PAL level 181 colour support

Author: kirjavascript

CHANGELOG.md

@@ -13,11 +13,13 @@
 * 0001 seeds are ignored
 * Floor no longer gobbled up by top line clear
 * Floor 0 has original no-burns behaviour again
-* Fixed ingame score display at 8 million with Classic Scoring
+* [Fixed ingame score display at 8/9 million with Classic Scoring](https://www.youtube.com/watch?v=fYdXky2i5AE)
 * Fixed CNROM legal screen CHR bank
 * Fixed CNROM legal to title flicker
 * Fixed piece skip when doing Sonic Drop then Hard Drop immediately
 * Fixed storage bug for push down points
+* Fixed crashes in garbage mode 4
+* Fixed line clearing happening on pause
 * Famicom Keyboard support
 * MMC3 Support
 * MMC5 Support

src/nmi/render_mode_play_and_demo.asm

@@ -343,6 +343,25 @@ updatePaletteForLevel:
         sta PPUDATA
         lda colorTable2,x
         sta PPUDATA
+        ; PAL level 181 is a different colour because of an address change
+        lda palFlag
+        beq @done
+        lda levelNumber
+        cmp #181
+        bne @done
+        lda #$3F
+        sta PPUADDR
+        lda #$09
+        sta PPUADDR
+        lda #$21
+        sta PPUDATA
+        lda #$3F
+        sta PPUADDR
+        lda #$19
+        sta PPUADDR
+        lda #$21
+        sta PPUDATA
+@done:
         rts
 
 ; 3 bytes per level in separate tables
@@ -365,22 +384,22 @@ colorTable0:
         .byte   $00,$01,$03,$05
 
 colorTable1:
-        .byte   $21,$29,$24,$2A 
-        .byte   $2B,$22,$00,$05 
-        .byte   $16,$27,$69,$14 
-        .byte   $20,$89,$14,$20 
-        .byte   $A5,$30,$C9,$A5 
-        .byte   $D0,$A5,$20,$A6 
-        .byte   $A5,$D0,$C9,$A9 
-        .byte   $85,$A9,$A9,$A6 
-        .byte   $99,$69,$C9,$A5 
-        .byte   $4C,$EB,$A9,$60 
-        .byte   $05,$D3,$00,$4A 
-        .byte   $AA,$60,$60,$17 
-        .byte   $29,$F0,$4E,$D0 
-        .byte   $A0,$AB,$07,$C9 
-        .byte   $38,$2A,$4E,$60 
-        .byte   $00,$01,$04,$05 
+        .byte   $21,$29,$24,$2A
+        .byte   $2B,$22,$00,$05
+        .byte   $16,$27,$69,$14
+        .byte   $20,$89,$14,$20
+        .byte   $A5,$30,$C9,$A5
+        .byte   $D0,$A5,$20,$A6
+        .byte   $A5,$D0,$C9,$A9
+        .byte   $85,$A9,$A9,$A6
+        .byte   $99,$69,$C9,$A5
+        .byte   $4C,$EB,$A9,$60
+        .byte   $05,$D3,$00,$4A
+        .byte   $AA,$60,$60,$17
+        .byte   $29,$F0,$4E,$D0
+        .byte   $A0,$AB,$07,$C9
+        .byte   $38,$2A,$4E,$60
+        .byte   $00,$01,$04,$05
 
 colorTable2:
         .byte   $12,$1A,$14,$12

tests/src/palettes.rs

@@ -267,6 +267,7 @@ pub fn test() {
     let level_number = labels::get("levelNumber") as usize;
     let render_flags = labels::get("renderFlags") as usize;
 
+
     // spend a few frames bootstrapping
     for _ in 0..3 {
         emu.run_until_vblank();
@@ -281,11 +282,23 @@ pub fn test() {
 
     for level in 0..256 {
         emu.memory.iram_raw[level_number] = level as u8;
-        emu.memory.iram_raw[render_flags] = 2;
+        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, PALETTES[level]);
     }
+
+    let pal181 = [0x21, 0x2b, 0x25];
+
+    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);
 }