From e122ba28be6e3f3513afe31f71816368c5de1fcf Mon Sep 17 00:00:00 2001 From: ghoulslash <41651341+ghoulslash@users.noreply.github.com> Date: Thu, 9 May 2024 10:22:46 -0400 Subject: [PATCH] fix battle script clearing specialBattleType (#4536) Co-authored-by: ghoulslash --- src/battle_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/battle_main.c b/src/battle_main.c index f09c8110a3..46b633d3e8 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3254,11 +3254,13 @@ static void ClearSetBScriptingStruct(void) { // windowsType is set up earlier in BattleInitBgsAndWindows, so we need to save the value u32 temp = gBattleScripting.windowsType; + u32 specialBattleType = gBattleScripting.specialTrainerBattleType; memset(&gBattleScripting, 0, sizeof(gBattleScripting)); gBattleScripting.windowsType = temp; gBattleScripting.battleStyle = gSaveBlock2Ptr->optionsBattleStyle; gBattleScripting.expOnCatch = (B_EXP_CATCH >= GEN_6); + gBattleScripting.specialTrainerBattleType = specialBattleType; } static void BattleStartClearSetData(void)