From 8eea132406f53e5857d1eec72181867b469bddfc Mon Sep 17 00:00:00 2001 From: FosterProgramming Date: Sun, 9 Nov 2025 18:16:19 +0100 Subject: [PATCH] Fix missing FREE_MATCH_CALL (#8171) Co-authored-by: Zimmermann Gyula --- src/battle_setup.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/battle_setup.c b/src/battle_setup.c index 1103818c05..1505f6af65 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -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; }