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

This commit is contained in:
2024-11-27 16:21:03 -06:00
parent 2d1b5116ec
commit 7a21eaa62a
4 changed files with 17 additions and 3 deletions

View File

@@ -159,7 +159,7 @@ incsrc hextodec.asm
incsrc textrenderer.asm incsrc textrenderer.asm
incsrc rewind.asm incsrc rewind.asm
incsrc lift.asm incsrc lift.asm
incsrc mothula.asm ; incsrc mothula.asm
incsrc switches.asm incsrc switches.asm
incsrc zoom_on_carry.asm incsrc zoom_on_carry.asm
incsrc iframes.asm incsrc iframes.asm

View File

@@ -234,7 +234,12 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
DialogItemReceive: DialogItemReceive:
BCS .nomessage ; if doubling the item value overflowed it must be a rando item 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 .nomessage
LDA.w #$FFFF LDA.w #$FFFF

View File

@@ -169,6 +169,15 @@ OnFileLoad:
JSL.l RefreshRainAmmo JSL.l RefreshRainAmmo
JSL.l SetEscapeAssist 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 + LDA.l IsEncrypted : CMP.b #01 : BNE +
JSL LoadStaticDecryptionKey JSL LoadStaticDecryptionKey
+ +

View File

@@ -377,7 +377,7 @@ ItemBehavior:
.mirror .mirror
LDA.l MirrorEquipment : CMP.b #$02 : !BGE + LDA.l MirrorEquipment : CMP.b #$02 : !BGE +
INC : STA.l MirrorEquipment ; upgrade mirror INC : STA.l MirrorEquipment ; upgrade mirror
+ +
RTS RTS