From 96ccf2cf22e885d82ea862d0e0e94e0bb1816eec Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Thu, 5 Jan 2017 04:51:55 -0800
Subject: define palette struct in C

---
 src/palette.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/palette.c b/src/palette.c
index bf93a036c..165eb2eae 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -30,7 +30,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;
@@ -48,7 +48,19 @@ EWRAM_DATA u32 gFiller_202F394 = 0;
 EWRAM_DATA static u32 sPlttBufferTransferPending = 0;
 EWRAM_DATA static u8 sPaletteDecompressionBuffer[0x400] = {0};
 
-extern struct PaletteStructTemplate gDummyPaletteStructTemplate;
+static const struct PaletteStructTemplate sDummyPaletteStructTemplate =
+{
+    0xFFFF,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    1,
+    0
+};
 
 static void unused_sub_8073DFC(struct PaletteStruct *, u32 *);
 static void unused_sub_8073F60(struct PaletteStruct *, u32 *);
@@ -332,7 +344,7 @@ void ResetPaletteStructByUid(u16 a1)
 
 void ResetPaletteStruct(u8 paletteNum)
 {
-    sPaletteStructs[paletteNum].base = &gDummyPaletteStructTemplate;
+    sPaletteStructs[paletteNum].base = &sDummyPaletteStructTemplate;
     sPaletteStructs[paletteNum].ps_field_4_0 = 0;
     sPaletteStructs[paletteNum].baseDestOffset = 0;
     sPaletteStructs[paletteNum].destOffset = 0;
-- 
cgit v1.2.3