keyboard detection

Author: zohassadar

README.md

@@ -248,7 +248,7 @@ Blocks are invisible until the end of the game.
 
 ![Hard Drop](./assets/screens/harddrop.png)
 
-Press `up` to hard drop and `select` to soft drop.
+Press `up` to hard drop and `select` to sonic drop.
 
 ## Level Menu
 

build.js

@@ -100,6 +100,7 @@ console.log();
 // build / compress nametables
 
 console.time('nametables');
+process.env['GYM_FLAGS'] = compileFlags.join(' ');
 require('./src/nametables/build');
 console.timeEnd('nametables');
 

src/constants.asm

@@ -101,9 +101,17 @@ MODE_LINECAP
 MODE_DASONLY
 MODE_QUAL
 MODE_PAL
+.if KEYBOARD = 1
+MODE_KEYBOARD
+.endif
 .endenum
 
+.if KEYBOARD = 1
+MODE_QUANTITY = MODE_KEYBOARD + 1
+.else
 MODE_QUANTITY = MODE_PAL + 1
+.endif
+
 MODE_GAME_QUANTITY = MODE_HARDDROP + 1
 
 SCORING_CLASSIC := 0 ; for scoringModifier
@@ -169,6 +177,9 @@ MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
     .byte $1    ; MODE_DASONLY
     .byte $1    ; MODE_QUAL
     .byte $1    ; MODE_PAL
+.if KEYBOARD = 1
+    .byte $1    ; MODE_KEYBOARD
+.endif
 .endmacro
 
 .macro MODENAMES

src/gamemode/bootscreen.asm

@@ -15,6 +15,10 @@ gameMode_bootScreen: ; boot
         jsr updateAudioAndWaitForNmi
         jsr checkRegion
 
+.if KEYBOARD = 1
+        jsr detectKeyboard
+.endif
+
 .if !QUAL_BOOT
         ; check if qualMode is already set
         lda qualFlag

src/gamemode/gametypemenu/menu.asm

@@ -152,37 +152,43 @@ seedControls:
 @skipSeedRight:
 
         lda menuSeedCursorIndex
-.if KEYBOARD <> 1
-        beq @skipSeedControl
-.else
-        bne @readKeys
+
+.if KEYBOARD = 1
+@kbSeedLow = generalCounter
+@kbSeedHigh = generalCounter2
+        bne @checkForKbSeedEntry
         jmp @skipSeedControl
-@readKeys:
+@checkForKbSeedEntry:
         jsr readKbSeedEntry
         bmi @noKeysPressed
-        sta generalCounter
+        sta @kbSeedLow
+        asl
+        asl
+        asl
+        asl
+        sta @kbSeedHigh
         ldy menuSeedCursorIndex
         dey
         tya
         lsr
-        tay ; save seed offset
-        bcc @highByte
+        tay
+        ; y = (index-1) // 2
+        ; c = (index-1) % 2
         lda set_seed_input,y
+        bcc @highByte
+; low byte:
         and #$F0
-        ora generalCounter
-        sta set_seed_input,y
-        jmp @moveRight
+        ora @kbSeedLow
+        bcs @storeSeed
 @highByte:
-        lda set_seed_input,y
         and #$0F
-        asl generalCounter
-        asl generalCounter
-        asl generalCounter
-        asl generalCounter
-        ora generalCounter
+        ora @kbSeedHigh
+@storeSeed:
         sta set_seed_input,y
         jmp @moveRight
 @noKeysPressed:
+.else
+        beq @skipSeedControl
 .endif
 
         lda menuSeedCursorIndex

src/gamemodestate/handlegameover.asm

@@ -18,9 +18,10 @@ gameModeState_handleGameOver:
         lda #$03
         sta renderMode
 .if KEYBOARD = 1
-        inc entryActive
+        ; flag for keyboard poll to ignore mapped keys except start/return
+        inc highScoreEntryActive
         jsr handleHighScoreIfNecessary
-        dec entryActive
+        dec highScoreEntryActive
 .else
         jsr handleHighScoreIfNecessary
 .endif

src/highscores/entry_screen.asm

@@ -178,7 +178,7 @@ highScoreEntryScreen:
 @checkForAOrRightPressed:
 
 .if KEYBOARD = 1
-        jsr readKbScoreInput
+        jsr readKbHighScoreEntry
         bmi @noKeyboardInput
         beq @nextTile
         cmp #$7F

src/io.asm

@@ -34,13 +34,6 @@ SND_CHN     := $4015
 JOY1        := $4016
 JOY2_APUFC  := $4017                        ; read: bits 0-4 joy data lines (bit 0 being normal controller), bits 6-7 are FC inhibit and mode
 
-; Used by Family Basic Keyboard
-.if KEYBOARD
-KB_INIT := $05
-KB_COL_0 := $04
-KB_COL_1 := $06
-KB_MASK  := $1E
-.endif
 
 MMC1_Control := $8000
 MMC1_CHR0   := $BFFF

src/keyboard/buttonmap.asm

@@ -1,5 +1,3 @@
-; see keymap.asm for full list of keys
-
 kbMappedUp     = keyK
 kbMappedDown   = keyJ
 kbMappedLeft   = keyH

src/keyboard/constants.asm

@@ -1,35 +1,5 @@
-; Assisted with the following python:
-; kbmap = """
-; CloseBracket OpenBracket RETURN  F8        STOP    Yen     SHIFTRight   KANA
-; Semicolon    Colon       atSign  F7        Caret   Dash    Slash        Underscore
-; K            L           O       F6        0       P       Comma        Period
-; J            U           I       F5        8       9       N            M
-; H            G           Y       F4        6       7       V            B
-; D            R           T       F3        4       5       C            F
-; A            S           W       F2        3       E       Z            X
-; CTR          Q           ESC     F1        2       1       GRPH         SHIFTLeft
-; Left         Right       UP      CLR_HOME  INS     DEL     Space        Down
-; """
-; for row, keys in enumerate(kbmap.strip().splitlines()):
-;     for mask, key in enumerate(keys.split()):
-;         print(f"key{key:<12} = ${((8 - row) << 3) | mask:02X}")
-
-.macro readKeyDirect keyMap
-        lda keyboardInput + (keyMap >> 3)
-        and #$80 >> (keyMap & 7)
-.endmacro
-
-.macro expandKeyRow keyMap
-        .byte keyMap >> 3
-.endmacro
-
-.macro expandKeyMask keyMap
-        .byte $80 >> (keyMap & 7)
-.endmacro
-
-
 ; each key is represented by a byte 0RRRRCCC
-; row is 0-8 and is inverted
+; row is 0-8
 ; col is byte position from left to right
 
 keyF1           = $0B
@@ -113,3 +83,27 @@ keyW            = $12
 keyX            = $17
 keyY            = $22
 keyZ            = $16
+
+
+KB_DISABLE = $00
+KB_INIT = $05
+KB_COL_0 = $04
+KB_COL_1 = $06
+KB_MASK  = $1E
+
+UPDOWN = BUTTON_UP | BUTTON_DOWN
+LEFTRIGHT = BUTTON_LEFT | BUTTON_RIGHT
+
+.macro readKeyDirect keyMap
+; not zero - key is pressed
+        lda kbRawInput + (keyMap >> 3)
+        and #$80 >> (keyMap & 7)
+.endmacro
+
+.macro expandKeyRow keyMap
+        .byte keyMap >> 3
+.endmacro
+
+.macro expandKeyMask keyMap
+        .byte $80 >> (keyMap & 7)
+.endmacro