From fc558b548855888691429472518d72f7b3e052f5 Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@edt.zone>
Date: Thu, 26 Oct 2023 08:24:05 +0200
Subject: [PATCH] Add more drop options and change how they work.

---
 README.md                 |   9 ++-
 bin/DMGTRIS.GBC           | Bin 65536 -> 65536 bytes
 bin/DMGTRIS.pocket        | Bin 65536 -> 65536 bytes
 src/constants.asm         |   8 ++-
 src/field.asm             |  79 +++++++++++++++++++++---
 src/include/globals.asm   | 124 ++++++++++++++++++++++----------------
 src/input.asm             |  81 ++++++++-----------------
 src/main.asm              |  27 +++++++--
 src/res/sources/tiles.gbr | Bin 39009 -> 39009 bytes
 src/res/tiles.inc         |  66 ++++++++++----------
 src/sprites.asm           |   8 +--
 src/sram.asm              |   2 +-
 src/state_gameplay.asm    |  77 ++++++++++++-----------
 src/state_title.asm       |   4 +-
 14 files changed, 279 insertions(+), 206 deletions(-)

diff --git a/README.md b/README.md
index d323ea5..e8723a2 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,16 @@ Choose between a few randomizer options:
 Select the rotation rules:
 - ARS1: Classic ARS from TGM1 and TGM2.
 - ARS2: ARS from TGM3.
+- NES: No kicks.
 
 ### Drop Mode
-Select whether up performs a sonic drop, a hard drop, or nothing at all.
+Choose how the up and down buttons act:
+- FIRM: Up drops to the bottom but does not lock until you are in neutral position. Down locks.
+- SNIC: Like FIRM, but thre is no neutral lock.
+- HARD: Up drops and locks. Down does not lock until you go neutral when the piece is grounded.
+- LOCK: Like HARD but down locks.
+- NONE: Up does nothing. Down locks.
+
 
 ### Speed Curve
 Select between several speed curves including the DMGTRIS default speed curve, TGM1, TGM3, as well as DEATH and SHIRASE mode. In addition there's a "CHILL" curve for when you just want to enjoy some tetris. It doesn't speed up very fast at all.
diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC
index 7ddf83f304bafa6a4035ca279f941d0254879824..ecfebe19c8935d9503924e51211ffc3e7146b569 100644
GIT binary patch
delta 6957
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
B8}$GH

