diff --git a/arm9/source/gameboy.cpp b/arm9/source/gameboy.cpp index e3474b30..a37af921 100644 --- 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() {