From b3fcd2192e1558126aa3bb2cfc4f8aedc80ae3f4 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@sirsidynix.com>
Date: Tue, 8 Dec 2020 10:57:37 -0700
Subject: [PATCH] Some DR changes (outdoor check for hub and keydrop correct
 KeyTable address) Shop VRAM issue investigated but not solved

---
 LTTP_RND_GeneralBugfixes.asm |  2 +-
 framehook.asm                |  1 -
 hudadditions.asm             |  5 +++--
 keydropshuffle.asm           |  2 +-
 shopkeeper.asm               | 28 ++++++++++++++--------------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 3c53e3f..3275a33 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -148,6 +148,7 @@ incsrc map.asm
 incsrc msu.asm
 incsrc dialog.asm
 incsrc entrances.asm
+incsrc clock.asm
 incsrc accessability.asm
 incsrc heartbeep.asm
 incsrc capacityupgrades.asm
@@ -194,7 +195,6 @@ incsrc retro.asm
 incsrc dpadinvert.asm
 incsrc boots.asm
 incsrc events.asm
-incsrc clock.asm
 incsrc fileselect.asm
 incsrc playername.asm
 incsrc decryption.asm
diff --git a/framehook.asm b/framehook.asm
index ba9d5ec..fdec526 100644
--- a/framehook.asm
+++ b/framehook.asm
@@ -42,7 +42,6 @@ FrameHookAction:
 	PLP : PLA
 RTL
 ;--------------------------------------------------------------------------------
-!NMI_AUX = "$7F5044"
 NMIHookAction:
 	PHA : PHX : PHY : PHD ; thing we wrote over, push stuff
 
diff --git a/hudadditions.asm b/hudadditions.asm
index f0ed773..9b78a0a 100644
--- a/hudadditions.asm
+++ b/hudadditions.asm
@@ -15,8 +15,9 @@ HudAdditions:
         LDX.b $07 : TXA : ORA.w #$2400 : STA !GOAL_DRAW_ADDRESS+14 ; draw 1's digit
     ++
 
-    ldx $040c : cpx #$ff : bne + : rts : +
-    lda.l DRMode : bne + : rts : +
+	LDX $1B : BNE + : RTS : + ; Skip if outdoors
+	ldx $040c : cpx #$ff : bne + : rts : + ; Skip if not in dungeon
+	lda.l DRMode : bne + : rts : + ; Skip if not door rando
         phb : phk : plb
         lda $7ef364 : and.l $0098c0, x : beq +
             lda.w CompassBossIndicator, x : and #$00ff : cmp $a0 : bne +
diff --git a/keydropshuffle.asm b/keydropshuffle.asm
index 7b64746..a150774 100644
--- a/keydropshuffle.asm
+++ b/keydropshuffle.asm
@@ -126,7 +126,7 @@ KeyGet:
 		lda !MULTIWORLD_ITEM_PLAYER_ID : bne .receive
 		phx
 			lda $040c : lsr : tax
-			lda $00 : cmp KeyTable, x : bne +
+			lda $00 : CMP.l KeyTable, x : bne +
 					- JSL.l FullInventoryExternal : jsl CountChestKeyLong : plx : pla : rtl
 			+ cmp #$af : beq - ; universal key
 			cmp #$24 : beq -   ; small key for this dungeon
diff --git a/shopkeeper.asm b/shopkeeper.asm
index cc546eb..620fa8c 100644
--- a/shopkeeper.asm
+++ b/shopkeeper.asm
@@ -194,20 +194,20 @@ SpritePrep_ShopKeeper:
 	BRL -
 	.stop
 	
-	;LDA $A0 : CMP.b #$FF : BNE .normal
-	;.dumb
-	;	LDA $2137
-	;	LDA $213F
-	;	LDA $213D
-	;	CMP.b #60
-	;	!BLT .dumb
-	;.normal
-	;LDA #$80 : STA $2100
-	;JSR Shopkeeper_UploadVRAMTiles
-	;LDA #$0F : STA $2100
-	LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA !NMI_AUX+2
-	LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA !NMI_AUX+1
-	LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA !NMI_AUX
+	LDA $A0 : CMP.b #$FF : BNE .normal
+	.dumb
+		LDA $2137
+		LDA $213F
+		LDA $213D
+		CMP.b #60
+		!BLT .dumb
+	.normal
+	LDA #$80 : STA $2100
+	JSR Shopkeeper_UploadVRAMTiles
+	LDA #$0F : STA $2100
+;	LDA.b #Shopkeeper_UploadVRAMTilesLong>>16 : STA !NMI_AUX+2
+;	LDA.b #Shopkeeper_UploadVRAMTilesLong>>8 : STA !NMI_AUX+1
+;	LDA.b #Shopkeeper_UploadVRAMTilesLong>>0 : STA !NMI_AUX
 
 	.done
 	LDA.l !SHOP_TYPE : BIT.b #$20 : BEQ .notTakeAll ; Take-all