scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dont draw shield for deku or wolf link

Browse Source
This commit is contained in:
scawful
2024-06-28 22:00:38 -04:00
parent 5c4aef2555
commit c02a7cac0a
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Masks/mask_routines.asm
View File

@@ -478,6 +478,7 @@ DekuLink_HoverBasedOnInput:
JSL Player_HaltDashAttack JSL Player_HaltDashAttack
; Pos - Cache Pos = difference
LDA $22 : SEC : SBC $3F : STA $31 LDA $22 : SEC : SBC $3F : STA $31
LDA $20 : SEC : SBC $3E : STA $30 LDA $20 : SEC : SBC $3E : STA $30
@@ -529,7 +530,11 @@ pushpc
LinkOAM_SetEquipmentVRAMOffsets = $0DABE6 LinkOAM_SetEquipmentVRAMOffsets = $0DABE6
LinkOAM_DrawShadow = $0DA857 LinkOAM_DrawShadow = $0DA857
org $0DA782
org $0DA780
LinkOAM_DrawShield:
{
REP #$30
JSL LinkOAM_CheckForDrawShield JSL LinkOAM_CheckForDrawShield
NOP #3 NOP #3
@@ -546,13 +551,17 @@ org $0DA782
BRL LinkOAM_DrawShadow BRL LinkOAM_DrawShadow
.shield_continue .shield_continue
}
pullpc pullpc
; Minish, Deku, Wolf don't draw shield
LinkOAM_CheckForDrawShield: LinkOAM_CheckForDrawShield:
{ {
LDA.w $02B2 : AND.w #$00FF : CMP.w #$0005 : BNE .shield LDA.w $02B2 : AND.w #$00FF : CMP.w #$0005 : BNE .shield
CMP.w #$0001 : BNE .shield
CMP.w #$0003 : BNE .shield
LDA.w #$0000 LDA.w #$0000
.shield .shield
RTL RTL