Match itgamewatchpanic (#1393)

doldecomp · Jul 8, 2024 · f6cec68 · f6cec68
1 parent 86197fc
commit f6cec68
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 251 deletions.
diff --git a/asm/melee/it/items/itgamewatchpanic.s b/asm/melee/it/items/itgamewatchpanic.s
diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt
@@ -15859,7 +15859,7 @@ it_802C7E94 = .text:0x802C7E94; // type:function size:0x4C scope:global
 it_802C7EE0 = .text:0x802C7EE0; // type:function size:0x20 scope:global
 it_802C7F00 = .text:0x802C7F00; // type:function size:0x20 scope:global
 it_802C7F20 = .text:0x802C7F20; // type:function size:0x8C scope:global
-it_802C7FAC = .text:0x802C7FAC; // type:function size:0x6C scope:global
+it_802C7FAC = .text:0x802C7FAC; // type:function size:0x6C scope:local
 it_802C8018 = .text:0x802C8018; // type:function size:0x20 scope:global
 it_802C8038 = .text:0x802C8038; // type:function size:0x120 scope:global
 it_802C8158 = .text:0x802C8158; // type:function size:0x70 scope:global

diff --git a/configure.py b/configure.py
@@ -985,7 +985,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
             Object(NonMatching, "melee/it/items/itgamewatchbreath.c"),
             Object(NonMatching, "melee/it/items/itkirbygamewatchchefpan.c"),
             Object(NonMatching, "melee/it/items/itgamewatchjudge.c"),
-            Object(NonMatching, "melee/it/items/itgamewatchpanic.c"),
+            Object(Matching, "melee/it/items/itgamewatchpanic.c"),
             Object(NonMatching, "melee/it/items/itgamewatchrescue.c"),
             Object(NonMatching, "melee/it/items/itgamewatchchef.c"),
             Object(NonMatching, "melee/it/items/itclinkmilk.c"),

diff --git a/obj_files.mk b/obj_files.mk
@@ -665,7 +665,7 @@ TEXT_O_FILES +=\
     $(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\
-    $(BUILD_DIR)/asm/melee/it/items/itgamewatchpanic.s.o\
+    $(BUILD_DIR)/src/melee/it/items/itgamewatchpanic.c.o\
     $(BUILD_DIR)/asm/melee/it/items/itgamewatchrescue.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itgamewatchchef.s.o\
     $(BUILD_DIR)/asm/melee/it/items/itclinkmilk.s.o\

diff --git a/src/melee/ft/chara/ftGameWatch/ftGw_SpecialLw.c b/src/melee/ft/chara/ftGameWatch/ftGw_SpecialLw.c
@@ -15,7 +15,7 @@
 #include "ft/ftcommon.h"
 #include "ft/ftparts.h"
 #include "ft/types.h"
-#include "it/items/it_27CF.h"
+#include "it/items/itgamewatchpanic.h"
 #include "lb/lb_00B0.h"
 
 #include <common_structs.h>

diff --git a/src/melee/it/it_2725.h b/src/melee/it/it_2725.h
@@ -38,6 +38,7 @@
 /* 27C8B0 */ void it_8027C8B0(Item_GObj*);
 /* 27CBFC */ f32 it_8027CBFC(Item_GObj*);
 /* 27CE44 */ void it_8027CE44(Item_GObj*);
+/* 27CE64 */ void it_8027CE64(Item_GObj*, Item_GObj*, s32);
 /* 3F14C4 */ extern struct ItemLogicTable it_803F14C4[43];
 /* 3F23CC */ extern struct ItemLogicTable it_803F23CC[];
 /* 3F3100 */ extern struct ItemLogicTable it_803F3100[118];

diff --git a/src/melee/it/items/it_27CF.h b/src/melee/it/items/it_27CF.h
@@ -152,10 +152,6 @@
 /* 2C7A84 */ void it_802C7A84(Item_GObj*);
 /* 2C7AD0 */ void it_802C7AD0(Item_GObj*);
 /* 2C7AF0 */ void it_802C7AF0(Item_GObj*);
-/* 2C7D60 */ HSD_GObj* it_802C7D60(Item_GObj*, Vec3*, s32, float);
-/* 2C7E94 */ void it_802C7E94(Item_GObj*);
-/* 2C7EE0 */ void it_802C7EE0(Item_GObj*);
-/* 2C7F00 */ void it_802C7F00(Item_GObj*);
 /* 2C8038 */ HSD_GObj* it_802C8038(Item_GObj*, Vec3*, s32, s32, float, float);
 /* 2C8158 */ void it_802C8158(Item_GObj*);
 /* 2C81C8 */ void it_802C81C8(Item_GObj*);