1 files changed, 25 insertions, 50 deletions
diff --git a/src/palette.c b/src/palette.c
index aa9a84e4c..d60efdbc5 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -1,5 +1,8 @@
 #include "global.h"
+#include "blend_palette.h"
 #include "palette.h"
+#include "decompress.h"
+#include "gpu_regs.h"
 #include "task.h"
 
 enum
@@ -28,7 +31,7 @@ struct PaletteStructTemplate
 
 struct PaletteStruct
 {
-    struct PaletteStructTemplate *base;
+    const struct PaletteStructTemplate *base;
     u32 ps_field_4_0:1;
     u16 ps_field_4_1:1;
     u32 baseDestOffset:9;
@@ -38,31 +41,6 @@ struct PaletteStruct
     u8 ps_field_9;
 };
 
-extern void LZDecompressWram(const void *src, void *dest);
-extern void SetGpuReg(u8 regOffset, u16 value);
-extern void sub_8149DFC(u8 a1);
-extern void sub_80A1670(u16 a1);
-extern void sub_80A2D54(u8 a1);
-extern void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value);
-extern void _call_via_r1(u32 a1, void *a2);
-
-extern void BlendPalette(u16, u16, u8, u16);
-
-EWRAM_DATA u16 gPlttBufferUnfaded[0x200] = {0};
-EWRAM_DATA u16 gPlttBufferFaded[0x200] = {0};
-EWRAM_DATA struct PaletteStruct sPaletteStructs[0x10] = {0};
-EWRAM_DATA struct PaletteFadeControl gPaletteFade = {0};
-EWRAM_DATA u32 gFiller_2037FE0 = 0;
-EWRAM_DATA u32 sPlttBufferTransferPending = 0;
-EWRAM_DATA u8 gPaletteDecompressionBuffer[0x400] = {0};
-
-extern struct PaletteStructTemplate gDummyPaletteStructTemplate;
-extern void *gUnknown_0852487C;
-extern u8 gUnknown_0852489C[];
-
-extern u16 gUnknown_03000F3C;
-extern void *gUnknown_03000F44;
-
 static void unused_sub_80A1CDC(struct PaletteStruct *, u32 *);
 static void unused_sub_80A1E40(struct PaletteStruct *, u32 *);
 static void unused_sub_80A1F00(struct PaletteStruct *);
@@ -73,32 +51,29 @@ static u8 UpdateFastPaletteFade(void);
 static u8 UpdateHardwarePaletteFade(void);
 static void UpdateBlendRegisters(void);
 static bool8 IsSoftwarePaletteFadeFinishing(void);
+static void sub_80A2D54(u8 taskId);
 
-void sub_80A1818(u16 a1)
-{
-  void **v1 = &gUnknown_0852487C;
-  CpuSet(v1[a1 & 0x3], gPlttBufferUnfaded + 0x80, 0x10);
-  BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
-  if ((u8)FindTaskIdByFunc(sub_8149DFC) != 0xFF )
-  {
-    gUnknown_03000F44 = sub_80A1670;
-    gUnknown_03000F3C = 0x20;
-  }
-  return;
-}
+EWRAM_DATA u16 gPlttBufferUnfaded[0x200] = {0};
+EWRAM_DATA u16 gPlttBufferFaded[0x200] = {0};
+EWRAM_DATA struct PaletteStruct sPaletteStructs[0x10] = {0};
+EWRAM_DATA struct PaletteFadeControl gPaletteFade = {0};
+static EWRAM_DATA u32 gFiller_2037FE0 = 0;
+static EWRAM_DATA u32 sPlttBufferTransferPending = 0;
+EWRAM_DATA u8 gPaletteDecompressionBuffer[0x400] = {0};
 
-void sub_80A1884(u16 a1)
-{
-  void **v1 = &gUnknown_0852487C;
-  CpuSet(v1[a1 & 0x3], gPlttBufferUnfaded + 0x80, 0x10);
-  if ((u8)FindTaskIdByFunc(sub_8149DFC) == 0xFF )
-  {
-    BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF);
-    if (!--gUnknown_03000F3C)
-        gUnknown_03000F44 = 0;
-  }
-  return;
-}
+static const struct PaletteStructTemplate gDummyPaletteStructTemplate = {
+    .uid = 0xFFFF,
+    .pst_field_B_5 = 1
+};
+static const u8 gUnknown_0852489C[] = {
+     0,  0,  0,  0,  0,
+     5,  5,  5,  5,  5,
+    11, 11, 11, 11, 11,
+    16, 16, 16, 16, 16,
+    21, 21, 21, 21, 21,
+    27, 27, 27, 27, 27,
+    31, 31
+};
 
 void LoadCompressedPalette(const void *src, u16 offset, u16 size)
 {