From 45f564b233ecaa5f15fa81cf9446230e453b7fd9 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 28 Jun 2024 16:19:20 -0400
Subject: [PATCH] add comments to CheckIfNight16Bit for the day/night system

---
 Overworld/time_system.asm | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/Overworld/time_system.asm b/Overworld/time_system.asm
index 5b87e0e..8aafe74 100644
--- a/Overworld/time_system.asm
+++ b/Overworld/time_system.asm
@@ -416,8 +416,6 @@ CheckIfNight:
   LDA $7EE000 : CMP.b #$12 : BCS .day_time
     LDA.b #$03
     RTL
-  .dont_change
-
 }
 
 warnpc $0EF3F9  ; free space
@@ -487,18 +485,18 @@ pullpc
 
 CheckIfNight16Bit:
 {
+  ; Don't change the spriteset during the intro sequence
   LDA.l $7EF3C5 : AND.w #$00FF : CMP.w #$0002 : BCC .day_time
-  LDA $7EE000 : AND.w #$00FF : CMP.w #$0006 : BCC .night_time
-    .day_time
-    LDA.l $7EF3C5
-
-    RTL
+    ; If it's less than 6 am, jump to night time
+    LDA $7EE000 : AND.w #$00FF : CMP.w #$0006 : BCC .night_time
+  .day_time
+  LDA.l $7EF3C5
+  RTL
   .night_time
-
+  ; 0x12 = 18 hours or 6 pm
   LDA $7EE000 : AND.w #$00FF : CMP.w #$0012 : BCS .day_time
-    LDA.l $7EF3C5
-    CLC
-    ADC #$0001
+    ; Load the gamestate 03 spritesets, but don't change the save ram
+    LDA.l $7EF3C5 : CLC : ADC #$0001
     RTL
 }