diff options
| author | IIMarckus <iimarckus@gmail.com> | 2019-08-16 01:03:03 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2019-08-16 01:03:03 -0600 |
| commit | 2176239aa565126b528facc9041ed3b58eaade90 (patch) | |
| tree | 4589377cff104542abb2ee309496b5e4786eb59f /engine/overworld | |
| parent | 901e6f25deda73fa7053942d7d094108a73e2bea (diff) | |
Incorporate the rest of the audio engine.
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/player_movement.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 61b45a72..1fdec4e2 100755 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -24,7 +24,7 @@ Function10017: ; 10017 (4:4017) ret Function1002d: ; 1002d (4:402d) - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp PLAYER_NORMAL jr z, .asm_10044 cp PLAYER_SURF @@ -236,7 +236,7 @@ Function10147: ; 10147 (4:4147) ret Function1016b: ; 1016b (4:416b) - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp $4 jr z, Function101c0 cp $8 @@ -655,7 +655,7 @@ Function103b4: ; 103b4 (4:43b4) ret Function103ca: ; 103ca (4:43ca) - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp $1 ret z cp $2 @@ -699,7 +699,7 @@ Function103ee: ; 103ee (4:43ee) Function103f9: ; 103f9 (4:43f9) push bc ld a, $0 - ld [wPlayerBikeSurfState], a + ld [wPlayerState], a call ReplacePlayerSprite pop bc ret @@ -713,7 +713,7 @@ Function10404: ; 10404 (4:4404) ld a, [wPlayerStandingTile] call CheckIceTile jr nc, .asm_1041e - ld a, [wPlayerBikeSurfState] + ld a, [wPlayerState] cp $2 jr nz, .asm_10420 .asm_1041e |