Change fire to return to start game and move across levels

intoinside · Dec 3, 2021 · ceb7fbf · ceb7fbf
1 parent a661dc0
commit ceb7fbf
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 6 deletions.
diff --git a/_intro.asm b/_intro.asm
@@ -22,9 +22,7 @@ Intro: {
     CheckFire:
       jsr WaitRoutine
       jsr TimedRoutine
-      jsr GetJoystickMove
-
-      lda FirePressed
+      jsr Keyboard.IsReturnPressed
       beq CheckFire
 
     NoMovement:

diff --git a/_keyboard.asm b/_keyboard.asm
@@ -0,0 +1,32 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Project   : ForestSaver - https://github.com/intoinside/ForestSaver
+// Target    : Commodore 64
+// Author    : Raffaele Intorcia - raffaele.intorcia@gmail.com
+//
+// Routine for keyboard managing
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#importonce
+
+Keyboard: {
+  Init: {
+      lda #1
+      sta KEYB.BUFFER_LEN     //  disable keyboard buffer
+      lda #127
+      sta KEYB.REPEAT_SWITCH  // disable key repeat
+  }
+
+  IsReturnPressed: {
+      lda KEYB.CURRENT_PRESSED
+      and #$01
+      sta ReturnPressed
+
+      rts
+  }
+
+  ReturnPressed:  .byte $00
+}
+
+#import "_label.asm"
diff --git a/_label.asm b/_label.asm
@@ -29,6 +29,12 @@ CIA: {
   .label PORT_A             = $dd00
 }
 
+KEYB: {
+  .label CURRENT_PRESSED    = $00cb
+  .label BUFFER_LEN         = $0289
+  .label REPEAT_SWITCH      = $028a
+}
+
 SPRITES: {
   .label EXTRACOLOR1        = $d025
   .label EXTRACOLOR2        = $d026

diff --git a/_level1.asm b/_level1.asm
@@ -44,13 +44,13 @@ Level1: {
 
     CloseLevelAndGotoNext:
       SetSpriteToBackground()
-      lda FirePressed
+      jsr Keyboard.IsReturnPressed
       bne LevelDone
       jmp EndLoop
 
     CloseLevelAndGame:
       SetSpriteToBackground()
-      lda FirePressed
+      lda Keyboard.ReturnPressed
       bne LevelDone
 
     EndLoop:

diff --git a/_level2.asm b/_level2.asm
@@ -45,7 +45,7 @@ Level2: {
 
     CloseLevelAndGame:
       SetSpriteToBackground()
-      lda FirePressed
+      jsr Keyboard.IsReturnPressed
       bne LevelDone
 
     EndLoop:

diff --git a/main.asm b/main.asm
@@ -69,10 +69,13 @@ MainGameSettings: {
     lda #$ff
     sta VIC.SPRITE_MULTICOLOR
 
+    jsr Keyboard.Init
+
     rts
 }
 
 #import "_intro.asm"
 #import "_level1.asm"
 #import "_level2.asm"
+#import "_keyboard.asm"
 #import "_label.asm"
diff --git a/maps/game-maps.ctm b/maps/game-maps.ctm