Make the SFX for sonic drops and landings a bit more subtle.

src/field.asm

@@ -973,7 +973,8 @@ FieldProcess::
     ldh a, [hDownState]
     cp a, 0
     jr nz, :+
-    ld a, SFX_DROP
+    call SFXKill
+    ld a, SFX_MOVE
     call SFXEnqueue
     ; If the down button is held, lock.
 :   ldh a, [hDownState]
@@ -987,6 +988,7 @@ FieldProcess::
     ; If we're out of lock delay, play a sound.
     cp a, 0
     jr nz, .draw
+    call SFXKill
     ld a, SFX_LOCK
     call SFXEnqueue
     jr .draw

src/sfx.asm

@@ -715,7 +715,7 @@ sSFXBell::
     db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $97, REG_NR24_CH2_FRQHI, $87, $FE
 sSFXBellEnd::
 sSFXMove::
-    db REG_NR42_CH4_VOLEV, $21, REG_NR41_CH4_LENGT, $3F, REG_NR42_CH4_VOLEV, $21, REG_NR43_CH4_FQRND, $00
+    db REG_NR42_CH4_VOLEV, $F1, REG_NR41_CH4_LENGT, $3F, REG_NR42_CH4_VOLEV, $F1, REG_NR43_CH4_FQRND, $00
     db REG_NR44_CH4_CNTRL, $80, $FE
 sSFXMoveEnd::
 sSFXRankUp::

src/state_gameplay.asm

@@ -205,16 +205,18 @@ fetchPieceMode:
     jr z, .lda1
 .ldb1
     ldh a, [hBState]
+    cp a, 0
+    jr z, .checkIRSB
     ld a, $FF
     ldh [hBState], a
     jr .cp1
 .lda1
     ldh a, [hAState]
+    cp a, 0
+    jr z, .checkIRSB
     ld a, $FF
     ldh [hAState], a
 .cp1
-    cp a, 0
-    jr z, .checkIRSB
     ld a, 3
     ldh [hCurrentPieceRotationState], a
     ld a, SFX_IRS
@@ -226,16 +228,18 @@ fetchPieceMode:
     jr z, .ldb2
 .lda2
     ld a, [hAState]
+    cp a, 0
+    jr z, .checkJingle
     ld a, $FF
     ldh [hAState], a
     jr .cp2
 .ldb2
     ldh a, [hBState]
+    cp a, 0
+    jr z, .checkJingle
     ld a, $FF
     ldh [hBState], a
 .cp2
-    cp a, 0
-    jr z, .checkJingle
     ld a, 1
     ldh [hCurrentPieceRotationState], a
     ld a, SFX_IRS
@@ -476,16 +480,18 @@ DoHold:
     jr z, .lda3
 .ldb3
     ldh a, [hBState]
+    cp a, 0
+    cp z, .checkIRSHB
     ld a, $FF
     ldh [hBState], a
     jr .cp3
 .lda3
     ldh a, [hAState]
+    cp a, 0
+    cp z, .checkIRSHB
     ld a, $FF
     ldh [hAState], a
 .cp3
-    cp a, 0
-    jr z, .checkIRSHB
     ld a, 3
     ldh [hCurrentPieceRotationState], a
     ld a, SFX_IRS
@@ -497,16 +503,18 @@ DoHold:
     jr z, .ldb4
 .lda4
     ldh a, [hAState]
+    cp a, 0
+    jr z, .noRotation
     ld a, $FF
     ldh [hAState], a
     jr .cp4
 .ldb4
     ldh a, [hBState]
+    cp a, 0
+    jr z, .noRotation
     ld a, $FF
     ldh [hBState], a
 .cp4
-    cp a, 0
-    jr z, .noRotation
     ld a, 1
     ldh [hCurrentPieceRotationState], a
     ld a, SFX_IRS