From 5226935857e77b85259fa5aece46eb431709da3f Mon Sep 17 00:00:00 2001 From: Eclipse <115349505+SubzeroEclipse@users.noreply.github.com> Date: Sat, 5 Aug 2023 04:56:05 +0200 Subject: [PATCH] =?UTF-8?q?Fixed=20Trainer=20class=20ball=20not=20assigned?= =?UTF-8?q?=20to=20second=20Pok=C3=A9mon=20(#3203)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/battle_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_main.c b/src/battle_main.c index 5841f8f615..b75c44b777 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1964,7 +1964,6 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer u8 fixedIV; s32 i, j; u8 monsCount; - s32 ball = -1; if (battleTypeFlags & BATTLE_TYPE_TRAINER && !(battleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_TRAINER_HILL))) @@ -1986,6 +1985,7 @@ u8 CreateNPCTrainerPartyFromTrainer(struct Pokemon *party, const struct Trainer for (i = 0; i < monsCount; i++) { + s32 ball = -1; u32 personalityHash = GeneratePartyHash(trainer, i); if (trainer->doubleBattle == TRUE) personalityValue = 0x80;