Skip to content

Commit 7ea32ac

Browse files
committed
formatting
1 parent c8d8c57 commit 7ea32ac

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

src/constants.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
142142
.byte $0 ; MODE_SPEED_TEST
143143
.byte $5 ; MODE_SCORE_DISPLAY
144144
.byte $3 ; MODE_CRASH
145-
.byte $1 ; MODE_STRICT
145+
.byte $1 ; MODE_STRICT
146146
.byte $1 ; MODE_HZ_DISPLAY
147147
.byte $1 ; MODE_INPUT_DISPLAY
148148
.byte $1 ; MODE_DISABLE_FLASH

src/playstate/updatestats.asm

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ testCrash:
466466
sta cycleCount
467467
lda #$6F
468468
sta cycleCount+1 ;low byte at +1
469-
469+
470470
lda completedLines ; checking if lines cleared
471471
beq @linesNotCleared
472472
ldx #$04 ;setting loop to run 4x
@@ -653,19 +653,19 @@ testCrash:
653653
adc allegroIndex
654654
sta allegroIndex
655655
@palCycles:
656-
lda palFlag ; if pal, move thresholds for crashes 3467 cycles away
657-
beq @randomFactors
658-
sec
659-
lda cycleCount+1
660-
sbc #$8B
661-
sta cycleCount+1
662-
lda cycleCount
663-
sbc #$0D
664-
sta cycleCount
665-
clc
656+
lda palFlag ; if pal, move thresholds for crashes 3467 cycles away
657+
beq @randomFactors
658+
sec
659+
lda cycleCount+1
660+
sbc #$8B
661+
sta cycleCount+1
662+
lda cycleCount
663+
sbc #$0D
664+
sta cycleCount
665+
clc
666666
@randomFactors:
667-
lda strictFlag
668-
bne @noDMA ;for strict crash, do not add random cycles.
667+
lda strictFlag
668+
bne @noDMA ;for strict crash, do not add random cycles.
669669
lda oneThirdPRNG ; RNG for which cycle of the last instruction the game returns to
670670
adc allegroIndex
671671
sta allegroIndex
@@ -710,13 +710,13 @@ testCrash:
710710
;confettiB = 30765-31193
711711
cmp #$74 ;high byte of cycle count is already loaded
712712
bne @nextSwitch
713-
lda strictFlag
714-
beq @normalChecks ;special conditions for "strict" mode. crash on 7423-7442, check red on 7443-7448.
715-
lda cycleCount+1
716-
cmp #$23 ;up to 8 cycles could have been added, but weren't, so our low bound is 8 below the typical.
717-
bcc @nextSwitch ;if too low, exit
718-
bcs @highBoundary ;otherwise, check high bound and skip check for gap.
719-
@normalChecks:
713+
lda strictFlag
714+
beq @normalChecks ;special conditions for "strict" mode. crash on 7423-7442, check red on 7443-7448.
715+
lda cycleCount+1
716+
cmp #$23 ;up to 8 cycles could have been added, but weren't, so our low bound is 8 below the typical.
717+
bcc @nextSwitch ;if too low, exit
718+
bcs @highBoundary ;otherwise, check high bound and skip check for gap.
719+
@normalChecks:
720720
lda cycleCount+1
721721
cmp #$2B ; minimum crash
722722
bcc @nextSwitch
@@ -733,11 +733,11 @@ testCrash:
733733
bcs @nextSwitch ;between 7436 & 7448
734734
cmp #$43
735735
bcc @notRed ;checking if crash is during first crashable instruction
736-
txa
737-
lsr ;all odd switches on PAL result in no crash.
738-
bcs @oddSwitch
739-
lda palFlag
740-
bne @nextSwitch ;if PAL, no crash.
736+
txa
737+
lsr ;all odd switches on PAL result in no crash.
738+
bcs @oddSwitch
739+
lda palFlag
740+
bne @nextSwitch ;if PAL, no crash.
741741
@oddSwitch:
742742
cpx #$07 ; checking which switch routine is active.
743743
beq @isPal ;checks version if sw2
@@ -749,10 +749,10 @@ testCrash:
749749
jsr satanSpawn
750750
jmp @allegroClear ;allegroClear is basically return, just clears the variable first.
751751
@isPal:
752-
lda palFlag
753-
beq @nextSwitch ;if NTSC, continue, no crash.
754-
jsr blackBox
755-
jmp @allegroClear
752+
lda palFlag
753+
beq @nextSwitch ;if NTSC, continue, no crash.
754+
jsr blackBox
755+
jmp @allegroClear
756756
@notRed:
757757
lda #$F0
758758
sta crashState
@@ -899,8 +899,8 @@ confettiHandler:
899899
beq @checkForNmi
900900
jmp confettiHandler
901901
@infiniteConfetti:
902-
lda palFlag
903-
bne @endConfetti ;infinite confetti does not exist on PAL
902+
lda palFlag
903+
bne @endConfetti ;infinite confetti does not exist on PAL
904904
lda heldButtons_player1
905905
adc #$80 ; loading 80 as Y coordinate of confetti text if nothing is held.
906906
cmp #$80
@@ -911,18 +911,18 @@ confettiHandler:
911911
rts
912912
satanSpawn: ; copied from routine vanilla game's memset_ppu_page_and_more which is no longer present in gym
913913
lda palFlag
914-
beq @ntsc
915-
lda #$00
914+
beq @ntsc
915+
lda #$00
916916
sta verticalBlankingInterval
917917
@checkForNmi:
918918
lda verticalBlankingInterval ;busyloop
919-
beq @checkForNmi
920-
ldx #$FF
921-
ldy #$00
922-
919+
beq @checkForNmi
920+
ldx #$FF
921+
ldy #$00
922+
923923
@ntsc:
924-
lda #$AA
925-
sta tmp1
924+
lda #$AA
925+
sta tmp1
926926
stx tmp2
927927
sty tmp3
928928
lda PPUSTATUS
@@ -996,4 +996,4 @@ patchData:
996996
.byte $FF,$FF,$FF,$FE,$23,$34,$FF,$FF
997997
.byte $FF,$FF,$FF,$FF,$FF,$FF,$FE,$22
998998
.byte $CA,$46,$47,$FE,$22,$EA,$56,$57
999-
.byte $FD
999+
.byte $FD

src/util/strings.asm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ stringLookup:
9696
.byte stringTopout-stringLookup
9797
.byte stringCrash-stringLookup
9898
.byte stringConfetti-stringLookup ;19
99-
.byte stringStrict-stringLookup
99+
.byte stringStrict-stringLookup
100100
stringClassic:
101101
.byte $7,'C','L','A','S','S','I','C'
102102
stringLetters:
@@ -152,4 +152,4 @@ stringCrash:
152152
stringConfetti:
153153
.byte $8,'C','O','N','F','E','T','T','I'
154154
stringStrict:
155-
.byte $6,'S','T','R','I','C','T'
155+
.byte $6,'S','T','R','I','C','T'

0 commit comments

Comments
 (0)