Merged in DR v1.4.1.10

controllerjank.asm

@@ -83,16 +83,16 @@ InvertDPad:
 	JML InvertDPadReturn
 
 	+ DEC : BNE +
-		JMP.w InvertDPad_DPadOnly
+		JMP InvertDPad_DPadOnly
 	+ DEC : BNE +
-		JMP.w InvertDPad_ButtonsOnly
+		JMP InvertDPad_ButtonsOnly
 	+ DEC : BNE +
-		JMP.w InvertDPad_Both
+		JMP InvertDPad_Both
 	+ DEC : BNE +
-		JMP.w InvertDPad_SwapSides
+		JMP InvertDPad_SwapSides
 	+ DEC : BNE +
-		JMP.w InvertDPad_DPadLROnly
-	+ JMP.w InvertDPad_DPadUDOnly
+		JMP InvertDPad_DPadLROnly
+	+ JMP InvertDPad_DPadUDOnly
 
 
 .onemind_controller_offset

doorrando/overrides.asm

@@ -19,7 +19,6 @@ OnFileLoadOverride:
 MirrorCheckOverride:
     lda.l DRFlags : and.b #$02 : beq ++
         lda.l MirrorEquipment : cmp.b #$01 : beq +
-    ;++ lda.b OverworldIndex : and.b #$40 ; what I wrote over
     ++ phx : ldx.b OverworldIndex : lda.l OWTileWorldAssoc,x : plx : and.b #$ff
     rtl
     + lda.l DRScroll : rtl

events.asm

@@ -272,6 +272,11 @@ PostItemAnimation:
                 LDA.b #$00 : STA.l TextBoxDefer
         +
 
+        LDA.w ItemReceiptMethod : CMP.b #$01 : BNE +
+            LDA.b LinkDirection : BEQ +
+                JSL IncrementChestTurnCounter
+        +
+
         LDA.b IndoorsFlag : BEQ +
         		REP #$20 : LDA.b RoomIndex : STA.l !MULTIWORLD_ROOMID : SEP #$20
         		LDA.w RoomItemsTaken : STA.l !MULTIWORLD_ROOMDATA
@@ -282,12 +287,8 @@ PostItemAnimation:
         		LDA.b #$00 : STA.l !MULTIWORLD_ITEM_PLAYER_ID
         		PLB
         		JML Ancilla_ReceiveItem_objectFinished
-		+
+	+
 
-        LDA.w ItemReceiptMethod : CMP.b #$01 : BNE +
-                LDA.b LinkDirection : BEQ +
-                        JSL IncrementChestTurnCounter
-        +
         REP #$20
         PEA.w $7E00
         PLB : PLB