From 72615a7c35321d20b3f7c2e1b42d0552d6390291 Mon Sep 17 00:00:00 2001 From: Zimmermann Gyula Date: Sat, 23 Dec 2023 12:29:12 +0100 Subject: [PATCH] Prevent infinite loop. (#3808) Regression caused by https://github.com/rh-hideout/pokeemerald-expansion/pull/3592/commits/fe1bad68b4e7fe37de7a33b5cdab5ef6314d1a00 --- src/battle_tower.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/battle_tower.c b/src/battle_tower.c index 015f6d207f..6dba9a63ed 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -2989,6 +2989,8 @@ static void FillPartnerParty(u16 trainerId) otID = STEVEN_OTID; else otID = ((firstIdPart % 72) * 1000) + ((secondIdPart % 23) * 10) + (thirdIdPart % 37) % 65536; + + do { personality = Random32(); } while (IsShinyOtIdPersonality(otID, personality));