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