Decompile data: trainer_see

4 files changed, 59 insertions, 68 deletions

diff --git a/data/trainer_see.s b/data/trainer_see.s
index 04a787f0c..7935c693e 100644
--- a/data/trainer_see.s
+++ b/data/trainer_see.s
@@ -2,41 +2,3 @@
 	.include "constants/constants.inc"
 
 	.section .rodata
-
-	.align 2
-gOamData_839B4D8:: @ 839B4D8
-	.2byte 0x0000
-	.2byte 0x4000
-	.2byte 0x0400
-
-	.align 2
-gSpriteImageTable_839B4E0:: @ 839B4E0
-	obj_frame_tiles gSpriteImage_839B308, 0x80
-	obj_frame_tiles gSpriteImage_839B388, 0x80
-
-	.align 2
-gSpriteImageTable_839B4F0:: @ 839B4F0
-	obj_frame_tiles gSpriteImage_839B408, 0x80
-
-	.align 2
-gSpriteAnim_839B4F8:: @ 839B4F8
-	obj_image_anim_frame 0, 60
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_839B500:: @ 839B500
-	obj_image_anim_frame 1, 60
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_839B508:: @ 839B508
-	.4byte gSpriteAnim_839B4F8
-	.4byte gSpriteAnim_839B500
-
-	.align 2
-gSpriteTemplate_839B510:: @ 839B510
-	spr_template 0xFFFF, 0xFFFF, gOamData_839B4D8, gSpriteAnimTable_839B508, gSpriteImageTable_839B4E0, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
-
-	.align 2
-gSpriteTemplate_839B528:: @ 839B528
-	spr_template 0xFFFF, 4100, gOamData_839B4D8, gSpriteAnimTable_839B508, gSpriteImageTable_839B4F0, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
diff --git a/include/trainer_see.h b/include/trainer_see.h
index de96dcd3a..e36df981b 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -5,17 +5,7 @@
 #include "task.h"
 
 bool8 CheckTrainers(void);
-bool8 CheckTrainer(u8);
-u8 TrainerCanApproachPlayer(struct MapObject *);
-
-bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *, u8, u8);
-void sub_80842C8(struct MapObject *, u8);
-void sub_80842FC(void (*func)(u8));
-void RunTrainerSeeFuncList(u8);
 void sub_8084794(struct MapObject *var);
 void ScrSpecial_EndTrainerApproach(void);
-void sub_80847D8(u8);
-void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3);
-void objc_exclamation_mark_probably(struct Sprite *sprite);
 
 #endif // GUARD_TRAINER_SEE_H
diff --git a/ld_script.txt b/ld_script.txt
index a242fcd57..0bdec4f4a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -502,7 +502,6 @@ SECTIONS {
         src/engine/cable_club.o(.rodata);
         src/debug/mori_debug_menu.o(.rodata);
         src/field/trainer_see.o(.rodata);
-        data/trainer_see.o(.rodata);
         src/field/wild_encounter.o(.rodata);
         src/field/field_effect.o(.rodata);
         src/pokemon/pokemon_menu.o(.rodata);
diff --git a/src/field/trainer_see.c b/src/field/trainer_see.c
index 38bc6971c..4e92d95ca 100644
--- a/src/field/trainer_see.c
+++ b/src/field/trainer_see.c
@@ -9,14 +9,22 @@
 #include "task.h"
 #include "util.h"
 
+static bool8 CheckTrainer(u8);
+static void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3);
+static void objc_exclamation_mark_probably(struct Sprite *sprite);
+static bool8 TrainerCanApproachPlayer(struct MapObject *);
+static void sub_80842C8(struct MapObject *, u8);
+static bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 approachDistance, u8 direction);
+static void RunTrainerSeeFuncList(u8 taskId);
+
 const u8 gSpriteImage_839B308[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/0.4bpp");
 const u8 gSpriteImage_839B388[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/1.4bpp");
 const u8 gSpriteImage_839B408[] = INCBIN_U8("graphics/unknown_sprites/839B408.4bpp");
 
-u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
 
 static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *, s16, s16, s16) =
 {
@@ -26,9 +34,6 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *, s16,
     GetTrainerApproachDistanceEast,
 };
 
-extern struct SpriteTemplate gSpriteTemplate_839B510;
-extern struct SpriteTemplate gSpriteTemplate_839B528;
-
 bool8 CheckTrainers(void)
 {
     u8 mapObjId;
@@ -43,7 +48,7 @@ bool8 CheckTrainers(void)
     return FALSE;
 }
 
-bool8 CheckTrainer(u8 mapObjId)
+static bool8 CheckTrainer(u8 mapObjId)
 {
     u8 *scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(mapObjId);
 
@@ -69,7 +74,7 @@ bool8 CheckTrainer(u8 mapObjId)
     }
 }
 
-bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj)
+static bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj)
 {
     s16 x, y;
     u8 i;
@@ -94,7 +99,7 @@ bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj)
 }
 
 // Returns how far south the player is from trainer. 0 if out of trainer's sight.
-u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->coords2.x == x
      && y > trainerObj->coords2.y
@@ -105,7 +110,7 @@ u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16
 }
 
 // Returns how far north the player is from trainer. 0 if out of trainer's sight.
-u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->coords2.x == x
      && y < trainerObj->coords2.y
@@ -116,7 +121,7 @@ u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16
 }
 
 // Returns how far west the player is from trainer. 0 if out of trainer's sight.
-u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->coords2.y == y
      && x < trainerObj->coords2.x
@@ -127,7 +132,7 @@ u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x
 }
 
 // Returns how far east the player is from trainer. 0 if out of trainer's sight.
-u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->coords2.y == y
      && x > trainerObj->coords2.x
@@ -143,7 +148,7 @@ u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x
 #define COLLISION_MASK 1
 #endif
 
-bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 approachDistance, u8 direction)
+static bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 approachDistance, u8 direction)
 {
     s16 x, y;
     u8 unk19_temp;
@@ -183,7 +188,7 @@ bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject2 *trainerObj, u8 approac
 #define tTrainerObjHi   data[1]
 #define tTrainerObjLo   data[2]
 
-void sub_80842C8(struct MapObject *trainerObj, u8 b)
+static void sub_80842C8(struct MapObject *trainerObj, u8 b)
 {
     u8 taskId = CreateTask(RunTrainerSeeFuncList, 0x50);
     struct Task *task = &gTasks[taskId];
@@ -193,7 +198,7 @@ void sub_80842C8(struct MapObject *trainerObj, u8 b)
     task->data[3] = b;
 }
 
-void sub_80842FC(TaskFunc followupFunc)
+static void sub_80842FC(TaskFunc followupFunc)
 {
     TaskFunc taskFunc = RunTrainerSeeFuncList;
     u8 taskId = FindTaskIdByFunc(taskFunc);
@@ -232,7 +237,7 @@ static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct
     sub_80846C8,
 };
 
-void RunTrainerSeeFuncList(u8 taskId)
+static void RunTrainerSeeFuncList(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     struct MapObject *trainerObj = (struct MapObject *)((task->tTrainerObjHi << 16) | (task->tTrainerObjLo));
@@ -450,6 +455,41 @@ static void Task_DestroyTrainerApproachTask(u8 taskId)
     EnableBothScriptContexts();
 }
 
+static const struct OamData gOamData_839B4D8 = {
+    .size = 1, .priority = 1
+};
+
+static const struct SpriteFrameImage gSpriteImageTable_839B4E0[] = {
+    { gSpriteImage_839B308, sizeof gSpriteImage_839B308 },
+    { gSpriteImage_839B388, sizeof gSpriteImage_839B388 }
+};
+
+static const struct SpriteFrameImage gSpriteImageTable_839B4F0[] = {
+    { gSpriteImage_839B408, sizeof gSpriteImage_839B408 }
+};
+
+static const union AnimCmd gSpriteAnim_839B4F8[] = {
+    ANIMCMD_FRAME(0, 60),
+    ANIMCMD_END
+};
+
+static const union AnimCmd gSpriteAnim_839B500[] = {
+    ANIMCMD_FRAME(1, 60),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const gSpriteAnimTable_839B508[] = {
+    gSpriteAnim_839B4F8,
+    gSpriteAnim_839B500
+};
+
+static const struct SpriteTemplate gSpriteTemplate_839B510 = {
+    0xffff, 0xffff, &gOamData_839B4D8, gSpriteAnimTable_839B508, gSpriteImageTable_839B4E0, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
+};
+static const struct SpriteTemplate gSpriteTemplate_839B528 = {
+    0xffff, 4100, &gOamData_839B4D8, gSpriteAnimTable_839B508, gSpriteImageTable_839B4F0, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
+};
+
 u8 FldEff_ExclamationMarkIcon1(void)
 {
     u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_839B510, 0, 0, 0x53);
@@ -480,7 +520,7 @@ u8 FldEff_HeartIcon(void)
     return 0;
 }
 
-void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3)
+static void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3)
 {
     sprite->oam.priority = 1;
     sprite->coordOffsetEnabled = 1;
@@ -494,7 +534,7 @@ void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3)
     StartSpriteAnim(sprite, a3);
 }
 
-void objc_exclamation_mark_probably(struct Sprite *sprite)
+static void objc_exclamation_mark_probably(struct Sprite *sprite)
 {
     u8 mapObjId;