Merge pull request #2064 from Lactozilla/fix-contestants-turn-blink-effect-offsets
Remove usage of gHeap in sSpritePalettes_ContestantsTurnBlinkEffect
This commit is contained in:
commit
9ea76f9815
1 changed files with 4 additions and 5 deletions
|
@ -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] =
|
||||
{
|
||||
{
|
||||
.data = (u16 *)(gHeap + 0x1A0A4),
|
||||
.data = eContestTempSave.cachedWindowPalettes[5],
|
||||
.tag = TAG_BLINK_EFFECT_CONTESTANT0
|
||||
},
|
||||
{
|
||||
.data = (u16 *)(gHeap + 0x1A0C4),
|
||||
.data = eContestTempSave.cachedWindowPalettes[6],
|
||||
.tag = TAG_BLINK_EFFECT_CONTESTANT1
|
||||
},
|
||||
{
|
||||
.data = (u16 *)(gHeap + 0x1A0E4),
|
||||
.data = eContestTempSave.cachedWindowPalettes[7],
|
||||
.tag = TAG_BLINK_EFFECT_CONTESTANT2
|
||||
},
|
||||
{
|
||||
.data = (u16 *)(gHeap + 0x1A104),
|
||||
.data = eContestTempSave.cachedWindowPalettes[8],
|
||||
.tag = TAG_BLINK_EFFECT_CONTESTANT3
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue