dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usage of gHeap in sSpritePalettes_ContestantsTurnBlinkEffect

Browse Source 
Those offsets into gHeap are actually just inside of eContestTempSave.
This commit is contained in:
Lactozilla
2024-11-12 14:28:33 -03:00
parent f8119bedd4
commit b60da57d8a
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/contest.c
View File

@@ -858,23 +858,22 @@ static const struct CompressedSpriteSheet sSpriteSheets_ContestantsTurnBlinkEffe
} }
}; };
// Yup this is super dangerous but that's how it is here
static const struct SpritePalette sSpritePalettes_ContestantsTurnBlinkEffect[CONTESTANT_COUNT] = static const struct SpritePalette sSpritePalettes_ContestantsTurnBlinkEffect[CONTESTANT_COUNT] =
{ {
{ {
.data = (u16 *)(gHeap + 0x1A0A4), .data = eContestTempSave.cachedWindowPalettes[5],
.tag = TAG_BLINK_EFFECT_CONTESTANT0 .tag = TAG_BLINK_EFFECT_CONTESTANT0
}, },
{ {
.data = (u16 *)(gHeap + 0x1A0C4), .data = eContestTempSave.cachedWindowPalettes[6],
.tag = TAG_BLINK_EFFECT_CONTESTANT1 .tag = TAG_BLINK_EFFECT_CONTESTANT1
}, },
{ {
.data = (u16 *)(gHeap + 0x1A0E4), .data = eContestTempSave.cachedWindowPalettes[7],
.tag = TAG_BLINK_EFFECT_CONTESTANT2 .tag = TAG_BLINK_EFFECT_CONTESTANT2
}, },
{ {
.data = (u16 *)(gHeap + 0x1A104), .data = eContestTempSave.cachedWindowPalettes[8],
.tag = TAG_BLINK_EFFECT_CONTESTANT3 .tag = TAG_BLINK_EFFECT_CONTESTANT3
} }
}; };