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

Address review comments; name some methods in event_object_movement

Browse Source
This commit is contained in:
PikalaxALT
2020-02-21 09:02:06 -05:00
parent 93ee43a31a
commit 14a599bbc2
4 changed files with 107 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/event_object_movement.s
+97 -97
View File
@@ -4723,7 +4723,7 @@ sub_8060078: @ 8060078
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -4736,7 +4736,7 @@ sub_8060078: @ 8060078
sub_80600A4: @ 80600A4 sub_80600A4: @ 80600A4
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r1, 0 adds r6, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080600D8 beq _080600D8
@@ -4837,7 +4837,7 @@ sub_806014C: @ 806014C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
orrs r0, r1 orrs r0, r1
@@ -4863,7 +4863,7 @@ sub_806017C: @ 806017C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
orrs r0, r1 orrs r0, r1
@@ -4881,7 +4881,7 @@ sub_80601AC: @ 80601AC
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080601CA beq _080601CA
@@ -5493,7 +5493,7 @@ sub_80605E4: @ 80605E4
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -5507,7 +5507,7 @@ sub_8060610: @ 8060610
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08060646 beq _08060646
@@ -5666,7 +5666,7 @@ sub_8060724: @ 8060724
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -5679,7 +5679,7 @@ sub_8060724: @ 8060724
sub_8060750: @ 8060750 sub_8060750: @ 8060750
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r1, 0 adds r6, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08060784 beq _08060784
@@ -5780,7 +5780,7 @@ sub_80607F8: @ 80607F8
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
orrs r0, r1 orrs r0, r1
@@ -5798,7 +5798,7 @@ sub_8060828: @ 8060828
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08060846 beq _08060846
@@ -5881,7 +5881,7 @@ sub_80608A8: @ 80608A8
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -5894,7 +5894,7 @@ sub_80608A8: @ 80608A8
sub_80608D4: @ 80608D4 sub_80608D4: @ 80608D4
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r1, 0 adds r6, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08060908 beq _08060908
@@ -5995,7 +5995,7 @@ sub_806097C: @ 806097C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
orrs r0, r1 orrs r0, r1
@@ -6013,7 +6013,7 @@ sub_80609AC: @ 80609AC
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080609CA beq _080609CA
@@ -6085,7 +6085,7 @@ sub_8060A18: @ 8060A18
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
pop {r4,r5} pop {r4,r5}
@@ -6097,7 +6097,7 @@ sub_8060A18: @ 8060A18
sub_8060A44: @ 8060A44 sub_8060A44: @ 8060A44
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08060A56 bne _08060A56
@@ -6189,7 +6189,7 @@ sub_8060ACC: @ 8060ACC
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -6203,7 +6203,7 @@ sub_8060AF8: @ 8060AF8
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08060B2E beq _08060B2E
@@ -6362,7 +6362,7 @@ sub_8060C0C: @ 8060C0C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -6376,7 +6376,7 @@ sub_8060C38: @ 8060C38
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08060C6E beq _08060C6E
@@ -6535,7 +6535,7 @@ sub_8060D4C: @ 8060D4C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -6549,7 +6549,7 @@ sub_8060D78: @ 8060D78
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08060DAE beq _08060DAE
@@ -6708,7 +6708,7 @@ sub_8060E8C: @ 8060E8C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -6722,7 +6722,7 @@ sub_8060EB8: @ 8060EB8
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08060EEE beq _08060EEE
@@ -6881,7 +6881,7 @@ sub_8060FCC: @ 8060FCC
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -6895,7 +6895,7 @@ sub_8060FF8: @ 8060FF8
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0806102E beq _0806102E
@@ -7054,7 +7054,7 @@ sub_806110C: @ 806110C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -7068,7 +7068,7 @@ sub_8061138: @ 8061138
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0806116E beq _0806116E
@@ -7227,7 +7227,7 @@ sub_806124C: @ 806124C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -7241,7 +7241,7 @@ sub_8061278: @ 8061278
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080612AE beq _080612AE
@@ -7400,7 +7400,7 @@ sub_806138C: @ 806138C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -7414,7 +7414,7 @@ sub_80613B8: @ 80613B8
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080613EE beq _080613EE
@@ -7573,7 +7573,7 @@ sub_80614CC: @ 80614CC
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -7587,7 +7587,7 @@ sub_80614F8: @ 80614F8
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0806152E beq _0806152E
@@ -7746,7 +7746,7 @@ sub_806160C: @ 806160C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x2 movs r0, 0x2
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
movs r0, 0x1 movs r0, 0x1
@@ -7760,7 +7760,7 @@ sub_8061638: @ 8061638
push {r4-r7,lr} push {r4-r7,lr}
adds r6, r0, 0 adds r6, r0, 0
adds r7, r1, 0 adds r7, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0806166E beq _0806166E
@@ -7908,7 +7908,7 @@ sub_8061738: @ 8061738
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
pop {r4,r5} pop {r4,r5}
@@ -7920,7 +7920,7 @@ sub_8061738: @ 8061738
sub_8061764: @ 8061764 sub_8061764: @ 8061764
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0806177E beq _0806177E
@@ -8051,7 +8051,7 @@ sub_806183C: @ 806183C
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
pop {r4,r5} pop {r4,r5}
@@ -8063,7 +8063,7 @@ sub_806183C: @ 806183C
sub_8061868: @ 8061868 sub_8061868: @ 8061868
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08061882 beq _08061882
@@ -8297,7 +8297,7 @@ _08061A24:
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
adds r2, r6, 0 adds r2, r6, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
orrs r0, r1 orrs r0, r1
@@ -8315,7 +8315,7 @@ sub_8061A44: @ 8061A44
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08061A62 beq _08061A62
@@ -8417,7 +8417,7 @@ _08061B0E:
adds r0, r4, 0 adds r0, r4, 0
mov r1, r8 mov r1, r8
adds r2, r6, 0 adds r2, r6, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
orrs r0, r1 orrs r0, r1
@@ -8438,7 +8438,7 @@ sub_8061B34: @ 8061B34
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08061B52 beq _08061B52
@@ -10418,7 +10418,7 @@ sub_8062944: @ 8062944
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08062962 beq _08062962
@@ -10463,7 +10463,7 @@ sub_8062970: @ 8062970
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
orrs r0, r1 orrs r0, r1
@@ -10513,7 +10513,7 @@ sub_80629B8: @ 80629B8
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
mov r0, sp mov r0, sp
movs r2, 0 movs r2, 0
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
@@ -10548,7 +10548,7 @@ _08062A3E:
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
_08062A52: _08062A52:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
@@ -10602,7 +10602,7 @@ sub_8062A70: @ 8062A70
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
mov r0, sp mov r0, sp
movs r2, 0 movs r2, 0
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
@@ -10637,7 +10637,7 @@ _08062AF6:
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
_08062B0A: _08062B0A:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
@@ -10691,7 +10691,7 @@ sub_8062B28: @ 8062B28
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
mov r0, sp mov r0, sp
movs r2, 0 movs r2, 0
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
@@ -10726,7 +10726,7 @@ _08062BAE:
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
_08062BC2: _08062BC2:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
@@ -10780,7 +10780,7 @@ sub_8062BE0: @ 8062BE0
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
mov r0, sp mov r0, sp
movs r2, 0 movs r2, 0
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
@@ -10815,7 +10815,7 @@ _08062C66:
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
_08062C7A: _08062C7A:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
@@ -10855,7 +10855,7 @@ cph_IM_DIFFERENT: @ 8062C98
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
orrs r0, r1 orrs r0, r1
@@ -10905,7 +10905,7 @@ sub_8062CE0: @ 8062CE0
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
mov r0, sp mov r0, sp
movs r2, 0 movs r2, 0
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
@@ -10940,7 +10940,7 @@ _08062D66:
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
_08062D7A: _08062D7A:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
@@ -11001,7 +11001,7 @@ oac_hopping: @ 8062D98
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
add r0, sp, 0x4 add r0, sp, 0x4
movs r2, 0 movs r2, 0
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
@@ -11036,7 +11036,7 @@ _08062E2C:
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
_08062E40: _08062E40:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
@@ -11352,7 +11352,7 @@ sub_8063078: @ 8063078
sub_8063084: @ 8063084 sub_8063084: @ 8063084
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08063096 beq _08063096
@@ -11419,7 +11419,7 @@ sub_80630E4: @ 80630E4
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
pop {r4,r5} pop {r4,r5}
@@ -11481,7 +11481,7 @@ sub_8063154: @ 8063154
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
pop {r4,r5} pop {r4,r5}
@@ -11543,7 +11543,7 @@ sub_80631C4: @ 80631C4
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x30] strh r0, [r5, 0x30]
pop {r4,r5} pop {r4,r5}
@@ -11605,7 +11605,7 @@ sub_8063234: @ 8063234
lsrs r2, 24 lsrs r2, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80645C8 bl ObjectEventSetSingleMovement
ldrb r0, [r4, 0x1] ldrb r0, [r4, 0x1]
movs r1, 0x20 movs r1, 0x20
orrs r0, r1 orrs r0, r1
@@ -11621,7 +11621,7 @@ sub_8063234: @ 8063234
sub_8063268: @ 8063268 sub_8063268: @ 8063268
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0806327A bne _0806327A
@@ -11774,7 +11774,7 @@ sub_8063364: @ 8063364
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x98 movs r2, 0x98
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0x30] strh r0, [r4, 0x30]
pop {r4,r5} pop {r4,r5}
@@ -11786,7 +11786,7 @@ sub_8063364: @ 8063364
sub_8063384: @ 8063384 sub_8063384: @ 8063384
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08063396 bne _08063396
@@ -11822,7 +11822,7 @@ sub_80633B4: @ 80633B4
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x99 movs r2, 0x99
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0x30] strh r0, [r4, 0x30]
movs r0, 0 movs r0, 0
@@ -11840,7 +11840,7 @@ sub_80633D4: @ 80633D4
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x9A movs r2, 0x9A
bl sub_80645C8 bl ObjectEventSetSingleMovement
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0x30] strh r0, [r4, 0x30]
movs r0, 0 movs r0, 0
@@ -11853,7 +11853,7 @@ sub_80633D4: @ 80633D4
sub_80633F4: @ 80633F4 sub_80633F4: @ 80633F4
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
bl sub_8064588 bl ObjectEventExecSingleMovementAction
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08063406 beq _08063406
@@ -13370,7 +13370,7 @@ sub_8063E28: @ 8063E28
bne _08063E5C bne _08063E5C
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_8064544 bl ObjectEventExecHeldMovementAction
_08063E5C: _08063E5C:
ldrb r0, [r4, 0x1E] ldrb r0, [r4, 0x1E]
bl MetatileBehavior_IsIce_2 bl MetatileBehavior_IsIce_2
@@ -14344,7 +14344,7 @@ _08064508: .4byte gUnknown_83A65A9
ObjectEventExecSpecialAnim: @ 806450C ObjectEventExecSpecialAnim: @ 806450C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r2, _08064540 @ =gUnknown_83A65BC ldr r2, _08064540 @ =sMovementActionFuncs
ldrb r0, [r4, 0x1C] ldrb r0, [r4, 0x1C]
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
@@ -14368,14 +14368,14 @@ _08064538:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08064540: .4byte gUnknown_83A65BC _08064540: .4byte sMovementActionFuncs
thumb_func_end ObjectEventExecSpecialAnim thumb_func_end ObjectEventExecSpecialAnim
thumb_func_start sub_8064544 thumb_func_start ObjectEventExecHeldMovementAction
sub_8064544: @ 8064544 ObjectEventExecHeldMovementAction: @ 8064544
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r2, _08064584 @ =gUnknown_83A65BC ldr r2, _08064584 @ =sMovementActionFuncs
ldrb r0, [r4, 0x1C] ldrb r0, [r4, 0x1C]
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
@@ -14404,15 +14404,15 @@ _0806457C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08064584: .4byte gUnknown_83A65BC _08064584: .4byte sMovementActionFuncs
thumb_func_end sub_8064544 thumb_func_end ObjectEventExecHeldMovementAction
thumb_func_start sub_8064588 thumb_func_start ObjectEventExecSingleMovementAction
sub_8064588: @ 8064588 ObjectEventExecSingleMovementAction: @ 8064588
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
ldr r1, _080645B4 @ =gUnknown_83A65BC ldr r1, _080645B4 @ =sMovementActionFuncs
ldrb r0, [r4, 0x1C] ldrb r0, [r4, 0x1C]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@@ -14431,7 +14431,7 @@ sub_8064588: @ 8064588
movs r0, 0 movs r0, 0
b _080645C2 b _080645C2
.align 2, 0 .align 2, 0
_080645B4: .4byte gUnknown_83A65BC _080645B4: .4byte sMovementActionFuncs
_080645B8: _080645B8:
movs r0, 0xFF movs r0, 0xFF
strb r0, [r4, 0x1C] strb r0, [r4, 0x1C]
@@ -14442,10 +14442,10 @@ _080645C2:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8064588 thumb_func_end ObjectEventExecSingleMovementAction
thumb_func_start sub_80645C8 thumb_func_start ObjectEventSetSingleMovement
sub_80645C8: @ 80645C8 ObjectEventSetSingleMovement: @ 80645C8
push {r4,lr} push {r4,lr}
adds r3, r0, 0 adds r3, r0, 0
lsls r2, 24 lsls r2, 24
@@ -14468,10 +14468,10 @@ _080645EA:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080645F0: .4byte gUnknown_3005E88 _080645F0: .4byte gUnknown_3005E88
thumb_func_end sub_80645C8 thumb_func_end ObjectEventSetSingleMovement
thumb_func_start an_look_any thumb_func_start FaceDirection
an_look_any: @ 80645F4 FaceDirection: @ 80645F4
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -14501,13 +14501,13 @@ an_look_any: @ 80645F4
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end an_look_any thumb_func_end FaceDirection
thumb_func_start sub_8064638 thumb_func_start sub_8064638
sub_8064638: @ 8064638 sub_8064638: @ 8064638
push {lr} push {lr}
movs r2, 0x1 movs r2, 0x1
bl an_look_any bl FaceDirection
movs r0, 0x1 movs r0, 0x1
pop {r1} pop {r1}
bx r1 bx r1
@@ -14517,7 +14517,7 @@ sub_8064638: @ 8064638
sub_8064648: @ 8064648 sub_8064648: @ 8064648
push {lr} push {lr}
movs r2, 0x2 movs r2, 0x2
bl an_look_any bl FaceDirection
movs r0, 0x1 movs r0, 0x1
pop {r1} pop {r1}
bx r1 bx r1
@@ -14527,7 +14527,7 @@ sub_8064648: @ 8064648
sub_8064658: @ 8064658 sub_8064658: @ 8064658
push {lr} push {lr}
movs r2, 0x3 movs r2, 0x3
bl an_look_any bl FaceDirection
movs r0, 0x1 movs r0, 0x1
pop {r1} pop {r1}
bx r1 bx r1
@@ -14537,7 +14537,7 @@ sub_8064658: @ 8064658
sub_8064668: @ 8064668 sub_8064668: @ 8064668
push {lr} push {lr}
movs r2, 0x4 movs r2, 0x4
bl an_look_any bl FaceDirection
movs r0, 0x1 movs r0, 0x1
pop {r1} pop {r1}
bx r1 bx r1
@@ -18678,7 +18678,7 @@ sub_806637C: @ 806637C
lsrs r2, 24 lsrs r2, 24
adds r0, r5, 0 adds r0, r5, 0
adds r1, r6, 0 adds r1, r6, 0
bl an_look_any bl FaceDirection
_080663C6: _080663C6:
movs r0, 0x1 movs r0, 0x1
strh r0, [r6, 0x32] strh r0, [r6, 0x32]
@@ -18728,7 +18728,7 @@ sub_80663D8: @ 80663D8
lsrs r2, 24 lsrs r2, 24
adds r0, r5, 0 adds r0, r5, 0
adds r1, r6, 0 adds r1, r6, 0
bl an_look_any bl FaceDirection
_0806642A: _0806642A:
movs r0, 0x1 movs r0, 0x1
strh r0, [r6, 0x32] strh r0, [r6, 0x32]
@@ -19358,7 +19358,7 @@ sub_806687C: @ 806687C
ldrb r2, [r0, 0x6] ldrb r2, [r0, 0x6]
adds r2, r3 adds r2, r3
ldrb r2, [r2] ldrb r2, [r2]
bl an_look_any bl FaceDirection
movs r0, 0x1 movs r0, 0x1
pop {r1} pop {r1}
bx r1 bx r1
data/event_object_movement.s
+1 -2
View File
@@ -8164,8 +8164,7 @@ gUnknown_83A65A9:: @ 83A65A9
.byte 0x00 .byte 0x00
.byte 0x00 .byte 0x00
@ gMovementActionFuncs sMovementActionFuncs:: @ 83A65BC
gUnknown_83A65BC:: @ 83A65BC
.4byte gUnknown_83A6864 .4byte gUnknown_83A6864
.4byte gUnknown_83A686C .4byte gUnknown_83A686C
.4byte gUnknown_83A6874 .4byte gUnknown_83A6874
include/constants/event_object_movement.h
+1
View File
@@ -186,6 +186,7 @@
#define MOVEMENT_ACTION_SHOW_REFLECTION 0x6F #define MOVEMENT_ACTION_SHOW_REFLECTION 0x6F
#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x70 #define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x70
#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x71 #define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x71
// Acro Bike related movement actions might not be in FRLG at all
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x72 #define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x72
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x73 #define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x73
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x74 #define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x74
src/trainer_see.c
+8 -9
View File
@@ -6,15 +6,14 @@
#include "quest_log.h" #include "quest_log.h"
#include "script.h" #include "script.h"
#include "task.h" #include "task.h"
#include "trainer_see.h"
#include "util.h" #include "util.h"
#include "constants/battle_setup.h" #include "constants/battle_setup.h"
#include "constants/event_object_movement.h" #include "constants/event_object_movement.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/object_events.h" #include "constants/object_events.h"
typedef u8 (*TRAINER_APPROACH_FUNC)(struct ObjectEvent *, s16, s16, s16); typedef u8 (*trainerApproachFunc)(struct ObjectEvent *, s16, s16, s16);
typedef bool8 (*TRAINER_SEE_FUNC)(u8, struct Task *, struct ObjectEvent *); typedef bool8 (*trainerSeeFunc)(u8, struct Task *, struct ObjectEvent *);
static bool8 CheckTrainer(u8 trainerObjId); static bool8 CheckTrainer(u8 trainerObjId);
static u8 GetTrainerApproachDistance(struct ObjectEvent * trainerObj); static u8 GetTrainerApproachDistance(struct ObjectEvent * trainerObj);
@@ -51,7 +50,7 @@ static const u16 sGfx_Emoticons[] = INCBIN_U16("graphics/object_events/emoticons
// x and y are the player's coordinates // x and y are the player's coordinates
// Returns distance to walk if trainer has unobstructed view of player // Returns distance to walk if trainer has unobstructed view of player
// Returns 0 if trainer can't see player // Returns 0 if trainer can't see player
static const TRAINER_APPROACH_FUNC sDirectionalApproachDistanceFuncs[] = { static const trainerApproachFunc sDirectionalApproachDistanceFuncs[] = {
GetTrainerApproachDistanceSouth, GetTrainerApproachDistanceSouth,
GetTrainerApproachDistanceNorth, GetTrainerApproachDistanceNorth,
GetTrainerApproachDistanceWest, GetTrainerApproachDistanceWest,
@@ -61,7 +60,7 @@ static const TRAINER_APPROACH_FUNC sDirectionalApproachDistanceFuncs[] = {
// bool8 func(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) // bool8 func(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
// Returns TRUE to run the next func immediately // Returns TRUE to run the next func immediately
// Returns FALSE to delay the next func to the next frame // Returns FALSE to delay the next func to the next frame
static const TRAINER_SEE_FUNC sTrainerSeeFuncList[] = { static const trainerSeeFunc sTrainerSeeFuncList[] = {
TrainerSeeFunc_Dummy, TrainerSeeFunc_Dummy,
TrainerSeeFunc_StartExclMark, TrainerSeeFunc_StartExclMark,
TrainerSeeFunc_WaitExclMark, TrainerSeeFunc_WaitExclMark,
@@ -79,7 +78,7 @@ static const TRAINER_SEE_FUNC sTrainerSeeFuncList[] = {
TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown
}; };
static const TRAINER_SEE_FUNC sTrainerSeeFuncList2[] = { static const trainerSeeFunc sTrainerSeeFuncList2[] = {
TrainerSeeFunc_TrainerInAshFacesPlayer, TrainerSeeFunc_TrainerInAshFacesPlayer,
TrainerSeeFunc_BeginJumpOutOfAsh, TrainerSeeFunc_BeginJumpOutOfAsh,
TrainerSeeFunc_WaitJumpOutOfAsh, TrainerSeeFunc_WaitJumpOutOfAsh,
@@ -427,8 +426,8 @@ static bool8 TrainerSeeFunc_WaitJumpOutOfAsh(u8 taskId, struct Task * task, stru
if (gSprites[task->tOutOfAshSpriteId].animCmdIndex == 2) if (gSprites[task->tOutOfAshSpriteId].animCmdIndex == 2)
{ {
trainerObj->fixedPriority = 0; trainerObj->fixedPriority = FALSE;
trainerObj->triggerGroundEffectsOnMove = 1; trainerObj->triggerGroundEffectsOnMove = TRUE;
sprite = &gSprites[trainerObj->spriteId]; sprite = &gSprites[trainerObj->spriteId];
sprite->oam.priority = 2; sprite->oam.priority = 2;
@@ -537,7 +536,7 @@ static void Task_RevealTrainer_RunTrainerSeeFuncList(u8 taskId)
} }
else else
{ {
trainerObj->heldMovementFinished = 0; trainerObj->heldMovementFinished = FALSE;
} }
} }