Fixing a couple minor bugs

DoorShuffle.py

@@ -1349,6 +1349,7 @@ logical_connections = [
     ('Skull Pot Circle Star Path', 'Skull Map Room'),
     ('Skull Big Chest Hookpath', 'Skull 1 Lobby'),
     ('Skull Back Drop Star Path', 'Skull Small Hall'),
+    ('Thieves Rail Ledge Drop Down', 'Thieves BK Corner'),
     ('Thieves Hellway Orange Barrier', 'Thieves Hellway S Crystal'),
     ('Thieves Hellway Crystal Orange Barrier', 'Thieves Hellway'),
     ('Thieves Hellway Blue Barrier', 'Thieves Hellway N Crystal'),

Doors.py

@@ -538,6 +538,7 @@ def create_doors(world, player):
         create_door(player, 'Thieves BK Corner WS Edge', Open).dir(We, 0xcc, None, Low),
         create_door(player, 'Thieves BK Corner S Edge', Open).dir(So, 0xcc, None, Low),
         create_door(player, 'Thieves BK Corner SW Edge', Open).dir(So, 0xcc, None, Low),
+        create_door(player, 'Thieves Rail Ledge Drop Down', Lgcl),
         create_door(player, 'Thieves Rail Ledge W', Nrml).dir(We, 0xcc, Mid, High).pos(2),
         create_door(player, 'Thieves Rail Ledge NW', Nrml).dir(No, 0xcc, Left, High).pos(1),
         create_door(player, 'Thieves BK Corner NE', Nrml).dir(No, 0xcc, Right, High).big_key().pos(0),

Regions.py

@@ -468,7 +468,7 @@ def create_regions(world, player):
         # tt
         create_dungeon_region(player, 'Thieves Lobby', 'Thieves\' Town', ['Thieves\' Town - Map Chest'], ['Thieves Town Exit', 'Thieves Lobby N Edge', 'Thieves Lobby NE Edge', 'Thieves Lobby E']),
         create_dungeon_region(player, 'Thieves Ambush', 'Thieves\' Town', ['Thieves\' Town - Ambush Chest'], ['Thieves Ambush S Edge', 'Thieves Ambush SE Edge', 'Thieves Ambush ES Edge', 'Thieves Ambush EN Edge', 'Thieves Ambush E']),
-        create_dungeon_region(player, 'Thieves Rail Ledge', 'Thieves\' Town', None, ['Thieves Rail Ledge NW', 'Thieves Rail Ledge W']),
+        create_dungeon_region(player, 'Thieves Rail Ledge', 'Thieves\' Town', None, ['Thieves Rail Ledge NW', 'Thieves Rail Ledge W', 'Thieves Rail Ledge Drop Down']),
         create_dungeon_region(player, 'Thieves BK Corner', 'Thieves\' Town', None, ['Thieves BK Corner WN Edge', 'Thieves BK Corner WS Edge', 'Thieves BK Corner S Edge', 'Thieves BK Corner SW Edge', 'Thieves BK Corner NE']),
         create_dungeon_region(player, 'Thieves Compass Room', 'Thieves\' Town', ['Thieves\' Town - Compass Chest'], ['Thieves Compass Room NW Edge', 'Thieves Compass Room N Edge', 'Thieves Compass Room WS Edge', 'Thieves Compass Room W']),
         create_dungeon_region(player, 'Thieves Big Chest Nook', 'Thieves\' Town', ['Thieves\' Town - Big Key Chest'], ['Thieves Big Chest Nook WS Edge']),

Rom.py

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

RoomData.py

@@ -265,7 +265,7 @@ class Room(object):
         self.modified = True
 
     def delete(self, list_idx):
-        self.doorList[list_idx] = (0xff, 0xff)
+        self.doorList[list_idx] = (Position.FF, DoorKind.FF)
 
     def address(self):
         return self.doorListAddress
@@ -350,6 +350,7 @@ class DoorKind(Enum):
     Warp = 0x46
     CaveEntranceLow08 = 0x48
     TrapLowE3 = 0x4A  # Maybe this is a toggle flag too?
+    FF = 0xFF
 
 
 @unique
@@ -390,6 +391,7 @@ class Position(Enum):
     EastN2 = 0x93
     East2 = 0xA3
     # EastS2 = 0xB3
+    FF = 0xFF
 
 
 class TestWorld(object):

asm/spiral.asm

@@ -26,8 +26,9 @@ SpiralWarp: {
     stz $07 ; this is a x quad adjuster for those blasted staircase on the edges
     lda $01 : and #$01 : !sub $a9
     bne .xQuad
+    lda $0462 : and #$04 : bne .xqCont
     inc $07
-    lda $22 : bne .skipXQuad ; this is an edge case
+    .xqCont lda $22 : bne .skipXQuad ; this is an edge case
     dec $23 : bra .skipXQuad ; need to -1 if $22 is 0
     .xQuad sta $06 : !add $a9 : sta $a9
     lda $0462 : and #$04 : bne .xCont

notes.txt

@@ -1,5 +1,8 @@
 Notes:
 
+Ice Spike Stairs seems to be off and maybe Lonely Freezor
+Pod bk ledge stairs
+
 AgaTower usually doesn't have enough Key Door candidates
 (Testing) Camera spots in Aga Tower: Push Statue, Lone Statue maybe?
 (Testing Waterfall Now) Spiral stairs without keys look funny - change to Incognito instead of Normal