diff --git a/Options.py b/Options.py
index ed51081d..7a9259a1 100644
--- a/Options.py
+++ b/Options.py
@@ -92,13 +92,19 @@ class Logic(Choice):
     alias_owg = 2
 
 
-class Goal(Choice):
-    option_ganon = 0
-    option_fast_ganon = 1
-    option_all_dungeons = 2
+class Objective(Choice):
+    option_crystals = 0
+    #option_pendants = 1
+    option_triforce_pieces = 2
     option_pedestal = 3
-    option_triforce_hunt = 4
+    option_bingo = 4
 
+local_objective = Toggle # local triforce pieces, local dungeon prizes etc.
+
+class Goal(Choice):
+    option_kill_ganon = 0
+    option_kill_ganon_and_gt_agahnim = 1
+    option_hand_in = 2
 
 class Accessibility(Choice):
     option_locations = 0
diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py
index b625c95b..4877118d 100644
--- a/worlds/alttp/Rom.py
+++ b/worlds/alttp/Rom.py
@@ -1371,7 +1371,7 @@ def patch_rom(world, rom, player, team, enemized):
     rom.write_bytes(0x02F539, [0xEA, 0xEA, 0xEA, 0xEA, 0xEA] if world.powder_patch_required[player] else [0xAD, 0xBF, 0x0A, 0xF0, 0x4F])
 
     # allow smith into multi-entrance caves in appropriate shuffles
-    if world.shuffle[player] in ['restricted', 'full', 'crossed', 'insanity'] or (world.shuffle[player] == 'simple' and world.mode[player] == 'inverted'):
+    if world.shuffle[player] in ['restricted', 'full', 'crossed', 'insanity', 'madness'] or (world.shuffle[player] == 'simple' and world.mode[player] == 'inverted'):
         rom.write_byte(0x18004C, 0x01)
 
     # set correct flag for hera basement item