From b2a2214d9d1ab7e87b7d8b06b1276d5a4eb1a8c9 Mon Sep 17 00:00:00 2001 From: alpine9000 Date: Fri, 25 Mar 2016 19:49:36 +1100 Subject: [PATCH] A few incorrect dbra counters --- 001.simple_image/bin/image.adf | Bin 901120 -> 901120 bytes 001.simple_image/image.s | 2 +- 003.music/bin/music.adf | Bin 901120 -> 901120 bytes 003.music/music.s | 2 +- 006.simple_blit/blit.s | 23 ----------------------- 007.masked_blit/masked_blit.s | 9 --------- 008.shift_blit/shift_blit.s | 9 --------- 023.slideshow/bin/slideshow.adf | Bin 901120 -> 901120 bytes 023.slideshow/slideshow.s | 4 ++-- 9 files changed, 4 insertions(+), 45 deletions(-) diff --git a/001.simple_image/bin/image.adf b/001.simple_image/bin/image.adf index 0667a08d6d555fd1cc7529d2facb35bff70e2654..d9e5c7f769669bd2fc7e4e471966c3bd1f62b3b6 100644 GIT binary patch delta 68 zcmZo@FmGru-{8u^$kOb_((cB>2*gZ4%nZaJJ}VHj0Wmuea{w_X5OV=BHxTn|cVpq* GwHp9W6cE<{ delta 68 zcmZo@FmGru-{8u^$lC12((cB>2*gZ4%nZaJJ}VHj0Wmuea{w_X5OV=BHxTn|cVpq* GwHp9WP7v4t diff --git a/001.simple_image/image.s b/001.simple_image/image.s index 88de6c4..51ba67c 100644 --- a/001.simple_image/image.s +++ b/001.simple_image/image.s @@ -35,7 +35,7 @@ level3InterruptHandler: .resetBitplanePointers: lea bitplanes(pc),a1 lea BPL1PTH(a5),a2 - moveq #SCREEN_BIT_DEPTH,d0 + moveq #SCREEN_BIT_DEPTH-1,d0 .bitplaneloop: move.l a1,(a2) lea SCREEN_WIDTH_BYTES(a1),a1 ; bit plane data is interleaved diff --git a/003.music/bin/music.adf b/003.music/bin/music.adf index 83349833ffbcc00ba532e379d06d46e6b8e06517..36d93d52406a74822fefbfe6d16e69016c10816a 100644 GIT binary patch delta 975 zcmYjNU1$?o6h8O%CX>ue(`lNx*gVcAaix(>5CWXX%r~mqrp(0;^Jn z(yhxfxFV(QU1V4GVUb;*7AdW0=z|8?r$r?!T~ zrlHS---fb+g5k#SV0hab3c9B!4YuW>*uL)*mTOM0=?{Z54Rk$US3FYE+B(3Vd;^rO z(x2%~IwUc=TYMzN$ZfhxHW0-FDqU5=K#Nnb_M~@fV*ym?p$nDc+e{>9-YB-M!A&oW541{WzS15U!qU3&U5P8eBY+WtRgv zV4+{4gTT5i`6SZkksc&5-Xd<}d&E$JZHkw)QVu-PZ_tH31z=WQ;6fOhGji1;nnCn_ zUYkd=C*%$dZEIERuaEX&i6cHFhQ5qj0#?V%$x7D=m{&Y<0!+D{w(aL)x^O`$>kNT40koKQE*#9sTN=T<{|iu>rxP?w zdu(56gYBt(Ct0L<@(EEqAkn-S0=h5?#aHdW7*im@9y(>5>Xk(NFbr4VHasxu&fcRy zFR*EsSB#{<3+6b`WCXs1fY?fi- z%n*0Op8_uUSEL)bR^2g-UG zvWR97eVmr3(d;otql~uY61MQuKFqPciU1!1DFKjSIorCLL56EVhBswFh8LBjAB*Z_ zg1yGN=|@%1w%Iq-%*6^Icf13!`{DBPyyC*Q&^d+1bo+_f5&In)9X$eH7dwZzPYGWy zevg8_7OPvBz2PXQ$3Yj2Y+wm@Ot)NA%8+pxWt+Pne*4&}^Y0`@2paohmj%A8FCJvq zgnuIg`%j|YWHOHIMM-fEr+0;AZZaG#4EU9DThCCTU#v>n{ED+ntU|Ou(7{cG<-%ch z%NZd9?3MFoq(7Gx1_ClSm6lhzb{+5AyUG`uR{4HK*l1|X-V-Y+>0{5_FUTazR>a7k w?0;|lY=h_Vf8$-|vzn?ARimm_rfQt3nN-cJYP_mhRL!btHdV9#tvQyy1IPq7CIA2c diff --git a/003.music/music.s b/003.music/music.s index 4e1c7de..2003688 100644 --- a/003.music/music.s +++ b/003.music/music.s @@ -47,7 +47,7 @@ level3InterruptHandler: .resetBitplanePointers: lea bitplanes(pc),a1 lea BPL1PTH(a5),a2 - moveq #SCREEN_BIT_DEPTH,d0 + moveq #SCREEN_BIT_DEPTH-1,d0 .bitplaneloop: move.l a1,(a2) lea SCREEN_WIDTH_BYTES(a1),a1 ; bit plane data is interleaved diff --git a/006.simple_blit/blit.s b/006.simple_blit/blit.s index dcbe1b0..23865f1 100644 --- a/006.simple_blit/blit.s +++ b/006.simple_blit/blit.s @@ -21,15 +21,6 @@ entry: move #$7fff,INTENA(a6) ; disable all interrupts include "out/image-palette.s" - if 0 - ;; reset color registers to white to prevent startup flicker - move.l #32,d0 - lea COLOR00(a6),a0 -.loop: - move.w #$FFF,(a0) - addq #2,a0 - dbra d0,.loop - endif ;; set up playfield move.w #(RASTER_Y_START<<8)|RASTER_X_START,DIWSTRT(a6) @@ -69,20 +60,6 @@ entry: bsr.s waitRaster bra.s .mainLoop - if 0 -resetBitplanePointers: - movem.l d0-a6,-(sp) - lea bitplanes,a1 - lea BPL1PTH(a6),a2 - moveq #SCREEN_BIT_DEPTH,d0 -.bitplaneloop: - move.l a1,(a2) - lea SCREEN_WIDTH_BYTES(a1),a1 ; bit plane data is interleaved - addq #4,a2 - dbra d0,.bitplaneloop - movem.l (sp)+,d0-a6 - rts - endif waitRaster: ;wait for rasterline d0.w. Modifies d0-d2/a0. move.l #$1ff00,d2 diff --git a/007.masked_blit/masked_blit.s b/007.masked_blit/masked_blit.s index 82dd48c..34cc639 100644 --- a/007.masked_blit/masked_blit.s +++ b/007.masked_blit/masked_blit.s @@ -29,15 +29,6 @@ entry: move #$7fff,INTENA(a6) ; disable all interrupts include "out/image-palette.s" - if 0 - ;; reset color registers to white to prevent startup flicker - move.l #32,d0 - lea COLOR00(a6),a0 -.loop: - move.w #$FFF,(a0) - addq #2,a0 - dbra d0,.loop - endif ;; set up playfield move.w #(RASTER_Y_START<<8)|RASTER_X_START,DIWSTRT(a6) diff --git a/008.shift_blit/shift_blit.s b/008.shift_blit/shift_blit.s index efd2933..be9f0c1 100644 --- a/008.shift_blit/shift_blit.s +++ b/008.shift_blit/shift_blit.s @@ -30,15 +30,6 @@ entry: move #$7fff,INTENA(a6) ; disable all interrupts include "out/image-palette.s" - if 0 - ;; reset color registers to white to prevent startup flicker - move.l #32,d0 - lea COLOR00(a6),a0 -.loop: - move.w #$FFF,(a0) - addq #2,a0 - dbra d0,.loop - endif ;; set up playfield move.w #(RASTER_Y_START<<8)|RASTER_X_START,DIWSTRT(a6) diff --git a/023.slideshow/bin/slideshow.adf b/023.slideshow/bin/slideshow.adf index c888c530b83ccd63080411d32e53c7de6f38e720..7d983fbb1f9d4946f074012ccc27c95c349a6e7b 100644 GIT binary patch delta 75 zcmZo@FmGru-w?#YRQ`W*2#YG?=jJMw_9_-eAZ7w$W*`RfS%H`hh}nUd1Bf|+m