shithub: pokecrystal

Download patch

ref: 08b14e593e07555c8d3a445d78d9bcb82a10ddf3
parent: a551e345df45897dd17c7cd5c7423851f8f210ba
author: Remy Oukaour <[email protected]>
date: Sun Dec 10 18:42:15 EST 2017

Rename tilesets, consistent with constant names

--- a/constants/tilemap_constants.asm
+++ b/constants/tilemap_constants.asm
@@ -11,7 +11,7 @@
 	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 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 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
--- a/data/sprite_engine.asm
+++ b/data/sprite_engine.asm
@@ -1640,7 +1640,7 @@
 	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)
binary files a/gfx/tilesets/00.2bpp.lz.0c7e555a /dev/null differ
binary files a/gfx/tilesets/00.png /dev/null differ
binary files a/gfx/tilesets/01.2bpp.lz.0c7e555a /dev/null differ
binary files a/gfx/tilesets/01.png /dev/null differ
binary files a/gfx/tilesets/02.2bpp.lz.391603fb /dev/null differ
binary files a/gfx/tilesets/02.png /dev/null differ
binary files a/gfx/tilesets/03.2bpp.lz.a29f5d51 /dev/null differ
binary files a/gfx/tilesets/03.png /dev/null differ
binary files a/gfx/tilesets/04.2bpp.lz.391603fb /dev/null differ
binary files a/gfx/tilesets/04.png /dev/null differ
binary files a/gfx/tilesets/05.2bpp.lz.c848ef13 /dev/null differ
binary files a/gfx/tilesets/05.png /dev/null differ
binary files a/gfx/tilesets/06.2bpp.lz.252cbd8f /dev/null differ
binary files a/gfx/tilesets/06.png /dev/null differ
binary files a/gfx/tilesets/07.2bpp.lz.e1c4014c /dev/null differ
binary files a/gfx/tilesets/07.png /dev/null differ
binary files a/gfx/tilesets/08.2bpp.lz.f5a55006 /dev/null differ
binary files a/gfx/tilesets/08.png /dev/null differ
binary files a/gfx/tilesets/09.2bpp.lz.56b1a405 /dev/null differ
binary files a/gfx/tilesets/09.png /dev/null differ
binary files a/gfx/tilesets/10.2bpp.lz.b8d0f547 /dev/null differ
binary files a/gfx/tilesets/10.png /dev/null differ
binary files a/gfx/tilesets/11.2bpp.lz.454cfd8b /dev/null differ
binary files a/gfx/tilesets/11.png /dev/null differ
binary files a/gfx/tilesets/12.2bpp.lz.e2e94f92 /dev/null differ
binary files a/gfx/tilesets/12.png /dev/null differ
binary files a/gfx/tilesets/13.2bpp.lz.63b414d4 /dev/null differ
binary files a/gfx/tilesets/13.png /dev/null differ
binary files a/gfx/tilesets/14.2bpp.lz.71d29a2f /dev/null differ
binary files a/gfx/tilesets/14.png /dev/null differ
binary files a/gfx/tilesets/15.2bpp.lz.c1f2ed8f /dev/null differ
binary files a/gfx/tilesets/15.png /dev/null differ
binary files a/gfx/tilesets/16.2bpp.lz.dd51d079 /dev/null differ
binary files a/gfx/tilesets/16.png /dev/null differ
binary files a/gfx/tilesets/17.2bpp.lz.1600ca86 /dev/null differ
binary files a/gfx/tilesets/17.png /dev/null differ
binary files a/gfx/tilesets/18.2bpp.lz.93800351 /dev/null differ
binary files a/gfx/tilesets/18.png /dev/null differ
binary files a/gfx/tilesets/19.2bpp.lz.0c1544c1 /dev/null differ
binary files a/gfx/tilesets/19.png /dev/null differ
binary files a/gfx/tilesets/20.2bpp.lz.35e51007 /dev/null differ
binary files a/gfx/tilesets/20.png /dev/null differ
binary files a/gfx/tilesets/21.2bpp.lz.febbc4ec /dev/null differ
binary files a/gfx/tilesets/21.png /dev/null differ
binary files a/gfx/tilesets/22.2bpp.lz.467b6a2d /dev/null differ
binary files a/gfx/tilesets/22.png /dev/null differ
binary files a/gfx/tilesets/23.2bpp.lz.bc56789c /dev/null differ
binary files a/gfx/tilesets/23.png /dev/null differ
binary files a/gfx/tilesets/24.2bpp.lz.3437812a /dev/null differ
binary files a/gfx/tilesets/24.png /dev/null differ
binary files a/gfx/tilesets/25.2bpp.lz.7fcb81d6 /dev/null differ
binary files a/gfx/tilesets/25.png /dev/null differ
binary files a/gfx/tilesets/26.2bpp.lz.8b42470b /dev/null differ
binary files a/gfx/tilesets/26.png /dev/null differ
binary files a/gfx/tilesets/27.2bpp.lz.27cdd9ad /dev/null differ
binary files a/gfx/tilesets/27.png /dev/null differ
binary files a/gfx/tilesets/28.2bpp.lz.cace291c /dev/null differ
binary files a/gfx/tilesets/28.png /dev/null differ
binary files a/gfx/tilesets/29.2bpp.lz.e23bc89f /dev/null differ
binary files a/gfx/tilesets/29.png /dev/null differ
binary files a/gfx/tilesets/30.2bpp.lz.25b9c4b6 /dev/null differ
binary files a/gfx/tilesets/30.png /dev/null differ
binary files a/gfx/tilesets/31.2bpp.lz.6b0ac896 /dev/null differ
binary files a/gfx/tilesets/31.png /dev/null differ
binary files a/gfx/tilesets/32.2bpp.lz.8b42470b /dev/null differ
binary files a/gfx/tilesets/32.png /dev/null differ
binary files a/gfx/tilesets/33.2bpp.lz.8b42470b /dev/null differ
binary files a/gfx/tilesets/33.png /dev/null differ
binary files a/gfx/tilesets/34.2bpp.lz.8b42470b /dev/null differ
binary files a/gfx/tilesets/34.png /dev/null differ
binary files a/gfx/tilesets/35.2bpp.lz.8b42470b /dev/null differ
binary files a/gfx/tilesets/35.png /dev/null differ
binary files a/gfx/tilesets/36.2bpp.lz.8b42470b /dev/null differ
binary files a/gfx/tilesets/36.png /dev/null differ
binary files /dev/null b/gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/aerodactyl_word_room.png differ
binary files /dev/null b/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d differ
binary files /dev/null b/gfx/tilesets/battle_tower.png differ
binary files /dev/null b/gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb differ
binary files /dev/null b/gfx/tilesets/battle_tower_outside.png differ
binary files /dev/null b/gfx/tilesets/beta_word_room.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/beta_word_room.png differ
binary files /dev/null b/gfx/tilesets/cave.2bpp.lz.3437812a differ
binary files /dev/null b/gfx/tilesets/cave.png differ
binary files /dev/null b/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 differ
binary files /dev/null b/gfx/tilesets/celadon_mansion.png differ
binary files /dev/null b/gfx/tilesets/game_corner.2bpp.lz.71d29a2f differ
binary files /dev/null b/gfx/tilesets/game_corner.png differ
binary files /dev/null b/gfx/tilesets/gate.2bpp.lz.f5a55006 differ
binary files /dev/null b/gfx/tilesets/gate.png differ
binary files /dev/null b/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f differ
binary files /dev/null b/gfx/tilesets/gym_1.png differ
binary files /dev/null b/gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/ho_oh_word_room.png differ
binary files /dev/null b/gfx/tilesets/house_1.2bpp.lz.c848ef13 differ
binary files /dev/null b/gfx/tilesets/house_1.png differ
binary files /dev/null b/gfx/tilesets/ice_path.2bpp.lz.e23bc89f differ
binary files /dev/null b/gfx/tilesets/ice_path.png differ
binary files /dev/null b/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 differ
binary files /dev/null b/gfx/tilesets/ilex_forest.png differ
binary files /dev/null b/gfx/tilesets/johto_1.2bpp.lz.0c7e555a differ
binary files /dev/null b/gfx/tilesets/johto_1.png differ
binary files /dev/null b/gfx/tilesets/johto_2.2bpp.lz.391603fb differ
binary files /dev/null b/gfx/tilesets/johto_2.png differ
binary files /dev/null b/gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/kabuto_word_room.png differ
binary files /dev/null b/gfx/tilesets/kanto.2bpp.lz.a29f5d51 differ
binary files /dev/null b/gfx/tilesets/kanto.png differ
binary files /dev/null b/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 differ
binary files /dev/null b/gfx/tilesets/kurts_house.png differ
binary files /dev/null b/gfx/tilesets/lab.2bpp.lz.b8d0f547 differ
binary files /dev/null b/gfx/tilesets/lab.png differ
binary files /dev/null b/gfx/tilesets/lighthouse.2bpp.lz.0c1544c1 differ
binary files /dev/null b/gfx/tilesets/lighthouse.png differ
binary files /dev/null b/gfx/tilesets/mart.2bpp.lz.e2e94f92 differ
binary files /dev/null b/gfx/tilesets/mart.png differ
binary files /dev/null b/gfx/tilesets/olivine_gym.2bpp.lz.93800351 differ
binary files /dev/null b/gfx/tilesets/olivine_gym.png differ
binary files /dev/null b/gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/omanyte_word_room.png differ
binary files /dev/null b/gfx/tilesets/park.2bpp.lz.7fcb81d6 differ
binary files /dev/null b/gfx/tilesets/park.png differ
binary files /dev/null b/gfx/tilesets/players_house.2bpp.lz.252cbd8f differ
binary files /dev/null b/gfx/tilesets/players_house.png differ
binary files /dev/null b/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 differ
binary files /dev/null b/gfx/tilesets/players_house_2f.png differ
binary files /dev/null b/gfx/tilesets/pokecenter.2bpp.lz.e1c4014c differ
binary files /dev/null b/gfx/tilesets/pokecenter.png differ
binary files /dev/null b/gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec differ
binary files /dev/null b/gfx/tilesets/pokecom_center.png differ
binary files /dev/null b/gfx/tilesets/port.2bpp.lz.56b1a405 differ
binary files /dev/null b/gfx/tilesets/port.png differ
binary files /dev/null b/gfx/tilesets/power_plant.2bpp.lz.454cfd8b differ
binary files /dev/null b/gfx/tilesets/power_plant.png differ
binary files /dev/null b/gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad differ
binary files /dev/null b/gfx/tilesets/radio_tower.png differ
binary files /dev/null b/gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b differ
binary files /dev/null b/gfx/tilesets/ruins_of_alph.png differ
binary files /dev/null b/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c differ
binary files /dev/null b/gfx/tilesets/sprout_tower.png differ
binary files /dev/null b/gfx/tilesets/train_station.2bpp.lz.1600ca86 differ
binary files /dev/null b/gfx/tilesets/train_station.png differ
binary files /dev/null b/gfx/tilesets/underground.2bpp.lz.cace291c differ
binary files /dev/null b/gfx/tilesets/underground.png differ
binary files /dev/null b/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 differ
binary files /dev/null b/gfx/tilesets/whirl_islands.png differ
--- a/home/map.asm
+++ b/home/map.asm
@@ -2374,12 +2374,12 @@
 	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
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -38,7 +38,7 @@
 	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 @@
 	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 @@
 
 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 @@
 	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 @@
 	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 @@
 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 @@
 	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 @@
 	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 @@
 	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
