diff --git a/data/i18n_en.bin b/data/i18n_en.bin index fbd7ded..1537236 100644 Binary files a/data/i18n_en.bin and b/data/i18n_en.bin differ diff --git a/dialog.asm b/dialog.asm index 99f25e7..e268b8a 100644 --- a/dialog.asm +++ b/dialog.asm @@ -227,7 +227,10 @@ DialogGanon1: REP #$20 LDA.w #$018C BCC + + JSL CheckMushroom LDA.w #$016D + BCC + + LDA.w #$0197 + STA.w TextID SEP #$20 JSL.l Sprite_ShowMessageMinimal_Alt @@ -247,6 +250,10 @@ DialogGanon2: REP #$20 BCS + LDA.w #$018D : JMP .done + + + JSL CheckMushroom + LDA.w #$0198 : JMP .done + BCC + + LDA.l GanonVulnerabilityItem : AND #$00FF : BNE .special_item LDA.l SpecialWeapons : AND.w #$00FF diff --git a/goalitem.asm b/goalitem.asm index 50f62cd..98c0125 100644 --- a/goalitem.asm +++ b/goalitem.asm @@ -1,7 +1,9 @@ GoalItemGanonCheck: LDA.w SpriteTypeTable, X : CMP.b #$D6 : BNE .success ; skip if not ganon JSL.l CheckGanonVulnerability - BCS .success + BCC .fail + JSL.l CheckMushroom + BCC .success .fail LDA.w SpriteActivity, X : CMP.b #17 : !BLT .success ; decmial 17 because Acmlm's chart is decimal diff --git a/trolls.asm b/trolls.asm index 6e26ee7..b322d38 100644 --- a/trolls.asm +++ b/trolls.asm @@ -176,3 +176,12 @@ SetLanmolaVelocity: ASL STA.w $0D50, X RTL + +CheckMushroom: + PHP + SEP #$20 + LDA.l InventoryTracking + AND.b #$20 + BEQ + + PLP : SEC : RTL ++ PLP : CLC : RTL