From 08b14e593e07555c8d3a445d78d9bcb82a10ddf3 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Sun, 10 Dec 2017 23:42:15 -0500
Subject: [PATCH] Rename tilesets, consistent with constant names

---
 constants/tilemap_constants.asm               |   8 +-
 data/sprite_engine.asm                        |   2 +-
 gfx/tilesets/01.2bpp.lz.0c7e555a              | Bin 3080 -> 0 bytes
 gfx/tilesets/01.png                           | Bin 2084 -> 0 bytes
 ... => aerodactyl_word_room.2bpp.lz.8b42470b} | Bin
 .../{26.png => aerodactyl_word_room.png}      | Bin
 ...467b6a2d => battle_tower.2bpp.lz.467b6a2d} | Bin
 gfx/tilesets/{22.png => battle_tower.png}     | Bin
 ... => battle_tower_outside.2bpp.lz.391603fb} | Bin
 .../{02.png => battle_tower_outside.png}      | Bin
 ...42470b => beta_word_room.2bpp.lz.8b42470b} | Bin
 gfx/tilesets/{32.png => beta_word_room.png}   | Bin
 ...2bpp.lz.3437812a => cave.2bpp.lz.3437812a} | Bin
 gfx/tilesets/{24.png => cave.png}             | Bin
 ...414d4 => celadon_mansion.2bpp.lz.63b414d4} | Bin
 gfx/tilesets/{13.png => celadon_mansion.png}  | Bin
 ....71d29a2f => game_corner.2bpp.lz.71d29a2f} | Bin
 gfx/tilesets/{14.png => game_corner.png}      | Bin
 ...2bpp.lz.f5a55006 => gate.2bpp.lz.f5a55006} | Bin
 gfx/tilesets/{08.png => gate.png}             | Bin
 ...bpp.lz.c1f2ed8f => gym_1.2bpp.lz.c1f2ed8f} | Bin
 gfx/tilesets/{15.png => gym_1.png}            | Bin
 ...2470b => ho_oh_word_room.2bpp.lz.8b42470b} | Bin
 gfx/tilesets/{33.png => ho_oh_word_room.png}  | Bin
 ...p.lz.c848ef13 => house_1.2bpp.lz.c848ef13} | Bin
 gfx/tilesets/{05.png => house_1.png}          | Bin
 ....lz.e23bc89f => ice_path.2bpp.lz.e23bc89f} | Bin
 gfx/tilesets/{29.png => ice_path.png}         | Bin
 ....6b0ac896 => ilex_forest.2bpp.lz.6b0ac896} | Bin
 gfx/tilesets/{31.png => ilex_forest.png}      | Bin
 ...p.lz.0c7e555a => johto_1.2bpp.lz.0c7e555a} | Bin
 gfx/tilesets/{00.png => johto_1.png}          | Bin
 ...p.lz.391603fb => johto_2.2bpp.lz.391603fb} | Bin
 gfx/tilesets/{04.png => johto_2.png}          | Bin
 ...470b => kabuto_word_room.2bpp.lz.8b42470b} | Bin
 gfx/tilesets/{34.png => kabuto_word_room.png} | Bin
 ...bpp.lz.a29f5d51 => kanto.2bpp.lz.a29f5d51} | Bin
 gfx/tilesets/{03.png => kanto.png}            | Bin
 ....dd51d079 => kurts_house.2bpp.lz.dd51d079} | Bin
 gfx/tilesets/{16.png => kurts_house.png}      | Bin
 ....2bpp.lz.b8d0f547 => lab.2bpp.lz.b8d0f547} | Bin
 gfx/tilesets/{10.png => lab.png}              | Bin
 ...z.0c1544c1 => lighthouse.2bpp.lz.0c1544c1} | Bin
 gfx/tilesets/{19.png => lighthouse.png}       | Bin
 ...2bpp.lz.e2e94f92 => mart.2bpp.lz.e2e94f92} | Bin
 gfx/tilesets/{12.png => mart.png}             | Bin
 ....93800351 => olivine_gym.2bpp.lz.93800351} | Bin
 gfx/tilesets/{18.png => olivine_gym.png}      | Bin
 ...70b => omanyte_word_room.2bpp.lz.8b42470b} | Bin
 .../{35.png => omanyte_word_room.png}         | Bin
 ...2bpp.lz.7fcb81d6 => park.2bpp.lz.7fcb81d6} | Bin
 gfx/tilesets/{25.png => park.png}             | Bin
 ...52cbd8f => players_house.2bpp.lz.252cbd8f} | Bin
 gfx/tilesets/{06.png => players_house.png}    | Bin
 ...1007 => players_house_2f.2bpp.lz.35e51007} | Bin
 gfx/tilesets/{20.png => players_house_2f.png} | Bin
 ...z.e1c4014c => pokecenter.2bpp.lz.e1c4014c} | Bin
 gfx/tilesets/{07.png => pokecenter.png}       | Bin
 ...bbc4ec => pokecom_center.2bpp.lz.febbc4ec} | Bin
 gfx/tilesets/{21.png => pokecom_center.png}   | Bin
 ...2bpp.lz.56b1a405 => port.2bpp.lz.56b1a405} | Bin
 gfx/tilesets/{09.png => port.png}             | Bin
 ....454cfd8b => power_plant.2bpp.lz.454cfd8b} | Bin
 gfx/tilesets/{11.png => power_plant.png}      | Bin
 ....27cdd9ad => radio_tower.2bpp.lz.27cdd9ad} | Bin
 gfx/tilesets/{27.png => radio_tower.png}      | Bin
 ...b42470b => ruins_of_alph.2bpp.lz.8b42470b} | Bin
 gfx/tilesets/{36.png => ruins_of_alph.png}    | Bin
 ...bc56789c => sprout_tower.2bpp.lz.bc56789c} | Bin
 gfx/tilesets/{23.png => sprout_tower.png}     | Bin
 ...600ca86 => train_station.2bpp.lz.1600ca86} | Bin
 gfx/tilesets/{17.png => train_station.png}    | Bin
 ....cace291c => underground.2bpp.lz.cace291c} | Bin
 gfx/tilesets/{28.png => underground.png}      | Bin
 ...5b9c4b6 => whirl_islands.2bpp.lz.25b9c4b6} | Bin
 gfx/tilesets/{30.png => whirl_islands.png}    | Bin
 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/01_palette_map.asm                   |  29 --
 ...bin => aerodactyl_word_room_collision.bin} | Bin
 ...bin => aerodactyl_word_room_metatiles.bin} |   0
 ...m => aerodactyl_word_room_palette_map.asm} |   0
 tilesets/animations.asm                       |  74 +--
 ...llision.bin => battle_tower_collision.bin} | Bin
 ...tatiles.bin => battle_tower_metatiles.bin} | Bin
 ...bin => battle_tower_outside_collision.bin} | Bin
 ...bin => battle_tower_outside_metatiles.bin} | Bin
 ...m => battle_tower_outside_palette_map.asm} |   0
 ...e_map.asm => battle_tower_palette_map.asm} |   0
 ...ision.bin => beta_word_room_collision.bin} | Bin
 ...tiles.bin => beta_word_room_metatiles.bin} |   0
 ...map.asm => beta_word_room_palette_map.asm} |   0
 .../{24_collision.bin => cave_collision.bin}  | Bin
 .../{24_metatiles.bin => cave_metatiles.bin}  |   0
 ...4_palette_map.asm => cave_palette_map.asm} |   0
 ...sion.bin => celadon_mansion_collision.bin} | Bin
 ...iles.bin => celadon_mansion_metatiles.bin} |   0
 ...ap.asm => celadon_mansion_palette_map.asm} |   0
 tilesets/data.asm                             | 422 +++++++++---------
 ...ollision.bin => game_corner_collision.bin} | Bin
 ...etatiles.bin => game_corner_metatiles.bin} | Bin
 ...te_map.asm => game_corner_palette_map.asm} |   0
 .../{08_collision.bin => gate_collision.bin}  | Bin
 .../{08_metatiles.bin => gate_metatiles.bin}  | Bin
 ...8_palette_map.asm => gate_palette_map.asm} |   0
 .../{15_collision.bin => gym_1_collision.bin} | Bin
 .../{15_metatiles.bin => gym_1_metatiles.bin} | Bin
 ..._palette_map.asm => gym_1_palette_map.asm} |   0
 ...sion.bin => ho_oh_word_room_collision.bin} | Bin
 ...iles.bin => ho_oh_word_room_metatiles.bin} |   0
 ...ap.asm => ho_oh_word_room_palette_map.asm} |   0
 ...05_collision.bin => house_1_collision.bin} | Bin
 ...05_metatiles.bin => house_1_metatiles.bin} | Bin
 ...alette_map.asm => house_1_palette_map.asm} |   0
 ...9_collision.bin => ice_path_collision.bin} | Bin
 ...9_metatiles.bin => ice_path_metatiles.bin} |   0
 ...lette_map.asm => ice_path_palette_map.asm} |   0
 ...ollision.bin => ilex_forest_collision.bin} | Bin
 ...etatiles.bin => ilex_forest_metatiles.bin} |   0
 ...te_map.asm => ilex_forest_palette_map.asm} |   0
 ...01_collision.bin => johto_1_collision.bin} | Bin
 ...01_metatiles.bin => johto_1_metatiles.bin} | Bin
 ...alette_map.asm => johto_1_palette_map.asm} |   0
 ...02_collision.bin => johto_2_collision.bin} | Bin
 ...02_metatiles.bin => johto_2_metatiles.bin} | Bin
 ...alette_map.asm => johto_2_palette_map.asm} |   0
 ...ion.bin => kabuto_word_room_collision.bin} | Bin
 ...les.bin => kabuto_word_room_metatiles.bin} |   0
 ...p.asm => kabuto_word_room_palette_map.asm} |   0
 .../{03_collision.bin => kanto_collision.bin} | Bin
 .../{03_metatiles.bin => kanto_metatiles.bin} | Bin
 ..._palette_map.asm => kanto_palette_map.asm} |   0
 ...ollision.bin => kurts_house_collision.bin} | Bin
 ...etatiles.bin => kurts_house_metatiles.bin} | Bin
 ...te_map.asm => kurts_house_palette_map.asm} |   0
 .../{10_collision.bin => lab_collision.bin}   | Bin
 .../{10_metatiles.bin => lab_metatiles.bin}   | Bin
 ...10_palette_map.asm => lab_palette_map.asm} |   0
 ...collision.bin => lighthouse_collision.bin} | Bin
 ...metatiles.bin => lighthouse_metatiles.bin} | Bin
 ...tte_map.asm => lighthouse_palette_map.asm} |   0
 .../{12_collision.bin => mart_collision.bin}  | Bin
 .../{12_metatiles.bin => mart_metatiles.bin}  |   0
 ...2_palette_map.asm => mart_palette_map.asm} |   0
 ...ollision.bin => olivine_gym_collision.bin} | Bin
 ...etatiles.bin => olivine_gym_metatiles.bin} |   0
 ...te_map.asm => olivine_gym_palette_map.asm} |   0
 ...on.bin => omanyte_word_room_collision.bin} | Bin
 ...es.bin => omanyte_word_room_metatiles.bin} |   0
 ....asm => omanyte_word_room_palette_map.asm} |   0
 tilesets/palette_maps.asm                     | 134 +++---
 .../{25_collision.bin => park_collision.bin}  | Bin
 .../{25_metatiles.bin => park_metatiles.bin}  | Bin
 ...5_palette_map.asm => park_palette_map.asm} |   0
 ...ion.bin => players_house_2f_collision.bin} | Bin
 ...les.bin => players_house_2f_metatiles.bin} | Bin
 ...p.asm => players_house_2f_palette_map.asm} |   0
 ...lision.bin => players_house_collision.bin} | Bin
 ...atiles.bin => players_house_metatiles.bin} | Bin
 ..._map.asm => players_house_palette_map.asm} |   0
 ...collision.bin => pokecenter_collision.bin} | Bin
 ...metatiles.bin => pokecenter_metatiles.bin} | Bin
 ...tte_map.asm => pokecenter_palette_map.asm} |   0
 ...ision.bin => pokecom_center_collision.bin} | Bin
 ...tiles.bin => pokecom_center_metatiles.bin} |   0
 ...map.asm => pokecom_center_palette_map.asm} |   0
 .../{09_collision.bin => port_collision.bin}  | Bin
 .../{09_metatiles.bin => port_metatiles.bin}  |   0
 ...9_palette_map.asm => port_palette_map.asm} |   0
 ...ollision.bin => power_plant_collision.bin} | Bin
 ...etatiles.bin => power_plant_metatiles.bin} |   0
 ...te_map.asm => power_plant_palette_map.asm} |   0
 ...ollision.bin => radio_tower_collision.bin} | Bin
 ...etatiles.bin => radio_tower_metatiles.bin} | Bin
 ...te_map.asm => radio_tower_palette_map.asm} |   0
 ...lision.bin => ruins_of_alph_collision.bin} | Bin
 ...atiles.bin => ruins_of_alph_metatiles.bin} | Bin
 ..._map.asm => ruins_of_alph_palette_map.asm} |   0
 ...llision.bin => sprout_tower_collision.bin} | Bin
 ...tatiles.bin => sprout_tower_metatiles.bin} |   0
 ...e_map.asm => sprout_tower_palette_map.asm} |   0
 tilesets/tileset_headers.asm                  |  78 ++--
 ...lision.bin => train_station_collision.bin} | Bin
 ...atiles.bin => train_station_metatiles.bin} | Bin
 ..._map.asm => train_station_palette_map.asm} |   0
 ...ollision.bin => underground_collision.bin} | Bin
 ...etatiles.bin => underground_metatiles.bin} |   0
 ...te_map.asm => underground_palette_map.asm} |   0
 ...bin => unused_whirl_islands_collision.bin} | Bin
 ...bin => unused_whirl_islands_metatiles.bin} | Bin
 ...lision.bin => whirl_islands_collision.bin} | Bin
 ...atiles.bin => whirl_islands_metatiles.bin} |   0
 ..._map.asm => whirl_islands_palette_map.asm} |   0
 195 files changed, 378 insertions(+), 407 deletions(-)
 delete mode 100644 gfx/tilesets/01.2bpp.lz.0c7e555a
 delete mode 100644 gfx/tilesets/01.png
 rename gfx/tilesets/{26.2bpp.lz.8b42470b => aerodactyl_word_room.2bpp.lz.8b42470b} (100%)
 rename gfx/tilesets/{26.png => aerodactyl_word_room.png} (100%)
 rename gfx/tilesets/{22.2bpp.lz.467b6a2d => battle_tower.2bpp.lz.467b6a2d} (100%)
 rename gfx/tilesets/{22.png => battle_tower.png} (100%)
 rename gfx/tilesets/{02.2bpp.lz.391603fb => battle_tower_outside.2bpp.lz.391603fb} (100%)
 rename gfx/tilesets/{02.png => battle_tower_outside.png} (100%)
 rename gfx/tilesets/{32.2bpp.lz.8b42470b => beta_word_room.2bpp.lz.8b42470b} (100%)
 rename gfx/tilesets/{32.png => beta_word_room.png} (100%)
 rename gfx/tilesets/{24.2bpp.lz.3437812a => cave.2bpp.lz.3437812a} (100%)
 rename gfx/tilesets/{24.png => cave.png} (100%)
 rename gfx/tilesets/{13.2bpp.lz.63b414d4 => celadon_mansion.2bpp.lz.63b414d4} (100%)
 rename gfx/tilesets/{13.png => celadon_mansion.png} (100%)
 rename gfx/tilesets/{14.2bpp.lz.71d29a2f => game_corner.2bpp.lz.71d29a2f} (100%)
 rename gfx/tilesets/{14.png => game_corner.png} (100%)
 rename gfx/tilesets/{08.2bpp.lz.f5a55006 => gate.2bpp.lz.f5a55006} (100%)
 rename gfx/tilesets/{08.png => gate.png} (100%)
 rename gfx/tilesets/{15.2bpp.lz.c1f2ed8f => gym_1.2bpp.lz.c1f2ed8f} (100%)
 rename gfx/tilesets/{15.png => gym_1.png} (100%)
 rename gfx/tilesets/{33.2bpp.lz.8b42470b => ho_oh_word_room.2bpp.lz.8b42470b} (100%)
 rename gfx/tilesets/{33.png => ho_oh_word_room.png} (100%)
 rename gfx/tilesets/{05.2bpp.lz.c848ef13 => house_1.2bpp.lz.c848ef13} (100%)
 rename gfx/tilesets/{05.png => house_1.png} (100%)
 rename gfx/tilesets/{29.2bpp.lz.e23bc89f => ice_path.2bpp.lz.e23bc89f} (100%)
 rename gfx/tilesets/{29.png => ice_path.png} (100%)
 rename gfx/tilesets/{31.2bpp.lz.6b0ac896 => ilex_forest.2bpp.lz.6b0ac896} (100%)
 rename gfx/tilesets/{31.png => ilex_forest.png} (100%)
 rename gfx/tilesets/{00.2bpp.lz.0c7e555a => johto_1.2bpp.lz.0c7e555a} (100%)
 rename gfx/tilesets/{00.png => johto_1.png} (100%)
 rename gfx/tilesets/{04.2bpp.lz.391603fb => johto_2.2bpp.lz.391603fb} (100%)
 rename gfx/tilesets/{04.png => johto_2.png} (100%)
 rename gfx/tilesets/{34.2bpp.lz.8b42470b => kabuto_word_room.2bpp.lz.8b42470b} (100%)
 rename gfx/tilesets/{34.png => kabuto_word_room.png} (100%)
 rename gfx/tilesets/{03.2bpp.lz.a29f5d51 => kanto.2bpp.lz.a29f5d51} (100%)
 rename gfx/tilesets/{03.png => kanto.png} (100%)
 rename gfx/tilesets/{16.2bpp.lz.dd51d079 => kurts_house.2bpp.lz.dd51d079} (100%)
 rename gfx/tilesets/{16.png => kurts_house.png} (100%)
 rename gfx/tilesets/{10.2bpp.lz.b8d0f547 => lab.2bpp.lz.b8d0f547} (100%)
 rename gfx/tilesets/{10.png => lab.png} (100%)
 rename gfx/tilesets/{19.2bpp.lz.0c1544c1 => lighthouse.2bpp.lz.0c1544c1} (100%)
 rename gfx/tilesets/{19.png => lighthouse.png} (100%)
 rename gfx/tilesets/{12.2bpp.lz.e2e94f92 => mart.2bpp.lz.e2e94f92} (100%)
 rename gfx/tilesets/{12.png => mart.png} (100%)
 rename gfx/tilesets/{18.2bpp.lz.93800351 => olivine_gym.2bpp.lz.93800351} (100%)
 rename gfx/tilesets/{18.png => olivine_gym.png} (100%)
 rename gfx/tilesets/{35.2bpp.lz.8b42470b => omanyte_word_room.2bpp.lz.8b42470b} (100%)
 rename gfx/tilesets/{35.png => omanyte_word_room.png} (100%)
 rename gfx/tilesets/{25.2bpp.lz.7fcb81d6 => park.2bpp.lz.7fcb81d6} (100%)
 rename gfx/tilesets/{25.png => park.png} (100%)
 rename gfx/tilesets/{06.2bpp.lz.252cbd8f => players_house.2bpp.lz.252cbd8f} (100%)
 rename gfx/tilesets/{06.png => players_house.png} (100%)
 rename gfx/tilesets/{20.2bpp.lz.35e51007 => players_house_2f.2bpp.lz.35e51007} (100%)
 rename gfx/tilesets/{20.png => players_house_2f.png} (100%)
 rename gfx/tilesets/{07.2bpp.lz.e1c4014c => pokecenter.2bpp.lz.e1c4014c} (100%)
 rename gfx/tilesets/{07.png => pokecenter.png} (100%)
 rename gfx/tilesets/{21.2bpp.lz.febbc4ec => pokecom_center.2bpp.lz.febbc4ec} (100%)
 rename gfx/tilesets/{21.png => pokecom_center.png} (100%)
 rename gfx/tilesets/{09.2bpp.lz.56b1a405 => port.2bpp.lz.56b1a405} (100%)
 rename gfx/tilesets/{09.png => port.png} (100%)
 rename gfx/tilesets/{11.2bpp.lz.454cfd8b => power_plant.2bpp.lz.454cfd8b} (100%)
 rename gfx/tilesets/{11.png => power_plant.png} (100%)
 rename gfx/tilesets/{27.2bpp.lz.27cdd9ad => radio_tower.2bpp.lz.27cdd9ad} (100%)
 rename gfx/tilesets/{27.png => radio_tower.png} (100%)
 rename gfx/tilesets/{36.2bpp.lz.8b42470b => ruins_of_alph.2bpp.lz.8b42470b} (100%)
 rename gfx/tilesets/{36.png => ruins_of_alph.png} (100%)
 rename gfx/tilesets/{23.2bpp.lz.bc56789c => sprout_tower.2bpp.lz.bc56789c} (100%)
 rename gfx/tilesets/{23.png => sprout_tower.png} (100%)
 rename gfx/tilesets/{17.2bpp.lz.1600ca86 => train_station.2bpp.lz.1600ca86} (100%)
 rename gfx/tilesets/{17.png => train_station.png} (100%)
 rename gfx/tilesets/{28.2bpp.lz.cace291c => underground.2bpp.lz.cace291c} (100%)
 rename gfx/tilesets/{28.png => underground.png} (100%)
 rename gfx/tilesets/{30.2bpp.lz.25b9c4b6 => whirl_islands.2bpp.lz.25b9c4b6} (100%)
 rename gfx/tilesets/{30.png => whirl_islands.png} (100%)
 delete mode 100644 tilesets/00_collision.bin
 delete mode 100644 tilesets/00_metatiles.bin
 delete mode 100644 tilesets/01_palette_map.asm
 rename tilesets/{32_collision.bin => aerodactyl_word_room_collision.bin} (100%)
 rename tilesets/{36_metatiles.bin => aerodactyl_word_room_metatiles.bin} (100%)
 rename tilesets/{26_palette_map.asm => aerodactyl_word_room_palette_map.asm} (100%)
 rename tilesets/{22_collision.bin => battle_tower_collision.bin} (100%)
 rename tilesets/{22_metatiles.bin => battle_tower_metatiles.bin} (100%)
 rename tilesets/{04_collision.bin => battle_tower_outside_collision.bin} (100%)
 rename tilesets/{04_metatiles.bin => battle_tower_outside_metatiles.bin} (100%)
 rename tilesets/{04_palette_map.asm => battle_tower_outside_palette_map.asm} (100%)
 rename tilesets/{22_palette_map.asm => battle_tower_palette_map.asm} (100%)
 rename tilesets/{33_collision.bin => beta_word_room_collision.bin} (100%)
 rename tilesets/{32_metatiles.bin => beta_word_room_metatiles.bin} (100%)
 rename tilesets/{32_palette_map.asm => beta_word_room_palette_map.asm} (100%)
 rename tilesets/{24_collision.bin => cave_collision.bin} (100%)
 rename tilesets/{24_metatiles.bin => cave_metatiles.bin} (100%)
 rename tilesets/{24_palette_map.asm => cave_palette_map.asm} (100%)
 rename tilesets/{13_collision.bin => celadon_mansion_collision.bin} (100%)
 rename tilesets/{13_metatiles.bin => celadon_mansion_metatiles.bin} (100%)
 rename tilesets/{13_palette_map.asm => celadon_mansion_palette_map.asm} (100%)
 rename tilesets/{14_collision.bin => game_corner_collision.bin} (100%)
 rename tilesets/{14_metatiles.bin => game_corner_metatiles.bin} (100%)
 rename tilesets/{14_palette_map.asm => game_corner_palette_map.asm} (100%)
 rename tilesets/{08_collision.bin => gate_collision.bin} (100%)
 rename tilesets/{08_metatiles.bin => gate_metatiles.bin} (100%)
 rename tilesets/{08_palette_map.asm => gate_palette_map.asm} (100%)
 rename tilesets/{15_collision.bin => gym_1_collision.bin} (100%)
 rename tilesets/{15_metatiles.bin => gym_1_metatiles.bin} (100%)
 rename tilesets/{15_palette_map.asm => gym_1_palette_map.asm} (100%)
 rename tilesets/{34_collision.bin => ho_oh_word_room_collision.bin} (100%)
 rename tilesets/{33_metatiles.bin => ho_oh_word_room_metatiles.bin} (100%)
 rename tilesets/{33_palette_map.asm => ho_oh_word_room_palette_map.asm} (100%)
 rename tilesets/{05_collision.bin => house_1_collision.bin} (100%)
 rename tilesets/{05_metatiles.bin => house_1_metatiles.bin} (100%)
 rename tilesets/{05_palette_map.asm => house_1_palette_map.asm} (100%)
 rename tilesets/{29_collision.bin => ice_path_collision.bin} (100%)
 rename tilesets/{29_metatiles.bin => ice_path_metatiles.bin} (100%)
 rename tilesets/{29_palette_map.asm => ice_path_palette_map.asm} (100%)
 rename tilesets/{31_collision.bin => ilex_forest_collision.bin} (100%)
 rename tilesets/{31_metatiles.bin => ilex_forest_metatiles.bin} (100%)
 rename tilesets/{31_palette_map.asm => ilex_forest_palette_map.asm} (100%)
 rename tilesets/{01_collision.bin => johto_1_collision.bin} (100%)
 rename tilesets/{01_metatiles.bin => johto_1_metatiles.bin} (100%)
 rename tilesets/{00_palette_map.asm => johto_1_palette_map.asm} (100%)
 mode change 100755 => 100644
 rename tilesets/{02_collision.bin => johto_2_collision.bin} (100%)
 rename tilesets/{02_metatiles.bin => johto_2_metatiles.bin} (100%)
 rename tilesets/{02_palette_map.asm => johto_2_palette_map.asm} (100%)
 rename tilesets/{35_collision.bin => kabuto_word_room_collision.bin} (100%)
 rename tilesets/{34_metatiles.bin => kabuto_word_room_metatiles.bin} (100%)
 rename tilesets/{34_palette_map.asm => kabuto_word_room_palette_map.asm} (100%)
 rename tilesets/{03_collision.bin => kanto_collision.bin} (100%)
 rename tilesets/{03_metatiles.bin => kanto_metatiles.bin} (100%)
 rename tilesets/{03_palette_map.asm => kanto_palette_map.asm} (100%)
 rename tilesets/{16_collision.bin => kurts_house_collision.bin} (100%)
 rename tilesets/{16_metatiles.bin => kurts_house_metatiles.bin} (100%)
 rename tilesets/{16_palette_map.asm => kurts_house_palette_map.asm} (100%)
 rename tilesets/{10_collision.bin => lab_collision.bin} (100%)
 rename tilesets/{10_metatiles.bin => lab_metatiles.bin} (100%)
 rename tilesets/{10_palette_map.asm => lab_palette_map.asm} (100%)
 rename tilesets/{19_collision.bin => lighthouse_collision.bin} (100%)
 rename tilesets/{19_metatiles.bin => lighthouse_metatiles.bin} (100%)
 rename tilesets/{19_palette_map.asm => lighthouse_palette_map.asm} (100%)
 rename tilesets/{12_collision.bin => mart_collision.bin} (100%)
 rename tilesets/{12_metatiles.bin => mart_metatiles.bin} (100%)
 rename tilesets/{12_palette_map.asm => mart_palette_map.asm} (100%)
 rename tilesets/{18_collision.bin => olivine_gym_collision.bin} (100%)
 rename tilesets/{18_metatiles.bin => olivine_gym_metatiles.bin} (100%)
 rename tilesets/{18_palette_map.asm => olivine_gym_palette_map.asm} (100%)
 rename tilesets/{36_collision.bin => omanyte_word_room_collision.bin} (100%)
 rename tilesets/{35_metatiles.bin => omanyte_word_room_metatiles.bin} (100%)
 rename tilesets/{35_palette_map.asm => omanyte_word_room_palette_map.asm} (100%)
 rename tilesets/{25_collision.bin => park_collision.bin} (100%)
 rename tilesets/{25_metatiles.bin => park_metatiles.bin} (100%)
 rename tilesets/{25_palette_map.asm => park_palette_map.asm} (100%)
 rename tilesets/{20_collision.bin => players_house_2f_collision.bin} (100%)
 rename tilesets/{20_metatiles.bin => players_house_2f_metatiles.bin} (100%)
 rename tilesets/{20_palette_map.asm => players_house_2f_palette_map.asm} (100%)
 rename tilesets/{06_collision.bin => players_house_collision.bin} (100%)
 rename tilesets/{06_metatiles.bin => players_house_metatiles.bin} (100%)
 rename tilesets/{06_palette_map.asm => players_house_palette_map.asm} (100%)
 rename tilesets/{07_collision.bin => pokecenter_collision.bin} (100%)
 rename tilesets/{07_metatiles.bin => pokecenter_metatiles.bin} (100%)
 rename tilesets/{07_palette_map.asm => pokecenter_palette_map.asm} (100%)
 rename tilesets/{21_collision.bin => pokecom_center_collision.bin} (100%)
 rename tilesets/{21_metatiles.bin => pokecom_center_metatiles.bin} (100%)
 rename tilesets/{21_palette_map.asm => pokecom_center_palette_map.asm} (100%)
 rename tilesets/{09_collision.bin => port_collision.bin} (100%)
 rename tilesets/{09_metatiles.bin => port_metatiles.bin} (100%)
 rename tilesets/{09_palette_map.asm => port_palette_map.asm} (100%)
 rename tilesets/{11_collision.bin => power_plant_collision.bin} (100%)
 rename tilesets/{11_metatiles.bin => power_plant_metatiles.bin} (100%)
 rename tilesets/{11_palette_map.asm => power_plant_palette_map.asm} (100%)
 rename tilesets/{27_collision.bin => radio_tower_collision.bin} (100%)
 rename tilesets/{27_metatiles.bin => radio_tower_metatiles.bin} (100%)
 rename tilesets/{27_palette_map.asm => radio_tower_palette_map.asm} (100%)
 rename tilesets/{26_collision.bin => ruins_of_alph_collision.bin} (100%)
 rename tilesets/{26_metatiles.bin => ruins_of_alph_metatiles.bin} (100%)
 rename tilesets/{36_palette_map.asm => ruins_of_alph_palette_map.asm} (100%)
 rename tilesets/{23_collision.bin => sprout_tower_collision.bin} (100%)
 rename tilesets/{23_metatiles.bin => sprout_tower_metatiles.bin} (100%)
 rename tilesets/{23_palette_map.asm => sprout_tower_palette_map.asm} (100%)
 rename tilesets/{17_collision.bin => train_station_collision.bin} (100%)
 rename tilesets/{17_metatiles.bin => train_station_metatiles.bin} (100%)
 rename tilesets/{17_palette_map.asm => train_station_palette_map.asm} (100%)
 rename tilesets/{28_collision.bin => underground_collision.bin} (100%)
 rename tilesets/{28_metatiles.bin => underground_metatiles.bin} (100%)
 rename tilesets/{28_palette_map.asm => underground_palette_map.asm} (100%)
 rename tilesets/{unused_30_collision.bin => unused_whirl_islands_collision.bin} (100%)
 rename tilesets/{unused_30_metatiles.bin => unused_whirl_islands_metatiles.bin} (100%)
 rename tilesets/{30_collision.bin => whirl_islands_collision.bin} (100%)
 rename tilesets/{30_metatiles.bin => whirl_islands_metatiles.bin} (100%)
 rename tilesets/{30_palette_map.asm => whirl_islands_palette_map.asm} (100%)

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/01.2bpp.lz.0c7e555a b/gfx/tilesets/01.2bpp.lz.0c7e555a
deleted file mode 100644
index 9821e1433a2ae8f69555999336c51936a0407568..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3080
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

