From 73d100d5df10ab5d370938b0364e5b4f3f25e88b Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Thu, 28 Nov 2024 14:33:15 -0500
Subject: [PATCH] Fix bug with using masks in dark world dungeons

---
 Masks/gbc_form.asm        | 8 ++++----
 Overworld/time_system.asm | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Masks/gbc_form.asm b/Masks/gbc_form.asm
index d7ccd16..62b8dd1 100644
--- a/Masks/gbc_form.asm
+++ b/Masks/gbc_form.asm
@@ -50,10 +50,10 @@ LinkState_GameboyInDungeonEntrance:
 {
   ; if link is in the dark world, change his sprite to the gbc one
   LDA $0FFF : CMP #$00 : BEQ .return
-    LDA.w !CurrentMask : CMP.b #$05 : BEQ .return
-      LDA $BC :  CMP #$06 : BEQ .return
-      JSL UpdateGbcPalette
-      LDA #$3B : STA $BC   ; change link's sprite
+    LDA.w !CurrentMask : BNE .return
+      LDA $BC : CMP #$06 : BEQ .return
+        JSL UpdateGbcPalette
+        LDA #$3B : STA $BC ; change link's sprite
   .return
   JSL $0AFE80 ; Underworld_HandleLayerEffect
   RTL
diff --git a/Overworld/time_system.asm b/Overworld/time_system.asm
index 8a3e4ae..c43ecb5 100644
--- a/Overworld/time_system.asm
+++ b/Overworld/time_system.asm
@@ -125,7 +125,7 @@ RunClock:
   .counter_increasing
   ; GBC Link code
   LDA $0FFF : CMP #$00 : BEQ .light_world
-    LDA $02B2 : CMP.b #$05 : BCS .already_gbc_or_minish
+    LDA $02B2 : BNE .already_gbc_or_minish
       JSL UpdateGbcPalette
       LDA.b #$3B : STA $BC   ; change link's sprite
       LDA.b #$06 : STA $02B2 ; set the form id