fix GBC BIOS overwriting palette in SGB mode

Lana-chan · Mar 13, 2023 · 04f88d9 · 04f88d9
1 parent 7269f5b
commit 04f88d9
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/arm9/source/gameboy.cpp b/arm9/source/gameboy.cpp
@@ -398,10 +398,6 @@ void initGameboyMode() {
         case 0: // GB
             gbRegs.af.b.h = 0x01;
             gbMode = GB;
-            if (romSlot0[0x143] == 0x80 || romSlot1[0x143] == 0xC0)
-                // Init the palette in case the bios overwrote it, since it
-                // assumed it was starting in GBC mode.
-                initGFXPalette(true);
             break;
         case 1: // GBC
             gbRegs.af.b.h = 0x11;
@@ -416,6 +412,11 @@ void initGameboyMode() {
             initSGB();
             break;
     }
+
+    if (gbMode == GB && (romSlot0[0x143] == 0x80 || romSlot1[0x143] == 0xC0))
+        // Init the palette in case the bios overwrote it, since it
+        // assumed it was starting in GBC mode.
+        initGFXPalette(true);
 }
 
 void checkLYC() {