From 08b14e593e07555c8d3a445d78d9bcb82a10ddf3 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 23:42:15 -0500 Subject: Rename tilesets, consistent with constant names --- constants/tilemap_constants.asm | 8 +- data/sprite_engine.asm | 2 +- gfx/tilesets/00.2bpp.lz.0c7e555a | Bin 3080 -> 0 bytes gfx/tilesets/00.png | Bin 2084 -> 0 bytes gfx/tilesets/01.2bpp.lz.0c7e555a | Bin 3080 -> 0 bytes gfx/tilesets/01.png | Bin 2084 -> 0 bytes gfx/tilesets/02.2bpp.lz.391603fb | Bin 3080 -> 0 bytes gfx/tilesets/02.png | Bin 2341 -> 0 bytes gfx/tilesets/03.2bpp.lz.a29f5d51 | Bin 1542 -> 0 bytes gfx/tilesets/03.png | Bin 1316 -> 0 bytes gfx/tilesets/04.2bpp.lz.391603fb | Bin 3080 -> 0 bytes gfx/tilesets/04.png | Bin 2341 -> 0 bytes gfx/tilesets/05.2bpp.lz.c848ef13 | Bin 1200 -> 0 bytes gfx/tilesets/05.png | Bin 1264 -> 0 bytes gfx/tilesets/06.2bpp.lz.252cbd8f | Bin 992 -> 0 bytes gfx/tilesets/06.png | Bin 1005 -> 0 bytes gfx/tilesets/07.2bpp.lz.e1c4014c | Bin 1072 -> 0 bytes gfx/tilesets/07.png | Bin 1195 -> 0 bytes gfx/tilesets/08.2bpp.lz.f5a55006 | Bin 1024 -> 0 bytes gfx/tilesets/08.png | Bin 1146 -> 0 bytes gfx/tilesets/09.2bpp.lz.56b1a405 | Bin 1040 -> 0 bytes gfx/tilesets/09.png | Bin 1062 -> 0 bytes gfx/tilesets/10.2bpp.lz.b8d0f547 | Bin 2048 -> 0 bytes gfx/tilesets/10.png | Bin 2041 -> 0 bytes gfx/tilesets/11.2bpp.lz.454cfd8b | Bin 1056 -> 0 bytes gfx/tilesets/11.png | Bin 1131 -> 0 bytes gfx/tilesets/12.2bpp.lz.e2e94f92 | Bin 1872 -> 0 bytes gfx/tilesets/12.png | Bin 1773 -> 0 bytes gfx/tilesets/13.2bpp.lz.63b414d4 | Bin 1888 -> 0 bytes gfx/tilesets/13.png | Bin 2047 -> 0 bytes gfx/tilesets/14.2bpp.lz.71d29a2f | Bin 1472 -> 0 bytes gfx/tilesets/14.png | Bin 1583 -> 0 bytes gfx/tilesets/15.2bpp.lz.c1f2ed8f | Bin 1248 -> 0 bytes gfx/tilesets/15.png | Bin 1282 -> 0 bytes gfx/tilesets/16.2bpp.lz.dd51d079 | Bin 1216 -> 0 bytes gfx/tilesets/16.png | Bin 1203 -> 0 bytes gfx/tilesets/17.2bpp.lz.1600ca86 | Bin 928 -> 0 bytes gfx/tilesets/17.png | Bin 1156 -> 0 bytes gfx/tilesets/18.2bpp.lz.93800351 | Bin 2176 -> 0 bytes gfx/tilesets/18.png | Bin 2284 -> 0 bytes gfx/tilesets/19.2bpp.lz.0c1544c1 | Bin 1136 -> 0 bytes gfx/tilesets/19.png | Bin 1226 -> 0 bytes gfx/tilesets/20.2bpp.lz.35e51007 | Bin 1216 -> 0 bytes gfx/tilesets/20.png | Bin 1250 -> 0 bytes gfx/tilesets/21.2bpp.lz.febbc4ec | Bin 2208 -> 0 bytes gfx/tilesets/21.png | Bin 2498 -> 0 bytes gfx/tilesets/22.2bpp.lz.467b6a2d | Bin 832 -> 0 bytes gfx/tilesets/22.png | Bin 993 -> 0 bytes gfx/tilesets/23.2bpp.lz.bc56789c | Bin 1376 -> 0 bytes gfx/tilesets/23.png | Bin 1505 -> 0 bytes gfx/tilesets/24.2bpp.lz.3437812a | Bin 912 -> 0 bytes gfx/tilesets/24.png | Bin 1044 -> 0 bytes gfx/tilesets/25.2bpp.lz.7fcb81d6 | Bin 1184 -> 0 bytes gfx/tilesets/25.png | Bin 1334 -> 0 bytes gfx/tilesets/26.2bpp.lz.8b42470b | Bin 3080 -> 0 bytes gfx/tilesets/26.png | Bin 1909 -> 0 bytes gfx/tilesets/27.2bpp.lz.27cdd9ad | Bin 1376 -> 0 bytes gfx/tilesets/27.png | Bin 1419 -> 0 bytes gfx/tilesets/28.2bpp.lz.cace291c | Bin 976 -> 0 bytes gfx/tilesets/28.png | Bin 1143 -> 0 bytes gfx/tilesets/29.2bpp.lz.e23bc89f | Bin 2352 -> 0 bytes gfx/tilesets/29.png | Bin 2592 -> 0 bytes gfx/tilesets/30.2bpp.lz.25b9c4b6 | Bin 832 -> 0 bytes gfx/tilesets/30.png | Bin 851 -> 0 bytes gfx/tilesets/31.2bpp.lz.6b0ac896 | Bin 976 -> 0 bytes gfx/tilesets/31.png | Bin 1264 -> 0 bytes gfx/tilesets/32.2bpp.lz.8b42470b | Bin 3080 -> 0 bytes gfx/tilesets/32.png | Bin 1909 -> 0 bytes gfx/tilesets/33.2bpp.lz.8b42470b | Bin 3080 -> 0 bytes gfx/tilesets/33.png | Bin 1909 -> 0 bytes gfx/tilesets/34.2bpp.lz.8b42470b | Bin 3080 -> 0 bytes gfx/tilesets/34.png | Bin 1909 -> 0 bytes gfx/tilesets/35.2bpp.lz.8b42470b | Bin 3080 -> 0 bytes gfx/tilesets/35.png | Bin 1909 -> 0 bytes gfx/tilesets/36.2bpp.lz.8b42470b | Bin 3080 -> 0 bytes gfx/tilesets/36.png | Bin 1909 -> 0 bytes gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b | Bin 0 -> 3080 bytes gfx/tilesets/aerodactyl_word_room.png | Bin 0 -> 1909 bytes gfx/tilesets/battle_tower.2bpp.lz.467b6a2d | Bin 0 -> 832 bytes gfx/tilesets/battle_tower.png | Bin 0 -> 993 bytes gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb | Bin 0 -> 3080 bytes gfx/tilesets/battle_tower_outside.png | Bin 0 -> 2341 bytes gfx/tilesets/beta_word_room.2bpp.lz.8b42470b | Bin 0 -> 3080 bytes gfx/tilesets/beta_word_room.png | Bin 0 -> 1909 bytes gfx/tilesets/cave.2bpp.lz.3437812a | Bin 0 -> 912 bytes gfx/tilesets/cave.png | Bin 0 -> 1044 bytes gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 | Bin 0 -> 1888 bytes gfx/tilesets/celadon_mansion.png | Bin 0 -> 2047 bytes gfx/tilesets/game_corner.2bpp.lz.71d29a2f | Bin 0 -> 1472 bytes gfx/tilesets/game_corner.png | Bin 0 -> 1583 bytes gfx/tilesets/gate.2bpp.lz.f5a55006 | Bin 0 -> 1024 bytes gfx/tilesets/gate.png | Bin 0 -> 1146 bytes gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f | Bin 0 -> 1248 bytes gfx/tilesets/gym_1.png | Bin 0 -> 1282 bytes gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b | Bin 0 -> 3080 bytes gfx/tilesets/ho_oh_word_room.png | Bin 0 -> 1909 bytes gfx/tilesets/house_1.2bpp.lz.c848ef13 | Bin 0 -> 1200 bytes gfx/tilesets/house_1.png | Bin 0 -> 1264 bytes gfx/tilesets/ice_path.2bpp.lz.e23bc89f | Bin 0 -> 2352 bytes gfx/tilesets/ice_path.png | Bin 0 -> 2592 bytes gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 | Bin 0 -> 976 bytes gfx/tilesets/ilex_forest.png | Bin 0 -> 1264 bytes gfx/tilesets/johto_1.2bpp.lz.0c7e555a | Bin 0 -> 3080 bytes gfx/tilesets/johto_1.png | Bin 0 -> 2084 bytes gfx/tilesets/johto_2.2bpp.lz.391603fb | Bin 0 -> 3080 bytes gfx/tilesets/johto_2.png | Bin 0 -> 2341 bytes gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b | Bin 0 -> 3080 bytes gfx/tilesets/kabuto_word_room.png | Bin 0 -> 1909 bytes gfx/tilesets/kanto.2bpp.lz.a29f5d51 | Bin 0 -> 1542 bytes gfx/tilesets/kanto.png | Bin 0 -> 1316 bytes gfx/tilesets/kurts_house.2bpp.lz.dd51d079 | Bin 0 -> 1216 bytes gfx/tilesets/kurts_house.png | Bin 0 -> 1203 bytes gfx/tilesets/lab.2bpp.lz.b8d0f547 | Bin 0 -> 2048 bytes gfx/tilesets/lab.png | Bin 0 -> 2041 bytes gfx/tilesets/lighthouse.2bpp.lz.0c1544c1 | Bin 0 -> 1136 bytes gfx/tilesets/lighthouse.png | Bin 0 -> 1226 bytes gfx/tilesets/mart.2bpp.lz.e2e94f92 | Bin 0 -> 1872 bytes gfx/tilesets/mart.png | Bin 0 -> 1773 bytes gfx/tilesets/olivine_gym.2bpp.lz.93800351 | Bin 0 -> 2176 bytes gfx/tilesets/olivine_gym.png | Bin 0 -> 2284 bytes gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b | Bin 0 -> 3080 bytes gfx/tilesets/omanyte_word_room.png | Bin 0 -> 1909 bytes gfx/tilesets/park.2bpp.lz.7fcb81d6 | Bin 0 -> 1184 bytes gfx/tilesets/park.png | Bin 0 -> 1334 bytes gfx/tilesets/players_house.2bpp.lz.252cbd8f | Bin 0 -> 992 bytes gfx/tilesets/players_house.png | Bin 0 -> 1005 bytes gfx/tilesets/players_house_2f.2bpp.lz.35e51007 | Bin 0 -> 1216 bytes gfx/tilesets/players_house_2f.png | Bin 0 -> 1250 bytes gfx/tilesets/pokecenter.2bpp.lz.e1c4014c | Bin 0 -> 1072 bytes gfx/tilesets/pokecenter.png | Bin 0 -> 1195 bytes gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec | Bin 0 -> 2208 bytes gfx/tilesets/pokecom_center.png | Bin 0 -> 2498 bytes gfx/tilesets/port.2bpp.lz.56b1a405 | Bin 0 -> 1040 bytes gfx/tilesets/port.png | Bin 0 -> 1062 bytes gfx/tilesets/power_plant.2bpp.lz.454cfd8b | Bin 0 -> 1056 bytes gfx/tilesets/power_plant.png | Bin 0 -> 1131 bytes gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad | Bin 0 -> 1376 bytes gfx/tilesets/radio_tower.png | Bin 0 -> 1419 bytes gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b | Bin 0 -> 3080 bytes gfx/tilesets/ruins_of_alph.png | Bin 0 -> 1909 bytes gfx/tilesets/sprout_tower.2bpp.lz.bc56789c | Bin 0 -> 1376 bytes gfx/tilesets/sprout_tower.png | Bin 0 -> 1505 bytes gfx/tilesets/train_station.2bpp.lz.1600ca86 | Bin 0 -> 928 bytes gfx/tilesets/train_station.png | Bin 0 -> 1156 bytes gfx/tilesets/underground.2bpp.lz.cace291c | Bin 0 -> 976 bytes gfx/tilesets/underground.png | Bin 0 -> 1143 bytes gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 | Bin 0 -> 832 bytes gfx/tilesets/whirl_islands.png | Bin 0 -> 851 bytes home/map.asm | 4 +- maps/map_headers.asm | 34 +- tilesets/00_collision.bin | Bin 256 -> 0 bytes tilesets/00_metatiles.bin | Bin 1024 -> 0 bytes tilesets/00_palette_map.asm | 29 -- tilesets/01_collision.bin | Bin 512 -> 0 bytes tilesets/01_metatiles.bin | Bin 2048 -> 0 bytes tilesets/01_palette_map.asm | 29 -- tilesets/02_collision.bin | Bin 512 -> 0 bytes tilesets/02_metatiles.bin | Bin 2048 -> 0 bytes tilesets/02_palette_map.asm | 29 -- tilesets/03_collision.bin | Bin 512 -> 0 bytes tilesets/03_metatiles.bin | Bin 2048 -> 0 bytes tilesets/03_palette_map.asm | 29 -- tilesets/04_collision.bin | Bin 512 -> 0 bytes tilesets/04_metatiles.bin | Bin 2048 -> 0 bytes tilesets/04_palette_map.asm | 29 -- tilesets/05_collision.bin | Bin 256 -> 0 bytes tilesets/05_metatiles.bin | Bin 1024 -> 0 bytes tilesets/05_palette_map.asm | 29 -- tilesets/06_collision.bin | Bin 256 -> 0 bytes tilesets/06_metatiles.bin | Bin 1024 -> 0 bytes tilesets/06_palette_map.asm | 29 -- tilesets/07_collision.bin | Bin 256 -> 0 bytes tilesets/07_metatiles.bin | Bin 1024 -> 0 bytes tilesets/07_palette_map.asm | 29 -- tilesets/08_collision.bin | Bin 256 -> 0 bytes tilesets/08_metatiles.bin | Bin 1024 -> 0 bytes tilesets/08_palette_map.asm | 29 -- tilesets/09_collision.bin | Bin 256 -> 0 bytes tilesets/09_metatiles.bin | 65 ---- tilesets/09_palette_map.asm | 29 -- tilesets/10_collision.bin | Bin 256 -> 0 bytes tilesets/10_metatiles.bin | Bin 1024 -> 0 bytes tilesets/10_palette_map.asm | 29 -- tilesets/11_collision.bin | Bin 256 -> 0 bytes tilesets/11_metatiles.bin | 8 - tilesets/11_palette_map.asm | 29 -- tilesets/12_collision.bin | Bin 256 -> 0 bytes tilesets/12_metatiles.bin | 3 - tilesets/12_palette_map.asm | 29 -- tilesets/13_collision.bin | Bin 256 -> 0 bytes tilesets/13_metatiles.bin | 5 - tilesets/13_palette_map.asm | 29 -- tilesets/14_collision.bin | Bin 256 -> 0 bytes tilesets/14_metatiles.bin | Bin 1024 -> 0 bytes tilesets/14_palette_map.asm | 29 -- tilesets/15_collision.bin | Bin 256 -> 0 bytes tilesets/15_metatiles.bin | Bin 1024 -> 0 bytes tilesets/15_palette_map.asm | 29 -- tilesets/16_collision.bin | Bin 256 -> 0 bytes tilesets/16_metatiles.bin | Bin 1024 -> 0 bytes tilesets/16_palette_map.asm | 29 -- tilesets/17_collision.bin | Bin 256 -> 0 bytes tilesets/17_metatiles.bin | Bin 1024 -> 0 bytes tilesets/17_palette_map.asm | 29 -- tilesets/18_collision.bin | Bin 256 -> 0 bytes tilesets/18_metatiles.bin | 15 - tilesets/18_palette_map.asm | 29 -- tilesets/19_collision.bin | Bin 256 -> 0 bytes tilesets/19_metatiles.bin | Bin 1024 -> 0 bytes tilesets/19_palette_map.asm | 29 -- tilesets/20_collision.bin | Bin 256 -> 0 bytes tilesets/20_metatiles.bin | Bin 1024 -> 0 bytes tilesets/20_palette_map.asm | 29 -- tilesets/21_collision.bin | Bin 256 -> 0 bytes tilesets/21_metatiles.bin | 2 - tilesets/21_palette_map.asm | 29 -- tilesets/22_collision.bin | Bin 256 -> 0 bytes tilesets/22_metatiles.bin | Bin 1024 -> 0 bytes tilesets/22_palette_map.asm | 29 -- tilesets/23_collision.bin | Bin 256 -> 0 bytes tilesets/23_metatiles.bin | 2 - tilesets/23_palette_map.asm | 29 -- tilesets/24_collision.bin | Bin 256 -> 0 bytes tilesets/24_metatiles.bin | 6 - tilesets/24_palette_map.asm | 29 -- tilesets/25_collision.bin | Bin 256 -> 0 bytes tilesets/25_metatiles.bin | Bin 1024 -> 0 bytes tilesets/25_palette_map.asm | 29 -- tilesets/26_collision.bin | Bin 256 -> 0 bytes tilesets/26_metatiles.bin | Bin 1024 -> 0 bytes tilesets/26_palette_map.asm | 29 -- tilesets/27_collision.bin | Bin 256 -> 0 bytes tilesets/27_metatiles.bin | Bin 1024 -> 0 bytes tilesets/27_palette_map.asm | 29 -- tilesets/28_collision.bin | Bin 256 -> 0 bytes tilesets/28_metatiles.bin | 2 - tilesets/28_palette_map.asm | 29 -- tilesets/29_collision.bin | Bin 256 -> 0 bytes tilesets/29_metatiles.bin | 3 - tilesets/29_palette_map.asm | 29 -- tilesets/30_collision.bin | Bin 256 -> 0 bytes tilesets/30_metatiles.bin | 6 - tilesets/30_palette_map.asm | 29 -- tilesets/31_collision.bin | Bin 256 -> 0 bytes tilesets/31_metatiles.bin | 1 - tilesets/31_palette_map.asm | 29 -- tilesets/32_collision.bin | Bin 256 -> 0 bytes tilesets/32_metatiles.bin | 17 - tilesets/32_palette_map.asm | 29 -- tilesets/33_collision.bin | Bin 256 -> 0 bytes tilesets/33_metatiles.bin | 17 - tilesets/33_palette_map.asm | 29 -- tilesets/34_collision.bin | Bin 256 -> 0 bytes tilesets/34_metatiles.bin | 17 - tilesets/34_palette_map.asm | 29 -- tilesets/35_collision.bin | Bin 256 -> 0 bytes tilesets/35_metatiles.bin | 17 - tilesets/35_palette_map.asm | 29 -- tilesets/36_collision.bin | Bin 256 -> 0 bytes tilesets/36_metatiles.bin | 17 - tilesets/36_palette_map.asm | 29 -- tilesets/aerodactyl_word_room_collision.bin | Bin 0 -> 256 bytes tilesets/aerodactyl_word_room_metatiles.bin | 17 + tilesets/aerodactyl_word_room_palette_map.asm | 29 ++ tilesets/animations.asm | 74 ++-- tilesets/battle_tower_collision.bin | Bin 0 -> 256 bytes tilesets/battle_tower_metatiles.bin | Bin 0 -> 1024 bytes tilesets/battle_tower_outside_collision.bin | Bin 0 -> 512 bytes tilesets/battle_tower_outside_metatiles.bin | Bin 0 -> 2048 bytes tilesets/battle_tower_outside_palette_map.asm | 29 ++ tilesets/battle_tower_palette_map.asm | 29 ++ tilesets/beta_word_room_collision.bin | Bin 0 -> 256 bytes tilesets/beta_word_room_metatiles.bin | 17 + tilesets/beta_word_room_palette_map.asm | 29 ++ tilesets/cave_collision.bin | Bin 0 -> 256 bytes tilesets/cave_metatiles.bin | 6 + tilesets/cave_palette_map.asm | 29 ++ tilesets/celadon_mansion_collision.bin | Bin 0 -> 256 bytes tilesets/celadon_mansion_metatiles.bin | 5 + tilesets/celadon_mansion_palette_map.asm | 29 ++ tilesets/data.asm | 422 ++++++++++----------- tilesets/game_corner_collision.bin | Bin 0 -> 256 bytes tilesets/game_corner_metatiles.bin | Bin 0 -> 1024 bytes tilesets/game_corner_palette_map.asm | 29 ++ tilesets/gate_collision.bin | Bin 0 -> 256 bytes tilesets/gate_metatiles.bin | Bin 0 -> 1024 bytes tilesets/gate_palette_map.asm | 29 ++ tilesets/gym_1_collision.bin | Bin 0 -> 256 bytes tilesets/gym_1_metatiles.bin | Bin 0 -> 1024 bytes tilesets/gym_1_palette_map.asm | 29 ++ tilesets/ho_oh_word_room_collision.bin | Bin 0 -> 256 bytes tilesets/ho_oh_word_room_metatiles.bin | 17 + tilesets/ho_oh_word_room_palette_map.asm | 29 ++ tilesets/house_1_collision.bin | Bin 0 -> 256 bytes tilesets/house_1_metatiles.bin | Bin 0 -> 1024 bytes tilesets/house_1_palette_map.asm | 29 ++ tilesets/ice_path_collision.bin | Bin 0 -> 256 bytes tilesets/ice_path_metatiles.bin | 3 + tilesets/ice_path_palette_map.asm | 29 ++ tilesets/ilex_forest_collision.bin | Bin 0 -> 256 bytes tilesets/ilex_forest_metatiles.bin | 1 + tilesets/ilex_forest_palette_map.asm | 29 ++ tilesets/johto_1_collision.bin | Bin 0 -> 512 bytes tilesets/johto_1_metatiles.bin | Bin 0 -> 2048 bytes tilesets/johto_1_palette_map.asm | 29 ++ tilesets/johto_2_collision.bin | Bin 0 -> 512 bytes tilesets/johto_2_metatiles.bin | Bin 0 -> 2048 bytes tilesets/johto_2_palette_map.asm | 29 ++ tilesets/kabuto_word_room_collision.bin | Bin 0 -> 256 bytes tilesets/kabuto_word_room_metatiles.bin | 17 + tilesets/kabuto_word_room_palette_map.asm | 29 ++ tilesets/kanto_collision.bin | Bin 0 -> 512 bytes tilesets/kanto_metatiles.bin | Bin 0 -> 2048 bytes tilesets/kanto_palette_map.asm | 29 ++ tilesets/kurts_house_collision.bin | Bin 0 -> 256 bytes tilesets/kurts_house_metatiles.bin | Bin 0 -> 1024 bytes tilesets/kurts_house_palette_map.asm | 29 ++ tilesets/lab_collision.bin | Bin 0 -> 256 bytes tilesets/lab_metatiles.bin | Bin 0 -> 1024 bytes tilesets/lab_palette_map.asm | 29 ++ tilesets/lighthouse_collision.bin | Bin 0 -> 256 bytes tilesets/lighthouse_metatiles.bin | Bin 0 -> 1024 bytes tilesets/lighthouse_palette_map.asm | 29 ++ tilesets/mart_collision.bin | Bin 0 -> 256 bytes tilesets/mart_metatiles.bin | 3 + tilesets/mart_palette_map.asm | 29 ++ tilesets/olivine_gym_collision.bin | Bin 0 -> 256 bytes tilesets/olivine_gym_metatiles.bin | 15 + tilesets/olivine_gym_palette_map.asm | 29 ++ tilesets/omanyte_word_room_collision.bin | Bin 0 -> 256 bytes tilesets/omanyte_word_room_metatiles.bin | 17 + tilesets/omanyte_word_room_palette_map.asm | 29 ++ tilesets/palette_maps.asm | 134 +++---- tilesets/park_collision.bin | Bin 0 -> 256 bytes tilesets/park_metatiles.bin | Bin 0 -> 1024 bytes tilesets/park_palette_map.asm | 29 ++ tilesets/players_house_2f_collision.bin | Bin 0 -> 256 bytes tilesets/players_house_2f_metatiles.bin | Bin 0 -> 1024 bytes tilesets/players_house_2f_palette_map.asm | 29 ++ tilesets/players_house_collision.bin | Bin 0 -> 256 bytes tilesets/players_house_metatiles.bin | Bin 0 -> 1024 bytes tilesets/players_house_palette_map.asm | 29 ++ tilesets/pokecenter_collision.bin | Bin 0 -> 256 bytes tilesets/pokecenter_metatiles.bin | Bin 0 -> 1024 bytes tilesets/pokecenter_palette_map.asm | 29 ++ tilesets/pokecom_center_collision.bin | Bin 0 -> 256 bytes tilesets/pokecom_center_metatiles.bin | 2 + tilesets/pokecom_center_palette_map.asm | 29 ++ tilesets/port_collision.bin | Bin 0 -> 256 bytes tilesets/port_metatiles.bin | 65 ++++ tilesets/port_palette_map.asm | 29 ++ tilesets/power_plant_collision.bin | Bin 0 -> 256 bytes tilesets/power_plant_metatiles.bin | 8 + tilesets/power_plant_palette_map.asm | 29 ++ tilesets/radio_tower_collision.bin | Bin 0 -> 256 bytes tilesets/radio_tower_metatiles.bin | Bin 0 -> 1024 bytes tilesets/radio_tower_palette_map.asm | 29 ++ tilesets/ruins_of_alph_collision.bin | Bin 0 -> 256 bytes tilesets/ruins_of_alph_metatiles.bin | Bin 0 -> 1024 bytes tilesets/ruins_of_alph_palette_map.asm | 29 ++ tilesets/sprout_tower_collision.bin | Bin 0 -> 256 bytes tilesets/sprout_tower_metatiles.bin | 2 + tilesets/sprout_tower_palette_map.asm | 29 ++ tilesets/tileset_headers.asm | 78 ++-- tilesets/train_station_collision.bin | Bin 0 -> 256 bytes tilesets/train_station_metatiles.bin | Bin 0 -> 1024 bytes tilesets/train_station_palette_map.asm | 29 ++ tilesets/underground_collision.bin | Bin 0 -> 256 bytes tilesets/underground_metatiles.bin | 2 + tilesets/underground_palette_map.asm | 29 ++ tilesets/unused_30_collision.bin | Bin 512 -> 0 bytes tilesets/unused_30_metatiles.bin | Bin 2048 -> 0 bytes tilesets/unused_whirl_islands_collision.bin | Bin 0 -> 512 bytes tilesets/unused_whirl_islands_metatiles.bin | Bin 0 -> 2048 bytes tilesets/whirl_islands_collision.bin | Bin 0 -> 256 bytes tilesets/whirl_islands_metatiles.bin | 6 + tilesets/whirl_islands_palette_map.asm | 29 ++ 377 files changed, 1625 insertions(+), 1654 deletions(-) delete mode 100644 gfx/tilesets/00.2bpp.lz.0c7e555a delete mode 100644 gfx/tilesets/00.png delete mode 100644 gfx/tilesets/01.2bpp.lz.0c7e555a delete mode 100644 gfx/tilesets/01.png delete mode 100644 gfx/tilesets/02.2bpp.lz.391603fb delete mode 100644 gfx/tilesets/02.png delete mode 100644 gfx/tilesets/03.2bpp.lz.a29f5d51 delete mode 100644 gfx/tilesets/03.png delete mode 100644 gfx/tilesets/04.2bpp.lz.391603fb delete mode 100644 gfx/tilesets/04.png delete mode 100644 gfx/tilesets/05.2bpp.lz.c848ef13 delete mode 100644 gfx/tilesets/05.png delete mode 100644 gfx/tilesets/06.2bpp.lz.252cbd8f delete mode 100644 gfx/tilesets/06.png delete mode 100644 gfx/tilesets/07.2bpp.lz.e1c4014c delete mode 100644 gfx/tilesets/07.png delete mode 100644 gfx/tilesets/08.2bpp.lz.f5a55006 delete mode 100644 gfx/tilesets/08.png delete mode 100644 gfx/tilesets/09.2bpp.lz.56b1a405 delete mode 100644 gfx/tilesets/09.png delete mode 100644 gfx/tilesets/10.2bpp.lz.b8d0f547 delete mode 100644 gfx/tilesets/10.png delete mode 100644 gfx/tilesets/11.2bpp.lz.454cfd8b delete mode 100644 gfx/tilesets/11.png delete mode 100644 gfx/tilesets/12.2bpp.lz.e2e94f92 delete mode 100644 gfx/tilesets/12.png delete mode 100644 gfx/tilesets/13.2bpp.lz.63b414d4 delete mode 100644 gfx/tilesets/13.png delete mode 100644 gfx/tilesets/14.2bpp.lz.71d29a2f delete mode 100644 gfx/tilesets/14.png delete mode 100644 gfx/tilesets/15.2bpp.lz.c1f2ed8f delete mode 100644 gfx/tilesets/15.png delete mode 100644 gfx/tilesets/16.2bpp.lz.dd51d079 delete mode 100644 gfx/tilesets/16.png delete mode 100644 gfx/tilesets/17.2bpp.lz.1600ca86 delete mode 100644 gfx/tilesets/17.png delete mode 100644 gfx/tilesets/18.2bpp.lz.93800351 delete mode 100644 gfx/tilesets/18.png delete mode 100644 gfx/tilesets/19.2bpp.lz.0c1544c1 delete mode 100644 gfx/tilesets/19.png delete mode 100644 gfx/tilesets/20.2bpp.lz.35e51007 delete mode 100644 gfx/tilesets/20.png delete mode 100644 gfx/tilesets/21.2bpp.lz.febbc4ec delete mode 100644 gfx/tilesets/21.png delete mode 100644 gfx/tilesets/22.2bpp.lz.467b6a2d delete mode 100644 gfx/tilesets/22.png delete mode 100644 gfx/tilesets/23.2bpp.lz.bc56789c delete mode 100644 gfx/tilesets/23.png delete mode 100644 gfx/tilesets/24.2bpp.lz.3437812a delete mode 100644 gfx/tilesets/24.png delete mode 100644 gfx/tilesets/25.2bpp.lz.7fcb81d6 delete mode 100644 gfx/tilesets/25.png delete mode 100644 gfx/tilesets/26.2bpp.lz.8b42470b delete mode 100644 gfx/tilesets/26.png delete mode 100644 gfx/tilesets/27.2bpp.lz.27cdd9ad delete mode 100644 gfx/tilesets/27.png delete mode 100644 gfx/tilesets/28.2bpp.lz.cace291c delete mode 100644 gfx/tilesets/28.png delete mode 100644 gfx/tilesets/29.2bpp.lz.e23bc89f delete mode 100644 gfx/tilesets/29.png delete mode 100644 gfx/tilesets/30.2bpp.lz.25b9c4b6 delete mode 100644 gfx/tilesets/30.png delete mode 100644 gfx/tilesets/31.2bpp.lz.6b0ac896 delete mode 100644 gfx/tilesets/31.png delete mode 100644 gfx/tilesets/32.2bpp.lz.8b42470b delete mode 100644 gfx/tilesets/32.png delete mode 100644 gfx/tilesets/33.2bpp.lz.8b42470b delete mode 100644 gfx/tilesets/33.png delete mode 100644 gfx/tilesets/34.2bpp.lz.8b42470b delete mode 100644 gfx/tilesets/34.png delete mode 100644 gfx/tilesets/35.2bpp.lz.8b42470b delete mode 100644 gfx/tilesets/35.png delete mode 100644 gfx/tilesets/36.2bpp.lz.8b42470b delete mode 100644 gfx/tilesets/36.png create mode 100644 gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b create mode 100644 gfx/tilesets/aerodactyl_word_room.png create mode 100644 gfx/tilesets/battle_tower.2bpp.lz.467b6a2d create mode 100644 gfx/tilesets/battle_tower.png create mode 100644 gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb create mode 100644 gfx/tilesets/battle_tower_outside.png create mode 100644 gfx/tilesets/beta_word_room.2bpp.lz.8b42470b create mode 100644 gfx/tilesets/beta_word_room.png create mode 100644 gfx/tilesets/cave.2bpp.lz.3437812a create mode 100644 gfx/tilesets/cave.png create mode 100644 gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 create mode 100644 gfx/tilesets/celadon_mansion.png create mode 100644 gfx/tilesets/game_corner.2bpp.lz.71d29a2f create mode 100644 gfx/tilesets/game_corner.png create mode 100644 gfx/tilesets/gate.2bpp.lz.f5a55006 create mode 100644 gfx/tilesets/gate.png create mode 100644 gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f create mode 100644 gfx/tilesets/gym_1.png create mode 100644 gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b create mode 100644 gfx/tilesets/ho_oh_word_room.png create mode 100644 gfx/tilesets/house_1.2bpp.lz.c848ef13 create mode 100644 gfx/tilesets/house_1.png create mode 100644 gfx/tilesets/ice_path.2bpp.lz.e23bc89f create mode 100644 gfx/tilesets/ice_path.png create mode 100644 gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 create mode 100644 gfx/tilesets/ilex_forest.png create mode 100644 gfx/tilesets/johto_1.2bpp.lz.0c7e555a create mode 100644 gfx/tilesets/johto_1.png create mode 100644 gfx/tilesets/johto_2.2bpp.lz.391603fb create mode 100644 gfx/tilesets/johto_2.png create mode 100644 gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b create mode 100644 gfx/tilesets/kabuto_word_room.png create mode 100644 gfx/tilesets/kanto.2bpp.lz.a29f5d51 create mode 100644 gfx/tilesets/kanto.png create mode 100644 gfx/tilesets/kurts_house.2bpp.lz.dd51d079 create mode 100644 gfx/tilesets/kurts_house.png create mode 100644 gfx/tilesets/lab.2bpp.lz.b8d0f547 create mode 100644 gfx/tilesets/lab.png create mode 100644 gfx/tilesets/lighthouse.2bpp.lz.0c1544c1 create mode 100644 gfx/tilesets/lighthouse.png create mode 100644 gfx/tilesets/mart.2bpp.lz.e2e94f92 create mode 100644 gfx/tilesets/mart.png create mode 100644 gfx/tilesets/olivine_gym.2bpp.lz.93800351 create mode 100644 gfx/tilesets/olivine_gym.png create mode 100644 gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b create mode 100644 gfx/tilesets/omanyte_word_room.png create mode 100644 gfx/tilesets/park.2bpp.lz.7fcb81d6 create mode 100644 gfx/tilesets/park.png create mode 100644 gfx/tilesets/players_house.2bpp.lz.252cbd8f create mode 100644 gfx/tilesets/players_house.png create mode 100644 gfx/tilesets/players_house_2f.2bpp.lz.35e51007 create mode 100644 gfx/tilesets/players_house_2f.png create mode 100644 gfx/tilesets/pokecenter.2bpp.lz.e1c4014c create mode 100644 gfx/tilesets/pokecenter.png create mode 100644 gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec create mode 100644 gfx/tilesets/pokecom_center.png create mode 100644 gfx/tilesets/port.2bpp.lz.56b1a405 create mode 100644 gfx/tilesets/port.png create mode 100644 gfx/tilesets/power_plant.2bpp.lz.454cfd8b create mode 100644 gfx/tilesets/power_plant.png create mode 100644 gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad create mode 100644 gfx/tilesets/radio_tower.png create mode 100644 gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b create mode 100644 gfx/tilesets/ruins_of_alph.png create mode 100644 gfx/tilesets/sprout_tower.2bpp.lz.bc56789c create mode 100644 gfx/tilesets/sprout_tower.png create mode 100644 gfx/tilesets/train_station.2bpp.lz.1600ca86 create mode 100644 gfx/tilesets/train_station.png create mode 100644 gfx/tilesets/underground.2bpp.lz.cace291c create mode 100644 gfx/tilesets/underground.png create mode 100644 gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 create mode 100644 gfx/tilesets/whirl_islands.png delete mode 100644 tilesets/00_collision.bin delete mode 100644 tilesets/00_metatiles.bin delete mode 100755 tilesets/00_palette_map.asm delete mode 100644 tilesets/01_collision.bin delete mode 100644 tilesets/01_metatiles.bin delete mode 100644 tilesets/01_palette_map.asm delete mode 100644 tilesets/02_collision.bin delete mode 100644 tilesets/02_metatiles.bin delete mode 100644 tilesets/02_palette_map.asm delete mode 100644 tilesets/03_collision.bin delete mode 100644 tilesets/03_metatiles.bin delete mode 100644 tilesets/03_palette_map.asm delete mode 100644 tilesets/04_collision.bin delete mode 100644 tilesets/04_metatiles.bin delete mode 100644 tilesets/04_palette_map.asm delete mode 100644 tilesets/05_collision.bin delete mode 100644 tilesets/05_metatiles.bin delete mode 100644 tilesets/05_palette_map.asm delete mode 100644 tilesets/06_collision.bin delete mode 100644 tilesets/06_metatiles.bin delete mode 100644 tilesets/06_palette_map.asm delete mode 100644 tilesets/07_collision.bin delete mode 100644 tilesets/07_metatiles.bin delete mode 100644 tilesets/07_palette_map.asm delete mode 100644 tilesets/08_collision.bin delete mode 100644 tilesets/08_metatiles.bin delete mode 100644 tilesets/08_palette_map.asm delete mode 100644 tilesets/09_collision.bin delete mode 100644 tilesets/09_metatiles.bin delete mode 100644 tilesets/09_palette_map.asm delete mode 100644 tilesets/10_collision.bin delete mode 100644 tilesets/10_metatiles.bin delete mode 100644 tilesets/10_palette_map.asm delete mode 100644 tilesets/11_collision.bin delete mode 100644 tilesets/11_metatiles.bin delete mode 100644 tilesets/11_palette_map.asm delete mode 100644 tilesets/12_collision.bin delete mode 100644 tilesets/12_metatiles.bin delete mode 100644 tilesets/12_palette_map.asm delete mode 100644 tilesets/13_collision.bin delete mode 100644 tilesets/13_metatiles.bin delete mode 100644 tilesets/13_palette_map.asm delete mode 100644 tilesets/14_collision.bin delete mode 100644 tilesets/14_metatiles.bin delete mode 100644 tilesets/14_palette_map.asm delete mode 100644 tilesets/15_collision.bin delete mode 100644 tilesets/15_metatiles.bin delete mode 100644 tilesets/15_palette_map.asm delete mode 100644 tilesets/16_collision.bin delete mode 100644 tilesets/16_metatiles.bin delete mode 100644 tilesets/16_palette_map.asm delete mode 100644 tilesets/17_collision.bin delete mode 100644 tilesets/17_metatiles.bin delete mode 100644 tilesets/17_palette_map.asm delete mode 100644 tilesets/18_collision.bin delete mode 100644 tilesets/18_metatiles.bin delete mode 100644 tilesets/18_palette_map.asm delete mode 100644 tilesets/19_collision.bin delete mode 100644 tilesets/19_metatiles.bin delete mode 100644 tilesets/19_palette_map.asm delete mode 100644 tilesets/20_collision.bin delete mode 100644 tilesets/20_metatiles.bin delete mode 100644 tilesets/20_palette_map.asm delete mode 100644 tilesets/21_collision.bin delete mode 100644 tilesets/21_metatiles.bin delete mode 100644 tilesets/21_palette_map.asm delete mode 100644 tilesets/22_collision.bin delete mode 100644 tilesets/22_metatiles.bin delete mode 100644 tilesets/22_palette_map.asm delete mode 100644 tilesets/23_collision.bin delete mode 100644 tilesets/23_metatiles.bin delete mode 100644 tilesets/23_palette_map.asm delete mode 100644 tilesets/24_collision.bin delete mode 100644 tilesets/24_metatiles.bin delete mode 100644 tilesets/24_palette_map.asm delete mode 100644 tilesets/25_collision.bin delete mode 100644 tilesets/25_metatiles.bin delete mode 100644 tilesets/25_palette_map.asm delete mode 100644 tilesets/26_collision.bin delete mode 100644 tilesets/26_metatiles.bin delete mode 100644 tilesets/26_palette_map.asm delete mode 100644 tilesets/27_collision.bin delete mode 100644 tilesets/27_metatiles.bin delete mode 100644 tilesets/27_palette_map.asm delete mode 100644 tilesets/28_collision.bin delete mode 100644 tilesets/28_metatiles.bin delete mode 100644 tilesets/28_palette_map.asm delete mode 100644 tilesets/29_collision.bin delete mode 100644 tilesets/29_metatiles.bin delete mode 100644 tilesets/29_palette_map.asm delete mode 100644 tilesets/30_collision.bin delete mode 100644 tilesets/30_metatiles.bin delete mode 100644 tilesets/30_palette_map.asm delete mode 100644 tilesets/31_collision.bin delete mode 100644 tilesets/31_metatiles.bin delete mode 100644 tilesets/31_palette_map.asm delete mode 100644 tilesets/32_collision.bin delete mode 100644 tilesets/32_metatiles.bin delete mode 100644 tilesets/32_palette_map.asm delete mode 100644 tilesets/33_collision.bin delete mode 100644 tilesets/33_metatiles.bin delete mode 100644 tilesets/33_palette_map.asm delete mode 100644 tilesets/34_collision.bin delete mode 100644 tilesets/34_metatiles.bin delete mode 100644 tilesets/34_palette_map.asm delete mode 100644 tilesets/35_collision.bin delete mode 100644 tilesets/35_metatiles.bin delete mode 100644 tilesets/35_palette_map.asm delete mode 100644 tilesets/36_collision.bin delete mode 100644 tilesets/36_metatiles.bin delete mode 100644 tilesets/36_palette_map.asm create mode 100644 tilesets/aerodactyl_word_room_collision.bin create mode 100644 tilesets/aerodactyl_word_room_metatiles.bin create mode 100644 tilesets/aerodactyl_word_room_palette_map.asm create mode 100644 tilesets/battle_tower_collision.bin create mode 100644 tilesets/battle_tower_metatiles.bin create mode 100644 tilesets/battle_tower_outside_collision.bin create mode 100644 tilesets/battle_tower_outside_metatiles.bin create mode 100644 tilesets/battle_tower_outside_palette_map.asm create mode 100644 tilesets/battle_tower_palette_map.asm create mode 100644 tilesets/beta_word_room_collision.bin create mode 100644 tilesets/beta_word_room_metatiles.bin create mode 100644 tilesets/beta_word_room_palette_map.asm create mode 100644 tilesets/cave_collision.bin create mode 100644 tilesets/cave_metatiles.bin create mode 100644 tilesets/cave_palette_map.asm create mode 100644 tilesets/celadon_mansion_collision.bin create mode 100644 tilesets/celadon_mansion_metatiles.bin create mode 100644 tilesets/celadon_mansion_palette_map.asm create mode 100644 tilesets/game_corner_collision.bin create mode 100644 tilesets/game_corner_metatiles.bin create mode 100644 tilesets/game_corner_palette_map.asm create mode 100644 tilesets/gate_collision.bin create mode 100644 tilesets/gate_metatiles.bin create mode 100644 tilesets/gate_palette_map.asm create mode 100644 tilesets/gym_1_collision.bin create mode 100644 tilesets/gym_1_metatiles.bin create mode 100644 tilesets/gym_1_palette_map.asm create mode 100644 tilesets/ho_oh_word_room_collision.bin create mode 100644 tilesets/ho_oh_word_room_metatiles.bin create mode 100644 tilesets/ho_oh_word_room_palette_map.asm create mode 100644 tilesets/house_1_collision.bin create mode 100644 tilesets/house_1_metatiles.bin create mode 100644 tilesets/house_1_palette_map.asm create mode 100644 tilesets/ice_path_collision.bin create mode 100644 tilesets/ice_path_metatiles.bin create mode 100644 tilesets/ice_path_palette_map.asm create mode 100644 tilesets/ilex_forest_collision.bin create mode 100644 tilesets/ilex_forest_metatiles.bin create mode 100644 tilesets/ilex_forest_palette_map.asm create mode 100644 tilesets/johto_1_collision.bin create mode 100644 tilesets/johto_1_metatiles.bin create mode 100644 tilesets/johto_1_palette_map.asm create mode 100644 tilesets/johto_2_collision.bin create mode 100644 tilesets/johto_2_metatiles.bin create mode 100644 tilesets/johto_2_palette_map.asm create mode 100644 tilesets/kabuto_word_room_collision.bin create mode 100644 tilesets/kabuto_word_room_metatiles.bin create mode 100644 tilesets/kabuto_word_room_palette_map.asm create mode 100644 tilesets/kanto_collision.bin create mode 100644 tilesets/kanto_metatiles.bin create mode 100644 tilesets/kanto_palette_map.asm create mode 100644 tilesets/kurts_house_collision.bin create mode 100644 tilesets/kurts_house_metatiles.bin create mode 100644 tilesets/kurts_house_palette_map.asm create mode 100644 tilesets/lab_collision.bin create mode 100644 tilesets/lab_metatiles.bin create mode 100644 tilesets/lab_palette_map.asm create mode 100644 tilesets/lighthouse_collision.bin create mode 100644 tilesets/lighthouse_metatiles.bin create mode 100644 tilesets/lighthouse_palette_map.asm create mode 100644 tilesets/mart_collision.bin create mode 100644 tilesets/mart_metatiles.bin create mode 100644 tilesets/mart_palette_map.asm create mode 100644 tilesets/olivine_gym_collision.bin create mode 100644 tilesets/olivine_gym_metatiles.bin create mode 100644 tilesets/olivine_gym_palette_map.asm create mode 100644 tilesets/omanyte_word_room_collision.bin create mode 100644 tilesets/omanyte_word_room_metatiles.bin create mode 100644 tilesets/omanyte_word_room_palette_map.asm create mode 100644 tilesets/park_collision.bin create mode 100644 tilesets/park_metatiles.bin create mode 100644 tilesets/park_palette_map.asm create mode 100644 tilesets/players_house_2f_collision.bin create mode 100644 tilesets/players_house_2f_metatiles.bin create mode 100644 tilesets/players_house_2f_palette_map.asm create mode 100644 tilesets/players_house_collision.bin create mode 100644 tilesets/players_house_metatiles.bin create mode 100644 tilesets/players_house_palette_map.asm create mode 100644 tilesets/pokecenter_collision.bin create mode 100644 tilesets/pokecenter_metatiles.bin create mode 100644 tilesets/pokecenter_palette_map.asm create mode 100644 tilesets/pokecom_center_collision.bin create mode 100644 tilesets/pokecom_center_metatiles.bin create mode 100644 tilesets/pokecom_center_palette_map.asm create mode 100644 tilesets/port_collision.bin create mode 100644 tilesets/port_metatiles.bin create mode 100644 tilesets/port_palette_map.asm create mode 100644 tilesets/power_plant_collision.bin create mode 100644 tilesets/power_plant_metatiles.bin create mode 100644 tilesets/power_plant_palette_map.asm create mode 100644 tilesets/radio_tower_collision.bin create mode 100644 tilesets/radio_tower_metatiles.bin create mode 100644 tilesets/radio_tower_palette_map.asm create mode 100644 tilesets/ruins_of_alph_collision.bin create mode 100644 tilesets/ruins_of_alph_metatiles.bin create mode 100644 tilesets/ruins_of_alph_palette_map.asm create mode 100644 tilesets/sprout_tower_collision.bin create mode 100644 tilesets/sprout_tower_metatiles.bin create mode 100644 tilesets/sprout_tower_palette_map.asm create mode 100644 tilesets/train_station_collision.bin create mode 100644 tilesets/train_station_metatiles.bin create mode 100644 tilesets/train_station_palette_map.asm create mode 100644 tilesets/underground_collision.bin create mode 100644 tilesets/underground_metatiles.bin create mode 100644 tilesets/underground_palette_map.asm delete mode 100644 tilesets/unused_30_collision.bin delete mode 100644 tilesets/unused_30_metatiles.bin create mode 100644 tilesets/unused_whirl_islands_collision.bin create mode 100644 tilesets/unused_whirl_islands_metatiles.bin create mode 100644 tilesets/whirl_islands_collision.bin create mode 100644 tilesets/whirl_islands_metatiles.bin create mode 100644 tilesets/whirl_islands_palette_map.asm diff --git a/constants/tilemap_constants.asm b/constants/tilemap_constants.asm index 702dc92bf..d06e22cc6 100644 --- a/constants/tilemap_constants.asm +++ b/constants/tilemap_constants.asm @@ -11,7 +11,7 @@ const_value SET 1 const TILESET_KANTO ; 03 const TILESET_BATTLE_TOWER_OUTSIDE ; 04 const TILESET_HOUSE_1 ; 05 - const TILESET_KRISS_HOUSE ; 06 + const TILESET_PLAYERS_HOUSE ; 06 const TILESET_POKECENTER ; 07 const TILESET_GATE ; 08 const TILESET_PORT ; 09 @@ -21,11 +21,11 @@ const_value SET 1 const TILESET_CELADON_MANSION ; 0d const TILESET_GAME_CORNER ; 0e const TILESET_GYM_1 ; 0f - const TILESET_KURT_HOUSE ; 10 + const TILESET_KURTS_HOUSE ; 10 const TILESET_TRAIN_STATION ; 11 const TILESET_OLIVINE_GYM ; 12 const TILESET_LIGHTHOUSE ; 13 - const TILESET_KRISS_HOUSE_2F ; 14 + const TILESET_PLAYERS_HOUSE_2F ; 14 const TILESET_POKECOM_CENTER ; 15 const TILESET_BATTLE_TOWER ; 16 const TILESET_SPROUT_TOWER ; 17 @@ -37,7 +37,7 @@ const_value SET 1 const TILESET_ICE_PATH ; 1d const TILESET_WHIRL_ISLANDS ; 1e const TILESET_ILEX_FOREST ; 1f - const TILESET_32 ; 20 + const TILESET_BETA_WORD_ROOM ; 20 const TILESET_HO_OH_WORD_ROOM ; 21 const TILESET_KABUTO_WORD_ROOM ; 22 const TILESET_OMANYTE_WORD_ROOM ; 23 diff --git a/data/sprite_engine.asm b/data/sprite_engine.asm index 31872d531..e3662fdaf 100755 --- a/data/sprite_engine.asm +++ b/data/sprite_engine.asm @@ -1640,7 +1640,7 @@ BrokenStdGFXPointers: ; Broken 2bpp pointers dbbw $80, $01, .deleted dbbw $80, $01, .deleted dbbw $80, $01, .deleted - dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within Tileset11GFX) + dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within TilesetTrainStationGFX) dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data) dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data) dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7) diff --git a/gfx/tilesets/00.2bpp.lz.0c7e555a b/gfx/tilesets/00.2bpp.lz.0c7e555a deleted file mode 100644 index 9821e1433..000000000 Binary files a/gfx/tilesets/00.2bpp.lz.0c7e555a and /dev/null differ diff --git a/gfx/tilesets/00.png b/gfx/tilesets/00.png deleted file mode 100644 index 0fc2db12f..000000000 Binary files a/gfx/tilesets/00.png and /dev/null differ diff --git a/gfx/tilesets/01.2bpp.lz.0c7e555a b/gfx/tilesets/01.2bpp.lz.0c7e555a deleted file mode 100644 index 9821e1433..000000000 Binary files a/gfx/tilesets/01.2bpp.lz.0c7e555a and /dev/null differ diff --git a/gfx/tilesets/01.png b/gfx/tilesets/01.png deleted file mode 100644 index 0fc2db12f..000000000 Binary files a/gfx/tilesets/01.png and /dev/null differ diff --git a/gfx/tilesets/02.2bpp.lz.391603fb b/gfx/tilesets/02.2bpp.lz.391603fb deleted file mode 100644 index 64f23e23b..000000000 Binary files a/gfx/tilesets/02.2bpp.lz.391603fb and /dev/null differ diff --git a/gfx/tilesets/02.png b/gfx/tilesets/02.png deleted file mode 100644 index 126573b7b..000000000 Binary files a/gfx/tilesets/02.png and /dev/null differ diff --git a/gfx/tilesets/03.2bpp.lz.a29f5d51 b/gfx/tilesets/03.2bpp.lz.a29f5d51 deleted file mode 100644 index d925ee111..000000000 Binary files a/gfx/tilesets/03.2bpp.lz.a29f5d51 and /dev/null differ diff --git a/gfx/tilesets/03.png b/gfx/tilesets/03.png deleted file mode 100644 index 08b2cbeea..000000000 Binary files a/gfx/tilesets/03.png and /dev/null differ diff --git a/gfx/tilesets/04.2bpp.lz.391603fb b/gfx/tilesets/04.2bpp.lz.391603fb deleted file mode 100644 index 64f23e23b..000000000 Binary files a/gfx/tilesets/04.2bpp.lz.391603fb and /dev/null differ diff --git a/gfx/tilesets/04.png b/gfx/tilesets/04.png deleted file mode 100644 index 126573b7b..000000000 Binary files a/gfx/tilesets/04.png and /dev/null differ diff --git a/gfx/tilesets/05.2bpp.lz.c848ef13 b/gfx/tilesets/05.2bpp.lz.c848ef13 deleted file mode 100644 index f9afaf70d..000000000 Binary files a/gfx/tilesets/05.2bpp.lz.c848ef13 and /dev/null differ diff --git a/gfx/tilesets/05.png b/gfx/tilesets/05.png deleted file mode 100644 index 3ab7b5ce8..000000000 Binary files a/gfx/tilesets/05.png and /dev/null differ diff --git a/gfx/tilesets/06.2bpp.lz.252cbd8f b/gfx/tilesets/06.2bpp.lz.252cbd8f deleted file mode 100644 index 17c64de65..000000000 Binary files a/gfx/tilesets/06.2bpp.lz.252cbd8f and /dev/null differ diff --git a/gfx/tilesets/06.png b/gfx/tilesets/06.png deleted file mode 100644 index b49f799d8..000000000 Binary files a/gfx/tilesets/06.png and /dev/null differ diff --git a/gfx/tilesets/07.2bpp.lz.e1c4014c b/gfx/tilesets/07.2bpp.lz.e1c4014c deleted file mode 100644 index 71783d9f2..000000000 Binary files a/gfx/tilesets/07.2bpp.lz.e1c4014c and /dev/null differ diff --git a/gfx/tilesets/07.png b/gfx/tilesets/07.png deleted file mode 100644 index d4084ebd4..000000000 Binary files a/gfx/tilesets/07.png and /dev/null differ diff --git a/gfx/tilesets/08.2bpp.lz.f5a55006 b/gfx/tilesets/08.2bpp.lz.f5a55006 deleted file mode 100644 index 724b6b8b7..000000000 Binary files a/gfx/tilesets/08.2bpp.lz.f5a55006 and /dev/null differ diff --git a/gfx/tilesets/08.png b/gfx/tilesets/08.png deleted file mode 100644 index b8f2db2d2..000000000 Binary files a/gfx/tilesets/08.png and /dev/null differ diff --git a/gfx/tilesets/09.2bpp.lz.56b1a405 b/gfx/tilesets/09.2bpp.lz.56b1a405 deleted file mode 100644 index 96dd2e594..000000000 Binary files a/gfx/tilesets/09.2bpp.lz.56b1a405 and /dev/null differ diff --git a/gfx/tilesets/09.png b/gfx/tilesets/09.png deleted file mode 100644 index 6990a7d7b..000000000 Binary files a/gfx/tilesets/09.png and /dev/null differ diff --git a/gfx/tilesets/10.2bpp.lz.b8d0f547 b/gfx/tilesets/10.2bpp.lz.b8d0f547 deleted file mode 100644 index cd0f43861..000000000 Binary files a/gfx/tilesets/10.2bpp.lz.b8d0f547 and /dev/null differ diff --git a/gfx/tilesets/10.png b/gfx/tilesets/10.png deleted file mode 100644 index 418a068fa..000000000 Binary files a/gfx/tilesets/10.png and /dev/null differ diff --git a/gfx/tilesets/11.2bpp.lz.454cfd8b b/gfx/tilesets/11.2bpp.lz.454cfd8b deleted file mode 100644 index 584e54dd2..000000000 Binary files a/gfx/tilesets/11.2bpp.lz.454cfd8b and /dev/null differ diff --git a/gfx/tilesets/11.png b/gfx/tilesets/11.png deleted file mode 100644 index b72e3f401..000000000 Binary files a/gfx/tilesets/11.png and /dev/null differ diff --git a/gfx/tilesets/12.2bpp.lz.e2e94f92 b/gfx/tilesets/12.2bpp.lz.e2e94f92 deleted file mode 100644 index e8091a899..000000000 Binary files a/gfx/tilesets/12.2bpp.lz.e2e94f92 and /dev/null differ diff --git a/gfx/tilesets/12.png b/gfx/tilesets/12.png deleted file mode 100644 index 4053283bc..000000000 Binary files a/gfx/tilesets/12.png and /dev/null differ diff --git a/gfx/tilesets/13.2bpp.lz.63b414d4 b/gfx/tilesets/13.2bpp.lz.63b414d4 deleted file mode 100644 index b68f147d0..000000000 Binary files a/gfx/tilesets/13.2bpp.lz.63b414d4 and /dev/null differ diff --git a/gfx/tilesets/13.png b/gfx/tilesets/13.png deleted file mode 100644 index 7dde8574e..000000000 Binary files a/gfx/tilesets/13.png and /dev/null differ diff --git a/gfx/tilesets/14.2bpp.lz.71d29a2f b/gfx/tilesets/14.2bpp.lz.71d29a2f deleted file mode 100644 index f7e185b4e..000000000 Binary files a/gfx/tilesets/14.2bpp.lz.71d29a2f and /dev/null differ diff --git a/gfx/tilesets/14.png b/gfx/tilesets/14.png deleted file mode 100644 index 776900638..000000000 Binary files a/gfx/tilesets/14.png and /dev/null differ diff --git a/gfx/tilesets/15.2bpp.lz.c1f2ed8f b/gfx/tilesets/15.2bpp.lz.c1f2ed8f deleted file mode 100644 index 6b45c769d..000000000 Binary files a/gfx/tilesets/15.2bpp.lz.c1f2ed8f and /dev/null differ diff --git a/gfx/tilesets/15.png b/gfx/tilesets/15.png deleted file mode 100644 index 582b9365d..000000000 Binary files a/gfx/tilesets/15.png and /dev/null differ diff --git a/gfx/tilesets/16.2bpp.lz.dd51d079 b/gfx/tilesets/16.2bpp.lz.dd51d079 deleted file mode 100644 index 28f025413..000000000 Binary files a/gfx/tilesets/16.2bpp.lz.dd51d079 and /dev/null differ diff --git a/gfx/tilesets/16.png b/gfx/tilesets/16.png deleted file mode 100644 index 3d6f1b511..000000000 Binary files a/gfx/tilesets/16.png and /dev/null differ diff --git a/gfx/tilesets/17.2bpp.lz.1600ca86 b/gfx/tilesets/17.2bpp.lz.1600ca86 deleted file mode 100644 index 56e509f5e..000000000 Binary files a/gfx/tilesets/17.2bpp.lz.1600ca86 and /dev/null differ diff --git a/gfx/tilesets/17.png b/gfx/tilesets/17.png deleted file mode 100644 index 0c148f95d..000000000 Binary files a/gfx/tilesets/17.png and /dev/null differ diff --git a/gfx/tilesets/18.2bpp.lz.93800351 b/gfx/tilesets/18.2bpp.lz.93800351 deleted file mode 100644 index e19994f37..000000000 Binary files a/gfx/tilesets/18.2bpp.lz.93800351 and /dev/null differ diff --git a/gfx/tilesets/18.png b/gfx/tilesets/18.png deleted file mode 100644 index 350c04932..000000000 Binary files a/gfx/tilesets/18.png and /dev/null differ diff --git a/gfx/tilesets/19.2bpp.lz.0c1544c1 b/gfx/tilesets/19.2bpp.lz.0c1544c1 deleted file mode 100644 index d208e65c3..000000000 Binary files a/gfx/tilesets/19.2bpp.lz.0c1544c1 and /dev/null differ diff --git a/gfx/tilesets/19.png b/gfx/tilesets/19.png deleted file mode 100644 index 920ee30ec..000000000 Binary files a/gfx/tilesets/19.png and /dev/null differ diff --git a/gfx/tilesets/20.2bpp.lz.35e51007 b/gfx/tilesets/20.2bpp.lz.35e51007 deleted file mode 100644 index b458a501d..000000000 Binary files a/gfx/tilesets/20.2bpp.lz.35e51007 and /dev/null differ diff --git a/gfx/tilesets/20.png b/gfx/tilesets/20.png deleted file mode 100644 index e46a847b9..000000000 Binary files a/gfx/tilesets/20.png and /dev/null differ diff --git a/gfx/tilesets/21.2bpp.lz.febbc4ec b/gfx/tilesets/21.2bpp.lz.febbc4ec deleted file mode 100644 index 5b787c854..000000000 Binary files a/gfx/tilesets/21.2bpp.lz.febbc4ec and /dev/null differ diff --git a/gfx/tilesets/21.png b/gfx/tilesets/21.png deleted file mode 100644 index 889b02727..000000000 Binary files a/gfx/tilesets/21.png and /dev/null differ diff --git a/gfx/tilesets/22.2bpp.lz.467b6a2d b/gfx/tilesets/22.2bpp.lz.467b6a2d deleted file mode 100644 index fa5d0a9f0..000000000 Binary files a/gfx/tilesets/22.2bpp.lz.467b6a2d and /dev/null differ diff --git a/gfx/tilesets/22.png b/gfx/tilesets/22.png deleted file mode 100644 index 1cd57402d..000000000 Binary files a/gfx/tilesets/22.png and /dev/null differ diff --git a/gfx/tilesets/23.2bpp.lz.bc56789c b/gfx/tilesets/23.2bpp.lz.bc56789c deleted file mode 100644 index 2033306e3..000000000 Binary files a/gfx/tilesets/23.2bpp.lz.bc56789c and /dev/null differ diff --git a/gfx/tilesets/23.png b/gfx/tilesets/23.png deleted file mode 100644 index 268fc998f..000000000 Binary files a/gfx/tilesets/23.png and /dev/null differ diff --git a/gfx/tilesets/24.2bpp.lz.3437812a b/gfx/tilesets/24.2bpp.lz.3437812a deleted file mode 100644 index 69069fb75..000000000 Binary files a/gfx/tilesets/24.2bpp.lz.3437812a and /dev/null differ diff --git a/gfx/tilesets/24.png b/gfx/tilesets/24.png deleted file mode 100644 index 0e5bdee7e..000000000 Binary files a/gfx/tilesets/24.png and /dev/null differ diff --git a/gfx/tilesets/25.2bpp.lz.7fcb81d6 b/gfx/tilesets/25.2bpp.lz.7fcb81d6 deleted file mode 100644 index 01a0e56bd..000000000 Binary files a/gfx/tilesets/25.2bpp.lz.7fcb81d6 and /dev/null differ diff --git a/gfx/tilesets/25.png b/gfx/tilesets/25.png deleted file mode 100644 index 7a4a5f8eb..000000000 Binary files a/gfx/tilesets/25.png and /dev/null differ diff --git a/gfx/tilesets/26.2bpp.lz.8b42470b b/gfx/tilesets/26.2bpp.lz.8b42470b deleted file mode 100644 index 68a4fdad0..000000000 Binary files a/gfx/tilesets/26.2bpp.lz.8b42470b and /dev/null differ diff --git a/gfx/tilesets/26.png b/gfx/tilesets/26.png deleted file mode 100644 index f41866c58..000000000 Binary files a/gfx/tilesets/26.png and /dev/null differ diff --git a/gfx/tilesets/27.2bpp.lz.27cdd9ad b/gfx/tilesets/27.2bpp.lz.27cdd9ad deleted file mode 100644 index 34be33856..000000000 Binary files a/gfx/tilesets/27.2bpp.lz.27cdd9ad and /dev/null differ diff --git a/gfx/tilesets/27.png b/gfx/tilesets/27.png deleted file mode 100644 index 8d2d32e1f..000000000 Binary files a/gfx/tilesets/27.png and /dev/null differ diff --git a/gfx/tilesets/28.2bpp.lz.cace291c b/gfx/tilesets/28.2bpp.lz.cace291c deleted file mode 100644 index c204dca26..000000000 Binary files a/gfx/tilesets/28.2bpp.lz.cace291c and /dev/null differ diff --git a/gfx/tilesets/28.png b/gfx/tilesets/28.png deleted file mode 100644 index 0a83d2043..000000000 Binary files a/gfx/tilesets/28.png and /dev/null differ diff --git a/gfx/tilesets/29.2bpp.lz.e23bc89f b/gfx/tilesets/29.2bpp.lz.e23bc89f deleted file mode 100644 index 25cc45c85..000000000 Binary files a/gfx/tilesets/29.2bpp.lz.e23bc89f and /dev/null differ diff --git a/gfx/tilesets/29.png b/gfx/tilesets/29.png deleted file mode 100644 index d70eb53be..000000000 Binary files a/gfx/tilesets/29.png and /dev/null differ diff --git a/gfx/tilesets/30.2bpp.lz.25b9c4b6 b/gfx/tilesets/30.2bpp.lz.25b9c4b6 deleted file mode 100644 index 50a5ab9ac..000000000 Binary files a/gfx/tilesets/30.2bpp.lz.25b9c4b6 and /dev/null differ diff --git a/gfx/tilesets/30.png b/gfx/tilesets/30.png deleted file mode 100644 index 9dc74c45b..000000000 Binary files a/gfx/tilesets/30.png and /dev/null differ diff --git a/gfx/tilesets/31.2bpp.lz.6b0ac896 b/gfx/tilesets/31.2bpp.lz.6b0ac896 deleted file mode 100644 index 7b5355705..000000000 Binary files a/gfx/tilesets/31.2bpp.lz.6b0ac896 and /dev/null differ diff --git a/gfx/tilesets/31.png b/gfx/tilesets/31.png deleted file mode 100644 index a85cc0394..000000000 Binary files a/gfx/tilesets/31.png and /dev/null differ diff --git a/gfx/tilesets/32.2bpp.lz.8b42470b b/gfx/tilesets/32.2bpp.lz.8b42470b deleted file mode 100644 index 68a4fdad0..000000000 Binary files a/gfx/tilesets/32.2bpp.lz.8b42470b and /dev/null differ diff --git a/gfx/tilesets/32.png b/gfx/tilesets/32.png deleted file mode 100644 index f41866c58..000000000 Binary files a/gfx/tilesets/32.png and /dev/null differ diff --git a/gfx/tilesets/33.2bpp.lz.8b42470b b/gfx/tilesets/33.2bpp.lz.8b42470b deleted file mode 100644 index 68a4fdad0..000000000 Binary files a/gfx/tilesets/33.2bpp.lz.8b42470b and /dev/null differ diff --git a/gfx/tilesets/33.png b/gfx/tilesets/33.png deleted file mode 100644 index f41866c58..000000000 Binary files a/gfx/tilesets/33.png and /dev/null differ diff --git a/gfx/tilesets/34.2bpp.lz.8b42470b b/gfx/tilesets/34.2bpp.lz.8b42470b deleted file mode 100644 index 68a4fdad0..000000000 Binary files a/gfx/tilesets/34.2bpp.lz.8b42470b and /dev/null differ diff --git a/gfx/tilesets/34.png b/gfx/tilesets/34.png deleted file mode 100644 index f41866c58..000000000 Binary files a/gfx/tilesets/34.png and /dev/null differ diff --git a/gfx/tilesets/35.2bpp.lz.8b42470b b/gfx/tilesets/35.2bpp.lz.8b42470b deleted file mode 100644 index 68a4fdad0..000000000 Binary files a/gfx/tilesets/35.2bpp.lz.8b42470b and /dev/null differ diff --git a/gfx/tilesets/35.png b/gfx/tilesets/35.png deleted file mode 100644 index f41866c58..000000000 Binary files a/gfx/tilesets/35.png and /dev/null differ diff --git a/gfx/tilesets/36.2bpp.lz.8b42470b b/gfx/tilesets/36.2bpp.lz.8b42470b deleted file mode 100644 index 68a4fdad0..000000000 Binary files a/gfx/tilesets/36.2bpp.lz.8b42470b and /dev/null differ diff --git a/gfx/tilesets/36.png b/gfx/tilesets/36.png deleted file mode 100644 index f41866c58..000000000 Binary files a/gfx/tilesets/36.png and /dev/null differ diff --git a/gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b b/gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b new file mode 100644 index 000000000..68a4fdad0 Binary files /dev/null and b/gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b differ diff --git a/gfx/tilesets/aerodactyl_word_room.png b/gfx/tilesets/aerodactyl_word_room.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/aerodactyl_word_room.png differ diff --git a/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d b/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d new file mode 100644 index 000000000..fa5d0a9f0 Binary files /dev/null and b/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d differ diff --git a/gfx/tilesets/battle_tower.png b/gfx/tilesets/battle_tower.png new file mode 100644 index 000000000..1cd57402d Binary files /dev/null and b/gfx/tilesets/battle_tower.png differ diff --git a/gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb b/gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb new file mode 100644 index 000000000..64f23e23b Binary files /dev/null and b/gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb differ diff --git a/gfx/tilesets/battle_tower_outside.png b/gfx/tilesets/battle_tower_outside.png new file mode 100644 index 000000000..126573b7b Binary files /dev/null and b/gfx/tilesets/battle_tower_outside.png differ diff --git a/gfx/tilesets/beta_word_room.2bpp.lz.8b42470b b/gfx/tilesets/beta_word_room.2bpp.lz.8b42470b new file mode 100644 index 000000000..68a4fdad0 Binary files /dev/null and b/gfx/tilesets/beta_word_room.2bpp.lz.8b42470b differ diff --git a/gfx/tilesets/beta_word_room.png b/gfx/tilesets/beta_word_room.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/beta_word_room.png differ diff --git a/gfx/tilesets/cave.2bpp.lz.3437812a b/gfx/tilesets/cave.2bpp.lz.3437812a new file mode 100644 index 000000000..69069fb75 Binary files /dev/null and b/gfx/tilesets/cave.2bpp.lz.3437812a differ diff --git a/gfx/tilesets/cave.png b/gfx/tilesets/cave.png new file mode 100644 index 000000000..0e5bdee7e Binary files /dev/null and b/gfx/tilesets/cave.png differ diff --git a/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 b/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 new file mode 100644 index 000000000..b68f147d0 Binary files /dev/null and b/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 differ diff --git a/gfx/tilesets/celadon_mansion.png b/gfx/tilesets/celadon_mansion.png new file mode 100644 index 000000000..7dde8574e Binary files /dev/null and b/gfx/tilesets/celadon_mansion.png differ diff --git a/gfx/tilesets/game_corner.2bpp.lz.71d29a2f b/gfx/tilesets/game_corner.2bpp.lz.71d29a2f new file mode 100644 index 000000000..f7e185b4e Binary files /dev/null and b/gfx/tilesets/game_corner.2bpp.lz.71d29a2f differ diff --git a/gfx/tilesets/game_corner.png b/gfx/tilesets/game_corner.png new file mode 100644 index 000000000..776900638 Binary files /dev/null and b/gfx/tilesets/game_corner.png differ diff --git a/gfx/tilesets/gate.2bpp.lz.f5a55006 b/gfx/tilesets/gate.2bpp.lz.f5a55006 new file mode 100644 index 000000000..724b6b8b7 Binary files /dev/null and b/gfx/tilesets/gate.2bpp.lz.f5a55006 differ diff --git a/gfx/tilesets/gate.png b/gfx/tilesets/gate.png new file mode 100644 index 000000000..b8f2db2d2 Binary files /dev/null and b/gfx/tilesets/gate.png differ diff --git a/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f b/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f new file mode 100644 index 000000000..6b45c769d Binary files /dev/null and b/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f differ diff --git a/gfx/tilesets/gym_1.png b/gfx/tilesets/gym_1.png new file mode 100644 index 000000000..582b9365d Binary files /dev/null and b/gfx/tilesets/gym_1.png differ diff --git a/gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b b/gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b new file mode 100644 index 000000000..68a4fdad0 Binary files /dev/null and b/gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b differ diff --git a/gfx/tilesets/ho_oh_word_room.png b/gfx/tilesets/ho_oh_word_room.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/ho_oh_word_room.png differ diff --git a/gfx/tilesets/house_1.2bpp.lz.c848ef13 b/gfx/tilesets/house_1.2bpp.lz.c848ef13 new file mode 100644 index 000000000..f9afaf70d Binary files /dev/null and b/gfx/tilesets/house_1.2bpp.lz.c848ef13 differ diff --git a/gfx/tilesets/house_1.png b/gfx/tilesets/house_1.png new file mode 100644 index 000000000..3ab7b5ce8 Binary files /dev/null and b/gfx/tilesets/house_1.png differ diff --git a/gfx/tilesets/ice_path.2bpp.lz.e23bc89f b/gfx/tilesets/ice_path.2bpp.lz.e23bc89f new file mode 100644 index 000000000..25cc45c85 Binary files /dev/null and b/gfx/tilesets/ice_path.2bpp.lz.e23bc89f differ diff --git a/gfx/tilesets/ice_path.png b/gfx/tilesets/ice_path.png new file mode 100644 index 000000000..d70eb53be Binary files /dev/null and b/gfx/tilesets/ice_path.png differ diff --git a/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 b/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 new file mode 100644 index 000000000..7b5355705 Binary files /dev/null and b/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 differ diff --git a/gfx/tilesets/ilex_forest.png b/gfx/tilesets/ilex_forest.png new file mode 100644 index 000000000..a85cc0394 Binary files /dev/null and b/gfx/tilesets/ilex_forest.png differ diff --git a/gfx/tilesets/johto_1.2bpp.lz.0c7e555a b/gfx/tilesets/johto_1.2bpp.lz.0c7e555a new file mode 100644 index 000000000..9821e1433 Binary files /dev/null and b/gfx/tilesets/johto_1.2bpp.lz.0c7e555a differ diff --git a/gfx/tilesets/johto_1.png b/gfx/tilesets/johto_1.png new file mode 100644 index 000000000..0fc2db12f Binary files /dev/null and b/gfx/tilesets/johto_1.png differ diff --git a/gfx/tilesets/johto_2.2bpp.lz.391603fb b/gfx/tilesets/johto_2.2bpp.lz.391603fb new file mode 100644 index 000000000..64f23e23b Binary files /dev/null and b/gfx/tilesets/johto_2.2bpp.lz.391603fb differ diff --git a/gfx/tilesets/johto_2.png b/gfx/tilesets/johto_2.png new file mode 100644 index 000000000..126573b7b Binary files /dev/null and b/gfx/tilesets/johto_2.png differ diff --git a/gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b b/gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b new file mode 100644 index 000000000..68a4fdad0 Binary files /dev/null and b/gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b differ diff --git a/gfx/tilesets/kabuto_word_room.png b/gfx/tilesets/kabuto_word_room.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/kabuto_word_room.png differ diff --git a/gfx/tilesets/kanto.2bpp.lz.a29f5d51 b/gfx/tilesets/kanto.2bpp.lz.a29f5d51 new file mode 100644 index 000000000..d925ee111 Binary files /dev/null and b/gfx/tilesets/kanto.2bpp.lz.a29f5d51 differ diff --git a/gfx/tilesets/kanto.png b/gfx/tilesets/kanto.png new file mode 100644 index 000000000..08b2cbeea Binary files /dev/null and b/gfx/tilesets/kanto.png differ diff --git a/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 b/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 new file mode 100644 index 000000000..28f025413 Binary files /dev/null and b/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 differ diff --git a/gfx/tilesets/kurts_house.png b/gfx/tilesets/kurts_house.png new file mode 100644 index 000000000..3d6f1b511 Binary files /dev/null and b/gfx/tilesets/kurts_house.png differ diff --git a/gfx/tilesets/lab.2bpp.lz.b8d0f547 b/gfx/tilesets/lab.2bpp.lz.b8d0f547 new file mode 100644 index 000000000..cd0f43861 Binary files /dev/null and b/gfx/tilesets/lab.2bpp.lz.b8d0f547 differ diff --git a/gfx/tilesets/lab.png b/gfx/tilesets/lab.png new file mode 100644 index 000000000..418a068fa Binary files /dev/null and b/gfx/tilesets/lab.png differ diff --git a/gfx/tilesets/lighthouse.2bpp.lz.0c1544c1 b/gfx/tilesets/lighthouse.2bpp.lz.0c1544c1 new file mode 100644 index 000000000..d208e65c3 Binary files /dev/null and b/gfx/tilesets/lighthouse.2bpp.lz.0c1544c1 differ diff --git a/gfx/tilesets/lighthouse.png b/gfx/tilesets/lighthouse.png new file mode 100644 index 000000000..920ee30ec Binary files /dev/null and b/gfx/tilesets/lighthouse.png differ diff --git a/gfx/tilesets/mart.2bpp.lz.e2e94f92 b/gfx/tilesets/mart.2bpp.lz.e2e94f92 new file mode 100644 index 000000000..e8091a899 Binary files /dev/null and b/gfx/tilesets/mart.2bpp.lz.e2e94f92 differ diff --git a/gfx/tilesets/mart.png b/gfx/tilesets/mart.png new file mode 100644 index 000000000..4053283bc Binary files /dev/null and b/gfx/tilesets/mart.png differ diff --git a/gfx/tilesets/olivine_gym.2bpp.lz.93800351 b/gfx/tilesets/olivine_gym.2bpp.lz.93800351 new file mode 100644 index 000000000..e19994f37 Binary files /dev/null and b/gfx/tilesets/olivine_gym.2bpp.lz.93800351 differ diff --git a/gfx/tilesets/olivine_gym.png b/gfx/tilesets/olivine_gym.png new file mode 100644 index 000000000..350c04932 Binary files /dev/null and b/gfx/tilesets/olivine_gym.png differ diff --git a/gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b b/gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b new file mode 100644 index 000000000..68a4fdad0 Binary files /dev/null and b/gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b differ diff --git a/gfx/tilesets/omanyte_word_room.png b/gfx/tilesets/omanyte_word_room.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/omanyte_word_room.png differ diff --git a/gfx/tilesets/park.2bpp.lz.7fcb81d6 b/gfx/tilesets/park.2bpp.lz.7fcb81d6 new file mode 100644 index 000000000..01a0e56bd Binary files /dev/null and b/gfx/tilesets/park.2bpp.lz.7fcb81d6 differ diff --git a/gfx/tilesets/park.png b/gfx/tilesets/park.png new file mode 100644 index 000000000..7a4a5f8eb Binary files /dev/null and b/gfx/tilesets/park.png differ diff --git a/gfx/tilesets/players_house.2bpp.lz.252cbd8f b/gfx/tilesets/players_house.2bpp.lz.252cbd8f new file mode 100644 index 000000000..17c64de65 Binary files /dev/null and b/gfx/tilesets/players_house.2bpp.lz.252cbd8f differ diff --git a/gfx/tilesets/players_house.png b/gfx/tilesets/players_house.png new file mode 100644 index 000000000..b49f799d8 Binary files /dev/null and b/gfx/tilesets/players_house.png differ diff --git a/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 b/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 new file mode 100644 index 000000000..b458a501d Binary files /dev/null and b/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 differ diff --git a/gfx/tilesets/players_house_2f.png b/gfx/tilesets/players_house_2f.png new file mode 100644 index 000000000..e46a847b9 Binary files /dev/null and b/gfx/tilesets/players_house_2f.png differ diff --git a/gfx/tilesets/pokecenter.2bpp.lz.e1c4014c b/gfx/tilesets/pokecenter.2bpp.lz.e1c4014c new file mode 100644 index 000000000..71783d9f2 Binary files /dev/null and b/gfx/tilesets/pokecenter.2bpp.lz.e1c4014c differ diff --git a/gfx/tilesets/pokecenter.png b/gfx/tilesets/pokecenter.png new file mode 100644 index 000000000..d4084ebd4 Binary files /dev/null and b/gfx/tilesets/pokecenter.png differ diff --git a/gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec b/gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec new file mode 100644 index 000000000..5b787c854 Binary files /dev/null and b/gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec differ diff --git a/gfx/tilesets/pokecom_center.png b/gfx/tilesets/pokecom_center.png new file mode 100644 index 000000000..889b02727 Binary files /dev/null and b/gfx/tilesets/pokecom_center.png differ diff --git a/gfx/tilesets/port.2bpp.lz.56b1a405 b/gfx/tilesets/port.2bpp.lz.56b1a405 new file mode 100644 index 000000000..96dd2e594 Binary files /dev/null and b/gfx/tilesets/port.2bpp.lz.56b1a405 differ diff --git a/gfx/tilesets/port.png b/gfx/tilesets/port.png new file mode 100644 index 000000000..6990a7d7b Binary files /dev/null and b/gfx/tilesets/port.png differ diff --git a/gfx/tilesets/power_plant.2bpp.lz.454cfd8b b/gfx/tilesets/power_plant.2bpp.lz.454cfd8b new file mode 100644 index 000000000..584e54dd2 Binary files /dev/null and b/gfx/tilesets/power_plant.2bpp.lz.454cfd8b differ diff --git a/gfx/tilesets/power_plant.png b/gfx/tilesets/power_plant.png new file mode 100644 index 000000000..b72e3f401 Binary files /dev/null and b/gfx/tilesets/power_plant.png differ diff --git a/gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad b/gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad new file mode 100644 index 000000000..34be33856 Binary files /dev/null and b/gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad differ diff --git a/gfx/tilesets/radio_tower.png b/gfx/tilesets/radio_tower.png new file mode 100644 index 000000000..8d2d32e1f Binary files /dev/null and b/gfx/tilesets/radio_tower.png differ diff --git a/gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b b/gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b new file mode 100644 index 000000000..68a4fdad0 Binary files /dev/null and b/gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b differ diff --git a/gfx/tilesets/ruins_of_alph.png b/gfx/tilesets/ruins_of_alph.png new file mode 100644 index 000000000..f41866c58 Binary files /dev/null and b/gfx/tilesets/ruins_of_alph.png differ diff --git a/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c b/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c new file mode 100644 index 000000000..2033306e3 Binary files /dev/null and b/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c differ diff --git a/gfx/tilesets/sprout_tower.png b/gfx/tilesets/sprout_tower.png new file mode 100644 index 000000000..268fc998f Binary files /dev/null and b/gfx/tilesets/sprout_tower.png differ diff --git a/gfx/tilesets/train_station.2bpp.lz.1600ca86 b/gfx/tilesets/train_station.2bpp.lz.1600ca86 new file mode 100644 index 000000000..56e509f5e Binary files /dev/null and b/gfx/tilesets/train_station.2bpp.lz.1600ca86 differ diff --git a/gfx/tilesets/train_station.png b/gfx/tilesets/train_station.png new file mode 100644 index 000000000..0c148f95d Binary files /dev/null and b/gfx/tilesets/train_station.png differ diff --git a/gfx/tilesets/underground.2bpp.lz.cace291c b/gfx/tilesets/underground.2bpp.lz.cace291c new file mode 100644 index 000000000..c204dca26 Binary files /dev/null and b/gfx/tilesets/underground.2bpp.lz.cace291c differ diff --git a/gfx/tilesets/underground.png b/gfx/tilesets/underground.png new file mode 100644 index 000000000..0a83d2043 Binary files /dev/null and b/gfx/tilesets/underground.png differ diff --git a/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 b/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 new file mode 100644 index 000000000..50a5ab9ac Binary files /dev/null and b/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 differ diff --git a/gfx/tilesets/whirl_islands.png b/gfx/tilesets/whirl_islands.png new file mode 100644 index 000000000..9dc74c45b Binary files /dev/null and b/gfx/tilesets/whirl_islands.png differ diff --git a/home/map.asm b/home/map.asm index baf42cb19..6d9337fe9 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2374,12 +2374,12 @@ LoadTilesetHeader:: ; 2d27 push bc ld hl, Tilesets - ld bc, Tileset01 - Tileset00 + ld bc, Tileset1 - Tileset0 ld a, [wTileset] call AddNTimes ld de, TilesetBank - ld bc, Tileset01 - Tileset00 + ld bc, Tileset1 - Tileset0 ld a, BANK(Tilesets) call FarCopyBytes diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 9d58c7cbe..30010042e 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -38,7 +38,7 @@ MapGroup1: map_header OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header Route39Barn, TILESET_KURT_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header Route39Barn, TILESET_KURTS_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route39Farmhouse, TILESET_HOUSE_1, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route38, TILESET_JOHTO_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route39, TILESET_JOHTO_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -103,7 +103,7 @@ MapGroup3: map_header OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header MahoganyMart1F, TILESET_KURT_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header MahoganyMart1F, TILESET_KURTS_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TeamRocketBaseB2F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TeamRocketBaseB3F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE @@ -151,13 +151,13 @@ MapGroup3: MapGroup4: map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header WiseTriosRoom, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE + map_header WiseTriosRoom, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakLugiaSpeechHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header DanceTheatre, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header EcruteakLugiaSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header DanceTheatre, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakGym, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE - map_header EcruteakItemfinderHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header EcruteakItemfinderHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_POND @@ -209,7 +209,7 @@ MapGroup8: map_header AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header KurtsHouse, TILESET_KURT_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header KurtsHouse, TILESET_KURTS_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header AzaleaGym, TILESET_GYM_1, INDOOR, AZALEA_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header Route33, TILESET_JOHTO_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -233,9 +233,9 @@ MapGroup10: map_header VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletNicknameSpeechHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header VioletOnixTradeHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header VioletOnixTradeHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -290,8 +290,8 @@ MapGroup12: MapGroup13: map_header Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN - map_header RedsHouse1F, TILESET_KRISS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header RedsHouse2F, TILESET_KRISS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BluesHouse, TILESET_HOUSE_1, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -318,7 +318,7 @@ MapGroup15: map_header OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, 0, PALETTE_AUTO, FISHGROUP_SHORE - map_header MountMoonGiftShop, TILESET_KURT_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header MountMoonGiftShop, TILESET_KURTS_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_AUTO, FISHGROUP_SHORE @@ -452,10 +452,10 @@ MapGroup24: map_header Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header NewBarkTown, TILESET_JOHTO_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header KrissHouse1F, TILESET_KRISS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header KrissHouse2F, TILESET_KRISS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header KrissHouse2F, TILESET_PLAYERS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header KrissNeighborsHouse, TILESET_HOUSE_1, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header ElmsHouse, TILESET_KRISS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route26HealSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route26DayofWeekSiblingsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route27SandstormHouse, TILESET_HOUSE_1, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE @@ -473,8 +473,8 @@ MapGroup25: map_header MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SaffronTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CopycatsHouse1F, TILESET_KRISS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header CopycatsHouse2F, TILESET_KRISS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route5UndergroundEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route5SaffronCityGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/tilesets/00_collision.bin b/tilesets/00_collision.bin deleted file mode 100644 index 085171e36..000000000 Binary files a/tilesets/00_collision.bin and /dev/null differ diff --git a/tilesets/00_metatiles.bin b/tilesets/00_metatiles.bin deleted file mode 100644 index 763df1997..000000000 Binary files a/tilesets/00_metatiles.bin and /dev/null differ diff --git a/tilesets/00_palette_map.asm b/tilesets/00_palette_map.asm deleted file mode 100755 index 62fbd2d00..000000000 --- a/tilesets/00_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/01_collision.bin b/tilesets/01_collision.bin deleted file mode 100644 index b3276e1cf..000000000 Binary files a/tilesets/01_collision.bin and /dev/null differ diff --git a/tilesets/01_metatiles.bin b/tilesets/01_metatiles.bin deleted file mode 100644 index 9024f2ad6..000000000 Binary files a/tilesets/01_metatiles.bin and /dev/null differ 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/02_collision.bin b/tilesets/02_collision.bin deleted file mode 100644 index 6e5addd6d..000000000 Binary files a/tilesets/02_collision.bin and /dev/null differ diff --git a/tilesets/02_metatiles.bin b/tilesets/02_metatiles.bin deleted file mode 100644 index a15c0c2c7..000000000 Binary files a/tilesets/02_metatiles.bin and /dev/null differ diff --git a/tilesets/02_palette_map.asm b/tilesets/02_palette_map.asm deleted file mode 100644 index f2af7a92d..000000000 --- a/tilesets/02_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF - 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, GRAY, GREEN, GREEN - tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED - tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW - tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY - tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF - tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF - tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN - tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED - tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW - tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN - tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF diff --git a/tilesets/03_collision.bin b/tilesets/03_collision.bin deleted file mode 100644 index f0038d731..000000000 Binary files a/tilesets/03_collision.bin and /dev/null differ diff --git a/tilesets/03_metatiles.bin b/tilesets/03_metatiles.bin deleted file mode 100644 index 41b0cfffd..000000000 Binary files a/tilesets/03_metatiles.bin and /dev/null differ diff --git a/tilesets/03_palette_map.asm b/tilesets/03_palette_map.asm deleted file mode 100644 index e3e497fb9..000000000 --- a/tilesets/03_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY - tilepal 0, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN - tilepal 0, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY - tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED - tilepal 0, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY - tilepal 1, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN - tilepal 1, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY - tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED - tilepal 1, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/04_collision.bin b/tilesets/04_collision.bin deleted file mode 100644 index 5ca0e3954..000000000 Binary files a/tilesets/04_collision.bin and /dev/null differ diff --git a/tilesets/04_metatiles.bin b/tilesets/04_metatiles.bin deleted file mode 100644 index c4390bcba..000000000 Binary files a/tilesets/04_metatiles.bin and /dev/null differ diff --git a/tilesets/04_palette_map.asm b/tilesets/04_palette_map.asm deleted file mode 100644 index dfc74a9c0..000000000 --- a/tilesets/04_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, BROWN - 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, RED, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, RED, RED, RED, ROOF, RED, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED, RED - tilepal 1, RED, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED - tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED - tilepal 1, RED, RED, RED, RED, RED, YELLOW, YELLOW, YELLOW - tilepal 1, YELLOW, RED, RED, RED, WATER, WATER, WATER, RED - tilepal 1, RED, RED, ROOF, RED, RED, ROOF, RED, RED - tilepal 1, RED, ROOF, ROOF, RED, RED, RED, ROOF, ROOF - tilepal 1, RED, RED, RED, RED, YELLOW, RED, GREEN, RED - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF diff --git a/tilesets/05_collision.bin b/tilesets/05_collision.bin deleted file mode 100644 index e11da7330..000000000 Binary files a/tilesets/05_collision.bin and /dev/null differ diff --git a/tilesets/05_metatiles.bin b/tilesets/05_metatiles.bin deleted file mode 100644 index 0d3a22f32..000000000 Binary files a/tilesets/05_metatiles.bin and /dev/null differ diff --git a/tilesets/05_palette_map.asm b/tilesets/05_palette_map.asm deleted file mode 100644 index ce7b988b7..000000000 --- a/tilesets/05_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER - tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN - tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER - tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN - tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN - tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER - tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER - tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN - tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN - tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER - tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN - tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN diff --git a/tilesets/06_collision.bin b/tilesets/06_collision.bin deleted file mode 100644 index dc3a08bfb..000000000 Binary files a/tilesets/06_collision.bin and /dev/null differ diff --git a/tilesets/06_metatiles.bin b/tilesets/06_metatiles.bin deleted file mode 100644 index f316eb8c1..000000000 Binary files a/tilesets/06_metatiles.bin and /dev/null differ diff --git a/tilesets/06_palette_map.asm b/tilesets/06_palette_map.asm deleted file mode 100644 index 5d089835b..000000000 --- a/tilesets/06_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER - tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER - tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN - tilepal 0, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - tilepal 1, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER - tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER - tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN - tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/tilesets/07_collision.bin b/tilesets/07_collision.bin deleted file mode 100644 index 5e58e03c9..000000000 Binary files a/tilesets/07_collision.bin and /dev/null differ diff --git a/tilesets/07_metatiles.bin b/tilesets/07_metatiles.bin deleted file mode 100644 index c96c4843b..000000000 Binary files a/tilesets/07_metatiles.bin and /dev/null differ diff --git a/tilesets/07_palette_map.asm b/tilesets/07_palette_map.asm deleted file mode 100644 index 78508b59e..000000000 --- a/tilesets/07_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER - tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY - tilepal 0, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY - tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER - tilepal 0, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY - tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER - tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY - tilepal 0, RED, RED, RED, RED, RED, RED, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER - tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY - tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY - tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY - tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER - tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY - tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY - tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/08_collision.bin b/tilesets/08_collision.bin deleted file mode 100644 index 5876a3fbe..000000000 Binary files a/tilesets/08_collision.bin and /dev/null differ diff --git a/tilesets/08_metatiles.bin b/tilesets/08_metatiles.bin deleted file mode 100644 index 74076ff58..000000000 Binary files a/tilesets/08_metatiles.bin and /dev/null differ diff --git a/tilesets/08_palette_map.asm b/tilesets/08_palette_map.asm deleted file mode 100644 index 7854d3a81..000000000 --- a/tilesets/08_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GRAY, WATER, WATER, RED, GREEN, GREEN, GREEN - tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN - tilepal 0, WATER, GRAY, WATER, WATER, RED, BROWN, BROWN, WATER - tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, WATER - tilepal 0, GREEN, GREEN, GRAY, GRAY, GREEN, GREEN, WATER, WATER - tilepal 0, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN - tilepal 0, GREEN, GREEN, GREEN, GREEN, GRAY, WATER, WATER, WATER - tilepal 0, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN - tilepal 1, GRAY, GRAY, GRAY, GRAY, ROOF, RED, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, WATER - tilepal 1, GRAY, ROOF, RED, GRAY, GRAY, WATER, GRAY, GRAY - tilepal 1, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN - tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, WATER, WATER, WATER - tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY diff --git a/tilesets/09_collision.bin b/tilesets/09_collision.bin deleted file mode 100644 index af2e7fd34..000000000 Binary files a/tilesets/09_collision.bin and /dev/null differ diff --git a/tilesets/09_metatiles.bin b/tilesets/09_metatiles.bin deleted file mode 100644 index 69a600707..000000000 --- a/tilesets/09_metatiles.bin +++ /dev/null @@ -1,65 +0,0 @@ -""""!!!!1111111111111111    ""  !!!!+,--9::3#$%./02;<=>&'()345?@AB*678CDE+,-39:PQXYZFGHIRRSSZ[\\IJKLT,-U]^^^MNOVW_ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ"""""""" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  ""1111  - - - - - - - - - - - - - - - - ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ \ No newline at end of file diff --git a/tilesets/09_palette_map.asm b/tilesets/09_palette_map.asm deleted file mode 100644 index 6bfdf4686..000000000 --- a/tilesets/09_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN - tilepal 0, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN - tilepal 0, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF - tilepal 0, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - -rept 16 - db $ff -endr - - tilepal 1, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN - tilepal 1, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN - tilepal 1, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY - tilepal 1, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF - tilepal 1, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF diff --git a/tilesets/10_collision.bin b/tilesets/10_collision.bin deleted file mode 100644 index 4396125f0..000000000 Binary files a/tilesets/10_collision.bin and /dev/null differ diff --git a/tilesets/10_metatiles.bin b/tilesets/10_metatiles.bin deleted file mode 100644 index 62da01e8b..000000000 Binary files a/tilesets/10_metatiles.bin and /dev/null differ diff --git a/tilesets/10_palette_map.asm b/tilesets/10_palette_map.asm deleted file mode 100644 index 24399c6ea..000000000 --- a/tilesets/10_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, WATER, WATER, WATER, WATER, ROOF, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN - tilepal 0, WATER, WATER, WATER, WATER, RED, BROWN, BROWN, GRAY - tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN - tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, BROWN, GREEN, GREEN, GREEN - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, RED, RED, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER diff --git a/tilesets/11_collision.bin b/tilesets/11_collision.bin deleted file mode 100644 index ee03c4528..000000000 Binary files a/tilesets/11_collision.bin and /dev/null differ diff --git a/tilesets/11_metatiles.bin b/tilesets/11_metatiles.bin deleted file mode 100644 index f6089d29c..000000000 --- a/tilesets/11_metatiles.bin +++ /dev/null @@ -1,8 +0,0 @@ -6666666666666666""""""""&&&&@B@B - - - - &&&&88889999&& !&&&&&01&&&&&@B@B()()()()*+()&&&&&&&& &&,-""<=""./&>?&"",-""<=&./&>? &&&&''''7777,-&<=&./&>?&&,-&<=&./&>?@AABPQQRPHIRS::T&&&@A&PQ&&AAABQQQREEFEUUVU - K -[EFEEUVUU K - [&PQ&S:&&QQQR:::T&&EFE;UVU;JKJ;Z[Z;6666666666666666AAABMMMN88889999""""""""#$$%WXXY""""@B""PRPRPRPRPR""23""CD&&&&""""""@B&PR&PR;;;;;;;;&&&&&&&&;;;;;;;;""""@B""PR&PR&PR&PR&PR&PR&PR&PR&PR@APRLM&&&&&@A&LM&&&&AB&MN&&&&&@B@APRLM&&&& &&@AABPHIR &&&&&&@B&PR&PR&PR&PR&&@BPR#$$%WXXY&&&&PRPRPRPR@B&PR&PR&PR&@AAALMMM&&&&AAABMMMN&&&&&@B&PR&PR&PR&&&&AAAAMMMM""""""""&&AAAAMMMM&&&&&PR&PR&PR&PR&@A&PQ&PQ&S:@AAALMMM88889999&PR&PRABPRMNPR""""""\]&^_&@B@APRLMPR&PR&AB@BMNPR&PR&PRPR&PR&PR@ALM&PR&PRABPRMN \ No newline at end of file diff --git a/tilesets/11_palette_map.asm b/tilesets/11_palette_map.asm deleted file mode 100644 index f79f9c01b..000000000 --- a/tilesets/11_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN - tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN - tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED - tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN - tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED - tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER - tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF - tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN - tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN - tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED - tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN - tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED - tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER - tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF - tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/12_collision.bin b/tilesets/12_collision.bin deleted file mode 100644 index 0f8763b7b..000000000 Binary files a/tilesets/12_collision.bin and /dev/null differ diff --git a/tilesets/12_metatiles.bin b/tilesets/12_metatiles.bin deleted file mode 100644 index 63b2f629d..000000000 --- a/tilesets/12_metatiles.bin +++ /dev/null @@ -1,3 +0,0 @@ -,-<= -II "#23$%45*+>?>?*+ !01JK ‰Š§¨./‘‘‘‘‘‘°±²¶·¸*;;;>?>?>?;;;;&'67()89@AB+PQRECD\]STU VWVWXYXYZ[Z[ PQPQPQPQ^_^_ÄÅÆÇÔÕÖ×ÈÉÊËØ‘‘‘*+>?>?,-<=*;;;>?>?::>?::;;;+>?::>?::>?>?:: ::>? F:F:F::G:G:G"#23$%45 LMLMLMLMNONO !HH01HH>?HH>?HHHH&'HH67HH()HH89––––––––––––––––  -II *+PQ>?PQ>?^_HH&'HH67HH()HH89/HHHHHHHHHHHHHHHHHHHH HHHHHHHHHHHHHHHH;;;;&'67()89>?>?.ÀÁÂÃÐÑÒÓ‘ÙÚ‘ÛÜ‘‘‘‘‘‘‘‘‘‘‘‘‘"#‘23‘$%‘‹Œ‘‘‘‘‘‘ ¡¡¡––––‘‘‘‘‘‘‘‘¡¡¡¡––––‘‘™š‘‘©ª¡¡¡¢––––‘‘‘’‘‘‘’‘‘™š‘‘©ª‚‘‘‘’‘‘‘’‘‘‘’®¯¯¯‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‡ˆ‘‘—˜‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘ƒ„…†“””•¡¡¡¡––––œŽŽŽ¬žžž¬¬›«ŽŽ«žžž«ž¯¯¯­‘‘‘‘‘‘‘‘‘‘‘‘°±²¹º³»¼µ½¾¸ \ No newline at end of file diff --git a/tilesets/12_palette_map.asm b/tilesets/12_palette_map.asm deleted file mode 100644 index 991510d12..000000000 --- a/tilesets/12_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GREEN, GREEN, WATER, RED, GRAY, GRAY, ROOF, ROOF - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, RED, ROOF, ROOF, GRAY, YELLOW - tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER - tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER - tilepal 0, WATER, WATER, RED, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED, RED - tilepal 0, GREEN, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, RED, YELLOW, YELLOW, YELLOW, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, RED, BROWN, BROWN - -rept 16 - db $ff -endr - - tilepal 1, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN, GRAY - tilepal 1, GRAY, GREEN, GREEN, RED, RED, WATER, WATER, ROOF - tilepal 1, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW, ROOF, GRAY - tilepal 1, GRAY, GRAY, WATER, GRAY, GRAY, GRAY, YELLOW, YELLOW - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, RED, WATER, RED - tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED - tilepal 1, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN - tilepal 1, GRAY, GRAY, WATER, GRAY, WATER, RED, BROWN, BROWN diff --git a/tilesets/13_collision.bin b/tilesets/13_collision.bin deleted file mode 100644 index a07b03bce..000000000 Binary files a/tilesets/13_collision.bin and /dev/null differ diff --git a/tilesets/13_metatiles.bin b/tilesets/13_metatiles.bin deleted file mode 100644 index d4506328f..000000000 --- a/tilesets/13_metatiles.bin +++ /dev/null @@ -1,5 +0,0 @@ - -  -  EU((((6868$%"#4523236778FGGHFGGHVWWX68"#./23^_*+,-:;<=JKLMZ[&' -   -  !0168"#*+23:; ,-<=LMJKZ[*+,-:;<=JKLMZ[ÃÂÂÂÃÀÀÀ“ÂÂÂÂÂÂÂÂÀÀÀÀ‡‡‡Â‡‡‡ƒÀÀÀ“ÂÂÃÂÂÂÃÂÀÀÁÂÆ€€‚‘’¡¢Â±²‚‚…†’’•–£¤¥¦³´µ¶‚‚‚‘’’’¡¢£¤±²³´…€€€•¥ Âµ°ÂÂÃÂFGÃÂFGÃÂ\ÃÂ\GGGHGGGH !]01]ÃÂÂÂÃÂÂÂÃÂ67ÃÂFGÂÂÂÂÂÂÂÂ7778GGGHÂÂÂÄÂÂÂÄÀÀÀ„”ÂÂÂÄÂÂÂÄÂÂÂÄÂÂÂÄÂÂÃÂÂÂÃÂÂÂÃÂÂÂÃÂÅÅÅÅÅÅÅÅ((((ÅÅÅÅÅÅÅÅÅŽÅÅžŸÅÐÑÓ)œITTÒ×——œ×‡‡9ÓÕÖTTY——ÇÔ‡‡Ç9ÓŠ‹TTš›——ß«‡‡Ý»ªªº&'ºˆ‰‰ˆ¸¹¼½Š‹Ó)š›TT®ß——¾Ý‡‡§§&··'ˆ‰‰ˆ¸¹¨©‡‡ßˇ‡ÜÏÀÀÛØÚÙÈÉÌͯ¯Œ¿¿ÎÜÅÅÞÚË߇‡Ï܇‡ØÛÀÀÙÚÈɬ­¯¯˜Ê¿¿ÝÜÅÅ™ÚÒׇ‡œ×‡‡Òׇ‡œ×‡‡‡‡ÇÔ‡‡Ç‡‡ÇÔ‡‡Ç‡‡‡Â‡‡‡Â‡‡‡Â‡‡‡‡‡‡Â‡‡‡Â‡‡‡Â‡‡‡ÂÒׇ‡œ×‡‡Ò׃Àœ×“‡‡ÇÔ‡‡ÇÀ„ÇԔLJ‡‡Â‡‡‡ÂÀÀÀ„” \ No newline at end of file diff --git a/tilesets/13_palette_map.asm b/tilesets/13_palette_map.asm deleted file mode 100644 index 2bd27ad22..000000000 --- a/tilesets/13_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER - tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN - tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN - tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN - -rept 16 - db $ff -endr - - tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW - tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW - tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN - tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW - tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN - tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW diff --git a/tilesets/14_collision.bin b/tilesets/14_collision.bin deleted file mode 100644 index 2bfcad418..000000000 Binary files a/tilesets/14_collision.bin and /dev/null differ diff --git a/tilesets/14_metatiles.bin b/tilesets/14_metatiles.bin deleted file mode 100644 index 24beba2d3..000000000 Binary files a/tilesets/14_metatiles.bin and /dev/null differ diff --git a/tilesets/14_palette_map.asm b/tilesets/14_palette_map.asm deleted file mode 100644 index 34bb9f6f0..000000000 --- a/tilesets/14_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, GREEN, GREEN, GREEN - tilepal 0, GREEN, GREEN, GRAY, GRAY, RED, RED, GREEN, BROWN - tilepal 0, GRAY, GRAY, GRAY, RED, BROWN, GREEN, GRAY, GRAY - tilepal 0, GRAY, GREEN, GRAY, GRAY, RED, RED, BROWN, BROWN - tilepal 0, BROWN, BROWN, RED, RED, BROWN, BROWN, GRAY, GRAY - tilepal 0, GRAY, GREEN, RED, RED, GREEN, GRAY, RED, RED - tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN - tilepal 0, BROWN, BROWN, RED, RED, GREEN, BROWN, RED, RED - tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED - tilepal 0, RED, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER - -rept 16 - db $ff -endr - - tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, BROWN - tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF - tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, RED, ROOF, ROOF - tilepal 1, YELLOW, RED, YELLOW, RED, WATER, WATER, RED, RED - tilepal 1, RED, RED, RED, RED, GREEN, GRAY, RED, RED - tilepal 1, RED, RED, YELLOW, YELLOW, WATER, WATER, BROWN, BROWN - tilepal 1, BROWN, BROWN, RED, RED, GREEN, ROOF, RED, RED - tilepal 1, RED, RED, YELLOW, YELLOW, ROOF, ROOF, RED, RED - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED - tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED - tilepal 1, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER diff --git a/tilesets/15_collision.bin b/tilesets/15_collision.bin deleted file mode 100644 index fe8c334f0..000000000 Binary files a/tilesets/15_collision.bin and /dev/null differ diff --git a/tilesets/15_metatiles.bin b/tilesets/15_metatiles.bin deleted file mode 100644 index a9df6062c..000000000 Binary files a/tilesets/15_metatiles.bin and /dev/null differ diff --git a/tilesets/15_palette_map.asm b/tilesets/15_palette_map.asm deleted file mode 100644 index b20f49195..000000000 --- a/tilesets/15_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN - tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN - tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN - tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN - tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY - tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN - tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY - tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF - tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF - -rept 16 - db $ff -endr - - tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN - tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN - tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN - tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN - tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY - tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN - tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY - tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF - tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF diff --git a/tilesets/16_collision.bin b/tilesets/16_collision.bin deleted file mode 100644 index 499a1d071..000000000 Binary files a/tilesets/16_collision.bin and /dev/null differ diff --git a/tilesets/16_metatiles.bin b/tilesets/16_metatiles.bin deleted file mode 100644 index 3f6b41bd1..000000000 Binary files a/tilesets/16_metatiles.bin and /dev/null differ diff --git a/tilesets/16_palette_map.asm b/tilesets/16_palette_map.asm deleted file mode 100644 index 5daa0da6b..000000000 --- a/tilesets/16_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY - tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY - tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER - tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN - -rept 16 - db $ff -endr - - tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY - tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY - tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY - tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER - tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN diff --git a/tilesets/17_collision.bin b/tilesets/17_collision.bin deleted file mode 100644 index bd5c4c586..000000000 Binary files a/tilesets/17_collision.bin and /dev/null differ diff --git a/tilesets/17_metatiles.bin b/tilesets/17_metatiles.bin deleted file mode 100644 index 9bbdd0bd2..000000000 Binary files a/tilesets/17_metatiles.bin and /dev/null differ diff --git a/tilesets/17_palette_map.asm b/tilesets/17_palette_map.asm deleted file mode 100644 index f52f5bbe7..000000000 --- a/tilesets/17_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY - tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY - tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER - tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER - tilepal 0, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN - tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER - -rept 16 - db $ff -endr - - tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY - tilepal 1, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY - tilepal 1, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY - tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER - tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER - tilepal 1, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN - tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER diff --git a/tilesets/18_collision.bin b/tilesets/18_collision.bin deleted file mode 100644 index cf77d603e..000000000 Binary files a/tilesets/18_collision.bin and /dev/null differ diff --git a/tilesets/18_metatiles.bin b/tilesets/18_metatiles.bin deleted file mode 100644 index a2adb197a..000000000 --- a/tilesets/18_metatiles.bin +++ /dev/null @@ -1,15 +0,0 @@ -  *() 89+,!!   %'!!  5 5 5 5 5&&01    %&&'677:"##$2334°°°°´ÕÖ·×ØØÙÚÛÛÜ  +,+, *() 89 SSSSSSSSSSSSSSSSFGFGVWVWFGSSVWSS FGFGVWVWSSFGSSVW]•—‚]]]%&&'XYXYÑ£¤Ñ¥¦§¨©ª«¬­®¯ÔSSSSSSSSFGFGVWVWÇÈÒÒÓÓÓÓÓÓÒÓÓÓÓÒFGSSVWSSFGSSVWSSSSFGSSVWSSFGSSVW./SS>?SSNOSS^_SSSS./SS>?SSNOSS^_S@HH@PQQPPQQPPQQHHHHQQQQQQQQQQQQHHBSQQRBQQRRQQRR----------------PPQQPPQQPCDDCDDDQQQQQQQQTUTUTUTUQQRRQQRRDDERDDDESSSSSSSS - SS - SS - SSSS - FG - VW - FG - VWFG - VW - FG - VW - SS - SS - SS - SSÊ°°°Ë±Ý±Ì²Þ²ÉÀÀÀ°°°Î±Ý±Ï²Þ²ÐÀÀÀÍFGFGVWVWFGFGVWVW————]]]]%&&'XYXY°°ÁÂݱÃÄÞ²ÅÆÀÀÅÆÁ°°ÃıÝÅƲÞÅÆÀÀ°°°°´µ¶·¸¹º»¼½¾¿]ˆ‰‚]ˆ‰‚]ˆ‰€]ˆ‰‹Œ]…‹Œ]†‹Œ]‡‹Œ]„;<<=;<<=;<<=;<<=ÒÒÇÈÒÓÓÓÓÒÓÓÓÓÒÓ````````````````;<<=;<<=%&&'XYXY˜™——š›——œ——žŸ————˜™——š›——œ——žŸ—–]…]]]†%&&'XYXY]•—‚]]—ƒ]]•€]•——–]…—]]†–]]‡—–]„]ˆ‰‚]ˆ‰ƒ]ˆ€]Ž‹Œ]…‹Œ]†’Œ]‡Ž]„————————————————ÓÓÓÓ;<<=””””““““¡ÓÓÓ¢ÒÓÒ‘‘‘‘ŽŽŽŽÒÓÓ¡ÒÒÓ¢‘‘‘‘ŽŽŽŽ \ No newline at end of file diff --git a/tilesets/18_palette_map.asm b/tilesets/18_palette_map.asm deleted file mode 100644 index 551a09351..000000000 --- a/tilesets/18_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN - tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED - tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY diff --git a/tilesets/19_collision.bin b/tilesets/19_collision.bin deleted file mode 100644 index f15ac266a..000000000 Binary files a/tilesets/19_collision.bin and /dev/null differ diff --git a/tilesets/19_metatiles.bin b/tilesets/19_metatiles.bin deleted file mode 100644 index 21ca0f09a..000000000 Binary files a/tilesets/19_metatiles.bin and /dev/null differ diff --git a/tilesets/19_palette_map.asm b/tilesets/19_palette_map.asm deleted file mode 100644 index 5f80e3a4d..000000000 --- a/tilesets/19_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, WATER, WATER, WATER, BROWN, WATER, WATER, RED - tilepal 0, RED, ROOF, ROOF, BROWN, ROOF, RED, RED, RED - tilepal 0, ROOF, WATER, ROOF, BROWN, ROOF, WATER, WATER, RED - tilepal 0, RED, ROOF, ROOF, WATER, ROOF, RED, RED, RED - tilepal 0, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY - tilepal 0, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, GRAY, GRAY - tilepal 0, ROOF, ROOF, WATER, WATER, RED, ROOF, BROWN, GRAY - tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER - tilepal 0, YELLOW, YELLOW, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN - tilepal 0, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF - tilepal 0, YELLOW, YELLOW, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY - tilepal 0, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, ROOF, GRAY, GRAY, BROWN, BROWN, RED - tilepal 1, RED, RED, RED, BROWN, RED, RED, RED, RED - tilepal 1, ROOF, WATER, ROOF, BROWN, RED, WATER, WATER, RED - tilepal 1, RED, RED, RED, WATER, RED, RED, RED, RED - tilepal 1, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY - tilepal 1, GRAY, GRAY, GRAY, BROWN, RED, ROOF, GRAY, GRAY - tilepal 1, ROOF, ROOF, WATER, WATER, RED, RED, BROWN, GRAY - tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER - tilepal 1, RED, RED, ROOF, ROOF, BROWN, BROWN, GRAY, GRAY - tilepal 1, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF - tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY - tilepal 1, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY diff --git a/tilesets/20_collision.bin b/tilesets/20_collision.bin deleted file mode 100644 index 9ceb978ab..000000000 Binary files a/tilesets/20_collision.bin and /dev/null differ diff --git a/tilesets/20_metatiles.bin b/tilesets/20_metatiles.bin deleted file mode 100644 index 0839798fe..000000000 Binary files a/tilesets/20_metatiles.bin and /dev/null differ diff --git a/tilesets/20_palette_map.asm b/tilesets/20_palette_map.asm deleted file mode 100644 index 1c0cb1f08..000000000 --- a/tilesets/20_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED - tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED - tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED - tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN - tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN - tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED - tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED - tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED - tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN - tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED - tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN - tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW - tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN - tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW diff --git a/tilesets/21_collision.bin b/tilesets/21_collision.bin deleted file mode 100644 index 0dfed1d91..000000000 Binary files a/tilesets/21_collision.bin and /dev/null differ diff --git a/tilesets/21_metatiles.bin b/tilesets/21_metatiles.bin deleted file mode 100644 index 097a882fd..000000000 --- a/tilesets/21_metatiles.bin +++ /dev/null @@ -1,2 +0,0 @@ -================"#23"#23±±%,-./<==?LMNOƒƒ -  !01@A544$$$$ÂÃÒÓ 44$$$$4444$$$$±R,/±RLO±R\]±‘ƒ±±%4”$ ¡†‡,/–—LO:;\]‘ 5$$$$±R&'±R±R±·¶±–§—±†¦‡±·¶±·¶±–§—±JK£±Z[%444 $$$±¦¦‡± ¶±4444$$$$4444$$$$¦¦¦¦§§§§ƒƒŠ‹°²ˆ‰·˜š·ˆ‰·˜™–§¶Œ¶›¶Œ§—œ4444$$$$ÄÅÔÕ================¨©ª«¸¹º»ÈÉÊËØÙÚÛª«¬­º»¼½ÊËÌÍÚÛÜ݈‰·˜š·ˆ‰·˜š·¶Œ¶›¶Œ¶›ØÝŽŽ¶4ŽŽ¶$ŽŽ¶§§—ª«ª«º»º»ÊËÊËÚÛÚÛ¶’“·¶¢£·¦¦§§§§ƒƒŠ‹†¦¦·ŽŽƒƒŠ‹¦¦‡ŽŽ¶¶’“·¶¢£·¶ÀÁ·¶ÐÑ·ŽŽŽŽŽŽŽŽŽŽŽŽ§§§§ƒƒŠ‹¦¦¦¦ŽŽŽŽDETUQQQQPPPPHIHIXYXY4·ŽŽ$·ŽŽ€·ŽŽ>–§§Š‹Š‹°²°²Š‹Š‹°²°² 44Š‹Š‹°²°²4444®¯®¯ÞßÞß®¯®¯¾¿¾¿^_^_„…()„…89”•:;‚‚‚‚$$$$ÆÇ‚‚Öׂ‚()$$89ÆÇ:;Öׂ‚‚‚¦¦¦¦§§ ¶BC·¶¢S·®¯®¯¾¿¾¿ÎϾ¿ÞßÞß 4$$$• 444±¤¥$±´µ¦±–§§4444$$$$ž‰†¦˜š·ˆ‰·˜š·¦‡ŒŸ¶›¶Œ¶› \ No newline at end of file diff --git a/tilesets/21_palette_map.asm b/tilesets/21_palette_map.asm deleted file mode 100644 index 75ee649f9..000000000 --- a/tilesets/21_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 0, WATER, WATER, GRAY, GRAY, RED, GRAY, WATER, WATER - tilepal 0, RED, WATER, GRAY, WATER, WATER, WATER, RED, RED - tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY - tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER - tilepal 0, RED, RED, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY - tilepal 0, GRAY, GRAY, WATER, WATER, WATER, WATER, RED, WATER - tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, RED, RED, GRAY - tilepal 0, RED, RED, WATER, WATER, WATER, WATER, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, GRAY, YELLOW, YELLOW - -rept 16 - db $ff -endr - - tilepal 1, GRAY, GRAY, GRAY, WATER, RED, RED, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GRAY, WATER - tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, RED, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 1, RED, RED, GRAY, GRAY, RED, RED, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN - tilepal 1, WATER, RED, WATER, BROWN, WATER, WATER, WATER, WATER - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN - tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN - tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY - tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN diff --git a/tilesets/22_collision.bin b/tilesets/22_collision.bin deleted file mode 100644 index 5cb2b0eeb..000000000 Binary files a/tilesets/22_collision.bin and /dev/null differ diff --git a/tilesets/22_metatiles.bin b/tilesets/22_metatiles.bin deleted file mode 100644 index c64ef0a12..000000000 Binary files a/tilesets/22_metatiles.bin and /dev/null differ diff --git a/tilesets/22_palette_map.asm b/tilesets/22_palette_map.asm deleted file mode 100644 index 1abce2a16..000000000 --- a/tilesets/22_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, RED, WATER, WATER, GRAY, GRAY, WATER, WATER - tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN - tilepal 0, WATER, RED, WATER, WATER, GRAY, GRAY, WATER, WATER - tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN - tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, GRAY - tilepal 0, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, WATER - tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, BROWN, BROWN, BROWN - tilepal 0, RED, BROWN, RED, BROWN, BROWN, BROWN, RED, RED - tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER - tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED - tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER - -rept 16 - db $ff -endr - - tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF - tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED - tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER - tilepal 1, RED, GRAY, GRAY, GRAY, GREEN, YELLOW, RED, RED - tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY - tilepal 1, YELLOW, YELLOW, BROWN, YELLOW, WATER, WATER, YELLOW, RED - tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER - tilepal 1, GRAY, GRAY, BROWN, YELLOW, RED, RED, YELLOW, RED - tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER - tilepal 1, GRAY, GRAY, YELLOW, BROWN, WATER, WATER, GRAY, BROWN - tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY - tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/23_collision.bin b/tilesets/23_collision.bin deleted file mode 100644 index 878803fb8..000000000 Binary files a/tilesets/23_collision.bin and /dev/null differ diff --git a/tilesets/23_metatiles.bin b/tilesets/23_metatiles.bin deleted file mode 100644 index b6668fcd4..000000000 --- a/tilesets/23_metatiles.bin +++ /dev/null @@ -1,2 +0,0 @@ - @ !!A1A1!!!!!!@ A1A1 - A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!! -.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$  "#23!!67"#!!2367%545%545%545%545 ^^  ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿFV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW  \ No newline at end of file diff --git a/tilesets/23_palette_map.asm b/tilesets/23_palette_map.asm deleted file mode 100644 index 6e3c10115..000000000 --- a/tilesets/23_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED - tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED - tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED - tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED - tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN diff --git a/tilesets/24_collision.bin b/tilesets/24_collision.bin deleted file mode 100644 index 701de1c0b..000000000 Binary files a/tilesets/24_collision.bin and /dev/null differ diff --git a/tilesets/24_metatiles.bin b/tilesets/24_metatiles.bin deleted file mode 100644 index a41b5b080..000000000 --- a/tilesets/24_metatiles.bin +++ /dev/null @@ -1,6 +0,0 @@ -$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&' -& -&  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&&  -& -67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&  -&&& \ No newline at end of file diff --git a/tilesets/24_palette_map.asm b/tilesets/24_palette_map.asm deleted file mode 100644 index 73c09ebe5..000000000 --- a/tilesets/24_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/25_collision.bin b/tilesets/25_collision.bin deleted file mode 100644 index 29e6fa56d..000000000 Binary files a/tilesets/25_collision.bin and /dev/null differ diff --git a/tilesets/25_metatiles.bin b/tilesets/25_metatiles.bin deleted file mode 100644 index 1fe931640..000000000 Binary files a/tilesets/25_metatiles.bin and /dev/null differ diff --git a/tilesets/25_palette_map.asm b/tilesets/25_palette_map.asm deleted file mode 100644 index f9c65ef89..000000000 --- a/tilesets/25_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GREEN, BROWN, RED, GREEN, BROWN, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN - tilepal 0, RED, RED, RED, GRAY, WATER, ROOF, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN - tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN - tilepal 0, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN - tilepal 0, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, GRAY, RED - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN - tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, WATER - -rept 16 - db $ff -endr - - tilepal 1, WATER, WATER, GRAY, RED, GREEN, BROWN, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN - tilepal 1, WATER, WATER, RED, GRAY, WATER, ROOF, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN - tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN - tilepal 1, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN - tilepal 1, BROWN, BROWN, GREEN, GREEN, WATER, WATER, WATER, RED - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN - tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, GRAY diff --git a/tilesets/26_collision.bin b/tilesets/26_collision.bin deleted file mode 100644 index 1eedacfe8..000000000 Binary files a/tilesets/26_collision.bin and /dev/null differ diff --git a/tilesets/26_metatiles.bin b/tilesets/26_metatiles.bin deleted file mode 100644 index 61ef041b5..000000000 Binary files a/tilesets/26_metatiles.bin and /dev/null differ diff --git a/tilesets/26_palette_map.asm b/tilesets/26_palette_map.asm deleted file mode 100644 index 5ebde24ba..000000000 --- a/tilesets/26_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - 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 - 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 - 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/27_collision.bin b/tilesets/27_collision.bin deleted file mode 100644 index 0d77042b7..000000000 Binary files a/tilesets/27_collision.bin and /dev/null differ diff --git a/tilesets/27_metatiles.bin b/tilesets/27_metatiles.bin deleted file mode 100644 index 01c0b4aa5..000000000 Binary files a/tilesets/27_metatiles.bin and /dev/null differ diff --git a/tilesets/27_palette_map.asm b/tilesets/27_palette_map.asm deleted file mode 100644 index 3530f7479..000000000 --- a/tilesets/27_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, RED, RED, WATER, WATER, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, WATER, WATER, RED, WATER, WATER, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, ROOF, ROOF, GRAY, GRAY, BROWN, GRAY, GRAY, BROWN - tilepal 0, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN - tilepal 0, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY - tilepal 0, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GREEN, GREEN - tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, YELLOW, YELLOW, RED - tilepal 1, ROOF, RED, RED, ROOF, GRAY, GRAY, GRAY, GRAY - tilepal 1, ROOF, ROOF, GRAY, GRAY, WATER, GRAY, GRAY, BROWN - tilepal 1, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN - tilepal 1, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY - tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN - tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, RED, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/28_collision.bin b/tilesets/28_collision.bin deleted file mode 100644 index eccd3e3df..000000000 Binary files a/tilesets/28_collision.bin and /dev/null differ diff --git a/tilesets/28_metatiles.bin b/tilesets/28_metatiles.bin deleted file mode 100644 index 28b807e1e..000000000 --- a/tilesets/28_metatiles.bin +++ /dev/null @@ -1,2 +0,0 @@ -*+:;,-<=EFUV 0144444444   44 444444      CDCDSTSTCDCDSTST        "#23                      - QQQQQQQQ./>?./>?@ANOP]^_&'67             01 01@AAAPQQQPQQQAAABQQQRQQQR@AABPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQR@B@B()89()89 \ No newline at end of file diff --git a/tilesets/28_palette_map.asm b/tilesets/28_palette_map.asm deleted file mode 100644 index 6b9b5546d..000000000 --- a/tilesets/28_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED - tilepal 0, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY - tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED - tilepal 0, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED - tilepal 1, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY - tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED - tilepal 1, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN - tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/29_collision.bin b/tilesets/29_collision.bin deleted file mode 100644 index a4498cbee..000000000 Binary files a/tilesets/29_collision.bin and /dev/null differ diff --git a/tilesets/29_metatiles.bin b/tilesets/29_metatiles.bin deleted file mode 100644 index c92246e8a..000000000 --- a/tilesets/29_metatiles.bin +++ /dev/null @@ -1,3 +0,0 @@ -šššššªššššš - šˆ‰Š‹˜™šš¨©š›¨©ššŠ‹Š‹ššššš›ššªª›šŠ‹Œššœšš¬­šš¬­š«›ª›*+š:;¨©š›¨©šš¨©šš¨©š›ªªªšªšª›šªššš¬­šš¬­›š¬­šš¬­ÀÁÂÃÐÑÒÓÀÁÂÃÐÑÒÓ¨©š›¨©šš¸¹ººÈÉÊÊššššššššº»ººÊËÊÊ›š¬­šš¬­º»¼½ÊËÌÍ šššššš›š› ¡š°±šššš›ªšš¢£ªš²³ªš›ª›«››€®¯‘¾¿š›ª›ª›ÄÅÔÕÀÁÂÃÐÑÒÓÄÅ›ÔÕªÄÅÄÅÔÕÔÕššªÄÅÄÅÔÕÔÕšÄÅÔÕššªªšªŽšžŸÄÅšÔÕÄÅÔÕª„…†‡”•–—¤¥¦§´µ¶·ª‚ƒ›’“ªÄÅ«ÔÕšŽšžŸªš››ššÄŪªÔÕšÀÁÂÃÐÑÒÓ›››ÀÁÂÃÐÑÒÓ›ÄŪªÔÕÄÅÔÕÆÇÆÇÖ×Ö×ÆÇÆÇÖ×Ö×ÄÅšÔÕªªª››ªªª‚ƒª’“ªª›ª›ªª›ÄÅÔÕ™šª©šª©›ª«Èºººªªªª›››ºººº›ª¬ª›¬›ª›¬ºººÍ˜˜ª˜˜ªª›››œš›œšª›œª›œšš›ª«›BCŠ‹ª››››››››››  ‚ƒÆÇ’“Ö×ÆÇÆÇÖ×Ö×ÆÇÆÇÖ×ÖׂƒÆÇ’“Ö×ÆÇ‚ƒÖ×’“ÆÇÆÇÖ×Ö×ÆÇÆÇÖ×Ö×ÆÇ‚ƒÖ×’“RRRRSS(S >8(TRRRR,--.IJHKRRRRS)SS9? V)RRRRSSSS  >TLM \]XYZ[8//9WGGGU? NO^_ ›››››ª«ª - ª›ª›šªªª*+ª:;˜™šš¨©šš¸¹®¯Èɾ¿ššœšš¬­®¯¼½¾¿Ì͈‰Œ˜™œ¸¹¼½ÈÉÌÍ&' 67EF   šššš›ššš€¹º‘ÉÊ4444444444444444 \ No newline at end of file diff --git a/tilesets/29_palette_map.asm b/tilesets/29_palette_map.asm deleted file mode 100644 index 985844071..000000000 --- a/tilesets/29_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, BROWN, ROOF, ROOF, BROWN, BROWN, WATER, WATER - tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 0, ROOF, ROOF, ROOF, ROOF, BROWN, BROWN, WATER, WATER - tilepal 0, WATER, ROOF, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY - tilepal 0, WATER, WATER, ROOF, ROOF, WATER, WATER, WATER, WATER - tilepal 0, BROWN, WATER, WATER, WATER, WATER, WATER, GRAY, GRAY - tilepal 0, WATER, WATER, ROOF, ROOF, GRAY, GRAY, WATER, WATER - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, GREEN, GRAY, GRAY, WATER - tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, WATER - tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER - -rept 16 - db $ff -endr - - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN - tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF diff --git a/tilesets/30_collision.bin b/tilesets/30_collision.bin deleted file mode 100644 index 701de1c0b..000000000 Binary files a/tilesets/30_collision.bin and /dev/null differ diff --git a/tilesets/30_metatiles.bin b/tilesets/30_metatiles.bin deleted file mode 100644 index a41b5b080..000000000 --- a/tilesets/30_metatiles.bin +++ /dev/null @@ -1,6 +0,0 @@ -$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&' -& -&  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&&  -& -67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&  -&&& \ No newline at end of file diff --git a/tilesets/30_palette_map.asm b/tilesets/30_palette_map.asm deleted file mode 100644 index 73c09ebe5..000000000 --- a/tilesets/30_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - -rept 16 - db $ff -endr - - tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN - tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY - tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY - tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY - tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/31_collision.bin b/tilesets/31_collision.bin deleted file mode 100644 index 9f66b5fdd..000000000 Binary files a/tilesets/31_collision.bin and /dev/null differ diff --git a/tilesets/31_metatiles.bin b/tilesets/31_metatiles.bin deleted file mode 100644 index a8b82d8cf..000000000 --- a/tilesets/31_metatiles.bin +++ /dev/null @@ -1 +0,0 @@ - ,-./<=>?**** ,-./<=>? ***&'&'6767&'67&'&'6767&'67&'67*** &'67&'67(9&'8:67&'67&'&'6767&'&'6767&'67&'&'6767&'67&'67&'67&'67)**********+** !!! !!! !!!!!!!!!!!!!!!!!!"!!!"!!!"02 !!!0111#$$$#$!!!!1111$$$$$$!!!"1112$$$%$%#$$$#$$$#$34#$$$#$$$#$$$3444$$$$$$$$$$$$4444$$$%$$$%$$$%4445 \ No newline at end of file diff --git a/tilesets/31_palette_map.asm b/tilesets/31_palette_map.asm deleted file mode 100644 index 696788084..000000000 --- a/tilesets/31_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW - tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW - tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN - tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN - tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN - tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN - 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/32_collision.bin deleted file mode 100644 index a4da351d3..000000000 Binary files a/tilesets/32_collision.bin and /dev/null differ diff --git a/tilesets/32_metatiles.bin b/tilesets/32_metatiles.bin deleted file mode 100644 index 47c531b2e..000000000 --- a/tilesets/32_metatiles.bin +++ /dev/null @@ -1,17 +0,0 @@ -ÂÀÒÓ‘®¯€¾¿‘¬­Œ¼½œŽ®¯žŸ¾¿€„…‘”•ŒŽœžŸŽ„…žŸ”•ÆǦ§Ö׶· ¡ÀÁ°±ÐÑŽžŸ ¡¦§°±¶·®¯¦§¾¿¶·‚ƒ€’“‘¤¥Ž´µžŸ ¡Ž°±žŸÆÇ€Öב¢£ÀÁ²³Ðц‡€–—‘  -  -  -  !"#®¯¾¿@ABC 89 -  -  - -  -  -  -  -  -  -  - TVXY  - C 6!@ #8 - 6"7¬­¦§¼½¶·¤¥Š‹´µš›¤¥¦§´µ¶·¨©¦§¸¹¶· ¡ˆ‰°±˜™¢£¦§²³¶·¤¥´µððððððððððððððððÀÁÐÑððððððððððððððððˆ‰¤¥˜™´µª«ÀÁº»ÐÑðððððððððððððððð ¡€°±‘ª«ˆ‰º»˜™ª«€º»‘Ž¬­žŸ¼½€ÄÅ‘ÔÕ¬­€¼½‘„…„…”•”•¬­ÀÁ¼½ÐÑ„…Œ”•œŽ ¡žŸ°±€ª«‘º»€‘ÀÁ¢£ÐѲ³®¯¬­¾¿¼½ÀÁÄÅÐÑÔÕ¦§ÀÁ¶·ÐÑ¢£ˆ‰²³˜™‚ƒŽ’“žŸ \ No newline at end of file diff --git a/tilesets/32_palette_map.asm b/tilesets/32_palette_map.asm deleted file mode 100644 index 5ebde24ba..000000000 --- a/tilesets/32_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - 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 - 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 - 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/33_collision.bin b/tilesets/33_collision.bin deleted file mode 100644 index a4da351d3..000000000 Binary files a/tilesets/33_collision.bin and /dev/null differ diff --git a/tilesets/33_metatiles.bin b/tilesets/33_metatiles.bin deleted file mode 100644 index 2b542c632..000000000 --- a/tilesets/33_metatiles.bin +++ /dev/null @@ -1,17 +0,0 @@ -Ì͈‰Üݘ™ŽžŸÈɨ©ØÙ¸¹€ª«‘º»ÄÅÔÕ¨©Èɸ¹ØÙÄÅÆÇÔÕÖצ§ˆ‰¶·˜™€ÂÑÒÓª«º»ÆǬ­Ö×¼½ÌÍÜÝ€¦§‘¶·¤¥´µ ¡ª«°±º»Ž€žŸ‘Âè©ÒÓ¸¹  -  -  -  !"#¬­ª«¼½º»@ABC 89 -  -  - -  -  -  -  -  -  -  - TVXY  - C 6!@ #8 - 6"7[\M]ÌÍ ¡ÜÝ°±ÆÇŽÖמŸÆÇŽÖמŸˆ‰¨©˜™¸¹Ì͈‰Üݘ™†‡–—ˆ‰®¯˜™¾¿€ÂÑÒÓÆÇÖ׊‹¬­š›¼½ÂÃÒÓÆÇŽÖמŸˆ‰ ¡˜™°±ÂÃÒÓÄÅ€ÔÕ‘¤¥ˆ‰´µ˜™ÄÅÔÕ \ No newline at end of file diff --git a/tilesets/33_palette_map.asm b/tilesets/33_palette_map.asm deleted file mode 100644 index 5ebde24ba..000000000 --- a/tilesets/33_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - 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 - 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 - 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/34_collision.bin b/tilesets/34_collision.bin deleted file mode 100644 index a4da351d3..000000000 Binary files a/tilesets/34_collision.bin and /dev/null differ diff --git a/tilesets/34_metatiles.bin b/tilesets/34_metatiles.bin deleted file mode 100644 index 14d082e2a..000000000 --- a/tilesets/34_metatiles.bin +++ /dev/null @@ -1,17 +0,0 @@ -¬­Èɼ½ØÙÂÃÒÓÌͬ­Üݼ½ÂƇÒÓ–—ÄÅÔÕÄÅŽÔÕžŸ€¦§‘¶·¦§¶·ÂȉÒÓ˜™¨©€¸¹‘ ¡ª«°±º»ŽžŸˆ‰ÂØ™ÒÓˆ‰˜™Š‹¬­š›¼½ÂÃÒÓÆÇŽÖמŸˆ‰˜™  -  -  -  !"#€Œ‘œ@ABC 89 -  -  - -  -  -  -  -  -  -  - TVXY  - C 6!@ #8 - 6"7ˆ‰ÄŘ™ÔÕ \ No newline at end of file diff --git a/tilesets/34_palette_map.asm b/tilesets/34_palette_map.asm deleted file mode 100644 index 5ebde24ba..000000000 --- a/tilesets/34_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - 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 - 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 - 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/35_collision.bin b/tilesets/35_collision.bin deleted file mode 100644 index a4da351d3..000000000 Binary files a/tilesets/35_collision.bin and /dev/null differ diff --git a/tilesets/35_metatiles.bin b/tilesets/35_metatiles.bin deleted file mode 100644 index 3cc62f562..000000000 --- a/tilesets/35_metatiles.bin +++ /dev/null @@ -1,17 +0,0 @@ -ÆÇŽÖמŸˆ‰[\˜™M]®¯¾¿¬­Äż½ÔÕÄň‰ÔÕ˜™ÄÅÄÅÔÕÔÕŒÂÃœÒÓˆ‰€˜™‘ÆÇÖ× ¡ª«°±º»ÄÅ ¡ÔÕ°±ŒŽœžŸÆÇÖ×€ª«‘º»†‡–—  -  -  -  !"#ÂȉÒÓ˜™@ABC 89 -  -  - -  -  -  -  -  -  -  - TVXY  - C 6!@ #8 - 6"7Š‹ÈÉš›ØÙÄň‰ÔÕ˜™ÆÇÖ׎ˆ‰žŸ˜™¬­Èɼ½ØÙÆÇÄÅÖ×ÔÕ ¡†‡°±–—ˆ‰˜™Ìͬ­Üݼ½Âæ§ÒÓ¶·†‡–— \ No newline at end of file diff --git a/tilesets/35_palette_map.asm b/tilesets/35_palette_map.asm deleted file mode 100644 index 5ebde24ba..000000000 --- a/tilesets/35_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - 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 - 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 - 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/36_collision.bin b/tilesets/36_collision.bin deleted file mode 100644 index a4da351d3..000000000 Binary files a/tilesets/36_collision.bin and /dev/null differ diff --git a/tilesets/36_metatiles.bin b/tilesets/36_metatiles.bin deleted file mode 100644 index 0538baa98..000000000 --- a/tilesets/36_metatiles.bin +++ /dev/null @@ -1,17 +0,0 @@ -ÆÇŽÖמŸÈÉÄÅØÙÔÕÌÍÜ݈‰˜™ÄÅŽÔÕžŸ€¦§‘¶·¦§¶·ˆ‰ÂØ™ÒÓˆ‰„…˜™”•ÆÇÖ×€‘®¯¬­¾¿¼½¤¥ˆ‰´µ˜™¨©¬­¸¹¼½ª«º»ÄÅÆÇÔÕÖ×€ÆÇ‘Ö×  -  -  -  !"#ÈɈ‰ØÙ˜™@ABC 89 -  -  - -  -  -  -  -  -  -  - TVXY  - C 6!@ #8 - 6"7¬­¼½ÈÉÆÇØÙÖ×ÄÅ ¡ÔÕ°±†‡ˆ‰–—˜™ \ No newline at end of file diff --git a/tilesets/36_palette_map.asm b/tilesets/36_palette_map.asm deleted file mode 100644 index 5ebde24ba..000000000 --- a/tilesets/36_palette_map.asm +++ /dev/null @@ -1,29 +0,0 @@ - tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW - tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN - tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN - tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN - -rept 16 - db $ff -endr - - 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 - 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 - 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/aerodactyl_word_room_collision.bin b/tilesets/aerodactyl_word_room_collision.bin new file mode 100644 index 000000000..a4da351d3 Binary files /dev/null and b/tilesets/aerodactyl_word_room_collision.bin differ diff --git a/tilesets/aerodactyl_word_room_metatiles.bin b/tilesets/aerodactyl_word_room_metatiles.bin new file mode 100644 index 000000000..0538baa98 --- /dev/null +++ b/tilesets/aerodactyl_word_room_metatiles.bin @@ -0,0 +1,17 @@ +ÆÇŽÖמŸÈÉÄÅØÙÔÕÌÍÜ݈‰˜™ÄÅŽÔÕžŸ€¦§‘¶·¦§¶·ˆ‰ÂØ™ÒÓˆ‰„…˜™”•ÆÇÖ×€‘®¯¬­¾¿¼½¤¥ˆ‰´µ˜™¨©¬­¸¹¼½ª«º»ÄÅÆÇÔÕÖ×€ÆÇ‘Ö×  +  +  +  !"#ÈɈ‰ØÙ˜™@ABC 89 +  +  + +  +  +  +  +  +  +  + TVXY  + C 6!@ #8 + 6"7¬­¼½ÈÉÆÇØÙÖ×ÄÅ ¡ÔÕ°±†‡ˆ‰–—˜™ \ No newline at end of file diff --git a/tilesets/aerodactyl_word_room_palette_map.asm b/tilesets/aerodactyl_word_room_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/tilesets/aerodactyl_word_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + 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 + 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 + 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/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_collision.bin b/tilesets/battle_tower_collision.bin new file mode 100644 index 000000000..5cb2b0eeb Binary files /dev/null and b/tilesets/battle_tower_collision.bin differ diff --git a/tilesets/battle_tower_metatiles.bin b/tilesets/battle_tower_metatiles.bin new file mode 100644 index 000000000..c64ef0a12 Binary files /dev/null and b/tilesets/battle_tower_metatiles.bin differ diff --git a/tilesets/battle_tower_outside_collision.bin b/tilesets/battle_tower_outside_collision.bin new file mode 100644 index 000000000..5ca0e3954 Binary files /dev/null and b/tilesets/battle_tower_outside_collision.bin differ diff --git a/tilesets/battle_tower_outside_metatiles.bin b/tilesets/battle_tower_outside_metatiles.bin new file mode 100644 index 000000000..c4390bcba Binary files /dev/null and b/tilesets/battle_tower_outside_metatiles.bin differ diff --git a/tilesets/battle_tower_outside_palette_map.asm b/tilesets/battle_tower_outside_palette_map.asm new file mode 100644 index 000000000..dfc74a9c0 --- /dev/null +++ b/tilesets/battle_tower_outside_palette_map.asm @@ -0,0 +1,29 @@ + 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, BROWN + 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, RED, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, RED, RED, RED, ROOF, RED, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED, RED + tilepal 1, RED, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED + tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED + tilepal 1, RED, RED, RED, RED, RED, YELLOW, YELLOW, YELLOW + tilepal 1, YELLOW, RED, RED, RED, WATER, WATER, WATER, RED + tilepal 1, RED, RED, ROOF, RED, RED, ROOF, RED, RED + tilepal 1, RED, ROOF, ROOF, RED, RED, RED, ROOF, ROOF + tilepal 1, RED, RED, RED, RED, YELLOW, RED, GREEN, RED + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF diff --git a/tilesets/battle_tower_palette_map.asm b/tilesets/battle_tower_palette_map.asm new file mode 100644 index 000000000..1abce2a16 --- /dev/null +++ b/tilesets/battle_tower_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, RED, WATER, WATER, GRAY, GRAY, WATER, WATER + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN + tilepal 0, WATER, RED, WATER, WATER, GRAY, GRAY, WATER, WATER + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN + tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, GRAY + tilepal 0, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, WATER + tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, BROWN, BROWN, BROWN + tilepal 0, RED, BROWN, RED, BROWN, BROWN, BROWN, RED, RED + tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER + tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED + tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER + +rept 16 + db $ff +endr + + tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED + tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER + tilepal 1, RED, GRAY, GRAY, GRAY, GREEN, YELLOW, RED, RED + tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, BROWN, YELLOW, WATER, WATER, YELLOW, RED + tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER + tilepal 1, GRAY, GRAY, BROWN, YELLOW, RED, RED, YELLOW, RED + tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 1, GRAY, GRAY, YELLOW, BROWN, WATER, WATER, GRAY, BROWN + tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/beta_word_room_collision.bin b/tilesets/beta_word_room_collision.bin new file mode 100644 index 000000000..a4da351d3 Binary files /dev/null and b/tilesets/beta_word_room_collision.bin differ diff --git a/tilesets/beta_word_room_metatiles.bin b/tilesets/beta_word_room_metatiles.bin new file mode 100644 index 000000000..47c531b2e --- /dev/null +++ b/tilesets/beta_word_room_metatiles.bin @@ -0,0 +1,17 @@ +ÂÀÒÓ‘®¯€¾¿‘¬­Œ¼½œŽ®¯žŸ¾¿€„…‘”•ŒŽœžŸŽ„…žŸ”•ÆǦ§Ö׶· ¡ÀÁ°±ÐÑŽžŸ ¡¦§°±¶·®¯¦§¾¿¶·‚ƒ€’“‘¤¥Ž´µžŸ ¡Ž°±žŸÆÇ€Öב¢£ÀÁ²³Ðц‡€–—‘  +  +  +  !"#®¯¾¿@ABC 89 +  +  + +  +  +  +  +  +  +  + TVXY  + C 6!@ #8 + 6"7¬­¦§¼½¶·¤¥Š‹´µš›¤¥¦§´µ¶·¨©¦§¸¹¶· ¡ˆ‰°±˜™¢£¦§²³¶·¤¥´µððððððððððððððððÀÁÐÑððððððððððððððððˆ‰¤¥˜™´µª«ÀÁº»ÐÑðððððððððððððððð ¡€°±‘ª«ˆ‰º»˜™ª«€º»‘Ž¬­žŸ¼½€ÄÅ‘ÔÕ¬­€¼½‘„…„…”•”•¬­ÀÁ¼½ÐÑ„…Œ”•œŽ ¡žŸ°±€ª«‘º»€‘ÀÁ¢£ÐѲ³®¯¬­¾¿¼½ÀÁÄÅÐÑÔÕ¦§ÀÁ¶·ÐÑ¢£ˆ‰²³˜™‚ƒŽ’“žŸ \ No newline at end of file diff --git a/tilesets/beta_word_room_palette_map.asm b/tilesets/beta_word_room_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/tilesets/beta_word_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + 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 + 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 + 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/cave_collision.bin b/tilesets/cave_collision.bin new file mode 100644 index 000000000..701de1c0b Binary files /dev/null and b/tilesets/cave_collision.bin differ diff --git a/tilesets/cave_metatiles.bin b/tilesets/cave_metatiles.bin new file mode 100644 index 000000000..a41b5b080 --- /dev/null +++ b/tilesets/cave_metatiles.bin @@ -0,0 +1,6 @@ +$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&' +& +&  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&&  +& +67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&  +&&& \ No newline at end of file diff --git a/tilesets/cave_palette_map.asm b/tilesets/cave_palette_map.asm new file mode 100644 index 000000000..73c09ebe5 --- /dev/null +++ b/tilesets/cave_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/celadon_mansion_collision.bin b/tilesets/celadon_mansion_collision.bin new file mode 100644 index 000000000..a07b03bce Binary files /dev/null and b/tilesets/celadon_mansion_collision.bin differ diff --git a/tilesets/celadon_mansion_metatiles.bin b/tilesets/celadon_mansion_metatiles.bin new file mode 100644 index 000000000..d4506328f --- /dev/null +++ b/tilesets/celadon_mansion_metatiles.bin @@ -0,0 +1,5 @@ + +  +  EU((((6868$%"#4523236778FGGHFGGHVWWX68"#./23^_*+,-:;<=JKLMZ[&' +   +  !0168"#*+23:; ,-<=LMJKZ[*+,-:;<=JKLMZ[ÃÂÂÂÃÀÀÀ“ÂÂÂÂÂÂÂÂÀÀÀÀ‡‡‡Â‡‡‡ƒÀÀÀ“ÂÂÃÂÂÂÃÂÀÀÁÂÆ€€‚‘’¡¢Â±²‚‚…†’’•–£¤¥¦³´µ¶‚‚‚‘’’’¡¢£¤±²³´…€€€•¥ Âµ°ÂÂÃÂFGÃÂFGÃÂ\ÃÂ\GGGHGGGH !]01]ÃÂÂÂÃÂÂÂÃÂ67ÃÂFGÂÂÂÂÂÂÂÂ7778GGGHÂÂÂÄÂÂÂÄÀÀÀ„”ÂÂÂÄÂÂÂÄÂÂÂÄÂÂÂÄÂÂÃÂÂÂÃÂÂÂÃÂÂÂÃÂÅÅÅÅÅÅÅÅ((((ÅÅÅÅÅÅÅÅÅŽÅÅžŸÅÐÑÓ)œITTÒ×——œ×‡‡9ÓÕÖTTY——ÇÔ‡‡Ç9ÓŠ‹TTš›——ß«‡‡Ý»ªªº&'ºˆ‰‰ˆ¸¹¼½Š‹Ó)š›TT®ß——¾Ý‡‡§§&··'ˆ‰‰ˆ¸¹¨©‡‡ßˇ‡ÜÏÀÀÛØÚÙÈÉÌͯ¯Œ¿¿ÎÜÅÅÞÚË߇‡Ï܇‡ØÛÀÀÙÚÈɬ­¯¯˜Ê¿¿ÝÜÅÅ™ÚÒׇ‡œ×‡‡Òׇ‡œ×‡‡‡‡ÇÔ‡‡Ç‡‡ÇÔ‡‡Ç‡‡‡Â‡‡‡Â‡‡‡Â‡‡‡‡‡‡Â‡‡‡Â‡‡‡Â‡‡‡ÂÒׇ‡œ×‡‡Ò׃Àœ×“‡‡ÇÔ‡‡ÇÀ„ÇԔLJ‡‡Â‡‡‡ÂÀÀÀ„” \ No newline at end of file diff --git a/tilesets/celadon_mansion_palette_map.asm b/tilesets/celadon_mansion_palette_map.asm new file mode 100644 index 000000000..2bd27ad22 --- /dev/null +++ b/tilesets/celadon_mansion_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER + tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN + tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN + tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW + tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW + tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN + tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW + tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW diff --git a/tilesets/data.asm b/tilesets/data.asm index 6d1ead4c0..52f63cb89 100644 --- a/tilesets/data.asm +++ b/tilesets/data.asm @@ -5,430 +5,430 @@ INCLUDE "tilesets/roofs.asm" SECTION "Tileset Data 1", ROMX -Tileset03GFX: ; 0x18000 -INCBIN "gfx/tilesets/03.2bpp.lz" +TilesetKantoGFX: ; 0x18000 +INCBIN "gfx/tilesets/kanto.2bpp.lz" ; 0x18606 -Tileset03Meta: ; 0x18606 -INCBIN "tilesets/03_metatiles.bin" +TilesetKantoMeta: ; 0x18606 +INCBIN "tilesets/kanto_metatiles.bin" ; 0x18e06 -Tileset03Coll: ; 0x18e06 -INCBIN "tilesets/03_collision.bin" +TilesetKantoColl: ; 0x18e06 +INCBIN "tilesets/kanto_collision.bin" ; 0x19006 -Tileset00GFX: ; 0x19006 -Tileset01GFX: ; 0x19006 -INCBIN "gfx/tilesets/01.2bpp.lz" +Tileset0GFX: ; 0x19006 +TilesetJohto1GFX: ; 0x19006 +INCBIN "gfx/tilesets/johto_1.2bpp.lz" ; 0x19c0e -Tileset00Meta: ; 0x19c0e -Tileset01Meta: ; 0x19c0e -INCBIN "tilesets/01_metatiles.bin" +Tileset0Meta: ; 0x19c0e +TilesetJohto1Meta: ; 0x19c0e +INCBIN "tilesets/johto_1_metatiles.bin" ; 0x1a40e -Tileset00Coll: ; 0x1a40e -Tileset01Coll: ; 0x1a40e -INCBIN "tilesets/01_collision.bin" +Tileset0Coll: ; 0x1a40e +TilesetJohto1Coll: ; 0x1a40e +INCBIN "tilesets/johto_1_collision.bin" ; 0x1a60e -Tileset29GFX: ; 0x1a60e -INCBIN "gfx/tilesets/29.2bpp.lz" +TilesetIcePathGFX: ; 0x1a60e +INCBIN "gfx/tilesets/ice_path.2bpp.lz" ; 0x1af3e -Tileset29Meta: ; 0x1af3e -INCBIN "tilesets/29_metatiles.bin" +TilesetIcePathMeta: ; 0x1af3e +INCBIN "tilesets/ice_path_metatiles.bin" ; 0x1b33e -Tileset29Coll: ; 0x1b33e -INCBIN "tilesets/29_collision.bin" +TilesetIcePathColl: ; 0x1b33e +INCBIN "tilesets/ice_path_collision.bin" ; 0x1b43e -Tileset20GFX: ; 0x1b43e -INCBIN "gfx/tilesets/20.2bpp.lz" +TilesetPlayersHouse2FGFX: ; 0x1b43e +INCBIN "gfx/tilesets/players_house_2f.2bpp.lz" ; 0x1b8fe -Tileset20Meta: ; 0x1b8fe -INCBIN "tilesets/20_metatiles.bin" +TilesetPlayersHouse2FMeta: ; 0x1b8fe +INCBIN "tilesets/players_house_2f_metatiles.bin" ; 0x1bcfe -Tileset20Coll: ; 0x1bcfe -INCBIN "tilesets/20_collision.bin" +TilesetPlayersHouse2FColl: ; 0x1bcfe +INCBIN "tilesets/players_house_2f_collision.bin" ; 0x1bdfe SECTION "Tileset Data 2", ROMX -Tileset07GFX: ; 0x1c30c -INCBIN "gfx/tilesets/07.2bpp.lz" +TilesetPokecenterGFX: ; 0x1c30c +INCBIN "gfx/tilesets/pokecenter.2bpp.lz" ; 0x1c73c -Tileset07Meta: ; 0x1c73c -INCBIN "tilesets/07_metatiles.bin" +TilesetPokecenterMeta: ; 0x1c73c +INCBIN "tilesets/pokecenter_metatiles.bin" ; 0x1cb3c -Tileset07Coll: ; 0x1cb3c -INCBIN "tilesets/07_collision.bin" +TilesetPokecenterColl: ; 0x1cb3c +INCBIN "tilesets/pokecenter_collision.bin" ; 0x1cc3c -Tileset09GFX: ; 0x1cc3c -INCBIN "gfx/tilesets/09.2bpp.lz" +TilesetPortGFX: ; 0x1cc3c +INCBIN "gfx/tilesets/port.2bpp.lz" ; 0x1d04c -Tileset09Meta: ; 0x1d04c -INCBIN "tilesets/09_metatiles.bin" +TilesetPortMeta: ; 0x1d04c +INCBIN "tilesets/port_metatiles.bin" ; 0x1d44c -Tileset09Coll: ; 0x1d44c -INCBIN "tilesets/09_collision.bin" +TilesetPortColl: ; 0x1d44c +INCBIN "tilesets/port_collision.bin" ; 0x1d54c -Tileset06GFX: ; 0x1d54c -INCBIN "gfx/tilesets/06.2bpp.lz" +TilesetPlayersHouseGFX: ; 0x1d54c +INCBIN "gfx/tilesets/players_house.2bpp.lz" ; 0x1d92c -Tileset06Meta: ; 0x1d92c -INCBIN "tilesets/06_metatiles.bin" +TilesetPlayersHouseMeta: ; 0x1d92c +INCBIN "tilesets/players_house_metatiles.bin" ; 0x1dd2c -Tileset06Coll: ; 0x1dd2c -INCBIN "tilesets/06_collision.bin" +TilesetPlayersHouseColl: ; 0x1dd2c +INCBIN "tilesets/players_house_collision.bin" ; 0x1de2c -Tileset13GFX: ; 0x1de2c -INCBIN "gfx/tilesets/13.2bpp.lz" +TilesetCeladonMansionGFX: ; 0x1de2c +INCBIN "gfx/tilesets/celadon_mansion.2bpp.lz" ; 0x1e58c -Tileset13Meta: ; 0x1e58c -INCBIN "tilesets/13_metatiles.bin" +TilesetCeladonMansionMeta: ; 0x1e58c +INCBIN "tilesets/celadon_mansion_metatiles.bin" ; 0x1e98c -Tileset13Coll: ; 0x1e98c -INCBIN "tilesets/13_collision.bin" +TilesetCeladonMansionColl: ; 0x1e98c +INCBIN "tilesets/celadon_mansion_collision.bin" ; 0x1ea8c -Tileset24GFX: ; 0x1ea8c -INCBIN "gfx/tilesets/24.2bpp.lz" +TilesetCaveGFX: ; 0x1ea8c +INCBIN "gfx/tilesets/cave.2bpp.lz" ; 0x1ee1c -Tileset24Meta: ; 0x1ee1c -Tileset30Meta: ; 0x1ee1c -INCBIN "tilesets/24_metatiles.bin" +TilesetCaveMeta: ; 0x1ee1c +TilesetWhirlIslandsMeta: ; 0x1ee1c +INCBIN "tilesets/cave_metatiles.bin" ; 0x1f21c -Tileset24Coll: ; 0x1f21c -Tileset30Coll: ; 0x1f21c -INCBIN "tilesets/24_collision.bin" +TilesetCaveColl: ; 0x1f21c +TilesetWhirlIslandsColl: ; 0x1f21c +INCBIN "tilesets/cave_collision.bin" ; 0x1f31c SECTION "Tileset Data 3", ROMX -Tileset23GFX: ; 0x20181 -INCBIN "gfx/tilesets/23.2bpp.lz" +TilesetSproutTowerGFX: ; 0x20181 +INCBIN "gfx/tilesets/sprout_tower.2bpp.lz" ; 0x206e1 -Tileset23Meta: ; 0x206e1 -INCBIN "tilesets/23_metatiles.bin" +TilesetSproutTowerMeta: ; 0x206e1 +INCBIN "tilesets/sprout_tower_metatiles.bin" ; 0x20ae1 -Tileset23Coll: ; 0x20ae1 -INCBIN "tilesets/23_collision.bin" +TilesetSproutTowerColl: ; 0x20ae1 +INCBIN "tilesets/sprout_tower_collision.bin" ; 0x20be1 -Tileset10GFX: ; 0x20be1 -INCBIN "gfx/tilesets/10.2bpp.lz" +TilesetLabGFX: ; 0x20be1 +INCBIN "gfx/tilesets/lab.2bpp.lz" ; 0x213e1 -Tileset10Meta: ; 0x213e1 -INCBIN "tilesets/10_metatiles.bin" +TilesetLabMeta: ; 0x213e1 +INCBIN "tilesets/lab_metatiles.bin" ; 0x217e1 -Tileset10Coll: ; 0x217e1 -INCBIN "tilesets/10_collision.bin" +TilesetLabColl: ; 0x217e1 +INCBIN "tilesets/lab_collision.bin" ; 0x218e1 -Tileset12GFX: ; 0x218e1 -INCBIN "gfx/tilesets/12.2bpp.lz" +TilesetMartGFX: ; 0x218e1 +INCBIN "gfx/tilesets/mart.2bpp.lz" ; 0x22031 -Tileset12Meta: ; 0x22031 -INCBIN "tilesets/12_metatiles.bin" +TilesetMartMeta: ; 0x22031 +INCBIN "tilesets/mart_metatiles.bin" ; 0x22431 -Tileset12Coll: ; 0x22431 -INCBIN "tilesets/12_collision.bin" +TilesetMartColl: ; 0x22431 +INCBIN "tilesets/mart_collision.bin" ; 0x22531 -Tileset14GFX: ; 0x22531 -INCBIN "gfx/tilesets/14.2bpp.lz" +TilesetGameCornerGFX: ; 0x22531 +INCBIN "gfx/tilesets/game_corner.2bpp.lz" ; 0x22af1 -Tileset14Meta: ; 0x22af1 -INCBIN "tilesets/14_metatiles.bin" +TilesetGameCornerMeta: ; 0x22af1 +INCBIN "tilesets/game_corner_metatiles.bin" ; 0x22ef1 -Tileset14Coll: ; 0x22ef1 -INCBIN "tilesets/14_collision.bin" +TilesetGameCornerColl: ; 0x22ef1 +INCBIN "tilesets/game_corner_collision.bin" ; 0x22ff1 -Tileset17GFX: ; 0x22ff1 -INCBIN "gfx/tilesets/17.2bpp.lz" +TilesetTrainStationGFX: ; 0x22ff1 +INCBIN "gfx/tilesets/train_station.2bpp.lz" ; 0x23391 -Tileset17Meta: ; 0x23391 -INCBIN "tilesets/17_metatiles.bin" +TilesetTrainStationMeta: ; 0x23391 +INCBIN "tilesets/train_station_metatiles.bin" ; 0x23791 -Tileset17Coll: ; 0x23791 -INCBIN "tilesets/17_collision.bin" +TilesetTrainStationColl: ; 0x23791 +INCBIN "tilesets/train_station_collision.bin" ; 0x23891 -Tileset31Meta: ; 0x23891 -INCBIN "tilesets/31_metatiles.bin" +TilesetIlexForestMeta: ; 0x23891 +INCBIN "tilesets/ilex_forest_metatiles.bin" ; 0x23b11 SECTION "Tileset Data 4", ROMX -Tileset15GFX: ; 0x30000 -INCBIN "gfx/tilesets/15.2bpp.lz" +TilesetGym1GFX: ; 0x30000 +INCBIN "gfx/tilesets/gym_1.2bpp.lz" ; 0x304e0 -Tileset15Meta: ; 0x304e0 -INCBIN "tilesets/15_metatiles.bin" +TilesetGym1Meta: ; 0x304e0 +INCBIN "tilesets/gym_1_metatiles.bin" ; 0x308e0 -Tileset15Coll: ; 0x308e0 -INCBIN "tilesets/15_collision.bin" +TilesetGym1Coll: ; 0x308e0 +INCBIN "tilesets/gym_1_collision.bin" ; 0x309e0 -Tileset25GFX: ; 0x309e0 -INCBIN "gfx/tilesets/25.2bpp.lz" +TilesetParkGFX: ; 0x309e0 +INCBIN "gfx/tilesets/park.2bpp.lz" ; 0x30e80 -Tileset25Meta: ; 0x30e80 -INCBIN "tilesets/25_metatiles.bin" +TilesetParkMeta: ; 0x30e80 +INCBIN "tilesets/park_metatiles.bin" ; 0x31280 -Tileset25Coll: ; 0x31280 -INCBIN "tilesets/25_collision.bin" +TilesetParkColl: ; 0x31280 +INCBIN "tilesets/park_collision.bin" ; 0x31380 -Tileset27GFX: ; 0x31380 -INCBIN "gfx/tilesets/27.2bpp.lz" +TilesetRadioTowerGFX: ; 0x31380 +INCBIN "gfx/tilesets/radio_tower.2bpp.lz" ; 0x318e0 -Tileset27Meta: ; 0x318e0 -INCBIN "tilesets/27_metatiles.bin" +TilesetRadioTowerMeta: ; 0x318e0 +INCBIN "tilesets/radio_tower_metatiles.bin" ; 0x31ce0 -Tileset27Coll: ; 0x31ce0 -INCBIN "tilesets/27_collision.bin" +TilesetRadioTowerColl: ; 0x31ce0 +INCBIN "tilesets/radio_tower_collision.bin" ; 0x31de0 -Tileset28GFX: ; 0x31de0 -INCBIN "gfx/tilesets/28.2bpp.lz" +TilesetUndergroundGFX: ; 0x31de0 +INCBIN "gfx/tilesets/underground.2bpp.lz" ; 0x321b0 -Tileset28Meta: ; 0x321b0 -INCBIN "tilesets/28_metatiles.bin" +TilesetUndergroundMeta: ; 0x321b0 +INCBIN "tilesets/underground_metatiles.bin" ; 0x325b0 -Tileset28Coll: ; 0x325b0 -INCBIN "tilesets/28_collision.bin" +TilesetUndergroundColl: ; 0x325b0 +INCBIN "tilesets/underground_collision.bin" ; 0x326b0 -Tileset30GFX: ; 0x326b0 -INCBIN "gfx/tilesets/30.2bpp.lz" +TilesetWhirlIslandsGFX: ; 0x326b0 +INCBIN "gfx/tilesets/whirl_islands.2bpp.lz" ; 0x329f0 -UnusedTileset30Meta: ; 0x329f0 -INCBIN "tilesets/unused_30_metatiles.bin" +UnusedTilesetWhirlIslandsMeta: ; 0x329f0 +INCBIN "tilesets/unused_whirl_islands_metatiles.bin" ; 0x331f0 -UnusedTileset30Coll: ; 0x331f0 -INCBIN "tilesets/unused_30_collision.bin" +UnusedTilesetWhirlIslandsColl: ; 0x331f0 +INCBIN "tilesets/unused_whirl_islands_collision.bin" ; 0x333f0 SECTION "Tileset Data 5", ROMX -Tileset21GFX: ; 0xb4000 -INCBIN "gfx/tilesets/21.2bpp.lz" +TilesetPokeComCenterGFX: ; 0xb4000 +INCBIN "gfx/tilesets/pokecom_center.2bpp.lz" ; 0xb48a0 -Tileset21Meta: ; 0xb48a0 -INCBIN "tilesets/21_metatiles.bin" +TilesetPokeComCenterMeta: ; 0xb48a0 +INCBIN "tilesets/pokecom_center_metatiles.bin" ; 0xb4ca0 -Tileset21Coll: ; 0xb4ca0 -INCBIN "tilesets/21_collision.bin" +TilesetPokeComCenterColl: ; 0xb4ca0 +INCBIN "tilesets/pokecom_center_collision.bin" ; 0xb4da0 -Tileset22GFX: ; 0xb4da0 -INCBIN "gfx/tilesets/22.2bpp.lz" +TilesetBattleTowerGFX: ; 0xb4da0 +INCBIN "gfx/tilesets/battle_tower.2bpp.lz" ; 0xb50e0 -Tileset22Meta: ; 0xb50e0 -INCBIN "tilesets/22_metatiles.bin" +TilesetBattleTowerMeta: ; 0xb50e0 +INCBIN "tilesets/battle_tower_metatiles.bin" ; 0xb54e0 -Tileset22Coll: ; 0xb54e0 -INCBIN "tilesets/22_collision.bin" +TilesetBattleTowerColl: ; 0xb54e0 +INCBIN "tilesets/battle_tower_collision.bin" ; 0xb55e0 -Tileset08GFX: ; 0xb55e0 -INCBIN "gfx/tilesets/08.2bpp.lz" +TilesetGateGFX: ; 0xb55e0 +INCBIN "gfx/tilesets/gate.2bpp.lz" ; 0xb59e0 -Tileset08Meta: ; 0xb59e0 -INCBIN "tilesets/08_metatiles.bin" +TilesetGateMeta: ; 0xb59e0 +INCBIN "tilesets/gate_metatiles.bin" ; 0xb5de0 -Tileset08Coll: ; 0xb5de0 -INCBIN "tilesets/08_collision.bin" +TilesetGateColl: ; 0xb5de0 +INCBIN "tilesets/gate_collision.bin" ; 0xb5ee0 -Tileset02GFX: ; 0xb5ee0 -Tileset04GFX: ; 0xb5ee0 -INCBIN "gfx/tilesets/02.2bpp.lz" +TilesetJohto2GFX: ; 0xb5ee0 +TilesetBattleTowerOutsideGFX: ; 0xb5ee0 +INCBIN "gfx/tilesets/johto_2.2bpp.lz" ; 0xb6ae8 -Tileset02Meta: ; 0xb6ae8 -INCBIN "tilesets/02_metatiles.bin" +TilesetJohto2Meta: ; 0xb6ae8 +INCBIN "tilesets/johto_2_metatiles.bin" ; 0xb72e8 -Tileset02Coll: ; 0xb72e8 -INCBIN "tilesets/02_collision.bin" +TilesetJohto2Coll: ; 0xb72e8 +INCBIN "tilesets/johto_2_collision.bin" ; 0xb74e8 -Tileset16GFX: ; 0xb74e8 -INCBIN "gfx/tilesets/16.2bpp.lz" +TilesetKurtsHouseGFX: ; 0xb74e8 +INCBIN "gfx/tilesets/kurts_house.2bpp.lz" ; 0xb79a8 -Tileset16Meta: ; 0xb79a8 -INCBIN "tilesets/16_metatiles.bin" +TilesetKurtsHouseMeta: ; 0xb79a8 +INCBIN "tilesets/kurts_house_metatiles.bin" ; 0xb7da8 -Tileset16Coll: ; 0xb7da8 -INCBIN "tilesets/16_collision.bin" +TilesetKurtsHouseColl: ; 0xb7da8 +INCBIN "tilesets/kurts_house_collision.bin" ; 0xb7ea8 SECTION "Tileset Data 6", ROMX -Tileset31GFX: ; 0xdc000 -INCBIN "gfx/tilesets/31.2bpp.lz" +TilesetIlexForestGFX: ; 0xdc000 +INCBIN "gfx/tilesets/ilex_forest.2bpp.lz" ; 0xdc3d0 -Tileset18GFX: ; 0xdc3d0 -INCBIN "gfx/tilesets/18.2bpp.lz" +TilesetOlivineGymGFX: ; 0xdc3d0 +INCBIN "gfx/tilesets/olivine_gym.2bpp.lz" ; 0xdcc50 -Tileset18Meta: ; 0xdcc50 -INCBIN "tilesets/18_metatiles.bin" +TilesetOlivineGymMeta: ; 0xdcc50 +INCBIN "tilesets/olivine_gym_metatiles.bin" ; 0xdd050 -Tileset18Coll: ; 0xdd050 -INCBIN "tilesets/18_collision.bin" +TilesetOlivineGymColl: ; 0xdd050 +INCBIN "tilesets/olivine_gym_collision.bin" ; 0xdd150 -Tileset05GFX: ; 0xdd150 -INCBIN "gfx/tilesets/05.2bpp.lz" +TilesetHouse1GFX: ; 0xdd150 +INCBIN "gfx/tilesets/house_1.2bpp.lz" ; 0xdd600 -Tileset05Meta: ; 0xdd600 -INCBIN "tilesets/05_metatiles.bin" +TilesetHouse1Meta: ; 0xdd600 +INCBIN "tilesets/house_1_metatiles.bin" ; 0xdda00 -Tileset05Coll: ; 0xdda00 -INCBIN "tilesets/05_collision.bin" +TilesetHouse1Coll: ; 0xdda00 +INCBIN "tilesets/house_1_collision.bin" ; 0xddb00 -Tileset19GFX: ; 0xddb00 -INCBIN "gfx/tilesets/19.2bpp.lz" +TilesetLighthouseGFX: ; 0xddb00 +INCBIN "gfx/tilesets/lighthouse.2bpp.lz" ; 0xddf70 -Tileset19Meta: ; 0xddf70 -INCBIN "tilesets/19_metatiles.bin" +TilesetLighthouseMeta: ; 0xddf70 +INCBIN "tilesets/lighthouse_metatiles.bin" ; 0xde370 -Tileset19Coll: ; 0xde370 -INCBIN "tilesets/19_collision.bin" +TilesetLighthouseColl: ; 0xde370 +INCBIN "tilesets/lighthouse_collision.bin" ; 0xde470 -Tileset31Coll: ; 0xde470 -INCBIN "tilesets/31_collision.bin" +TilesetIlexForestColl: ; 0xde470 +INCBIN "tilesets/ilex_forest_collision.bin" ; 0xde570 -Tileset11GFX: ; 0xde570 -INCBIN "gfx/tilesets/11.2bpp.lz" +TilesetPowerPlantGFX: ; 0xde570 +INCBIN "gfx/tilesets/power_plant.2bpp.lz" ; 0xde990 -Tileset11Meta: ; 0xde990 -INCBIN "tilesets/11_metatiles.bin" +TilesetPowerPlantMeta: ; 0xde990 +INCBIN "tilesets/power_plant_metatiles.bin" ; 0xded90 -Tileset11Coll: ; 0xded90 -INCBIN "tilesets/11_collision.bin" +TilesetPowerPlantColl: ; 0xded90 +INCBIN "tilesets/power_plant_collision.bin" ; 0xdee90 -Tileset04Meta: ; 0xdee90 -INCBIN "tilesets/04_metatiles.bin" +TilesetBattleTowerOutsideMeta: ; 0xdee90 +INCBIN "tilesets/battle_tower_outside_metatiles.bin" ; 0xdf690 -Tileset04Coll: ; 0xdf690 -INCBIN "tilesets/04_collision.bin" +TilesetBattleTowerOutsideColl: ; 0xdf690 +INCBIN "tilesets/battle_tower_outside_collision.bin" ; 0xdf890 -Tileset32Meta: ; 0xdf890 -INCBIN "tilesets/32_metatiles.bin" +TilesetBetaWordRoomMeta: ; 0xdf890 +INCBIN "tilesets/beta_word_room_metatiles.bin" ; 0xdfc90 -Tileset32Coll: ; 0xdfc90 -Tileset33Coll: ; 0xdfc90 -Tileset34Coll: ; 0xdfc90 -Tileset35Coll: ; 0xdfc90 -Tileset36Coll: ; 0xdfc90 -INCBIN "tilesets/32_collision.bin" +TilesetBetaWordRoomColl: ; 0xdfc90 +TilesetHoOhWordRoomColl: ; 0xdfc90 +TilesetKabutoWordRoomColl: ; 0xdfc90 +TilesetOmanyteWordRoomColl: ; 0xdfc90 +TilesetAerodactylWordRoomColl: ; 0xdfc90 +INCBIN "tilesets/beta_word_room_collision.bin" ; 0xdfd90 SECTION "Tileset Data 7", ROMX -Tileset26GFX: ; 0x1dc5a1 -Tileset32GFX: ; 0x1dc5a1 -Tileset33GFX: ; 0x1dc5a1 -Tileset34GFX: ; 0x1dc5a1 -Tileset35GFX: ; 0x1dc5a1 -Tileset36GFX: ; 0x1dc5a1 -INCBIN "gfx/tilesets/26.2bpp.lz" +TilesetRuinsOfAlphGFX: ; 0x1dc5a1 +TilesetBetaWordRoomGFX: ; 0x1dc5a1 +TilesetHoOhWordRoomGFX: ; 0x1dc5a1 +TilesetKabutoWordRoomGFX: ; 0x1dc5a1 +TilesetOmanyteWordRoomGFX: ; 0x1dc5a1 +TilesetAerodactylWordRoomGFX: ; 0x1dc5a1 +INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz" ; 0x1dd1a9 -Tileset26Meta: ; 0x1dd1a9 -INCBIN "tilesets/26_metatiles.bin" +TilesetRuinsOfAlphMeta: ; 0x1dd1a9 +INCBIN "tilesets/ruins_of_alph_metatiles.bin" ; 0x1dd5a9 -Tileset26Coll: ; 0x1dd5a9 -INCBIN "tilesets/26_collision.bin" +TilesetRuinsOfAlphColl: ; 0x1dd5a9 +INCBIN "tilesets/ruins_of_alph_collision.bin" ; 0x1dd6a9 SECTION "Tileset Data 8", ROMX -Tileset33Meta: ; 0x1e0000 -INCBIN "tilesets/33_metatiles.bin" +TilesetHoOhWordRoomMeta: ; 0x1e0000 +INCBIN "tilesets/ho_oh_word_room_metatiles.bin" ; 0x1e0400 -Tileset34Meta: ; 0x1e0400 -INCBIN "tilesets/34_metatiles.bin" +TilesetKabutoWordRoomMeta: ; 0x1e0400 +INCBIN "tilesets/kabuto_word_room_metatiles.bin" ; 0x1e0800 -Tileset35Meta: ; 0x1e0800 -INCBIN "tilesets/35_metatiles.bin" +TilesetOmanyteWordRoomMeta: ; 0x1e0800 +INCBIN "tilesets/omanyte_word_room_metatiles.bin" ; 0x1e0c00 -Tileset36Meta: ; 0x1e0c00 -INCBIN "tilesets/36_metatiles.bin" +TilesetAerodactylWordRoomMeta: ; 0x1e0c00 +INCBIN "tilesets/aerodactyl_word_room_metatiles.bin" ; 0x1e1000 diff --git a/tilesets/game_corner_collision.bin b/tilesets/game_corner_collision.bin new file mode 100644 index 000000000..2bfcad418 Binary files /dev/null and b/tilesets/game_corner_collision.bin differ diff --git a/tilesets/game_corner_metatiles.bin b/tilesets/game_corner_metatiles.bin new file mode 100644 index 000000000..24beba2d3 Binary files /dev/null and b/tilesets/game_corner_metatiles.bin differ diff --git a/tilesets/game_corner_palette_map.asm b/tilesets/game_corner_palette_map.asm new file mode 100644 index 000000000..34bb9f6f0 --- /dev/null +++ b/tilesets/game_corner_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, GREEN, GREEN, GREEN + tilepal 0, GREEN, GREEN, GRAY, GRAY, RED, RED, GREEN, BROWN + tilepal 0, GRAY, GRAY, GRAY, RED, BROWN, GREEN, GRAY, GRAY + tilepal 0, GRAY, GREEN, GRAY, GRAY, RED, RED, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, BROWN, BROWN, GRAY, GRAY + tilepal 0, GRAY, GREEN, RED, RED, GREEN, GRAY, RED, RED + tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, GREEN, BROWN, RED, RED + tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED + tilepal 0, RED, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER + +rept 16 + db $ff +endr + + tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, BROWN + tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF + tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, RED, ROOF, ROOF + tilepal 1, YELLOW, RED, YELLOW, RED, WATER, WATER, RED, RED + tilepal 1, RED, RED, RED, RED, GREEN, GRAY, RED, RED + tilepal 1, RED, RED, YELLOW, YELLOW, WATER, WATER, BROWN, BROWN + tilepal 1, BROWN, BROWN, RED, RED, GREEN, ROOF, RED, RED + tilepal 1, RED, RED, YELLOW, YELLOW, ROOF, ROOF, RED, RED + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED + tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 1, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER diff --git a/tilesets/gate_collision.bin b/tilesets/gate_collision.bin new file mode 100644 index 000000000..5876a3fbe Binary files /dev/null and b/tilesets/gate_collision.bin differ diff --git a/tilesets/gate_metatiles.bin b/tilesets/gate_metatiles.bin new file mode 100644 index 000000000..74076ff58 Binary files /dev/null and b/tilesets/gate_metatiles.bin differ diff --git a/tilesets/gate_palette_map.asm b/tilesets/gate_palette_map.asm new file mode 100644 index 000000000..7854d3a81 --- /dev/null +++ b/tilesets/gate_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, WATER, WATER, RED, GREEN, GREEN, GREEN + tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN + tilepal 0, WATER, GRAY, WATER, WATER, RED, BROWN, BROWN, WATER + tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, WATER + tilepal 0, GREEN, GREEN, GRAY, GRAY, GREEN, GREEN, WATER, WATER + tilepal 0, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 0, GREEN, GREEN, GREEN, GREEN, GRAY, WATER, WATER, WATER + tilepal 0, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN + tilepal 1, GRAY, GRAY, GRAY, GRAY, ROOF, RED, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, WATER + tilepal 1, GRAY, ROOF, RED, GRAY, GRAY, WATER, GRAY, GRAY + tilepal 1, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, WATER, WATER, WATER + tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY diff --git a/tilesets/gym_1_collision.bin b/tilesets/gym_1_collision.bin new file mode 100644 index 000000000..fe8c334f0 Binary files /dev/null and b/tilesets/gym_1_collision.bin differ diff --git a/tilesets/gym_1_metatiles.bin b/tilesets/gym_1_metatiles.bin new file mode 100644 index 000000000..a9df6062c Binary files /dev/null and b/tilesets/gym_1_metatiles.bin differ diff --git a/tilesets/gym_1_palette_map.asm b/tilesets/gym_1_palette_map.asm new file mode 100644 index 000000000..b20f49195 --- /dev/null +++ b/tilesets/gym_1_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN + tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN + tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN + tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN + tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF + tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF + +rept 16 + db $ff +endr + + tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN + tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN + tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN + tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN + tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN + tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY + tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF + tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF diff --git a/tilesets/ho_oh_word_room_collision.bin b/tilesets/ho_oh_word_room_collision.bin new file mode 100644 index 000000000..a4da351d3 Binary files /dev/null and b/tilesets/ho_oh_word_room_collision.bin differ diff --git a/tilesets/ho_oh_word_room_metatiles.bin b/tilesets/ho_oh_word_room_metatiles.bin new file mode 100644 index 000000000..2b542c632 --- /dev/null +++ b/tilesets/ho_oh_word_room_metatiles.bin @@ -0,0 +1,17 @@ +Ì͈‰Üݘ™ŽžŸÈɨ©ØÙ¸¹€ª«‘º»ÄÅÔÕ¨©Èɸ¹ØÙÄÅÆÇÔÕÖצ§ˆ‰¶·˜™€ÂÑÒÓª«º»ÆǬ­Ö×¼½ÌÍÜÝ€¦§‘¶·¤¥´µ ¡ª«°±º»Ž€žŸ‘Âè©ÒÓ¸¹  +  +  +  !"#¬­ª«¼½º»@ABC 89 +  +  + +  +  +  +  +  +  +  + TVXY  + C 6!@ #8 + 6"7[\M]ÌÍ ¡ÜÝ°±ÆÇŽÖמŸÆÇŽÖמŸˆ‰¨©˜™¸¹Ì͈‰Üݘ™†‡–—ˆ‰®¯˜™¾¿€ÂÑÒÓÆÇÖ׊‹¬­š›¼½ÂÃÒÓÆÇŽÖמŸˆ‰ ¡˜™°±ÂÃÒÓÄÅ€ÔÕ‘¤¥ˆ‰´µ˜™ÄÅÔÕ \ No newline at end of file diff --git a/tilesets/ho_oh_word_room_palette_map.asm b/tilesets/ho_oh_word_room_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/tilesets/ho_oh_word_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + 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 + 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 + 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/house_1_collision.bin b/tilesets/house_1_collision.bin new file mode 100644 index 000000000..e11da7330 Binary files /dev/null and b/tilesets/house_1_collision.bin differ diff --git a/tilesets/house_1_metatiles.bin b/tilesets/house_1_metatiles.bin new file mode 100644 index 000000000..0d3a22f32 Binary files /dev/null and b/tilesets/house_1_metatiles.bin differ diff --git a/tilesets/house_1_palette_map.asm b/tilesets/house_1_palette_map.asm new file mode 100644 index 000000000..ce7b988b7 --- /dev/null +++ b/tilesets/house_1_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER + tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER + tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN + tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN + tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER + tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER + tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN + tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN + tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER + tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN diff --git a/tilesets/ice_path_collision.bin b/tilesets/ice_path_collision.bin new file mode 100644 index 000000000..a4498cbee Binary files /dev/null and b/tilesets/ice_path_collision.bin differ diff --git a/tilesets/ice_path_metatiles.bin b/tilesets/ice_path_metatiles.bin new file mode 100644 index 000000000..c92246e8a --- /dev/null +++ b/tilesets/ice_path_metatiles.bin @@ -0,0 +1,3 @@ +šššššªššššš + šˆ‰Š‹˜™šš¨©š›¨©ššŠ‹Š‹ššššš›ššªª›šŠ‹Œššœšš¬­šš¬­š«›ª›*+š:;¨©š›¨©šš¨©šš¨©š›ªªªšªšª›šªššš¬­šš¬­›š¬­šš¬­ÀÁÂÃÐÑÒÓÀÁÂÃÐÑÒÓ¨©š›¨©šš¸¹ººÈÉÊÊššššššššº»ººÊËÊÊ›š¬­šš¬­º»¼½ÊËÌÍ šššššš›š› ¡š°±šššš›ªšš¢£ªš²³ªš›ª›«››€®¯‘¾¿š›ª›ª›ÄÅÔÕÀÁÂÃÐÑÒÓÄÅ›ÔÕªÄÅÄÅÔÕÔÕššªÄÅÄÅÔÕÔÕšÄÅÔÕššªªšªŽšžŸÄÅšÔÕÄÅÔÕª„…†‡”•–—¤¥¦§´µ¶·ª‚ƒ›’“ªÄÅ«ÔÕšŽšžŸªš››ššÄŪªÔÕšÀÁÂÃÐÑÒÓ›››ÀÁÂÃÐÑÒÓ›ÄŪªÔÕÄÅÔÕÆÇÆÇÖ×Ö×ÆÇÆÇÖ×Ö×ÄÅšÔÕªªª››ªªª‚ƒª’“ªª›ª›ªª›ÄÅÔÕ™šª©šª©›ª«Èºººªªªª›››ºººº›ª¬ª›¬›ª›¬ºººÍ˜˜ª˜˜ªª›››œš›œšª›œª›œšš›ª«›BCŠ‹ª››››››››››  ‚ƒÆÇ’“Ö×ÆÇÆÇÖ×Ö×ÆÇÆÇÖ×ÖׂƒÆÇ’“Ö×ÆÇ‚ƒÖ×’“ÆÇÆÇÖ×Ö×ÆÇÆÇÖ×Ö×ÆÇ‚ƒÖ×’“RRRRSS(S >8(TRRRR,--.IJHKRRRRS)SS9? V)RRRRSSSS  >TLM \]XYZ[8//9WGGGU? NO^_ ›››››ª«ª + ª›ª›šªªª*+ª:;˜™šš¨©šš¸¹®¯Èɾ¿ššœšš¬­®¯¼½¾¿Ì͈‰Œ˜™œ¸¹¼½ÈÉÌÍ&' 67EF   šššš›ššš€¹º‘ÉÊ4444444444444444 \ No newline at end of file diff --git a/tilesets/ice_path_palette_map.asm b/tilesets/ice_path_palette_map.asm new file mode 100644 index 000000000..985844071 --- /dev/null +++ b/tilesets/ice_path_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, BROWN, ROOF, ROOF, BROWN, BROWN, WATER, WATER + tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, BROWN, BROWN, WATER, WATER + tilepal 0, WATER, ROOF, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY + tilepal 0, WATER, WATER, ROOF, ROOF, WATER, WATER, WATER, WATER + tilepal 0, BROWN, WATER, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 0, WATER, WATER, ROOF, ROOF, GRAY, GRAY, WATER, WATER + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, GREEN, GRAY, GRAY, WATER + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, WATER + tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + +rept 16 + db $ff +endr + + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF diff --git a/tilesets/ilex_forest_collision.bin b/tilesets/ilex_forest_collision.bin new file mode 100644 index 000000000..9f66b5fdd Binary files /dev/null and b/tilesets/ilex_forest_collision.bin differ diff --git a/tilesets/ilex_forest_metatiles.bin b/tilesets/ilex_forest_metatiles.bin new file mode 100644 index 000000000..a8b82d8cf --- /dev/null +++ b/tilesets/ilex_forest_metatiles.bin @@ -0,0 +1 @@ + ,-./<=>?**** ,-./<=>? ***&'&'6767&'67&'&'6767&'67&'67*** &'67&'67(9&'8:67&'67&'&'6767&'&'6767&'67&'&'6767&'67&'67&'67&'67)**********+** !!! !!! !!!!!!!!!!!!!!!!!!"!!!"!!!"02 !!!0111#$$$#$!!!!1111$$$$$$!!!"1112$$$%$%#$$$#$$$#$34#$$$#$$$#$$$3444$$$$$$$$$$$$4444$$$%$$$%$$$%4445 \ No newline at end of file diff --git a/tilesets/ilex_forest_palette_map.asm b/tilesets/ilex_forest_palette_map.asm new file mode 100644 index 000000000..696788084 --- /dev/null +++ b/tilesets/ilex_forest_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW + tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW + tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN + 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/johto_1_collision.bin b/tilesets/johto_1_collision.bin new file mode 100644 index 000000000..b3276e1cf Binary files /dev/null and b/tilesets/johto_1_collision.bin differ diff --git a/tilesets/johto_1_metatiles.bin b/tilesets/johto_1_metatiles.bin new file mode 100644 index 000000000..9024f2ad6 Binary files /dev/null and b/tilesets/johto_1_metatiles.bin differ diff --git a/tilesets/johto_1_palette_map.asm b/tilesets/johto_1_palette_map.asm new file mode 100644 index 000000000..62fbd2d00 --- /dev/null +++ b/tilesets/johto_1_palette_map.asm @@ -0,0 +1,29 @@ + 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/johto_2_collision.bin b/tilesets/johto_2_collision.bin new file mode 100644 index 000000000..6e5addd6d Binary files /dev/null and b/tilesets/johto_2_collision.bin differ diff --git a/tilesets/johto_2_metatiles.bin b/tilesets/johto_2_metatiles.bin new file mode 100644 index 000000000..a15c0c2c7 Binary files /dev/null and b/tilesets/johto_2_metatiles.bin differ diff --git a/tilesets/johto_2_palette_map.asm b/tilesets/johto_2_palette_map.asm new file mode 100644 index 000000000..f2af7a92d --- /dev/null +++ b/tilesets/johto_2_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF + 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, GRAY, GREEN, GREEN + tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED + tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW + tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF + tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF + tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN + tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED + tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW + tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN + tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF diff --git a/tilesets/kabuto_word_room_collision.bin b/tilesets/kabuto_word_room_collision.bin new file mode 100644 index 000000000..a4da351d3 Binary files /dev/null and b/tilesets/kabuto_word_room_collision.bin differ diff --git a/tilesets/kabuto_word_room_metatiles.bin b/tilesets/kabuto_word_room_metatiles.bin new file mode 100644 index 000000000..14d082e2a --- /dev/null +++ b/tilesets/kabuto_word_room_metatiles.bin @@ -0,0 +1,17 @@ +¬­Èɼ½ØÙÂÃÒÓÌͬ­Üݼ½ÂƇÒÓ–—ÄÅÔÕÄÅŽÔÕžŸ€¦§‘¶·¦§¶·ÂȉÒÓ˜™¨©€¸¹‘ ¡ª«°±º»ŽžŸˆ‰ÂØ™ÒÓˆ‰˜™Š‹¬­š›¼½ÂÃÒÓÆÇŽÖמŸˆ‰˜™  +  +  +  !"#€Œ‘œ@ABC 89 +  +  + +  +  +  +  +  +  +  + TVXY  + C 6!@ #8 + 6"7ˆ‰ÄŘ™ÔÕ \ No newline at end of file diff --git a/tilesets/kabuto_word_room_palette_map.asm b/tilesets/kabuto_word_room_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/tilesets/kabuto_word_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + 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 + 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 + 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/kanto_collision.bin b/tilesets/kanto_collision.bin new file mode 100644 index 000000000..f0038d731 Binary files /dev/null and b/tilesets/kanto_collision.bin differ diff --git a/tilesets/kanto_metatiles.bin b/tilesets/kanto_metatiles.bin new file mode 100644 index 000000000..41b0cfffd Binary files /dev/null and b/tilesets/kanto_metatiles.bin differ diff --git a/tilesets/kanto_palette_map.asm b/tilesets/kanto_palette_map.asm new file mode 100644 index 000000000..e3e497fb9 --- /dev/null +++ b/tilesets/kanto_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY + tilepal 0, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN + tilepal 0, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY + tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED + tilepal 0, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY + tilepal 1, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN + tilepal 1, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY + tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED + tilepal 1, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/kurts_house_collision.bin b/tilesets/kurts_house_collision.bin new file mode 100644 index 000000000..499a1d071 Binary files /dev/null and b/tilesets/kurts_house_collision.bin differ diff --git a/tilesets/kurts_house_metatiles.bin b/tilesets/kurts_house_metatiles.bin new file mode 100644 index 000000000..3f6b41bd1 Binary files /dev/null and b/tilesets/kurts_house_metatiles.bin differ diff --git a/tilesets/kurts_house_palette_map.asm b/tilesets/kurts_house_palette_map.asm new file mode 100644 index 000000000..5daa0da6b --- /dev/null +++ b/tilesets/kurts_house_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY + tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY + tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN diff --git a/tilesets/lab_collision.bin b/tilesets/lab_collision.bin new file mode 100644 index 000000000..4396125f0 Binary files /dev/null and b/tilesets/lab_collision.bin differ diff --git a/tilesets/lab_metatiles.bin b/tilesets/lab_metatiles.bin new file mode 100644 index 000000000..62da01e8b Binary files /dev/null and b/tilesets/lab_metatiles.bin differ diff --git a/tilesets/lab_palette_map.asm b/tilesets/lab_palette_map.asm new file mode 100644 index 000000000..24399c6ea --- /dev/null +++ b/tilesets/lab_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, WATER, WATER, WATER, ROOF, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN + tilepal 0, WATER, WATER, WATER, WATER, RED, BROWN, BROWN, GRAY + tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN + tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, BROWN, GREEN, GREEN, GREEN + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, RED, RED, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER diff --git a/tilesets/lighthouse_collision.bin b/tilesets/lighthouse_collision.bin new file mode 100644 index 000000000..f15ac266a Binary files /dev/null and b/tilesets/lighthouse_collision.bin differ diff --git a/tilesets/lighthouse_metatiles.bin b/tilesets/lighthouse_metatiles.bin new file mode 100644 index 000000000..21ca0f09a Binary files /dev/null and b/tilesets/lighthouse_metatiles.bin differ diff --git a/tilesets/lighthouse_palette_map.asm b/tilesets/lighthouse_palette_map.asm new file mode 100644 index 000000000..5f80e3a4d --- /dev/null +++ b/tilesets/lighthouse_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, WATER, WATER, BROWN, WATER, WATER, RED + tilepal 0, RED, ROOF, ROOF, BROWN, ROOF, RED, RED, RED + tilepal 0, ROOF, WATER, ROOF, BROWN, ROOF, WATER, WATER, RED + tilepal 0, RED, ROOF, ROOF, WATER, ROOF, RED, RED, RED + tilepal 0, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY + tilepal 0, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, GRAY, GRAY + tilepal 0, ROOF, ROOF, WATER, WATER, RED, ROOF, BROWN, GRAY + tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER + tilepal 0, YELLOW, YELLOW, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN + tilepal 0, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF + tilepal 0, YELLOW, YELLOW, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY + tilepal 0, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, ROOF, GRAY, GRAY, BROWN, BROWN, RED + tilepal 1, RED, RED, RED, BROWN, RED, RED, RED, RED + tilepal 1, ROOF, WATER, ROOF, BROWN, RED, WATER, WATER, RED + tilepal 1, RED, RED, RED, WATER, RED, RED, RED, RED + tilepal 1, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY + tilepal 1, GRAY, GRAY, GRAY, BROWN, RED, ROOF, GRAY, GRAY + tilepal 1, ROOF, ROOF, WATER, WATER, RED, RED, BROWN, GRAY + tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER + tilepal 1, RED, RED, ROOF, ROOF, BROWN, BROWN, GRAY, GRAY + tilepal 1, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF + tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY + tilepal 1, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY diff --git a/tilesets/mart_collision.bin b/tilesets/mart_collision.bin new file mode 100644 index 000000000..0f8763b7b Binary files /dev/null and b/tilesets/mart_collision.bin differ diff --git a/tilesets/mart_metatiles.bin b/tilesets/mart_metatiles.bin new file mode 100644 index 000000000..63b2f629d --- /dev/null +++ b/tilesets/mart_metatiles.bin @@ -0,0 +1,3 @@ +,-<= +II "#23$%45*+>?>?*+ !01JK ‰Š§¨./‘‘‘‘‘‘°±²¶·¸*;;;>?>?>?;;;;&'67()89@AB+PQRECD\]STU VWVWXYXYZ[Z[ PQPQPQPQ^_^_ÄÅÆÇÔÕÖ×ÈÉÊËØ‘‘‘*+>?>?,-<=*;;;>?>?::>?::;;;+>?::>?::>?>?:: ::>? F:F:F::G:G:G"#23$%45 LMLMLMLMNONO !HH01HH>?HH>?HHHH&'HH67HH()HH89––––––––––––––––  +II *+PQ>?PQ>?^_HH&'HH67HH()HH89/HHHHHHHHHHHHHHHHHHHH HHHHHHHHHHHHHHHH;;;;&'67()89>?>?.ÀÁÂÃÐÑÒÓ‘ÙÚ‘ÛÜ‘‘‘‘‘‘‘‘‘‘‘‘‘"#‘23‘$%‘‹Œ‘‘‘‘‘‘ ¡¡¡––––‘‘‘‘‘‘‘‘¡¡¡¡––––‘‘™š‘‘©ª¡¡¡¢––––‘‘‘’‘‘‘’‘‘™š‘‘©ª‚‘‘‘’‘‘‘’‘‘‘’®¯¯¯‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‡ˆ‘‘—˜‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘‘ƒ„…†“””•¡¡¡¡––––œŽŽŽ¬žžž¬¬›«ŽŽ«žžž«ž¯¯¯­‘‘‘‘‘‘‘‘‘‘‘‘°±²¹º³»¼µ½¾¸ \ No newline at end of file diff --git a/tilesets/mart_palette_map.asm b/tilesets/mart_palette_map.asm new file mode 100644 index 000000000..991510d12 --- /dev/null +++ b/tilesets/mart_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GREEN, GREEN, WATER, RED, GRAY, GRAY, ROOF, ROOF + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, RED, ROOF, ROOF, GRAY, YELLOW + tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 0, WATER, WATER, RED, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED, RED + tilepal 0, GREEN, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, YELLOW, YELLOW, YELLOW, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, RED, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN, GRAY + tilepal 1, GRAY, GREEN, GREEN, RED, RED, WATER, WATER, ROOF + tilepal 1, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW, ROOF, GRAY + tilepal 1, GRAY, GRAY, WATER, GRAY, GRAY, GRAY, YELLOW, YELLOW + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, RED, WATER, RED + tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED + tilepal 1, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN + tilepal 1, GRAY, GRAY, WATER, GRAY, WATER, RED, BROWN, BROWN diff --git a/tilesets/olivine_gym_collision.bin b/tilesets/olivine_gym_collision.bin new file mode 100644 index 000000000..cf77d603e Binary files /dev/null and b/tilesets/olivine_gym_collision.bin differ diff --git a/tilesets/olivine_gym_metatiles.bin b/tilesets/olivine_gym_metatiles.bin new file mode 100644 index 000000000..a2adb197a --- /dev/null +++ b/tilesets/olivine_gym_metatiles.bin @@ -0,0 +1,15 @@ +  *() 89+,!!   %'!!  5 5 5 5 5&&01    %&&'677:"##$2334°°°°´ÕÖ·×ØØÙÚÛÛÜ  +,+, *() 89 SSSSSSSSSSSSSSSSFGFGVWVWFGSSVWSS FGFGVWVWSSFGSSVW]•—‚]]]%&&'XYXYÑ£¤Ñ¥¦§¨©ª«¬­®¯ÔSSSSSSSSFGFGVWVWÇÈÒÒÓÓÓÓÓÓÒÓÓÓÓÒFGSSVWSSFGSSVWSSSSFGSSVWSSFGSSVW./SS>?SSNOSS^_SSSS./SS>?SSNOSS^_S@HH@PQQPPQQPPQQHHHHQQQQQQQQQQQQHHBSQQRBQQRRQQRR----------------PPQQPPQQPCDDCDDDQQQQQQQQTUTUTUTUQQRRQQRRDDERDDDESSSSSSSS + SS + SS + SSSS + FG + VW + FG + VWFG + VW + FG + VW + SS + SS + SS + SSÊ°°°Ë±Ý±Ì²Þ²ÉÀÀÀ°°°Î±Ý±Ï²Þ²ÐÀÀÀÍFGFGVWVWFGFGVWVW————]]]]%&&'XYXY°°ÁÂݱÃÄÞ²ÅÆÀÀÅÆÁ°°ÃıÝÅƲÞÅÆÀÀ°°°°´µ¶·¸¹º»¼½¾¿]ˆ‰‚]ˆ‰‚]ˆ‰€]ˆ‰‹Œ]…‹Œ]†‹Œ]‡‹Œ]„;<<=;<<=;<<=;<<=ÒÒÇÈÒÓÓÓÓÒÓÓÓÓÒÓ````````````````;<<=;<<=%&&'XYXY˜™——š›——œ——žŸ————˜™——š›——œ——žŸ—–]…]]]†%&&'XYXY]•—‚]]—ƒ]]•€]•——–]…—]]†–]]‡—–]„]ˆ‰‚]ˆ‰ƒ]ˆ€]Ž‹Œ]…‹Œ]†’Œ]‡Ž]„————————————————ÓÓÓÓ;<<=””””““““¡ÓÓÓ¢ÒÓÒ‘‘‘‘ŽŽŽŽÒÓÓ¡ÒÒÓ¢‘‘‘‘ŽŽŽŽ \ No newline at end of file diff --git a/tilesets/olivine_gym_palette_map.asm b/tilesets/olivine_gym_palette_map.asm new file mode 100644 index 000000000..551a09351 --- /dev/null +++ b/tilesets/olivine_gym_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN + tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED + tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY diff --git a/tilesets/omanyte_word_room_collision.bin b/tilesets/omanyte_word_room_collision.bin new file mode 100644 index 000000000..a4da351d3 Binary files /dev/null and b/tilesets/omanyte_word_room_collision.bin differ diff --git a/tilesets/omanyte_word_room_metatiles.bin b/tilesets/omanyte_word_room_metatiles.bin new file mode 100644 index 000000000..3cc62f562 --- /dev/null +++ b/tilesets/omanyte_word_room_metatiles.bin @@ -0,0 +1,17 @@ +ÆÇŽÖמŸˆ‰[\˜™M]®¯¾¿¬­Äż½ÔÕÄň‰ÔÕ˜™ÄÅÄÅÔÕÔÕŒÂÃœÒÓˆ‰€˜™‘ÆÇÖ× ¡ª«°±º»ÄÅ ¡ÔÕ°±ŒŽœžŸÆÇÖ×€ª«‘º»†‡–—  +  +  +  !"#ÂȉÒÓ˜™@ABC 89 +  +  + +  +  +  +  +  +  +  + TVXY  + C 6!@ #8 + 6"7Š‹ÈÉš›ØÙÄň‰ÔÕ˜™ÆÇÖ׎ˆ‰žŸ˜™¬­Èɼ½ØÙÆÇÄÅÖ×ÔÕ ¡†‡°±–—ˆ‰˜™Ìͬ­Üݼ½Âæ§ÒÓ¶·†‡–— \ No newline at end of file diff --git a/tilesets/omanyte_word_room_palette_map.asm b/tilesets/omanyte_word_room_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/tilesets/omanyte_word_room_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + 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 + 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 + 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/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/park_collision.bin b/tilesets/park_collision.bin new file mode 100644 index 000000000..29e6fa56d Binary files /dev/null and b/tilesets/park_collision.bin differ diff --git a/tilesets/park_metatiles.bin b/tilesets/park_metatiles.bin new file mode 100644 index 000000000..1fe931640 Binary files /dev/null and b/tilesets/park_metatiles.bin differ diff --git a/tilesets/park_palette_map.asm b/tilesets/park_palette_map.asm new file mode 100644 index 000000000..f9c65ef89 --- /dev/null +++ b/tilesets/park_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GREEN, BROWN, RED, GREEN, BROWN, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN + tilepal 0, RED, RED, RED, GRAY, WATER, ROOF, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN + tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN + tilepal 0, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN + tilepal 0, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, GRAY, RED + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, WATER + +rept 16 + db $ff +endr + + tilepal 1, WATER, WATER, GRAY, RED, GREEN, BROWN, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN + tilepal 1, WATER, WATER, RED, GRAY, WATER, ROOF, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN + tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN + tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN + tilepal 1, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, BROWN, GREEN, GREEN, WATER, WATER, WATER, RED + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, GRAY diff --git a/tilesets/players_house_2f_collision.bin b/tilesets/players_house_2f_collision.bin new file mode 100644 index 000000000..9ceb978ab Binary files /dev/null and b/tilesets/players_house_2f_collision.bin differ diff --git a/tilesets/players_house_2f_metatiles.bin b/tilesets/players_house_2f_metatiles.bin new file mode 100644 index 000000000..0839798fe Binary files /dev/null and b/tilesets/players_house_2f_metatiles.bin differ diff --git a/tilesets/players_house_2f_palette_map.asm b/tilesets/players_house_2f_palette_map.asm new file mode 100644 index 000000000..1c0cb1f08 --- /dev/null +++ b/tilesets/players_house_2f_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED + tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED + tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN + tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW + tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN + tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW diff --git a/tilesets/players_house_collision.bin b/tilesets/players_house_collision.bin new file mode 100644 index 000000000..dc3a08bfb Binary files /dev/null and b/tilesets/players_house_collision.bin differ diff --git a/tilesets/players_house_metatiles.bin b/tilesets/players_house_metatiles.bin new file mode 100644 index 000000000..f316eb8c1 Binary files /dev/null and b/tilesets/players_house_metatiles.bin differ diff --git a/tilesets/players_house_palette_map.asm b/tilesets/players_house_palette_map.asm new file mode 100644 index 000000000..5d089835b --- /dev/null +++ b/tilesets/players_house_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER + tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER + tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN + tilepal 0, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER + tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN diff --git a/tilesets/pokecenter_collision.bin b/tilesets/pokecenter_collision.bin new file mode 100644 index 000000000..5e58e03c9 Binary files /dev/null and b/tilesets/pokecenter_collision.bin differ diff --git a/tilesets/pokecenter_metatiles.bin b/tilesets/pokecenter_metatiles.bin new file mode 100644 index 000000000..c96c4843b Binary files /dev/null and b/tilesets/pokecenter_metatiles.bin differ diff --git a/tilesets/pokecenter_palette_map.asm b/tilesets/pokecenter_palette_map.asm new file mode 100644 index 000000000..78508b59e --- /dev/null +++ b/tilesets/pokecenter_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER + tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY + tilepal 0, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER + tilepal 0, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY + tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY + tilepal 0, RED, RED, RED, RED, RED, RED, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER + tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY + tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY + tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY + tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/pokecom_center_collision.bin b/tilesets/pokecom_center_collision.bin new file mode 100644 index 000000000..0dfed1d91 Binary files /dev/null and b/tilesets/pokecom_center_collision.bin differ diff --git a/tilesets/pokecom_center_metatiles.bin b/tilesets/pokecom_center_metatiles.bin new file mode 100644 index 000000000..097a882fd --- /dev/null +++ b/tilesets/pokecom_center_metatiles.bin @@ -0,0 +1,2 @@ +================"#23"#23±±%,-./<==?LMNOƒƒ +  !01@A544$$$$ÂÃÒÓ 44$$$$4444$$$$±R,/±RLO±R\]±‘ƒ±±%4”$ ¡†‡,/–—LO:;\]‘ 5$$$$±R&'±R±R±·¶±–§—±†¦‡±·¶±·¶±–§—±JK£±Z[%444 $$$±¦¦‡± ¶±4444$$$$4444$$$$¦¦¦¦§§§§ƒƒŠ‹°²ˆ‰·˜š·ˆ‰·˜™–§¶Œ¶›¶Œ§—œ4444$$$$ÄÅÔÕ================¨©ª«¸¹º»ÈÉÊËØÙÚÛª«¬­º»¼½ÊËÌÍÚÛÜ݈‰·˜š·ˆ‰·˜š·¶Œ¶›¶Œ¶›ØÝŽŽ¶4ŽŽ¶$ŽŽ¶§§—ª«ª«º»º»ÊËÊËÚÛÚÛ¶’“·¶¢£·¦¦§§§§ƒƒŠ‹†¦¦·ŽŽƒƒŠ‹¦¦‡ŽŽ¶¶’“·¶¢£·¶ÀÁ·¶ÐÑ·ŽŽŽŽŽŽŽŽŽŽŽŽ§§§§ƒƒŠ‹¦¦¦¦ŽŽŽŽDETUQQQQPPPPHIHIXYXY4·ŽŽ$·ŽŽ€·ŽŽ>–§§Š‹Š‹°²°²Š‹Š‹°²°² 44Š‹Š‹°²°²4444®¯®¯ÞßÞß®¯®¯¾¿¾¿^_^_„…()„…89”•:;‚‚‚‚$$$$ÆÇ‚‚Öׂ‚()$$89ÆÇ:;Öׂ‚‚‚¦¦¦¦§§ ¶BC·¶¢S·®¯®¯¾¿¾¿ÎϾ¿ÞßÞß 4$$$• 444±¤¥$±´µ¦±–§§4444$$$$ž‰†¦˜š·ˆ‰·˜š·¦‡ŒŸ¶›¶Œ¶› \ No newline at end of file diff --git a/tilesets/pokecom_center_palette_map.asm b/tilesets/pokecom_center_palette_map.asm new file mode 100644 index 000000000..75ee649f9 --- /dev/null +++ b/tilesets/pokecom_center_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 0, WATER, WATER, GRAY, GRAY, RED, GRAY, WATER, WATER + tilepal 0, RED, WATER, GRAY, WATER, WATER, WATER, RED, RED + tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY + tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER + tilepal 0, RED, RED, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY + tilepal 0, GRAY, GRAY, WATER, WATER, WATER, WATER, RED, WATER + tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, RED, RED, GRAY + tilepal 0, RED, RED, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, GRAY, YELLOW, YELLOW + +rept 16 + db $ff +endr + + tilepal 1, GRAY, GRAY, GRAY, WATER, RED, RED, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GRAY, WATER + tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, RED, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER + tilepal 1, RED, RED, GRAY, GRAY, RED, RED, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN + tilepal 1, WATER, RED, WATER, BROWN, WATER, WATER, WATER, WATER + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN + tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN + tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN diff --git a/tilesets/port_collision.bin b/tilesets/port_collision.bin new file mode 100644 index 000000000..af2e7fd34 Binary files /dev/null and b/tilesets/port_collision.bin differ diff --git a/tilesets/port_metatiles.bin b/tilesets/port_metatiles.bin new file mode 100644 index 000000000..69a600707 --- /dev/null +++ b/tilesets/port_metatiles.bin @@ -0,0 +1,65 @@ +""""!!!!1111111111111111    ""  !!!!+,--9::3#$%./02;<=>&'()345?@AB*678CDE+,-39:PQXYZFGHIRRSSZ[\\IJKLT,-U]^^^MNOVW_ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ"""""""" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +  ""1111  + + + + + + + + + + + + + + + + ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ \ No newline at end of file diff --git a/tilesets/port_palette_map.asm b/tilesets/port_palette_map.asm new file mode 100644 index 000000000..6bfdf4686 --- /dev/null +++ b/tilesets/port_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN + tilepal 0, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN + tilepal 0, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF + tilepal 0, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + +rept 16 + db $ff +endr + + tilepal 1, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN + tilepal 1, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN + tilepal 1, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF + tilepal 1, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF + tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF diff --git a/tilesets/power_plant_collision.bin b/tilesets/power_plant_collision.bin new file mode 100644 index 000000000..ee03c4528 Binary files /dev/null and b/tilesets/power_plant_collision.bin differ diff --git a/tilesets/power_plant_metatiles.bin b/tilesets/power_plant_metatiles.bin new file mode 100644 index 000000000..f6089d29c --- /dev/null +++ b/tilesets/power_plant_metatiles.bin @@ -0,0 +1,8 @@ +6666666666666666""""""""&&&&@B@B + + + + &&&&88889999&& !&&&&&01&&&&&@B@B()()()()*+()&&&&&&&& &&,-""<=""./&>?&"",-""<=&./&>? &&&&''''7777,-&<=&./&>?&&,-&<=&./&>?@AABPQQRPHIRS::T&&&@A&PQ&&AAABQQQREEFEUUVU + K +[EFEEUVUU K + [&PQ&S:&&QQQR:::T&&EFE;UVU;JKJ;Z[Z;6666666666666666AAABMMMN88889999""""""""#$$%WXXY""""@B""PRPRPRPRPR""23""CD&&&&""""""@B&PR&PR;;;;;;;;&&&&&&&&;;;;;;;;""""@B""PR&PR&PR&PR&PR&PR&PR&PR&PR@APRLM&&&&&@A&LM&&&&AB&MN&&&&&@B@APRLM&&&& &&@AABPHIR &&&&&&@B&PR&PR&PR&PR&&@BPR#$$%WXXY&&&&PRPRPRPR@B&PR&PR&PR&@AAALMMM&&&&AAABMMMN&&&&&@B&PR&PR&PR&&&&AAAAMMMM""""""""&&AAAAMMMM&&&&&PR&PR&PR&PR&@A&PQ&PQ&S:@AAALMMM88889999&PR&PRABPRMNPR""""""\]&^_&@B@APRLMPR&PR&AB@BMNPR&PR&PRPR&PR&PR@ALM&PR&PRABPRMN \ No newline at end of file diff --git a/tilesets/power_plant_palette_map.asm b/tilesets/power_plant_palette_map.asm new file mode 100644 index 000000000..f79f9c01b --- /dev/null +++ b/tilesets/power_plant_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN + tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN + tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED + tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED + tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER + tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF + tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN + tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN + tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED + tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED + tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER + tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF + tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/radio_tower_collision.bin b/tilesets/radio_tower_collision.bin new file mode 100644 index 000000000..0d77042b7 Binary files /dev/null and b/tilesets/radio_tower_collision.bin differ diff --git a/tilesets/radio_tower_metatiles.bin b/tilesets/radio_tower_metatiles.bin new file mode 100644 index 000000000..01c0b4aa5 Binary files /dev/null and b/tilesets/radio_tower_metatiles.bin differ diff --git a/tilesets/radio_tower_palette_map.asm b/tilesets/radio_tower_palette_map.asm new file mode 100644 index 000000000..3530f7479 --- /dev/null +++ b/tilesets/radio_tower_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, RED, RED, WATER, WATER, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, WATER, RED, WATER, WATER, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, ROOF, ROOF, GRAY, GRAY, BROWN, GRAY, GRAY, BROWN + tilepal 0, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN + tilepal 0, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY + tilepal 0, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GREEN, GREEN + tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, YELLOW, YELLOW, RED + tilepal 1, ROOF, RED, RED, ROOF, GRAY, GRAY, GRAY, GRAY + tilepal 1, ROOF, ROOF, GRAY, GRAY, WATER, GRAY, GRAY, BROWN + tilepal 1, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN + tilepal 1, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY + tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN + tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, RED, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/ruins_of_alph_collision.bin b/tilesets/ruins_of_alph_collision.bin new file mode 100644 index 000000000..1eedacfe8 Binary files /dev/null and b/tilesets/ruins_of_alph_collision.bin differ diff --git a/tilesets/ruins_of_alph_metatiles.bin b/tilesets/ruins_of_alph_metatiles.bin new file mode 100644 index 000000000..61ef041b5 Binary files /dev/null and b/tilesets/ruins_of_alph_metatiles.bin differ diff --git a/tilesets/ruins_of_alph_palette_map.asm b/tilesets/ruins_of_alph_palette_map.asm new file mode 100644 index 000000000..5ebde24ba --- /dev/null +++ b/tilesets/ruins_of_alph_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + 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 + 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 + 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/sprout_tower_collision.bin b/tilesets/sprout_tower_collision.bin new file mode 100644 index 000000000..878803fb8 Binary files /dev/null and b/tilesets/sprout_tower_collision.bin differ diff --git a/tilesets/sprout_tower_metatiles.bin b/tilesets/sprout_tower_metatiles.bin new file mode 100644 index 000000000..b6668fcd4 --- /dev/null +++ b/tilesets/sprout_tower_metatiles.bin @@ -0,0 +1,2 @@ + @ !!A1A1!!!!!!@ A1A1 + A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!! -.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$  "#23!!67"#!!2367%545%545%545%545 ^^  ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿFV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW  \ No newline at end of file diff --git a/tilesets/sprout_tower_palette_map.asm b/tilesets/sprout_tower_palette_map.asm new file mode 100644 index 000000000..6e3c10115 --- /dev/null +++ b/tilesets/sprout_tower_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED + tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED + tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED + tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED + tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN diff --git a/tilesets/tileset_headers.asm b/tilesets/tileset_headers.asm index d0debd2b7..d96931c17 100644 --- a/tilesets/tileset_headers.asm +++ b/tilesets/tileset_headers.asm @@ -7,42 +7,42 @@ 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 +Tileset0:: + tileset Tileset0 +Tileset1:: + 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 diff --git a/tilesets/train_station_collision.bin b/tilesets/train_station_collision.bin new file mode 100644 index 000000000..bd5c4c586 Binary files /dev/null and b/tilesets/train_station_collision.bin differ diff --git a/tilesets/train_station_metatiles.bin b/tilesets/train_station_metatiles.bin new file mode 100644 index 000000000..9bbdd0bd2 Binary files /dev/null and b/tilesets/train_station_metatiles.bin differ diff --git a/tilesets/train_station_palette_map.asm b/tilesets/train_station_palette_map.asm new file mode 100644 index 000000000..f52f5bbe7 --- /dev/null +++ b/tilesets/train_station_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY + tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY + tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY + tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER + tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER + tilepal 0, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN + tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER + +rept 16 + db $ff +endr + + tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY + tilepal 1, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY + tilepal 1, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY + tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER + tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER + tilepal 1, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN + tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER diff --git a/tilesets/underground_collision.bin b/tilesets/underground_collision.bin new file mode 100644 index 000000000..eccd3e3df Binary files /dev/null and b/tilesets/underground_collision.bin differ diff --git a/tilesets/underground_metatiles.bin b/tilesets/underground_metatiles.bin new file mode 100644 index 000000000..28b807e1e --- /dev/null +++ b/tilesets/underground_metatiles.bin @@ -0,0 +1,2 @@ +*+:;,-<=EFUV 0144444444   44 444444      CDCDSTSTCDCDSTST        "#23                      + QQQQQQQQ./>?./>?@ANOP]^_&'67             01 01@AAAPQQQPQQQAAABQQQRQQQR@AABPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQR@B@B()89()89 \ No newline at end of file diff --git a/tilesets/underground_palette_map.asm b/tilesets/underground_palette_map.asm new file mode 100644 index 000000000..6b9b5546d --- /dev/null +++ b/tilesets/underground_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED + tilepal 0, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED + tilepal 0, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED + tilepal 1, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY + tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED + tilepal 1, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN + tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN + tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY diff --git a/tilesets/unused_30_collision.bin b/tilesets/unused_30_collision.bin deleted file mode 100644 index 559aad109..000000000 Binary files a/tilesets/unused_30_collision.bin and /dev/null differ diff --git a/tilesets/unused_30_metatiles.bin b/tilesets/unused_30_metatiles.bin deleted file mode 100644 index b70f1a0e6..000000000 Binary files a/tilesets/unused_30_metatiles.bin and /dev/null differ diff --git a/tilesets/unused_whirl_islands_collision.bin b/tilesets/unused_whirl_islands_collision.bin new file mode 100644 index 000000000..559aad109 Binary files /dev/null and b/tilesets/unused_whirl_islands_collision.bin differ diff --git a/tilesets/unused_whirl_islands_metatiles.bin b/tilesets/unused_whirl_islands_metatiles.bin new file mode 100644 index 000000000..b70f1a0e6 Binary files /dev/null and b/tilesets/unused_whirl_islands_metatiles.bin differ diff --git a/tilesets/whirl_islands_collision.bin b/tilesets/whirl_islands_collision.bin new file mode 100644 index 000000000..701de1c0b Binary files /dev/null and b/tilesets/whirl_islands_collision.bin differ diff --git a/tilesets/whirl_islands_metatiles.bin b/tilesets/whirl_islands_metatiles.bin new file mode 100644 index 000000000..a41b5b080 --- /dev/null +++ b/tilesets/whirl_islands_metatiles.bin @@ -0,0 +1,6 @@ +$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&' +& +&  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&&  +& +67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&  +&&& \ No newline at end of file diff --git a/tilesets/whirl_islands_palette_map.asm b/tilesets/whirl_islands_palette_map.asm new file mode 100644 index 000000000..73c09ebe5 --- /dev/null +++ b/tilesets/whirl_islands_palette_map.asm @@ -0,0 +1,29 @@ + tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN + tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + +rept 16 + db $ff +endr + + tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN + tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY + tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY + tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY + tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY -- cgit v1.2.3