--Fixed Aga Tower staircase (Push statue)

--Petting Zoo rename
--Gui fix for repeated options
--Eliminated bad rule - (It Required Desert BK even if wallslide not in desert)

DoorShuffle.py

@@ -127,7 +127,7 @@ def vanilla_key_logic(world, player):
             raise Exception('Vanilla key layout not valid %s' % builder.name)
         if player not in world.key_logic.keys():
             world.key_logic[player] = {}
-        key_layout = analyze_dungeon(key_layout, world, player)
+        analyze_dungeon(key_layout, world, player)
         world.key_logic[player][builder.name] = key_layout.key_logic
     validate_vanilla_key_logic(world, player)
 
@@ -1122,7 +1122,7 @@ def determine_required_paths(world):
             paths['Hyrule Castle'].append('Hyrule Dungeon Cellblock')
             # noinspection PyTypeChecker
             paths['Hyrule Castle'].append(('Hyrule Dungeon Cellblock', 'Sanctuary'))
-    if world.doorShuffle in ['basic', 'experimental']:  # todo: crossed?
+    if world.doorShuffle in ['basic']:
         paths['Thieves Town'].append('Thieves Attic Window')
     return paths
 
@@ -1986,7 +1986,7 @@ default_door_connections = [
     ('GT Hope Room EN', 'GT Tile Room WN'),
     ('GT Big Chest SW', 'GT Invisible Catwalk NW'),
     ('GT Bob\'s Room SE', 'GT Invisible Catwalk NE'),
-    ('GT Speed Torch NE', 'GT Trap Room SE'),
+    ('GT Speed Torch NE', 'GT Petting Zoo SE'),
     ('GT Speed Torch SE', 'GT Crystal Conveyor NE'),
     ('GT Warp Maze (Pits) ES', 'GT Invisible Catwalk WS'),
     ('GT Hookshot NW', 'GT DMs Room SW'),

Doors.py

@@ -972,7 +972,7 @@ def create_doors(world, player):
         create_door(player, 'GT Warp Maze - Main Rails Right Mid Warp', Warp),
         create_door(player, 'GT Warp Maze - Pot Rail Warp', Warp),
         create_door(player, 'GT Warp Maze (Rails) WS', Nrml).dir(We, 0x7d, Bot, High).pos(1),
-        create_door(player, 'GT Trap Room SE', Nrml).dir(So, 0x7d, Right, High).trap(0x4).pos(0),
+        create_door(player, 'GT Petting Zoo SE', Nrml).dir(So, 0x7d, Right, High).trap(0x4).pos(0),
         create_door(player, 'GT Conveyor Star Pits EN', Nrml).dir(Ea, 0x7b, Top, High).small_key().pos(1),
         create_door(player, 'GT Hidden Star ES', Nrml).dir(Ea, 0x7b, Bot, High).pos(2).kill(),
         create_door(player, 'GT Hidden Star Warp', Warp),

Dungeons.py

@@ -287,7 +287,7 @@ gt_regions = [
     'GT Double Switch Exit', 'GT Spike Crystals', 'GT Warp Maze - Left Section', 'GT Warp Maze - Mid Section',
     'GT Warp Maze - Right Section', 'GT Warp Maze - Pit Section', 'GT Warp Maze - Pit Exit Warp Spot',
     'GT Warp Maze Exit Section', 'GT Firesnake Room', 'GT Firesnake Room Ledge', 'GT Warp Maze - Rail Choice',
-    'GT Warp Maze - Rando Rail', 'GT Warp Maze - Main Rails', 'GT Warp Maze - Pot Rail', 'GT Trap Room',
+    'GT Warp Maze - Rando Rail', 'GT Warp Maze - Main Rails', 'GT Warp Maze - Pot Rail', 'GT Petting Zoo',
     'GT Conveyor Star Pits', 'GT Hidden Star', 'GT DMs Room', 'GT Falling Bridge', 'GT Randomizer Room', 'GT Ice Armos',
     'GT Big Key Room', 'GT Four Torches', 'GT Fairy Abyss', 'GT Crystal Paths', 'GT Mimics 1', 'GT Mimics 2',
     'GT Dash Hall', 'GT Hidden Spikes', 'GT Cannonball Bridge', 'GT Refill', 'GT Gauntlet 1', 'GT Gauntlet 2',

Gui.py

@@ -320,9 +320,6 @@ def guiMain(args=None):
     timerFrame.pack(expand=True, anchor=E)
     progressiveFrame.pack(expand=True, anchor=E)
     algorithmFrame.pack(expand=True, anchor=E)
-    heartbeepFrame.pack(expand=True, anchor=E)
-    heartcolorFrame.pack(expand=True, anchor=E)
-    fastMenuFrame.pack(expand=True, anchor=E)
 
     enemizerFrame = LabelFrame(randomizerWindow, text="Enemizer", padx=5, pady=5)
     enemizerFrame.columnconfigure(0, weight=1)

Regions.py

@@ -655,7 +655,7 @@ def create_regions(world, player):
         create_dungeon_region(player, 'GT Warp Maze - Rando Rail', 'Ganon\'s Tower', None, ['GT Warp Maze (Rails) WS', 'GT Warp Maze - Rando Rail Warp']),
         create_dungeon_region(player, 'GT Warp Maze - Main Rails', 'Ganon\'s Tower', None, ['GT Warp Maze - Main Rails Best Warp', 'GT Warp Maze - Main Rails Mid Left Warp', 'GT Warp Maze - Main Rails Mid Right Warp', 'GT Warp Maze - Main Rails Right Top Warp', 'GT Warp Maze - Main Rails Right Mid Warp']),
         create_dungeon_region(player, 'GT Warp Maze - Pot Rail', 'Ganon\'s Tower', None, ['GT Warp Maze - Pot Rail Warp']),
-        create_dungeon_region(player, 'GT Trap Room', 'Ganon\'s Tower', None, ['GT Trap Room SE']),
+        create_dungeon_region(player, 'GT Petting Zoo', 'Ganon\'s Tower', None, ['GT Petting Zoo SE']),
         create_dungeon_region(player, 'GT Conveyor Star Pits', 'Ganon\'s Tower', ['Ganons Tower - Conveyor Star Pits Pot Key'], ['GT Conveyor Star Pits EN']),
         create_dungeon_region(player, 'GT Hidden Star', 'Ganon\'s Tower', None, ['GT Hidden Star ES', 'GT Hidden Star Warp']),
         create_dungeon_region(player, 'GT DMs Room', 'Ganon\'s Tower', ['Ganons Tower - DMs Room - Top Left', 'Ganons Tower - DMs Room - Top Right',

Rom.py

@@ -18,7 +18,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '7dd5fc42926c73856b8b2b956668efd3'
+RANDOMIZERBASEHASH = 'f4c6e0ad6aa3e36d2a16f4340d6e0c36'
 
 
 class JsonRom(object):

Rules.py

@@ -271,7 +271,6 @@ def global_rules(world, player):
     # Desert
     set_rule(world.get_location('Desert Palace - Torch', player), lambda state: state.has_Boots(player))
     set_rule(world.get_entrance('Desert Wall Slide NW', player), lambda state: state.has_fire_source(player))
-    add_rule(world.get_entrance('Desert Wall Slide NW', player), lambda state: state.has('Big Key (Desert Palace)', player))
     set_defeat_dungeon_boss_rule(world.get_location('Desert Palace - Prize', player))
     set_defeat_dungeon_boss_rule(world.get_location('Desert Palace - Boss', player))
 

asm/spiral.asm

@@ -112,7 +112,9 @@ LookupSpiralOffset: {
     stz $01 : bra .done
     .iceu lda $22 : cmp #$78 : bcc .done
     inc $01 : bra .done
-    .quad3 lda #$02 : sta $01 ; always 2
+    .quad3
+    lda $a2 : cmp #$40 : beq .done ; top of aga exception
+    lda #$02 : sta $01 ; always 2
 
     .done
     lda $a2 : tax : lda SpiralOffset,x