update zora princess collision

This commit is contained in:
scawful
2024-07-04 14:07:26 -04:00
parent 978774330d
commit 0fa69b9196

View File

@@ -64,22 +64,22 @@ Sprite_ZoraPrincess_Prep:
Sprite_ZoraPrincess_Main:
{
LDA.w SprAction, X; Load the SprAction
JSL UseImplicitRegIndexedLocalJumpTable; Goto the SprAction we are currently in
JSL Sprite_PlayerCantPassThrough
LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable
dw WaitForLink
dw CheckForSongOfHealing
dw ThanksMessage
dw GiveZoraMask
WaitForLink:
{
%PlayAnimation(0, 1, 10)
%ShowSolicitedMessage($0C5) : BCC .no_hablaba
%GotoAction(1)
.no_hablaba
RTS
}
@@ -97,7 +97,6 @@ Sprite_ZoraPrincess_Main:
ThanksMessage:
{
%PlayAnimation(0, 1, 10)
LDA.w SprTimerD, X : BNE +
%ShowUnconditionalMessage($0C6)
LDA.b #$C0 : STA.w SprTimerD, X
@@ -109,20 +108,16 @@ Sprite_ZoraPrincess_Main:
GiveZoraMask:
{
LDA.w SprTimerD, X : BNE +
LDY #$0F : STZ $02E9 ; Give the Deku Mask
LDY #$0F : STZ $02E9 ; Give the Zora Mask
JSL Link_ReceiveItem
LDA #$01 : STA.l $7EF302
LDA.b #$00 : STA $0DD0, X
+
RTS
}
}
Sprite_ZoraPrincess_Draw:
{
JSL Sprite_PrepOamCoord