atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2064 from Lactozilla/fix-contestants-turn-blink-effect-offsets

Browse source 
Remove usage of gHeap in sSpritePalettes_ContestantsTurnBlinkEffect
This commit is contained in:
GriffinR 2024-11-12 12:47:24 -05:00 committed by GitHub
commit 9ea76f9815
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show stats 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
} }
}; };