scope and declaration changes

wyatt-avilla · Feb 28, 2024 · a17b891 · a17b891
1 parent 02af526
commit a17b891
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 26 deletions.
diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt
@@ -13792,22 +13792,22 @@ it_80283AE4 = .text:0x80283AE4; // type:function size:0xF0 scope:global
 it_80283BD4 = .text:0x80283BD4; // type:function size:0x18 scope:global
 it_80283BEC = .text:0x80283BEC; // type:function size:0x5C scope:global
 it_80283C48 = .text:0x80283C48; // type:function size:0x34 scope:global
-it_80283C7C = .text:0x80283C7C; // type:function size:0x58 scope:global
-it_80283CD4 = .text:0x80283CD4; // type:function size:0xD0 scope:global
-it_80283DA4 = .text:0x80283DA4; // type:function size:0x4 scope:global
-it_80283DA8 = .text:0x80283DA8; // type:function size:0x2C scope:global
-it_80283DD4 = .text:0x80283DD4; // type:function size:0x28 scope:global
-it_80283DFC = .text:0x80283DFC; // type:function size:0xD0 scope:global
-it_80283ECC = .text:0x80283ECC; // type:function size:0x30 scope:global
-it_80283EFC = .text:0x80283EFC; // type:function size:0x2C scope:global
+it_80283C7C = .text:0x80283C7C; // type:function size:0x58 scope:local
+it_80283CD4 = .text:0x80283CD4; // type:function size:0xD0 scope:local
+it_80283DA4 = .text:0x80283DA4; // type:function size:0x4 scope:local
+it_80283DA8 = .text:0x80283DA8; // type:function size:0x2C scope:local
+it_80283DD4 = .text:0x80283DD4; // type:function size:0x28 scope:local
+it_80283DFC = .text:0x80283DFC; // type:function size:0xD0 scope:local
+it_80283ECC = .text:0x80283ECC; // type:function size:0x30 scope:local
+it_80283EFC = .text:0x80283EFC; // type:function size:0x2C scope:local
 it_80283F28 = .text:0x80283F28; // type:function size:0xF8 scope:global
-it_80284020 = .text:0x80284020; // type:function size:0x8 scope:global
-it_80284028 = .text:0x80284028; // type:function size:0x4 scope:global
+it_80284020 = .text:0x80284020; // type:function size:0x8 scope:local
+it_80284028 = .text:0x80284028; // type:function size:0x4 scope:local
 it_8028402C = .text:0x8028402C; // type:function size:0x100 scope:global
 it_8028412C = .text:0x8028412C; // type:function size:0x28 scope:global
-it_80284154 = .text:0x80284154; // type:function size:0x8 scope:global
-it_8028415C = .text:0x8028415C; // type:function size:0x4 scope:global
-it_80284160 = .text:0x80284160; // type:function size:0x34 scope:global
+it_80284154 = .text:0x80284154; // type:function size:0x8 scope:local
+it_8028415C = .text:0x8028415C; // type:function size:0x4 scope:local
+it_80284160 = .text:0x80284160; // type:function size:0x34 scope:local
 it_80284194 = .text:0x80284194; // type:function size:0x20 scope:global
 it_802841B4 = .text:0x802841B4; // type:function size:0xD8 scope:local
 it_8028428C = .text:0x8028428C; // type:function size:0x18 scope:local
@@ -32113,8 +32113,8 @@ it_804DC88C = .sdata2:0x804DC88C; // type:object size:0x4 scope:global data:floa
 it_804DC890 = .sdata2:0x804DC890; // type:object size:0x8 scope:global data:double
 it_804DC898 = .sdata2:0x804DC898; // type:object size:0x8 scope:global data:double
 it_804DC8A0 = .sdata2:0x804DC8A0; // type:object size:0x4 scope:global data:float
