From fc44a155487129800d17c4fad2a549ba06863c08 Mon Sep 17 00:00:00 2001
From: alpine9000 <alex.g.brown@gmail.com>
Date: Fri, 4 Mar 2016 21:16:51 +1100
Subject: [PATCH] Moved update code into vblank isr

---
 009.anim_blit/anim_blit.s       |  44 ++++++++++++++++++++------------
 009.anim_blit/bin/anim_blit.adf | Bin 901120 -> 901120 bytes
 009.anim_blit/blit.s            |   7 +++--
 009.anim_blit/init.s            |   7 +++--
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/009.anim_blit/anim_blit.s b/009.anim_blit/anim_blit.s
index bcd247b..1e6c7f3 100644
--- a/009.anim_blit/anim_blit.s
+++ b/009.anim_blit/anim_blit.s
@@ -8,31 +8,41 @@ entry:
 	lea 	CUSTOM,a6
 	bsr	init
 	
-	moveq	#0,d0 		; starting x position for the blitter object
-	moveq 	#0,d1		; starting y position for the blitter object
 	lea	bitplanes(pc),a0
 	lea	emoji,a1
 	lea	emojiMask,a2
 .mainLoop:
-	bsr.s	waitvbl
-	addq	#1,d0		; move the blitter object one pixel to the left
-	addq	#1,d1		; move the blitter object one pixel down
-	bsr.s 	blitObject64	; blit 64 pixel object (x=d0,y=d1,background=a0,object=a1,mask=a2)
-	cmp.l	#SCREEN_WIDTH-BLIT_BOB_WIDTH64+16,d0	; check if we need to wrap the x
-	bne.s	.skip
-	moveq	#0,d0					; wrap x back to zero
-.skip:
-
-	cmp.l	#SCREEN_HEIGHT-BLIT_BOB_HEIGHT64,d1	; check if we need to wrap the y
-	bne.s	.skip2
-	moveq	#0,d1					; wrap y back to the top
-.skip2:		
 	bra.s	.mainLoop
 
-	include	"utils.s"
 	include	"blit.s"
 	include "init.s"
-	
+
+level3InterruptHandler:
+	movem.l	d0-a6,-(sp)	
+	move.w	#INTF_VERTB,INTREQ(a6)	; clear interrupt bit	
+
+.moveBlitterObject:	
+	lea	xpos(pc),a3
+	lea	ypos(pc),a4
+	add.l	#1,xpos		; move the blitter object one pixel to the left
+	add.l	#1,ypos		; move the blitter object one pixel down
+	bsr.s 	blitObject64	; blit 64 pixel object (x=d0,y=d1,background=a0,object=a1,mask=a2)
+	cmp.l	#SCREEN_WIDTH-BLIT_BOB_WIDTH64+16,xpos	; check if we need to wrap the x
+	bne.s	.skip
+	move.l	#0,xpos					; wrap x back to 0
+.skip:
+	cmp.l	#SCREEN_HEIGHT-BLIT_BOB_HEIGHT64,ypos	; check if we need to wrap the y
+	bne.s	.done
+	move.l	#0,ypos					; wrap y back to 0
+.done:
+
+		
+.interruptComplete:
+	movem.l	(sp)+,d0-a6
+	rte
+
+xpos:	dc.l	0
+ypos:	dc.l	0
 	
 copper:
 	;; bitplane pointers must be first else poking addresses will be incorrect
diff --git a/009.anim_blit/bin/anim_blit.adf b/009.anim_blit/bin/anim_blit.adf
index aaf85b3f1d380bb759df9f1e1fe4b8f6e1225165..ceaa834783b003c183d4789bd5bc01f76e984021 100644
GIT binary patch
delta 253
zcmZo@FmGru-@wVDJ<IVI(;DZW4D6?NxB|&5I}-kR<uNdE=rOP{Fs1$QEA@E(|DS@e
zl1So<$$2al9PYmun-oto<ZOP%;>gH)#Pt`$l*u}5()AU(9t;fzdJG-5HO&VYrrFjU
zP+*wlbHDyS#01+K1_g#W?!Op3Jb^f9Cj&cE3z+OkWcYiFXD0&#BLhe*jZ66t0|)@w
zAW?<`KvoBmXb0HLVz3$z@d$_?FfeS+V#~SP^rY<xW7`v^wkOPOPgvTXu(my6YkR`p
V_JpJD31{0AuC^!K%bxJu0RYgfS;_za

delta 231
zcmZo@FmGru-@wUIf2Dw-h{5p}Q=Riq2KG~Zu0ZliU!qKqLy%*l(}q0^42%qEOa%;^
zfGmasX-q{736DIU|Np08$#DMz%Yi)%jQ<&csu=Yd(%$&oumA5?>Xpa9#G%K)#=w;J
z!><&iHt~%LgBruLZVhHNh8Nv0yQefi^m^%K>%;(rll@rYHg92ZWMs{7{l#E0`4_9S
zw2ZC?LxX`HLx*im^8towwlxnJ7-m5X-`vAia(7~YR@0NVCyZ@RnA)B&w>@ELd&1iG
agstrfd)pI^wkMozPq^Bia4&npa|Zy<N?d9H

diff --git a/009.anim_blit/blit.s b/009.anim_blit/blit.s
index f0be615..a5bc03b 100644
--- a/009.anim_blit/blit.s
+++ b/009.anim_blit/blit.s
@@ -35,13 +35,16 @@ blitWait:
 	rts
 
 	;; blitobject64
-	;; d0 - xpos
-	;; d1 - ypos
+	;; a3 - xpos
+	;; a4 - ypos
 	;; a0 - display
 	;; a1 - object
 	;; a2 - mask
 blitObject64: 
 	movem.l	d0-a6,-(sp)
+	
+	move.l	(a3),d0
+	move.l	(a4),d1
 	bsr	 blitWait
 
 	;; d0 = XPOS
diff --git a/009.anim_blit/init.s b/009.anim_blit/init.s
index 08d9cd5..090929c 100644
--- a/009.anim_blit/init.s
+++ b/009.anim_blit/init.s
@@ -2,7 +2,10 @@
 init:
 	movem.l	d0-a6,-(sp)
 	move	#$7ff,DMACON(a6)	; disable all dma
-	move	#$7fff,INTENA(a6)	; disable all interrupts
+
+	lea	level3InterruptHandler(pc),a3
+	move.l	a3,LVL3_INT_VECTOR
+	move	#$7fff,INTENA(a6) ; disable all interrupts
 
 	include "out/image-palette.s"
 	
@@ -35,6 +38,6 @@ init:
 	move.l	a0,COP1LC(a6)
  	move.w  COPJMP1(a6),d0
 	move.w	#(DMAF_BLITTER|DMAF_SETCLR!DMAF_COPPER!DMAF_RASTER!DMAF_MASTER),DMACON(a6)
-	move.w	#(INTF_SETCLR|INTF_INTEN|INTF_EXTER),INTENA(a6)
+	move.w	#(INTF_SETCLR|INTF_VERTB|INTF_INTEN),INTENA(a6)
 	movem.l (sp)+,d0-a6
 	rts
\ No newline at end of file