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

Author: kirjavascript

src/modes/floor.asm

@@ -9,8 +9,8 @@ drawFloor:
         ; x10
         lda multBy10Table, x
         tax
-        ; draw block tiles ($7B)
-        lda #BLOCK_TILES
+        ; draw block tiles+3 ($7E)
+        lda #BLOCK_TILES+3
 @loop:
         sta playfield+$46,X
         inx

src/playstate/completedrows.asm

@@ -102,7 +102,7 @@ playState_checkForCompletedRows:
         tax
         ldy multBy10Table,x
         ldx #$0A
-        lda #BLOCK_TILES
+        lda #BLOCK_TILES+3
 @drawFloorSurface:
         sta playfield,y
         iny

src/playstate/updatestats.asm

@@ -1,10 +1,13 @@
+; y reg tracks lines crossing multiple of 10 from @linesCleared until addPoints
+
 playState_updateLinesAndStatistics:
         jsr updateMusicSpeed
         lda completedLines
         bne @linesCleared
         jmp addPoints
 
 @linesCleared:
+        ldy #$00
         tax
         dec lineClearStatsByType-1,x
         bpl @noCarry
@@ -75,6 +78,7 @@ checkLevelUp:
         and #$0F
         bne @lineLoop
 
+        iny ; used by floorcap check below
         lda practiseType
         cmp #MODE_TAPQTY
         beq @lineLoop
@@ -115,7 +119,7 @@ checkLevelUp:
         lda crashState
         ora #$08
         sta crashState
-        lda #$06 ; checked in floor linecap stuff, just below
+        lda #$06
         sta soundEffectSlot1Init
         lda renderFlags
         ora #RENDER_LEVEL
@@ -167,10 +171,9 @@ checkLinecap: ; set linecapState
         lda linecapState
         cmp #LINECAP_FLOOR
         bne @floorLinecapEnd
-        ; check level up sound is happening
-        lda soundEffectSlot1Init
-        cmp #6
-        bne @floorLinecapEnd
+        ; check level up was possible
+        tya
+        beq @floorLinecapEnd
         lda #$A
         sta garbageHole
         lda #1

src/playstate/util.asm

@@ -120,8 +120,7 @@ checkIfAboveLowStackLine:
         lda #19
         sbc lowStackRowModifier
         tax
-        lda multBy10Table,x
-        tay
+        ldy multBy10Table,x
         ldx #$0A
         sec
 @checkForBlockInRow:

tests/src/floor.rs

@@ -2,7 +2,8 @@ use crate::{util, labels, playfield};
 
 pub fn test() {
     test_floor();
-    test_floor_linecap();
+    test_floor_linecap("MODE_TRANSITION",0);
+    test_floor_linecap("MODE_TETRIS",1);
     test_floor0();
 }
 
@@ -54,7 +55,7 @@ fn test_floor() {
     assert_ne!(playfield::get(&mut emu, 0, 19), 0xEF);
 }
 
-fn test_floor_linecap() {
+fn test_floor_linecap(mode: &str, linecap_when: u8) {
     let mut emu = util::emulator(None);
 
     for _ in 0..3 { emu.run_until_vblank(); }
@@ -64,12 +65,15 @@ fn test_floor_linecap() {
     let main_loop = labels::get("mainLoop");
     let level_number = labels::get("levelNumber") as usize;
 
-    emu.memory.iram_raw[practise_type] = labels::get("MODE_TRANSITION") as _;
+    emu.memory.iram_raw[practise_type] = labels::get(mode) as _;
     emu.memory.iram_raw[level_number] = 19;
     emu.memory.iram_raw[game_mode] = 4;
 
     emu.memory.iram_raw[labels::get("linecapFlag") as usize] = 1;
+    emu.memory.iram_raw[labels::get("linecapWhen") as usize] = linecap_when;
     emu.memory.iram_raw[labels::get("linecapHow") as usize] = labels::get("LINECAP_FLOOR") as u8 - 1;
+    emu.memory.iram_raw[labels::get("linecapLines") as usize] = 0x10;
+    emu.memory.iram_raw[labels::get("linecapLines") as usize + 1] = 0;
     emu.memory.iram_raw[labels::get("linecapLevel") as usize] = 20;
 
     emu.registers.pc = main_loop;

tests/src/sps.rs

@@ -13,6 +13,7 @@ impl SPS {
     }
 
     pub fn set_input(&mut self, seed: (u8, u8, u8)) {
+        self.emu.memory.iram_raw[labels::get("spawnID") as usize] = 0;
         self.emu.memory.iram_raw[(labels::get("set_seed_input") + 0) as usize] = seed.0;
         self.emu.memory.iram_raw[(labels::get("set_seed") + 0) as usize] = seed.0;
         self.emu.memory.iram_raw[(labels::get("set_seed_input") + 1) as usize] = seed.1;