Skip to content

Commit

Permalink
Remove usage of gHeap in sSpritePalettes_ContestantsTurnBlinkEffect
Browse files Browse the repository at this point in the history
Those offsets into gHeap are actually just inside of eContestTempSave.
  • Loading branch information
Lactozilla committed Nov 12, 2024
1 parent f8119be commit b60da57
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/contest.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
};
Expand Down

0 comments on commit b60da57

Please sign in to comment.