tetris-PRG.info: Improve garbage labels

ejona86 · Sep 5, 2020 · 4e6ca88 · 4e6ca88
1 parent 415ec30
commit 4e6ca88
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 18 deletions.
diff --git a/tetris-PRG.info b/tetris-PRG.info
@@ -110,8 +110,8 @@ LABEL { ADDR $00B6; NAME "heldButtons"; COMMENT "Active player's buttons"; };
 LABEL { ADDR $00B7; NAME "activePlayer"; COMMENT "Which player is being processed (data in $40)"; };
 LABEL { ADDR $00B8; NAME "playfieldAddr"; SIZE 2; COMMENT "HI byte is leftPlayfield in canon. Current playfield being processed: $0400 (left; 1st player) or $0500 (right; 2nd player)"; };
 LABEL { ADDR $00BA; NAME "allegro"; }; # canon
-LABEL { ADDR $00BB; NAME "totalGarbageInactivePlayer"; COMMENT "This is exchanged with totalGarbage when swapping players"; };
-LABEL { ADDR $00BC; NAME "totalGarbage"; }; # canon
+LABEL { ADDR $00BB; NAME "pendingGarbage"; COMMENT "Garbage waiting to be delivered to the current player. This is exchanged with pendingGarbageInactivePlayer when swapping players."; };
+LABEL { ADDR $00BC; NAME "pendingGarbageInactivePlayer"; COMMENT "canon is totalGarbage"; };
 LABEL { ADDR $00BD; NAME "renderMode"; }; # canon
 LABEL { ADDR $00BE; NAME "numberOfPlayers"; }; # canon
 LABEL { ADDR $00BF; NAME "nextPiece"; COMMENT "Stored by its orientation ID"; };
@@ -802,8 +802,13 @@ LABEL { ADDR $9AD2; NAME "@incrementLineIndex"; }; # canon
 LABEL { ADDR $9AF5; NAME "@skipTetrisSoundEffect"; };
 LABEL { ADDR $9B02; NAME "@ret"; };
 LABEL { ADDR $9B03; NAME "playState_receiveGarbage"; };
-LABEL { ADDR $9B3A; NAME "@garbageEmptySpace"; };
-LABEL { ADDR $9B3C; NAME "@placeGarbage"; };
+LABEL { ADDR $9B1C; NAME "@shiftPlayfieldUp"; };
+LABEL { ADDR $9B31; NAME "@fillGarbage"; };
+LABEL { ADDR $9B3A; NAME "@hole"; };
+LABEL { ADDR $9B3C; NAME "@set"; };
+LABEL { ADDR $9B45; NAME "@inc"; };
+LABEL { ADDR $9B50; NAME "@ret"; };
+LABEL { ADDR $9B52; NAME "@delay"; };
 LABEL { ADDR $9B58; NAME "playState_updateLinesAndStatistics"; };
 LABEL { ADDR $9B62; NAME "@linesCleared"; };
 LABEL { ADDR $9B78; NAME "@noCarry"; };

diff --git a/twoplayer-tetris-PRG.s.diff b/twoplayer-tetris-PRG.s.diff
@@ -786,27 +786,27 @@
  playState_receiveGarbage:
          lda     numberOfPlayers
          cmp     #$01
-         beq     L9B50
--        ldy     totalGarbageInactivePlayer
-+        bne     L9B50   ;ldy     totalGarbageInactivePlayer
-         beq     L9B50
+         beq     @ret
+-        ldy     pendingGarbage
++        bne     @ret    ;ldy     pendingGarbage
+         beq     @ret
          lda     vramRow
          cmp     #$20
-         bmi     L9B52
+         bmi     @delay
          lda     multBy10Table,y
-@@ -3171,11 +3244,11 @@ L9B31:  cpx     garbageHole
-         beq     @garbageEmptySpace
+@@ -3172,11 +3245,11 @@ @fillGarbage:
+         cpx     garbageHole
+         beq     @hole
          lda     #$78
-         jmp     @placeGarbage
+         jmp     @set
 
- @garbageEmptySpace:
--        lda     #$FF
-+        lda     #$EF
- @placeGarbage:
-         sta     (playfieldAddr),y
+-@hole:  lda     #$FF
++@hole:  lda     #$EF
+ @set:   sta     (playfieldAddr),y
          inx
          cpx     #$0A
-         bne     L9B45
+         bne     @inc
+         ldx     #$00
 @@ -3359,23 +3432,33 @@ L9C75:  lda     score+2
          clc
          adc     #$06