Merge in DoorDev changes

Revert ci changes

Items.py

@@ -62,8 +62,8 @@ item_table = {'Bow': (True, False, None, 0x0B, 'You have\nchosen the\narcher cla
               'Progressive Glove': (True, False, None, 0x61, 'a way to lift\nheavier things', 'and the lift upgrade', 'body-building kid', 'some glove for sale', 'fungus for gloves', 'body-building boy lifts again', 'a glove'),
               'Silver Arrows': (True, False, None, 0x58, 'Do you fancy\nsilver tipped\narrows?', 'and the ganonsbane', 'ganon-killing kid', 'ganon doom for sale', 'fungus for pork', 'archer boy shines again', 'the silver arrows'),
               'Green Pendant': (True, False, 'Crystal', [0x04, 0x38, 0x62, 0x00, 0x69, 0x01], None, None, None, None, None, None, None),
-              'Red Pendant': (True, False, 'Crystal', [0x02, 0x34, 0x60, 0x00, 0x69, 0x02], None, None, None, None, None, None, None),
-              'Blue Pendant': (True, False, 'Crystal', [0x01, 0x32, 0x60, 0x00, 0x69, 0x03], None, None, None, None, None, None, None),
+              'Blue Pendant': (True, False, 'Crystal', [0x02, 0x34, 0x60, 0x00, 0x69, 0x02], None, None, None, None, None, None, None),
+              'Red Pendant': (True, False, 'Crystal', [0x01, 0x32, 0x60, 0x00, 0x69, 0x03], None, None, None, None, None, None, None),
               'Triforce': (True, False, None, 0x6A, '\n   YOU WIN!', 'and the triforce', 'victorious kid', 'victory for sale', 'fungus for the win', 'greedy boy wins game again', 'the Triforce'),
               'Power Star': (True, False, None, 0x6B, 'a small victory', 'and the power star', 'star-struck kid', 'star for sale', 'see stars with shroom', 'mario powers up again', 'a Power Star'),
               'Triforce Piece': (True, False, None, 0x6C, 'a small victory', 'and the thirdforce', 'triangular kid', 'triangle for sale', 'fungus for triangle', 'wise boy has triangle again', 'a Triforce Piece'),

RELEASENOTES.md

@@ -27,3 +27,5 @@ Note: Only one of the key indicator will probably become core at most.
 * Small vitreous eyeballs will not drop items (DR basic and crossed only)
 * In Vanilla doors the HC back hallway area was broken - should be better now - also Trap Doors
 * Firebar speed should now be consistent. Ice palace rooms have slow firebars even if shuffled to other dungeons. Others should have normal speed firebars.
+* Red/Blue pendant swap fixed (originally ER bug)
+* Compass shuffle vs map shuffle item menu fix (originally ER bug)

Rom.py

@@ -22,7 +22,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'a4d716a9c9b3299267deee4ddb1143a5'
+RANDOMIZERBASEHASH = '9ed3ae2d129faa1cd3858e2f72b11b62'
 
 
 class JsonRom(object):

asm/hudadditions.asm

@@ -25,7 +25,7 @@ HudAdditions:
 
                 lda #$2811 : sta $7ec740
                 lda $7ef366 : and.l $0098c0, x : bne .check
-                    lda BigKeyStatus, x : and #$00ff : bne + ;todo: "and" is redundant or change table to one byte
+                    lda BigKeyStatus, x : bne + ; change this, if bk status changes to one byte
                         lda #$2574 : bra ++
                     + cmp #$0002 : bne +
                         lda #$2420 : bra ++
@@ -59,6 +59,7 @@ CountChestKeys:
     rtl
 
 CountChest:
+    lda !MULTIWORLD_ITEM_PLAYER_ID : bne .end
     cpy #$24 : beq +
     cpy #$a0 : !blt .end
     cpy #$ae : !bge .end