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

Level up bug.

This commit is contained in:
Randy Thiemann 2023-10-24 04:47:02 +02:00
parent 078c2001e7
commit 3a6de627ee
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/field.asm
View File

@ -1738,10 +1738,19 @@ FieldDelay::
; If so, we need to do a line clear delay. ; If so, we need to do a line clear delay.
; Otherwise, we skip to ARE delay. ; Otherwise, we skip to ARE delay.
.determine .determine
; Add one level if we're not at a breakpoint.
ldh a, [hRequiresLineClear]
cp a, $FF
jr z, .are
ld e, 1
call LevelUp
; Increment bravo by 4. ; Increment bravo by 4.
ldh a, [hBravo] ldh a, [hBravo]
add a, 4 add a, 4
ldh [hBravo], a ldh [hBravo], a
; Are there line clears?
call ToShadowField call ToShadowField
call FindClearedLines call FindClearedLines
ldh a, [hClearedLines] ldh a, [hClearedLines]
@ -1755,8 +1764,8 @@ FieldDelay::
and a, c and a, c
and a, d and a, d
cp a, $FF cp a, $FF
jr z, .skip ; If there were no line clears, skip to ARE delay. jr z, .skip
ld a, DELAY_STATE_LINE_PRE_CLEAR ; Otherwise, do a line clear delay. ld a, DELAY_STATE_LINE_PRE_CLEAR ; If there were line clears, do a line clear delay, then an ARE delay.
ld [wDelayState], a ld [wDelayState], a
ldh a, [hCurrentLineClearDelay] ldh a, [hCurrentLineClearDelay]
ldh [hRemainingDelay], a ldh [hRemainingDelay], a
@ -1917,15 +1926,9 @@ FieldDelay::
cp a, 0 cp a, 0
jr nz, .are jr nz, .are
; Otherwise, increment the level counter by one if it's not at a breakpoint. ; Otherwise, reset the combo.
ld a, 1 ld a, 1
ldh [hComboCt], a ldh [hComboCt], a
ldh a, [hRequiresLineClear]
cp a, $FF
jr z, .are
ld e, 1
call LevelUp
; ARE delay. ; ARE delay.
; Count down the delay. If it hits 0, award levels and score if necessary, then end the delay phase. ; Count down the delay. If it hits 0, award levels and score if necessary, then end the delay phase.