delta 6804
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
D(I^4|

diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket
index bc1585b0891b1ad8dbda72727f33b7b701421c32..b3a6df09830375bf9b7c5d2fa14f64a332c1276a 100644
GIT binary patch
delta 6957
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

delta 6804
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
F`(Nt&0rmg@

diff --git a/src/constants.asm b/src/constants.asm
index e219018..1c48953 100644
--- a/src/constants.asm
+++ b/src/constants.asm
@@ -61,8 +61,9 @@ CHARMAP "[", 129
 CHARMAP "]", 130
 CHARMAP "/", 128
 CHARMAP "-", 127
-CHARMAP "|", 126
-CHARMAP "#", 125
+CHARMAP "#", 126
+CHARMAP ".", 216
+CHARMAP ":", 222
 
 
 SECTION "Static Data", ROMX, BANK[1]
@@ -83,9 +84,12 @@ sOption1::
 sOption2::
     db "ARS1"
     db "ARS2"
+    db " NES"
 sOption3::
+    db "FIRM"
     db "SNIC"
     db "HARD"
+    db "LOCK"
     db "NONE"
 sOption4::
     db "DMGT"
diff --git a/src/field.asm b/src/field.asm
index bd0f769..0784f32 100644
--- a/src/field.asm
+++ b/src/field.asm
@@ -58,6 +58,7 @@ hDownFrames: ds 1
 hAwardDownBonus: ds 1
 hStalePiece: ds 1
 hBravo: ds 1
+hShouldLockIfGrounded: ds 1
 
 
 SECTION "Field Functions", ROM0
@@ -528,6 +529,7 @@ TrySpawnPiece::
     ldh [hDownFrames], a
     ldh [hAwardDownBonus], a
     ldh [hLockDelayForce], a
+    ldh [hShouldLockIfGrounded], a
     ldh a, [hCurrentLockDelay]
     ldh [hCurrentLockDelayRemaining], a
     ldh a, [hCurrentFramesPerGravityTick]
@@ -576,8 +578,6 @@ TrySpawnPiece::
     jp CanPieceFitFast
 
 
-
-
     ; Draws the piece onto the field.
     ; B is the tile.
     ; DE should point to the piece's rotation state data.
@@ -820,6 +820,11 @@ FieldProcess::
     ; Try kicks if the piece isn't I or O. And in the case of J L and T, only if the blocked side is the left or right.
 .maybekick
     ld c, a
+    ; No kicks for NES mode.
+    ld a, [wRotModeState]
+    cp a, ROT_MODE_NES
+    jp z, .norot
+
     ldh a, [hCurrentPiece]
     ; O pieces never kick, obviously.
     cp a, PIECE_O
@@ -1193,19 +1198,26 @@ FieldProcess::
     cp a, 20
     jr z, .postdrop
     ldh a, [hUpState]
-    cp a, 0
-    jr z, .postdrop
+    cp a, 1
+    jr nz, .postdrop
 
     ; What kind, if any?
     ld a, [wDropModeState]
     cp a, DROP_MODE_NONE
     jr z, .postdrop
+    cp a, DROP_MODE_LOCK
+    jr z, .harddrop
     cp a, DROP_MODE_HARD
     jr z, .harddrop
 
     ; Sonic drop.
 .sonicdrop
+    ld a, [wDropModeState]
+    cp a, DROP_MODE_SNIC
+    jr z, :+
     ld a, $FF
+    ldh [hShouldLockIfGrounded], a
+:   ld a, $FF
     ldh [hAwardDownBonus], a
     ld a, 20
     ldh [hWantedG], a
@@ -1215,6 +1227,11 @@ FieldProcess::
     jr nz, .grav
     ldh a, [hCurrentFramesPerGravityTick]
     ldh [hTicksUntilG], a
+    ld a, [wDropModeState]
+    cp a, DROP_MODE_SNIC
+    jr z, .grav
+    ld a, $FF
+    ldh [hShouldLockIfGrounded], a
     jr .grav
 
     ; Hard drop.
@@ -1250,6 +1267,11 @@ FieldProcess::
     ldh [hDownFrames], a
     ld a, 1
     ldh [hTicksUntilG], a
+    ld a, [wDropModeState]
+    cp a, DROP_MODE_HARD
+    jr nz, :+
+    ld a, $FF
+    ldh [hShouldLockIfGrounded], a
 
     ; Gravity?
 :   ldh a, [hTicksUntilG]
@@ -1302,7 +1324,7 @@ FieldProcess::
     call GetPieceDataFast
     call CanPieceFitFast
     cp a, $FF
-    jr z, .notgrounded
+    jp z, .notgrounded
 
     ; We're grounded.
 .grounded
@@ -1330,20 +1352,57 @@ FieldProcess::
 .postcheckforfirmdropsound
     ldh a, [hDownState]
     cp a, 0
-    jr z, .dontforcelock
-    ldh a, [hCurrentGravityPerTick]
+    jr z, .neutralcheck
+
+    ; Don't lock on down for hard drop mode immediately.
+    ld a, [wDropModeState]
+    cp a, DROP_MODE_HARD
+    jr nz, :+
+    ld a, $FF
+    ldh [hShouldLockIfGrounded], a
+    jr .dontforcelock
+
+    ; Lock on down in modes <20G.
+:   ldh a, [hCurrentGravityPerTick]
     cp a, 20
     jr nz, .forcelock
+
+    ; In 20G mode, only lock if down has been pressed for exactly 1 frame.
     ldh a, [hDownState]
     cp a, 1
+    jr z, .forcelock
+    jr .dontforcelock
+
+    ; If the down button is not held, check if we're neutral and if that should lock.
+.neutralcheck
+    ldh a, [hShouldLockIfGrounded]
+    cp a, 0
+    jr z, .dontforcelock
+
+    ; Check for neutral.
+    ldh a, [hUpState]
+    cp a, 0
+    jr nz, .dontforcelock
+    ldh a, [hLeftState]
+    cp a, 0
+    jr nz, .dontforcelock
+    ldh a, [hRightState]
+    cp a, 0
     jr nz, .dontforcelock
 
+    ; Lock on neutral for a few modes.
+    ld a, [wDropModeState]
+    cp a, DROP_MODE_FIRM
+    jr z, .forcelock
+    cp a, DROP_MODE_HARD
+    jr z, .forcelock
+    jr .dontforcelock
 
     ; Set the lock delay to 0 and save it.
 .forcelock
-    ld a, 0
+    xor a, a
     ldh [hCurrentLockDelayRemaining], a
-    jr .checklockdelay
+    jr .dolock
 
     ; Load the lock delay.
     ; Decrement it by one and save it.
@@ -1380,6 +1439,8 @@ FieldProcess::
 .notgrounded
     ldh a, [hCurrentLockDelay]
     ldh [hCurrentLockDelayRemaining], a
+    xor a, a
+    ldh [hShouldLockIfGrounded], a
 
 
     ; **************************************************************
diff --git a/src/include/globals.asm b/src/include/globals.asm
index b5e781d..a7a813c 100644
--- a/src/include/globals.asm
+++ b/src/include/globals.asm
@@ -23,13 +23,6 @@ INCLUDE "hardware.inc"
 INCLUDE "structs.asm"
 
 
-; PPU modes:
-; - 0: HBlank
-; - 1: VBlank
-; - 2: OAM Scan
-; - 3: Drawing
-
-
 ; Waits for PPU mode to be 0 or 1.
 ; We don't wait for 2 because it's super short and impractical to do much of anything in.
 MACRO wait_vram
@@ -93,11 +86,14 @@ MACRO lb
     ld \1, (LOW(\2) << 8) | LOW(\3)
 ENDM
 
+
+; Magic bytes for save files.
 DEF SAVE_MAGIC_0        EQU "D"
 DEF SAVE_MAGIC_1        EQU "M"
 DEF SAVE_MAGIC_2        EQU "G"
-DEF SAVE_MAGIC_3        EQU "3"
+DEF SAVE_MAGIC_3        EQU "5"
 
+; Some useful palettes.
 DEF PALETTE_REGULAR     EQU %11100100
 DEF PALETTE_INVERTED    EQU %00011011
 DEF PALETTE_MONO_0      EQU %11111111
@@ -113,6 +109,7 @@ DEF PALETTE_LIGHTER_1   EQU %10010000
 DEF PALETTE_LIGHTER_2   EQU %01000000
 DEF PALETTE_LIGHTER_3   EQU %00000000
 
+; Sprite base positions.
 DEF NEXT_BASE_X         EQU 115
 DEF NEXT_BASE_Y         EQU 40
 DEF HOLD_BASE_X         EQU 115
@@ -123,8 +120,7 @@ DEF LEVEL_BASE_X        EQU 120
 DEF CLEVEL_BASE_Y       EQU 136
 DEF NLEVEL_BASE_Y       EQU 148
 
-DEF SCURVE_ENTRY_SIZE   EQU 8
-
+; Piece names
 DEF PIECE_I             EQU 0
 DEF PIECE_Z             EQU 1
 DEF PIECE_S             EQU 2
@@ -132,8 +128,8 @@ DEF PIECE_J             EQU 3
 DEF PIECE_L             EQU 4
 DEF PIECE_O             EQU 5
 DEF PIECE_T             EQU 6
-DEF PIECE_NONE          EQU 255
 
+; Sound effect names
 DEF SFX_IRS             EQU $80
 DEF SFX_IHS             EQU 10
 DEF SFX_LINE_CLEAR      EQU 11
@@ -145,50 +141,11 @@ DEF SFX_RANKUP          EQU 16
 DEF SFX_READYGO         EQU 17
 DEF MUSIC_MENU          EQU $EE
 
-DEF STACK_SIZE          EQU 64
+; Tile data offsets
 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_TIME          EQU 80
-DEF GO_TIME             EQU 40
-
-DEF BUTTON_MODE_NORM    EQU 0
-DEF BUTTON_MODE_INVR    EQU 1
-DEF BUTTON_MODE_COUNT   EQU 2
-
-DEF TILE_RNG_MODE_BASE  EQU 217
-DEF RNG_MODE_TGM1       EQU 0
-DEF RNG_MODE_TGM2       EQU 1
-DEF RNG_MODE_TGM3       EQU 2
-DEF RNG_MODE_HELL       EQU 3
-DEF RNG_MODE_NES        EQU 4
-DEF RNG_MODE_COUNT      EQU 5
-
-DEF TILE_ROT_MODE_BASE  EQU 225
-DEF ROT_MODE_ARS        EQU 0
-DEF ROT_MODE_ARSTI      EQU 1
-DEF ROT_MODE_COUNT      EQU 2
-
-DEF TILE_DROP_MODE_BASE EQU 229
-DEF DROP_MODE_SONIC     EQU 0
-DEF DROP_MODE_HARD      EQU 1
-DEF DROP_MODE_NONE      EQU 2
-DEF DROP_MODE_COUNT     EQU 3
-
-DEF SCURVE_DMGT         EQU 0
-DEF SCURVE_TGM1         EQU 1
-DEF SCURVE_TGM3         EQU 2
-DEF SCURVE_DEAT         EQU 3
-DEF SCURVE_SHIR         EQU 4
-DEF SCURVE_CHIL         EQU 5
-DEF SCURVE_COUNT        EQU 6
-
-DEF TILE_HIG_MODE_BASE  EQU 232
-DEF HIG_MODE_OFF        EQU 0
-DEF HIG_MODE_ON         EQU 1
-DEF HIG_MODE_COUNT      EQU 2
-
 DEF TILE_FIELD_EMPTY    EQU 4
 DEF TILE_PIECE_0        EQU 10
 DEF TILE_0              EQU 66
@@ -197,6 +154,52 @@ DEF TILE_GHOST          EQU 125
 DEF TILE_SELECTED       EQU 193
 DEF TILE_UNSELECTED     EQU 194
 
+; Button mode.
+DEF BUTTON_MODE_NORM    EQU 0
+DEF BUTTON_MODE_INVR    EQU 1
+DEF BUTTON_MODE_COUNT   EQU 2
+
+; RNG mode.
+DEF TILE_RNG_MODE_BASE  EQU 218
+DEF RNG_MODE_TGM1       EQU 0
+DEF RNG_MODE_TGM2       EQU 1
+DEF RNG_MODE_TGM3       EQU 2
+DEF RNG_MODE_HELL       EQU 3
+DEF RNG_MODE_NES        EQU 4
+DEF RNG_MODE_COUNT      EQU 5
+
+; Rotation mode.
+DEF TILE_ROT_MODE_BASE  EQU 223
+DEF ROT_MODE_ARS        EQU 0
+DEF ROT_MODE_ARSTI      EQU 1
+DEF ROT_MODE_NES        EQU 2
+DEF ROT_MODE_COUNT      EQU 3
+
+; Drop mode.
+DEF TILE_DROP_MODE_BASE EQU 226
+DEF DROP_MODE_FIRM      EQU 0
+DEF DROP_MODE_SNIC      EQU 1
+DEF DROP_MODE_HARD      EQU 2
+DEF DROP_MODE_LOCK      EQU 3
+DEF DROP_MODE_NONE      EQU 4
+DEF DROP_MODE_COUNT     EQU 5
+
+; Speed curve selection.
+DEF SCURVE_DMGT         EQU 0
+DEF SCURVE_TGM1         EQU 1
+DEF SCURVE_TGM3         EQU 2
+DEF SCURVE_DEAT         EQU 3
+DEF SCURVE_SHIR         EQU 4
+DEF SCURVE_CHIL         EQU 5
+DEF SCURVE_COUNT        EQU 6
+
+; 20G mode.
+DEF TILE_HIG_MODE_BASE  EQU 231
+DEF HIG_MODE_OFF        EQU 0
+DEF HIG_MODE_ON         EQU 1
+DEF HIG_MODE_COUNT      EQU 2
+
+; VRAM Offsets for title screen tiles
 DEF TITLE_OPTIONS       EQU 7
 DEF TITLE_OPTION_0      EQU $98E0
 DEF TITLE_OPTION_1      EQU $9920
@@ -207,16 +210,33 @@ DEF TITLE_OPTION_5      EQU $9A20
 DEF TITLE_OPTION_6      EQU $9A60
 DEF TITLE_OPTION_OFFSET EQU 15
 
+; VRAM Offsets for gameplay tiles
 DEF FIELD_RNG           EQU $9852
 DEF FIELD_ROT           EQU $9892
 DEF FIELD_DROP          EQU $9912
 DEF FIELD_HIG           EQU $9952
 DEF FIELD_TOP_LEFT      EQU $9800+1
 
+; Gameplay definitions.
+DEF LEADY_TIME          EQU 80
+DEF GO_TIME             EQU 40
+DEF PIECE_SPAWN_X       EQU 5
+DEF PIECE_SPAWN_Y       EQU 3
+DEF ROTATION_STATE_DEF  EQU 0
+DEF ROTATION_STATE_CW   EQU 1
+DEF ROTATION_STATE_180  EQU 2
+DEF ROTATION_STATE_CCW  EQU 3
+
+; Game states. (Let these increase by 3)
+DEF STATE_TITLE         EQU 0
+DEF STATE_GAMEPLAY      EQU 3
+
+; Other
+DEF STACK_SIZE          EQU 64
 DEF EASTER_0            EQU $9845
 DEF EASTER_1            EQU $9865
 
+; Magic location for bank id.
 DEF rBANKID             EQU $4007
 
-
 ENDC
diff --git a/src/input.asm b/src/input.asm
index 195770d..c8bb681 100644
--- a/src/input.asm
+++ b/src/input.asm
@@ -23,15 +23,14 @@ INCLUDE "globals.asm"
 
 
 SECTION "High Input Variables", HRAM
-hUpState::     ds 1
-hDownState::   ds 1
-hLeftState::   ds 1
-hRightState::  ds 1
-hAState::      ds 1
-hBState::      ds 1
-hStartState::  ds 1
-hSelectState:: ds 1
-hDASCharge::   ds 1
+hUpState::         ds 1
+hDownState::       ds 1
+hLeftState::       ds 1
+hRightState::      ds 1
+hAState::          ds 1
+hBState::          ds 1
+hStartState::      ds 1
+hSelectState::     ds 1
 
 
 
@@ -46,37 +45,10 @@ InputInit::
     ldh [hBState], a
     ldh [hStartState], a
     ldh [hSelectState], a
-    ldh [hDASCharge], a
     ret
 
 
 GetInput::
-    ; Check if the left state > DAS charge.
-    ldh a, [hLeftState]
-    ld b, a
-    ldh a, [hDASCharge]
-    cp a, b
-    ; If so, save the new DAS charge.
-    jr nc, :+
-    ld a, b
-    ;ldh [hDASCharge], a
-
-    ; Check if the right state > DAS charge.
-:   ldh a, [hRightState]
-    ld b, a
-    ldh a, [hDASCharge]
-    cp a, b
-    ; If so, save the new DAS charge.
-    jr nc, :+
-    ld a, b
-    ;ldh [hDASCharge], a
-
-    ; There's an overflow risk here if the DAS charge is 255.
-:   cp a, $FF
-    jr nz, .btns
-    dec a
-    ldh [hDASCharge], a
-
     ; Get the button state.
 .btns
     ld a, P1F_GET_BTN
@@ -187,7 +159,7 @@ GetInput::
     xor a, a
     ldh [hDownState], a
 
-    ; Read left button. If it's just been pressed, restore the held DAS charge.
+    ; Read left button.
 .readLeft
     bit 1, b
     jr nz, .clearLeft
@@ -195,42 +167,41 @@ GetInput::
     ldh a, [hLeftState]
     cp a, $FF
     jr z, .readRight
-    cp a, 0
-    jr nz, :+
-    ldh a, [hDASCharge]
-:   inc a
+    inc a
     ldh [hLeftState], a
     jr .readRight
 .clearLeft
     xor a, a
     ldh [hLeftState], a
 
-    ; Read right button. If it's just been pressed, restore the held DAS charge.
+    ; Read right button.
 .readRight
     bit 0, b
     jr nz, .clearRight
 .setRight
     ldh a, [hRightState]
     cp a, $FF
-    jr z, .checkDAS
-    cp a, 0
-    jr nz, :+
-    ldh a, [hDASCharge]
-:   inc a
+    jr z, .priorities
+    inc a
     ldh [hRightState], a
-    jr .checkDAS
+    jr .priorities
 .clearRight
     xor a, a
     ldh [hRightState], a
 
-    ; If none of the four directions are pressed, reset the DAS charge.
-.checkDAS
-    ld a, b
-    or a, $F0
-    cp a, $FF
-    ret nz
+    ; If left or right are pressed, zero out up and down.
+.priorities
+    ldh a, [hRightState]
+    cp a, 0
+    jr nz, .zero
+    ldh a, [hLeftState]
+    cp a, 0
+    ret z
+
+.zero
     xor a, a
-    ldh [hDASCharge], a
+    ldh [hUpState], a
+    ldh [hDownState], a
     ret
 
 
diff --git a/src/main.asm b/src/main.asm
index acf9f8c..b44d3ea 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -126,21 +126,36 @@ EventLoop::
     call HandleTimers
 
     ; Call the current state's event handler.
-    ld b, 0
+    ld hl, .eventloopjumps
     ldh a, [hGameState]
-    cp a, b
-    jp nz, GamePlayEventLoopHandler
+    ld b, 0
+    ld c, a
+    add hl, bc
+    jp hl
+
+.eventloopjumps
     jp TitleEventLoopHandler
+    jp GamePlayEventLoopHandler
 EventLoopPostHandler::
 
     ; Wait for vblank.
     wait_vblank
 
     ; Do OAM DMA.
-    ; This will chain jump into the vblank handler.
-    jp hOAMDMA
+    call hOAMDMA
 
-    ; The VBlank Handler is expected to end with jr EventLoop.
+    ; Call the current state's vblank handler.
+    ld hl, .vblankjumps
+    ldh a, [hGameState]
+    ld b, 0
+    ld c, a
+    add hl, bc
+    jp hl
+
+.vblankjumps
+    jp TitleVBlankHandler
+    jp BlitField
+    ; The VBlank Handler is expected to end with jp EventLoop.
 
 
 ENDC
diff --git a/src/res/sources/tiles.gbr b/src/res/sources/tiles.gbr
index 9f38600a631b95cc7847ebdeac7f9e63e1a9728d..d1625a9a1490d5db5c0eeef4c77e9977ea9d112c 100644
GIT binary patch
delta 411
zcmaF3f$8A}rVVL<llN#yP8ML4**rUNCnGB(6A(;R43TC5u_h<7$ZS5R)c_NJ7z!0v
zWRuz4rvn#P43T1DX56f=Hy@^QVYt%dw}u>>|LRYK2_;4<O}xOdd9UF_Mu_1HqLe`b
zwZ;<}85uY8n|>EGVP;@p0Agkc0JA}Sbc`ZDnXy!L^7#U;$^YHCCUwY7o*>UQNsME%
zfDp&z2bSWK57@9z=C9_MeAc~UGk0N@=;R5h0zg5o$pHnTlN~HsCmV>ePA*{Lfav1{
zso&hw=Eyj?x1(+H=^)O@bJ`6i_jC#g0-eFgz`z8e7#TtI<n^6$lY2WG6%aBo6)+mC
tl4<k1&RFKj3ChPNPjF}7e53a}<7ECe*2!1;MfsVbUW3w`fAnW^006dpVF&;K

delta 237
zcmaF3f$8A}rVVL<lLZ)MHt*5sl;6x<m?aA2iElpB=Eyj)Kwz@JJ3BW612Y2{Ff&YM
zEY-s$#tK$9Ion-jGH*xQ!~!mY3Y90H=@6PM*IBUnT&FFw3KJ6(0~6395Q&ur%1_=9
yC^Pv?o1h?AEkYF&)8yKAiHQX~lP9>dZ@$s{osp4w@`ZlM$(jAin|UULasU9e5i?K#

diff --git a/src/res/tiles.inc b/src/res/tiles.inc
index cacb0f7..7e10909 100644
--- a/src/res/tiles.inc
+++ b/src/res/tiles.inc
@@ -28,8 +28,8 @@ Tiles::
     DB $67,$1F,$67,$1F,$67,$1F,$00,$00
     DB $E6,$F8,$E6,$F8,$E6,$F8,$E6,$F8
     DB $E6,$F8,$E6,$F8,$E6,$F8,$00,$00
+    DB $00,$00,$00,$00,$00,$00,$10,$00
     DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$01,$00,$00,$00
     DB $00,$00,$00,$00,$00,$FF,$FF,$FF
     DB $00,$FF,$00,$00,$00,$00,$00,$00
     DB $00,$00,$00,$00,$FF,$FF,$FF,$00
@@ -44,8 +44,8 @@ Tiles::
     DB $66,$BD,$7E,$99,$00,$FF,$00,$00
     DB $00,$FF,$36,$C9,$6C,$93,$5A,$A5
     DB $36,$C9,$6C,$93,$00,$FF,$00,$00
-    DB $00,$FF,$00,$BD,$3C,$81,$00,$81
-    DB $3C,$81,$00,$BD,$00,$FF,$00,$00
+    DB $00,$FF,$42,$BD,$7E,$81,$7E,$81
+    DB $7E,$81,$42,$BD,$00,$FF,$00,$00
     DB $00,$FF,$3C,$C3,$5A,$A5,$7E,$81
     DB $5A,$A5,$3C,$C3,$00,$FF,$00,$00
     DB $00,$FF,$5A,$A5,$42,$BD,$42,$BD
@@ -58,8 +58,8 @@ Tiles::
     DB $E7,$BD,$FF,$99,$FF,$FF,$00,$00
     DB $FF,$FF,$B7,$C9,$ED,$93,$DB,$A5
     DB $B7,$C9,$ED,$93,$FF,$FF,$00,$00
-    DB $FF,$FF,$81,$BD,$BD,$81,$81,$81
-    DB $BD,$81,$81,$BD,$FF,$FF,$00,$00
+    DB $FF,$FF,$C3,$BD,$FF,$81,$FF,$81
+    DB $FF,$81,$C3,$BD,$FF,$FF,$00,$00
     DB $FF,$FF,$BD,$C3,$DB,$A5,$FF,$81
     DB $DB,$A5,$BD,$C3,$FF,$FF,$00,$00
     DB $FF,$FF,$DB,$A5,$C3,$BD,$C3,$BD
@@ -72,8 +72,8 @@ Tiles::
     DB $66,$BD,$FE,$BB,$FF,$FF,$00,$00
     DB $00,$FF,$36,$C9,$6C,$93,$5A,$A5
     DB $36,$C9,$EE,$BB,$FF,$FF,$00,$00
-    DB $00,$FF,$00,$BD,$3C,$81,$00,$81
-    DB $3C,$81,$AA,$BF,$FF,$FF,$00,$00
+    DB $00,$FF,$42,$BD,$7E,$81,$7E,$81
+    DB $7E,$81,$EA,$BF,$FF,$FF,$00,$00
     DB $00,$FF,$3C,$C3,$5A,$A5,$7E,$81
     DB $5A,$A5,$BE,$EB,$FF,$FF,$00,$00
     DB $00,$FF,$5A,$A5,$42,$BD,$42,$BD
@@ -86,8 +86,8 @@ Tiles::
     DB $EE,$BF,$FF,$FF,$FF,$FF,$00,$00
     DB $00,$FF,$36,$C9,$6C,$93,$5A,$A5
     DB $BE,$EB,$FF,$FF,$FF,$FF,$00,$00
-    DB $00,$FF,$00,$BD,$3C,$81,$00,$81
-    DB $BE,$AB,$FF,$FF,$FF,$FF,$00,$00
+    DB $00,$FF,$42,$BD,$7E,$81,$7E,$81
+    DB $FE,$AB,$FF,$FF,$FF,$FF,$00,$00
     DB $00,$FF,$3C,$C3,$5A,$A5,$7E,$81
     DB $FA,$AF,$FF,$FF,$FF,$FF,$00,$00
     DB $00,$FF,$5A,$A5,$42,$BD,$42,$BD
@@ -100,7 +100,7 @@ Tiles::
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
     DB $00,$FF,$36,$C9,$6C,$93,$FA,$AF
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
-    DB $00,$FF,$00,$BD,$3C,$81,$AA,$AB
+    DB $00,$FF,$42,$BD,$7E,$81,$FE,$AB
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
     DB $00,$FF,$3C,$C3,$5A,$A5,$FE,$AB
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
@@ -114,7 +114,7 @@ Tiles::
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
     DB $00,$FF,$36,$C9,$EE,$BB,$FF,$FF
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
-    DB $00,$FF,$00,$BD,$BE,$AB,$FF,$FF
+    DB $00,$FF,$42,$BD,$FE,$AB,$FF,$FF
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
     DB $00,$FF,$3C,$C3,$FA,$AF,$FF,$FF
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
@@ -128,7 +128,7 @@ Tiles::
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
     DB $00,$FF,$BE,$EB,$FF,$FF,$FF,$FF
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
-    DB $00,$FF,$AA,$BF,$FF,$FF,$FF,$FF
+    DB $00,$FF,$EA,$BF,$FF,$FF,$FF,$FF
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
     DB $00,$FF,$BE,$EB,$FF,$FF,$FF,$FF
     DB $FF,$FF,$FF,$FF,$FF,$FF,$00,$00
@@ -272,10 +272,10 @@ Tiles::
     DB $00,$FF,$55,$FF,$FF,$FF,$00,$00
     DB $DB,$E7,$A5,$C3,$42,$81,$81,$00
     DB $42,$81,$A5,$C3,$DB,$E7,$00,$00
-    DB $10,$10,$38,$38,$7C,$7C,$10,$10
-    DB $7C,$7C,$38,$38,$10,$10,$00,$00
-    DB $00,$00,$28,$28,$6C,$6C,$FE,$FE
-    DB $6C,$6C,$28,$28,$00,$00,$00,$00
+    DB $44,$44,$FE,$FE,$44,$44,$44,$44
+    DB $44,$44,$FE,$FE,$44,$44,$00,$00
+    DB $00,$00,$00,$00,$00,$00,$3C,$3C
+    DB $00,$00,$00,$00,$00,$00,$00,$00
     DB $00,$00,$18,$18,$18,$18,$30,$30
     DB $30,$30,$60,$60,$60,$60,$00,$00
     DB $F0,$F0,$C0,$C0,$C0,$C0,$C0,$C0
@@ -453,7 +453,9 @@ Tiles::
     DB $C6,$C6,$6C,$6C,$38,$38,$38,$38
     DB $6C,$6C,$C6,$C6,$00,$00,$00,$00
     DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$00,$00,$00,$00
+    DB $00,$00,$30,$30,$30,$30,$00,$00
+    DB $00,$00,$30,$30,$30,$30,$00,$00
+    DB $00,$00,$30,$30,$30,$30,$00,$00
     DB $00,$75,$00,$47,$00,$55,$00,$55
     DB $00,$75,$00,$00,$00,$3E,$00,$00
     DB $00,$75,$00,$47,$00,$55,$00,$55
@@ -464,24 +466,20 @@ Tiles::
     DB $00,$3E,$00,$2A,$00,$00,$00,$00
     DB $00,$00,$00,$FF,$20,$81,$76,$81
     DB $20,$81,$00,$FF,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$28,$28,$10,$10
-    DB $28,$28,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$28,$28,$10,$10
-    DB $28,$28,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$28,$28,$10,$10
-    DB $28,$28,$00,$00,$00,$00,$00,$00
     DB $00,$26,$00,$55,$00,$76,$00,$55
     DB $00,$55,$00,$00,$00,$3E,$00,$00
     DB $00,$26,$00,$55,$00,$76,$00,$55
     DB $00,$55,$00,$00,$00,$36,$00,$00
-    DB $00,$00,$00,$00,$28,$28,$10,$10
-    DB $28,$28,$00,$00,$00,$00,$00,$00
-    DB $00,$00,$00,$00,$28,$28,$10,$10
-    DB $28,$28,$00,$00,$00,$00,$00,$00
+    DB $00,$00,$00,$FF,$20,$81,$76,$81
+    DB $20,$81,$00,$FF,$00,$00,$00,$00
+    DB $02,$70,$02,$40,$02,$60,$07,$40
+    DB $07,$40,$02,$00,$00,$1F,$00,$00
     DB $02,$70,$02,$40,$02,$70,$07,$10
     DB $07,$70,$02,$00,$00,$1F,$00,$00
     DB $02,$50,$02,$50,$02,$70,$07,$50
     DB $07,$50,$02,$00,$00,$1F,$00,$00
+    DB $02,$40,$02,$40,$02,$40,$07,$40
+    DB $07,$70,$02,$00,$00,$1F,$00,$00
     DB $02,$50,$02,$50,$02,$20,$07,$50
     DB $07,$50,$02,$00,$00,$1F,$00,$00
     DB $00,$3E,$02,$61,$04,$51,$24,$49
@@ -508,10 +506,12 @@ Tiles::
     DB $00,$00,$00,$00,$00,$00,$00,$00
     DB $00,$00,$00,$00,$00,$00,$00,$00
     DB $00,$00,$00,$00,$00,$00,$00,$00
-    DB $00,$E8,$00,$A8,$00,$A8,$00,$A8
-    DB $00,$EE,$00,$00,$00,$00,$00,$00
-    DB $00,$EA,$00,$8E,$00,$EA,$00,$2A
-    DB $00,$EA,$00,$00,$00,$00,$00,$00
+    DB $00,$00,$00,$00,$00,$00,$00,$00
+    DB $00,$00,$00,$00,$00,$00,$00,$00
+    DB $00,$00,$00,$00,$00,$00,$00,$00
+    DB $00,$00,$00,$00,$00,$00,$00,$00
+    DB $00,$00,$00,$00,$00,$00,$00,$00
+    DB $00,$00,$00,$00,$00,$00,$00,$00
     DB $03,$03,$04,$04,$08,$08,$0D,$08
     DB $0B,$09,$0D,$08,$0F,$08,$00,$00
     DB $06,$05,$03,$03,$00,$00,$0F,$0F
@@ -528,8 +528,8 @@ Tiles::
     DB $82,$82,$82,$82,$EC,$EC,$00,$00
     DB $44,$44,$CA,$CA,$4A,$4A,$4A,$4A
     DB $4A,$4A,$4A,$4A,$E4,$E4,$00,$00
-    DB $CE,$CE,$28,$28,$28,$28,$4C,$4C
-    DB $82,$82,$82,$82,$EC,$EC,$00,$00
+    DB $C6,$C6,$28,$28,$28,$28,$4E,$4E
+    DB $8A,$8A,$8A,$8A,$EC,$EC,$00,$00
     DB $08,$08,$1C,$1C,$30,$30,$3C,$3C
     DB $3C,$3C,$1C,$1C,$14,$14,$00,$00
 TilesEnd::
diff --git a/src/sprites.asm b/src/sprites.asm
index 52e048d..35d4f52 100644
--- a/src/sprites.asm
+++ b/src/sprites.asm
@@ -65,12 +65,8 @@ OAMDMA::
 :       dec a
         jr nz, :-
 
-        ; Jump to the current state's vblank handler.
-        ld b, 0
-        ldh a, [hGameState]
-        cp a, b
-        jp nz, BlitField
-        jp TitleVBlankHandler
+        ; Return
+        ret
     ENDL
 OAMDMAEnd::
 
diff --git a/src/sram.asm b/src/sram.asm
index 96f32b4..d3e5c4f 100644
--- a/src/sram.asm
+++ b/src/sram.asm
@@ -59,7 +59,7 @@ InitializeSRAM:
     ld [rRotModeState], a
     ld [wRotModeState], a
 
-    ld a, DROP_MODE_SONIC
+    ld a, DROP_MODE_FIRM
     ld [rDropModeState], a
     ld [wDropModeState], a
 
diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm
index 4d52ab9..b1bc142 100644
--- a/src/state_gameplay.asm
+++ b/src/state_gameplay.asm
@@ -23,15 +23,15 @@ INCLUDE "globals.asm"
 
 
 DEF MODE_LEADY              EQU 0
-DEF MODE_GO                 EQU 1
-DEF MODE_POSTGO             EQU 2
-DEF MODE_PREFETCHED_PIECE   EQU 4
-DEF MODE_SPAWN_PIECE        EQU 5
-DEF MODE_PIECE_IN_MOTION    EQU 6
-DEF MODE_DELAY              EQU 7
-DEF MODE_GAME_OVER          EQU 8
-DEF MODE_PRE_GAME_OVER      EQU 9
-DEF MODE_PAUSED             EQU 10
+DEF MODE_GO                 EQU 3
+DEF MODE_POSTGO             EQU 6
+DEF MODE_PREFETCHED_PIECE   EQU 9
+DEF MODE_SPAWN_PIECE        EQU 12
+DEF MODE_PIECE_IN_MOTION    EQU 15
+DEF MODE_DELAY              EQU 18
+DEF MODE_GAME_OVER          EQU 21
+DEF MODE_PRE_GAME_OVER      EQU 24
+DEF MODE_PAUSED             EQU 27
 
 
 SECTION "High Gameplay Variables", HRAM
@@ -114,7 +114,7 @@ SwitchToGameplay::
     call GBCGameplayInit
 
     ; Install the event loop handlers.
-    ld a, 1
+    ld a, STATE_GAMEPLAY
     ldh [hGameState], a
 
     ; And turn the LCD back on before we start.
@@ -132,28 +132,24 @@ SwitchToGameplay::
 
 GamePlayEventLoopHandler::
     ; What mode are we in?
+    ld hl, .modejumps
     ldh a, [hMode]
-    cp MODE_LEADY
-    jr z, leadyMode
-    cp MODE_GO
-    jr z, goMode
-    cp MODE_POSTGO
-    jr z, postGoMode
-    cp MODE_PREFETCHED_PIECE
-    jr z, prefetchedPieceMode
-    cp MODE_SPAWN_PIECE
-    jp z, spawnPieceMode
-    cp MODE_PIECE_IN_MOTION
-    jp z, pieceInMotionMode
-    cp MODE_DELAY
-    jp z, delayMode
-    cp MODE_PRE_GAME_OVER
-    jp z, preGameOverMode
-    cp MODE_GAME_OVER
-    jp z, gameOverMode
-    cp MODE_PAUSED
-    jp z, pauseMode
+    ld b, 0
+    ld c, a
+    add hl, bc
+    jp hl
 
+.modejumps
+    jp leadyMode
+    jp goMode
+    jp postGoMode
+    jp prefetchedPieceMode
+    jp spawnPieceMode
+    jp pieceInMotionMode
+    jp delayMode
+    jp gameOverMode
+    jp preGameOverMode
+    jp pauseMode
 
     ; Draw "READY" and wait a bit.
 leadyMode:
@@ -210,11 +206,11 @@ prefetchedPieceMode:
     ; A piece will spawn in the middle, at the top of the screen, not rotated by default.
     ld a, $FF
     ldh [hRequestedJingle], a
-    ld a, 5
+    ld a, PIECE_SPAWN_X
     ldh [hCurrentPieceX], a
-    ld a, 3
+    ld a, PIECE_SPAWN_Y
     ldh [hCurrentPieceY], a
-    xor a, a
+    xor a, a ; ROTATION_STATE_DEF
     ldh [hCurrentPieceRotationState], a
     ldh [hHoldSpent], a
 
@@ -252,7 +248,7 @@ prefetchedPieceMode:
     ld a, $FF
     ldh [hAState], a
 .cp1
-    ld a, 3
+    ld a, ROTATION_STATE_CCW
     ldh [hCurrentPieceRotationState], a
     ldh a, [hNextPiece]
     ld b, a
@@ -279,7 +275,7 @@ prefetchedPieceMode:
     ld a, $FF
     ldh [hBState], a
 .cp2
-    ld a, 1
+    ld a, ROTATION_STATE_CW
     ldh [hCurrentPieceRotationState], a
     ldh a, [hNextPiece]
     ld b, a
@@ -338,10 +334,11 @@ pieceInMotionMode:
     cp a, $FF
     jr z, :+
     ; Reset position and rotation.
-    ld a, 5
+    ld a, PIECE_SPAWN_X
     ldh [hCurrentPieceX], a
-    ld a, 3
+    ld a, PIECE_SPAWN_Y
     ldh [hCurrentPieceY], a
+    xor a, a ; ROTATION_STATE_DEF
     ldh [hCurrentPieceRotationState], a
     call DoHold
     ld a, MODE_SPAWN_PIECE
@@ -622,7 +619,7 @@ DoHold:
     ld a, $FF
     ldh [hAState], a
 .cp3
-    ld a, 3
+    ld a, ROTATION_STATE_CCW
     ldh [hCurrentPieceRotationState], a
     call SFXKill
     ld a, SFX_IRS | SFX_IHS
@@ -647,7 +644,7 @@ DoHold:
     ld a, $FF
     ldh [hBState], a
 .cp4
-    ld a, 1
+    ld a, ROTATION_STATE_CW
     ldh [hCurrentPieceRotationState], a
     call SFXKill
     ld a, SFX_IRS | SFX_IHS
@@ -658,7 +655,7 @@ DoHold:
     call SFXKill
     ld a, SFX_IHS
     call SFXEnqueue
-    ld a, 0
+    xor a, a ; ROTATION_STATE_DEF
     ldh [hCurrentPieceRotationState], a
 
 .doHoldOperation
diff --git a/src/state_title.asm b/src/state_title.asm
index b7f1f4e..cc74f01 100644
--- a/src/state_title.asm
+++ b/src/state_title.asm
@@ -115,8 +115,10 @@ SwitchToTitle::
     call GBCTitleInit
 
     ; Install the event loop handlers.
-    ld a, 0
+    ld a, STATE_TITLE
     ldh [hGameState], a
+
+    xor a, a
     ld [wSelected], a
 
     ; And turn the LCD back on before we start.