update to rustico; fix harddrop test

tests/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 gumdrop = "0.8.1"
-rusticnes-core = { git = "https://github.com/zeta0134/rusticnes-core.git", version = "0.2.0" }
+rustico-core = { git = "https://github.com/zeta0134/rustico.git", rev = "d31d380b1e15bf7cc80e8827730e56a6df77ae46" }
 minifb = "0.27"
 
 # for patch testing

tests/README.md

@@ -12,4 +12,4 @@ to verify various behaviour in the game, first build the ROM then run;
 cargo run --release -- --test
 ```
 
-uses [rusticnes-core](https://github.com/zeta0134/rusticnes-core)
+uses [rustico-core](https://github.com/zeta0134/rustico)

tests/src/crunch.rs

@@ -1,4 +1,4 @@
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 
 use crate::{util, labels, playfield};
 

tests/src/garbage.rs

@@ -1,5 +1,5 @@
 use crate::{util, labels, playfield};
-use rusticnes_core::memory::read_byte;
+use rustico_core::memory::read_byte;
 
 pub fn test_garbage4_crash() {
     let mut emu = util::emulator(None);

tests/src/harddrop.rs

@@ -1,5 +1,5 @@
 
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 
 use crate::{ util, labels, playfield};
 
@@ -209,9 +209,11 @@ fn test_harddropped_piece(emu: &mut NesState, start: &str, finish: &str, piece:
 
     // stage ghost piece
     let temp_pc = emu.registers.pc;
+    let temp_tick = emu.cpu.tick;
     emu.registers.pc = stage_sprite;
     let stage_cycles = util::cycles_to_return(emu);
     emu.registers.pc = temp_pc;
+    emu.cpu.tick = temp_tick;
 
     util::run_n_vblanks(emu, 1);
 

tests/src/hz_display.rs

@@ -1,5 +1,5 @@
 use crate::{labels, util};
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 
 pub fn test() {
     test_standard();

tests/src/main.rs

@@ -160,8 +160,8 @@ fn main() {
             emu.memory.iram_raw[rng_seed] = (seed >> 8) as u8;
             emu.memory.iram_raw[rng_seed + 1] = *seed as u8;
 
-            rusticnes_core::opcodes::push(&mut emu, (main_loop >> 8) as u8);
-            rusticnes_core::opcodes::push(&mut emu, main_loop as u8);
+            rustico_core::opcodes::push(&mut emu, (main_loop >> 8) as u8);
+            rustico_core::opcodes::push(&mut emu, main_loop as u8);
 
             for _ in 0..23 {
                 emu.run_until_vblank();

tests/src/mapper.rs

@@ -4,7 +4,7 @@ use crate::{
     playfield,
     util,
 };
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 
 pub fn get_expected_tilesets() -> (Vec<u8>, Vec<u8>) {
 

tests/src/playfield.rs

@@ -1,4 +1,4 @@
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 use crate::labels;
 
 pub fn set(emu: &mut NesState, x: u16, y: u16, value: u8) {

tests/src/score.rs

@@ -1,4 +1,4 @@
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 use crate::{labels, score, util};
 
 pub fn set(emu: &mut NesState, score: u32) {

tests/src/sps.rs

@@ -1,5 +1,5 @@
 use crate::{block, labels, util};
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 
 pub struct SPS {
     emu: NesState,

tests/src/util.rs

@@ -1,5 +1,5 @@
-pub use rusticnes_core::nes::NesState;
-use rusticnes_core::{ cartridge, opcodes, opcode_info };
+pub use rustico_core::nes::NesState;
+use rustico_core::{ cartridge, opcodes, opcode_info };
 use crate::{input, labels};
 
 pub static ROM: &'static [u8] = include_bytes!("../../tetris.nes");

tests/src/video.rs

@@ -1,4 +1,4 @@
-use rusticnes_core::nes::NesState;
+use rustico_core::nes::NesState;
 use minifb::{Window, WindowOptions, Key, KeyRepeat};
 
 pub const WIDTH: usize = 256;