diff options
| -rw-r--r-- | data/data_83760F0.s | 7 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/palette.c | 18 |
3 files changed, 16 insertions, 10 deletions
diff --git a/data/data_83760F0.s b/data/data_83760F0.s index 8f45c1b18..8eacb3472 100644 --- a/data/data_83760F0.s +++ b/data/data_83760F0.s @@ -4,13 +4,6 @@ .section .rodata .align 2 -gDummyPaletteStructTemplate:: @ 837DEE4 - .2byte 0xFFFF - .space 9 - .byte 0x20 - .space 4 - - .align 2 gFanfares:: @ 837DEF4 .2byte BGM_FANFA1, 80 .2byte BGM_FANFA4, 160 diff --git a/ld_script.txt b/ld_script.txt index 4b12ee737..ba6eb52af 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -321,6 +321,7 @@ SECTIONS { src/start_menu.o(.rodata); src/menu.o(.rodata); data/tileset_anim.o(.rodata); + src/palette.o(.rodata); data/data_83760F0.o(.rodata); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); 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; |