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

update librarian logic

Browse Source
This commit is contained in:
scawful
2024-10-19 19:14:39 -04:00
parent 9d894a16cf
commit dfea61e1bc
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Sprites/NPCs/mermaid.asm
View File

@@ -241,7 +241,6 @@ Sprite_Mermaid_Main:
dw Librarian_OfferTranslation dw Librarian_OfferTranslation
dw Librarian_TranslateScroll dw Librarian_TranslateScroll
dw Librarian_FinishTranslation dw Librarian_FinishTranslation
dw Librarian_ScrollQuestComplete
LibrarianIdle: LibrarianIdle:
{ {
@@ -254,14 +253,17 @@ Sprite_Mermaid_Main:
RTS RTS
+ +
; Ah, another scroll! ; If the player has all the maps
%ShowSolicitedMessage($01A0) : BCC ++ JSR Librarian_CheckForAllMaps : BCC ++
INC.w SprAction, X %ShowSolicitedMessage($01A3)
RTS
++ ++
JSR Librarian_CheckForAllMaps : BCC +++ ; Ah, another scroll!
%ShowSolicitedMessage($01A0) : BCC +++
INC.w SprAction, X INC.w SprAction, X
+++ +++
RTS RTS
} }
@@ -308,7 +310,7 @@ Sprite_Mermaid_Main:
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
print pc print pc
%ShowUnconditionalMessage($01A1) %ShowUnconditionalMessage($01A1)
; If there are no scrolls yet ; If there are no scrolls yet
LDA.l Scrolls : AND #$01 : BNE .NotMushroomGrotto LDA.l Scrolls : AND #$01 : BNE .NotMushroomGrotto
LDA.l DNGMAP2 : AND #%00000010 : BEQ .NotMushroomGrotto LDA.l DNGMAP2 : AND #%00000010 : BEQ .NotMushroomGrotto
@@ -364,7 +366,7 @@ Sprite_Mermaid_Main:
{ {
%PlayAnimation(0,1,16) %PlayAnimation(0,1,16)
PHX PHX
LDY.b #$01 LDY.b #$01
LDA.w SprMiscG, X LDA.w SprMiscG, X
ASL A : TAX ASL A : TAX
@@ -393,14 +395,6 @@ Sprite_Mermaid_Main:
STZ.w SprAction, X STZ.w SprAction, X
RTS RTS
} }
Librarian_ScrollQuestComplete:
{
%PlayAnimation(0,1,16)
%ShowUnconditionalMessage($01A3)
STZ.w SprAction, X
RTS
}
} }
} }