pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Update some labels

Browse Source
This commit is contained in:
Rangi 2019-12-03 09:17:21 -05:00
parent 083d51fd58
commit fa7261a8ee
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engine/overworld/map_setup.asm
View File

@ -178,13 +178,13 @@ CheckReplaceKrisSprite:
jr z, .surfing
call GetMapEnvironment
cp INDOOR
jr z, .checkbiking
jr z, .no_biking
cp ENVIRONMENT_5
jr z, .checkbiking
jr z, .no_biking
cp DUNGEON
jr z, .checkbiking
jr z, .no_biking
jr .nope
.checkbiking
.no_biking
ld a, [wPlayerState]
cp PLAYER_BIKE
jr nz, .nope
@ -200,18 +200,19 @@ CheckReplaceKrisSprite:
.CheckSurfing:
call CheckOnWater
jr nz, .ret_nc
jr nz, .nope2
ld a, [wPlayerState]
cp PLAYER_SURF
jr z, ._surfing
jr z, .is_surfing
cp PLAYER_SURF_PIKA
jr z, ._surfing
jr z, .is_surfing
ld a, PLAYER_SURF
ld [wPlayerState], a
._surfing
.is_surfing
scf
ret
.ret_nc
.nope2
and a
ret

1
home/map.asm
View File

@ -369,6 +369,7 @@ CheckIndoorMap::
ret
; unused
UnreferencedCheckEnvironment::
cp INDOOR
ret z
cp GATE