diff --git a/src/gamemode/gametypemenu/menu.asm b/src/gamemode/gametypemenu/menu.asm index e385bbb0..9ce4695d 100644 --- a/src/gamemode/gametypemenu/menu.asm +++ b/src/gamemode/gametypemenu/menu.asm @@ -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 diff --git a/src/main.asm b/src/main.asm index 1bebb3e3..000f7ae9 100644 --- a/src/main.asm +++ b/src/main.asm @@ -12,7 +12,6 @@ .include "chr.asm" .setcpu "6502" -.feature force_range .segment "PRG_chunk1": absolute diff --git a/src/nmi/render_mode_pause.asm b/src/nmi/render_mode_pause.asm index a7dbba14..b2ff2796 100644 --- a/src/nmi/render_mode_pause.asm +++ b/src/nmi/render_mode_pause.asm @@ -4,7 +4,7 @@ render_mode_pause: beq @skipSaveSlotPatch jsr saveSlotNametablePatch lda renderFlags - and #~RENDER_DEBUG + and #<~RENDER_DEBUG sta renderFlags @skipSaveSlotPatch: lda playState diff --git a/src/nmi/render_mode_play_and_demo.asm b/src/nmi/render_mode_play_and_demo.asm index 3bc2f9cb..e2bb7670 100644 --- a/src/nmi/render_mode_play_and_demo.asm +++ b/src/nmi/render_mode_play_and_demo.asm @@ -40,7 +40,7 @@ render_mode_play_and_demo: jsr renderModernLines @doneRenderingLines: lda renderFlags - and #~RENDER_LINES + and #<~RENDER_LINES sta renderFlags @renderLevel: @@ -85,7 +85,7 @@ render_mode_play_and_demo: @renderLevelEnd: jsr updatePaletteForLevel lda renderFlags - and #~RENDER_LEVEL + and #<~RENDER_LEVEL sta renderFlags @renderScore: @@ -164,7 +164,7 @@ render_mode_play_and_demo: @clearScoreRenderFlags: lda renderFlags - and #~RENDER_SCORE + and #<~RENDER_SCORE sta renderFlags @renderHz: @@ -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 @@ -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