Assorted matches (#1450)

* Match mnGallery_80258940 * Match grDisplay_801C5F60 * Tweak HSD_JObjSetupMatrix * Match grMaterial_801C8E28
doldecomp · Sep 9, 2024 · 5fa7cfc · 5fa7cfc
1 parent 138ca63
commit 5fa7cfc
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 2 deletions.
diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt
@@ -12949,7 +12949,7 @@ fn_802545C4 = .text:0x802545C4; // type:function size:0x37B8
 fn_80257D7C = .text:0x80257D7C; // type:function size:0x1A8
 mnSnap_80257F24 = .text:0x80257F24; // type:function size:0xA1C scope:global
 mnGallery_80258940 = .text:0x80258940; // type:function size:0x2C scope:global
-fn_8025896C = .text:0x8025896C; // type:function size:0x9C
+mnGallery_8025896C = .text:0x8025896C; // type:function size:0x9C
 mnGallery_80258A08 = .text:0x80258A08; // type:function size:0x1BC scope:global
 mnGallery_80258BC4 = .text:0x80258BC4; // type:function size:0x18C scope:global
 mnGallery_80258D50 = .text:0x80258D50; // type:function size:0x6C scope:global

diff --git a/src/melee/gr/grdisplay.c b/src/melee/gr/grdisplay.c
@@ -71,3 +71,14 @@ void grDisplay_801C5B90(HSD_JObj* jobj, void* arg1, u32 arg2, int arg3)
         }
     }
 }
+
+void grDisplay_801C5F60(HSD_GObj* gobj, int code)
+{
+    HSD_CObj* cobj = GET_COBJ(gobj);
+    if (HSD_CObjSetCurrent(cobj)) {
+        gobj->gxlink_prios = 8;
+        Camera_800310A0(0);
+        HSD_GObj_80390ED0(gobj, 7);
+        HSD_CObjEndCurrent();
+    }
+}
diff --git a/src/melee/gr/grmaterial.c b/src/melee/gr/grmaterial.c
@@ -187,6 +187,11 @@ void grMaterial_801C8E08(HSD_GObj* gobj)
     it_802756E0(gobj);
 }
 
+void grMaterial_801C8E28(HSD_GObj* gobj)
+{
+    it_802756D0(gobj);
+}
+
 bool grMaterial_801C8E48(HSD_GObj* gobj)
 {
     Item* it = gobj->user_data;

diff --git a/src/melee/gr/grmaterial.h b/src/melee/gr/grmaterial.h
@@ -14,6 +14,7 @@
 /* 1C8CFC */ int grMaterial_801C8CFC(int, int, Ground*, HSD_JObj*, int,
                                      HSD_GObjEvent, int);
 /* 1C8E08 */ void grMaterial_801C8E08(int);
+/* 1C8E28 */ void grMaterial_801C8E28(HSD_GObj*);
 /* 1C94D8 */ void grMaterial_801C94D8(UNK_T hsd_obj);
 /* 1C95C4 */ void grMaterial_801C95C4(HSD_GObj*);
 /* 1C9604 */ void grMaterial_801C9604(HSD_GObj* bg, int, bool);

diff --git a/src/melee/mn/mngallery.c b/src/melee/mn/mngallery.c
@@ -1 +1,11 @@
+#include "mngallery.h"
 
+#include <baselib/cobj.h>
+#include <baselib/memory.h>
+
+extern void* mnGallery_804D6C8C;
+
+void mnGallery_80258940(void)
+{
+    mnGallery_804D6C8C = HSD_MemAlloc(0x271000);
+}
diff --git a/src/melee/mn/mngallery.h b/src/melee/mn/mngallery.h
@@ -1 +1,10 @@
+#ifndef _mngallery_h_
+#define _mngallery_h_
 
+#include <platform.h>
+
+#include <baselib/gobj.h>
+
+void mnGallery_80258940(void);
+
+#endif
diff --git a/src/sysdolphin/baselib/jobj.h b/src/sysdolphin/baselib/jobj.h
@@ -236,7 +236,7 @@ static inline bool HSD_JObjMtxIsDirty(HSD_JObj* jobj)
 
 inline void HSD_JObjSetupMatrix(HSD_JObj* jobj)
 {
-    if (jobj == NULL || !HSD_JObjMtxIsDirty(jobj)) {
+    if (!jobj || !HSD_JObjMtxIsDirty(jobj)) {
         return;
     }
     HSD_JObjSetupMatrixSub(jobj);