From 61ae2c524b1d41106b91f4a064d9e4510393e7bc Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Sat, 21 Oct 2023 20:21:49 +0200
Subject: [PATCH] Add pause.

---
 DMGTRIS.GB              | Bin 32768 -> 32768 bytes
 README.md               |   1 +
 src/constants.asm       |   3 +
 src/include/globals.asm |   1 +
 src/state_gameplay.asm  | 135 +++++++++++++++++++++++++++++++---------
 5 files changed, 110 insertions(+), 30 deletions(-)

diff --git a/DMGTRIS.GB b/DMGTRIS.GB
index a9a5529aa00ea6deb79c66b954eb7e24bb3a91c5..f763ea1d60df7d941fd7c0e84bdeccac390219c9 100644
GIT binary patch
delta 2681
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

delta 2625
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

diff --git a/README.md b/README.md
index c98d2af..538dc9b 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Please do not try running it on older emulators such as VBA, since this game use
 - A — Rotate 1
 - B — Rotate 2
 - Select — Hold
+- Start — Pause
 - Up — Sonic drop
 - Down — Soft drop/Lock
 - Left/Right — Move
diff --git a/src/constants.asm b/src/constants.asm
index f41a648..497aff1 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -68,6 +68,9 @@ CHARMAP "#", 125
 SECTION "Static Data", ROM0
 sLeady::     db "  READY?  "
 sGo::        db "    GO    "
+sPause::
+    db "P A U S E "
+    db " P A U S E"
 sPieceXOffsets::    ; How to draw each piece. X-offsets of the sprites.
     db 0, 8, 16, 24 ; I
     db 0, 8, 8, 16  ; Z
diff --git a/src/include/globals.asm b/src/include/globals.asm
index b88cbd5..cb256e0 100644
--- a/src/include/globals.asm
+++ b/src/include/globals.asm
@@ -152,6 +152,7 @@ DEF GAME_OVER_R10       EQU 133
 DEF GAME_OVER_R12       EQU 153
 DEF GAME_OVER_R14       EQU 173
 DEF GAME_OVER_OTHER     EQU 131
+DEF LEADY_GO_TIME       EQU 90
 
 
 ENDC
diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm
index c954133..7b9c1c6 100644
--- a/src/state_gameplay.asm
+++ b/src/state_gameplay.asm
@@ -31,12 +31,9 @@ DEF MODE_PIECE_IN_MOTION EQU 5
 DEF MODE_DELAY EQU 6
 DEF MODE_GAME_OVER EQU 7
 DEF MODE_PRE_GAME_OVER EQU 8
+DEF MODE_PAUSED EQU 9
 
 
-SECTION "Gameplay Variables", WRAM0
-wMode: ds 1
-wModeCounter: ds 1
-
 SECTION "Critical Gameplay Variables", HRAM
 hCurrentPiece:: ds 1
 hCurrentPieceX:: ds 1
@@ -45,6 +42,9 @@ hCurrentPieceRotationState:: ds 1
 hHeldPiece: ds 1
 hHoldSpent:: ds 1
 hSkipJingle: ds 1
+hMode: ds 1
+hModeCounter: ds 1
+hPrePause: ds 1
 
 
 SECTION "Gameplay Functions", ROM0
@@ -90,9 +90,9 @@ SwitchToGameplay::
 
     ; Leady mode.
     ld a, MODE_LEADY
-    ld [wMode], a
-    ld a, 90
-    ld [wModeCounter], a
+    ldh [hMode], a
+    ld a, LEADY_GO_TIME
+    ldh [hModeCounter], a
 
     ; Install the event loop handlers.
     ld a, 1
@@ -110,7 +110,7 @@ SwitchToGameplay::
 
 GamePlayEventLoopHandler::
     ; What mode are we in?
-    ld a, [wMode]
+    ld a, [hMode]
     cp MODE_LEADY
     jr z, leadyMode
     cp MODE_GO
@@ -129,12 +129,14 @@ GamePlayEventLoopHandler::
     jp z, preGameOverMode
     cp MODE_GAME_OVER
     jp z, gameOverMode
+    cp MODE_PAUSED
+    jp z, pauseMode
 
 
     ; Draw "READY" and wait a bit.
 leadyMode:
-    ld a, [wModeCounter]
-    cp a, 90
+    ldh a, [hModeCounter]
+    cp a, LEADY_GO_TIME
     jr nz, :+
     call SFXKill
     ld a, SFX_READY_GO
@@ -142,9 +144,9 @@ leadyMode:
 :   dec a
     jr nz, :+
     ld a, MODE_GO
-    ld [wMode], a
-    ld a, 90
-:   ld [wModeCounter], a
+    ldh [hMode], a
+    ld a, LEADY_GO_TIME
+:   ldh [hModeCounter], a
     ld de, sLeady
     ld hl, wField+(14*10)
     ld bc, 10
@@ -154,13 +156,13 @@ leadyMode:
 
     ; Draw "GO" and wait a bit.
 goMode:
-    ld a, [wModeCounter]
+    ldh a, [hModeCounter]
     dec a
     jr nz, :+
     ld a, MODE_POSTGO
-    ld [wMode], a
+    ldh [hMode], a
     xor a, a
-:   ld [wModeCounter], a
+:   ldh [hModeCounter], a
     ld de, sGo
     ld hl, wField+(14*10)
     ld bc, 10
