Merge pull request #6 from Pecusx/develop

Second joystick button added to controls.

Timberman.asm

@@ -12,7 +12,7 @@
 
 ;---------------------------------------------------
 .macro build
-    dta d"1.02" ; number of this build (4 bytes)
+    dta d"1.05" ; number of this build (4 bytes)
 .endm
 
 .macro RMTSong
@@ -195,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
@@ -203,6 +203,8 @@ 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
 ;---------------------------------------------------
@@ -3466,7 +3468,7 @@ draw_branch3
     bne not_phase4
     ldx #(4*32)     ; how many lines draw
 not_phase4
-    stx tempbyte
+    stx tempbyte2
     ; now calculate start screen address
     :5 asl  ; phase*32
     ;clc
@@ -3484,7 +3486,7 @@ not_phase4
 @   lda (temp2),y
     sta (temp),y
     iny
-    cpy tempbyte ;? lines
+    cpy tempbyte2 ;? lines
     bne @-
 draw_branch4    
     lda branches_anim_phase
@@ -3500,7 +3502,7 @@ not_phase1
     bne not_phase2
     ldx #(1*32)     ; how many lines draw
 not_phase2    
-    stx tempbyte
+    stx tempbyte2
     ; now calculate start screen address
     :5 asl  ; phase*32
     ;clc
@@ -3518,7 +3520,7 @@ not_phase2
 @   lda (temp2),y
     sta (temp),y
     iny
-    cpy tempbyte ;? lines
+    cpy tempbyte2 ;? lines
     bne @-    
 all_drawed
     rts
@@ -3613,7 +3615,6 @@ notpressedJoyGetKey
     .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
@@ -3625,6 +3626,8 @@ checkSelectKey
       and #%00000001           ; Start
       beq StartPressed
     .ENDIF
+    lda STRIG1
+    beq SecondButton
     lda #@kbcode._none
     bne getkeyend
 OptionPressed
@@ -3675,6 +3678,8 @@ 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 1
+cloc	.ds 2
 regA	.ds 1
 regX	.ds 1
 regY	.ds 1
@@ -78,8 +78,7 @@ _lp	lda trig0		; FIRE #0
 	and #1
 	beq stop
 
-    lda cloc
-    cmp #200    ; timer - 4s.
+    cpw cloc #500   ; timer 10s
     bcs stop
 
 	lda skctl
@@ -194,7 +193,7 @@ VBL
 
 	mva #@dmactl(standard|dma|lineX1|players|missiles) dmactl	;set new screen width
 
-	inc cloc		;little timer
+	inw cloc		;little timer
 
 ; Initial values