proper function scoping

doldecomp · Jun 21, 2024 · 754c435 · 754c435
1 parent b3f9035
commit 754c435
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt
@@ -15243,14 +15243,14 @@ it_802AF184 = .text:0x802AF184; // type:function size:0x20 scope:global
 it_802AF1A4 = .text:0x802AF1A4; // type:function size:0xF4 scope:global
 it_802AF298 = .text:0x802AF298; // type:function size:0x6C scope:global
 it_802AF304 = .text:0x802AF304; // type:function size:0x28 scope:global
-it_802AF32C = .text:0x802AF32C; // type:function size:0x108 scope:global
+it_802AF32C = .text:0x802AF32C; // type:function size:0x108 scope:local
 it_802AF434 = .text:0x802AF434; // type:function size:0x218 scope:global
-it_802AF64C = .text:0x802AF64C; // type:function size:0x1F8 scope:global
-it_802AF844 = .text:0x802AF844; // type:function size:0x4 scope:global
-it_802AF848 = .text:0x802AF848; // type:function size:0xC4 scope:global
-it_802AF90C = .text:0x802AF90C; // type:function size:0x8 scope:global
-it_802AF914 = .text:0x802AF914; // type:function size:0x4 scope:global
-it_802AF918 = .text:0x802AF918; // type:function size:0x8 scope:global
+it_802AF64C = .text:0x802AF64C; // type:function size:0x1F8 scope:local
+it_802AF844 = .text:0x802AF844; // type:function size:0x4 scope:local
+it_802AF848 = .text:0x802AF848; // type:function size:0xC4 scope:local
+it_802AF90C = .text:0x802AF90C; // type:function size:0x8 scope:local
+it_802AF914 = .text:0x802AF914; // type:function size:0x4 scope:local
+it_802AF918 = .text:0x802AF918; // type:function size:0x8 scope:local
 it_802AF920 = .text:0x802AF920; // type:function size:0x20 scope:global
 it_802AF940 = .text:0x802AF940; // type:function size:0xEC scope:global
 it_802AFA2C = .text:0x802AFA2C; // type:function size:0x44 scope:global

diff --git a/src/melee/it/items/itlinkbow.c b/src/melee/it/items/itlinkbow.c
@@ -8,6 +8,14 @@
 
 #include <baselib/gobj.h>
 
+/* 2AF32C */ static void it_802AF32C(HSD_GObj*);
+/* 2AF64C */ static int it_802AF64C(HSD_GObj*);
+/* 2AF844 */ static void it_802AF844(HSD_GObj*);
+/* 2AF848 */ static int it_802AF848(HSD_GObj*);
+/* 2AF90C */ static int it_802AF90C(HSD_GObj*);
+/* 2AF914 */ static void it_802AF914(HSD_GObj*);
+/* 2AF918 */ static int it_802AF918(HSD_GObj*);
+
 ItemStateTable it_803F6E98[] = { { 0, it_802AF64C, it_802AF844, it_802AF848 },
                                  { 1, it_802AF64C, it_802AF844, it_802AF848 },
                                  { 2, it_802AF64C, it_802AF844, it_802AF848 },

diff --git a/src/melee/it/items/itlinkbow.h b/src/melee/it/items/itlinkbow.h
@@ -10,14 +10,7 @@
 /* 2AF1A4 */ HSD_GObj* it_802AF1A4(f32, Fighter_GObj*, Vec3*, u8, int);
 /* 2AF298 */ void it_802AF298(Item_GObj*);
 /* 2AF304 */ void it_802AF304(Item_GObj*);
-/* 2AF32C */ void it_802AF32C(HSD_GObj*);
 /* 2AF434 */ void it_802AF434(Item_GObj*);
-/* 2AF64C */ int it_802AF64C(HSD_GObj*);
-/* 2AF844 */ void it_802AF844(HSD_GObj*);
-/* 2AF848 */ int it_802AF848(HSD_GObj*);
-/* 2AF90C */ int it_802AF90C(HSD_GObj*);
-/* 2AF914 */ void it_802AF914(HSD_GObj*);
-/* 2AF918 */ int it_802AF918(HSD_GObj*);
 /* 2AF920 */ void it_802AF920(Item_GObj*, Item_GObj*);
 /* 3F6E98 */ extern ItemStateTable it_803F6E98[];