summaryrefslogtreecommitdiff
path: root/tilesets
diff options
context:
space:
mode:
Diffstat (limited to 'tilesets')
-rw-r--r--tilesets/aerodactyl_word_room_collision.asm64
-rw-r--r--tilesets/aerodactyl_word_room_metatiles.bin17
-rw-r--r--tilesets/aerodactyl_word_room_palette_map.asm29
-rw-r--r--tilesets/animations.asm1060
-rw-r--r--tilesets/battle_tower_collision.asm64
-rw-r--r--tilesets/battle_tower_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/battle_tower_outside_collision.asm128
-rw-r--r--tilesets/battle_tower_outside_metatiles.binbin2048 -> 0 bytes
-rw-r--r--tilesets/battle_tower_outside_palette_map.asm29
-rw-r--r--tilesets/battle_tower_palette_map.asm29
-rw-r--r--tilesets/beta_word_room_collision.asm64
-rw-r--r--tilesets/beta_word_room_metatiles.bin17
-rw-r--r--tilesets/beta_word_room_palette_map.asm29
-rw-r--r--tilesets/cave_collision.asm64
-rw-r--r--tilesets/cave_metatiles.bin6
-rw-r--r--tilesets/cave_palette_map.asm29
-rw-r--r--tilesets/celadon_mansion_collision.asm64
-rw-r--r--tilesets/celadon_mansion_metatiles.bin5
-rw-r--r--tilesets/celadon_mansion_palette_map.asm29
-rw-r--r--tilesets/data.asm429
-rw-r--r--tilesets/game_corner_collision.asm64
-rw-r--r--tilesets/game_corner_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/game_corner_palette_map.asm29
-rw-r--r--tilesets/gate_collision.asm64
-rw-r--r--tilesets/gate_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/gate_palette_map.asm29
-rw-r--r--tilesets/gym_1_collision.asm64
-rw-r--r--tilesets/gym_1_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/gym_1_palette_map.asm29
-rw-r--r--tilesets/ho_oh_word_room_collision.asm64
-rw-r--r--tilesets/ho_oh_word_room_metatiles.bin17
-rw-r--r--tilesets/ho_oh_word_room_palette_map.asm29
-rw-r--r--tilesets/house_1_collision.asm64
-rw-r--r--tilesets/house_1_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/house_1_palette_map.asm29
-rw-r--r--tilesets/ice_path_collision.asm64
-rw-r--r--tilesets/ice_path_metatiles.bin3
-rw-r--r--tilesets/ice_path_palette_map.asm29
-rw-r--r--tilesets/ilex_forest_collision.asm64
-rw-r--r--tilesets/ilex_forest_metatiles.bin1
-rw-r--r--tilesets/ilex_forest_palette_map.asm29
-rw-r--r--tilesets/johto_1_collision.asm128
-rw-r--r--tilesets/johto_1_metatiles.binbin2048 -> 0 bytes
-rw-r--r--tilesets/johto_1_palette_map.asm29
-rw-r--r--tilesets/johto_2_collision.asm128
-rw-r--r--tilesets/johto_2_metatiles.binbin2048 -> 0 bytes
-rw-r--r--tilesets/johto_2_palette_map.asm29
-rw-r--r--tilesets/kabuto_word_room_collision.asm64
-rw-r--r--tilesets/kabuto_word_room_metatiles.bin17
-rw-r--r--tilesets/kabuto_word_room_palette_map.asm29
-rw-r--r--tilesets/kanto_collision.asm128
-rw-r--r--tilesets/kanto_metatiles.binbin2048 -> 0 bytes
-rw-r--r--tilesets/kanto_palette_map.asm29
-rw-r--r--tilesets/kurts_house_collision.asm64
-rw-r--r--tilesets/kurts_house_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/kurts_house_palette_map.asm29
-rw-r--r--tilesets/lab_collision.asm64
-rw-r--r--tilesets/lab_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/lab_palette_map.asm29
-rw-r--r--tilesets/lighthouse_collision.asm64
-rw-r--r--tilesets/lighthouse_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/lighthouse_palette_map.asm29
-rw-r--r--tilesets/mart_collision.asm64
-rw-r--r--tilesets/mart_metatiles.bin3
-rw-r--r--tilesets/mart_palette_map.asm29
-rw-r--r--tilesets/olivine_gym_collision.asm64
-rw-r--r--tilesets/olivine_gym_metatiles.bin15
-rw-r--r--tilesets/olivine_gym_palette_map.asm29
-rw-r--r--tilesets/omanyte_word_room_collision.asm64
-rw-r--r--tilesets/omanyte_word_room_metatiles.bin17
-rw-r--r--tilesets/omanyte_word_room_palette_map.asm29
-rw-r--r--tilesets/palette_maps.asm130
-rw-r--r--tilesets/park_collision.asm64
-rw-r--r--tilesets/park_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/park_palette_map.asm29
-rw-r--r--tilesets/players_house_2f_collision.asm64
-rw-r--r--tilesets/players_house_2f_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/players_house_2f_palette_map.asm29
-rw-r--r--tilesets/players_house_collision.asm64
-rw-r--r--tilesets/players_house_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/players_house_palette_map.asm29
-rw-r--r--tilesets/pokecenter_collision.asm64
-rw-r--r--tilesets/pokecenter_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/pokecenter_palette_map.asm29
-rw-r--r--tilesets/pokecom_center_collision.asm64
-rw-r--r--tilesets/pokecom_center_metatiles.bin2
-rw-r--r--tilesets/pokecom_center_palette_map.asm29
-rw-r--r--tilesets/port_collision.asm64
-rw-r--r--tilesets/port_metatiles.bin65
-rw-r--r--tilesets/port_palette_map.asm29
-rw-r--r--tilesets/power_plant_collision.asm64
-rw-r--r--tilesets/power_plant_metatiles.bin8
-rw-r--r--tilesets/power_plant_palette_map.asm29
-rw-r--r--tilesets/radio_tower_collision.asm64
-rw-r--r--tilesets/radio_tower_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/radio_tower_palette_map.asm29
-rw-r--r--tilesets/roofs.asm20
-rw-r--r--tilesets/ruins_of_alph_collision.asm64
-rw-r--r--tilesets/ruins_of_alph_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/ruins_of_alph_palette_map.asm29
-rw-r--r--tilesets/special_palettes.asm200
-rw-r--r--tilesets/sprout_tower_collision.asm64
-rw-r--r--tilesets/sprout_tower_metatiles.bin2
-rw-r--r--tilesets/sprout_tower_palette_map.asm29
-rw-r--r--tilesets/tilesets.asm47
-rw-r--r--tilesets/train_station_collision.asm64
-rw-r--r--tilesets/train_station_metatiles.binbin1024 -> 0 bytes
-rw-r--r--tilesets/train_station_palette_map.asm29
-rw-r--r--tilesets/underground_collision.asm64
-rw-r--r--tilesets/underground_metatiles.bin2
-rw-r--r--tilesets/underground_palette_map.asm29
-rw-r--r--tilesets/unused_museum_palette_map.asm32
-rw-r--r--tilesets/unused_whirl_islands_collision.asm128
-rw-r--r--tilesets/unused_whirl_islands_metatiles.binbin2048 -> 0 bytes
-rw-r--r--tilesets/whirl_islands_collision.asm64
-rw-r--r--tilesets/whirl_islands_metatiles.bin6
-rw-r--r--tilesets/whirl_islands_palette_map.asm29
117 files changed, 0 insertions, 5853 deletions
diff --git a/tilesets/aerodactyl_word_room_collision.asm b/tilesets/aerodactyl_word_room_collision.asm
deleted file mode 100644
index 138f07143..000000000
--- a/tilesets/aerodactyl_word_room_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
- tilecoll WALL, WALL, WALL, FLOOR ; 15
- tilecoll WALL, WALL, FLOOR, FLOOR ; 16
- tilecoll WALL, WALL, FLOOR, FLOOR ; 17
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
- tilecoll WALL, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, WALL, FLOOR, WALL ; 1a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
- tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
- tilecoll WALL, WALL, WALL, WALL ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/aerodactyl_word_room_metatiles.bin b/tilesets/aerodactyl_word_room_metatiles.bin
deleted file mode 100644
index 0538baa98..000000000
--- a/tilesets/aerodactyl_word_room_metatiles.bin
+++ /dev/null
@@ -1,17 +0,0 @@
-ǎמŎ՞Øǐ 
- 
- 
-  !"#Ɉ٘@ABC 89
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- TVXY 
- C 6!@ #8
- 6"7Šհ \ No newline at end of file
diff --git a/tilesets/aerodactyl_word_room_palette_map.asm b/tilesets/aerodactyl_word_room_palette_map.asm
deleted file mode 100644
index 5ebde24ba..000000000
--- a/tilesets/aerodactyl_word_room_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/animations.asm b/tilesets/animations.asm
deleted file mode 100644
index d500a24b8..000000000
--- a/tilesets/animations.asm
+++ /dev/null
@@ -1,1060 +0,0 @@
-_AnimateTileset:: ; fc000
-; Iterate over a given pointer array of
-; animation functions (one per frame).
-
-; Typically in wra1, vra0
-
- ld a, [TilesetAnim]
- ld e, a
- ld a, [TilesetAnim + 1]
- ld d, a
-
- ld a, [hTileAnimFrame]
- ld l, a
- inc a
- ld [hTileAnimFrame], a
-
- ld h, 0
- add hl, hl
- add hl, hl
- add hl, de
-
-; 2-byte parameter
-; All functions take input de.
- ld e, [hl]
- inc hl
- ld d, [hl]
- inc hl
-
-; Function address
- ld a, [hli]
- ld h, [hl]
- ld l, a
-
- jp hl
-; fc01b
-
-Tileset0Anim: ; 0xfc01b
-TilesetJohto2Anim: ; 0xfc01b
-TilesetKantoAnim: ; 0xfc01b
- dw vTiles2 tile $14, AnimateWaterTile
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, TileAnimationPalette
- dw NULL, WaitTileAnimation
- dw NULL, AnimateFlowerTile
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, StandingTileFrame8
- dw NULL, DoneTileAnimation
-; 0xfc047
-
-TilesetParkAnim: ; 0xfc047
- dw vTiles2 tile $14, AnimateWaterTile
- dw NULL, WaitTileAnimation
- dw vTiles2 tile $5f, AnimateFountain
- dw NULL, WaitTileAnimation
- dw NULL, TileAnimationPalette
- dw NULL, WaitTileAnimation
- dw NULL, AnimateFlowerTile
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, StandingTileFrame8
- dw NULL, DoneTileAnimation
-; 0xfc073
-
-TilesetIlexForestAnim: ; 0xfc073
- dw NULL, ForestTreeLeftAnimation
- dw NULL, ForestTreeRightAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, ForestTreeLeftAnimation2
- dw NULL, ForestTreeRightAnimation2
- dw NULL, AnimateFlowerTile
- dw vTiles2 tile $14, AnimateWaterTile
- dw NULL, TileAnimationPalette
- dw NULL, StandingTileFrame8
- dw NULL, DoneTileAnimation
-; 0xfc0a3
-
-TilesetJohto1Anim: ; 0xfc0a3
- dw vTiles2 tile $14, AnimateWaterTile
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, TileAnimationPalette
- dw NULL, WaitTileAnimation
- dw NULL, AnimateFlowerTile
- dw WhirlpoolFrames1, AnimateWhirlpoolTile
- dw WhirlpoolFrames2, AnimateWhirlpoolTile
- dw WhirlpoolFrames3, AnimateWhirlpoolTile
- dw WhirlpoolFrames4, AnimateWhirlpoolTile
- dw NULL, WaitTileAnimation
- dw NULL, StandingTileFrame8
- dw NULL, DoneTileAnimation
-; 0xfc0d7
-
-TilesetAnimfc0d7: ; 0xfc0d7
- dw vTiles2 tile $03, WriteTileToBuffer
- dw wTileAnimBuffer, ScrollTileRightLeft
- dw vTiles2 tile $03, WriteTileFromBuffer
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, AnimateFlowerTile
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, DoneTileAnimation
-; 0xfc103
-
-TilesetAnimfc103: ; 0xfc103
- dw vTiles2 tile $14, WriteTileToBuffer
- dw wTileAnimBuffer, ScrollTileRightLeft
- dw vTiles2 tile $14, WriteTileFromBuffer
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, DoneTileAnimation
-; 0xfc12f
-
-TilesetPortAnim: ; 0xfc12f
- dw vTiles2 tile $14, AnimateWaterTile
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, TileAnimationPalette
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, StandingTileFrame8
- dw NULL, DoneTileAnimation
-; 0xfc15f
-
-TilesetGym1Anim: ; 0xfc15f
- dw NULL, SafariFountainAnim2
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, SafariFountainAnim1
- dw NULL, WaitTileAnimation
- dw NULL, StandingTileFrame8
- dw NULL, DoneTileAnimation
-; 0xfc17f
-
-TilesetAnimfc17f: ; 0xfc17f
- dw vTiles2 tile $53, WriteTileToBuffer
- dw wTileAnimBuffer, ScrollTileDown
- dw wTileAnimBuffer, ScrollTileDown
- dw vTiles2 tile $53, WriteTileFromBuffer
- dw vTiles2 tile $03, WriteTileToBuffer
- dw wTileAnimBuffer, ScrollTileRightLeft
- dw vTiles2 tile $03, WriteTileFromBuffer
- dw vTiles2 tile $53, WriteTileToBuffer
- dw wTileAnimBuffer, ScrollTileDown
- dw wTileAnimBuffer, ScrollTileDown
- dw vTiles2 tile $53, WriteTileFromBuffer
- dw NULL, DoneTileAnimation
-; 0xfc1af
-
-TilesetAnimfc1af: ; 0xfc1af
- dw vTiles2 tile $54, WriteTileToBuffer
- dw wTileAnimBuffer, ScrollTileDown
- dw wTileAnimBuffer, ScrollTileDown
- dw vTiles2 tile $54, WriteTileFromBuffer
- dw NULL, WaitTileAnimation
- dw vTiles2 tile $03, WriteTileToBuffer
- dw wTileAnimBuffer, ScrollTileRightLeft
- dw vTiles2 tile $03, WriteTileFromBuffer
- dw NULL, WaitTileAnimation
- dw vTiles2 tile $54, WriteTileToBuffer
- dw wTileAnimBuffer, ScrollTileDown
- dw wTileAnimBuffer, ScrollTileDown
- dw vTiles2 tile $54, WriteTileFromBuffer
- dw NULL, DoneTileAnimation
-; 0xfc1e7
-
-TilesetCaveAnim: ; 0xfc1e7
-TilesetWhirlIslandsAnim: ; 0xfc1e7
- dw vTiles2 tile $14, WriteTileToBuffer
- dw NULL, FlickeringCaveEntrancePalette
- dw wTileAnimBuffer, ScrollTileRightLeft
- dw NULL, FlickeringCaveEntrancePalette
- dw vTiles2 tile $14, WriteTileFromBuffer
- dw NULL, FlickeringCaveEntrancePalette
- dw NULL, TileAnimationPalette
- dw NULL, FlickeringCaveEntrancePalette
- dw vTiles2 tile $40, WriteTileToBuffer
- dw NULL, FlickeringCaveEntrancePalette
- dw wTileAnimBuffer, ScrollTileDown
- dw NULL, FlickeringCaveEntrancePalette
- dw wTileAnimBuffer, ScrollTileDown
- dw NULL, FlickeringCaveEntrancePalette
- dw wTileAnimBuffer, ScrollTileDown
- dw NULL, FlickeringCaveEntrancePalette
- dw vTiles2 tile $40, WriteTileFromBuffer
- dw NULL, FlickeringCaveEntrancePalette
- dw NULL, DoneTileAnimation
-; 0xfc233
-
-TilesetIcePathAnim: ; 0xfc233
- dw vTiles2 tile $35, WriteTileToBuffer
- dw NULL, FlickeringCaveEntrancePalette
- dw wTileAnimBuffer, ScrollTileRightLeft
- dw NULL, FlickeringCaveEntrancePalette
- dw vTiles2 tile $35, WriteTileFromBuffer
- dw NULL, FlickeringCaveEntrancePalette
- dw NULL, TileAnimationPalette
- dw NULL, FlickeringCaveEntrancePalette
- dw vTiles2 tile $31, WriteTileToBuffer
- dw NULL, FlickeringCaveEntrancePalette
- dw wTileAnimBuffer, ScrollTileDown
- dw NULL, FlickeringCaveEntrancePalette
- dw wTileAnimBuffer, ScrollTileDown
- dw NULL, FlickeringCaveEntrancePalette
- dw wTileAnimBuffer, ScrollTileDown
- dw NULL, FlickeringCaveEntrancePalette
- dw vTiles2 tile $31, WriteTileFromBuffer
- dw NULL, FlickeringCaveEntrancePalette
- dw NULL, DoneTileAnimation
-; 0xfc27f
-
-TilesetSproutTowerAnim: ; 0xfc27f
- dw SproutPillarTilePointer9, AnimateSproutPillarTile
- dw SproutPillarTilePointer10, AnimateSproutPillarTile
- dw SproutPillarTilePointer7, AnimateSproutPillarTile
- dw SproutPillarTilePointer8, AnimateSproutPillarTile
- dw SproutPillarTilePointer5, AnimateSproutPillarTile
- dw SproutPillarTilePointer6, AnimateSproutPillarTile
- dw SproutPillarTilePointer3, AnimateSproutPillarTile
- dw SproutPillarTilePointer4, AnimateSproutPillarTile
- dw SproutPillarTilePointer1, AnimateSproutPillarTile
- dw SproutPillarTilePointer2, AnimateSproutPillarTile
- dw NULL, StandingTileFrame
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, DoneTileAnimation
-; 0xfc2bf
-
-TilesetAnimfc2bf: ; 0xfc2bf
- dw vTiles2 tile $4f, WriteTileToBuffer
- dw wTileAnimBuffer, ScrollTileRightLeft
- dw vTiles2 tile $4f, WriteTileFromBuffer
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, WaitTileAnimation
- dw NULL, DoneTileAnimation
-; 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
- dw NULL, WaitTileAnimation
- dw NULL, DoneTileAnimation
-; 0xfc2fb
-
-DoneTileAnimation: ; fc2fb
-; Reset the animation command loop.
- xor a
- ld [hTileAnimFrame], a
-
-WaitTileAnimation: ; fc2fe
-; Do nothing this frame.
- ret
-; fc2ff
-
-StandingTileFrame8: ; fc2ff
- ld a, [TileAnimationTimer]
- inc a
- and 7
- ld [TileAnimationTimer], a
- ret
-; fc309
-
-
-ScrollTileRightLeft: ; fc309
-; Scroll right for 4 ticks, then left for 4 ticks.
- ld a, [TileAnimationTimer]
- inc a
- and 7
- ld [TileAnimationTimer], a
- and 4
- jr nz, ScrollTileLeft
- jr ScrollTileRight
-; fc318
-
-ScrollTileUpDown: ; fc318
-; Scroll up for 4 ticks, then down for 4 ticks.
- ld a, [TileAnimationTimer]
- inc a
- and 7
- ld [TileAnimationTimer], a
- and 4
- jr nz, ScrollTileDown
- jr ScrollTileUp
-; fc327
-
-ScrollTileLeft: ; fc327
- ld h, d
- ld l, e
- ld c, 4
-.loop
- rept 4
- ld a, [hl]
- rlca
- ld [hli], a
- endr
- dec c
- jr nz, .loop
- ret
-; fc33b
-
-ScrollTileRight: ; fc33b
- ld h, d
- ld l, e
- ld c, 4
-.loop
- rept 4
- ld a, [hl]
- rrca
- ld [hli], a
- endr
- dec c
- jr nz, .loop
- ret
-; fc34f
-
-ScrollTileUp: ; fc34f
- ld h, d
- ld l, e
- ld d, [hl]
- inc hl
- ld e, [hl]
- ld bc, $e
- add hl, bc
- ld a, 4
-.loop
- ld c, [hl]
- ld [hl], e
- dec hl
- ld b, [hl]
- ld [hl], d
- dec hl
- ld e, [hl]
- ld [hl], c
- dec hl
- ld d, [hl]
- ld [hl], b
- dec hl
- dec a
- jr nz, .loop
- ret
-; fc36a
-
-ScrollTileDown: ; fc36a
- ld h, d
- ld l, e
- ld de, $e
- push hl
- add hl, de
- ld d, [hl]
- inc hl
- ld e, [hl]
- pop hl
- ld a, 4
-.loop
- ld b, [hl]
- ld [hl], d
- inc hl
- ld c, [hl]
- ld [hl], e
- inc hl
- ld d, [hl]
- ld [hl], b
- inc hl
- ld e, [hl]
- ld [hl], c
- inc hl
- dec a
- jr nz, .loop
- ret
-; fc387
-
-
-AnimateFountain: ; fc387
- ld hl, sp+0
- ld b, h
- ld c, l
- ld hl, .frames
- ld a, [TileAnimationTimer]
- and 7
- add a
- add l
- ld l, a
- jr nc, .okay
- inc h
-.okay
- ld a, [hli]
- ld h, [hl]
- ld l, a
- ld sp, hl
- ld l, e
- ld h, d
- jp WriteTile
-
-.frames
- dw .frame1
- dw .frame2
- dw .frame3
- dw .frame4
- dw .frame3
- dw .frame4
- dw .frame5
- dw .frame1
-
-.frame1 INCBIN "gfx/tilesets/fountain/1.2bpp"
-.frame2 INCBIN "gfx/tilesets/fountain/2.2bpp"
-.frame3 INCBIN "gfx/tilesets/fountain/3.2bpp"
-.frame4 INCBIN "gfx/tilesets/fountain/4.2bpp"
-.frame5 INCBIN "gfx/tilesets/fountain/5.2bpp"
-; fc402
-
-
-AnimateWaterTile: ; fc402
-; Draw a water tile for the current frame in VRAM tile at de.
-
-; Save sp in bc (see WriteTile).
- ld hl, sp+0
- ld b, h
- ld c, l
-
- ld a, [TileAnimationTimer]
-
-; 4 tile graphics, updated every other frame.
- and 3 << 1
-
-; 2 x 8 = 16 bytes per tile
- add a
- add a
- add a
-
- add LOW(WaterTileFrames)
- ld l, a
- ld a, 0
- adc HIGH(WaterTileFrames)
- ld h, a
-
-; Stack now points to the start of the tile for this frame.
- ld sp, hl
-
- ld l, e
- ld h, d
-
- jp WriteTile
-; fc41c
-
-WaterTileFrames: ; fc41c
- INCBIN "gfx/tilesets/water/water.2bpp"
-; fc45c
-
-
-ForestTreeLeftAnimation: ; fc45c
- ld hl, sp+0
- ld b, h
- ld c, l
-
-; Only during the Celebi event.
- ld a, [wCelebiEvent]
- bit 2, a
- jr nz, .asm_fc46c
- ld hl, ForestTreeLeftFrames
- jr .asm_fc47d
-
-.asm_fc46c
- ld a, [TileAnimationTimer]
- call GetForestTreeFrame
- add a
- add a
- add a
- add LOW(ForestTreeLeftFrames)
- ld l, a
- ld a, 0
- adc HIGH(ForestTreeLeftFrames)
- ld h, a
-
-.asm_fc47d
- ld sp, hl
- ld hl, vTiles2 tile $0c
- jp WriteTile
-; fc484
-
-
-ForestTreeLeftFrames: ; fc484
- INCBIN "gfx/tilesets/forest-tree/1.2bpp"
- INCBIN "gfx/tilesets/forest-tree/2.2bpp"
-; fc4a4
-
-ForestTreeRightFrames: ; fc4a4
- INCBIN "gfx/tilesets/forest-tree/3.2bpp"
- INCBIN "gfx/tilesets/forest-tree/4.2bpp"
-; fc4c4
-
-
-ForestTreeRightAnimation: ; fc4c4
- ld hl, sp+0
- ld b, h
- ld c, l
-
-; Only during the Celebi event.
- ld a, [wCelebiEvent]
- bit 2, a
- jr nz, .asm_fc4d4
- ld hl, ForestTreeRightFrames
- jr .asm_fc4eb
-
-.asm_fc4d4
- ld a, [TileAnimationTimer]
- call GetForestTreeFrame
- add a
- add a
- add a
- add LOW(ForestTreeLeftFrames)
- ld l, a
- ld a, 0
- adc HIGH(ForestTreeLeftFrames)
- ld h, a
- push bc
- ld bc, ForestTreeRightFrames - ForestTreeLeftFrames
- add hl, bc
- pop bc
-
-.asm_fc4eb
- ld sp, hl
- ld hl, vTiles2 tile $0f
- jp WriteTile
-; fc4f2
-
-
-ForestTreeLeftAnimation2: ; fc4f2
- ld hl, sp+0
- ld b, h
- ld c, l
-
-; Only during the Celebi event.
- ld a, [wCelebiEvent]
- bit 2, a
- jr nz, .asm_fc502
- ld hl, ForestTreeLeftFrames
- jr .asm_fc515
-
-.asm_fc502
- ld a, [TileAnimationTimer]
- call GetForestTreeFrame
- xor 2
- add a
- add a
- add a
- add LOW(ForestTreeLeftFrames)
- ld l, a
- ld a, 0
- adc HIGH(ForestTreeLeftFrames)
- ld h, a
-
-.asm_fc515
- ld sp, hl
- ld hl, vTiles2 tile $0c
- jp WriteTile
-; fc51c
-
-
-ForestTreeRightAnimation2: ; fc51c
- ld hl, sp+0
- ld b, h
- ld c, l
-
-; Only during the Celebi event.
- ld a, [wCelebiEvent]
- bit 2, a
- jr nz, .asm_fc52c
- ld hl, ForestTreeRightFrames
- jr .asm_fc545
-
-.asm_fc52c
- ld a, [TileAnimationTimer]
- call GetForestTreeFrame
- xor 2
- add a
- add a
- add a
- add LOW(ForestTreeLeftFrames)
- ld l, a
- ld a, 0
- adc HIGH(ForestTreeLeftFrames)
- ld h, a
- push bc
- ld bc, ForestTreeRightFrames - ForestTreeLeftFrames
- add hl, bc
- pop bc
-
-.asm_fc545
- ld sp, hl
- ld hl, vTiles2 tile $0f
- jp WriteTile
-; fc54c
-
-
-GetForestTreeFrame: ; fc54c
-; Return 0 if a is even, or 2 if odd.
- and a
- jr z, .even
- cp 1
- jr z, .odd
- cp 2
- jr z, .even
- cp 3
- jr z, .odd
- cp 4
- jr z, .even
- cp 5
- jr z, .odd
- cp 6
- jr z, .even
-.odd
- ld a, 2
- scf
- ret
-.even
- xor a
- ret
-; fc56d
-
-
-AnimateFlowerTile: ; fc56d
-; No parameters.
-
-; Save sp in bc (see WriteTile).
- ld hl, sp+0
- ld b, h
- ld c, l
-
-; Alternate tile graphic every other frame
- ld a, [TileAnimationTimer]
- and 1 << 1
- ld e, a
-
-; CGB has different color mappings for flowers.
- ld a, [hCGB]
- and 1
-
- add e
- swap a ; << 4 (16 bytes)
- ld e, a
- ld d, 0
- ld hl, FlowerTileFrames
- add hl, de
- ld sp, hl
-
- ld hl, vTiles2 + $30 ; tile 4
-
- jp WriteTile
-; fc58c
-
-FlowerTileFrames: ; fc58c
- INCBIN "gfx/tilesets/flower/dmg_1.2bpp"
- INCBIN "gfx/tilesets/flower/cgb_1.2bpp"
- INCBIN "gfx/tilesets/flower/dmg_2.2bpp"
- INCBIN "gfx/tilesets/flower/cgb_2.2bpp"
-; fc5cc
-
-
-SafariFountainAnim1: ; fc5cc
-; Splash in the bottom-right corner of the fountain.
- ld hl, sp+0
- ld b, h
- ld c, l
- ld a, [TileAnimationTimer]
- and 6
- srl a
- inc a
- inc a
- and 3
- swap a
- ld e, a
- ld d, 0
- ld hl, SafariFountainFrames
- add hl, de
- ld sp, hl
- ld hl, vTiles2 tile $5b
- jp WriteTile
-; fc5eb
-
-
-SafariFountainAnim2: ; fc5eb
-; Splash in the top-left corner of the fountain.
- ld hl, sp+0
- ld b, h
- ld c, l
- ld a, [TileAnimationTimer]
- and 6
- add a
- add a
- add a
- ld e, a
- ld d, 0
- ld hl, SafariFountainFrames
- add hl, de
- ld sp, hl
- ld hl, vTiles2 tile $38
- jp WriteTile
-; fc605
-
-
-SafariFountainFrames: ; fc605
- INCBIN "gfx/tilesets/safari/1.2bpp"
- INCBIN "gfx/tilesets/safari/2.2bpp"
- INCBIN "gfx/tilesets/safari/3.2bpp"
- INCBIN "gfx/tilesets/safari/4.2bpp"
-; fc645
-
-
-AnimateSproutPillarTile: ; fc645
-; Read from struct at de:
-; Destination (VRAM)
-; Address of the first tile in the frame array
-
- ld hl, sp+0
- ld b, h
- ld c, l
-
- ld a, [TileAnimationTimer]
- and 7
-
-; Get frame index a
- ld hl, .frames
- add l
- ld l, a
- ld a, 0
- adc h
- ld h, a
- ld a, [hl]
-
-; Destination
- ld l, e
- ld h, d
- ld e, [hl]
- inc hl
- ld d, [hl]
- inc hl
-
-; Add the frame index to the starting address
- add [hl]
- inc hl
- ld h, [hl]
- ld l, a
- ld a, 0
- adc h
- ld h, a
-
- ld sp, hl
- ld l, e
- ld h, d
- jr WriteTile
-
-.frames
- db $00, $10, $20, $30, $40, $30, $20, $10
-; fc673
-
-
-StandingTileFrame: ; fc673
- ld hl, TileAnimationTimer
- inc [hl]
- ret
-; fc678
-
-
-AnimateWhirlpoolTile: ; fc678
-; Update whirlpool tile using struct at de.
-
-; Struct:
-; VRAM address
-; Address of the first tile
-
-; Only does one of 4 tiles at a time.
-
-; Save sp in bc (see WriteTile).
- ld hl, sp+0
- ld b, h
- ld c, l
-
-; de = VRAM address
- ld l, e
- ld h, d
- ld e, [hl]
- inc hl
- ld d, [hl]
- inc hl
-; Tile address is now at hl.
-
-; Get the tile for this frame.
- ld a, [TileAnimationTimer]
- and %11 ; 4 frames x2
- swap a ; * 16 bytes per tile
-
- add [hl]
- inc hl
- ld h, [hl]
- ld l, a
- ld a, 0
- adc h
- ld h, a
-
-; Stack now points to the desired frame.
- ld sp, hl
-
- ld l, e
- ld h, d
-
- jr WriteTile
-; fc696
-
-
-WriteTileFromBuffer: ; fc696
-; Write tiledata at wTileAnimBuffer to de.
-; wTileAnimBuffer is loaded to sp for WriteTile.
-
- ld hl, sp+0
- ld b, h
- ld c, l
-
- ld hl, wTileAnimBuffer
- ld sp, hl
-
- ld h, d
- ld l, e
- jr WriteTile
-; fc6a2
-
-
-WriteTileToBuffer: ; fc6a2
-; Write tiledata de to wTileAnimBuffer.
-; de is loaded to sp for WriteTile.
-
- ld hl, sp+0
- ld b, h
- ld c, l
-
- ld h, d
- ld l, e
- ld sp, hl
-
- ld hl, wTileAnimBuffer
-
- ; fallthrough
-
-WriteTile: ; fc6ac
-; Write one 8x8 tile ($10 bytes) from sp to hl.
-
-; Warning: sp is saved in bc so we can abuse pop.
-; sp is restored to address bc. Save sp in bc before calling.
-
- pop de
- ld [hl], e
- inc hl
- ld [hl], d
-
-rept 7
- pop de
- inc hl
- ld [hl], e
- inc hl
- ld [hl], d
-endr
-
-; restore sp
- ld h, b
- ld l, c
- ld sp, hl
- ret
-; fc6d7
-
-
-TileAnimationPalette: ; fc6d7
-; Transition between color values 0-2 for color 0 in palette 3.
-
-; No palette changes on DMG.
- ld a, [hCGB]
- and a
- ret z
-
-; We don't want to mess with non-standard palettes.
- ld a, [rBGP] ; BGP
- cp %11100100
- ret nz
-
-; Only update on even frames.
- ld a, [TileAnimationTimer]
- ld l, a
- and 1 ; odd
- ret nz
-
-; Ready for BGPD input...
-
- ld a, (1 << rBGPI_AUTO_INCREMENT) palette PAL_BG_WATER
- ld [rBGPI], a
-
- ld a, [rSVBK]
- push af
- ld a, BANK(wBGPals1)
- ld [rSVBK], a
-
-; Update color 0 in order 0 1 2 1
- ld a, l
- and %110 ; frames 0 2 4 6
- jr z, .color0
- cp 4
- jr z, .color2
-
-.color1
- ld hl, wBGPals1 palette PAL_BG_WATER + 2
- ld a, [hli]
- ld [rBGPD], a
- ld a, [hli]
- ld [rBGPD], a
- jr .end
-
-.color0
- ld hl, wBGPals1 palette PAL_BG_WATER
- ld a, [hli]
- ld [rBGPD], a
- ld a, [hli]
- ld [rBGPD], a
- jr .end
-
-.color2
- ld hl, wBGPals1 palette PAL_BG_WATER + 4
- ld a, [hli]
- ld [rBGPD], a
- ld a, [hli]
- ld [rBGPD], a
-
-.end
- pop af
- ld [rSVBK], a
- ret
-; fc71e
-
-
-FlickeringCaveEntrancePalette: ; fc71e
-; No palette changes on DMG.
- ld a, [hCGB]
- and a
- ret z
-; We don't want to mess with non-standard palettes.
- ld a, [rBGP]
- cp %11100100
- ret nz
-; We only want to be here if we're in a dark cave.
- ld a, [wTimeOfDayPalset]
- cp $ff ; 3,3,3,3
- ret nz
-
- ld a, [rSVBK]
- push af
- ld a, BANK(wBGPals1)
- ld [rSVBK], a
-; Ready for BGPD input...
- ld a, (1 << rBGPI_AUTO_INCREMENT) palette PAL_BG_YELLOW
- ld [rBGPI], a
- ld a, [hVBlankCounter]
- and 1 << 1
- jr nz, .bit1set
- ld hl, wBGPals1 palette PAL_BG_YELLOW
- jr .okay
-
-.bit1set
- ld hl, wBGPals1 palette PAL_BG_YELLOW + 2
-
-.okay
- ld a, [hli]
- ld [rBGPD], a
- ld a, [hli]
- ld [rBGPD], a
-
- pop af
- ld [rSVBK], a
- ret
-; fc750
-
-
-SproutPillarTilePointer1: dw vTiles2 tile $2d, SproutPillarTile1
-SproutPillarTilePointer2: dw vTiles2 tile $2f, SproutPillarTile2
-SproutPillarTilePointer3: dw vTiles2 tile $3d, SproutPillarTile3
-SproutPillarTilePointer4: dw vTiles2 tile $3f, SproutPillarTile4
-SproutPillarTilePointer5: dw vTiles2 tile $3c, SproutPillarTile5
-SproutPillarTilePointer6: dw vTiles2 tile $2c, SproutPillarTile6
-SproutPillarTilePointer7: dw vTiles2 tile $4d, SproutPillarTile7
-SproutPillarTilePointer8: dw vTiles2 tile $4f, SproutPillarTile8
-SproutPillarTilePointer9: dw vTiles2 tile $5d, SproutPillarTile9
-SproutPillarTilePointer10: dw vTiles2 tile $5f, SproutPillarTile10
-
-SproutPillarTile1: INCBIN "gfx/tilesets/sprout-pillar/1.2bpp"
-SproutPillarTile2: INCBIN "gfx/tilesets/sprout-pillar/2.2bpp"
-SproutPillarTile3: INCBIN "gfx/tilesets/sprout-pillar/3.2bpp"
-SproutPillarTile4: INCBIN "gfx/tilesets/sprout-pillar/4.2bpp"
-SproutPillarTile5: INCBIN "gfx/tilesets/sprout-pillar/5.2bpp"
-SproutPillarTile6: INCBIN "gfx/tilesets/sprout-pillar/6.2bpp"
-SproutPillarTile7: INCBIN "gfx/tilesets/sprout-pillar/7.2bpp"
-SproutPillarTile8: INCBIN "gfx/tilesets/sprout-pillar/8.2bpp"
-SproutPillarTile9: INCBIN "gfx/tilesets/sprout-pillar/9.2bpp"
-SproutPillarTile10: INCBIN "gfx/tilesets/sprout-pillar/10.2bpp"
-; fca98
-
-
-WhirlpoolFrames1: dw vTiles2 tile $32, WhirlpoolTiles1
-WhirlpoolFrames2: dw vTiles2 tile $33, WhirlpoolTiles2
-WhirlpoolFrames3: dw vTiles2 tile $42, WhirlpoolTiles3
-WhirlpoolFrames4: dw vTiles2 tile $43, WhirlpoolTiles4
-; fcaa8
-
-WhirlpoolTiles1: INCBIN "gfx/tilesets/whirlpool/1.2bpp"
-WhirlpoolTiles2: INCBIN "gfx/tilesets/whirlpool/2.2bpp"
-WhirlpoolTiles3: INCBIN "gfx/tilesets/whirlpool/3.2bpp"
-WhirlpoolTiles4: INCBIN "gfx/tilesets/whirlpool/4.2bpp"
-; fcba8
diff --git a/tilesets/battle_tower_collision.asm b/tilesets/battle_tower_collision.asm
deleted file mode 100644
index 908fee326..000000000
--- a/tilesets/battle_tower_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll WALL, WALL, FLOOR, FLOOR ; 03
- tilecoll WALL, WALL, FLOOR, FLOOR ; 04
- tilecoll WALL, DOOR, FLOOR, FLOOR ; 05
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 07
- tilecoll WALL, WALL, FLOOR, FLOOR ; 08
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 09
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
- tilecoll DOOR, WALL, FLOOR, FLOOR ; 11
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 13
- tilecoll WALL, WALL, WALL, WALL ; 14
- tilecoll WALL, FLOOR, WALL, FLOOR ; 15
- tilecoll FLOOR, WALL, FLOOR, WALL ; 16
- tilecoll FLOOR, WALL, FLOOR, WALL ; 17
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18
- tilecoll WALL, FLOOR, WALL, FLOOR ; 19
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
- tilecoll WALL, WALL, FLOOR, WALL ; 20
- tilecoll WALL, WALL, WALL, FLOOR ; 21
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
- tilecoll FLOOR, FLOOR, WALL, WALL ; 25
- tilecoll WALL, FLOOR, FLOOR, DOOR ; 26
- tilecoll WALL, WALL, FLOOR, FLOOR ; 27
- tilecoll WALL, WALL, FLOOR, FLOOR ; 28
- tilecoll WALL, PC, FLOOR, FLOOR ; 29
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
- tilecoll WALL, WALL, WALL, FLOOR ; 2b
- tilecoll WALL, WALL, FLOOR, WALL ; 2c
- tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2d
- tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll WALL, WALL, FLOOR, WALL ; 37
- tilecoll WALL, WALL, WALL, FLOOR ; 38
- tilecoll WALL, WALL, FLOOR, WALL ; 39
- tilecoll WALL, WALL, WALL, WALL ; 3a
- tilecoll WALL, WALL, WALL, FLOOR ; 3b
- tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll WALL, WALL, FLOOR, WALL ; 3d
- tilecoll WALL, WALL, FLOOR, WALL ; 3e
- tilecoll WALL, WALL, WALL, FLOOR ; 3f
- tilecoll WALL, WALL, FLOOR, WALL ; 40
diff --git a/tilesets/battle_tower_metatiles.bin b/tilesets/battle_tower_metatiles.bin
deleted file mode 100644
index c64ef0a12..000000000
--- a/tilesets/battle_tower_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/battle_tower_outside_collision.asm b/tilesets/battle_tower_outside_collision.asm
deleted file mode 100644
index 3aaa60113..000000000
--- a/tilesets/battle_tower_outside_collision.asm
+++ /dev/null
@@ -1,128 +0,0 @@
- tilecoll 01, 01, 01, 01 ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll WALL, WALL, WALL, WALL ; 06
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
- tilecoll WALL, WALL, WALL, WALL ; 09
- tilecoll WALL, WALL, WALL, WALL ; 0a
- tilecoll WALL, WALL, WALL, WALL ; 0b
- tilecoll WALL, WALL, WALL, WALL ; 0c
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
- tilecoll FLOOR, WALL, WALL, WALL ; 0e
- tilecoll WALL, WALL, WALL, WALL ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll WALL, WALL, FLOOR, FLOOR ; 11
- tilecoll WALL, WALL, FLOOR, WALL ; 12
- tilecoll WALL, WALL, DOOR, DOOR ; 13
- tilecoll WALL, WALL, WALL, FLOOR ; 14
- tilecoll WALL, WALL, FLOOR, FLOOR ; 15
- tilecoll WALL, WALL, WALL, WALL ; 16
- tilecoll WALL, WALL, DOOR, WALL ; 17
- tilecoll WALL, WALL, WALL, WALL ; 18
- tilecoll WALL, WALL, WALL, WALL ; 19
- tilecoll WALL, WALL, WALL, WALL ; 1a
- tilecoll WALL, WALL, WALL, WALL ; 1b
- tilecoll WALL, WALL, WALL, WALL ; 1c
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1d
- tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 20
- tilecoll FLOOR, FLOOR, WALL, WALL ; 21
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22
- tilecoll WALL, WALL, WALL, WALL ; 23
- tilecoll WALL, WALL, WALL, WALL ; 24
- tilecoll WALL, WALL, WALL, WALL ; 25
- tilecoll WALL, WALL, WALL, WALL ; 26
- tilecoll WALL, WALL, WALL, WALL ; 27
- tilecoll WALL, WALL, WALL, WALL ; 28
- tilecoll WALL, WALL, WALL, WALL ; 29
- tilecoll WALL, WALL, WALL, WALL ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll WALL, WALL, WALL, WALL ; 2c
- tilecoll WALL, WALL, WALL, WALL ; 2d
- tilecoll WALL, FLOOR, WALL, WALL ; 2e
- tilecoll WALL, WALL, WALL, WALL ; 2f
- tilecoll WALL, FLOOR, WALL, WALL ; 30
- tilecoll WALL, WALL, WALL, WALL ; 31
- tilecoll WALL, FLOOR, WALL, FLOOR ; 32
- tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 33
- tilecoll WALL, WALL, WALL, WALL ; 34
- tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 35
- tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 36
- tilecoll 5B, FLOOR, FLOOR, FLOOR ; 37
- tilecoll 5B, 01, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 41
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 43
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44
- tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 45
- tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 46
- tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 47
- tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 48
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 50
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 51
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 52
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 53
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 54
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 55
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 57
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 58
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 59
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 60
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 61
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 62
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 63
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 64
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 65
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 66
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 67
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 68
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 69
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 70
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 73
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 74
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 77
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 78
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 79
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80
diff --git a/tilesets/battle_tower_outside_metatiles.bin b/tilesets/battle_tower_outside_metatiles.bin
deleted file mode 100644
index c4390bcba..000000000
--- a/tilesets/battle_tower_outside_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/battle_tower_outside_palette_map.asm b/tilesets/battle_tower_outside_palette_map.asm
deleted file mode 100644
index dfc74a9c0..000000000
--- a/tilesets/battle_tower_outside_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
- tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
- tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
- tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, BROWN
- tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
- tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
- tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, RED, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, RED, RED, RED, ROOF, RED, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED, RED
- tilepal 1, RED, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED
- tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
- tilepal 1, RED, RED, RED, RED, RED, YELLOW, YELLOW, YELLOW
- tilepal 1, YELLOW, RED, RED, RED, WATER, WATER, WATER, RED
- tilepal 1, RED, RED, ROOF, RED, RED, ROOF, RED, RED
- tilepal 1, RED, ROOF, ROOF, RED, RED, RED, ROOF, ROOF
- tilepal 1, RED, RED, RED, RED, YELLOW, RED, GREEN, RED
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF
diff --git a/tilesets/battle_tower_palette_map.asm b/tilesets/battle_tower_palette_map.asm
deleted file mode 100644
index 1abce2a16..000000000
--- a/tilesets/battle_tower_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, RED, WATER, WATER, GRAY, GRAY, WATER, WATER
- tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
- tilepal 0, WATER, RED, WATER, WATER, GRAY, GRAY, WATER, WATER
- tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
- tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, GRAY
- tilepal 0, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, WATER
- tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, BROWN, BROWN, BROWN
- tilepal 0, RED, BROWN, RED, BROWN, BROWN, BROWN, RED, RED
- tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER
- tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED
- tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF
- tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED
- tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
- tilepal 1, RED, GRAY, GRAY, GRAY, GREEN, YELLOW, RED, RED
- tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
- tilepal 1, YELLOW, YELLOW, BROWN, YELLOW, WATER, WATER, YELLOW, RED
- tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
- tilepal 1, GRAY, GRAY, BROWN, YELLOW, RED, RED, YELLOW, RED
- tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
- tilepal 1, GRAY, GRAY, YELLOW, BROWN, WATER, WATER, GRAY, BROWN
- tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
- tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/beta_word_room_collision.asm b/tilesets/beta_word_room_collision.asm
deleted file mode 100644
index 138f07143..000000000
--- a/tilesets/beta_word_room_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
- tilecoll WALL, WALL, WALL, FLOOR ; 15
- tilecoll WALL, WALL, FLOOR, FLOOR ; 16
- tilecoll WALL, WALL, FLOOR, FLOOR ; 17
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
- tilecoll WALL, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, WALL, FLOOR, WALL ; 1a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
- tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
- tilecoll WALL, WALL, WALL, WALL ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/beta_word_room_metatiles.bin b/tilesets/beta_word_room_metatiles.bin
deleted file mode 100644
index 47c531b2e..000000000
--- a/tilesets/beta_word_room_metatiles.bin
+++ /dev/null
@@ -1,17 +0,0 @@
-ÀӐǦ׶ǀא 
- 
- 
-  !"#@ABC 89
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- TVXY 
- C 6!@ #8
- 6"7𠡀ŐѲ \ No newline at end of file
diff --git a/tilesets/beta_word_room_palette_map.asm b/tilesets/beta_word_room_palette_map.asm
deleted file mode 100644
index 5ebde24ba..000000000
--- a/tilesets/beta_word_room_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/cave_collision.asm b/tilesets/cave_collision.asm
deleted file mode 100644
index 3d5e0ae05..000000000
--- a/tilesets/cave_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
- tilecoll WALL, UP_WALL, WALL, FLOOR ; 05
- tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06
- tilecoll UP_WALL, WALL, FLOOR, WALL ; 07
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08
- tilecoll WALL, FLOOR, WALL, FLOOR ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c
- tilecoll WALL, FLOOR, WALL, WALL ; 0d
- tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
- tilecoll FLOOR, WALL, WALL, WALL ; 0f
- tilecoll WATER, WATER, WATER, WATER ; 10
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
- tilecoll FLOOR, FLOOR, WALL, CAVE ; 14
- tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15
- tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16
- tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
- tilecoll WALL, WALL, WALL, FLOOR ; 19
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1a
- tilecoll WALL, WALL, FLOOR, WALL ; 1b
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
- tilecoll WALL, WALL, WALL, WALL ; 1e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20
- tilecoll WALL, FLOOR, WALL, WALL ; 21
- tilecoll FLOOR, FLOOR, WALL, WALL ; 22
- tilecoll FLOOR, WALL, WALL, WALL ; 23
- tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25
- tilecoll WATER, WATER, WATER, WATER ; 26
- tilecoll WATER, WATER, WATER, WATER ; 27
- tilecoll WATER, WATER, WATER, WATER ; 28
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
- tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d
- tilecoll WALL, WALL, WALL, WALL ; 2e
- tilecoll WALL, WALL, WALL, WALL ; 2f
- tilecoll WALL, WALL, WALL, WALL ; 30
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31
- tilecoll WALL, WALL, WALL, WALL ; 32
- tilecoll WATER, WATER, WATER, WATER ; 33
- tilecoll WATER, WATER, WATER, WATER ; 34
- tilecoll WALL, WALL, WALL, WALL ; 35
- tilecoll FLOOR, WALL, FLOOR, WALL ; 36
- tilecoll FLOOR, WALL, FLOOR, WALL ; 37
- tilecoll WALL, WALL, WALL, CAVE ; 38
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d
- tilecoll WATER, WATER, WATER, WATER ; 3e
- tilecoll WATER, WATER, WATER, WATER ; 3f
- tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40
diff --git a/tilesets/cave_metatiles.bin b/tilesets/cave_metatiles.bin
deleted file mode 100644
index a41b5b080..000000000
--- a/tilesets/cave_metatiles.bin
+++ /dev/null
@@ -1,6 +0,0 @@
-$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&'
-&
-&  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&& 
-&
-67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&& 
-&&& \ No newline at end of file
diff --git a/tilesets/cave_palette_map.asm b/tilesets/cave_palette_map.asm
deleted file mode 100644
index 73c09ebe5..000000000
--- a/tilesets/cave_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
- tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
- tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/celadon_mansion_collision.asm b/tilesets/celadon_mansion_collision.asm
deleted file mode 100644
index 5db409be7..000000000
--- a/tilesets/celadon_mansion_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll WALL, WALL, FLOOR, FLOOR ; 05
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07
- tilecoll WALL, WALL, FLOOR, FLOOR ; 08
- tilecoll WALL, WALL, FLOOR, FLOOR ; 09
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
- tilecoll WALL, WALL, FLOOR, WALL ; 0b
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0c
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
- tilecoll WALL, WALL, FLOOR, WALL ; 0e
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f
- tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10
- tilecoll WALL, WALL, WALL, WALL ; 11
- tilecoll WALL, WALL, BOOKSHELF, WALL ; 12
- tilecoll WALL, WALL, WALL, WALL ; 13
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
- tilecoll WALL, FLOOR, WALL, FLOOR ; 15
- tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16
- tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17
- tilecoll WALL, DOOR, FLOOR, FLOOR ; 18
- tilecoll WALL, WALL, BOOKSHELF, WALL ; 19
- tilecoll WALL, WALL, WALL, WALL ; 1a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
- tilecoll FLOOR, FLOOR, WALL, WALL ; 1e
- tilecoll FLOOR, FLOOR, WALL, WALL ; 1f
- tilecoll FLOOR, FLOOR, WALL, WALL ; 20
- tilecoll FLOOR, WALL, FLOOR, WALL ; 21
- tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22
- tilecoll WALL, WALL, FLOOR, WALL ; 23
- tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24
- tilecoll WALL, WALL, WALL, STAIRCASE ; 25
- tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26
- tilecoll FLOOR, WALL, FLOOR, WALL ; 27
- tilecoll WALL, WALL, DOOR, WALL ; 28
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29
- tilecoll FLOOR, FLOOR, WALL, WALL ; 2a
- tilecoll FLOOR, FLOOR, WALL, WALL ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll WALL, WALL, WALL, FLOOR ; 30
- tilecoll WALL, WALL, FLOOR, WALL ; 31
- tilecoll WALL, WALL, FLOOR, WALL ; 32
- tilecoll WALL, WALL, WALL, WALL ; 33
- tilecoll WALL, WALL, WALL, FLOOR ; 34
- tilecoll WALL, WALL, WALL, WALL ; 35
- tilecoll FLOOR, WALL, WALL, WALL ; 36
- tilecoll WALL, WALL, FLOOR, WALL ; 37
- tilecoll WALL, FLOOR, WALL, WALL ; 38
- tilecoll WALL, WALL, FLOOR, WALL ; 39
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll WALL, FLOOR, WALL, WALL ; 3e
- tilecoll FLOOR, WALL, WALL, WALL ; 3f
- tilecoll FLOOR, FLOOR, WALL, WALL ; 40
diff --git a/tilesets/celadon_mansion_metatiles.bin b/tilesets/celadon_mansion_metatiles.bin
deleted file mode 100644
index d4506328f..000000000
--- a/tilesets/celadon_mansion_metatiles.bin
+++ /dev/null
@@ -1,5 +0,0 @@
-
- 
-  EU((((6868$%"#4523236778FGGHFGGHVWWX68"#./23^_*+,-:;<=JKLMZ[&'
-  
-  !0168"#*+23:; ,-<=LMJKZ[*+,-:;<=JKLMZ[ƒ‡‡€¡±µFGFG\\GGGHGGGH !]01]67FG7778GGGH((((ŎŞ)ITTחׇ9TTYԇǝ9ӊTT߫ݻ&')TTߗ݇&'ˇؐͯ߇܇ڐɬʿřׇׇׇׇԇǝԇǝ‡‡‡‡‡‡‡ׇׇ׃דԇǝԐǝ‡ \ No newline at end of file
diff --git a/tilesets/celadon_mansion_palette_map.asm b/tilesets/celadon_mansion_palette_map.asm
deleted file mode 100644
index 2bd27ad22..000000000
--- a/tilesets/celadon_mansion_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER
- tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN
- tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN
- tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW
- tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW
- tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN
- tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW
- tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
- tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
diff --git a/tilesets/data.asm b/tilesets/data.asm
deleted file mode 100644
index c26b7d3d1..000000000
--- a/tilesets/data.asm
+++ /dev/null
@@ -1,429 +0,0 @@
-SECTION "Tileset Data 1", ROMX
-
-TilesetKantoGFX: ; 0x18000
-INCBIN "gfx/tilesets/kanto.2bpp.lz"
-; 0x18606
-
-TilesetKantoMeta: ; 0x18606
-INCBIN "tilesets/kanto_metatiles.bin"
-; 0x18e06
-
-TilesetKantoColl: ; 0x18e06
-INCLUDE "tilesets/kanto_collision.asm"
-; 0x19006
-
-Tileset0GFX: ; 0x19006
-TilesetJohto1GFX: ; 0x19006
-INCBIN "gfx/tilesets/johto_1.2bpp.lz"
-; 0x19c0e
-
-Tileset0Meta: ; 0x19c0e
-TilesetJohto1Meta: ; 0x19c0e
-INCBIN "tilesets/johto_1_metatiles.bin"
-; 0x1a40e
-
-Tileset0Coll: ; 0x1a40e
-TilesetJohto1Coll: ; 0x1a40e
-INCLUDE "tilesets/johto_1_collision.asm"
-; 0x1a60e
-
-TilesetIcePathGFX: ; 0x1a60e
-INCBIN "gfx/tilesets/ice_path.2bpp.lz"
-; 0x1af3e
-
-TilesetIcePathMeta: ; 0x1af3e
-INCBIN "tilesets/ice_path_metatiles.bin"
-; 0x1b33e
-
-TilesetIcePathColl: ; 0x1b33e
-INCLUDE "tilesets/ice_path_collision.asm"
-; 0x1b43e
-
-TilesetPlayersHouse2FGFX: ; 0x1b43e
-INCBIN "gfx/tilesets/players_house_2f.2bpp.lz"
-; 0x1b8fe
-
-TilesetPlayersHouse2FMeta: ; 0x1b8fe
-INCBIN "tilesets/players_house_2f_metatiles.bin"
-; 0x1bcfe
-
-TilesetPlayersHouse2FColl: ; 0x1bcfe
-INCLUDE "tilesets/players_house_2f_collision.asm"
-; 0x1bdfe
-
-
-SECTION "Tileset Data 2", ROMX
-
-TilesetPokecenterGFX: ; 0x1c30c
-INCBIN "gfx/tilesets/pokecenter.2bpp.lz"
-; 0x1c73c
-
-TilesetPokecenterMeta: ; 0x1c73c
-INCBIN "tilesets/pokecenter_metatiles.bin"
-; 0x1cb3c
-
-TilesetPokecenterColl: ; 0x1cb3c
-INCLUDE "tilesets/pokecenter_collision.asm"
-; 0x1cc3c
-
-TilesetPortGFX: ; 0x1cc3c
-INCBIN "gfx/tilesets/port.2bpp.lz"
-; 0x1d04c
-
-TilesetPortMeta: ; 0x1d04c
-INCBIN "tilesets/port_metatiles.bin"
-; 0x1d44c
-
-TilesetPortColl: ; 0x1d44c
-INCLUDE "tilesets/port_collision.asm"
-; 0x1d54c
-
-TilesetPlayersHouseGFX: ; 0x1d54c
-INCBIN "gfx/tilesets/players_house.2bpp.lz"
-; 0x1d92c
-
-TilesetPlayersHouseMeta: ; 0x1d92c
-INCBIN "tilesets/players_house_metatiles.bin"
-; 0x1dd2c
-
-TilesetPlayersHouseColl: ; 0x1dd2c
-INCLUDE "tilesets/players_house_collision.asm"
-; 0x1de2c
-
-TilesetCeladonMansionGFX: ; 0x1de2c
-INCBIN "gfx/tilesets/celadon_mansion.2bpp.lz"
-; 0x1e58c
-
-TilesetCeladonMansionMeta: ; 0x1e58c
-INCBIN "tilesets/celadon_mansion_metatiles.bin"
-; 0x1e98c
-
-TilesetCeladonMansionColl: ; 0x1e98c
-INCLUDE "tilesets/celadon_mansion_collision.asm"
-; 0x1ea8c
-
-TilesetCaveGFX: ; 0x1ea8c
-INCBIN "gfx/tilesets/cave.2bpp.lz"
-; 0x1ee1c
-
-TilesetCaveMeta: ; 0x1ee1c
-TilesetWhirlIslandsMeta: ; 0x1ee1c
-INCBIN "tilesets/cave_metatiles.bin"
-; 0x1f21c
-
-TilesetCaveColl: ; 0x1f21c
-TilesetWhirlIslandsColl: ; 0x1f21c
-INCLUDE "tilesets/cave_collision.asm"
-; 0x1f31c
-
-
-SECTION "Tileset Data 3", ROMX
-
-TilesetSproutTowerGFX: ; 0x20181
-INCBIN "gfx/tilesets/sprout_tower.2bpp.lz"
-; 0x206e1
-
-TilesetSproutTowerMeta: ; 0x206e1
-INCBIN "tilesets/sprout_tower_metatiles.bin"
-; 0x20ae1
-
-TilesetSproutTowerColl: ; 0x20ae1
-INCLUDE "tilesets/sprout_tower_collision.asm"
-; 0x20be1
-
-TilesetLabGFX: ; 0x20be1
-INCBIN "gfx/tilesets/lab.2bpp.lz"
-; 0x213e1
-
-TilesetLabMeta: ; 0x213e1
-INCBIN "tilesets/lab_metatiles.bin"
-; 0x217e1
-
-TilesetLabColl: ; 0x217e1
-INCLUDE "tilesets/lab_collision.asm"
-; 0x218e1
-
-TilesetMartGFX: ; 0x218e1
-INCBIN "gfx/tilesets/mart.2bpp.lz"
-; 0x22031
-
-TilesetMartMeta: ; 0x22031
-INCBIN "tilesets/mart_metatiles.bin"
-; 0x22431
-
-TilesetMartColl: ; 0x22431
-INCLUDE "tilesets/mart_collision.asm"
-; 0x22531
-
-TilesetGameCornerGFX: ; 0x22531
-INCBIN "gfx/tilesets/game_corner.2bpp.lz"
-; 0x22af1
-
-TilesetGameCornerMeta: ; 0x22af1
-INCBIN "tilesets/game_corner_metatiles.bin"
-; 0x22ef1
-
-TilesetGameCornerColl: ; 0x22ef1
-INCLUDE "tilesets/game_corner_collision.asm"
-; 0x22ff1
-
-TilesetTrainStationGFX: ; 0x22ff1
-INCBIN "gfx/tilesets/train_station.2bpp.lz"
-; 0x23391
-
-TilesetTrainStationMeta: ; 0x23391
-INCBIN "tilesets/train_station_metatiles.bin"
-; 0x23791
-
-TilesetTrainStationColl: ; 0x23791
-INCLUDE "tilesets/train_station_collision.asm"
-; 0x23891
-
-TilesetIlexForestMeta: ; 0x23891
-INCBIN "tilesets/ilex_forest_metatiles.bin"
-; 0x23b11
-
-
-SECTION "Tileset Data 4", ROMX
-
-TilesetGym1GFX: ; 0x30000
-INCBIN "gfx/tilesets/gym_1.2bpp.lz"
-; 0x304e0
-
-TilesetGym1Meta: ; 0x304e0
-INCBIN "tilesets/gym_1_metatiles.bin"
-; 0x308e0
-
-TilesetGym1Coll: ; 0x308e0
-INCLUDE "tilesets/gym_1_collision.asm"
-; 0x309e0
-
-TilesetParkGFX: ; 0x309e0
-INCBIN "gfx/tilesets/park.2bpp.lz"
-; 0x30e80
-
-TilesetParkMeta: ; 0x30e80
-INCBIN "tilesets/park_metatiles.bin"
-; 0x31280
-
-TilesetParkColl: ; 0x31280
-INCLUDE "tilesets/park_collision.asm"
-; 0x31380
-
-TilesetRadioTowerGFX: ; 0x31380
-INCBIN "gfx/tilesets/radio_tower.2bpp.lz"
-; 0x318e0
-
-TilesetRadioTowerMeta: ; 0x318e0
-INCBIN "tilesets/radio_tower_metatiles.bin"
-; 0x31ce0
-
-TilesetRadioTowerColl: ; 0x31ce0
-INCLUDE "tilesets/radio_tower_collision.asm"
-; 0x31de0
-
-TilesetUndergroundGFX: ; 0x31de0
-INCBIN "gfx/tilesets/underground.2bpp.lz"
-; 0x321b0
-
-TilesetUndergroundMeta: ; 0x321b0
-INCBIN "tilesets/underground_metatiles.bin"
-; 0x325b0
-
-TilesetUndergroundColl: ; 0x325b0
-INCLUDE "tilesets/underground_collision.asm"
-; 0x326b0
-
-TilesetWhirlIslandsGFX: ; 0x326b0
-INCBIN "gfx/tilesets/whirl_islands.2bpp.lz"
-; 0x329f0
-
-UnusedTilesetWhirlIslandsMeta: ; 0x329f0
-INCBIN "tilesets/unused_whirl_islands_metatiles.bin"
-; 0x331f0
-
-UnusedTilesetWhirlIslandsColl: ; 0x331f0
-INCLUDE "tilesets/unused_whirl_islands_collision.asm"
-; 0x333f0
-
-
-SECTION "Tileset Data 5", ROMX
-
-TilesetPokeComCenterGFX: ; 0xb4000
-INCBIN "gfx/tilesets/pokecom_center.2bpp.lz"
-; 0xb48a0
-
-TilesetPokeComCenterMeta: ; 0xb48a0
-INCBIN "tilesets/pokecom_center_metatiles.bin"
-; 0xb4ca0
-
-TilesetPokeComCenterColl: ; 0xb4ca0
-INCLUDE "tilesets/pokecom_center_collision.asm"
-; 0xb4da0
-
-TilesetBattleTowerGFX: ; 0xb4da0
-INCBIN "gfx/tilesets/battle_tower.2bpp.lz"
-; 0xb50e0
-
-TilesetBattleTowerMeta: ; 0xb50e0
-INCBIN "tilesets/battle_tower_metatiles.bin"
-; 0xb54e0
-
-TilesetBattleTowerColl: ; 0xb54e0
-INCLUDE "tilesets/battle_tower_collision.asm"
-; 0xb55e0
-
-TilesetGateGFX: ; 0xb55e0
-INCBIN "gfx/tilesets/gate.2bpp.lz"
-; 0xb59e0
-
-TilesetGateMeta: ; 0xb59e0
-INCBIN "tilesets/gate_metatiles.bin"
-; 0xb5de0
-
-TilesetGateColl: ; 0xb5de0
-INCLUDE "tilesets/gate_collision.asm"
-; 0xb5ee0
-
-TilesetJohto2GFX: ; 0xb5ee0
-TilesetBattleTowerOutsideGFX: ; 0xb5ee0
-INCBIN "gfx/tilesets/johto_2.2bpp.lz"
-; 0xb6ae8
-
-TilesetJohto2Meta: ; 0xb6ae8
-INCBIN "tilesets/johto_2_metatiles.bin"
-; 0xb72e8
-
-TilesetJohto2Coll: ; 0xb72e8
-INCLUDE "tilesets/johto_2_collision.asm"
-; 0xb74e8
-
-TilesetKurtsHouseGFX: ; 0xb74e8
-INCBIN "gfx/tilesets/kurts_house.2bpp.lz"
-; 0xb79a8
-
-TilesetKurtsHouseMeta: ; 0xb79a8
-INCBIN "tilesets/kurts_house_metatiles.bin"
-; 0xb7da8
-
-TilesetKurtsHouseColl: ; 0xb7da8
-INCLUDE "tilesets/kurts_house_collision.asm"
-; 0xb7ea8
-
-
-SECTION "Tileset Data 6", ROMX
-
-TilesetIlexForestGFX: ; 0xdc000
-INCBIN "gfx/tilesets/ilex_forest.2bpp.lz"
-; 0xdc3d0
-
-TilesetOlivineGymGFX: ; 0xdc3d0
-INCBIN "gfx/tilesets/olivine_gym.2bpp.lz"
-; 0xdcc50
-
-TilesetOlivineGymMeta: ; 0xdcc50
-INCBIN "tilesets/olivine_gym_metatiles.bin"
-; 0xdd050
-
-TilesetOlivineGymColl: ; 0xdd050
-INCLUDE "tilesets/olivine_gym_collision.asm"
-; 0xdd150
-
-TilesetHouse1GFX: ; 0xdd150
-INCBIN "gfx/tilesets/house_1.2bpp.lz"
-; 0xdd600
-
-TilesetHouse1Meta: ; 0xdd600
-INCBIN "tilesets/house_1_metatiles.bin"
-; 0xdda00
-
-TilesetHouse1Coll: ; 0xdda00
-INCLUDE "tilesets/house_1_collision.asm"
-; 0xddb00
-
-TilesetLighthouseGFX: ; 0xddb00
-INCBIN "gfx/tilesets/lighthouse.2bpp.lz"
-; 0xddf70
-
-TilesetLighthouseMeta: ; 0xddf70
-INCBIN "tilesets/lighthouse_metatiles.bin"
-; 0xde370
-
-TilesetLighthouseColl: ; 0xde370
-INCLUDE "tilesets/lighthouse_collision.asm"
-; 0xde470
-
-TilesetIlexForestColl: ; 0xde470
-INCLUDE "tilesets/ilex_forest_collision.asm"
-; 0xde570
-
-TilesetPowerPlantGFX: ; 0xde570
-INCBIN "gfx/tilesets/power_plant.2bpp.lz"
-; 0xde990
-
-TilesetPowerPlantMeta: ; 0xde990
-INCBIN "tilesets/power_plant_metatiles.bin"
-; 0xded90
-
-TilesetPowerPlantColl: ; 0xded90
-INCLUDE "tilesets/power_plant_collision.asm"
-; 0xdee90
-
-TilesetBattleTowerOutsideMeta: ; 0xdee90
-INCBIN "tilesets/battle_tower_outside_metatiles.bin"
-; 0xdf690
-
-TilesetBattleTowerOutsideColl: ; 0xdf690
-INCLUDE "tilesets/battle_tower_outside_collision.asm"
-; 0xdf890
-
-TilesetBetaWordRoomMeta: ; 0xdf890
-INCBIN "tilesets/beta_word_room_metatiles.bin"
-; 0xdfc90
-
-TilesetBetaWordRoomColl: ; 0xdfc90
-TilesetHoOhWordRoomColl: ; 0xdfc90
-TilesetKabutoWordRoomColl: ; 0xdfc90
-TilesetOmanyteWordRoomColl: ; 0xdfc90
-TilesetAerodactylWordRoomColl: ; 0xdfc90
-INCLUDE "tilesets/beta_word_room_collision.asm"
-; 0xdfd90
-
-
-SECTION "Tileset Data 7", ROMX
-
-TilesetRuinsOfAlphGFX: ; 0x1dc5a1
-TilesetBetaWordRoomGFX: ; 0x1dc5a1
-TilesetHoOhWordRoomGFX: ; 0x1dc5a1
-TilesetKabutoWordRoomGFX: ; 0x1dc5a1
-TilesetOmanyteWordRoomGFX: ; 0x1dc5a1
-TilesetAerodactylWordRoomGFX: ; 0x1dc5a1
-INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz"
-; 0x1dd1a9
-
-TilesetRuinsOfAlphMeta: ; 0x1dd1a9
-INCBIN "tilesets/ruins_of_alph_metatiles.bin"
-; 0x1dd5a9
-
-TilesetRuinsOfAlphColl: ; 0x1dd5a9
-INCLUDE "tilesets/ruins_of_alph_collision.asm"
-; 0x1dd6a9
-
-
-SECTION "Tileset Data 8", ROMX
-
-TilesetHoOhWordRoomMeta: ; 0x1e0000
-INCBIN "tilesets/ho_oh_word_room_metatiles.bin"
-; 0x1e0400
-
-TilesetKabutoWordRoomMeta: ; 0x1e0400
-INCBIN "tilesets/kabuto_word_room_metatiles.bin"
-; 0x1e0800
-
-TilesetOmanyteWordRoomMeta: ; 0x1e0800
-INCBIN "tilesets/omanyte_word_room_metatiles.bin"
-; 0x1e0c00
-
-TilesetAerodactylWordRoomMeta: ; 0x1e0c00
-INCBIN "tilesets/aerodactyl_word_room_metatiles.bin"
-; 0x1e1000
diff --git a/tilesets/game_corner_collision.asm b/tilesets/game_corner_collision.asm
deleted file mode 100644
index 65b99cf54..000000000
--- a/tilesets/game_corner_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll WALL, WALL, FLOOR, FLOOR ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll WALL, WALL, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
- tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 08
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 09
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0a
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b
- tilecoll WALL, WALL, WALL, WALL ; 0c
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
- tilecoll WALL, WALL, WALL, WALL ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll WALL, WALL, COUNTER, COUNTER ; 11
- tilecoll WALL, WALL, COUNTER, COUNTER ; 12
- tilecoll WALL, WALL, WALL, WALL ; 13
- tilecoll WALL, WALL, COUNTER, FLOOR ; 14
- tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 15
- tilecoll WALL, WALL, WALL, WALL ; 16
- tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 17
- tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 18
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 19
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
- tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1c
- tilecoll WALL, WALL, FLOOR, COUNTER ; 1d
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1e
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1f
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll WALL, WALL, WALL, WALL ; 22
- tilecoll WALL, WALL, WALL, WALL ; 23
- tilecoll WALL, WALL, WALL, WALL ; 24
- tilecoll WALL, WALL, WALL, WALL ; 25
- tilecoll WALL, WALL, WALL, WALL ; 26
- tilecoll WALL, WALL, FLOOR, FLOOR ; 27
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 28
- tilecoll WALL, WALL, FLOOR, FLOOR ; 29
- tilecoll WALL, WALL, FLOOR, WALL ; 2a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
- tilecoll WALL, WALL, FLOOR, WALL ; 2c
- tilecoll FLOOR, FLOOR, WALL, WALL ; 2d
- tilecoll WALL, WALL, WALL, WALL ; 2e
- tilecoll WALL, WALL, WALL, WALL ; 2f
- tilecoll WALL, WALL, FLOOR, WALL ; 30
- tilecoll WALL, WALL, WALL, FLOOR ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/game_corner_metatiles.bin b/tilesets/game_corner_metatiles.bin
deleted file mode 100644
index 24beba2d3..000000000
--- a/tilesets/game_corner_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/game_corner_palette_map.asm b/tilesets/game_corner_palette_map.asm
deleted file mode 100644
index 34bb9f6f0..000000000
--- a/tilesets/game_corner_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, GREEN, GREEN, GREEN
- tilepal 0, GREEN, GREEN, GRAY, GRAY, RED, RED, GREEN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, RED, BROWN, GREEN, GRAY, GRAY
- tilepal 0, GRAY, GREEN, GRAY, GRAY, RED, RED, BROWN, BROWN
- tilepal 0, BROWN, BROWN, RED, RED, BROWN, BROWN, GRAY, GRAY
- tilepal 0, GRAY, GREEN, RED, RED, GREEN, GRAY, RED, RED
- tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
- tilepal 0, BROWN, BROWN, RED, RED, GREEN, BROWN, RED, RED
- tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
- tilepal 0, RED, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
-
-rept 16
- db $ff
-endr
-
- tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, BROWN
- tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
- tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, RED, ROOF, ROOF
- tilepal 1, YELLOW, RED, YELLOW, RED, WATER, WATER, RED, RED
- tilepal 1, RED, RED, RED, RED, GREEN, GRAY, RED, RED
- tilepal 1, RED, RED, YELLOW, YELLOW, WATER, WATER, BROWN, BROWN
- tilepal 1, BROWN, BROWN, RED, RED, GREEN, ROOF, RED, RED
- tilepal 1, RED, RED, YELLOW, YELLOW, ROOF, ROOF, RED, RED
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
- tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED
- tilepal 1, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
diff --git a/tilesets/gate_collision.asm b/tilesets/gate_collision.asm
deleted file mode 100644
index 54cd95d34..000000000
--- a/tilesets/gate_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll WALL, WALL, FLOOR, FLOOR ; 03
- tilecoll WALL, WALL, WALL, WALL ; 04
- tilecoll DOOR, DOOR, FLOOR, FLOOR ; 05
- tilecoll WALL, WALL, WALL, WALL ; 06
- tilecoll WALL, WALL, FLOOR, FLOOR ; 07
- tilecoll WALL, WALL, FLOOR, FLOOR ; 08
- tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 09
- tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 0a
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0c
- tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0d
- tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0e
- tilecoll WALL, WALL, COUNTER, FLOOR ; 0f
- tilecoll WALL, WALL, FLOOR, COUNTER ; 10
- tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 12
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 13
- tilecoll WALL, WALL, FLOOR, COUNTER ; 14
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
- tilecoll WALL, WALL, WALL, WALL ; 16
- tilecoll WALL, WALL, FLOOR, FLOOR ; 17
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
- tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
- tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 22
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
- tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 24
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 26
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27
- tilecoll WALL, WALL, WALL, WALL ; 28
- tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 29
- tilecoll WALL, DOOR, FLOOR, FLOOR ; 2a
- tilecoll DOOR, WALL, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2c
- tilecoll WALL, WALL, FLOOR, PC ; 2d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
- tilecoll DOOR, WALL, FLOOR, FLOOR ; 2f
- tilecoll WALL, WALL, FLOOR, FLOOR ; 30
- tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 31
- tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 32
- tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 33
- tilecoll COUNTER, FLOOR, FLOOR, WALL ; 34
- tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll WALL, FLOOR, WALL, FLOOR ; 39
- tilecoll WALL, WALL, WALL, WALL ; 3a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
- tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 3e
- tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3f
- tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40
diff --git a/tilesets/gate_metatiles.bin b/tilesets/gate_metatiles.bin
deleted file mode 100644
index 74076ff58..000000000
--- a/tilesets/gate_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/gate_palette_map.asm b/tilesets/gate_palette_map.asm
deleted file mode 100644
index 7854d3a81..000000000
--- a/tilesets/gate_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GRAY, WATER, WATER, RED, GREEN, GREEN, GREEN
- tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
- tilepal 0, WATER, GRAY, WATER, WATER, RED, BROWN, BROWN, WATER
- tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, WATER
- tilepal 0, GREEN, GREEN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
- tilepal 0, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
- tilepal 0, GREEN, GREEN, GREEN, GREEN, GRAY, WATER, WATER, WATER
- tilepal 0, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
- tilepal 1, GRAY, GRAY, GRAY, GRAY, ROOF, RED, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, WATER
- tilepal 1, GRAY, ROOF, RED, GRAY, GRAY, WATER, GRAY, GRAY
- tilepal 1, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
- tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, WATER, WATER, WATER
- tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
diff --git a/tilesets/gym_1_collision.asm b/tilesets/gym_1_collision.asm
deleted file mode 100644
index cc0b705f3..000000000
--- a/tilesets/gym_1_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04
- tilecoll WALL, WALL, WALL, FLOOR ; 05
- tilecoll WALL, WALL, FLOOR, FLOOR ; 06
- tilecoll WALL, WALL, FLOOR, WALL ; 07
- tilecoll WALL, WALL, WALL, WALL ; 08
- tilecoll WALL, FLOOR, WALL, FLOOR ; 09
- tilecoll FLOOR, FLOOR, PIT, FLOOR ; 0a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0c
- tilecoll WALL, FLOOR, WALL, WALL ; 0d
- tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
- tilecoll FLOOR, WALL, WALL, WALL ; 0f
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10
- tilecoll WALL, FLOOR, WALL, FLOOR ; 11
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
- tilecoll WALL, WALL, WALL, WALL ; 15
- tilecoll WALL, WALL, FLOOR, FLOOR ; 16
- tilecoll LADDER, LADDER, FLOOR, FLOOR ; 17
- tilecoll WALL, WALL, WALL, WALL ; 18
- tilecoll FLOOR, FLOOR, WALL, WALL ; 19
- tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
- tilecoll WALL, FLOOR, WALL, WALL ; 1c
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1d
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, FLOOR, WALL, FLOOR ; 21
- tilecoll WALL, WALL, FLOOR, FLOOR ; 22
- tilecoll WALL, WALL, FLOOR, FLOOR ; 23
- tilecoll WALL, WALL, FLOOR, FLOOR ; 24
- tilecoll WALL, WALL, WALL, WALL ; 25
- tilecoll FLOOR, WALL, FLOOR, WALL ; 26
- tilecoll WALL, FLOOR, WALL, FLOOR ; 27
- tilecoll WALL, WALL, WALL, WALL ; 28
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 29
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll WALL, WALL, WALL, WALL ; 2c
- tilecoll WALL, WALL, WALL, WALL ; 2d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
- tilecoll ICE, ICE, ICE, FLOOR ; 2f
- tilecoll ICE, ICE, FLOOR, ICE ; 30
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31
- tilecoll FLOOR, ICE, ICE, ICE ; 32
- tilecoll ICE, FLOOR, ICE, ICE ; 33
- tilecoll WALL, WALL, FLOOR, FLOOR ; 34
- tilecoll WALL, WALL, FLOOR, FLOOR ; 35
- tilecoll ICE, WALL, ICE, WALL ; 36
- tilecoll WALL, ICE, WALL, ICE ; 37
- tilecoll WALL, WALL, WALL, WALL ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll ICE, ICE, ICE, ICE ; 3a
- tilecoll WALL, FLOOR, FLOOR, WALL ; 3b
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3d
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3e
- tilecoll WALL, WALL, WALL, WALL ; 3f
- tilecoll WALL, WALL, WALL, WALL ; 40
diff --git a/tilesets/gym_1_metatiles.bin b/tilesets/gym_1_metatiles.bin
deleted file mode 100644
index a9df6062c..000000000
--- a/tilesets/gym_1_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/gym_1_palette_map.asm b/tilesets/gym_1_palette_map.asm
deleted file mode 100644
index b20f49195..000000000
--- a/tilesets/gym_1_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
- tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
- tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
- tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN
- tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
- tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN
- tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
- tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
- tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
- tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
- tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
- tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
- tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN
- tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
- tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN
- tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
- tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
- tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
diff --git a/tilesets/ho_oh_word_room_collision.asm b/tilesets/ho_oh_word_room_collision.asm
deleted file mode 100644
index 138f07143..000000000
--- a/tilesets/ho_oh_word_room_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
- tilecoll WALL, WALL, WALL, FLOOR ; 15
- tilecoll WALL, WALL, FLOOR, FLOOR ; 16
- tilecoll WALL, WALL, FLOOR, FLOOR ; 17
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
- tilecoll WALL, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, WALL, FLOOR, WALL ; 1a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
- tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
- tilecoll WALL, WALL, WALL, WALL ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/ho_oh_word_room_metatiles.bin b/tilesets/ho_oh_word_room_metatiles.bin
deleted file mode 100644
index 2b542c632..000000000
--- a/tilesets/ho_oh_word_room_metatiles.bin
+++ /dev/null
@@ -1,17 +0,0 @@
-͈ݘɨٸɸÐǬ׼èӸ 
- 
- 
-  !"#@ABC 89
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- TVXY 
- C 6!@ #8
- 6"7[\M]͠ݰǎמǎמ͈ݘÐǎמŀՐ \ No newline at end of file
diff --git a/tilesets/ho_oh_word_room_palette_map.asm b/tilesets/ho_oh_word_room_palette_map.asm
deleted file mode 100644
index 5ebde24ba..000000000
--- a/tilesets/ho_oh_word_room_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/house_1_collision.asm b/tilesets/house_1_collision.asm
deleted file mode 100644
index ae5580782..000000000
--- a/tilesets/house_1_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 02
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 03
- tilecoll WALL, WALL, FLOOR, FLOOR ; 04
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05
- tilecoll WALL, WINDOW, FLOOR, FLOOR ; 06
- tilecoll WALL, FLOOR, WALL, FLOOR ; 07
- tilecoll FLOOR, WALL, FLOOR, WALL ; 08
- tilecoll WALL, WINDOW, FLOOR, FLOOR ; 09
- tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 0a
- tilecoll WALL, WALL, WALL, WALL ; 0b
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
- tilecoll WALL, WALL, PC, WALL ; 11
- tilecoll WALL, WALL, WALL, FLOOR ; 12
- tilecoll WALL, WALL, FLOOR, FLOOR ; 13
- tilecoll WALL, WALL, FLOOR, FLOOR ; 14
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 15
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16
- tilecoll WINDOW, WALL, FLOOR, FLOOR ; 17
- tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 18
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b
- tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1c
- tilecoll WALL, WALL, FLOOR, PC ; 1d
- tilecoll WALL, WALL, FLOOR, RADIO ; 1e
- tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll FLOOR, WALL, FLOOR, WALL ; 22
- tilecoll WALL, FLOOR, WALL, FLOOR ; 23
- tilecoll FLOOR, WALL, FLOOR, WALL ; 24
- tilecoll WALL, FLOOR, WALL, FLOOR ; 25
- tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 26
- tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 27
- tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28
- tilecoll WALL, WALL, FLOOR, FLOOR ; 29
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
- tilecoll WALL, WALL, WALL, WALL ; 2d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll WALL, WALL, FLOOR, WALL ; 30
- tilecoll WALL, FLOOR, WALL, FLOOR ; 31
- tilecoll FLOOR, WALL, FLOOR, WALL ; 32
- tilecoll WALL, WINDOW, WALL, WALL ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/house_1_metatiles.bin b/tilesets/house_1_metatiles.bin
deleted file mode 100644
index 0d3a22f32..000000000
--- a/tilesets/house_1_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/house_1_palette_map.asm b/tilesets/house_1_palette_map.asm
deleted file mode 100644
index ce7b988b7..000000000
--- a/tilesets/house_1_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
- tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
- tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
- tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN
- tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN
- tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN
- tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
- tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
- tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
- tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
- tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
- tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN
- tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
- tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
- tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
- tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/ice_path_collision.asm b/tilesets/ice_path_collision.asm
deleted file mode 100644
index 4fd9376ad..000000000
--- a/tilesets/ice_path_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04
- tilecoll WALL, UP_WALL, WALL, FLOOR ; 05
- tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06
- tilecoll UP_WALL, WALL, FLOOR, WALL ; 07
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08
- tilecoll WALL, FLOOR, WALL, FLOOR ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
- tilecoll WALL, WALL, WALL, WALL ; 0c
- tilecoll WALL, FLOOR, WALL, WALL ; 0d
- tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
- tilecoll FLOOR, WALL, WALL, WALL ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
- tilecoll FLOOR, FLOOR, WALL, CAVE ; 14
- tilecoll WALL, WALL, WALL, FLOOR ; 15
- tilecoll WALL, WALL, FLOOR, FLOOR ; 16
- tilecoll WALL, WALL, FLOOR, WALL ; 17
- tilecoll FLOOR, FLOOR, PIT, FLOOR ; 18
- tilecoll WALL, FLOOR, WALL, FLOOR ; 19
- tilecoll WALL, WALL, WALL, WALL ; 1a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
- tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1c
- tilecoll WALL, FLOOR, WALL, WALL ; 1d
- tilecoll FLOOR, FLOOR, WALL, WALL ; 1e
- tilecoll FLOOR, WALL, WALL, WALL ; 1f
- tilecoll ICE, ICE, ICE, ICE ; 20
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 24
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 25
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 26
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 27
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 28
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 29
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll WALL, ICE, ICE, ICE ; 2d
- tilecoll ICE, ICE, WALL, ICE ; 2e
- tilecoll ICE, WALL, ICE, ICE ; 2f
- tilecoll ICE, ICE, ICE, WALL ; 30
- tilecoll WALL, WALL, FLOOR, WALL ; 31
- tilecoll WALL, WALL, WALL, WALL ; 32
- tilecoll WALL, WALL, WALL, FLOOR ; 33
- tilecoll WALL, WALL, FLOOR, FLOOR ; 34
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 38
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 39
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
- tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3e
- tilecoll FLOOR, FLOOR, WALL, WALL ; 3f
- tilecoll ICE, ICE, ICE, LADDER ; 40
diff --git a/tilesets/ice_path_metatiles.bin b/tilesets/ice_path_metatiles.bin
deleted file mode 100644
index c92246e8a..000000000
--- a/tilesets/ice_path_metatiles.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-
- *+:;Өʚʛ śժժū՚Ū՚ŪŚՙȺ͘BC  ǒׂǒǂגǂגRRRRSS(S >8(TRRRR,--.IJHKRRRRS)SS9? V)RRRRSSSS  >TLM \]XYZ[8//9WGGGU? NO^_ 
- *+:;ɾ͈&' 67EF   4444444444444444 \ No newline at end of file
diff --git a/tilesets/ice_path_palette_map.asm b/tilesets/ice_path_palette_map.asm
deleted file mode 100644
index 985844071..000000000
--- a/tilesets/ice_path_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, BROWN, ROOF, ROOF, BROWN, BROWN, WATER, WATER
- tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, ROOF, BROWN, BROWN, WATER, WATER
- tilepal 0, WATER, ROOF, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
- tilepal 0, WATER, WATER, ROOF, ROOF, WATER, WATER, WATER, WATER
- tilepal 0, BROWN, WATER, WATER, WATER, WATER, WATER, GRAY, GRAY
- tilepal 0, WATER, WATER, ROOF, ROOF, GRAY, GRAY, WATER, WATER
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, GREEN, GRAY, GRAY, WATER
- tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, WATER
- tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
-
-rept 16
- db $ff
-endr
-
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
diff --git a/tilesets/ilex_forest_collision.asm b/tilesets/ilex_forest_collision.asm
deleted file mode 100644
index 70cc72ff1..000000000
--- a/tilesets/ilex_forest_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll WATER, WATER, WATER, WATER ; 03
- tilecoll WATER, WATER, WATER, WATER ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll WALL, WALL, WALL, WALL ; 06
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 07
- tilecoll WATER, WATER, WATER, WATER ; 08
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 09
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 0a
- tilecoll WATER, WATER, WATER, WATER ; 0b
- tilecoll WATER, WATER, WATER, WATER ; 0c
- tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0d
- tilecoll WATER, WATER, WATER, WATER ; 0e
- tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0f
- tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 10
- tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11
- tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 12
- tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 13
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
- tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 15
- tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 16
- tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 17
- tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 18
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 19
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 1a
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1c
- tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1d
- tilecoll WALL, WALL, WALL, WALL ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21
- tilecoll WALL, WALL, WALL, WALL ; 22
- tilecoll WALL, WALL, WALL, WALL ; 23
- tilecoll WALL, WALL, WALL, WALL ; 24
- tilecoll WALL, WALL, WALL, DOOR ; 25
- tilecoll WALL, WALL, WALL, WALL ; 26
- tilecoll WALL, WALL, WALL, WALL ; 27
- tilecoll WALL, WALL, WALL, WALL ; 28
- tilecoll WALL, FLOOR, WALL, FLOOR ; 29
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2d
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2e
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2f
- tilecoll WALL, FLOOR, WALL, FLOOR ; 30
- tilecoll WALL, FLOOR, WALL, FLOOR ; 31
- tilecoll WALL, FLOOR, WALL, FLOOR ; 32
- tilecoll WALL, FLOOR, WALL, FLOOR ; 33
- tilecoll WALL, FLOOR, WALL, FLOOR ; 34
- tilecoll WALL, FLOOR, WALL, FLOOR ; 35
- tilecoll WALL, FLOOR, WALL, FLOOR ; 36
- tilecoll WALL, FLOOR, WALL, FLOOR ; 37
- tilecoll WALL, FLOOR, WALL, FLOOR ; 38
- tilecoll WALL, FLOOR, WALL, FLOOR ; 39
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3d
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3e
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3f
- tilecoll WALL, FLOOR, WALL, FLOOR ; 40
diff --git a/tilesets/ilex_forest_metatiles.bin b/tilesets/ilex_forest_metatiles.bin
deleted file mode 100644
index a8b82d8cf..000000000
--- a/tilesets/ilex_forest_metatiles.bin
+++ /dev/null
@@ -1 +0,0 @@
- ,-./<=>?**** ,-./<=>? ***&'&'6767&'67&'&'6767&'67&'67*** &'67&'67(9&'8:67&'67&'&'6767&'&'6767&'67&'&'6767&'67&'67&'67&'67)**********+** !!! !!! !!!!!!!!!!!!!!!!!!"!!!"!!!"02 !!!0111#$$$#$!!!!1111$$$$$$!!!"1112$$$%$%#$$$#$$$#$34#$$$#$$$#$$$3444$$$$$$$$$$$$4444$$$%$$$%$$$%4445 \ No newline at end of file
diff --git a/tilesets/ilex_forest_palette_map.asm b/tilesets/ilex_forest_palette_map.asm
deleted file mode 100644
index 696788084..000000000
--- a/tilesets/ilex_forest_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
- tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
- tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
- tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
- tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/johto_1_collision.asm b/tilesets/johto_1_collision.asm
deleted file mode 100644
index 4d6d2c072..000000000
--- a/tilesets/johto_1_collision.asm
+++ /dev/null
@@ -1,128 +0,0 @@
- tilecoll 01, 01, 01, 01 ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll WALL, WALL, WALL, WALL ; 06
- tilecoll LADDER, LADDER, LADDER, LADDER ; 07
- tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 08
- tilecoll WALL, WALL, WALL, WALL ; 09
- tilecoll WALL, WALL, WALL, WALL ; 0a
- tilecoll WALL, WALL, WALL, WALL ; 0b
- tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll WALL, WALL, WALL, WALL ; 11
- tilecoll WALL, WALL, WALL, WALL ; 12
- tilecoll WALL, WALL, WALL, WALL ; 13
- tilecoll WALL, WALL, WALL, WALL ; 14
- tilecoll WALL, WALL, WALL, DOOR ; 15
- tilecoll WALL, WALL, WALL, WALL ; 16
- tilecoll WALL, WALL, WALL, DOOR ; 17
- tilecoll WALL, WALL, WALL, WALL ; 18
- tilecoll WALL, WALL, WALL, WALL ; 19
- tilecoll WALL, WALL, WALL, WALL ; 1a
- tilecoll WALL, WALL, WALL, DOOR ; 1b
- tilecoll WALL, WALL, WALL, WALL ; 1c
- tilecoll WALL, WALL, WALL, WALL ; 1d
- tilecoll WALL, WALL, DOOR, WALL ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll WALL, WALL, WALL, WALL ; 22
- tilecoll WALL, WALL, WALL, WALL ; 23
- tilecoll WALL, WALL, WALL, WALL ; 24
- tilecoll WALL, WALL, WALL, WALL ; 25
- tilecoll WALL, WALL, WALL, WALL ; 26
- tilecoll WALL, WALL, WALL, WALL ; 27
- tilecoll WALL, WALL, DOOR, WALL ; 28
- tilecoll WALL, WALL, WALL, DOOR ; 29
- tilecoll WALL, WALL, WALL, WALL ; 2a
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2b
- tilecoll WALL, WALL, WALL, WALL ; 2c
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2e
- tilecoll WALL, WALL, WALL, DOOR ; 2f
- tilecoll WALL, WALL, WALL, WALL ; 30
- tilecoll BUOY, BUOY, BUOY, WATER ; 31
- tilecoll BUOY, BUOY, WATER, WATER ; 32
- tilecoll BUOY, BUOY, WATER, BUOY ; 33
- tilecoll FLOOR, FLOOR, WALL, WALL ; 34
- tilecoll BUOY, WATER, BUOY, WATER ; 35
- tilecoll WATER, WATER, WATER, WATER ; 36
- tilecoll WATER, BUOY, WATER, BUOY ; 37
- tilecoll WALL, WALL, WALL, DOOR ; 38
- tilecoll BUOY, WATER, BUOY, BUOY ; 39
- tilecoll WATER, WATER, BUOY, BUOY ; 3a
- tilecoll WATER, BUOY, BUOY, BUOY ; 3b
- tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 40
- tilecoll WALL, WALL, WALL, FLOOR ; 41
- tilecoll WALL, WALL, FLOOR, FLOOR ; 42
- tilecoll WALL, WALL, FLOOR, WALL ; 43
- tilecoll WATER, WATER, WATER, WATER ; 44
- tilecoll WALL, FLOOR, WALL, FLOOR ; 45
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46
- tilecoll FLOOR, WALL, FLOOR, WALL ; 47
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48
- tilecoll WALL, FLOOR, WALL, WALL ; 49
- tilecoll FLOOR, FLOOR, WALL, WALL ; 4a
- tilecoll FLOOR, WALL, WALL, WALL ; 4b
- tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54
- tilecoll WATER, WATER, WATER, WATER ; 55
- tilecoll WATER, WATER, WATER, WATER ; 56
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58
- tilecoll WATER, WATER, WATER, WATER ; 59
- tilecoll WATER, WATER, WATER, WATER ; 5a
- tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b
- tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5c
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5d
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5e
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5f
- tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 60
- tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 61
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 62
- tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 63
- tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 64
- tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65
- tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 66
- tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 67
- tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 68
- tilecoll WALL, FLOOR, WALL, FLOOR ; 69
- tilecoll FLOOR, WALL, FLOOR, WALL ; 6a
- tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b
- tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c
- tilecoll WALL, FLOOR, WALL, WALL ; 6d
- tilecoll FLOOR, WALL, WALL, WALL ; 6e
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70
- tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
- tilecoll FLOOR, FLOOR, WALL, WALL ; 73
- tilecoll FLOOR, FLOOR, CAVE, WALL ; 74
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75
- tilecoll WALL, WALL, FLOOR, FLOOR ; 76
- tilecoll WATER, WATER, WATER, WATER ; 77
- tilecoll WALL, WALL, DOOR, WALL ; 78
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79
- tilecoll WATER, WATER, WATER, WATER ; 7a
- tilecoll WATER, WATER, WATER, WATER ; 7b
- tilecoll WALL, WALL, WALL, WALL ; 7c
- tilecoll WALL, WALL, WALL, WALL ; 7d
- tilecoll WALL, WALL, WALL, WALL ; 7e
- tilecoll WALL, WALL, WALL, WALL ; 7f
- tilecoll WALL, WALL, WALL, WALL ; 80
diff --git a/tilesets/johto_1_metatiles.bin b/tilesets/johto_1_metatiles.bin
deleted file mode 100644
index 9024f2ad6..000000000
--- a/tilesets/johto_1_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/johto_1_palette_map.asm b/tilesets/johto_1_palette_map.asm
deleted file mode 100644
index 62fbd2d00..000000000
--- a/tilesets/johto_1_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
- tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
- tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
- tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
- tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
- tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED
- tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
- tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN
- tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
- tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
- tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
- tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/johto_2_collision.asm b/tilesets/johto_2_collision.asm
deleted file mode 100644
index 40255d744..000000000
--- a/tilesets/johto_2_collision.asm
+++ /dev/null
@@ -1,128 +0,0 @@
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll WALL, WALL, WALL, WALL ; 06
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
- tilecoll WALL, WALL, WALL, WALL ; 09
- tilecoll WALL, WALL, WALL, WALL ; 0a
- tilecoll WALL, WALL, WALL, WALL ; 0b
- tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll WALL, WALL, WALL, WALL ; 11
- tilecoll WALL, WALL, WALL, WALL ; 12
- tilecoll WALL, WALL, WALL, WALL ; 13
- tilecoll WALL, WALL, WALL, WALL ; 14
- tilecoll WALL, WALL, WALL, DOOR ; 15
- tilecoll WALL, WALL, WALL, WALL ; 16
- tilecoll WALL, WALL, WALL, DOOR ; 17
- tilecoll WALL, WALL, DOOR, WALL ; 18
- tilecoll WALL, WALL, WALL, WALL ; 19
- tilecoll WALL, WALL, WALL, WALL ; 1a
- tilecoll WALL, WALL, WALL, DOOR ; 1b
- tilecoll WALL, WALL, WALL, WALL ; 1c
- tilecoll WALL, WALL, WALL, WALL ; 1d
- tilecoll WALL, WALL, DOOR, WALL ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll WALL, WALL, WALL, WALL ; 22
- tilecoll WALL, WALL, WALL, WALL ; 23
- tilecoll WALL, WALL, WALL, WALL ; 24
- tilecoll WALL, WALL, DOOR, WALL ; 25
- tilecoll WALL, WALL, WALL, WALL ; 26
- tilecoll WALL, WALL, WALL, WALL ; 27
- tilecoll WALL, WALL, WALL, WALL ; 28
- tilecoll WALL, WALL, WALL, WALL ; 29
- tilecoll WALL, WALL, WALL, WALL ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll WALL, WALL, WALL, WALL ; 2c
- tilecoll WALL, WALL, WALL, WALL ; 2d
- tilecoll WALL, WALL, WALL, DOOR ; 2e
- tilecoll WALL, WALL, WALL, WALL ; 2f
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 30
- tilecoll BUOY, BUOY, BUOY, WATER ; 31
- tilecoll BUOY, BUOY, WATER, WATER ; 32
- tilecoll BUOY, BUOY, WATER, BUOY ; 33
- tilecoll WALL, WALL, WALL, WALL ; 34
- tilecoll BUOY, WATER, BUOY, WATER ; 35
- tilecoll WATER, WATER, WATER, WATER ; 36
- tilecoll WATER, BUOY, WATER, BUOY ; 37
- tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 38
- tilecoll BUOY, WATER, BUOY, BUOY ; 39
- tilecoll WATER, WATER, BUOY, BUOY ; 3a
- tilecoll WATER, BUOY, BUOY, BUOY ; 3b
- tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3c
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3d
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3e
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3f
- tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 40
- tilecoll WALL, WALL, WALL, FLOOR ; 41
- tilecoll WALL, WALL, FLOOR, FLOOR ; 42
- tilecoll WALL, WALL, FLOOR, WALL ; 43
- tilecoll WATER, WATER, WATER, WATER ; 44
- tilecoll WALL, FLOOR, WALL, FLOOR ; 45
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46
- tilecoll FLOOR, WALL, FLOOR, WALL ; 47
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48
- tilecoll WALL, FLOOR, WALL, WALL ; 49
- tilecoll FLOOR, FLOOR, WALL, WALL ; 4a
- tilecoll FLOOR, WALL, WALL, WALL ; 4b
- tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54
- tilecoll WATER, WATER, WATER, WATER ; 55
- tilecoll WATER, WATER, WATER, WATER ; 56
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58
- tilecoll WATER, WATER, WATER, WATER ; 59
- tilecoll WATER, WATER, WATER, WATER ; 5a
- tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b
- tilecoll WALL, WALL, WALL, CAVE ; 5c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 5d
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5e
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f
- tilecoll WALL, WALL, WALL, WALL ; 60
- tilecoll WATER, WATER, WALL, WALL ; 61
- tilecoll WATER, WATER, WALL, WALL ; 62
- tilecoll WATER, WATER, WALL, WALL ; 63
- tilecoll WATER, WATER, WATER, WATER ; 64
- tilecoll FLOOR, WALL, FLOOR, WALL ; 65
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66
- tilecoll WALL, FLOOR, WALL, FLOOR ; 67
- tilecoll WALL, WALL, WALL, WALL ; 68
- tilecoll WALL, FLOOR, WALL, FLOOR ; 69
- tilecoll FLOOR, WALL, FLOOR, WALL ; 6a
- tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b
- tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c
- tilecoll WALL, FLOOR, WALL, WALL ; 6d
- tilecoll FLOOR, WALL, WALL, WALL ; 6e
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70
- tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
- tilecoll FLOOR, FLOOR, WALL, WALL ; 73
- tilecoll FLOOR, FLOOR, WALL, CAVE ; 74
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75
- tilecoll WALL, WALL, FLOOR, FLOOR ; 76
- tilecoll WATER, WATER, WATER, WATER ; 77
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 78
- tilecoll FLOOR, FLOOR, WALL, WALL ; 79
- tilecoll WATER, WATER, WATER, WATER ; 7a
- tilecoll WATER, WATER, WATER, WATER ; 7b
- tilecoll WALL, WALL, WALL, WALL ; 7c
- tilecoll WALL, WALL, WALL, WALL ; 7d
- tilecoll WALL, WALL, WALL, WALL ; 7e
- tilecoll WALL, WALL, WALL, WALL ; 7f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80
diff --git a/tilesets/johto_2_metatiles.bin b/tilesets/johto_2_metatiles.bin
deleted file mode 100644
index a15c0c2c7..000000000
--- a/tilesets/johto_2_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/johto_2_palette_map.asm b/tilesets/johto_2_palette_map.asm
deleted file mode 100644
index f2af7a92d..000000000
--- a/tilesets/johto_2_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
- tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
- tilepal 0, RED, RED, BROWN, BROWN, BROWN, GRAY, GREEN, GREEN
- tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED
- tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW
- tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY
- tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
- tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF
- tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN
- tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED
- tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW
- tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN
- tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF
diff --git a/tilesets/kabuto_word_room_collision.asm b/tilesets/kabuto_word_room_collision.asm
deleted file mode 100644
index 138f07143..000000000
--- a/tilesets/kabuto_word_room_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
- tilecoll WALL, WALL, WALL, FLOOR ; 15
- tilecoll WALL, WALL, FLOOR, FLOOR ; 16
- tilecoll WALL, WALL, FLOOR, FLOOR ; 17
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
- tilecoll WALL, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, WALL, FLOOR, WALL ; 1a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
- tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
- tilecoll WALL, WALL, WALL, WALL ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/kabuto_word_room_metatiles.bin b/tilesets/kabuto_word_room_metatiles.bin
deleted file mode 100644
index 14d082e2a..000000000
--- a/tilesets/kabuto_word_room_metatiles.bin
+++ /dev/null
@@ -1,17 +0,0 @@
-ɼͬݼÆӖŎ՞ÈӘØǎמ 
- 
- 
-  !"#@ABC 89
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- TVXY 
- C 6!@ #8
- 6"7Ř \ No newline at end of file
diff --git a/tilesets/kabuto_word_room_palette_map.asm b/tilesets/kabuto_word_room_palette_map.asm
deleted file mode 100644
index 5ebde24ba..000000000
--- a/tilesets/kabuto_word_room_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/kanto_collision.asm b/tilesets/kanto_collision.asm
deleted file mode 100644
index 9b0f0c275..000000000
--- a/tilesets/kanto_collision.asm
+++ /dev/null
@@ -1,128 +0,0 @@
- tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll WALL, WALL, WALL, DOOR ; 03
- tilecoll WALL, WALL, WALL, WALL ; 04
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 05
- tilecoll LADDER, LADDER, LADDER, LADDER ; 06
- tilecoll FLOOR, FLOOR, CAVE, WALL ; 07
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 08
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09
- tilecoll WALL, WALL, WALL, WALL ; 0a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
- tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0c
- tilecoll WALL, WALL, WALL, WALL ; 0d
- tilecoll WALL, WALL, WALL, WALL ; 0e
- tilecoll WALL, WALL, WALL, WALL ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll WALL, WALL, WALL, WALL ; 11
- tilecoll WALL, WALL, WALL, WALL ; 12
- tilecoll WALL, WALL, DOOR, WALL ; 13
- tilecoll WALL, WALL, WALL, WALL ; 14
- tilecoll WALL, WATER, WALL, WALL ; 15
- tilecoll WATER, WALL, WALL, WALL ; 16
- tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 18
- tilecoll WALL, WATER, WALL, WATER ; 19
- tilecoll WATER, WALL, WATER, WALL ; 1a
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
- tilecoll FLOOR, FLOOR, WALL, WALL ; 1d
- tilecoll WATER, WATER, WATER, WATER ; 1e
- tilecoll WATER, WATER, WATER, WATER ; 1f
- tilecoll WATER, WATER, WATER, WATER ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll WALL, WALL, WALL, WALL ; 22
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
- tilecoll WALL, FLOOR, WALL, WALL ; 25
- tilecoll FLOOR, WALL, WALL, WALL ; 26
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
- tilecoll WALL, FLOOR, WALL, FLOOR ; 29
- tilecoll FLOOR, WALL, FLOOR, WALL ; 2a
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
- tilecoll WATER, WATER, WATER, WATER ; 2e
- tilecoll WATER, WATER, WATER, WATER ; 2f
- tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 30
- tilecoll WALL, WALL, WALL, WALL ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll WALL, CUT_TREE, WALL, FLOOR ; 33
- tilecoll WALL, WALL, FLOOR, CUT_TREE ; 34
- tilecoll CUT_TREE, FLOOR, WALL, WALL ; 35
- tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 36
- tilecoll WALL, WALL, FLOOR, WALL ; 37
- tilecoll WALL, WALL, WALL, WALL ; 38
- tilecoll FLOOR, FLOOR, WALL, WALL ; 39
- tilecoll FLOOR, FLOOR, WALL, WALL ; 3a
- tilecoll WALL, WALL, DOOR, WALL ; 3b
- tilecoll UP_WALL, WALL, FLOOR, WALL ; 3c
- tilecoll WALL, WALL, WALL, DOOR ; 3d
- tilecoll WALL, WALL, WALL, WALL ; 3e
- tilecoll WALL, UP_WALL, WALL, FLOOR ; 3f
- tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 40
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 41
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 42
- tilecoll HOP_DOWN, WALL, WALL, WALL ; 43
- tilecoll WATER, WATER, WATER, WATER ; 44
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 45
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 46
- tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 47
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 48
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4b
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4c
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4d
- tilecoll FLOOR, WALL, FLOOR, WALL ; 4e
- tilecoll WALL, FLOOR, WALL, FLOOR ; 4f
- tilecoll FLOOR, WALL, WALL, WALL ; 50
- tilecoll WALL, FLOOR, WALL, WALL ; 51
- tilecoll WALL, WALL, FLOOR, FLOOR ; 52
- tilecoll FLOOR, FLOOR, WALL, WALL ; 53
- tilecoll WALL, WALL, WALL, DOOR ; 54
- tilecoll WALL, WALL, WALL, WALL ; 55
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56
- tilecoll FLOOR, FLOOR, WALL, WALL ; 57
- tilecoll FLOOR, FLOOR, WALL, WALL ; 58
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 59
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 5a
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5b
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5c
- tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f
- tilecoll FLOOR, WALL, FLOOR, WALL ; 60
- tilecoll FLOOR, WALL, CUT_TREE, WALL ; 61
- tilecoll FLOOR, FLOOR, WALL, WALL ; 62
- tilecoll WALL, WALL, WALL, FLOOR ; 63
- tilecoll WALL, WALL, FLOOR, WALL ; 64
- tilecoll WATER, WATER, WATER, WATER ; 65
- tilecoll WATER, WATER, WATER, WATER ; 66
- tilecoll WALL, WALL, WALL, WALL ; 67
- tilecoll WALL, WATER, WALL, WATER ; 68
- tilecoll WALL, WALL, WALL, WALL ; 69
- tilecoll WALL, WALL, WALL, WALL ; 6a
- tilecoll WATER, WALL, WATER, WALL ; 6b
- tilecoll WATER, WATER, WALL, WALL ; 6c
- tilecoll WALL, WALL, FLOOR, FLOOR ; 6d
- tilecoll WALL, FLOOR, WALL, FLOOR ; 6e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 6f
- tilecoll FLOOR, FLOOR, WALL, WALL ; 70
- tilecoll FLOOR, WALL, CAVE, WALL ; 71
- tilecoll WALL, WALL, WALL, WALL ; 72
- tilecoll WALL, WALL, WALL, WALL ; 73
- tilecoll WALL, WALL, WALL, WALL ; 74
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75
- tilecoll WALL, WALL, WALL, WALL ; 76
- tilecoll WALL, WALL, WALL, WALL ; 77
- tilecoll FLOOR, FLOOR, WALL, WALL ; 78
- tilecoll WATER, WATER, WATER, WATER ; 79
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7a
- tilecoll WALL, WALL, WALL, WALL ; 7b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c
- tilecoll WALL, WALL, WALL, DOOR ; 7d
- tilecoll WALL, WALL, WALL, WALL ; 7e
- tilecoll WALL, WALL, WALL, WALL ; 7f
- tilecoll WALL, WALL, WALL, WALL ; 80
diff --git a/tilesets/kanto_metatiles.bin b/tilesets/kanto_metatiles.bin
deleted file mode 100644
index 41b0cfffd..000000000
--- a/tilesets/kanto_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/kanto_palette_map.asm b/tilesets/kanto_palette_map.asm
deleted file mode 100644
index e3e497fb9..000000000
--- a/tilesets/kanto_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
- tilepal 0, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN
- tilepal 0, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
- tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
- tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
- tilepal 0, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
- tilepal 1, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN
- tilepal 1, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
- tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
- tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
- tilepal 1, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/kurts_house_collision.asm b/tilesets/kurts_house_collision.asm
deleted file mode 100644
index 95cb1c21d..000000000
--- a/tilesets/kurts_house_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, RADIO, FLOOR ; 02
- tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 03
- tilecoll WALL, WALL, FLOOR, FLOOR ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 08
- tilecoll WALL, WALL, FLOOR, FLOOR ; 09
- tilecoll WALL, WALL, WALL, WALL ; 0a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 0c
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 12
- tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 13
- tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 14
- tilecoll WALL, WALL, FLOOR, FLOOR ; 15
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17
- tilecoll WALL, WALL, WALL, WALL ; 18
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1c
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 22
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 23
- tilecoll WALL, WALL, RADIO, FLOOR ; 24
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25
- tilecoll WALL, WALL, FLOOR, FLOOR ; 26
- tilecoll FLOOR, FLOOR, WALL, WALL ; 27
- tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 28
- tilecoll WALL, WALL, FLOOR, FLOOR ; 29
- tilecoll WALL, WALL, WALL, WALL ; 2a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30
- tilecoll WALL, WALL, FLOOR, FLOOR ; 31
- tilecoll WALL, WALL, WALL, WALL ; 32
- tilecoll WALL, WALL, WALL, WALL ; 33
- tilecoll WALL, WALL, WALL, FLOOR ; 34
- tilecoll WALL, WALL, WALL, FLOOR ; 35
- tilecoll WALL, WALL, FLOOR, FLOOR ; 36
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37
- tilecoll WALL, WALL, FLOOR, WALL ; 38
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 39
- tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 3a
- tilecoll 04, 03, 03, 03 ; 3b
- tilecoll 03, 03, 03, 03 ; 3c
- tilecoll 03, 03, 04, 04 ; 3d
- tilecoll 04, 04, 04, 04 ; 3e
- tilecoll 03, 03, 03, 03 ; 3f
- tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 40
diff --git a/tilesets/kurts_house_metatiles.bin b/tilesets/kurts_house_metatiles.bin
deleted file mode 100644
index 3f6b41bd1..000000000
--- a/tilesets/kurts_house_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/kurts_house_palette_map.asm b/tilesets/kurts_house_palette_map.asm
deleted file mode 100644
index 5daa0da6b..000000000
--- a/tilesets/kurts_house_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
- tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
- tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY
- tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
- tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
- tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
- tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
- tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY
- tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
- tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
diff --git a/tilesets/lab_collision.asm b/tilesets/lab_collision.asm
deleted file mode 100644
index 436c8e0a7..000000000
--- a/tilesets/lab_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03
- tilecoll WALL, WALL, WALL, WALL ; 04
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05
- tilecoll WALL, WALL, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, WALL, WALL ; 07
- tilecoll FLOOR, FLOOR, WALL, WALL ; 08
- tilecoll WALL, WALL, WALL, WALL ; 09
- tilecoll WINDOW, WALL, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0f
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 10
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
- tilecoll WALL, WALL, FLOOR, FLOOR ; 12
- tilecoll WALL, WALL, FLOOR, FLOOR ; 13
- tilecoll WALL, WALL, FLOOR, FLOOR ; 14
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 15
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16
- tilecoll WALL, WALL, FLOOR, FLOOR ; 17
- tilecoll WALL, WALL, WALL, WALL ; 18
- tilecoll WALL, WALL, FLOOR, FLOOR ; 19
- tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 1a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
- tilecoll FLOOR, FLOOR, WALL, WALL ; 20
- tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 21
- tilecoll FLOOR, FLOOR, WALL, WALL ; 22
- tilecoll WALL, WALL, WALL, WALL ; 23
- tilecoll WALL, WALL, WALL, WALL ; 24
- tilecoll WALL, WALL, WALL, WALL ; 25
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
- tilecoll WALL, WALL, WALL, WALL ; 27
- tilecoll WALL, WALL, WALL, WALL ; 28
- tilecoll WALL, WALL, WALL, WALL ; 29
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/lab_metatiles.bin b/tilesets/lab_metatiles.bin
deleted file mode 100644
index 62da01e8b..000000000
--- a/tilesets/lab_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/lab_palette_map.asm b/tilesets/lab_palette_map.asm
deleted file mode 100644
index 24399c6ea..000000000
--- a/tilesets/lab_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, WATER, WATER, WATER, WATER, ROOF, BROWN, BROWN, BROWN
- tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
- tilepal 0, WATER, WATER, WATER, WATER, RED, BROWN, BROWN, GRAY
- tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
- tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, BROWN, GREEN, GREEN, GREEN
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, RED, RED, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
diff --git a/tilesets/lighthouse_collision.asm b/tilesets/lighthouse_collision.asm
deleted file mode 100644
index 05b6cd614..000000000
--- a/tilesets/lighthouse_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll WALL, WALL, WALL, WALL ; 03
- tilecoll WALL, WALL, WALL, WALL ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll WALL, WALL, WALL, WALL ; 06
- tilecoll FLOOR, FLOOR, WALL, WALL ; 07
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0a
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
- tilecoll WALL, WALL, WALL, WALL ; 0d
- tilecoll WALL, WALL, WALL, WALL ; 0e
- tilecoll WALL, WALL, WALL, WALL ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll 9C, FLOOR, COUNTER, FLOOR ; 11
- tilecoll WALL, WALL, WALL, WALL ; 12
- tilecoll WALL, WALL, WALL, WALL ; 13
- tilecoll WALL, WALL, WALL, WALL ; 14
- tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 15
- tilecoll WALL, WALL, WALL, WALL ; 16
- tilecoll 9C, FLOOR, COUNTER, FLOOR ; 17
- tilecoll WALL, WALL, WALL, WALL ; 18
- tilecoll FLOOR, WALL, FLOOR, WALL ; 19
- tilecoll WALL, WALL, WALL, STAIRCASE ; 1a
- tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1b
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c
- tilecoll WALL, WALL, WALL, WALL ; 1d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, FLOOR, WALL, FLOOR ; 21
- tilecoll FLOOR, WALL, FLOOR, WALL ; 22
- tilecoll WALL, FLOOR, WALL, WALL ; 23
- tilecoll FLOOR, WALL, WALL, WALL ; 24
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
- tilecoll FLOOR, FLOOR, WALL, WALL ; 26
- tilecoll WALL, WALL, WALL, WALL ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
- tilecoll FLOOR, FLOOR, PIT, PIT ; 29
- tilecoll WALL, WALL, WINDOW, WINDOW ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
- tilecoll WALL, WALL, WALL, WALL ; 2e
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f
- tilecoll WALL, WALL, WALL, BOOKSHELF ; 30
- tilecoll WALL, WALL, FLOOR, WALL ; 31
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 32
- tilecoll WALL, WALL, WALL, WALL ; 33
- tilecoll WALL, FLOOR, WALL, FLOOR ; 34
- tilecoll WALL, WALL, PC, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 36
- tilecoll FLOOR, WALL, FLOOR, WALL ; 37
- tilecoll WALL, WALL, WALL, WALL ; 38
- tilecoll WALL, WALL, FLOOR, WALL ; 39
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b
- tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll WALL, WALL, WALL, WALL ; 3d
- tilecoll WALL, WALL, WINDOW, WALL ; 3e
- tilecoll WALL, WALL, WALL, WALL ; 3f
- tilecoll WALL, WALL, WALL, WALL ; 40
diff --git a/tilesets/lighthouse_metatiles.bin b/tilesets/lighthouse_metatiles.bin
deleted file mode 100644
index 21ca0f09a..000000000
--- a/tilesets/lighthouse_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/lighthouse_palette_map.asm b/tilesets/lighthouse_palette_map.asm
deleted file mode 100644
index 5f80e3a4d..000000000
--- a/tilesets/lighthouse_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, WATER, WATER, WATER, BROWN, WATER, WATER, RED
- tilepal 0, RED, ROOF, ROOF, BROWN, ROOF, RED, RED, RED
- tilepal 0, ROOF, WATER, ROOF, BROWN, ROOF, WATER, WATER, RED
- tilepal 0, RED, ROOF, ROOF, WATER, ROOF, RED, RED, RED
- tilepal 0, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY
- tilepal 0, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, GRAY, GRAY
- tilepal 0, ROOF, ROOF, WATER, WATER, RED, ROOF, BROWN, GRAY
- tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER
- tilepal 0, YELLOW, YELLOW, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN
- tilepal 0, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
- tilepal 0, YELLOW, YELLOW, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
- tilepal 0, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, ROOF, GRAY, GRAY, BROWN, BROWN, RED
- tilepal 1, RED, RED, RED, BROWN, RED, RED, RED, RED
- tilepal 1, ROOF, WATER, ROOF, BROWN, RED, WATER, WATER, RED
- tilepal 1, RED, RED, RED, WATER, RED, RED, RED, RED
- tilepal 1, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY
- tilepal 1, GRAY, GRAY, GRAY, BROWN, RED, ROOF, GRAY, GRAY
- tilepal 1, ROOF, ROOF, WATER, WATER, RED, RED, BROWN, GRAY
- tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER
- tilepal 1, RED, RED, ROOF, ROOF, BROWN, BROWN, GRAY, GRAY
- tilepal 1, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
- tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
- tilepal 1, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
diff --git a/tilesets/mart_collision.asm b/tilesets/mart_collision.asm
deleted file mode 100644
index 80076ac3f..000000000
--- a/tilesets/mart_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03
- tilecoll WALL, WALL, FLOOR, FLOOR ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07
- tilecoll WALL, FLOOR, WALL, FLOOR ; 08
- tilecoll WALL, WALL, FLOOR, COUNTER ; 09
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
- tilecoll WALL, WALL, COUNTER, FLOOR ; 0b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 0c
- tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0d
- tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0e
- tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0f
- tilecoll FLOOR, WALL, WALL, WALL ; 10
- tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 11
- tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 12
- tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 13
- tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 14
- tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 15
- tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 16
- tilecoll WALL, WALL, FLOOR, FLOOR ; 17
- tilecoll WALL, WALL, FLOOR, COUNTER ; 18
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1a
- tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1b
- tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1c
- tilecoll WALL, WALL, WALL, WALL ; 1d
- tilecoll WALL, WALL, WALL, WALL ; 1e
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1f
- tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 20
- tilecoll FLOOR, WALL, FLOOR, WALL ; 21
- tilecoll WALL, WALL, WALL, WALL ; 22
- tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 23
- tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 24
- tilecoll WALL, WALL, WALL, WALL ; 25
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26
- tilecoll WALL, WALL, FLOOR, FLOOR ; 27
- tilecoll WALL, WALL, COUNTER, MART_SHELF ; 28
- tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 29
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2d
- tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2e
- tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2f
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 30
- tilecoll WALL, WALL, WALL, WALL ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll WALL, WALL, WALL, WALL ; 33
- tilecoll WALL, FLOOR, WALL, WALL ; 34
- tilecoll FLOOR, FLOOR, WALL, WALL ; 35
- tilecoll FLOOR, WALL, WALL, WALL ; 36
- tilecoll FLOOR, WALL, FLOOR, WALL ; 37
- tilecoll FLOOR, WALL, FLOOR, WALL ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll WALL, WALL, WALL, WALL ; 3d
- tilecoll WALL, WALL, WALL, WALL ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll WALL, WALL, WALL, WALL ; 40
diff --git a/tilesets/mart_metatiles.bin b/tilesets/mart_metatiles.bin
deleted file mode 100644
index 63b2f629d..000000000
--- a/tilesets/mart_metatiles.bin
+++ /dev/null
@@ -1,3 +0,0 @@
-,-<=
-II "#23$%45*+>?>?*+ !01JK ./*;;;>?>?>?;;;;&'67()89@AB+PQRECD\]STU VWVWXYXYZ[Z[ PQPQPQPQ^_^_ؑ*+>?>?,-<=*;;;>?>?::>?::;;;+>?::>?::>?>?:: ::>? F:F:F::G:G:G"#23$%45 LMLMLMLMNONO !HH01HH>?HH>?HHHH&'HH67HH()HH89 
-II *+PQ>?PQ>?^_HH&'HH67HH()HH89/HHHHHHHHHHHHHHHHHHHH HHHHHHHHHHHHHHHH;;;;&'67()89>?>?.Ӑڐ܁"#23$% \ No newline at end of file
diff --git a/tilesets/mart_palette_map.asm b/tilesets/mart_palette_map.asm
deleted file mode 100644
index 991510d12..000000000
--- a/tilesets/mart_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GREEN, GREEN, WATER, RED, GRAY, GRAY, ROOF, ROOF
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, BROWN, BROWN, BROWN, RED, ROOF, ROOF, GRAY, YELLOW
- tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
- tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
- tilepal 0, WATER, WATER, RED, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED, RED
- tilepal 0, GREEN, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, RED, YELLOW, YELLOW, YELLOW, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, RED, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN, GRAY
- tilepal 1, GRAY, GREEN, GREEN, RED, RED, WATER, WATER, ROOF
- tilepal 1, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW, ROOF, GRAY
- tilepal 1, GRAY, GRAY, WATER, GRAY, GRAY, GRAY, YELLOW, YELLOW
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, RED, WATER, RED
- tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
- tilepal 1, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
- tilepal 1, GRAY, GRAY, WATER, GRAY, WATER, RED, BROWN, BROWN
diff --git a/tilesets/olivine_gym_collision.asm b/tilesets/olivine_gym_collision.asm
deleted file mode 100644
index 351f76f61..000000000
--- a/tilesets/olivine_gym_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, FLOOR, WALL ; 02
- tilecoll WALL, WALL, WALL, FLOOR ; 03
- tilecoll FLOOR, FLOOR, WALL, WALL ; 04
- tilecoll WALL, WALL, WALL, WALL ; 05
- tilecoll WALL, WALL, COUNTER, FLOOR ; 06
- tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 07
- tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09
- tilecoll WALL, FLOOR, FLOOR, WALL ; 0a
- tilecoll WALL, WALL, WALL, WALL ; 0b
- tilecoll WALL, WALL, LADDER, LADDER ; 0c
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0d
- tilecoll WALL, WALL, WALL, WALL ; 0e
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
- tilecoll WALL, WALL, WALL, FLOOR ; 12
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
- tilecoll WALL, WALL, FLOOR, WALL ; 14
- tilecoll WALL, FLOOR, WALL, WALL ; 15
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16
- tilecoll FLOOR, FLOOR, WALL, WALL ; 17
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
- tilecoll WALL, FLOOR, WALL, FLOOR ; 19
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
- tilecoll WALL, UP_WALL, WALL, FLOOR ; 1d
- tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1e
- tilecoll UP_WALL, WALL, FLOOR, WALL ; 1f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
- tilecoll WALL, FLOOR, WALL, WALL ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll FLOOR, WALL, WALL, WALL ; 23
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24
- tilecoll WALL, FLOOR, WALL, FLOOR ; 25
- tilecoll WALL, WALL, WALL, WALL ; 26
- tilecoll WALL, WALL, WALL, WALL ; 27
- tilecoll FLOOR, WALL, FLOOR, WALL ; 28
- tilecoll WALL, WALL, WALL, WALL ; 29
- tilecoll WALL, WALL, WALL, WALL ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll FLOOR, FLOOR, WALL, WALL ; 2c
- tilecoll WALL, WALL, WALL, WALL ; 2d
- tilecoll WALL, WALL, WALL, WALL ; 2e
- tilecoll WALL, WALL, WALL, WALL ; 2f
- tilecoll WALL, FLOOR, WALL, FLOOR ; 30
- tilecoll FLOOR, WALL, FLOOR, WALL ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
- tilecoll WALL, WALL, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, WALL, WALL ; 35
- tilecoll WALL, FLOOR, WALL, FLOOR ; 36
- tilecoll FLOOR, WALL, FLOOR, WALL ; 37
- tilecoll FLOOR, WALL, WALL, WALL ; 38
- tilecoll WALL, FLOOR, WALL, FLOOR ; 39
- tilecoll FLOOR, WALL, FLOOR, WALL ; 3a
- tilecoll WALL, WALL, WALL, WALL ; 3b
- tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll WALL, FLOOR, WALL, WALL ; 3f
- tilecoll FLOOR, WALL, WALL, WALL ; 40
diff --git a/tilesets/olivine_gym_metatiles.bin b/tilesets/olivine_gym_metatiles.bin
deleted file mode 100644
index a2adb197a..000000000
--- a/tilesets/olivine_gym_metatiles.bin
+++ /dev/null
@@ -1,15 +0,0 @@
-  *() 89+,!!   %'!!  5 5 5 5 5&&01    %&&'677:"##$2334ַ  +,+, *() 89 SSSSSSSSSSSSSSSSFGFGVWVWFGSSVWSS FGFGVWVWSSFGSSVW]]]]%&&'XYXYѣѥSSSSSSSSFGFGVWVWFGSSVWSSFGSSVWSSSSFGSSVWSSFGSSVW./SS>?SSNOSS^_SSSS./SS>?SSNOSS^_S@HH@PQQPPQQPPQQHHHHQQQQQQQQQQQQHHBSQQRBQQRRQQRR----------------PPQQPPQQPCDDCDDDQQQQQQQQTUTUTUTUQQRRQQRRDDERDDDESSSSSSSS
- SS
- SS
- SSSS
- FG
- VW
- FG
- VWFG
- VW
- FG
- VW
- SS
- SS
- SS
- SSʰ˱ݱ̲޲αݱϲ޲FGFGVWVWFGFGVWVW]]]]%&&'XYXYݱ޲°ıƲ]]]]]]]];<<=;<<=;<<=;<<=````````````````;<<=;<<=%&&'XYXY]]]]%&&'XYXY]]]]]]]]]]]]]]]]]]]];<<=ӢґӡӢ \ No newline at end of file
diff --git a/tilesets/olivine_gym_palette_map.asm b/tilesets/olivine_gym_palette_map.asm
deleted file mode 100644
index 551a09351..000000000
--- a/tilesets/olivine_gym_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
- tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
- tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED
- tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY
diff --git a/tilesets/omanyte_word_room_collision.asm b/tilesets/omanyte_word_room_collision.asm
deleted file mode 100644
index 138f07143..000000000
--- a/tilesets/omanyte_word_room_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
- tilecoll WALL, WALL, WALL, FLOOR ; 15
- tilecoll WALL, WALL, FLOOR, FLOOR ; 16
- tilecoll WALL, WALL, FLOOR, FLOOR ; 17
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
- tilecoll WALL, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, WALL, FLOOR, WALL ; 1a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1c
- tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d
- tilecoll WALL, WALL, WALL, WALL ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/omanyte_word_room_metatiles.bin b/tilesets/omanyte_word_room_metatiles.bin
deleted file mode 100644
index 3cc62f562..000000000
--- a/tilesets/omanyte_word_room_metatiles.bin
+++ /dev/null
@@ -1,17 +0,0 @@
-ǎמ[\M]żň՘ÜŠհ 
- 
- 
-  !"#ÈӘ@ABC 89
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- TVXY 
- C 6!@ #8
- 6"7ɚň՘ɼͬݼæӶ \ No newline at end of file
diff --git a/tilesets/omanyte_word_room_palette_map.asm b/tilesets/omanyte_word_room_palette_map.asm
deleted file mode 100644
index 5ebde24ba..000000000
--- a/tilesets/omanyte_word_room_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm
deleted file mode 100644
index 55391aeac..000000000
--- a/tilesets/palette_maps.asm
+++ /dev/null
@@ -1,130 +0,0 @@
-TilesetKantoPalMap: ; 0x4c075
-INCLUDE "tilesets/kanto_palette_map.asm"
-; 0x4c0e5
-
-Tileset0PalMap: ; 0x4c0e5
-TilesetJohto1PalMap: ; 0x4c0e5
-INCLUDE "tilesets/johto_1_palette_map.asm"
-; 0x4c155
-
-TilesetJohto2PalMap: ; 0x4c155
-INCLUDE "tilesets/johto_2_palette_map.asm"
-; 0x4c1c5
-
-TilesetHouse1PalMap: ; 0x4c1c5
-INCLUDE "tilesets/house_1_palette_map.asm"
-; 0x4c235
-
-TilesetPlayersHousePalMap: ; 0x4c235
-INCLUDE "tilesets/players_house_palette_map.asm"
-; 0x4c2a5
-
-TilesetPokecenterPalMap: ; 0x4c2a5
-INCLUDE "tilesets/pokecenter_palette_map.asm"
-; 0x4c315
-
-TilesetGatePalMap: ; 0x4c315
-INCLUDE "tilesets/gate_palette_map.asm"
-; 0x4c385
-
-TilesetPortPalMap: ; 0x4c385
-INCLUDE "tilesets/port_palette_map.asm"
-; 0x4c3f5
-
-TilesetLabPalMap: ; 0x4c3f5
-INCLUDE "tilesets/lab_palette_map.asm"
-; 0x4c465
-
-TilesetPowerPlantPalMap: ; 0x4c465
-INCLUDE "tilesets/power_plant_palette_map.asm"
-; 0x4c4d5
-
-TilesetMartPalMap: ; 0x4c4d5
-INCLUDE "tilesets/mart_palette_map.asm"
-; 0x4c545
-
-TilesetCeladonMansionPalMap: ; 0x4c545
-INCLUDE "tilesets/celadon_mansion_palette_map.asm"
-; 0x4c5b5
-
-TilesetGameCornerPalMap: ; 0x4c5b5
-INCLUDE "tilesets/game_corner_palette_map.asm"
-; 0x4c625
-
-TilesetGym1PalMap: ; 0x4c625
-INCLUDE "tilesets/gym_1_palette_map.asm"
-; 0x4c695
-
-TilesetKurtsHousePalMap: ; 0x4c695
-INCLUDE "tilesets/kurts_house_palette_map.asm"
-; 0x4c705
-
-TilesetSproutTowerPalMap: ; 0x4c705
-INCLUDE "tilesets/sprout_tower_palette_map.asm"
-; 0x4c775
-
-TilesetCavePalMap: ; 0x4c775
-TilesetWhirlIslandsPalMap: ; 0x4c775
-INCLUDE "tilesets/cave_palette_map.asm"
-; 0x4c7e5
-
-TilesetParkPalMap: ; 0x4c7e5
-INCLUDE "tilesets/park_palette_map.asm"
-; 0x4c855
-
-TilesetRuinsOfAlphPalMap: ; 0x4c855
-TilesetBetaWordRoomPalMap: ; 0x4c855
-TilesetHoOhWordRoomPalMap: ; 0x4c855
-TilesetKabutoWordRoomPalMap: ; 0x4c855
-TilesetOmanyteWordRoomPalMap: ; 0x4c855
-TilesetAerodactylWordRoomPalMap: ; 0x4c855
-INCLUDE "tilesets/ruins_of_alph_palette_map.asm"
-; 0x4c8c5
-
-TilesetRadioTowerPalMap: ; 0x4c8c5
-INCLUDE "tilesets/radio_tower_palette_map.asm"
-; 0x4c935
-
-TilesetTrainStationPalMap: ; 0x4c935
-INCLUDE "tilesets/train_station_palette_map.asm"
-; 0x4c9a5
-
-TilesetUndergroundPalMap: ; 0x4c9a5
-INCLUDE "tilesets/underground_palette_map.asm"
-; 0x4ca15
-
-TilesetOlivineGymPalMap: ; 0x4ca15
-INCLUDE "tilesets/olivine_gym_palette_map.asm"
-; 0x4ca85
-
-TilesetLighthousePalMap: ; 0x4ca85
-INCLUDE "tilesets/lighthouse_palette_map.asm"
-; 0x4caf5
-
-TilesetPlayersHouse2FPalMap: ; 0x4caf5
-INCLUDE "tilesets/players_house_2f_palette_map.asm"
-; 0x4cb65
-
-UnusedMuseumPalMap: ; 0x4cb65
-INCLUDE "tilesets/unused_museum_palette_map.asm"
-; 4cbd5
-
-TilesetIcePathPalMap: ; 0x4cbd5
-INCLUDE "tilesets/ice_path_palette_map.asm"
-; 0x4cc45
-
-TilesetIlexForestPalMap: ; 0x4cc45
-INCLUDE "tilesets/ilex_forest_palette_map.asm"
-; 0x4ccb5
-
-TilesetPokeComCenterPalMap: ; 0x4ccb5
-INCLUDE "tilesets/pokecom_center_palette_map.asm"
-; 0x4cd25
-
-TilesetBattleTowerPalMap: ; 0x4cd25
-INCLUDE "tilesets/battle_tower_palette_map.asm"
-; 0x4cd95
-
-TilesetBattleTowerOutsidePalMap: ; 0x4cd95
-INCLUDE "tilesets/battle_tower_outside_palette_map.asm"
-; 0x4ce05
diff --git a/tilesets/park_collision.asm b/tilesets/park_collision.asm
deleted file mode 100644
index c5965e0c9..000000000
--- a/tilesets/park_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll WALL, WALL, WALL, WALL ; 07
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 08
- tilecoll WALL, WALL, WALL, WALL ; 09
- tilecoll WALL, WALL, WALL, WALL ; 0a
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0c
- tilecoll WALL, WALL, WALL, WALL ; 0d
- tilecoll WALL, WALL, WALL, WALL ; 0e
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10
- tilecoll WALL, WALL, WALL, FLOOR ; 11
- tilecoll WALL, WALL, FLOOR, FLOOR ; 12
- tilecoll WALL, WALL, FLOOR, WALL ; 13
- tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 14
- tilecoll WALL, FLOOR, WALL, FLOOR ; 15
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16
- tilecoll FLOOR, WALL, FLOOR, WALL ; 17
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18
- tilecoll WALL, FLOOR, WALL, WALL ; 19
- tilecoll FLOOR, FLOOR, WALL, WALL ; 1a
- tilecoll FLOOR, WALL, WALL, WALL ; 1b
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c
- tilecoll WALL, WALL, WALL, FLOOR ; 1d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
- tilecoll WALL, WALL, FLOOR, WALL ; 1f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
- tilecoll WALL, FLOOR, WALL, FLOOR ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll FLOOR, WALL, FLOOR, WALL ; 23
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
- tilecoll WALL, FLOOR, WALL, WALL ; 25
- tilecoll FLOOR, FLOOR, WALL, WALL ; 26
- tilecoll FLOOR, WALL, WALL, WALL ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
- tilecoll WALL, WALL, WALL, WALL ; 29
- tilecoll WALL, WALL, WALL, WALL ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll WALL, WALL, WALL, WALL ; 2d
- tilecoll WALL, WALL, WALL, WALL ; 2e
- tilecoll WALL, WALL, WALL, WALL ; 2f
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30
- tilecoll WALL, WALL, WALL, WALL ; 31
- tilecoll WALL, WALL, WALL, WALL ; 32
- tilecoll WALL, WALL, WALL, WALL ; 33
- tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 34
- tilecoll WALL, WALL, WALL, WALL ; 35
- tilecoll WALL, WALL, WALL, WALL ; 36
- tilecoll WALL, WALL, WALL, WALL ; 37
- tilecoll WALL, WALL, WALL, WALL ; 38
- tilecoll WALL, WALL, WALL, WALL ; 39
- tilecoll WALL, WALL, WALL, WALL ; 3a
- tilecoll WALL, WALL, WALL, WALL ; 3b
- tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll WALL, WALL, WALL, WALL ; 3d
- tilecoll WALL, WALL, WALL, WALL ; 3e
- tilecoll WALL, WALL, WALL, WALL ; 3f
- tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 40
diff --git a/tilesets/park_metatiles.bin b/tilesets/park_metatiles.bin
deleted file mode 100644
index 1fe931640..000000000
--- a/tilesets/park_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/park_palette_map.asm b/tilesets/park_palette_map.asm
deleted file mode 100644
index f9c65ef89..000000000
--- a/tilesets/park_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GREEN, BROWN, RED, GREEN, BROWN, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
- tilepal 0, RED, RED, RED, GRAY, WATER, ROOF, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN
- tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY
- tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN
- tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN
- tilepal 0, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
- tilepal 0, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, GRAY, RED
- tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
- tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
-
-rept 16
- db $ff
-endr
-
- tilepal 1, WATER, WATER, GRAY, RED, GREEN, BROWN, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
- tilepal 1, WATER, WATER, RED, GRAY, WATER, ROOF, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN
- tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY
- tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN
- tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN
- tilepal 1, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
- tilepal 1, BROWN, BROWN, GREEN, GREEN, WATER, WATER, WATER, RED
- tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
- tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, GRAY
diff --git a/tilesets/players_house_2f_collision.asm b/tilesets/players_house_2f_collision.asm
deleted file mode 100644
index 464d80b83..000000000
--- a/tilesets/players_house_2f_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03
- tilecoll WALL, WALL, TV, BOOKSHELF ; 04
- tilecoll WALL, WALL, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
- tilecoll WALL, WALL, FLOOR, FLOOR ; 08
- tilecoll WALL, WALL, FLOOR, FLOOR ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11
- tilecoll WALL, WALL, FLOOR, FLOOR ; 12
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
- tilecoll WALL, WALL, FLOOR, FLOOR ; 15
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
- tilecoll WALL, WALL, FLOOR, FLOOR ; 18
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1f
- tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 20
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22
- tilecoll FLOOR, WALL, FLOOR, WALL ; 23
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 26
- tilecoll FF, FF, FF, FF ; 27
- tilecoll FF, FF, FF, FF ; 28
- tilecoll FF, FF, FF, FF ; 29
- tilecoll FF, FF, FF, FF ; 2a
- tilecoll FF, FF, FF, FF ; 2b
- tilecoll FF, FF, FF, FF ; 2c
- tilecoll FF, FF, FF, FF ; 2d
- tilecoll FF, FF, FF, FF ; 2e
- tilecoll FF, FF, FF, FF ; 2f
- tilecoll FF, FF, FF, FF ; 30
- tilecoll FF, FF, FF, FF ; 31
- tilecoll FF, FF, FF, FF ; 32
- tilecoll FF, FF, FF, FF ; 33
- tilecoll FF, FF, FF, FF ; 34
- tilecoll FF, FF, FF, FF ; 35
- tilecoll FF, FF, FF, FF ; 36
- tilecoll FF, FF, FF, FF ; 37
- tilecoll FF, FF, FF, FF ; 38
- tilecoll FF, FF, FF, FF ; 39
- tilecoll FF, FF, FF, FF ; 3a
- tilecoll FF, FF, FF, FF ; 3b
- tilecoll FF, FF, FF, FF ; 3c
- tilecoll FF, FF, FF, FF ; 3d
- tilecoll FF, FF, FF, FF ; 3e
- tilecoll FF, FF, FF, FF ; 3f
- tilecoll FF, FF, FF, FF ; 40
diff --git a/tilesets/players_house_2f_metatiles.bin b/tilesets/players_house_2f_metatiles.bin
deleted file mode 100644
index 0839798fe..000000000
--- a/tilesets/players_house_2f_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/players_house_2f_palette_map.asm b/tilesets/players_house_2f_palette_map.asm
deleted file mode 100644
index 1c0cb1f08..000000000
--- a/tilesets/players_house_2f_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
- tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
- tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
- tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED
- tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
- tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED
- tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
- tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED
- tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
- tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
- tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
- tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
- tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
- tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
- tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED
- tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
- tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED
- tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
- tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED
- tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
- tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
- tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
- tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
diff --git a/tilesets/players_house_collision.asm b/tilesets/players_house_collision.asm
deleted file mode 100644
index ed6b70a29..000000000
--- a/tilesets/players_house_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WINDOW, WALL, FLOOR, FLOOR ; 02
- tilecoll WALL, WALL, FLOOR, TV ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll WALL, WALL, WALL, WALL ; 05
- tilecoll WALL, WALL, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07
- tilecoll WALL, WALL, WALL, WALL ; 08
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0a
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0b
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0c
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll WALL, WALL, PC, FLOOR ; 11
- tilecoll WALL, WALL, TV, WALL ; 12
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
- tilecoll FLOOR, TV, FLOOR, WALL ; 14
- tilecoll FLOOR, WALL, FLOOR, WALL ; 15
- tilecoll WALL, WALL, FLOOR, WALL ; 16
- tilecoll FLOOR, WALL, FLOOR, WALL ; 17
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
- tilecoll WALL, WALL, RADIO, PC ; 19
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
- tilecoll WALL, WALL, RADIO, FLOOR ; 1b
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e
- tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1f
- tilecoll WALL, WALL, PC, RADIO ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll WALL, WALL, TV, BOOKSHELF ; 22
- tilecoll WALL, FLOOR, WALL, FLOOR ; 23
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 24
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 25
- tilecoll FLOOR, FLOOR, WALL, WALL ; 26
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
- tilecoll WALL, WALL, FLOOR, FLOOR ; 28
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/players_house_metatiles.bin b/tilesets/players_house_metatiles.bin
deleted file mode 100644
index f316eb8c1..000000000
--- a/tilesets/players_house_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/players_house_palette_map.asm b/tilesets/players_house_palette_map.asm
deleted file mode 100644
index 5d089835b..000000000
--- a/tilesets/players_house_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
- tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
- tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
- tilepal 0, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
- tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
- tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN
- tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
- tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/pokecenter_collision.asm b/tilesets/pokecenter_collision.asm
deleted file mode 100644
index 5b776330e..000000000
--- a/tilesets/pokecenter_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll WALL, WALL, WALL, FLOOR ; 03
- tilecoll WALL, WALL, FLOOR, WALL ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 06
- tilecoll WALL, COUNTER, FLOOR, FLOOR ; 07
- tilecoll COUNTER, WALL, FLOOR, FLOOR ; 08
- tilecoll WALL, WALL, FLOOR, PC ; 09
- tilecoll WALL, WALL, FLOOR, WALL ; 0a
- tilecoll WALL, DOOR, FLOOR, FLOOR ; 0b
- tilecoll WALL, WALL, WALL, WALL ; 0c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0e
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f
- tilecoll WALL, WALL, FLOOR, WALL ; 10
- tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 11
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12
- tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 13
- tilecoll WALL, WALL, FLOOR, FLOOR ; 14
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15
- tilecoll WALL, DOOR, FLOOR, FLOOR ; 16
- tilecoll WALL, WALL, FLOOR, WALL ; 17
- tilecoll WALL, WALL, WALL, WALL ; 18
- tilecoll WALL, WALL, WALL, WALL ; 19
- tilecoll WALL, WALL, WALL, WALL ; 1a
- tilecoll WALL, WALL, WALL, WALL ; 1b
- tilecoll WALL, WALL, WALL, WALL ; 1c
- tilecoll WALL, WALL, WALL, WALL ; 1d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
- tilecoll WALL, WALL, FLOOR, FLOOR ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll WALL, WALL, FLOOR, PC ; 22
- tilecoll WALL, WALL, WALL, FLOOR ; 23
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 26
- tilecoll WALL, WALL, FLOOR, FLOOR ; 27
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 28
- tilecoll WALL, WALL, FLOOR, WALL ; 29
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a
- tilecoll WALL, WALL, WALL, FLOOR ; 2b
- tilecoll WALL, DOOR, FLOOR, FLOOR ; 2c
- tilecoll WALL, WALL, WALL, WALL ; 2d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2f
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 30
- tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31
- tilecoll WALL, WALL, FLOOR, WALL ; 32
- tilecoll PC, WALL, FLOOR, WALL ; 33
- tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 34
- tilecoll DOOR, WALL, FLOOR, FLOOR ; 35
- tilecoll DOOR, WALL, FLOOR, WALL ; 36
- tilecoll DOOR, WALL, FLOOR, FLOOR ; 37
- tilecoll DOOR, WALL, FLOOR, WALL ; 38
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 39
- tilecoll WALL, WALL, FLOOR, WALL ; 3a
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll WALL, WALL, FLOOR, WALL ; 3c
- tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3e
- tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 40
diff --git a/tilesets/pokecenter_metatiles.bin b/tilesets/pokecenter_metatiles.bin
deleted file mode 100644
index c96c4843b..000000000
--- a/tilesets/pokecenter_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/pokecenter_palette_map.asm b/tilesets/pokecenter_palette_map.asm
deleted file mode 100644
index 78508b59e..000000000
--- a/tilesets/pokecenter_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
- tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
- tilepal 0, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
- tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
- tilepal 0, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY
- tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
- tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
- tilepal 0, RED, RED, RED, RED, RED, RED, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
- tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
- tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
- tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY
- tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
- tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
- tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
- tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/pokecom_center_collision.asm b/tilesets/pokecom_center_collision.asm
deleted file mode 100644
index 1ecef84de..000000000
--- a/tilesets/pokecom_center_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 03
- tilecoll WALL, WALL, FLOOR, FLOOR ; 04
- tilecoll WALL, WALL, WALL, FLOOR ; 05
- tilecoll WALL, WALL, WALL, WALL ; 06
- tilecoll WALL, WALL, WALL, FLOOR ; 07
- tilecoll WALL, WALL, FLOOR, PC ; 08
- tilecoll WALL, WALL, WALL, FLOOR ; 09
- tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0a
- tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0b
- tilecoll WALL, WALL, WALL, WALL ; 0c
- tilecoll WALL, WALL, FLOOR, WALL ; 0d
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f
- tilecoll WALL, WALL, FLOOR, WALL ; 10
- tilecoll WALL, WALL, FLOOR, FLOOR ; 11
- tilecoll WALL, WALL, WALL, FLOOR ; 12
- tilecoll WALL, WALL, WALL, WALL ; 13
- tilecoll WALL, WALL, WALL, WALL ; 14
- tilecoll WALL, WALL, WALL, WALL ; 15
- tilecoll WALL, WALL, FLOOR, FLOOR ; 16
- tilecoll WALL, WALL, WALL, WALL ; 17
- tilecoll WALL, WALL, WALL, WALL ; 18
- tilecoll WALL, WALL, WALL, WALL ; 19
- tilecoll WALL, WALL, WALL, WALL ; 1a
- tilecoll WALL, WALL, FLOOR, WALL ; 1b
- tilecoll WALL, WALL, WALL, WALL ; 1c
- tilecoll WALL, WALL, WALL, WALL ; 1d
- tilecoll WALL, WALL, WALL, WALL ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23
- tilecoll WALL, WALL, WALL, WALL ; 24
- tilecoll WALL, WALL, WALL, WALL ; 25
- tilecoll WALL, WALL, WALL, WALL ; 26
- tilecoll WALL, WALL, WALL, WALL ; 27
- tilecoll WALL, WALL, WALL, WALL ; 28
- tilecoll WALL, WALL, WALL, WALL ; 29
- tilecoll WALL, WALL, WALL, WALL ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2d
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2f
- tilecoll WALL, WALL, WALL, WALL ; 30
- tilecoll WALL, WALL, WALL, WALL ; 31
- tilecoll WALL, WALL, WALL, WALL ; 32
- tilecoll WALL, WALL, WALL, WALL ; 33
- tilecoll FLOOR, FLOOR, WALL, WALL ; 34
- tilecoll WALL, WALL, WALL, WALL ; 35
- tilecoll WALL, WALL, FLOOR, FLOOR ; 36
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37
- tilecoll WALL, WALL, FLOOR, FLOOR ; 38
- tilecoll WALL, WALL, WALL, WALL ; 39
- tilecoll WALL, WALL, WALL, WALL ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll WALL, WALL, FLOOR, FLOOR ; 3c
- tilecoll WALL, WALL, WALL, WALL ; 3d
- tilecoll FLOOR, FLOOR, WALL, WALL ; 3e
- tilecoll WALL, WALL, WALL, WALL ; 3f
- tilecoll WALL, WALL, WALL, WALL ; 40
diff --git a/tilesets/pokecom_center_metatiles.bin b/tilesets/pokecom_center_metatiles.bin
deleted file mode 100644
index 097a882fd..000000000
--- a/tilesets/pokecom_center_metatiles.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-================"#23"#23%,-./<==?LMNO
-  !01@A544$$$$ 44$$$$4444$$$$R,/RLOR\]%4$,/LO:;\] 5$$$$R&'RRJKZ[%444 $$$ 4444$$$$4444$$$$4444$$$$================۪݈4$۶ѷDETUQQQQPPPPHIHIXYXY4$> 444444^_^_()89:;$$$$ǂׁ()$$89:;ׂ BCSϾ߁ 4$$$ 444$4444$$$$ \ No newline at end of file
diff --git a/tilesets/pokecom_center_palette_map.asm b/tilesets/pokecom_center_palette_map.asm
deleted file mode 100644
index 75ee649f9..000000000
--- a/tilesets/pokecom_center_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 0, WATER, WATER, GRAY, GRAY, RED, GRAY, WATER, WATER
- tilepal 0, RED, WATER, GRAY, WATER, WATER, WATER, RED, RED
- tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
- tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER
- tilepal 0, RED, RED, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY
- tilepal 0, GRAY, GRAY, WATER, WATER, WATER, WATER, RED, WATER
- tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, RED, RED, GRAY
- tilepal 0, RED, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, GRAY, YELLOW, YELLOW
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, GRAY, GRAY, WATER, RED, RED, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GRAY, WATER
- tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, RED, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
- tilepal 1, RED, RED, GRAY, GRAY, RED, RED, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN
- tilepal 1, WATER, RED, WATER, BROWN, WATER, WATER, WATER, WATER
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN
- tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
- tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
- tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
diff --git a/tilesets/port_collision.asm b/tilesets/port_collision.asm
deleted file mode 100644
index fb37ee11e..000000000
--- a/tilesets/port_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll BUOY, WATER, BUOY, WATER ; 03
- tilecoll WATER, BUOY, WATER, BUOY ; 04
- tilecoll LADDER, LADDER, LADDER, LADDER ; 05
- tilecoll WALL, WALL, WALL, WATER ; 06
- tilecoll WALL, WALL, WATER, WATER ; 07
- tilecoll WALL, WALL, WATER, WALL ; 08
- tilecoll WATER, WATER, WATER, WATER ; 09
- tilecoll WALL, WATER, WALL, WATER ; 0a
- tilecoll WATER, WATER, WATER, WATER ; 0b
- tilecoll WATER, WALL, WATER, WALL ; 0c
- tilecoll WATER, WATER, FLOOR, FLOOR ; 0d
- tilecoll WALL, WATER, WALL, WALL ; 0e
- tilecoll WATER, WATER, WALL, WALL ; 0f
- tilecoll WATER, WALL, WALL, WALL ; 10
- tilecoll WATER, WATER, WATER, WATER ; 11
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
- tilecoll WATER, WATER, WATER, WATER ; 13
- tilecoll WATER, FLOOR, WATER, FLOOR ; 14
- tilecoll WATER, FLOOR, WATER, FLOOR ; 15
- tilecoll WATER, WATER, WATER, WATER ; 16
- tilecoll WATER, WATER, WATER, WATER ; 17
- tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 18
- tilecoll WATER, WATER, WALL, WALL ; 19
- tilecoll WATER, FLOOR, WALL, WALL ; 1a
- tilecoll WALL, WALL, WALL, WALL ; 1b
- tilecoll WALL, WATER, WALL, WALL ; 1c
- tilecoll WATER_21, WATER_21, WALL, WALL ; 1d
- tilecoll WATER_21, WATER_21, WALL, WALL ; 1e
- tilecoll WATER_21, WATER_21, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WATER ; 20
- tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 21
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22
- tilecoll BUOY, BUOY, BUOY, WATER ; 23
- tilecoll BUOY, BUOY, WATER, BUOY ; 24
- tilecoll BUOY, BUOY, WATER, WATER ; 25
- tilecoll BUOY, BUOY, WATER, WATER ; 26
- tilecoll LADDER, LADDER, LADDER, LADDER ; 27
- tilecoll FLOOR, FLOOR, WATER, WATER ; 28
- tilecoll FLOOR, FLOOR, FLOOR, WATER ; 29
- tilecoll FLOOR, FLOOR, WATER, FLOOR ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
- tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2d
- tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2e
- tilecoll FLOOR, WATER, FLOOR, WATER ; 2f
- tilecoll WATER, FLOOR, WATER, FLOOR ; 30
- tilecoll FLOOR, FLOOR, WATER, WATER ; 31
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
- tilecoll WALL, FLOOR, WALL, FLOOR ; 33
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34
- tilecoll FLOOR, WATER, FLOOR, WATER ; 35
- tilecoll WALL, WALL, FLOOR, LADDER ; 36
- tilecoll WATER, WATER, WATER, WATER ; 37
- tilecoll FLOOR, WATER, FLOOR, WATER ; 38
- tilecoll WATER, FLOOR, WATER, FLOOR ; 39
- tilecoll WATER, WATER, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3b
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3c
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40
diff --git a/tilesets/port_metatiles.bin b/tilesets/port_metatiles.bin
deleted file mode 100644
index 69a600707..000000000
--- a/tilesets/port_metatiles.bin
+++ /dev/null
@@ -1,65 +0,0 @@
-""""!!!!1111111111111111    ""  !!!!+,--9::3#$%./02;<=>&'()345?@AB*678CDE+,-39:PQXYZFGHIRRSSZ[\\IJKLT,-U]^^^MNOVW_""""""""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  ""1111 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  \ No newline at end of file
diff --git a/tilesets/port_palette_map.asm b/tilesets/port_palette_map.asm
deleted file mode 100644
index 6bfdf4686..000000000
--- a/tilesets/port_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
- tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
- tilepal 0, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
- tilepal 0, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY
- tilepal 0, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF
- tilepal 0, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
- tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
- tilepal 1, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
- tilepal 1, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY
- tilepal 1, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF
- tilepal 1, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
diff --git a/tilesets/power_plant_collision.asm b/tilesets/power_plant_collision.asm
deleted file mode 100644
index eb5cd8f33..000000000
--- a/tilesets/power_plant_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
- tilecoll WALL, WALL, FLOOR, FLOOR ; 02
- tilecoll WALL, WALL, WALL, WALL ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 05
- tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 06
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 07
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
- tilecoll WALL, WALL, FLOOR, FLOOR ; 09
- tilecoll WALL, WALL, WALL, FLOOR ; 0a
- tilecoll WALL, WALL, FLOOR, WALL ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
- tilecoll WALL, FLOOR, WALL, FLOOR ; 0e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
- tilecoll FLOOR, FLOOR, WALL, WALL ; 12
- tilecoll WALL, WALL, WALL, WALL ; 13
- tilecoll WALL, WALL, WALL, WALL ; 14
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15
- tilecoll WALL, WALL, FLOOR, FLOOR ; 16
- tilecoll WALL, WALL, WALL, WALL ; 17
- tilecoll WALL, WALL, WALL, WALL ; 18
- tilecoll WALL, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, WALL, WALL, WALL ; 1a
- tilecoll WALL, WALL, WALL, FLOOR ; 1b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1e
- tilecoll WALL, WALL, FLOOR, COUNTER ; 1f
- tilecoll WALL, WALL, FLOOR, FLOOR ; 20
- tilecoll FLOOR, FLOOR, WALL, WALL ; 21
- tilecoll WALL, WALL, WALL, FLOOR ; 22
- tilecoll WALL, FLOOR, WALL, FLOOR ; 23
- tilecoll WALL, FLOOR, WALL, WALL ; 24
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 25
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 26
- tilecoll FLOOR, FLOOR, WALL, WALL ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
- tilecoll WALL, WALL, FLOOR, FLOOR ; 29
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2c
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2f
- tilecoll WALL, FLOOR, WALL, FLOOR ; 30
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
- tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 32
- tilecoll WALL, WALL, FLOOR, FLOOR ; 33
- tilecoll FLOOR, WALL, FLOOR, WALL ; 34
- tilecoll FLOOR, FLOOR, WALL, WALL ; 35
- tilecoll WALL, WALL, FLOOR, FLOOR ; 36
- tilecoll WALL, WALL, FLOOR, FLOOR ; 37
- tilecoll FLOOR, WALL, FLOOR, WALL ; 38
- tilecoll FLOOR, WALL, FLOOR, WALL ; 39
- tilecoll WALL, WALL, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, WALL, WALL, WALL ; 3b
- tilecoll WALL, WALL, FLOOR, WALL ; 3c
- tilecoll WALL, WALL, WALL, FLOOR ; 3d
- tilecoll WALL, WALL, FLOOR, WALL ; 3e
- tilecoll WALL, FLOOR, WALL, WALL ; 3f
- tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40
diff --git a/tilesets/power_plant_metatiles.bin b/tilesets/power_plant_metatiles.bin
deleted file mode 100644
index f6089d29c..000000000
--- a/tilesets/power_plant_metatiles.bin
+++ /dev/null
@@ -1,8 +0,0 @@
-6666666666666666""""""""&&&&@B@B
-
-
-
- &&&&88889999&& !&&&&&01&&&&&@B@B()()()()*+()&&&&&&&& &&,-""<=""./&>?&"",-""<=&./&>? &&&&''''7777,-&<=&./&>?&&,-&<=&./&>?@AABPQQRPHIRS::T&&&@A&PQ&&AAABQQQREEFEUUVU
- K
-[EFEEUVUU K
- [&PQ&S:&&QQQR:::T&&EFE;UVU;JKJ;Z[Z;6666666666666666AAABMMMN88889999""""""""#$$%WXXY""""@B""PRPRPRPRPR""23""CD&&&&""""""@B&PR&PR;;;;;;;;&&&&&&&&;;;;;;;;""""@B""PR&PR&PR&PR&PR&PR&PR&PR&PR@APRLM&&&&&@A&LM&&&&AB&MN&&&&&@B@APRLM&&&& &&@AABPHIR &&&&&&@B&PR&PR&PR&PR&&@BPR#$$%WXXY&&&&PRPRPRPR@B&PR&PR&PR&@AAALMMM&&&&AAABMMMN&&&&&@B&PR&PR&PR&&&&AAAAMMMM""""""""&&AAAAMMMM&&&&&PR&PR&PR&PR&@A&PQ&PQ&S:@AAALMMM88889999&PR&PRABPRMNPR""""""\]&^_&@B@APRLMPR&PR&AB@BMNPR&PR&PRPR&PR&PR@ALM&PR&PRABPRMN \ No newline at end of file
diff --git a/tilesets/power_plant_palette_map.asm b/tilesets/power_plant_palette_map.asm
deleted file mode 100644
index f79f9c01b..000000000
--- a/tilesets/power_plant_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
- tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN
- tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED
- tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
- tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED
- tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER
- tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
- tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
- tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN
- tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED
- tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
- tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED
- tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER
- tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
- tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/radio_tower_collision.asm b/tilesets/radio_tower_collision.asm
deleted file mode 100644
index 1713eb438..000000000
--- a/tilesets/radio_tower_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll WALL, WALL, FLOOR, FLOOR ; 03
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 04
- tilecoll WALL, WALL, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, WALL, COUNTER ; 06
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 07
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08
- tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 09
- tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 0a
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0b
- tilecoll WALL, WALL, WALL, WALL ; 0c
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0d
- tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0f
- tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 10
- tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 11
- tilecoll WALL, WALL, FLOOR, FLOOR ; 12
- tilecoll WALL, WALL, PC, FLOOR ; 13
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
- tilecoll FLOOR, FLOOR, WALL, WALL ; 16
- tilecoll WALL, WALL, WALL, WALL ; 17
- tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 18
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19
- tilecoll WALL, WALL, FLOOR, COUNTER ; 1a
- tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1b
- tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1c
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1d
- tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1e
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
- tilecoll WALL, FLOOR, WALL, FLOOR ; 20
- tilecoll FLOOR, WALL, FLOOR, WALL ; 21
- tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 23
- tilecoll WALL, WALL, WALL, WALL ; 24
- tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 25
- tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 26
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
- tilecoll WALL, WALL, FLOOR, WALL ; 29
- tilecoll FLOOR, WALL, FLOOR, WALL ; 2a
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
- tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2e
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2f
- tilecoll WALL, WALL, WALL, WALL ; 30
- tilecoll WALL, FLOOR, WALL, FLOOR ; 31
- tilecoll WALL, WALL, FLOOR, WALL ; 32
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33
- tilecoll WALL, WALL, WALL, FLOOR ; 34
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 35
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
- tilecoll WALL, WALL, FLOOR, FLOOR ; 37
- tilecoll FLOOR, WALL, FLOOR, WALL ; 38
- tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 39
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
- tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 3d
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/radio_tower_metatiles.bin b/tilesets/radio_tower_metatiles.bin
deleted file mode 100644
index 01c0b4aa5..000000000
--- a/tilesets/radio_tower_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/radio_tower_palette_map.asm b/tilesets/radio_tower_palette_map.asm
deleted file mode 100644
index 3530f7479..000000000
--- a/tilesets/radio_tower_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, RED, RED, WATER, WATER, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, WATER, WATER, RED, WATER, WATER, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, ROOF, ROOF, GRAY, GRAY, BROWN, GRAY, GRAY, BROWN
- tilepal 0, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
- tilepal 0, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY
- tilepal 0, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GREEN, GREEN
- tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, YELLOW, YELLOW, RED
- tilepal 1, ROOF, RED, RED, ROOF, GRAY, GRAY, GRAY, GRAY
- tilepal 1, ROOF, ROOF, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
- tilepal 1, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
- tilepal 1, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY
- tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN
- tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, RED, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm
deleted file mode 100644
index 72999efc6..000000000
--- a/tilesets/roofs.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-LoadMapGroupRoof:: ; 1c000
- ld a, [MapGroup]
- ld e, a
- ld d, 0
- ld hl, MapGroupRoofs
- add hl, de
- ld a, [hl]
- cp $ff
- ret z
- ld hl, Roofs
- ld bc, $90
- call AddNTimes
- ld de, vTiles2 tile $0a
- ld bc, $90
- call CopyBytes
- ret
-; 1c021
-
-
-INCLUDE "data/maps/roofs.asm"
diff --git a/tilesets/ruins_of_alph_collision.asm b/tilesets/ruins_of_alph_collision.asm
deleted file mode 100644
index 8c65340ab..000000000
--- a/tilesets/ruins_of_alph_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, WALL, FLOOR ; 02
- tilecoll WALL, WALL, FLOOR, WALL ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll WALL, WALL, WALL, FLOOR ; 06
- tilecoll WALL, WALL, FLOOR, FLOOR ; 07
- tilecoll WALL, WALL, FLOOR, FLOOR ; 08
- tilecoll WALL, WALL, FLOOR, WALL ; 09
- tilecoll WALL, FLOOR, WALL, WALL ; 0a
- tilecoll FLOOR, FLOOR, WALL, WALL ; 0b
- tilecoll FLOOR, FLOOR, WALL, WALL ; 0c
- tilecoll FLOOR, WALL, WALL, WALL ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll WALL, FLOOR, WALL, FLOOR ; 0f
- tilecoll FLOOR, WALL, FLOOR, WALL ; 10
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
- tilecoll WALL, FLOOR, WALL, WALL ; 15
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17
- tilecoll FLOOR, WALL, WALL, WALL ; 18
- tilecoll WALL, WALL, WALL, PIT ; 19
- tilecoll WALL, WALL, PIT, WALL ; 1a
- tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1d
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1e
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21
- tilecoll WALL, FLOOR, WALL, FLOOR ; 22
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 23
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 24
- tilecoll WALL, WALL, WALL, WALL ; 25
- tilecoll WALL, WALL, WALL, WALL ; 26
- tilecoll WALL, WALL, WALL, WALL ; 27
- tilecoll WALL, WALL, WALL, WALL ; 28
- tilecoll WALL, WALL, WALL, WALL ; 29
- tilecoll WALL, WALL, WALL, WALL ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2c
- tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2f
- tilecoll FLOOR, FLOOR, FLOOR, PIT ; 30
- tilecoll CAVE, WALL, FLOOR, FLOOR ; 31
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 32
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
- tilecoll WALL, WALL, WALL, PIT ; 35
- tilecoll WALL, WALL, PIT, WALL ; 36
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
- tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 39
- tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3b
- tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3c
- tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3d
- tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3e
- tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3f
- tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 40
diff --git a/tilesets/ruins_of_alph_metatiles.bin b/tilesets/ruins_of_alph_metatiles.bin
deleted file mode 100644
index 61ef041b5..000000000
--- a/tilesets/ruins_of_alph_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/ruins_of_alph_palette_map.asm b/tilesets/ruins_of_alph_palette_map.asm
deleted file mode 100644
index 5ebde24ba..000000000
--- a/tilesets/ruins_of_alph_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/special_palettes.asm b/tilesets/special_palettes.asm
deleted file mode 100644
index 761b15348..000000000
--- a/tilesets/special_palettes.asm
+++ /dev/null
@@ -1,200 +0,0 @@
-LoadSpecialMapPalette: ; 494ac
- ld a, [wTileset]
- cp TILESET_POKECOM_CENTER
- jr z, .pokecom_2f
- cp TILESET_BATTLE_TOWER
- jr z, .battle_tower
- cp TILESET_ICE_PATH
- jr z, .ice_path
- cp TILESET_HOUSE_1
- jr z, .house
- cp TILESET_RADIO_TOWER
- jr z, .radio_tower
- cp TILESET_CELADON_MANSION
- jr z, .mansion_mobile
- jr .do_nothing
-
-.pokecom_2f
- call LoadPokeComPalette
- scf
- ret
-
-.battle_tower
- call LoadBattleTowerPalette
- scf
- ret
-
-.ice_path
- ld a, [wEnvironment]
- and $7
- cp INDOOR ; Hall of Fame
- jr z, .do_nothing
- call LoadIcePathPalette
- scf
- ret
-
-.house
- call LoadHousePalette
- scf
- ret
-
-.radio_tower
- call LoadRadioTowerPalette
- scf
- ret
-
-.mansion_mobile
- call LoadMansionPalette
- scf
- ret
-
-.do_nothing
- and a
- ret
-; 494f2
-
-LoadPokeComPalette: ; 494f2
- ld a, BANK(wBGPals1)
- ld de, wBGPals1
- ld hl, PokeComPalette
- ld bc, 8 palettes
- call FarCopyWRAM
- ret
-; 49501
-
-PokeComPalette: ; 49501
-INCLUDE "data/palettes/tilesets/pokecom_center.pal"
-; 49541
-
-LoadBattleTowerPalette: ; 49541
- ld a, BANK(wBGPals1)
- ld de, wBGPals1
- ld hl, BattleTowerPalette
- ld bc, 8 palettes
- call FarCopyWRAM
- ret
-; 49550
-
-BattleTowerPalette: ; 49550
-INCLUDE "data/palettes/tilesets/battle_tower.pal"
-; 49590
-
-LoadIcePathPalette: ; 49590
- ld a, BANK(wBGPals1)
- ld de, wBGPals1
- ld hl, IcePathPalette
- ld bc, 8 palettes
- call FarCopyWRAM
- ret
-; 4959f
-
-IcePathPalette: ; 4959f
-INCLUDE "data/palettes/tilesets/ice_path.pal"
-; 495df
-
-LoadHousePalette: ; 495df
- ld a, BANK(wBGPals1)
- ld de, wBGPals1
- ld hl, HousePalette
- ld bc, 8 palettes
- call FarCopyWRAM
- ret
-; 495ee
-
-HousePalette: ; 495ee
-INCLUDE "data/palettes/tilesets/house_1.pal"
-; 4962e
-
-LoadRadioTowerPalette: ; 4962e
- ld a, BANK(wBGPals1)
- ld de, wBGPals1
- ld hl, RadioTowerPalette
- ld bc, 8 palettes
- call FarCopyWRAM
- ret
-; 4963d
-
-RadioTowerPalette: ; 4963d
-INCLUDE "data/palettes/tilesets/radio_tower.pal"
-; 4967d
-
-MansionPalette1: ; 4967d
- RGB 30, 28, 26
- RGB 19, 19, 19
- RGB 13, 13, 13
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 31, 19, 24
- RGB 30, 10, 06
- RGB 07, 07, 07
-
- RGB 18, 24, 09
- RGB 15, 20, 01
- RGB 09, 13, 00
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 15, 16, 31
- RGB 09, 09, 31
- RGB 07, 07, 07
-
- RGB 30, 28, 26
- RGB 31, 31, 07
- RGB 31, 16, 01
- RGB 07, 07, 07
-
- RGB 26, 24, 17
- RGB 21, 17, 07
- RGB 16, 13, 03
- RGB 07, 07, 07
-
-MansionPalette3: ; 496ad
- RGB 30, 28, 26
- RGB 17, 19, 31
- RGB 14, 16, 31
- RGB 07, 07, 07
-
- RGB 31, 31, 16
- RGB 31, 31, 16
- RGB 14, 09, 00
- RGB 00, 00, 00
-; 496bd
-
-MansionPalette4: ; 496bd
- RGB 05, 05, 16
- RGB 08, 19, 28
- RGB 00, 00, 00
- RGB 31, 31, 31
-; 496c5
-
-LoadMansionPalette: ; 496c5
- ld a, BANK(wBGPals1)
- ld de, wBGPals1
- ld hl, MansionPalette1
- ld bc, 8 palettes
- call FarCopyWRAM
- ld a, BANK(wBGPals1)
- ld de, wBGPals1 palette PAL_BG_YELLOW
- ld hl, MansionPalette2
- ld bc, 1 palettes
- call FarCopyWRAM
- ld a, BANK(wBGPals1)
- ld de, wBGPals1 palette PAL_BG_WATER
- ld hl, MansionPalette3
- ld bc, 1 palettes
- call FarCopyWRAM
- ld a, BANK(wBGPals1)
- ld de, wBGPals1 palette PAL_BG_ROOF
- ld hl, MansionPalette4
- ld bc, 1 palettes
- call FarCopyWRAM
- ret
-; 496fe
-
-MansionPalette2: ; 496fe
- RGB 25, 24, 23
- RGB 20, 19, 19
- RGB 14, 16, 31
- RGB 07, 07, 07
-; 49706
diff --git a/tilesets/sprout_tower_collision.asm b/tilesets/sprout_tower_collision.asm
deleted file mode 100644
index 9d02e9640..000000000
--- a/tilesets/sprout_tower_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04
- tilecoll WALL, WALL, WALL, FLOOR ; 05
- tilecoll WALL, WALL, FLOOR, FLOOR ; 06
- tilecoll WALL, WALL, FLOOR, WALL ; 07
- tilecoll WALL, WALL, WALL, WALL ; 08
- tilecoll WALL, FLOOR, WALL, FLOOR ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
- tilecoll WALL, WALL, WALL, WALL ; 0c
- tilecoll WALL, FLOOR, WALL, WALL ; 0d
- tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
- tilecoll FLOOR, WALL, WALL, WALL ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll FLOOR, WALL, FLOOR, WALL ; 11
- tilecoll WALL, FLOOR, WALL, FLOOR ; 12
- tilecoll WALL, FLOOR, WALL, FLOOR ; 13
- tilecoll FLOOR, WALL, FLOOR, WALL ; 14
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16
- tilecoll WALL, FLOOR, WALL, WALL ; 17
- tilecoll FLOOR, WALL, WALL, WALL ; 18
- tilecoll WALL, WALL, WALL, WALL ; 19
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
- tilecoll WALL, WALL, WALL, WALL ; 1c
- tilecoll WALL, WALL, WALL, WALL ; 1d
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1e
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1f
- tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 20
- tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 21
- tilecoll WALL, WALL, WALL, FLOOR ; 22
- tilecoll WALL, WALL, FLOOR, WALL ; 23
- tilecoll WALL, WALL, WALL, WALL ; 24
- tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 25
- tilecoll WALL, WALL, PIT, FLOOR ; 26
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 27
- tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 28
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
- tilecoll WALL, WALL, WALL, WALL ; 2b
- tilecoll WALL, HOP_LEFT, WALL, WALL ; 2c
- tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
- tilecoll WALL, WALL, WALL, FLOOR ; 2f
- tilecoll WALL, WALL, FLOOR, WALL ; 30
- tilecoll WALL, FLOOR, WALL, FLOOR ; 31
- tilecoll FLOOR, WALL, FLOOR, WALL ; 32
- tilecoll WALL, WALL, FLOOR, FLOOR ; 33
- tilecoll WALL, WALL, WALL, FLOOR ; 34
- tilecoll WALL, WALL, FLOOR, WALL ; 35
- tilecoll WALL, FLOOR, WALL, FLOOR ; 36
- tilecoll FLOOR, WALL, FLOOR, WALL ; 37
- tilecoll PIT, PIT, FLOOR, FLOOR ; 38
- tilecoll FLOOR, PIT, FLOOR, PIT ; 39
- tilecoll PIT, FLOOR, PIT, FLOOR ; 3a
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b
- tilecoll WALL, WALL, FLOOR, FLOOR ; 3c
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3d
- tilecoll WALL, HOP_DOWN, WALL, WALL ; 3e
- tilecoll HOP_DOWN, WALL, WALL, WALL ; 3f
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 40
diff --git a/tilesets/sprout_tower_metatiles.bin b/tilesets/sprout_tower_metatiles.bin
deleted file mode 100644
index b6668fcd4..000000000
--- a/tilesets/sprout_tower_metatiles.bin
+++ /dev/null
@@ -1,2 +0,0 @@
- @ !!A1A1!!!!!!@ A1A1
- A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!! -.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$  "#23!!67"#!!2367%545%545%545%545 ^^  FV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW  \ No newline at end of file
diff --git a/tilesets/sprout_tower_palette_map.asm b/tilesets/sprout_tower_palette_map.asm
deleted file mode 100644
index 6e3c10115..000000000
--- a/tilesets/sprout_tower_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
- tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
- tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
- tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
- tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
diff --git a/tilesets/tilesets.asm b/tilesets/tilesets.asm
deleted file mode 100644
index 06cbdb05d..000000000
--- a/tilesets/tilesets.asm
+++ /dev/null
@@ -1,47 +0,0 @@
-tileset: MACRO
- dba \1GFX, \1Meta, \1Coll
- dw \1Anim
- dw NULL
- dw \1PalMap
-ENDM
-
-Tilesets:: ; 4d596
-; entries correspond to TILESET_* constants
- tileset Tileset0
- tileset TilesetJohto1
- tileset TilesetJohto2
- tileset TilesetKanto
- tileset TilesetBattleTowerOutside
- tileset TilesetHouse1
- tileset TilesetPlayersHouse
- tileset TilesetPokecenter
- tileset TilesetGate
- tileset TilesetPort
- tileset TilesetLab
- tileset TilesetPowerPlant
- tileset TilesetMart
- tileset TilesetCeladonMansion
- tileset TilesetGameCorner
- tileset TilesetGym1
- tileset TilesetKurtsHouse
- tileset TilesetTrainStation
- tileset TilesetOlivineGym
- tileset TilesetLighthouse
- tileset TilesetPlayersHouse2F
- tileset TilesetPokeComCenter
- tileset TilesetBattleTower
- tileset TilesetSproutTower
- tileset TilesetCave
- tileset TilesetPark
- tileset TilesetRuinsOfAlph
- tileset TilesetRadioTower
- tileset TilesetUnderground
- tileset TilesetIcePath
- tileset TilesetWhirlIslands
- tileset TilesetIlexForest
- tileset TilesetBetaWordRoom
- tileset TilesetHoOhWordRoom
- tileset TilesetKabutoWordRoom
- tileset TilesetOmanyteWordRoom
- tileset TilesetAerodactylWordRoom
-; 4d7c1
diff --git a/tilesets/train_station_collision.asm b/tilesets/train_station_collision.asm
deleted file mode 100644
index 55b147237..000000000
--- a/tilesets/train_station_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll FF, FF, FF, FF ; 01
- tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 02
- tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 03
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll FLOOR, FLOOR, WALL, WALL ; 07
- tilecoll WALL, FLOOR, WALL, FLOOR ; 08
- tilecoll WALL, FLOOR, WALL, WALL ; 09
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a
- tilecoll WALL, WALL, WALL, WALL ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 0d
- tilecoll WALL, WALL, WALL, WALL ; 0e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll WALL, WALL, WALL, WALL ; 11
- tilecoll WALL, WALL, DOOR, WALL ; 12
- tilecoll WALL, WALL, WALL, DOOR ; 13
- tilecoll WALL, WALL, WALL, WALL ; 14
- tilecoll WALL, WALL, WALL, WALL ; 15
- tilecoll WALL, WALL, WALL, WALL ; 16
- tilecoll WALL, WALL, WALL, WALL ; 17
- tilecoll WALL, WALL, WALL, WALL ; 18
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
- tilecoll WALL, WALL, WALL, WALL ; 1b
- tilecoll WALL, WALL, WALL, WALL ; 1c
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll WALL, FLOOR, WALL, FLOOR ; 22
- tilecoll FLOOR, WALL, FLOOR, WALL ; 23
- tilecoll WALL, WALL, FLOOR, FLOOR ; 24
- tilecoll WALL, WALL, FLOOR, FLOOR ; 25
- tilecoll WALL, WALL, FLOOR, FLOOR ; 26
- tilecoll WALL, FLOOR, WALL, FLOOR ; 27
- tilecoll FLOOR, WALL, FLOOR, WALL ; 28
- tilecoll WALL, WALL, WALL, FLOOR ; 29
- tilecoll WALL, WALL, FLOOR, WALL ; 2a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
- tilecoll FLOOR, WALL, FLOOR, WALL ; 2c
- tilecoll FLOOR, WALL, FLOOR, WALL ; 2d
- tilecoll FLOOR, WALL, FLOOR, WALL ; 2e
- tilecoll WALL, WALL, WALL, WALL ; 2f
- tilecoll WALL, WALL, FLOOR, FLOOR ; 30
- tilecoll WALL, WALL, FLOOR, FLOOR ; 31
- tilecoll WALL, FLOOR, WALL, FLOOR ; 32
- tilecoll FLOOR, WALL, FLOOR, WALL ; 33
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34
- tilecoll WALL, FLOOR, WALL, FLOOR ; 35
- tilecoll FLOOR, WALL, FLOOR, WALL ; 36
- tilecoll WALL, WALL, WALL, FLOOR ; 37
- tilecoll WALL, WALL, FLOOR, FLOOR ; 38
- tilecoll WALL, WALL, FLOOR, WALL ; 39
- tilecoll WALL, FLOOR, WALL, WALL ; 3a
- tilecoll WALL, WALL, WALL, WALL ; 3b
- tilecoll FLOOR, WALL, WALL, WALL ; 3c
- tilecoll WALL, WALL, WALL, WALL ; 3d
- tilecoll WALL, WALL, WALL, WALL ; 3e
- tilecoll WALL, WALL, WALL, WALL ; 3f
- tilecoll WALL, WALL, WALL, WALL ; 40
diff --git a/tilesets/train_station_metatiles.bin b/tilesets/train_station_metatiles.bin
deleted file mode 100644
index 9bbdd0bd2..000000000
--- a/tilesets/train_station_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/train_station_palette_map.asm b/tilesets/train_station_palette_map.asm
deleted file mode 100644
index f52f5bbe7..000000000
--- a/tilesets/train_station_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
- tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
- tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY
- tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER
- tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
- tilepal 0, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
- tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
-
-rept 16
- db $ff
-endr
-
- tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
- tilepal 1, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
- tilepal 1, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY
- tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER
- tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
- tilepal 1, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
- tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
diff --git a/tilesets/underground_collision.asm b/tilesets/underground_collision.asm
deleted file mode 100644
index 0c3120451..000000000
--- a/tilesets/underground_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 03
- tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04
- tilecoll WALL, WALL, WALL, FLOOR ; 05
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
- tilecoll WALL, FLOOR, WALL, FLOOR ; 07
- tilecoll FLOOR, FLOOR, PIT, PIT ; 08
- tilecoll WALL, WALL, WALL, FLOOR ; 09
- tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
- tilecoll WALL, WALL, FLOOR, WALL ; 0b
- tilecoll WALL, WALL, WALL, WALL ; 0c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
- tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 10
- tilecoll WALL, FLOOR, WALL, WALL ; 11
- tilecoll FLOOR, FLOOR, WALL, WALL ; 12
- tilecoll FLOOR, WALL, WALL, WALL ; 13
- tilecoll WALL, WALL, FLOOR, FLOOR ; 14
- tilecoll FLOOR, FLOOR, WALL, WALL ; 15
- tilecoll FLOOR, FLOOR, WALL, WALL ; 16
- tilecoll WALL, FLOOR, WALL, WALL ; 17
- tilecoll FLOOR, WALL, WALL, WALL ; 18
- tilecoll FLOOR, WALL, FLOOR, WALL ; 19
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f
- tilecoll WALL, WALL, FLOOR, FLOOR ; 20
- tilecoll WALL, WALL, FLOOR, FLOOR ; 21
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 24
- tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25
- tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 26
- tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 27
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 28
- tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 29
- tilecoll FLOOR, WALL, FLOOR, WALL ; 2a
- tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
- tilecoll WALL, WALL, WALL, WALL ; 2c
- tilecoll WALL, WALL, WALL, WALL ; 2d
- tilecoll WALL, WALL, WALL, WALL ; 2e
- tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2f
- tilecoll WALL, WALL, WALL, WALL ; 30
- tilecoll WALL, WALL, WALL, WALL ; 31
- tilecoll WALL, WALL, WALL, WALL ; 32
- tilecoll WALL, WALL, WALL, WALL ; 33
- tilecoll WALL, WALL, WALL, WALL ; 34
- tilecoll WALL, WALL, WALL, WALL ; 35
- tilecoll WALL, WALL, WALL, WALL ; 36
- tilecoll WALL, FLOOR, WALL, FLOOR ; 37
- tilecoll FLOOR, WALL, FLOOR, WALL ; 38
- tilecoll WALL, WALL, WALL, WALL ; 39
- tilecoll WALL, WALL, WALL, WALL ; 3a
- tilecoll WALL, WALL, WALL, WALL ; 3b
- tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll WALL, WALL, WALL, WALL ; 3d
- tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3e
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
diff --git a/tilesets/underground_metatiles.bin b/tilesets/underground_metatiles.bin
deleted file mode 100644
index 28b807e1e..000000000
--- a/tilesets/underground_metatiles.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-*+:;,-<=EFUV 0144444444   44 444444      CDCDSTSTCDCDSTST        "#23                     
- QQQQQQQQ./>?./>?@ANOP]^_&'67             01 01@AAAPQQQPQQQAAABQQQRQQQR@AABPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQRPQQR@B@B()89()89 \ No newline at end of file
diff --git a/tilesets/underground_palette_map.asm b/tilesets/underground_palette_map.asm
deleted file mode 100644
index 6b9b5546d..000000000
--- a/tilesets/underground_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
- tilepal 0, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
- tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
- tilepal 0, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
- tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
- tilepal 1, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
- tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
- tilepal 1, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
- tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
- tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/unused_museum_palette_map.asm b/tilesets/unused_museum_palette_map.asm
deleted file mode 100644
index cfbe6dbcd..000000000
--- a/tilesets/unused_museum_palette_map.asm
+++ /dev/null
@@ -1,32 +0,0 @@
-; Matches pokered's "gate" tileset (notable for its Pewter Museum tiles)
-; https://tcrf.net/Pok%C3%A9mon_Gold_and_Silver#Unused_Tile_Palette_Assignment_Data
-
- tilepal 0, WATER, RED, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN
- tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN
- tilepal 0, BROWN, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF
- tilepal 0, ROOF, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF
- tilepal 0, ROOF, ROOF, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF
- tilepal 0, ROOF, GRAY, ROOF, BROWN, ROOF, ROOF, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, ROOF
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED
- 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, WATER, RED, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN
- tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, YELLOW, YELLOW, RED, GREEN, GREEN, BROWN
- tilepal 1, BROWN, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF
- tilepal 1, ROOF, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF
- tilepal 1, ROOF, ROOF, BROWN, BROWN, GRAY, BROWN, BROWN, ROOF
- tilepal 1, ROOF, GRAY, ROOF, BROWN, ROOF, ROOF, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, ROOF
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/unused_whirl_islands_collision.asm b/tilesets/unused_whirl_islands_collision.asm
deleted file mode 100644
index 0022d3881..000000000
--- a/tilesets/unused_whirl_islands_collision.asm
+++ /dev/null
@@ -1,128 +0,0 @@
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 04
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
- tilecoll WALL, WALL, WALL, WALL ; 06
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
- tilecoll WALL, WALL, WALL, WALL ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll WALL, WALL, WALL, WALL ; 0b
- tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0d
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
- tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f
- tilecoll WALL, WALL, WALL, WALL ; 10
- tilecoll WALL, WALL, WALL, WALL ; 11
- tilecoll WALL, WALL, WALL, WALL ; 12
- tilecoll WALL, WALL, WALL, WALL ; 13
- tilecoll WALL, WALL, WALL, WALL ; 14
- tilecoll WALL, WALL, WALL, DOOR ; 15
- tilecoll WALL, WALL, WALL, WALL ; 16
- tilecoll WALL, WALL, WALL, DOOR ; 17
- tilecoll WALL, WALL, TOWN_MAP, WALL ; 18
- tilecoll WALL, WALL, WALL, WALL ; 19
- tilecoll WALL, WALL, WALL, WALL ; 1a
- tilecoll WALL, WALL, WALL, DOOR ; 1b
- tilecoll WALL, WALL, TOWN_MAP, WALL ; 1c
- tilecoll WALL, WALL, WALL, WALL ; 1d
- tilecoll WALL, WALL, DOOR, WALL ; 1e
- tilecoll WALL, WALL, WALL, WALL ; 1f
- tilecoll WALL, WALL, WALL, WALL ; 20
- tilecoll WALL, WALL, WALL, WALL ; 21
- tilecoll WALL, WALL, WALL, WALL ; 22
- tilecoll WALL, WALL, WALL, WALL ; 23
- tilecoll WALL, WALL, WALL, WALL ; 24
- tilecoll WALL, WALL, WALL, WALL ; 25
- tilecoll WALL, WALL, WALL, WALL ; 26
- tilecoll WALL, WALL, WALL, WALL ; 27
- tilecoll WALL, WALL, WALL, WALL ; 28
- tilecoll WALL, WALL, WALL, DOOR ; 29
- tilecoll WALL, WALL, WALL, WALL ; 2a
- tilecoll WALL, WALL, WALL, DOOR ; 2b
- tilecoll WALL, WALL, WALL, WALL ; 2c
- tilecoll FLOOR, FLOOR, WALL, WALL ; 2d
- tilecoll FLOOR, FLOOR, WALL, WALL ; 2e
- tilecoll WALL, WALL, WALL, DOOR ; 2f
- tilecoll WALL, WALL, WALL, WALL ; 30
- tilecoll BUOY, BUOY, BUOY, WATER_21 ; 31
- tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 32
- tilecoll BUOY, BUOY, WATER_21, BUOY ; 33
- tilecoll FLOOR, FLOOR, WALL, WALL ; 34
- tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 35
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 36
- tilecoll WATER_21, BUOY, WATER_21, BUOY ; 37
- tilecoll WALL, WALL, WALL, WALL ; 38
- tilecoll BUOY, WATER_21, BUOY, BUOY ; 39
- tilecoll WATER_21, WATER_21, BUOY, BUOY ; 3a
- tilecoll WATER_21, BUOY, BUOY, BUOY ; 3b
- tilecoll WALL, WALL, WALL, WALL ; 3c
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40
- tilecoll WALL, WALL, WALL, FLOOR ; 41
- tilecoll WALL, WALL, FLOOR, FLOOR ; 42
- tilecoll WALL, WALL, FLOOR, WALL ; 43
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 44
- tilecoll WALL, FLOOR, WALL, FLOOR ; 45
- tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 46
- tilecoll FLOOR, WALL, FLOOR, WALL ; 47
- tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 48
- tilecoll WALL, FLOOR, WALL, WALL ; 49
- tilecoll FLOOR, FLOOR, WALL, WALL ; 4a
- tilecoll FLOOR, WALL, WALL, WALL ; 4b
- tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 56
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 5a
- tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b
- tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5c
- tilecoll WALL, WALL, WALL, FLOOR ; 5d
- tilecoll WALL, WALL, FLOOR, FLOOR ; 5e
- tilecoll WALL, WALL, FLOOR, WALL ; 5f
- tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 60
- tilecoll WALL, FLOOR, WALL, FLOOR ; 61
- tilecoll WALL, WALL, WALL, WALL ; 62
- tilecoll FLOOR, WALL, FLOOR, WALL ; 63
- tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 64
- tilecoll WALL, FLOOR, WALL, WALL ; 65
- tilecoll FLOOR, FLOOR, WALL, WALL ; 66
- tilecoll FLOOR, WALL, WALL, WALL ; 67
- tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 68
- tilecoll WALL, FLOOR, WALL, FLOOR ; 69
- tilecoll FLOOR, WALL, FLOOR, WALL ; 6a
- tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b
- tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c
- tilecoll WALL, FLOOR, WALL, WALL ; 6d
- tilecoll FLOOR, WALL, WALL, WALL ; 6e
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70
- tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
- tilecoll FLOOR, FLOOR, WALL, WALL ; 73
- tilecoll FLOOR, FLOOR, DOOR, WALL ; 74
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75
- tilecoll WALL, WALL, FLOOR, FLOOR ; 76
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 77
- tilecoll WALL, WALL, WALL, WALL ; 78
- tilecoll WALL, WALL, WALL, WALL ; 79
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a
- tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7b
- tilecoll WALL, WALL, WALL, WALL ; 7c
- tilecoll WALL, WALL, WALL, WALL ; 7d
- tilecoll WALL, WALL, WALL, WALL ; 7e
- tilecoll WALL, WALL, WALL, WALL ; 7f
- tilecoll WALL, WALL, WALL, WALL ; 80
diff --git a/tilesets/unused_whirl_islands_metatiles.bin b/tilesets/unused_whirl_islands_metatiles.bin
deleted file mode 100644
index b70f1a0e6..000000000
--- a/tilesets/unused_whirl_islands_metatiles.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/whirl_islands_collision.asm b/tilesets/whirl_islands_collision.asm
deleted file mode 100644
index 3d5e0ae05..000000000
--- a/tilesets/whirl_islands_collision.asm
+++ /dev/null
@@ -1,64 +0,0 @@
- tilecoll WALL, WALL, WALL, WALL ; 01
- tilecoll WALL, WALL, WALL, WALL ; 02
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
- tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04
- tilecoll WALL, UP_WALL, WALL, FLOOR ; 05
- tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06
- tilecoll UP_WALL, WALL, FLOOR, WALL ; 07
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08
- tilecoll WALL, FLOOR, WALL, FLOOR ; 09
- tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
- tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c
- tilecoll WALL, FLOOR, WALL, WALL ; 0d
- tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
- tilecoll FLOOR, WALL, WALL, WALL ; 0f
- tilecoll WATER, WATER, WATER, WATER ; 10
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13
- tilecoll FLOOR, FLOOR, WALL, CAVE ; 14
- tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15
- tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16
- tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
- tilecoll WALL, WALL, WALL, FLOOR ; 19
- tilecoll WALL, WALL, FLOOR, FLOOR ; 1a
- tilecoll WALL, WALL, FLOOR, WALL ; 1b
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c
- tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
- tilecoll WALL, WALL, WALL, WALL ; 1e
- tilecoll FLOOR, WALL, FLOOR, WALL ; 1f
- tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20
- tilecoll WALL, FLOOR, WALL, WALL ; 21
- tilecoll FLOOR, FLOOR, WALL, WALL ; 22
- tilecoll FLOOR, WALL, WALL, WALL ; 23
- tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24
- tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25
- tilecoll WATER, WATER, WATER, WATER ; 26
- tilecoll WATER, WATER, WATER, WATER ; 27
- tilecoll WATER, WATER, WATER, WATER ; 28
- tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29
- tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a
- tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
- tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d
- tilecoll WALL, WALL, WALL, WALL ; 2e
- tilecoll WALL, WALL, WALL, WALL ; 2f
- tilecoll WALL, WALL, WALL, WALL ; 30
- tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31
- tilecoll WALL, WALL, WALL, WALL ; 32
- tilecoll WATER, WATER, WATER, WATER ; 33
- tilecoll WATER, WATER, WATER, WATER ; 34
- tilecoll WALL, WALL, WALL, WALL ; 35
- tilecoll FLOOR, WALL, FLOOR, WALL ; 36
- tilecoll FLOOR, WALL, FLOOR, WALL ; 37
- tilecoll WALL, WALL, WALL, CAVE ; 38
- tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a
- tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b
- tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c
- tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d
- tilecoll WATER, WATER, WATER, WATER ; 3e
- tilecoll WATER, WATER, WATER, WATER ; 3f
- tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40
diff --git a/tilesets/whirl_islands_metatiles.bin b/tilesets/whirl_islands_metatiles.bin
deleted file mode 100644
index a41b5b080..000000000
--- a/tilesets/whirl_islands_metatiles.bin
+++ /dev/null
@@ -1,6 +0,0 @@
-$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&'
-&
-&  &&67&&67&&&&$$$$*+:;$$$$"#23     ()89       !01     $$&&&&    @@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%' &&&&&&&& 
-&
-67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&& 
-&&& \ No newline at end of file
diff --git a/tilesets/whirl_islands_palette_map.asm b/tilesets/whirl_islands_palette_map.asm
deleted file mode 100644
index 73c09ebe5..000000000
--- a/tilesets/whirl_islands_palette_map.asm
+++ /dev/null
@@ -1,29 +0,0 @@
- tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
- tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
-
-rept 16
- db $ff
-endr
-
- tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
- tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
- tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
- tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
- tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
- tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
- tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY