Fix some fake symbols (#187)

* Fix fake reference from ovl_Npc_Conv_Master

* ovl_FallSESW fix

* reorder

* ac_npc_guide2 fix

* ovl_Npc_Police

5 files changed, 3 insertions, 11 deletions

diff --git a/src/overlays/actors/ovl_FallSESW/ac_fallSESW.c b/src/overlays/actors/ovl_FallSESW/ac_fallSESW.c
index e98d424..68c8eb2 100644
--- a/src/overlays/actors/ovl_FallSESW/ac_fallSESW.c
+++ b/src/overlays/actors/ovl_FallSESW/ac_fallSESW.c
@@ -28,8 +28,6 @@ ActorProfile FallSESW_Profile = {
 
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_FallSESW/ac_fallSESW/func_80A034B0_jp.s")
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_FallSESW/ac_fallSESW/D_80A03528_jp.s")
-
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_FallSESW/ac_fallSESW/aFLEW_actor_move.s")
 
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_FallSESW/ac_fallSESW/aFLEW_actor_draw.s")
diff --git a/src/overlays/actors/ovl_Npc2/ac_npc2.c b/src/overlays/actors/ovl_Npc2/ac_npc2.c
index 411240a..d6e3d8e 100644
--- a/src/overlays/actors/ovl_Npc2/ac_npc2.c
+++ b/src/overlays/actors/ovl_Npc2/ac_npc2.c
@@ -469,8 +469,6 @@ CollisionCheck_Status_Init aNPC_StatusData = { 0, 0x14, 0x1E, 0, 50 };
 
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc2/ac_npc2/func_8099E020_jp.s")
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc2/ac_npc2/D_8099E1F0_jp.s")
-
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc2/ac_npc2/func_8099E3E0_jp.s")
 
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc2/ac_npc2/func_8099E410_jp.s")
diff --git a/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.c b/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.c
index 64ee56b..34d0aa8 100644
--- a/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.c
+++ b/src/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2.c
@@ -37,8 +37,6 @@ ActorProfile Npc_Guide2_Profile = {
 
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2/func_809B141C_jp.s")
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2/D_809B15CC_jp.s")
-
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2/func_809B17C4_jp.s")
 
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc_Guide2/ac_npc_guide2/func_809B1808_jp.s")
diff --git a/src/overlays/actors/ovl_Npc_Police/ac_npc_police.c b/src/overlays/actors/ovl_Npc_Police/ac_npc_police.c
index 14108bd..47648f2 100644
--- a/src/overlays/actors/ovl_Npc_Police/ac_npc_police.c
+++ b/src/overlays/actors/ovl_Npc_Police/ac_npc_police.c
@@ -73,8 +73,6 @@ ActorProfile Npc_Police_Profile = {
 
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc_Police/ac_npc_police/func_809C1D28_jp.s")
 
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc_Police/ac_npc_police/D_809C1D44_jp.s")
-
-#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc_Police/ac_npc_police/D_809C1D5C_jp.s")
+#pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc_Police/ac_npc_police/func_809C1D48_jp.s")
 
 #pragma GLOBAL_ASM("asm/jp/nonmatchings/overlays/actors/ovl_Npc_Police/ac_npc_police/func_809C1D74_jp.s")
diff --git a/src/overlays/actors/ovl_Structure/ac_structure.c b/src/overlays/actors/ovl_Structure/ac_structure.c
index 64cdaf9..f4501dd 100644
--- a/src/overlays/actors/ovl_Structure/ac_structure.c
+++ b/src/overlays/actors/ovl_Structure/ac_structure.c
@@ -18,8 +18,8 @@ void aSTR_actor_move(Actor* thisx, Game_Play* game_play);
 void aSTR_init_clip_area(Game_Play* game_play);
 void aSTR_free_clip_area(void);
 
-StructureActor aSTR_actor_cl[9];
-s8 aSTR_overlay[9][8192];
+StructureActor aSTR_actor_cl[STRUCTURE_CLIP_STRUCTURE_ACTOR_COUNT];
+s8 aSTR_overlay[STRUCTURE_CLIP_STRUCTURE_ACTOR_COUNT][8192];
 
 // Original name unknown. Unused
 s8 aSTR_bss_padding_1[8];