50 rupees at start, show mirror message only on second mirror

2024-11-27 16:21:03 -06:00
parent 2d1b5116ec
commit 7a21eaa62a
4 changed files with 17 additions and 3 deletions
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -159,7 +159,7 @@ incsrc hextodec.asm
 incsrc textrenderer.asm
 incsrc rewind.asm
 incsrc lift.asm
-incsrc mothula.asm
+; incsrc mothula.asm
 incsrc switches.asm
 incsrc zoom_on_carry.asm
 incsrc iframes.asm
--- a/dialog.asm
+++ b/dialog.asm
@@ -234,7 +234,12 @@ RTL
 ;--------------------------------------------------------------------------------
 DialogItemReceive:
 	BCS .nomessage ; if doubling the item value overflowed it must be a rando item
-	CPY.b #$98 : BCC ++ ;if the item is $4C or greater it must be a rando item
+	CPY.b #$98 : BCS .nomessage ; if the item is $4C or greater it must be a rando item
+	CPY.b #$34 : BEQ .mirror
+	BRA ++
+.mirror
+	LDA.l MirrorEquipment : AND.w #$00FF
+	CMP.w #$0002 : BEQ ++
 .nomessage
 	LDA.w #$FFFF

--- a/events.asm
+++ b/events.asm
@@ -169,6 +169,15 @@ OnFileLoad:
 	JSL.l RefreshRainAmmo
 	JSL.l SetEscapeAssist

+	REP #$20
+	LDA.l CurrentRupees
+	CMP.w #50
+	BCS +
+	LDA.w #50
+	STA.l CurrentRupees
+	+
+	SEP #$20
+
 	LDA.l IsEncrypted : CMP.b #01 : BNE +
 		JSL LoadStaticDecryptionKey
 	+