Skip to content

Commit 22d82b3

Browse files
committed
cannot use block tool in qual mod
1 parent 8d52ebc commit 22d82b3

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
## [v4 classic]
33
- Standard Pause in Qual Mode
44
- No Next Box allowed in Qual Mode
5+
- Block Tool cannot be used in Qual Mode
56

67
## [v4]
78
- B-Type Trainer (height 0-8)

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,8 @@ Also reintroduces other classic features like the end game curtain, standard pau
269269

270270
These features make TetrisGYM work better with post processing tools like [NestrisChamps](https://github.com/timotheeg/nestrischamps) and [MaxoutClub](https://maxoutclub.com/).
271271

272+
You cannot use the Block Tool and Qual mode at the same time.
273+
272274
## PAL Mode
273275

274276
Dictate if the NTSC or PAL gameplay mechanics should be used. Should automatically detect region, but can be manually overwritten otherwise.

main.asm

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ menuConfigControls:
10461046
dec menuVars, x
10471047
lda #$01
10481048
sta soundEffectSlot1Init
1049-
jsr checkGoofy
1049+
jsr assertValues
10501050
@skipLeftConfig:
10511051

10521052
; check if pressing right
@@ -1060,15 +1060,33 @@ menuConfigControls:
10601060
inc menuVars, x
10611061
lda #$01
10621062
sta soundEffectSlot1Init
1063-
jsr checkGoofy
1063+
jsr assertValues
10641064
@skipRightConfig:
10651065
@configEnd:
10661066
rts
10671067

10681068
menuConfigSizeLookup:
10691069
.byte MENUSIZES
10701070

1071-
checkGoofy:
1071+
assertValues:
1072+
; make sure you can only have block or qual
1073+
lda practiseType
1074+
cmp #MODE_QUAL
1075+
bne @noQual
1076+
lda menuVars, x
1077+
beq @noQual
1078+
lda #0
1079+
sta debugFlag
1080+
@noQual:
1081+
lda practiseType
1082+
cmp #MODE_DEBUG
1083+
bne @noDebug
1084+
lda menuVars, x
1085+
beq @noDebug
1086+
lda #0
1087+
sta qualFlag
1088+
@noDebug:
1089+
; goofy
10721090
lda practiseType
10731091
cmp #MODE_GOOFY
10741092
bne @noFlip

0 commit comments

Comments
 (0)