From 81b956408e4c8de9876cf43e130d0b34d9ce8d17 Mon Sep 17 00:00:00 2001 From: ScorelessPine Date: Wed, 5 Jul 2023 18:49:36 -0700 Subject: [PATCH] SMZ3: Fixed Ganon sign text on AllDungeonsDefeatMotherBrain goal (#1617) --- worlds/smz3/TotalSMZ3/Patch.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/worlds/smz3/TotalSMZ3/Patch.py b/worlds/smz3/TotalSMZ3/Patch.py index a79c99a8..bb23b0b9 100644 --- a/worlds/smz3/TotalSMZ3/Patch.py +++ b/worlds/smz3/TotalSMZ3/Patch.py @@ -122,7 +122,7 @@ class Patch: self.WriteGanonInvicible(config.Goal) self.WritePreOpenPyramid(config.Goal) - self.WriteCrystalsNeeded(self.myWorld.TowerCrystals, self.myWorld.GanonCrystals) + self.WriteCrystalsNeeded(self.myWorld.TowerCrystals, self.myWorld.GanonCrystals, config.Goal) self.WriteBossesNeeded(self.myWorld.TourianBossTokens) self.WriteRngBlock() @@ -776,12 +776,15 @@ class Patch: def WriteBossesNeeded(self, tourianBossTokens): self.patches.append((Snes(0xF47200), getWordArray(tourianBossTokens))) - def WriteCrystalsNeeded(self, towerCrystals, ganonCrystals): + def WriteCrystalsNeeded(self, towerCrystals, ganonCrystals, goal: Goal): self.patches.append((Snes(0x30805E), [towerCrystals])) self.patches.append((Snes(0x30805F), [ganonCrystals])) self.stringTable.SetTowerRequirementText(f"You need {towerCrystals} crystals to enter Ganon's Tower.") - self.stringTable.SetGanonRequirementText(f"You need {ganonCrystals} crystals to defeat Ganon.") + if (goal == Goal.AllDungeonsDefeatMotherBrain): + self.stringTable.SetGanonRequirementText(f"You need to complete all the dungeons and bosses to defeat Ganon.") + else: + self.stringTable.SetGanonRequirementText(f"You need {ganonCrystals} crystals to defeat Ganon.") def WriteRngBlock(self): #/* Repoint RNG Block */