aboutsummaryrefslogtreecommitdiffstats
path: root/data/tilesets/bookshelf_tile_ids.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-14 10:21:18 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-14 13:32:09 -0400
commitf37cf959c930ae9595f9f71ce0d9b17dcf5421d0 (patch)
tree33cc0d34fec73e972f4fb040b8b31f59b7e69805 /data/tilesets/bookshelf_tile_ids.asm
parentMerge pull request #269 from Rangi42/master (diff)
downloadpokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.tar.gz
pokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.tar.xz
pokeyellow-f37cf959c930ae9595f9f71ce0d9b17dcf5421d0.zip
Clean up some data, using macros for multiline list entries
Diffstat (limited to 'data/tilesets/bookshelf_tile_ids.asm')
-rw-r--r--data/tilesets/bookshelf_tile_ids.asm60
1 files changed, 24 insertions, 36 deletions
diff --git a/data/tilesets/bookshelf_tile_ids.asm b/data/tilesets/bookshelf_tile_ids.asm
index 535bf8e9..da340cdf 100644
--- a/data/tilesets/bookshelf_tile_ids.asm
+++ b/data/tilesets/bookshelf_tile_ids.asm
@@ -1,37 +1,25 @@
-; format: db tileset id, bookshelf tile id, text id
+bookshelf_tile: MACRO
+ db \1, \2
+ db_tx_pre \3
+ENDM
+
BookshelfTileIDs:
- db PLATEAU, $30
- db_tx_pre IndigoPlateauStatues
- db HOUSE, $3D
- db_tx_pre TownMapText
- db HOUSE, $1E
- db_tx_pre BookOrSculptureText
- db MANSION, $32
- db_tx_pre BookOrSculptureText
- db REDS_HOUSE_1, $32
- db_tx_pre BookOrSculptureText
- db LAB, $28
- db_tx_pre BookOrSculptureText
- db LOBBY, $16
- db_tx_pre ElevatorText
- db GYM, $1D
- db_tx_pre BookOrSculptureText
- db DOJO, $1D
- db_tx_pre BookOrSculptureText
- db GATE, $22
- db_tx_pre BookOrSculptureText
- db MART, $54
- db_tx_pre PokemonStuffText
- db MART, $55
- db_tx_pre PokemonStuffText
- db POKECENTER, $54
- db_tx_pre PokemonStuffText
- db POKECENTER, $55
- db_tx_pre PokemonStuffText
- db LOBBY, $50
- db_tx_pre PokemonStuffText
- db LOBBY, $52
- db_tx_pre PokemonStuffText
- db SHIP, $36
- db_tx_pre BookOrSculptureText
- db $FF
+; tileset id, bookshelf tile id, text id
+ bookshelf_tile PLATEAU, $30, IndigoPlateauStatues
+ bookshelf_tile HOUSE, $3D, TownMapText
+ bookshelf_tile HOUSE, $1E, BookOrSculptureText
+ bookshelf_tile MANSION, $32, BookOrSculptureText
+ bookshelf_tile REDS_HOUSE_1, $32, BookOrSculptureText
+ bookshelf_tile LAB, $28, BookOrSculptureText
+ bookshelf_tile LOBBY, $16, ElevatorText
+ bookshelf_tile GYM, $1D, BookOrSculptureText
+ bookshelf_tile DOJO, $1D, BookOrSculptureText
+ bookshelf_tile GATE, $22, BookOrSculptureText
+ bookshelf_tile MART, $54, PokemonStuffText
+ bookshelf_tile MART, $55, PokemonStuffText
+ bookshelf_tile POKECENTER, $54, PokemonStuffText
+ bookshelf_tile POKECENTER, $55, PokemonStuffText
+ bookshelf_tile LOBBY, $50, PokemonStuffText
+ bookshelf_tile LOBBY, $52, PokemonStuffText
+ bookshelf_tile SHIP, $36, BookOrSculptureText
+ db -1 ; end