Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-10-02 06:37:21 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix dynamic trainer script regression (#10233)
Some checks are pending
CI / build-emerald (push) Waiting to run
Details
CI / build-firered (push) Waiting to run
Details
CI / build-leafgreen (push) Waiting to run
Details
CI / release (push) Waiting to run
Details
CI / test (push) Waiting to run
Details
CI / build (push) Blocked by required conditions
Details
CI / docs_validate (push) Waiting to run
Details
CI / allcontributors (push) Waiting to run
Details

Browse Source
This commit is contained in:
FosterProgramming
2026-06-16 16:05:15 +02:00
committed by GitHub
parent 25a94bcdba
commit c2e2dbfda6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/event.inc
View File

@@ -762,7 +762,7 @@
.ifgt \isDouble; .set trainerbattle_flags, trainerbattle_flags | (1 << 0); .endif
.ifgt \isRematch; .set trainerbattle_flags, trainerbattle_flags | (1 << 1); .endif
.ifgt \playMusicA; .set trainerbattle_flags, trainerbattle_flags | (1 << 2); .endif
.ifgt \playMusicB; .set trainerBattle_flags, trainerbattle_flags | (1 << 3); .endif
.ifgt \playMusicB; .set trainerbattle_flags, trainerbattle_flags | (1 << 3); .endif
.ifgt \continueScript; .set trainerbattle_flags, trainerbattle_flags | (1 << 4); .endif
.ifgt \facePlayer; .set trainerbattle_flags, trainerbattle_flags | (1 << 5); .endif
.ifgt \earlyRival; .set trainerbattle_flags, trainerbattle_flags | (1 << 6); .endif

5
src/battle_setup.c
View File

@@ -1217,6 +1217,11 @@ static void BattleSetup_ConfigureTrainerBattle(TrainerBattleParameter *battlePar
PUSH(EventSnippet_NotEnoughMonsForDoubleBattle)
return;
}
if (battleParams->params.opponentA != 0 && battleParams->params.opponentB != 0)
{
gNoOfApproachingTrainers = 2;
}
#if FREE_MATCH_CALL == FALSE
if (battleParams->params.isRematch)