pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

PLAYER_SLIP → PLAYER_SKATE (probably used for the beta skateboard; DoPlayerMovement.BikeCheck returns true for it)

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-15 23:29:42 -05:00
parent fa98c29fa4
commit 5aac8afae7
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
constants/wram_constants.asm
View File

@@ -107,7 +107,7 @@ REGISTERED_NUMBER EQU %00111111
; PlayerState: ; d95d ; PlayerState: ; d95d
PLAYER_NORMAL EQU 0 PLAYER_NORMAL EQU 0
PLAYER_BIKE EQU 1 PLAYER_BIKE EQU 1
PLAYER_SLIP EQU 2 PLAYER_SKATE EQU 2
PLAYER_SURF EQU 4 PLAYER_SURF EQU 4
PLAYER_SURF_PIKA EQU 8 PLAYER_SURF_PIKA EQU 8

2
engine/map_setup.asm
View File

@@ -356,7 +356,7 @@ CheckReplaceKrisSprite: ; 154f7
ld a, [PlayerState] ld a, [PlayerState]
cp PLAYER_NORMAL cp PLAYER_NORMAL
jr z, .nope jr z, .nope
cp PLAYER_SLIP cp PLAYER_SKATE
jr z, .nope jr z, .nope
cp PLAYER_SURF cp PLAYER_SURF
jr z, .surfing jr z, .surfing

7
engine/player_movement.asm
View File

@@ -42,7 +42,7 @@ DoPlayerMovement:: ; 80000
jr z, .Surf jr z, .Surf
cp PLAYER_BIKE cp PLAYER_BIKE
jr z, .Normal jr z, .Normal
cp PLAYER_SLIP cp PLAYER_SKATE
jr z, .Ice jr z, .Ice
.Normal: .Normal:
@@ -750,11 +750,10 @@ DoPlayerMovement:: ; 80000
; 803ca ; 803ca
.BikeCheck: ; 803ca .BikeCheck: ; 803ca
ld a, [PlayerState] ld a, [PlayerState]
cp PLAYER_BIKE cp PLAYER_BIKE
ret z ret z
cp PLAYER_SLIP cp PLAYER_SKATE
ret ret
; 803d3 ; 803d3
@@ -824,7 +823,7 @@ CheckStandingOnIce:: ; 80404
call CheckIceTile call CheckIceTile
jr nc, .yep jr nc, .yep
ld a, [PlayerState] ld a, [PlayerState]
cp PLAYER_SLIP cp PLAYER_SKATE
jr nz, .not_ice jr nz, .not_ice
.yep .yep