From f3aa6f900c89c39fd5d5c30075ea456bb2ae1339 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 22 Sep 2024 20:08:17 -0400
Subject: [PATCH] housekeeping messages, overlays, mermaid

---
 Core/message.asm         | 7 +++++--
 Overworld/overlays.asm   | 6 +++---
 Sprites/NPCs/mermaid.asm | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Core/message.asm b/Core/message.asm
index 34f395e..94a7d5b 100644
--- a/Core/message.asm
+++ b/Core/message.asm
@@ -27,8 +27,10 @@ org $0ED436
   NOP #$06
 
 org $2F8000
-  MessageExpand:
-  LDA.b $02 : AND.w #$00FF : CMP.w #$000E : BNE + ; are we already in expanded bank?
+MessageExpand:
+{
+  ; are we already in expanded bank?
+  LDA.b $02 : AND.w #$00FF : CMP.w #$000E : BNE + 
     LDA.w #MessageExpandedData : STA.b $00
     LDA.w #MessageExpandedData>>16 : STA.b $02
     JML $0ED3FC ; go back to original read message code pointers 
@@ -37,6 +39,7 @@ org $2F8000
   LDA.w #$DF40 : STA.b $00
   LDA.w #$000E : STA.b $02
   JML $0ED3FC ; go back to original read message code pointers 
+}
 
 MessageExpandedData:
   Message_18D:
diff --git a/Overworld/overlays.asm b/Overworld/overlays.asm
index 9277e3d..96953fb 100644
--- a/Overworld/overlays.asm
+++ b/Overworld/overlays.asm
@@ -20,12 +20,12 @@ org $07866D
   LDA.b #$1B : STA.b $5D
   RTL
 
-; ================================================
+; =========================================================
 ; Overlays $04C6
 ; 01 - Zora Temple (OW 1E)
 ; 02 - Castle Bridge (OW 1B)
 ; 03 - Tail Palace (OW 2F)
-; 04 - TODO: Shrines
+; 04 - TODO: Goron Mines Entrance
 ; 05 - TODO: Fortress of Secrets (OW 5E)
 
 CameraCache = $0632
@@ -59,7 +59,7 @@ NewDesertCheck:
       LDA.w $0618 : STA.w CameraCache
       SEP #$20
   +
-  JML $07A493 ; returnPos ; do not !
+  JML $07A493 ; return do not !
 }
 
 pushpc
diff --git a/Sprites/NPCs/mermaid.asm b/Sprites/NPCs/mermaid.asm
index 2fae49a..3e332be 100644
--- a/Sprites/NPCs/mermaid.asm
+++ b/Sprites/NPCs/mermaid.asm
@@ -1,5 +1,5 @@
 ; =========================================================
-; Mermaid and Maple NPC
+; Mermaid, Maple and Librarian NPC
 
 !SPRID              = Sprite_Mermaid
 !NbrTiles           = 02  ; Number of tiles used in a frame