diff options
Diffstat (limited to 'gfx/tilesets.asm')
| -rw-r--r-- | gfx/tilesets.asm | 324 |
1 files changed, 113 insertions, 211 deletions
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index f6d6b465f..c4071349c 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -6,430 +6,332 @@ ENDM SECTION "Tileset Data 1", ROMX -TilesetKantoGFX: ; 0x18000 +TilesetKantoGFX: INCBIN "gfx/tilesets/kanto.2bpp.lz" -; 0x18606 -TilesetKantoMeta: ; 0x18606 +TilesetKantoMeta: INCBIN "data/tilesets/kanto_metatiles.bin" -; 0x18e06 -TilesetKantoColl: ; 0x18e06 +TilesetKantoColl: INCLUDE "data/tilesets/kanto_collision.asm" -; 0x19006 -Tileset0GFX: ; 0x19006 -TilesetJohtoGFX: ; 0x19006 +Tileset0GFX: +TilesetJohtoGFX: INCBIN "gfx/tilesets/johto.2bpp.lz" -; 0x19c0e -Tileset0Meta: ; 0x19c0e -TilesetJohtoMeta: ; 0x19c0e +Tileset0Meta: +TilesetJohtoMeta: INCBIN "data/tilesets/johto_metatiles.bin" -; 0x1a40e -Tileset0Coll: ; 0x1a40e -TilesetJohtoColl: ; 0x1a40e +Tileset0Coll: +TilesetJohtoColl: INCLUDE "data/tilesets/johto_collision.asm" -; 0x1a60e -TilesetIcePathGFX: ; 0x1a60e +TilesetIcePathGFX: INCBIN "gfx/tilesets/ice_path.2bpp.lz" -; 0x1af3e -TilesetIcePathMeta: ; 0x1af3e +TilesetIcePathMeta: INCBIN "data/tilesets/ice_path_metatiles.bin" -; 0x1b33e -TilesetIcePathColl: ; 0x1b33e +TilesetIcePathColl: INCLUDE "data/tilesets/ice_path_collision.asm" -; 0x1b43e -TilesetPlayersRoomGFX: ; 0x1b43e +TilesetPlayersRoomGFX: INCBIN "gfx/tilesets/players_room.2bpp.lz" -; 0x1b8fe -TilesetPlayersRoomMeta: ; 0x1b8fe +TilesetPlayersRoomMeta: INCBIN "data/tilesets/players_room_metatiles.bin" -; 0x1bcfe -TilesetPlayersRoomColl: ; 0x1bcfe +TilesetPlayersRoomColl: INCLUDE "data/tilesets/players_room_collision.asm" -; 0x1bdfe SECTION "Tileset Data 2", ROMX -TilesetPokecenterGFX: ; 0x1c30c +TilesetPokecenterGFX: INCBIN "gfx/tilesets/pokecenter.2bpp.lz" -; 0x1c73c -TilesetPokecenterMeta: ; 0x1c73c +TilesetPokecenterMeta: INCBIN "data/tilesets/pokecenter_metatiles.bin" -; 0x1cb3c -TilesetPokecenterColl: ; 0x1cb3c +TilesetPokecenterColl: INCLUDE "data/tilesets/pokecenter_collision.asm" -; 0x1cc3c -TilesetPortGFX: ; 0x1cc3c +TilesetPortGFX: INCBIN "gfx/tilesets/port.2bpp.lz" -; 0x1d04c -TilesetPortMeta: ; 0x1d04c +TilesetPortMeta: INCBIN "data/tilesets/port_metatiles.bin" -; 0x1d44c -TilesetPortColl: ; 0x1d44c +TilesetPortColl: INCLUDE "data/tilesets/port_collision.asm" -; 0x1d54c -TilesetPlayersHouseGFX: ; 0x1d54c +TilesetPlayersHouseGFX: INCBIN "gfx/tilesets/players_house.2bpp.lz" -; 0x1d92c -TilesetPlayersHouseMeta: ; 0x1d92c +TilesetPlayersHouseMeta: INCBIN "data/tilesets/players_house_metatiles.bin" -; 0x1dd2c -TilesetPlayersHouseColl: ; 0x1dd2c +TilesetPlayersHouseColl: INCLUDE "data/tilesets/players_house_collision.asm" -; 0x1de2c -TilesetMansionGFX: ; 0x1de2c +TilesetMansionGFX: INCBIN "gfx/tilesets/mansion.2bpp.lz" -; 0x1e58c -TilesetMansionMeta: ; 0x1e58c +TilesetMansionMeta: INCBIN "data/tilesets/mansion_metatiles.bin" -; 0x1e98c -TilesetMansionColl: ; 0x1e98c +TilesetMansionColl: INCLUDE "data/tilesets/mansion_collision.asm" -; 0x1ea8c -TilesetCaveGFX: ; 0x1ea8c +TilesetCaveGFX: INCBIN "gfx/tilesets/cave.2bpp.lz" -; 0x1ee1c -TilesetCaveMeta: ; 0x1ee1c -TilesetDarkCaveMeta: ; 0x1ee1c +TilesetCaveMeta: +TilesetDarkCaveMeta: INCBIN "data/tilesets/cave_metatiles.bin" -; 0x1f21c -TilesetCaveColl: ; 0x1f21c -TilesetDarkCaveColl: ; 0x1f21c +TilesetCaveColl: +TilesetDarkCaveColl: INCLUDE "data/tilesets/cave_collision.asm" -; 0x1f31c SECTION "Tileset Data 3", ROMX -TilesetTowerGFX: ; 0x20181 +TilesetTowerGFX: INCBIN "gfx/tilesets/tower.2bpp.lz" -; 0x206e1 -TilesetTowerMeta: ; 0x206e1 +TilesetTowerMeta: INCBIN "data/tilesets/tower_metatiles.bin" -; 0x20ae1 -TilesetTowerColl: ; 0x20ae1 +TilesetTowerColl: INCLUDE "data/tilesets/tower_collision.asm" -; 0x20be1 -TilesetLabGFX: ; 0x20be1 +TilesetLabGFX: INCBIN "gfx/tilesets/lab.2bpp.lz" -; 0x213e1 -TilesetLabMeta: ; 0x213e1 +TilesetLabMeta: INCBIN "data/tilesets/lab_metatiles.bin" -; 0x217e1 -TilesetLabColl: ; 0x217e1 +TilesetLabColl: INCLUDE "data/tilesets/lab_collision.asm" -; 0x218e1 -TilesetMartGFX: ; 0x218e1 +TilesetMartGFX: INCBIN "gfx/tilesets/mart.2bpp.lz" -; 0x22031 -TilesetMartMeta: ; 0x22031 +TilesetMartMeta: INCBIN "data/tilesets/mart_metatiles.bin" -; 0x22431 -TilesetMartColl: ; 0x22431 +TilesetMartColl: INCLUDE "data/tilesets/mart_collision.asm" -; 0x22531 -TilesetGameCornerGFX: ; 0x22531 +TilesetGameCornerGFX: INCBIN "gfx/tilesets/game_corner.2bpp.lz" -; 0x22af1 -TilesetGameCornerMeta: ; 0x22af1 +TilesetGameCornerMeta: INCBIN "data/tilesets/game_corner_metatiles.bin" -; 0x22ef1 -TilesetGameCornerColl: ; 0x22ef1 +TilesetGameCornerColl: INCLUDE "data/tilesets/game_corner_collision.asm" -; 0x22ff1 -TilesetTrainStationGFX: ; 0x22ff1 +TilesetTrainStationGFX: INCBIN "gfx/tilesets/train_station.2bpp.lz" -; 0x23391 -TilesetTrainStationMeta: ; 0x23391 +TilesetTrainStationMeta: INCBIN "data/tilesets/train_station_metatiles.bin" -; 0x23791 -TilesetTrainStationColl: ; 0x23791 +TilesetTrainStationColl: INCLUDE "data/tilesets/train_station_collision.asm" -; 0x23891 -TilesetForestMeta: ; 0x23891 +TilesetForestMeta: INCBIN "data/tilesets/forest_metatiles.bin" -; 0x23b11 SECTION "Tileset Data 4", ROMX -TilesetEliteFourRoomGFX: ; 0x30000 +TilesetEliteFourRoomGFX: INCBIN "gfx/tilesets/elite_four_room.2bpp.lz" -; 0x304e0 -TilesetEliteFourRoomMeta: ; 0x304e0 +TilesetEliteFourRoomMeta: INCBIN "data/tilesets/elite_four_room_metatiles.bin" -; 0x308e0 -TilesetEliteFourRoomColl: ; 0x308e0 +TilesetEliteFourRoomColl: INCLUDE "data/tilesets/elite_four_room_collision.asm" -; 0x309e0 -TilesetParkGFX: ; 0x309e0 +TilesetParkGFX: INCBIN "gfx/tilesets/park.2bpp.lz" -; 0x30e80 -TilesetParkMeta: ; 0x30e80 +TilesetParkMeta: INCBIN "data/tilesets/park_metatiles.bin" -; 0x31280 -TilesetParkColl: ; 0x31280 +TilesetParkColl: INCLUDE "data/tilesets/park_collision.asm" -; 0x31380 -TilesetRadioTowerGFX: ; 0x31380 +TilesetRadioTowerGFX: INCBIN "gfx/tilesets/radio_tower.2bpp.lz" -; 0x318e0 -TilesetRadioTowerMeta: ; 0x318e0 +TilesetRadioTowerMeta: INCBIN "data/tilesets/radio_tower_metatiles.bin" -; 0x31ce0 -TilesetRadioTowerColl: ; 0x31ce0 +TilesetRadioTowerColl: INCLUDE "data/tilesets/radio_tower_collision.asm" -; 0x31de0 -TilesetUndergroundGFX: ; 0x31de0 +TilesetUndergroundGFX: INCBIN "gfx/tilesets/underground.2bpp.lz" -; 0x321b0 -TilesetUndergroundMeta: ; 0x321b0 +TilesetUndergroundMeta: INCBIN "data/tilesets/underground_metatiles.bin" -; 0x325b0 -TilesetUndergroundColl: ; 0x325b0 +TilesetUndergroundColl: INCLUDE "data/tilesets/underground_collision.asm" -; 0x326b0 -TilesetDarkCaveGFX: ; 0x326b0 +TilesetDarkCaveGFX: INCBIN "gfx/tilesets/dark_cave.2bpp.lz" -; 0x329f0 -UnusedTilesetDarkCaveMeta: ; 0x329f0 +UnusedTilesetDarkCaveMeta: INCBIN "data/tilesets/unused_dark_cave_metatiles.bin" -; 0x331f0 -UnusedTilesetDarkCaveColl: ; 0x331f0 +UnusedTilesetDarkCaveColl: INCLUDE "data/tilesets/unused_dark_cave_collision.asm" -; 0x333f0 SECTION "Tileset Data 5", ROMX -TilesetPokeComCenterGFX: ; 0xb4000 +TilesetPokeComCenterGFX: INCBIN "gfx/tilesets/pokecom_center.2bpp.lz" -; 0xb48a0 -TilesetPokeComCenterMeta: ; 0xb48a0 +TilesetPokeComCenterMeta: INCBIN "data/tilesets/pokecom_center_metatiles.bin" -; 0xb4ca0 -TilesetPokeComCenterColl: ; 0xb4ca0 +TilesetPokeComCenterColl: INCLUDE "data/tilesets/pokecom_center_collision.asm" -; 0xb4da0 -TilesetBattleTowerGFX: ; 0xb4da0 +TilesetBattleTowerGFX: INCBIN "gfx/tilesets/battle_tower.2bpp.lz" -; 0xb50e0 -TilesetBattleTowerMeta: ; 0xb50e0 +TilesetBattleTowerMeta: INCBIN "data/tilesets/battle_tower_metatiles.bin" -; 0xb54e0 -TilesetBattleTowerColl: ; 0xb54e0 +TilesetBattleTowerColl: INCLUDE "data/tilesets/battle_tower_collision.asm" -; 0xb55e0 -TilesetGateGFX: ; 0xb55e0 +TilesetGateGFX: INCBIN "gfx/tilesets/gate.2bpp.lz" -; 0xb59e0 -TilesetGateMeta: ; 0xb59e0 +TilesetGateMeta: INCBIN "data/tilesets/gate_metatiles.bin" -; 0xb5de0 -TilesetGateColl: ; 0xb5de0 +TilesetGateColl: INCLUDE "data/tilesets/gate_collision.asm" -; 0xb5ee0 -TilesetJohtoModernGFX: ; 0xb5ee0 -TilesetBattleTowerOutsideGFX: ; 0xb5ee0 +TilesetJohtoModernGFX: +TilesetBattleTowerOutsideGFX: INCBIN "gfx/tilesets/johto_modern.2bpp.lz" -; 0xb6ae8 -TilesetJohtoModernMeta: ; 0xb6ae8 +TilesetJohtoModernMeta: INCBIN "data/tilesets/johto_modern_metatiles.bin" -; 0xb72e8 -TilesetJohtoModernColl: ; 0xb72e8 +TilesetJohtoModernColl: INCLUDE "data/tilesets/johto_modern_collision.asm" -; 0xb74e8 -TilesetTraditionalHouseGFX: ; 0xb74e8 +TilesetTraditionalHouseGFX: INCBIN "gfx/tilesets/traditional_house.2bpp.lz" -; 0xb79a8 -TilesetTraditionalHouseMeta: ; 0xb79a8 +TilesetTraditionalHouseMeta: INCBIN "data/tilesets/traditional_house_metatiles.bin" -; 0xb7da8 -TilesetTraditionalHouseColl: ; 0xb7da8 +TilesetTraditionalHouseColl: INCLUDE "data/tilesets/traditional_house_collision.asm" -; 0xb7ea8 SECTION "Tileset Data 6", ROMX -TilesetForestGFX: ; 0xdc000 +TilesetForestGFX: INCBIN "gfx/tilesets/forest.2bpp.lz" -; 0xdc3d0 -TilesetChampionsRoomGFX: ; 0xdc3d0 +TilesetChampionsRoomGFX: INCBIN "gfx/tilesets/champions_room.2bpp.lz" -; 0xdcc50 -TilesetChampionsRoomMeta: ; 0xdcc50 +TilesetChampionsRoomMeta: INCBIN "data/tilesets/champions_room_metatiles.bin" -; 0xdd050 -TilesetChampionsRoomColl: ; 0xdd050 +TilesetChampionsRoomColl: INCLUDE "data/tilesets/champions_room_collision.asm" -; 0xdd150 -TilesetHouseGFX: ; 0xdd150 +TilesetHouseGFX: INCBIN "gfx/tilesets/house.2bpp.lz" -; 0xdd600 -TilesetHouseMeta: ; 0xdd600 +TilesetHouseMeta: INCBIN "data/tilesets/house_metatiles.bin" -; 0xdda00 -TilesetHouseColl: ; 0xdda00 +TilesetHouseColl: INCLUDE "data/tilesets/house_collision.asm" -; 0xddb00 -TilesetLighthouseGFX: ; 0xddb00 +TilesetLighthouseGFX: INCBIN "gfx/tilesets/lighthouse.2bpp.lz" -; 0xddf70 -TilesetLighthouseMeta: ; 0xddf70 +TilesetLighthouseMeta: INCBIN "data/tilesets/lighthouse_metatiles.bin" -; 0xde370 -TilesetLighthouseColl: ; 0xde370 +TilesetLighthouseColl: INCLUDE "data/tilesets/lighthouse_collision.asm" -; 0xde470 -TilesetForestColl: ; 0xde470 +TilesetForestColl: INCLUDE "data/tilesets/forest_collision.asm" -; 0xde570 -TilesetFacilityGFX: ; 0xde570 +TilesetFacilityGFX: INCBIN "gfx/tilesets/facility.2bpp.lz" -; 0xde990 -TilesetFacilityMeta: ; 0xde990 +TilesetFacilityMeta: INCBIN "data/tilesets/facility_metatiles.bin" -; 0xded90 -TilesetFacilityColl: ; 0xded90 +TilesetFacilityColl: INCLUDE "data/tilesets/facility_collision.asm" -; 0xdee90 -TilesetBattleTowerOutsideMeta: ; 0xdee90 +TilesetBattleTowerOutsideMeta: INCBIN "data/tilesets/battle_tower_outside_metatiles.bin" -; 0xdf690 -TilesetBattleTowerOutsideColl: ; 0xdf690 +TilesetBattleTowerOutsideColl: INCLUDE "data/tilesets/battle_tower_outside_collision.asm" -; 0xdf890 -TilesetBetaWordRoomMeta: ; 0xdf890 +TilesetBetaWordRoomMeta: INCBIN "data/tilesets/beta_word_room_metatiles.bin" -; 0xdfc90 -TilesetBetaWordRoomColl: ; 0xdfc90 -TilesetHoOhWordRoomColl: ; 0xdfc90 -TilesetKabutoWordRoomColl: ; 0xdfc90 -TilesetOmanyteWordRoomColl: ; 0xdfc90 -TilesetAerodactylWordRoomColl: ; 0xdfc90 +TilesetBetaWordRoomColl: +TilesetHoOhWordRoomColl: +TilesetKabutoWordRoomColl: +TilesetOmanyteWordRoomColl: +TilesetAerodactylWordRoomColl: INCLUDE "data/tilesets/beta_word_room_collision.asm" -; 0xdfd90 SECTION "Tileset Data 7", ROMX -TilesetRuinsOfAlphGFX: ; 0x1dc5a1 -TilesetBetaWordRoomGFX: ; 0x1dc5a1 -TilesetHoOhWordRoomGFX: ; 0x1dc5a1 -TilesetKabutoWordRoomGFX: ; 0x1dc5a1 -TilesetOmanyteWordRoomGFX: ; 0x1dc5a1 -TilesetAerodactylWordRoomGFX: ; 0x1dc5a1 +TilesetRuinsOfAlphGFX: +TilesetBetaWordRoomGFX: +TilesetHoOhWordRoomGFX: +TilesetKabutoWordRoomGFX: +TilesetOmanyteWordRoomGFX: +TilesetAerodactylWordRoomGFX: INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz" -; 0x1dd1a9 -TilesetRuinsOfAlphMeta: ; 0x1dd1a9 +TilesetRuinsOfAlphMeta: INCBIN "data/tilesets/ruins_of_alph_metatiles.bin" -; 0x1dd5a9 -TilesetRuinsOfAlphColl: ; 0x1dd5a9 +TilesetRuinsOfAlphColl: INCLUDE "data/tilesets/ruins_of_alph_collision.asm" -; 0x1dd6a9 SECTION "Tileset Data 8", ROMX -TilesetHoOhWordRoomMeta: ; 0x1e0000 +TilesetHoOhWordRoomMeta: INCBIN "data/tilesets/ho_oh_word_room_metatiles.bin" -; 0x1e0400 -TilesetKabutoWordRoomMeta: ; 0x1e0400 +TilesetKabutoWordRoomMeta: INCBIN "data/tilesets/kabuto_word_room_metatiles.bin" -; 0x1e0800 -TilesetOmanyteWordRoomMeta: ; 0x1e0800 +TilesetOmanyteWordRoomMeta: INCBIN "data/tilesets/omanyte_word_room_metatiles.bin" -; 0x1e0c00 -TilesetAerodactylWordRoomMeta: ; 0x1e0c00 +TilesetAerodactylWordRoomMeta: INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin" -; 0x1e1000 |