Make separate tileset object, add similar collision files.

1 files changed, 233 insertions, 0 deletions

diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
new file mode 100644
index 00000000..201f2a51
--- /dev/null
+++ b/gfx/tilesets.asm
@@ -0,0 +1,233 @@
+INCLUDE "constants.asm"
+
+tilecoll: MACRO
+; used in data/tilesets/*_collision.asm
+	db COLL_\1, COLL_\2, COLL_\3, COLL_\4
+ENDM
+
+
+SECTION "Tileset Data 1", ROMX
+
+TilesetKantoMeta::
+INCBIN "data/tilesets/kanto_metatiles.bin"
+
+TilesetKantoColl::
+INCLUDE "data/tilesets/kanto_collision.asm"
+
+Tileset0GFX::
+TilesetJohtoGFX::
+INCBIN "gfx/tilesets/johto.2bpp.lz"
+
+Tileset0Meta::
+TilesetJohtoMeta::
+INCBIN "data/tilesets/johto_metatiles.bin"
+
+Tileset0Coll::
+TilesetJohtoColl::
+INCLUDE "data/tilesets/johto_collision.asm"
+
+TilesetJohtoModernGFX::
+INCBIN "gfx/tilesets/johto_modern.2bpp.lz"
+
+TilesetJohtoModernMeta::
+INCBIN "data/tilesets/johto_modern_metatiles.bin"
+
+TilesetJohtoModernColl::
+	dr $1a80c, $1b40c
+
+TilesetTraditionalHouseGFX::
+INCBIN "gfx/tilesets/traditional_house.2bpp.lz"
+
+TilesetTraditionalHouseMeta::
+INCBIN "data/tilesets/traditional_house_metatiles.bin"
+
+TilesetTraditionalHouseColl::
+INCLUDE "data/tilesets/traditional_house_collision.asm"
+
+
+SECTION "Tileset Data 2", ROMX
+
+TilesetGateGFX::
+INCBIN "gfx/tilesets/gate.2bpp.lz"
+
+TilesetGateMeta::
+INCBIN "data/tilesets/gate_metatiles.bin"
+
+TilesetGateColl::
+INCLUDE "data/tilesets/gate_collision.asm"
+
+TilesetPokecenterGFX::
+INCBIN "gfx/tilesets/pokecenter.2bpp.lz"
+
+TilesetPokecenterMeta::
+INCBIN "data/tilesets/pokecenter_metatiles.bin"
+
+TilesetPokecenterColl::
+INCLUDE "data/tilesets/pokecenter_collision.asm"
+
+TilesetPortGFX::
+INCBIN "gfx/tilesets/port.2bpp.lz"
+
+TilesetPortMeta::
+INCBIN "data/tilesets/port_metatiles.bin"
+
+TilesetPortColl::
+INCLUDE "data/tilesets/port_collision.asm"
+
+TilesetPlayersHouseGFX::
+INCBIN "gfx/tilesets/players_house.2bpp.lz"
+
+TilesetPlayersHouseMeta::
+INCBIN "data/tilesets/players_house_metatiles.bin"
+
+TilesetPlayersHouseColl::
+INCLUDE "data/tilesets/players_house_collision.asm"
+
+TilesetMansionGFX::
+INCBIN "gfx/tilesets/mansion.2bpp.lz"
+
+TilesetMansionMeta::
+INCBIN "data/tilesets/mansion_metatiles.bin"
+
+TilesetMansionColl::
+	dr $1eebc, $1efbc
+
+TilesetCaveGFX::
+INCBIN "gfx/tilesets/cave.2bpp.lz"
+
+TilesetCaveMeta::
+TilesetDarkCaveMeta::
+INCBIN "data/tilesets/cave_metatiles.bin"
+
+TilesetCaveColl::
+TilesetDarkCaveColl::
+INCLUDE "data/tilesets/cave_collision.asm"
+
+
+SECTION "Tileset Data 3", ROMX
+
+TilesetTowerGFX::
+INCBIN "gfx/tilesets/tower.2bpp.lz"
+
+TilesetTowerMeta::
+INCBIN "data/tilesets/tower_metatiles.bin"
+
+TilesetTowerColl::
+INCLUDE "data/tilesets/tower_collision.asm"
+
+TilesetLabGFX::
+INCBIN "gfx/tilesets/lab.2bpp.lz"
+
+TilesetLabMeta::
+INCBIN "data/tilesets/lab_metatiles.bin"
+
+TilesetLabColl::
+	dr $21281, $21381
+
+TilesetFacilityGFX::
+INCBIN "gfx/tilesets/facility.2bpp.lz"
+
+TilesetFacilityMeta::
+INCBIN "data/tilesets/facility_metatiles.bin"
+
+TilesetFacilityColl::
+INCLUDE "data/tilesets/facility_collision.asm"
+
+TilesetMartGFX::
+INCBIN "gfx/tilesets/mart.2bpp.lz"
+
+TilesetMartMeta::
+INCBIN "data/tilesets/mart_metatiles.bin"
+
+TilesetMartColl::
+	dr $22451, $22551
+
+TilesetGameCornerGFX::
+INCBIN "gfx/tilesets/game_corner.2bpp.lz"
+
+TilesetGameCornerMeta::
+INCBIN "data/tilesets/game_corner_metatiles.bin"
+
+TilesetGameCornerColl::
+INCLUDE "data/tilesets/game_corner_collision.asm"
+
+TilesetTrainStationGFX::
+INCBIN "gfx/tilesets/train_station.2bpp.lz"
+
+TilesetTrainStationMeta::
+INCBIN "data/tilesets/train_station_metatiles.bin"
+
+TilesetTrainStationColl::
+INCLUDE "data/tilesets/train_station_collision.asm"
+
+TilesetForestMeta::
+INCBIN "data/tilesets/forest_metatiles.bin"
+
+
+SECTION "Tileset Data 4", ROMX
+
+TilesetEliteFourRoomGFX::
+INCBIN "gfx/tilesets/elite_four_room.2bpp.lz"
+
+TilesetEliteFourRoomMeta::
+INCBIN "data/tilesets/elite_four_room_metatiles.bin"
+
+TilesetEliteFourRoomColl::
+INCLUDE "data/tilesets/elite_four_room_collision.asm"
+
+TilesetParkGFX::
+INCBIN "gfx/tilesets/park.2bpp.lz"
+
+TilesetParkMeta::
+INCBIN "data/tilesets/park_metatiles.bin"
+
+TilesetParkColl::
+INCLUDE "data/tilesets/park_collision.asm"
+
+TilesetRuinsOfAlphGFX::
+INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz"
+
+TilesetRuinsOfAlphMeta::
+INCBIN "data/tilesets/ruins_of_alph_metatiles.bin"
+
+TilesetRuinsOfAlphColl::
+	dr $31a70, $31b70
+
+TilesetRadioTowerGFX::
+INCBIN "gfx/tilesets/radio_tower.2bpp.lz"
+
+TilesetRadioTowerMeta::
+INCBIN "data/tilesets/radio_tower_metatiles.bin"
+
+TilesetRadioTowerColl::
+	dr $323c0, $324c0
+
+TilesetUndergroundGFX::
+INCBIN "gfx/tilesets/underground.2bpp.lz"
+
+TilesetUndergroundMeta::
+INCBIN "data/tilesets/underground_metatiles.bin"
+
+TilesetUndergroundColl::
+INCLUDE "data/tilesets/underground_collision.asm"
+
+TilesetIcePathGFX::
+INCBIN "gfx/tilesets/ice_path.2bpp.lz"
+
+TilesetIcePathMeta::
+INCBIN "data/tilesets/ice_path_metatiles.bin"
+
+TilesetIcePathColl::
+INCLUDE "data/tilesets/ice_path_collision.asm"
+
+TilesetDarkCaveGFX::
+INCBIN "gfx/tilesets/dark_cave.2bpp.lz"
+
+TilesetForestGFX::
+INCBIN "gfx/tilesets/forest.2bpp.lz"
+
+
+SECTION "Tileset Data 5", ROMX
+
+TilesetKantoGFX::
+INCBIN "gfx/tilesets/kanto.2bpp.lz"