From b0b825cce92b95494bdc9ab8cf48af9621af3f7a Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 27 Aug 2024 18:41:37 -0400
Subject: [PATCH] fix save and quit bg color bug

---
 Overworld/time_system.asm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/Overworld/time_system.asm b/Overworld/time_system.asm
index d41c0cd..67d8e2f 100644
--- a/Overworld/time_system.asm
+++ b/Overworld/time_system.asm
@@ -421,24 +421,26 @@ SubAreasFix:
     SEP #$20
 	PLX
   .no_effect
-	STA PaletteBuffer_HUD
-	STA PaletteBuffer_BG
+	STA.l PaletteBuffer_HUD
+	STA.l PaletteBuffer_BG
 	RTL
 }
 
+GlovePalettePosition = $7EC4FA
+
 GlovesFix:
 {
 	STA.l !pal_color
 	LDA $1B : AND #$00FF : BEQ .outdoors3
     LDA.l !pal_color
-    STA $7EC4FA
+    STA GlovePalettePosition
     RTL
 
   .outdoors3:
 	PHX
 	JSL ColorSubEffect
 	PLX
-	STA $7EC4FA
+	STA GlovePalettePosition
 	RTL
 }
 
@@ -457,10 +459,22 @@ CheckIfNight:
 
 ColorBgFix:
 {
+  PHA
+  SEP #$30
+  ; Check for save and quit
+  LDA.b $10 : CMP.b #$17 : BEQ .vanilla
+  REP #$30
+  PLA 
   JSL ColorSubEffect
   STA.l PaletteCgram_HUD
   STA.l PaletteCgram_BG
   RTL
+
+  .vanilla
+  REP #$30
+  PLA
+  STA.l PaletteCgram_HUD
+  RTL
 }
 
 pushpc