diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 40413a0..e88f1a1 100644 --- 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 diff --git a/dialog.asm b/dialog.asm index 1bead2f..cd0bff8 100644 --- 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 diff --git a/events.asm b/events.asm index b7fb316..b9dec7f 100644 --- 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 + diff --git a/newitems.asm b/newitems.asm index 28a3fcf..88905fa 100644 --- a/newitems.asm +++ b/newitems.asm @@ -377,7 +377,7 @@ ItemBehavior: .mirror LDA.l MirrorEquipment : CMP.b #$02 : !BGE + - INC : STA.l MirrorEquipment ; upgrade mirror + INC : STA.l MirrorEquipment ; upgrade mirror + RTS