From c02a7cac0a40a6634c769e4578cf71aae715b1e9 Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 28 Jun 2024 22:00:38 -0400 Subject: [PATCH] dont draw shield for deku or wolf link --- Masks/mask_routines.asm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Masks/mask_routines.asm b/Masks/mask_routines.asm index 58579e8..00cfc52 100644 --- a/Masks/mask_routines.asm +++ b/Masks/mask_routines.asm @@ -478,6 +478,7 @@ DekuLink_HoverBasedOnInput: JSL Player_HaltDashAttack + ; Pos - Cache Pos = difference LDA $22 : SEC : SBC $3F : STA $31 LDA $20 : SEC : SBC $3E : STA $30 @@ -529,7 +530,11 @@ pushpc LinkOAM_SetEquipmentVRAMOffsets = $0DABE6 LinkOAM_DrawShadow = $0DA857 -org $0DA782 + +org $0DA780 +LinkOAM_DrawShield: +{ + REP #$30 JSL LinkOAM_CheckForDrawShield NOP #3 @@ -546,13 +551,17 @@ org $0DA782 BRL LinkOAM_DrawShadow .shield_continue +} pullpc +; Minish, Deku, Wolf don't draw shield LinkOAM_CheckForDrawShield: { LDA.w $02B2 : AND.w #$00FF : CMP.w #$0005 : BNE .shield + CMP.w #$0001 : BNE .shield + CMP.w #$0003 : BNE .shield LDA.w #$0000 .shield RTL