From bf0b18169a6bc4d1ca65425195474448c213481d Mon Sep 17 00:00:00 2001
From: Pecusx <Pecus@poczta.fm>
Date: Sun, 1 Jun 2025 12:45:57 +0200
Subject: [PATCH] More game controls

---
 lumber.asm |  66 +++++++++++++++++++++++++++++++----------------------
 lumber.xex | Bin 33246 -> 33284 bytes
 2 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/lumber.asm b/lumber.asm
index 18e3905..e9e314a 100644
--- a/lumber.asm
+++ b/lumber.asm
@@ -1404,9 +1404,9 @@ wait_for_key
     pause 1
 StartLoop
     jsr GetKey
-    cmp #@kbcode._left
+    cmp #@kbcode._left  ; left, Select
     beq leftkey
-    cmp #@kbcode._right
+    cmp #@kbcode._right ; right , Option
     bne notdirectionskeys
 leftkey
     lda Difficulty
@@ -1414,6 +1414,10 @@ leftkey
     sta Difficulty
     jmp difficulty_display
 notdirectionskeys
+    cmp #@kbcode._space  ; space, Start
+    beq EndOfStartScreen
+    cmp #@kbcode._tab  ; TAB, 1st joy button
+    bne StartLoop
 EndOfStartScreen
     rts
 .endp
@@ -1492,9 +1496,12 @@ training_mode
     beq training_mode2
     jsr EnterPlayerName    ; enter name only in normal game mode and if there are new score
 training_mode2
+    mva #5 NewHiScorePosition ; prevent highlighting of result
 OverLoop
     jsr GetKey
-    cmp #@kbcode._space
+    cmp #@kbcode._space ; space, Start
+    beq EndOfOverScreen
+    cmp #@kbcode._tab   ; TAB, Joy 1st button
     bne OverLoop
 EndOfOverScreen
     rts
@@ -1523,17 +1530,16 @@ loop
     bne No_keys
 key_released_before
     jsr GetKeyFast
-    cmp #@kbcode._left
+    cmp #@kbcode._left  ; left, Select
     beq left_pressed
-    cmp #@kbcode._right
+    cmp #@kbcode._tab   ; TAB, 1st button
+    beq left_pressed
+    cmp #@kbcode._right ; right, Option
+    beq right_pressed
+    cmp #@kbcode._ret ; Return
     beq right_pressed
     ; other keys or no key
-    cmp #@kbcode._up
-    bne NoNextLevel
-    ; next level if joy UP
     sta LastKey
-    ;jsr LevelUp
-NoNextLevel
 No_keys
     lda PowerValue
     jeq LevelDeath
@@ -1614,8 +1620,11 @@ LevelDeath
     RMTsong song_game_over
 @   
     jsr GetKey
-    cmp #@kbcode._space
+    cmp #@kbcode._space ; space, Start
+    beq restart
+    cmp #@kbcode._tab   ; TAB, 1st joy button
     bne @-
+restart
     ; restart game
     rts
 go_loop
@@ -1921,13 +1930,15 @@ input_name_loop
     jeq end_of_name
     pause 1
     jsr GetKey
-    cmp #@kbcode._left
+    cmp #@kbcode._left  ; left, Select
     beq leftkey
-    cmp #@kbcode._right
+    cmp #@kbcode._right ; right, Option
     beq rightkey
-    cmp #@kbcode._space
-    bne input_name_loop
+    cmp #@kbcode._space ; space, Start
     beq next_char
+    cmp #@kbcode._tab ; TAB, 1st joy buttom
+    beq next_char
+    bne input_name_loop
 leftkey
     ldx CharCode
     dex
@@ -3439,18 +3450,26 @@ checkSelectKey
       lda CONSOL
       and #%00000100           ; Option
       beq OptionPressed
+      lda CONSOL
+      and #%00000001           ; Start
+      beq StartPressed
     .ENDIF
     lda #@kbcode._none
     bne getkeyend
 OptionPressed
-    lda #@kbcode._atari        ; Option key
+    lda #@kbcode._right        ; Option key = right key
     bne getkeyend
 SecondButton
+    lda #@kbcode._ret          ; 2nd joy button = Return key
+    bne getkeyend
 SelectPressed
-    lda #@kbcode._tab          ; Select key
+    lda #@kbcode._left          ; Select key = left key
+    bne getkeyend
+StartPressed
+    lda #@kbcode._space          ; Start key = space key
     bne getkeyend
 JoyButton
-    lda #@kbcode._ret          ; Return key
+    lda #@kbcode._tab          ; 1st joy button = TAB key
 getkeyend
     rts
 ; ----
@@ -3490,8 +3509,8 @@ StillWait
       and #%00000100  ;  any key  
       beq StillWait
       lda CONSOL
-      and #%00000110           ; Select and Option only
-      cmp #%00000110
+      and #%00000111           ; Start, Select and Option
+      cmp #%00000111
       bne StillWait
     .ELIF TARGET = 5200
       lda SkStatSimulator
@@ -3502,13 +3521,6 @@ KeyReleased
       rts
 .endp
 ;--------------------------------------------------
-.proc CheckStartKey
-;--------------------------------------------------
-    lda CONSOL  ; turbo mode
-    and #%00000001 ; START KEY
-    rts
-.endp
-;--------------------------------------------------
 .proc InitBranches
 ;--------------------------------------------------
     ldy #5
diff --git a/lumber.xex b/lumber.xex
index a8629e6a3da54dd224d220dcac25eeb6a29cc05b..c65bcb7e3104934cb33d45185c93a660d4b71d53 100644
GIT binary patch
delta 4278
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

delta 4236
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