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

Mugshot Transitions 2v1 fix (#6911)

Browse Source
This commit is contained in:
grintoul1 2025-05-19 06:44:05 +01:00 committed by GitHub
parent 29a6113318
commit 0d8d36499b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/battle_transition.c
View File

@ -2376,16 +2376,25 @@ static bool8 Mugshot_StartOpponentSlide(struct Task *task)
sTransitionData->BG0HOFS_Upper += 8;
SetTrainerPicSlideDirection(task->tOpponentSpriteAId, 0);
SetTrainerPicSlideDirection(task->tOpponentSpriteBId, 0);
if (TRAINER_BATTLE_PARAM.opponentB != TRAINER_NONE && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
{
SetTrainerPicSlideDirection(task->tOpponentSpriteBId, 0);
}
SetTrainerPicSlideDirection(task->tPlayerSpriteId, 1);
SetTrainerPicSlideDirection(task->tPartnerSpriteId, 1);
if (gPartnerTrainerId != TRAINER_PARTNER(PARTNER_NONE) && gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
{
SetTrainerPicSlideDirection(task->tPartnerSpriteId, 1);
}
// Start opponent slide
IncrementTrainerPicState(task->tOpponentSpriteAId);
PlaySE(SE_MUGSHOT);
IncrementTrainerPicState(task->tOpponentSpriteBId);
if (TRAINER_BATTLE_PARAM.opponentB != TRAINER_NONE && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
{
IncrementTrainerPicState(task->tOpponentSpriteBId);
}
sTransitionData->VBlank_DMA++;
return FALSE;
@ -2400,7 +2409,10 @@ static bool8 Mugshot_WaitStartPlayerSlide(struct Task *task)
if (IsTrainerPicSlideDone(task->tOpponentSpriteAId))
{
task->tState++;
IncrementTrainerPicState(task->tPartnerSpriteId);
if (gPartnerTrainerId != TRAINER_PARTNER(PARTNER_NONE) && gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
{
IncrementTrainerPicState(task->tPartnerSpriteId);
}
IncrementTrainerPicState(task->tPlayerSpriteId);
}
return FALSE;