From 9a7963e4ced07842bb15f316997943d6d855a879 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 6 Aug 2020 09:14:17 +0200 Subject: [PATCH] Multi battle support for var arguments --- src/battle_tower.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/battle_tower.c b/src/battle_tower.c index b753ef7de1..5b17bdf4fb 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -2155,9 +2155,9 @@ void DoSpecialTrainerBattle(void) gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLE | BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER; } - gPartnerSpriteId = gSpecialVar_0x8007; - FillPartnerParty(gSpecialVar_0x8006 + TRAINER_CUSTOM_PARTNER); - gPartnerTrainerId = gSpecialVar_0x8006 + TRAINER_CUSTOM_PARTNER; + gPartnerSpriteId = VarGet(gSpecialVar_0x8007); + gPartnerTrainerId = VarGet(gSpecialVar_0x8006) + TRAINER_CUSTOM_PARTNER; + FillPartnerParty(gPartnerTrainerId); CreateTask(Task_StartBattleAfterTransition, 1); PlayMapChosenOrBattleBGM(0); if (gSpecialVar_0x8005 & MULTI_BATTLE_2_VS_WILD)