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

Update Zora handler

Browse Source
This commit is contained in:
scawful
2024-12-02 11:47:38 -05:00
parent 01e530e5fa
commit 4145ea8e4b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Sprites/NPCs/zora.asm
View File

@@ -15,6 +15,7 @@ Sprite_Zora_Long:
LDA.w WORLDFLAG : AND.w #$00FF : BEQ .eon_draw LDA.w WORLDFLAG : AND.w #$00FF : BEQ .eon_draw
SEP #$30 SEP #$30
JSR Sprite_EonZora_Draw JSR Sprite_EonZora_Draw
JSL Sprite_DrawShadow
LDA.b #$02 : STA.w SprMiscG, X LDA.b #$02 : STA.w SprMiscG, X
JMP + JMP +
.eon_draw .eon_draw
@@ -46,7 +47,7 @@ Sprite_Zora_Prep:
Sprite_Zora_Handler: Sprite_Zora_Handler:
{ {
LDA.w SprMiscG, X LDA.w SprMiscG, X
CMP.b #$02 : BNE .not_princess CMP.b #$01 : BNE .not_princess
JSR Sprite_ZoraPrincess_Main JSR Sprite_ZoraPrincess_Main
RTS RTS
.not_princess .not_princess
@@ -106,14 +107,14 @@ Zora_HandleDialogue:
{ {
LDA.l CRYSTALS : AND.b #$20 : BEQ +++ LDA.l CRYSTALS : AND.b #$20 : BEQ +++
%ShowSolicitedMessage($01A6) %ShowSolicitedMessage($01A6)
JMP ++ JMP +
+++ +++
LDA.w SprAction, X : BEQ + LDA.w SprAction, X : BEQ ++
%ShowSolicitedMessage($01A5) %ShowSolicitedMessage($01A5)
JMP ++ JMP +
+
%ShowSolicitedMessage($01A4)
++ ++
%ShowSolicitedMessage($01A4)
+
RTS RTS
} }