Fix COL0_FLAG behavior in SGB

Baekalfen · Jan 19, 2024 · c007cde · c007cde
1 parent ee3c43b
commit c007cde
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/pyboy/core/lcd.py b/pyboy/core/lcd.py
@@ -72,10 +72,6 @@ def __init__(self, cgb, cartridge_cgb, disable_renderer, color_palette, cgb_colo
             self.OBP1.palette_mem_rgb = [(c << 8) for c in color_palette]
             self.renderer = Renderer(False)
 
-        self.BGP.palette_mem_rgb[0] |= COL0_FLAG
-        self.OBP0.palette_mem_rgb[0] |= COL0_FLAG
-        self.OBP1.palette_mem_rgb[0] |= COL0_FLAG
-
     def get_lcdc(self):
         return self._LCDC.value
 
@@ -302,7 +298,10 @@ def get(self):
         return self.value
 
     def getcolor(self, i):
-        return self.palette_mem_rgb[self.lookup[i]]
+        if i==0:
+            return self.palette_mem_rgb[self.lookup[0]] | COL0_FLAG
+        else:
+            return self.palette_mem_rgb[self.lookup[i]]
 
 
 class STATRegister: