villadelfia
/
dmgtris
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: villadelfia:f1a341a751ecfa29d2d201d77236a0260db24dfb
Branches Tags
villadelfia:master
villadelfia:small-version
..
compare: villadelfia:d4b1c6463e02144133515a48a2c93f2ca8da2269
Branches Tags
villadelfia:master
villadelfia:small-version

No commits in common. "f1a341a751ecfa29d2d201d77236a0260db24dfb" and "d4b1c6463e02144133515a48a2c93f2ca8da2269" have entirely different histories.
f1a341a751 ... d4b1c6463e

3 changed files with 10 additions and 20 deletions
Show Stats Expand all files Collapse all files

4
src/field.asm
View File

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

2
src/sfx.asm
View File

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

24
src/state_gameplay.asm
View File

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