diff --git a/data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/bg/header.c b/data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/bg/header.c
index 5831bd3bc8..cef28b6e8c 100644
--- a/data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/bg/header.c
+++ b/data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_chao_hunt_act_vs_zone_a_fg[];
+extern const ColorRaw Palette_zone_chao_hunt_act_vs_zone_a_fg[];
 const u8 Tiles_zone_chao_hunt_act_vs_zone_a_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_chao_hunt_act_vs_zone_a_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/header.c b/data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/header.c
index 0c8be417e1..7467ee4b82 100644
--- a/data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/header.c
+++ b/data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_chao_hunt_act_vs_zone_a_fg[] = INCBIN_U16("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_chao_hunt_act_vs_zone_a_fg[] = INCPAL("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_chao_hunt_act_vs_zone_a_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_chao_hunt_act_vs_zone_a_fg[] = INCBIN_S8("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_chao_hunt_act_vs_zone_a_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_a/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/bg/header.c b/data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/bg/header.c
index 9f0c5c0373..9604263950 100644
--- a/data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/bg/header.c
+++ b/data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_chao_hunt_act_vs_zone_b_fg[];
+extern const ColorRaw Palette_zone_chao_hunt_act_vs_zone_b_fg[];
 const u8 Tiles_zone_chao_hunt_act_vs_zone_b_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_chao_hunt_act_vs_zone_b_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/header.c b/data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/header.c
index 92caf83efe..dddf6836e2 100644
--- a/data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/header.c
+++ b/data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_chao_hunt_act_vs_zone_b_fg[] = INCBIN_U16("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_chao_hunt_act_vs_zone_b_fg[] = INCPAL("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_chao_hunt_act_vs_zone_b_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_chao_hunt_act_vs_zone_b_fg[] = INCBIN_S8("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_chao_hunt_act_vs_zone_b_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_b/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/bg/header.c b/data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/bg/header.c
index 1c2cd40cb2..cc96acfd4c 100644
--- a/data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/bg/header.c
+++ b/data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_chao_hunt_act_vs_zone_c_fg[];
+extern const ColorRaw Palette_zone_chao_hunt_act_vs_zone_c_fg[];
 const u8 Tiles_zone_chao_hunt_act_vs_zone_c_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_chao_hunt_act_vs_zone_c_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/header.c b/data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/header.c
index 4fc1ed5b46..6efc1da2f1 100644
--- a/data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/header.c
+++ b/data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_chao_hunt_act_vs_zone_c_fg[] = INCBIN_U16("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_chao_hunt_act_vs_zone_c_fg[] = INCPAL("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_chao_hunt_act_vs_zone_c_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_chao_hunt_act_vs_zone_c_fg[] = INCBIN_S8("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_chao_hunt_act_vs_zone_c_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_c/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/bg/header.c b/data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/bg/header.c
index 59b54729b5..a25e99a198 100644
--- a/data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/bg/header.c
+++ b/data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_chao_hunt_act_vs_zone_d_fg[];
+extern const ColorRaw Palette_zone_chao_hunt_act_vs_zone_d_fg[];
 const u8 Tiles_zone_chao_hunt_act_vs_zone_d_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_chao_hunt_act_vs_zone_d_bg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/header.c b/data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/header.c
index f49e78c48e..b498c9083f 100644
--- a/data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/header.c
+++ b/data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_chao_hunt_act_vs_zone_d_fg[] = INCBIN_U16("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_chao_hunt_act_vs_zone_d_fg[] = INCPAL("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_chao_hunt_act_vs_zone_d_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_chao_hunt_act_vs_zone_d_fg[] = INCBIN_S8("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_chao_hunt_act_vs_zone_d_fg[] = INCBIN_U8("data/sa1/maps/chao_hunt/vs_zone_d/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_1/act_1/tilemaps/bg/header.c b/data/sa1/maps/zone_1/act_1/tilemaps/bg/header.c
index 9bb3f046b1..f6c1c07e45 100644
--- a/data/sa1/maps/zone_1/act_1/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_1/act_1/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_1_act_1_fg[];
+extern const ColorRaw Palette_zone_1_act_1_fg[];
 const u8 Tiles_zone_1_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_1/act_1/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_1_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_1/act_1/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_1/act_1/tilemaps/fg/header.c b/data/sa1/maps/zone_1/act_1/tilemaps/fg/header.c
index fd8318e405..a4898e7de9 100644
--- a/data/sa1/maps/zone_1/act_1/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_1/act_1/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_1_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_1/act_1/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_1_act_1_fg[] = INCPAL("data/sa1/maps/zone_1/act_1/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_1_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_1/act_1/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_1_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_1/act_1/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_1_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_1/act_1/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_1/act_2/tilemaps/bg/header.c b/data/sa1/maps/zone_1/act_2/tilemaps/bg/header.c
index 60163beb64..54208e6715 100644
--- a/data/sa1/maps/zone_1/act_2/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_1/act_2/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_1_act_2_fg[];
+extern const ColorRaw Palette_zone_1_act_2_fg[];
 const u8 Tiles_zone_1_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_1/act_2/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_1_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_1/act_2/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_1/act_2/tilemaps/fg/header.c b/data/sa1/maps/zone_1/act_2/tilemaps/fg/header.c
index 5627bf6e65..5ef6cb7b58 100644
--- a/data/sa1/maps/zone_1/act_2/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_1/act_2/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_1_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_1/act_2/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_1_act_2_fg[] = INCPAL("data/sa1/maps/zone_1/act_2/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_1_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_1/act_2/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_1_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_1/act_2/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_1_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_1/act_2/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_2/act_1/tilemaps/bg/header.c b/data/sa1/maps/zone_2/act_1/tilemaps/bg/header.c
index 107f470ca0..f74af93ae1 100644
--- a/data/sa1/maps/zone_2/act_1/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_2/act_1/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_2_act_1_fg[];
+extern const ColorRaw Palette_zone_2_act_1_fg[];
 const u8 Tiles_zone_2_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_2/act_1/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_2_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_2/act_1/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_2/act_1/tilemaps/fg/header.c b/data/sa1/maps/zone_2/act_1/tilemaps/fg/header.c
index d0885f63ba..8c1333fe6c 100644
--- a/data/sa1/maps/zone_2/act_1/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_2/act_1/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_2_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_2/act_1/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_2_act_1_fg[] = INCPAL("data/sa1/maps/zone_2/act_1/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_2_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_2/act_1/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_2_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_2/act_1/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_2_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_2/act_1/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_2/act_2/tilemaps/bg/header.c b/data/sa1/maps/zone_2/act_2/tilemaps/bg/header.c
index 8cd04e15af..78d1f4a7f4 100644
--- a/data/sa1/maps/zone_2/act_2/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_2/act_2/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_2_act_2_fg[];
+extern const ColorRaw Palette_zone_2_act_2_fg[];
 const u8 Tiles_zone_2_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_2/act_2/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_2_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_2/act_2/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_2/act_2/tilemaps/fg/header.c b/data/sa1/maps/zone_2/act_2/tilemaps/fg/header.c
index 8c8f6721be..4180602ff4 100644
--- a/data/sa1/maps/zone_2/act_2/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_2/act_2/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_2_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_2/act_2/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_2_act_2_fg[] = INCPAL("data/sa1/maps/zone_2/act_2/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_2_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_2/act_2/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_2_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_2/act_2/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_2_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_2/act_2/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_3/act_1/tilemaps/bg/header.c b/data/sa1/maps/zone_3/act_1/tilemaps/bg/header.c
index 75b8c4fd97..4493960119 100644
--- a/data/sa1/maps/zone_3/act_1/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_3/act_1/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_3_act_1_fg[];
+extern const ColorRaw Palette_zone_3_act_1_fg[];
 const u8 Tiles_zone_3_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_3/act_1/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_3_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_3/act_1/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_3/act_1/tilemaps/fg/header.c b/data/sa1/maps/zone_3/act_1/tilemaps/fg/header.c
index 69a14dc6eb..8af5c76b2f 100644
--- a/data/sa1/maps/zone_3/act_1/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_3/act_1/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_3_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_3/act_1/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_3_act_1_fg[] = INCPAL("data/sa1/maps/zone_3/act_1/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_3_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_3/act_1/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_3_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_3/act_1/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_3_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_3/act_1/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_3/act_2/tilemaps/bg/header.c b/data/sa1/maps/zone_3/act_2/tilemaps/bg/header.c
index ad55c830fd..944e78a25d 100644
--- a/data/sa1/maps/zone_3/act_2/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_3/act_2/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_3_act_2_fg[];
+extern const ColorRaw Palette_zone_3_act_2_fg[];
 const u8 Tiles_zone_3_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_3/act_2/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_3_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_3/act_2/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_3/act_2/tilemaps/fg/header.c b/data/sa1/maps/zone_3/act_2/tilemaps/fg/header.c
index 572077f2db..9dfc534f33 100644
--- a/data/sa1/maps/zone_3/act_2/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_3/act_2/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_3_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_3/act_2/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_3_act_2_fg[] = INCPAL("data/sa1/maps/zone_3/act_2/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_3_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_3/act_2/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_3_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_3/act_2/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_3_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_3/act_2/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_4/act_1/tilemaps/bg/header.c b/data/sa1/maps/zone_4/act_1/tilemaps/bg/header.c
index 1e93e61a46..331b466483 100644
--- a/data/sa1/maps/zone_4/act_1/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_4/act_1/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_4_act_1_fg[];
+extern const ColorRaw Palette_zone_4_act_1_fg[];
 const u8 Tiles_zone_4_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_4/act_1/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_4_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_4/act_1/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_4/act_1/tilemaps/fg/header.c b/data/sa1/maps/zone_4/act_1/tilemaps/fg/header.c
index 14319a0227..087becc08b 100644
--- a/data/sa1/maps/zone_4/act_1/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_4/act_1/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_4_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_4/act_1/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_4_act_1_fg[] = INCPAL("data/sa1/maps/zone_4/act_1/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_4_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_4/act_1/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_4_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_4/act_1/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_4_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_4/act_1/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_4/act_2/tilemaps/bg/header.c b/data/sa1/maps/zone_4/act_2/tilemaps/bg/header.c
index 8c85b814a6..80b74c0dfc 100644
--- a/data/sa1/maps/zone_4/act_2/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_4/act_2/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_4_act_2_fg[];
+extern const ColorRaw Palette_zone_4_act_2_fg[];
 const u8 Tiles_zone_4_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_4/act_2/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_4_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_4/act_2/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_4/act_2/tilemaps/fg/header.c b/data/sa1/maps/zone_4/act_2/tilemaps/fg/header.c
index 5699568420..5b1ee5e746 100644
--- a/data/sa1/maps/zone_4/act_2/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_4/act_2/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_4_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_4/act_2/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_4_act_2_fg[] = INCPAL("data/sa1/maps/zone_4/act_2/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_4_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_4/act_2/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_4_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_4/act_2/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_4_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_4/act_2/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_5/act_1/tilemaps/bg/header.c b/data/sa1/maps/zone_5/act_1/tilemaps/bg/header.c
index ef1379a470..e177657673 100644
--- a/data/sa1/maps/zone_5/act_1/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_5/act_1/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_5_act_1_fg[];
+extern const ColorRaw Palette_zone_5_act_1_fg[];
 const u8 Tiles_zone_5_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_5/act_1/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_5_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_5/act_1/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_5/act_1/tilemaps/fg/header.c b/data/sa1/maps/zone_5/act_1/tilemaps/fg/header.c
index b96266884c..b451dd5214 100644
--- a/data/sa1/maps/zone_5/act_1/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_5/act_1/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_5_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_5/act_1/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_5_act_1_fg[] = INCPAL("data/sa1/maps/zone_5/act_1/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_5_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_5/act_1/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_5_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_5/act_1/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_5_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_5/act_1/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_5/act_2/tilemaps/bg/header.c b/data/sa1/maps/zone_5/act_2/tilemaps/bg/header.c
index 1728772591..67370c6b0b 100644
--- a/data/sa1/maps/zone_5/act_2/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_5/act_2/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_5_act_2_fg[];
+extern const ColorRaw Palette_zone_5_act_2_fg[];
 const u8 Tiles_zone_5_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_5/act_2/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_5_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_5/act_2/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_5/act_2/tilemaps/fg/header.c b/data/sa1/maps/zone_5/act_2/tilemaps/fg/header.c
index 38366bd113..14ce431f2f 100644
--- a/data/sa1/maps/zone_5/act_2/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_5/act_2/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_5_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_5/act_2/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_5_act_2_fg[] = INCPAL("data/sa1/maps/zone_5/act_2/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_5_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_5/act_2/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_5_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_5/act_2/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_5_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_5/act_2/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_6/act_1/tilemaps/bg/header.c b/data/sa1/maps/zone_6/act_1/tilemaps/bg/header.c
index 70a230ac04..6461c98873 100644
--- a/data/sa1/maps/zone_6/act_1/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_6/act_1/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_6_act_1_fg[];
+extern const ColorRaw Palette_zone_6_act_1_fg[];
 const u8 Tiles_zone_6_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_6/act_1/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_6_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_6/act_1/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_6/act_1/tilemaps/fg/header.c b/data/sa1/maps/zone_6/act_1/tilemaps/fg/header.c
index 2a997103ae..e30acd483d 100644
--- a/data/sa1/maps/zone_6/act_1/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_6/act_1/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_6_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_6/act_1/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_6_act_1_fg[] = INCPAL("data/sa1/maps/zone_6/act_1/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_6_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_6/act_1/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_6_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_6/act_1/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_6_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_6/act_1/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_6/act_2/tilemaps/bg/header.c b/data/sa1/maps/zone_6/act_2/tilemaps/bg/header.c
index 0223596476..94798e047a 100644
--- a/data/sa1/maps/zone_6/act_2/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_6/act_2/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_6_act_2_fg[];
+extern const ColorRaw Palette_zone_6_act_2_fg[];
 const u8 Tiles_zone_6_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_6/act_2/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_6_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_6/act_2/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_6/act_2/tilemaps/fg/header.c b/data/sa1/maps/zone_6/act_2/tilemaps/fg/header.c
index 33e8174091..77b59fef67 100644
--- a/data/sa1/maps/zone_6/act_2/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_6/act_2/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_6_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_6/act_2/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_6_act_2_fg[] = INCPAL("data/sa1/maps/zone_6/act_2/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_6_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_6/act_2/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_6_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_6/act_2/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_6_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_6/act_2/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_7/act_1/tilemaps/bg/header.c b/data/sa1/maps/zone_7/act_1/tilemaps/bg/header.c
index 04a0a31238..2d90080ab7 100644
--- a/data/sa1/maps/zone_7/act_1/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_7/act_1/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_7_act_1_fg[];
+extern const ColorRaw Palette_zone_7_act_1_fg[];
 const u8 Tiles_zone_7_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_7/act_1/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_7_act_1_bg[] = INCBIN_U8("data/sa1/maps/zone_7/act_1/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_7/act_1/tilemaps/fg/header.c b/data/sa1/maps/zone_7/act_1/tilemaps/fg/header.c
index c2cfa94fa0..b0092d7060 100644
--- a/data/sa1/maps/zone_7/act_1/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_7/act_1/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_7_act_1_fg[] = INCBIN_U16("data/sa1/maps/zone_7/act_1/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_7_act_1_fg[] = INCPAL("data/sa1/maps/zone_7/act_1/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_7_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_7/act_1/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_7_act_1_fg[] = INCBIN_S8("data/sa1/maps/zone_7/act_1/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_7_act_1_fg[] = INCBIN_U8("data/sa1/maps/zone_7/act_1/tilemaps/fg/tile_rot.coll");
diff --git a/data/sa1/maps/zone_7/act_2/tilemaps/bg/header.c b/data/sa1/maps/zone_7/act_2/tilemaps/bg/header.c
index 5b6c2288ad..5009b8feeb 100644
--- a/data/sa1/maps/zone_7/act_2/tilemaps/bg/header.c
+++ b/data/sa1/maps/zone_7/act_2/tilemaps/bg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-extern const u16 Palette_zone_7_act_2_fg[];
+extern const ColorRaw Palette_zone_7_act_2_fg[];
 const u8 Tiles_zone_7_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_7/act_2/tilemaps/bg/tiles.4bpp");
 const u8 Tilemap_zone_7_act_2_bg[] = INCBIN_U8("data/sa1/maps/zone_7/act_2/tilemaps/bg/tilemap.tilemap2");
 
diff --git a/data/sa1/maps/zone_7/act_2/tilemaps/fg/header.c b/data/sa1/maps/zone_7/act_2/tilemaps/fg/header.c
index 3725c35864..46261fa9ba 100644
--- a/data/sa1/maps/zone_7/act_2/tilemaps/fg/header.c
+++ b/data/sa1/maps/zone_7/act_2/tilemaps/fg/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_zone_7_act_2_fg[] = INCBIN_U16("data/sa1/maps/zone_7/act_2/tilemaps/fg/palette.gbapal");
+const ColorRaw Palette_zone_7_act_2_fg[] = INCPAL("data/sa1/maps/zone_7/act_2/tilemaps/fg/palette.pal");
 const u8 Tileset_zone_7_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_7/act_2/tilemaps/fg/tileset.4bpp");
 const s8 CollHeightMap_zone_7_act_2_fg[] = INCBIN_S8("data/sa1/maps/zone_7/act_2/tilemaps/fg/height_map.coll");
 const u8 CollTileRot_zone_7_act_2_fg[] = INCBIN_U8("data/sa1/maps/zone_7/act_2/tilemaps/fg/tile_rot.coll");
diff --git a/graphics/sa1/tilemaps/egg_rocket_clouds/header.c b/graphics/sa1/tilemaps/egg_rocket_clouds/header.c
index d6d6236d77..edc183b976 100644
--- a/graphics/sa1/tilemaps/egg_rocket_clouds/header.c
+++ b/graphics/sa1/tilemaps/egg_rocket_clouds/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_egg_rocket_clouds[] = INCBIN_U16("graphics/sa1/tilemaps/egg_rocket_clouds/palette.gbapal");
+const ColorRaw Palette_egg_rocket_clouds[] = INCPAL("graphics/sa1/tilemaps/egg_rocket_clouds/palette.pal");
 const u8 Tiles_egg_rocket_clouds[] = INCBIN_U8("graphics/sa1/tilemaps/egg_rocket_clouds/tiles.4bpp");
 const u8 Tilemap_egg_rocket_clouds[] = INCBIN_U8("graphics/sa1/tilemaps/egg_rocket_clouds/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/ice_paradise_snow/header.c b/graphics/sa1/tilemaps/ice_paradise_snow/header.c
index 7ffd63b466..7ab57811fc 100644
--- a/graphics/sa1/tilemaps/ice_paradise_snow/header.c
+++ b/graphics/sa1/tilemaps/ice_paradise_snow/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_ice_paradise_snow[] = INCBIN_U16("graphics/sa1/tilemaps/ice_paradise_snow/palette.gbapal");
+const ColorRaw Palette_ice_paradise_snow[] = INCPAL("graphics/sa1/tilemaps/ice_paradise_snow/palette.pal");
 const u8 Tiles_ice_paradise_snow[] = INCBIN_U8("graphics/sa1/tilemaps/ice_paradise_snow/tiles.4bpp");
 const u8 Tilemap_ice_paradise_snow[] = INCBIN_U8("graphics/sa1/tilemaps/ice_paradise_snow/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/intro_created_by_sonic_team/header.c b/graphics/sa1/tilemaps/intro_created_by_sonic_team/header.c
index b52d103b99..b1a6e598f2 100644
--- a/graphics/sa1/tilemaps/intro_created_by_sonic_team/header.c
+++ b/graphics/sa1/tilemaps/intro_created_by_sonic_team/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_intro_created_by_sonic_team[] = INCBIN_U16("graphics/sa1/tilemaps/intro_created_by_sonic_team/palette.gbapal");
+const ColorRaw Palette_intro_created_by_sonic_team[] = INCPAL("graphics/sa1/tilemaps/intro_created_by_sonic_team/palette.pal");
 const u8 Tiles_intro_created_by_sonic_team[] = INCBIN_U8("graphics/sa1/tilemaps/intro_created_by_sonic_team/tiles.4bpp");
 const u8 Tilemap_intro_created_by_sonic_team[] = INCBIN_U8("graphics/sa1/tilemaps/intro_created_by_sonic_team/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/intro_presented_by_sega/header.c b/graphics/sa1/tilemaps/intro_presented_by_sega/header.c
index 85ee772052..23a605f2ae 100644
--- a/graphics/sa1/tilemaps/intro_presented_by_sega/header.c
+++ b/graphics/sa1/tilemaps/intro_presented_by_sega/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_intro_presented_by_sega[] = INCBIN_U16("graphics/sa1/tilemaps/intro_presented_by_sega/palette.gbapal");
+const ColorRaw Palette_intro_presented_by_sega[] = INCPAL("graphics/sa1/tilemaps/intro_presented_by_sega/palette.pal");
 const u8 Tiles_intro_presented_by_sega[] = INCBIN_U8("graphics/sa1/tilemaps/intro_presented_by_sega/tiles.4bpp");
 const u8 Tilemap_intro_presented_by_sega[] = INCBIN_U8("graphics/sa1/tilemaps/intro_presented_by_sega/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/mp_choose_pak_type_en/header.c b/graphics/sa1/tilemaps/mp_choose_pak_type_en/header.c
index b779abd73a..97a81b3252 100644
--- a/graphics/sa1/tilemaps/mp_choose_pak_type_en/header.c
+++ b/graphics/sa1/tilemaps/mp_choose_pak_type_en/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_choose_pak_type_en[] = INCBIN_U16("graphics/sa1/tilemaps/mp_choose_pak_type_en/palette.gbapal");
+const ColorRaw Palette_mp_choose_pak_type_en[] = INCPAL("graphics/sa1/tilemaps/mp_choose_pak_type_en/palette.pal");
 const u8 Tiles_mp_choose_pak_type_en[] = INCBIN_U8("graphics/sa1/tilemaps/mp_choose_pak_type_en/tiles.4bpp");
 const u8 Tilemap_mp_choose_pak_type_en[] = INCBIN_U8("graphics/sa1/tilemaps/mp_choose_pak_type_en/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/mp_choose_pak_type_jp/header.c b/graphics/sa1/tilemaps/mp_choose_pak_type_jp/header.c
index 32712fb406..6c9ce9875e 100644
--- a/graphics/sa1/tilemaps/mp_choose_pak_type_jp/header.c
+++ b/graphics/sa1/tilemaps/mp_choose_pak_type_jp/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_choose_pak_type_jp[] = INCBIN_U16("graphics/sa1/tilemaps/mp_choose_pak_type_jp/palette.gbapal");
+const ColorRaw Palette_mp_choose_pak_type_jp[] = INCPAL("graphics/sa1/tilemaps/mp_choose_pak_type_jp/palette.pal");
 const u8 Tiles_mp_choose_pak_type_jp[] = INCBIN_U8("graphics/sa1/tilemaps/mp_choose_pak_type_jp/tiles.4bpp");
 const u8 Tilemap_mp_choose_pak_type_jp[] = INCBIN_U8("graphics/sa1/tilemaps/mp_choose_pak_type_jp/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/mp_connection_error/header.c b/graphics/sa1/tilemaps/mp_connection_error/header.c
index 3daac2ef3a..efef7322a2 100644
--- a/graphics/sa1/tilemaps/mp_connection_error/header.c
+++ b/graphics/sa1/tilemaps/mp_connection_error/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_connection_error[] = INCBIN_U16("graphics/sa1/tilemaps/mp_connection_error/palette.gbapal");
+const ColorRaw Palette_mp_connection_error[] = INCPAL("graphics/sa1/tilemaps/mp_connection_error/palette.pal");
 const u8 Tiles_mp_connection_error[] = INCBIN_U8("graphics/sa1/tilemaps/mp_connection_error/tiles.4bpp");
 const u8 Tilemap_mp_connection_error[] = INCBIN_U8("graphics/sa1/tilemaps/mp_connection_error/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/mp_connection_success/header.c b/graphics/sa1/tilemaps/mp_connection_success/header.c
index fe052a7474..130bfd29d5 100644
--- a/graphics/sa1/tilemaps/mp_connection_success/header.c
+++ b/graphics/sa1/tilemaps/mp_connection_success/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_connection_success[] = INCBIN_U16("graphics/sa1/tilemaps/mp_connection_success/palette.gbapal");
+const ColorRaw Palette_mp_connection_success[] = INCPAL("graphics/sa1/tilemaps/mp_connection_success/palette.pal");
 const u8 Tiles_mp_connection_success[] = INCBIN_U8("graphics/sa1/tilemaps/mp_connection_success/tiles.4bpp");
 const u8 Tilemap_mp_connection_success[] = INCBIN_U8("graphics/sa1/tilemaps/mp_connection_success/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/mp_continue_screen/header.c b/graphics/sa1/tilemaps/mp_continue_screen/header.c
index 442fa26af7..97886370cd 100644
--- a/graphics/sa1/tilemaps/mp_continue_screen/header.c
+++ b/graphics/sa1/tilemaps/mp_continue_screen/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_continue_screen[] = INCBIN_U16("graphics/sa1/tilemaps/mp_continue_screen/palette.gbapal");
+const ColorRaw Palette_mp_continue_screen[] = INCPAL("graphics/sa1/tilemaps/mp_continue_screen/palette.pal");
 const u8 Tiles_mp_continue_screen[] = INCBIN_U8("graphics/sa1/tilemaps/mp_continue_screen/tiles.4bpp");
 const u8 Tilemap_mp_continue_screen[] = INCBIN_U8("graphics/sa1/tilemaps/mp_continue_screen/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/mp_multipak_player_overview/header.c b/graphics/sa1/tilemaps/mp_multipak_player_overview/header.c
index ff1eca2f3d..a38619f70c 100644
--- a/graphics/sa1/tilemaps/mp_multipak_player_overview/header.c
+++ b/graphics/sa1/tilemaps/mp_multipak_player_overview/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_multipak_player_overview[] = INCBIN_U16("graphics/sa1/tilemaps/mp_multipak_player_overview/palette.gbapal");
+const ColorRaw Palette_mp_multipak_player_overview[] = INCPAL("graphics/sa1/tilemaps/mp_multipak_player_overview/palette.pal");
 const u8 Tiles_mp_multipak_player_overview[] = INCBIN_U8("graphics/sa1/tilemaps/mp_multipak_player_overview/tiles.4bpp");
 const u8 Tilemap_mp_multipak_player_overview[] = INCBIN_U8("graphics/sa1/tilemaps/mp_multipak_player_overview/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/mp_singlepak_program_is_being_sent/header.c b/graphics/sa1/tilemaps/mp_singlepak_program_is_being_sent/header.c
index eeae0e25c9..c0c025d615 100644
--- a/graphics/sa1/tilemaps/mp_singlepak_program_is_being_sent/header.c
+++ b/graphics/sa1/tilemaps/mp_singlepak_program_is_being_sent/header.c
@@ -1,8 +1,8 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_singlepak_program_is_being_sent[]
-    = INCBIN_U16("graphics/sa1/tilemaps/mp_singlepak_program_is_being_sent/palette.gbapal");
+const ColorRaw Palette_mp_singlepak_program_is_being_sent[]
+    = INCPAL("graphics/sa1/tilemaps/mp_singlepak_program_is_being_sent/palette.pal");
 const u8 Tiles_mp_singlepak_program_is_being_sent[] = INCBIN_U8("graphics/sa1/tilemaps/mp_singlepak_program_is_being_sent/tiles.4bpp");
 const u8 Tilemap_mp_singlepak_program_is_being_sent[]
     = INCBIN_U8("graphics/sa1/tilemaps/mp_singlepak_program_is_being_sent/tilemap.tilemap2");
diff --git a/graphics/sa1/tilemaps/mp_team_play_screen/header.c b/graphics/sa1/tilemaps/mp_team_play_screen/header.c
index 47c93c4be5..0d0d16d84d 100644
--- a/graphics/sa1/tilemaps/mp_team_play_screen/header.c
+++ b/graphics/sa1/tilemaps/mp_team_play_screen/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_team_play_screen[] = INCBIN_U16("graphics/sa1/tilemaps/mp_team_play_screen/palette.gbapal");
+const ColorRaw Palette_mp_team_play_screen[] = INCPAL("graphics/sa1/tilemaps/mp_team_play_screen/palette.pal");
 const u8 Tiles_mp_team_play_screen[] = INCBIN_U8("graphics/sa1/tilemaps/mp_team_play_screen/tiles.4bpp");
 const u8 Tilemap_mp_team_play_screen[] = INCBIN_U8("graphics/sa1/tilemaps/mp_team_play_screen/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/mp_vs_background/header.c b/graphics/sa1/tilemaps/mp_vs_background/header.c
index 11e48ff596..464409ef9a 100644
--- a/graphics/sa1/tilemaps/mp_vs_background/header.c
+++ b/graphics/sa1/tilemaps/mp_vs_background/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_mp_vs_background[] = INCBIN_U16("graphics/sa1/tilemaps/mp_vs_background/palette.gbapal");
+const ColorRaw Palette_mp_vs_background[] = INCPAL("graphics/sa1/tilemaps/mp_vs_background/palette.pal");
 const u8 Tiles_mp_vs_background[] = INCBIN_U8("graphics/sa1/tilemaps/mp_vs_background/tiles.4bpp");
 const u8 Tilemap_mp_vs_background[] = INCBIN_U8("graphics/sa1/tilemaps/mp_vs_background/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/special_stage/header.c b/graphics/sa1/tilemaps/special_stage/header.c
index 94e0345376..e5bf0c5cd6 100644
--- a/graphics/sa1/tilemaps/special_stage/header.c
+++ b/graphics/sa1/tilemaps/special_stage/header.c
@@ -1,71 +1,71 @@
 #include "global.h"
 #include "core.h"
 
-u16 Palette_tilemap_54[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage/palette.gbapal");
+ColorRaw Palette_tilemap_54[] = INCPAL("graphics/sa1/tilemaps/special_stage/palette.pal");
 u8 Tiles_tilemap_54[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage/tiles.4bpp");
 u8 Tilemap_tilemap_54[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_0[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_0/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_0[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_0/palette.pal");
 u8 Tiles_special_stage_bg_frame_0[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_0/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_0[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_0/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_1[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_1/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_1[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_1/palette.pal");
 u8 Tiles_special_stage_bg_frame_1[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_1/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_1[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_1/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_2[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_2/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_2[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_2/palette.pal");
 u8 Tiles_special_stage_bg_frame_2[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_2/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_2[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_2/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_3[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_3/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_3[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_3/palette.pal");
 u8 Tiles_special_stage_bg_frame_3[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_3/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_3[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_3/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_4[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_4/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_4[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_4/palette.pal");
 u8 Tiles_special_stage_bg_frame_4[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_4/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_4[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_4/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_5[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_5/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_5[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_5/palette.pal");
 u8 Tiles_special_stage_bg_frame_5[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_5/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_5[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_5/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_6[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_6/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_6[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_6/palette.pal");
 u8 Tiles_special_stage_bg_frame_6[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_6/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_6[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_6/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_7[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_7/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_7[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_7/palette.pal");
 u8 Tiles_special_stage_bg_frame_7[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_7/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_7[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_7/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_8[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_8/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_8[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_8/palette.pal");
 u8 Tiles_special_stage_bg_frame_8[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_8/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_8[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_8/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_9[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_9/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_9[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_9/palette.pal");
 u8 Tiles_special_stage_bg_frame_9[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_9/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_9[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_9/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_10[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_10/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_10[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_10/palette.pal");
 u8 Tiles_special_stage_bg_frame_10[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_10/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_10[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_10/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_11[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_11/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_11[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_11/palette.pal");
 u8 Tiles_special_stage_bg_frame_11[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_11/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_11[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_11/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_12[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_12/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_12[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_12/palette.pal");
 u8 Tiles_special_stage_bg_frame_12[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_12/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_12[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_12/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_13[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_13/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_13[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_13/palette.pal");
 u8 Tiles_special_stage_bg_frame_13[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_13/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_13[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_13/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_14[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_14/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_14[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_14/palette.pal");
 u8 Tiles_special_stage_bg_frame_14[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_14/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_14[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_14/tilemap.tilemap2");
 
-u16 Palette_special_stage_bg_frame_15[] = INCBIN_U16("graphics/sa1/tilemaps/special_stage_bg_frame_15/palette.gbapal");
+ColorRaw Palette_special_stage_bg_frame_15[] = INCPAL("graphics/sa1/tilemaps/special_stage_bg_frame_15/palette.pal");
 u8 Tiles_special_stage_bg_frame_15[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_15/tiles.4bpp");
 u8 Tilemap_special_stage_bg_frame_15[] = INCBIN_U8("graphics/sa1/tilemaps/special_stage_bg_frame_15/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/tilemap_73/header.c b/graphics/sa1/tilemaps/tilemap_73/header.c
index 79c00d79a7..f6ca6aa1d4 100644
--- a/graphics/sa1/tilemaps/tilemap_73/header.c
+++ b/graphics/sa1/tilemaps/tilemap_73/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_73[] = {
+const ColorRaw Palette_tilemap_73[] = {
     0x8340, 0,      0x9000, 0x2000, 0x421,  0x8c20, 0x2800, 0x1c20, 0x3000, 0xb000, 0xac20, 0x9c40, 0x8842, 0x3802, 0x3022, 0xac40,
     0xb820, 0xb802, 0xb440, 0x65,   0x3423, 0x3860, 0x2082, 0xb061, 0x1084, 0x3c60, 0x3844, 0xe1,   0x4460, 0x3046, 0xaca0, 0x4860,
     0xca6,  0xac83, 0x9ca3, 0xd060, 0x94a5, 0xbc81, 0xd460, 0xb865, 0x14,   0xd860, 0x2c88, 0xc0c0, 0xc8a1, 0x98c6, 0x5c80, 0x15,
diff --git a/graphics/sa1/tilemaps/tilemap_74/header.c b/graphics/sa1/tilemaps/tilemap_74/header.c
index bc3c2cf814..64d076ac05 100644
--- a/graphics/sa1/tilemaps/tilemap_74/header.c
+++ b/graphics/sa1/tilemaps/tilemap_74/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_74[] = {
+const ColorRaw Palette_tilemap_74[] = {
     0x8340, 0,      0x9000, 0x2000, 0x421,  0x8c20, 0x2800, 0x1c20, 0x3000, 0xb000, 0xac20, 0x9c40, 0x8842, 0x3802, 0x3022, 0xac40,
     0xb820, 0xb802, 0xb440, 0x65,   0x3423, 0x3860, 0x2082, 0xb061, 0x1084, 0x3c60, 0x3844, 0xe1,   0x4460, 0x3046, 0xaca0, 0x4860,
     0xca6,  0xac83, 0x9ca3, 0xd060, 0x94a5, 0xbc81, 0xd460, 0xb865, 0x14,   0xd860, 0x2c88, 0xc0c0, 0xc8a1, 0x98c6, 0x5c80, 0x15,
diff --git a/graphics/sa1/tilemaps/tilemap_75/header.c b/graphics/sa1/tilemaps/tilemap_75/header.c
index 8183f39787..c207871782 100644
--- a/graphics/sa1/tilemaps/tilemap_75/header.c
+++ b/graphics/sa1/tilemaps/tilemap_75/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_75[] = {
+const ColorRaw Palette_tilemap_75[] = {
     0x8340, 0,      0x9000, 0x2000, 0x421,  0x8c20, 0x2800, 0x1c20, 0x3000, 0xb000, 0xac20, 0x9c40, 0x8842, 0x3802, 0x3022, 0xac40,
     0xb820, 0xb802, 0xb440, 0x65,   0x3423, 0x3860, 0x2082, 0xb061, 0x1084, 0x3c60, 0x3844, 0xe1,   0x4460, 0x3046, 0xaca0, 0x4860,
     0xca6,  0xac83, 0x9ca3, 0xd060, 0x94a5, 0xbc81, 0xd460, 0xb865, 0x14,   0xd860, 0x2c88, 0xc0c0, 0xc8a1, 0x98c6, 0x5c80, 0x15,
diff --git a/graphics/sa1/tilemaps/tilemap_84/header.c b/graphics/sa1/tilemaps/tilemap_84/header.c
index b916ba1fba..f7f1b9636b 100644
--- a/graphics/sa1/tilemaps/tilemap_84/header.c
+++ b/graphics/sa1/tilemaps/tilemap_84/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_84[] = INCBIN_U16("graphics/sa1/tilemaps/tilemap_84/palette.gbapal");
+const ColorRaw Palette_tilemap_84[] = INCPAL("graphics/sa1/tilemaps/tilemap_84/palette.pal");
 const u8 Tiles_tilemap_84[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_84/tiles.4bpp");
 const u8 Tilemap_tilemap_84[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_84/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/tilemap_85/header.c b/graphics/sa1/tilemaps/tilemap_85/header.c
index ac8580a5af..e4f4ac6d31 100644
--- a/graphics/sa1/tilemaps/tilemap_85/header.c
+++ b/graphics/sa1/tilemaps/tilemap_85/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_85[] = INCBIN_U16("graphics/sa1/tilemaps/tilemap_85/palette.gbapal");
+const ColorRaw Palette_tilemap_85[] = INCPAL("graphics/sa1/tilemaps/tilemap_85/palette.pal");
 const u8 Tiles_tilemap_85[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_85/tiles.4bpp");
 const u8 Tilemap_tilemap_85[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_85/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/tilemap_89/header.c b/graphics/sa1/tilemaps/tilemap_89/header.c
index e5df91d0ab..afaa940ea4 100644
--- a/graphics/sa1/tilemaps/tilemap_89/header.c
+++ b/graphics/sa1/tilemaps/tilemap_89/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_89[] = INCBIN_U16("graphics/sa1/tilemaps/tilemap_89/palette.gbapal");
+const ColorRaw Palette_tilemap_89[] = INCPAL("graphics/sa1/tilemaps/tilemap_89/palette.pal");
 const u8 Tiles_tilemap_89[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_89/tiles.4bpp");
 const u8 Tilemap_tilemap_89[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_89/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/tilemap_unused_mp_1/header.c b/graphics/sa1/tilemaps/tilemap_unused_mp_1/header.c
index 4e0db86e75..dfa1c3bbdd 100644
--- a/graphics/sa1/tilemaps/tilemap_unused_mp_1/header.c
+++ b/graphics/sa1/tilemaps/tilemap_unused_mp_1/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_unused_mp_1[] = INCBIN_U16("graphics/sa1/tilemaps/tilemap_unused_mp_1/palette.gbapal");
+const ColorRaw Palette_tilemap_unused_mp_1[] = INCPAL("graphics/sa1/tilemaps/tilemap_unused_mp_1/palette.pal");
 const u8 Tiles_tilemap_unused_mp_1[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_unused_mp_1/tiles.4bpp");
 const u8 Tilemap_tilemap_unused_mp_1[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_unused_mp_1/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/tilemap_unused_mp_2/header.c b/graphics/sa1/tilemaps/tilemap_unused_mp_2/header.c
index c1a2e7ff1f..937f94cc5c 100644
--- a/graphics/sa1/tilemaps/tilemap_unused_mp_2/header.c
+++ b/graphics/sa1/tilemaps/tilemap_unused_mp_2/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_unused_mp_2[] = INCBIN_U16("graphics/sa1/tilemaps/tilemap_unused_mp_2/palette.gbapal");
+const ColorRaw Palette_tilemap_unused_mp_2[] = INCPAL("graphics/sa1/tilemaps/tilemap_unused_mp_2/palette.pal");
 const u8 Tiles_tilemap_unused_mp_2[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_unused_mp_2/tiles.4bpp");
 const u8 Tilemap_tilemap_unused_mp_2[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_unused_mp_2/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/tilemap_unused_mp_3/header.c b/graphics/sa1/tilemaps/tilemap_unused_mp_3/header.c
index 82b73ced68..bf6461cfbf 100644
--- a/graphics/sa1/tilemaps/tilemap_unused_mp_3/header.c
+++ b/graphics/sa1/tilemaps/tilemap_unused_mp_3/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_unused_mp_3[] = INCBIN_U16("graphics/sa1/tilemaps/tilemap_unused_mp_3/palette.gbapal");
+const ColorRaw Palette_tilemap_unused_mp_3[] = INCPAL("graphics/sa1/tilemaps/tilemap_unused_mp_3/palette.pal");
 const u8 Tiles_tilemap_unused_mp_3[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_unused_mp_3/tiles.4bpp");
 const u8 Tilemap_tilemap_unused_mp_3[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_unused_mp_3/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/tilemap_unused_mp_4/header.c b/graphics/sa1/tilemaps/tilemap_unused_mp_4/header.c
index 3ace2dbf11..5c203345b7 100644
--- a/graphics/sa1/tilemaps/tilemap_unused_mp_4/header.c
+++ b/graphics/sa1/tilemaps/tilemap_unused_mp_4/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_unused_mp_4[] = INCBIN_U16("graphics/sa1/tilemaps/tilemap_unused_mp_4/palette.gbapal");
+const ColorRaw Palette_tilemap_unused_mp_4[] = INCPAL("graphics/sa1/tilemaps/tilemap_unused_mp_4/palette.pal");
 const u8 Tiles_tilemap_unused_mp_4[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_unused_mp_4/tiles.4bpp");
 const u8 Tilemap_tilemap_unused_mp_4[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_unused_mp_4/tilemap.tilemap2");
 
diff --git a/graphics/sa1/tilemaps/tilemap_unused_mp_player_bar/header.c b/graphics/sa1/tilemaps/tilemap_unused_mp_player_bar/header.c
index 1dea15f08e..5914e09b6e 100644
--- a/graphics/sa1/tilemaps/tilemap_unused_mp_player_bar/header.c
+++ b/graphics/sa1/tilemaps/tilemap_unused_mp_player_bar/header.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "core.h"
 
-const u16 Palette_tilemap_unused_mp_player_bar[] = INCBIN_U16("graphics/sa1/tilemaps/tilemap_unused_mp_player_bar/palette.gbapal");
+const ColorRaw Palette_tilemap_unused_mp_player_bar[] = INCPAL("graphics/sa1/tilemaps/tilemap_unused_mp_player_bar/palette.pal");
 const u8 Tiles_tilemap_unused_mp_player_bar[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_unused_mp_player_bar/tiles.4bpp");
 const u8 Tilemap_tilemap_unused_mp_player_bar[] = INCBIN_U8("graphics/sa1/tilemaps/tilemap_unused_mp_player_bar/tilemap.tilemap2");
 
diff --git a/include/core.h b/include/core.h
index 691d494555..0c4a96f537 100644
--- a/include/core.h
+++ b/include/core.h
@@ -297,8 +297,8 @@ extern winreg_t gWinRegs[6];
 extern struct BlendRegs gBldRegs;
 extern BgAffineReg gBgAffineRegs[NUM_AFFINE_BACKGROUNDS];
 #if (GAME == GAME_SA1)
-extern u16 gObjPalette[OBJ_PLTT_SIZE / sizeof(u16)];
-extern u16 gBgPalette[BG_PLTT_SIZE / sizeof(u16)];
+extern ColorRaw gObjPalette[OBJ_PLTT_SIZE / sizeof(u16)];
+extern ColorRaw gBgPalette[BG_PLTT_SIZE / sizeof(u16)];
 #else
 extern ColorRaw gObjPalette[16 * PALETTE_LEN_4BPP];
 extern ColorRaw gBgPalette[16 * PALETTE_LEN_4BPP];
diff --git a/include/game/shared/stage/water_effects.h b/include/game/shared/stage/water_effects.h
index 7cead89b15..3332320e24 100644
--- a/include/game/shared/stage/water_effects.h
+++ b/include/game/shared/stage/water_effects.h
@@ -12,9 +12,10 @@
 #ifdef M2C
 // M2C: Empty structs are not supported.
 #else
-typedef struct {
-#if (GAME == GAME_SA2)
-    u16 pal[32][16];
+// Additional "palette memory". Statically alloced in SA1!
+typedef struct WaterData {
+#if (GAME >= GAME_SA2)
+    ColorRaw pal[32][16];
 #endif
 } WaterData;
 #endif
@@ -24,22 +25,23 @@ typedef struct {
 #ifdef BUG_FIX
     /* 0x00 */ bool8 isActive;
 #endif
-    /* 0x00 */ u8 SA2_LABEL(unk1);
-    /* 0x01 */ u8 SA2_LABEL(unk2);
-#elif (GAME == GAME_SA2)
+    /* 0x00 */ int_vcount SA2_LABEL(unk1);
+    /* 0x01 */ int_vcount SA2_LABEL(unk2);
+#elif (GAME >= GAME_SA2)
     /* 0x00 */ bool8 isActive;
-    /* 0x01 */ u8 unk1;
-    /* 0x02 */ u8 unk2;
-    /* 0x03 */ u8 unk3;
+    /* 0x00 */ int_vcount SA2_LABEL(unk1);
+    /* 0x01 */ int_vcount SA2_LABEL(unk2);
+    /* 0x03 */ int_vcount SA2_LABEL(unk3);
 #endif
     /* 0x02|0x04 */ s16 currentWaterLevel;
     /* 0x04|0x06 */ s16 targetWaterLevel;
-    /* 0x08|0x08 */ u32 unk8;
-    /* 0x0C|0x0C */ u32 mask;
-
-    // Additional "palette memory", statically alloced in SA1!
-    /* 0x10 */ struct Task *t; /* size: SA1: 0x00, SA2: 0x400 */
+    /* 0x08|0x08 */ u32 flags;
+    /* 0x0C|0x0C */ u32 blendColors;
+    /* 0x10 */ struct Task *t; /* -> WaterData |  size: SA1: 0x00, SA2: 0x400, SA3: *unused* */
     /* 0x14 */ Sprite s;
+#if (GAME == GAME_SA3)
+    /* 0x3C */ WaterData wd;
+#endif
 } Water;
 
 extern Water gWater;
diff --git a/include/tilemap.h b/include/tilemap.h
index ea81b5c4dd..a090135683 100644
--- a/include/tilemap.h
+++ b/include/tilemap.h
@@ -27,11 +27,7 @@ typedef struct {
     /* 0x07 */ u8 animDelay;
     /* 0x08 */ const u8 *tiles;
     /* 0x0C */ u32 tilesSize;
-#if (GAME == GAME_SA1)
-    /* 0x10 */ const u16 *palette;
-#else
     /* 0x10 */ const ColorRaw *palette;
-#endif
     /* 0x14 */ u16 palOffset;
     /* 0x16 */ u16 palLength;
 
diff --git a/src/data/sa1/obj_palettes.c b/src/data/sa1/obj_palettes.c
index b230db365a..cc543303a4 100644
--- a/src/data/sa1/obj_palettes.c
+++ b/src/data/sa1/obj_palettes.c
@@ -1,237 +1,237 @@
 #include "global.h"
 
 // 0x0811E574
-const u16 gSpritePalettes[][16] = {
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_000.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_001.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_002.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_003.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_004.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_005.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_006.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_007.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_008.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_009.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_010.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_011.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_012.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_013.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_014.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_015.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_016.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_017.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_018.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_019.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_020.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_021.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_022.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_023.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_024.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_025.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_026.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_027.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_028.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_029.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_030.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_031.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_032.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_033.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_034.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_035.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_036.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_037.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_038.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_039.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_040.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_041.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_042.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_043.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_044.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_045.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_046.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_047.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_048.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_049.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_050.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_051.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_052.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_053.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_054.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_055.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_056.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_057.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_058.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_059.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_060.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_061.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_062.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_063.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_064.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_065.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_066.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_067.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_068.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_069.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_070.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_071.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_072.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_073.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_074.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_075.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_076.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_077.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_078.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_079.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_080.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_081.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_082.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_083.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_084.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_085.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_086.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_087.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_088.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_089.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_090.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_091.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_092.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_093.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_094.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_095.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_096.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_097.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_098.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_099.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_100.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_101.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_102.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_103.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_104.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_105.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_106.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_107.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_108.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_109.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_110.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_111.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_112.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_113.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_114.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_115.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_116.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_117.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_118.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_119.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_120.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_121.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_122.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_123.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_124.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_125.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_126.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_127.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_128.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_129.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_130.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_131.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_132.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_133.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_134.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_135.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_136.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_137.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_138.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_139.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_140.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_141.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_142.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_143.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_144.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_145.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_146.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_147.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_148.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_149.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_150.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_151.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_152.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_153.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_154.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_155.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_156.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_157.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_158.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_159.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_160.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_161.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_162.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_163.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_164.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_165.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_166.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_167.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_168.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_169.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_170.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_171.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_172.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_173.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_174.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_175.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_176.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_177.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_178.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_179.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_180.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_181.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_182.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_183.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_184.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_185.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_186.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_187.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_188.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_189.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_190.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_191.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_192.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_193.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_194.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_195.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_196.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_197.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_198.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_199.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_200.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_201.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_202.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_203.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_204.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_205.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_206.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_207.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_208.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_209.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_210.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_211.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_212.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_213.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_214.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_215.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_216.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_217.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_218.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_219.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_220.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_221.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_222.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_223.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_224.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_225.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_226.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_227.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_228.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_229.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_230.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_231.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_232.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_233.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_234.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_235.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_236.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_237.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_238.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_239.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_240.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_241.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_242.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_243.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_244.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_245.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_246.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_247.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_248.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_249.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_250.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_251.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_252.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_253.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_254.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_255.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_256.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_257.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_258.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_259.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_260.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_261.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_262.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_263.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_264.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_265.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_266.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_267.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_268.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_269.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_270.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_271.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_272.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_273.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_274.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_275.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_276.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_277.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_278.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_279.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_280.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_281.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_282.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_283.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_284.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_285.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_286.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_287.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_288.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_289.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_290.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_291.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_292.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_293.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_294.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_295.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_296.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_297.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_298.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_299.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_300.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_301.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_302.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_303.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_304.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_305.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_306.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_307.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_308.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_309.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_310.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_311.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_312.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_313.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_314.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_315.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_316.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_317.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_318.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_319.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_320.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_321.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_322.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_323.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_324.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_325.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_326.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_327.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_328.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_329.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_330.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_331.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_332.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_333.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_334.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_335.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_336.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_337.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_338.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_339.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_340.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_341.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_342.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_343.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_344.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_345.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_346.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_347.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_348.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_349.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_350.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_351.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_352.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_353.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_354.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_355.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_356.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_357.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_358.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_359.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_360.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_361.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_362.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_363.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_364.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_365.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_366.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_367.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_368.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_369.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_370.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_371.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_372.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_373.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_374.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_375.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_376.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_377.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_378.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_379.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_380.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_381.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_382.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_383.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_384.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_385.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_386.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_387.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_388.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_389.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_390.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_391.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_392.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_393.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_394.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_395.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_396.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_397.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_398.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_399.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_400.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_401.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_402.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_403.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_404.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_405.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_406.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_407.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_408.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_409.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_410.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_411.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_412.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_413.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_414.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_415.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_416.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_417.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_418.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_419.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_420.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_421.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_422.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_423.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_424.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_425.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_426.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_427.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_428.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_429.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_430.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_431.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_432.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_433.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_434.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_435.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_436.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_437.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_438.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_439.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_440.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_441.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_442.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_443.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_444.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_445.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_446.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_447.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_448.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_449.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_450.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_451.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_452.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_453.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_454.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_455.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_456.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_457.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_458.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_459.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_460.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_461.gbapal"),
-    INCBIN_U16("graphics/sa1/obj_palettes/pal_462.gbapal"), INCBIN_U16("graphics/sa1/obj_palettes/pal_463.gbapal"),
+const ColorRaw gSpritePalettes[][16] = {
+    INCPAL("graphics/sa1/obj_palettes/pal_000.pal"), INCPAL("graphics/sa1/obj_palettes/pal_001.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_002.pal"), INCPAL("graphics/sa1/obj_palettes/pal_003.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_004.pal"), INCPAL("graphics/sa1/obj_palettes/pal_005.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_006.pal"), INCPAL("graphics/sa1/obj_palettes/pal_007.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_008.pal"), INCPAL("graphics/sa1/obj_palettes/pal_009.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_010.pal"), INCPAL("graphics/sa1/obj_palettes/pal_011.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_012.pal"), INCPAL("graphics/sa1/obj_palettes/pal_013.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_014.pal"), INCPAL("graphics/sa1/obj_palettes/pal_015.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_016.pal"), INCPAL("graphics/sa1/obj_palettes/pal_017.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_018.pal"), INCPAL("graphics/sa1/obj_palettes/pal_019.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_020.pal"), INCPAL("graphics/sa1/obj_palettes/pal_021.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_022.pal"), INCPAL("graphics/sa1/obj_palettes/pal_023.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_024.pal"), INCPAL("graphics/sa1/obj_palettes/pal_025.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_026.pal"), INCPAL("graphics/sa1/obj_palettes/pal_027.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_028.pal"), INCPAL("graphics/sa1/obj_palettes/pal_029.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_030.pal"), INCPAL("graphics/sa1/obj_palettes/pal_031.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_032.pal"), INCPAL("graphics/sa1/obj_palettes/pal_033.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_034.pal"), INCPAL("graphics/sa1/obj_palettes/pal_035.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_036.pal"), INCPAL("graphics/sa1/obj_palettes/pal_037.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_038.pal"), INCPAL("graphics/sa1/obj_palettes/pal_039.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_040.pal"), INCPAL("graphics/sa1/obj_palettes/pal_041.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_042.pal"), INCPAL("graphics/sa1/obj_palettes/pal_043.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_044.pal"), INCPAL("graphics/sa1/obj_palettes/pal_045.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_046.pal"), INCPAL("graphics/sa1/obj_palettes/pal_047.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_048.pal"), INCPAL("graphics/sa1/obj_palettes/pal_049.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_050.pal"), INCPAL("graphics/sa1/obj_palettes/pal_051.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_052.pal"), INCPAL("graphics/sa1/obj_palettes/pal_053.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_054.pal"), INCPAL("graphics/sa1/obj_palettes/pal_055.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_056.pal"), INCPAL("graphics/sa1/obj_palettes/pal_057.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_058.pal"), INCPAL("graphics/sa1/obj_palettes/pal_059.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_060.pal"), INCPAL("graphics/sa1/obj_palettes/pal_061.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_062.pal"), INCPAL("graphics/sa1/obj_palettes/pal_063.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_064.pal"), INCPAL("graphics/sa1/obj_palettes/pal_065.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_066.pal"), INCPAL("graphics/sa1/obj_palettes/pal_067.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_068.pal"), INCPAL("graphics/sa1/obj_palettes/pal_069.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_070.pal"), INCPAL("graphics/sa1/obj_palettes/pal_071.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_072.pal"), INCPAL("graphics/sa1/obj_palettes/pal_073.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_074.pal"), INCPAL("graphics/sa1/obj_palettes/pal_075.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_076.pal"), INCPAL("graphics/sa1/obj_palettes/pal_077.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_078.pal"), INCPAL("graphics/sa1/obj_palettes/pal_079.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_080.pal"), INCPAL("graphics/sa1/obj_palettes/pal_081.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_082.pal"), INCPAL("graphics/sa1/obj_palettes/pal_083.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_084.pal"), INCPAL("graphics/sa1/obj_palettes/pal_085.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_086.pal"), INCPAL("graphics/sa1/obj_palettes/pal_087.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_088.pal"), INCPAL("graphics/sa1/obj_palettes/pal_089.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_090.pal"), INCPAL("graphics/sa1/obj_palettes/pal_091.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_092.pal"), INCPAL("graphics/sa1/obj_palettes/pal_093.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_094.pal"), INCPAL("graphics/sa1/obj_palettes/pal_095.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_096.pal"), INCPAL("graphics/sa1/obj_palettes/pal_097.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_098.pal"), INCPAL("graphics/sa1/obj_palettes/pal_099.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_100.pal"), INCPAL("graphics/sa1/obj_palettes/pal_101.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_102.pal"), INCPAL("graphics/sa1/obj_palettes/pal_103.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_104.pal"), INCPAL("graphics/sa1/obj_palettes/pal_105.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_106.pal"), INCPAL("graphics/sa1/obj_palettes/pal_107.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_108.pal"), INCPAL("graphics/sa1/obj_palettes/pal_109.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_110.pal"), INCPAL("graphics/sa1/obj_palettes/pal_111.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_112.pal"), INCPAL("graphics/sa1/obj_palettes/pal_113.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_114.pal"), INCPAL("graphics/sa1/obj_palettes/pal_115.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_116.pal"), INCPAL("graphics/sa1/obj_palettes/pal_117.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_118.pal"), INCPAL("graphics/sa1/obj_palettes/pal_119.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_120.pal"), INCPAL("graphics/sa1/obj_palettes/pal_121.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_122.pal"), INCPAL("graphics/sa1/obj_palettes/pal_123.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_124.pal"), INCPAL("graphics/sa1/obj_palettes/pal_125.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_126.pal"), INCPAL("graphics/sa1/obj_palettes/pal_127.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_128.pal"), INCPAL("graphics/sa1/obj_palettes/pal_129.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_130.pal"), INCPAL("graphics/sa1/obj_palettes/pal_131.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_132.pal"), INCPAL("graphics/sa1/obj_palettes/pal_133.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_134.pal"), INCPAL("graphics/sa1/obj_palettes/pal_135.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_136.pal"), INCPAL("graphics/sa1/obj_palettes/pal_137.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_138.pal"), INCPAL("graphics/sa1/obj_palettes/pal_139.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_140.pal"), INCPAL("graphics/sa1/obj_palettes/pal_141.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_142.pal"), INCPAL("graphics/sa1/obj_palettes/pal_143.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_144.pal"), INCPAL("graphics/sa1/obj_palettes/pal_145.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_146.pal"), INCPAL("graphics/sa1/obj_palettes/pal_147.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_148.pal"), INCPAL("graphics/sa1/obj_palettes/pal_149.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_150.pal"), INCPAL("graphics/sa1/obj_palettes/pal_151.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_152.pal"), INCPAL("graphics/sa1/obj_palettes/pal_153.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_154.pal"), INCPAL("graphics/sa1/obj_palettes/pal_155.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_156.pal"), INCPAL("graphics/sa1/obj_palettes/pal_157.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_158.pal"), INCPAL("graphics/sa1/obj_palettes/pal_159.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_160.pal"), INCPAL("graphics/sa1/obj_palettes/pal_161.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_162.pal"), INCPAL("graphics/sa1/obj_palettes/pal_163.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_164.pal"), INCPAL("graphics/sa1/obj_palettes/pal_165.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_166.pal"), INCPAL("graphics/sa1/obj_palettes/pal_167.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_168.pal"), INCPAL("graphics/sa1/obj_palettes/pal_169.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_170.pal"), INCPAL("graphics/sa1/obj_palettes/pal_171.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_172.pal"), INCPAL("graphics/sa1/obj_palettes/pal_173.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_174.pal"), INCPAL("graphics/sa1/obj_palettes/pal_175.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_176.pal"), INCPAL("graphics/sa1/obj_palettes/pal_177.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_178.pal"), INCPAL("graphics/sa1/obj_palettes/pal_179.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_180.pal"), INCPAL("graphics/sa1/obj_palettes/pal_181.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_182.pal"), INCPAL("graphics/sa1/obj_palettes/pal_183.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_184.pal"), INCPAL("graphics/sa1/obj_palettes/pal_185.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_186.pal"), INCPAL("graphics/sa1/obj_palettes/pal_187.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_188.pal"), INCPAL("graphics/sa1/obj_palettes/pal_189.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_190.pal"), INCPAL("graphics/sa1/obj_palettes/pal_191.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_192.pal"), INCPAL("graphics/sa1/obj_palettes/pal_193.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_194.pal"), INCPAL("graphics/sa1/obj_palettes/pal_195.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_196.pal"), INCPAL("graphics/sa1/obj_palettes/pal_197.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_198.pal"), INCPAL("graphics/sa1/obj_palettes/pal_199.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_200.pal"), INCPAL("graphics/sa1/obj_palettes/pal_201.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_202.pal"), INCPAL("graphics/sa1/obj_palettes/pal_203.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_204.pal"), INCPAL("graphics/sa1/obj_palettes/pal_205.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_206.pal"), INCPAL("graphics/sa1/obj_palettes/pal_207.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_208.pal"), INCPAL("graphics/sa1/obj_palettes/pal_209.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_210.pal"), INCPAL("graphics/sa1/obj_palettes/pal_211.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_212.pal"), INCPAL("graphics/sa1/obj_palettes/pal_213.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_214.pal"), INCPAL("graphics/sa1/obj_palettes/pal_215.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_216.pal"), INCPAL("graphics/sa1/obj_palettes/pal_217.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_218.pal"), INCPAL("graphics/sa1/obj_palettes/pal_219.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_220.pal"), INCPAL("graphics/sa1/obj_palettes/pal_221.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_222.pal"), INCPAL("graphics/sa1/obj_palettes/pal_223.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_224.pal"), INCPAL("graphics/sa1/obj_palettes/pal_225.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_226.pal"), INCPAL("graphics/sa1/obj_palettes/pal_227.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_228.pal"), INCPAL("graphics/sa1/obj_palettes/pal_229.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_230.pal"), INCPAL("graphics/sa1/obj_palettes/pal_231.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_232.pal"), INCPAL("graphics/sa1/obj_palettes/pal_233.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_234.pal"), INCPAL("graphics/sa1/obj_palettes/pal_235.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_236.pal"), INCPAL("graphics/sa1/obj_palettes/pal_237.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_238.pal"), INCPAL("graphics/sa1/obj_palettes/pal_239.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_240.pal"), INCPAL("graphics/sa1/obj_palettes/pal_241.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_242.pal"), INCPAL("graphics/sa1/obj_palettes/pal_243.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_244.pal"), INCPAL("graphics/sa1/obj_palettes/pal_245.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_246.pal"), INCPAL("graphics/sa1/obj_palettes/pal_247.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_248.pal"), INCPAL("graphics/sa1/obj_palettes/pal_249.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_250.pal"), INCPAL("graphics/sa1/obj_palettes/pal_251.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_252.pal"), INCPAL("graphics/sa1/obj_palettes/pal_253.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_254.pal"), INCPAL("graphics/sa1/obj_palettes/pal_255.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_256.pal"), INCPAL("graphics/sa1/obj_palettes/pal_257.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_258.pal"), INCPAL("graphics/sa1/obj_palettes/pal_259.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_260.pal"), INCPAL("graphics/sa1/obj_palettes/pal_261.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_262.pal"), INCPAL("graphics/sa1/obj_palettes/pal_263.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_264.pal"), INCPAL("graphics/sa1/obj_palettes/pal_265.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_266.pal"), INCPAL("graphics/sa1/obj_palettes/pal_267.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_268.pal"), INCPAL("graphics/sa1/obj_palettes/pal_269.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_270.pal"), INCPAL("graphics/sa1/obj_palettes/pal_271.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_272.pal"), INCPAL("graphics/sa1/obj_palettes/pal_273.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_274.pal"), INCPAL("graphics/sa1/obj_palettes/pal_275.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_276.pal"), INCPAL("graphics/sa1/obj_palettes/pal_277.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_278.pal"), INCPAL("graphics/sa1/obj_palettes/pal_279.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_280.pal"), INCPAL("graphics/sa1/obj_palettes/pal_281.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_282.pal"), INCPAL("graphics/sa1/obj_palettes/pal_283.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_284.pal"), INCPAL("graphics/sa1/obj_palettes/pal_285.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_286.pal"), INCPAL("graphics/sa1/obj_palettes/pal_287.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_288.pal"), INCPAL("graphics/sa1/obj_palettes/pal_289.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_290.pal"), INCPAL("graphics/sa1/obj_palettes/pal_291.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_292.pal"), INCPAL("graphics/sa1/obj_palettes/pal_293.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_294.pal"), INCPAL("graphics/sa1/obj_palettes/pal_295.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_296.pal"), INCPAL("graphics/sa1/obj_palettes/pal_297.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_298.pal"), INCPAL("graphics/sa1/obj_palettes/pal_299.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_300.pal"), INCPAL("graphics/sa1/obj_palettes/pal_301.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_302.pal"), INCPAL("graphics/sa1/obj_palettes/pal_303.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_304.pal"), INCPAL("graphics/sa1/obj_palettes/pal_305.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_306.pal"), INCPAL("graphics/sa1/obj_palettes/pal_307.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_308.pal"), INCPAL("graphics/sa1/obj_palettes/pal_309.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_310.pal"), INCPAL("graphics/sa1/obj_palettes/pal_311.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_312.pal"), INCPAL("graphics/sa1/obj_palettes/pal_313.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_314.pal"), INCPAL("graphics/sa1/obj_palettes/pal_315.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_316.pal"), INCPAL("graphics/sa1/obj_palettes/pal_317.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_318.pal"), INCPAL("graphics/sa1/obj_palettes/pal_319.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_320.pal"), INCPAL("graphics/sa1/obj_palettes/pal_321.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_322.pal"), INCPAL("graphics/sa1/obj_palettes/pal_323.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_324.pal"), INCPAL("graphics/sa1/obj_palettes/pal_325.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_326.pal"), INCPAL("graphics/sa1/obj_palettes/pal_327.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_328.pal"), INCPAL("graphics/sa1/obj_palettes/pal_329.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_330.pal"), INCPAL("graphics/sa1/obj_palettes/pal_331.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_332.pal"), INCPAL("graphics/sa1/obj_palettes/pal_333.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_334.pal"), INCPAL("graphics/sa1/obj_palettes/pal_335.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_336.pal"), INCPAL("graphics/sa1/obj_palettes/pal_337.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_338.pal"), INCPAL("graphics/sa1/obj_palettes/pal_339.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_340.pal"), INCPAL("graphics/sa1/obj_palettes/pal_341.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_342.pal"), INCPAL("graphics/sa1/obj_palettes/pal_343.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_344.pal"), INCPAL("graphics/sa1/obj_palettes/pal_345.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_346.pal"), INCPAL("graphics/sa1/obj_palettes/pal_347.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_348.pal"), INCPAL("graphics/sa1/obj_palettes/pal_349.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_350.pal"), INCPAL("graphics/sa1/obj_palettes/pal_351.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_352.pal"), INCPAL("graphics/sa1/obj_palettes/pal_353.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_354.pal"), INCPAL("graphics/sa1/obj_palettes/pal_355.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_356.pal"), INCPAL("graphics/sa1/obj_palettes/pal_357.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_358.pal"), INCPAL("graphics/sa1/obj_palettes/pal_359.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_360.pal"), INCPAL("graphics/sa1/obj_palettes/pal_361.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_362.pal"), INCPAL("graphics/sa1/obj_palettes/pal_363.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_364.pal"), INCPAL("graphics/sa1/obj_palettes/pal_365.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_366.pal"), INCPAL("graphics/sa1/obj_palettes/pal_367.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_368.pal"), INCPAL("graphics/sa1/obj_palettes/pal_369.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_370.pal"), INCPAL("graphics/sa1/obj_palettes/pal_371.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_372.pal"), INCPAL("graphics/sa1/obj_palettes/pal_373.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_374.pal"), INCPAL("graphics/sa1/obj_palettes/pal_375.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_376.pal"), INCPAL("graphics/sa1/obj_palettes/pal_377.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_378.pal"), INCPAL("graphics/sa1/obj_palettes/pal_379.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_380.pal"), INCPAL("graphics/sa1/obj_palettes/pal_381.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_382.pal"), INCPAL("graphics/sa1/obj_palettes/pal_383.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_384.pal"), INCPAL("graphics/sa1/obj_palettes/pal_385.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_386.pal"), INCPAL("graphics/sa1/obj_palettes/pal_387.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_388.pal"), INCPAL("graphics/sa1/obj_palettes/pal_389.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_390.pal"), INCPAL("graphics/sa1/obj_palettes/pal_391.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_392.pal"), INCPAL("graphics/sa1/obj_palettes/pal_393.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_394.pal"), INCPAL("graphics/sa1/obj_palettes/pal_395.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_396.pal"), INCPAL("graphics/sa1/obj_palettes/pal_397.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_398.pal"), INCPAL("graphics/sa1/obj_palettes/pal_399.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_400.pal"), INCPAL("graphics/sa1/obj_palettes/pal_401.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_402.pal"), INCPAL("graphics/sa1/obj_palettes/pal_403.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_404.pal"), INCPAL("graphics/sa1/obj_palettes/pal_405.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_406.pal"), INCPAL("graphics/sa1/obj_palettes/pal_407.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_408.pal"), INCPAL("graphics/sa1/obj_palettes/pal_409.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_410.pal"), INCPAL("graphics/sa1/obj_palettes/pal_411.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_412.pal"), INCPAL("graphics/sa1/obj_palettes/pal_413.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_414.pal"), INCPAL("graphics/sa1/obj_palettes/pal_415.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_416.pal"), INCPAL("graphics/sa1/obj_palettes/pal_417.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_418.pal"), INCPAL("graphics/sa1/obj_palettes/pal_419.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_420.pal"), INCPAL("graphics/sa1/obj_palettes/pal_421.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_422.pal"), INCPAL("graphics/sa1/obj_palettes/pal_423.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_424.pal"), INCPAL("graphics/sa1/obj_palettes/pal_425.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_426.pal"), INCPAL("graphics/sa1/obj_palettes/pal_427.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_428.pal"), INCPAL("graphics/sa1/obj_palettes/pal_429.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_430.pal"), INCPAL("graphics/sa1/obj_palettes/pal_431.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_432.pal"), INCPAL("graphics/sa1/obj_palettes/pal_433.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_434.pal"), INCPAL("graphics/sa1/obj_palettes/pal_435.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_436.pal"), INCPAL("graphics/sa1/obj_palettes/pal_437.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_438.pal"), INCPAL("graphics/sa1/obj_palettes/pal_439.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_440.pal"), INCPAL("graphics/sa1/obj_palettes/pal_441.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_442.pal"), INCPAL("graphics/sa1/obj_palettes/pal_443.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_444.pal"), INCPAL("graphics/sa1/obj_palettes/pal_445.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_446.pal"), INCPAL("graphics/sa1/obj_palettes/pal_447.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_448.pal"), INCPAL("graphics/sa1/obj_palettes/pal_449.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_450.pal"), INCPAL("graphics/sa1/obj_palettes/pal_451.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_452.pal"), INCPAL("graphics/sa1/obj_palettes/pal_453.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_454.pal"), INCPAL("graphics/sa1/obj_palettes/pal_455.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_456.pal"), INCPAL("graphics/sa1/obj_palettes/pal_457.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_458.pal"), INCPAL("graphics/sa1/obj_palettes/pal_459.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_460.pal"), INCPAL("graphics/sa1/obj_palettes/pal_461.pal"),
+    INCPAL("graphics/sa1/obj_palettes/pal_462.pal"), INCPAL("graphics/sa1/obj_palettes/pal_463.pal"),
 };
\ No newline at end of file
diff --git a/src/data/sa1/sprite_tables.c b/src/data/sa1/sprite_tables.c
index 51b26b7624..6798fba0b6 100644
--- a/src/data/sa1/sprite_tables.c
+++ b/src/data/sa1/sprite_tables.c
@@ -5,4 +5,4 @@ extern const u8 gObjTiles_4bpp[];
 extern const u8 gObjTiles_8bpp[];
 
 const struct SpriteTables gSpriteTables = { (const void *)gAnimations,    gSpriteDimensions, (const u16 **const)gSpriteOamData,
-                                            (const u16 *)gSpritePalettes, gObjTiles_4bpp,    gObjTiles_8bpp };
+                                            (const ColorRaw *)gSpritePalettes, gObjTiles_4bpp,    gObjTiles_8bpp };
diff --git a/src/game/shared/stage/stage.c b/src/game/shared/stage/stage.c
index f2d4ea738e..1282deddb9 100644
--- a/src/game/shared/stage/stage.c
+++ b/src/game/shared/stage/stage.c
@@ -493,14 +493,15 @@ void Task_GameStage(void)
 #ifndef COLLECT_RINGS_ROM
     if (IS_SINGLE_PLAYER) {
 #if DEBUG
-#include "game/sa2/ui/character_select.h"
         if (gInput & SELECT_BUTTON) {
             const u32 initialCharacter = CHARACTER_TAILS;
             const bool32 allUnlocked = TRUE;
             TasksDestroyAll();
 #if (GAME == GAME_SA1)
+#include "game/sa1/ui/character_select.h"
             CreateCharacterSelectionScreen(initialCharacter);
 #elif (GAME == GAME_SA2)
+#include "game/sa2/ui/character_select.h"
             CreateCharacterSelectionScreen(initialCharacter, allUnlocked);
 #endif
             return;
diff --git a/src/game/shared/stage/water_effects.c b/src/game/shared/stage/water_effects.c
index 3815857bae..a1682bd5e7 100644
--- a/src/game/shared/stage/water_effects.c
+++ b/src/game/shared/stage/water_effects.c
@@ -75,7 +75,7 @@ static const u16 gUnknown_080D550C[NUM_CHARACTERS] = {
     SA2_ANIM_UNDERWATER_1UP_KNUCKLES, SA2_ANIM_UNDERWATER_1UP_AMY,
 };
 
-static void inline CopyPalette(u32 *dst, u32 *src, s32 length)
+static inline void CopyPalette(u32 *dst, u32 *src, s32 length)
 {
     u32 r2 = length >> 4;
 
@@ -116,8 +116,8 @@ void InitWaterPalettes(void)
     Water *water = &gWater;
     WaterData *wd = TASK_DATA(water->t);
 #if (GAME == GAME_SA1)
-    MaskPaletteWithUnderwaterColor_inline((u32 *)&sPaletteBuffer[0], (u32 *)&gObjPalette[0], water->mask, 16 * 16);
-    MaskPaletteWithUnderwaterColor_inline((u32 *)&sPaletteBuffer[16 * 16], (u32 *)&gBgPalette[0], water->mask, 16 * 16);
+    MaskPaletteWithUnderwaterColor_inline((u32 *)&sPaletteBuffer[0], (u32 *)&gObjPalette[0], water->blendColors, 16 * 16);
+    MaskPaletteWithUnderwaterColor_inline((u32 *)&sPaletteBuffer[16 * 16], (u32 *)&gBgPalette[0], water->blendColors, 16 * 16);
 #elif (GAME == GAME_SA2)
     if (IS_MULTI_PLAYER) {
         u8 i = 0, j = 0;
@@ -161,7 +161,7 @@ void InitWaterPalettes(void)
     pal = (animation[0]->pal.palId + 4);
     CopyPalette((u32 *)wd->pal[4], (u32 *)gSpritePalettes[pal], 12 * PALETTE_LEN_4BPP);
 
-    MaskPaletteWithUnderwaterColor_inline((u32 *)wd->pal[16], (u32 *)gBgPalette, water->mask, 16 * 16);
+    MaskPaletteWithUnderwaterColor_inline((u32 *)wd->pal[16], (u32 *)gBgPalette, water->blendColors, 16 * 16);
 #endif
 }
 
@@ -190,8 +190,8 @@ void CreateStageWaterTask(s32 waterLevel, u32 p1, u32 mask)
     gWater.targetWaterLevel = waterLevel;
     gWater.SA2_LABEL(unk2) = 0xFF;
     gWater.SA2_LABEL(unk1) = -1;
-    gWater.unk8 = mask & 0x100;
-    gWater.mask = p1;
+    gWater.flags = mask & 0x100;
+    gWater.blendColors = p1;
 
     if (waterLevel >= 0) {
         Sprite *s = &gWater.s;
@@ -425,7 +425,7 @@ static void SA2_LABEL(sub_8011A4C)(void)
         WaterData *wd = TASK_DATA(water->t);
         u32 unk2 = water->SA2_LABEL(unk2);
         water->SA2_LABEL(unk1) = unk2;
-        water->unk8 &= ~0x1;
+        water->flags &= ~0x1;
 
         // TODO: This surely can be matched differently!
         unk2 <<= 24;
diff --git a/src/platform/win32/opengl.c b/src/platform/win32/opengl.c
index fbf7941161..4150e1e03a 100644
--- a/src/platform/win32/opengl.c
+++ b/src/platform/win32/opengl.c
@@ -104,7 +104,7 @@ static ChunkGfx sChunkGfx = { 0 };
 
 // Set of chunks that have to be drawn this frame
 typedef struct ChunkSet {
-    u16 *items;
+    MetatileIndexType *items;
     u16 count, capacity;
 } ChunkSet;
 static ChunkSet sChunkSet = { 0 };
@@ -154,8 +154,8 @@ void FindUniqueChunks(ChunkSet *set, Background *bg, u16 mapChunkX, u16 mapChunk
     for (int y = 0; y < screenChunkHeight; y++) {
         for (int x = 0; x < screenChunkWidth; x++) {
             u32 screenChunkIndex = (mapChunkY + y) * bg->mapWidth + (mapChunkX + x);
-            const u16 *chunk = &bg->metatileMap[screenChunkIndex];
-            const u16 chunkId = *chunk;
+            const MetatileIndexType *chunk = &bg->metatileMap[screenChunkIndex];
+            const MetatileIndexType chunkId = *chunk;
             bool8 isInSet = FALSE;
 
             // Find chunk ID in set
@@ -396,22 +396,24 @@ void OpenGL_ProcessBackgroundsCopyQueue(void)
         s16 bgScrollY = gBgScrollRegs[bgId][1];
 
         if (gDispCnt & (DISPCNT_BG0_ON << bgId)) {
-            if (bg->flags & BACKGROUND_FLAG_IS_LEVEL_MAP) {
-                UpdateChunkGfx(&sChunkGfx, bg);
-            } else {
-                // TEMP!!!
-                // DON'T MALLOC AND FREE TILEMAPS ALL THE TIME!!!
-                // (Also currently it's possible to get corrupted Background pointers, leading to crashes)
-                if (needsUpdate[bgId]) {
-                    if (bg->graphics.dest && !IN_VRAM(bg->graphics.dest)) {
-                        free(bg->graphics.dest);
+            if (bg) {
+                if (bg->flags & BACKGROUND_FLAG_IS_LEVEL_MAP) {
+                    UpdateChunkGfx(&sChunkGfx, bg);
+                } else {
+                    // TEMP!!!
+                    // DON'T MALLOC AND FREE TILEMAPS ALL THE TIME!!!
+                    // (Also currently it's possible to get corrupted Background pointers, leading to crashes)
+                    if (needsUpdate[bgId]) {
+                        if (bg->graphics.dest && !IN_VRAM(bg->graphics.dest)) {
+                            free(bg->graphics.dest);
+                        }
+                        bg->graphics.dest = malloc((bg->xTiles * 8) * (bg->yTiles * 8) * TILE_SIZE_RGBA);
                     }
-                    bg->graphics.dest = malloc((bg->xTiles * 8) * (bg->yTiles * 8) * TILE_SIZE_RGBA);
-                }
 
-                RenderTilemap(bg->graphics.dest, bg, 0);
-                OpenGL_RenderRGBABuffer((Color *)bg->graphics.dest, bg->xTiles * 8, bg->yTiles * 8, bgScrollX, bgScrollY,
-                                        bgScrollX + bg->targetTilesX * 8, bgScrollY + bg->targetTilesY * 8);
+                    RenderTilemap(bg->graphics.dest, bg, 0);
+                    OpenGL_RenderRGBABuffer((Color *)bg->graphics.dest, bg->xTiles * 8, bg->yTiles * 8, bgScrollX, bgScrollY,
+                                            bgScrollX + bg->targetTilesX * 8, bgScrollY + bg->targetTilesY * 8);
+                }
             }
         }
     }