diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-15 23:29:42 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-15 23:29:42 -0500 |
| commit | 5aac8afae7a3514b76f684237f3de59e6a27977e (patch) | |
| tree | 37ab2bbb8c3b8c4f1f0c2d89dd1cacdc8ebf13f0 | |
| parent | fa98c29fa44a7509b9e2377bdf84c05981dc4931 (diff) | |
PLAYER_SLIP → PLAYER_SKATE (probably used for the beta skateboard; DoPlayerMovement.BikeCheck returns true for it)
| -rw-r--r-- | constants/wram_constants.asm | 2 | ||||
| -rw-r--r-- | engine/map_setup.asm | 2 | ||||
| -rwxr-xr-x | engine/player_movement.asm | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 23692fdef..c8c49621e 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -107,7 +107,7 @@ REGISTERED_NUMBER EQU %00111111 ; PlayerState: ; d95d PLAYER_NORMAL EQU 0 PLAYER_BIKE EQU 1 -PLAYER_SLIP EQU 2 +PLAYER_SKATE EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 5de4f30da..72fe9c07f 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -356,7 +356,7 @@ CheckReplaceKrisSprite: ; 154f7 ld a, [PlayerState] cp PLAYER_NORMAL jr z, .nope - cp PLAYER_SLIP + cp PLAYER_SKATE jr z, .nope cp PLAYER_SURF jr z, .surfing diff --git a/engine/player_movement.asm b/engine/player_movement.asm index 7ccb36551..5bc3e1f0b 100755 --- a/engine/player_movement.asm +++ b/engine/player_movement.asm @@ -42,7 +42,7 @@ DoPlayerMovement:: ; 80000 jr z, .Surf cp PLAYER_BIKE jr z, .Normal - cp PLAYER_SLIP + cp PLAYER_SKATE jr z, .Ice .Normal: @@ -750,11 +750,10 @@ DoPlayerMovement:: ; 80000 ; 803ca .BikeCheck: ; 803ca - ld a, [PlayerState] cp PLAYER_BIKE ret z - cp PLAYER_SLIP + cp PLAYER_SKATE ret ; 803d3 @@ -824,7 +823,7 @@ CheckStandingOnIce:: ; 80404 call CheckIceTile jr nc, .yep ld a, [PlayerState] - cp PLAYER_SLIP + cp PLAYER_SKATE jr nz, .not_ice .yep |