diff options
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/tilesets.asm | 148 | ||||
| -rw-r--r-- | gfx/tilesets/champions_room.2bpp.lz.93800351 (renamed from gfx/tilesets/olivine_gym.2bpp.lz.93800351) | bin | 2176 -> 2176 bytes | |||
| -rw-r--r-- | gfx/tilesets/champions_room.png (renamed from gfx/tilesets/olivine_gym.png) | bin | 2267 -> 2267 bytes | |||
| -rw-r--r-- | gfx/tilesets/champions_room_palette_map.asm (renamed from gfx/tilesets/olivine_gym_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6 (renamed from gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6) | bin | 832 -> 832 bytes | |||
| -rw-r--r-- | gfx/tilesets/dark_cave.png (renamed from gfx/tilesets/whirl_islands.png) | bin | 840 -> 840 bytes | |||
| -rw-r--r-- | gfx/tilesets/dark_cave_palette_map.asm (renamed from gfx/tilesets/whirl_islands_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f (renamed from gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f) | bin | 1248 -> 1248 bytes | |||
| -rw-r--r-- | gfx/tilesets/elite_four_room.png (renamed from gfx/tilesets/gym_1.png) | bin | 1272 -> 1272 bytes | |||
| -rw-r--r-- | gfx/tilesets/elite_four_room_palette_map.asm (renamed from gfx/tilesets/gym_1_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/facility.2bpp.lz.454cfd8b (renamed from gfx/tilesets/power_plant.2bpp.lz.454cfd8b) | bin | 1056 -> 1056 bytes | |||
| -rw-r--r-- | gfx/tilesets/facility.png (renamed from gfx/tilesets/power_plant.png) | bin | 1123 -> 1123 bytes | |||
| -rw-r--r-- | gfx/tilesets/facility_palette_map.asm (renamed from gfx/tilesets/power_plant_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/forest.2bpp.lz.6b0ac896 (renamed from gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896) | bin | 976 -> 976 bytes | |||
| -rw-r--r-- | gfx/tilesets/forest.png (renamed from gfx/tilesets/ilex_forest.png) | bin | 1214 -> 1214 bytes | |||
| -rw-r--r-- | gfx/tilesets/forest_palette_map.asm (renamed from gfx/tilesets/ilex_forest_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/house.2bpp.lz.c848ef13 (renamed from gfx/tilesets/house_1.2bpp.lz.c848ef13) | bin | 1200 -> 1200 bytes | |||
| -rw-r--r-- | gfx/tilesets/house.pal (renamed from gfx/tilesets/house_1.pal) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/house.png (renamed from gfx/tilesets/house_1.png) | bin | 1254 -> 1254 bytes | |||
| -rw-r--r-- | gfx/tilesets/house_palette_map.asm (renamed from gfx/tilesets/house_1_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/johto.2bpp.lz.0c7e555a (renamed from gfx/tilesets/johto_1.2bpp.lz.0c7e555a) | bin | 3080 -> 3080 bytes | |||
| -rw-r--r-- | gfx/tilesets/johto.png (renamed from gfx/tilesets/johto_1.png) | bin | 2044 -> 2044 bytes | |||
| -rw-r--r-- | gfx/tilesets/johto_modern.2bpp.lz.391603fb (renamed from gfx/tilesets/johto_2.2bpp.lz.391603fb) | bin | 3080 -> 3080 bytes | |||
| -rw-r--r-- | gfx/tilesets/johto_modern.png (renamed from gfx/tilesets/johto_2.png) | bin | 2324 -> 2324 bytes | |||
| -rw-r--r-- | gfx/tilesets/johto_modern_palette_map.asm (renamed from gfx/tilesets/johto_2_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/johto_palette_map.asm (renamed from gfx/tilesets/johto_1_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/mansion.2bpp.lz.63b414d4 (renamed from gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4) | bin | 1888 -> 1888 bytes | |||
| -rw-r--r-- | gfx/tilesets/mansion.png (renamed from gfx/tilesets/celadon_mansion.png) | bin | 2047 -> 2047 bytes | |||
| -rw-r--r-- | gfx/tilesets/mansion_1.pal (renamed from gfx/tilesets/celadon_mansion_1.pal) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/mansion_2.pal (renamed from gfx/tilesets/celadon_mansion_2.pal) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/mansion_palette_map.asm (renamed from gfx/tilesets/celadon_mansion_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/palette_maps.asm | 46 | ||||
| -rw-r--r-- | gfx/tilesets/players_room.2bpp.lz.35e51007 (renamed from gfx/tilesets/players_house_2f.2bpp.lz.35e51007) | bin | 1216 -> 1216 bytes | |||
| -rw-r--r-- | gfx/tilesets/players_room.png (renamed from gfx/tilesets/players_house_2f.png) | bin | 1221 -> 1221 bytes | |||
| -rw-r--r-- | gfx/tilesets/players_room_palette_map.asm (renamed from gfx/tilesets/players_house_2f_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/tower-pillar/1.png (renamed from gfx/tilesets/sprout-pillar/1.png) | bin | 137 -> 137 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower-pillar/10.png (renamed from gfx/tilesets/sprout-pillar/10.png) | bin | 118 -> 118 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower-pillar/2.png (renamed from gfx/tilesets/sprout-pillar/2.png) | bin | 133 -> 133 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower-pillar/3.png (renamed from gfx/tilesets/sprout-pillar/3.png) | bin | 127 -> 127 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower-pillar/4.png (renamed from gfx/tilesets/sprout-pillar/4.png) | bin | 130 -> 130 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower-pillar/5.png (renamed from gfx/tilesets/sprout-pillar/5.png) | bin | 117 -> 117 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower-pillar/6.png (renamed from gfx/tilesets/sprout-pillar/6.png) | bin | 116 -> 116 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower-pillar/7.png (renamed from gfx/tilesets/sprout-pillar/7.png) | bin | 115 -> 115 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower-pillar/8.png (renamed from gfx/tilesets/sprout-pillar/8.png) | bin | 115 -> 115 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower-pillar/9.png (renamed from gfx/tilesets/sprout-pillar/9.png) | bin | 127 -> 127 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower.2bpp.lz.bc56789c (renamed from gfx/tilesets/sprout_tower.2bpp.lz.bc56789c) | bin | 1376 -> 1376 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower.png (renamed from gfx/tilesets/sprout_tower.png) | bin | 1489 -> 1489 bytes | |||
| -rw-r--r-- | gfx/tilesets/tower_palette_map.asm (renamed from gfx/tilesets/sprout_tower_palette_map.asm) | 0 | ||||
| -rw-r--r-- | gfx/tilesets/traditional_house.2bpp.lz.dd51d079 (renamed from gfx/tilesets/kurts_house.2bpp.lz.dd51d079) | bin | 1216 -> 1216 bytes | |||
| -rw-r--r-- | gfx/tilesets/traditional_house.png (renamed from gfx/tilesets/kurts_house.png) | bin | 1181 -> 1181 bytes | |||
| -rw-r--r-- | gfx/tilesets/traditional_house_palette_map.asm (renamed from gfx/tilesets/kurts_house_palette_map.asm) | 0 |
51 files changed, 97 insertions, 97 deletions
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 0f4dcbb34..f6d6b465f 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -19,18 +19,18 @@ INCLUDE "data/tilesets/kanto_collision.asm" ; 0x19006 Tileset0GFX: ; 0x19006 -TilesetJohto1GFX: ; 0x19006 -INCBIN "gfx/tilesets/johto_1.2bpp.lz" +TilesetJohtoGFX: ; 0x19006 +INCBIN "gfx/tilesets/johto.2bpp.lz" ; 0x19c0e Tileset0Meta: ; 0x19c0e -TilesetJohto1Meta: ; 0x19c0e -INCBIN "data/tilesets/johto_1_metatiles.bin" +TilesetJohtoMeta: ; 0x19c0e +INCBIN "data/tilesets/johto_metatiles.bin" ; 0x1a40e Tileset0Coll: ; 0x1a40e -TilesetJohto1Coll: ; 0x1a40e -INCLUDE "data/tilesets/johto_1_collision.asm" +TilesetJohtoColl: ; 0x1a40e +INCLUDE "data/tilesets/johto_collision.asm" ; 0x1a60e TilesetIcePathGFX: ; 0x1a60e @@ -45,16 +45,16 @@ TilesetIcePathColl: ; 0x1b33e INCLUDE "data/tilesets/ice_path_collision.asm" ; 0x1b43e -TilesetPlayersHouse2FGFX: ; 0x1b43e -INCBIN "gfx/tilesets/players_house_2f.2bpp.lz" +TilesetPlayersRoomGFX: ; 0x1b43e +INCBIN "gfx/tilesets/players_room.2bpp.lz" ; 0x1b8fe -TilesetPlayersHouse2FMeta: ; 0x1b8fe -INCBIN "data/tilesets/players_house_2f_metatiles.bin" +TilesetPlayersRoomMeta: ; 0x1b8fe +INCBIN "data/tilesets/players_room_metatiles.bin" ; 0x1bcfe -TilesetPlayersHouse2FColl: ; 0x1bcfe -INCLUDE "data/tilesets/players_house_2f_collision.asm" +TilesetPlayersRoomColl: ; 0x1bcfe +INCLUDE "data/tilesets/players_room_collision.asm" ; 0x1bdfe @@ -96,16 +96,16 @@ TilesetPlayersHouseColl: ; 0x1dd2c INCLUDE "data/tilesets/players_house_collision.asm" ; 0x1de2c -TilesetCeladonMansionGFX: ; 0x1de2c -INCBIN "gfx/tilesets/celadon_mansion.2bpp.lz" +TilesetMansionGFX: ; 0x1de2c +INCBIN "gfx/tilesets/mansion.2bpp.lz" ; 0x1e58c -TilesetCeladonMansionMeta: ; 0x1e58c -INCBIN "data/tilesets/celadon_mansion_metatiles.bin" +TilesetMansionMeta: ; 0x1e58c +INCBIN "data/tilesets/mansion_metatiles.bin" ; 0x1e98c -TilesetCeladonMansionColl: ; 0x1e98c -INCLUDE "data/tilesets/celadon_mansion_collision.asm" +TilesetMansionColl: ; 0x1e98c +INCLUDE "data/tilesets/mansion_collision.asm" ; 0x1ea8c TilesetCaveGFX: ; 0x1ea8c @@ -113,28 +113,28 @@ INCBIN "gfx/tilesets/cave.2bpp.lz" ; 0x1ee1c TilesetCaveMeta: ; 0x1ee1c -TilesetWhirlIslandsMeta: ; 0x1ee1c +TilesetDarkCaveMeta: ; 0x1ee1c INCBIN "data/tilesets/cave_metatiles.bin" ; 0x1f21c TilesetCaveColl: ; 0x1f21c -TilesetWhirlIslandsColl: ; 0x1f21c +TilesetDarkCaveColl: ; 0x1f21c INCLUDE "data/tilesets/cave_collision.asm" ; 0x1f31c SECTION "Tileset Data 3", ROMX -TilesetSproutTowerGFX: ; 0x20181 -INCBIN "gfx/tilesets/sprout_tower.2bpp.lz" +TilesetTowerGFX: ; 0x20181 +INCBIN "gfx/tilesets/tower.2bpp.lz" ; 0x206e1 -TilesetSproutTowerMeta: ; 0x206e1 -INCBIN "data/tilesets/sprout_tower_metatiles.bin" +TilesetTowerMeta: ; 0x206e1 +INCBIN "data/tilesets/tower_metatiles.bin" ; 0x20ae1 -TilesetSproutTowerColl: ; 0x20ae1 -INCLUDE "data/tilesets/sprout_tower_collision.asm" +TilesetTowerColl: ; 0x20ae1 +INCLUDE "data/tilesets/tower_collision.asm" ; 0x20be1 TilesetLabGFX: ; 0x20be1 @@ -185,23 +185,23 @@ TilesetTrainStationColl: ; 0x23791 INCLUDE "data/tilesets/train_station_collision.asm" ; 0x23891 -TilesetIlexForestMeta: ; 0x23891 -INCBIN "data/tilesets/ilex_forest_metatiles.bin" +TilesetForestMeta: ; 0x23891 +INCBIN "data/tilesets/forest_metatiles.bin" ; 0x23b11 SECTION "Tileset Data 4", ROMX -TilesetGym1GFX: ; 0x30000 -INCBIN "gfx/tilesets/gym_1.2bpp.lz" +TilesetEliteFourRoomGFX: ; 0x30000 +INCBIN "gfx/tilesets/elite_four_room.2bpp.lz" ; 0x304e0 -TilesetGym1Meta: ; 0x304e0 -INCBIN "data/tilesets/gym_1_metatiles.bin" +TilesetEliteFourRoomMeta: ; 0x304e0 +INCBIN "data/tilesets/elite_four_room_metatiles.bin" ; 0x308e0 -TilesetGym1Coll: ; 0x308e0 -INCLUDE "data/tilesets/gym_1_collision.asm" +TilesetEliteFourRoomColl: ; 0x308e0 +INCLUDE "data/tilesets/elite_four_room_collision.asm" ; 0x309e0 TilesetParkGFX: ; 0x309e0 @@ -240,16 +240,16 @@ TilesetUndergroundColl: ; 0x325b0 INCLUDE "data/tilesets/underground_collision.asm" ; 0x326b0 -TilesetWhirlIslandsGFX: ; 0x326b0 -INCBIN "gfx/tilesets/whirl_islands.2bpp.lz" +TilesetDarkCaveGFX: ; 0x326b0 +INCBIN "gfx/tilesets/dark_cave.2bpp.lz" ; 0x329f0 -UnusedTilesetWhirlIslandsMeta: ; 0x329f0 -INCBIN "data/tilesets/unused_whirl_islands_metatiles.bin" +UnusedTilesetDarkCaveMeta: ; 0x329f0 +INCBIN "data/tilesets/unused_dark_cave_metatiles.bin" ; 0x331f0 -UnusedTilesetWhirlIslandsColl: ; 0x331f0 -INCLUDE "data/tilesets/unused_whirl_islands_collision.asm" +UnusedTilesetDarkCaveColl: ; 0x331f0 +INCLUDE "data/tilesets/unused_dark_cave_collision.asm" ; 0x333f0 @@ -291,60 +291,60 @@ TilesetGateColl: ; 0xb5de0 INCLUDE "data/tilesets/gate_collision.asm" ; 0xb5ee0 -TilesetJohto2GFX: ; 0xb5ee0 +TilesetJohtoModernGFX: ; 0xb5ee0 TilesetBattleTowerOutsideGFX: ; 0xb5ee0 -INCBIN "gfx/tilesets/johto_2.2bpp.lz" +INCBIN "gfx/tilesets/johto_modern.2bpp.lz" ; 0xb6ae8 -TilesetJohto2Meta: ; 0xb6ae8 -INCBIN "data/tilesets/johto_2_metatiles.bin" +TilesetJohtoModernMeta: ; 0xb6ae8 +INCBIN "data/tilesets/johto_modern_metatiles.bin" ; 0xb72e8 -TilesetJohto2Coll: ; 0xb72e8 -INCLUDE "data/tilesets/johto_2_collision.asm" +TilesetJohtoModernColl: ; 0xb72e8 +INCLUDE "data/tilesets/johto_modern_collision.asm" ; 0xb74e8 -TilesetKurtsHouseGFX: ; 0xb74e8 -INCBIN "gfx/tilesets/kurts_house.2bpp.lz" +TilesetTraditionalHouseGFX: ; 0xb74e8 +INCBIN "gfx/tilesets/traditional_house.2bpp.lz" ; 0xb79a8 -TilesetKurtsHouseMeta: ; 0xb79a8 -INCBIN "data/tilesets/kurts_house_metatiles.bin" +TilesetTraditionalHouseMeta: ; 0xb79a8 +INCBIN "data/tilesets/traditional_house_metatiles.bin" ; 0xb7da8 -TilesetKurtsHouseColl: ; 0xb7da8 -INCLUDE "data/tilesets/kurts_house_collision.asm" +TilesetTraditionalHouseColl: ; 0xb7da8 +INCLUDE "data/tilesets/traditional_house_collision.asm" ; 0xb7ea8 SECTION "Tileset Data 6", ROMX -TilesetIlexForestGFX: ; 0xdc000 -INCBIN "gfx/tilesets/ilex_forest.2bpp.lz" +TilesetForestGFX: ; 0xdc000 +INCBIN "gfx/tilesets/forest.2bpp.lz" ; 0xdc3d0 -TilesetOlivineGymGFX: ; 0xdc3d0 -INCBIN "gfx/tilesets/olivine_gym.2bpp.lz" +TilesetChampionsRoomGFX: ; 0xdc3d0 +INCBIN "gfx/tilesets/champions_room.2bpp.lz" ; 0xdcc50 -TilesetOlivineGymMeta: ; 0xdcc50 -INCBIN "data/tilesets/olivine_gym_metatiles.bin" +TilesetChampionsRoomMeta: ; 0xdcc50 +INCBIN "data/tilesets/champions_room_metatiles.bin" ; 0xdd050 -TilesetOlivineGymColl: ; 0xdd050 -INCLUDE "data/tilesets/olivine_gym_collision.asm" +TilesetChampionsRoomColl: ; 0xdd050 +INCLUDE "data/tilesets/champions_room_collision.asm" ; 0xdd150 -TilesetHouse1GFX: ; 0xdd150 -INCBIN "gfx/tilesets/house_1.2bpp.lz" +TilesetHouseGFX: ; 0xdd150 +INCBIN "gfx/tilesets/house.2bpp.lz" ; 0xdd600 -TilesetHouse1Meta: ; 0xdd600 -INCBIN "data/tilesets/house_1_metatiles.bin" +TilesetHouseMeta: ; 0xdd600 +INCBIN "data/tilesets/house_metatiles.bin" ; 0xdda00 -TilesetHouse1Coll: ; 0xdda00 -INCLUDE "data/tilesets/house_1_collision.asm" +TilesetHouseColl: ; 0xdda00 +INCLUDE "data/tilesets/house_collision.asm" ; 0xddb00 TilesetLighthouseGFX: ; 0xddb00 @@ -359,20 +359,20 @@ TilesetLighthouseColl: ; 0xde370 INCLUDE "data/tilesets/lighthouse_collision.asm" ; 0xde470 -TilesetIlexForestColl: ; 0xde470 -INCLUDE "data/tilesets/ilex_forest_collision.asm" +TilesetForestColl: ; 0xde470 +INCLUDE "data/tilesets/forest_collision.asm" ; 0xde570 -TilesetPowerPlantGFX: ; 0xde570 -INCBIN "gfx/tilesets/power_plant.2bpp.lz" +TilesetFacilityGFX: ; 0xde570 +INCBIN "gfx/tilesets/facility.2bpp.lz" ; 0xde990 -TilesetPowerPlantMeta: ; 0xde990 -INCBIN "data/tilesets/power_plant_metatiles.bin" +TilesetFacilityMeta: ; 0xde990 +INCBIN "data/tilesets/facility_metatiles.bin" ; 0xded90 -TilesetPowerPlantColl: ; 0xded90 -INCLUDE "data/tilesets/power_plant_collision.asm" +TilesetFacilityColl: ; 0xded90 +INCLUDE "data/tilesets/facility_collision.asm" ; 0xdee90 TilesetBattleTowerOutsideMeta: ; 0xdee90 diff --git a/gfx/tilesets/olivine_gym.2bpp.lz.93800351 b/gfx/tilesets/champions_room.2bpp.lz.93800351 Binary files differindex e19994f37..e19994f37 100644 --- a/gfx/tilesets/olivine_gym.2bpp.lz.93800351 +++ b/gfx/tilesets/champions_room.2bpp.lz.93800351 diff --git a/gfx/tilesets/olivine_gym.png b/gfx/tilesets/champions_room.png Binary files differindex e32c2fb28..e32c2fb28 100644 --- a/gfx/tilesets/olivine_gym.png +++ b/gfx/tilesets/champions_room.png diff --git a/gfx/tilesets/olivine_gym_palette_map.asm b/gfx/tilesets/champions_room_palette_map.asm index 551a09351..551a09351 100644 --- a/gfx/tilesets/olivine_gym_palette_map.asm +++ b/gfx/tilesets/champions_room_palette_map.asm diff --git a/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 b/gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6 Binary files differindex 50a5ab9ac..50a5ab9ac 100644 --- a/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 +++ b/gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6 diff --git a/gfx/tilesets/whirl_islands.png b/gfx/tilesets/dark_cave.png Binary files differindex 1d0a91e5e..1d0a91e5e 100644 --- a/gfx/tilesets/whirl_islands.png +++ b/gfx/tilesets/dark_cave.png diff --git a/gfx/tilesets/whirl_islands_palette_map.asm b/gfx/tilesets/dark_cave_palette_map.asm index 73c09ebe5..73c09ebe5 100644 --- a/gfx/tilesets/whirl_islands_palette_map.asm +++ b/gfx/tilesets/dark_cave_palette_map.asm diff --git a/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f b/gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f Binary files differindex 6b45c769d..6b45c769d 100644 --- a/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f +++ b/gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f diff --git a/gfx/tilesets/gym_1.png b/gfx/tilesets/elite_four_room.png Binary files differindex 27f64afa2..27f64afa2 100644 --- a/gfx/tilesets/gym_1.png +++ b/gfx/tilesets/elite_four_room.png diff --git a/gfx/tilesets/gym_1_palette_map.asm b/gfx/tilesets/elite_four_room_palette_map.asm index b20f49195..b20f49195 100644 --- a/gfx/tilesets/gym_1_palette_map.asm +++ b/gfx/tilesets/elite_four_room_palette_map.asm diff --git a/gfx/tilesets/power_plant.2bpp.lz.454cfd8b b/gfx/tilesets/facility.2bpp.lz.454cfd8b Binary files differindex 584e54dd2..584e54dd2 100644 --- a/gfx/tilesets/power_plant.2bpp.lz.454cfd8b +++ b/gfx/tilesets/facility.2bpp.lz.454cfd8b diff --git a/gfx/tilesets/power_plant.png b/gfx/tilesets/facility.png Binary files differindex e2e501077..e2e501077 100644 --- a/gfx/tilesets/power_plant.png +++ b/gfx/tilesets/facility.png diff --git a/gfx/tilesets/power_plant_palette_map.asm b/gfx/tilesets/facility_palette_map.asm index f79f9c01b..f79f9c01b 100644 --- a/gfx/tilesets/power_plant_palette_map.asm +++ b/gfx/tilesets/facility_palette_map.asm diff --git a/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 b/gfx/tilesets/forest.2bpp.lz.6b0ac896 Binary files differindex 7b5355705..7b5355705 100644 --- a/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 +++ b/gfx/tilesets/forest.2bpp.lz.6b0ac896 diff --git a/gfx/tilesets/ilex_forest.png b/gfx/tilesets/forest.png Binary files differindex 853625944..853625944 100644 --- a/gfx/tilesets/ilex_forest.png +++ b/gfx/tilesets/forest.png diff --git a/gfx/tilesets/ilex_forest_palette_map.asm b/gfx/tilesets/forest_palette_map.asm index 696788084..696788084 100644 --- a/gfx/tilesets/ilex_forest_palette_map.asm +++ b/gfx/tilesets/forest_palette_map.asm diff --git a/gfx/tilesets/house_1.2bpp.lz.c848ef13 b/gfx/tilesets/house.2bpp.lz.c848ef13 Binary files differindex f9afaf70d..f9afaf70d 100644 --- a/gfx/tilesets/house_1.2bpp.lz.c848ef13 +++ b/gfx/tilesets/house.2bpp.lz.c848ef13 diff --git a/gfx/tilesets/house_1.pal b/gfx/tilesets/house.pal index a9f8b74b6..a9f8b74b6 100644 --- a/gfx/tilesets/house_1.pal +++ b/gfx/tilesets/house.pal diff --git a/gfx/tilesets/house_1.png b/gfx/tilesets/house.png Binary files differindex ce3547bb8..ce3547bb8 100644 --- a/gfx/tilesets/house_1.png +++ b/gfx/tilesets/house.png diff --git a/gfx/tilesets/house_1_palette_map.asm b/gfx/tilesets/house_palette_map.asm index ce7b988b7..ce7b988b7 100644 --- a/gfx/tilesets/house_1_palette_map.asm +++ b/gfx/tilesets/house_palette_map.asm diff --git a/gfx/tilesets/johto_1.2bpp.lz.0c7e555a b/gfx/tilesets/johto.2bpp.lz.0c7e555a Binary files differindex 9821e1433..9821e1433 100644 --- a/gfx/tilesets/johto_1.2bpp.lz.0c7e555a +++ b/gfx/tilesets/johto.2bpp.lz.0c7e555a diff --git a/gfx/tilesets/johto_1.png b/gfx/tilesets/johto.png Binary files differindex 62ceb23a0..62ceb23a0 100644 --- a/gfx/tilesets/johto_1.png +++ b/gfx/tilesets/johto.png diff --git a/gfx/tilesets/johto_2.2bpp.lz.391603fb b/gfx/tilesets/johto_modern.2bpp.lz.391603fb Binary files differindex 64f23e23b..64f23e23b 100644 --- a/gfx/tilesets/johto_2.2bpp.lz.391603fb +++ b/gfx/tilesets/johto_modern.2bpp.lz.391603fb diff --git a/gfx/tilesets/johto_2.png b/gfx/tilesets/johto_modern.png Binary files differindex 1c080ff45..1c080ff45 100644 --- a/gfx/tilesets/johto_2.png +++ b/gfx/tilesets/johto_modern.png diff --git a/gfx/tilesets/johto_2_palette_map.asm b/gfx/tilesets/johto_modern_palette_map.asm index f2af7a92d..f2af7a92d 100644 --- a/gfx/tilesets/johto_2_palette_map.asm +++ b/gfx/tilesets/johto_modern_palette_map.asm diff --git a/gfx/tilesets/johto_1_palette_map.asm b/gfx/tilesets/johto_palette_map.asm index 62fbd2d00..62fbd2d00 100644 --- a/gfx/tilesets/johto_1_palette_map.asm +++ b/gfx/tilesets/johto_palette_map.asm diff --git a/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 b/gfx/tilesets/mansion.2bpp.lz.63b414d4 Binary files differindex b68f147d0..b68f147d0 100644 --- a/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 +++ b/gfx/tilesets/mansion.2bpp.lz.63b414d4 diff --git a/gfx/tilesets/celadon_mansion.png b/gfx/tilesets/mansion.png Binary files differindex 44e697a1b..44e697a1b 100644 --- a/gfx/tilesets/celadon_mansion.png +++ b/gfx/tilesets/mansion.png diff --git a/gfx/tilesets/celadon_mansion_1.pal b/gfx/tilesets/mansion_1.pal index 1ed1de75f..1ed1de75f 100644 --- a/gfx/tilesets/celadon_mansion_1.pal +++ b/gfx/tilesets/mansion_1.pal diff --git a/gfx/tilesets/celadon_mansion_2.pal b/gfx/tilesets/mansion_2.pal index ad5c5e4db..ad5c5e4db 100644 --- a/gfx/tilesets/celadon_mansion_2.pal +++ b/gfx/tilesets/mansion_2.pal diff --git a/gfx/tilesets/celadon_mansion_palette_map.asm b/gfx/tilesets/mansion_palette_map.asm index 2bd27ad22..2bd27ad22 100644 --- a/gfx/tilesets/celadon_mansion_palette_map.asm +++ b/gfx/tilesets/mansion_palette_map.asm diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm index b67daeb8d..5e8f9f4eb 100644 --- a/gfx/tilesets/palette_maps.asm +++ b/gfx/tilesets/palette_maps.asm @@ -15,16 +15,16 @@ INCLUDE "gfx/tilesets/kanto_palette_map.asm" ; 0x4c0e5 Tileset0PalMap: ; 0x4c0e5 -TilesetJohto1PalMap: ; 0x4c0e5 -INCLUDE "gfx/tilesets/johto_1_palette_map.asm" +TilesetJohtoPalMap: ; 0x4c0e5 +INCLUDE "gfx/tilesets/johto_palette_map.asm" ; 0x4c155 -TilesetJohto2PalMap: ; 0x4c155 -INCLUDE "gfx/tilesets/johto_2_palette_map.asm" +TilesetJohtoModernPalMap: ; 0x4c155 +INCLUDE "gfx/tilesets/johto_modern_palette_map.asm" ; 0x4c1c5 -TilesetHouse1PalMap: ; 0x4c1c5 -INCLUDE "gfx/tilesets/house_1_palette_map.asm" +TilesetHousePalMap: ; 0x4c1c5 +INCLUDE "gfx/tilesets/house_palette_map.asm" ; 0x4c235 TilesetPlayersHousePalMap: ; 0x4c235 @@ -47,36 +47,36 @@ TilesetLabPalMap: ; 0x4c3f5 INCLUDE "gfx/tilesets/lab_palette_map.asm" ; 0x4c465 -TilesetPowerPlantPalMap: ; 0x4c465 -INCLUDE "gfx/tilesets/power_plant_palette_map.asm" +TilesetFacilityPalMap: ; 0x4c465 +INCLUDE "gfx/tilesets/facility_palette_map.asm" ; 0x4c4d5 TilesetMartPalMap: ; 0x4c4d5 INCLUDE "gfx/tilesets/mart_palette_map.asm" ; 0x4c545 -TilesetCeladonMansionPalMap: ; 0x4c545 -INCLUDE "gfx/tilesets/celadon_mansion_palette_map.asm" +TilesetMansionPalMap: ; 0x4c545 +INCLUDE "gfx/tilesets/mansion_palette_map.asm" ; 0x4c5b5 TilesetGameCornerPalMap: ; 0x4c5b5 INCLUDE "gfx/tilesets/game_corner_palette_map.asm" ; 0x4c625 -TilesetGym1PalMap: ; 0x4c625 -INCLUDE "gfx/tilesets/gym_1_palette_map.asm" +TilesetEliteFourRoomPalMap: ; 0x4c625 +INCLUDE "gfx/tilesets/elite_four_room_palette_map.asm" ; 0x4c695 -TilesetKurtsHousePalMap: ; 0x4c695 -INCLUDE "gfx/tilesets/kurts_house_palette_map.asm" +TilesetTraditionalHousePalMap: ; 0x4c695 +INCLUDE "gfx/tilesets/traditional_house_palette_map.asm" ; 0x4c705 -TilesetSproutTowerPalMap: ; 0x4c705 -INCLUDE "gfx/tilesets/sprout_tower_palette_map.asm" +TilesetTowerPalMap: ; 0x4c705 +INCLUDE "gfx/tilesets/tower_palette_map.asm" ; 0x4c775 TilesetCavePalMap: ; 0x4c775 -TilesetWhirlIslandsPalMap: ; 0x4c775 +TilesetDarkCavePalMap: ; 0x4c775 INCLUDE "gfx/tilesets/cave_palette_map.asm" ; 0x4c7e5 @@ -105,16 +105,16 @@ TilesetUndergroundPalMap: ; 0x4c9a5 INCLUDE "gfx/tilesets/underground_palette_map.asm" ; 0x4ca15 -TilesetOlivineGymPalMap: ; 0x4ca15 -INCLUDE "gfx/tilesets/olivine_gym_palette_map.asm" +TilesetChampionsRoomPalMap: ; 0x4ca15 +INCLUDE "gfx/tilesets/champions_room_palette_map.asm" ; 0x4ca85 TilesetLighthousePalMap: ; 0x4ca85 INCLUDE "gfx/tilesets/lighthouse_palette_map.asm" ; 0x4caf5 -TilesetPlayersHouse2FPalMap: ; 0x4caf5 -INCLUDE "gfx/tilesets/players_house_2f_palette_map.asm" +TilesetPlayersRoomPalMap: ; 0x4caf5 +INCLUDE "gfx/tilesets/players_room_palette_map.asm" ; 0x4cb65 UnusedMuseumPalMap: ; 0x4cb65 @@ -125,8 +125,8 @@ TilesetIcePathPalMap: ; 0x4cbd5 INCLUDE "gfx/tilesets/ice_path_palette_map.asm" ; 0x4cc45 -TilesetIlexForestPalMap: ; 0x4cc45 -INCLUDE "gfx/tilesets/ilex_forest_palette_map.asm" +TilesetForestPalMap: ; 0x4cc45 +INCLUDE "gfx/tilesets/forest_palette_map.asm" ; 0x4ccb5 TilesetPokeComCenterPalMap: ; 0x4ccb5 diff --git a/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 b/gfx/tilesets/players_room.2bpp.lz.35e51007 Binary files differindex b458a501d..b458a501d 100644 --- a/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 +++ b/gfx/tilesets/players_room.2bpp.lz.35e51007 diff --git a/gfx/tilesets/players_house_2f.png b/gfx/tilesets/players_room.png Binary files differindex a0f268eb5..a0f268eb5 100644 --- a/gfx/tilesets/players_house_2f.png +++ b/gfx/tilesets/players_room.png diff --git a/gfx/tilesets/players_house_2f_palette_map.asm b/gfx/tilesets/players_room_palette_map.asm index 1c0cb1f08..1c0cb1f08 100644 --- a/gfx/tilesets/players_house_2f_palette_map.asm +++ b/gfx/tilesets/players_room_palette_map.asm diff --git a/gfx/tilesets/sprout-pillar/1.png b/gfx/tilesets/tower-pillar/1.png Binary files differindex c22fb2a13..c22fb2a13 100644 --- a/gfx/tilesets/sprout-pillar/1.png +++ b/gfx/tilesets/tower-pillar/1.png diff --git a/gfx/tilesets/sprout-pillar/10.png b/gfx/tilesets/tower-pillar/10.png Binary files differindex 01dbe1afc..01dbe1afc 100644 --- a/gfx/tilesets/sprout-pillar/10.png +++ b/gfx/tilesets/tower-pillar/10.png diff --git a/gfx/tilesets/sprout-pillar/2.png b/gfx/tilesets/tower-pillar/2.png Binary files differindex 76fae403b..76fae403b 100644 --- a/gfx/tilesets/sprout-pillar/2.png +++ b/gfx/tilesets/tower-pillar/2.png diff --git a/gfx/tilesets/sprout-pillar/3.png b/gfx/tilesets/tower-pillar/3.png Binary files differindex 80ce4657c..80ce4657c 100644 --- a/gfx/tilesets/sprout-pillar/3.png +++ b/gfx/tilesets/tower-pillar/3.png diff --git a/gfx/tilesets/sprout-pillar/4.png b/gfx/tilesets/tower-pillar/4.png Binary files differindex 9d523c4bc..9d523c4bc 100644 --- a/gfx/tilesets/sprout-pillar/4.png +++ b/gfx/tilesets/tower-pillar/4.png diff --git a/gfx/tilesets/sprout-pillar/5.png b/gfx/tilesets/tower-pillar/5.png Binary files differindex b7796c8d6..b7796c8d6 100644 --- a/gfx/tilesets/sprout-pillar/5.png +++ b/gfx/tilesets/tower-pillar/5.png diff --git a/gfx/tilesets/sprout-pillar/6.png b/gfx/tilesets/tower-pillar/6.png Binary files differindex 0ca0e5936..0ca0e5936 100644 --- a/gfx/tilesets/sprout-pillar/6.png +++ b/gfx/tilesets/tower-pillar/6.png diff --git a/gfx/tilesets/sprout-pillar/7.png b/gfx/tilesets/tower-pillar/7.png Binary files differindex 3aa4b4e94..3aa4b4e94 100644 --- a/gfx/tilesets/sprout-pillar/7.png +++ b/gfx/tilesets/tower-pillar/7.png diff --git a/gfx/tilesets/sprout-pillar/8.png b/gfx/tilesets/tower-pillar/8.png Binary files differindex e81475618..e81475618 100644 --- a/gfx/tilesets/sprout-pillar/8.png +++ b/gfx/tilesets/tower-pillar/8.png diff --git a/gfx/tilesets/sprout-pillar/9.png b/gfx/tilesets/tower-pillar/9.png Binary files differindex da74607be..da74607be 100644 --- a/gfx/tilesets/sprout-pillar/9.png +++ b/gfx/tilesets/tower-pillar/9.png diff --git a/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c b/gfx/tilesets/tower.2bpp.lz.bc56789c Binary files differindex 2033306e3..2033306e3 100644 --- a/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c +++ b/gfx/tilesets/tower.2bpp.lz.bc56789c diff --git a/gfx/tilesets/sprout_tower.png b/gfx/tilesets/tower.png Binary files differindex 05484b5d9..05484b5d9 100644 --- a/gfx/tilesets/sprout_tower.png +++ b/gfx/tilesets/tower.png diff --git a/gfx/tilesets/sprout_tower_palette_map.asm b/gfx/tilesets/tower_palette_map.asm index 6e3c10115..6e3c10115 100644 --- a/gfx/tilesets/sprout_tower_palette_map.asm +++ b/gfx/tilesets/tower_palette_map.asm diff --git a/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 b/gfx/tilesets/traditional_house.2bpp.lz.dd51d079 Binary files differindex 28f025413..28f025413 100644 --- a/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 +++ b/gfx/tilesets/traditional_house.2bpp.lz.dd51d079 diff --git a/gfx/tilesets/kurts_house.png b/gfx/tilesets/traditional_house.png Binary files differindex bda1f7983..bda1f7983 100644 --- a/gfx/tilesets/kurts_house.png +++ b/gfx/tilesets/traditional_house.png diff --git a/gfx/tilesets/kurts_house_palette_map.asm b/gfx/tilesets/traditional_house_palette_map.asm index 5daa0da6b..5daa0da6b 100644 --- a/gfx/tilesets/kurts_house_palette_map.asm +++ b/gfx/tilesets/traditional_house_palette_map.asm |
