diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-10-05 07:20:54 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-10-05 07:20:54 -0400 |
| commit | 2f00afe9352ff9b71d5854f18ca5356905cf2ef8 (patch) | |
| tree | d0b1377b835ad702db9cc2e37614e1df600de587 | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| download | pokeyellow-2f00afe9352ff9b71d5854f18ca5356905cf2ef8.tar.gz pokeyellow-2f00afe9352ff9b71d5854f18ca5356905cf2ef8.tar.xz pokeyellow-2f00afe9352ff9b71d5854f18ca5356905cf2ef8.zip | |
Move `ShoreTiles` and `WaterTile` into data/
| -rw-r--r-- | data/tilesets/water_tilesets.asm | 9 | ||||
| -rw-r--r-- | 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: |