diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-02 13:47:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-02 13:47:34 -0400 |
| commit | 8d224bf941d86a6603d2ae217c87caa2743994f7 (patch) | |
| tree | 9c15ffc43f3ada02e8f4d43e88692500cb93e167 /src/palette.c | |
| parent | 17c76432f420de962628e5c558ae2d4dee51dab7 (diff) | |
| parent | 81b84503fac74d58fd15808764e1516046c37fb9 (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/palette.c')
| -rw-r--r-- | src/palette.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/palette.c b/src/palette.c index 5d1d6635c..eb49ce4c6 100644 --- a/src/palette.c +++ b/src/palette.c @@ -54,8 +54,10 @@ static void UpdateBlendRegisters(void); static bool8 IsSoftwarePaletteFadeFinishing(void); static void sub_80A2D54(u8 taskId); -EWRAM_DATA u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE] = {0}; -EWRAM_DATA u16 gPlttBufferFaded[PLTT_BUFFER_SIZE] = {0}; +// palette buffers require alignment with agbcc because +// unaligned word reads are issued in BlendPalette otherwise +ALIGNED(4) EWRAM_DATA u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE] = {0}; +ALIGNED(4) EWRAM_DATA u16 gPlttBufferFaded[PLTT_BUFFER_SIZE] = {0}; EWRAM_DATA struct PaletteStruct sPaletteStructs[0x10] = {0}; EWRAM_DATA struct PaletteFadeControl gPaletteFade = {0}; static EWRAM_DATA u32 gFiller_2037FE0 = 0; |