From 59bf609685ec57becee28fc9b54c24caa7a5ab90 Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Sun, 22 Mar 2026 14:26:24 +0100
Subject: [PATCH] combine palettes (#723)

---
 graphics/cave_transition/enter.pal | 11 -----------
 graphics/cave_transition/exit.pal  | 11 -----------
 src/fldeff_flash.c                 |  9 ++++-----
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 graphics/cave_transition/enter.pal
 delete mode 100644 graphics/cave_transition/exit.pal

diff --git a/graphics/cave_transition/enter.pal b/graphics/cave_transition/enter.pal
deleted file mode 100644
index fea15a176..000000000
--- a/graphics/cave_transition/enter.pal
+++ /dev/null
@@ -1,11 +0,0 @@
-JASC-PAL
-0100
-8
-148 197 172
-16 16 16
-32 32 32
-49 49 49
-65 65 65
-82 82 82
-98 98 98
-115 115 115
diff --git a/graphics/cave_transition/exit.pal b/graphics/cave_transition/exit.pal
deleted file mode 100644
index 09eb37624..000000000
--- a/graphics/cave_transition/exit.pal
+++ /dev/null
@@ -1,11 +0,0 @@
-JASC-PAL
-0100
-8
-131 131 131
-148 148 148
-164 164 164
-180 180 180
-197 197 197
-213 213 213
-230 230 230
-255 255 255
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index c9918e638..ffc11a28d 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -157,8 +157,7 @@ static const struct FlashStruct sTransitionTypes[] = {
 static const u16 sCaveTransitionPalette_White[] = INCBIN_U16("graphics/cave_transition/white.gbapal");
 static const u16 sCaveTransitionPalette_Black[] = INCBIN_U16("graphics/cave_transition/black.gbapal");
 
-static const u16 sCaveTransitionPalette_Enter[] = INCBIN_U16("graphics/cave_transition/enter.gbapal");
-static const u16 sCaveTransitionPalette_Exit[] = INCBIN_U16("graphics/cave_transition/exit.gbapal");
+static const u16 sCaveTransitionPalette[] = INCBIN_U16("graphics/cave_transition/tiles.gbapal");
 static const u32 sCaveTransitionTilemap[] = INCBIN_U32("graphics/cave_transition/tilemap.bin.lz");
 static const u32 sCaveTransitionTiles[] = INCBIN_U32("graphics/cave_transition/tiles.4bpp.lz");
 
@@ -302,7 +301,7 @@ static void Task_FlashTransition_Exit_1(u8 taskId)
     LZ77UnCompVram(sCaveTransitionTiles, (void *)BG_CHAR_ADDR(3));
     LZ77UnCompVram(sCaveTransitionTilemap, (void *)BG_SCREEN_ADDR(31));
     LoadPalette(sCaveTransitionPalette_White, BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_White));
-    LoadPalette(sCaveTransitionPalette_Exit, BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_Exit));
+    LoadPalette(&sCaveTransitionPalette[8], BG_PLTT_ID(14), PLTT_SIZEOF(8));
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD);
     SetGpuReg(REG_OFFSET_BLDALPHA, 0);
     SetGpuReg(REG_OFFSET_BLDY, 0);
@@ -336,7 +335,7 @@ static void Task_FlashTransition_Exit_3(u8 taskId)
     if (count < 8)
     {
         gTasks[taskId].data[2]++;
-        LoadPalette(&sCaveTransitionPalette_Exit[count], BG_PLTT_ID(14), sizeof(sCaveTransitionPalette_Exit) - PLTT_SIZEOF(count));
+        LoadPalette(&sCaveTransitionPalette[count + 8], BG_PLTT_ID(14), PLTT_SIZEOF(8) - PLTT_SIZEOF(count));
     }
     else
     {
@@ -389,7 +388,7 @@ static void Task_FlashTransition_Enter_2(u8 taskId)
     {
         gTasks[taskId].data[2]++;
         gTasks[taskId].data[2]++;
-        LoadPalette(&sCaveTransitionPalette_Enter[15 - count], BG_PLTT_ID(14), PLTT_SIZEOF(count + 1));
+        LoadPalette(&sCaveTransitionPalette[15 - count], BG_PLTT_ID(14), PLTT_SIZEOF(count + 1));
     }
     else
     {