Merge branch 'main' into kara

2022-07-23 17:33:34 -07:00
parent 9d485e86cd 0e6e5d5b45
commit f7070dd30f
9 changed files with 703 additions and 714 deletions
--- a/inventory.asm
+++ b/inventory.asm
@@ -703,31 +703,13 @@ RTL
 RTS

 .setDungeonCompletion
-        LDA $040C
-	CMP #$FF : BEQ +
-		LSR : AND #$0F : CMP #$08 : !BGE ++
-			JSR .valueShift
-			ORA DungeonsCompleted : STA DungeonsCompleted
-			BRA +
-		++
-			!SUB #$08
-			JSR .valueShift
-			BIT.b #$C0 : BEQ +++ : LDA.b #$C0 : +++ ; Make Hyrule Castle / Sewers Count for Both
-			ORA DungeonsCompleted+1 : STA DungeonsCompleted+1
+	LDX $040C : BMI +
+		REP #$20  ; 16 bit
+		LDA.l DungeonMask, X
+		ORA DungeonsCompleted : STA DungeonsCompleted
+		SEP #$20  ; 8 bit
 	+
 RTS
-
-.valueShift
-	PHX
-	TAX : LDA.b #$01
-	-
-		CPX #$00 : BEQ +
-		ASL
-		DEX
-	BRA -
-	+
-	PLX
-RTS
 ;--------------------------------------------------------------------------------

 ;--------------------------------------------------------------------------------