Merge pull request #3 from Pecusx/develop

Filenames and smol opty

Timberman.asm

@@ -12,7 +12,7 @@
 
 ;---------------------------------------------------
 .macro build
-    dta d"1.07" ; number of this build (4 bytes)
+    dta d"1.02" ; number of this build (4 bytes)
 .endm
 
 .macro RMTSong
@@ -57,8 +57,7 @@
     .zpvar SpeedTableAdr .word
     .zpvar Difficulty .byte ; 0 - normal, 1 - easy
     .zpvar LumberjackDir .byte ; 2 - on left , 1 - on right
-    .zpvar Paddle1State .byte
-    .zpvar Paddle2State .byte
+    .zpvar PaddleState .byte
     .zpvar LowCharsetBase .byte
     .zpvar displayposition .word
     .zpvar LastKey  .byte   ; $ff if no key pressed or last key released
@@ -196,7 +195,7 @@ timber_foot_addr
     .wo foot_0
     .by $44+$80 ; DLI_L2 - fonts
     .wo title_timber+(32*7) ; rest of shadow
-    .by $45
+    .by $45 
 difficulty_text_addr
     .wo difficulty_normal_text
     .by $45+$80
@@ -204,8 +203,6 @@ difficulty_text_addr
     .by $45+$80
     .wo credits_lines
     .by $85
-    .by $44         ; anty ANTIC 40/32 switch glitch :)
-    .wo empty_line
     .by $41
     .wo dl_title
 ;---------------------------------------------------
@@ -1807,10 +1804,8 @@ RIPLoop
     jsr GetKeyFast
     cmp #@kbcode._space ; space, Start
     beq restart
-    lda STRIG0
+    cmp #@kbcode._tab   ; TAB, 1st joy button
     beq restart
-;    cmp #@kbcode._tab   ; TAB, 1st joy button
-;    beq restart
     lda RTCLOK+1
     cmp #2
     bne RIPLoop
@@ -3471,7 +3466,7 @@ draw_branch3
     bne not_phase4
     ldx #(4*32)     ; how many lines draw
 not_phase4
-    stx tempbyte2
+    stx tempbyte
     ; now calculate start screen address
     :5 asl  ; phase*32
     ;clc
@@ -3489,7 +3484,7 @@ not_phase4
 @   lda (temp2),y
     sta (temp),y
     iny
-    cpy tempbyte2 ;? lines
+    cpy tempbyte ;? lines
     bne @-
 draw_branch4    
     lda branches_anim_phase
@@ -3505,7 +3500,7 @@ not_phase1
     bne not_phase2
     ldx #(1*32)     ; how many lines draw
 not_phase2    
-    stx tempbyte2
+    stx tempbyte
     ; now calculate start screen address
     :5 asl  ; phase*32
     ;clc
@@ -3523,7 +3518,7 @@ not_phase2
 @   lda (temp2),y
     sta (temp),y
     iny
-    cpy tempbyte2 ;? lines
+    cpy tempbyte ;? lines
     bne @-    
 all_drawed
     rts
@@ -3615,11 +3610,10 @@ notpressedJoyGetKey
     ;fire
     lda STRIG0
     beq JoyButton
-    .IF TARGET = 800        ; More joy buttons , Select and Option key only on A800
-      jsr Check3button      ; Third joy button
-      bcc JoyButton         ; like First button
-      jsr Check2button      ; Second joy button
+    .IF TARGET = 800           ; Second joy button , Select and Option key only on A800
+      jsr Check2button
       bcc SecondButton
+      bne checkSelectKey
 checkSelectKey
       lda CONSOL
       and #%00000010           ; Select
@@ -3631,8 +3625,6 @@ checkSelectKey
       and #%00000001           ; Start
       beq StartPressed
     .ENDIF
-    lda STRIG1
-    beq SecondButton
     lda #@kbcode._none
     bne getkeyend
 OptionPressed
@@ -3657,15 +3649,8 @@ Check2button
     lda PADDL0
     and #$c0
     eor #$C0
-    cmp Paddle1State
-    sta Paddle1State
-    rts
-Check3button
-    lda PADDL1
-    and #$c0
-    eor #$C0
-    cmp Paddle2State
-    sta Paddle2State
+    cmp PaddleState
+    sta PaddleState
     rts
     .ENDIF
 .endp
@@ -3690,8 +3675,6 @@ StillWait
       bne StillWait
       lda STRIG0
       beq StillWait
-      lda STRIG1
-      beq StillWait
     .IF TARGET = 800
       lda SKSTAT
       and #%00000100  ;  any key  

art/DM_logo_src/digital_melody_logo.asm

@@ -10,7 +10,7 @@
 fcnt	.ds 2
 fadr	.ds 2
 fhlp	.ds 2
-cloc	.ds 2
+cloc	.ds 1
 regA	.ds 1
 regX	.ds 1
 regY	.ds 1
@@ -78,7 +78,8 @@ _lp	lda trig0		; FIRE #0
 	and #1
 	beq stop
 
-    cpw cloc #500   ; timer 10s
+    lda cloc
+    cmp #200    ; timer - 4s.
     bcs stop
 
 	lda skctl
@@ -193,7 +194,7 @@ VBL
 
 	mva #@dmactl(standard|dma|lineX1|players|missiles) dmactl	;set new screen width
 
-	inw cloc		;little timer
+	inc cloc		;little timer
 
 ; Initial values