diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 20:12:40 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 20:12:40 -0500 |
| commit | 590c4b500b9dd37d372a935865aa4df0ab0bf43c (patch) | |
| tree | 5572d76c91e106e74e1401076f130fb902f6b67b /asm/rotating_gate.s | |
| parent | bc063b45d05716d1eab283f6d474bcdc601cafde (diff) | |
| parent | 14a76793e596d612efd273169c4172922c270f13 (diff) | |
Merge branch 'master' into record_mixing
Diffstat (limited to 'asm/rotating_gate.s')
| -rw-r--r-- | asm/rotating_gate.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/rotating_gate.s b/asm/rotating_gate.s index 5b7671bf8..da5e73034 100644 --- a/asm/rotating_gate.s +++ b/asm/rotating_gate.s @@ -410,7 +410,7 @@ sub_80FBAE4: @ 80FBAE4 adds r0, r4, 0x4 lsls r0, 24 lsrs r4, r0, 24 - bl sub_811A138 + bl GetPlayerSpeed lsls r0, 16 asrs r0, 16 cmp r0, 0x1 @@ -433,7 +433,7 @@ _080FBB2A: adds r0, 0x8 lsls r0, 24 lsrs r4, r0, 24 - bl sub_811A138 + bl GetPlayerSpeed lsls r0, 16 asrs r0, 16 cmp r0, 0x1 |