Decomp all trainer see funcs

2 files changed, 106 insertions, 99 deletions

diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h
index bf75a47cc..93640576a 100644
--- a/include/constants/event_object_movement.h
+++ b/include/constants/event_object_movement.h
@@ -146,100 +146,102 @@
 #define MOVEMENT_ACTION_JUMP_SPECIAL_UP                 0x3B
 #define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT               0x3C
 #define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT              0x3D
-#define MOVEMENT_ACTION_FACE_PLAYER                     0x3E
-#define MOVEMENT_ACTION_FACE_AWAY_PLAYER                0x3F
-#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION           0x40
-#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION         0x41
-#define MOVEMENT_ACTION_JUMP_DOWN                       0x42
-#define MOVEMENT_ACTION_JUMP_UP                         0x43
-#define MOVEMENT_ACTION_JUMP_LEFT                       0x44
-#define MOVEMENT_ACTION_JUMP_RIGHT                      0x45
-#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN              0x46
-#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP                0x47
-#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT              0x48
-#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT             0x49
-#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP           0x4A
-#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN           0x4B
-#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT        0x4C
-#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT        0x4D
-#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION         0x4E
-#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN              0x4F
-#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x50
-#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x51
-#define MOVEMENT_ACTION_DISABLE_ANIMATION               0x52
-#define MOVEMENT_ACTION_RESTORE_ANIMATION               0x53
-#define MOVEMENT_ACTION_SET_INVISIBLE                   0x54
-#define MOVEMENT_ACTION_SET_VISIBLE                     0x55
-#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK          0x56
-#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK             0x57
-#define MOVEMENT_ACTION_EMOTE_HEART                     0x58
-#define MOVEMENT_ACTION_REVEAL_TRAINER                  0x59
-#define MOVEMENT_ACTION_ROCK_SMASH_BREAK                0x5A
-#define MOVEMENT_ACTION_CUT_TREE                        0x5B
-#define MOVEMENT_ACTION_SET_FIXED_PRIORITY              0x5C
-#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY            0x5D
-#define MOVEMENT_ACTION_INIT_AFFINE_ANIM                0x5E
-#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM               0x5F
-#define MOVEMENT_ACTION_HIDE_REFLECTION                 0x60
-#define MOVEMENT_ACTION_SHOW_REFLECTION                 0x61
-#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE          0x62
-#define MOVEMENT_ACTION_WALK_DOWN_AFFINE                0x63
-#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN          0x64
-#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP            0x65
-#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT          0x66
-#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT         0x67
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN           0x68
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP             0x69
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT           0x6A
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT          0x6B
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN      0x6C
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP        0x6D
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT      0x6E
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT     0x6F
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN      0x70
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP        0x71
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT      0x72
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT     0x73
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN           0x74
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP             0x75
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT           0x76
-#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT          0x77
-#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN          0x78
-#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP            0x79
-#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT          0x7A
-#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT         0x7B
-#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN      0x7C
-#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP        0x7D
-#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT      0x7E
-#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT     0x7F
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN      0x80
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP        0x81
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT      0x82
-#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT     0x83
-#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN          0x84
-#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP            0x85
-#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT          0x86
-#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT         0x87
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN      0x88
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP        0x89
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT      0x8A
-#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT     0x8B
-#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT    0x8C
-#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT   0x8D
-#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT  0x8E
-#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x8F
-#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT      0x90
-#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT     0x91
-#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT    0x92
-#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT   0x93
-#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM             0x94
-#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM            0x95
-#define MOVEMENT_ACTION_WALK_LEFT_AFFINE                0x96
-#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE               0x97
-#define MOVEMENT_ACTION_LEVITATE                        0x98
-#define MOVEMENT_ACTION_STOP_LEVITATE                   0x99
-#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP    0x9A
-#define MOVEMENT_ACTION_FIGURE_8                        0x9B
+// Something else here maybe? idk
+#define MOVEMENT_ACTION_FACE_PLAYER                     0x4A
+#define MOVEMENT_ACTION_FACE_AWAY_PLAYER                0x4B
+#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION           0x4C
+#define MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION         0x4D
+#define MOVEMENT_ACTION_JUMP_DOWN                       0x4E
+#define MOVEMENT_ACTION_JUMP_UP                         0x4F
+#define MOVEMENT_ACTION_JUMP_LEFT                       0x50
+#define MOVEMENT_ACTION_JUMP_RIGHT                      0x51
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN              0x52
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP                0x53
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT              0x54
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT             0x55
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP           0x56
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN           0x57
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT        0x58
+#define MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT        0x59
+#define MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION         0x5A
+#define MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN              0x5B
+#define MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT 0x5C
+#define MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT 0x5D
+#define MOVEMENT_ACTION_DISABLE_ANIMATION               0x5E
+#define MOVEMENT_ACTION_RESTORE_ANIMATION               0x5F
+#define MOVEMENT_ACTION_SET_INVISIBLE                   0x60
+#define MOVEMENT_ACTION_SET_VISIBLE                     0x61
+#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK          0x62
+#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK             0x63
+#define MOVEMENT_ACTION_EMOTE_HEART                     0x64
+// more stuff here? idk
+#define MOVEMENT_ACTION_REVEAL_TRAINER                  0x67
+#define MOVEMENT_ACTION_ROCK_SMASH_BREAK                0x68
+#define MOVEMENT_ACTION_CUT_TREE                        0x69
+#define MOVEMENT_ACTION_SET_FIXED_PRIORITY              0x6A
+#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY            0x6B
+#define MOVEMENT_ACTION_INIT_AFFINE_ANIM                0x6C
+#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM               0x6D
+#define MOVEMENT_ACTION_HIDE_REFLECTION                 0x6E
+#define MOVEMENT_ACTION_SHOW_REFLECTION                 0x6F
+#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE          0x70
+#define MOVEMENT_ACTION_WALK_DOWN_AFFINE                0x71
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN          0x72
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP            0x73
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT          0x74
+#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT         0x75
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN           0x76
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP             0x77
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT           0x78
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT          0x79
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN      0x7A
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP        0x7B
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT      0x7C
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT     0x7D
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN      0x7E
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP        0x7F
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT      0x80
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT     0x81
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN           0x82
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP             0x83
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT           0x84
+#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT          0x85
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN          0x86
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP            0x87
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT          0x88
+#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT         0x89
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN      0x8A
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP        0x8B
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT      0x8C
+#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT     0x8D
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN      0x8E
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP        0x8F
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT      0x90
+#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT     0x91
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN          0x92
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP            0x93
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT          0x94
+#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT         0x95
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN      0x96
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP        0x97
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT      0x98
+#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT     0x99
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT    0x9A
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT   0x9B
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT  0x9C
+#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x9D
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT      0x9E
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT     0x9F
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT    0xA0
+#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT   0xA1
+#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM             0xA2
+#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM            0xA3
+#define MOVEMENT_ACTION_WALK_LEFT_AFFINE                0xA4
+#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE               0xA5
+#define MOVEMENT_ACTION_LEVITATE                        0xA6
+#define MOVEMENT_ACTION_STOP_LEVITATE                   0xA7
+#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP    0xA8
+#define MOVEMENT_ACTION_FIGURE_8                        0xA9
 
 // These two are verified correct in FRLG
 #define MOVEMENT_ACTION_FLY_UP                          0xA4
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index b5acd4bbb..29f7ff3d7 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -48,7 +48,7 @@ void SpawnObjectEventsInView(s16, s16);
 u8 sprite_new(u8, u8, s16, s16, u8, u8);
 u8 AddPseudoObjectEvent(u16, SpriteCallback, s16, s16, u8);
 u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup);
-u8 SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
+int SpawnSpecialObjectEventParameterized(u8, u8, u8, s16, s16, u8);
 u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *);
 void sub_8093038(s16, s16, s16 *, s16 *);
 void CameraObjectReset1(void);
@@ -65,7 +65,7 @@ void sub_808E82C(u8, u8, u8, s16, s16);
 void sub_805F400(u8, u8, u8);
 void sub_805F3A8(u8, u8, u8, u8);
 void sub_808E75C(s16, s16);
-void ObjectEventGetLocalIdAndMap(struct ObjectEvent *, u8 *, u8 *, u8 *);
+void ObjectEventGetLocalIdAndMap(struct ObjectEvent * objectEvent, u8 *localId, u8 *mapNum, u8 *mapGroup);
 void npc_coords_shift(struct ObjectEvent *, s16, s16);
 void sub_808EB08(struct ObjectEvent *, s16, s16);
 void sub_805FE94(u8, u8, u8);
@@ -84,7 +84,7 @@ u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z);
 void sub_8063E28(struct ObjectEvent *, struct Sprite *);
 bool8 ObjectEventSetHeldMovement(struct ObjectEvent *, u8);
 void npc_coords_shift_still(struct ObjectEvent *);
-void sub_805FE7C(struct ObjectEvent *, u8);
+void TryOverrideTemplateCoordsForObjectEvent(struct ObjectEvent *, u8);
 void SetTrainerMovementType(struct ObjectEvent *, u8);
 u8 sub_80634F0(u8 direction);
 u8 sub_8063500(u8 a0);
@@ -93,14 +93,19 @@ u8 sub_805EB44(u8, u8, s16, s16);
 void npc_paltag_set_load(u8 mode);
 bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent);
 u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent);
-u8 sub_8063F84(u8 direction);
+u8 GetWalkNormalMovementAction(u8 direction);
 u8 GetTrainerFacingDirectionMovementType(u8 direction);
 void CameraObjectSetFollowedObjectId(u8 spriteId);
 void UnfreezeObjectEvents(void);
 void TurnObjectEvent(u8, u8);
 const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId);
-u8 sub_805DF30(void);
+u8 GetIndexOfFirstInactiveObjectEvent(void);
 u8 GetCollisionFlagsAtCoords(struct ObjectEvent * objectEvent, s16 x, s16 y, u8 direction);
+u8 GetFaceDirectionMovementAction(u8 direction);
+u8 GetJumpInPlaceMovementAction(u8 direction);
+u8 sub_8063FB0(u8 direction);
+void OverrideTemplateCoordsForObjectEvent(struct ObjectEvent *);
+void sub_805C774(void);
 
 // Exported data declarations