-it_804DC8A8 = .sdata2:0x804DC8A8; // type:object size:0x4 scope:global data:float
-it_804DC8AC = .sdata2:0x804DC8AC; // type:object size:0x4 scope:global data:float
+@182 = .sdata2:0x804DC8A8; // type:object size:0x4 scope:local data:float
+@183 = .sdata2:0x804DC8AC; // type:object size:0x4 scope:local data:float
 @176 = .sdata2:0x804DC8B0; // type:object size:0x4 scope:local data:float
 @180 = .sdata2:0x804DC8B4; // type:object size:0x4 scope:local data:float
 @197 = .sdata2:0x804DC8B8; // type:object size:0x4 scope:local data:float

diff --git a/src/melee/it/items/itheart.c b/src/melee/it/items/itheart.c
@@ -6,13 +6,31 @@
 #include "it/it_26B1.h"
 #include "it/itCommonItems.h"
 #include "it/item.h"
-#include "it/types.h"
 
 #include <baselib/gobj.h>
 #include <baselib/jobj.h>
 
-void it_80283DD4(HSD_GObj* gobj);
-void it_80283C7C(HSD_GObj* gobj);
+/* 283C7C */ static void it_80283C7C(Item_GObj* gobj);
+/* 283CD4 */ static bool it_80283CD4(Item_GObj* gobj);
+/* 283DA4 */ static void it_80283DA4(Item_GObj* gobj);
+/* 283DA8 */ static bool it_80283DA8(Item_GObj* gobj);
+/* 283DD4 */ static void it_80283DD4(Item_GObj* gobj);
+/* 283DFC */ static bool it_80283DFC(Item_GObj* gobj);
+/* 283ECC */ static void it_80283ECC(Item_GObj* gobj);
+/* 283EFC */ static bool it_80283EFC(Item_GObj* gobj);
+/* 284020 */ static bool it_80284020(Item_GObj* gobj);
+/* 284028 */ static void it_80284028(Item_GObj* gobj);
+/* 284154 */ static bool it_80284154(Item_GObj* gobj);
+/* 28415C */ static void it_8028415C(Item_GObj* gobj);
+/* 284160 */ static bool it_80284160(Item_GObj* gobj);
+
+ItemStateTable it_803F56C8[] = {
+    { 0xFFFFFFFF, it_80283CD4, it_80283DA4, it_80283DA8 },
+    { 0xFFFFFFFF, it_80283DFC, it_80283ECC, it_80283EFC },
+    { 0xFFFFFFFF, it_80284020, it_80284028, NULL },
+    { 0xFFFFFFFF, it_80283DFC, it_80283ECC, it_80283EFC },
+    { 0xFFFFFFFF, it_80284154, it_8028415C, it_80284160 },
+};
 
 Item_GObj* it_80283AE4(Item_GObj* gobj, Vec3* pos, s32 arg2)
 {
@@ -182,11 +200,3 @@ void it_80284194(Item_GObj* gobj, Item_GObj* ref_gobj)
 {
     it_8026B894(gobj, ref_gobj);
 }
-
-ItemStateTable it_803F56C8[] = {
-    { 0xFFFFFFFF, it_80283CD4, it_80283DA4, it_80283DA8 },
-    { 0xFFFFFFFF, it_80283DFC, it_80283ECC, it_80283EFC },
-    { 0xFFFFFFFF, it_80284020, it_80284028, NULL },
-    { 0xFFFFFFFF, it_80283DFC, it_80283ECC, it_80283EFC },
-    { 0xFFFFFFFF, it_80284154, it_8028415C, it_80284160 },
-};
diff --git a/src/melee/it/items/itheart.h b/src/melee/it/items/itheart.h
@@ -4,7 +4,10 @@
 #include "it/forward.h"
 
 #include "it/items/types.h"
+#include "it/types.h"
 
+/* 283AE4 */ Item_GObj* it_80283AE4(Item_GObj* gobj, Vec3* pos, s32 arg2);
+/* 283BD4 */ void it_80283BD4(Item_GObj* gobj);
 /* 283BEC */ void it_80283BEC(Item_GObj*);
 /* 283C48 */ void it_80283C48(Item_GObj*);
 /* 283F28 */ void it_80283F28(Item_GObj*);