Finish home cleanup, identify tileset data, other misc cleanups.

3 files changed, 43 insertions, 32 deletions

diff --git a/data/events/unused_pokemonpc_menudata.asm b/data/events/unused_pokemonpc_menudata.asm
deleted file mode 100644
index 24c23c24..00000000
--- a/data/events/unused_pokemonpc_menudata.asm
+++ /dev/null
@@ -1,30 +0,0 @@
-UnusedMenuData156be:
-	db $06, $00, $4a, $06, $06, $50, $06, $06, $58, $1e, $40, $00, $00, $c7, $40
-	db $06, $00, $4a, $06, $06, $50, $06, $06, $58, $4a, $40, $00, $00, $c7, $40
-	db $06, $06, $5a, $06, $0c, $60, $06, $0c, $68, $1e, $40, $00, $00, $f7, $40
-	db $70, $07, $44, $06, $00, $40, $06, $00, $48, $1e, $40, $00, $00, $97, $40
-	db $37, $33, $61, $37, $d3, $65, $37, $d3, $69, $8e, $42, $00, $00, $27, $41
-	db $07, $4c, $5e, $07, $2c, $62, $07, $2c, $66, $8e, $42, $00, $00, $57, $41
-	db $07, $0c, $4c, $07, $3c, $50, $07, $3c, $54, $8e, $42, $00, $00, $87, $41
-	db $07, $0c, $43, $07, $0c, $47, $07, $0c, $4b, $8e, $42, $00, $00, $b7, $41
-	db $07, $3c, $55, $07, $4c, $59, $07, $4c, $5d, $d6, $40, $00, $00, $e7, $41
-	db $08, $b1, $4a, $08, $81, $4e, $08, $81, $52, $8e, $42, $00, $00, $17, $42
-	db $08, $81, $53, $08, $a1, $57, $08, $a1, $5b, $8e, $42, $00, $00, $47, $42
-	db $08, $a1, $5c, $08, $51, $60, $08, $51, $64, $8e, $42, $00, $00, $77, $42
-	db $07, $2c, $67, $07, $bc, $6a, $07, $bc, $6e, $8e, $42, $00, $00, $a7, $42
-	db $08, $51, $65, $08, $51, $69, $08, $51, $6d, $8e, $42, $00, $00, $d7, $42
-	db $0c, $00, $40, $0c, $e0, $44, $0c, $e0, $48, $06, $41, $00, $00, $07, $43
-	db $06, $0c, $74, $06, $bc, $78, $06, $bc, $7c, $8e, $42, $00, $00, $37, $43
-	db $08, $51, $6e, $08, $f1, $71, $08, $f1, $75, $8e, $42, $00, $00, $57, $44
-	db $37, $73, $57, $37, $33, $5c, $37, $33, $60, $8e, $42, $00, $00, $b7, $44
-	db $37, $d3, $6a, $37, $d3, $6e, $37, $d3, $72, $8e, $42, $00, $00, $e7, $44
-	db $37, $d3, $73, $37, $93, $78, $37, $93, $7c, $8e, $42, $00, $00, $17, $45
-	db $08, $81, $41, $08, $b1, $45, $08, $b1, $49, $26, $42, $00, $00, $67, $43
-	db $07, $bc, $6f, $07, $4c, $73, $07, $4c, $77, $8e, $41, $00, $00, $97, $43
-	db $0c, $e0, $49, $0c, $40, $4e, $0c, $40, $52, $1e, $40, $00, $00, $c7, $43
-	db $0c, $40, $53, $0c, $70, $56, $0c, $70, $5a, $8e, $42, $00, $00, $f7, $43
-	db $0c, $70, $5b, $0c, $c0, $5f, $0c, $c0, $63, $8e, $42, $00, $00, $27, $44
-	db $0c, $c0, $64, $0c, $90, $68, $0c, $90, $6c, $8e, $42, $00, $00, $87, $44
-	db $0c, $90, $6d, $0c, $d0, $71, $0c, $d0, $75, $da, $41, $00, $00, $77, $45
-	db $0c, $d0, $76, $07, $4c, $73, $07, $4c, $77, $8e, $41, $00, $00, $97, $43
-	db $0c, $10, $7a, $08, $f1, $76, $37, $93, $7d, $1e, $40, $00, $00, $a7, $45
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index 29f29355..7df01575 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -994,5 +994,3 @@ DragonsDenB1F_Blocks:
 
 TohjoFalls_Blocks:
 	INCBIN "maps/TohjoFalls.blk"
-
-	dr $dd773, $dfe92 ; XXX Probably not blockdata?
diff --git a/data/tilesets.asm b/data/tilesets.asm
new file mode 100644
index 00000000..bc1f1b2f
--- /dev/null
+++ b/data/tilesets.asm
@@ -0,0 +1,43 @@
+tileset: MACRO
+	dba \1GFX, \1Meta, \1Coll
+	dw \1Anim
+	dw NULL
+	dw \1PalMap
+ENDM
+
+; Associated data:
+; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm
+; - The *PalMap are defined in gfx/tileset_palette_maps.asm
+; - The *Anim are defined in engine/tilesets/tileset_anims.asm
+
+Tilesets::
+; entries correspond to TILESET_* constants
+	tileset Tileset0
+	tileset TilesetJohto
+	tileset TilesetJohtoModern
+	tileset TilesetKanto
+	tileset TilesetHouse
+	tileset TilesetPlayersHouse
+	tileset TilesetPokecenter
+	tileset TilesetGate
+	tileset TilesetPort
+	tileset TilesetLab
+	tileset TilesetFacility
+	tileset TilesetMart
+	tileset TilesetMansion
+	tileset TilesetGameCorner
+	tileset TilesetEliteFourRoom
+	tileset TilesetTraditionalHouse
+	tileset TilesetTrainStation
+	tileset TilesetChampionsRoom
+	tileset TilesetLighthouse
+	tileset TilesetPlayersRoom
+	tileset TilesetTower
+	tileset TilesetCave
+	tileset TilesetPark
+	tileset TilesetRuinsOfAlph
+	tileset TilesetRadioTower
+	tileset TilesetUnderground
+	tileset TilesetIcePath
+	tileset TilesetDarkCave
+	tileset TilesetForest