Merge branch 'DRUnstable' into OWMain

2025-12-03 09:37:31 -06:00
parent 94efc26bf3 b583cc58ff
commit 581e45a63c
13 changed files with 232 additions and 58 deletions
--- a/heartpieces.asm
+++ b/heartpieces.asm
@@ -242,6 +242,12 @@ LoadOutdoorValue:
 	PHP
 	REP #$20 ; set 16-bit accumulator
 	LDA.b OverworldIndex
+	; Rain state fix: In rain state DW, use LW screen ID for item lookup
+	BIT.w #$0040 : BEQ +
+		LDA.l ProgressIndicator : AND.w #$00FF : CMP.w #$0002
+			LDA.b OverworldIndex : BCS ++ : AND.w #$00BF
+		++
+	+
 	CMP.w #$00 : BNE +
 		LDA.l OWBonkPrizeTable[$00].loot
 		JMP .done