dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decomp all trainer see funcs

Browse Source
This commit is contained in:
PikalaxALT
2020-02-20 14:03:29 -05:00
parent 0125c1440e
commit abc39d86f3
12 changed files with 521 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/event_object_movement.s
+54 -54
View File
@@ -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
asm/field_effect.s
+7 -7
View File
@@ -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
asm/field_player_avatar.s
+8 -8
View File
@@ -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
asm/overworld.s
+1 -1
View File
@@ -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
asm/trainer_see.s
+1 -773
View File
@@ -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