function scopes

wyatt-avilla · Mar 28, 2024 · 20f2775 · 20f2775
1 parent 6e44130
commit 20f2775
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 33 deletions.
diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt
@@ -16103,27 +16103,27 @@ it_802CDB0C = .text:0x802CDB0C; // type:function size:0x24 scope:global
 it_802CDB30 = .text:0x802CDB30; // type:function size:0x88 scope:global
 it_802CDBB8 = .text:0x802CDBB8; // type:function size:0x28 scope:global
 it_802CDBE0 = .text:0x802CDBE0; // type:function size:0x7C scope:global
-it_802CDC5C = .text:0x802CDC5C; // type:function size:0x4 scope:global
+it_802CDC5C = .text:0x802CDC5C; // type:function size:0x4 scope:local
 it_802CDC60 = .text:0x802CDC60; // type:function size:0x20 scope:global
-it_802CDC80 = .text:0x802CDC80; // type:function size:0x34 scope:global
-it_802CDCB4 = .text:0x802CDCB4; // type:function size:0x70 scope:global
-it_802CDD24 = .text:0x802CDD24; // type:function size:0x54 scope:global
-it_802CDD78 = .text:0x802CDD78; // type:function size:0x58 scope:global
-it_802CDDD0 = .text:0x802CDDD0; // type:function size:0x4C scope:global
-it_802CDE1C = .text:0x802CDE1C; // type:function size:0x10C scope:global
-it_802CDF28 = .text:0x802CDF28; // type:function size:0xE0 scope:global
-it_802CE008 = .text:0x802CE008; // type:function size:0xBC scope:global
-it_802CE0C4 = .text:0x802CE0C4; // type:function size:0x244 scope:global
-it_802CE308 = .text:0x802CE308; // type:function size:0xA0 scope:global
-it_802CE3A8 = .text:0x802CE3A8; // type:function size:0x58 scope:global
-it_802CE400 = .text:0x802CE400; // type:function size:0x188 scope:global
-it_802CE588 = .text:0x802CE588; // type:function size:0x54 scope:global
-it_802CE5DC = .text:0x802CE5DC; // type:function size:0x5C scope:global
-it_802CE638 = .text:0x802CE638; // type:function size:0x8 scope:global
-it_802CE640 = .text:0x802CE640; // type:function size:0x64 scope:global
-it_802CE6A4 = .text:0x802CE6A4; // type:function size:0x24 scope:global
-it_802CE6C8 = .text:0x802CE6C8; // type:function size:0x20 scope:global
-it_802CE6E8 = .text:0x802CE6E8; // type:function size:0x28 scope:global
+it_802CDC80 = .text:0x802CDC80; // type:function size:0x34 scope:local
+it_802CDCB4 = .text:0x802CDCB4; // type:function size:0x70 scope:local
+it_802CDD24 = .text:0x802CDD24; // type:function size:0x54 scope:local
+it_802CDD78 = .text:0x802CDD78; // type:function size:0x58 scope:local
+it_802CDDD0 = .text:0x802CDDD0; // type:function size:0x4C scope:local
+it_802CDE1C = .text:0x802CDE1C; // type:function size:0x10C scope:local
+it_802CDF28 = .text:0x802CDF28; // type:function size:0xE0 scope:local
+it_802CE008 = .text:0x802CE008; // type:function size:0xBC scope:local
+it_802CE0C4 = .text:0x802CE0C4; // type:function size:0x244 scope:local
+it_802CE308 = .text:0x802CE308; // type:function size:0xA0 scope:local
+it_802CE3A8 = .text:0x802CE3A8; // type:function size:0x58 scope:local
+it_802CE400 = .text:0x802CE400; // type:function size:0x188 scope:local
+it_802CE588 = .text:0x802CE588; // type:function size:0x54 scope:local
+it_802CE5DC = .text:0x802CE5DC; // type:function size:0x5C scope:local
+it_802CE638 = .text:0x802CE638; // type:function size:0x8 scope:local
+it_802CE640 = .text:0x802CE640; // type:function size:0x64 scope:local
+it_802CE6A4 = .text:0x802CE6A4; // type:function size:0x24 scope:local
+it_802CE6C8 = .text:0x802CE6C8; // type:function size:0x20 scope:local
+it_802CE6E8 = .text:0x802CE6E8; // type:function size:0x28 scope:local
 it_802CE710 = .text:0x802CE710; // type:function size:0xBC scope:global
 it_802CE7CC = .text:0x802CE7CC; // type:function size:0x4 scope:global
 it_802CE7D0 = .text:0x802CE7D0; // type:function size:0x20 scope:global

