Merge branch 'Crash-Detection' of https://github.com/HydrantDude/TetrisGYM into Crash-Detection

Author: HydrantDude

CHANGELOG.md

@@ -14,6 +14,7 @@
 * Floor 0 has original no-burns behaviour again
 * 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
 * Always Next Box removed
 * 0001 seeds are ignored

src/nmi/render_score.asm

@@ -196,6 +196,7 @@ getScoreDiv100k:
         lsr
         lsr
         lsr
+        clc
         tax
         lda multBy100Table, x
         adc tmpZ

tests/src/main.rs

@@ -3,6 +3,7 @@ mod input;
 mod labels;
 mod pushdown;
 mod rng;
+mod score;
 mod sps;
 mod util;
 mod video;
@@ -33,12 +34,14 @@ fn main() {
 
     // run tests
     if options.test {
+        score::test_render();
+        println!("score rendering works!");
+        pushdown::test();
+        println!("pushdown works!");
         rng::test();
         println!("rng seeds are the same!");
         sps::test();
         println!("sps is the same!");
-        pushdown::test();
-        println!("pushdown works!");
     }
 
     // print SPS sequences
@@ -63,18 +66,17 @@ fn main() {
 
     // other stuff
 
-    let rng_seed = labels::get("rng_seed") as usize;
-    let main_loop = labels::get("mainLoop");
-    let practise_type = labels::get("practiseType") as usize;
-    let game_mode = labels::get("gameMode") as usize;
-    let level_number = labels::get("levelNumber") as usize;
-    let b_modifier = labels::get("typeBModifier") as usize;
-    let mode_typeb = labels::get("MODE_TYPEB") as u8;
-
     if options.foo {
         let mut emu = util::emulator(None);
         let mut view = video::Video::new();
 
+        let rng_seed = labels::get("rng_seed") as usize;
+        let main_loop = labels::get("mainLoop");
+        let practise_type = labels::get("practiseType") as usize;
+        let game_mode = labels::get("gameMode") as usize;
+        let level_number = labels::get("levelNumber") as usize;
+        let b_modifier = labels::get("typeBModifier") as usize;
+        let mode_typeb = labels::get("MODE_TYPEB") as u8;
 
         rng::seeds().iter().for_each(|seed| {
 

tests/src/pushdown.rs

@@ -1,12 +1,12 @@
-use crate::{labels, util};
+use crate::{labels, util, score};
 
 pub fn test() {
     let mut emu = util::emulator(None);
 
     for pushdown in 2..15 {
         [0..1000, 24500..25500].into_iter().for_each(|range| {
             for score in range {
-                util::set_score(&mut emu, score);
+                score::set(&mut emu, score);
 
                 emu.registers.pc = labels::get("addPushDownPoints");
                 emu.memory.iram_raw[labels::get("holdDownPoints") as usize] = pushdown;
@@ -15,7 +15,7 @@ pub fn test() {
 
                 let reference = pushdown_impl(pushdown, score as u16) as u32;
 
-                assert_eq!(reference, util::get_score(&mut emu) - score);
+                assert_eq!(reference, score::get(&mut emu) - score);
             }
         });
     }

tests/src/rng.rs

@@ -1,6 +1,16 @@
 use crate::{util, labels};
 use std::collections::HashSet;
 
+pub fn test() {
+    assert_eq!(
+        seeds(),
+        include_str!("./rng_seeds.txt")
+            .split(',')
+            .map(|s| s.trim().parse::<u16>().expect(s))
+            .collect::<HashSet<_>>()
+    );
+}
+
 pub fn seeds() -> HashSet<u16> {
     let mut emu = util::emulator(None);
     let rng_seed = labels::get("rng_seed");
@@ -33,13 +43,3 @@ pub fn seeds() -> HashSet<u16> {
 
     seeds
 }
-
-pub fn test() {
-    assert_eq!(
-        seeds(),
-        include_str!("./rng_seeds.txt")
-            .split(',')
-            .map(|s| s.trim().parse::<u16>().expect(s))
-            .collect::<HashSet<_>>()
-    );
-}

tests/src/score.rs

@@ -0,0 +1,60 @@
+use rusticnes_core::nes::NesState;
+use crate::{labels, score, util};
+
+pub fn test_render() {
+    let mut emu = util::emulator(None);
+
+    let rendered_score = |emu: &mut NesState| {
+        let vram_offset = emu.ppu.current_vram_address - 6;
+
+        (vram_offset..vram_offset + 6)
+            .map(|i| emu.ppu.read_byte(&mut *emu.mapper, i))
+            .collect::<Vec<u8>>()
+    };
+
+    // check classic score rendering works
+
+    for i in 0..1000 {
+        let score = i * 100000;
+
+        score::set(&mut emu, score);
+        emu.registers.pc = labels::get("renderClassicScore");
+        util::run_to_return(&mut emu, false);
+
+        assert_eq!((i % 16) as u8, rendered_score(&mut emu)[0]);
+    }
+
+    // check score cap works
+
+    let score = 8952432;
+    score::set(&mut emu, score);
+    emu.registers.pc = labels::get("renderScoreCap");
+    util::run_to_return(&mut emu, false);
+    assert_eq!(vec![9, 9, 9, 9, 9, 9], rendered_score(&mut emu));
+}
+
+pub fn set(emu: &mut NesState, score: u32) {
+    let score_addr = labels::get("score");
+    let binscore_addr = labels::get("binScore");
+    let bcd_str = format!("{:08}", score);
+    let bcd_a = i64::from_str_radix(&bcd_str[0..2], 16).unwrap();
+    let bcd_b = i64::from_str_radix(&bcd_str[2..4], 16).unwrap();
+    let bcd_c = i64::from_str_radix(&bcd_str[4..6], 16).unwrap();
+    let bcd_d = i64::from_str_radix(&bcd_str[6..8], 16).unwrap();
+
+    emu.memory.iram_raw[(score_addr + 3) as usize] = bcd_a as u8;
+    emu.memory.iram_raw[(score_addr + 2) as usize] = bcd_b as u8;
+    emu.memory.iram_raw[(score_addr + 1) as usize] = bcd_c as u8;
+    emu.memory.iram_raw[score_addr as usize] = bcd_d as u8;
+    emu.memory.iram_raw[binscore_addr as usize] = score as u8;
+    emu.memory.iram_raw[(binscore_addr + 1) as usize] = (score >> 8) as u8;
+    emu.memory.iram_raw[(binscore_addr + 2) as usize] = (score >> 16) as u8;
+    emu.memory.iram_raw[(binscore_addr + 3) as usize] = (score >> 24) as u8;
+}
+
+pub fn get(emu: &mut NesState) -> u32 {
+    let binscore_addr = labels::get("binScore");
+    emu.memory.iram_raw[binscore_addr as usize] as u32
+        + ((emu.memory.iram_raw[(binscore_addr + 1) as usize] as u32) << 8)
+        + ((emu.memory.iram_raw[(binscore_addr + 2) as usize] as u32) << 16)
+}

tests/src/util.rs

@@ -43,25 +43,24 @@ pub fn print_step(emu: &mut NesState) {
     println!("{}", opcode_info::disassemble_instruction(emu.cpu.opcode, 0, 0).0);
 }
 
-pub fn set_score(emu: &mut NesState, score: u32) {
-    let score_addr = labels::get("score");
-    let binscore_addr = labels::get("binScore");
-    let bcd_str = format!("{:06}", score);
-    let bcd_a = i64::from_str_radix(&bcd_str[0..2], 16).unwrap();
-    let bcd_b = i64::from_str_radix(&bcd_str[2..4], 16).unwrap();
-    let bcd_c = i64::from_str_radix(&bcd_str[4..6], 16).unwrap();
-
-    emu.memory.iram_raw[(score_addr + 2) as usize] = bcd_a as u8;
-    emu.memory.iram_raw[(score_addr + 1) as usize] = bcd_b as u8;
-    emu.memory.iram_raw[score_addr as usize] = bcd_c as u8;
-    emu.memory.iram_raw[binscore_addr as usize] = score as u8;
-    emu.memory.iram_raw[(binscore_addr + 1) as usize] = (score >> 8) as u8;
-    emu.memory.iram_raw[(binscore_addr + 2) as usize] = (score >> 16) as u8;
-}
+pub const fn _ppu_addr_to_xy(ppu_addr: u16) -> (u8, u8) {
+    const SCREEN_WIDTH: u16 = 256 / 8;
+    const SCREEN_HEIGHT: u16 = 240 / 8;
+
+    let base_address = ppu_addr & 0x2C00;
+
+    let (base_x, base_y) = match base_address {
+        0x2000 => (0, 0),
+        0x2400 => (1, 0),
+        0x2800 => (0, 1),
+        0x2C00 => (1, 1),
+        _ => panic!("Invalid PPU address"),
+    };
+
+    let offset = ppu_addr - base_address;
+
+    let x = base_x * SCREEN_WIDTH + (offset % 32);
+    let y = base_y * SCREEN_HEIGHT + (offset / 32);
 
-pub fn get_score(emu: &mut NesState) -> u32 {
-    let binscore_addr = labels::get("binScore");
-    emu.memory.iram_raw[binscore_addr as usize] as u32
-        + ((emu.memory.iram_raw[(binscore_addr + 1) as usize] as u32) << 8)
-        + ((emu.memory.iram_raw[(binscore_addr + 2) as usize] as u32) << 16)
+    (x as _, y as _)
 }