Merge branch 'master' into pal181

Author: zohassadar

CHANGELOG.md

@@ -20,6 +20,7 @@
 * Fixed storage bug for push down points
 * Fixed crashes in garbage mode 4
 * Fixed line clearing happening on pause
+* Fixed PAL level 181 colour
 * Famicom Keyboard support
 * MMC3 Support
 * MMC5 Support

src/nmi/render_mode_play_and_demo.asm

@@ -325,7 +325,7 @@ updatePaletteForLevel:
         tax
         lda palFlag
         beq @renderPalettes
-        cpx #$35 ; Level 181 & 245 and'd with $3F
+        cpx #$35 ; Level 181 & 245 and'd with $3F (level 53 is properly mod10'd)
         bne @renderPalettes
         ldx #$40
 @renderPalettes:

tests/src/palettes.rs

@@ -294,11 +294,20 @@ pub fn test() {
 
     let pal_flag = labels::get("palFlag") as usize;
     emu.memory.iram_raw[pal_flag] = 1;
-    emu.memory.iram_raw[level_number] = 181;
-    emu.memory.iram_raw[render_flags] = labels::get("RENDER_LEVEL") as u8;
-    emu.run_until_vblank();
-    let bg_palette = &emu.ppu.palette[9..12];
-    let sprite_palette = &emu.ppu.palette[25..28];
-    assert_eq!(bg_palette, sprite_palette);
-    assert_eq!(bg_palette, pal181);
+
+    for level in 0..256 {
+        emu.memory.iram_raw[level_number] = level as u8;
+        emu.memory.iram_raw[render_flags] = labels::get("RENDER_LEVEL") as u8;
+        emu.run_until_vblank();
+        let bg_palette = &emu.ppu.palette[9..12];
+        let sprite_palette = &emu.ppu.palette[25..28];
+
+        assert_eq!(bg_palette, sprite_palette);
+
+        if level == 181 || level == 245 {
+            assert_eq!(bg_palette, pal181);
+        } else {
+            assert_eq!(bg_palette, PALETTES[level]);
+        }
+    }
 }