From 783c82a895e2e9486656a33e0c7722c073d9b969 Mon Sep 17 00:00:00 2001
From: alpine9000 <alex.g.brown@gmail.com>
Date: Fri, 15 Apr 2016 10:11:31 +1000
Subject: [PATCH] refactor...

---
 028.game2/game1.s | 53 +++++++++++++++++++++++++++--------------------
 028.game2/image.s | 11 ++--------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/028.game2/game1.s b/028.game2/game1.s
index 5c7f1db..8e51c18 100644
--- a/028.game2/game1.s
+++ b/028.game2/game1.s
@@ -47,11 +47,33 @@ Reset:
 	move.l	#0,backgroundScrollX
 	move.l	#0,bg_shift		; shift counter (d2)
 	move.l	#0,bg_tileIndex		; tile index	(d3)	
-	move.l	#BACKGROUND_UPDATE_COUNT,d6 (Frame count)
 	jsr 	BlueFill
 	move.l	#-1,frameCount		
 	
 MainLoop:
+
+	move.w	#$09e,COLOR00(a6)	
+	move.w	#$09e,COLOR08(a6)
+	
+	bsr 	Update
+	
+	bsr	RenderNextForegroundFrame	
+	bsr 	RenderNextBackgroundFrame		
+
+	move.l	#5000,d7
+.loop:
+	dbra	d7,.loop
+
+	jsr	WaitVerticalBlank	
+	bsr.s	HoriScrollPlayfield
+	jsr 	SwitchBuffers	    ; takes bitplane pointer offset in d0
+
+	move.w	#$000,COLOR00(a6)	
+	move.w	#$000,COLOR08(a6)	
+	
+	bra	MainLoop
+
+Update:
 	andi.b	#BACKGROUND_UPDATE_COUNT,d6
 	bne	.skipBackgroundUpdates
 	;; ---- Background updates ----------------------------------------
@@ -73,21 +95,10 @@ MainLoop:
 	bsr	UpdateShiftCounter
 .skipForegroundUpdates:
 
-	add.l	#1,frameCount	
-
+	add.l	#1,frameCount
+	move.l	frameCount,d6	
+	rts
 	
-	move.l	frameCount,d6
-	
-	bsr	RenderNextForegroundFrame	
-	bsr 	RenderNextBackgroundFrame		
-
-	jsr	WaitVerticalBlank		
-	bsr.s	HoriScrollPlayfield
-	jsr 	SwitchBuffers	    ; takes bitplane pointer offset in d0
-	
-
-	bra	MainLoop
-
 HoriScrollPlayfield:
 	;; d0 - fg x position in pixels
 	;; d1 - bg x position in pixels	
@@ -120,12 +131,9 @@ HoriScrollPlayfield:
 
 
 RenderNextBackgroundFrame:
-	btst	#FOREGROUND_DELAY_BIT,d6
-	beq	.s1
 	lea	backgroundMap,a2
 	add.l	bg_tileIndex,a2
 	bsr	RenderBackgroundTile	
-.s1:
 	rts
 	
 RenderNextForegroundFrame:
@@ -213,6 +221,7 @@ Level3InterruptHandler:
 
 .verticalBlank:
 	move.w	#INTF_VERTB,INTREQ(a6)	; clear interrupt bit	
+	add.l	#1,verticalBlankCount
 .checkCopper:
 	move.w	INTREQR(a6),d0
 	and.w	#INTF_COPER,d0	
@@ -258,7 +267,7 @@ foregroundOffscreen:
 backgroundOnscreen:
 	dc.l	backgroundBitplanes1
 backgroundOffscreen:
-	dc.l	backgroundBitplanes2	
+	dc.l	backgroundBitplanes1
 tilemap:
 	incbin "out/foreground.bin"
 backgroundTilemap:
@@ -282,6 +291,8 @@ bg_tileIndex:
 	dc.l	0
 frameCount:
 	dc.l	0
+verticalBlankCount:
+	dc.l	0
 	
 	section .bss
 foregroundBitplanes1:
@@ -294,10 +305,6 @@ foregroundBitplanes2:
 backgroundBitplanes1:
 	ds.b	IMAGESIZE
 	ds.b	BITPLANE_WIDTH_BYTES*20
-backgroundBitplanes2:
-	ds.b	IMAGESIZE
-	ds.b	BITPLANE_WIDTH_BYTES*20	
-	
 
 startUserstack:
 	ds.b	$1000		; size of stack
diff --git a/028.game2/image.s b/028.game2/image.s
index c70c8b4..1884213 100644
--- a/028.game2/image.s
+++ b/028.game2/image.s
@@ -4,7 +4,6 @@
 	
 SwitchBuffers:
 	;; offscreen - bitplane address
-	;; 	movem.l	d0/a0-a1,-(sp)
 
 	move.l	foregroundScrollX,d0
 	lsr.l   #3,d0		; bytes to scroll
@@ -15,19 +14,13 @@ SwitchBuffers:
 	lea 	copperListBpl1Ptr,a0
 	jsr	PokeBitplanePointers
 
-	btst	#FOREGROUND_DELAY_BIT,d6 ; only swap the background buffer every second frame
-	beq	.skipBackgroundSwap
+	;; background is not double buffered
 	move.l	backgroundScrollX,d0
 	lsr.l   #3,d0		; bytes to scroll		
-	move.l	backgroundOffscreen,a0
-	move.l	backgroundOnscreen,backgroundOffscreen
-	move.l	a0,backgroundOnscreen
-	move.l	a0,a1
+	move.l	backgroundOnscreen,a1
 	lea 	copperListBpl2Ptr,a0
 	jsr	PokeBitplanePointers
 
-.skipBackgroundSwap:	
-	;; 	movem.l (sp)+,d0/a0-a1
 	rts
 
 PokeBitplanePointers: