Merge branch 'master' into mapper_edit

zohassadar · web-flow · commit 3bfc8a82df6f · 2024-02-03T18:41:50.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,20 +3,20 @@
 ## [unreleased]
 * Crunch Mode
 * Marathon Mode
-* Added hidden score option
-* M Scoring changed to just add a millions counter to Classic Scoring
-* Famicom Keyboard support
-* MMC3 Support
-* MMC5 Support
+* Hidden Score Mode
+* M Score changed to Classic Scoring + Millions counter
 * Invisible linecap turns entire playfield invisible
 * Invisible mode preserves original piece colors
 * 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 CNROM legal screen CHR bank
 * Fixed CNROM legal to title flicker
-* Fixed ingame score display at 8 million with Classic Scoring
 * Block Tool pieces wrap around
 * 0001 seeds are ignored
+* Famicom Keyboard support
+* MMC3 Support
+* MMC5 Support
 
 ## [v5 tournament]
 * Linecap Menu (from CTM Masters September 2022)
diff --git a/src/constants.asm b/src/constants.asm
@@ -40,7 +40,7 @@ TETRIMINO_X_HIDE := $EF
 
 PAUSE_SPRITE_X := $74
 PAUSE_SPRITE_Y := $58
-; yobi-style
+; jazzthief-style
 ; PAUSE_SPRITE_X := $C4
 ; PAUSE_SPRITE_Y := $16
 
diff --git a/src/gamemode/gametypemenu/menu.asm b/src/gamemode/gametypemenu/menu.asm
@@ -207,7 +207,6 @@ seedControls:
         jmp @skipSeedDown
 @lowNybbleDown:
         lda set_seed_input, x
-        clc
         tay
         and #$F
         ; cmp #$0 ; and sets z flag
@@ -220,6 +219,7 @@ seedControls:
         jmp @skipSeedDown
 @noWrapDown:
         tya
+        sec
         sbc #1
         sta set_seed_input, x
 @skipSeedDown:
diff --git a/src/gamemodestate/initstate.asm b/src/gamemodestate/initstate.asm
@@ -40,6 +40,15 @@ gameModeState_initGameState:
         sta linecapState
         sta dasOnlyShiftDisabled
         sta invisibleFlag
+        sta currentFloor
+
+; initialize currentFloor if necessary
+        lda practiseType
+        cmp #MODE_FLOOR
+        bne @notFloor
+        lda floorModifier
+        sta currentFloor
+@notFloor:
 
         lda practiseType
         cmp #MODE_INVISIBLE
diff --git a/src/modes/floor.asm b/src/modes/floor.asm
@@ -1,5 +1,5 @@
 advanceGameFloor:
-        lda floorModifier
+        lda currentFloor
 drawFloor:
         ; get correct offset
         sta tmp1
diff --git a/src/playstate/completedrows.asm b/src/playstate/completedrows.asm
@@ -45,15 +45,15 @@ playState_checkForCompletedRows:
         bne @normalRow
 
 @floorCheck:
-        lda floorModifier
+        lda currentFloor
         beq @rowNotComplete
 
 @fullRowBurningCheck:
         inc activeFloorMode ; Floor is active
         lda #$13
         sec
         sbc generalCounter2 ; contains current row being checked
-        cmp floorModifier
+        cmp currentFloor
         bcc @rowNotComplete ; ignore floor rows
 @normalRow:
 
@@ -98,7 +98,7 @@ playState_checkForCompletedRows:
         beq @incrementLineIndex
         lda #$14
         sec
-        sbc floorModifier
+        sbc currentFloor
         tax
         ldy multBy10Table,x
         ldx #$0A
diff --git a/src/playstate/updatestats.asm b/src/playstate/updatestats.asm
@@ -164,6 +164,7 @@ checkLinecap: ; set linecapState
         sta garbageHole
         lda #1
         sta pendingGarbage
+        inc currentFloor
 @floorLinecapEnd:
 
 addPoints:
diff --git a/src/ram.asm b/src/ram.asm
@@ -209,10 +209,10 @@ linecapState: .res 1 ; $639 ; 0 if not triggered, 1 + linecapHow otherwise, rese
 dasOnlyShiftDisabled: .res 1 ; $63A
 
 invisibleFlag: .res 1 ; $63B  ; 0 for normal mode, non-zero for Invisible playfield rendering.  Reset on game init and game over.
+currentFloor: .res 1 ; $63C floorModifier is copied here at game init.  Set to 0 otherwise and incremented when linecap floor.
+mapperId: .res 1 ; $63D ; For INES_MAPPER 1000 (autodetect).  0 = CNROM.  1 = MMC1.
 
