From 9f5094d23eb6359370dea697f8b88dec122d73ee Mon Sep 17 00:00:00 2001 From: Thorn Avery Date: Sat, 23 Sep 2023 09:32:16 +1000 Subject: [PATCH] fix fishing in statues --- data/tilesets/water_tilesets.asm | 5 +++++ engine/items/item_effects.asm | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/data/tilesets/water_tilesets.asm b/data/tilesets/water_tilesets.asm index 6bf891c1..c5f0b6c0 100644 --- a/data/tilesets/water_tilesets.asm +++ b/data/tilesets/water_tilesets.asm @@ -12,3 +12,8 @@ WaterTilesets: db CITRINE db CELESTE db -1 ; end + +NonShoreTilesets: + db GYM + db SHIP_PORT + db -1 ; end diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 6f78ff14..8b5c7e4e 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -2942,9 +2942,11 @@ IsNextTileShoreOrWater: call IsInArray jr nc, .notShoreOrWater 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 - 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 jr z, .shoreOrWater cp $32 ; usual eastern shore tile