@@ -171,7 +173,7 @@ goMode:
     ; Clear the field, ready for gameplay.
 postGoMode:
     ld a, MODE_FETCH_PIECE
-    ld [wMode], a
+    ldh [hMode], a
     call FieldClear
     jp drawStaticInfo
 
@@ -259,7 +261,7 @@ fetchPieceMode:
     call SFXEnqueue
 .skipJingle
     ld a, MODE_SPAWN_PIECE
-    ld [wMode], a
+    ldh [hMode], a
     ; State falls through to the next.
 
 
@@ -269,16 +271,25 @@ spawnPieceMode:
     cp a, $FF
     jr z, :+
     ld a, MODE_PRE_GAME_OVER
-    ld [wMode], a
+    ldh [hMode], a
     jp drawStaticInfo
 :   ld a, MODE_PIECE_IN_MOTION
-    ld [wMode], a
+    ldh [hMode], a
 
 
     ; This mode lasts for as long as the piece is in motion.
     ; Field will let us know when it has locked in place.
 pieceInMotionMode:
-    call FieldProcess
+    ldh a, [hStartState]
+    cp a, 1
+    jr nz, :+
+    ldh a, [hMode]
+    ldh [hPrePause], a
+    ld a, MODE_PAUSED
+    ldh [hMode], a
+    jp drawStaticInfo
+
+:   call FieldProcess
 
     ; Do we hold?
     ld a, [hSelectState]
@@ -297,14 +308,14 @@ pieceInMotionMode:
     ldh [hCurrentPieceRotationState], a
     call DoHold
     ld a, MODE_SPAWN_PIECE
-    ld [wMode], a
+    ldh [hMode], a
 
     ; Do we go into delay state?
 :   ldh a, [hCurrentLockDelayRemaining]
     cp a, 0
     jr nz, :+
     ld a, MODE_DELAY
-    ld [wMode], a
+    ldh [hMode], a
     call ToShadowField
     ; No fall through this time.
 
@@ -312,13 +323,22 @@ pieceInMotionMode:
 
 
 delayMode:
-    call FieldDelay
+    ldh a, [hStartState]
+    cp a, 1
+    jr nz, :+
+    ldh a, [hMode]
+    ldh [hPrePause], a
+    ld a, MODE_PAUSED
+    ldh [hMode], a
+    jp drawStaticInfo
+
+:   call FieldDelay
 
     ldh a, [hRemainingDelay]
     cp a, 0
     jr nz, :+
     ld a, MODE_FETCH_PIECE
-    ld [wMode], a
+    ldh [hMode], a
 
 :   jp drawStaticInfo
 
@@ -417,7 +437,7 @@ preGameOverMode:
 .skip7\@
     ENDR
     ld a, MODE_GAME_OVER
-    ld [wMode], a
+    ldh [hMode], a
 
 
 gameOverMode:
@@ -434,10 +454,10 @@ gameOverMode:
     xor a, a
     ldh [hHoldSpent], a
     ld a, MODE_LEADY
-    ld [wMode], a
-    ld a, 90
-    ld [wModeCounter], a
-    jr drawStaticInfo
+    ldh [hMode], a
+    ld a, LEADY_GO_TIME
+    ldh [hModeCounter], a
+    jp drawStaticInfo
 
     ; Quit
 :   ldh a, [hBState]
@@ -447,6 +467,61 @@ gameOverMode:
     jp EventLoopPostHandler
 
 
+pauseMode:
+    ldh a, [hStartState]
+    cp a, 1
+    jr nz, :+
+    ldh a, [hPrePause]
+    ldh [hMode], a
+    jp drawStaticInfo
+
+    ; Draw PAUSE all over the field, but not if we came from delay mode.
+:   ldh a, [hPrePause]
+    cp a, MODE_DELAY
+    jr z, drawStaticInfo
+    ld de, sPause
+    ld hl, wField+(4*10)
+    ld bc, 20
+    call UnsafeMemCopy
+    ld de, sPause
+    ld hl, wField+(6*10)
+    ld bc, 20
+    call UnsafeMemCopy
+    ld de, sPause
+    ld hl, wField+(8*10)
+    ld bc, 20
+    call UnsafeMemCopy
+    ld de, sPause
+    ld hl, wField+(10*10)
+    ld bc, 20
+    call UnsafeMemCopy
+    ld de, sPause
+    ld hl, wField+(12*10)
+    ld bc, 20
+    call UnsafeMemCopy
+    ld de, sPause
+    ld hl, wField+(14*10)
+    ld bc, 20
+    call UnsafeMemCopy
+    ld de, sPause
+    ld hl, wField+(16*10)
+    ld bc, 20
+    call UnsafeMemCopy
+    ld de, sPause
+    ld hl, wField+(18*10)
+    ld bc, 20
+    call UnsafeMemCopy
+    ld de, sPause
+    ld hl, wField+(20*10)
+    ld bc, 20
+    call UnsafeMemCopy
+    ld de, sPause
+    ld hl, wField+(22*10)
+    ld bc, 20
+    call UnsafeMemCopy
+    jr drawStaticInfo
+
+
     ; Always draw the score, level, next piece, and held piece.
 drawStaticInfo:
 :   ld a, [wNextPiece]