-mapperId: .res 1 ; $63C ; For INES_MAPPER 1000 (autodetect).  0 = CNROM.  1 = MMC1.  
-
-    .res $38
+    .res $37
 
 .if KEYBOARD
 newlyPressedKeys: .res 1 ; $0675
diff --git a/tests/src/floor.rs b/tests/src/floor.rs
@@ -0,0 +1,49 @@
+use crate::{util, labels, playfield};
+
+pub fn test() {
+    // check floor 0 doesnt burn lines
+
+    let mut emu = util::emulator(None);
+
+    for _ in 0..3 {
+        emu.run_until_vblank();
+    }
+
+    let practise_type = labels::get("practiseType") as usize;
+    let game_mode = labels::get("gameMode") as usize;
+    let main_loop = labels::get("mainLoop");
+    let level_number = labels::get("levelNumber") as usize;
+
+    // load floor 0
+
+    emu.memory.iram_raw[practise_type] = labels::get("MODE_FLOOR") as _;
+    emu.memory.iram_raw[level_number] = 18;
+    emu.memory.iram_raw[game_mode] = 4;
+
+    emu.registers.pc = main_loop;
+
+    for _ in 0..5 {
+        emu.run_until_vblank();
+    }
+
+    // setup a tetris
+
+    emu.memory.iram_raw[labels::get("currentPiece") as usize] = 0x11;
+    emu.memory.iram_raw[labels::get("tetriminoX") as usize] = 0x5;
+    emu.memory.iram_raw[labels::get("tetriminoY") as usize] = 0x11;
+    emu.memory.iram_raw[labels::get("autorepeatY") as usize] = 0;
+
+    playfield::set_str(&mut emu,r##"
+##### ####
+##### ####
+##### ####
+##### ####"##);
+
+    emu.memory.iram_raw[labels::get("vramRow") as usize] = 0;
+
+    for _ in 0..20 {
+        emu.run_until_vblank();
+    }
+
+    assert_ne!(playfield::get(&mut emu, 0, 19), 0xEF);
+}
diff --git a/tests/src/main.rs b/tests/src/main.rs
@@ -1,14 +1,17 @@
 mod block;
 mod cycle_count;
-mod drought;
 mod input;
 mod labels;
+mod playfield;
+mod util;
+mod video;
+
+mod drought;
+mod floor;
 mod pushdown;
 mod rng;
 mod score;
 mod sps;
-mod util;
-mod video;
 
 use gumdrop::Options;
 
@@ -39,6 +42,8 @@ fn main() {
 
     // run tests
     if options.test {
+        floor::test();
+        println!("floor 0 works!");
         score::test();
         println!("score works!");
         score::test_render();
diff --git a/tests/src/playfield.rs b/tests/src/playfield.rs
@@ -0,0 +1,49 @@
+use rusticnes_core::nes::NesState;
+use crate::{labels};
+
+pub fn set(emu: &mut NesState, x: u16, y: u16, value: u8) {
+    let index = ((y * 10) + x) + labels::get("playfield");
+    emu.memory.iram_raw[index as usize] = value;
+}
+
+pub fn get(emu: &mut NesState, x: u16, y: u16) -> u8 {
+    let index = ((y * 10) + x) + labels::get("playfield");
+    emu.memory.iram_raw[index as usize]
+}
+
+#[allow(dead_code)]
+pub fn clear(emu: &mut NesState) {
+    for line in 0..20 {
+        self::fill_line(emu, line);
+    }
+}
+
+#[allow(dead_code)]
+pub fn fill_line(emu: &mut NesState, y: u16) {
+    for x in 0..10 {
+        self::set(emu, x, y, labels::get("BLOCK_TILES") as _);
+    }
+}
+
+pub fn set_str(emu: &mut NesState, playfield: &str) {
+    let rows = playfield.trim_start_matches('\n').split("\n").collect::<Vec<_>>();
+    let offset = 20 - rows.len() as u16;
+    rows.iter().enumerate().for_each(|(y, line)| {
+        line.chars().enumerate().for_each(|(x, ch)| {
+            self::set(emu, x as _, offset + y as u16, if ch == '#' { 0x7b } else { 0xef });
+        });
+    });
+}
+
+#[allow(dead_code)]
+pub fn get_str(emu: &mut NesState) -> String {
+    let mut s = String::new();
+    for y in 0..20 {
+        for x in 0..10 {
+            s.push_str(if self::get(emu, x, y) == 0xEF { " " } else { "#" });
+        }
+        s.push_str("\n");
+    }
+
+    s
+}
