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

dismiss cape flag when switching items

Browse Source
This commit is contained in:
scawful
2024-07-08 22:14:47 -04:00
parent 7bb24227d0
commit 7b10c7fd29
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Masks/mask_routines.asm
View File

@@ -90,7 +90,7 @@ ForceResetMask_GameOver:
ForceResetMask_SaveAndQuit: ForceResetMask_SaveAndQuit:
{ {
LDA $02B2 : BEQ .still_link LDA !CurrentMask : BEQ .still_link
%ResetToLinkGraphics() %ResetToLinkGraphics()
.still_link .still_link
LDA.b #$0F LDA.b #$0F
@@ -102,7 +102,7 @@ ForceResetMask_SaveAndQuit:
Palette_ArmorAndGloves: Palette_ArmorAndGloves:
{ {
LDA $02B2 : CMP #$01 : BEQ .deku_mask LDA !CurrentMask : CMP #$01 : BEQ .deku_mask
CMP.b #$02 : BEQ .zora_mask CMP.b #$02 : BEQ .zora_mask
CMP.b #$03 : BEQ .wolf_mask CMP.b #$03 : BEQ .wolf_mask
CMP.b #$04 : BEQ .bunny_hood CMP.b #$04 : BEQ .bunny_hood
@@ -218,7 +218,7 @@ Overworld_CgramAuxToMain_Override:
LDA $7EC400, X : STA $7EC600, X LDA $7EC400, X : STA $7EC600, X
LDA $7EC440, X : STA $7EC640, X LDA $7EC440, X : STA $7EC640, X
LDA $7EC480, X : STA $7EC680, X LDA $7EC480, X : STA $7EC680, X
LDA $02B2 : BNE .has_mask_palette LDA !CurrentMask : BNE .has_mask_palette
LDA $7EC4C0, X : STA $7EC6C0, X LDA $7EC4C0, X : STA $7EC6C0, X
.has_mask_palette .has_mask_palette
INX #2 : CPX.b #$40 : BNE .loop INX #2 : CPX.b #$40 : BNE .loop
@@ -235,7 +235,8 @@ Overworld_CgramAuxToMain_Override:
LinkState_ResetMaskAnimated: LinkState_ResetMaskAnimated:
{ {
LDA.w $02B2 : BEQ .no_transform STZ.b $55
LDA.w !CurrentMask : BEQ .no_transform
CMP.b #$01 : BEQ .check_item_slot CMP.b #$01 : BEQ .check_item_slot
CMP.b #$02 : BEQ .no_transform CMP.b #$02 : BEQ .no_transform
CMP.b #$03 : BEQ .check_item_slot CMP.b #$03 : BEQ .check_item_slot
@@ -277,7 +278,7 @@ org $079CD9
pullpc pullpc
LinkItem_CheckForSwordSwing_Masks: LinkItem_CheckForSwordSwing_Masks:
{ {
LDA $02B2 : BEQ .return LDA !CurrentMask : BEQ .return
CMP.b #$02 : BEQ .return ; zora mask can use sword CMP.b #$02 : BEQ .return ; zora mask can use sword
CMP.b #$06 : BEQ .return ; gbc link can use sword CMP.b #$06 : BEQ .return ; gbc link can use sword
LDA #$01 LDA #$01
@@ -304,9 +305,8 @@ Link_TransformMask:
%PlayerTransform() %PlayerTransform()
PLA ; restore mask ID PLA ; restore mask ID
TAY TAY
; LDA $02B2
CPY !CurrentMask : BEQ .unequip ; check if mask is on CPY !CurrentMask : BEQ .unequip ; check if mask is on
STA $02B2 : TAX STA !CurrentMask : TAX
LDA .mask_gfx, X : STA $BC ; set the mask gfx LDA .mask_gfx, X : STA $BC ; set the mask gfx
JSL Palette_ArmorAndGloves ; set the palette JSL Palette_ArmorAndGloves ; set the palette
; STA $02F5 ; Somaria platform flag, no dash ; STA $02F5 ; Somaria platform flag, no dash
@@ -326,7 +326,8 @@ Link_TransformMask:
db $00, $35, $36, $38, $37, $39, $3A, $3B db $00, $35, $36, $38, $37, $39, $3A, $3B
} }
; TODO: Return to normal Link. ; =========================================================
Link_TransformMoosh: Link_TransformMoosh:
{ {
PHB : PHK : PLB PHB : PHK : PLB
@@ -528,7 +529,7 @@ DekuLink_HoverBasedOnInput:
DekuLink_CheckForDash: DekuLink_CheckForDash:
{ {
LDA.w $02B2 : CMP.b #$01 : BNE + LDA.w !CurrentMask : CMP.b #$01 : BNE +
STZ.b $F2 STZ.b $F2
+ +
LDA.b #$00 LDA.b #$00
@@ -1319,7 +1320,7 @@ pullpc
; Minish, Deku, Wolf don't draw shield ; Minish, Deku, Wolf don't draw shield
LinkOAM_CheckForDrawShield: LinkOAM_CheckForDrawShield:
{ {
LDA.w $02B2 : AND.w #$00FF : CMP.w #$0005 : BNE + LDA.w !CurrentMask : AND.w #$00FF : CMP.w #$0005 : BNE +
.no_shield .no_shield
LDA.w #$0000 LDA.w #$0000
RTL RTL