Merge branch 'kirjavascript:master' into mapper_edit

Author: zohassadar

src/gamemodestate/pause.asm

@@ -30,8 +30,6 @@ pause:
 @pauseSetupClassic:
         lda #$16
         sta PPUMASK
-        jmp @pauseSetupPart2
-
 @pauseSetupNotClassic:
         lda #$04 ; render_mode_pause
         sta renderMode

src/ram.asm

@@ -136,7 +136,7 @@ highScoreEntryRawPos: .res 1 ; $00D5                ; High score position 0=1st
 highScoreEntryNameOffsetForRow: .res 1 ; $00D6      ; Relative to start of table
 highScoreEntryCurrentLetter: .res 1 ; $00D7
 lineClearStatsByType: .res 7 ; $00D8                ; bcd. one entry for each of single, double, triple, tetris
-displayNextPiece: .res 1 ; $00DF
+hideNextPiece: .res 1 ; $00DF
 AUDIOTMP1: .res 1 ; $00E0
 AUDIOTMP2: .res 1 ; $00E1
 AUDIOTMP3: .res 1 ; $00E2

src/util/core.asm

@@ -245,7 +245,6 @@ generateNextPseudorandomNumber2x:
 generateNextPseudorandomNumber:
         lda tmp1,x
         eor tmp2,x
-        and #$02
         lsr
         lsr
         ror tmp1,x
@@ -254,7 +253,7 @@ generateNextPseudorandomNumber:
         sbc #$00
         bpl @noReset
         lda #$2
-@noReset:	
+@noReset:
         sta oneThirdPRNG
         rts