pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix CheckOnWater while on a space tile (#34) [bugfix to aa91909388]

Browse Source
This commit is contained in:
xCrystal 2024-01-04 22:30:40 +01:00
parent 0df29e5aaf
commit 9198f4d4b1
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/overworld/map_setup.asm
View File

@ -93,12 +93,11 @@ SkipUpdateMapSprites:
ret ret
CheckUpdatePlayerSprite: CheckUpdatePlayerSprite:
nop call .CheckForcedBiking
call .CheckBiking
jr c, .ok jr c, .ok
call .CheckSurfing call .CheckSurfing
jr c, .ok jr c, .ok
call .CheckSurfing2 call .ResetSurfingOrBikingState
jr c, .ok jr c, .ok
ret ret
@ -106,7 +105,7 @@ CheckUpdatePlayerSprite:
call UpdatePlayerSprite call UpdatePlayerSprite
ret ret
.CheckBiking: .CheckForcedBiking:
and a and a
ld hl, wBikeFlags ld hl, wBikeFlags
bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl] bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl]
@ -116,7 +115,7 @@ CheckUpdatePlayerSprite:
scf scf
ret ret
.CheckSurfing2: .ResetSurfingOrBikingState:
ld a, [wPlayerState] ld a, [wPlayerState]
cp PLAYER_NORMAL cp PLAYER_NORMAL
jr z, .nope jr z, .nope

12
home/map_objects.asm
View File

@ -78,13 +78,25 @@ GetPlayerTile::
ret ret
CheckOnWater:: CheckOnWater::
; return z if on water, nz otherwise.
; if tile permission is SPACE_TILE, wPlayerState dictates whether player is on water or not.
; otherwise the current tile permission being LAND_TILE or WATER_TILE dictates it.
ld a, [wPlayerTile] ld a, [wPlayerTile]
call GetTileCollision call GetTileCollision
cp SPACE_TILE
jr z, .check_player_state
sub WATER_TILE sub WATER_TILE
ret z ret z
and a and a
ret ret
.check_player_state
ld a, [wPlayerState]
cp PLAYER_SURF
ret z
cp PLAYER_SURF_PIKA
ret
GetTileCollision:: GetTileCollision::
; Get the collision type of tile a. ; Get the collision type of tile a.