From 056b1bc9b82636d07cfe69ef7935f269782ccc92 Mon Sep 17 00:00:00 2001 From: Mads Ynddal <5528170+Baekalfen@users.noreply.github.com> Date: Sun, 12 Nov 2023 11:12:13 +0100 Subject: [PATCH] Fix CGB sprite priority --- pyboy/core/lcd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyboy/core/lcd.py b/pyboy/core/lcd.py index 7cc4e4204..a82f15b57 100644 --- a/pyboy/core/lcd.py +++ b/pyboy/core/lcd.py @@ -570,7 +570,7 @@ def scanline_sprites(self, lcd, ly, buffer, ignore_priority): if y <= ly < y + spriteheight: # x is used for sorting for priority if self.cgb: - self.sprites_to_render[sprite_count] = n << 16 | x + self.sprites_to_render[sprite_count] = n else: self.sprites_to_render[sprite_count] = x << 16 | n sprite_count += 1 @@ -587,7 +587,7 @@ def scanline_sprites(self, lcd, ly, buffer, ignore_priority): for _n in self.sprites_to_render[:sprite_count]: if self.cgb: - n = _n >> 16 + n = _n else: n = _n & 0xFF # n = self.sprites_to_render_n[_n]