summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/event_object_movement.s108
-rw-r--r--asm/field_effect.s14
-rw-r--r--asm/field_player_avatar.s16
-rw-r--r--asm/overworld.s2
-rw-r--r--asm/trainer_see.s774
-rw-r--r--data/trainer_see.s17
-rw-r--r--include/constants/event_object_movement.h190
-rw-r--r--include/event_object_movement.h15
-rw-r--r--src/field_fadetransition.c2
-rw-r--r--src/field_specials.c3
-rw-r--r--src/trainer_see.c355
-rw-r--r--src/vs_seeker.c4
12 files changed, 521 insertions, 979 deletions
diff --git a/asm/event_object_movement.s b/asm/event_object_movement.s
index 49724f61d..3bd824767 100644
--- a/asm/event_object_movement.s
+++ b/asm/event_object_movement.s
@@ -137,8 +137,8 @@ _0805DF28: .4byte gFieldEffectObjectTemplatePointers
_0805DF2C: .4byte gSprites
thumb_func_end sub_805DE8C
- thumb_func_start sub_805DF30
-sub_805DF30: @ 805DF30
+ thumb_func_start GetIndexOfFirstInactiveObjectEvent
+GetIndexOfFirstInactiveObjectEvent: @ 805DF30
push {lr}
movs r1, 0
ldr r2, _0805DF3C @ =gObjectEvents
@@ -165,7 +165,7 @@ _0805DF5A:
adds r0, r1, 0
pop {r1}
bx r1
- thumb_func_end sub_805DF30
+ thumb_func_end GetIndexOfFirstInactiveObjectEvent
thumb_func_start GetObjectEventIdByLocalIdAndMap
GetObjectEventIdByLocalIdAndMap: @ 805DF60
@@ -4408,8 +4408,8 @@ _0805FE52:
bx r1
thumb_func_end sub_805FDE8
- thumb_func_start sub_805FE5C
-sub_805FE5C: @ 805FE5C
+ thumb_func_start OverrideTemplateCoordsForObjectEvent
+OverrideTemplateCoordsForObjectEvent: @ 805FE5C
push {r4,lr}
adds r4, r0, 0
bl sub_805FDE8
@@ -4426,10 +4426,10 @@ _0805FE76:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805FE5C
+ thumb_func_end OverrideTemplateCoordsForObjectEvent
- thumb_func_start sub_805FE7C
-sub_805FE7C: @ 805FE7C
+ thumb_func_start TryOverrideTemplateCoordsForObjectEvent
+TryOverrideTemplateCoordsForObjectEvent: @ 805FE7C
push {r4,lr}
lsls r1, 24
lsrs r4, r1, 24
@@ -4441,7 +4441,7 @@ _0805FE8C:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805FE7C
+ thumb_func_end TryOverrideTemplateCoordsForObjectEvent
thumb_func_start sub_805FE94
sub_805FE94: @ 805FE94
@@ -4465,7 +4465,7 @@ sub_805FE94: @ 805FE94
lsls r0, 2
ldr r1, _0805FEC8 @ =gObjectEvents
adds r0, r1
- bl sub_805FE5C
+ bl OverrideTemplateCoordsForObjectEvent
_0805FEC2:
add sp, 0x4
pop {r0}
@@ -4717,7 +4717,7 @@ sub_8060078: @ 8060078
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -4831,7 +4831,7 @@ sub_806014C: @ 806014C
adds r5, r1, 0
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8063F84
+ bl GetWalkNormalMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -5487,7 +5487,7 @@ sub_80605E4: @ 80605E4
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -5660,7 +5660,7 @@ sub_8060724: @ 8060724
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -5774,7 +5774,7 @@ sub_80607F8: @ 80607F8
adds r5, r1, 0
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8063F84
+ bl GetWalkNormalMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -5875,7 +5875,7 @@ sub_80608A8: @ 80608A8
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -5989,7 +5989,7 @@ sub_806097C: @ 806097C
adds r5, r1, 0
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8063F84
+ bl GetWalkNormalMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -6079,7 +6079,7 @@ sub_8060A18: @ 8060A18
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -6183,7 +6183,7 @@ sub_8060ACC: @ 8060ACC
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -6356,7 +6356,7 @@ sub_8060C0C: @ 8060C0C
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -6529,7 +6529,7 @@ sub_8060D4C: @ 8060D4C
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -6702,7 +6702,7 @@ sub_8060E8C: @ 8060E8C
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -6875,7 +6875,7 @@ sub_8060FCC: @ 8060FCC
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -7048,7 +7048,7 @@ sub_806110C: @ 806110C
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -7221,7 +7221,7 @@ sub_806124C: @ 806124C
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -7394,7 +7394,7 @@ sub_806138C: @ 806138C
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -7567,7 +7567,7 @@ sub_80614CC: @ 80614CC
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -7740,7 +7740,7 @@ sub_806160C: @ 806160C
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -7902,7 +7902,7 @@ sub_8061738: @ 8061738
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -8045,7 +8045,7 @@ sub_806183C: @ 806183C
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -8255,7 +8255,7 @@ _080619BC:
lsrs r5, r0, 24
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8063F84
+ bl GetWalkNormalMovementAction
lsls r0, 24
lsrs r6, r0, 24
cmp r5, 0x1
@@ -8275,7 +8275,7 @@ _080619BC:
bl ObjectEventSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8063F84
+ bl GetWalkNormalMovementAction
lsls r0, 24
lsrs r6, r0, 24
ldrb r1, [r4, 0x18]
@@ -8374,7 +8374,7 @@ _08061AA2:
bl ObjectEventSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8063F84
+ bl GetWalkNormalMovementAction
lsls r0, 24
lsrs r6, r0, 24
ldrb r1, [r4, 0x18]
@@ -8395,7 +8395,7 @@ _08061AA2:
bl ObjectEventSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8063F84
+ bl GetWalkNormalMovementAction
lsls r0, 24
lsrs r6, r0, 24
ldrb r1, [r4, 0x18]
@@ -10457,7 +10457,7 @@ sub_8062970: @ 8062970
adds r1, 0x21
ldrb r1, [r1]
bl state_to_direction
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -10507,7 +10507,7 @@ sub_80629B8: @ 80629B8
adds r3, r5, 0
bl ObjectEventMoveDestCoords
adds r0, r6, 0
- bl sub_8063F84
+ bl GetWalkNormalMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -10542,7 +10542,7 @@ sub_80629B8: @ 80629B8
bne _08062A52
_08062A3E:
adds r0, r6, 0
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -10631,7 +10631,7 @@ sub_8062A70: @ 8062A70
bne _08062B0A
_08062AF6:
adds r0, r6, 0
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -10720,7 +10720,7 @@ sub_8062B28: @ 8062B28
bne _08062BC2
_08062BAE:
adds r0, r6, 0
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -10809,7 +10809,7 @@ sub_8062BE0: @ 8062BE0
bne _08062C7A
_08062C66:
adds r0, r6, 0
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -10849,7 +10849,7 @@ cph_IM_DIFFERENT: @ 8062C98
adds r1, 0x21
ldrb r1, [r1]
bl state_to_direction
- bl sub_806413C
+ bl GetJumpInPlaceMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -10934,7 +10934,7 @@ sub_8062CE0: @ 8062CE0
bne _08062D7A
_08062D66:
adds r0, r6, 0
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -11030,7 +11030,7 @@ oac_hopping: @ 8062D98
bne _08062E40
_08062E2C:
adds r0, r6, 0
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -11599,7 +11599,7 @@ sub_8063234: @ 8063234
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -13416,8 +13416,8 @@ _08063E88:
bx r0
thumb_func_end sub_8063E28
- thumb_func_start sub_8063EB8
-sub_8063EB8: @ 8063EB8
+ thumb_func_start GetFaceDirectionMovementAction
+GetFaceDirectionMovementAction: @ 8063EB8
push {r4,lr}
sub sp, 0x8
lsls r0, 24
@@ -13439,7 +13439,7 @@ _08063ED0:
bx r1
.align 2, 0
_08063EE0: .4byte gUnknown_83A64EC
- thumb_func_end sub_8063EB8
+ thumb_func_end GetFaceDirectionMovementAction
thumb_func_start sub_8063EE4
sub_8063EE4: @ 8063EE4
@@ -13534,8 +13534,8 @@ _08063F70:
_08063F80: .4byte gUnknown_83A6500
thumb_func_end sub_8063F58
- thumb_func_start sub_8063F84
-sub_8063F84: @ 8063F84
+ thumb_func_start GetWalkNormalMovementAction
+GetWalkNormalMovementAction: @ 8063F84
push {r4,lr}
sub sp, 0x8
lsls r0, 24
@@ -13557,7 +13557,7 @@ _08063F9C:
bx r1
.align 2, 0
_08063FAC: .4byte gUnknown_83A6505
- thumb_func_end sub_8063F84
+ thumb_func_end GetWalkNormalMovementAction
thumb_func_start sub_8063FB0
sub_8063FB0: @ 8063FB0
@@ -13784,8 +13784,8 @@ _08064128:
_08064138: .4byte gUnknown_83A6532
thumb_func_end GetJumpLedgeAnimId
- thumb_func_start sub_806413C
-sub_806413C: @ 806413C
+ thumb_func_start GetJumpInPlaceMovementAction
+GetJumpInPlaceMovementAction: @ 806413C
push {r4,lr}
sub sp, 0x8
lsls r0, 24
@@ -13807,7 +13807,7 @@ _08064154:
bx r1
.align 2, 0
_08064164: .4byte gUnknown_83A6537
- thumb_func_end sub_806413C
+ thumb_func_end GetJumpInPlaceMovementAction
thumb_func_start sub_8064168
sub_8064168: @ 8064168
@@ -14018,7 +14018,7 @@ ObjectEventFaceOppositeDirection: @ 80642C8
bl GetOppositeDirection
lsls r0, 24
lsrs r0, 24
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 462182563..e93220c19 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -2238,7 +2238,7 @@ sub_80844BC: @ 80844BC
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2666,7 +2666,7 @@ _0808484A:
bl GetPlayerFacingDirection
lsls r0, 24
lsrs r0, 24
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2947,7 +2947,7 @@ sub_8084A5C: @ 8084A5C
ldr r0, _08084AC0 @ =gObjectEvents
adds r4, r0
movs r0, 0x4
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3200,7 +3200,7 @@ sub_8084C3C: @ 8084C3C
bl ScriptContext2_Disable
bl UnfreezeObjectEvents
movs r0, 0x4
- bl sub_8063F84
+ bl GetWalkNormalMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4668,7 +4668,7 @@ _0808579E:
lsrs r0, 28
adds r0, r7
ldrb r0, [r0]
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7194,7 +7194,7 @@ sub_8086B30: @ 8086B30
strb r0, [r5]
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7380,7 +7380,7 @@ _08086CD2:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index 7a2c5cbc5..09aeeabea 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -1840,7 +1840,7 @@ sub_805C104: @ 805C104
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8063F84
+ bl GetWalkNormalMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
@@ -1976,7 +1976,7 @@ PlayerFaceDirection: @ 805C1F4
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -2065,7 +2065,7 @@ _0805C27E:
ldrb r0, [r0, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
lsls r0, 24
lsrs r0, 24
bl sub_805BFFC
@@ -3713,7 +3713,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_806413C
+ bl GetJumpInPlaceMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3846,7 +3846,7 @@ sub_805CFEC: @ 805CFEC
add r0, sp
ldrb r6, [r0]
adds r0, r6, 0
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4138,7 +4138,7 @@ sub_805D240: @ 805D240
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5450,7 +5450,7 @@ _0805DC9A:
ldrsh r0, [r5, r3]
adds r0, r1
ldrb r0, [r0]
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5618,7 +5618,7 @@ _0805DDE4:
lsrs r0, 28
adds r0, r4
ldrb r0, [r0]
- bl sub_8063EB8
+ bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
diff --git a/asm/overworld.s b/asm/overworld.s
index 5b3c01652..6de308f40 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -7190,7 +7190,7 @@ SpawnLinkPlayerObjectEvent: @ 805839C
lsls r2, 24
lsrs r2, 24
mov r8, r2
- bl sub_805DF30
+ bl GetIndexOfFirstInactiveObjectEvent
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
diff --git a/asm/trainer_see.s b/asm/trainer_see.s
index 11c4fcbcb..e56433bd5 100644
--- a/asm/trainer_see.s
+++ b/asm/trainer_see.s
@@ -5,778 +5,6 @@
.text
- thumb_func_start sub_8081E68
-sub_8081E68: @ 8081E68
- push {r4,r5,lr}
- adds r5, r0, 0
- lsls r4, r1, 24
- lsrs r4, 24
- ldr r0, _08081E94 @ =RunTrainerSeeFuncList
- movs r1, 0x50
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- ldr r0, _08081E98 @ =gTasks
- adds r1, r0
- lsrs r0, r5, 16
- strh r0, [r1, 0xA]
- strh r5, [r1, 0xC]
- strh r4, [r1, 0xE]
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08081E94: .4byte RunTrainerSeeFuncList
-_08081E98: .4byte gTasks
- thumb_func_end sub_8081E68
-
- thumb_func_start sub_8081E9C
-sub_8081E9C: @ 8081E9C
- push {r4-r6,lr}
- adds r6, r0, 0
- ldr r5, _08081ED4 @ =RunTrainerSeeFuncList
- adds r0, r5, 0
- bl FindTaskIdByFunc
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- adds r0, r4, 0
- adds r1, r5, 0
- adds r2, r6, 0
- bl SetTaskFuncWithFollowupFunc
- ldr r1, _08081ED8 @ =gTasks
- lsls r0, r4, 2
- adds r0, r4
- lsls r0, 3
- adds r0, r1
- movs r1, 0x1
- strh r1, [r0, 0x8]
- adds r0, r4, 0
- bl _call_via_r5
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08081ED4: .4byte RunTrainerSeeFuncList
-_08081ED8: .4byte gTasks
- thumb_func_end sub_8081E9C
-
- thumb_func_start RunTrainerSeeFuncList
-RunTrainerSeeFuncList: @ 8081EDC
- push {r4-r7,lr}
- lsls r0, 24
- lsrs r6, r0, 24
- lsls r0, r6, 2
- adds r0, r6
- lsls r0, 3
- ldr r1, _08081F08 @ =gTasks
- adds r5, r0, r1
- movs r1, 0xA
- ldrsh r0, [r5, r1]
- lsls r4, r0, 16
- ldrh r0, [r5, 0xC]
- orrs r4, r0
- ldrb r0, [r4]
- lsls r0, 31
- cmp r0, 0
- bne _08081F0C
- adds r0, r6, 0
- bl SwitchTaskToFollowupFunc
- b _08081F28
- .align 2, 0
-_08081F08: .4byte gTasks
-_08081F0C:
- ldr r7, _08081F30 @ =gUnknown_83C7258
-_08081F0E:
- movs r1, 0x8
- ldrsh r0, [r5, r1]
- lsls r0, 2
- adds r0, r7
- ldr r3, [r0]
- adds r0, r6, 0
- adds r1, r5, 0
- adds r2, r4, 0
- bl _call_via_r3
- lsls r0, 24
- cmp r0, 0
- bne _08081F0E
-_08081F28:
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08081F30: .4byte gUnknown_83C7258
- thumb_func_end RunTrainerSeeFuncList
-
- thumb_func_start sub_8081F34
-sub_8081F34: @ 8081F34
- movs r0, 0
- bx lr
- thumb_func_end sub_8081F34
-
- thumb_func_start sub_8081F38
-sub_8081F38: @ 8081F38
- push {r4,r5,lr}
- adds r5, r1, 0
- adds r4, r2, 0
- ldrb r1, [r4, 0x18]
- movs r0, 0xF
- ands r0, r1
- cmp r0, 0x1
- bne _08081F54
- movs r1, 0xE
- ldrsh r0, [r5, r1]
- cmp r0, 0x2
- ble _08081F54
- movs r0, 0xC
- b _08081F82
-_08081F54:
- ldr r1, _08081F8C @ =gFieldEffectArguments
- adds r2, r1, 0x4
- adds r3, r1, 0
- adds r3, 0x8
- adds r0, r4, 0
- bl ObjectEventGetLocalIdAndMap
- movs r0, 0
- bl FieldEffectStart
- ldrb r0, [r4, 0x18]
- lsls r0, 28
- lsrs r0, 28
- bl sub_8063EB8
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- adds r0, r4, 0
- bl ObjectEventSetHeldMovement
- ldrh r0, [r5, 0x8]
- adds r0, 0x1
-_08081F82:
- strh r0, [r5, 0x8]
- movs r0, 0x1
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_08081F8C: .4byte gFieldEffectArguments
- thumb_func_end sub_8081F38
-
- thumb_func_start sub_8081F90
-sub_8081F90: @ 8081F90
- push {r4,r5,lr}
- adds r4, r1, 0
- adds r5, r2, 0
- movs r0, 0
- bl FieldEffectActiveListContains
- lsls r0, 24
- cmp r0, 0
- beq _08081FA6
- movs r0, 0
- b _08081FC8
-_08081FA6:
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- ldrb r0, [r5, 0x6]
- subs r0, 0x39
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- bhi _08081FBC
- movs r0, 0x6
- strh r0, [r4, 0x8]
-_08081FBC:
- ldrb r0, [r5, 0x6]
- cmp r0, 0x3F
- bne _08081FC6
- movs r0, 0x8
- strh r0, [r4, 0x8]
-_08081FC6:
- movs r0, 0x1
-_08081FC8:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_8081F90
-
- thumb_func_start sub_8081FD0
-sub_8081FD0: @ 8081FD0
- push {r4,r5,lr}
- adds r5, r1, 0
- adds r4, r2, 0
- adds r0, r4, 0
- bl ObjectEventIsMovementOverridden
- lsls r0, 24
- cmp r0, 0
- beq _08081FEE
- adds r0, r4, 0
- bl ObjectEventClearHeldMovementIfFinished
- lsls r0, 24
- cmp r0, 0
- beq _08082022
-_08081FEE:
- movs r1, 0xE
- ldrsh r0, [r5, r1]
- cmp r0, 0
- beq _08082014
- ldrb r0, [r4, 0x18]
- lsls r0, 28
- lsrs r0, 28
- bl sub_8063F84
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- adds r0, r4, 0
- bl ObjectEventSetHeldMovement
- ldrh r0, [r5, 0xE]
- subs r0, 0x1
- strh r0, [r5, 0xE]
- b _08082022
-_08082014:
- adds r0, r4, 0
- movs r1, 0x4A
- bl ObjectEventSetHeldMovement
- ldrh r0, [r5, 0x8]
- adds r0, 0x1
- strh r0, [r5, 0x8]
-_08082022:
- movs r0, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_8081FD0
-
- thumb_func_start sub_808202C
-sub_808202C: @ 808202C
- push {r4,r5,lr}
- adds r5, r1, 0
- adds r4, r2, 0
- adds r0, r4, 0
- bl ObjectEventIsMovementOverridden
- lsls r0, 24
- cmp r0, 0
- beq _0808204A
- adds r0, r4, 0
- bl ObjectEventClearHeldMovementIfFinished
- lsls r0, 24
- cmp r0, 0
- beq _080820AC
-_0808204A:
- ldrb r0, [r4, 0x18]
- lsls r0, 28
- lsrs r0, 28
- bl GetTrainerFacingDirectionMovementType
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- adds r0, r4, 0
- bl SetTrainerMovementType
- ldrb r0, [r4, 0x18]
- lsls r0, 28
- lsrs r0, 28
- bl GetTrainerFacingDirectionMovementType
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- adds r0, r4, 0
- bl sub_805FE7C
- adds r0, r4, 0
- bl sub_805FE5C
- ldr r0, _080820B4 @ =gPlayerAvatar
- ldrb r1, [r0, 0x5]
- lsls r0, r1, 3
- adds r0, r1
- lsls r0, 2
- ldr r1, _080820B8 @ =gObjectEvents
- adds r4, r0, r1
- adds r0, r4, 0
- bl ObjectEventIsMovementOverridden
- lsls r0, 24
- cmp r0, 0
- beq _080820A2
- adds r0, r4, 0
- bl ObjectEventClearHeldMovementIfFinished
- lsls r0, 24
- cmp r0, 0
- beq _080820AC
-_080820A2:
- bl sub_805C774
- ldrh r0, [r5, 0x8]
- adds r0, 0x1
- strh r0, [r5, 0x8]
-_080820AC:
- movs r0, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_080820B4: .4byte gPlayerAvatar
-_080820B8: .4byte gObjectEvents
- thumb_func_end sub_808202C
-
- thumb_func_start sub_80820BC
-sub_80820BC: @ 80820BC
- push {r4,r5,lr}
- lsls r0, 24
- lsrs r5, r0, 24
- ldr r0, _080820F8 @ =gPlayerAvatar
- ldrb r1, [r0, 0x5]
- lsls r0, r1, 3
- adds r0, r1
- lsls r0, 2
- ldr r1, _080820FC @ =gObjectEvents
- adds r4, r0, r1
- adds r0, r4, 0
- bl ObjectEventIsMovementOverridden
- lsls r0, 24
- cmp r0, 0
- beq _080820E8
- adds r0, r4, 0
- bl ObjectEventClearHeldMovementIfFinished
- lsls r0, 24
- cmp r0, 0
- beq _080820EE
-_080820E8:
- adds r0, r5, 0
- bl SwitchTaskToFollowupFunc
-_080820EE:
- movs r0, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_080820F8: .4byte gPlayerAvatar
-_080820FC: .4byte gObjectEvents
- thumb_func_end sub_80820BC
-
- thumb_func_start sub_8082100
-sub_8082100: @ 8082100
- push {r4,r5,lr}
- adds r5, r1, 0
- adds r4, r2, 0
- adds r0, r4, 0
- bl ObjectEventIsMovementOverridden
- lsls r0, 24
- cmp r0, 0
- beq _0808211E
- adds r0, r4, 0
- bl ObjectEventClearHeldMovementIfFinished
- lsls r0, 24
- cmp r0, 0
- beq _0808212C
-_0808211E:
- adds r0, r4, 0
- movs r1, 0x67
- bl ObjectEventSetHeldMovement
- ldrh r0, [r5, 0x8]
- adds r0, 0x1
- strh r0, [r5, 0x8]
-_0808212C:
- movs r0, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_8082100
-
- thumb_func_start sub_8082134
-sub_8082134: @ 8082134
- push {r4,lr}
- adds r4, r1, 0
- adds r0, r2, 0
- bl ObjectEventClearHeldMovementIfFinished
- lsls r0, 24
- cmp r0, 0
- beq _08082148
- movs r0, 0x3
- strh r0, [r4, 0x8]
-_08082148:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8082134
-
- thumb_func_start sub_8082150
-sub_8082150: @ 8082150
- push {r4,r5,lr}
- adds r5, r1, 0
- adds r4, r2, 0
- adds r0, r4, 0
- bl ObjectEventIsMovementOverridden
- lsls r0, 24
- cmp r0, 0
- beq _0808216E
- adds r0, r4, 0
- bl ObjectEventClearHeldMovementIfFinished
- lsls r0, 24
- cmp r0, 0
- beq _0808217C
-_0808216E:
- adds r0, r4, 0
- movs r1, 0x4A
- bl ObjectEventSetHeldMovement
- ldrh r0, [r5, 0x8]
- adds r0, 0x1
- strh r0, [r5, 0x8]
-_0808217C:
- movs r0, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_8082150
-
- thumb_func_start sub_8082184
-sub_8082184: @ 8082184
- push {r4,r5,lr}
- adds r5, r1, 0
- adds r4, r2, 0
- adds r0, r4, 0
- bl ObjectEventCheckHeldMovementStatus
- lsls r0, 24
- cmp r0, 0
- beq _080821CA
- ldr r2, _080821D4 @ =gFieldEffectArguments
- movs r1, 0x10
- ldrsh r0, [r4, r1]
- str r0, [r2]
- movs r1, 0x12
- ldrsh r0, [r4, r1]
- str r0, [r2, 0x4]
- ldr r3, _080821D8 @ =gSprites
- ldrb r1, [r4, 0x4]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r3
- adds r0, 0x43
- ldrb r0, [r0]
- subs r0, 0x1
- str r0, [r2, 0x8]
- movs r0, 0x2
- str r0, [r2, 0xC]
- movs r0, 0x31
- bl FieldEffectStart
- strh r0, [r5, 0x10]
- ldrh r0, [r5, 0x8]
- adds r0, 0x1
- strh r0, [r5, 0x8]
-_080821CA:
- movs r0, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_080821D4: .4byte gFieldEffectArguments
-_080821D8: .4byte gSprites
- thumb_func_end sub_8082184
-
- thumb_func_start sub_80821DC
-sub_80821DC: @ 80821DC
- push {r4,r5,lr}
- adds r5, r1, 0
- adds r4, r2, 0
- ldr r2, _0808224C @ =gSprites
- movs r1, 0x10
- ldrsh r0, [r5, r1]
- lsls r1, r0, 4
- adds r1, r0
- lsls r1, 2
- adds r1, r2
- adds r1, 0x2B
- ldrb r0, [r1]
- cmp r0, 0x2
- bne _08082244
- ldrb r1, [r4, 0x3]
- movs r0, 0x5
- negs r0, r0
- ands r0, r1
- strb r0, [r4, 0x3]
- ldrb r0, [r4]
- movs r1, 0x4
- orrs r0, r1
- strb r0, [r4]
- ldrb r1, [r4, 0x4]
- lsls r0, r1, 4
- adds r0, r1
- lsls r0, 2
- adds r0, r2
- ldrb r2, [r0, 0x5]
- movs r1, 0xD
- negs r1, r1
- ands r1, r2
- movs r2, 0x8
- orrs r1, r2
- strb r1, [r0, 0x5]
- adds r0, r4, 0
- bl ObjectEventClearHeldMovementIfFinished
- ldrb r0, [r4, 0x18]
- lsls r0, 28
- lsrs r0, 28
- bl sub_806413C
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- adds r0, r4, 0
- bl ObjectEventSetHeldMovement
- ldrh r0, [r5, 0x8]
- adds r0, 0x1
- strh r0, [r5, 0x8]
-_08082244:
- movs r0, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_0808224C: .4byte gSprites
- thumb_func_end sub_80821DC
-
- thumb_func_start sub_8082250
-sub_8082250: @ 8082250
- push {r4,lr}
- adds r4, r1, 0
- movs r0, 0x31
- bl FieldEffectActiveListContains
- lsls r0, 24
- cmp r0, 0
- bne _08082264
- movs r0, 0x3
- strh r0, [r4, 0x8]
-_08082264:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8082250
-
- thumb_func_start sub_808226C
-sub_808226C: @ 808226C
- push {r4,lr}
- sub sp, 0x8
- adds r4, r1, 0
- movs r0, 0
- strh r0, [r4, 0x12]
- ldr r0, _080822C4 @ =gSaveBlock1Ptr
- ldr r0, [r0]
- ldrh r3, [r0]
- adds r3, 0x7
- lsls r3, 16
- asrs r3, 16
- ldrh r0, [r0, 0x2]
- adds r0, 0x7
- lsls r0, 16
- asrs r0, 16
- str r0, [sp]
- movs r0, 0x3
- str r0, [sp, 0x4]
- movs r0, 0x12
- movs r1, 0x7
- movs r2, 0x7F
- bl SpawnSpecialObjectEventParameterized
- ldr r2, _080822C8 @ =gObjectEvents
- lsls r1, r0, 3
- adds r1, r0
- lsls r1, 2
- adds r1, r2
- ldrb r0, [r1, 0x1]
- movs r2, 0x20
- orrs r0, r2
- strb r0, [r1, 0x1]
- ldrb r0, [r1, 0x4]
- bl CameraObjectSetFollowedObjectId
- ldrh r0, [r4, 0x8]
- adds r0, 0x1
- strh r0, [r4, 0x8]
- movs r0, 0
- add sp, 0x8
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_080822C4: .4byte gSaveBlock1Ptr
-_080822C8: .4byte gObjectEvents
- thumb_func_end sub_808226C
-
- thumb_func_start sub_80822CC
-sub_80822CC: @ 80822CC
- push {r4-r6,lr}
- sub sp, 0x4
- adds r5, r1, 0
- adds r6, r2, 0
- ldr r0, _08082348 @ =gSaveBlock1Ptr
- ldr r0, [r0]
- ldrb r1, [r0, 0x5]
- ldrb r2, [r0, 0x4]
- movs r0, 0x7F
- mov r3, sp
- bl TryGetObjectEventIdByLocalIdAndMap
- mov r0, sp
- ldrb r1, [r0]
- lsls r0, r1, 3
- adds r0, r1
- lsls r0, 2
- ldr r4, _0808234C @ =gObjectEvents
- adds r0, r4
- bl ObjectEventIsMovementOverridden
- lsls r0, 24
- cmp r0, 0
- beq _08082312
- mov r0, sp
- ldrb r1, [r0]
- lsls r0, r1, 3
- adds r0, r1
- lsls r0, 2
- adds r0, r4
- bl ObjectEventClearHeldMovementIfFinished
- lsls r0, 24
- cmp r0, 0
- beq _0808236E
-_08082312:
- movs r0, 0x12
- ldrsh r1, [r5, r0]
- movs r2, 0xE
- ldrsh r0, [r5, r2]
- subs r0, 0x1
- cmp r1, r0
- beq _08082350
- mov r0, sp
- ldrb r0, [r0]
- lsls r4, r0, 3
- adds r4, r0
- lsls r4, 2
- ldr r0, _0808234C @ =gObjectEvents
- adds r4, r0
- movs r0, 0x2
- bl sub_8063FB0
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- adds r0, r4, 0
- bl ObjectEventSetHeldMovement
- ldrh r0, [r5, 0x12]
- adds r0, 0x1
- strh r0, [r5, 0x12]
- b _0808236E
- .align 2, 0
-_08082348: .4byte gSaveBlock1Ptr
-_0808234C: .4byte gObjectEvents
-_08082350:
- ldr r1, _08082378 @ =gFieldEffectArguments
- adds r2, r1, 0x4
- adds r3, r1, 0
- adds r3, 0x8
- adds r0, r6, 0
- bl ObjectEventGetLocalIdAndMap
- movs r0, 0
- bl FieldEffectStart
- movs r0, 0
- strh r0, [r5, 0x12]
- ldrh r0, [r5, 0x8]
- adds r0, 0x1
- strh r0, [r5, 0x8]
-_0808236E:
- movs r0, 0
- add sp, 0x4
- pop {r4-r6}
- pop {r1}
- bx r1
- .align 2, 0
-_08082378: .4byte gFieldEffectArguments
- thumb_func_end sub_80822CC
-
- thumb_func_start sub_808237C
-sub_808237C: @ 808237C
- push {r4,r5,lr}
- sub sp, 0x4
- adds r5, r1, 0
- ldr r0, _08082404 @ =gSaveBlock1Ptr
- ldr r0, [r0]
- ldrb r1, [r0, 0x5]
- ldrb r2, [r0, 0x4]
- movs r0, 0x7F
- mov r3, sp
- bl TryGetObjectEventIdByLocalIdAndMap
- movs r0, 0
- bl FieldEffectActiveListContains
- lsls r0, 24
- cmp r0, 0
- bne _0808242E
- mov r0, sp
- ldrb r1, [r0]
- lsls r0, r1, 3
- adds r0, r1
- lsls r0, 2
- ldr r4, _08082408 @ =gObjectEvents
- adds r0, r4
- bl ObjectEventIsMovementOverridden
- lsls r0, 24
- cmp r0, 0
- beq _080823CC
- mov r0, sp
- ldrb r1, [r0]
- lsls r0, r1, 3
- adds r0, r1
- lsls r0, 2
- adds r0, r4
- bl ObjectEventClearHeldMovementIfFinished
- lsls r0, 24
- cmp r0, 0
- beq _0808242E
-_080823CC:
- movs r0, 0x12
- ldrsh r1, [r5, r0]
- movs r2, 0xE
- ldrsh r0, [r5, r2]
- subs r0, 0x1
- cmp r1, r0
- beq _0808240C
- mov r0, sp
- ldrb r0, [r0]
- lsls r4, r0, 3
- adds r4, r0
- lsls r4, 2
- ldr r0, _08082408 @ =gObjectEvents
- adds r4, r0
- movs r0, 0x1
- bl sub_8063FB0
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- adds r0, r4, 0
- bl ObjectEventSetHeldMovement
- ldrh r0, [r5, 0x12]
- adds r0, 0x1
- strh r0, [r5, 0x12]
- b _0808242E
- .align 2, 0
-_08082404: .4byte gSaveBlock1Ptr
-_08082408: .4byte gObjectEvents
-_0808240C:
- bl GetPlayerAvatarObjectId
- lsls r0, 24
- lsrs r0, 24
- bl CameraObjectSetFollowedObjectId
- ldr r0, _08082438 @ =gSaveBlock1Ptr
- ldr r0, [r0]
- ldrb r1, [r0, 0x5]
- ldrb r2, [r0, 0x4]
- movs r0, 0x7F
- bl RemoveObjectEventByLocalIdAndMap
- movs r0, 0
- strh r0, [r5, 0x12]
- movs r0, 0x2
- strh r0, [r5, 0x8]
-_0808242E:
- movs r0, 0
- add sp, 0x4
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_08082438: .4byte gSaveBlock1Ptr
- thumb_func_end sub_808237C
-
thumb_func_start sub_808243C
sub_808243C: @ 808243C
push {r4,r5,lr}
@@ -841,7 +69,7 @@ _0808246E:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_805FE7C
+ bl TryOverrideTemplateCoordsForObjectEvent
adds r0, r5, 0
bl DestroyTask
b _080824E2
diff --git a/data/trainer_see.s b/data/trainer_see.s
index 13641f259..f10a0b2c4 100644
--- a/data/trainer_see.s
+++ b/data/trainer_see.s
@@ -4,23 +4,6 @@
.section .rodata
.align 2
-gUnknown_83C7258:: @ 83C7258
- .4byte sub_8081F34
- .4byte sub_8081F38
- .4byte sub_8081F90
- .4byte sub_8081FD0
- .4byte sub_808202C
- .4byte sub_80820BC
- .4byte sub_8082100
- .4byte sub_8082134
- .4byte sub_8082150
- .4byte sub_8082184
- .4byte sub_80821DC
- .4byte sub_8082250
- .4byte sub_808226C
- .4byte sub_80822CC
- .4byte sub_808237C
-
gUnknown_83C7294:: @ 83C7294
.4byte sub_8082150
.4byte sub_8082184
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
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 2e1dcd919..5f97cd680 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -415,7 +415,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId)
if (sub_807E418())
{
sub_807DCB0(TRUE);
- ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], sub_8063F84(GetPlayerFacingDirection()));
+ ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
task->data[0] = 2;
}
break;
diff --git a/src/field_specials.c b/src/field_specials.c
index a1de82c0f..d9d15748a 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -46,6 +46,7 @@
#include "constants/region_map.h"
#include "constants/moves.h"
#include "constants/menu.h"
+#include "constants/event_objects.h"
static EWRAM_DATA u8 sElevatorCurrentFloorWindowId = 0;
static EWRAM_DATA u16 sElevatorScroll = 0;
@@ -315,7 +316,7 @@ void Special_AnimatePcTurnOff()
void SpawnCameraObject(void)
{
- u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 8, 127, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
+ u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 8, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
gObjectEvents[objectEventId].invisible = TRUE;
CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId);
}
diff --git a/src/trainer_see.c b/src/trainer_see.c
index a04fe83ec..93b22d2a3 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -1,28 +1,78 @@
#include "global.h"
#include "battle_setup.h"
-#include "field_player_avatar.h"
#include "event_object_movement.h"
+#include "field_effect.h"
+#include "field_player_avatar.h"
#include "quest_log.h"
+#include "task.h"
#include "constants/battle_setup.h"
+#include "constants/event_object_movement.h"
+#include "constants/event_objects.h"
+#include "constants/object_events.h"
+
+typedef u8 (*TRAINER_APPROACH_FUNC)(struct ObjectEvent *, s16, s16, s16);
+typedef bool8 (*TRAINER_SEE_FUNC)(u8, struct Task *, struct ObjectEvent *);
-static bool8 CheckTrainer(u8 objectEventId);
-static u8 GetTrainerApproachDistance(struct ObjectEvent * objectEvent);
-static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent * objectEvent, s16 range, s16 x, s16 y);
-static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent * objectEvent, s16 range, s16 x, s16 y);
-static u8 GetTrainerApproachDistanceWest(struct ObjectEvent * objectEvent, s16 range, s16 x, s16 y);
-static u8 GetTrainerApproachDistanceEast(struct ObjectEvent * objectEvent, s16 range, s16 x, s16 y);
-static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent * objectEvent, u8 approachDistance, u8 facingDirection);
-void sub_8081E68(struct ObjectEvent * objectEvent, u8 approachDistance);
+static bool8 CheckTrainer(u8 trainerObjId);
+static u8 GetTrainerApproachDistance(struct ObjectEvent * trainerObj);
+static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent * trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent * trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceWest(struct ObjectEvent * trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceEast(struct ObjectEvent * trainerObj, s16 range, s16 x, s16 y);
+static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent * trainerObj, u8 approachDistance, u8 facingDirection);
+void TrainerApproachPlayer(struct ObjectEvent * trainerObj, u8 approachDistance);
+void Task_RunTrainerSeeFuncList(u8 taskId);
+bool8 sub_8081F34(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_8081F38(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_8081F90(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_8081FD0(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_808202C(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_80820BC(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_8082100(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_8082134(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_8082150(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_8082184(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_80821DC(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_8082250(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_808226C(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_80822CC(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
+bool8 sub_808237C(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj);
const u16 gUnknown_83C6AC8[] = INCBIN_U16("graphics/object_events/emoticons.4bpp");
-u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *, s16 range, s16 x, s16 y) = {
+// u8 func(struct ObjectEvent * trainerObj, s16 range, s16 x, s16 y)
+// range is the maximum distance the trainer can see
+// x and y are the player's coordinates
+// Returns distance to walk if trainer has unobstructed view of player
+// Returns 0 if trainer can't see player
+const TRAINER_APPROACH_FUNC sDirectionalApproachDistanceFuncs[] = {
GetTrainerApproachDistanceSouth,
GetTrainerApproachDistanceNorth,
GetTrainerApproachDistanceWest,
GetTrainerApproachDistanceEast
};
+// bool8 func(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+// Returns TRUE to run the next func immediately
+// Returns FALSE to delay the next func to the next frame
+const TRAINER_SEE_FUNC sTrainerSeeFuncList[] = {
+ sub_8081F34,
+ sub_8081F38,
+ sub_8081F90,
+ sub_8081FD0,
+ sub_808202C,
+ sub_80820BC,
+ sub_8082100,
+ sub_8082134,
+ sub_8082150,
+ sub_8082184,
+ sub_80821DC,
+ sub_8082250,
+ sub_808226C,
+ sub_80822CC,
+ sub_808237C
+};
+
bool8 CheckForTrainersWantingBattle(void)
{
u8 i;
@@ -43,19 +93,19 @@ bool8 CheckForTrainersWantingBattle(void)
return FALSE;
}
-static bool8 CheckTrainer(u8 objectEventId)
+static bool8 CheckTrainer(u8 trainerObjId)
{
- const u8 *script = GetObjectEventScriptPointerByObjectEventId(objectEventId);
+ const u8 *script = GetObjectEventScriptPointerByObjectEventId(trainerObjId);
u8 approachDistance;
if (GetTrainerFlagFromScriptPointer(script))
return FALSE;
- approachDistance = GetTrainerApproachDistance(&gObjectEvents[objectEventId]);
+ approachDistance = GetTrainerApproachDistance(&gObjectEvents[trainerObjId]);
if (approachDistance != 0)
{
if (script[1] == TRAINER_BATTLE_DOUBLE && GetMonsStateToDoubles())
return FALSE;
- ConfigureAndSetUpOneTrainerBattle(objectEventId, script);
- sub_8081E68(&gObjectEvents[objectEventId], approachDistance - 1);
+ ConfigureAndSetUpOneTrainerBattle(trainerObjId, script);
+ TrainerApproachPlayer(&gObjectEvents[trainerObjId], approachDistance - 1);
return TRUE;
}
return FALSE;
@@ -93,7 +143,7 @@ static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 ra
&& y > trainerObj->currentCoords.y
&& y <= trainerObj->currentCoords.y + range)
{
- if (range > 3 && sub_805DF30() == OBJECT_EVENTS_COUNT)
+ if (range > 3 && GetIndexOfFirstInactiveObjectEvent() == OBJECT_EVENTS_COUNT)
return 0;
return (y - trainerObj->currentCoords.y);
}
@@ -172,3 +222,276 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 ap
return 0;
}
+
+#define tFuncId data[0]
+#define tTrainerObjHi data[1]
+#define tTrainerObjLo data[2]
+#define tTrainerRange data[3]
+#define tOutOfAshSpriteId data[4]
+#define tData5 data[5]
+
+#define TaskGetTrainerObj(dest, task) do { \
+ (dest) = (struct ObjectEvent *)(((task)->tTrainerObjHi << 16) | ((u16)(task)->tTrainerObjLo)); \
+} while (0)
+
+void TrainerApproachPlayer(struct ObjectEvent * trainerObj, u8 approachDistance)
+{
+ u8 taskId = CreateTask(Task_RunTrainerSeeFuncList, 80);
+ struct Task * task = &gTasks[taskId];
+ task->tTrainerObjHi = ((uintptr_t)trainerObj) >> 16;
+ task->tTrainerObjLo = (uintptr_t)trainerObj;
+ task->tTrainerRange = approachDistance;
+}
+
+void sub_8081E9C(TaskFunc taskFunc)
+{
+ u8 taskId = FindTaskIdByFunc(Task_RunTrainerSeeFuncList);
+ SetTaskFuncWithFollowupFunc(taskId, Task_RunTrainerSeeFuncList, taskFunc);
+ gTasks[taskId].tFuncId = 1;
+ Task_RunTrainerSeeFuncList(taskId);
+}
+
+void Task_RunTrainerSeeFuncList(u8 taskId)
+{
+ struct Task * task = &gTasks[taskId];
+ struct ObjectEvent * trainerObj;
+ TaskGetTrainerObj(trainerObj, task);
+
+ if (!trainerObj->active)
+ {
+ SwitchTaskToFollowupFunc(taskId);
+ }
+ else
+ {
+ while (sTrainerSeeFuncList[task->tFuncId](taskId, task, trainerObj))
+ ;
+ }
+}
+
+// TrainerSeeFuncs
+
+bool8 sub_8081F34(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ return FALSE;
+}
+
+bool8 sub_8081F38(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ u8 action;
+ // FRLG introduces trainers who can see the player from offscreen above.
+ // Handle this case here.
+ if (trainerObj->facingDirection == DIR_SOUTH && task->tTrainerRange > 2)
+ {
+ task->tFuncId = 12;
+ }
+ else
+ {
+ ObjectEventGetLocalIdAndMap(trainerObj, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+ FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
+ action = GetFaceDirectionMovementAction(trainerObj->facingDirection);
+ ObjectEventSetHeldMovement(trainerObj, action);
+ task->tFuncId++;
+ }
+ return TRUE;
+}
+
+bool8 sub_8081F90(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1))
+ {
+ return FALSE;
+ }
+ else
+ {
+ task->tFuncId++;
+ if (trainerObj->animPattern == MOVEMENT_TYPE_TREE_DISGUISE || trainerObj->animPattern == MOVEMENT_TYPE_MOUNTAIN_DISGUISE)
+ task->tFuncId = 6;
+ if (trainerObj->animPattern == MOVEMENT_TYPE_HIDDEN)
+ task->tFuncId = 8;
+ return TRUE;
+ }
+}
+
+bool8 sub_8081FD0(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj))
+ {
+ if (task->tTrainerRange)
+ {
+ ObjectEventSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection));
+ task->tTrainerRange--;
+ }
+ else
+ {
+ ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
+ task->tFuncId++;
+ }
+ }
+ return FALSE;
+}
+
+bool8 sub_808202C(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ struct ObjectEvent *playerObj;
+
+ if (ObjectEventIsMovementOverridden(trainerObj) && !ObjectEventClearHeldMovementIfFinished(trainerObj))
+ return FALSE;
+
+ SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection));
+ TryOverrideTemplateCoordsForObjectEvent(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection));
+ OverrideTemplateCoordsForObjectEvent(trainerObj);
+
+ playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
+ if (ObjectEventIsMovementOverridden(playerObj) && !ObjectEventClearHeldMovementIfFinished(playerObj))
+ return FALSE;
+
+ sub_805C774();
+ // Uncomment to have player turn to face their opponent
+ // ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection)));
+ task->tFuncId++;
+ return FALSE;
+}
+
+bool8 sub_80820BC(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
+
+ if (!ObjectEventIsMovementOverridden(playerObj)
+ || ObjectEventClearHeldMovementIfFinished(playerObj))
+ SwitchTaskToFollowupFunc(taskId); // This ends the trainer walk routine.
+ return FALSE;
+}
+
+// Jumps here if disguised. Not used in FRLG.
+bool8 sub_8082100(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ if (!ObjectEventIsMovementOverridden(trainerObj)
+ || ObjectEventClearHeldMovementIfFinished(trainerObj))
+ {
+ ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER);
+ task->tFuncId++;
+ }
+ return FALSE;
+}
+
+bool8 sub_8082134(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ if (ObjectEventClearHeldMovementIfFinished(trainerObj))
+ task->tFuncId = 3;
+
+ return FALSE;
+}
+
+// Jump here if hidden in ash. Not used in FRLG.
+bool8 sub_8082150(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ if (!ObjectEventIsMovementOverridden(trainerObj)
+ || ObjectEventClearHeldMovementIfFinished(trainerObj))
+ {
+ ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
+ task->tFuncId++;
+ }
+ return FALSE;
+}
+
+bool8 sub_8082184(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ if (ObjectEventCheckHeldMovementStatus(trainerObj))
+ {
+ gFieldEffectArguments[0] = trainerObj->currentCoords.x;
+ gFieldEffectArguments[1] = trainerObj->currentCoords.y;
+ gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1;
+ gFieldEffectArguments[3] = 2;
+ task->tOutOfAshSpriteId = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
+ task->tFuncId++;
+ }
+ return FALSE;
+}
+
+bool8 sub_80821DC(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ struct Sprite *sprite;
+
+ if (gSprites[task->tOutOfAshSpriteId].animCmdIndex == 2)
+ {
+ trainerObj->fixedPriority = 0;
+ trainerObj->triggerGroundEffectsOnMove = 1;
+
+ sprite = &gSprites[trainerObj->spriteId];
+ sprite->oam.priority = 2;
+ ObjectEventClearHeldMovementIfFinished(trainerObj);
+ ObjectEventSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection));
+ task->tFuncId++;
+ }
+
+ return FALSE;
+}
+
+bool8 sub_8082250(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
+{
+ if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
+ task->tFuncId = 3;
+
+ return FALSE;
+}
+
+// FRLG exclusive: Scroll the camera up to reveal an offscreen above trainer
+bool8 sub_808226C(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
+{
+ int specialObjectId;
+ task->tData5 = 0;
+ specialObjectId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 7, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
+ gObjectEvents[specialObjectId].invisible = TRUE;
+ CameraObjectSetFollowedObjectId(gObjectEvents[specialObjectId].spriteId);
+ task->tFuncId++;
+ return FALSE;
+}
+
+bool8 sub_80822CC(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
+{
+ u8 specialObjectId;
+ TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId);
+
+ if (ObjectEventIsMovementOverridden(&gObjectEvents[specialObjectId]) && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[specialObjectId]))
+ return FALSE;
+
+ if (task->tData5 != task->tTrainerRange - 1)
+ {
+ ObjectEventSetHeldMovement(&gObjectEvents[specialObjectId], sub_8063FB0(DIR_NORTH));
+ task->tData5++;
+ }
+ else
+ {
+ ObjectEventGetLocalIdAndMap(trainerObj, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
+ FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
+ task->tData5 = 0;
+ task->tFuncId++;
+ }
+ return FALSE;
+}
+
+bool8 sub_808237C(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
+{
+ u8 specialObjectId;
+ TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId);
+
+ if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1))
+ return FALSE;
+
+ if (ObjectEventIsMovementOverridden(&gObjectEvents[specialObjectId]) && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[specialObjectId]))
+ return FALSE;
+
+ if (task->tData5 != task->tTrainerRange - 1)
+ {
+ ObjectEventSetHeldMovement(&gObjectEvents[specialObjectId], sub_8063FB0(DIR_SOUTH));
+ task->tData5++;
+ }
+ else
+ {
+ CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId());
+ RemoveObjectEventByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+ task->tData5 = 0;
+ task->tFuncId = 2;
+ }
+ return FALSE;
+}
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index 221108a8f..b74c345e4 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -951,7 +951,7 @@ void sub_810CB90(void)
TryGetObjectEventIdByLocalIdAndMap(r4[r8].localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &sp0);
r4_2 = &gObjectEvents[sp0];
sub_810CF54(&r4[r8]); // You are using this function incorrectly. Please consult the manual.
- sub_805FE7C(r4_2, gUnknown_8453F67[r4_2->facingDirection]);
+ TryOverrideTemplateCoordsForObjectEvent(r4_2, gUnknown_8453F67[r4_2->facingDirection]);
gSaveBlock1Ptr->trainerRematches[r4[r8].localId] = 0;
if (gSelectedObjectEvent == sp0)
r4_2->animPattern = gUnknown_8453F67[r4_2->facingDirection];
@@ -1312,7 +1312,7 @@ static void StartAllRespondantIdleMovements(void)
if (sub_810CF04(sVsSeeker->trainerInfo[j].objectEventId) == 1)
SetTrainerMovementType(r4, sVsSeeker->runningBehaviourEtcArray[i]);
- sub_805FE7C(r4, sVsSeeker->runningBehaviourEtcArray[i]);
+ TryOverrideTemplateCoordsForObjectEvent(r4, sVsSeeker->runningBehaviourEtcArray[i]);
gSaveBlock1Ptr->trainerRematches[sVsSeeker->trainerInfo[j].localId] = GetNextAvailableRematchTrainer(sVsSeekerData, sVsSeeker->trainerInfo[j].trainerIdx, &dummy);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 13:08:04 +0000