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

Actually fix the IRS bug.

This commit is contained in:
Randy Thiemann 2023-10-21 19:24:35 +02:00
parent d4b1c6463e
commit aa948a2214
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/state_gameplay.asm
View File

@ -205,16 +205,18 @@ 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
@ -226,16 +228,18 @@ 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
@ -476,16 +480,18 @@ 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
@ -497,16 +503,18 @@ 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