diff --git a/src/melee/it/items/ithassam.c b/src/melee/it/items/ithassam.c
@@ -24,12 +24,33 @@
 #include <baselib/gobj.h>
 #include <baselib/jobj.h>
 
-bool it_802CE0C4(Item_GObj*); /* static */
-void it_802CE400(Item_GObj*); /* static */
-void it_802CE640(Item_GObj*); /* static */
-void it_802CDCB4(Item_GObj*); /* static */
-bool it_802CDD24(Item_GObj*); /* static */
-void it_802CE008(Item_GObj*); /* static */
+/* 2CDC5C */ static void it_802CDC5C(Item_GObj* gobj);
+/* 2CDC80 */ static void it_802CDC80(Item_GObj* gobj);
+/* 2CDCB4 */ static void it_802CDCB4(Item_GObj* gobj);
+/* 2CDD24 */ static bool it_802CDD24(Item_GObj* gobj);
+/* 2CDD78 */ static void it_802CDD78(Item_GObj* gobj);
+/* 2CDDD0 */ static bool it_802CDDD0(Item_GObj* gobj);
+/* 2CDE1C */ static Item_GObj* it_802CDE1C(Vec3* vec, Item_GObj* gobj);
+/* 2CDF28 */ static void it_802CDF28(Item_GObj* gobj);
+/* 2CE008 */ static void it_802CE008(Item_GObj* gobj);
+/* 2CE0C4 */ static bool it_802CE0C4(HSD_GObj* gobj);
+/* 2CE308 */ static void it_802CE308(Item_GObj* gobj);
+/* 2CE3A8 */ static bool it_802CE3A8(Item_GObj* gobj);
+/* 2CE400 */ static void it_802CE400(Item_GObj* gobj);
+/* 2CE588 */ static bool it_802CE588(Item_GObj* gobj);
+/* 2CE5DC */ static void it_802CE5DC(Item_GObj* gobj);
+/* 2CE638 */ static bool it_802CE638(Item_GObj* gobj);
+/* 2CE640 */ static void it_802CE640(Item_GObj* gobj);
+/* 2CE6A4 */ static bool it_802CE6A4(Item_GObj* gobj);
+/* 2CE6C8 */ static void it_802CE6C8(Item_GObj* gobj);
+/* 2CE6E8 */ static bool it_802CE6E8(Item_GObj* gobj);
+
+ItemStateTable it_803F7CF8[] = {
+    { 0, it_802CDD24, it_802CDD78, it_802CDDD0 },
+    { 1, it_802CE0C4, it_802CE308, it_802CE3A8 },
+    { 2, it_802CE588, it_802CE5DC, it_802CE638 },
+    { -1, it_802CE6A4, it_802CE6C8, it_802CE6E8 },
+};
 
 void it_802CDBE0(Item_GObj* gobj)
 {
@@ -354,10 +375,3 @@ bool it_802CE6E8(Item_GObj* gobj)
 {
     return it_8027A118(gobj, it_802CDC80);
 }
-
-ItemStateTable it_803F7CF8[] = {
-    { 0, it_802CDD24, it_802CDD78, it_802CDDD0 },
-    { 1, it_802CE0C4, it_802CE308, it_802CE3A8 },
-    { 2, it_802CE588, it_802CE5DC, it_802CE638 },
-    { -1, it_802CE6A4, it_802CE6C8, it_802CE6E8 },
-};