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

Fix missing FREE_MATCH_CALL (#8171)

Browse Source 
Co-authored-by: Zimmermann Gyula <graiondilach@hotmail.com>
This commit is contained in:
FosterProgramming 2025-11-09 18:16:19 +01:00 committed by GitHub
parent 3e583f8add
commit 8eea132406
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_setup.c
View File

@ -1128,8 +1128,12 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
bool32 GetRematchFromScriptPointer(const u8 *data)
{
#if FREE_MATCH_CALL
return FALSE;
#else
TrainerBattleParameter *temp = (TrainerBattleParameter*)(data + OPCODE_OFFSET);
return ShouldTryRematchBattleForTrainerId(temp->params.opponentA);
#endif
}
#undef OPCODE_OFFSET
@ -1793,11 +1797,13 @@ static bool8 WasSecondRematchWon(const struct RematchTrainer *table, u16 firstBa
return FALSE;
if (!HasTrainerBeenFought(table[tableId].trainerIds[1]))
return FALSE;
#if FREE_MATCH_CALL == FALSE
if (I_VS_SEEKER_CHARGING)
{
if (gSaveBlock1Ptr->trainerRematches[tableId] == 0)
return FALSE;
}
#endif
return TRUE;
}