Move ShoreTiles and WaterTile into data/

Ohgrimm · Oct 5, 2022 · 2f00afe · 2f00afe
1 parent 5271a9f
commit 2f00afe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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: