summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--constants/tilemap_constants.asm10
-rw-r--r--macros.asm1
-rwxr-xr-xtilesets/00_palette_map.asm29
-rw-r--r--tilesets/00_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/01_palette_map.asm29
-rw-r--r--tilesets/01_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/02_palette_map.asm29
-rw-r--r--tilesets/02_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/03_palette_map.asm29
-rw-r--r--tilesets/03_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/04_palette_map.asm29
-rw-r--r--tilesets/04_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/05_palette_map.asm29
-rw-r--r--tilesets/05_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/06_palette_map.asm29
-rw-r--r--tilesets/06_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/07_palette_map.asm29
-rw-r--r--tilesets/07_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/08_palette_map.asm29
-rw-r--r--tilesets/08_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/09_palette_map.asm29
-rw-r--r--tilesets/09_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/10_palette_map.asm29
-rw-r--r--tilesets/10_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/11_palette_map.asm29
-rw-r--r--tilesets/11_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/12_palette_map.asm29
-rw-r--r--tilesets/12_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/13_palette_map.asm29
-rw-r--r--tilesets/13_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/14_palette_map.asm29
-rw-r--r--tilesets/14_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/15_palette_map.asm29
-rw-r--r--tilesets/15_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/16_palette_map.asm29
-rw-r--r--tilesets/16_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/17_palette_map.asm29
-rw-r--r--tilesets/17_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/18_palette_map.asm29
-rw-r--r--tilesets/18_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/19_palette_map.asm29
-rw-r--r--tilesets/19_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/20_palette_map.asm29
-rw-r--r--tilesets/20_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/21_palette_map.asm29
-rw-r--r--tilesets/21_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/22_palette_map.asm29
-rw-r--r--tilesets/22_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/23_palette_map.asm29
-rw-r--r--tilesets/23_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/24_palette_map.asm29
-rw-r--r--tilesets/24_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/25_palette_map.asm29
-rw-r--r--tilesets/25_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/26_palette_map.asm29
-rw-r--r--tilesets/26_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/27_palette_map.asm29
-rw-r--r--tilesets/27_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/28_palette_map.asm29
-rw-r--r--tilesets/28_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/29_palette_map.asm29
-rw-r--r--tilesets/29_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/30_palette_map.asm29
-rw-r--r--tilesets/30_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/31_palette_map.asm29
-rw-r--r--tilesets/31_palette_map.bin1
-rw-r--r--tilesets/32_palette_map.asm29
-rw-r--r--tilesets/32_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/33_palette_map.asm29
-rw-r--r--tilesets/33_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/34_palette_map.asm29
-rw-r--r--tilesets/34_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/35_palette_map.asm29
-rw-r--r--tilesets/35_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/36_palette_map.asm29
-rw-r--r--tilesets/36_palette_map.binbin112 -> 0 bytes
-rw-r--r--tilesets/palette_maps.asm60
77 files changed, 1114 insertions, 31 deletions
diff --git a/constants/tilemap_constants.asm b/constants/tilemap_constants.asm
index e64d042d8..b130b5de3 100644
--- a/constants/tilemap_constants.asm
+++ b/constants/tilemap_constants.asm
@@ -41,3 +41,13 @@ const_value SET 1
const TILESET_KABUTO_WORD_ROOM ; 22
const TILESET_OMANYTE_WORD_ROOM ; 23
const TILESET_AERODACTYL_WORD_ROOM ; 24
+
+ const_def
+ const PAL_BG_GRAY
+ const PAL_BG_RED
+ const PAL_BG_GREEN
+ const PAL_BG_WATER
+ const PAL_BG_YELLOW
+ const PAL_BG_BROWN
+ const PAL_BG_ROOF
+ const PAL_BG_TEXT
diff --git a/macros.asm b/macros.asm
index 812873584..6656ca038 100644
--- a/macros.asm
+++ b/macros.asm
@@ -15,6 +15,7 @@ INCLUDE "macros/rst.asm"
INCLUDE "macros/mobile.asm"
INCLUDE "macros/trainer.asm"
INCLUDE "macros/trade_anim.asm"
+INCLUDE "macros/pals.asm"
RGB: MACRO
dw ((\3) << 10) + ((\2) << 5) + (\1)
diff --git a/tilesets/00_palette_map.asm b/tilesets/00_palette_map.asm
new file mode 100755
index 000000000..62fbd2d00
--- /dev/null
+++ b/tilesets/00_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
+ tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
+ tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+ tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
+ tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
+ tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED
+ tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+ tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/00_palette_map.bin b/tilesets/00_palette_map.bin
deleted file mode 100644
index 91a8f594d..000000000
--- a/tilesets/00_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/01_palette_map.asm b/tilesets/01_palette_map.asm
new file mode 100644
index 000000000..62fbd2d00
--- /dev/null
+++ b/tilesets/01_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
+ tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
+ tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+ tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
+ tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
+ tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED
+ tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+ tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/01_palette_map.bin b/tilesets/01_palette_map.bin
deleted file mode 100644
index 91a8f594d..000000000
--- a/tilesets/01_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/02_palette_map.asm b/tilesets/02_palette_map.asm
new file mode 100644
index 000000000..f2af7a92d
--- /dev/null
+++ b/tilesets/02_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
+ tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
+ tilepal 0, RED, RED, BROWN, BROWN, BROWN, GRAY, GREEN, GREEN
+ tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED
+ tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW
+ tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY
+ tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF
+ tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN
+ tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED
+ tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW
+ tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN
+ tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF
diff --git a/tilesets/02_palette_map.bin b/tilesets/02_palette_map.bin
deleted file mode 100644
index 509f2f810..000000000
--- a/tilesets/02_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/03_palette_map.asm b/tilesets/03_palette_map.asm
new file mode 100644
index 000000000..e3e497fb9
--- /dev/null
+++ b/tilesets/03_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
+ tilepal 0, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN
+ tilepal 0, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+ tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
+ tilepal 0, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, BROWN, BROWN, RED, BROWN, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, YELLOW, YELLOW, YELLOW, GRAY, BROWN, GRAY
+ tilepal 1, GRAY, BROWN, ROOF, BROWN, WATER, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, BROWN
+ tilepal 1, ROOF, ROOF, GRAY, GRAY, GREEN, GREEN, GREEN, GRAY
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+ tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, RED
+ tilepal 1, GREEN, GREEN, GREEN, ROOF, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/03_palette_map.bin b/tilesets/03_palette_map.bin
deleted file mode 100644
index b9ae628fb..000000000
--- a/tilesets/03_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/04_palette_map.asm b/tilesets/04_palette_map.asm
new file mode 100644
index 000000000..dfc74a9c0
--- /dev/null
+++ b/tilesets/04_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
+ tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
+ tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+ tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, BROWN
+ tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
+ tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
+ tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, RED, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, RED, RED, RED, ROOF, RED, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED, RED
+ tilepal 1, RED, ROOF, ROOF, ROOF, ROOF, ROOF, RED, RED
+ tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+ tilepal 1, RED, RED, RED, RED, RED, YELLOW, YELLOW, YELLOW
+ tilepal 1, YELLOW, RED, RED, RED, WATER, WATER, WATER, RED
+ tilepal 1, RED, RED, ROOF, RED, RED, ROOF, RED, RED
+ tilepal 1, RED, ROOF, ROOF, RED, RED, RED, ROOF, ROOF
+ tilepal 1, RED, RED, RED, RED, YELLOW, RED, GREEN, RED
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF
diff --git a/tilesets/04_palette_map.bin b/tilesets/04_palette_map.bin
deleted file mode 100644
index 71013e707..000000000
--- a/tilesets/04_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/05_palette_map.asm b/tilesets/05_palette_map.asm
new file mode 100644
index 000000000..ce7b988b7
--- /dev/null
+++ b/tilesets/05_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
+ tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
+ tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN
+ tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
+ tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER
+ tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER
+ tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/05_palette_map.bin b/tilesets/05_palette_map.bin
deleted file mode 100644
index 55423dc33..000000000
--- a/tilesets/05_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/06_palette_map.asm b/tilesets/06_palette_map.asm
new file mode 100644
index 000000000..5d089835b
--- /dev/null
+++ b/tilesets/06_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+ tilepal 0, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, BROWN, BROWN, BROWN, RED, GREEN, WATER, WATER
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, RED, BROWN, WATER, WATER
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+ tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/06_palette_map.bin b/tilesets/06_palette_map.bin
deleted file mode 100644
index addf636ac..000000000
--- a/tilesets/06_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/07_palette_map.asm b/tilesets/07_palette_map.asm
new file mode 100644
index 000000000..78508b59e
--- /dev/null
+++ b/tilesets/07_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+ tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+ tilepal 0, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
+ tilepal 0, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY
+ tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+ tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
+ tilepal 0, RED, RED, RED, RED, RED, RED, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, RED, GRAY, WATER, WATER, WATER, ROOF, ROOF
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+ tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+ tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, WATER, GRAY
+ tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+ tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, RED, RED, GRAY
+ tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
+ tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/07_palette_map.bin b/tilesets/07_palette_map.bin
deleted file mode 100644
index e993af8ec..000000000
--- a/tilesets/07_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/08_palette_map.asm b/tilesets/08_palette_map.asm
new file mode 100644
index 000000000..7854d3a81
--- /dev/null
+++ b/tilesets/08_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GRAY, WATER, WATER, RED, GREEN, GREEN, GREEN
+ tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+ tilepal 0, WATER, GRAY, WATER, WATER, RED, BROWN, BROWN, WATER
+ tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, BROWN, WATER
+ tilepal 0, GREEN, GREEN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+ tilepal 0, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
+ tilepal 0, GREEN, GREEN, GREEN, GREEN, GRAY, WATER, WATER, WATER
+ tilepal 0, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, ROOF, RED, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, WATER
+ tilepal 1, GRAY, ROOF, RED, GRAY, GRAY, WATER, GRAY, GRAY
+ tilepal 1, RED, RED, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, WATER, WATER, WATER
+ tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, WATER, GRAY, GRAY
diff --git a/tilesets/08_palette_map.bin b/tilesets/08_palette_map.bin
deleted file mode 100644
index e5dc47699..000000000
--- a/tilesets/08_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/09_palette_map.asm b/tilesets/09_palette_map.asm
new file mode 100644
index 000000000..6bfdf4686
--- /dev/null
+++ b/tilesets/09_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
+ tilepal 0, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, WATER, WATER, GRAY, GRAY, RED, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, RED, BROWN
+ tilepal 1, ROOF, WATER, WATER, WATER, WATER, RED, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, ROOF, WATER, RED, RED, GRAY, GRAY
+ tilepal 1, BROWN, BROWN, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, RED, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, GRAY, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
diff --git a/tilesets/09_palette_map.bin b/tilesets/09_palette_map.bin
deleted file mode 100644
index d197c5d4c..000000000
--- a/tilesets/09_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/10_palette_map.asm b/tilesets/10_palette_map.asm
new file mode 100644
index 000000000..24399c6ea
--- /dev/null
+++ b/tilesets/10_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, WATER, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, WATER, WATER, WATER, WATER, ROOF, BROWN, BROWN, BROWN
+ tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+ tilepal 0, WATER, WATER, WATER, WATER, RED, BROWN, BROWN, GRAY
+ tilepal 0, WATER, WATER, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
+ tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, BROWN, GREEN, GREEN, GREEN
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, RED, RED, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
diff --git a/tilesets/10_palette_map.bin b/tilesets/10_palette_map.bin
deleted file mode 100644
index a5f62bf30..000000000
--- a/tilesets/10_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/11_palette_map.asm b/tilesets/11_palette_map.asm
new file mode 100644
index 000000000..f79f9c01b
--- /dev/null
+++ b/tilesets/11_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
+ tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN
+ tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+ tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED
+ tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER
+ tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
+ tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN
+ tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN
+ tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+ tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED
+ tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER
+ tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF
+ tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/11_palette_map.bin b/tilesets/11_palette_map.bin
deleted file mode 100644
index f2e77186c..000000000
--- a/tilesets/11_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/12_palette_map.asm b/tilesets/12_palette_map.asm
new file mode 100644
index 000000000..991510d12
--- /dev/null
+++ b/tilesets/12_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GREEN, GREEN, WATER, RED, GRAY, GRAY, ROOF, ROOF
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, RED, ROOF, ROOF, GRAY, YELLOW
+ tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+ tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+ tilepal 0, WATER, WATER, RED, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED, RED
+ tilepal 0, GREEN, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, RED, YELLOW, YELLOW, YELLOW, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, ROOF, RED, RED, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN, GRAY
+ tilepal 1, GRAY, GREEN, GREEN, RED, RED, WATER, WATER, ROOF
+ tilepal 1, GRAY, GRAY, GRAY, YELLOW, YELLOW, YELLOW, ROOF, GRAY
+ tilepal 1, GRAY, GRAY, WATER, GRAY, GRAY, GRAY, YELLOW, YELLOW
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, RED, WATER, RED
+ tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+ tilepal 1, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+ tilepal 1, GRAY, GRAY, WATER, GRAY, WATER, RED, BROWN, BROWN
diff --git a/tilesets/12_palette_map.bin b/tilesets/12_palette_map.bin
deleted file mode 100644
index d8e843c15..000000000
--- a/tilesets/12_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/13_palette_map.asm b/tilesets/13_palette_map.asm
new file mode 100644
index 000000000..2bd27ad22
--- /dev/null
+++ b/tilesets/13_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER
+ tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN
+ tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN
+ tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW
+ tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW
+ tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN
+ tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW
+ tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN
+ tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
diff --git a/tilesets/13_palette_map.bin b/tilesets/13_palette_map.bin
deleted file mode 100644
index 2e25b5d1e..000000000
--- a/tilesets/13_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/14_palette_map.asm b/tilesets/14_palette_map.asm
new file mode 100644
index 000000000..34bb9f6f0
--- /dev/null
+++ b/tilesets/14_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, GREEN, GREEN, GREEN
+ tilepal 0, GREEN, GREEN, GRAY, GRAY, RED, RED, GREEN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, RED, BROWN, GREEN, GRAY, GRAY
+ tilepal 0, GRAY, GREEN, GRAY, GRAY, RED, RED, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, RED, RED, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, GRAY, GREEN, RED, RED, GREEN, GRAY, RED, RED
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, RED, RED, GREEN, BROWN, RED, RED
+ tilepal 0, ROOF, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
+ tilepal 0, RED, ROOF, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, BROWN
+ tilepal 1, YELLOW, RED, YELLOW, RED, GREEN, GREEN, BROWN, ROOF
+ tilepal 1, ROOF, GRAY, GRAY, GRAY, GRAY, RED, ROOF, ROOF
+ tilepal 1, YELLOW, RED, YELLOW, RED, WATER, WATER, RED, RED
+ tilepal 1, RED, RED, RED, RED, GREEN, GRAY, RED, RED
+ tilepal 1, RED, RED, YELLOW, YELLOW, WATER, WATER, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, RED, RED, GREEN, ROOF, RED, RED
+ tilepal 1, RED, RED, YELLOW, YELLOW, ROOF, ROOF, RED, RED
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, RED, RED
+ tilepal 1, RED, GRAY, GRAY, GRAY, GRAY, GRAY, RED, RED
+ tilepal 1, GRAY, GRAY, GRAY, WATER, ROOF, ROOF, WATER, WATER
diff --git a/tilesets/14_palette_map.bin b/tilesets/14_palette_map.bin
deleted file mode 100644
index 4385036ac..000000000
--- a/tilesets/14_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/15_palette_map.asm b/tilesets/15_palette_map.asm
new file mode 100644
index 000000000..b20f49195
--- /dev/null
+++ b/tilesets/15_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
+ tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
+ tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
+ tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN
+ tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN
+ tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+ tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
+ tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
+ tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN
+ tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN
+ tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN
+ tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN
+ tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN
+ tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY
+ tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF
+ tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF
diff --git a/tilesets/15_palette_map.bin b/tilesets/15_palette_map.bin
deleted file mode 100644
index 385f0f74f..000000000
--- a/tilesets/15_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/16_palette_map.asm b/tilesets/16_palette_map.asm
new file mode 100644
index 000000000..5daa0da6b
--- /dev/null
+++ b/tilesets/16_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
+ tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY
+ tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY
+ tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY
+ tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN
diff --git a/tilesets/16_palette_map.bin b/tilesets/16_palette_map.bin
deleted file mode 100644
index 14a4191b8..000000000
--- a/tilesets/16_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/17_palette_map.asm b/tilesets/17_palette_map.asm
new file mode 100644
index 000000000..f52f5bbe7
--- /dev/null
+++ b/tilesets/17_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+ tilepal 0, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+ tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+ tilepal 0, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, WATER, WATER, WATER, WATER, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+ tilepal 1, GRAY, GRAY, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, RED, GRAY
+ tilepal 1, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, ROOF, GRAY, GRAY
+ tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, WATER, WATER, WATER, WATER
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
+ tilepal 1, WATER, GREEN, GREEN, WATER, BROWN, BROWN, BROWN, GREEN
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN, WATER, WATER
diff --git a/tilesets/17_palette_map.bin b/tilesets/17_palette_map.bin
deleted file mode 100644
index 8c3cbd31a..000000000
--- a/tilesets/17_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/18_palette_map.asm b/tilesets/18_palette_map.asm
new file mode 100644
index 000000000..551a09351
--- /dev/null
+++ b/tilesets/18_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED
+ tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY
diff --git a/tilesets/18_palette_map.bin b/tilesets/18_palette_map.bin
deleted file mode 100644
index 13ed47664..000000000
--- a/tilesets/18_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/19_palette_map.asm b/tilesets/19_palette_map.asm
new file mode 100644
index 000000000..5f80e3a4d
--- /dev/null
+++ b/tilesets/19_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, WATER, WATER, WATER, BROWN, WATER, WATER, RED
+ tilepal 0, RED, ROOF, ROOF, BROWN, ROOF, RED, RED, RED
+ tilepal 0, ROOF, WATER, ROOF, BROWN, ROOF, WATER, WATER, RED
+ tilepal 0, RED, ROOF, ROOF, WATER, ROOF, RED, RED, RED
+ tilepal 0, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, BROWN, ROOF, ROOF, GRAY, GRAY
+ tilepal 0, ROOF, ROOF, WATER, WATER, RED, ROOF, BROWN, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER
+ tilepal 0, YELLOW, YELLOW, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
+ tilepal 0, YELLOW, YELLOW, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
+ tilepal 0, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, ROOF, GRAY, GRAY, BROWN, BROWN, RED
+ tilepal 1, RED, RED, RED, BROWN, RED, RED, RED, RED
+ tilepal 1, ROOF, WATER, ROOF, BROWN, RED, WATER, WATER, RED
+ tilepal 1, RED, RED, RED, WATER, RED, RED, RED, RED
+ tilepal 1, ROOF, ROOF, WATER, BROWN, RED, WATER, WATER, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, BROWN, RED, ROOF, GRAY, GRAY
+ tilepal 1, ROOF, ROOF, WATER, WATER, RED, RED, BROWN, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, ROOF, BROWN, WATER
+ tilepal 1, RED, RED, ROOF, ROOF, BROWN, BROWN, GRAY, GRAY
+ tilepal 1, RED, RED, GRAY, GRAY, GREEN, GREEN, ROOF, ROOF
+ tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
+ tilepal 1, RED, RED, GREEN, GREEN, ROOF, ROOF, GRAY, GRAY
diff --git a/tilesets/19_palette_map.bin b/tilesets/19_palette_map.bin
deleted file mode 100644
index 9579602a6..000000000
--- a/tilesets/19_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/20_palette_map.asm b/tilesets/20_palette_map.asm
new file mode 100644
index 000000000..1c0cb1f08
--- /dev/null
+++ b/tilesets/20_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+ tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
+ tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+ tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED
+ tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+ tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED
+ tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+ tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+ tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+ tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+ tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED
+ tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+ tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED
+ tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+ tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED
+ tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN
+ tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+ tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN
+ tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW
diff --git a/tilesets/20_palette_map.bin b/tilesets/20_palette_map.bin
deleted file mode 100644
index 7390c20fa..000000000
--- a/tilesets/20_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/21_palette_map.asm b/tilesets/21_palette_map.asm
new file mode 100644
index 000000000..75ee649f9
--- /dev/null
+++ b/tilesets/21_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 0, WATER, WATER, GRAY, GRAY, RED, GRAY, WATER, WATER
+ tilepal 0, RED, WATER, GRAY, WATER, WATER, WATER, RED, RED
+ tilepal 0, WATER, WATER, GRAY, GRAY, GRAY, GREEN, GREEN, GRAY
+ tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER
+ tilepal 0, RED, RED, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, RED, RED, RED, WATER, WATER, WATER
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY
+ tilepal 0, GRAY, GRAY, WATER, WATER, WATER, WATER, RED, WATER
+ tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, RED, RED, GRAY
+ tilepal 0, RED, RED, WATER, WATER, WATER, WATER, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, WATER, WATER, GRAY, GRAY, YELLOW, YELLOW
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, GRAY, GRAY, WATER, RED, RED, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GRAY, WATER
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, RED, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, RED, RED, GRAY, GRAY, RED, RED, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN
+ tilepal 1, WATER, RED, WATER, BROWN, WATER, WATER, WATER, WATER
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, GREEN, GREEN
+ tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+ tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
diff --git a/tilesets/21_palette_map.bin b/tilesets/21_palette_map.bin
deleted file mode 100644
index b4a0afde2..000000000
--- a/tilesets/21_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/22_palette_map.asm b/tilesets/22_palette_map.asm
new file mode 100644
index 000000000..1abce2a16
--- /dev/null
+++ b/tilesets/22_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, RED, WATER, WATER, GRAY, GRAY, WATER, WATER
+ tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
+ tilepal 0, WATER, RED, WATER, WATER, GRAY, GRAY, WATER, WATER
+ tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, BROWN, BROWN
+ tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, GRAY
+ tilepal 0, WATER, WATER, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, RED, RED, RED, RED, WATER, GRAY, WATER
+ tilepal 0, GRAY, GRAY, BROWN, RED, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, RED, BROWN, RED, BROWN, BROWN, BROWN, RED, RED
+ tilepal 0, WATER, WATER, WATER, RED, RED, RED, RED, WATER
+ tilepal 0, BROWN, YELLOW, RED, BROWN, BROWN, BROWN, RED, RED
+ tilepal 0, WATER, RED, RED, RED, RED, GRAY, RED, WATER
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, WATER, GRAY, WATER, WATER, WATER, ROOF, ROOF
+ tilepal 1, YELLOW, YELLOW, GRAY, GRAY, WATER, WATER, RED, RED
+ tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, WATER
+ tilepal 1, RED, GRAY, GRAY, GRAY, GREEN, YELLOW, RED, RED
+ tilepal 1, GRAY, GRAY, RED, RED, WATER, WATER, GRAY, GRAY
+ tilepal 1, YELLOW, YELLOW, BROWN, YELLOW, WATER, WATER, YELLOW, RED
+ tilepal 1, GRAY, GRAY, RED, RED, GRAY, WATER, WATER, WATER
+ tilepal 1, GRAY, GRAY, BROWN, YELLOW, RED, RED, YELLOW, RED
+ tilepal 1, GRAY, GRAY, RED, RED, RED, RED, WATER, WATER
+ tilepal 1, GRAY, GRAY, YELLOW, BROWN, WATER, WATER, GRAY, BROWN
+ tilepal 1, RED, RED, RED, RED, RED, RED, GRAY, GRAY
+ tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/22_palette_map.bin b/tilesets/22_palette_map.bin
deleted file mode 100644
index dc30c3055..000000000
--- a/tilesets/22_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/23_palette_map.asm b/tilesets/23_palette_map.asm
new file mode 100644
index 000000000..6e3c10115
--- /dev/null
+++ b/tilesets/23_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
+ tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
+ tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED
+ tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED
+ tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
diff --git a/tilesets/23_palette_map.bin b/tilesets/23_palette_map.bin
deleted file mode 100644
index 086080a7d..000000000
--- a/tilesets/23_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/24_palette_map.asm b/tilesets/24_palette_map.asm
new file mode 100644
index 000000000..73c09ebe5
--- /dev/null
+++ b/tilesets/24_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/24_palette_map.bin b/tilesets/24_palette_map.bin
deleted file mode 100644
index b6c971393..000000000
--- a/tilesets/24_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/25_palette_map.asm b/tilesets/25_palette_map.asm
new file mode 100644
index 000000000..f9c65ef89
--- /dev/null
+++ b/tilesets/25_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GREEN, BROWN, RED, GREEN, BROWN, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+ tilepal 0, RED, RED, RED, GRAY, WATER, ROOF, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN
+ tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN
+ tilepal 0, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN
+ tilepal 0, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+ tilepal 0, BROWN, BROWN, GREEN, GREEN, GRAY, GRAY, GRAY, RED
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, WATER
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, WATER, WATER, GRAY, RED, GREEN, BROWN, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN, GREEN, GREEN
+ tilepal 1, WATER, WATER, RED, GRAY, WATER, ROOF, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, GREEN, GREEN, GREEN
+ tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, BROWN, GREEN, BROWN, BROWN, GREEN
+ tilepal 1, RED, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN, BROWN, GREEN
+ tilepal 1, BROWN, RED, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, BROWN, GREEN, GREEN, WATER, WATER, WATER, RED
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, GRAY
diff --git a/tilesets/25_palette_map.bin b/tilesets/25_palette_map.bin
deleted file mode 100644
index 871b5afbe..000000000
--- a/tilesets/25_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/26_palette_map.asm b/tilesets/26_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/tilesets/26_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/26_palette_map.bin b/tilesets/26_palette_map.bin
deleted file mode 100644
index e5d3715e4..000000000
--- a/tilesets/26_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/27_palette_map.asm b/tilesets/27_palette_map.asm
new file mode 100644
index 000000000..3530f7479
--- /dev/null
+++ b/tilesets/27_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, RED, RED, WATER, WATER, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, WATER, WATER, RED, WATER, WATER, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, ROOF, ROOF, GRAY, GRAY, BROWN, GRAY, GRAY, BROWN
+ tilepal 0, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
+ tilepal 0, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GREEN, GREEN
+ tilepal 0, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 1, YELLOW, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, RED, YELLOW, YELLOW, RED
+ tilepal 1, ROOF, RED, RED, ROOF, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, ROOF, ROOF, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, ROOF, ROOF, GRAY, RED, RED, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GRAY, BROWN
+ tilepal 1, BROWN, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY, GREEN, GREEN
+ tilepal 1, GREEN, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, RED, RED, WATER, WATER, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, RED, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/27_palette_map.bin b/tilesets/27_palette_map.bin
deleted file mode 100644
index 8bacb68a1..000000000
--- a/tilesets/27_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/28_palette_map.asm b/tilesets/28_palette_map.asm
new file mode 100644
index 000000000..6b9b5546d
--- /dev/null
+++ b/tilesets/28_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
+ tilepal 0, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+ tilepal 0, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
+ tilepal 0, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, GRAY, RED, WATER, WATER, WATER, WATER, RED
+ tilepal 1, RED, GRAY, WATER, WATER, WATER, WATER, GRAY, GRAY
+ tilepal 1, GRAY, RED, RED, WATER, WATER, WATER, WATER, RED
+ tilepal 1, RED, GRAY, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GREEN, GREEN
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, BROWN, BROWN, YELLOW, YELLOW, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/28_palette_map.bin b/tilesets/28_palette_map.bin
deleted file mode 100644
index 3d90cf959..000000000
--- a/tilesets/28_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/29_palette_map.asm b/tilesets/29_palette_map.asm
new file mode 100644
index 000000000..985844071
--- /dev/null
+++ b/tilesets/29_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, BROWN, ROOF, ROOF, BROWN, BROWN, WATER, WATER
+ tilepal 0, BROWN, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 0, ROOF, ROOF, ROOF, ROOF, BROWN, BROWN, WATER, WATER
+ tilepal 0, WATER, ROOF, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY
+ tilepal 0, WATER, WATER, ROOF, ROOF, WATER, WATER, WATER, WATER
+ tilepal 0, BROWN, WATER, WATER, WATER, WATER, WATER, GRAY, GRAY
+ tilepal 0, WATER, WATER, ROOF, ROOF, GRAY, GRAY, WATER, WATER
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, GREEN, GRAY, GRAY, WATER
+ tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, WATER, WATER, WATER
+ tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, GREEN, GREEN
+ tilepal 1, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
diff --git a/tilesets/29_palette_map.bin b/tilesets/29_palette_map.bin
deleted file mode 100644
index 017e9c52d..000000000
--- a/tilesets/29_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/30_palette_map.asm b/tilesets/30_palette_map.asm
new file mode 100644
index 000000000..73c09ebe5
--- /dev/null
+++ b/tilesets/30_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN
+ tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
+ tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY
diff --git a/tilesets/30_palette_map.bin b/tilesets/30_palette_map.bin
deleted file mode 100644
index b6c971393..000000000
--- a/tilesets/30_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/31_palette_map.asm b/tilesets/31_palette_map.asm
new file mode 100644
index 000000000..696788084
--- /dev/null
+++ b/tilesets/31_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
+ tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+ tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW
+ tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+ tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
+ tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/31_palette_map.bin b/tilesets/31_palette_map.bin
deleted file mode 100644
index 78f51b99a..000000000
--- a/tilesets/31_palette_map.bin
+++ /dev/null
@@ -1 +0,0 @@
-P$ETU""USUUU""UUU"RU""UUU""RR%UUUUUUUUUUUUUUUU؝ݪݝݪݪݪݪڭ \ No newline at end of file
diff --git a/tilesets/32_palette_map.asm b/tilesets/32_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/tilesets/32_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/32_palette_map.bin b/tilesets/32_palette_map.bin
deleted file mode 100644
index e5d3715e4..000000000
--- a/tilesets/32_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/33_palette_map.asm b/tilesets/33_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/tilesets/33_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/33_palette_map.bin b/tilesets/33_palette_map.bin
deleted file mode 100644
index e5d3715e4..000000000
--- a/tilesets/33_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/34_palette_map.asm b/tilesets/34_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/tilesets/34_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/34_palette_map.bin b/tilesets/34_palette_map.bin
deleted file mode 100644
index e5d3715e4..000000000
--- a/tilesets/34_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/35_palette_map.asm b/tilesets/35_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/tilesets/35_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/35_palette_map.bin b/tilesets/35_palette_map.bin
deleted file mode 100644
index e5d3715e4..000000000
--- a/tilesets/35_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/36_palette_map.asm b/tilesets/36_palette_map.asm
new file mode 100644
index 000000000..5ebde24ba
--- /dev/null
+++ b/tilesets/36_palette_map.asm
@@ -0,0 +1,29 @@
+ tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, WATER, WATER, WATER, WATER, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, RED, RED, RED, GRAY, GRAY, GRAY
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW
+ tilepal 0, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN
+ tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN
+ tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+
+rept 16
+ db $ff
+endr
+
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
+ tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
diff --git a/tilesets/36_palette_map.bin b/tilesets/36_palette_map.bin
deleted file mode 100644
index e5d3715e4..000000000
--- a/tilesets/36_palette_map.bin
+++ /dev/null
Binary files differ
diff --git a/tilesets/palette_maps.asm b/tilesets/palette_maps.asm
index fc5867aad..7e19893d4 100644
--- a/tilesets/palette_maps.asm
+++ b/tilesets/palette_maps.asm
@@ -1,75 +1,75 @@
Tileset03PalMap: ; 0x4c075
-INCBIN "tilesets/03_palette_map.bin"
+INCLUDE "tilesets/03_palette_map.asm"
; 0x4c0e5
Tileset00PalMap: ; 0x4c0e5
Tileset01PalMap: ; 0x4c0e5
-INCBIN "tilesets/01_palette_map.bin"
+INCLUDE "tilesets/01_palette_map.asm"
; 0x4c155
Tileset02PalMap: ; 0x4c155
-INCBIN "tilesets/02_palette_map.bin"
+INCLUDE "tilesets/02_palette_map.asm"
; 0x4c1c5
Tileset05PalMap: ; 0x4c1c5
-INCBIN "tilesets/05_palette_map.bin"
+INCLUDE "tilesets/05_palette_map.asm"
; 0x4c235
Tileset06PalMap: ; 0x4c235
-INCBIN "tilesets/06_palette_map.bin"
+INCLUDE "tilesets/06_palette_map.asm"
; 0x4c2a5
Tileset07PalMap: ; 0x4c2a5
-INCBIN "tilesets/07_palette_map.bin"
+INCLUDE "tilesets/07_palette_map.asm"
; 0x4c315
Tileset08PalMap: ; 0x4c315
-INCBIN "tilesets/08_palette_map.bin"
+INCLUDE "tilesets/08_palette_map.asm"
; 0x4c385
Tileset09PalMap: ; 0x4c385
-INCBIN "tilesets/09_palette_map.bin"
+INCLUDE "tilesets/09_palette_map.asm"
; 0x4c3f5
Tileset10PalMap: ; 0x4c3f5
-INCBIN "tilesets/10_palette_map.bin"
+INCLUDE "tilesets/10_palette_map.asm"
; 0x4c465
Tileset11PalMap: ; 0x4c465
-INCBIN "tilesets/11_palette_map.bin"
+INCLUDE "tilesets/11_palette_map.asm"
; 0x4c4d5
Tileset12PalMap: ; 0x4c4d5
-INCBIN "tilesets/12_palette_map.bin"
+INCLUDE "tilesets/12_palette_map.asm"
; 0x4c545
Tileset13PalMap: ; 0x4c545
-INCBIN "tilesets/13_palette_map.bin"
+INCLUDE "tilesets/13_palette_map.asm"
; 0x4c5b5
Tileset14PalMap: ; 0x4c5b5
-INCBIN "tilesets/14_palette_map.bin"
+INCLUDE "tilesets/14_palette_map.asm"
; 0x4c625
Tileset15PalMap: ; 0x4c625
-INCBIN "tilesets/15_palette_map.bin"
+INCLUDE "tilesets/15_palette_map.asm"
; 0x4c695
Tileset16PalMap: ; 0x4c695
-INCBIN "tilesets/16_palette_map.bin"
+INCLUDE "tilesets/16_palette_map.asm"
; 0x4c705
Tileset23PalMap: ; 0x4c705
-INCBIN "tilesets/23_palette_map.bin"
+INCLUDE "tilesets/23_palette_map.asm"
; 0x4c775
Tileset24PalMap: ; 0x4c775
Tileset30PalMap: ; 0x4c775
-INCBIN "tilesets/30_palette_map.bin"
+INCLUDE "tilesets/30_palette_map.asm"
; 0x4c7e5
Tileset25PalMap: ; 0x4c7e5
-INCBIN "tilesets/25_palette_map.bin"
+INCLUDE "tilesets/25_palette_map.asm"
; 0x4c855
Tileset26PalMap: ; 0x4c855
@@ -78,31 +78,31 @@ Tileset33PalMap: ; 0x4c855
Tileset34PalMap: ; 0x4c855
Tileset35PalMap: ; 0x4c855
Tileset36PalMap: ; 0x4c855
-INCBIN "tilesets/36_palette_map.bin"
+INCLUDE "tilesets/36_palette_map.asm"
; 0x4c8c5
Tileset27PalMap: ; 0x4c8c5
-INCBIN "tilesets/27_palette_map.bin"
+INCLUDE "tilesets/27_palette_map.asm"
; 0x4c935
Tileset17PalMap: ; 0x4c935
-INCBIN "tilesets/17_palette_map.bin"
+INCLUDE "tilesets/17_palette_map.asm"
; 0x4c9a5
Tileset28PalMap: ; 0x4c9a5
-INCBIN "tilesets/28_palette_map.bin"
+INCLUDE "tilesets/28_palette_map.asm"
; 0x4ca15
Tileset18PalMap: ; 0x4ca15
-INCBIN "tilesets/18_palette_map.bin"
+INCLUDE "tilesets/18_palette_map.asm"
; 0x4ca85
Tileset19PalMap: ; 0x4ca85
-INCBIN "tilesets/19_palette_map.bin"
+INCLUDE "tilesets/19_palette_map.asm"
; 0x4caf5
Tileset20PalMap: ; 0x4caf5
-INCBIN "tilesets/20_palette_map.bin"
+INCLUDE "tilesets/20_palette_map.asm"
; 0x4cb65
UnusedPalMap1:
@@ -110,23 +110,23 @@ INCBIN "tilesets/unused_palette_map_1.bin"
; 4cbd5
Tileset29PalMap: ; 0x4cbd5
-INCBIN "tilesets/29_palette_map.bin"
+INCLUDE "tilesets/29_palette_map.asm"
; 0x4cc45
Tileset31PalMap: ; 0x4cc45
-INCBIN "tilesets/31_palette_map.bin"
+INCLUDE "tilesets/31_palette_map.asm"
; 0x4ccb5
Tileset21PalMap: ; 0x4ccb5
-INCBIN "tilesets/21_palette_map.bin"
+INCLUDE "tilesets/21_palette_map.asm"
; 0x4cd25
Tileset22PalMap: ; 0x4cd25
-INCBIN "tilesets/22_palette_map.bin"
+INCLUDE "tilesets/22_palette_map.asm"
; 0x4cd95
Tileset04PalMap: ; 0x4cd95
-INCBIN "tilesets/04_palette_map.bin"
+INCLUDE "tilesets/04_palette_map.asm"
; 0x4ce05
UnusedPalMap2: