Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-12 04:56:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Mugshot_ShowBanner fakematch relying on merged stores (#2336)
Some checks failed
CI / build (push) Has been cancelled
Details

Browse Source 
If the fields ever change in proximity to each other, this breaks, so this fakematch must be fixed.
This commit is contained in:
AZero13
2026-06-27 01:33:45 -04:00
committed by GitHub
parent c948da6df8
commit 83df84e406
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_transition.c
View File

@@ -2352,7 +2352,6 @@ static bool8 Mugshot_ShowBanner(struct Task *task)
u8 i, sinIndex;
u16 *toStore;
s16 x;
s32 mergedValue;
sTransitionData->VBlank_DMA = FALSE;
@@ -2391,8 +2390,7 @@ static bool8 Mugshot_ShowBanner(struct Task *task)
if (task->tBottomBannerX < 0)
task->tBottomBannerX = 0;
mergedValue = *(s32 *)(&task->tTopBannerX);
if (mergedValue == DISPLAY_WIDTH)
if (task->tTopBannerX == DISPLAY_WIDTH && task->tBottomBannerX == 0)
task->tState++;
sTransitionData->BG0HOFS_Lower -= 8;