Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Safari and Wally backsprites when reshowing battle screen (#8561)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-12-17 14:37:23 -03:00 committed by GitHub
parent b0285152b4
commit 7ea180513e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/reshow_battle_screen.c
View File

@ -237,7 +237,7 @@ static void CB2_ReshowBlankBattleScreenAfterMenu(void)
gBattleScripting.reshowMainState--;
break;
case 10:
if (gBattleScripting.monCaught)
if (gBattleScripting.monCaught)
CreateCaughtMonSprite(); // displays the caught mon for the switch into party feature
break;
default:
@ -324,7 +324,7 @@ void CreateBattlerSprite(u32 battler)
gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 0x50,
(8 - gTrainerBacksprites[gSaveBlock2Ptr->playerGender].coordinates.size) * 4 + 80,
GetBattlerSpriteSubpriority(0));
gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler;
gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = (8 + battler / 2);
gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy;
gSprites[gBattlerSpriteIds[battler]].data[0] = battler;
}
@ -334,7 +334,7 @@ void CreateBattlerSprite(u32 battler)
gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, 0x50,
(8 - gTrainerBacksprites[TRAINER_BACK_PIC_WALLY].coordinates.size) * 4 + 80,
GetBattlerSpriteSubpriority(0));
gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler;
gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = (8 + battler / 2);
gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy;
gSprites[gBattlerSpriteIds[battler]].data[0] = battler;
}