From 2f00afe9352ff9b71d5854f18ca5356905cf2ef8 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 5 Oct 2022 07:20:54 -0400 Subject: Move `ShoreTiles` and `WaterTile` into data/ --- data/tilesets/water_tilesets.asm | 9 +++++++++ engine/items/item_effects.asm | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/data/tilesets/water_tilesets.asm b/data/tilesets/water_tilesets.asm index 8abdce39..252a3924 100644 --- a/data/tilesets/water_tilesets.asm +++ b/data/tilesets/water_tilesets.asm @@ -10,3 +10,12 @@ WaterTilesets: db FACILITY db PLATEAU db -1 ; end + +; tiles that allow surfing and fishing, +; depending on the tileset (see IsNextTileShoreOrWater) +ShoreTiles: + db $48, $32 + ; fallthrough +WaterTile: + db $14 + db -1 ; end diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index c2ff34dc..c495f991 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -3119,13 +3119,6 @@ IsNextTileShoreOrWater:: INCLUDE "data/tilesets/water_tilesets.asm" -; shore tiles -ShoreTiles: - db $48, $32 -WaterTile: - db $14 - db $ff ; terminator - ; reloads map view and processes sprite data ; for items that cause the overworld to be displayed ItemUseReloadOverworldData: -- cgit v1.3.1-sl0p