Lots of bugfixes - see notes

asm/drhooks.asm

@@ -139,6 +139,14 @@ org $019dbd ; <- Bank01.asm : 4465 of Object_Draw8xN (LDA $9B52, Y : STA $7E2000
 jsl CutoffEntranceRug : bra .nextTile : nop
 .nextTile
 
+;maybe set 02e2 to 0
+
+org $0799de ; <- Bank07.asm : 4088 (LDA.b #$15 : STA $5D)
+JSL StoreTempBunnyState
+;
+org $08c450 ; <- ancilla_receive_item.asm : 146-148 (STY $5D : STZ $02D8)
+JSL RetrieveBunnyState : NOP
+
 ; These two, if enabled together, have implications for vanilla BK doors in IP/Hera/Mire
 ; IPBJ is common enough to consider not doing this. Mire is not a concern for vanilla - maybe glitched modes
 ; Hera BK door back can be seen with Pot clipping - likely useful for no logic seeds

asm/keydropshuffle.asm

@@ -116,10 +116,12 @@ KeyGet:
     lda $7ef36f ; what we wrote over
     pha
         lda.l ShuffleKeyDrops : bne +
-            pla : rtl
-        +
-        ldy $0e80, x
-        phy
+            - pla : rtl
+        + ldy $0e80, x
+        lda $a0 : cmp #$87 : bne +
+        	jsr ShouldKeyBeCountedForDungeon : bcc -
+        		jsl CountChestKeyLong : bra -
+        + phy
             jsr KeyGetPlayer : sta !MULTIWORLD_ITEM_PLAYER_ID
             jsl.l $0791b3 ; Player_HaltDashAttackLong
             jsl.l Link_ReceiveItem
@@ -136,6 +138,16 @@ KeyGet:
     pla : dec : rtl
 }
 
+; Input Y - the item type
+ShouldKeyBeCountedForDungeon:
+{
+	phx
+		lda $040c : lsr : tax
+		tya : cmp KeyTable, x : bne +
+			- plx : sec : rts
+		+ cmp #$24 : beq -
+	plx : clc : rts
+}
 
 BigKeyGet:
 {

asm/overrides.asm

@@ -88,6 +88,7 @@ SuctionOverworldFix:
 CutoffRooms:
 db $bc, $a2, $1a, $49, $14, $8c, $9f, $c2
 db $66, $5d, $a8
+; Don't forget CutoffRoomCount!!!
 
 CutoffEntranceRug:
     pha : phx
@@ -96,7 +97,7 @@ CutoffEntranceRug:
         cmp #$000C : bne .norm
           + lda $a0 : sep #$20 : ldx #$0000
           	- cmp.l CutoffRooms, x : beq .check
-          	inx : cpx #$0009 : !blt - ; CutoffRoom Count is here!
+          	inx : cpx #$000B : !blt - ; CutoffRoomCount is here!
         rep #$20
     .norm plx : pla : lda $9B52, y : sta $7E2000, x ; what we wrote over
 rtl
@@ -108,3 +109,15 @@ rtl
       bra  .norm
 .skip plx : pla : rtl
 
+
+StoreTempBunnyState:
+	LDA $5D : CMP #$1C : BNE +
+		STA $5F
+	+ LDA #$15 : STA $5D ; what we wrote over
+RTL
+
+RetrieveBunnyState:
+	STY $5D : STZ $02D8 ; what we wrote over
+	LDA $5F : BEQ +
+		STA $5D
++ RTL