Merge branch 'DRMain' into overworld_kara

2021-07-08 19:39:10 -07:00
parent 8b173ac27b 02e66ba9e3
commit 2c931527e9
4 changed files with 28 additions and 28 deletions
--- a/events.asm
+++ b/events.asm
@@ -57,7 +57,6 @@ RTL
 ;--------------------------------------------------------------------------------
 OnUncleItemGet:
 	PHA
-
 		LDA.l EscapeAssist
 		BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
 		BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : +
--- a/newhud.asm
+++ b/newhud.asm
@@ -145,9 +145,10 @@ SEP #$30
 	SEP #$20
 	LDA.b $1B : BEQ .noprize

-
-
-	LDX.w $040C : BMI .noprize
+	LDX.w $040C
+	CPX #$1A : !BGE .noprize
+	CPX #$04 : !BLT .noprize
+	CPX #$08 : BEQ .noprize

 	REP #$20

@@ -156,9 +157,10 @@ SEP #$30

 	LDA.l $7EF368
 	AND.l DungeonItemMasks,X
-	BEQ .doneprize
+	BEQ .noprize

 .drawprize
+	TXA : LSR : TAX
 	LDA.l CrystalPendantFlags_2, X
 	AND.w #$0040 : BNE .is_crystal

--- a/stats.asm
+++ b/stats.asm
@@ -147,7 +147,6 @@
 ; $7EF4FEw[2] - Save Checksum
 ;--------------------------------------------------------------------------------

-
 ;--------------------------------------------------------------------------------
 !LOCK_STATS = "$7EF443"
 ;--------------------------------------------------------------------------------