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

make librarian persist when changing rooms in library

Browse Source
This commit is contained in:
scawful
2024-07-05 23:18:35 -04:00
parent b4d6b0f11c
commit d330407409
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Sprites/NPCs/mermaid.asm
View File

@@ -61,6 +61,7 @@ Sprite_Mermaid_Long:
Sprite_Mermaid_Prep: Sprite_Mermaid_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
LDA.b #$80 : STA.w SprDefl, X
LDA.b #$40 : STA.w SprTimerA, X LDA.b #$40 : STA.w SprTimerA, X
STZ.w SprMiscE, X STZ.w SprMiscE, X
LDA.b #$07 : STA.w SprHitbox, X LDA.b #$07 : STA.w SprHitbox, X
@@ -230,7 +231,7 @@ Sprite_Mermaid_Main:
{ {
%PlayAnimation(0,1,16) %PlayAnimation(0,1,16)
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
%ShowUnconditionalMessage($012C) %ShowSolicitedMessage($012C)
RTS RTS
} }
} }
@@ -238,10 +239,10 @@ Sprite_Mermaid_Main:
Librarian_CheckForAllMaps: Librarian_CheckForAllMaps:
{ {
LDA.l DNGMAP1 LDA.l DNGMAP1
CMP.l #$FFFC CMP.w #$FFFC
BNE .not_all_maps BNE .not_all_maps
LDA.l DNGMAP2 LDA.l DNGMAP2
CMP.l #$FFFF CMP.w #$FFFF
BEQ .all_maps BEQ .all_maps
.not_all_maps .not_all_maps
CLC CLC