From 7a004de9a00fc86f64aaf299b029b1e2b040ad08 Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Fri, 19 Apr 2024 23:10:29 +0200
Subject: [PATCH] LttP: remove glitch triforce setting (#3174)

---
 BaseClasses.py      | 1 -
 Generate.py         | 1 -
 Main.py             | 1 -
 settings.py         | 1 -
 worlds/alttp/Rom.py | 2 +-
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index c9890938..53a6b3b1 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -133,7 +133,6 @@ class MultiWorld():
         self.random = ThreadBarrierProxy(random.Random())
         self.players = players
         self.player_types = {player: NetUtils.SlotType.player for player in self.player_ids}
-        self.glitch_triforce = False
         self.algorithm = 'balanced'
         self.groups = {}
         self.regions = self.RegionManager(players)
diff --git a/Generate.py b/Generate.py
index a04e913d..8c649d76 100644
--- a/Generate.py
+++ b/Generate.py
@@ -147,7 +147,6 @@ def main(args=None, callback=ERmain):
     erargs = parse_arguments(['--multi', str(args.multi)])
     erargs.seed = seed
     erargs.plando_options = args.plando
-    erargs.glitch_triforce = options.generator.glitch_triforce_room
     erargs.spoiler = args.spoiler
     erargs.race = args.race
     erargs.outputname = seed_name
diff --git a/Main.py b/Main.py
index 50ad94de..1be91a8b 100644
--- a/Main.py
+++ b/Main.py
@@ -43,7 +43,6 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
     multiworld.player_name = args.name.copy()
     multiworld.sprite = args.sprite.copy()
     multiworld.sprite_pool = args.sprite_pool.copy()
-    multiworld.glitch_triforce = args.glitch_triforce  # This is enabled/disabled globally, no per player option.
 
     multiworld.set_options(args)
     multiworld.set_item_links()
diff --git a/settings.py b/settings.py
index e94bb342..b463c5a0 100644
--- a/settings.py
+++ b/settings.py
@@ -671,7 +671,6 @@ class GeneratorOptions(Group):
     weights_file_path: WeightsFilePath = WeightsFilePath("weights.yaml")
     meta_file_path: MetaFilePath = MetaFilePath("meta.yaml")
     spoiler: Spoiler = Spoiler(3)
-    glitch_triforce_room: GlitchTriforceRoom = GlitchTriforceRoom(1)  # why is this here?
     race: Race = Race(0)
     plando_options: PlandoOptions = PlandoOptions("bosses, connections, texts")
 
diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py
index 11e2f0a3..08597cea 100644
--- a/worlds/alttp/Rom.py
+++ b/worlds/alttp/Rom.py
@@ -1616,7 +1616,7 @@ def patch_rom(world: MultiWorld, rom: LocalRom, player: int, enemized: bool):
     rom.write_byte(0xEFD95, digging_game_rng)
     rom.write_byte(0x1800A3, 0x01)  # enable correct world setting behaviour after agahnim kills
     rom.write_byte(0x1800A4, 0x01 if world.glitches_required[player] != 'no_logic' else 0x00)  # enable POD EG fix
-    rom.write_byte(0x186383, 0x01 if world.glitch_triforce or world.glitches_required[
+    rom.write_byte(0x186383, 0x01 if world.glitches_required[
         player] == 'no_logic' else 0x00)  # disable glitching to Triforce from Ganons Room
     rom.write_byte(0x180042, 0x01 if world.save_and_quit_from_boss else 0x00)  # Allow Save and Quit after boss kill