Merge branch 'master' of github.com:kirjavascript/TetrisGYM into readme_v6

Author: kirjavascript

CHANGELOG.md

@@ -14,6 +14,8 @@
 * Block Tool pieces wrap around
 * Always Next Box removed
 * 0001 seeds are ignored
+* Hz display correctly counts taps with Up and Down
+* Keep Hz display enabled when topped out
 * Floor no longer gobbled up by top line clear
 * Floor 0 has original no-burns behaviour again
 * [Fixed ingame score display at 8/9 million with Classic Scoring](https://www.youtube.com/watch?v=fYdXky2i5AE)
@@ -25,7 +27,6 @@
 * Fixed crashes in garbage mode 4
 * Fixed line clearing happening on pause
 * Fixed PAL colours
-* Keep hz display enabled when topped out
 * Famicom Keyboard support
 * Autodetect MMC1/CNROM
 * NROM Support

src/modes/hz.asm

@@ -37,11 +37,10 @@ hzControl: ; called in playState_playerControlsActiveTetrimino, gameTypeLoopCont
 
         ; detect inputs
         lda newlyPressedButtons_player1
-        and #BUTTON_DPAD
+        and #BUTTON_LEFT+BUTTON_RIGHT
         cmp #BUTTON_LEFT
         beq hzTap
-        lda newlyPressedButtons_player1
-        and #BUTTON_DPAD
+        and #BUTTON_LEFT+BUTTON_RIGHT
         cmp #BUTTON_RIGHT
         beq hzTap
 
@@ -193,11 +192,11 @@ checkNegativeDelay:
         lda hzSpawnDelay
         bne @ret
         lda newlyPressedButtons_player1
-        and #BUTTON_DPAD
+        and #BUTTON_LEFT+BUTTON_RIGHT
         cmp #BUTTON_LEFT
         beq @setDelay
         lda newlyPressedButtons_player1
-        and #BUTTON_DPAD
+        and #BUTTON_LEFT+BUTTON_RIGHT
         cmp #BUTTON_RIGHT
         beq @setDelay
         rts

tests/src/hz_display.rs

@@ -7,24 +7,30 @@ pub fn test() {
 }
 
 fn test_standard() {
-    let mut emu = util::emulator(None);
+    let boot = || {
+        let mut emu = util::emulator(None);
 
-    util::run_n_vblanks(&mut emu, 4);
+        util::run_n_vblanks(&mut emu, 4);
 
-    let hz_flag = labels::get("hzFlag") as usize;
-    let game_mode = labels::get("gameMode") as usize;
-    let main_loop = labels::get("mainLoop");
-    let level_number = labels::get("levelNumber") as usize;
+        let hz_flag = labels::get("hzFlag") as usize;
+        let game_mode = labels::get("gameMode") as usize;
+        let main_loop = labels::get("mainLoop");
+        let level_number = labels::get("levelNumber") as usize;
 
-    // turn on hz display
-    emu.memory.iram_raw[hz_flag] = 1;
-    // trick game into thinking it should start an a-type run
-    emu.memory.iram_raw[level_number] = 29;
-    emu.memory.iram_raw[game_mode] = 4;
-    emu.registers.pc = main_loop;
+        // turn on hz display
+        emu.memory.iram_raw[hz_flag] = 1;
+        // trick game into thinking it should start an a-type run
+        emu.memory.iram_raw[level_number] = 29;
+        emu.memory.iram_raw[game_mode] = 4;
+        emu.registers.pc = main_loop;
 
-    // wait for piece to become active
-    util::run_n_vblanks(&mut emu, 5);
+        // wait for piece to become active
+        util::run_n_vblanks(&mut emu, 5);
+
+        emu
+    };
+
+    let mut emu = boot();
     // test left input sequence with delay of 5
     run_input_string(&mut emu, ".....L.L..L.L.");
     assert_hz_display(&mut emu, HzSpeed(25, 75), 4, 5, Dir::Left);
@@ -53,6 +59,21 @@ fn test_standard() {
     util::run_n_vblanks(&mut emu, 2+12-4);
     run_input_string(&mut emu, "L.....");
     assert_hz_display(&mut emu, HzSpeed(18, 3), 4, -1, Dir::Right);
+
+    // check L+U etc is counted as a tap
+    let mut emu = boot();
+    {
+        use crate::input::*;
+        run_input_string(&mut emu, "LB.L.LL.");
+        util::set_controller_raw(&mut emu, LEFT + UP);
+        emu.run_until_vblank();
+        emu.run_until_vblank();
+        run_input_string(&mut emu, ".");
+        util::set_controller_raw(&mut emu, LEFT + UP);
+        emu.run_until_vblank();
+        emu.run_until_vblank();
+    }
+    assert_hz_display(&mut emu, HzSpeed(21, 85), 5, 0, Dir::Left);
 }
 
 fn test_tspin() {