binary files a/tilesets/00_collision.bin /dev/null differ
binary files a/tilesets/00_metatiles.bin /dev/null differ
--- a/tilesets/00_palette_map.asm
+++ /dev/null
@@ -1,29 +1,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
binary files a/tilesets/01_collision.bin /dev/null differ
binary files a/tilesets/01_metatiles.bin /dev/null differ
--- a/tilesets/01_palette_map.asm
+++ /dev/null
@@ -1,29 +1,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
binary files a/tilesets/02_collision.bin /dev/null differ
binary files a/tilesets/02_metatiles.bin /dev/null differ
--- a/tilesets/02_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
-	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
-	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GRAY, GREEN, GREEN
-	tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED
-	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW
-	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY
-	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
-	tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN
-	tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED
-	tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW
-	tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN
-	tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF
binary files a/tilesets/03_collision.bin /dev/null differ
binary files a/tilesets/03_metatiles.bin /dev/null differ
--- a/tilesets/03_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
-	tilepal 0, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN
-	tilepal 0, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
-	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
-	tilepal 0, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
-	tilepal 1, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN
-	tilepal 1, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
-	tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
-	tilepal 1, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
binary files a/tilesets/04_collision.bin /dev/null differ
binary files a/tilesets/04_metatiles.bin /dev/null differ
--- a/tilesets/04_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
-	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
-	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, BROWN
-	tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
-	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
-	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, RED, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, RED, RED, RED, ROOF, RED, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED, RED
-	tilepal 1, RED, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED
-	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
-	tilepal 1, RED, RED, RED, RED, RED, YELLOW, YELLOW, YELLOW
-	tilepal 1, YELLOW, RED, RED, RED, WATER, WATER, WATER, RED
-	tilepal 1, RED, RED, ROOF, RED, RED, ROOF, RED, RED
-	tilepal 1, RED, ROOF, ROOF, RED, RED, RED, ROOF, ROOF
-	tilepal 1, RED, RED, RED, RED, YELLOW, RED, GREEN, RED
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF
binary files a/tilesets/05_collision.bin /dev/null differ
binary files a/tilesets/05_metatiles.bin /dev/null differ
--- a/tilesets/05_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
-	tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN
-	tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
-	tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
-	tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
-	tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
binary files a/tilesets/06_collision.bin /dev/null differ
binary files a/tilesets/06_metatiles.bin /dev/null differ
--- a/tilesets/06_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
-	tilepal 0, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files a/tilesets/07_collision.bin /dev/null differ
binary files a/tilesets/07_metatiles.bin /dev/null differ
--- a/tilesets/07_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
-	tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
-	tilepal 0, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
-	tilepal 0, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY
-	tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
-	tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
-	tilepal 0, RED, RED, RED, RED, RED, RED, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
-	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
-	tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY
-	tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
-	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
-	tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
-	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
binary files a/tilesets/08_collision.bin /dev/null differ
binary files a/tilesets/08_metatiles.bin /dev/null differ
--- a/tilesets/08_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GRAY, WATER, WATER, RED, GREEN, GREEN, GREEN
-	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
-	tilepal 0, WATER, GRAY, WATER, WATER, RED, BROWN, BROWN, WATER
-	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, WATER
-	tilepal 0, GREEN, GREEN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
-	tilepal 0, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, GREEN, GREEN, GREEN, GREEN, GRAY, WATER, WATER, WATER
-	tilepal 0, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, ROOF, RED, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, WATER
-	tilepal 1, GRAY, ROOF, RED, GRAY, GRAY, WATER, GRAY, GRAY
-	tilepal 1, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, WATER, WATER, WATER
-	tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
binary files a/tilesets/09_collision.bin /dev/null differ
--- a/tilesets/09_metatiles.bin
+++ /dev/null
@@ -1,65 +1,0 @@
-""""!!!!1111111111111111    ""       !!!!+,--9::3#$%./02;<=>&'()345?@AB*678CDE+,-39:PQXYZFGHIRRSSZ[\\IJKLT,-U]^^^MNOVW_����������������""""""""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	

""1111
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-���������������������������������������������������������������������������������������������
\ No newline at end of file
--- a/tilesets/09_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
-	tilepal 0, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
-	tilepal 1, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY
-	tilepal 1, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
binary files a/tilesets/10_collision.bin /dev/null differ
binary files a/tilesets/10_metatiles.bin /dev/null differ
--- a/tilesets/10_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, WATER, WATER, WATER, WATER, ROOF, BROWN, BROWN, BROWN
-	tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
-	tilepal 0, WATER, WATER, WATER, WATER, RED, BROWN, BROWN, GRAY
-	tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
-	tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, BROWN, GREEN, GREEN, GREEN
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, RED, RED, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
binary files a/tilesets/11_collision.bin /dev/null differ
--- a/tilesets/11_metatiles.bin
+++ /dev/null
@@ -1,8 +1,0 @@
-6666666666666666""""""""&&&&@B@B
-
-
-
-&&&&88889999&& !&&&&&01&&&&&@B@B()()()()*+()&&&&&&&&	&&,-""<=""./&>?&"",-""<=&./&>?







&&&&''''7777,-&<=&./&>?&&,-&<=&./&>?@AABPQQRPHIRS::T&&&@A&PQ&&AAABQQQREEFEUUVU
-K
-[EFEEUVUUK
-[&PQ&S:&&QQQR:::T&&EFE;UVU;JKJ;Z[Z;6666666666666666AAABMMMN88889999""""""""#$$%WXXY""""@B""PRPRPRPRPR""23""CD&&&&""""""@B&PR&PR;;;;;;;;&&&&&&&&;;;;;;;;""""@B""PR&PR&PR&PR&PR&PR&PR&PR&PR@APRLM&&&&&@A&LM&&&&AB&MN&&&&&@B@APRLM&&&&	&&@AABPHIR	&&&&&&@B&PR&PR&PR&PR&&@BPR#$$%WXXY&&&&PRPRPRPR@B&PR&PR&PR&@AAALMMM&&&&AAABMMMN&&&&&@B&PR&PR&PR&&&&AAAAMMMM""""""""&&AAAAMMMM&&&&&PR&PR&PR&PR&@A&PQ&PQ&S:@AAALMMM88889999&PR&PRABPRMNPR""""""\]&^_&@B@APRLMPR&PR&AB@BMNPR&PR&PRPR&PR&PR@ALM&PR&PRABPRMN
\ No newline at end of file
--- a/tilesets/11_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
-	tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN
-	tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
-	tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED
-	tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER
-	tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
-	tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
-	tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN
-	tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
-	tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED
-	tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER
-	tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
-	tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
binary files a/tilesets/12_collision.bin /dev/null differ
--- a/tilesets/12_metatiles.bin
+++ /dev/null
@@ -1,3 +1,0 @@
-,-<=
-II"#23$%45*+>?>?*+ !01JK	����./����������������*;;;>?>?>?;;;;&'67()89@AB+PQRECD\]STU

VWVWXYXYZ[Z[

PQPQPQPQ^_^_������������ؑ��*+>?>?,-<=*;;;>?>?::>?::;;;+>?::>?::>?>?::

::>?

F:F:F::G:G:G"#23$%45

LMLMLMLMNONO !HH01HH>?HH>?HHHH&'HH67HH()HH89����������������
-II
*+PQ>?PQ>?^_HH&'HH67HH()HH89/HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH;;;;&'67()89>?>?.�������Ӑ��ڐ��܁�����������������"#��23��$%��������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
--- a/tilesets/12_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GREEN, GREEN, WATER, RED, GRAY, GRAY, ROOF, ROOF
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, RED, ROOF, ROOF, GRAY, YELLOW
-	tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
-	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
-	tilepal 0, WATER, WATER, RED, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED, RED
-	tilepal 0, GREEN, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, RED, YELLOW, YELLOW, YELLOW, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, RED, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN, GRAY
-	tilepal 1, GRAY, GREEN, GREEN, RED, RED, WATER, WATER, ROOF
-	tilepal 1, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW, ROOF, GRAY
-	tilepal 1, GRAY, GRAY, WATER, GRAY, GRAY, GRAY, YELLOW, YELLOW
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, RED, WATER, RED
-	tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
-	tilepal 1, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, GRAY, GRAY, WATER, GRAY, WATER, RED, BROWN, BROWN
binary files a/tilesets/13_collision.bin /dev/null differ
binary files a/tilesets/13_metatiles.bin /dev/null differ
--- a/tilesets/13_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER
-	tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN
-	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN
-	tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW
-	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW
-	tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN
-	tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW
-	tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
binary files a/tilesets/14_collision.bin /dev/null differ
binary files a/tilesets/14_metatiles.bin /dev/null differ
--- a/tilesets/14_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, GREEN, GREEN, GREEN
-	tilepal 0, GREEN, GREEN, GRAY, GRAY, RED, RED, GREEN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, RED, BROWN, GREEN, GRAY, GRAY
-	tilepal 0, GRAY, GREEN, GRAY, GRAY, RED, RED, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, RED, RED, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, GRAY, GREEN, RED, RED, GREEN, GRAY, RED, RED
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, RED, RED, GREEN, BROWN, RED, RED
-	tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
-	tilepal 0, RED, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, BROWN
-	tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
-	tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, RED, ROOF, ROOF
-	tilepal 1, YELLOW, RED, YELLOW, RED, WATER, WATER, RED, RED
-	tilepal 1, RED, RED, RED, RED, GREEN, GRAY, RED, RED
-	tilepal 1, RED, RED, YELLOW, YELLOW, WATER, WATER, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, RED, RED, GREEN, ROOF, RED, RED
-	tilepal 1, RED, RED, YELLOW, YELLOW, ROOF, ROOF, RED, RED
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
-	tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED
-	tilepal 1, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
binary files a/tilesets/15_collision.bin /dev/null differ
binary files a/tilesets/15_metatiles.bin /dev/null differ
--- a/tilesets/15_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
-	tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
-	tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
-	tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN
-	tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
-	tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
-	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
-	tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
-	tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
-	tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
-	tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN
-	tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
-	tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
-	tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
binary files a/tilesets/16_collision.bin /dev/null differ
binary files a/tilesets/16_metatiles.bin /dev/null differ
--- a/tilesets/16_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
-	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY
-	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
-	tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY
-	tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
binary files a/tilesets/17_collision.bin /dev/null differ
binary files a/tilesets/17_metatiles.bin /dev/null differ
--- a/tilesets/17_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
-	tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
-	tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
-	tilepal 0, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
-	tilepal 1, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
-	tilepal 1, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY
-	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
-	tilepal 1, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
binary files a/tilesets/18_collision.bin /dev/null differ
--- a/tilesets/18_metatiles.bin
+++ /dev/null
@@ -1,15 +1,0 @@
-
 *()  89+,!!          


%'!!	 5 5 5 5 5&&01                    %&&'677:"##$2334������ַ��������
        +,+, *()  89        SSSSSSSSSSSSSSSSFGFGVWVWFGSSVWSS                FGFGVWVWSSFGSSVW�]���]]]%&&'XYXYѣ�ѥ�����������SSSSSSSSFGFGVWVW����������������FGSSVWSSFGSSVWSSSSFGSSVWSSFGSSVW./SS>?SSNOSS^_SSSS./SS>?SSNOSS^_S@HH@PQQPPQQPPQQHHHHQQQQQQQQQQQQHHBSQQRBQQRRQQRR----------------PPQQPPQQPCDDCDDDQQQQQQQQTUTUTUTUQQRRQQRRDDERDDDESSSSSSSS
-SS
-SS
-SSSS
-FG
-VW
-FG
-VWFG
-VW
-FG
-VW
-SS
-SS
-SS
-SSʰ��˱ݱ̲޲�������αݱϲ޲�����FGFGVWVWFGFGVWVW����]]]]%&&'XYXY����ݱ��޲�������°��ı��Ʋ����������������������]���]���]���]����]���]���]���]�;<<=;<<=;<<=;<<=����������������````````````````;<<=;<<=%&&'XYXY����������������������������������]�]]]�%&&'XYXY�]���]]��]]��]����]��]]��]]���]��]���]���]���]����]���]���]���]���������������������;<<=�����������Ӣ��ґ���������ӡ��Ӣ�������
\ No newline at end of file
--- a/tilesets/18_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED
-	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY
binary files a/tilesets/19_collision.bin /dev/null differ
binary files a/tilesets/19_metatiles.bin /dev/null differ
--- a/tilesets/19_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, WATER, WATER, WATER, BROWN, WATER, WATER, RED
-	tilepal 0, RED, ROOF, ROOF, BROWN, ROOF, RED, RED, RED
-	tilepal 0, ROOF, WATER, ROOF, BROWN, ROOF, WATER, WATER, RED
-	tilepal 0, RED, ROOF, ROOF, WATER, ROOF, RED, RED, RED
-	tilepal 0, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, GRAY, GRAY
-	tilepal 0, ROOF, ROOF, WATER, WATER, RED, ROOF, BROWN, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER
-	tilepal 0, YELLOW, YELLOW, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
-	tilepal 0, YELLOW, YELLOW, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
-	tilepal 0, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, ROOF, GRAY, GRAY, BROWN, BROWN, RED
-	tilepal 1, RED, RED, RED, BROWN, RED, RED, RED, RED
-	tilepal 1, ROOF, WATER, ROOF, BROWN, RED, WATER, WATER, RED
-	tilepal 1, RED, RED, RED, WATER, RED, RED, RED, RED
-	tilepal 1, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, BROWN, RED, ROOF, GRAY, GRAY
-	tilepal 1, ROOF, ROOF, WATER, WATER, RED, RED, BROWN, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER
-	tilepal 1, RED, RED, ROOF, ROOF, BROWN, BROWN, GRAY, GRAY
-	tilepal 1, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
-	tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
-	tilepal 1, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
binary files a/tilesets/20_collision.bin /dev/null differ
binary files a/tilesets/20_metatiles.bin /dev/null differ
--- a/tilesets/20_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
-	tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
-	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
-	tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED
-	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
-	tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED
-	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
-	tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
-	tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
-	tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
-	tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
-	tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED
-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
-	tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED
-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
-	tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
-	tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
-	tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
binary files a/tilesets/21_collision.bin /dev/null differ
--- a/tilesets/21_metatiles.bin
+++ /dev/null
@@ -1,2 +1,0 @@
-================"#23"#23��%,-./<==?LMNO��
- !01@A544$$$$����44$$$$4444$$$$�R,/�RLO�R\]������%4�$����,/��LO:;\]��5$$$$�R&'�R�R�������������������������JK��Z[%444$$$�����	���4444$$$$4444$$$$����������������������������������������������4444$$$$����================���������������۪��������������݈������������������������������������4���$���������������������۶�����������������������������������������������ѷ����������������������������DETUQQQQPPPPHIHIXYXY4���$�������>�������������������44��������4444����������������^_^_��()��89��:;����$$$$�ǂ��ׁ�����()$$89��:;�ׂ���������	�BC���S����������Ͼ����߁���������������4$$$�444���$����������������4444$$$$�������������������������������
\ No newline at end of file
--- a/tilesets/21_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 0, WATER, WATER, GRAY, GRAY, RED, GRAY, WATER, WATER
-	tilepal 0, RED, WATER, GRAY, WATER, WATER, WATER, RED, RED
-	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
-	tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER
-	tilepal 0, RED, RED, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY
-	tilepal 0, GRAY, GRAY, WATER, WATER, WATER, WATER, RED, WATER
-	tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, RED, RED, GRAY
-	tilepal 0, RED, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, GRAY, YELLOW, YELLOW
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, GRAY, GRAY, WATER, RED, RED, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GRAY, WATER
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, RED, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, RED, RED, GRAY, GRAY, RED, RED, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN
-	tilepal 1, WATER, RED, WATER, BROWN, WATER, WATER, WATER, WATER
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN
-	tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
binary files a/tilesets/22_collision.bin /dev/null differ
binary files a/tilesets/22_metatiles.bin /dev/null differ
--- a/tilesets/22_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, RED, WATER, WATER, GRAY, GRAY, WATER, WATER
-	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
-	tilepal 0, WATER, RED, WATER, WATER, GRAY, GRAY, WATER, WATER
-	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
-	tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, GRAY
-	tilepal 0, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, WATER
-	tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, RED, BROWN, RED, BROWN, BROWN, BROWN, RED, RED
-	tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER
-	tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED
-	tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF
-	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED
-	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
-	tilepal 1, RED, GRAY, GRAY, GRAY, GREEN, YELLOW, RED, RED
-	tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
-	tilepal 1, YELLOW, YELLOW, BROWN, YELLOW, WATER, WATER, YELLOW, RED
-	tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
-	tilepal 1, GRAY, GRAY, BROWN, YELLOW, RED, RED, YELLOW, RED
-	tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
-	tilepal 1, GRAY, GRAY, YELLOW, BROWN, WATER, WATER, GRAY, BROWN
-	tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
-	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
binary files a/tilesets/23_collision.bin /dev/null differ
--- a/tilesets/23_metatiles.bin
+++ /dev/null
@@ -1,2 +1,0 @@
-
@ !!A1A1!!!!!!@ A1A1
-A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!!-.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$	
"#23!!67"#!!2367%545%545%545%545	^^		��������������������������������FVGWPQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFVGW
\ No newline at end of file
--- a/tilesets/23_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
-	tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
-	tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
-	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
-	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
binary files a/tilesets/24_collision.bin /dev/null differ
--- a/tilesets/24_metatiles.bin
+++ /dev/null
@@ -1,6 +1,0 @@
-$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&'
-&
-&&&67&&67&&&&$$$$*+:;$$$$"#23







()89







 !01







$$&&&&



@@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%'

&&&&&&&&

-&
-67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&
-&&&
\ No newline at end of file
--- a/tilesets/24_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
binary files a/tilesets/25_collision.bin /dev/null differ
binary files a/tilesets/25_metatiles.bin /dev/null differ
--- a/tilesets/25_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GREEN, BROWN, RED, GREEN, BROWN, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, RED, RED, RED, GRAY, WATER, ROOF, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN
-	tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN
-	tilepal 0, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
-	tilepal 0, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, GRAY, RED
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, WATER, WATER, GRAY, RED, GREEN, BROWN, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, WATER, WATER, RED, GRAY, WATER, ROOF, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN
-	tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN
-	tilepal 1, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, BROWN, GREEN, GREEN, WATER, WATER, WATER, RED
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, GRAY
binary files a/tilesets/26_collision.bin /dev/null differ
binary files a/tilesets/26_metatiles.bin /dev/null differ
--- a/tilesets/26_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files a/tilesets/27_collision.bin /dev/null differ
binary files a/tilesets/27_metatiles.bin /dev/null differ
--- a/tilesets/27_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, RED, RED, WATER, WATER, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, WATER, WATER, RED, WATER, WATER, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, ROOF, ROOF, GRAY, GRAY, BROWN, GRAY, GRAY, BROWN
-	tilepal 0, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
-	tilepal 0, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GREEN, GREEN
-	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, YELLOW, YELLOW, RED
-	tilepal 1, ROOF, RED, RED, ROOF, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, ROOF, ROOF, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
-	tilepal 1, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN
-	tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, RED, GRAY, GRAY, GRAY, GRAY
binary files a/tilesets/28_collision.bin /dev/null differ
--- a/tilesets/28_metatiles.bin
+++ /dev/null
@@ -1,2 +1,0 @@
-*+:;,-<=EFUV	0144444444


44
444444





CDCDSTSTCDCDSTST







"#23






















-QQQQQQQQ./>?./>?@ANOP]^_&'67











	01	01@AAAPQQQPQQQAAABQQQRQQQR@AABPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQR@B@B()89()89
\ No newline at end of file
--- a/tilesets/28_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
-	tilepal 0, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
-	tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
-	tilepal 0, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
-	tilepal 1, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
-	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
-	tilepal 1, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
binary files a/tilesets/29_collision.bin /dev/null differ
--- a/tilesets/29_metatiles.bin
+++ /dev/null
@@ -1,3 +1,0 @@
-�����������
-������������������������������������������������������*+�:;����������������������������������������������������������Ө��������������ʚ��������������ʛ���������������																���������������������������������������������������������������ś�ժ�������������������������������������������ժ������������������������ū�՚������������Ū��՚���������������������Ū������������������������Ś��������������������������ՙ���������Ⱥ��������������������������͘��������������������������BC�������������



���ǒ������������������ׂ��ǒ����ǂ��ג������������������ǂ��ג�RRRRSS(S
>8(TRRRR,--.IJHKRRRRS)SS9?
V)RRRRSSSS


>TLM
\]XYZ[8//9WGGGU?
NO^_
��������
-��������*+�:;�������������ɾ����������������͈���������������&'
67EF




����������������4444444444444444
\ No newline at end of file
--- a/tilesets/29_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, BROWN, ROOF, ROOF, BROWN, BROWN, WATER, WATER
-	tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, BROWN, BROWN, WATER, WATER
-	tilepal 0, WATER, ROOF, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
-	tilepal 0, WATER, WATER, ROOF, ROOF, WATER, WATER, WATER, WATER
-	tilepal 0, BROWN, WATER, WATER, WATER, WATER, WATER, GRAY, GRAY
-	tilepal 0, WATER, WATER, ROOF, ROOF, GRAY, GRAY, WATER, WATER
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, GREEN, GRAY, GRAY, WATER
-	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, WATER
-	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN
-	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
binary files a/tilesets/30_collision.bin /dev/null differ
--- a/tilesets/30_metatiles.bin
+++ /dev/null
@@ -1,6 +1,0 @@
-$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&'
-&
-&&&67&&67&&&&$$$$*+:;$$$$"#23







()89







 !01







$$&&&&



@@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%'

&&&&&&&&

-&
-67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&
-&&&
\ No newline at end of file
--- a/tilesets/30_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
-	tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
binary files a/tilesets/31_collision.bin /dev/null differ
--- a/tilesets/31_metatiles.bin
+++ /dev/null
@@ -1,1 +1,0 @@
-
,-./<=>?****
,-./<=>?	***&'&'6767&'67&'&'6767&'67&'67***&'67&'67(9&'8:67&'67&'&'6767&'&'6767&'67&'&'6767&'67&'67&'67&'67)**********+** !!! !!! !!!!!!!!!!!!!!!!!!"!!!"!!!"02 !!!0111#$$$#$!!!!1111$$$$$$!!!"1112$$$%$%#$$$#$$$#$34#$$$#$$$#$$$3444$$$$$$$$$$$$4444$$$%$$$%$$$%4445
\ No newline at end of file
--- a/tilesets/31_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
-	tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
-	tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
-	tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files a/tilesets/32_collision.bin /dev/null differ
--- a/tilesets/32_metatiles.bin
+++ /dev/null
@@ -1,17 +1,0 @@
-�À��Ӑ��������������������������������������������������Ǧ��׶������������������������������������������������������ǀ��א�����������������	
-
-
- !"#����@ABC	89
-
-
-
-
-
-
-
-
-
-
-TVXY	
-C 6!@	#8
-6"7�����������������������������������������������������������������������������������������������������������������������𠡀��������������������������������Ő������������������������������������������������������������Ѳ�����������������������������������������
\ No newline at end of file
--- a/tilesets/32_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files a/tilesets/33_collision.bin /dev/null differ
--- a/tilesets/33_metatiles.bin
+++ /dev/null
@@ -1,17 +1,0 @@
-�͈��ݘ������ɨ��ٸ����������������ɸ����������������������Ð��������Ǭ��׼����������������������������������è��Ӹ�	
-
-
- !"#��������@ABC	89
-
-
-
-
-
-
-
-
-
-
-TVXY	
-C 6!@	#8
-6"7[\M]�͠��ݰ��ǎ��מ��ǎ��מ����������͈��ݘ����������������Ð��������������������ǎ��מ��������������ŀ��Ր�������������
\ No newline at end of file
--- a/tilesets/33_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files a/tilesets/34_collision.bin /dev/null differ
--- a/tilesets/34_metatiles.bin
+++ /dev/null
@@ -1,17 +1,0 @@
-���ɼ��������ͬ��ݼ��Æ��Ӗ������Ŏ��՞��������������È��Ә������������������������Ø��������������������ǎ��מ�����	
-
-
- !"#��������@ABC	89
-
-
-
-
-
-
-
-
-
-
-TVXY	
-C 6!@	#8
-6"7������
\ No newline at end of file
--- a/tilesets/34_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files a/tilesets/35_collision.bin /dev/null differ
--- a/tilesets/35_metatiles.bin
+++ /dev/null
@@ -1,17 +1,0 @@
-�ǎ��מ���[\��M]�������ż����ň��՘������������Ü������������������������Š��հ�������������������������	
-
-
- !"#�È��Ә�@ABC	89
-
-
-
-
-
-
-
-
-
-
-TVXY	
-C 6!@	#8
-6"7���ɚ����ň��՘����������������ɼ������������������������ͬ��ݼ��æ��Ӷ�����
\ No newline at end of file
--- a/tilesets/35_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files a/tilesets/36_collision.bin /dev/null differ
--- a/tilesets/36_metatiles.bin
+++ /dev/null
@@ -1,17 +1,0 @@
-�ǎ��מ������������������Ŏ��՞����������������Ø����������������������������������������������������������ǐ���	
-
-
- !"#�Ɉ��٘�@ABC	89
-
-
-
-
-
-
-
-
-
-
-TVXY	
-C 6!@	#8
-6"7�������������Š��հ���������
\ No newline at end of file
--- a/tilesets/36_palette_map.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
-	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
-	db $ff
-endr
-
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files /dev/null b/tilesets/aerodactyl_word_room_collision.bin differ
--- /dev/null
+++ b/tilesets/aerodactyl_word_room_metatiles.bin
@@ -1,0 +1,17 @@
+�ǎ��מ������������������Ŏ��՞����������������Ø����������������������������������������������������������ǐ���	
+
+
+ !"#�Ɉ��٘�@ABC	89
+
+
+
+
+
+
+
+
+
+
+TVXY	
+C 6!@	#8
+6"7�������������Š��հ���������
\ No newline at end of file
--- /dev/null
+++ b/tilesets/aerodactyl_word_room_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -35,9 +35,9 @@
 	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 @@
 	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 @@
 	dw NULL,  DoneTileAnimation
 ; 0xfc073
 
-Tileset31Anim: ; 0xfc073
+TilesetIlexForestAnim: ; 0xfc073
 	dw NULL,  ForestTreeLeftAnimation
 	dw NULL,  ForestTreeRightAnimation
 	dw NULL,  WaitTileAnimation
@@ -80,7 +80,7 @@
 	dw NULL,  DoneTileAnimation
 ; 0xfc0a3
 
-Tileset01Anim: ; 0xfc0a3
+TilesetJohto1Anim: ; 0xfc0a3
 	dw VTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -124,7 +124,7 @@
 	dw NULL,  DoneTileAnimation
 ; 0xfc12f
 
-Tileset09Anim: ; 0xfc12f
+TilesetPortAnim: ; 0xfc12f
 	dw VTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -139,7 +139,7 @@
 	dw NULL,  DoneTileAnimation
 ; 0xfc15f
 
-Tileset15Anim: ; 0xfc15f
+TilesetGym1Anim: ; 0xfc15f
 	dw NULL,  SafariFountainAnim2
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -182,8 +182,8 @@
 	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 @@
 	dw NULL,  DoneTileAnimation
 ; 0xfc233
 
-Tileset29Anim: ; 0xfc233
+TilesetIcePathAnim: ; 0xfc233
 	dw VTiles2 tile $35, WriteTileToBuffer
 	dw NULL,  FlickeringCaveEntrancePalette
 	dw wTileAnimBuffer, ScrollTileRightLeft
@@ -227,7 +227,7 @@
 	dw NULL,  DoneTileAnimation
 ; 0xfc27f
 
-Tileset23Anim: ; 0xfc27f
+TilesetSproutTowerAnim: ; 0xfc27f
 	dw SproutPillarTilePointer9,  AnimateSproutPillarTile
 	dw SproutPillarTilePointer10, AnimateSproutPillarTile
 	dw SproutPillarTilePointer7,  AnimateSproutPillarTile
@@ -259,31 +259,31 @@
 	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
binary files /dev/null b/tilesets/battle_tower_collision.bin differ
binary files /dev/null b/tilesets/battle_tower_metatiles.bin differ
binary files /dev/null b/tilesets/battle_tower_outside_collision.bin differ
binary files /dev/null b/tilesets/battle_tower_outside_metatiles.bin differ
--- /dev/null
+++ b/tilesets/battle_tower_outside_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
+	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, BROWN
+	tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
+	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
+	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, RED, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, RED, RED, RED, ROOF, RED, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED, RED
+	tilepal 1, RED, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED
+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+	tilepal 1, RED, RED, RED, RED, RED, YELLOW, YELLOW, YELLOW
+	tilepal 1, YELLOW, RED, RED, RED, WATER, WATER, WATER, RED
+	tilepal 1, RED, RED, ROOF, RED, RED, ROOF, RED, RED
+	tilepal 1, RED, ROOF, ROOF, RED, RED, RED, ROOF, ROOF
+	tilepal 1, RED, RED, RED, RED, YELLOW, RED, GREEN, RED
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF
--- /dev/null
+++ b/tilesets/battle_tower_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, RED, WATER, WATER, GRAY, GRAY, WATER, WATER
+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
+	tilepal 0, WATER, RED, WATER, WATER, GRAY, GRAY, WATER, WATER
+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
+	tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, GRAY
+	tilepal 0, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, WATER
+	tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, RED, BROWN, RED, BROWN, BROWN, BROWN, RED, RED
+	tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER
+	tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED
+	tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF
+	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED
+	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, RED, GRAY, GRAY, GRAY, GREEN, YELLOW, RED, RED
+	tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
+	tilepal 1, YELLOW, YELLOW, BROWN, YELLOW, WATER, WATER, YELLOW, RED
+	tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
+	tilepal 1, GRAY, GRAY, BROWN, YELLOW, RED, RED, YELLOW, RED
+	tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+	tilepal 1, GRAY, GRAY, YELLOW, BROWN, WATER, WATER, GRAY, BROWN
+	tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
+	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
binary files /dev/null b/tilesets/beta_word_room_collision.bin differ
--- /dev/null
+++ b/tilesets/beta_word_room_metatiles.bin
@@ -1,0 +1,17 @@
+�À��Ӑ��������������������������������������������������Ǧ��׶������������������������������������������������������ǀ��א�����������������	
+
+
+ !"#����@ABC	89
+
+
+
+
+
+
+
+
+
+
+TVXY	
+C 6!@	#8
+6"7�����������������������������������������������������������������������������������������������������������������������𠡀��������������������������������Ő������������������������������������������������������������Ѳ�����������������������������������������
\ No newline at end of file
--- /dev/null
+++ b/tilesets/beta_word_room_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files /dev/null b/tilesets/cave_collision.bin differ
--- /dev/null
+++ b/tilesets/cave_metatiles.bin
@@ -1,0 +1,6 @@
+$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&'
+&
+&&&67&&67&&&&$$$$*+:;$$$$"#23







()89







 !01







$$&&&&



@@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%'

&&&&&&&&

+&
+67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&
+&&&
\ No newline at end of file
--- /dev/null
+++ b/tilesets/cave_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
binary files /dev/null b/tilesets/celadon_mansion_collision.bin differ
binary files /dev/null b/tilesets/celadon_mansion_metatiles.bin differ
--- /dev/null
+++ b/tilesets/celadon_mansion_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER
+	tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN
+	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN
+	tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW
+	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW
+	tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN
+	tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW
+	tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
--- a/tilesets/data.asm
+++ b/tilesets/data.asm
@@ -5,430 +5,430 @@
 
 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
binary files /dev/null b/tilesets/game_corner_collision.bin differ
binary files /dev/null b/tilesets/game_corner_metatiles.bin differ
--- /dev/null
+++ b/tilesets/game_corner_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, GREEN, GREEN, GREEN
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, RED, RED, GREEN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, RED, BROWN, GREEN, GRAY, GRAY
+	tilepal 0, GRAY, GREEN, GRAY, GRAY, RED, RED, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, GRAY, GREEN, RED, RED, GREEN, GRAY, RED, RED
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, GREEN, BROWN, RED, RED
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
+	tilepal 0, RED, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, BROWN
+	tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
+	tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, RED, ROOF, ROOF
+	tilepal 1, YELLOW, RED, YELLOW, RED, WATER, WATER, RED, RED
+	tilepal 1, RED, RED, RED, RED, GREEN, GRAY, RED, RED
+	tilepal 1, RED, RED, YELLOW, YELLOW, WATER, WATER, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, RED, RED, GREEN, ROOF, RED, RED
+	tilepal 1, RED, RED, YELLOW, YELLOW, ROOF, ROOF, RED, RED
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
+	tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED
+	tilepal 1, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
binary files /dev/null b/tilesets/gate_collision.bin differ
binary files /dev/null b/tilesets/gate_metatiles.bin differ
--- /dev/null
+++ b/tilesets/gate_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, WATER, WATER, RED, GREEN, GREEN, GREEN
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+	tilepal 0, WATER, GRAY, WATER, WATER, RED, BROWN, BROWN, WATER
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, WATER
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+	tilepal 0, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, GREEN, GREEN, GREEN, GREEN, GRAY, WATER, WATER, WATER
+	tilepal 0, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, ROOF, RED, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, WATER
+	tilepal 1, GRAY, ROOF, RED, GRAY, GRAY, WATER, GRAY, GRAY
+	tilepal 1, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, WATER, WATER, WATER
+	tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
binary files /dev/null b/tilesets/gym_1_collision.bin differ
binary files /dev/null b/tilesets/gym_1_metatiles.bin differ
--- /dev/null
+++ b/tilesets/gym_1_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
+	tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
+	tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
+	tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN
+	tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+	tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
+	tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
+	tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
+	tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
+	tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN
+	tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+	tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
+	tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
binary files /dev/null b/tilesets/ho_oh_word_room_collision.bin differ
--- /dev/null
+++ b/tilesets/ho_oh_word_room_metatiles.bin
@@ -1,0 +1,17 @@
+�͈��ݘ������ɨ��ٸ����������������ɸ����������������������Ð��������Ǭ��׼����������������������������������è��Ӹ�	
+
+
+ !"#��������@ABC	89
+
+
+
+
+
+
+
+
+
+
+TVXY	
+C 6!@	#8
+6"7[\M]�͠��ݰ��ǎ��מ��ǎ��מ����������͈��ݘ����������������Ð��������������������ǎ��מ��������������ŀ��Ր�������������
\ No newline at end of file
--- /dev/null
+++ b/tilesets/ho_oh_word_room_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files /dev/null b/tilesets/house_1_collision.bin differ
binary files /dev/null b/tilesets/house_1_metatiles.bin differ
--- /dev/null
+++ b/tilesets/house_1_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
+	tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN
+	tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
+	tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
+	tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
+	tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
binary files /dev/null b/tilesets/ice_path_collision.bin differ
--- /dev/null
+++ b/tilesets/ice_path_metatiles.bin
@@ -1,0 +1,3 @@
+�����������
+������������������������������������������������������*+�:;����������������������������������������������������������Ө��������������ʚ��������������ʛ���������������																���������������������������������������������������������������ś�ժ�������������������������������������������ժ������������������������ū�՚������������Ū��՚���������������������Ū������������������������Ś��������������������������ՙ���������Ⱥ��������������������������͘��������������������������BC�������������



���ǒ������������������ׂ��ǒ����ǂ��ג������������������ǂ��ג�RRRRSS(S
>8(TRRRR,--.IJHKRRRRS)SS9?
V)RRRRSSSS


>TLM
\]XYZ[8//9WGGGU?
NO^_
��������
+��������*+�:;�������������ɾ����������������͈���������������&'
67EF




����������������4444444444444444
\ No newline at end of file
--- /dev/null
+++ b/tilesets/ice_path_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, BROWN, ROOF, ROOF, BROWN, BROWN, WATER, WATER
+	tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, BROWN, BROWN, WATER, WATER
+	tilepal 0, WATER, ROOF, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
+	tilepal 0, WATER, WATER, ROOF, ROOF, WATER, WATER, WATER, WATER
+	tilepal 0, BROWN, WATER, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 0, WATER, WATER, ROOF, ROOF, GRAY, GRAY, WATER, WATER
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, GREEN, GRAY, GRAY, WATER
+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, WATER
+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
binary files /dev/null b/tilesets/ilex_forest_collision.bin differ
--- /dev/null
+++ b/tilesets/ilex_forest_metatiles.bin
@@ -1,0 +1,1 @@
+
,-./<=>?****
,-./<=>?	***&'&'6767&'67&'&'6767&'67&'67***&'67&'67(9&'8:67&'67&'&'6767&'&'6767&'67&'&'6767&'67&'67&'67&'67)**********+** !!! !!! !!!!!!!!!!!!!!!!!!"!!!"!!!"02 !!!0111#$$$#$!!!!1111$$$$$$!!!"1112$$$%$%#$$$#$$$#$34#$$$#$$$#$$$3444$$$$$$$$$$$$4444$$$%$$$%$$$%4445
\ No newline at end of file
--- /dev/null
+++ b/tilesets/ilex_forest_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
+	tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
+	tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files /dev/null b/tilesets/johto_1_collision.bin differ
binary files /dev/null b/tilesets/johto_1_metatiles.bin differ
--- /dev/null
+++ b/tilesets/johto_1_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
+	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
+	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
+	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED
+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+	tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files /dev/null b/tilesets/johto_2_collision.bin differ
binary files /dev/null b/tilesets/johto_2_metatiles.bin differ
--- /dev/null
+++ b/tilesets/johto_2_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
+	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GRAY, GREEN, GREEN
+	tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED
+	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW
+	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY
+	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
+	tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED
+	tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW
+	tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN
+	tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF
binary files /dev/null b/tilesets/kabuto_word_room_collision.bin differ
--- /dev/null
+++ b/tilesets/kabuto_word_room_metatiles.bin
@@ -1,0 +1,17 @@
+���ɼ��������ͬ��ݼ��Æ��Ӗ������Ŏ��՞��������������È��Ә������������������������Ø��������������������ǎ��מ�����	
+
+
+ !"#��������@ABC	89
+
+
+
+
+
+
+
+
+
+
+TVXY	
+C 6!@	#8
+6"7������
\ No newline at end of file
--- /dev/null
+++ b/tilesets/kabuto_word_room_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files /dev/null b/tilesets/kanto_collision.bin differ
binary files /dev/null b/tilesets/kanto_metatiles.bin differ
--- /dev/null
+++ b/tilesets/kanto_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
+	tilepal 0, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
+	tilepal 0, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
+	tilepal 1, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN
+	tilepal 1, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+	tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
+	tilepal 1, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
binary files /dev/null b/tilesets/kurts_house_collision.bin differ
binary files /dev/null b/tilesets/kurts_house_metatiles.bin differ
--- /dev/null
+++ b/tilesets/kurts_house_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY
+	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY
+	tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
binary files /dev/null b/tilesets/lab_collision.bin differ
binary files /dev/null b/tilesets/lab_metatiles.bin differ
--- /dev/null
+++ b/tilesets/lab_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, WATER, WATER, WATER, ROOF, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+	tilepal 0, WATER, WATER, WATER, WATER, RED, BROWN, BROWN, GRAY
+	tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, BROWN, GREEN, GREEN, GREEN
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, RED, RED, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
binary files /dev/null b/tilesets/lighthouse_collision.bin differ
binary files /dev/null b/tilesets/lighthouse_metatiles.bin differ
--- /dev/null
+++ b/tilesets/lighthouse_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, WATER, WATER, WATER, BROWN, WATER, WATER, RED
+	tilepal 0, RED, ROOF, ROOF, BROWN, ROOF, RED, RED, RED
+	tilepal 0, ROOF, WATER, ROOF, BROWN, ROOF, WATER, WATER, RED
+	tilepal 0, RED, ROOF, ROOF, WATER, ROOF, RED, RED, RED
+	tilepal 0, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, GRAY, GRAY
+	tilepal 0, ROOF, ROOF, WATER, WATER, RED, ROOF, BROWN, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER
+	tilepal 0, YELLOW, YELLOW, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
+	tilepal 0, YELLOW, YELLOW, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
+	tilepal 0, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, ROOF, GRAY, GRAY, BROWN, BROWN, RED
+	tilepal 1, RED, RED, RED, BROWN, RED, RED, RED, RED
+	tilepal 1, ROOF, WATER, ROOF, BROWN, RED, WATER, WATER, RED
+	tilepal 1, RED, RED, RED, WATER, RED, RED, RED, RED
+	tilepal 1, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, RED, ROOF, GRAY, GRAY
+	tilepal 1, ROOF, ROOF, WATER, WATER, RED, RED, BROWN, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER
+	tilepal 1, RED, RED, ROOF, ROOF, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
+	tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
+	tilepal 1, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
binary files /dev/null b/tilesets/mart_collision.bin differ
--- /dev/null
+++ b/tilesets/mart_metatiles.bin
@@ -1,0 +1,3 @@
+,-<=
+II"#23$%45*+>?>?*+ !01JK	����./����������������*;;;>?>?>?;;;;&'67()89@AB+PQRECD\]STU

VWVWXYXYZ[Z[

PQPQPQPQ^_^_������������ؑ��*+>?>?,-<=*;;;>?>?::>?::;;;+>?::>?::>?>?::

::>?

F:F:F::G:G:G"#23$%45

LMLMLMLMNONO !HH01HH>?HH>?HHHH&'HH67HH()HH89����������������
+II
*+PQ>?PQ>?^_HH&'HH67HH()HH89/HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH;;;;&'67()89>?>?.�������Ӑ��ڐ��܁�����������������"#��23��$%��������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������
\ No newline at end of file
--- /dev/null
+++ b/tilesets/mart_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GREEN, GREEN, WATER, RED, GRAY, GRAY, ROOF, ROOF
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, RED, ROOF, ROOF, GRAY, YELLOW
+	tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+	tilepal 0, WATER, WATER, RED, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED, RED
+	tilepal 0, GREEN, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, YELLOW, YELLOW, YELLOW, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, RED, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN, GRAY
+	tilepal 1, GRAY, GREEN, GREEN, RED, RED, WATER, WATER, ROOF
+	tilepal 1, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW, ROOF, GRAY
+	tilepal 1, GRAY, GRAY, WATER, GRAY, GRAY, GRAY, YELLOW, YELLOW
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, RED, WATER, RED
+	tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+	tilepal 1, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, WATER, GRAY, WATER, RED, BROWN, BROWN
binary files /dev/null b/tilesets/olivine_gym_collision.bin differ
--- /dev/null
+++ b/tilesets/olivine_gym_metatiles.bin
@@ -1,0 +1,15 @@
+
 *()  89+,!!          


%'!!	 5 5 5 5 5&&01                    %&&'677:"##$2334������ַ��������
        +,+, *()  89        SSSSSSSSSSSSSSSSFGFGVWVWFGSSVWSS                FGFGVWVWSSFGSSVW�]���]]]%&&'XYXYѣ�ѥ�����������SSSSSSSSFGFGVWVW����������������FGSSVWSSFGSSVWSSSSFGSSVWSSFGSSVW./SS>?SSNOSS^_SSSS./SS>?SSNOSS^_S@HH@PQQPPQQPPQQHHHHQQQQQQQQQQQQHHBSQQRBQQRRQQRR----------------PPQQPPQQPCDDCDDDQQQQQQQQTUTUTUTUQQRRQQRRDDERDDDESSSSSSSS
+SS
+SS
+SSSS
+FG
+VW
+FG
+VWFG
+VW
+FG
+VW
+SS
+SS
+SS
+SSʰ��˱ݱ̲޲�������αݱϲ޲�����FGFGVWVWFGFGVWVW����]]]]%&&'XYXY����ݱ��޲�������°��ı��Ʋ����������������������]���]���]���]����]���]���]���]�;<<=;<<=;<<=;<<=����������������````````````````;<<=;<<=%&&'XYXY����������������������������������]�]]]�%&&'XYXY�]���]]��]]��]����]��]]��]]���]��]���]���]���]����]���]���]���]���������������������;<<=�����������Ӣ��ґ���������ӡ��Ӣ�������
\ No newline at end of file
--- /dev/null
+++ b/tilesets/olivine_gym_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED
+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY
binary files /dev/null b/tilesets/omanyte_word_room_collision.bin differ
--- /dev/null
+++ b/tilesets/omanyte_word_room_metatiles.bin
@@ -1,0 +1,17 @@
+�ǎ��מ���[\��M]�������ż����ň��՘������������Ü������������������������Š��հ�������������������������	
+
+
+ !"#�È��Ә�@ABC	89
+
+
+
+
+
+
+
+
+
+
+TVXY	
+C 6!@	#8
+6"7���ɚ����ň��՘����������������ɼ������������������������ͬ��ݼ��æ��Ӷ�����
\ No newline at end of file
--- /dev/null
+++ b/tilesets/omanyte_word_room_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
--- a/tilesets/palette_maps.asm
+++ b/tilesets/palette_maps.asm
@@ -1,108 +1,108 @@
-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:
@@ -109,24 +109,24 @@
 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:
binary files /dev/null b/tilesets/park_collision.bin differ
binary files /dev/null b/tilesets/park_metatiles.bin differ
--- /dev/null
+++ b/tilesets/park_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GREEN, BROWN, RED, GREEN, BROWN, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, RED, RED, RED, GRAY, WATER, ROOF, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN
+	tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN
+	tilepal 0, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+	tilepal 0, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, GRAY, RED
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, WATER, WATER, GRAY, RED, GREEN, BROWN, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, WATER, WATER, RED, GRAY, WATER, ROOF, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN
+	tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN
+	tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN
+	tilepal 1, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, BROWN, GREEN, GREEN, WATER, WATER, WATER, RED
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, GRAY
binary files /dev/null b/tilesets/players_house_2f_collision.bin differ
binary files /dev/null b/tilesets/players_house_2f_metatiles.bin differ
--- /dev/null
+++ b/tilesets/players_house_2f_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED
+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED
+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+	tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+	tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED
+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED
+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+	tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+	tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+	tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
binary files /dev/null b/tilesets/players_house_collision.bin differ
binary files /dev/null b/tilesets/players_house_metatiles.bin differ
--- /dev/null
+++ b/tilesets/players_house_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+	tilepal 0, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files /dev/null b/tilesets/pokecenter_collision.bin differ
binary files /dev/null b/tilesets/pokecenter_metatiles.bin differ
--- /dev/null
+++ b/tilesets/pokecenter_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+	tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
+	tilepal 0, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+	tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
+	tilepal 0, RED, RED, RED, RED, RED, RED, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+	tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY
+	tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
+	tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
+	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
binary files /dev/null b/tilesets/pokecom_center_collision.bin differ
--- /dev/null
+++ b/tilesets/pokecom_center_metatiles.bin
@@ -1,0 +1,2 @@
+================"#23"#23��%,-./<==?LMNO��
+ !01@A544$$$$����44$$$$4444$$$$�R,/�RLO�R\]������%4�$����,/��LO:;\]��5$$$$�R&'�R�R�������������������������JK��Z[%444$$$�����	���4444$$$$4444$$$$����������������������������������������������4444$$$$����================���������������۪��������������݈������������������������������������4���$���������������������۶�����������������������������������������������ѷ����������������������������DETUQQQQPPPPHIHIXYXY4���$�������>�������������������44��������4444����������������^_^_��()��89��:;����$$$$�ǂ��ׁ�����()$$89��:;�ׂ���������	�BC���S����������Ͼ����߁���������������4$$$�444���$����������������4444$$$$�������������������������������
\ No newline at end of file
--- /dev/null
+++ b/tilesets/pokecom_center_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 0, WATER, WATER, GRAY, GRAY, RED, GRAY, WATER, WATER
+	tilepal 0, RED, WATER, GRAY, WATER, WATER, WATER, RED, RED
+	tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER
+	tilepal 0, RED, RED, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY
+	tilepal 0, GRAY, GRAY, WATER, WATER, WATER, WATER, RED, WATER
+	tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, RED, RED, GRAY
+	tilepal 0, RED, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, GRAY, YELLOW, YELLOW
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, GRAY, GRAY, WATER, RED, RED, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GRAY, WATER
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, RED, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+	tilepal 1, RED, RED, GRAY, GRAY, RED, RED, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN
+	tilepal 1, WATER, RED, WATER, BROWN, WATER, WATER, WATER, WATER
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
binary files /dev/null b/tilesets/port_collision.bin differ
--- /dev/null
+++ b/tilesets/port_metatiles.bin
@@ -1,0 +1,65 @@
+""""!!!!1111111111111111    ""       !!!!+,--9::3#$%./02;<=>&'()345?@AB*678CDE+,-39:PQXYZFGHIRRSSZ[\\IJKLT,-U]^^^MNOVW_����������������""""""""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	

