Merge branch 'master' into pr/dtk-template

doldecomp · Sep 17, 2024 · c75bcd3 · c75bcd3
2 parents 56aa923 + 5fff08a
commit c75bcd3
Show file tree

Hide file tree

Showing 19 changed files with 500 additions and 1,590 deletions.
diff --git a/asm/melee/it/items/itcoin.s b/asm/melee/it/items/itcoin.s
diff --git a/asm/melee/it/items/itdkinoko.s b/asm/melee/it/items/itdkinoko.s
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/configure.py b/configure.py
@@ -973,7 +973,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> Library:
             Object(NonMatching, "melee/it/items/itharisen.c"),
             Object(Matching, "melee/it/items/itfflower.c"),
             Object(Matching, "melee/it/items/itkinoko.c"),
-            Object(NonMatching, "melee/it/items/itdkinoko.c"),
+            Object(Matching, "melee/it/items/itdkinoko.c"),
             Object(Matching, "melee/it/items/ithammer.c"),
             Object(NonMatching, "melee/it/items/itwstar.c"),
             Object(Matching, "melee/it/items/itscball.c"),
@@ -1113,7 +1113,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> Library:
             Object(NonMatching, "melee/it/items/itmasterhandlaser.c"),
             Object(NonMatching, "melee/it/items/itmasterhandbullet.c"),
             Object(NonMatching, "melee/it/items/itcrazyhandbomb.c"),
-            Object(NonMatching, "melee/it/items/itcoin.c"),
+            Object(Matching, "melee/it/items/itcoin.c"),
             Object(NonMatching, "melee/it/items/itkirby_2F23.c"),
             Object(NonMatching, "melee/it/items/it_2F28.c"),
             Object(Matching, "melee/it/items/it_2F2B.c"),

diff --git a/obj_files.mk b/obj_files.mk
@@ -586,7 +586,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itharisen.s.o\
     $(BUILD_DIR)/src/melee/it/items/itfflower.c.o\
     $(BUILD_DIR)/src/melee/it/items/itkinoko.c.o\
-    $(BUILD_DIR)/asm/melee/it/items/itdkinoko.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itdkinoko.c.o\
     $(BUILD_DIR)/src/melee/it/items/ithammer.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itwstar.s.o\
     $(BUILD_DIR)/src/melee/it/items/itscball.c.o\
@@ -730,7 +730,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itmasterhandlaser.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itmasterhandbullet.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itcrazyhandbomb.s.o\
-    $(BUILD_DIR)/asm/melee/it/items/itcoin.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itcoin.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itkirby_2F23.s.o\
     $(BUILD_DIR)/asm/melee/it/items/it_2F28.s.o\
     $(BUILD_DIR)/src/melee/it/items/it_2F2B.c.o\

diff --git a/src/MSL/math.h b/src/MSL/math.h
@@ -84,6 +84,11 @@ static inline f32 fabs_inline(f32 x)
     }
 }
 
+static inline double fabs(double f)
+{
+    return __fabs(f);
+}
+
 double frexp(double x, int* exponent);
 float fabsf__Ff(float);
 float tanf(float x);

diff --git a/src/dolphin/pad/pad.h b/src/dolphin/pad/pad.h
@@ -42,7 +42,7 @@ void PADControlMotor(int chan, u32 command);
 void VISetBlack(bool);
 u32 VIGetRetraceCount(void);
 void PADClamp(PADStatus*);
-void PADRead(u8*);
+void PADRead(PADStatus*);
 void PADReset(u32);
 void PADTypeAndStatusCallback(s32 chan, u32 type);
 void PADSetSpec(s32);

diff --git a/src/melee/gm/gmmain.c b/src/melee/gm/gmmain.c
@@ -60,7 +60,7 @@ enum {
 static u32 arena_size;
 static bool gmMain_804D6594;
 
-static u8 gmMain_8046B108[0xF0];
+static HSD_PadData gmMain_8046B108[5];
 static HSD_PadRumbleListData gmMain_8046B1F8[12];
 
 static void gmMain_8015FD24(void)

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();
+    }
+}