fix fishing in statues

This commit is contained in:
Thorn Avery 2023-09-23 09:32:16 +10:00
parent 2670abaf56
commit 9f5094d23e
2 changed files with 9 additions and 2 deletions

View file

@ -12,3 +12,8 @@ WaterTilesets:
db CITRINE db CITRINE
db CELESTE db CELESTE
db -1 ; end db -1 ; end
NonShoreTilesets:
db GYM
db SHIP_PORT
db -1 ; end

View file

@ -2942,9 +2942,11 @@ IsNextTileShoreOrWater:
call IsInArray call IsInArray
jr nc, .notShoreOrWater jr nc, .notShoreOrWater
ld a, [wCurMapTileset] ld a, [wCurMapTileset]
cp SHIP_PORT ; Vermilion Dock tileset ld hl, NonShoreTilesets
ld de, 1
call IsInArray ; check if shore tiles should be skipped
ld a, [wTileInFrontOfPlayer] ; tile in front of player ld a, [wTileInFrontOfPlayer] ; tile in front of player
jr z, .skipShoreTiles ; if it's the Vermilion Dock tileset jr c, .skipShoreTiles ; if it's the Vermilion Dock tileset
cp $48 ; eastern shore tile in Safari Zone cp $48 ; eastern shore tile in Safari Zone
jr z, .shoreOrWater jr z, .shoreOrWater
cp $32 ; usual eastern shore tile cp $32 ; usual eastern shore tile