From 2e3f06d6d8be20a0eef4e79e3e52ccd2d729bf31 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Fri, 29 Nov 2024 16:03:49 -0500
Subject: [PATCH] Update mask form palette upload to use time of day

---
 Masks/bunny_hood.asm    |  7 ++++++-
 Masks/deku_mask.asm     |  7 ++++++-
 Masks/mask_routines.asm |  6 +++---
 Masks/minish_form.asm   |  3 ---
 Masks/wolf_mask.asm     | 16 +++++++++-------
 Masks/zora_mask.asm     |  7 ++++++-
 6 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Masks/bunny_hood.asm b/Masks/bunny_hood.asm
index bbdee06..35ee30d 100644
--- a/Masks/bunny_hood.asm
+++ b/Masks/bunny_hood.asm
@@ -25,7 +25,12 @@ UpdateBunnyPalette:
   LDX #$001E
 
   .loop
-  LDA.l bunny_palette, X : STA $7EC6E0, X
+  LDA.l bunny_palette, X
+  PHX
+  STA.l !pal_color
+  JSL ColorSubEffect
+  PLX
+  STA $7EC6E0, X
   DEX : DEX : BPL .loop
 
   SEP #$30 ; go back to 8 bit mode
diff --git a/Masks/deku_mask.asm b/Masks/deku_mask.asm
index 691954e..eacfb50 100644
--- a/Masks/deku_mask.asm
+++ b/Masks/deku_mask.asm
@@ -13,7 +13,12 @@ UpdateDekuPalette:
   LDX #$001E
 
   .loop
-  LDA.l deku_palette, X : STA $7EC6E0, X
+  LDA.l deku_palette, X
+  PHX
+  STA.l !pal_color
+  JSL ColorSubEffect
+  PLX
+  STA $7EC6E0, X
   DEX : DEX : BPL .loop
 
   SEP #$30 ; go back to 8 bit mode
diff --git a/Masks/mask_routines.asm b/Masks/mask_routines.asm
index 6ab52b5..9c43ea5 100644
--- a/Masks/mask_routines.asm
+++ b/Masks/mask_routines.asm
@@ -10,8 +10,6 @@ macro PlayerTransform()
   STA $012E
 endmacro
 
-
-
 macro CheckNewR_ButtonPress()
   LDA.b $F6 : BIT.b #$10
 endmacro
@@ -191,7 +189,9 @@ Palette_ArmorAndGloves:
   LDA.b $BC : AND #$00FF : STA $02
 
   .loop
-    LDA [$00] : STA $7EC300, X : STA $7EC500, X
+    LDA [$00]
+    JSL ColorBgFix
+    STA $7EC300, X : STA $7EC500, X
     INC $00 : INC $00
     INX #2
   DEY : BPL .loop
diff --git a/Masks/minish_form.asm b/Masks/minish_form.asm
index da258b7..a1e8cf9 100644
--- a/Masks/minish_form.asm
+++ b/Masks/minish_form.asm
@@ -4,9 +4,6 @@
 ; Reacts to Tile ID 64 to transform into Minish Link
 ; =========================================================
 
-org    $07DA2A
-  TileDetection_OverworldAttributeJumpTable:
-
 ; Overworld Collision Tables
 org $07DAF2
   dw LinkState_CheckForMinishForm ; Tile ID 64
diff --git a/Masks/wolf_mask.asm b/Masks/wolf_mask.asm
index d5e10f8..0edaced 100644
--- a/Masks/wolf_mask.asm
+++ b/Masks/wolf_mask.asm
@@ -9,8 +9,13 @@ UpdateWolfPalette:
   LDX #$001E
 
   .loop
-    LDA.l WolfPalette, X : STA $7EC6E0, X
-    DEX : DEX : BPL .loop
+    LDA.l WolfPalette, X
+    PHX
+    STA.l !pal_color
+    JSL ColorSubEffect
+    PLX
+    STA $7EC6E0, X
+  DEX : DEX : BPL .loop
 
   SEP #$30 ; go back to 8 bit mode
   INC $15  ; update the palette
@@ -27,11 +32,8 @@ WolfPalette:
 
 ; =========================================================
 
-org $07A3DB
-  LinkItem_Flute:
-
-org $07A32C
-  LinkItem_Shovel:
+LinkItem_Flute = $07A3DB
+LinkItem_Shovel =  $07A32C
 
 ; LinkItem_Shovel
 org $07A3B2
diff --git a/Masks/zora_mask.asm b/Masks/zora_mask.asm
index 70d8eff..9f6bc2a 100644
--- a/Masks/zora_mask.asm
+++ b/Masks/zora_mask.asm
@@ -17,7 +17,12 @@ UpdateZoraPalette:
   LDX #$001E
 
   .loop
-  LDA.l zora_palette, X : STA $7EC6E0, X
+  LDA.l zora_palette, X
+  PHX
+  STA.l !pal_color
+  JSL ColorSubEffect
+  PLX
+  STA $7EC6E0, X
   DEX : DEX : BPL .loop
 
   SEP #$30 ; go back to 8 bit mode