diff --git a/dino.asm b/dino.asm index ab2dbc3..429974c 100644 --- a/dino.asm +++ b/dino.asm @@ -86,6 +86,14 @@ FirstSTART NewGame jsr SetStart EndLoop + jsr GameR + key + jsr HiScoreR + jmp NewGame + rts + +;----------------------------------------------- +.proc GameR ;lda #$32 ;sta COLBAK jsr WorldToScreen @@ -111,11 +119,8 @@ EndLoop mva #4 hscrol jmp EndLoop EndGame - key - jsr HiScoreR - jmp NewGame rts - +.endp ;----------------------------------------------- ; Generation of character sets 2,3 and 4 of 1 ; By copying and horizontal shift dino @@ -397,7 +402,7 @@ ObjectLoop rts .endp ;----------------------------------------------- -; Show Dino on screen (test) +; Show Dino on screen and check collisions ;----------------------------------------------- .proc ShowDino ldx #5 ; position diff --git a/dino.asm.bak b/dino.asm.bak index 8ac5508..ab2dbc3 100644 --- a/dino.asm.bak +++ b/dino.asm.bak @@ -459,10 +459,6 @@ Jump jPhase1 ldy #0 DinoLoop1 - lda (temp_w),y - bmi @+ - sta screen+$300,x -@ adw temp_w #5 lda (temp_w),y bmi @+ lda screen+$400,x ; check obstacle @@ -498,7 +494,7 @@ NotHit1c lda (temp_w),y Hit1c sta screen+$600,x -@ sbw temp_w #15 +@ sbw temp_w #10 inx iny cpy #5 ; dino width @@ -507,10 +503,6 @@ Hit1c jPhase2 ldy #0 DinoLoop2 - lda (temp_w),y - bmi @+ - sta screen+$200,x -@ adw temp_w #5 lda (temp_w),y bmi @+ sta screen+$300,x @@ -538,7 +530,7 @@ NotHit2b lda (temp_w),y Hit2b sta screen+$500,x -@ sbw temp_w #15 +@ sbw temp_w #10 inx iny cpy #5 ; dino width @@ -547,10 +539,6 @@ Hit2b jPhase3 ldy #0 DinoLoop3 - lda (temp_w),y - bmi @+ - sta screen+$100,x -@ adw temp_w #5 lda (temp_w),y bmi @+ sta screen+$200,x @@ -570,7 +558,7 @@ NotHit3a lda (temp_w),y Hit3a sta screen+$400,x -@ sbw temp_w #15 +@ sbw temp_w #10 inx iny cpy #5 ; dino width @@ -579,10 +567,6 @@ Hit3a jPhase4 ldy #0 DinoLoop4 - lda (temp_w),y - bmi @+ - sta screen,x -@ adw temp_w #5 lda (temp_w),y bmi @+ sta screen+$100,x @@ -594,7 +578,7 @@ DinoLoop4 lda (temp_w),y bmi @+ sta screen+$300,x -@ sbw temp_w #15 +@ sbw temp_w #10 inx iny cpy #5 ; dino width diff --git a/dino.xex b/dino.xex index 5f3f06b..f8dc91b 100644 Binary files a/dino.xex and b/dino.xex differ