diff options
Diffstat (limited to 'tilesets')
| -rw-r--r-- | tilesets/00_collision.bin | bin | 256 -> 0 bytes | |||
| -rw-r--r-- | tilesets/00_metatiles.bin | bin | 1024 -> 0 bytes | |||
| -rw-r--r-- | tilesets/01_palette_map.asm | 29 | ||||
| -rw-r--r-- | tilesets/aerodactyl_word_room_collision.bin (renamed from tilesets/32_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/aerodactyl_word_room_metatiles.bin (renamed from tilesets/36_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/aerodactyl_word_room_palette_map.asm (renamed from tilesets/26_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/animations.asm | 74 | ||||
| -rw-r--r-- | tilesets/battle_tower.pal | 15 | ||||
| -rw-r--r-- | tilesets/battle_tower_collision.bin (renamed from tilesets/22_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/battle_tower_metatiles.bin (renamed from tilesets/22_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/battle_tower_outside_collision.bin (renamed from tilesets/04_collision.bin) | bin | 512 -> 512 bytes | |||
| -rw-r--r-- | tilesets/battle_tower_outside_metatiles.bin (renamed from tilesets/04_metatiles.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | tilesets/battle_tower_outside_palette_map.asm (renamed from tilesets/04_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/battle_tower_palette_map.asm (renamed from tilesets/22_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/beta_word_room_collision.bin (renamed from tilesets/33_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/beta_word_room_metatiles.bin (renamed from tilesets/32_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/beta_word_room_palette_map.asm (renamed from tilesets/32_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/bg.pal | 90 | ||||
| -rw-r--r-- | tilesets/cave_collision.bin (renamed from tilesets/24_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/cave_metatiles.bin (renamed from tilesets/24_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/cave_palette_map.asm (renamed from tilesets/24_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/celadon_mansion_collision.bin (renamed from tilesets/13_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/celadon_mansion_metatiles.bin (renamed from tilesets/13_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/celadon_mansion_palette_map.asm (renamed from tilesets/13_palette_map.asm) | 0 | ||||
| -rwxr-xr-x | tilesets/collision.asm | 6 | ||||
| -rw-r--r-- | tilesets/data.asm | 434 | ||||
| -rw-r--r-- | tilesets/data_1.asm | 50 | ||||
| -rw-r--r-- | tilesets/data_2.asm | 61 | ||||
| -rw-r--r-- | tilesets/data_3.asm | 64 | ||||
| -rw-r--r-- | tilesets/data_4.asm | 59 | ||||
| -rw-r--r-- | tilesets/data_5.asm | 60 | ||||
| -rw-r--r-- | tilesets/data_6.asm | 75 | ||||
| -rw-r--r-- | tilesets/data_7.asm | 16 | ||||
| -rw-r--r-- | tilesets/data_8.asm | 15 | ||||
| -rw-r--r-- | tilesets/game_corner_collision.bin (renamed from tilesets/14_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/game_corner_metatiles.bin (renamed from tilesets/14_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/game_corner_palette_map.asm (renamed from tilesets/14_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/gate_collision.bin (renamed from tilesets/08_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/gate_metatiles.bin (renamed from tilesets/08_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/gate_palette_map.asm (renamed from tilesets/08_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/gym_1_collision.bin (renamed from tilesets/15_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/gym_1_metatiles.bin (renamed from tilesets/15_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/gym_1_palette_map.asm (renamed from tilesets/15_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/ho_oh_word_room_collision.bin (renamed from tilesets/34_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/ho_oh_word_room_metatiles.bin (renamed from tilesets/33_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/ho_oh_word_room_palette_map.asm (renamed from tilesets/33_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/house.pal | 15 | ||||
| -rw-r--r-- | tilesets/house_1_collision.bin (renamed from tilesets/05_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/house_1_metatiles.bin (renamed from tilesets/05_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/house_1_palette_map.asm (renamed from tilesets/05_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/ice_path.pal | 15 | ||||
| -rw-r--r-- | tilesets/ice_path_collision.bin (renamed from tilesets/29_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/ice_path_metatiles.bin (renamed from tilesets/29_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/ice_path_palette_map.asm (renamed from tilesets/29_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/ilex_forest_collision.bin (renamed from tilesets/31_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/ilex_forest_metatiles.bin (renamed from tilesets/31_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/ilex_forest_palette_map.asm (renamed from tilesets/31_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/johto_1_collision.bin (renamed from tilesets/01_collision.bin) | bin | 512 -> 512 bytes | |||
| -rw-r--r-- | tilesets/johto_1_metatiles.bin (renamed from tilesets/01_metatiles.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | tilesets/johto_1_palette_map.asm (renamed from tilesets/00_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/johto_2_collision.bin (renamed from tilesets/02_collision.bin) | bin | 512 -> 512 bytes | |||
| -rw-r--r-- | tilesets/johto_2_metatiles.bin (renamed from tilesets/02_metatiles.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | tilesets/johto_2_palette_map.asm (renamed from tilesets/02_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/kabuto_word_room_collision.bin (renamed from tilesets/35_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/kabuto_word_room_metatiles.bin (renamed from tilesets/34_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/kabuto_word_room_palette_map.asm (renamed from tilesets/34_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/kanto_collision.bin (renamed from tilesets/03_collision.bin) | bin | 512 -> 512 bytes | |||
| -rw-r--r-- | tilesets/kanto_metatiles.bin (renamed from tilesets/03_metatiles.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | tilesets/kanto_palette_map.asm (renamed from tilesets/03_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/kurts_house_collision.bin (renamed from tilesets/16_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/kurts_house_metatiles.bin (renamed from tilesets/16_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/kurts_house_palette_map.asm (renamed from tilesets/16_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/lab_collision.bin (renamed from tilesets/10_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/lab_metatiles.bin (renamed from tilesets/10_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/lab_palette_map.asm (renamed from tilesets/10_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/lighthouse_collision.bin (renamed from tilesets/19_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/lighthouse_metatiles.bin (renamed from tilesets/19_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/lighthouse_palette_map.asm (renamed from tilesets/19_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/mart_collision.bin (renamed from tilesets/12_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/mart_metatiles.bin (renamed from tilesets/12_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/mart_palette_map.asm (renamed from tilesets/12_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/ob.pal | 68 | ||||
| -rw-r--r-- | tilesets/olivine_gym_collision.bin (renamed from tilesets/18_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/olivine_gym_metatiles.bin (renamed from tilesets/18_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/olivine_gym_palette_map.asm (renamed from tilesets/18_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/omanyte_word_room_collision.bin (renamed from tilesets/36_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/omanyte_word_room_metatiles.bin (renamed from tilesets/35_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/omanyte_word_room_palette_map.asm (renamed from tilesets/35_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/palette_maps.asm | 134 | ||||
| -rw-r--r-- | tilesets/park_collision.bin (renamed from tilesets/25_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/park_metatiles.bin (renamed from tilesets/25_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/park_palette_map.asm (renamed from tilesets/25_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/players_house_2f_collision.bin (renamed from tilesets/20_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/players_house_2f_metatiles.bin (renamed from tilesets/20_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/players_house_2f_palette_map.asm (renamed from tilesets/20_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/players_house_collision.bin (renamed from tilesets/06_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/players_house_metatiles.bin (renamed from tilesets/06_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/players_house_palette_map.asm (renamed from tilesets/06_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/pokecenter_collision.bin (renamed from tilesets/07_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/pokecenter_metatiles.bin (renamed from tilesets/07_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/pokecenter_palette_map.asm (renamed from tilesets/07_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/pokecom.pal | 15 | ||||
| -rw-r--r-- | tilesets/pokecom_center_collision.bin (renamed from tilesets/21_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/pokecom_center_metatiles.bin (renamed from tilesets/21_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/pokecom_center_palette_map.asm (renamed from tilesets/21_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/port_collision.bin (renamed from tilesets/09_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/port_metatiles.bin (renamed from tilesets/09_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/port_palette_map.asm (renamed from tilesets/09_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/power_plant_collision.bin (renamed from tilesets/11_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/power_plant_metatiles.bin (renamed from tilesets/11_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/power_plant_palette_map.asm (renamed from tilesets/11_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/radio_tower_collision.bin (renamed from tilesets/27_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/radio_tower_metatiles.bin (renamed from tilesets/27_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/radio_tower_palette_map.asm (renamed from tilesets/27_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/roof.pal | 48 | ||||
| -rw-r--r-- | tilesets/roofs.asm | 33 | ||||
| -rw-r--r-- | tilesets/ruins_of_alph_collision.bin (renamed from tilesets/26_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/ruins_of_alph_metatiles.bin (renamed from tilesets/26_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/ruins_of_alph_palette_map.asm (renamed from tilesets/36_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/sprout_tower_collision.bin (renamed from tilesets/23_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/sprout_tower_metatiles.bin (renamed from tilesets/23_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/sprout_tower_palette_map.asm (renamed from tilesets/23_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/tileset_headers.asm | 81 | ||||
| -rw-r--r-- | tilesets/train_station_collision.bin (renamed from tilesets/17_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/train_station_metatiles.bin (renamed from tilesets/17_metatiles.bin) | bin | 1024 -> 1024 bytes | |||
| -rw-r--r-- | tilesets/train_station_palette_map.asm (renamed from tilesets/17_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/underground_collision.bin (renamed from tilesets/28_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/underground_metatiles.bin (renamed from tilesets/28_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/underground_palette_map.asm (renamed from tilesets/28_palette_map.asm) | 0 | ||||
| -rw-r--r-- | tilesets/unused_whirl_islands_collision.bin (renamed from tilesets/unused_30_collision.bin) | bin | 512 -> 512 bytes | |||
| -rw-r--r-- | tilesets/unused_whirl_islands_metatiles.bin (renamed from tilesets/unused_30_metatiles.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | tilesets/whirl_islands_collision.bin (renamed from tilesets/30_collision.bin) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | tilesets/whirl_islands_metatiles.bin (renamed from tilesets/30_metatiles.bin) | 0 | ||||
| -rw-r--r-- | tilesets/whirl_islands_palette_map.asm (renamed from tilesets/30_palette_map.asm) | 0 |
134 files changed, 736 insertions, 721 deletions
diff --git a/tilesets/00_collision.bin b/tilesets/00_collision.bin Binary files differdeleted file mode 100644 index 085171e36..000000000 --- a/tilesets/00_collision.bin +++ /dev/null diff --git a/tilesets/00_metatiles.bin b/tilesets/00_metatiles.bin Binary files differdeleted file mode 100644 index 763df1997..000000000 --- a/tilesets/00_metatiles.bin +++ /dev/null diff --git a/tilesets/01_palette_map.asm b/tilesets/01_palette_map.asm deleted file mode 100644 index 62fbd2d00..000000000 --- a/tilesets/01_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED - tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN - tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN - tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW - tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN - tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED - tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED - tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN - tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN - tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN - tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN - tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/tilesets/32_collision.bin b/tilesets/aerodactyl_word_room_collision.bin Binary files differindex a4da351d3..a4da351d3 100644 --- a/tilesets/32_collision.bin +++ b/tilesets/aerodactyl_word_room_collision.bin diff --git a/tilesets/36_metatiles.bin b/tilesets/aerodactyl_word_room_metatiles.bin index 0538baa98..0538baa98 100644 --- a/tilesets/36_metatiles.bin +++ b/tilesets/aerodactyl_word_room_metatiles.bin diff --git a/tilesets/26_palette_map.asm b/tilesets/aerodactyl_word_room_palette_map.asm index 5ebde24ba..5ebde24ba 100644 --- a/tilesets/26_palette_map.asm +++ b/tilesets/aerodactyl_word_room_palette_map.asm diff --git a/tilesets/animations.asm b/tilesets/animations.asm index 9bc80454c..3de67ee6e 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -35,9 +35,9 @@ _AnimateTileset:: ; fc000 jp hl ; fc01b -Tileset00Anim: ; 0xfc01b -Tileset02Anim: ; 0xfc01b -Tileset03Anim: ; 0xfc01b +Tileset0Anim: ; 0xfc01b +TilesetJohto2Anim: ; 0xfc01b +TilesetKantoAnim: ; 0xfc01b dw VTiles2 tile $14, AnimateWaterTile dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation @@ -51,7 +51,7 @@ Tileset03Anim: ; 0xfc01b dw NULL, DoneTileAnimation ; 0xfc047 -Tileset25Anim: ; 0xfc047 +TilesetParkAnim: ; 0xfc047 dw VTiles2 tile $14, AnimateWaterTile dw NULL, WaitTileAnimation dw VTiles2 tile $5f, AnimateFountain @@ -65,7 +65,7 @@ Tileset25Anim: ; 0xfc047 dw NULL, DoneTileAnimation ; 0xfc073 -Tileset31Anim: ; 0xfc073 +TilesetIlexForestAnim: ; 0xfc073 dw NULL, ForestTreeLeftAnimation dw NULL, ForestTreeRightAnimation dw NULL, WaitTileAnimation @@ -80,7 +80,7 @@ Tileset31Anim: ; 0xfc073 dw NULL, DoneTileAnimation ; 0xfc0a3 -Tileset01Anim: ; 0xfc0a3 +TilesetJohto1Anim: ; 0xfc0a3 dw VTiles2 tile $14, AnimateWaterTile dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation @@ -124,7 +124,7 @@ TilesetAnimfc103: ; 0xfc103 dw NULL, DoneTileAnimation ; 0xfc12f -Tileset09Anim: ; 0xfc12f +TilesetPortAnim: ; 0xfc12f dw VTiles2 tile $14, AnimateWaterTile dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation @@ -139,7 +139,7 @@ Tileset09Anim: ; 0xfc12f dw NULL, DoneTileAnimation ; 0xfc15f -Tileset15Anim: ; 0xfc15f +TilesetGym1Anim: ; 0xfc15f dw NULL, SafariFountainAnim2 dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation @@ -182,8 +182,8 @@ TilesetAnimfc1af: ; 0xfc1af dw NULL, DoneTileAnimation ; 0xfc1e7 -Tileset24Anim: ; 0xfc1e7 -Tileset30Anim: ; 0xfc1e7 +TilesetCaveAnim: ; 0xfc1e7 +TilesetWhirlIslandsAnim: ; 0xfc1e7 dw VTiles2 tile $14, WriteTileToBuffer dw NULL, FlickeringCaveEntrancePalette dw wTileAnimBuffer, ScrollTileRightLeft @@ -205,7 +205,7 @@ Tileset30Anim: ; 0xfc1e7 dw NULL, DoneTileAnimation ; 0xfc233 -Tileset29Anim: ; 0xfc233 +TilesetIcePathAnim: ; 0xfc233 dw VTiles2 tile $35, WriteTileToBuffer dw NULL, FlickeringCaveEntrancePalette dw wTileAnimBuffer, ScrollTileRightLeft @@ -227,7 +227,7 @@ Tileset29Anim: ; 0xfc233 dw NULL, DoneTileAnimation ; 0xfc27f -Tileset23Anim: ; 0xfc27f +TilesetSproutTowerAnim: ; 0xfc27f dw SproutPillarTilePointer9, AnimateSproutPillarTile dw SproutPillarTilePointer10, AnimateSproutPillarTile dw SproutPillarTilePointer7, AnimateSproutPillarTile @@ -259,31 +259,31 @@ TilesetAnimfc2bf: ; 0xfc2bf dw NULL, DoneTileAnimation ; 0xfc2e7 -Tileset04Anim: ; 0xfc2e7 -Tileset05Anim: ; 0xfc2e7 -Tileset06Anim: ; 0xfc2e7 -Tileset07Anim: ; 0xfc2e7 -Tileset08Anim: ; 0xfc2e7 -Tileset10Anim: ; 0xfc2e7 -Tileset11Anim: ; 0xfc2e7 -Tileset12Anim: ; 0xfc2e7 -Tileset13Anim: ; 0xfc2e7 -Tileset14Anim: ; 0xfc2e7 -Tileset16Anim: ; 0xfc2e7 -Tileset17Anim: ; 0xfc2e7 -Tileset18Anim: ; 0xfc2e7 -Tileset19Anim: ; 0xfc2e7 -Tileset20Anim: ; 0xfc2e7 -Tileset21Anim: ; 0xfc2e7 -Tileset22Anim: ; 0xfc2e7 -Tileset26Anim: ; 0xfc2e7 -Tileset27Anim: ; 0xfc2e7 -Tileset28Anim: ; 0xfc2e7 -Tileset32Anim: ; 0xfc2e7 -Tileset33Anim: ; 0xfc2e7 -Tileset34Anim: ; 0xfc2e7 -Tileset35Anim: ; 0xfc2e7 -Tileset36Anim: ; 0xfc2e7 +TilesetBattleTowerOutsideAnim: ; 0xfc2e7 +TilesetHouse1Anim: ; 0xfc2e7 +TilesetPlayersHouseAnim: ; 0xfc2e7 +TilesetPokecenterAnim: ; 0xfc2e7 +TilesetGateAnim: ; 0xfc2e7 +TilesetLabAnim: ; 0xfc2e7 +TilesetPowerPlantAnim: ; 0xfc2e7 +TilesetMartAnim: ; 0xfc2e7 +TilesetCeladonMansionAnim: ; 0xfc2e7 +TilesetGameCornerAnim: ; 0xfc2e7 +TilesetKurtsHouseAnim: ; 0xfc2e7 +TilesetTrainStationAnim: ; 0xfc2e7 +TilesetOlivineGymAnim: ; 0xfc2e7 +TilesetLighthouseAnim: ; 0xfc2e7 +TilesetPlayersHouse2FAnim: ; 0xfc2e7 +TilesetPokeComCenterAnim: ; 0xfc2e7 +TilesetBattleTowerAnim: ; 0xfc2e7 +TilesetRuinsOfAlphAnim: ; 0xfc2e7 +TilesetRadioTowerAnim: ; 0xfc2e7 +TilesetUndergroundAnim: ; 0xfc2e7 +TilesetBetaWordRoomAnim: ; 0xfc2e7 +TilesetHoOhWordRoomAnim: ; 0xfc2e7 +TilesetKabutoWordRoomAnim: ; 0xfc2e7 +TilesetOmanyteWordRoomAnim: ; 0xfc2e7 +TilesetAerodactylWordRoomAnim: ; 0xfc2e7 dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation diff --git a/tilesets/battle_tower.pal b/tilesets/battle_tower.pal index f7daec67a..4e71a5575 100644 --- a/tilesets/battle_tower.pal +++ b/tilesets/battle_tower.pal @@ -1,38 +1,39 @@ +; gray RGB 30, 28, 26 RGB 19, 19, 19 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 30, 28, 26 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 18, 24, 09 RGB 15, 20, 01 RGB 09, 13, 00 RGB 07, 07, 07 - +; water (blue) RGB 30, 28, 26 RGB 15, 16, 31 RGB 09, 09, 31 RGB 07, 07, 07 - +; yellow RGB 30, 28, 26 RGB 31, 31, 07 RGB 31, 16, 01 RGB 07, 07, 07 - +; brown RGB 26, 24, 17 RGB 21, 17, 07 RGB 16, 13, 03 RGB 07, 07, 07 - +; roof RGB 05, 05, 16 RGB 08, 19, 28 RGB 00, 00, 00 RGB 31, 31, 31 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 diff --git a/tilesets/22_collision.bin b/tilesets/battle_tower_collision.bin Binary files differindex 5cb2b0eeb..5cb2b0eeb 100644 --- a/tilesets/22_collision.bin +++ b/tilesets/battle_tower_collision.bin diff --git a/tilesets/22_metatiles.bin b/tilesets/battle_tower_metatiles.bin Binary files differindex c64ef0a12..c64ef0a12 100644 --- a/tilesets/22_metatiles.bin +++ b/tilesets/battle_tower_metatiles.bin diff --git a/tilesets/04_collision.bin b/tilesets/battle_tower_outside_collision.bin Binary files differindex 5ca0e3954..5ca0e3954 100644 --- a/tilesets/04_collision.bin +++ b/tilesets/battle_tower_outside_collision.bin diff --git a/tilesets/04_metatiles.bin b/tilesets/battle_tower_outside_metatiles.bin Binary files differindex c4390bcba..c4390bcba 100644 --- a/tilesets/04_metatiles.bin +++ b/tilesets/battle_tower_outside_metatiles.bin diff --git a/tilesets/04_palette_map.asm b/tilesets/battle_tower_outside_palette_map.asm index dfc74a9c0..dfc74a9c0 100644 --- a/tilesets/04_palette_map.asm +++ b/tilesets/battle_tower_outside_palette_map.asm diff --git a/tilesets/22_palette_map.asm b/tilesets/battle_tower_palette_map.asm index 1abce2a16..1abce2a16 100644 --- a/tilesets/22_palette_map.asm +++ b/tilesets/battle_tower_palette_map.asm diff --git a/tilesets/33_collision.bin b/tilesets/beta_word_room_collision.bin Binary files differindex a4da351d3..a4da351d3 100644 --- a/tilesets/33_collision.bin +++ b/tilesets/beta_word_room_collision.bin diff --git a/tilesets/32_metatiles.bin b/tilesets/beta_word_room_metatiles.bin index 47c531b2e..47c531b2e 100644 --- a/tilesets/32_metatiles.bin +++ b/tilesets/beta_word_room_metatiles.bin diff --git a/tilesets/32_palette_map.asm b/tilesets/beta_word_room_palette_map.asm index 5ebde24ba..5ebde24ba 100644 --- a/tilesets/32_palette_map.asm +++ b/tilesets/beta_word_room_palette_map.asm diff --git a/tilesets/bg.pal b/tilesets/bg.pal index 03b01b47c..3cd14d142 100644 --- a/tilesets/bg.pal +++ b/tilesets/bg.pal @@ -1,208 +1,226 @@ +; morn + +; gray RGB 28, 31, 16 RGB 21, 21, 21 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 28, 31, 16 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 22, 31, 10 RGB 12, 25, 01 RGB 05, 14, 00 RGB 07, 07, 07 - +; water RGB 31, 31, 31 RGB 08, 12, 31 RGB 01, 04, 31 RGB 07, 07, 07 - +; yellow RGB 28, 31, 16 RGB 31, 31, 07 RGB 31, 16, 01 RGB 07, 07, 07 - +; brown RGB 28, 31, 16 RGB 24, 18, 07 RGB 20, 15, 03 RGB 07, 07, 07 - +; roof RGB 28, 31, 16 RGB 15, 31, 31 RGB 05, 17, 31 RGB 07, 07, 07 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 RGB 00, 00, 00 +; day + +; gray RGB 27, 31, 27 RGB 21, 21, 21 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 27, 31, 27 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 22, 31, 10 RGB 12, 25, 01 RGB 05, 14, 00 RGB 07, 07, 07 - +; water RGB 31, 31, 31 RGB 08, 12, 31 RGB 01, 04, 31 RGB 07, 07, 07 - +; yellow RGB 27, 31, 27 RGB 31, 31, 07 RGB 31, 16, 01 RGB 07, 07, 07 - +; brown RGB 27, 31, 27 RGB 24, 18, 07 RGB 20, 15, 03 RGB 07, 07, 07 - +; roof RGB 27, 31, 27 RGB 15, 31, 31 RGB 05, 17, 31 RGB 07, 07, 07 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 RGB 00, 00, 00 +; nite + +; gray RGB 15, 14, 24 RGB 11, 11, 19 RGB 07, 07, 12 RGB 00, 00, 00 - +; red RGB 15, 14, 24 RGB 14, 07, 17 RGB 13, 00, 08 RGB 00, 00, 00 - +; green RGB 15, 14, 24 RGB 08, 13, 19 RGB 00, 11, 13 RGB 00, 00, 00 - +; water RGB 15, 14, 24 RGB 05, 05, 17 RGB 03, 03, 10 RGB 00, 00, 00 - +; yellow RGB 30, 30, 11 RGB 16, 14, 18 RGB 16, 14, 10 RGB 00, 00, 00 - +; brown RGB 15, 14, 24 RGB 12, 09, 15 RGB 08, 04, 05 RGB 00, 00, 00 - +; roof RGB 15, 14, 24 RGB 13, 12, 23 RGB 11, 09, 20 RGB 00, 00, 00 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 RGB 00, 00, 00 +; dark + +; gray RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; red RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; green RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; water RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; yellow RGB 30, 30, 11 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; brown RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; roof RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 RGB 00, 00, 00 +; indoor + +; gray RGB 30, 28, 26 RGB 19, 19, 19 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 30, 28, 26 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 18, 24, 09 RGB 15, 20, 01 RGB 09, 13, 00 RGB 07, 07, 07 - +; water RGB 30, 28, 26 RGB 15, 16, 31 RGB 09, 09, 31 RGB 07, 07, 07 - +; yellow RGB 30, 28, 26 RGB 31, 31, 07 RGB 31, 16, 01 RGB 07, 07, 07 - +; brown RGB 26, 24, 17 RGB 21, 17, 07 RGB 16, 13, 03 RGB 07, 07, 07 - +; roof RGB 30, 28, 26 RGB 17, 19, 31 RGB 14, 16, 31 RGB 07, 07, 07 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 RGB 00, 00, 00 +; overworld water + +; morn/day RGB 23, 23, 31 RGB 18, 19, 31 RGB 13, 12, 31 RGB 07, 07, 07 - +; nite RGB 15, 13, 27 RGB 10, 09, 20 RGB 04, 03, 18 diff --git a/tilesets/24_collision.bin b/tilesets/cave_collision.bin Binary files differindex 701de1c0b..701de1c0b 100644 --- a/tilesets/24_collision.bin +++ b/tilesets/cave_collision.bin diff --git a/tilesets/24_metatiles.bin b/tilesets/cave_metatiles.bin index a41b5b080..a41b5b080 100644 --- a/tilesets/24_metatiles.bin +++ b/tilesets/cave_metatiles.bin diff --git a/tilesets/24_palette_map.asm b/tilesets/cave_palette_map.asm index 73c09ebe5..73c09ebe5 100644 --- a/tilesets/24_palette_map.asm +++ b/tilesets/cave_palette_map.asm diff --git a/tilesets/13_collision.bin b/tilesets/celadon_mansion_collision.bin Binary files differindex a07b03bce..a07b03bce 100644 --- a/tilesets/13_collision.bin +++ b/tilesets/celadon_mansion_collision.bin diff --git a/tilesets/13_metatiles.bin b/tilesets/celadon_mansion_metatiles.bin index d4506328f..d4506328f 100644 --- a/tilesets/13_metatiles.bin +++ b/tilesets/celadon_mansion_metatiles.bin diff --git a/tilesets/13_palette_map.asm b/tilesets/celadon_mansion_palette_map.asm index 2bd27ad22..2bd27ad22 100644 --- a/tilesets/13_palette_map.asm +++ b/tilesets/celadon_mansion_palette_map.asm diff --git a/tilesets/collision.asm b/tilesets/collision.asm index 84397cb5d..0d031763d 100755 --- a/tilesets/collision.asm +++ b/tilesets/collision.asm @@ -1,5 +1,8 @@ NONTALKABLE EQUS "db" -TALKABLE EQUS "db TALK +" +TALKABLE EQUS "db TALK +" + +TileCollisionTable:: ; 4ce1f +; entries correspond to collision ids NONTALKABLE LANDTILE ; 00 NONTALKABLE LANDTILE ; 01 NONTALKABLE LANDTILE ; 02 @@ -256,3 +259,4 @@ TALKABLE EQUS "db TALK +" NONTALKABLE LANDTILE ; fd NONTALKABLE LANDTILE ; fe NONTALKABLE WALLTILE ; ff +; 4cf1f diff --git a/tilesets/data.asm b/tilesets/data.asm new file mode 100644 index 000000000..52f63cb89 --- /dev/null +++ b/tilesets/data.asm @@ -0,0 +1,434 @@ +SECTION "Roofs", ROMX + +INCLUDE "tilesets/roofs.asm" + + +SECTION "Tileset Data 1", ROMX + +TilesetKantoGFX: ; 0x18000 +INCBIN "gfx/tilesets/kanto.2bpp.lz" +; 0x18606 + +TilesetKantoMeta: ; 0x18606 +INCBIN "tilesets/kanto_metatiles.bin" +; 0x18e06 + +TilesetKantoColl: ; 0x18e06 +INCBIN "tilesets/kanto_collision.bin" +; 0x19006 + +Tileset0GFX: ; 0x19006 +TilesetJohto1GFX: ; 0x19006 +INCBIN "gfx/tilesets/johto_1.2bpp.lz" +; 0x19c0e + +Tileset0Meta: ; 0x19c0e +TilesetJohto1Meta: ; 0x19c0e +INCBIN "tilesets/johto_1_metatiles.bin" +; 0x1a40e + +Tileset0Coll: ; 0x1a40e +TilesetJohto1Coll: ; 0x1a40e +INCBIN "tilesets/johto_1_collision.bin" +; 0x1a60e + +TilesetIcePathGFX: ; 0x1a60e +INCBIN "gfx/tilesets/ice_path.2bpp.lz" +; 0x1af3e + +TilesetIcePathMeta: ; 0x1af3e +INCBIN "tilesets/ice_path_metatiles.bin" +; 0x1b33e + +TilesetIcePathColl: ; 0x1b33e +INCBIN "tilesets/ice_path_collision.bin" +; 0x1b43e + +TilesetPlayersHouse2FGFX: ; 0x1b43e +INCBIN "gfx/tilesets/players_house_2f.2bpp.lz" +; 0x1b8fe + +TilesetPlayersHouse2FMeta: ; 0x1b8fe +INCBIN "tilesets/players_house_2f_metatiles.bin" +; 0x1bcfe + +TilesetPlayersHouse2FColl: ; 0x1bcfe +INCBIN "tilesets/players_house_2f_collision.bin" +; 0x1bdfe + + +SECTION "Tileset Data 2", ROMX + +TilesetPokecenterGFX: ; 0x1c30c +INCBIN "gfx/tilesets/pokecenter.2bpp.lz" +; 0x1c73c + +TilesetPokecenterMeta: ; 0x1c73c +INCBIN "tilesets/pokecenter_metatiles.bin" +; 0x1cb3c + +TilesetPokecenterColl: ; 0x1cb3c +INCBIN "tilesets/pokecenter_collision.bin" +; 0x1cc3c + +TilesetPortGFX: ; 0x1cc3c +INCBIN "gfx/tilesets/port.2bpp.lz" +; 0x1d04c + +TilesetPortMeta: ; 0x1d04c +INCBIN "tilesets/port_metatiles.bin" +; 0x1d44c + +TilesetPortColl: ; 0x1d44c +INCBIN "tilesets/port_collision.bin" +; 0x1d54c + +TilesetPlayersHouseGFX: ; 0x1d54c +INCBIN "gfx/tilesets/players_house.2bpp.lz" +; 0x1d92c + +TilesetPlayersHouseMeta: ; 0x1d92c +INCBIN "tilesets/players_house_metatiles.bin" +; 0x1dd2c + +TilesetPlayersHouseColl: ; 0x1dd2c +INCBIN "tilesets/players_house_collision.bin" +; 0x1de2c + +TilesetCeladonMansionGFX: ; 0x1de2c +INCBIN "gfx/tilesets/celadon_mansion.2bpp.lz" +; 0x1e58c + +TilesetCeladonMansionMeta: ; 0x1e58c +INCBIN "tilesets/celadon_mansion_metatiles.bin" +; 0x1e98c + +TilesetCeladonMansionColl: ; 0x1e98c +INCBIN "tilesets/celadon_mansion_collision.bin" +; 0x1ea8c + +TilesetCaveGFX: ; 0x1ea8c +INCBIN "gfx/tilesets/cave.2bpp.lz" +; 0x1ee1c + +TilesetCaveMeta: ; 0x1ee1c +TilesetWhirlIslandsMeta: ; 0x1ee1c +INCBIN "tilesets/cave_metatiles.bin" +; 0x1f21c + +TilesetCaveColl: ; 0x1f21c +TilesetWhirlIslandsColl: ; 0x1f21c +INCBIN "tilesets/cave_collision.bin" +; 0x1f31c + + +SECTION "Tileset Data 3", ROMX + +TilesetSproutTowerGFX: ; 0x20181 +INCBIN "gfx/tilesets/sprout_tower.2bpp.lz" +; 0x206e1 + +TilesetSproutTowerMeta: ; 0x206e1 +INCBIN "tilesets/sprout_tower_metatiles.bin" +; 0x20ae1 + +TilesetSproutTowerColl: ; 0x20ae1 +INCBIN "tilesets/sprout_tower_collision.bin" +; 0x20be1 + +TilesetLabGFX: ; 0x20be1 +INCBIN "gfx/tilesets/lab.2bpp.lz" +; 0x213e1 + +TilesetLabMeta: ; 0x213e1 +INCBIN "tilesets/lab_metatiles.bin" +; 0x217e1 + +TilesetLabColl: ; 0x217e1 +INCBIN "tilesets/lab_collision.bin" +; 0x218e1 + +TilesetMartGFX: ; 0x218e1 +INCBIN "gfx/tilesets/mart.2bpp.lz" +; 0x22031 + +TilesetMartMeta: ; 0x22031 +INCBIN "tilesets/mart_metatiles.bin" +; 0x22431 + +TilesetMartColl: ; 0x22431 +INCBIN "tilesets/mart_collision.bin" +; 0x22531 + +TilesetGameCornerGFX: ; 0x22531 +INCBIN "gfx/tilesets/game_corner.2bpp.lz" +; 0x22af1 + +TilesetGameCornerMeta: ; 0x22af1 +INCBIN "tilesets/game_corner_metatiles.bin" +; 0x22ef1 + +TilesetGameCornerColl: ; 0x22ef1 +INCBIN "tilesets/game_corner_collision.bin" +; 0x22ff1 + +TilesetTrainStationGFX: ; 0x22ff1 +INCBIN "gfx/tilesets/train_station.2bpp.lz" +; 0x23391 + +TilesetTrainStationMeta: ; 0x23391 +INCBIN "tilesets/train_station_metatiles.bin" +; 0x23791 + +TilesetTrainStationColl: ; 0x23791 +INCBIN "tilesets/train_station_collision.bin" +; 0x23891 + +TilesetIlexForestMeta: ; 0x23891 +INCBIN "tilesets/ilex_forest_metatiles.bin" +; 0x23b11 + + +SECTION "Tileset Data 4", ROMX + +TilesetGym1GFX: ; 0x30000 +INCBIN "gfx/tilesets/gym_1.2bpp.lz" +; 0x304e0 + +TilesetGym1Meta: ; 0x304e0 +INCBIN "tilesets/gym_1_metatiles.bin" +; 0x308e0 + +TilesetGym1Coll: ; 0x308e0 +INCBIN "tilesets/gym_1_collision.bin" +; 0x309e0 + +TilesetParkGFX: ; 0x309e0 +INCBIN "gfx/tilesets/park.2bpp.lz" +; 0x30e80 + +TilesetParkMeta: ; 0x30e80 +INCBIN "tilesets/park_metatiles.bin" +; 0x31280 + +TilesetParkColl: ; 0x31280 +INCBIN "tilesets/park_collision.bin" +; 0x31380 + +TilesetRadioTowerGFX: ; 0x31380 +INCBIN "gfx/tilesets/radio_tower.2bpp.lz" +; 0x318e0 + +TilesetRadioTowerMeta: ; 0x318e0 +INCBIN "tilesets/radio_tower_metatiles.bin" +; 0x31ce0 + +TilesetRadioTowerColl: ; 0x31ce0 +INCBIN "tilesets/radio_tower_collision.bin" +; 0x31de0 + +TilesetUndergroundGFX: ; 0x31de0 +INCBIN "gfx/tilesets/underground.2bpp.lz" +; 0x321b0 + +TilesetUndergroundMeta: ; 0x321b0 +INCBIN "tilesets/underground_metatiles.bin" +; 0x325b0 + +TilesetUndergroundColl: ; 0x325b0 +INCBIN "tilesets/underground_collision.bin" +; 0x326b0 + +TilesetWhirlIslandsGFX: ; 0x326b0 +INCBIN "gfx/tilesets/whirl_islands.2bpp.lz" +; 0x329f0 + +UnusedTilesetWhirlIslandsMeta: ; 0x329f0 +INCBIN "tilesets/unused_whirl_islands_metatiles.bin" +; 0x331f0 + +UnusedTilesetWhirlIslandsColl: ; 0x331f0 +INCBIN "tilesets/unused_whirl_islands_collision.bin" +; 0x333f0 + + +SECTION "Tileset Data 5", ROMX + +TilesetPokeComCenterGFX: ; 0xb4000 +INCBIN "gfx/tilesets/pokecom_center.2bpp.lz" +; 0xb48a0 + +TilesetPokeComCenterMeta: ; 0xb48a0 +INCBIN "tilesets/pokecom_center_metatiles.bin" +; 0xb4ca0 + +TilesetPokeComCenterColl: ; 0xb4ca0 +INCBIN "tilesets/pokecom_center_collision.bin" +; 0xb4da0 + +TilesetBattleTowerGFX: ; 0xb4da0 +INCBIN "gfx/tilesets/battle_tower.2bpp.lz" +; 0xb50e0 + +TilesetBattleTowerMeta: ; 0xb50e0 +INCBIN "tilesets/battle_tower_metatiles.bin" +; 0xb54e0 + +TilesetBattleTowerColl: ; 0xb54e0 +INCBIN "tilesets/battle_tower_collision.bin" +; 0xb55e0 + +TilesetGateGFX: ; 0xb55e0 +INCBIN "gfx/tilesets/gate.2bpp.lz" +; 0xb59e0 + +TilesetGateMeta: ; 0xb59e0 +INCBIN "tilesets/gate_metatiles.bin" +; 0xb5de0 + +TilesetGateColl: ; 0xb5de0 +INCBIN "tilesets/gate_collision.bin" +; 0xb5ee0 + +TilesetJohto2GFX: ; 0xb5ee0 +TilesetBattleTowerOutsideGFX: ; 0xb5ee0 +INCBIN "gfx/tilesets/johto_2.2bpp.lz" +; 0xb6ae8 + +TilesetJohto2Meta: ; 0xb6ae8 +INCBIN "tilesets/johto_2_metatiles.bin" +; 0xb72e8 + +TilesetJohto2Coll: ; 0xb72e8 +INCBIN "tilesets/johto_2_collision.bin" +; 0xb74e8 + +TilesetKurtsHouseGFX: ; 0xb74e8 +INCBIN "gfx/tilesets/kurts_house.2bpp.lz" +; 0xb79a8 + +TilesetKurtsHouseMeta: ; 0xb79a8 +INCBIN "tilesets/kurts_house_metatiles.bin" +; 0xb7da8 + +TilesetKurtsHouseColl: ; 0xb7da8 +INCBIN "tilesets/kurts_house_collision.bin" +; 0xb7ea8 + + +SECTION "Tileset Data 6", ROMX + +TilesetIlexForestGFX: ; 0xdc000 +INCBIN "gfx/tilesets/ilex_forest.2bpp.lz" +; 0xdc3d0 + +TilesetOlivineGymGFX: ; 0xdc3d0 +INCBIN "gfx/tilesets/olivine_gym.2bpp.lz" +; 0xdcc50 + +TilesetOlivineGymMeta: ; 0xdcc50 +INCBIN "tilesets/olivine_gym_metatiles.bin" +; 0xdd050 + +TilesetOlivineGymColl: ; 0xdd050 +INCBIN "tilesets/olivine_gym_collision.bin" +; 0xdd150 + +TilesetHouse1GFX: ; 0xdd150 +INCBIN "gfx/tilesets/house_1.2bpp.lz" +; 0xdd600 + +TilesetHouse1Meta: ; 0xdd600 +INCBIN "tilesets/house_1_metatiles.bin" +; 0xdda00 + +TilesetHouse1Coll: ; 0xdda00 +INCBIN "tilesets/house_1_collision.bin" +; 0xddb00 + +TilesetLighthouseGFX: ; 0xddb00 +INCBIN "gfx/tilesets/lighthouse.2bpp.lz" +; 0xddf70 + +TilesetLighthouseMeta: ; 0xddf70 +INCBIN "tilesets/lighthouse_metatiles.bin" +; 0xde370 + +TilesetLighthouseColl: ; 0xde370 +INCBIN "tilesets/lighthouse_collision.bin" +; 0xde470 + +TilesetIlexForestColl: ; 0xde470 +INCBIN "tilesets/ilex_forest_collision.bin" +; 0xde570 + +TilesetPowerPlantGFX: ; 0xde570 +INCBIN "gfx/tilesets/power_plant.2bpp.lz" +; 0xde990 + +TilesetPowerPlantMeta: ; 0xde990 +INCBIN "tilesets/power_plant_metatiles.bin" +; 0xded90 + +TilesetPowerPlantColl: ; 0xded90 +INCBIN "tilesets/power_plant_collision.bin" +; 0xdee90 + +TilesetBattleTowerOutsideMeta: ; 0xdee90 +INCBIN "tilesets/battle_tower_outside_metatiles.bin" +; 0xdf690 + +TilesetBattleTowerOutsideColl: ; 0xdf690 +INCBIN "tilesets/battle_tower_outside_collision.bin" +; 0xdf890 + +TilesetBetaWordRoomMeta: ; 0xdf890 +INCBIN "tilesets/beta_word_room_metatiles.bin" +; 0xdfc90 + +TilesetBetaWordRoomColl: ; 0xdfc90 +TilesetHoOhWordRoomColl: ; 0xdfc90 +TilesetKabutoWordRoomColl: ; 0xdfc90 +TilesetOmanyteWordRoomColl: ; 0xdfc90 +TilesetAerodactylWordRoomColl: ; 0xdfc90 +INCBIN "tilesets/beta_word_room_collision.bin" +; 0xdfd90 + + +SECTION "Tileset Data 7", ROMX + +TilesetRuinsOfAlphGFX: ; 0x1dc5a1 +TilesetBetaWordRoomGFX: ; 0x1dc5a1 +TilesetHoOhWordRoomGFX: ; 0x1dc5a1 +TilesetKabutoWordRoomGFX: ; 0x1dc5a1 +TilesetOmanyteWordRoomGFX: ; 0x1dc5a1 +TilesetAerodactylWordRoomGFX: ; 0x1dc5a1 +INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz" +; 0x1dd1a9 + +TilesetRuinsOfAlphMeta: ; 0x1dd1a9 +INCBIN "tilesets/ruins_of_alph_metatiles.bin" +; 0x1dd5a9 + +TilesetRuinsOfAlphColl: ; 0x1dd5a9 +INCBIN "tilesets/ruins_of_alph_collision.bin" +; 0x1dd6a9 + + +SECTION "Tileset Data 8", ROMX + +TilesetHoOhWordRoomMeta: ; 0x1e0000 +INCBIN "tilesets/ho_oh_word_room_metatiles.bin" +; 0x1e0400 + +TilesetKabutoWordRoomMeta: ; 0x1e0400 +INCBIN "tilesets/kabuto_word_room_metatiles.bin" +; 0x1e0800 + +TilesetOmanyteWordRoomMeta: ; 0x1e0800 +INCBIN "tilesets/omanyte_word_room_metatiles.bin" +; 0x1e0c00 + +TilesetAerodactylWordRoomMeta: ; 0x1e0c00 +INCBIN "tilesets/aerodactyl_word_room_metatiles.bin" +; 0x1e1000 diff --git a/tilesets/data_1.asm b/tilesets/data_1.asm deleted file mode 100644 index 307dac666..000000000 --- a/tilesets/data_1.asm +++ /dev/null @@ -1,50 +0,0 @@ -Tileset03GFX: ; 0x18000 -INCBIN "gfx/tilesets/03.2bpp.lz" -; 0x18606 - -Tileset03Meta: ; 0x18606 -INCBIN "tilesets/03_metatiles.bin" -; 0x18e06 - -Tileset03Coll: ; 0x18e06 -INCBIN "tilesets/03_collision.bin" -; 0x19006 - -Tileset00GFX: ; 0x19006 -Tileset01GFX: ; 0x19006 -INCBIN "gfx/tilesets/01.2bpp.lz" -; 0x19c0e - -Tileset00Meta: ; 0x19c0e -Tileset01Meta: ; 0x19c0e -INCBIN "tilesets/01_metatiles.bin" -; 0x1a40e - -Tileset00Coll: ; 0x1a40e -Tileset01Coll: ; 0x1a40e -INCBIN "tilesets/01_collision.bin" -; 0x1a60e - -Tileset29GFX: ; 0x1a60e -INCBIN "gfx/tilesets/29.2bpp.lz" -; 0x1af3e - -Tileset29Meta: ; 0x1af3e -INCBIN "tilesets/29_metatiles.bin" -; 0x1b33e - -Tileset29Coll: ; 0x1b33e -INCBIN "tilesets/29_collision.bin" -; 0x1b43e - -Tileset20GFX: ; 0x1b43e -INCBIN "gfx/tilesets/20.2bpp.lz" -; 0x1b8fe - -Tileset20Meta: ; 0x1b8fe -INCBIN "tilesets/20_metatiles.bin" -; 0x1bcfe - -Tileset20Coll: ; 0x1bcfe -INCBIN "tilesets/20_collision.bin" -; 0x1bdfe diff --git a/tilesets/data_2.asm b/tilesets/data_2.asm deleted file mode 100644 index 9109cc235..000000000 --- a/tilesets/data_2.asm +++ /dev/null @@ -1,61 +0,0 @@ -Tileset07GFX: ; 0x1c30c -INCBIN "gfx/tilesets/07.2bpp.lz" -; 0x1c73c - -Tileset07Meta: ; 0x1c73c -INCBIN "tilesets/07_metatiles.bin" -; 0x1cb3c - -Tileset07Coll: ; 0x1cb3c -INCBIN "tilesets/07_collision.bin" -; 0x1cc3c - -Tileset09GFX: ; 0x1cc3c -INCBIN "gfx/tilesets/09.2bpp.lz" -; 0x1d04c - -Tileset09Meta: ; 0x1d04c -INCBIN "tilesets/09_metatiles.bin" -; 0x1d44c - -Tileset09Coll: ; 0x1d44c -INCBIN "tilesets/09_collision.bin" -; 0x1d54c - -Tileset06GFX: ; 0x1d54c -INCBIN "gfx/tilesets/06.2bpp.lz" -; 0x1d92c - -Tileset06Meta: ; 0x1d92c -INCBIN "tilesets/06_metatiles.bin" -; 0x1dd2c - -Tileset06Coll: ; 0x1dd2c -INCBIN "tilesets/06_collision.bin" -; 0x1de2c - -Tileset13GFX: ; 0x1de2c -INCBIN "gfx/tilesets/13.2bpp.lz" -; 0x1e58c - -Tileset13Meta: ; 0x1e58c -INCBIN "tilesets/13_metatiles.bin" -; 0x1e98c - -Tileset13Coll: ; 0x1e98c -INCBIN "tilesets/13_collision.bin" -; 0x1ea8c - -Tileset24GFX: ; 0x1ea8c -INCBIN "gfx/tilesets/24.2bpp.lz" -; 0x1ee1c - -Tileset24Meta: ; 0x1ee1c -Tileset30Meta: ; 0x1ee1c -INCBIN "tilesets/24_metatiles.bin" -; 0x1f21c - -Tileset24Coll: ; 0x1f21c -Tileset30Coll: ; 0x1f21c -INCBIN "tilesets/24_collision.bin" -; 0x1f31c diff --git a/tilesets/data_3.asm b/tilesets/data_3.asm deleted file mode 100644 index 72b2b72ff..000000000 --- a/tilesets/data_3.asm +++ /dev/null @@ -1,64 +0,0 @@ -Tileset23GFX: ; 0x20181 -INCBIN "gfx/tilesets/23.2bpp.lz" -; 0x206e1 - -Tileset23Meta: ; 0x206e1 -INCBIN "tilesets/23_metatiles.bin" -; 0x20ae1 - -Tileset23Coll: ; 0x20ae1 -INCBIN "tilesets/23_collision.bin" -; 0x20be1 - -Tileset10GFX: ; 0x20be1 -INCBIN "gfx/tilesets/10.2bpp.lz" -; 0x213e1 - -Tileset10Meta: ; 0x213e1 -INCBIN "tilesets/10_metatiles.bin" -; 0x217e1 - -Tileset10Coll: ; 0x217e1 -INCBIN "tilesets/10_collision.bin" -; 0x218e1 - -Tileset12GFX: ; 0x218e1 -INCBIN "gfx/tilesets/12.2bpp.lz" -; 0x22031 - -Tileset12Meta: ; 0x22031 -INCBIN "tilesets/12_metatiles.bin" -; 0x22431 - -Tileset12Coll: ; 0x22431 -INCBIN "tilesets/12_collision.bin" -; 0x22531 - -Tileset14GFX: ; 0x22531 -INCBIN "gfx/tilesets/14.2bpp.lz" -; 0x22af1 - -Tileset14Meta: ; 0x22af1 -INCBIN "tilesets/14_metatiles.bin" -; 0x22ef1 - -Tileset14Coll: ; 0x22ef1 -INCBIN "tilesets/14_collision.bin" -; 0x22ff1 - -Tileset17GFX: ; 0x22ff1 -INCBIN "gfx/tilesets/17.2bpp.lz" -; 0x23391 - -Tileset17Meta: ; 0x23391 -INCBIN "tilesets/17_metatiles.bin" -; 0x23791 - -Tileset17Coll: ; 0x23791 -INCBIN "tilesets/17_collision.bin" -; 0x23891 - -; todo -Tileset31Meta: ; 0x23891 -INCBIN "tilesets/31_metatiles.bin" -; 0x23b11 diff --git a/tilesets/data_4.asm b/tilesets/data_4.asm deleted file mode 100644 index fb61d1f2b..000000000 --- a/tilesets/data_4.asm +++ /dev/null @@ -1,59 +0,0 @@ -Tileset15GFX: ; 0x30000 -INCBIN "gfx/tilesets/15.2bpp.lz" -; 0x304e0 - -Tileset15Meta: ; 0x304e0 -INCBIN "tilesets/15_metatiles.bin" -; 0x308e0 - -Tileset15Coll: ; 0x308e0 -INCBIN "tilesets/15_collision.bin" -; 0x309e0 - -Tileset25GFX: ; 0x309e0 -INCBIN "gfx/tilesets/25.2bpp.lz" -; 0x30e80 - -Tileset25Meta: ; 0x30e80 -INCBIN "tilesets/25_metatiles.bin" -; 0x31280 - -Tileset25Coll: ; 0x31280 -INCBIN "tilesets/25_collision.bin" -; 0x31380 - -Tileset27GFX: ; 0x31380 -INCBIN "gfx/tilesets/27.2bpp.lz" -; 0x318e0 - -Tileset27Meta: ; 0x318e0 -INCBIN "tilesets/27_metatiles.bin" -; 0x31ce0 - -Tileset27Coll: ; 0x31ce0 -INCBIN "tilesets/27_collision.bin" -; 0x31de0 - -Tileset28GFX: ; 0x31de0 -INCBIN "gfx/tilesets/28.2bpp.lz" -; 0x321b0 - -Tileset28Meta: ; 0x321b0 -INCBIN "tilesets/28_metatiles.bin" -; 0x325b0 - -Tileset28Coll: ; 0x325b0 -INCBIN "tilesets/28_collision.bin" -; 0x326b0 - -Tileset30GFX: ; 0x326b0 -INCBIN "gfx/tilesets/30.2bpp.lz" -; 0x329f0 - -UnusedTileset30Meta: ; 0x329f0 -INCBIN "tilesets/unused_30_metatiles.bin" -; 0x331f0 - -UnusedTileset30Coll: ; 0x331f0 -INCBIN "tilesets/unused_30_collision.bin" -; 0x333f0 diff --git a/tilesets/data_5.asm b/tilesets/data_5.asm deleted file mode 100644 index 109df2daf..000000000 --- a/tilesets/data_5.asm +++ /dev/null @@ -1,60 +0,0 @@ -Tileset21GFX: ; 0xb4000 -INCBIN "gfx/tilesets/21.2bpp.lz" -; 0xb48a0 - -Tileset21Meta: ; 0xb48a0 -INCBIN "tilesets/21_metatiles.bin" -; 0xb4ca0 - -Tileset21Coll: ; 0xb4ca0 -INCBIN "tilesets/21_collision.bin" -; 0xb4da0 - -Tileset22GFX: ; 0xb4da0 -INCBIN "gfx/tilesets/22.2bpp.lz" -; 0xb50e0 - -Tileset22Meta: ; 0xb50e0 -INCBIN "tilesets/22_metatiles.bin" -; 0xb54e0 - -Tileset22Coll: ; 0xb54e0 -INCBIN "tilesets/22_collision.bin" -; 0xb55e0 - -Tileset08GFX: ; 0xb55e0 -INCBIN "gfx/tilesets/08.2bpp.lz" -; 0xb59e0 - -Tileset08Meta: ; 0xb59e0 -INCBIN "tilesets/08_metatiles.bin" -; 0xb5de0 - -Tileset08Coll: ; 0xb5de0 -INCBIN "tilesets/08_collision.bin" -; 0xb5ee0 - -Tileset02GFX: ; 0xb5ee0 -Tileset04GFX: ; 0xb5ee0 -INCBIN "gfx/tilesets/04.2bpp.lz" -; 0xb6ae8 - -Tileset02Meta: ; 0xb6ae8 -INCBIN "tilesets/02_metatiles.bin" -; 0xb72e8 - -Tileset02Coll: ; 0xb72e8 -INCBIN "tilesets/02_collision.bin" -; 0xb74e8 - -Tileset16GFX: ; 0xb74e8 -INCBIN "gfx/tilesets/16.2bpp.lz" -; 0xb79a8 - -Tileset16Meta: ; 0xb79a8 -INCBIN "tilesets/16_metatiles.bin" -; 0xb7da8 - -Tileset16Coll: ; 0xb7da8 -INCBIN "tilesets/16_collision.bin" -; 0xb7ea8 diff --git a/tilesets/data_6.asm b/tilesets/data_6.asm deleted file mode 100644 index 695282bc7..000000000 --- a/tilesets/data_6.asm +++ /dev/null @@ -1,75 +0,0 @@ -Tileset31GFX: ; 0xdc000 -INCBIN "gfx/tilesets/31.2bpp.lz" -; 0xdc3d0 - -Tileset18GFX: ; 0xdc3d0 -INCBIN "gfx/tilesets/18.2bpp.lz" -; 0xdcc50 - -Tileset18Meta: ; 0xdcc50 -INCBIN "tilesets/18_metatiles.bin" -; 0xdd050 - -Tileset18Coll: ; 0xdd050 -INCBIN "tilesets/18_collision.bin" -; 0xdd150 - -Tileset05GFX: ; 0xdd150 -INCBIN "gfx/tilesets/05.2bpp.lz" -; 0xdd600 - -Tileset05Meta: ; 0xdd600 -INCBIN "tilesets/05_metatiles.bin" -; 0xdda00 - -Tileset05Coll: ; 0xdda00 -INCBIN "tilesets/05_collision.bin" -; 0xddb00 - -Tileset19GFX: ; 0xddb00 -INCBIN "gfx/tilesets/19.2bpp.lz" -; 0xddf70 - -Tileset19Meta: ; 0xddf70 -INCBIN "tilesets/19_metatiles.bin" -; 0xde370 - -Tileset19Coll: ; 0xde370 -INCBIN "tilesets/19_collision.bin" -; 0xde470 - -Tileset31Coll: ; 0xde470 -INCBIN "tilesets/31_collision.bin" -; 0xde570 - -Tileset11GFX: ; 0xde570 -INCBIN "gfx/tilesets/11.2bpp.lz" -; 0xde990 - -Tileset11Meta: ; 0xde990 -INCBIN "tilesets/11_metatiles.bin" -; 0xded90 - -Tileset11Coll: ; 0xded90 -INCBIN "tilesets/11_collision.bin" -; 0xdee90 - -Tileset04Meta: ; 0xdee90 -INCBIN "tilesets/04_metatiles.bin" -; 0xdf690 - -Tileset04Coll: ; 0xdf690 -INCBIN "tilesets/04_collision.bin" -; 0xdf890 - -Tileset32Meta: ; 0xdf890 -INCBIN "tilesets/32_metatiles.bin" -; 0xdfc90 - -Tileset32Coll: ; 0xdfc90 -Tileset33Coll: ; 0xdfc90 -Tileset34Coll: ; 0xdfc90 -Tileset35Coll: ; 0xdfc90 -Tileset36Coll: ; 0xdfc90 -INCBIN "tilesets/36_collision.bin" -; 0xdfd90 diff --git a/tilesets/data_7.asm b/tilesets/data_7.asm deleted file mode 100644 index d781ab518..000000000 --- a/tilesets/data_7.asm +++ /dev/null @@ -1,16 +0,0 @@ -Tileset26GFX: ; 0x1dc5a1 -Tileset32GFX: ; 0x1dc5a1 -Tileset33GFX: ; 0x1dc5a1 -Tileset34GFX: ; 0x1dc5a1 -Tileset35GFX: ; 0x1dc5a1 -Tileset36GFX: ; 0x1dc5a1 -INCBIN "gfx/tilesets/26.2bpp.lz" -; 0x1dd1a9 - -Tileset26Meta: ; 0x1dd1a9 -INCBIN "tilesets/26_metatiles.bin" -; 0x1dd5a9 - -Tileset26Coll: ; 0x1dd5a9 -INCBIN "tilesets/26_collision.bin" -; 0x1dd6a9 diff --git a/tilesets/data_8.asm b/tilesets/data_8.asm deleted file mode 100644 index 7ee2ecf3d..000000000 --- a/tilesets/data_8.asm +++ /dev/null @@ -1,15 +0,0 @@ -Tileset33Meta: ; 0x1e0000 -INCBIN "tilesets/33_metatiles.bin" -; 0x1e0400 - -Tileset34Meta: ; 0x1e0400 -INCBIN "tilesets/34_metatiles.bin" -; 0x1e0800 - -Tileset35Meta: ; 0x1e0800 -INCBIN "tilesets/35_metatiles.bin" -; 0x1e0c00 - -Tileset36Meta: ; 0x1e0c00 -INCBIN "tilesets/36_metatiles.bin" -; 0x1e1000 diff --git a/tilesets/14_collision.bin b/tilesets/game_corner_collision.bin Binary files differindex 2bfcad418..2bfcad418 100644 --- a/tilesets/14_collision.bin +++ b/tilesets/game_corner_collision.bin diff --git a/tilesets/14_metatiles.bin b/tilesets/game_corner_metatiles.bin Binary files differindex 24beba2d3..24beba2d3 100644 --- a/tilesets/14_metatiles.bin +++ b/tilesets/game_corner_metatiles.bin diff --git a/tilesets/14_palette_map.asm b/tilesets/game_corner_palette_map.asm index 34bb9f6f0..34bb9f6f0 100644 --- a/tilesets/14_palette_map.asm +++ b/tilesets/game_corner_palette_map.asm diff --git a/tilesets/08_collision.bin b/tilesets/gate_collision.bin Binary files differindex 5876a3fbe..5876a3fbe 100644 --- a/tilesets/08_collision.bin +++ b/tilesets/gate_collision.bin diff --git a/tilesets/08_metatiles.bin b/tilesets/gate_metatiles.bin Binary files differindex 74076ff58..74076ff58 100644 --- a/tilesets/08_metatiles.bin +++ b/tilesets/gate_metatiles.bin diff --git a/tilesets/08_palette_map.asm b/tilesets/gate_palette_map.asm index 7854d3a81..7854d3a81 100644 --- a/tilesets/08_palette_map.asm +++ b/tilesets/gate_palette_map.asm diff --git a/tilesets/15_collision.bin b/tilesets/gym_1_collision.bin Binary files differindex fe8c334f0..fe8c334f0 100644 --- a/tilesets/15_collision.bin +++ b/tilesets/gym_1_collision.bin diff --git a/tilesets/15_metatiles.bin b/tilesets/gym_1_metatiles.bin Binary files differindex a9df6062c..a9df6062c 100644 --- a/tilesets/15_metatiles.bin +++ b/tilesets/gym_1_metatiles.bin diff --git a/tilesets/15_palette_map.asm b/tilesets/gym_1_palette_map.asm index b20f49195..b20f49195 100644 --- a/tilesets/15_palette_map.asm +++ b/tilesets/gym_1_palette_map.asm diff --git a/tilesets/34_collision.bin b/tilesets/ho_oh_word_room_collision.bin Binary files differindex a4da351d3..a4da351d3 100644 --- a/tilesets/34_collision.bin +++ b/tilesets/ho_oh_word_room_collision.bin diff --git a/tilesets/33_metatiles.bin b/tilesets/ho_oh_word_room_metatiles.bin index 2b542c632..2b542c632 100644 --- a/tilesets/33_metatiles.bin +++ b/tilesets/ho_oh_word_room_metatiles.bin diff --git a/tilesets/33_palette_map.asm b/tilesets/ho_oh_word_room_palette_map.asm index 5ebde24ba..5ebde24ba 100644 --- a/tilesets/33_palette_map.asm +++ b/tilesets/ho_oh_word_room_palette_map.asm diff --git a/tilesets/house.pal b/tilesets/house.pal index 2d6d51790..a9f8b74b6 100644 --- a/tilesets/house.pal +++ b/tilesets/house.pal @@ -1,38 +1,39 @@ +; gray RGB 30, 28, 26 RGB 19, 19, 19 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 30, 28, 26 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 30, 28, 26 RGB 15, 20, 01 RGB 09, 13, 00 RGB 07, 07, 07 - +; water (blue) RGB 30, 28, 26 RGB 15, 16, 31 RGB 09, 09, 31 RGB 07, 07, 07 - +; yellow RGB 30, 28, 26 RGB 31, 31, 07 RGB 31, 16, 01 RGB 07, 07, 07 - +; brown RGB 26, 24, 17 RGB 21, 17, 07 RGB 16, 13, 03 RGB 07, 07, 07 - +; roof (glass) RGB 30, 28, 26 RGB 31, 19, 24 RGB 16, 13, 03 RGB 07, 07, 07 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 diff --git a/tilesets/05_collision.bin b/tilesets/house_1_collision.bin Binary files differindex e11da7330..e11da7330 100644 --- a/tilesets/05_collision.bin +++ b/tilesets/house_1_collision.bin diff --git a/tilesets/05_metatiles.bin b/tilesets/house_1_metatiles.bin Binary files differindex 0d3a22f32..0d3a22f32 100644 --- a/tilesets/05_metatiles.bin +++ b/tilesets/house_1_metatiles.bin diff --git a/tilesets/05_palette_map.asm b/tilesets/house_1_palette_map.asm index ce7b988b7..ce7b988b7 100644 --- a/tilesets/05_palette_map.asm +++ b/tilesets/house_1_palette_map.asm diff --git a/tilesets/ice_path.pal b/tilesets/ice_path.pal index f92281d79..cb7659f50 100644 --- a/tilesets/ice_path.pal +++ b/tilesets/ice_path.pal @@ -1,38 +1,39 @@ +; gray RGB 15, 14, 24 RGB 11, 11, 19 RGB 07, 07, 12 RGB 00, 00, 00 - +; red RGB 15, 14, 24 RGB 14, 07, 17 RGB 13, 00, 08 RGB 00, 00, 00 - +; green (ice) RGB 22, 29, 31 RGB 10, 27, 31 RGB 31, 31, 31 RGB 05, 00, 09 - +; water RGB 15, 14, 24 RGB 05, 05, 17 RGB 03, 03, 10 RGB 00, 00, 00 - +; yellow RGB 30, 30, 11 RGB 16, 14, 18 RGB 16, 14, 10 RGB 00, 00, 00 - +; brown RGB 15, 14, 24 RGB 12, 09, 15 RGB 08, 04, 05 RGB 00, 00, 00 - +; roof (snow) RGB 25, 31, 31 RGB 09, 28, 31 RGB 16, 11, 31 RGB 05, 00, 09 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 diff --git a/tilesets/29_collision.bin b/tilesets/ice_path_collision.bin Binary files differindex a4498cbee..a4498cbee 100644 --- a/tilesets/29_collision.bin +++ b/tilesets/ice_path_collision.bin diff --git a/tilesets/29_metatiles.bin b/tilesets/ice_path_metatiles.bin index c92246e8a..c92246e8a 100644 --- a/tilesets/29_metatiles.bin +++ b/tilesets/ice_path_metatiles.bin diff --git a/tilesets/29_palette_map.asm b/tilesets/ice_path_palette_map.asm index 985844071..985844071 100644 --- a/tilesets/29_palette_map.asm +++ b/tilesets/ice_path_palette_map.asm diff --git a/tilesets/31_collision.bin b/tilesets/ilex_forest_collision.bin Binary files differindex 9f66b5fdd..9f66b5fdd 100644 --- a/tilesets/31_collision.bin +++ b/tilesets/ilex_forest_collision.bin diff --git a/tilesets/31_metatiles.bin b/tilesets/ilex_forest_metatiles.bin index a8b82d8cf..a8b82d8cf 100644 --- a/tilesets/31_metatiles.bin +++ b/tilesets/ilex_forest_metatiles.bin diff --git a/tilesets/31_palette_map.asm b/tilesets/ilex_forest_palette_map.asm index 696788084..696788084 100644 --- a/tilesets/31_palette_map.asm +++ b/tilesets/ilex_forest_palette_map.asm diff --git a/tilesets/01_collision.bin b/tilesets/johto_1_collision.bin Binary files differindex b3276e1cf..b3276e1cf 100644 --- a/tilesets/01_collision.bin +++ b/tilesets/johto_1_collision.bin diff --git a/tilesets/01_metatiles.bin b/tilesets/johto_1_metatiles.bin Binary files differindex 9024f2ad6..9024f2ad6 100644 --- a/tilesets/01_metatiles.bin +++ b/tilesets/johto_1_metatiles.bin diff --git a/tilesets/00_palette_map.asm b/tilesets/johto_1_palette_map.asm index 62fbd2d00..62fbd2d00 100755..100644 --- a/tilesets/00_palette_map.asm +++ b/tilesets/johto_1_palette_map.asm diff --git a/tilesets/02_collision.bin b/tilesets/johto_2_collision.bin Binary files differindex 6e5addd6d..6e5addd6d 100644 --- a/tilesets/02_collision.bin +++ b/tilesets/johto_2_collision.bin diff --git a/tilesets/02_metatiles.bin b/tilesets/johto_2_metatiles.bin Binary files differindex a15c0c2c7..a15c0c2c7 100644 --- a/tilesets/02_metatiles.bin +++ b/tilesets/johto_2_metatiles.bin diff --git a/tilesets/02_palette_map.asm b/tilesets/johto_2_palette_map.asm index f2af7a92d..f2af7a92d 100644 --- a/tilesets/02_palette_map.asm +++ b/tilesets/johto_2_palette_map.asm diff --git a/tilesets/35_collision.bin b/tilesets/kabuto_word_room_collision.bin Binary files differindex a4da351d3..a4da351d3 100644 --- a/tilesets/35_collision.bin +++ b/tilesets/kabuto_word_room_collision.bin diff --git a/tilesets/34_metatiles.bin b/tilesets/kabuto_word_room_metatiles.bin index 14d082e2a..14d082e2a 100644 --- a/tilesets/34_metatiles.bin +++ b/tilesets/kabuto_word_room_metatiles.bin diff --git a/tilesets/34_palette_map.asm b/tilesets/kabuto_word_room_palette_map.asm index 5ebde24ba..5ebde24ba 100644 --- a/tilesets/34_palette_map.asm +++ b/tilesets/kabuto_word_room_palette_map.asm diff --git a/tilesets/03_collision.bin b/tilesets/kanto_collision.bin Binary files differindex f0038d731..f0038d731 100644 --- a/tilesets/03_collision.bin +++ b/tilesets/kanto_collision.bin diff --git a/tilesets/03_metatiles.bin b/tilesets/kanto_metatiles.bin Binary files differindex 41b0cfffd..41b0cfffd 100644 --- a/tilesets/03_metatiles.bin +++ b/tilesets/kanto_metatiles.bin diff --git a/tilesets/03_palette_map.asm b/tilesets/kanto_palette_map.asm index e3e497fb9..e3e497fb9 100644 --- a/tilesets/03_palette_map.asm +++ b/tilesets/kanto_palette_map.asm diff --git a/tilesets/16_collision.bin b/tilesets/kurts_house_collision.bin Binary files differindex 499a1d071..499a1d071 100644 --- a/tilesets/16_collision.bin +++ b/tilesets/kurts_house_collision.bin diff --git a/tilesets/16_metatiles.bin b/tilesets/kurts_house_metatiles.bin Binary files differindex 3f6b41bd1..3f6b41bd1 100644 --- a/tilesets/16_metatiles.bin +++ b/tilesets/kurts_house_metatiles.bin diff --git a/tilesets/16_palette_map.asm b/tilesets/kurts_house_palette_map.asm index 5daa0da6b..5daa0da6b 100644 --- a/tilesets/16_palette_map.asm +++ b/tilesets/kurts_house_palette_map.asm diff --git a/tilesets/10_collision.bin b/tilesets/lab_collision.bin Binary files differindex 4396125f0..4396125f0 100644 --- a/tilesets/10_collision.bin +++ b/tilesets/lab_collision.bin diff --git a/tilesets/10_metatiles.bin b/tilesets/lab_metatiles.bin Binary files differindex 62da01e8b..62da01e8b 100644 --- a/tilesets/10_metatiles.bin +++ b/tilesets/lab_metatiles.bin diff --git a/tilesets/10_palette_map.asm b/tilesets/lab_palette_map.asm index 24399c6ea..24399c6ea 100644 --- a/tilesets/10_palette_map.asm +++ b/tilesets/lab_palette_map.asm diff --git a/tilesets/19_collision.bin b/tilesets/lighthouse_collision.bin Binary files differindex f15ac266a..f15ac266a 100644 --- a/tilesets/19_collision.bin +++ b/tilesets/lighthouse_collision.bin diff --git a/tilesets/19_metatiles.bin b/tilesets/lighthouse_metatiles.bin Binary files differindex 21ca0f09a..21ca0f09a 100644 --- a/tilesets/19_metatiles.bin +++ b/tilesets/lighthouse_metatiles.bin diff --git a/tilesets/19_palette_map.asm b/tilesets/lighthouse_palette_map.asm index 5f80e3a4d..5f80e3a4d 100644 --- a/tilesets/19_palette_map.asm +++ b/tilesets/lighthouse_palette_map.asm diff --git a/tilesets/12_collision.bin b/tilesets/mart_collision.bin Binary files differindex 0f8763b7b..0f8763b7b 100644 --- a/tilesets/12_collision.bin +++ b/tilesets/mart_collision.bin diff --git a/tilesets/12_metatiles.bin b/tilesets/mart_metatiles.bin index 63b2f629d..63b2f629d 100644 --- a/tilesets/12_metatiles.bin +++ b/tilesets/mart_metatiles.bin diff --git a/tilesets/12_palette_map.asm b/tilesets/mart_palette_map.asm index 991510d12..991510d12 100644 --- a/tilesets/12_palette_map.asm +++ b/tilesets/mart_palette_map.asm diff --git a/tilesets/ob.pal b/tilesets/ob.pal index f9fa6699e..bb7db6ab0 100644 --- a/tilesets/ob.pal +++ b/tilesets/ob.pal @@ -1,158 +1,170 @@ +; morn + +; red RGB 28, 31, 16 RGB 31, 19, 10 RGB 31, 07, 01 RGB 00, 00, 00 - +; blue RGB 28, 31, 16 RGB 31, 19, 10 RGB 10, 09, 31 RGB 00, 00, 00 - +; green RGB 28, 31, 16 RGB 31, 19, 10 RGB 07, 23, 03 RGB 00, 00, 00 - +; brown RGB 28, 31, 16 RGB 31, 19, 10 RGB 15, 10, 03 RGB 00, 00, 00 - +; pink RGB 28, 31, 16 RGB 31, 19, 10 RGB 30, 10, 06 RGB 00, 00, 00 - +; silver RGB 31, 31, 31 RGB 31, 31, 31 RGB 13, 13, 13 RGB 00, 00, 00 - +; tree RGB 22, 31, 10 RGB 12, 25, 01 RGB 05, 14, 00 RGB 07, 07, 07 - +; rock RGB 28, 31, 16 RGB 24, 18, 07 RGB 20, 15, 03 RGB 07, 07, 07 +; day + +; red RGB 27, 31, 27 RGB 31, 19, 10 RGB 31, 07, 01 RGB 00, 00, 00 - +; blue RGB 27, 31, 27 RGB 31, 19, 10 RGB 10, 09, 31 RGB 00, 00, 00 - +; green RGB 27, 31, 27 RGB 31, 19, 10 RGB 07, 23, 03 RGB 00, 00, 00 - +; brown RGB 27, 31, 27 RGB 31, 19, 10 RGB 15, 10, 03 RGB 00, 00, 00 - +; pink RGB 27, 31, 27 RGB 31, 19, 10 RGB 30, 10, 06 RGB 00, 00, 00 - +; silver RGB 31, 31, 31 RGB 31, 31, 31 RGB 13, 13, 13 RGB 00, 00, 00 - +; tree RGB 22, 31, 10 RGB 12, 25, 01 RGB 05, 14, 00 RGB 07, 07, 07 - +; rock RGB 27, 31, 27 RGB 24, 18, 07 RGB 20, 15, 03 RGB 07, 07, 07 +; nite + +; red RGB 15, 14, 24 RGB 31, 19, 10 RGB 31, 07, 01 RGB 00, 00, 00 - +; blue RGB 15, 14, 24 RGB 31, 19, 10 RGB 10, 09, 31 RGB 00, 00, 00 - +; green RGB 15, 14, 24 RGB 31, 19, 10 RGB 07, 23, 03 RGB 00, 00, 00 - +; brown RGB 15, 14, 24 RGB 31, 19, 10 RGB 15, 10, 03 RGB 00, 00, 00 - +; pink RGB 15, 14, 24 RGB 31, 19, 10 RGB 30, 10, 06 RGB 00, 00, 00 - +; silver RGB 31, 31, 31 RGB 31, 31, 31 RGB 13, 13, 13 RGB 00, 00, 00 - +; tree RGB 15, 14, 24 RGB 08, 13, 19 RGB 00, 11, 13 RGB 00, 00, 00 - +; rock RGB 15, 14, 24 RGB 12, 09, 15 RGB 08, 04, 05 RGB 00, 00, 00 +; dark + +; red RGB 01, 01, 02 RGB 31, 19, 10 RGB 31, 07, 01 RGB 00, 00, 00 - +; blue RGB 01, 01, 02 RGB 31, 19, 10 RGB 10, 09, 31 RGB 00, 00, 00 - +; green RGB 01, 01, 02 RGB 31, 19, 10 RGB 07, 23, 03 RGB 00, 00, 00 - +; brown RGB 01, 01, 02 RGB 31, 19, 10 RGB 15, 10, 03 RGB 00, 00, 00 - +; pink RGB 01, 01, 02 RGB 31, 19, 10 RGB 30, 10, 06 RGB 00, 00, 00 - +; silver RGB 31, 31, 31 RGB 31, 31, 31 RGB 13, 13, 13 RGB 00, 00, 00 - +; tree RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - +; rock RGB 01, 01, 02 RGB 00, 00, 00 RGB 00, 00, 00 diff --git a/tilesets/18_collision.bin b/tilesets/olivine_gym_collision.bin Binary files differindex cf77d603e..cf77d603e 100644 --- a/tilesets/18_collision.bin +++ b/tilesets/olivine_gym_collision.bin diff --git a/tilesets/18_metatiles.bin b/tilesets/olivine_gym_metatiles.bin index a2adb197a..a2adb197a 100644 --- a/tilesets/18_metatiles.bin +++ b/tilesets/olivine_gym_metatiles.bin diff --git a/tilesets/18_palette_map.asm b/tilesets/olivine_gym_palette_map.asm index 551a09351..551a09351 100644 --- a/tilesets/18_palette_map.asm +++ b/tilesets/olivine_gym_palette_map.asm diff --git a/tilesets/36_collision.bin b/tilesets/omanyte_word_room_collision.bin Binary files differindex a4da351d3..a4da351d3 100644 --- a/tilesets/36_collision.bin +++ b/tilesets/omanyte_word_room_collision.bin diff --git a/tilesets/35_metatiles.bin b/tilesets/omanyte_word_room_metatiles.bin index 3cc62f562..3cc62f562 100644 --- a/tilesets/35_metatiles.bin +++ b/tilesets/omanyte_word_room_metatiles.bin diff --git a/tilesets/35_palette_map.asm b/tilesets/omanyte_word_room_palette_map.asm index 5ebde24ba..5ebde24ba 100644 --- a/tilesets/35_palette_map.asm +++ b/tilesets/omanyte_word_room_palette_map.asm diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm index 7e19893d4..fb7da4cf4 100644 --- a/tilesets/palette_maps.asm +++ b/tilesets/palette_maps.asm @@ -1,132 +1,132 @@ -Tileset03PalMap: ; 0x4c075 -INCLUDE "tilesets/03_palette_map.asm" +TilesetKantoPalMap: ; 0x4c075 +INCLUDE "tilesets/kanto_palette_map.asm" ; 0x4c0e5 -Tileset00PalMap: ; 0x4c0e5 -Tileset01PalMap: ; 0x4c0e5 -INCLUDE "tilesets/01_palette_map.asm" +Tileset0PalMap: ; 0x4c0e5 +TilesetJohto1PalMap: ; 0x4c0e5 +INCLUDE "tilesets/johto_1_palette_map.asm" ; 0x4c155 -Tileset02PalMap: ; 0x4c155 -INCLUDE "tilesets/02_palette_map.asm" +TilesetJohto2PalMap: ; 0x4c155 +INCLUDE "tilesets/johto_2_palette_map.asm" ; 0x4c1c5 -Tileset05PalMap: ; 0x4c1c5 -INCLUDE "tilesets/05_palette_map.asm" +TilesetHouse1PalMap: ; 0x4c1c5 +INCLUDE "tilesets/house_1_palette_map.asm" ; 0x4c235 -Tileset06PalMap: ; 0x4c235 -INCLUDE "tilesets/06_palette_map.asm" +TilesetPlayersHousePalMap: ; 0x4c235 +INCLUDE "tilesets/players_house_palette_map.asm" ; 0x4c2a5 -Tileset07PalMap: ; 0x4c2a5 -INCLUDE "tilesets/07_palette_map.asm" +TilesetPokecenterPalMap: ; 0x4c2a5 +INCLUDE "tilesets/pokecenter_palette_map.asm" ; 0x4c315 -Tileset08PalMap: ; 0x4c315 -INCLUDE "tilesets/08_palette_map.asm" +TilesetGatePalMap: ; 0x4c315 +INCLUDE "tilesets/gate_palette_map.asm" ; 0x4c385 -Tileset09PalMap: ; 0x4c385 -INCLUDE "tilesets/09_palette_map.asm" +TilesetPortPalMap: ; 0x4c385 +INCLUDE "tilesets/port_palette_map.asm" ; 0x4c3f5 -Tileset10PalMap: ; 0x4c3f5 -INCLUDE "tilesets/10_palette_map.asm" +TilesetLabPalMap: ; 0x4c3f5 +INCLUDE "tilesets/lab_palette_map.asm" ; 0x4c465 -Tileset11PalMap: ; 0x4c465 -INCLUDE "tilesets/11_palette_map.asm" +TilesetPowerPlantPalMap: ; 0x4c465 +INCLUDE "tilesets/power_plant_palette_map.asm" ; 0x4c4d5 -Tileset12PalMap: ; 0x4c4d5 -INCLUDE "tilesets/12_palette_map.asm" +TilesetMartPalMap: ; 0x4c4d5 +INCLUDE "tilesets/mart_palette_map.asm" ; 0x4c545 -Tileset13PalMap: ; 0x4c545 -INCLUDE "tilesets/13_palette_map.asm" +TilesetCeladonMansionPalMap: ; 0x4c545 +INCLUDE "tilesets/celadon_mansion_palette_map.asm" ; 0x4c5b5 -Tileset14PalMap: ; 0x4c5b5 -INCLUDE "tilesets/14_palette_map.asm" +TilesetGameCornerPalMap: ; 0x4c5b5 +INCLUDE "tilesets/game_corner_palette_map.asm" ; 0x4c625 -Tileset15PalMap: ; 0x4c625 -INCLUDE "tilesets/15_palette_map.asm" +TilesetGym1PalMap: ; 0x4c625 +INCLUDE "tilesets/gym_1_palette_map.asm" ; 0x4c695 -Tileset16PalMap: ; 0x4c695 -INCLUDE "tilesets/16_palette_map.asm" +TilesetKurtsHousePalMap: ; 0x4c695 +INCLUDE "tilesets/kurts_house_palette_map.asm" ; 0x4c705 -Tileset23PalMap: ; 0x4c705 -INCLUDE "tilesets/23_palette_map.asm" +TilesetSproutTowerPalMap: ; 0x4c705 +INCLUDE "tilesets/sprout_tower_palette_map.asm" ; 0x4c775 -Tileset24PalMap: ; 0x4c775 -Tileset30PalMap: ; 0x4c775 -INCLUDE "tilesets/30_palette_map.asm" +TilesetCavePalMap: ; 0x4c775 +TilesetWhirlIslandsPalMap: ; 0x4c775 +INCLUDE "tilesets/cave_palette_map.asm" ; 0x4c7e5 -Tileset25PalMap: ; 0x4c7e5 -INCLUDE "tilesets/25_palette_map.asm" +TilesetParkPalMap: ; 0x4c7e5 +INCLUDE "tilesets/park_palette_map.asm" ; 0x4c855 -Tileset26PalMap: ; 0x4c855 -Tileset32PalMap: ; 0x4c855 -Tileset33PalMap: ; 0x4c855 -Tileset34PalMap: ; 0x4c855 -Tileset35PalMap: ; 0x4c855 -Tileset36PalMap: ; 0x4c855 -INCLUDE "tilesets/36_palette_map.asm" +TilesetRuinsOfAlphPalMap: ; 0x4c855 +TilesetBetaWordRoomPalMap: ; 0x4c855 +TilesetHoOhWordRoomPalMap: ; 0x4c855 +TilesetKabutoWordRoomPalMap: ; 0x4c855 +TilesetOmanyteWordRoomPalMap: ; 0x4c855 +TilesetAerodactylWordRoomPalMap: ; 0x4c855 +INCLUDE "tilesets/ruins_of_alph_palette_map.asm" ; 0x4c8c5 -Tileset27PalMap: ; 0x4c8c5 -INCLUDE "tilesets/27_palette_map.asm" +TilesetRadioTowerPalMap: ; 0x4c8c5 +INCLUDE "tilesets/radio_tower_palette_map.asm" ; 0x4c935 -Tileset17PalMap: ; 0x4c935 -INCLUDE "tilesets/17_palette_map.asm" +TilesetTrainStationPalMap: ; 0x4c935 +INCLUDE "tilesets/train_station_palette_map.asm" ; 0x4c9a5 -Tileset28PalMap: ; 0x4c9a5 -INCLUDE "tilesets/28_palette_map.asm" +TilesetUndergroundPalMap: ; 0x4c9a5 +INCLUDE "tilesets/underground_palette_map.asm" ; 0x4ca15 -Tileset18PalMap: ; 0x4ca15 -INCLUDE "tilesets/18_palette_map.asm" +TilesetOlivineGymPalMap: ; 0x4ca15 +INCLUDE "tilesets/olivine_gym_palette_map.asm" ; 0x4ca85 -Tileset19PalMap: ; 0x4ca85 -INCLUDE "tilesets/19_palette_map.asm" +TilesetLighthousePalMap: ; 0x4ca85 +INCLUDE "tilesets/lighthouse_palette_map.asm" ; 0x4caf5 -Tileset20PalMap: ; 0x4caf5 -INCLUDE "tilesets/20_palette_map.asm" +TilesetPlayersHouse2FPalMap: ; 0x4caf5 +INCLUDE "tilesets/players_house_2f_palette_map.asm" ; 0x4cb65 UnusedPalMap1: INCBIN "tilesets/unused_palette_map_1.bin" ; 4cbd5 -Tileset29PalMap: ; 0x4cbd5 -INCLUDE "tilesets/29_palette_map.asm" +TilesetIcePathPalMap: ; 0x4cbd5 +INCLUDE "tilesets/ice_path_palette_map.asm" ; 0x4cc45 -Tileset31PalMap: ; 0x4cc45 -INCLUDE "tilesets/31_palette_map.asm" +TilesetIlexForestPalMap: ; 0x4cc45 +INCLUDE "tilesets/ilex_forest_palette_map.asm" ; 0x4ccb5 -Tileset21PalMap: ; 0x4ccb5 -INCLUDE "tilesets/21_palette_map.asm" +TilesetPokeComCenterPalMap: ; 0x4ccb5 +INCLUDE "tilesets/pokecom_center_palette_map.asm" ; 0x4cd25 -Tileset22PalMap: ; 0x4cd25 -INCLUDE "tilesets/22_palette_map.asm" +TilesetBattleTowerPalMap: ; 0x4cd25 +INCLUDE "tilesets/battle_tower_palette_map.asm" ; 0x4cd95 -Tileset04PalMap: ; 0x4cd95 -INCLUDE "tilesets/04_palette_map.asm" +TilesetBattleTowerOutsidePalMap: ; 0x4cd95 +INCLUDE "tilesets/battle_tower_outside_palette_map.asm" ; 0x4ce05 UnusedPalMap2: diff --git a/tilesets/25_collision.bin b/tilesets/park_collision.bin Binary files differindex 29e6fa56d..29e6fa56d 100644 --- a/tilesets/25_collision.bin +++ b/tilesets/park_collision.bin diff --git a/tilesets/25_metatiles.bin b/tilesets/park_metatiles.bin Binary files differindex 1fe931640..1fe931640 100644 --- a/tilesets/25_metatiles.bin +++ b/tilesets/park_metatiles.bin diff --git a/tilesets/25_palette_map.asm b/tilesets/park_palette_map.asm index f9c65ef89..f9c65ef89 100644 --- a/tilesets/25_palette_map.asm +++ b/tilesets/park_palette_map.asm diff --git a/tilesets/20_collision.bin b/tilesets/players_house_2f_collision.bin Binary files differindex 9ceb978ab..9ceb978ab 100644 --- a/tilesets/20_collision.bin +++ b/tilesets/players_house_2f_collision.bin diff --git a/tilesets/20_metatiles.bin b/tilesets/players_house_2f_metatiles.bin Binary files differindex 0839798fe..0839798fe 100644 --- a/tilesets/20_metatiles.bin +++ b/tilesets/players_house_2f_metatiles.bin diff --git a/tilesets/20_palette_map.asm b/tilesets/players_house_2f_palette_map.asm index 1c0cb1f08..1c0cb1f08 100644 --- a/tilesets/20_palette_map.asm +++ b/tilesets/players_house_2f_palette_map.asm diff --git a/tilesets/06_collision.bin b/tilesets/players_house_collision.bin Binary files differindex dc3a08bfb..dc3a08bfb 100644 --- a/tilesets/06_collision.bin +++ b/tilesets/players_house_collision.bin diff --git a/tilesets/06_metatiles.bin b/tilesets/players_house_metatiles.bin Binary files differindex f316eb8c1..f316eb8c1 100644 --- a/tilesets/06_metatiles.bin +++ b/tilesets/players_house_metatiles.bin diff --git a/tilesets/06_palette_map.asm b/tilesets/players_house_palette_map.asm index 5d089835b..5d089835b 100644 --- a/tilesets/06_palette_map.asm +++ b/tilesets/players_house_palette_map.asm diff --git a/tilesets/07_collision.bin b/tilesets/pokecenter_collision.bin Binary files differindex 5e58e03c9..5e58e03c9 100644 --- a/tilesets/07_collision.bin +++ b/tilesets/pokecenter_collision.bin diff --git a/tilesets/07_metatiles.bin b/tilesets/pokecenter_metatiles.bin Binary files differindex c96c4843b..c96c4843b 100644 --- a/tilesets/07_metatiles.bin +++ b/tilesets/pokecenter_metatiles.bin diff --git a/tilesets/07_palette_map.asm b/tilesets/pokecenter_palette_map.asm index 78508b59e..78508b59e 100644 --- a/tilesets/07_palette_map.asm +++ b/tilesets/pokecenter_palette_map.asm diff --git a/tilesets/pokecom.pal b/tilesets/pokecom.pal index 7b89faf62..9fe7b765a 100644 --- a/tilesets/pokecom.pal +++ b/tilesets/pokecom.pal @@ -1,38 +1,39 @@ +; gray RGB 30, 28, 26 RGB 19, 19, 19 RGB 13, 13, 13 RGB 07, 07, 07 - +; red RGB 30, 28, 26 RGB 31, 19, 24 RGB 30, 10, 06 RGB 07, 07, 07 - +; green RGB 18, 24, 09 RGB 15, 20, 01 RGB 09, 13, 00 RGB 07, 07, 07 - +; water (blue) RGB 30, 28, 26 RGB 17, 19, 31 RGB 14, 16, 31 RGB 07, 07, 07 - +; yellow RGB 31, 26, 21 RGB 31, 20, 01 RGB 14, 16, 31 RGB 07, 07, 07 - +; brown RGB 21, 17, 07 RGB 17, 19, 31 RGB 16, 13, 03 RGB 07, 07, 07 - +; roof RGB 05, 05, 16 RGB 08, 19, 28 RGB 00, 00, 00 RGB 31, 31, 31 - +; text RGB 31, 31, 16 RGB 31, 31, 16 RGB 14, 09, 00 diff --git a/tilesets/21_collision.bin b/tilesets/pokecom_center_collision.bin Binary files differindex 0dfed1d91..0dfed1d91 100644 --- a/tilesets/21_collision.bin +++ b/tilesets/pokecom_center_collision.bin diff --git a/tilesets/21_metatiles.bin b/tilesets/pokecom_center_metatiles.bin index 097a882fd..097a882fd 100644 --- a/tilesets/21_metatiles.bin +++ b/tilesets/pokecom_center_metatiles.bin diff --git a/tilesets/21_palette_map.asm b/tilesets/pokecom_center_palette_map.asm index 75ee649f9..75ee649f9 100644 --- a/tilesets/21_palette_map.asm +++ b/tilesets/pokecom_center_palette_map.asm diff --git a/tilesets/09_collision.bin b/tilesets/port_collision.bin Binary files differindex af2e7fd34..af2e7fd34 100644 --- a/tilesets/09_collision.bin +++ b/tilesets/port_collision.bin diff --git a/tilesets/09_metatiles.bin b/tilesets/port_metatiles.bin index 69a600707..69a600707 100644 --- a/tilesets/09_metatiles.bin +++ b/tilesets/port_metatiles.bin diff --git a/tilesets/09_palette_map.asm b/tilesets/port_palette_map.asm index 6bfdf4686..6bfdf4686 100644 --- a/tilesets/09_palette_map.asm +++ b/tilesets/port_palette_map.asm diff --git a/tilesets/11_collision.bin b/tilesets/power_plant_collision.bin Binary files differindex ee03c4528..ee03c4528 100644 --- a/tilesets/11_collision.bin +++ b/tilesets/power_plant_collision.bin diff --git a/tilesets/11_metatiles.bin b/tilesets/power_plant_metatiles.bin index f6089d29c..f6089d29c 100644 --- a/tilesets/11_metatiles.bin +++ b/tilesets/power_plant_metatiles.bin diff --git a/tilesets/11_palette_map.asm b/tilesets/power_plant_palette_map.asm index f79f9c01b..f79f9c01b 100644 --- a/tilesets/11_palette_map.asm +++ b/tilesets/power_plant_palette_map.asm diff --git a/tilesets/27_collision.bin b/tilesets/radio_tower_collision.bin Binary files differindex 0d77042b7..0d77042b7 100644 --- a/tilesets/27_collision.bin +++ b/tilesets/radio_tower_collision.bin diff --git a/tilesets/27_metatiles.bin b/tilesets/radio_tower_metatiles.bin Binary files differindex 01c0b4aa5..01c0b4aa5 100644 --- a/tilesets/27_metatiles.bin +++ b/tilesets/radio_tower_metatiles.bin diff --git a/tilesets/27_palette_map.asm b/tilesets/radio_tower_palette_map.asm index 3530f7479..3530f7479 100644 --- a/tilesets/27_palette_map.asm +++ b/tilesets/radio_tower_palette_map.asm diff --git a/tilesets/roof.pal b/tilesets/roof.pal index 67d59ed4d..ba65fc7d2 100644 --- a/tilesets/roof.pal +++ b/tilesets/roof.pal @@ -4,13 +4,13 @@ RGB 21, 21, 21 RGB 11, 11, 11 -; group 1 +; group 1 (Olivine) RGB 14, 17, 31 RGB 07, 11, 15 RGB 09, 09, 17 RGB 05, 07, 13 -; group 2 +; group 2 (Mahogany) RGB 12, 19, 00 RGB 06, 10, 00 RGB 06, 09, 07 @@ -22,97 +22,97 @@ RGB 21, 21, 21 RGB 17, 08, 07 -; group 4 +; group 4 (Ecruteak) RGB 31, 19, 00 RGB 27, 10, 05 RGB 15, 07, 02 RGB 11, 04, 02 -; group 5 +; group 5 (Blackthorn) RGB 11, 10, 16 RGB 05, 06, 07 RGB 03, 04, 08 RGB 00, 00, 00 -; group 6 +; group 6 (Cinnabar) RGB 31, 10, 00 RGB 18, 06, 00 RGB 18, 05, 09 RGB 17, 08, 07 -; group 7 +; group 7 (Cerulean) RGB 17, 27, 31 RGB 05, 15, 31 RGB 07, 08, 22 RGB 07, 07, 16 -; group 8 +; group 8 (Azalea) RGB 22, 20, 10 RGB 17, 14, 03 RGB 11, 11, 05 RGB 10, 09, 07 -; group 9 +; group 9 (Lake of Rage) RGB 31, 08, 04 RGB 09, 09, 08 RGB 18, 05, 09 RGB 09, 09, 08 -; group 10 +; group 10 (Violet) RGB 24, 14, 31 RGB 13, 07, 21 RGB 12, 03, 18 RGB 09, 03, 15 -; group 11 +; group 11 (Goldenrod) RGB 25, 25, 00 RGB 20, 17, 08 RGB 12, 12, 00 RGB 10, 09, 05 -; group 12 +; group 12 (Vermilion) RGB 27, 23, 01 RGB 23, 11, 00 RGB 15, 11, 01 RGB 11, 10, 01 -; group 13 +; group 13 (Pallet) RGB 27, 28, 31 RGB 17, 19, 22 RGB 14, 14, 18 RGB 10, 09, 13 -; group 14 +; group 14 (Pewter) RGB 19, 19, 16 RGB 10, 12, 15 RGB 09, 09, 11 RGB 04, 05, 07 -; group 15 +; group 15 (Mount Moon Square) RGB 14, 17, 31 RGB 07, 11, 15 RGB 09, 13, 19 RGB 07, 07, 16 -; group 16 +; group 16 (Route 23) RGB 21, 21, 21 RGB 13, 13, 13 RGB 11, 11, 19 RGB 07, 07, 12 -; group 17 +; group 17 (Fuchsia) RGB 31, 18, 29 RGB 17, 13, 20 RGB 14, 06, 12 RGB 11, 03, 10 -; group 18 +; group 18 (Lavender) RGB 23, 15, 31 RGB 16, 05, 31 RGB 12, 07, 17 RGB 08, 06, 10 -; group 19 +; group 19 (Route 28) RGB 21, 21, 25 RGB 16, 16, 16 RGB 13, 13, 13 @@ -124,37 +124,37 @@ RGB 21, 21, 21 RGB 11, 11, 11 -; group 21 +; group 21 (Celadon) RGB 19, 31, 15 RGB 31, 22, 02 RGB 12, 13, 09 RGB 09, 12, 03 -; group 22 +; group 22 (Cianwood) RGB 15, 10, 31 RGB 07, 05, 15 RGB 06, 05, 17 RGB 02, 02, 08 -; group 23 +; group 23 (Viridian) RGB 21, 31, 07 RGB 13, 25, 04 RGB 09, 14, 08 RGB 06, 10, 04 -; group 24 +; group 24 (New Bark) RGB 20, 31, 14 RGB 11, 23, 05 RGB 09, 13, 08 RGB 06, 09, 04 -; group 25 +; group 25 (Saffron) RGB 31, 26, 00 RGB 31, 15, 00 RGB 13, 13, 01 RGB 08, 08, 01 -; group 26 +; group 26 (Cherrygrove) RGB 31, 14, 28 RGB 31, 05, 21 RGB 14, 07, 17 diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm index 2f9b99d2d..0e14f3cab 100644 --- a/tilesets/roofs.asm +++ b/tilesets/roofs.asm @@ -1,4 +1,3 @@ - LoadMapGroupRoof:: ; 1c000 ld a, [MapGroup] ld e, a @@ -17,35 +16,9 @@ LoadMapGroupRoof:: ; 1c000 ret ; 1c021 -MapGroupRoofs: ; 1c021i - db -1 ; group 0 (unused) - db 3 ; group 1 - db 2 ; group 2 - db -1 ; group 3 - db 1 ; group 4 - db 2 ; group 5 - db -1 ; group 6 - db -1 ; group 7 - db 2 ; group 8 - db 2 ; group 9 - db 1 ; group 10 - db 4 ; group 11 - db -1 ; group 12 - db -1 ; group 13 - db -1 ; group 14 - db -1 ; group 15 - db -1 ; group 16 - db -1 ; group 17 - db -1 ; group 18 - db 0 ; group 19 - db -1 ; group 20 - db -1 ; group 21 - db 3 ; group 22 - db -1 ; group 23 - db 0 ; group 24 - db -1 ; group 25 - db 0 ; group 26 -; 1c03c + +INCLUDE "data/mapgroup_roofs.asm" + Roofs: ; 1c03c INCBIN "gfx/tilesets/roofs/0.2bpp" diff --git a/tilesets/26_collision.bin b/tilesets/ruins_of_alph_collision.bin Binary files differindex 1eedacfe8..1eedacfe8 100644 --- a/tilesets/26_collision.bin +++ b/tilesets/ruins_of_alph_collision.bin diff --git a/tilesets/26_metatiles.bin b/tilesets/ruins_of_alph_metatiles.bin Binary files differindex 61ef041b5..61ef041b5 100644 --- a/tilesets/26_metatiles.bin +++ b/tilesets/ruins_of_alph_metatiles.bin diff --git a/tilesets/36_palette_map.asm b/tilesets/ruins_of_alph_palette_map.asm index 5ebde24ba..5ebde24ba 100644 --- a/tilesets/36_palette_map.asm +++ b/tilesets/ruins_of_alph_palette_map.asm diff --git a/tilesets/23_collision.bin b/tilesets/sprout_tower_collision.bin Binary files differindex 878803fb8..878803fb8 100644 --- a/tilesets/23_collision.bin +++ b/tilesets/sprout_tower_collision.bin diff --git a/tilesets/23_metatiles.bin b/tilesets/sprout_tower_metatiles.bin index b6668fcd4..b6668fcd4 100644 --- a/tilesets/23_metatiles.bin +++ b/tilesets/sprout_tower_metatiles.bin diff --git a/tilesets/23_palette_map.asm b/tilesets/sprout_tower_palette_map.asm index 6e3c10115..6e3c10115 100644 --- a/tilesets/23_palette_map.asm +++ b/tilesets/sprout_tower_palette_map.asm diff --git a/tilesets/tileset_headers.asm b/tilesets/tileset_headers.asm index d0debd2b7..b63e962f1 100644 --- a/tilesets/tileset_headers.asm +++ b/tilesets/tileset_headers.asm @@ -1,5 +1,3 @@ -; entries correspond to TILESET_* constants - tileset: macro dba \1GFX, \1Meta, \1Coll dw \1Anim @@ -7,42 +5,43 @@ tileset: macro dw \1PalMap endm -Tileset00:: - tileset Tileset00 -Tileset01:: - tileset Tileset01 - tileset Tileset02 - tileset Tileset03 - tileset Tileset04 - tileset Tileset05 - tileset Tileset06 - tileset Tileset07 - tileset Tileset08 - tileset Tileset09 - tileset Tileset10 - tileset Tileset11 - tileset Tileset12 - tileset Tileset13 - tileset Tileset14 - tileset Tileset15 - tileset Tileset16 - tileset Tileset17 - tileset Tileset18 - tileset Tileset19 - tileset Tileset20 - tileset Tileset21 - tileset Tileset22 - tileset Tileset23 - tileset Tileset24 - tileset Tileset25 - tileset Tileset26 - tileset Tileset27 - tileset Tileset28 - tileset Tileset29 - tileset Tileset30 - tileset Tileset31 - tileset Tileset32 - tileset Tileset33 - tileset Tileset34 - tileset Tileset35 - tileset Tileset36 +Tilesets:: ; 4d596 +; entries correspond to TILESET_* constants + tileset Tileset0 + tileset TilesetJohto1 + tileset TilesetJohto2 + tileset TilesetKanto + tileset TilesetBattleTowerOutside + tileset TilesetHouse1 + tileset TilesetPlayersHouse + tileset TilesetPokecenter + tileset TilesetGate + tileset TilesetPort + tileset TilesetLab + tileset TilesetPowerPlant + tileset TilesetMart + tileset TilesetCeladonMansion + tileset TilesetGameCorner + tileset TilesetGym1 + tileset TilesetKurtsHouse + tileset TilesetTrainStation + tileset TilesetOlivineGym + tileset TilesetLighthouse + tileset TilesetPlayersHouse2F + tileset TilesetPokeComCenter + tileset TilesetBattleTower + tileset TilesetSproutTower + tileset TilesetCave + tileset TilesetPark + tileset TilesetRuinsOfAlph + tileset TilesetRadioTower + tileset TilesetUnderground + tileset TilesetIcePath + tileset TilesetWhirlIslands + tileset TilesetIlexForest + tileset TilesetBetaWordRoom + tileset TilesetHoOhWordRoom + tileset TilesetKabutoWordRoom + tileset TilesetOmanyteWordRoom + tileset TilesetAerodactylWordRoom +; 4d7c1 diff --git a/tilesets/17_collision.bin b/tilesets/train_station_collision.bin Binary files differindex bd5c4c586..bd5c4c586 100644 --- a/tilesets/17_collision.bin +++ b/tilesets/train_station_collision.bin diff --git a/tilesets/17_metatiles.bin b/tilesets/train_station_metatiles.bin Binary files differindex 9bbdd0bd2..9bbdd0bd2 100644 --- a/tilesets/17_metatiles.bin +++ b/tilesets/train_station_metatiles.bin diff --git a/tilesets/17_palette_map.asm b/tilesets/train_station_palette_map.asm index f52f5bbe7..f52f5bbe7 100644 --- a/tilesets/17_palette_map.asm +++ b/tilesets/train_station_palette_map.asm diff --git a/tilesets/28_collision.bin b/tilesets/underground_collision.bin Binary files differindex eccd3e3df..eccd3e3df 100644 --- a/tilesets/28_collision.bin +++ b/tilesets/underground_collision.bin diff --git a/tilesets/28_metatiles.bin b/tilesets/underground_metatiles.bin index 28b807e1e..28b807e1e 100644 --- a/tilesets/28_metatiles.bin +++ b/tilesets/underground_metatiles.bin diff --git a/tilesets/28_palette_map.asm b/tilesets/underground_palette_map.asm index 6b9b5546d..6b9b5546d 100644 --- a/tilesets/28_palette_map.asm +++ b/tilesets/underground_palette_map.asm diff --git a/tilesets/unused_30_collision.bin b/tilesets/unused_whirl_islands_collision.bin Binary files differindex 559aad109..559aad109 100644 --- a/tilesets/unused_30_collision.bin +++ b/tilesets/unused_whirl_islands_collision.bin diff --git a/tilesets/unused_30_metatiles.bin b/tilesets/unused_whirl_islands_metatiles.bin Binary files differindex b70f1a0e6..b70f1a0e6 100644 --- a/tilesets/unused_30_metatiles.bin +++ b/tilesets/unused_whirl_islands_metatiles.bin diff --git a/tilesets/30_collision.bin b/tilesets/whirl_islands_collision.bin Binary files differindex 701de1c0b..701de1c0b 100644 --- a/tilesets/30_collision.bin +++ b/tilesets/whirl_islands_collision.bin diff --git a/tilesets/30_metatiles.bin b/tilesets/whirl_islands_metatiles.bin index a41b5b080..a41b5b080 100644 --- a/tilesets/30_metatiles.bin +++ b/tilesets/whirl_islands_metatiles.bin diff --git a/tilesets/30_palette_map.asm b/tilesets/whirl_islands_palette_map.asm index 73c09ebe5..73c09ebe5 100644 --- a/tilesets/30_palette_map.asm +++ b/tilesets/whirl_islands_palette_map.asm |