Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gamemode/gametypemenu/menu.asm
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ menuYTmp := tmp2
ldx darkModifier
lda darkOptions, x
sta spriteIndexInOamContentLookup
lda #(MODE_DARK*8) + MENU_SPRITE_Y_BASE + 1
lda #<((MODE_DARK*8) + MENU_SPRITE_Y_BASE + 1)

@renderOption:
sec
Expand Down
1 change: 0 additions & 1 deletion src/main.asm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
.include "chr.asm"

.setcpu "6502"
.feature force_range

.segment "PRG_chunk1": absolute

Expand Down
2 changes: 1 addition & 1 deletion src/nmi/render_mode_pause.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ render_mode_pause:
beq @skipSaveSlotPatch
jsr saveSlotNametablePatch
lda renderFlags
and #~RENDER_DEBUG
and #<~RENDER_DEBUG
sta renderFlags
@skipSaveSlotPatch:
lda playState
Expand Down
10 changes: 5 additions & 5 deletions src/nmi/render_mode_play_and_demo.asm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ render_mode_play_and_demo:
jsr renderModernLines
@doneRenderingLines:
lda renderFlags
and #~RENDER_LINES
and #<~RENDER_LINES
sta renderFlags

@renderLevel:
Expand Down Expand Up @@ -85,7 +85,7 @@ render_mode_play_and_demo:
@renderLevelEnd:
jsr updatePaletteForLevel
lda renderFlags
and #~RENDER_LEVEL
and #<~RENDER_LEVEL
sta renderFlags

@renderScore:
Expand Down Expand Up @@ -164,7 +164,7 @@ render_mode_play_and_demo:

@clearScoreRenderFlags:
lda renderFlags
and #~RENDER_SCORE
and #<~RENDER_SCORE
sta renderFlags

@renderHz:
Expand All @@ -175,7 +175,7 @@ render_mode_play_and_demo:
beq @renderStatsHz
jsr renderHz
lda renderFlags
and #~RENDER_HZ
and #<~RENDER_HZ
sta renderFlags

; run a patched version of the stats
Expand Down Expand Up @@ -207,7 +207,7 @@ render_mode_play_and_demo:
lda statsByType,x
jsr twoDigsToPPU
lda renderFlags
and #~RENDER_STATS
and #<~RENDER_STATS
sta renderFlags
@renderTetrisFlashAndSound:
lda #$3F
Expand Down