Match itgamewatchturtle (doldecomp#1379)

wyatt-avilla · Mar 8, 2024 · f44d526 · f44d526
1 parent 4760ed5
commit f44d526
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 254 deletions.
diff --git a/asm/melee/it/items/itgamewatchturtle.s b/asm/melee/it/items/itgamewatchturtle.s
diff --git a/configure.py b/configure.py
@@ -981,7 +981,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
             Object(NonMatching, "melee/it/items/itgamewatchmanhole.c"),
             Object(NonMatching, "melee/it/items/itgamewatchfire.c"),
             Object(NonMatching, "melee/it/items/itgamewatchparachute.c"),
-            Object(NonMatching, "melee/it/items/itgamewatchturtle.c"),
+            Object(Matching, "melee/it/items/itgamewatchturtle.c"),
             Object(NonMatching, "melee/it/items/itgamewatchbreath.c"),
             Object(NonMatching, "melee/it/items/itkirbygamewatchchefpan.c"),
             Object(NonMatching, "melee/it/items/itgamewatchjudge.c"),

diff --git a/obj_files.mk b/obj_files.mk
@@ -661,7 +661,7 @@ TEXT_O_FILES +=\
     $(BUILD_DIR)/asm/melee/it/items/itgamewatchmanhole.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itgamewatchfire.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itgamewatchparachute.s.o\
-    $(BUILD_DIR)/asm/melee/it/items/itgamewatchturtle.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itgamewatchturtle.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itgamewatchbreath.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itkirbygamewatchchefpan.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itgamewatchjudge.s.o\

diff --git a/src/melee/ft/chara/ftGameWatch/ftGw_AttackAir.c b/src/melee/ft/chara/ftGameWatch/ftGw_AttackAir.c
@@ -13,6 +13,7 @@
 #include "ftCommon/ftCo_LandingAir.h"
 #include "ftGameWatch/types.h"
 #include "it/items/it_27CF.h"
+#include "it/items/itgamewatchturtle.h"
 #include "lb/lb_00B0.h"
 
 #include <dolphin/mtx/types.h>

diff --git a/src/melee/it/items/it_27CF.h b/src/melee/it/items/it_27CF.h
@@ -150,11 +150,6 @@
 /* 2C6DB8 */ void it_802C6DB8(Item_GObj*);
 /* 2C6DD8 */ void it_802C6DD8(Item_GObj*);
 /* 2C6E50 */ void it_802C6E50(Item_GObj*);
-/* 2C6F40 */ HSD_GObj* it_802C6F40(Item_GObj*, Vec3*, s32, float);
-/* 2C7074 */ void it_802C7074(Item_GObj*);
-/* 2C70C0 */ void it_802C70C0(Item_GObj*);
-/* 2C70E0 */ void it_802C70E0(Item_GObj*);
-/* 2C7158 */ void it_802C7158(Item_GObj*);
 /* 2C720C */ HSD_GObj* it_802C720C(Item_GObj*, Vec3*, s32, float);
 /* 2C7340 */ void it_802C7340(Item_GObj*);
 /* 2C738C */ void it_802C738C(Item_GObj*);