From eee99e8d7ef56488ea1b21f3b7baf9f00377870e Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Sat, 1 Jun 2024 07:42:11 -0400
Subject: [PATCH] double buffering and better startup

---
 NOTES.md             |   3 +
 basics               | Bin 0 -> 552 bytes
 basics.s             | 172 +++++++++++++++++++++++++++++
 better_startup       | Bin 0 -> 3068 bytes
 better_startup.c     |  98 +++++++++++++++++
 blitter_speed_test.q |   0
 bun.c                |  74 ++++++-------
 bun.h                |  21 +++-
 main                 | Bin 5600 -> 6112 bytes
 main.c               |  52 ++++++---
 screen.c             |  12 ++-
 screen.h             |  13 ++-
 system/copper.c      |   1 +
 system/system.h      |  19 +++-
 system/system.s      | 250 +++++++++++++++++++++++++++++++++++--------
 15 files changed, 600 insertions(+), 115 deletions(-)
 create mode 100644 NOTES.md
 create mode 100755 basics
 create mode 100644 basics.s
 create mode 100755 better_startup
 create mode 100644 better_startup.c
 create mode 100644 blitter_speed_test.q

diff --git a/NOTES.md b/NOTES.md
new file mode 100644
index 0000000..d22c3ea
--- /dev/null
+++ b/NOTES.md
@@ -0,0 +1,3 @@
+Left off at implementing asm routine for injecting point in
+copperlist ram where bitplane pointers are going for
+easy replacement for double buffering.
diff --git a/basics b/basics
new file mode 100755
index 0000000000000000000000000000000000000000..06e6d58a57a392f9342aaa4ac044aa0885d00ad3
GIT binary patch
literal 552
zcmZ9JK}!Nb7>3_<J%~_5bPAzmg`g;nx>&d<b_uGvbm>+aq(TSL42nIh5aB_>gLnuL
ze}VJ^Joqy_B}5Q`NLUwx+TPjSLp1Pw@63EN-}f>Ds2^~L;;EE8puR~>1GA*3#pSjr
z@4dp8x&{=iF~Tppwz)gy`mzAg{T_t-oL9qREK}>$O=?4Qe_}itI-Fwoj;%4~xZ9$J
zsBNl`+A&OCelX00En}sRrePw1rtIX@)TuSu$JSYKA~_f)=_(3so0a`O3yO`$9+W7~
zVUM&WQFh%*-){GfxP^+W*l}XpiLImLy4<V7a<qY4_Eu0eoRjq9YSYmc+PYlVTxWm%
zxUWJtbgU=oFvIMX=W?dty;>l`{7M!G?tdZ36VIzBqAYF#iYNiuV!DvapOqpP`Ajig
zWG83H|M`!XQb(LDcniL~e0A)Q6geiRBuDPZJsFTE@<Qa@PnMQ{5G3<tk!U2w9EUpj
E1x|m11^@s6

literal 0
HcmV?d00001

diff --git a/basics.s b/basics.s
new file mode 100644
index 0000000..d7beed0
--- /dev/null
+++ b/basics.s
@@ -0,0 +1,172 @@
+  XREF _custom
+
+; write this from scratch and get it working
+; then plug it into C
+FUNC_CNT SET -30
+FUNCDEF MACRO
+_LVO\1 EQU FUNC_CNT
+FUNC_CNT SET FUNC_CNT-6
+  ENDM
+
+  INCDIR "include_i_39:"
+  INCDIR "extra_lvos_39:"
+  INCLUDE "exec/exec_lib.i"
+  INCLUDE "exec/types.i"
+  INCLUDE "exec/execbase.i"
+  INCLUDE "exec/libraries.i" # get the CALLLIB macro
+  INCLUDE "graphics/gfxbase.i"
+  INCLUDE "graphics_lvo.i"
+  INCLUDE "hardware/custom.i"
+  INCLUDE "hardware/dmabits.i"
+
+START:
+  BSR _takeOverSystem
+  BSR _giveBackSystem
+  MOVE.L #0,D0
+  RTS
+
+OpenGraphicsLibrary MACRO
+    LEA GraphicsLibrary,A1
+    MOVEQ #0,D0
+    CALLLIB _LVOOpenLibrary
+    MOVE.L D0,GraphicsBase
+  ENDM
+
+TakeOverView MACRO
+    MOVE.L GraphicsBase,A6
+    MOVE.L gb_ActiView(A6),OldView
+    MOVEQ #0,D0
+    CALLLIB _LVOLoadView
+    CALLLIB _LVOWaitTOF
+    CALLLIB _LVOWaitTOF
+  ENDM
+
+PreserveOldCopper MACRO
+    MOVE.L $26(A6),OldCopper1
+    MOVE.L $32(A6),OldCopper2
+  ENDM
+
+GetVBRPointer MACRO
+    BSR getVBR
+    MOVE.L D0,VBRPtr
+  ENDM
+
+PreserveOldRegisters MACRO
+    LEA _custom,A6
+    MOVE.W adkconr(A6),Oldadkcon
+    MOVE.W intenar(A6),Oldintena
+    MOVE.W dmaconr(A6),Olddmacon
+  ENDM
+
+ClearRegisters MACRO
+    MOVE.W #$7FFF,D0
+    BSR waitRaster
+    MOVE.W D0,intena(A6)
+    MOVE.W D0,dmacon(A6)
+    MOVE.W D0,intreq(A6)
+  ENDM
+
+SetRegisters MACRO
+    MOVE.W #$C000,intena(A6) ; enable master interrupt
+    MOVE.W #$3FFF,intena(A6) ; disable every other interrupt
+
+    MOVE.W #DMAF_SETCLR|DMAF_COPPER|DMAF_RASTER|DMAF_BLITTER,dmacon(A6)
+    MOVE.W #DMAF_AUDIO|DMAF_DISK|DMAF_SPRITE,dmacon(A6)
+  ENDM
+
+_takeOverSystem:
+  MOVEM.L A6,-(SP)
+    CLR.W $100
+
+    MOVE.L $4,A6
+    CALLLIB _LVOForbid
+
+    OpenGraphicsLibrary
+    PreserveOldCopper
+
+    CALLLIB _LVOOwnBlitter
+    CALLLIB _LVOWaitBlit
+
+    PreserveOldRegisters
+
+    SetRegisters
+    TakeOverView
+  MOVEM.L (SP)+,A6
+  RTS
+
+waitRaster:
+  MOVE.L D0,-(SP)
+.loop:
+    MOVE.L $DFF004,D0
+    AND.L #$1FF00,D0
+    CMP.L #303<<8,D0
+    BNE .loop
+  MOVE.L (SP)+,D0
+  RTS
+
+_giveBackSystem:
+  CLR.W $100
+
+  MOVEM.L A6,-(SP)
+    LEA _custom,A6
+
+    MOVE.W #$8000,d0
+    OR.W D0,Olddmacon
+    OR.W D0,Oldintena
+    OR.W D0,Oldadkcon
+    SUBQ #1,D0
+
+    ;ClearRegisters
+
+    MOVE.L OldCopper1,cop1lc(A6)
+    MOVE.L OldCopper2,cop2lc(A6)
+    MOVE.W #1,copjmp1(A6)
+
+    MOVE.W Olddmacon,intena(A6)
+    MOVE.W Olddmacon,dmacon(A6)
+    MOVE.W Oldadkcon,adkcon(A6)
+
+    MOVE.L OldView,A1
+
+    MOVE.L GraphicsBase,A6
+    CALLLIB _LVOLoadView
+    CALLLIB _LVOWaitTOF
+    CALLLIB _LVOWaitTOF
+
+    MOVE.L $4,A6
+    MOVE.L GraphicsBase,D0
+    MOVE.L D0,A1
+    CALLLIB _LVOCloseLibrary
+
+    CALLLIB _LVOPermit
+  MOVEM.L (SP)+,A6
+  RTS
+
+getVBR:
+  MOVE.L A5,-(SP)
+    MOVEQ #0,D0
+    MOVE.L $4,A6
+    BTST #0,AttnFlags+1(A6)
+    BEQ .is68K
+    LEA .get010VBR(pc),A5
+    CALLLIB _LVOSupervisor
+.is68K:
+  MOVE.L (SP)+,A5
+  RTS
+
+.get010VBR:
+  dc.l $4E7A0801 ; movec vcr,d0
+  RTE
+
+  CNOP 0,4
+GraphicsLibrary dc.b 'graphics.library',0
+
+  CNOP 0,4
+GraphicsBase dc.l 1
+OldView dc.l 1
+OldCopper1 dc.l 1
+OldCopper2 dc.l 1
+VBRPtr dc.l 1
+Oldadkcon dc.w 0
+Oldintena dc.w 0
+Olddmacon dc.w 0
diff --git a/better_startup b/better_startup
new file mode 100755
index 0000000000000000000000000000000000000000..6cb7191acaf9475cefbf3712033be50e10b36732
GIT binary patch
literal 3068
zcmZuzZ){W76+ixi<EAD!SrVBoOK)8_B%bA$HrC1_roK27j0rEnuq~CU<pmPIWSH0(
z2SUZDgAh$xm<-JrLJ`UbR3X)(*)&ZI<pZtQ7CJVCH6OBSYNo0v8;cg!A=E`C-tSyH
z1E#*@oO{mio_p^(=bm?-i7fx7!ecFt79#U^A-@Ew1XU4P{?1rv;n<2N<e_c<VN2f-
zS+}y3N|M-w@$0&|?t`7v`CLOgWg9d)S~p;-6yKt(;kYv*R8dcXJ0rSHtjoMd&F*z)
z)3#x(N;kC7<;g77^z0Tss<EXdrqU(%CNhypyOM7XrwuY!G^jN3zuC((Sm7qe0C}i#
zzYB92>~rdDmM*m{(uf$=t~~VUX1@ww#zE(Sj)^Q?F0Qchd@xH>3BozlNZOT^KeE5A
z%cd&{Xb<PG=TOv^=+TMpHteJGbT#}QVj(&v_EGls^zCVPA2~n1`SDF*PEy7ChHW%C
zGyKD}Sw#j^IuTk>)kiV3&6~~Pbkv@xRLCGxvru7^7Uo^)+2QhE5J5VQ+&w6tBEd37
zw=kFgT#zvB{3!pW6S`v8!!7@y*WhcqIG(~TQwn)h;U$mZ^2KOKsP1|~1o;WfU3If`
zT*P2y55*`Y`pDDJM^>8Du34<`$bs?81nE|xkku2T?DNzRqcOV7_xoy=#)}y%<qXQK
zTKzE^$6fu>unJYnXxGf2vTf0>BAlfW!@;+J)fryl55xMB;c&-jf-T{ZA68R_V1L~{
zx@s`?ZgK7??4}UoNxgy*tUY1afu(sJ#v#n@5zn;Ezi~_(?1>-r$NKjqyOT!<l{JOx
zaiN+n_mahYF-OkO!iE5%pY`@3e|=O(^$OROIW)Av*-fSo>s0>~>x`-dWHR_OMWsea
z6QB&}6zE5wA<*mXOXNsU<9BHOo|)7%`KhSYu;yFUYFYEHYEIUga>LiL>ReNfUM`Fk
zMDzcm;1O`M<W|Y;l9x8+e9yw}Cm27#n8CV@7|&vy!8qpG9>`IL8<+1f1%shr;6vy_
zgm=I7vP!k#VWTwR#G7MHnsn4><8UCC&x2N;`#n~tgYT1YypL>6lZcge6TKS&qAxaX
zdL!Rd@bh=DJ16A}O}~YFLCWJzzkxh1<%>;AR159mb4yf@F|Dk{PJN(G&~DIXPynQH
zzLlpT`8eMyDGKM9YLQQ8g4*VNpMQ$m(gro|C?3g4@_NYwlDj0|EV(MVQ*uglD<#LM
zGfOVr7535fs5Sg%v=p`C5<9hwU(TQkT;WXguj`NEzORcC|1&u4z^m;oe4^DqVmQSS
zNTg*rYl%vSnxM{hZLnzJfQ5b4f^qEt>Z>EP(D?1vWjc|N{gC^HSH)XpOH?AdF`PMx
z-cX;<3sdV7xg2W6+^%%ba_}XW>!%<2cC-L%2$2t6h*Cd3Gd+9!P<`tn1-33y2vvSb
z?xMBL#~jE`hc@W-ie0Jhz57J_q26RP7C$V!UZPhzx9ukCA4m=Mr~2aqkKP9#Wv!~|
zzF*ar^RVDITtSWJstf*y7O2`ACnx&g4Tl;z?W{_QNt5v)`4srQWGVPvXO*EP-IJzh
zy<UcSFC<&!bhyeWllGV~tYM0N4n#yw>otrT6>=Yk+{ecIME{0)TLkCm7le;)po>mN
z()@PcNheLA7QETb=vKFidAsk1SIFHhcs1%Q{|c|lvBOE}S7&6jZku?!b41?=OZLwn
z8BLJ09Jg4Od?hn%zz^oSGx#;VqdG_5(Cy%*4z>DrWEA|*ShpI-RJhzQM@C^eB5oE=
z|H^2}4O?)%PWc{=CTfGPQ|O@Z7`Hi%K5?yWzK?VwuTm!Ctwz7QWjG^g)a0!@GIH)_
zzAmmKzL(H~$?7L>j9%02Vn2Fh#``_7HhN!_w9SjOPAef<Z-LOl3tVs0oVx^hQ6&%O
z>QwHg(Nf=b?0LgadL_EA?zVgIWwZQKqM!LG{H8I`vP{2Ho<@buY+WKZ@8JmnJBeK$
z)ODd6Yu%yn`e<&~sK@@!v~PReQ|=P%IU{z2T|h_9{Grb7F7d2o4C@k*?T7dqJtO;h
zS+eI(`10nP<*L89xAO_yt>3u`{z>w6p+4I}W2om-sOP|w-Mh7WU_(m86TJfh#eEQk
zES`_`h<H>GRbSTziAqU3pp+qcFLF9l*js+5XHh$IQ3pJ7cGJoy2@}7&oLeK=o#^Y|
z`{)xv@;>H_O1HY|+nH(H*(_*|S15Lcv|r=b&O`^^aqb6}MKBXfME1L2HV|~{GSM0<
z#?L@=!1%XPDF_&uF(g56fsTRB0b2vIK#qZiKvB>MPzE?peF5VAzX@y{XJL+?k^tlz
z1)2G}iF_VI8U7x7BxaRo16^|*O#B~qe${+$e4zP-Mg{*(FE%P08x=Vr<K)=*LAM|k
z<ODfD91}l?OXgxTMi&D`zw!H!DwQ%HchIA4ONi6Xb-)=V<h+0bIVy8p)bW<vQTq<y
z@=bWm?oeT+^oh^r{PUSUPz|W)kL4a@b5}=ia({mcqV(C^wI$ixyQ6nMbo>&+{FZof
zPk#^3v(J{UmRKylw_w0v;gR|0II4<%%%Wyre9Yfj_7}doAID&`@ku>j^Q6A=1?xDL
z>xgTBV+nyag4jQ<n<wM>L3e*@cl#FL9J8g1^<b<JA-<;)Yd<`|P^uSYhA*bX+Tz_k
Z-|z1|%t+zxtX-S?55}J`Ell#g{TBzsTa5q!

literal 0
HcmV?d00001

diff --git a/better_startup.c b/better_startup.c
new file mode 100644
index 0000000..94af7cc
--- /dev/null
+++ b/better_startup.c
@@ -0,0 +1,98 @@
+#include <clib/exec_protos.h>
+#include <clib/intuition_protos.h>
+#include <clib/graphics_protos.h>
+#include <exec/memory.h>
+#include <graphics/gfxbase.h>
+#include <hardware/custom.h>
+#include <hardware/dmabits.h>
+#include <exec/types.h>
+ 
+extern struct GfxBase *GfxBase;
+extern far struct Custom custom;
+ 
+int main(void) {
+  UWORD OldDMACON,OldINTENA,OldINTREQ,OldADKCON;
+  struct View *OldView = ((struct GfxBase *)GfxBase)->ActiView;
+  ULONG OldCopper = custom.cop1lc;
+  ULONG OldCopper2 = custom.cop2lc;
+  UWORD *copperlist = AllocMem(10000, MEMF_CHIP | MEMF_CLEAR);
+  UWORD *currentCopperlist;
+  UBYTE *bitplanes = AllocMem(320 * 256, MEMF_CHIP | MEMF_CLEAR);
+  int i;
+ 
+  LoadView(0);
+  WaitTOF();
+  WaitTOF();
+  OwnBlitter();
+  WaitBlit();
+ 
+  Forbid();
+
+  OldDMACON = custom.dmaconr | 0x8000;
+  OldINTENA = custom.intenar | 0x8000;
+  //OldINTREQ = custom.intreqr | 0x8000;
+  OldADKCON = custom.adkconr | 0x8000;
+
+  custom.intreq = 0x7fff;
+  custom.cmacon = 0x7fff;
+  custom.cmacon = 0x7fff;
+
+
+  // enable
+  custom.dmacon = DMAF_SETCLR | DMAF_COPPER | DMAF_RASTER | DMAF_BLITTER;
+   
+  // disable
+  custom.dmacon = DMAF_AUDIO | DMAF_DISK | DMAF_SPRITE;
+
+  custom.bplcon0 = (1 << 9) + (1 << 12);
+  custom.bplcon1 = 0;
+  custom.bplcon2 = 0;
+  custom.bpl1mod = 0;
+  custom.bpl2mod = 0;
+  custom.diwstrt = 0x2c21;
+  custom.diwstop = 0x2cc1;
+  custom.ddfstrt = 0x0038;
+  custom.ddfstop = 0x00d0;
+
+  currentCopperlist = copperlist;
+
+  *(currentCopperlist++) = 0x0050;
+  *(currentCopperlist++) = ((ULONG)bitplanes >> 16);
+  *(currentCopperlist++) = 0x0020;
+  *(currentCopperlist++) = ((ULONG)bitplanes && 16);
+  *(currentCopperlist++) = 0xffff;
+  *(currentCopperlist++) = 0xfffe;
+
+  custom.cop1lc = copperlist;
+
+  for (i = 0; i < 200; ++i) {
+    WaitTOF();
+  }
+
+  custom.dmacon = 0x7FFF;
+  custom.dmacon = OldDMACON;
+ 
+  custom.intena = 0x7FFF;
+  custom.intena = OldINTENA;
+ 
+  /*
+  custom.intreq = 0x7FFF;
+  custom.intreq = OldINTREQ;
+  */
+ 
+  custom.adkcon = 0x7FFF;
+  custom.adkcon = OldADKCON;
+
+  custom.cop1lc = OldCopper;
+  custom.cop2lc = OldCopper1;
+
+  LoadView(OldView);
+  WaitTOF();
+  WaitTOF();
+  WaitBlit();
+  DisownBlitter();
+  Permit();
+
+  FreeMem(copperlist, 10000);
+  FreeMem(bitplanes, 320 * 256);
+}
diff --git a/blitter_speed_test.q b/blitter_speed_test.q
new file mode 100644
index 0000000..e69de29
diff --git a/bun.c b/bun.c
index df79fbf..5e8adb8 100644
--- a/bun.c
+++ b/bun.c
@@ -17,16 +17,6 @@ extern unsigned char far coolbun[];
 
 unsigned char *coolbunArea;
 
-#define COOL_BUN_WIDTH (32)
-#define COOL_BUN_WIDTH_BYTES (COOL_BUN_WIDTH / 8)
-#define COOL_BUN_HEIGHT (32)
-#define COOL_BUN_PLANES (2)
-#define COOL_BUN_LAST_ROW (COOL_BUN_HEIGHT - 1)
-#define COOL_BUN_LAST_ROW_BYTES (COOL_BUN_LAST_ROW * COOL_BUN_WIDTH_BYTES)
-
-#define COOL_BUN_PLANE_SIZE (COOL_BUN_WIDTH_BYTES * COOL_BUN_HEIGHT)
-#define COOL_BUN_MEMORY_SIZE (COOL_BUN_PLANE_SIZE * COOL_BUN_PLANES)
-
 #define BLTCON0( \
   minterm, aChan, bChan, cChan, dChan, shift \
 ) (minterm + (aChan << 11) + (bChan << 10) + (cChan << 9) + (dChan << 8) + (shift << 12))
@@ -42,16 +32,6 @@ void setupBun() {
   currentCoolBunArea = coolbunArea;
   currentCoolBun = coolbun;
 
-  /*
-  for (plane = 0; plane < COOL_BUN_PLANES; ++plane) {
-    for (y = 0; y < COOL_BUN_HEIGHT; ++y) {
-      for (x = 0; x < COOL_BUN_WIDTH_BYTES; ++x) {
-        *(currentCoolBunArea++) = *(currentCoolBun++);
-      }
-    }
-  }
-  */
-
   CopyMem(coolbun, coolbunArea, COOL_BUN_MEMORY_SIZE);
 }
 
@@ -59,7 +39,12 @@ void teardownBun() {
   FreeMem(coolbunArea, COOL_BUN_MEMORY_SIZE);
 }
 
-void bun_offRightSide(int plusXValue, int y, struct CurrentScreen *currentScreen) {
+void bun_offRightSide(
+  int plusXValue,
+  int y,
+  struct ScreenSetup *screenSetup,
+  struct CurrentScreen *currentScreen
+) {
   uint8_t i, plane = 0;
   uint8_t shift = plusXValue & 15;
   uint8_t wordShift = (plusXValue >> 4);
@@ -73,8 +58,8 @@ void bun_offRightSide(int plusXValue, int y, struct CurrentScreen *currentScreen
     custom.bltbpt = coolbunArea +
       plane * COOL_BUN_PLANE_SIZE;
     custom.bltdpt = currentScreen->planes[plane] +
-      (y * currentScreen->byteWidth) +
-      currentScreen->byteWidth - COOL_BUN_WIDTH_BYTES +
+      (y * screenSetup->byteWidth) +
+      screenSetup->byteWidth - COOL_BUN_WIDTH_BYTES +
       wordShift * 2;
 
     custom.bltafwm = 0xffff;
@@ -85,7 +70,7 @@ void bun_offRightSide(int plusXValue, int y, struct CurrentScreen *currentScreen
     custom.bltalwm = bltalwm;
 
     custom.bltbmod = wordShift * 2;
-    custom.bltdmod = currentScreen->byteWidth - COOL_BUN_WIDTH_BYTES +
+    custom.bltdmod = screenSetup->byteWidth - COOL_BUN_WIDTH_BYTES +
       wordShift * 2;
 
     custom.bltsize = 2 - wordShift + (COOL_BUN_HEIGHT << 6);
@@ -94,7 +79,12 @@ void bun_offRightSide(int plusXValue, int y, struct CurrentScreen *currentScreen
   }
 }
 
-void bun_offLeftSide(int minusXValue, int y, struct CurrentScreen *currentScreen) {
+void bun_offLeftSide(
+  int minusXValue,
+  int y,
+  struct ScreenSetup *screenSetup,
+  struct CurrentScreen *currentScreen
+) {
   unsigned char plane;
   uint8_t shift = minusXValue & 15;
   uint8_t wordShift = (minusXValue >> 4);
@@ -118,7 +108,7 @@ void bun_offLeftSide(int minusXValue, int y, struct CurrentScreen *currentScreen
 
     // d is the part on screen
     custom.bltdpt = currentScreen->planes[plane] +
-      (currentScreen->byteWidth * (y + COOL_BUN_LAST_ROW)) +
+      (screenSetup->byteWidth * (y + COOL_BUN_LAST_ROW)) +
       2 -
       wordShift * 2;
 
@@ -130,7 +120,7 @@ void bun_offLeftSide(int minusXValue, int y, struct CurrentScreen *currentScreen
     custom.bltalwm = bltalwm;
 
     custom.bltbmod = wordShift * 2;
-    custom.bltdmod = currentScreen->byteWidth - 4 + wordShift * 2;
+    custom.bltdmod = screenSetup->byteWidth - 4 + wordShift * 2;
 
     custom.bltsize = 2 - wordShift + (COOL_BUN_HEIGHT << 6);
 
@@ -138,7 +128,12 @@ void bun_offLeftSide(int minusXValue, int y, struct CurrentScreen *currentScreen
   }
 }
 
-void bun_anywhere(int x, int y, struct CurrentScreen *currentScreen) {
+void bun_anywhere(
+  int x,
+  int y,
+  struct ScreenSetup *screenSetup,
+  struct CurrentScreen *currentScreen
+) {
   uint8_t plane;
   uint8_t shift = x & 15;
   uint8_t needsExtraWord = shift != 0;
@@ -154,7 +149,7 @@ void bun_anywhere(int x, int y, struct CurrentScreen *currentScreen) {
     custom.bltadat = 0xffff;
     custom.bltbpt = coolbunArea + plane * COOL_BUN_PLANE_SIZE;
     custom.bltdpt = currentScreen->planes[plane] +
-      WORD_ALIGNED_BYTE_POSITION(currentScreen->pixelWidth, x, y);
+      WORD_ALIGNED_BYTE_POSITION(screenSetup->width, x, y);
 
    // custom.bltdpt = screenSetup.memoryStart;
     custom.bltafwm = 0xffff;
@@ -165,14 +160,19 @@ void bun_anywhere(int x, int y, struct CurrentScreen *currentScreen) {
     }
 
     custom.bltbmod = -(needsExtraWord * 2);
-    custom.bltdmod = currentScreen->byteWidth - COOL_BUN_WIDTH_BYTES - (needsExtraWord * 2);
+    custom.bltdmod = screenSetup->byteWidth - COOL_BUN_WIDTH_BYTES - (needsExtraWord * 2);
     custom.bltsize = (2 + needsExtraWord) + (COOL_BUN_HEIGHT << 6);
 
     WaitBlit();
   }
 }
 
-void renderBun(int x, int y, struct CurrentScreen *currentScreen) {
+void renderBun(
+  int x,
+  int y,
+  struct ScreenSetup *screenSetup,
+  struct CurrentScreen *currentScreen
+) {
   /**
     * Conditions that will cause the program to crash if met. If your bun
     * isn't rendering, it's due to here.
@@ -180,16 +180,16 @@ void renderBun(int x, int y, struct CurrentScreen *currentScreen) {
     * TODO: Handle top/bottom off-screen as well.
     */
   if (x < -31) return;
-  if (x > currentScreen->pixelWidth + 31) return;
+  if (x > screenSetup->width + 31) return;
   if (y < 1) return;
-  if (y > currentScreen->pixelHeight- COOL_BUN_HEIGHT - 1) return;
+  if (y > screenSetup->height- COOL_BUN_HEIGHT - 1) return;
 
   if (x < 0) {
-    bun_offLeftSide(-x, y, currentScreen);
-  } else if (x > currentScreen->pixelWidth - COOL_BUN_WIDTH) {
-    bun_offRightSide(x - (currentScreen->pixelWidth - COOL_BUN_WIDTH), y, currentScreen);
+    bun_offLeftSide(-x, y, screenSetup, currentScreen);
+  } else if (x > screenSetup->width - COOL_BUN_WIDTH) {
+    bun_offRightSide(x - (screenSetup->width - COOL_BUN_WIDTH), y, screenSetup, currentScreen);
   } else {
-    bun_anywhere(x, y, currentScreen);
+    bun_anywhere(x, y, screenSetup, currentScreen);
   }
 }
 
diff --git a/bun.h b/bun.h
index 946c1b2..a275440 100644
--- a/bun.h
+++ b/bun.h
@@ -3,8 +3,23 @@
 
 #include "screen.h"
 
-void setupBun();
-void renderBun(int x, int y, struct CurrentScreen *currentScreen);
-void teardownBun();
+#define COOL_BUN_WIDTH (32)
+#define COOL_BUN_WIDTH_BYTES (COOL_BUN_WIDTH / 8)
+#define COOL_BUN_HEIGHT (32)
+#define COOL_BUN_PLANES (2)
+#define COOL_BUN_LAST_ROW (COOL_BUN_HEIGHT - 1)
+#define COOL_BUN_LAST_ROW_BYTES (COOL_BUN_LAST_ROW * COOL_BUN_WIDTH_BYTES)
+
+#define COOL_BUN_PLANE_SIZE (COOL_BUN_WIDTH_BYTES * COOL_BUN_HEIGHT)
+#define COOL_BUN_MEMORY_SIZE (COOL_BUN_PLANE_SIZE * COOL_BUN_PLANES)
+
+void setupBun(void);
+void renderBun(
+  int x,
+  int y,
+  struct ScreenSetup *screenSetup,
+  struct CurrentScreen *currentScreen
+);
+void teardownBun(void);
 
 #endif
diff --git a/main b/main
index 13f8c514f8c6595ff15811d97f97206707096e57..d0b5699aa395808adccc25fd9a0b0bba4af2bbcf 100755
GIT binary patch
delta 3287
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
P+Y^Yu8nWmYmeu_S;}M_4

delta 2709
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
U)g>MU96ygO$V(F0SYiGD0IuiYvj6}9

diff --git a/main.c b/main.c
index b53b1bb..68fbee5 100644
--- a/main.c
+++ b/main.c
@@ -30,14 +30,18 @@ volatile short *dbg = (volatile short *)0x100;
 unsigned char *scratchArea;
 struct ScreenSetup screenSetup;
 struct CurrentScreen currentScreen;
+void *copperlistBitplanePointers[8][2];
+void *copperlistSpritePointers[8];
 
 #define offsetof(s, m) &((struct s *)0)->m
 uint16_t custom_color = (uint16_t)offsetof(Custom, color);
+uint16_t custom_sprite = (uint16_t)offsetof(Custom, sprpt);
 
 int main(void) {
-  uint16_t *copperlist, *currentCopperlist;
-  int i, x, y, plane, result;
+  uint16_t *copperlist, *currentCopperlist, result;
+  int i, x, y, plane;
   int blitShiftRight, memoryXOffset, blitWidth;
+  uint32_t wow, wow2;
 
   color_t colors[8];
 
@@ -59,10 +63,15 @@ int main(void) {
   setCopperlist(copperlist);
   setUpDisplay((uint32_t)screenSetup.bitplanes);
 
-  // TODO: [ ] A struct that can be filled with the locations in the copperlist where
-  //           bitplane addresses go
-  currentCopperlist = addDisplayToCopperlist(copperlist, &screenSetup);
-  //currentCopperlist = addColorsToCopperlist(currentCopperlist, colors, 16);
+  currentCopperlist = addDisplayToCopperlist(
+    copperlist,
+    &screenSetup,
+    &currentScreen,
+    &copperlistBitplanePointers
+  );
+
+  currentCopperlist = setUpEmptySpritesInCopperlist(currentCopperlist);
+
   *(currentCopperlist++) = custom_color;
   *(currentCopperlist++) = 0x000;
 
@@ -81,7 +90,7 @@ int main(void) {
     *(currentCopperlist++) = custom_color;
     *(currentCopperlist++) = 0x9b8;
 
-    *(currentCopperlist++) = 1 + (31 + (320 / 4) << 1) + ((44 + y) << 8);
+    *(currentCopperlist++) = 1 + ((31 + (320 / 4)) << 1) + ((44 + y) << 8);
     *(currentCopperlist++) = 0xFFFE;
     *(currentCopperlist++) = custom_color;
     *(currentCopperlist++) = 0x000;
@@ -89,29 +98,40 @@ int main(void) {
 
   endCopperlist(currentCopperlist);
 
-  for (i = -31; i < screenSetup.width - 1; ++i) {
-    //y = WaitBOF(250);
-    WaitTOF();
+  for (i = -31; i < screenSetup.width - 1; i += 3) {
+    swapCurrentScreenBuffer(&screenSetup, &currentScreen);
 
-    /*
     for (plane = 0; plane < 2; ++plane) {
       custom.bltcon0 = 0xc0 + (1 << 8);
       custom.bltcon1 = 0;
       custom.bltadat = 0x0000;
       custom.bltafwm = 0xffff;
       custom.bltalwm = 0xffff;
-      custom.bltdpt = screenSetup.memoryStart + (45 * screenSetup.width) / 8 + plane * screenSetup.nextBitplaneAdvance;
+      custom.bltdpt = currentScreen.planes[plane] +
+        (45 * screenSetup.byteWidth);
       custom.bltdmod = 0;
-      custom.bltsize = 20 + (COOL_BUN_MEMORY_SIZE << 6);
+      custom.bltsize = screenSetup.byteWidth / 2 + (COOL_BUN_HEIGHT << 6);
       WaitBlit();
     }
-    */
 
-    renderBun(i, 45, &currentScreen);
+    renderBun(
+      i,
+      45,
+      &screenSetup,
+      &currentScreen
+    );
+
+    updateDisplayInCopperList(
+      &screenSetup,
+      &currentScreen,
+      copperlistBitplanePointers
+    );
+
+    WaitTOF();
   }
 
   for (i = 0; i < 100; ++i) {
-    WaitTOF();
+    WaitBOF(200);
   }
 
   giveBackSystem();
diff --git a/screen.c b/screen.c
index 379aa98..5119ab1 100644
--- a/screen.c
+++ b/screen.c
@@ -49,7 +49,6 @@ void setCurrentScreen(
   short int buffer
 ) {
   int plane;
-
   currentScreen->currentBuffer = buffer;
 
   for (plane = 0; plane < screenSetup->bitplanes; ++plane) {
@@ -59,14 +58,17 @@ void setCurrentScreen(
   }
 }
 
+void swapCurrentScreenBuffer(
+  struct ScreenSetup *screenSetup,
+  struct CurrentScreen *currentScreen
+) {
+  setCurrentScreen(screenSetup, currentScreen, 1 - currentScreen->currentBuffer);
+}
+
 void setupInitialCurrentScreen(
   struct ScreenSetup *screenSetup,
   struct CurrentScreen *currentScreen
 ) {
-  currentScreen->pixelWidth = screenSetup->width;
-  currentScreen->pixelHeight = screenSetup->height;
-  currentScreen->byteWidth = screenSetup->byteWidth;
-
   setCurrentScreen(screenSetup, currentScreen, 0);
 }
 
diff --git a/screen.h b/screen.h
index c7e878d..48fd508 100644
--- a/screen.h
+++ b/screen.h
@@ -21,9 +21,6 @@ struct ScreenSetup {
 
 struct CurrentScreen {
   uint16_t currentBuffer;
-  uint16_t pixelWidth;
-  uint16_t byteWidth;
-  uint16_t pixelHeight;
   unsigned char *planes[8];
 };
 
@@ -40,4 +37,14 @@ void setCurrentScreen(
   struct CurrentScreen *currentScreen,
   short int buffer
 );
+
+void swapCurrentScreenBuffer(
+  struct ScreenSetup *screenSetup,
+  struct CurrentScreen *currentScreen
+);
+
+void setupInitialCurrentScreen(
+  struct ScreenSetup *screenSetup,
+  struct CurrentScreen *currentScreen
+);
 #endif
diff --git a/system/copper.c b/system/copper.c
index 1d5711a..a6232a4 100644
--- a/system/copper.c
+++ b/system/copper.c
@@ -20,6 +20,7 @@ uint16_t * prepareNewCopperlist(void) {
 
 void setCopperlist(uint16_t *copperlist) {
   custom.cop1lc = copperlist;
+  //custom.copjmp1 = 1;
 }
 
 void freeCopperlist(uint16_t *copperlist) {
diff --git a/system/system.h b/system/system.h
index 2ca58d3..a0b2b5f 100644
--- a/system/system.h
+++ b/system/system.h
@@ -1,8 +1,8 @@
 #ifndef __SYSTEM_H__
 #define __SYSTEM_H__
 
-#include "types.h"
-#include "screen.h"
+#include "../types.h"
+#include "../screen.h"
 
 #define WORD_ALIGNED_BYTE_POSITION(width, x, y) (((width * y + x) >> 3) & 0xfffe)
 #define WORD_ALIGNED_BYTE_X(x) (((x) >> 3) & 0xfffe)
@@ -12,14 +12,25 @@
 // copperlist
 extern void initializeCopperlist(void *copperlist);
 extern uint16_t* endCopperlist(uint16_t *copperlist);
-extern uint16_t* addDisplayToCopperlist(uint16_t *copperlist, struct ScreenSetup *);
+extern uint16_t* addDisplayToCopperlist(
+  uint16_t *copperlist,
+  struct ScreenSetup *,
+  struct CurrentScreen *,
+  void *copperlistBitplanePointers
+);
+extern void updateDisplayInCopperList(
+  struct ScreenSetup *,
+  struct CurrentScreen *,
+  void *copperlistBitplanePointers
+);
 extern uint16_t* addColorsToCopperlist(uint16_t *copperlist, color_t[], int count);
+extern uint16_t* setUpEmptySpritesInCopperlist(uint16_t *copperlist);
 
 extern void takeOverSystem(void);
 extern void giveBackSystem(void);
 extern void setUpDisplay(uint32_t bitplaneCount);
 
 extern void myWaitBlit(void);
-extern uint16_t WaitBOF(uint16_t line);
+extern uint16_t WaitBOF(uint32_t line);
 
 #endif
diff --git a/system/system.s b/system/system.s
index 678407b..3bac6c7 100644
--- a/system/system.s
+++ b/system/system.s
@@ -2,7 +2,9 @@
   XDEF _giveBackSystem
   XDEF _initializeCopperlist
   XDEF _setUpDisplay
+  XDEF _setUpEmptySpritesInCopperlist
   XDEF _addDisplayToCopperlist
+  XDEF _updateDisplayInCopperList
   XDEF _addColorsToCopperlist
   XDEF _endCopperlist
   XDEF _myWaitBlit
@@ -20,11 +22,13 @@ FUNC_CNT SET FUNC_CNT-6
   INCDIR "extra_lvos_39:"
   INCLUDE "exec/exec_lib.i"
   INCLUDE "exec/types.i"
+  INCLUDE "exec/execbase.i"
   INCLUDE "exec/libraries.i" # get the CALLLIB macro
   INCLUDE "graphics/gfxbase.i"
   INCLUDE "graphics_lvo.i"
   INCLUDE "hardware/custom.i"
   INCLUDE "hardware/dmabits.i"
+  INCLUDE "hardware/intbits.i"
 
 ; @param 1 Pointer to null terminated name of library
 ; @param 2 Minimum version of library, 0 for any
@@ -57,19 +61,36 @@ RestoreRegister MACRO
   UWORD ScreenSetup_height
   UWORD ScreenSetup_bitplanes
   ULONG ScreenSetup_memoryStart
+  UWORD ScreenSetup_byteWidth
+  UWORD ScreenSetup_nextBitplaneAdvance
+  UWORD ScreenSetup_nextBufferAdvance
+  ULONG ScreenSetup_copperlistBitplanePointers
   LABEL ScreenSetup_SIZEOF
 
+  STRUCTURE CurrentScreen,0
+  UWORD CurrentScreen_currentBuffer
+CurrentScreen_planes EQU SOFFSET
+SOFFSET SET SOFFSET+(8*4)
+  LABEL CurrentScreen_SIZEOF
+
 BPLCON0_COLOR EQU $200
 
+M68K_LEVEL3_INTERRUPT_AUTOVECTOR EQU $6C
 _takeOverSystem:
-  MOVE.L A6,-(SP)
+  MOVEM.L A2/A6,-(SP)
     OpenLibrary #GraphicsLibrary,#0
     MOVE.L D0,GraphicsBase
-    MOVE.L D0,A6
 
+    MOVE.L $4,A6
+    CALLLIB _LVOForbid
+
+    MOVE.L D0,A6
     MOVE.L gb_ActiView(A6),OldView
     MOVE.L gb_copinit(A6),OldCopper
 
+    CALLLIB _LVOOwnBlitter
+    CALLLIB _LVOWaitBlit
+
     LEA _custom,A0
 
     PreserveRegister dmacon
@@ -77,25 +98,56 @@ _takeOverSystem:
     PreserveRegister intreq
     PreserveRegister adkcon
 
-    ; http://amigadev.elowar.com/read/ADCD_2.1/Hardware_Manual_guide/node0036.html
-    MOVE.W #$C000,intena(A0) ; enable master interrupt
-    MOVE.W #$3FFF,intena(A0) ; disable every other interrupt
-
-    MOVE.W #DMAF_SETCLR|DMAF_COPPER|DMAF_RASTER|DMAF_BLITTER,dmacon(A0)
-    MOVE.W #DMAF_AUDIO|DMAF_DISK|DMAF_SPRITE,dmacon(A0)
-
     MOVE.L #0,A1
     CALLLIB _LVOLoadView
     CALLLIB _LVOWaitTOF
     CALLLIB _LVOWaitTOF
-    CALLLIB _LVOOwnBlitter
-    CALLLIB _LVOWaitBlit
 
-    MOVE.L $4,A6
-    CALLLIB _LVOForbid
-  MOVE.L (SP)+,A6
+    LEA _custom,A0
+
+    ; http://amigadev.elowar.com/read/ADCD_2.1/Hardware_Manual_guide/node0036.html
+    MOVE.W #$7FFF,intena(A0) ; disable all interrupts
+    ; we need VERTB to use WaitTOF
+    MOVE.W #INTF_SETCLR|INTF_INTEN|INTF_COPER|INTF_VERTB,intena(A0) ; enable master interrupt, copper, and VBR
+
+    MOVE.W #$7FFF,dmacon(a0)
+    MOVE.W #DMAF_SETCLR|DMAF_MASTER|DMAF_COPPER|DMAF_RASTER|DMAF_BLITTER,dmacon(A0)
+  MOVEM.L (SP)+,A2/A6
   RTS
 
+; @outreg D0 pointer to VBR
+GetVBR:
+  MOVE.L A5,-(SP)
+    MOVEQ #0,D0
+    MOVE.L $4,A6
+    BTST #0,AttnFlags+1(A6)
+    BEQ.B .zIs68K
+    LEA Get68010VBR(pc),A5
+    CALLLIB _LVOSupervisor
+.zIs68K:
+  MOVE.L (SP)+,A5
+  RTS
+
+Get68010VBR:
+  DC.L $4E7A0801
+  RTE
+
+NewLevel3VBI:
+  MOVEM.L D0-A6,-(SP)
+    MOVE.L VBIPtr,D0
+    BEQ.B .noVBI
+    MOVE.L D0,A0
+    JSR (A0)
+.noVBI:
+    LEA _custom,A6
+    LEA intreq(A6),A6
+    MOVEQ #$20,D0
+    MOVE.W D0,(A6)
+    MOVE.W D0,(A6) ; there is a bug in the 4000?
+  MOVEM.L (SP)+,D0-A6
+  RTE
+
+
 _giveBackSystem:
   MOVE.L A6,-(SP)
     LEA _custom,A0
@@ -127,49 +179,134 @@ _initializeCopperlist:
   RTS
 
 ; @stack *copperlist Pointer to copperlist
-; @stack ScreenSetup Pointer to screensetup struct
+; @stack ScreenSetup Pointer to screenSetup struct
+; @stack CurrentScreen Pointer to currentScreen struct
+; @stack copperlistBitplanePointers Pointer to bitplane pointers within the copper list [[high, low], ...]
+  STRUCTURE updateDisplayInCopperList,4
+  ULONG updateDisplayInCopperList_screenSetup
+  ULONG updateDisplayInCopperList_currentScreen
+  ULONG updateDisplayInCopperList_copperlistBitplanePointers
+_updateDisplayInCopperList:
+  MOVE.L updateDisplayInCopperList_screenSetup(A7),A0
+  MOVE.L updateDisplayInCopperList_currentScreen(A7),A1
+  MOVE.L updateDisplayInCopperList_copperlistBitplanePointers(A7),D0
+
+  MOVEM.L A2-A3/D2,-(SP)
+    MOVE.L D0,A2
+    ; a2 has copperlistBitplanePointers
+
+    MOVE.W ScreenSetup_bitplanes(A0),D1
+    SUBQ #1,D1
+    LEA CurrentScreen_planes(A1),A1
+    ; a1 has planes
+
+.continue:
+    MOVE.L (A1)+,D2
+    ; d2 has bitplane pointer
+
+    MOVE.L (A2)+,A3
+    ; a3 has high copperlist bitplane pointer
+    SWAP D2
+    MOVE.W D2,(A3)
+    MOVE.L (A2)+,A3
+    ; a3 has low copperlist bitplane pointer
+    SWAP D2
+    MOVE.W D2,(A3)
+
+    DBRA D1,.continue
+  MOVEM.L (SP)+,A2-A3/D2
+
+  RTS
+
+; Populate all 8 sprite pointers with the
+; address to an empty sprite.
+;
+; @stack *copperlist Pointer to copperlist
+; @outreg D0 Current pointer to copperlist
+_setUpEmptySpritesInCopperlist:
+  MOVE.L 4(A7),A1
+
+  MOVE.L D2,-(SP)
+    MOVEQ #7,D0
+    MOVEQ #0,D1
+    MOVE.W #sprpt,D1
+    LEA EmptySprite,A0
+    MOVE.L A0,D2
+.spritewrite:
+    SWAP D2
+    MOVE.W D1,(A1)+
+    MOVE.W D2,(A1)+
+    ADDQ #2,D1
+    SWAP D2
+    MOVE.W D1,(A1)+
+    MOVE.W D2,(A1)+
+    ADDQ #2,D1
+    DBRA D0,.spritewrite
+  MOVE.L (SP)+,D2
+  MOVE.L A1,D0
+
+  RTS
+
+; @stack *copperlist Pointer to copperlist
+; @stack ScreenSetup Pointer to screenSetup struct
+; @stack CurrentScreen Pointer to currentScreen struct
+; @stack copperlistBitplanePointers Pointer to currentScreen struct
+  STRUCTURE AddDisplayToCopperListParams,4
+  ULONG AddDisplayToCopperListParams_copperlistPtr
+  ULONG AddDisplayToCopperListParams_screenSetupPtr
+  ULONG AddDisplayToCopperListParams_currentScreenPtr
+  ULONG AddDisplayToCopperListParams_copperlistBitplanePointersPtr
 _addDisplayToCopperlist:
-  MOVE.L 4(A7),A0 ; copperlist
-  MOVE.L 8(A7),A1 ; struct
+  MOVE.L A7,A0
 
   ; A2,D2,D3
-  MOVEM.L A2/D2/D3,-(SP)
-    MOVE.W ScreenSetup_bitplanes(A1),D0
-    MOVE.L ScreenSetup_memoryStart(A1),A2
+  MOVEM.L A2-A4/D2-D4,-(SP)
+    MOVE.L AddDisplayToCopperListParams_copperlistPtr(A0),A1 ; copperlist
+    MOVE.L AddDisplayToCopperListParams_screenSetupPtr(A0),A2 ; screenSetup
+    MOVE.L AddDisplayToCopperListParams_currentScreenPtr(A0),A3 ; currentScreen
+    MOVE.L AddDisplayToCopperListParams_copperlistBitplanePointersPtr(A0),A4 ; copperlistBitplanePointers
 
-    ; get bitplane offset
-    MOVEQ #0,D2
-    MOVE.W ScreenSetup_width(A1),D2
-    ROR.W #3,D2
-    MULU ScreenSetup_height(A1),D2
+    LEA CurrentScreen_planes(A3),A3
+    ; a3 contains address to planes
+
+
+    MOVEQ #0,D0
+    MOVE.W ScreenSetup_bitplanes(A2),D0
+    ; d0 is num of bitplanes
 
-    SUBQ #1,D0
-.continue:
     ; set up bplpt
     MOVEQ #0,D1
-    MOVE.L D0,D1
-    ROL.L #2,D1
     ADD.W #bplpt,D1
+    ; d1 contains bltpt
 
-    ; set up bitplane pointer
-    MOVE.L D0,D3
-    MULU D2,D3
-    ADD.L A2,D3
+    MOVEQ #0,D4
+.continue:
+    ; get plane to split up
+    MOVE.L (A3)+,D3
 
     ; high byte
     SWAP D3
-    MOVE.W D1,(A0)+
-    MOVE.W D3,(A0)+
+    MOVE.W D1,(A1)+
+    ; get this position for later updating
+    MOVE.L A1,(A4)+
+    MOVE.W D3,(A1)+
     ; low byte
     SWAP D3
     ADDQ #2,D1
-    MOVE.W D1,(A0)+
-    MOVE.W D3,(A0)+
-    DBRA D0,.continue
+    MOVE.W D1,(A1)+
+    ; get this position for later updating
+    MOVE.L A1,(A4)+
+    MOVE.W D3,(A1)+
+    ADDQ #2,D1
+
+    ADDQ #1,D4
+    CMP D4,D0
+    BNE .continue
 
     ; current copperlist position
-    MOVE.L A0,D0
-  MOVEM.L (SP)+,A2/D2/D3
+    MOVE.L A1,D0
+  MOVEM.L (SP)+,A2-A4/D2-D4
+
 
   RTS
 
@@ -208,14 +345,16 @@ _endCopperlist:
 ; @stack bitplaneCount
 _setUpDisplay:
   MOVE.L D2,-(SP)
-    MOVE.L 4(A7),D2
+    MOVE.L 8(A7),D2
 
     LEA _custom,A1
 
     MOVEQ #0,D0
     MOVE.W #BPLCON0_COLOR,D0
+
     MOVEQ #0,D1
     MOVE.W D2,D1
+
     AND.W #$7,D1
     ROL.W #8,D1
     ROL.W #4,D1
@@ -223,9 +362,13 @@ _setUpDisplay:
     MOVE.W D0,bplcon0(A1)
 
     MOVE.W #0,bplcon1(A1)
+    MOVE.W #0,bplcon2(A1)
     MOVE.W #0,bpl1mod(A1)
-    MOVE.W #$2c21,diwstrt(A1)
-    MOVE.W #$2cc1,diwstop(A1)
+    MOVE.W #0,bpl2mod(A1)
+    MOVE.W #$2c81,diwstrt(A1)
+    ; pal trick
+    MOVE.W #$f4c1,diwstop(A1)
+    MOVE.W #$38c1,diwstop(A1)
     MOVE.W #$0038,ddfstrt(A1)
     MOVE.W #$00d0,ddfstop(A1)
   MOVE.L (SP)+,D2
@@ -247,8 +390,8 @@ _myWaitBlit:
   RTS
 
 _WaitBOF:
-  MOVE.W 6(A7),D1
-  ROL.W #8,D1
+  MOVE.W 4(A7),D1
+  ROL.L #8,D1
 
   MOVE.L $dff004,D0
   AND.L #$1ff00,D0
@@ -264,14 +407,27 @@ _WaitBOF:
   RTS
 
   CNOP 0,4
-OldView dc.l 0
-OldCopper dc.l 0
 GraphicsBase dc.l 0
 
+; old graphics stuff
+OldView dc.l 0
+OldCopper dc.l 0
+
+; old registers
 Olddmacon dc.w 0
 Oldintena dc.w 0
 Oldintreq dc.w 0
 Oldadkcon dc.w 0
 
+; vertical blank interrupt and the vector base register
+OldLevel3VBI dc.l 0
+VBRPtr dc.l 0
+
+; you can set this to your own interrupt
+VBIPtr dc.l 0
+
   CNOP 0,4
 GraphicsLibrary GRAPHICSNAME
+
+  SECTION Sprite,Data_C
+EmptySprite dc.w 0,0