From 4d11518c2170e8263f7b247fff8b5bfa5b46df44 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 23 Oct 2025 15:59:41 +0200
Subject: [PATCH] ground map externs

---
 include/ground_map.h  | 5 ++++-
 src/debug_field_map.c | 1 -
 src/ground_lives.c    | 2 --
 src/ground_main.c     | 6 ------
 src/ground_map.c      | 5 ++---
 src/ground_script.c   | 9 +++------
 6 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/include/ground_map.h b/include/ground_map.h
index ea4d91f4c..1286a32e4 100644
--- a/include/ground_map.h
+++ b/include/ground_map.h
@@ -29,8 +29,11 @@ bool8 sub_80A579C(PixelPos *pos1, PixelPos *pos2);
 bool8 CheckMapCollision_80A585C(PixelPos *pixPos1, PixelPos *boundary);
 bool8 sub_80A58C8(PixelPos *pixPos1, PixelPos *boundary);
 u8 sub_80A5934(u8 param_1, PixelPos *param_2, PixelPos *param_3);
-
+u8 sub_80A595C(u8 param_1, PixelPos *param_2, PixelPos *param_3);
+u16 sub_80A5984(s32 param_1, PixelPos *param_2);
+void sub_80A59A0(s32 param_1, PixelPos *param_2, u16 param_3);
 void GroundMap_Action(void);
+void sub_80A59DC(void);
 void sub_80A5E70(void);
 
 #endif // GUARD_GROUND_MAP_H
diff --git a/src/debug_field_map.c b/src/debug_field_map.c
index 474bc00af..4f129fb44 100644
--- a/src/debug_field_map.c
+++ b/src/debug_field_map.c
@@ -21,7 +21,6 @@
 
 extern void sub_8012A18(s32 unused);
 extern void sub_80999E8(s32 a0);
-extern void sub_80A59DC(void);
 extern PixelPos SetVecFromDirectionSpeed(s8 r1, u32 r2);
 
 UNUSED static void DebugMapViewer(void)
diff --git a/src/ground_lives.c b/src/ground_lives.c
index 58d5f692f..a5ab5cd25 100644
--- a/src/ground_lives.c
+++ b/src/ground_lives.c
@@ -108,9 +108,7 @@ extern const struct GroundLiveTypeData gGroundLivesTypeData_811E63C[];
 extern s32 sub_8002984(s32 _direction1, u32 caseID);
 extern bool8 sub_80A66F8(struct UnkGroundSpriteStruct *ptr);
 extern bool8 sub_80A671C(struct UnkGroundSpriteStruct *ptr);
-extern bool8 sub_80A595C(u32 a0, PixelPos *pixelPosArg1, PixelPos *pixelPosArg2);
 extern PixelPos SetVecFromDirectionSpeed(s32 r1, u32 r2);
-extern u8 sub_80A5934(s32 param_1, PixelPos *, PixelPos *);
 extern bool8 sub_809B1C0(s32 a0, u32 kind, Pokemon *a2);
 extern Pokemon *sub_80A8D54(s32);
 extern const struct GroundScriptHeader *GetGroundScript(s16 a0, const DebugLocation *);
diff --git a/src/ground_main.c b/src/ground_main.c
index 6d5409290..3ffde5ae8 100644
--- a/src/ground_main.c
+++ b/src/ground_main.c
@@ -52,12 +52,8 @@ EWRAM_INIT u8 gUnknown_203B49D = {0};
 
 extern void sub_809B57C();
 extern void sub_809D25C();
-extern void sub_80A59DC();
-extern void sub_809B614();
 extern void sub_809CA20();
 extern void sub_80A6E80();
-extern void sub_8099BE4();
-extern void sub_809B638();
 extern void nullsub_106();
 extern void sub_80A73EC();
 
@@ -75,13 +71,11 @@ extern bool8 sub_8099B94(void);
 extern void sub_8099768(void);
 extern void sub_809975C(void);
 extern void sub_809B474(void);
-extern void sub_80A59DC(void);
 extern void sub_809B614(void);
 extern void sub_8099BE4(void);
 extern void sub_8099744(void);
 extern void WaitForNextFrameAndAdvanceRNG(void);
 extern void LoadBufferedInputs(void);
-extern void sub_80A5E70(void);
 extern void sub_809B638(void);
 extern void sub_8099750(void);
 extern void nullsub_16(void);
diff --git a/src/ground_map.c b/src/ground_map.c
index ba4322291..0de14f94b 100644
--- a/src/ground_map.c
+++ b/src/ground_map.c
@@ -1365,10 +1365,9 @@ u16 sub_80A5984(s32 param_1, PixelPos *param_2)
     return sub_80A4720(gGroundMapDungeon_3001B70, param_1, param_2);
 }
 
-void sub_80A59A0(s32 param_1, PixelPos *param_2, u32 param_3)
+void sub_80A59A0(s32 param_1, PixelPos *param_2, u16 param_3)
 {
-    u32 param_3_u32 = (u16)param_3;
-    sub_80A4740(gGroundMapDungeon_3001B70, param_1, param_2, param_3_u32);
+    sub_80A4740(gGroundMapDungeon_3001B70, param_1, param_2, param_3);
 }
 
 void GroundMap_Action(void)
diff --git a/src/ground_script.c b/src/ground_script.c
index 2a553e9cd..9898f766f 100644
--- a/src/ground_script.c
+++ b/src/ground_script.c
@@ -92,8 +92,6 @@ void sub_8096488(void);
 bool8 sub_80964B4(void);
 bool8 sub_8097640();
 u8 sub_80964E4();
-s32 sub_80A5984();
-void sub_80A59A0(s32, s32 *, u16);
 
 // For gScriptLocks, gScriptLockConds, gUnlockBranchLabels
 #define SCRIPT_LOCKS_ARR_COUNT 129
@@ -3683,10 +3681,9 @@ static s32 sub_80A14E8(Action *action, u8 idx, u32 r2, s32 r3)
             }
             return 0;
         case 0x3D: {
-            s32 sp_338[2];
-            sp_338[0] = r2;
-            sp_338[1] = r3;
-            sub_80A59A0(0, sp_338, sub_80A5984(1, sp_338));
+            PixelPos sp_338 = {r2, r3};
+
+            sub_80A59A0(0, &sp_338, sub_80A5984(1, &sp_338));
             return 0;
         }
         case 0x3E: