From 1defb93144d3edb4d4dc742bb07bbc4df2f009b7 Mon Sep 17 00:00:00 2001 From: scawful Date: Fri, 25 Oct 2024 16:30:41 -0400 Subject: [PATCH] Housekeeping --- Items/goldstar.asm | 2 +- Sprites/NPCs/followers.asm | 2 +- Sprites/NPCs/mermaid.asm | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Items/goldstar.asm b/Items/goldstar.asm index daa011b..ea0ad89 100644 --- a/Items/goldstar.asm +++ b/Items/goldstar.asm @@ -593,7 +593,7 @@ pullpc ; Hookshot box size BallChain_TryAncillaDraw: { -; Ball Chain timer should be $FF here on first run + ; Ball Chain timer should be $FF here on first run LDA $7A : AND #$00FF : CMP #$0000 : BEQ + CMP #$0001 : BEQ + SEP #$20 diff --git a/Sprites/NPCs/followers.asm b/Sprites/NPCs/followers.asm index 25e12f1..8b206ec 100644 --- a/Sprites/NPCs/followers.asm +++ b/Sprites/NPCs/followers.asm @@ -424,7 +424,7 @@ Sprite_39_ZoraBaby: RTS } } -print "End of Sprite 39 Locksmith ", pc +print "End of Sprite 39 Locksmith ", pc assert pc() <= $06BD9C pullpc diff --git a/Sprites/NPCs/mermaid.asm b/Sprites/NPCs/mermaid.asm index 2ed79f2..b2ecd18 100644 --- a/Sprites/NPCs/mermaid.asm +++ b/Sprites/NPCs/mermaid.asm @@ -308,7 +308,6 @@ Sprite_Mermaid_Main: { %PlayAnimation(0,1,16) JSL Sprite_PlayerCantPassThrough - print pc %ShowUnconditionalMessage($01A1) ; If there are no scrolls yet