Merge remote-tracking branch 'upstream/master' into keyboard_score_entry

Author: zohassadar

src/gamemode/gametypemenu/menu.asm

@@ -575,7 +575,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

src/gamemodestate/initstate.asm

@@ -12,7 +12,6 @@
 .include "chr.asm"
 
 .setcpu "6502"
-.feature force_range
 
 .segment    "PRG_chunk1": absolute
 

src/main.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

src/modes/debug.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