""1111
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+���������������������������������������������������������������������������������������������
\ No newline at end of file
--- /dev/null
+++ b/tilesets/port_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
+	tilepal 0, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
+	tilepal 1, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+	tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
binary files /dev/null b/tilesets/power_plant_collision.bin differ
--- /dev/null
+++ b/tilesets/power_plant_metatiles.bin
@@ -1,0 +1,8 @@
+6666666666666666""""""""&&&&@B@B
+
+
+
+&&&&88889999&& !&&&&&01&&&&&@B@B()()()()*+()&&&&&&&&	&&,-""<=""./&>?&"",-""<=&./&>?







&&&&''''7777,-&<=&./&>?&&,-&<=&./&>?@AABPQQRPHIRS::T&&&@A&PQ&&AAABQQQREEFEUUVU
+K
+[EFEEUVUUK
+[&PQ&S:&&QQQR:::T&&EFE;UVU;JKJ;Z[Z;6666666666666666AAABMMMN88889999""""""""#$$%WXXY""""@B""PRPRPRPRPR""23""CD&&&&""""""@B&PR&PR;;;;;;;;&&&&&&&&;;;;;;;;""""@B""PR&PR&PR&PR&PR&PR&PR&PR&PR@APRLM&&&&&@A&LM&&&&AB&MN&&&&&@B@APRLM&&&&	&&@AABPHIR	&&&&&&@B&PR&PR&PR&PR&&@BPR#$$%WXXY&&&&PRPRPRPR@B&PR&PR&PR&@AAALMMM&&&&AAABMMMN&&&&&@B&PR&PR&PR&&&&AAAAMMMM""""""""&&AAAAMMMM&&&&&PR&PR&PR&PR&@A&PQ&PQ&S:@AAALMMM88889999&PR&PRABPRMNPR""""""\]&^_&@B@APRLMPR&PR&AB@BMNPR&PR&PRPR&PR&PR@ALM&PR&PRABPRMN
\ No newline at end of file
--- /dev/null
+++ b/tilesets/power_plant_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
+	tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN
+	tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+	tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED
+	tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER
+	tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
+	tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
+	tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN
+	tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+	tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED
+	tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER
+	tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
+	tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
binary files /dev/null b/tilesets/radio_tower_collision.bin differ
binary files /dev/null b/tilesets/radio_tower_metatiles.bin differ
--- /dev/null
+++ b/tilesets/radio_tower_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, RED, RED, WATER, WATER, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, WATER, RED, WATER, WATER, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, ROOF, ROOF, GRAY, GRAY, BROWN, GRAY, GRAY, BROWN
+	tilepal 0, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
+	tilepal 0, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GREEN, GREEN
+	tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, YELLOW, YELLOW, RED
+	tilepal 1, ROOF, RED, RED, ROOF, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, ROOF, ROOF, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
+	tilepal 1, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN
+	tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, RED, GRAY, GRAY, GRAY, GRAY
binary files /dev/null b/tilesets/ruins_of_alph_collision.bin differ
binary files /dev/null b/tilesets/ruins_of_alph_metatiles.bin differ
--- /dev/null
+++ b/tilesets/ruins_of_alph_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
binary files /dev/null b/tilesets/sprout_tower_collision.bin differ
--- /dev/null
+++ b/tilesets/sprout_tower_metatiles.bin
@@ -1,0 +1,2 @@
+
@ !!A1A1!!!!!!@ A1A1
+A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!!-.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$	
"#23!!67"#!!2367%545%545%545%545	^^		��������������������������������FVGWPQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFVGW
\ No newline at end of file
--- /dev/null
+++ b/tilesets/sprout_tower_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
+	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
+	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
--- a/tilesets/tileset_headers.asm
+++ b/tilesets/tileset_headers.asm
@@ -7,42 +7,42 @@
 	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
binary files /dev/null b/tilesets/train_station_collision.bin differ
binary files /dev/null b/tilesets/train_station_metatiles.bin differ
--- /dev/null
+++ b/tilesets/train_station_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+	tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+	tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY
+	tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+	tilepal 0, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+	tilepal 1, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+	tilepal 1, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY
+	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+	tilepal 1, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
binary files /dev/null b/tilesets/underground_collision.bin differ
--- /dev/null
+++ b/tilesets/underground_metatiles.bin
@@ -1,0 +1,2 @@
+*+:;,-<=EFUV	0144444444


44
444444





CDCDSTSTCDCDSTST







"#23






















+QQQQQQQQ./>?./>?@ANOP]^_&'67











	01	01@AAAPQQQPQQQAAABQQQRQQQR@AABPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQR@B@B()89()89
\ No newline at end of file
--- /dev/null
+++ b/tilesets/underground_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
+	tilepal 0, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
+	tilepal 0, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
+	tilepal 1, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+	tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
+	tilepal 1, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
binary files a/tilesets/unused_30_collision.bin /dev/null differ
binary files a/tilesets/unused_30_metatiles.bin /dev/null differ
binary files /dev/null b/tilesets/unused_whirl_islands_collision.bin differ
binary files /dev/null b/tilesets/unused_whirl_islands_metatiles.bin differ
binary files /dev/null b/tilesets/whirl_islands_collision.bin differ
--- /dev/null
+++ b/tilesets/whirl_islands_metatiles.bin
@@ -1,0 +1,6 @@
+$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&'
+&
+&&&67&&67&&&&$$$$*+:;$$$$"#23







()89







 !01







$$&&&&



@@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%'

&&&&&&&&

+&
+67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&
+&&&
\ No newline at end of file
--- /dev/null
+++ b/tilesets/whirl_islands_palette_map.asm
@@ -1,0 +1,29 @@
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+	tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+	db $ff
+endr
+
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+	tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY