diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-16 07:51:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-16 07:51:08 -0400 |
| commit | f44f89a463d7280a95094e8f37a56873a90da843 (patch) | |
| tree | 194662b15b39fb223bd20b17ea696ff525ebab0d /asm/field_control_avatar.s | |
| parent | 4a7c1d888a9f90b9102f469aab12beeab89ffff6 (diff) | |
| parent | e1f7efb8e67fb5587a8baf20f421c20e134e8b24 (diff) | |
Merge pull request #300 from ultima-soul/event_object_movement
Decompile/port event_object_movement
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 58a6b6e76..09c516bd8 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -923,7 +923,7 @@ _0806CFA4: .4byte gDirectionToVectors _0806CFA8: .4byte gObjectEvents _0806CFAC: movs r4, 0 - ldr r1, _0806CFE4 @ =gUnknown_2031DEC + ldr r1, _0806CFE4 @ =gLinkPlayerObjectEvents _0806CFB0: ldrb r0, [r1] cmp r0, 0x1 @@ -953,7 +953,7 @@ _0806CFDE: pop {r1} bx r1 .align 2, 0 -_0806CFE4: .4byte gUnknown_2031DEC +_0806CFE4: .4byte gLinkPlayerObjectEvents _0806CFE8: .4byte gSelectedObjectEvent _0806CFEC: .4byte gSpecialVar_LastTalked _0806CFF0: .4byte gSpecialVar_Facing @@ -3083,7 +3083,7 @@ _0806E046: GetObjectEventScriptPointerForComparison: @ 806E050 push {r4,r5,lr} sub sp, 0x8 - bl player_get_direction_upper_nybble + bl GetPlayerMovementDirection adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -3112,7 +3112,7 @@ GetObjectEventScriptPointerForComparison: @ 806E050 SetCableClubWarp: @ 806E08C push {r4,lr} sub sp, 0x8 - bl player_get_direction_upper_nybble + bl GetPlayerMovementDirection mov r4, sp mov r0, sp bl player_get_pos_to_and_height |