diff --git a/gfx/tilesets/01.png b/gfx/tilesets/01.png
deleted file mode 100644
index 0fc2db12fd791d8a5782d074eb259eec2be78ab9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2084
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
O0000<MNUMnLSTZsj{D{S

diff --git a/gfx/tilesets/26.2bpp.lz.8b42470b b/gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/26.2bpp.lz.8b42470b
rename to gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/26.png b/gfx/tilesets/aerodactyl_word_room.png
similarity index 100%
rename from gfx/tilesets/26.png
rename to gfx/tilesets/aerodactyl_word_room.png
diff --git a/gfx/tilesets/22.2bpp.lz.467b6a2d b/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d
similarity index 100%
rename from gfx/tilesets/22.2bpp.lz.467b6a2d
rename to gfx/tilesets/battle_tower.2bpp.lz.467b6a2d
diff --git a/gfx/tilesets/22.png b/gfx/tilesets/battle_tower.png
similarity index 100%
rename from gfx/tilesets/22.png
rename to gfx/tilesets/battle_tower.png
diff --git a/gfx/tilesets/02.2bpp.lz.391603fb b/gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb
similarity index 100%
rename from gfx/tilesets/02.2bpp.lz.391603fb
rename to gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb
diff --git a/gfx/tilesets/02.png b/gfx/tilesets/battle_tower_outside.png
similarity index 100%
rename from gfx/tilesets/02.png
rename to gfx/tilesets/battle_tower_outside.png
diff --git a/gfx/tilesets/32.2bpp.lz.8b42470b b/gfx/tilesets/beta_word_room.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/32.2bpp.lz.8b42470b
rename to gfx/tilesets/beta_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/32.png b/gfx/tilesets/beta_word_room.png
similarity index 100%
rename from gfx/tilesets/32.png
rename to gfx/tilesets/beta_word_room.png
diff --git a/gfx/tilesets/24.2bpp.lz.3437812a b/gfx/tilesets/cave.2bpp.lz.3437812a
similarity index 100%
rename from gfx/tilesets/24.2bpp.lz.3437812a
rename to gfx/tilesets/cave.2bpp.lz.3437812a
diff --git a/gfx/tilesets/24.png b/gfx/tilesets/cave.png
similarity index 100%
rename from gfx/tilesets/24.png
rename to gfx/tilesets/cave.png
diff --git a/gfx/tilesets/13.2bpp.lz.63b414d4 b/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4
similarity index 100%
rename from gfx/tilesets/13.2bpp.lz.63b414d4
rename to gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4
diff --git a/gfx/tilesets/13.png b/gfx/tilesets/celadon_mansion.png
similarity index 100%
rename from gfx/tilesets/13.png
rename to gfx/tilesets/celadon_mansion.png
diff --git a/gfx/tilesets/14.2bpp.lz.71d29a2f b/gfx/tilesets/game_corner.2bpp.lz.71d29a2f
similarity index 100%
rename from gfx/tilesets/14.2bpp.lz.71d29a2f
rename to gfx/tilesets/game_corner.2bpp.lz.71d29a2f
diff --git a/gfx/tilesets/14.png b/gfx/tilesets/game_corner.png
similarity index 100%
rename from gfx/tilesets/14.png
rename to gfx/tilesets/game_corner.png
diff --git a/gfx/tilesets/08.2bpp.lz.f5a55006 b/gfx/tilesets/gate.2bpp.lz.f5a55006
similarity index 100%
rename from gfx/tilesets/08.2bpp.lz.f5a55006
rename to gfx/tilesets/gate.2bpp.lz.f5a55006
diff --git a/gfx/tilesets/08.png b/gfx/tilesets/gate.png
similarity index 100%
rename from gfx/tilesets/08.png
rename to gfx/tilesets/gate.png
diff --git a/gfx/tilesets/15.2bpp.lz.c1f2ed8f b/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f
similarity index 100%
rename from gfx/tilesets/15.2bpp.lz.c1f2ed8f
rename to gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f
diff --git a/gfx/tilesets/15.png b/gfx/tilesets/gym_1.png
similarity index 100%
rename from gfx/tilesets/15.png
rename to gfx/tilesets/gym_1.png
diff --git a/gfx/tilesets/33.2bpp.lz.8b42470b b/gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/33.2bpp.lz.8b42470b
rename to gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/33.png b/gfx/tilesets/ho_oh_word_room.png
similarity index 100%
rename from gfx/tilesets/33.png
rename to gfx/tilesets/ho_oh_word_room.png
diff --git a/gfx/tilesets/05.2bpp.lz.c848ef13 b/gfx/tilesets/house_1.2bpp.lz.c848ef13
similarity index 100%
rename from gfx/tilesets/05.2bpp.lz.c848ef13
rename to gfx/tilesets/house_1.2bpp.lz.c848ef13
diff --git a/gfx/tilesets/05.png b/gfx/tilesets/house_1.png
similarity index 100%
rename from gfx/tilesets/05.png
rename to gfx/tilesets/house_1.png
diff --git a/gfx/tilesets/29.2bpp.lz.e23bc89f b/gfx/tilesets/ice_path.2bpp.lz.e23bc89f
similarity index 100%
rename from gfx/tilesets/29.2bpp.lz.e23bc89f
rename to gfx/tilesets/ice_path.2bpp.lz.e23bc89f
diff --git a/gfx/tilesets/29.png b/gfx/tilesets/ice_path.png
similarity index 100%
rename from gfx/tilesets/29.png
rename to gfx/tilesets/ice_path.png
diff --git a/gfx/tilesets/31.2bpp.lz.6b0ac896 b/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896
similarity index 100%
rename from gfx/tilesets/31.2bpp.lz.6b0ac896
rename to gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896
diff --git a/gfx/tilesets/31.png b/gfx/tilesets/ilex_forest.png
similarity index 100%
rename from gfx/tilesets/31.png
rename to gfx/tilesets/ilex_forest.png
diff --git a/gfx/tilesets/00.2bpp.lz.0c7e555a b/gfx/tilesets/johto_1.2bpp.lz.0c7e555a
similarity index 100%
rename from gfx/tilesets/00.2bpp.lz.0c7e555a
rename to gfx/tilesets/johto_1.2bpp.lz.0c7e555a
diff --git a/gfx/tilesets/00.png b/gfx/tilesets/johto_1.png
similarity index 100%
rename from gfx/tilesets/00.png
rename to gfx/tilesets/johto_1.png
diff --git a/gfx/tilesets/04.2bpp.lz.391603fb b/gfx/tilesets/johto_2.2bpp.lz.391603fb
similarity index 100%
rename from gfx/tilesets/04.2bpp.lz.391603fb
rename to gfx/tilesets/johto_2.2bpp.lz.391603fb
diff --git a/gfx/tilesets/04.png b/gfx/tilesets/johto_2.png
similarity index 100%
rename from gfx/tilesets/04.png
rename to gfx/tilesets/johto_2.png
diff --git a/gfx/tilesets/34.2bpp.lz.8b42470b b/gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/34.2bpp.lz.8b42470b
rename to gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/34.png b/gfx/tilesets/kabuto_word_room.png
similarity index 100%
rename from gfx/tilesets/34.png
rename to gfx/tilesets/kabuto_word_room.png
diff --git a/gfx/tilesets/03.2bpp.lz.a29f5d51 b/gfx/tilesets/kanto.2bpp.lz.a29f5d51
similarity index 100%
rename from gfx/tilesets/03.2bpp.lz.a29f5d51
rename to gfx/tilesets/kanto.2bpp.lz.a29f5d51
diff --git a/gfx/tilesets/03.png b/gfx/tilesets/kanto.png
similarity index 100%
rename from gfx/tilesets/03.png
rename to gfx/tilesets/kanto.png
diff --git a/gfx/tilesets/16.2bpp.lz.dd51d079 b/gfx/tilesets/kurts_house.2bpp.lz.dd51d079
similarity index 100%
rename from gfx/tilesets/16.2bpp.lz.dd51d079
rename to gfx/tilesets/kurts_house.2bpp.lz.dd51d079
diff --git a/gfx/tilesets/16.png b/gfx/tilesets/kurts_house.png
similarity index 100%
rename from gfx/tilesets/16.png
rename to gfx/tilesets/kurts_house.png
diff --git a/gfx/tilesets/10.2bpp.lz.b8d0f547 b/gfx/tilesets/lab.2bpp.lz.b8d0f547
similarity index 100%
rename from gfx/tilesets/10.2bpp.lz.b8d0f547
rename to gfx/tilesets/lab.2bpp.lz.b8d0f547
diff --git a/gfx/tilesets/10.png b/gfx/tilesets/lab.png
similarity index 100%
rename from gfx/tilesets/10.png
rename to gfx/tilesets/lab.png
diff --git a/gfx/tilesets/19.2bpp.lz.0c1544c1 b/gfx/tilesets/lighthouse.2bpp.lz.0c1544c1
similarity index 100%
rename from gfx/tilesets/19.2bpp.lz.0c1544c1
rename to gfx/tilesets/lighthouse.2bpp.lz.0c1544c1
diff --git a/gfx/tilesets/19.png b/gfx/tilesets/lighthouse.png
similarity index 100%
rename from gfx/tilesets/19.png
rename to gfx/tilesets/lighthouse.png
diff --git a/gfx/tilesets/12.2bpp.lz.e2e94f92 b/gfx/tilesets/mart.2bpp.lz.e2e94f92
similarity index 100%
rename from gfx/tilesets/12.2bpp.lz.e2e94f92
rename to gfx/tilesets/mart.2bpp.lz.e2e94f92
diff --git a/gfx/tilesets/12.png b/gfx/tilesets/mart.png
similarity index 100%
rename from gfx/tilesets/12.png
rename to gfx/tilesets/mart.png
diff --git a/gfx/tilesets/18.2bpp.lz.93800351 b/gfx/tilesets/olivine_gym.2bpp.lz.93800351
similarity index 100%
rename from gfx/tilesets/18.2bpp.lz.93800351
rename to gfx/tilesets/olivine_gym.2bpp.lz.93800351
diff --git a/gfx/tilesets/18.png b/gfx/tilesets/olivine_gym.png
similarity index 100%
rename from gfx/tilesets/18.png
rename to gfx/tilesets/olivine_gym.png
diff --git a/gfx/tilesets/35.2bpp.lz.8b42470b b/gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/35.2bpp.lz.8b42470b
rename to gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/35.png b/gfx/tilesets/omanyte_word_room.png
similarity index 100%
rename from gfx/tilesets/35.png
rename to gfx/tilesets/omanyte_word_room.png
diff --git a/gfx/tilesets/25.2bpp.lz.7fcb81d6 b/gfx/tilesets/park.2bpp.lz.7fcb81d6
similarity index 100%
rename from gfx/tilesets/25.2bpp.lz.7fcb81d6
rename to gfx/tilesets/park.2bpp.lz.7fcb81d6
diff --git a/gfx/tilesets/25.png b/gfx/tilesets/park.png
similarity index 100%
rename from gfx/tilesets/25.png
rename to gfx/tilesets/park.png
diff --git a/gfx/tilesets/06.2bpp.lz.252cbd8f b/gfx/tilesets/players_house.2bpp.lz.252cbd8f
similarity index 100%
rename from gfx/tilesets/06.2bpp.lz.252cbd8f
rename to gfx/tilesets/players_house.2bpp.lz.252cbd8f
diff --git a/gfx/tilesets/06.png b/gfx/tilesets/players_house.png
similarity index 100%
rename from gfx/tilesets/06.png
rename to gfx/tilesets/players_house.png
diff --git a/gfx/tilesets/20.2bpp.lz.35e51007 b/gfx/tilesets/players_house_2f.2bpp.lz.35e51007
similarity index 100%
rename from gfx/tilesets/20.2bpp.lz.35e51007
rename to gfx/tilesets/players_house_2f.2bpp.lz.35e51007
diff --git a/gfx/tilesets/20.png b/gfx/tilesets/players_house_2f.png
similarity index 100%
rename from gfx/tilesets/20.png
rename to gfx/tilesets/players_house_2f.png
diff --git a/gfx/tilesets/07.2bpp.lz.e1c4014c b/gfx/tilesets/pokecenter.2bpp.lz.e1c4014c
similarity index 100%
rename from gfx/tilesets/07.2bpp.lz.e1c4014c
rename to gfx/tilesets/pokecenter.2bpp.lz.e1c4014c
diff --git a/gfx/tilesets/07.png b/gfx/tilesets/pokecenter.png
similarity index 100%
rename from gfx/tilesets/07.png
rename to gfx/tilesets/pokecenter.png
diff --git a/gfx/tilesets/21.2bpp.lz.febbc4ec b/gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec
similarity index 100%
rename from gfx/tilesets/21.2bpp.lz.febbc4ec
rename to gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec
diff --git a/gfx/tilesets/21.png b/gfx/tilesets/pokecom_center.png
similarity index 100%
rename from gfx/tilesets/21.png
rename to gfx/tilesets/pokecom_center.png
diff --git a/gfx/tilesets/09.2bpp.lz.56b1a405 b/gfx/tilesets/port.2bpp.lz.56b1a405
similarity index 100%
rename from gfx/tilesets/09.2bpp.lz.56b1a405
rename to gfx/tilesets/port.2bpp.lz.56b1a405
diff --git a/gfx/tilesets/09.png b/gfx/tilesets/port.png
similarity index 100%
rename from gfx/tilesets/09.png
rename to gfx/tilesets/port.png
diff --git a/gfx/tilesets/11.2bpp.lz.454cfd8b b/gfx/tilesets/power_plant.2bpp.lz.454cfd8b
similarity index 100%
rename from gfx/tilesets/11.2bpp.lz.454cfd8b
rename to gfx/tilesets/power_plant.2bpp.lz.454cfd8b
diff --git a/gfx/tilesets/11.png b/gfx/tilesets/power_plant.png
similarity index 100%
rename from gfx/tilesets/11.png
rename to gfx/tilesets/power_plant.png
diff --git a/gfx/tilesets/27.2bpp.lz.27cdd9ad b/gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad
similarity index 100%
rename from gfx/tilesets/27.2bpp.lz.27cdd9ad
rename to gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad
diff --git a/gfx/tilesets/27.png b/gfx/tilesets/radio_tower.png
similarity index 100%
rename from gfx/tilesets/27.png
rename to gfx/tilesets/radio_tower.png
diff --git a/gfx/tilesets/36.2bpp.lz.8b42470b b/gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b
similarity index 100%
rename from gfx/tilesets/36.2bpp.lz.8b42470b
rename to gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b
diff --git a/gfx/tilesets/36.png b/gfx/tilesets/ruins_of_alph.png
similarity index 100%
rename from gfx/tilesets/36.png
rename to gfx/tilesets/ruins_of_alph.png
diff --git a/gfx/tilesets/23.2bpp.lz.bc56789c b/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c
similarity index 100%
rename from gfx/tilesets/23.2bpp.lz.bc56789c
rename to gfx/tilesets/sprout_tower.2bpp.lz.bc56789c
diff --git a/gfx/tilesets/23.png b/gfx/tilesets/sprout_tower.png
similarity index 100%
rename from gfx/tilesets/23.png
rename to gfx/tilesets/sprout_tower.png
diff --git a/gfx/tilesets/17.2bpp.lz.1600ca86 b/gfx/tilesets/train_station.2bpp.lz.1600ca86
similarity index 100%
rename from gfx/tilesets/17.2bpp.lz.1600ca86
rename to gfx/tilesets/train_station.2bpp.lz.1600ca86
diff --git a/gfx/tilesets/17.png b/gfx/tilesets/train_station.png
similarity index 100%
rename from gfx/tilesets/17.png
rename to gfx/tilesets/train_station.png
diff --git a/gfx/tilesets/28.2bpp.lz.cace291c b/gfx/tilesets/underground.2bpp.lz.cace291c
similarity index 100%
rename from gfx/tilesets/28.2bpp.lz.cace291c
rename to gfx/tilesets/underground.2bpp.lz.cace291c
diff --git a/gfx/tilesets/28.png b/gfx/tilesets/underground.png
similarity index 100%
rename from gfx/tilesets/28.png
rename to gfx/tilesets/underground.png
diff --git a/gfx/tilesets/30.2bpp.lz.25b9c4b6 b/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6
similarity index 100%
rename from gfx/tilesets/30.2bpp.lz.25b9c4b6
rename to gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6
diff --git a/gfx/tilesets/30.png b/gfx/tilesets/whirl_islands.png
similarity index 100%
rename from gfx/tilesets/30.png
rename to gfx/tilesets/whirl_islands.png
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 085171e36d880112756366a4af494eaf2953201b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 256
zcmZusK?=Yi3~NumK-dEY!Qbf)9)0_oYEi}lHfd8zR8^IQ%Rre7kKslEb)ZY9TSaP;
uAtUA=ZmSOt`{)lD?l1eEmz?JUd1;>m77~RIOm0*hGke=EzzdllJjx4?aTA09

diff --git a/tilesets/00_metatiles.bin b/tilesets/00_metatiles.bin
deleted file mode 100644
index 763df1997b23b3f63e271fb4d3d9a329835ef079..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmaJ=X;0fg5CucxLLf9%1k|<?sTAiZP*G4gaygI>kw_&-sATwEak8j<Xz58y@0R=c
zYrNTIa#$5F8O`}-#_M%oUoV0_1bi6uL8b=+1Ncib7LUc}o~vJ>SSac~yjXDEwRP8x
zMwQHGGMQ4PQX$!@)oO4TVU|hYZa<runa$>Md6JE4^`+wkgWbaG?(RCy&JJZ197jcZ
zs~rdHSh{UnQo}Z27`CmG?$<P}I}dmKVI&e64uwL7X_}Ppt|z;bUs~?hR#s8|2<0Ov
zw}?+XB`PobWA5Z*-I|zC{YS&$FbT~eKFl!^>LcfYWaz#82SbW4d)v00LHkWT#Xw+b
z*)&&HH4Ua^;(1BaKIk7oZwd4d<$yPD58nO!_507~!!KXSfB)g*r@#M>PmaEQ|52*f
z>-1iplp5Y947l>Wc+K)OUe7Czv*tK!<{J&K*%Cs4Uq`!IBH8d#X(5=GH4@2eE0t!R
z*R=9N?B(e`(LEv_gZK^4YoeXt{5+C0i+z}jkaByzmq@lmDoruaw?Vf+-*emG8>s@(
zJ8+t_{5kMBc5bq&U|vV}R-B%lU+m)?v#-_jcCz=+<vlL1u5aZ2?ehr)3Ps+EbS&<V
J{6DJdZUGNJ!}b6G

diff --git a/tilesets/01_palette_map.asm b/tilesets/01_palette_map.asm
deleted file mode 100644
index 62fbd2d00..000000000
--- a/tilesets/01_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
-	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
-	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
-	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
-	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
-	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED
-	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
-	tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/32_collision.bin b/tilesets/aerodactyl_word_room_collision.bin
similarity index 100%
rename from tilesets/32_collision.bin
rename to tilesets/aerodactyl_word_room_collision.bin
diff --git a/tilesets/36_metatiles.bin b/tilesets/aerodactyl_word_room_metatiles.bin
similarity index 100%
rename from tilesets/36_metatiles.bin
rename to tilesets/aerodactyl_word_room_metatiles.bin
diff --git a/tilesets/26_palette_map.asm b/tilesets/aerodactyl_word_room_palette_map.asm
similarity index 100%
rename from tilesets/26_palette_map.asm
rename to tilesets/aerodactyl_word_room_palette_map.asm
diff --git a/tilesets/animations.asm b/tilesets/animations.asm
index 9bc80454c..3de67ee6e 100644
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -35,9 +35,9 @@ _AnimateTileset:: ; fc000
 	jp hl
 ; fc01b
 
-Tileset00Anim: ; 0xfc01b
-Tileset02Anim: ; 0xfc01b
-Tileset03Anim: ; 0xfc01b
+Tileset0Anim: ; 0xfc01b
+TilesetJohto2Anim: ; 0xfc01b
+TilesetKantoAnim: ; 0xfc01b
 	dw VTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -51,7 +51,7 @@ Tileset03Anim: ; 0xfc01b
 	dw NULL,  DoneTileAnimation
 ; 0xfc047
 
-Tileset25Anim: ; 0xfc047
+TilesetParkAnim: ; 0xfc047
 	dw VTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw VTiles2 tile $5f, AnimateFountain
@@ -65,7 +65,7 @@ Tileset25Anim: ; 0xfc047
 	dw NULL,  DoneTileAnimation
 ; 0xfc073
 
-Tileset31Anim: ; 0xfc073
+TilesetIlexForestAnim: ; 0xfc073
 	dw NULL,  ForestTreeLeftAnimation
 	dw NULL,  ForestTreeRightAnimation
 	dw NULL,  WaitTileAnimation
@@ -80,7 +80,7 @@ Tileset31Anim: ; 0xfc073
 	dw NULL,  DoneTileAnimation
 ; 0xfc0a3
 
-Tileset01Anim: ; 0xfc0a3
+TilesetJohto1Anim: ; 0xfc0a3
 	dw VTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -124,7 +124,7 @@ TilesetAnimfc103: ; 0xfc103
 	dw NULL,  DoneTileAnimation
 ; 0xfc12f
 
-Tileset09Anim: ; 0xfc12f
+TilesetPortAnim: ; 0xfc12f
 	dw VTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -139,7 +139,7 @@ Tileset09Anim: ; 0xfc12f
 	dw NULL,  DoneTileAnimation
 ; 0xfc15f
 
-Tileset15Anim: ; 0xfc15f
+TilesetGym1Anim: ; 0xfc15f
 	dw NULL,  SafariFountainAnim2
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -182,8 +182,8 @@ TilesetAnimfc1af: ; 0xfc1af
 	dw NULL,  DoneTileAnimation
 ; 0xfc1e7
 
-Tileset24Anim: ; 0xfc1e7
-Tileset30Anim: ; 0xfc1e7
+TilesetCaveAnim: ; 0xfc1e7
+TilesetWhirlIslandsAnim: ; 0xfc1e7
 	dw VTiles2 tile $14, WriteTileToBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw wTileAnimBuffer, ScrollTileRightLeft
@@ -205,7 +205,7 @@ Tileset30Anim: ; 0xfc1e7
 	dw NULL,  DoneTileAnimation
 ; 0xfc233
 
-Tileset29Anim: ; 0xfc233
+TilesetIcePathAnim: ; 0xfc233
 	dw VTiles2 tile $35, WriteTileToBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw wTileAnimBuffer, ScrollTileRightLeft
@@ -227,7 +227,7 @@ Tileset29Anim: ; 0xfc233
 	dw NULL,  DoneTileAnimation
 ; 0xfc27f
 
-Tileset23Anim: ; 0xfc27f
+TilesetSproutTowerAnim: ; 0xfc27f
 	dw SproutPillarTilePointer9,  AnimateSproutPillarTile
 	dw SproutPillarTilePointer10, AnimateSproutPillarTile
 	dw SproutPillarTilePointer7,  AnimateSproutPillarTile
@@ -259,31 +259,31 @@ TilesetAnimfc2bf: ; 0xfc2bf
 	dw NULL,  DoneTileAnimation
 ; 0xfc2e7
 
-Tileset04Anim: ; 0xfc2e7
-Tileset05Anim: ; 0xfc2e7
-Tileset06Anim: ; 0xfc2e7
-Tileset07Anim: ; 0xfc2e7
-Tileset08Anim: ; 0xfc2e7
-Tileset10Anim: ; 0xfc2e7
-Tileset11Anim: ; 0xfc2e7
-Tileset12Anim: ; 0xfc2e7
-Tileset13Anim: ; 0xfc2e7
-Tileset14Anim: ; 0xfc2e7
-Tileset16Anim: ; 0xfc2e7
-Tileset17Anim: ; 0xfc2e7
-Tileset18Anim: ; 0xfc2e7
-Tileset19Anim: ; 0xfc2e7
-Tileset20Anim: ; 0xfc2e7
-Tileset21Anim: ; 0xfc2e7
-Tileset22Anim: ; 0xfc2e7
-Tileset26Anim: ; 0xfc2e7
-Tileset27Anim: ; 0xfc2e7
-Tileset28Anim: ; 0xfc2e7
-Tileset32Anim: ; 0xfc2e7
-Tileset33Anim: ; 0xfc2e7
-Tileset34Anim: ; 0xfc2e7
-Tileset35Anim: ; 0xfc2e7
-Tileset36Anim: ; 0xfc2e7
+TilesetBattleTowerOutsideAnim: ; 0xfc2e7
+TilesetHouse1Anim: ; 0xfc2e7
+TilesetPlayersHouseAnim: ; 0xfc2e7
+TilesetPokecenterAnim: ; 0xfc2e7
+TilesetGateAnim: ; 0xfc2e7
+TilesetLabAnim: ; 0xfc2e7
+TilesetPowerPlantAnim: ; 0xfc2e7
+TilesetMartAnim: ; 0xfc2e7
+TilesetCeladonMansionAnim: ; 0xfc2e7
+TilesetGameCornerAnim: ; 0xfc2e7
+TilesetKurtsHouseAnim: ; 0xfc2e7
+TilesetTrainStationAnim: ; 0xfc2e7
+TilesetOlivineGymAnim: ; 0xfc2e7
+TilesetLighthouseAnim: ; 0xfc2e7
+TilesetPlayersHouse2FAnim: ; 0xfc2e7
+TilesetPokeComCenterAnim: ; 0xfc2e7
+TilesetBattleTowerAnim: ; 0xfc2e7
+TilesetRuinsOfAlphAnim: ; 0xfc2e7
+TilesetRadioTowerAnim: ; 0xfc2e7
+TilesetUndergroundAnim: ; 0xfc2e7
+TilesetBetaWordRoomAnim: ; 0xfc2e7
+TilesetHoOhWordRoomAnim: ; 0xfc2e7
+TilesetKabutoWordRoomAnim: ; 0xfc2e7
+TilesetOmanyteWordRoomAnim: ; 0xfc2e7
+TilesetAerodactylWordRoomAnim: ; 0xfc2e7
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
diff --git a/tilesets/22_collision.bin b/tilesets/battle_tower_collision.bin
similarity index 100%
rename from tilesets/22_collision.bin
rename to tilesets/battle_tower_collision.bin
diff --git a/tilesets/22_metatiles.bin b/tilesets/battle_tower_metatiles.bin
similarity index 100%
rename from tilesets/22_metatiles.bin
rename to tilesets/battle_tower_metatiles.bin
diff --git a/tilesets/04_collision.bin b/tilesets/battle_tower_outside_collision.bin
similarity index 100%
rename from tilesets/04_collision.bin
rename to tilesets/battle_tower_outside_collision.bin
diff --git a/tilesets/04_metatiles.bin b/tilesets/battle_tower_outside_metatiles.bin
similarity index 100%
rename from tilesets/04_metatiles.bin
rename to tilesets/battle_tower_outside_metatiles.bin
diff --git a/tilesets/04_palette_map.asm b/tilesets/battle_tower_outside_palette_map.asm
similarity index 100%
rename from tilesets/04_palette_map.asm
rename to tilesets/battle_tower_outside_palette_map.asm
diff --git a/tilesets/22_palette_map.asm b/tilesets/battle_tower_palette_map.asm
similarity index 100%
rename from tilesets/22_palette_map.asm
rename to tilesets/battle_tower_palette_map.asm
diff --git a/tilesets/33_collision.bin b/tilesets/beta_word_room_collision.bin
similarity index 100%
rename from tilesets/33_collision.bin
rename to tilesets/beta_word_room_collision.bin
diff --git a/tilesets/32_metatiles.bin b/tilesets/beta_word_room_metatiles.bin
similarity index 100%
rename from tilesets/32_metatiles.bin
rename to tilesets/beta_word_room_metatiles.bin
diff --git a/tilesets/32_palette_map.asm b/tilesets/beta_word_room_palette_map.asm
similarity index 100%
rename from tilesets/32_palette_map.asm
rename to tilesets/beta_word_room_palette_map.asm
diff --git a/tilesets/24_collision.bin b/tilesets/cave_collision.bin
similarity index 100%
rename from tilesets/24_collision.bin
rename to tilesets/cave_collision.bin
diff --git a/tilesets/24_metatiles.bin b/tilesets/cave_metatiles.bin
similarity index 100%
rename from tilesets/24_metatiles.bin
rename to tilesets/cave_metatiles.bin
diff --git a/tilesets/24_palette_map.asm b/tilesets/cave_palette_map.asm
similarity index 100%
rename from tilesets/24_palette_map.asm
rename to tilesets/cave_palette_map.asm
diff --git a/tilesets/13_collision.bin b/tilesets/celadon_mansion_collision.bin
similarity index 100%
rename from tilesets/13_collision.bin
rename to tilesets/celadon_mansion_collision.bin
diff --git a/tilesets/13_metatiles.bin b/tilesets/celadon_mansion_metatiles.bin
similarity index 100%
rename from tilesets/13_metatiles.bin
rename to tilesets/celadon_mansion_metatiles.bin
diff --git a/tilesets/13_palette_map.asm b/tilesets/celadon_mansion_palette_map.asm
similarity index 100%
rename from tilesets/13_palette_map.asm
rename to tilesets/celadon_mansion_palette_map.asm
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/14_collision.bin b/tilesets/game_corner_collision.bin
similarity index 100%
rename from tilesets/14_collision.bin
rename to tilesets/game_corner_collision.bin
diff --git a/tilesets/14_metatiles.bin b/tilesets/game_corner_metatiles.bin
similarity index 100%
rename from tilesets/14_metatiles.bin
rename to tilesets/game_corner_metatiles.bin
diff --git a/tilesets/14_palette_map.asm b/tilesets/game_corner_palette_map.asm
similarity index 100%
rename from tilesets/14_palette_map.asm
rename to tilesets/game_corner_palette_map.asm
diff --git a/tilesets/08_collision.bin b/tilesets/gate_collision.bin
similarity index 100%
rename from tilesets/08_collision.bin
rename to tilesets/gate_collision.bin
diff --git a/tilesets/08_metatiles.bin b/tilesets/gate_metatiles.bin
similarity index 100%
rename from tilesets/08_metatiles.bin
rename to tilesets/gate_metatiles.bin
diff --git a/tilesets/08_palette_map.asm b/tilesets/gate_palette_map.asm
similarity index 100%
rename from tilesets/08_palette_map.asm
rename to tilesets/gate_palette_map.asm
diff --git a/tilesets/15_collision.bin b/tilesets/gym_1_collision.bin
similarity index 100%
rename from tilesets/15_collision.bin
rename to tilesets/gym_1_collision.bin
diff --git a/tilesets/15_metatiles.bin b/tilesets/gym_1_metatiles.bin
similarity index 100%
rename from tilesets/15_metatiles.bin
rename to tilesets/gym_1_metatiles.bin
diff --git a/tilesets/15_palette_map.asm b/tilesets/gym_1_palette_map.asm
similarity index 100%
rename from tilesets/15_palette_map.asm
rename to tilesets/gym_1_palette_map.asm
diff --git a/tilesets/34_collision.bin b/tilesets/ho_oh_word_room_collision.bin
similarity index 100%
rename from tilesets/34_collision.bin
rename to tilesets/ho_oh_word_room_collision.bin
diff --git a/tilesets/33_metatiles.bin b/tilesets/ho_oh_word_room_metatiles.bin
similarity index 100%
rename from tilesets/33_metatiles.bin
rename to tilesets/ho_oh_word_room_metatiles.bin
diff --git a/tilesets/33_palette_map.asm b/tilesets/ho_oh_word_room_palette_map.asm
similarity index 100%
rename from tilesets/33_palette_map.asm
rename to tilesets/ho_oh_word_room_palette_map.asm
diff --git a/tilesets/05_collision.bin b/tilesets/house_1_collision.bin
similarity index 100%
rename from tilesets/05_collision.bin
rename to tilesets/house_1_collision.bin
diff --git a/tilesets/05_metatiles.bin b/tilesets/house_1_metatiles.bin
similarity index 100%
rename from tilesets/05_metatiles.bin
rename to tilesets/house_1_metatiles.bin
diff --git a/tilesets/05_palette_map.asm b/tilesets/house_1_palette_map.asm
similarity index 100%
rename from tilesets/05_palette_map.asm
rename to tilesets/house_1_palette_map.asm
diff --git a/tilesets/29_collision.bin b/tilesets/ice_path_collision.bin
similarity index 100%
rename from tilesets/29_collision.bin
rename to tilesets/ice_path_collision.bin
diff --git a/tilesets/29_metatiles.bin b/tilesets/ice_path_metatiles.bin
similarity index 100%
rename from tilesets/29_metatiles.bin
rename to tilesets/ice_path_metatiles.bin
diff --git a/tilesets/29_palette_map.asm b/tilesets/ice_path_palette_map.asm
similarity index 100%
rename from tilesets/29_palette_map.asm
rename to tilesets/ice_path_palette_map.asm
diff --git a/tilesets/31_collision.bin b/tilesets/ilex_forest_collision.bin
similarity index 100%
rename from tilesets/31_collision.bin
rename to tilesets/ilex_forest_collision.bin
diff --git a/tilesets/31_metatiles.bin b/tilesets/ilex_forest_metatiles.bin
similarity index 100%
rename from tilesets/31_metatiles.bin
rename to tilesets/ilex_forest_metatiles.bin
diff --git a/tilesets/31_palette_map.asm b/tilesets/ilex_forest_palette_map.asm
similarity index 100%
rename from tilesets/31_palette_map.asm
rename to tilesets/ilex_forest_palette_map.asm
diff --git a/tilesets/01_collision.bin b/tilesets/johto_1_collision.bin
similarity index 100%
rename from tilesets/01_collision.bin
rename to tilesets/johto_1_collision.bin
diff --git a/tilesets/01_metatiles.bin b/tilesets/johto_1_metatiles.bin
similarity index 100%
rename from tilesets/01_metatiles.bin
rename to tilesets/johto_1_metatiles.bin
diff --git a/tilesets/00_palette_map.asm b/tilesets/johto_1_palette_map.asm
old mode 100755
new mode 100644
similarity index 100%
rename from tilesets/00_palette_map.asm
rename to tilesets/johto_1_palette_map.asm
diff --git a/tilesets/02_collision.bin b/tilesets/johto_2_collision.bin
similarity index 100%
rename from tilesets/02_collision.bin
rename to tilesets/johto_2_collision.bin
diff --git a/tilesets/02_metatiles.bin b/tilesets/johto_2_metatiles.bin
similarity index 100%
rename from tilesets/02_metatiles.bin
rename to tilesets/johto_2_metatiles.bin
diff --git a/tilesets/02_palette_map.asm b/tilesets/johto_2_palette_map.asm
similarity index 100%
rename from tilesets/02_palette_map.asm
rename to tilesets/johto_2_palette_map.asm
diff --git a/tilesets/35_collision.bin b/tilesets/kabuto_word_room_collision.bin
similarity index 100%
rename from tilesets/35_collision.bin
rename to tilesets/kabuto_word_room_collision.bin
diff --git a/tilesets/34_metatiles.bin b/tilesets/kabuto_word_room_metatiles.bin
similarity index 100%
rename from tilesets/34_metatiles.bin
rename to tilesets/kabuto_word_room_metatiles.bin
diff --git a/tilesets/34_palette_map.asm b/tilesets/kabuto_word_room_palette_map.asm
similarity index 100%
rename from tilesets/34_palette_map.asm
rename to tilesets/kabuto_word_room_palette_map.asm
diff --git a/tilesets/03_collision.bin b/tilesets/kanto_collision.bin
similarity index 100%
rename from tilesets/03_collision.bin
rename to tilesets/kanto_collision.bin
diff --git a/tilesets/03_metatiles.bin b/tilesets/kanto_metatiles.bin
similarity index 100%
rename from tilesets/03_metatiles.bin
rename to tilesets/kanto_metatiles.bin
diff --git a/tilesets/03_palette_map.asm b/tilesets/kanto_palette_map.asm
similarity index 100%
rename from tilesets/03_palette_map.asm
rename to tilesets/kanto_palette_map.asm
diff --git a/tilesets/16_collision.bin b/tilesets/kurts_house_collision.bin
similarity index 100%
rename from tilesets/16_collision.bin
rename to tilesets/kurts_house_collision.bin
diff --git a/tilesets/16_metatiles.bin b/tilesets/kurts_house_metatiles.bin
similarity index 100%
rename from tilesets/16_metatiles.bin
rename to tilesets/kurts_house_metatiles.bin
diff --git a/tilesets/16_palette_map.asm b/tilesets/kurts_house_palette_map.asm
similarity index 100%
rename from tilesets/16_palette_map.asm
rename to tilesets/kurts_house_palette_map.asm
diff --git a/tilesets/10_collision.bin b/tilesets/lab_collision.bin
similarity index 100%
rename from tilesets/10_collision.bin
rename to tilesets/lab_collision.bin
diff --git a/tilesets/10_metatiles.bin b/tilesets/lab_metatiles.bin
similarity index 100%
rename from tilesets/10_metatiles.bin
rename to tilesets/lab_metatiles.bin
diff --git a/tilesets/10_palette_map.asm b/tilesets/lab_palette_map.asm
similarity index 100%
rename from tilesets/10_palette_map.asm
rename to tilesets/lab_palette_map.asm
diff --git a/tilesets/19_collision.bin b/tilesets/lighthouse_collision.bin
similarity index 100%
rename from tilesets/19_collision.bin
rename to tilesets/lighthouse_collision.bin
diff --git a/tilesets/19_metatiles.bin b/tilesets/lighthouse_metatiles.bin
similarity index 100%
rename from tilesets/19_metatiles.bin
rename to tilesets/lighthouse_metatiles.bin
diff --git a/tilesets/19_palette_map.asm b/tilesets/lighthouse_palette_map.asm
similarity index 100%
rename from tilesets/19_palette_map.asm
rename to tilesets/lighthouse_palette_map.asm
diff --git a/tilesets/12_collision.bin b/tilesets/mart_collision.bin
similarity index 100%
rename from tilesets/12_collision.bin
rename to tilesets/mart_collision.bin
diff --git a/tilesets/12_metatiles.bin b/tilesets/mart_metatiles.bin
similarity index 100%
rename from tilesets/12_metatiles.bin
rename to tilesets/mart_metatiles.bin
diff --git a/tilesets/12_palette_map.asm b/tilesets/mart_palette_map.asm
similarity index 100%
rename from tilesets/12_palette_map.asm
rename to tilesets/mart_palette_map.asm
diff --git a/tilesets/18_collision.bin b/tilesets/olivine_gym_collision.bin
similarity index 100%
rename from tilesets/18_collision.bin
rename to tilesets/olivine_gym_collision.bin
diff --git a/tilesets/18_metatiles.bin b/tilesets/olivine_gym_metatiles.bin
similarity index 100%
rename from tilesets/18_metatiles.bin
rename to tilesets/olivine_gym_metatiles.bin
diff --git a/tilesets/18_palette_map.asm b/tilesets/olivine_gym_palette_map.asm
similarity index 100%
rename from tilesets/18_palette_map.asm
rename to tilesets/olivine_gym_palette_map.asm
diff --git a/tilesets/36_collision.bin b/tilesets/omanyte_word_room_collision.bin
similarity index 100%
rename from tilesets/36_collision.bin
rename to tilesets/omanyte_word_room_collision.bin
diff --git a/tilesets/35_metatiles.bin b/tilesets/omanyte_word_room_metatiles.bin
similarity index 100%
rename from tilesets/35_metatiles.bin
rename to tilesets/omanyte_word_room_metatiles.bin
diff --git a/tilesets/35_palette_map.asm b/tilesets/omanyte_word_room_palette_map.asm
similarity index 100%
rename from tilesets/35_palette_map.asm
rename to tilesets/omanyte_word_room_palette_map.asm
diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm
index 7e19893d4..fb7da4cf4 100644
--- a/tilesets/palette_maps.asm
+++ b/tilesets/palette_maps.asm
@@ -1,132 +1,132 @@
-Tileset03PalMap: ; 0x4c075
-INCLUDE "tilesets/03_palette_map.asm"
+TilesetKantoPalMap: ; 0x4c075
+INCLUDE "tilesets/kanto_palette_map.asm"
 ; 0x4c0e5
 
-Tileset00PalMap: ; 0x4c0e5
-Tileset01PalMap: ; 0x4c0e5
-INCLUDE "tilesets/01_palette_map.asm"
+Tileset0PalMap: ; 0x4c0e5
+TilesetJohto1PalMap: ; 0x4c0e5
+INCLUDE "tilesets/johto_1_palette_map.asm"
 ; 0x4c155
 
-Tileset02PalMap: ; 0x4c155
-INCLUDE "tilesets/02_palette_map.asm"
+TilesetJohto2PalMap: ; 0x4c155
+INCLUDE "tilesets/johto_2_palette_map.asm"
 ; 0x4c1c5
 
-Tileset05PalMap: ; 0x4c1c5
-INCLUDE "tilesets/05_palette_map.asm"
+TilesetHouse1PalMap: ; 0x4c1c5
+INCLUDE "tilesets/house_1_palette_map.asm"
 ; 0x4c235
 
-Tileset06PalMap: ; 0x4c235
-INCLUDE "tilesets/06_palette_map.asm"
+TilesetPlayersHousePalMap: ; 0x4c235
+INCLUDE "tilesets/players_house_palette_map.asm"
 ; 0x4c2a5
 
-Tileset07PalMap: ; 0x4c2a5
-INCLUDE "tilesets/07_palette_map.asm"
+TilesetPokecenterPalMap: ; 0x4c2a5
+INCLUDE "tilesets/pokecenter_palette_map.asm"
 ; 0x4c315
 
-Tileset08PalMap: ; 0x4c315
-INCLUDE "tilesets/08_palette_map.asm"
+TilesetGatePalMap: ; 0x4c315
+INCLUDE "tilesets/gate_palette_map.asm"
 ; 0x4c385
 
-Tileset09PalMap: ; 0x4c385
-INCLUDE "tilesets/09_palette_map.asm"
+TilesetPortPalMap: ; 0x4c385
+INCLUDE "tilesets/port_palette_map.asm"
 ; 0x4c3f5
 
-Tileset10PalMap: ; 0x4c3f5
-INCLUDE "tilesets/10_palette_map.asm"
+TilesetLabPalMap: ; 0x4c3f5
+INCLUDE "tilesets/lab_palette_map.asm"
 ; 0x4c465
 
-Tileset11PalMap: ; 0x4c465
-INCLUDE "tilesets/11_palette_map.asm"
+TilesetPowerPlantPalMap: ; 0x4c465
+INCLUDE "tilesets/power_plant_palette_map.asm"
 ; 0x4c4d5
 
-Tileset12PalMap: ; 0x4c4d5
-INCLUDE "tilesets/12_palette_map.asm"
+TilesetMartPalMap: ; 0x4c4d5
+INCLUDE "tilesets/mart_palette_map.asm"
 ; 0x4c545
 
-Tileset13PalMap: ; 0x4c545
-INCLUDE "tilesets/13_palette_map.asm"
+TilesetCeladonMansionPalMap: ; 0x4c545
+INCLUDE "tilesets/celadon_mansion_palette_map.asm"
 ; 0x4c5b5
 
-Tileset14PalMap: ; 0x4c5b5
-INCLUDE "tilesets/14_palette_map.asm"
+TilesetGameCornerPalMap: ; 0x4c5b5
+INCLUDE "tilesets/game_corner_palette_map.asm"
 ; 0x4c625
 
-Tileset15PalMap: ; 0x4c625
-INCLUDE "tilesets/15_palette_map.asm"
+TilesetGym1PalMap: ; 0x4c625
+INCLUDE "tilesets/gym_1_palette_map.asm"
 ; 0x4c695
 
-Tileset16PalMap: ; 0x4c695
-INCLUDE "tilesets/16_palette_map.asm"
+TilesetKurtsHousePalMap: ; 0x4c695
+INCLUDE "tilesets/kurts_house_palette_map.asm"
 ; 0x4c705
 
-Tileset23PalMap: ; 0x4c705
-INCLUDE "tilesets/23_palette_map.asm"
+TilesetSproutTowerPalMap: ; 0x4c705
+INCLUDE "tilesets/sprout_tower_palette_map.asm"
 ; 0x4c775
 
-Tileset24PalMap: ; 0x4c775
-Tileset30PalMap: ; 0x4c775
-INCLUDE "tilesets/30_palette_map.asm"
+TilesetCavePalMap: ; 0x4c775
+TilesetWhirlIslandsPalMap: ; 0x4c775
+INCLUDE "tilesets/cave_palette_map.asm"
 ; 0x4c7e5
 
-Tileset25PalMap: ; 0x4c7e5
-INCLUDE "tilesets/25_palette_map.asm"
+TilesetParkPalMap: ; 0x4c7e5
+INCLUDE "tilesets/park_palette_map.asm"
 ; 0x4c855
 
-Tileset26PalMap: ; 0x4c855
-Tileset32PalMap: ; 0x4c855
-Tileset33PalMap: ; 0x4c855
-Tileset34PalMap: ; 0x4c855
-Tileset35PalMap: ; 0x4c855
-Tileset36PalMap: ; 0x4c855
-INCLUDE "tilesets/36_palette_map.asm"
+TilesetRuinsOfAlphPalMap: ; 0x4c855
+TilesetBetaWordRoomPalMap: ; 0x4c855
+TilesetHoOhWordRoomPalMap: ; 0x4c855
+TilesetKabutoWordRoomPalMap: ; 0x4c855
+TilesetOmanyteWordRoomPalMap: ; 0x4c855
+TilesetAerodactylWordRoomPalMap: ; 0x4c855
+INCLUDE "tilesets/ruins_of_alph_palette_map.asm"
 ; 0x4c8c5
 
-Tileset27PalMap: ; 0x4c8c5
-INCLUDE "tilesets/27_palette_map.asm"
+TilesetRadioTowerPalMap: ; 0x4c8c5
+INCLUDE "tilesets/radio_tower_palette_map.asm"
 ; 0x4c935
 
-Tileset17PalMap: ; 0x4c935
-INCLUDE "tilesets/17_palette_map.asm"
+TilesetTrainStationPalMap: ; 0x4c935
+INCLUDE "tilesets/train_station_palette_map.asm"
 ; 0x4c9a5
 
-Tileset28PalMap: ; 0x4c9a5
-INCLUDE "tilesets/28_palette_map.asm"
+TilesetUndergroundPalMap: ; 0x4c9a5
+INCLUDE "tilesets/underground_palette_map.asm"
 ; 0x4ca15
 
-Tileset18PalMap: ; 0x4ca15
-INCLUDE "tilesets/18_palette_map.asm"
+TilesetOlivineGymPalMap: ; 0x4ca15
+INCLUDE "tilesets/olivine_gym_palette_map.asm"
 ; 0x4ca85
 
-Tileset19PalMap: ; 0x4ca85
-INCLUDE "tilesets/19_palette_map.asm"
+TilesetLighthousePalMap: ; 0x4ca85
+INCLUDE "tilesets/lighthouse_palette_map.asm"
 ; 0x4caf5
 
-Tileset20PalMap: ; 0x4caf5
-INCLUDE "tilesets/20_palette_map.asm"
+TilesetPlayersHouse2FPalMap: ; 0x4caf5
+INCLUDE "tilesets/players_house_2f_palette_map.asm"
 ; 0x4cb65
 
 UnusedPalMap1:
 INCBIN "tilesets/unused_palette_map_1.bin"
 ; 4cbd5
 
-Tileset29PalMap: ; 0x4cbd5
-INCLUDE "tilesets/29_palette_map.asm"
+TilesetIcePathPalMap: ; 0x4cbd5
+INCLUDE "tilesets/ice_path_palette_map.asm"
 ; 0x4cc45
 
-Tileset31PalMap: ; 0x4cc45
-INCLUDE "tilesets/31_palette_map.asm"
+TilesetIlexForestPalMap: ; 0x4cc45
+INCLUDE "tilesets/ilex_forest_palette_map.asm"
 ; 0x4ccb5
 
-Tileset21PalMap: ; 0x4ccb5
-INCLUDE "tilesets/21_palette_map.asm"
+TilesetPokeComCenterPalMap: ; 0x4ccb5
+INCLUDE "tilesets/pokecom_center_palette_map.asm"
 ; 0x4cd25
 
-Tileset22PalMap: ; 0x4cd25
-INCLUDE "tilesets/22_palette_map.asm"
+TilesetBattleTowerPalMap: ; 0x4cd25
+INCLUDE "tilesets/battle_tower_palette_map.asm"
 ; 0x4cd95
 
-Tileset04PalMap: ; 0x4cd95
-INCLUDE "tilesets/04_palette_map.asm"
+TilesetBattleTowerOutsidePalMap: ; 0x4cd95
+INCLUDE "tilesets/battle_tower_outside_palette_map.asm"
 ; 0x4ce05
 
 UnusedPalMap2:
diff --git a/tilesets/25_collision.bin b/tilesets/park_collision.bin
similarity index 100%
rename from tilesets/25_collision.bin
rename to tilesets/park_collision.bin
diff --git a/tilesets/25_metatiles.bin b/tilesets/park_metatiles.bin
similarity index 100%
rename from tilesets/25_metatiles.bin
rename to tilesets/park_metatiles.bin
diff --git a/tilesets/25_palette_map.asm b/tilesets/park_palette_map.asm
similarity index 100%
rename from tilesets/25_palette_map.asm
rename to tilesets/park_palette_map.asm
diff --git a/tilesets/20_collision.bin b/tilesets/players_house_2f_collision.bin
similarity index 100%
rename from tilesets/20_collision.bin
rename to tilesets/players_house_2f_collision.bin
diff --git a/tilesets/20_metatiles.bin b/tilesets/players_house_2f_metatiles.bin
similarity index 100%
rename from tilesets/20_metatiles.bin
rename to tilesets/players_house_2f_metatiles.bin
diff --git a/tilesets/20_palette_map.asm b/tilesets/players_house_2f_palette_map.asm
similarity index 100%
rename from tilesets/20_palette_map.asm
rename to tilesets/players_house_2f_palette_map.asm
diff --git a/tilesets/06_collision.bin b/tilesets/players_house_collision.bin
similarity index 100%
rename from tilesets/06_collision.bin
rename to tilesets/players_house_collision.bin
diff --git a/tilesets/06_metatiles.bin b/tilesets/players_house_metatiles.bin
similarity index 100%
rename from tilesets/06_metatiles.bin
rename to tilesets/players_house_metatiles.bin
diff --git a/tilesets/06_palette_map.asm b/tilesets/players_house_palette_map.asm
similarity index 100%
rename from tilesets/06_palette_map.asm
rename to tilesets/players_house_palette_map.asm
diff --git a/tilesets/07_collision.bin b/tilesets/pokecenter_collision.bin
similarity index 100%
rename from tilesets/07_collision.bin
rename to tilesets/pokecenter_collision.bin
diff --git a/tilesets/07_metatiles.bin b/tilesets/pokecenter_metatiles.bin
similarity index 100%
rename from tilesets/07_metatiles.bin
rename to tilesets/pokecenter_metatiles.bin
diff --git a/tilesets/07_palette_map.asm b/tilesets/pokecenter_palette_map.asm
similarity index 100%
rename from tilesets/07_palette_map.asm
rename to tilesets/pokecenter_palette_map.asm
diff --git a/tilesets/21_collision.bin b/tilesets/pokecom_center_collision.bin
similarity index 100%
rename from tilesets/21_collision.bin
rename to tilesets/pokecom_center_collision.bin
diff --git a/tilesets/21_metatiles.bin b/tilesets/pokecom_center_metatiles.bin
similarity index 100%
rename from tilesets/21_metatiles.bin
rename to tilesets/pokecom_center_metatiles.bin
diff --git a/tilesets/21_palette_map.asm b/tilesets/pokecom_center_palette_map.asm
similarity index 100%
rename from tilesets/21_palette_map.asm
rename to tilesets/pokecom_center_palette_map.asm
diff --git a/tilesets/09_collision.bin b/tilesets/port_collision.bin
similarity index 100%
rename from tilesets/09_collision.bin
rename to tilesets/port_collision.bin
diff --git a/tilesets/09_metatiles.bin b/tilesets/port_metatiles.bin
similarity index 100%
rename from tilesets/09_metatiles.bin
rename to tilesets/port_metatiles.bin
diff --git a/tilesets/09_palette_map.asm b/tilesets/port_palette_map.asm
similarity index 100%
rename from tilesets/09_palette_map.asm
rename to tilesets/port_palette_map.asm
diff --git a/tilesets/11_collision.bin b/tilesets/power_plant_collision.bin
similarity index 100%
rename from tilesets/11_collision.bin
rename to tilesets/power_plant_collision.bin
diff --git a/tilesets/11_metatiles.bin b/tilesets/power_plant_metatiles.bin
similarity index 100%
rename from tilesets/11_metatiles.bin
rename to tilesets/power_plant_metatiles.bin
diff --git a/tilesets/11_palette_map.asm b/tilesets/power_plant_palette_map.asm
similarity index 100%
rename from tilesets/11_palette_map.asm
rename to tilesets/power_plant_palette_map.asm
diff --git a/tilesets/27_collision.bin b/tilesets/radio_tower_collision.bin
similarity index 100%
rename from tilesets/27_collision.bin
rename to tilesets/radio_tower_collision.bin
diff --git a/tilesets/27_metatiles.bin b/tilesets/radio_tower_metatiles.bin
similarity index 100%
rename from tilesets/27_metatiles.bin
rename to tilesets/radio_tower_metatiles.bin
diff --git a/tilesets/27_palette_map.asm b/tilesets/radio_tower_palette_map.asm
similarity index 100%
rename from tilesets/27_palette_map.asm
rename to tilesets/radio_tower_palette_map.asm
diff --git a/tilesets/26_collision.bin b/tilesets/ruins_of_alph_collision.bin
similarity index 100%
rename from tilesets/26_collision.bin
rename to tilesets/ruins_of_alph_collision.bin
diff --git a/tilesets/26_metatiles.bin b/tilesets/ruins_of_alph_metatiles.bin
similarity index 100%
rename from tilesets/26_metatiles.bin
rename to tilesets/ruins_of_alph_metatiles.bin
diff --git a/tilesets/36_palette_map.asm b/tilesets/ruins_of_alph_palette_map.asm
similarity index 100%
rename from tilesets/36_palette_map.asm
rename to tilesets/ruins_of_alph_palette_map.asm
diff --git a/tilesets/23_collision.bin b/tilesets/sprout_tower_collision.bin
similarity index 100%
rename from tilesets/23_collision.bin
rename to tilesets/sprout_tower_collision.bin
diff --git a/tilesets/23_metatiles.bin b/tilesets/sprout_tower_metatiles.bin
similarity index 100%
rename from tilesets/23_metatiles.bin
rename to tilesets/sprout_tower_metatiles.bin
diff --git a/tilesets/23_palette_map.asm b/tilesets/sprout_tower_palette_map.asm
similarity index 100%
rename from tilesets/23_palette_map.asm
rename to tilesets/sprout_tower_palette_map.asm
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/17_collision.bin b/tilesets/train_station_collision.bin
similarity index 100%
rename from tilesets/17_collision.bin
rename to tilesets/train_station_collision.bin
diff --git a/tilesets/17_metatiles.bin b/tilesets/train_station_metatiles.bin
similarity index 100%
rename from tilesets/17_metatiles.bin
rename to tilesets/train_station_metatiles.bin
diff --git a/tilesets/17_palette_map.asm b/tilesets/train_station_palette_map.asm
similarity index 100%
rename from tilesets/17_palette_map.asm
rename to tilesets/train_station_palette_map.asm
diff --git a/tilesets/28_collision.bin b/tilesets/underground_collision.bin
similarity index 100%
rename from tilesets/28_collision.bin
rename to tilesets/underground_collision.bin
diff --git a/tilesets/28_metatiles.bin b/tilesets/underground_metatiles.bin
similarity index 100%
rename from tilesets/28_metatiles.bin
rename to tilesets/underground_metatiles.bin
diff --git a/tilesets/28_palette_map.asm b/tilesets/underground_palette_map.asm
similarity index 100%
rename from tilesets/28_palette_map.asm
rename to tilesets/underground_palette_map.asm
diff --git a/tilesets/unused_30_collision.bin b/tilesets/unused_whirl_islands_collision.bin
similarity index 100%
rename from tilesets/unused_30_collision.bin
rename to tilesets/unused_whirl_islands_collision.bin
diff --git a/tilesets/unused_30_metatiles.bin b/tilesets/unused_whirl_islands_metatiles.bin
similarity index 100%
rename from tilesets/unused_30_metatiles.bin
rename to tilesets/unused_whirl_islands_metatiles.bin
diff --git a/tilesets/30_collision.bin b/tilesets/whirl_islands_collision.bin
similarity index 100%
rename from tilesets/30_collision.bin
rename to tilesets/whirl_islands_collision.bin
diff --git a/tilesets/30_metatiles.bin b/tilesets/whirl_islands_metatiles.bin
similarity index 100%
rename from tilesets/30_metatiles.bin
rename to tilesets/whirl_islands_metatiles.bin
diff --git a/tilesets/30_palette_map.asm b/tilesets/whirl_islands_palette_map.asm
similarity index 100%
rename from tilesets/30_palette_map.asm
rename to tilesets/whirl_islands_palette_map.asm