From 96f803a7c7a126aab9cf9094ada47d3d9b2e23db Mon Sep 17 00:00:00 2001
From: Pragyansh Chaturvedi <pragyanshchaturvedi18@gmail.com>
Date: Wed, 11 Oct 2023 16:58:10 +0530
Subject: [PATCH] janitorial

---
 src/dmg_boot.gb                               | Bin 256 -> 0 bytes
 tests/cpu_instrs/cpu_instrs.gb                | Bin 65536 -> 0 bytes
 tests/cpu_instrs/individual/01-special.gb     | Bin 32768 -> 0 bytes
 tests/cpu_instrs/individual/02-interrupts.gb  | Bin 32768 -> 0 bytes
 tests/cpu_instrs/individual/03-op sp,hl.gb    | Bin 32768 -> 0 bytes
 tests/cpu_instrs/individual/04-op r,imm.gb    | Bin 32768 -> 0 bytes
 tests/cpu_instrs/individual/05-op rp.gb       | Bin 32768 -> 0 bytes
 tests/cpu_instrs/individual/06-ld r,r.gb      | Bin 32768 -> 0 bytes
 .../individual/07-jr,jp,call,ret,rst.gb       | Bin 32768 -> 0 bytes
 tests/cpu_instrs/individual/08-misc instrs.gb | Bin 32768 -> 0 bytes
 tests/cpu_instrs/individual/09-op r,r.gb      | Bin 32768 -> 0 bytes
 tests/cpu_instrs/individual/10-bit ops.gb     | Bin 32768 -> 0 bytes
 tests/cpu_instrs/individual/11-op a,(hl).gb   | Bin 32768 -> 0 bytes
 tests/cpu_instrs/readme.txt                   | 119 -------
 tests/cpu_instrs/source/01-special.s          |  78 -----
 tests/cpu_instrs/source/02-interrupts.s       |  73 ----
 tests/cpu_instrs/source/03-op sp,hl.s         | 102 ------
 tests/cpu_instrs/source/04-op r,imm.s         |  88 -----
 tests/cpu_instrs/source/05-op rp.s            |  98 ------
 tests/cpu_instrs/source/06-ld r,r.s           | 115 -------
 .../cpu_instrs/source/07-jr,jp,call,ret,rst.s | 127 -------
 tests/cpu_instrs/source/08-misc instrs.s      | 110 ------
 tests/cpu_instrs/source/09-op r,r.s           | 269 ---------------
 tests/cpu_instrs/source/10-bit ops.s          | 315 ------------------
 tests/cpu_instrs/source/11-op a,(hl).s        | 162 ---------
 tests/cpu_instrs/source/common/apu.s          | 215 ------------
 tests/cpu_instrs/source/common/build_gbs.s    | 121 -------
 tests/cpu_instrs/source/common/build_rom.s    |  80 -----
 tests/cpu_instrs/source/common/checksums.s    |  98 ------
 tests/cpu_instrs/source/common/console.bin    | Bin 768 -> 0 bytes
 tests/cpu_instrs/source/common/console.s      | 291 ----------------
 tests/cpu_instrs/source/common/cpu_speed.s    |  64 ----
 tests/cpu_instrs/source/common/crc.s          |  78 -----
 tests/cpu_instrs/source/common/crc_fast.s     |  88 -----
 tests/cpu_instrs/source/common/delay.s        | 220 ------------
 tests/cpu_instrs/source/common/gb.inc         |  64 ----
 tests/cpu_instrs/source/common/instr_test.s   | 105 ------
 tests/cpu_instrs/source/common/macros.inc     |  73 ----
 tests/cpu_instrs/source/common/multi_custom.s |  38 ---
 tests/cpu_instrs/source/common/numbers.s      | 177 ----------
 tests/cpu_instrs/source/common/printing.s     |  98 ------
 tests/cpu_instrs/source/common/runtime.s      | 142 --------
 tests/cpu_instrs/source/common/testing.s      | 176 ----------
 tests/cpu_instrs/source/linkfile              |   2 -
 tests/cpu_instrs/source/shell.inc             |  21 --
 tests/halt_bug.gb                             | Bin 32768 -> 0 bytes
 46 files changed, 3807 deletions(-)
 delete mode 100644 src/dmg_boot.gb
 delete mode 100644 tests/cpu_instrs/cpu_instrs.gb
 delete mode 100644 tests/cpu_instrs/individual/01-special.gb
 delete mode 100644 tests/cpu_instrs/individual/02-interrupts.gb
 delete mode 100644 tests/cpu_instrs/individual/03-op sp,hl.gb
 delete mode 100644 tests/cpu_instrs/individual/04-op r,imm.gb
 delete mode 100644 tests/cpu_instrs/individual/05-op rp.gb
 delete mode 100644 tests/cpu_instrs/individual/06-ld r,r.gb
 delete mode 100644 tests/cpu_instrs/individual/07-jr,jp,call,ret,rst.gb
 delete mode 100644 tests/cpu_instrs/individual/08-misc instrs.gb
 delete mode 100644 tests/cpu_instrs/individual/09-op r,r.gb
 delete mode 100644 tests/cpu_instrs/individual/10-bit ops.gb
 delete mode 100644 tests/cpu_instrs/individual/11-op a,(hl).gb
 delete mode 100644 tests/cpu_instrs/readme.txt
 delete mode 100644 tests/cpu_instrs/source/01-special.s
 delete mode 100644 tests/cpu_instrs/source/02-interrupts.s
 delete mode 100644 tests/cpu_instrs/source/03-op sp,hl.s
 delete mode 100644 tests/cpu_instrs/source/04-op r,imm.s
 delete mode 100644 tests/cpu_instrs/source/05-op rp.s
 delete mode 100644 tests/cpu_instrs/source/06-ld r,r.s
 delete mode 100644 tests/cpu_instrs/source/07-jr,jp,call,ret,rst.s
 delete mode 100644 tests/cpu_instrs/source/08-misc instrs.s
 delete mode 100644 tests/cpu_instrs/source/09-op r,r.s
 delete mode 100644 tests/cpu_instrs/source/10-bit ops.s
 delete mode 100644 tests/cpu_instrs/source/11-op a,(hl).s
 delete mode 100644 tests/cpu_instrs/source/common/apu.s
 delete mode 100644 tests/cpu_instrs/source/common/build_gbs.s
 delete mode 100644 tests/cpu_instrs/source/common/build_rom.s
 delete mode 100644 tests/cpu_instrs/source/common/checksums.s
 delete mode 100644 tests/cpu_instrs/source/common/console.bin
 delete mode 100644 tests/cpu_instrs/source/common/console.s
 delete mode 100644 tests/cpu_instrs/source/common/cpu_speed.s
 delete mode 100644 tests/cpu_instrs/source/common/crc.s
 delete mode 100644 tests/cpu_instrs/source/common/crc_fast.s
 delete mode 100644 tests/cpu_instrs/source/common/delay.s
 delete mode 100644 tests/cpu_instrs/source/common/gb.inc
 delete mode 100644 tests/cpu_instrs/source/common/instr_test.s
 delete mode 100644 tests/cpu_instrs/source/common/macros.inc
 delete mode 100644 tests/cpu_instrs/source/common/multi_custom.s
 delete mode 100644 tests/cpu_instrs/source/common/numbers.s
 delete mode 100644 tests/cpu_instrs/source/common/printing.s
 delete mode 100644 tests/cpu_instrs/source/common/runtime.s
 delete mode 100644 tests/cpu_instrs/source/common/testing.s
 delete mode 100644 tests/cpu_instrs/source/linkfile
 delete mode 100644 tests/cpu_instrs/source/shell.inc
 delete mode 100644 tests/halt_bug.gb

diff --git a/src/dmg_boot.gb b/src/dmg_boot.gb
deleted file mode 100644
index afa0ee4792c2ba80afb6b0c1962e249e195e6fc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 256
zcmV+b0ssCn{{OEb|DQ6;d?5QFCjSl*K7caf3_kPXGCp^AKK$TE5d;At5P%xZl>p6_
z026!uG$8X4*Z>9y8WSQT1t9r88R`(3AupK@3_U0aG7TX4E)N*<XFg<C;6gr;;6MZ(
z0uBuDME;N<`VAoW9U$@!6C`{dgZ^SD1|GrwWFQ86;tW2A;_yO{;6fE3(gh$-79beQ
zPX+|V%MlmB%Mlj^AoU_6A|uJp?Pg}o4FC%Ra{z+?3;+!P2oWEMi2x4V%x>o0-PxJD
zyJur=4(!a`+?k)dxidaILb;{6r9wO*1OXAK02&j%ApRqL{xl%<1{rvUBLyJ)h9Lev
G0pL*XS7L7f

diff --git a/tests/cpu_instrs/cpu_instrs.gb b/tests/cpu_instrs/cpu_instrs.gb
deleted file mode 100644
index 7b06221b23dcd84644e7910bb8ba91a957c9ba04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65536
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
MfFZyT_;UpQ3qRkrD*ylh

diff --git a/tests/cpu_instrs/individual/01-special.gb b/tests/cpu_instrs/individual/01-special.gb
deleted file mode 100644
index ad3e9984f967b77b7ffdf768842ce3c04517d059..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
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

diff --git a/tests/cpu_instrs/individual/02-interrupts.gb b/tests/cpu_instrs/individual/02-interrupts.gb
deleted file mode 100644
index 20895940ad31ca0229cb4ff8bb7c7ef79ca8db10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI4Uu+ab7{KSQcS|Y9wS_*6aD^>@YH4V?Lc~j4HWe#q6zc=ggh*UsyNI0E+Cn+t
zI9r++{PQ63MP4-epz%e+3s893?cQBk%QO;!EC~&Ffj031%^hR`p}F&$y+Q)v5ffs*
z$<EGxGvD9e%<kJAAy2o-*3<R(pL;VGddF{Q+S&PJUPT`nA^|d=RMsv%`~?YKJ{z5y
zn7DNG^ywWRMuXSSPFz0v!|CC*%40bVfb4PSH0|Zb)}DEBQ!UYhHO&h`;{Ce$;+>dD
z^aj#q67MsgIVOk%kN^@u0!RP}AOR$R1dsp{Kmter2_OL^fCP{L5<mh-00|%gB!C2v
z01`j~NB{{S0VIF~kN^@u0!RP}AOR$R1dsp{Kmter2_OL^fCP{L5<mh-00|%gB!C2v
z0226r5irG(i+*WlsYJ#-f1V-Mi8GFJg;nT<_2O+;D6s{)a=tuMu$(xn(GPOz3BU8V
zC{aq8fy`j$P-e(-QWqv0hDsY--fnrf<+sMlvGCY)V~dtbH6O&LZ*1B(eX?W!^w4_;
zrp1-wwZ_u2-qoM3?#Z4r3f94#*N*2ZZ0b`i>Q&5~$F`heRdTD&JT|1Dh_hprJ7(Fa
z{<lLb*e`nX3GttT#in((&|vijTW+vZy5+D{#seF8ETkNRm2|^$Vsz5kN3+g;I^i6k
zmz+4g;2fmqoKy_d_8D~4No{zO-gHv!o9T77Rd>c-Vrz}URCTc`>`l)}OQy$mQZ(SC
zU}9ddbNKu=BUr_@8EFZUfl7o{-w|nMup<WIJ}W!vEMMN7^VtV;ekf3YS|-^pgL+FO
z%Qov4<T}Yl^mn%R^>uZUtU}CPBlmo^+~i;1bd^@~wf634*Mk+m-F;86cO*_U%>_$<
z0C!L?dd9h-lOJex@`KP1K_6=6g+J_9Vf*p}r^N;N!BgV={Gnm7GCy=utS~!tW*g?P
z(G1njiyag1Shrp%UC9w!A(=VQtD%>mH!1_rOPQ6*-pq=Ized@&I!gfTQP!b5N(Ec0
zEAF{r{G_m-N8DP#lf(K)3TAH9;Tiv^7m6NR4D!M@Zr>T{>Z~GJK=MEmmjjn}cMBC?
zrsT5nd0%^jWbeb@Eu;(|%vSqHhK;+$=AsT`qBsKgeD#zMhO&A^JE-4s)wwok9-meD
zV^*ckw`J!iUA<ywcUNEZ`Q75)?%rL1*zeZs=QTTuhra`7c`f-zBsb8b%TqpZTyTR6
z{?}i5Ys;g)`Uy`DRLrl8lxNBPirBFxA>Us7Msy5|wI=Tod#WZmZo+xh%?5HPNZ6cY
z1Nkyof>Ei<Ery-Qg>2<+uHI&QlJxxs@}1z@yIP!C;TP{(uq_`6HLx)|mCvA)CwIR%
zp?Go~u#pf1{B@M9+EYnEO$n8Y7XG?y8F(`MBD`trfT<kGw1J;jm1~(z=Fy}(Rhwxm
zSii%oIWRQ<$?%u6seaOFSZp^J=ZJF)MX{-hbtRp`@s<~(d$VOn?589o40rI7n!HzU
zrz@cbMQm7P3w3M!;*7Ews>{M_2~j}}G%g;_Y$#Y4xN>)6<EmA)i|zVF%ML({yV-LO
zzdw{WLP;bNaX-zGVgxQisG`b3oDwZUB{lsy39So-yWtNy0)c?57Yu=2C`fw3Fot^w
z(d3e>!4jnja9D1Vq{2gDRw6`IiB|}K!!{yo(SA*n3FY=Q0Wx1mkVJq61egzm<VXTy
zCDgdUWm#3@TtC6pBnk92e(_Ne0%0DPU$dh`cod29Tp>JM@XRgCaiCs^|8Z1R2n7cT
zO(Stl;}^`UstSH%5lzz~F^I3mRTc7bN0lh58ikMqR>4doGEbk%MBokVz@`Ump;X=y
zBt2ccm`<mO)}Kg#A<q|@?8XBHSMHCjb7ct0<ICI+K;(_bf#$~3WSJ81b+I@N{xq4V
z&ewSgWiAkJiEFlmwDIZ%FNwKwjMRi9>4*D3NKsd%Sy2`g@bBV<`Uxkk@_H0EF34H}
z<d75x?A!+C6#<w4E{IP_7$U$v0)1#b058Jp54)la`qw!C7|Z(HAFsbG$5q!KIOH<t
z0Wv>$u#cQT5M&;P|7i?2;~NYB;{2?-0Lt@_4{Wk~eu9)r+|CUTTzV)CKw6-u-u%9N
zbm5s0_O;2smC~A)ozdN0y}f&ScK22BFQ}98D1#ZVqg3+Gmd!s~1+zWLLP>Uelz+Tw
z@!`wkdcqqLKmter2_OL^fCP{L5<mh-00|%gB!C2v01`j~NB{{S0VIF~kN^@u0!RP}
yAOR$R1dsp{Kmter2_OL^fCP{L5<mh-00|%gB!C2v01`j~NB{{S0VMEj5%?FoQfCSP

diff --git a/tests/cpu_instrs/individual/03-op sp,hl.gb b/tests/cpu_instrs/individual/03-op sp,hl.gb
deleted file mode 100644
index 50b3cc70f1e2e458f0bc4ee6eace19f988074825..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
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

diff --git a/tests/cpu_instrs/individual/04-op r,imm.gb b/tests/cpu_instrs/individual/04-op r,imm.gb
deleted file mode 100644
index 58ca7b8ac3c2b16efc9c8e401e790671c00022a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
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

diff --git a/tests/cpu_instrs/individual/05-op rp.gb b/tests/cpu_instrs/individual/05-op rp.gb
deleted file mode 100644
index 1c19d922f728bd11dcd8b289813fd0409f438157..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
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
HUn1}~7IqB+

diff --git a/tests/cpu_instrs/individual/06-ld r,r.gb b/tests/cpu_instrs/individual/06-ld r,r.gb
deleted file mode 100644
index d497bfd1275361bc847fa94dc87b43729f180b5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeH}dvFuS8NfgJaX5~UEyJ{jANY)o#&)5o2_>FJY@LKh8)BTM2{aVS5kLf@+6Dp$
zEGsrnLrSIvntz%;fXsB#X4=N3kMPP&PZkos+UE&vLXRexQ^2&<fGZ_jV#^@)+Y`_>
z=`hp&m1)17+uQqgzsG*R+ub{W|ML=_lrwnQ>m8T~x94t#Zm`2dC~#Ij`%Q4XJ<xLT
z?AbFf96!Epb&KQDz}dH7IB@*vo$N!zI#IS+ecnLrhsHkk;zB1Vj^g@~a%p_>MCk*6
z7?dh#3`5Sxe&#emB0vO)01+SpM1Tko0U|&IhyW2F0z`la5CI}U1c(3;AOb{y2oM1x
zKm>>Y5g-CYfCvx)B0vO)01+SpM1Tko0U|&IhyW2F0z`la5CI}U1c(3;AOb{y2oM1x
zKm>@u{}zF;)O$MLeYMgJgSOZEKt0@NvU6IllAJ5OZwVQ#L}71ady=Xd(2A7~E~y{o
zpo+jUMyJtb>@>PnGxFweRd;5=%*8X8%zVXF(BIHMrN6Y&UA)pia(UtQkt5AJM!J`_
zk4V#{3$DzxO*1ymXp5Z+CDo32jvk2T>S7*K#T*un+jP}T7oJ$AXf_?Ez@+PKq1DE;
zlgeLBF<1MsQh!()ORCz4qD=~E6(OxUq#aXKQ>zQzu))V<#0+T}C8U~uaoF50#>^e!
zS+iX{V+O=G%?|OD8S$gq_K<kejNH3OeAkT3YZ5PM%M`Q!F73`x@?ufCupuWpA?gm>
zbTcB_%?Nhf?pSm5jTIqBp|&Cvb>n0(6Jb`~KKIqGW<QGC)!49EU0ol~(>vn%n4o~U
z3~Nt>#GDMov?fKxxejZ+%7d#mZ(h3wVhqAh^rrH3Pi_9(+Vf%&ADh?Ovi8PEzTTP=
z^mW0*wYQ-qLclw!r)`7W&`fmBG80``cVg|H#S_0-&*SS$bRL&V5?#lniHV&@rGiBF
z5h*v^tY~^Dd^A*#+1~CyBz>U1_nFMOIOq(F30RA;X0W<gC)SKHoozE}s@Q<`yrKm|
zTHS!wte7lUt5le^ZZy79w4a@@azRg~wzW4Ieq_MpGk#G?rfs_9;E63*wcfXOO(Db(
z$qh-WMlSQLSI9=<Q*{=NSL!ORs?=0Wy;5K2?92#I`pPdBR+qP@pO(xHR0^PuKMlB$
z)D-9!i~ABy6J8e!Z$9hqB{F7@k-=2l1~8k^R18TYqeirQ!b~wHV^U65V3hD@+x~00
z3D-rNG{&IcFWEdHmFKShbMm}r3S-76(CCwBGzATEq?F2>MzQ55V@zV*#$?M+N{yg;
zsl#3Wj=g_l?N~_dF<f&EmoeR_VMz@7j4}Bm_|!<VP=IE|7}m)~(Vg7ybmy>xsK1Nr
z+xQNh#7U!8iOC+|kNJ`wQX>wx6)1&|%>pD`FV+^BtcdFma-}@!k{|cMaFr`#O}`OS
zNn<LQ2FrO#x^`VRV)@Qw2NEs-%<w`isUDUD+>L(_bF)W=$sF9X&b9IQh^wE5p5~=1
zTm_YU<M)@ji~n`suk`bse`a&drkag4+h$0=4>u{TiO!$5y3QoJUa2uU6Fc$VmFUL%
z&LEyB+Mj#1<tMb4db8UGAXYUVsgI8i)yK!MriO;`uoxd=7vfikaIst)!quo9iE4*>
zYo}yQY!FM04r%9=biX8|#`sgLBYi|V7Dz{>--Hi@hRs{eAl7lKQU9$5x8G`T$E^n2
zZ#8)8zc*DI0qy~~7vMgCc>wbP762>+_yWKe0qzG_1n>Yr6To7CW`G9)z69_Pz?T6Y
z26zNu3BXc-uK+v>ungd<0LuYZ0DKK#C4daD3g9t-)c|V%)&h6|)&V>YupVFoz!LyI
zfUg6z0JH+M0c-@=1h5(4Nq{W?+W`Ck+W~d}v;zbHIsk$IPXRbU)1r=Ielz$jfj3on
zEy9N4SB6-LZOLrs_xx2?hLT}?-$jwsl_71<3AOQaJ;JN~zx-+I-!^`K%X#0?+2gLm
z%Z|<(<ZW-^-KF)rPY1Y8PvMhoQ(kUqb^a-x7K`&f#oP7`yPke-*X$CQKV;)N&%d)L
zdbVTl9htplKjH0?-|ncYR#L*<6$d*%Kd<ZuTxZGjZ)kr!^wt<}7muD>ln9TBQqlYS
zHm)CBkT{sz#C7TxzB7lnd*45}XYOOJmw)t7Xv_S|TN-yatzOb|Y-XB|@pjJc-%XqS
zt=_ezZ)G07L;1@im+#*-i;w;AwXTaTzVF<1=u)_@B68rxM_awxug9-Fd1=yn-)^(7
zyv$p!7qLwp&-EXw6%zB(dnGfZYWw@FWAVh?KKwk+>Z^jCNOdc=yB!&9+2nW`9{llg
zosGsTbnQZ)xV#F!E9Bu`y;_qmjq-!=aiJKG%=PRktnlw^zI2w^;?4Noz#!<aIiou3
zR6&ji1*MZ-o;D3Vh4Ll*uxs&?Y@gAHe(qxzjD_KXY?sq$OsYNjC(wDZ6DPy}1!^mX
z&8jlJK0QIYEt!^T3$-`;%;c*xKijem&n50ibE-IDyrY-MaH>L&7GMrcsw&lm$#>*S
zS6LZm7sJyptBe|_pEd4Hs`z=S&|6)ux;kf>UQs%&9b=5fPTl<75qSX-d_G*eSbS+8
zUH~GKJwiYPuTON#(PyB1PI*JC_inJ;?UtUS9PP>-(AI!$1Fm(iC*#2l0iqa0huPwG
z%lLpR{CbgP$Pw)5un|1omaSf|2Sjc!22th%K?vGKyMX=na*r>Fv4V0y;Ic=S16)7I
z)!c5>_wtLkOt3fbxcs`_x`9V=i+rva9xr_6mf1L%FUH@{A~O)tLD1`kfY-|}?3ZO3
z{rY`guh-|t_;Ns&ab8v{1C!+z3<)@jW?t~{>5Co^ctJa~X+v8;FIa*Q9Z8>#Mx)@}
z8VsT#pDz}V6%Q3Gd8==ZC1Xe)-^2YNL|%9tELJ?P$0GvzI-MRte_jutIv?j#$a2AW
zQ!TTp(8#kFa=>rNekgA6MQ^+YY}1PDzAkzMhW;(Qm_KmRGS7!uaZ&aLQ7(4}5IeWQ
zekLFj#D(!iXut^g9+5tlHiYNn`8Qai2lX#;0N7^rxj&wNRu0IPKXk}t&I4t>@bEoy
z0uGdU7?y1@e?S7K1AMJo0J8l!AAHHy`f-S&o7-98kxQE>+HqQ_C%?NtyL9mxKpQ{F
zf6d%;X8P7hn`Ue(<UebsVPjoJj>!uC@#PQys!w~aPg^yB``9I>Z*CmR3*CqS5g-CY
zfCvx)B0vO)01+SpM1Tko0U|&IhyW2F0z`la5CI}U1c(3;AOb{y2oM1xKm>>Y5g-CY
ffCvx)B0vO)01+SpM1Tko0U|&IhyW4z4+#7nJ{)}*

diff --git a/tests/cpu_instrs/individual/07-jr,jp,call,ret,rst.gb b/tests/cpu_instrs/individual/07-jr,jp,call,ret,rst.gb
deleted file mode 100644
index 5c8d20bb3a1a0458f29afe40b8d3ca125b13a391..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI4Z){W76~K?3#H7JEf3-bALS7(vAxefRTZy#StF%K!)0(C02P#!X7!@8ZwUQ7J
zIK=jxWa_$U8m%_9>pqlK>)0P{FeYsjvJZ9~+j%pOkq+1ck>t4$P%WC-pf?f&_Rf6{
ztm~$Hm^2Ah=jq*h-?{hvx##!pz0aR4DPUgG|EVo_e~9Zywe`%$vV3|OEG^m#!(fMH
zP+HmW+IPWm`E>WS$;pdvkBsbkvD<Ou^yKBY509MOz&@2t5M_(mCwG7IQ)3UkxVaKS
zj*6D5I`K};GV!)I0-;9eh=BE>pE*sC2oM1xKm>>Y5g-CYfCvx)B0vO)01+SpM1Tko
z0U|&IhyW2F0z`la5CI}U1c(3;AOb{y2oM1xKm>>Y5g-CYfCvx)B0vO)01+SpM1Tko
z0U|&IhyW2F0z`la5CJ0a*&+}TM=zAP?l!pKjOFY&C@01ZHmw$gGLMV@FonEY6=LTK
zJsHLDsTCnVmlpmn;FB~I0a#uS>Vx`_KCBqg^D~XZ`KQ{x(YB@SsIxTDo>-o!ZE#g=
z^Ui*}xqtTku7k6~&kf9qYs9P0{HngzJ*~aTiEu{or>vSURip{UOcAUslCo%ukt-W}
zKBQVSoB|UU+A_0Es`1cAhESybBGht1oX;rgY)GvRtMy@Zbyz(WQVex%_`VH3W}-$|
z&4<E@;T2|#ej#Zb6ef)U;iBOa&KrJV!iaiNtv@Wpjp&nK7j7ESO`XCG_4$yI*r;v@
zXRej!%G#~5B{5gTq8U-aZbY$Tsbj~<b6dlXGIeV>=EBKfCbo6OZ@BIbc6m|kSCTWv
z>eVf&V$Gi_!31rX%Z&O;Sg__Hsdk1Goa>A_8hU2?-n~0_K$1b^mC<amCN-Bl-h4$U
z=VP0Cx_90mDbaeeHf>knMDrtPi4d?x^_=AlH#E}0bw+v+%Mg~~bv*G0<qE#ObZ|th
zN)MhAm!*eJilyn{_r;<}S4h>uk(1#T%yy~wxOiK+wLU+c0*!&b1WP%VJQgPlV#(`k
z*a5w%@lZnjVMq;x)$WAa6*5?n+7M#qx>5N`QGYXL=7OFKb^mB4awK8!8NVCK<Sd%#
z;E6r8{bkS29c7S2B=;q8HFDWxzCt#VTB)&EszFn5Rb^LV>J8ei%3$6GwMT!qd3D`D
z?%Sf_M<pNXcyoXYNy&nCtztagx#X-+_TX8&mChT-^gO2G(t%m@&I-urc_peo5n&;{
z29v5}rFs>Aw!Cw%DDAvv5$72syrM-4D?E4Qlgaa*<&5c{L!-~5(Q-7fidltK>J_G+
zyk5<Q^%~PpR*9l|t;5ywp*^vuc|NQh)18m&PJNBu#4;H4RlVjv@F~$QTPd1VVAx7F
zhwj{oN|%-W6!pKu^(}mdR&&y*Rb{ZJ`D2Nwg_WqoWd_RPW0wum&Uc&34OY(e&v2z;
z@rD=o!AzqwZ%)4hQ^{c}m<F>R5$`SNMor)O!a&*yfEiv*W|R}64R_;Tg`&cdVK4{x
ztZ{8TK2pjT;aJymTb-p1eB&opxGMgA-*5Bsoqus}Q(x1brUR|w2a(QDPdfP99_PjM
z;L#>Mm>$A<Fg=X*PykO9_4=s#!kBtww6JXel8twwEvdPwmef3!?9>b%7I&tYFLiec
z7t6gVT#f3pG4=Rp^YVg;1(MmhDfLPymk@2)dH$62=bjZ$`EoJw50S&+8Dp^-B>jtx
zdKVk)Uu^K;VuJ&V4Nm;;rix&Za7{N`B$q{Mw@9P@Si~Ruvp@EMKX%C<8}r9b`(vs<
zcFrHW?2m;c7?(hi;H(6i1Q#WU1N;TxZvfK(*8%<xa2p^GfQvA1fhty&3QV&vrTo)u
zOUgIRys3fdXr>e<*9WI7?@XPK%uPwRO0ARYd#BYyV_EAYuZzq&VD|XU+Go}SW(|`)
zS<B?E`Tkf%mv~sY@!pU6$KcJ@u^q2(I1n#8ci?CCME~``(My+$Zg(C2NbIY+WZAU4
z^Uy@U>*-%_yt(_W)Rt|JHpeHvCYRg}mY@2;6Cb|!leV_+_x-$j|1WpsUiuS%e&)@l
zFDzD~mX&vkyvLhu=}o!UMI)@JSK{W`GBy;)Z_K`UBMdn}9l`c{jy$%kCba@j&s3ep
z=2G>Vx^`T6p%H#;E5-$Xx2Z&&<EP0>whBCVUS{9I0{^{~h?C5c>cYbpgP^~zyi(ac
zZgWR%rM1<+TD1y2g-b;II;!j9><zsG{d|>O)i*~v$IY%vy(6O>!_R5(S`a70Kd8<1
zGe+YIttGcad?b?-o6FSY<3{F>ZC~y_fSa3JsawWz!dRo1=uEa=i<M#yOl+*xY&DOT
zh<Div%r1#XNI@AjF1)5cnNjeJuGe~;&b4bRS7`OMs|GN}Tyo;UZw7&1Ab`i?F@HdK
zavr<^1m>1(J^^Hp;Bv=ag}TS;+I!@$fZc94^&E9*SLcA<c5K^w0c0sJ$v7kk0d!cn
zTrM|01QsL!w;QZBJ38zDN$%b+%Mu9OUI?Jf2LceV3w9g!+v_Ax0AmH*J{y-Mx7)|{
z16<AJLVcOvyk$0fJCDonh1LZ;ic8>g#qfCJGq)_n!F)0P?rt{&0UZQn8GN$LZ|rxw
z-RRfrk!9KA#rSTY+l})wTQ@MbyBk9Sj-r_i5}&>xfsJ2ihc>-vi>dM}0I}KJg;*>G
z^8P>o4f%ZWlFWFhV9NVFkC`%t<nbl$2O;u{$HB{tCrgq5=<7mm7X8T*pE@7sQz&r3
zcq>h_mC(Vnw^_k!%3i2w_rxB&2Y_72?OG5e8$<slUd$gjX*bV@nQ>8;11Q(Ie2AUf
zU_Y}V6U2q_1!%_z_#TlyUcCs<!}D)9MG5t9Z~)jA^tnHte?j)SO@HW+%bW+weBt4H
z<OCcj^Dz96p12u*!3e;|*QyDi(2w)Mmu#*dhakAPof#gv^a_F<r-gd%o9`5sE<OXO
z9dZ8q#<j6+cVFx7-qshldpxauJNLEr?cG<#fBhJ`g$?RfgO&d4QyQ6zt7qft?-RJE
zokH%xCNe!zMFfZd5g-CYfCvx)B0vO)01+SpM1Tko0U|&IhyW2F0z`la5CI}U1c(3;
uAOb{y2oM1xKm>>Y5g-CYfCvx)B0vO)01+SpM1Tko0U|&Ih`?u;z&`;#5pP@o

diff --git a/tests/cpu_instrs/individual/08-misc instrs.gb b/tests/cpu_instrs/individual/08-misc instrs.gb
deleted file mode 100644
index 4da139be35c0f82db12136c2b65b2571122a026b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
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

diff --git a/tests/cpu_instrs/individual/09-op r,r.gb b/tests/cpu_instrs/individual/09-op r,r.gb
deleted file mode 100644
index e30e6ecc2de8626a9a39ee817dc316c638012446..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI4dvp}l9ml_$#}Y!ad4Of|A`=o~ScxprVl2xDh|pGPJhgzu2kTK6sgWQly2xhD
zLkmi=KI#Fb@~BjVDhP@Qsk)nGlT0p?V_Kj~D|8l2Z1(`}N~cW%?)G;#NS}w()4zJ!
zd(Ygt_c!<VxWCWbnYn)r@PA(XBa^z%IGu+wF(SDhEyzG7(sGJdKLyLjhnDmmKYr|`
z*49P$F0q_Gbo}F&Hnr}*M)?O~jU<~A*POR~;~&QU>&4kQ@LIC1xrOriQJM0eU4D2=
zFwKvo|N5DW2?_#&fFK|U2m*qDARq_`0)l`bAP5Kof`A|(2nYg#fFK|U2m*qDARq_`
z0)l`bAP5Kof`A|(2nYg#fFK|U2m*qDARq_`0)l`bAP5Kof`A|(2nYg#fFK|U2m*qD
zARq_`0)l`b@V`aCFSi{{wOuH-q1*IPC)9nNhVnZt*&CfI|0yBFwOp@qc<4%0HQZXZ
zw}DIQKXXteC~>_}Z_=Cf7S#wG=`CrA&#L@Z<-E$B<!P*%<+1!?TlPZN*)y|OoPDq6
zv9m4nSDux}$)A+R$1a=j@PwtI9$!>#2qy*I;pCu{qNq}m;t!jGsu4>+xWKEKf;0t1
zzSyQG+K|@a{evMTYumimeeyt5)y{ggkv^@+r<MA&176k8#{0gsp>8x___Vm!ry4G)
z*H|HijK`$o#!Bg!;g*gV4N{L0aFN;ypVVOlX51`&ZUkn|kxpw1yau~YyT%vo%ZjB}
zC$$f2xA{#$BOqlM0lF~4a^L>Lclj*o+FibO8%>5XF;7f+&UT@x#zo=^HPmaAmRiFp
z!G>@uC1|ExdbJ0AQc@ftZH`x^x%O&p-dpdfufP93gcSH6Y#U4o+AC70R-BTu_}I+4
zCHH?hk{YZVGzS-X_EiigOM*aWQjeLsxuFqhoM=Rvs5Vn=naC5rR8P_Ei!`>%xsj#=
za%QA?znm6nc~4IE*Lby{&%fVirEEvIcFTWO&rOQ|E{vc8eHhg&s&T62N+Z>{K2CX5
zFDseVt-avYJU(qww^rjdlw_^gt0dNq##f5=#=%4`<jK$;X^Z;r>Nfa{w|Jv5Q&6_>
z#Ae;Ixc2`0(h(vgUrKT*ahaL8h01TjV}eRYxHzcNsu~<asTT(q<uu04$lv+a?9#%O
zu_t7sft1{&<BEY6k~)ZBUv_6?&ajW9^h^EVxk%jDrN=21n-0aK&&ftqkE;P~x?l0?
zqbR8yB~8!eebdG-k|X7PCV4;sbIB&VPvyC*f15nNlBX#8SIB5I8Rd~dl02v?IeK=&
zPh20VwCJM}eg@S5spng4){`0R;fevDx=Sygs+a5I^fDz%L4Tl+`X_v9pvIg=X4w=r
zN9iYb4whp}QZ|$RDz0zhPv}TanzV8a<rdyem4iMtV6i0v4N|wpj7a&GiY!CP;`-fO
zDMdc*qUWHuq&%LO{xnJ@MyXI5O44ic7Z-H{3E%Odfk-((8GaIqs{3R!J&nJTl80Uy
zhGOBKgIt?lA7S-s?5df6S9w}7fACp>E&K1E`-Lw4<R7aqTUPdP*`pKWU;5{G>mrSB
z)|DTNH0><Y8zaqhZi=+fx!FT+6z$VC?aqVRYi&c14G=0hAFzh|PguhPR0mJ=(#zuf
z31x5i!U<X|U!0)TsIBeLcDGgJ4Vjn_8tgxzo$|(*Y#tooy--7Jt$e^8>yY>QH~D&v
z%grFvaJf;}<px(=Zt$_o4X(W0V9$SU%3t6Uf$M-9fVY6%z#iaj;2mHuun%|-*bf{4
zT7h2x?*ktKjX)F74Ej|Ho&cT%RspMlr+}w{HNX#nwZM;nXMyK{=Ybc19|JD}>wxvZ
zOTf#(2H+>aE5IgTGq45tDex+=75Evj4R{^c4(tGa4!i-p3G4z=LBD6g6+jU%4yXjC
z0x6)swqO)c2$TU606Q=Y7!70r#Q>wj1eOGr43+|x3N{QZ4Qx1AI@k!X46sbFEU;{_
z9I#xlkzk|1t^gYiCV}OF<%1P~6@nFk6@$rOC17L0O2Nv&#(`Z4Rsl91%nEiD*aWaj
zu!&$cut{K5VAp_M3-(p8>%gkPt_S-X*c323*i^6^V1c&2!xEvBTGH7utCvoJ-hg$s
zwZ=N%y6^};g`$31z*&Kiue2f7BkQ3=b6ABbE4%pd#z_29$36G`)B_!F^nCxJ=5J=1
zt%1RH8(#5OZFa%8X|cDbZOh!u8#;$Ktb4xOX`A=rIn$Oq)_v!ec^5W6HKTu}wa=YA
z?IuUy^?e_{_1Wgf3Tn=eedikU)V&?{tw&0IA1q&^Z&=@IS$?dqdD}^+=BoMqGlwgc
z)py?BF(5D8|N19gcX$4F^^af8T;*7E;HoR9uWs3$K7HfS^=tF?jch;iVN3V-H{sf0
zcSl0`5B%uBliN1WGXHG(K+D&2KPyP?Jij8m0kzvR?`HF-7u=k&CoOpD#$llsuB|Us
zrHR!8JyU+Z;KTO*<XbbgRy}C;#Llcae8u=#50x#s<BI&MovYsZSbpQ?tL}Al_?}<B
zqpoZ8Z3_af@I9vNmg8wbSJw!m`1!eMrpLqD2J4Rc(fX#34t!d_Z0f!jCr;Vsx^;3>
z${ibDKC$(9$({|9H~qS^>g$#Zy>tDyE#G=(yS~x2t?0c!x{p3<O<vU$Jo4<lNe92(
z_Q8{HSG~Nk^3?gUv!A&?t$x{p`WMff{_ZQCiynyHd}jKQ2d-a!?!xfTGUcmoe0A}T
zr)r*9wet2E>GM7-u;g{s6%33HzkAD`{Da=zC->a+t>@C$?i@X7?yCihmj#pmFn8^$
zD<|LE_hfF*=T+<G>>W(ozRtR!?TgB-SI&2ze*e&-ypmamwWDnA;gcKBRb9QKzxC}u
zeeF=%eQVkl-tOGB=<S&koXb9)a>E^~GDhEi@}12~rKY|a^K!deN6xZ;u;Bb{0n?cC
z$*$cM=E%(0v$Ek+wb!~5pT~nYb<sBIx~>v5(?ax6`?MuatuiWHKpTK?VNmH07X`J`
zUDBN;SZ_|DclL#{RJosj5FapS)2DN>@;Fue>zXPbS4`m=+CNYb@>dgAb0#sfBVbO;
zAGv+(Sn}jcm1%>geXc6c>C?#1jmjtbY=1UOT*}d>Mb%xjBW&zzq{;9-VMS4|QBn}J
z#)iqmqcOQ6UHiDph`w9-)g_P8_la9+d5k7ZXYvy09V`mAr%?`yT#_F&kE%+QFDM0+
zU5LJdL&~IabhSPss?s*2C|FlsK7M>oL9i%)>`IE!AL_ZZ?Ui_egxcEL#7?+2R!avU
zDGs~YEx}nU*&OXZK;h)V>N@8XWMt4gii)L>><TSdT1{>BQow1C+nqEZNgi@IRBSc}
zbvzd(z~MlWIfEQdgWb905vS7*iQ7valKFrKo(w6&OxH6C?X@0?<#D*pT(&zLZm#d)
zYBn3`JNdy|#hg*i<MQKTYXgsBllWXIJRQ{MmP2tUUyA>|B@P7=Iq*20a66s+pz98Y
zgZ#Q`ola-1i{d-n4hPLE(K?_w97`x9Xq3#Hu=D9lc9?k~JF;0ywv;L_9<-m09c^!K
zhw~AShYb0Asn`?oNFgCVQad>zQ%D})&ixQXUU(cTiFi)CT>|+!8aqq=oOV8SKF+5w
z#D(IGNtlhnG@iXV39f|fLUwg+`=$E;#JmpMMbU0n$bSMa<xd|SnikJTNyH`D=^?q$
z<|gdihOR4SVnVnmzJzLuK=+a8Q&~#zYI*+E36VZvIL!f2JEYJ3@%)Emw<F<?9CDfS
zAek>bx{sWIg=8Lv|Er9f@f%D4+<dJj01REH`Or;HtRIUc*|=RIJaJhnNf|UP(sO*i
zacJpMAJCG!_!ixEeP!KJdD(<z>3q{}=q9B}PcoFWzwQA2tzFs+UE1PqdXCGb*rf+2
z;YFMT0YN|z5CjAPK|l}?1Ox#=KoAfF1OY)n5D)|e0YN|z5CjAPK|l}?1Ox#=KoAfF
r1OY)n5D)|e0YN|z5CjAPK|l}?1Ox#=KoAfF1OY)n5D*0ZO#*)bMsZX?

diff --git a/tests/cpu_instrs/individual/10-bit ops.gb b/tests/cpu_instrs/individual/10-bit ops.gb
deleted file mode 100644
index 8988458ea0eff185d7f3bd78ff85bb7717edccfa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
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

diff --git a/tests/cpu_instrs/individual/11-op a,(hl).gb b/tests/cpu_instrs/individual/11-op a,(hl).gb
deleted file mode 100644
index 0634b7fdd19bd62c16860ab1bad05760d6ac5965..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
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
HpAz^7^EI)n

diff --git a/tests/cpu_instrs/readme.txt b/tests/cpu_instrs/readme.txt
deleted file mode 100644
index 6f94955..0000000
--- a/tests/cpu_instrs/readme.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-Game Boy CPU Instruction Behavior Test
---------------------------------------
-This ROM tests the behavior of all CPU instructions except STOP and the
-11 illegal opcodes. The tests are fairly thorough, running instructions
-with boundary data and verifying both the result and that other
-registers are not modified. Instructions which perform the same
-operation on different registers are each tested just as thoroughly, in
-case an emulator implements each independently. Some sub-tests take half
-minute to complete.
-
-Failed instructions are listed as
-
-	[CB] opcode
-
-Some errors cannot of course be diagnosed properly, since the test
-framework itself relies on basic instruction behavior being correct.
-
-
-Internal operation
-------------------
-The main tests use a framework that runs each instruction in a loop,
-varying the register values on input and examining them on output.
-Rather than keep a table of correct values, it simply calculates a
-CRC-32 checksum of all the output, then compares this with the correct
-value. Instructions are divided into several groups, each with a
-different set of input values suited for their behavior; for example,
-the bit test instructions are fed $01, $02, $04 ... $40, $80, to ensure
-each bit is handled properly, while the arithmetic instructions are fed
-$01, $0F, $10, $7F, $FF, to exercise carry and half-carry. A few
-instructions require a custom test due to their uniqueness.
-
-
-Multi-ROM
----------
-In the main directory is a single ROM which runs all the tests. It
-prints a test's number, runs the test, then "ok" if it passes, otherwise
-a failure code. Once all tests have completed it either reports that all
-tests passed, or prints the number of failed tests. Finally, it makes
-several beeps. If a test fails, it can be run on its own by finding the
-corresponding ROM in individual/.
-
-Ths compact format on screen is to avoid having the results scroll off
-the top, so the test can be started and allowed to run without having to
-constantly monitor the display. 
-
-Currently there is no well-defined way for an emulator test rig to
-programatically find the result of the test; contact me if you're trying
-to do completely automated testing of your emulator. One simple approach
-is to take a screenshot after all tests have run, or even just a
-checksum of one, and compare this with a previous run.
-
-
-Failure codes
--------------
-Failed tests may print a failure code, and also short description of the
-problem. For more information about a failure code, look in the
-corresponding source file in source/; the point in the code where
-"set_test n" occurs is where that failure code will be generated.
-Failure code 1 is a general failure of the test; any further information
-will be printed.
-
-Note that once a sub-test fails, no further tests for that file are run.
-
-
-Console output
---------------
-Information is printed on screen in a way that needs only minimum LCD
-support, and won't hang if LCD output isn't supported at all.
-Specifically, while polling LY to wait for vblank, it will time out if
-it takes too long, so LY always reading back as the same value won't
-hang the test. It's also OK if scrolling isn't supported; in this case,
-text will appear starting at the top of the screen.
-
-Everything printed on screen is also sent to the game link port by
-writing the character to SB, then writing $81 to SC. This is useful for
-tests which print lots of information that scrolls off screen.
-
-
-Source code
------------
-Source code is included for all tests, in source/. It can be used to
-build the individual test ROMs. Code for the multi test isn't included
-due to the complexity of putting everything together.
-
-Code is written for the wla-dx assembler. To assemble a particular test,
-execute
-
-	wla -o "source_filename.s" test.o
-	wlalink linkfile test.gb
-
-Test code uses a common shell framework contained in common/.
-
-
-Internal framework operation
-----------------------------
-Tests use a common framework for setting things up, reporting results,
-and ending. All files first include "shell.inc", which sets up the ROM
-header and shell code, and includes other commonly-used modules.
-
-One oddity is that test code is first copied to internal RAM at $D000,
-then executed there. This allows self-modification, and ensures the code
-is executed the same way it is on my devcart, which doesn't have a
-rewritable ROM as most do.
-
-Some macros are used to simplify common tasks:
-
-	Macro               Behavior
-	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	wreg addr,data      Writes data to addr using LDH
-	lda  addr           Loads byte from addr into A using LDH
-	sta  addr           Stores A at addr using LDH
-	delay n             Delays n cycles, where NOP = 1 cycle
-	delay_msec n        Delays n milliseconds
-	set_test n,"Cause"  Sets failure code and optional string
-
-Routines and macros are documented where they are defined.
-
--- 
-Shay Green <gblargg@gmail.com>
diff --git a/tests/cpu_instrs/source/01-special.s b/tests/cpu_instrs/source/01-special.s
deleted file mode 100644
index 776d685..0000000
--- a/tests/cpu_instrs/source/01-special.s
+++ /dev/null
@@ -1,78 +0,0 @@
-; Tests instructions that don't fit template
-
-.include "shell.inc"
-
-main:
-     set_test 2,"JR negative"
-     ld   a,0
-     jp   jr_neg
-     inc  a
--    inc  a
-     inc  a
-     cp   2
-     jp   nz,test_failed
-     jp   +
-jr_neg:
-     jr   -
-+
-     
-     set_test 3,"JR positive"
-     ld   a,0
-     jr   +
-     inc  a
-+    inc  a
-     inc  a
-     cp   2
-     jp   nz,test_failed
-     
-     
-     set_test 4,"LD PC,HL"
-     ld   hl,+
-     ld   a,0
-     ld   pc,hl
-     inc  a
-+    inc  a
-     inc  a
-     cp   2
-     jp   nz,test_failed
-     
-
-     set_test 5,"POP AF"
-     ld   bc,$1200
--    push bc
-     pop  af
-     push af
-     pop  de
-     ld   a,c
-     and  $F0
-     cp   e
-     jp   nz,test_failed
-     inc  b
-     inc  c
-     jr   nz,-
-     
-     
-     set_test 6,"DAA"
-     ; Test all combinations of A and flags (256*16 total)
-     ld   de,0
--    push de
-     pop  af
-     daa
-     
-     push af
-     call update_crc
-     pop  hl
-     ld   a,l
-     call update_crc
-     
-     inc  d
-     jr   nz,-
-     
-     ld   a,e
-     add  $10
-     ld   e,a
-     jr   nz,-
-     
-     check_crc $6A9F8D8A
-     
-     jp   tests_passed
diff --git a/tests/cpu_instrs/source/02-interrupts.s b/tests/cpu_instrs/source/02-interrupts.s
deleted file mode 100644
index de18b34..0000000
--- a/tests/cpu_instrs/source/02-interrupts.s
+++ /dev/null
@@ -1,73 +0,0 @@
-; Tests DI, EI, and HALT (STOP proved untestable)
-
-.include "shell.inc"
-
-main:
-     wreg IE,$04
-     
-     set_test 2,"EI"
-     ei
-     ld   bc,0
-     push bc
-     pop  bc
-     inc  b
-     wreg IF,$04
-interrupt_addr:
-     dec  b
-     jp   nz,test_failed
-     ld   hl,sp-2
-     ldi  a,(hl)
-     cp   <interrupt_addr
-     jp   nz,test_failed
-     ld   a,(hl)
-     cp   >interrupt_addr
-     jp   nz,test_failed
-     lda  IF
-     and  $04
-     jp   nz,test_failed
-     
-     set_test 3,"DI"
-     di
-     ld   bc,0
-     push bc
-     pop  bc
-     wreg IF,$04
-     ld   hl,sp-2
-     ldi  a,(hl)
-     or   (hl)
-     jp   nz,test_failed
-     lda  IF
-     and  $04
-     jp   z,test_failed
-     
-     set_test 4,"Timer doesn't work"
-     wreg TAC,$05
-     wreg TIMA,0
-     wreg IF,0
-     delay 500
-     lda  IF
-     delay 500
-     and  $04
-     jp   nz,test_failed
-     delay 500
-     lda  IF
-     and  $04
-     jp   z,test_failed
-     pop  af
-     
-     set_test 5,"HALT"
-     wreg TAC,$05
-     wreg TIMA,0
-     wreg IF,0
-     halt      ; timer interrupt will exit halt
-     nop       ; avoids DMG bug
-     lda  IF
-     and  $04
-     jp   z,test_failed
-     
-     jp   tests_passed
-
-.bank 0 slot 0
-.org $50
-     inc a
-     ret
diff --git a/tests/cpu_instrs/source/03-op sp,hl.s b/tests/cpu_instrs/source/03-op sp,hl.s
deleted file mode 100644
index 9531d51..0000000
--- a/tests/cpu_instrs/source/03-op sp,hl.s	
+++ /dev/null
@@ -1,102 +0,0 @@
-; Tests SP/HL instructions
-
-;.define PRINT_CHECKSUMS 1
-.include "shell.inc"
-.include "instr_test.s"
-
-instrs:
-     .byte $33,0,0     ; INC  SP
-     .byte $3B,0,0     ; DEC  SP
-     .byte $39,0,0     ; ADD  HL,SP
-     .byte $F9,0,0     ; LD   SP,HL
-     .byte $E8,$01,0   ; ADD  SP,1
-     .byte $E8,$FF,0   ; ADD  SP,-1
-     .byte $F8,$01,0   ; LD   HL,SP+1
-     .byte $F8,$FF,0   ; LD   HL,SP-1
-instrs_end:
-
-test_instr:
-     ; C = flags register
-     ld   c,$00
-     call test
-     ld   c,$F0
-     call test
-     ret
-
-test:
-     ; Go through each value for HL
-     ld   hl,values
-hl_loop:
-     ld   e,(hl)
-     inc  hl
-     ld   d,(hl)
-     inc  hl
-     push hl
-     
-     ; Go through each value for SP
-     ld   hl,values
-values_loop:
-     push bc
-     push de
-     push hl
-     
-     push bc
-     pop  af
-     
-     ; Switch stack
-     ld   (temp),sp
-     ld   a,(hl+)
-     ld   h,(hl)
-     ld   l,a
-;    call print_regs
-     ld   sp,hl
-     
-     ; Set registers
-     ld   h,d
-     ld   l,e
-     ld   a,$12
-     ld   bc,$5691
-     ld   de,$9ABC
-     
-     jp   instr
-instr_done:
-     ; Save new SP and switch to yet another stack
-     ld   (temp+2),sp
-     ld   sp,$DF70
-     
-     call checksum_af_bc_de_hl
-     
-     ; Checksum SP
-     ld   a,(temp+2)
-     call update_crc_fast
-     ld   a,(temp+3)
-     call update_crc_fast
-     
-     ldsp temp
-     
-     pop  hl
-     pop  de
-     pop  bc
-     inc  hl
-     inc  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,values_loop
-     
-     pop  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,hl_loop
-     
-     ret
-
-values:
-     .word $0000,$0001,$000F,$0010,$001F,$007F,$0080,$00FF
-     .word $0100,$0F00,$1F00,$1000,$7FFF,$8000,$FFFF
-values_end:
-     .word $0000,$0001,$000F,$0010,$001F,$007F,$0080,$00FF
-     .word $0100,$0F00,$1F00,$1000,$7FFF,$8000,$FFFF
-
-checksums:
-     .byte $BC,$F4,$CD,$8C,$C7,$5E,$89,$E5,$36,$65,$21,$55,$D6,$6A,$2A,$FF
-     .byte $EB,$34,$37,$B9,$08,$5F,$22,$13,$B6,$2A,$37,$C3,$72,$43,$5C,$4D
diff --git a/tests/cpu_instrs/source/04-op r,imm.s b/tests/cpu_instrs/source/04-op r,imm.s
deleted file mode 100644
index 3f4ec59..0000000
--- a/tests/cpu_instrs/source/04-op r,imm.s	
+++ /dev/null
@@ -1,88 +0,0 @@
-; Tests immediate instructions
-
-;.define PRINT_CHECKSUMS 1
-.include "shell.inc"
-.include "instr_test.s"
-
-instrs:
-     .byte $36,0,0 ; LD   (HL),$00
-     .byte $06,0,0 ; LD   B,$00
-     .byte $0E,0,0 ; LD   C,$00
-     .byte $16,0,0 ; LD   D,$00
-     .byte $1E,0,0 ; LD   E,$00
-     .byte $26,0,0 ; LD   H,$00
-     .byte $2E,0,0 ; LD   L,$00
-     .byte $3E,0,0 ; LD   A,$00
-     .byte $F6,0,0 ; OR   $00
-     .byte $FE,0,0 ; CP   $00
-     .byte $C6,0,0 ; ADD  $00
-     .byte $CE,0,0 ; ADC  $00
-     .byte $D6,0,0 ; SUB  $00
-     .byte $DE,0,0 ; SBC  $00
-     .byte $E6,0,0 ; AND  $00
-     .byte $EE,0,0 ; XOR  $00
-instrs_end:    
-     
-test_instr:
-     ld   c,$00
-     call test
-     ld   c,$10
-     call test
-     ld   c,$E0
-     call test
-     ld   c,$F0
-     call test
-     ret
-     
-test:
-     ; Go through each value for A
-     ld   hl,values
-a_loop:
-     ld   b,(hl)
-     push hl
-     
-     ; Go through each value for immediate data
-     ld   hl,values
-values_loop:
-     push bc
-     push hl
-     
-     ; Set registers
-     push bc
-     ld   a,(hl)
-     ld   (instr+1),a
-     ld   bc,$1234
-     ld   de,$5678
-     ld   hl,rp_temp
-     pop  af
-     
-;    call print_regs
-     jp   instr
-instr_done:
-     
-     ; Checksum registers and (hl)
-     call checksum_af_bc_de_hl
-     ld   a,(rp_temp)
-     call update_crc_fast
-     
-     pop  hl
-     pop  bc
-     inc  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,values_loop
-     
-     pop  hl
-     inc  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,a_loop
-     
-     ret
-
-values:
-     .byte $00,$01,$0F,$10,$1F,$7F,$80,$F0,$FF
-values_end:
-
-checksums:
-     .byte $7F,$7F,$05,$B7,$85,$82,$94,$B6,$D8,$0A,$D6,$F5,$44,$8C,$37,$2A,$FB,$46,$05,$FA,$BD,$2F,$9E,$C1,$5A,$56,$2A,$DA,$D0,$EE,$14,$BA,$EA,$42,$36,$D2,$87,$28,$AB,$30,$4D,$A2,$63,$C6,$34,$4E,$55,$08,$9B,$1C,$97,$0E,$49,$F8,$73,$D4,$86,$C7,$DC,$C6,$03,$BF,$43,$21,
diff --git a/tests/cpu_instrs/source/05-op rp.s b/tests/cpu_instrs/source/05-op rp.s
deleted file mode 100644
index ed4e204..0000000
--- a/tests/cpu_instrs/source/05-op rp.s	
+++ /dev/null
@@ -1,98 +0,0 @@
-; Tests BC/DE/HL arithmetic
-
-;.define PRINT_CHECKSUMS 1
-.include "shell.inc"
-.include "instr_test.s"
-     
-instrs:
-     .byte $0B,0,0     ; DEC  BC
-     .byte $1B,0,0     ; DEC  DE
-     .byte $2B,0,0     ; DEC  HL
-     .byte $03,0,0     ; INC  BC
-     .byte $13,0,0     ; INC  DE
-     .byte $23,0,0     ; INC  HL
-     .byte $09,0,0     ; ADD  HL,BC
-     .byte $19,0,0     ; ADD  HL,DE
-     .byte $29,0,0     ; ADD  HL,HL
-instrs_end:
-
-test_instr:
-     ld   c,$00
-     call test
-     ld   c,$10
-     call test
-     ld   c,$E0
-     call test
-     ld   c,$F0
-     call test
-     ret
-
-test:
-     ; Go through each value for HL
-     ld   hl,values
-hl_loop:
-     ld   e,(hl)
-     inc  hl
-     ld   d,(hl)
-     inc  hl
-     push hl
-     
-     ; Go through each value for BC, DE, A
-     ld   hl,values
-values_loop:
-     push bc
-     push de
-     push hl
-     
-     push de
-     push bc
-     
-     ; BC
-     ld   c,(hl)
-     inc  hl
-     ld   b,(hl)
-     inc  hl
-     
-     ; DE
-     ld   e,(hl)
-     inc  hl
-     ld   d,(hl)
-     inc  hl
-     
-     ; HL, AF
-     pop  af
-     ld   a,(hl)
-     pop  hl
-     
-;    call print_regs
-     jp   instr
-instr_done:
-     
-     ; Checksum registers
-     call checksum_af_bc_de_hl
-     
-     pop  hl
-     pop  de
-     pop  bc
-     inc  hl
-     inc  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,values_loop
-     
-     pop  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,hl_loop
-     
-     ret
-
-values:
-     .word $0000,$0001,$000F,$0010,$001F,$007F,$0080,$00FF
-     .word $0100,$0F00,$1F00,$1000,$7FFF,$8000,$FFFF
-values_end:
-     .word $0000,$0001,$000F,$0010,$001F,$007F,$0080,$00FF
-     .word $0100,$0F00,$1F00,$1000,$7FFF,$8000,$FFFF
-
-checksums:
-     .byte $C0,$A1,$36,$A3,$BE,$15,$B8,$2B,$9F,$93,$C6,$C2,$86,$C0,$07,$81,$0F,$75,$35,$38,$6B,$C7,$0A,$1B,$06,$68,$4B,$42,$64,$B4,$8C,$18,$FB,$6C,$31,$94,
diff --git a/tests/cpu_instrs/source/06-ld r,r.s b/tests/cpu_instrs/source/06-ld r,r.s
deleted file mode 100644
index 49668c1..0000000
--- a/tests/cpu_instrs/source/06-ld r,r.s	
+++ /dev/null
@@ -1,115 +0,0 @@
-; Tests LD r,r ($40-$7F)
-
-;.define PRINT_CHECKSUMS 1
-.include "shell.inc"
-.include "instr_test.s"
-
-instrs:
-     .byte $40,0,0 ; LD   B,B
-     .byte $41,0,0 ; LD   B,C
-     .byte $42,0,0 ; LD   B,D
-     .byte $43,0,0 ; LD   B,E
-     .byte $44,0,0 ; LD   B,H
-     .byte $45,0,0 ; LD   B,L
-     .byte $46,0,0 ; LD   B,(HL)
-     .byte $47,0,0 ; LD   B,A
-     
-     .byte $48,0,0 ; LD   C,B
-     .byte $49,0,0 ; LD   C,C
-     .byte $4A,0,0 ; LD   C,D
-     .byte $4B,0,0 ; LD   C,E
-     .byte $4C,0,0 ; LD   C,H
-     .byte $4D,0,0 ; LD   C,L
-     .byte $4E,0,0 ; LD   C,(HL)
-     .byte $4F,0,0 ; LD   C,A
-     
-     .byte $50,0,0 ; LD   D,B
-     .byte $51,0,0 ; LD   D,C
-     .byte $52,0,0 ; LD   D,D
-     .byte $53,0,0 ; LD   D,E
-     .byte $54,0,0 ; LD   D,H
-     .byte $55,0,0 ; LD   D,L
-     .byte $56,0,0 ; LD   D,(HL)
-     .byte $57,0,0 ; LD   D,A
-     
-     .byte $58,0,0 ; LD   E,B
-     .byte $59,0,0 ; LD   E,C
-     .byte $5A,0,0 ; LD   E,D
-     .byte $5B,0,0 ; LD   E,E
-     .byte $5C,0,0 ; LD   E,H
-     .byte $5D,0,0 ; LD   E,L
-     .byte $5E,0,0 ; LD   E,(HL)
-     .byte $5F,0,0 ; LD   E,A
-     
-     .byte $60,0,0 ; LD   H,B
-     .byte $61,0,0 ; LD   H,C
-     .byte $62,0,0 ; LD   H,D
-     .byte $63,0,0 ; LD   H,E
-     .byte $64,0,0 ; LD   H,H
-     .byte $65,0,0 ; LD   H,L
-     .byte $66,0,0 ; LD   H,(HL)
-     .byte $67,0,0 ; LD   H,A
-     
-     .byte $68,0,0 ; LD   L,B
-     .byte $69,0,0 ; LD   L,C
-     .byte $6A,0,0 ; LD   L,D
-     .byte $6B,0,0 ; LD   L,E
-     .byte $6C,0,0 ; LD   L,H
-     .byte $6D,0,0 ; LD   L,L
-     .byte $6E,0,0 ; LD   L,(HL)
-     .byte $6F,0,0 ; LD   L,A
-     
-     .byte $70,0,0 ; LD   (HL),B
-     .byte $71,0,0 ; LD   (HL),C
-     .byte $72,0,0 ; LD   (HL),D
-     .byte $73,0,0 ; LD   (HL),E
-     .byte $74,0,0 ; LD   (HL),H
-     .byte $75,0,0 ; LD   (HL),L
-     .byte $77,0,0 ; LD   (HL),A
-     
-     .byte $78,0,0 ; LD   A,B
-     .byte $79,0,0 ; LD   A,C
-     .byte $7A,0,0 ; LD   A,D
-     .byte $7B,0,0 ; LD   A,E
-     .byte $7C,0,0 ; LD   A,H
-     .byte $7D,0,0 ; LD   A,L
-     .byte $7E,0,0 ; LD   A,(HL)
-     .byte $7F,0,0 ; LD   A,A
-instrs_end:
-
-test_instr:
-     ld   c,$00
-     call test
-     ld   c,$10
-     call test
-     ld   c,$E0
-     call test
-     ld   c,$F0
-     call test
-     ret
-     
-test:
-     ; Put different value in each register and (hl_temp)
-     ld   b,$BC
-     push bc
-     ld   a,$DE
-     ld   (rp_temp),a
-     ld   a,$12
-     ld   bc,$3456
-     ld   de,$789A
-     ld   hl,rp_temp ; (HL) points to RAM
-     pop  af
-     
-;    call print_regs
-     jp   instr
-instr_done:
-     
-     ; Checksum registers and (HL)
-     call checksum_af_bc_de_hl
-     ld   a,(rp_temp)
-     call update_crc_fast
-     
-     ret
-     
-checksums:
-     .byte $40,$3A,$AF,$06,$B6,$CB,$B2,$AB,$6F,$EF,$71,$9B,$75,$E3,$6C,$B9,$34,$FB,$26,$B7,$5A,$B9,$2F,$CE,$34,$FB,$26,$B7,$C2,$0A,$3B,$1A,$2A,$8A,$D6,$7C,$40,$3A,$AF,$06,$AF,$0A,$74,$70,$19,$A9,$6E,$6F,$11,$DA,$FE,$FE,$18,$10,$04,$2B,$11,$DA,$FE,$FE,$7B,$6A,$87,$84,$8B,$87,$34,$12,$00,$45,$DE,$01,$40,$3A,$AF,$06,$93,$E2,$8F,$C6,$DD,$7D,$90,$32,$FF,$90,$1B,$A8,$DD,$7D,$90,$32,$56,$BF,$7A,$21,$23,$C0,$FA,$06,$3B,$1D,$A0,$80,$3F,$44,$1B,$9C,$40,$3A,$AF,$06,$56,$25,$85,$CD,$D7,$B1,$DB,$F9,$56,$25,$85,$CD,$4E,$F8,$DF,$4B,$F0,$C3,$F9,$18,$20,$0F,$F6,$91,$71,$69,$CE,$46,$F0,$A0,$03,$4D,$40,$3A,$AF,$06,$29,$47,$E2,$36,$40,$3A,$AF,$06,$90,$F6,$A0,$8F,$3D,$62,$26,$A9,$A4,$52,$C1,$75,$45,$ED,$75,$40,$8A,$4D,$63,$56,$AF,$BA,$2D,$FE,$40,$3A,$AF,$06,$AF,$BA,$2D,$FE,$36,$8A,$CA,$22,$34,$8D,$C2,$65,$1A,$DB,$FF,$54,$32,$C0,$E8,$55,$ED,$4A,$87,$2F,$40,$3A,$AF,$06,$9D,$BC,$81,$E6,$6E,$6C,$92,$37,$B1,$EC,$C3,$29,$1D,$C5,$9F,$A1,$59,$6F,$66,$CD,$B4,$FB,$FD,$74,$EC,$13,$F3,$8E,$70,$0C,$5F,$ED,$EC,$13,$F3,$8E,$40,$3A,$AF,$06,
diff --git a/tests/cpu_instrs/source/07-jr,jp,call,ret,rst.s b/tests/cpu_instrs/source/07-jr,jp,call,ret,rst.s
deleted file mode 100644
index e7c8b49..0000000
--- a/tests/cpu_instrs/source/07-jr,jp,call,ret,rst.s
+++ /dev/null
@@ -1,127 +0,0 @@
-; Tests branch instructions
-
-;.define PRINT_CHECKSUMS 1
-.include "shell.inc"
-.include "instr_test.s"
-
-instrs:
-     ;       JR cond,skip
-     ;       INC A
-     ; skip:
-     .byte $18,$01,$3C ; JR   *+3
-     .byte $20,$01,$3C ; JR   NZ,*+3
-     .byte $28,$01,$3C ; JR   Z,*+3
-     .byte $30,$01,$3C ; JR   NC,*+3
-     .byte $38,$01,$3C ; JR   C,*+3
-     
-     .byte $C2,<taken,>taken ; JP   NZ,taken
-     .byte $C3,<taken,>taken ; JP   taken
-     .byte $CA,<taken,>taken ; JP   Z,taken
-     .byte $D2,<taken,>taken ; JP   NC,taken
-     .byte $DA,<taken,>taken ; JP   C,taken
-
-     .byte $C4,<taken,>taken ; CALL NZ,taken
-     .byte $CC,<taken,>taken ; CALL Z,taken
-     .byte $CD,<taken,>taken ; CALL taken
-     .byte $D4,<taken,>taken ; CALL NC,taken
-     .byte $DC,<taken,>taken ; CALL C,taken
-     
-     ; RET cond
-     ; INC A
-     .byte $C0,$3C,0 ; RET  NZ
-     .byte $C8,$3C,0 ; RET  Z
-     .byte $C9,$3C,0 ; RET
-     .byte $D0,$3C,0 ; RET  NC
-     .byte $D8,$3C,0 ; RET  C
-     .byte $D9,$3C,0 ; RETI
-     
-     ; RST
-     ; can only easily test this one on devcart
-     .byte $C7,0,0 ; RST $00
-.ifndef BUILD_DEVCART
-     .byte $CF,0,0 ; RST $08
-     .byte $D7,0,0 ; RST $10
-     .byte $DF,0,0 ; RST $18
-     .byte $E7,0,0 ; RST $20
-     .byte $EF,0,0 ; RST $28
-     .byte $F7,0,0 ; RST $30
-     .byte $FF,0,0 ; RST $38
-.endif
-
-instrs_end:
-
-test_instr:
-     wreg IE,0 ; disable interrupts, since RETI does EI
-     
-     ; Go through all 16 combinations of flags
-     ld   bc,$1200
--    
-     ; Fill 4 bytes of new stack
-     ld   a,$12
-     ld   ($DF80-2),a
-     ld   a,$34
-     ld   ($DF80-3),a
-     ld   a,$56
-     ld   ($DF80-4),a
-     ld   a,$78
-     ld   ($DF80-5),a
-     
-     ; Set AF
-     push bc
-     pop  af
-     
-     ; Switch to new stack
-     ld   (temp),sp
-     ld   sp,$DF80
-     
-     ; Set return address
-     ld   de,instr+3
-     push de
-     
-     jp   instr
-instr_done:
-     inc  a
-taken:
-     di             ; RETI enables interrupts
-     
-     ; Save new SP and switch to yet another stack
-     ld   (temp+2),sp
-     ld   sp,$DF70
-     
-     ; Checksum A and SP
-     call update_crc_fast
-     ld   a,(temp+2)
-     call update_crc_fast
-     ld   a,(temp+3)
-     call update_crc_fast
-     
-     ; Checksum 4 bytes of stack
-     ld   a,($DF80-2)
-     call update_crc_fast
-     ld   a,($DF80-3)
-     call update_crc_fast
-     ld   a,($DF80-4)
-     call update_crc_fast
-     ld   a,($DF80-5)
-     call update_crc_fast
-     
-     ldsp temp
-     
-     ld   a,c
-     add  $10
-     ld   c,a
-     jr   nz,-
-     
-     ret
-
-checksums:
-     .byte $EC,$A4,$94,$79,$C4,$00,$96,$2C,$C4,$64,$90,$33,$77,$C7,$0A,$D4
-     .byte $77,$A3,$0C,$CB,$79,$E7,$7E,$AE,$DA,$DC,$03,$F7,$4F,$9F,$E9,$20
-     .byte $72,$12,$DA,$01,$44,$6A,$4D,$8F,$D1,$79,$30,$4C,$AA,$37,$F2,$6A
-     .byte $97,$EA,$56,$5F,$32,$28,$C7,$D1,$49,$66,$05,$F7,$80,$0F,$BA,$8E
-     .byte $41,$E2,$A4,$9A,$2D,$2D,$8C,$72,$A5,$13,$76,$A8,$64,$FE,$68,$BC
-     .byte $2D,$2D,$8C,$72,$50,$96,$24,$27,$50,$96,$24,$27,$50,$96,$24,$27
-     .byte $50,$96,$24,$27,$50,$96,$24,$27,$50,$96,$24,$27,$50,$96,$24,$27
-     .byte $50,$96,$24,$27
-
-.include "multi_custom.s"
diff --git a/tests/cpu_instrs/source/08-misc instrs.s b/tests/cpu_instrs/source/08-misc instrs.s
deleted file mode 100644
index 5c11c8e..0000000
--- a/tests/cpu_instrs/source/08-misc instrs.s	
+++ /dev/null
@@ -1,110 +0,0 @@
-; Tests miscellaneous instructions
-
-;.define PRINT_CHECKSUMS 1
-.include "shell.inc"
-.include "instr_test.s"
-
-instrs:
-     .byte $F0,$91,0   ; LDH  A,($91)
-     .byte $E0,$91,0   ; LDH  ($91),A
-     .byte $F2,$00,0   ; LDH  A,(C)
-     .byte $E2,$00,0   ; LDH  (C),A
-     .byte $FA,$91,$FF ; LD   A,($FF91)
-     .byte $EA,$91,$FF ; LD   ($FF91),A
-     .byte $08,$91,$FF ; LD   ($FF91),SP
-     .byte $01,$23,$01 ; LD   BC,$0123
-     .byte $11,$23,$01 ; LD   DE,$0123
-     .byte $21,$23,$01 ; LD   HL,$0123
-     .byte $31,$23,$01 ; LD   SP,$0123
-     .byte $F5,0,0     ; PUSH AF
-     .byte $C5,0,0     ; PUSH BC
-     .byte $D5,0,0     ; PUSH DE
-     .byte $E5,0,0     ; PUSH HL
-     .byte $F1,0,0     ; POP  AF
-     .byte $C1,0,0     ; POP  BC
-     .byte $D1,0,0     ; POP  DE
-     .byte $E1,0,0     ; POP  HL
-instrs_end:
-
-test_instr:
-     ; C = flags register
-     ld   c,$00
-     call test
-     ld   c,$10
-     call test
-     ld   c,$E0
-     call test
-     ld   c,$F0
-     call test
-     ret
-
-test:
-     ; Fill RAM
-     ld   a,$FE
-     ld   ($FF90),a
-     ld   a,$DC
-     ld   ($FF91),a
-     ld   a,$BA
-     ld   ($FF92),a
-     
-     ; Fill stack
-     ld   a,$13
-     ld   ($DF80),a
-     ld   a,$57
-     ld   ($DF80-1),a
-     ld   a,$9B
-     ld   ($DF80-2),a
-     ld   a,$DF
-     ld   ($DF80-3),a
-     
-     ; Set registers
-     ld   b,$12
-     push bc
-     ld   bc,$5691
-     ld   de,$9ABC
-     ld   hl,$DEF0
-     pop  af
-     
-     ; Switch stack
-     ld   (temp),sp
-     ld   sp,$DF80-2
-     
-     jp   instr
-instr_done:
-     ; Save new SP and switch to another stack
-     ld   (temp+2),sp
-     ld   sp,$DF70
-     
-     call checksum_af_bc_de_hl
-     
-     ; Checksum SP
-     ld   a,(temp+2)
-     call update_crc_fast
-     ld   a,(temp+3)
-     call update_crc_fast
-     
-     ; Checksum RAM
-     ld   a,($FF90)
-     call update_crc_fast
-     ld   a,($FF91)
-     call update_crc_fast
-     ld   a,($FF92)
-     call update_crc_fast
-     
-     ; Checksum stack
-     ld   a,($DF80)
-     call update_crc_fast
-     ld   a,($DF80-1)
-     call update_crc_fast
-     ld   a,($DF80-2)
-     call update_crc_fast
-     ld   a,($DF80-3)
-     call update_crc_fast
-     
-     ; Restore SP
-     ldsp temp
-     
-     ret
-
-checksums:
-     .byte $4D,$FF,$15,$97,$6D,$A7,$35,$65,$4D,$FF,$15,$97,$6D,$A7,$35,$65,$4D,$FF,$15,$97,$6D,$A7,$35,$65,$AD,$FA,$5E,$41,$D0,$78,$79,$C1,$AF,$66,$99,$34,$0D,$E1,$97,$99,$6F,$D0,$6F,$5D,$C3,$1F,$A3,$8A,$C2,$F1,$9C,$F3,$C1,$C3,$DC,$78,$C0,$2D,$E3,$01,$8F,$C4,$0F,$44,$95,$22,$6A,$39,$61,$C5,$AB,$55,$FB,$DF,$2C,$52,
diff --git a/tests/cpu_instrs/source/09-op r,r.s b/tests/cpu_instrs/source/09-op r,r.s
deleted file mode 100644
index 432c4e7..0000000
--- a/tests/cpu_instrs/source/09-op r,r.s	
+++ /dev/null
@@ -1,269 +0,0 @@
-; Tests most register instructions.
-; Takes 10 seconds.
-
-;.define PRINT_CHECKSUMS 1
-.include "shell.inc"
-.include "instr_test.s"
-
-instrs:
-     .byte $00,0,0 ; NOP
-     .byte $2F,0,0 ; CPL
-     .byte $37,0,0 ; SCF
-     .byte $3F,0,0 ; CCF
-     
-     .byte $B0,0,0 ; OR   B
-     .byte $B1,0,0 ; OR   C
-     .byte $B2,0,0 ; OR   D
-     .byte $B3,0,0 ; OR   E
-     .byte $B4,0,0 ; OR   H
-     .byte $B5,0,0 ; OR   L
-     .byte $B7,0,0 ; OR   A
-     
-     .byte $B8,0,0 ; CP   B
-     .byte $B9,0,0 ; CP   C
-     .byte $BA,0,0 ; CP   D
-     .byte $BB,0,0 ; CP   E
-     .byte $BC,0,0 ; CP   H
-     .byte $BD,0,0 ; CP   L
-     .byte $BF,0,0 ; CP   A
-     
-     .byte $80,0,0 ; ADD  B
-     .byte $81,0,0 ; ADD  C
-     .byte $82,0,0 ; ADD  D
-     .byte $83,0,0 ; ADD  E
-     .byte $84,0,0 ; ADD  H
-     .byte $85,0,0 ; ADD  L
-     .byte $87,0,0 ; ADD  A
-     
-     .byte $88,0,0 ; ADC  B
-     .byte $89,0,0 ; ADC  C
-     .byte $8A,0,0 ; ADC  D
-     .byte $8B,0,0 ; ADC  E
-     .byte $8C,0,0 ; ADC  H
-     .byte $8D,0,0 ; ADC  L
-     .byte $8F,0,0 ; ADC  A
-     
-     .byte $90,0,0 ; SUB  B
-     .byte $91,0,0 ; SUB  C
-     .byte $92,0,0 ; SUB  D
-     .byte $93,0,0 ; SUB  E
-     .byte $94,0,0 ; SUB  H
-     .byte $95,0,0 ; SUB  L
-     .byte $97,0,0 ; SUB  A
-     
-     .byte $98,0,0 ; SBC  B
-     .byte $99,0,0 ; SBC  C
-     .byte $9A,0,0 ; SBC  D
-     .byte $9B,0,0 ; SBC  E
-     .byte $9C,0,0 ; SBC  H
-     .byte $9D,0,0 ; SBC  L
-     .byte $9F,0,0 ; SBC  A
-     
-     .byte $A0,0,0 ; AND  B
-     .byte $A1,0,0 ; AND  C
-     .byte $A2,0,0 ; AND  D
-     .byte $A3,0,0 ; AND  E
-     .byte $A4,0,0 ; AND  H
-     .byte $A5,0,0 ; AND  L
-     .byte $A7,0,0 ; AND  A
-     
-     .byte $A8,0,0 ; XOR  B
-     .byte $A9,0,0 ; XOR  C
-     .byte $AA,0,0 ; XOR  D
-     .byte $AB,0,0 ; XOR  E
-     .byte $AC,0,0 ; XOR  H
-     .byte $AD,0,0 ; XOR  L
-     .byte $AF,0,0 ; XOR  A
-     
-     .byte $05,0,0 ; DEC  B
-     .byte $0D,0,0 ; DEC  C
-     .byte $15,0,0 ; DEC  D
-     .byte $1D,0,0 ; DEC  E
-     .byte $25,0,0 ; DEC  H
-     .byte $2D,0,0 ; DEC  L
-     .byte $3D,0,0 ; DEC  A
-     
-     .byte $04,0,0 ; INC  B
-     .byte $0C,0,0 ; INC  C
-     .byte $14,0,0 ; INC  D
-     .byte $1C,0,0 ; INC  E
-     .byte $24,0,0 ; INC  H
-     .byte $2C,0,0 ; INC  L
-     .byte $3C,0,0 ; INC  A
-     
-     .byte $07,0,0 ; RLCA
-     .byte $17,0,0 ; RLA
-     .byte $0F,0,0 ; RRCA
-     .byte $1F,0,0 ; RRA
-     
-     .byte $CB,$00,0 ; RLC  B
-     .byte $CB,$01,0 ; RLC  C
-     .byte $CB,$02,0 ; RLC  D
-     .byte $CB,$03,0 ; RLC  E
-     .byte $CB,$04,0 ; RLC  H
-     .byte $CB,$05,0 ; RLC  L
-     .byte $CB,$07,0 ; RLC  A
-     
-     .byte $CB,$08,0 ; RRC  B
-     .byte $CB,$09,0 ; RRC  C
-     .byte $CB,$0A,0 ; RRC  D
-     .byte $CB,$0B,0 ; RRC  E
-     .byte $CB,$0C,0 ; RRC  H
-     .byte $CB,$0D,0 ; RRC  L
-     .byte $CB,$0F,0 ; RRC  A
-     
-     .byte $CB,$10,0 ; RL   B
-     .byte $CB,$11,0 ; RL   C
-     .byte $CB,$12,0 ; RL   D
-     .byte $CB,$13,0 ; RL   E
-     .byte $CB,$14,0 ; RL   H
-     .byte $CB,$15,0 ; RL   L
-     .byte $CB,$17,0 ; RL   A
-     
-     .byte $CB,$18,0 ; RR   B
-     .byte $CB,$19,0 ; RR   C
-     .byte $CB,$1A,0 ; RR   D
-     .byte $CB,$1B,0 ; RR   E
-     .byte $CB,$1C,0 ; RR   H
-     .byte $CB,$1D,0 ; RR   L
-     .byte $CB,$1F,0 ; RR   A
-     
-     .byte $CB,$20,0 ; SLA  B
-     .byte $CB,$21,0 ; SLA  C
-     .byte $CB,$22,0 ; SLA  D
-     .byte $CB,$23,0 ; SLA  E
-     .byte $CB,$24,0 ; SLA  H
-     .byte $CB,$25,0 ; SLA  L
-     .byte $CB,$27,0 ; SLA  A
-     
-     .byte $CB,$28,0 ; SRA  B
-     .byte $CB,$29,0 ; SRA  C
-     .byte $CB,$2A,0 ; SRA  D
-     .byte $CB,$2B,0 ; SRA  E
-     .byte $CB,$2C,0 ; SRA  H
-     .byte $CB,$2D,0 ; SRA  L
-     .byte $CB,$2F,0 ; SRA  A
-     
-     .byte $CB,$30,0 ; SWAP B
-     .byte $CB,$31,0 ; SWAP C
-     .byte $CB,$32,0 ; SWAP D
-     .byte $CB,$33,0 ; SWAP E
-     .byte $CB,$34,0 ; SWAP H
-     .byte $CB,$35,0 ; SWAP L
-     .byte $CB,$37,0 ; SWAP A
-     
-     .byte $CB,$38,0 ; SRL  B
-     .byte $CB,$39,0 ; SRL  C
-     .byte $CB,$3A,0 ; SRL  D
-     .byte $CB,$3B,0 ; SRL  E
-     .byte $CB,$3C,0 ; SRL  H
-     .byte $CB,$3D,0 ; SRL  L
-     .byte $CB,$3F,0 ; SRL  A
-instrs_end:    
-
-test_instr:
-     ld   c,$00
-     call test
-     ld   c,$F0
-     call test
-     ret
-     
-test:
-     ; Go through each value for A
-     ld   hl,values
-a_loop:
-     ld   b,(hl)
-     push hl
-     
-     ; Go through each value for other registers
-     ld   hl,values
-values_loop:
-     push bc
-     push hl
-     
-     push bc
-     
-     ; BC
-     ld   a,(hl+)
-     ld   b,a
-     ld   a,(hl+)
-     ld   c,a
-     
-     ; HL
-     ld   a,(hl+)
-     ld   d,a
-     ld   a,(hl+)
-     ld   e,a
-     push de
-     
-     ; DE
-     ld   a,(hl+)
-     ld   d,a
-     ld   a,(hl+)
-     ld   e,a
-     
-     pop  hl
-     pop  af
-     
-;    call print_regs
-     jp   instr
-instr_done:
-     
-     ; Checksum registers
-     call checksum_af_bc_de_hl
-     
-     pop  hl
-     pop  bc
-     inc  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,values_loop
-     
-     pop  hl
-     inc  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,a_loop
-     
-     ret
-
-values:
-     .byte $00,$01,$0F,$10,$1F,$7F,$80,$F0,$FF
-values_end:
-     .byte $00,$01,$0F,$10,$1F,$7F,$80,$F0,$FF
-     
-checksums:
-     .byte $7C,$55,$BD,$05,$BA,$C7,$AC,$D1,$74,$6D,$82,$4A,$0F,$06,$2A,$C5
-     .byte $FA,$97,$9B,$9D,$C3,$32,$A0,$78,$00,$C1,$9F,$69,$C0,$D1,$C2,$A1
-     .byte $55,$0D,$3F,$C8,$09,$7D,$97,$92,$CE,$66,$30,$56,$95,$F3,$01,$A1
-     .byte $5B,$97,$54,$4C,$56,$FC,$A0,$89,$42,$F8,$7B,$2A,$E6,$7C,$03,$40
-     .byte $45,$60,$C5,$A8,$B7,$BF,$B0,$EF,$A0,$7A,$1B,$4F,$FB,$22,$B4,$33
-     .byte $06,$3D,$B5,$C7,$3C,$A4,$D5,$23,$C1,$BE,$75,$8B,$E0,$9B,$98,$BB
-     .byte $0E,$75,$D9,$E6,$82,$A7,$E2,$66,$CD,$78,$4F,$E8,$8E,$D4,$2D,$3E
-     .byte $88,$5C,$58,$C7,$F9,$20,$5F,$B9,$A8,$E4,$CA,$5E,$C8,$DB,$88,$94
-     .byte $A3,$0D,$87,$60,$8B,$BA,$2B,$27,$41,$88,$83,$B1,$0A,$41,$9E,$D6
-     .byte $98,$8D,$19,$B7,$13,$C6,$D5,$BF,$83,$CE,$74,$9F,$00,$34,$07,$5E
-     .byte $F0,$E1,$1A,$68,$8F,$BA,$85,$A7,$A0,$46,$06,$A5,$75,$F9,$83,$48
-     .byte $12,$EF,$1B,$03,$C8,$FB,$79,$EA,$9B,$00,$6C,$A9,$0D,$5E,$CB,$57
-     .byte $41,$1B,$4B,$0C,$B2,$08,$D8,$E3,$43,$07,$E1,$93,$34,$73,$23,$C9
-     .byte $18,$2F,$38,$F9,$D1,$3B,$AB,$5A,$BF,$C6,$F8,$03,$50,$0C,$A4,$32
-     .byte $6B,$06,$7E,$FE,$ED,$8B,$D4,$15,$29,$46,$6D,$24,$6E,$5B,$15,$1A
-     .byte $32,$AE,$87,$B0,$DC,$20,$AC,$4B,$2B,$63,$60,$C7,$C1,$92,$75,$AA
-     .byte $6F,$CA,$17,$53,$5A,$C5,$78,$EA,$61,$01,$10,$83,$DD,$08,$D8,$78
-     .byte $CA,$0B,$F5,$1F,$92,$55,$08,$01,$7F,$EA,$CD,$9B,$2A,$AA,$73,$17
-     .byte $E0,$9F,$D0,$BA,$E7,$73,$72,$3D,$B7,$95,$2F,$3B,$A7,$78,$50,$36
-     .byte $81,$04,$5B,$9E,$9A,$DE,$A4,$DD,$21,$B2,$9B,$36,$9F,$D7,$C8,$32
-     .byte $48,$0E,$FC,$E5,$55,$C3,$53,$75,$A4,$ED,$A9,$E0,$9E,$78,$A7,$1D
-     .byte $B8,$F4,$7C,$D6,$90,$2A,$03,$87,$81,$D8,$D5,$90,$63,$02,$C4,$52
-     .byte $C2,$BE,$85,$B3,$32,$9A,$9E,$2D,$E3,$FB,$22,$47,$8E,$65,$08,$73
-     .byte $72,$5A,$73,$95,$ED,$EC,$59,$9D,$C8,$67,$68,$F1,$4B,$ED,$41,$D5
-     .byte $68,$39,$75,$F3,$FC,$09,$EF,$0D,$20,$2B,$43,$A3,$69,$AA,$89,$4F
-     .byte $84,$87,$7B,$58,$42,$0A,$56,$EF,$1B,$0E,$19,$CA,$6F,$1B,$F9,$17
-     .byte $EA,$B6,$4C,$B2,$1A,$C4,$C0,$B1,$E2,$B2,$45,$4E,$91,$0A,$8D,$AE
-     .byte $17,$31,$55,$A3,$1B,$69,$72,$D8,$03,$E9,$55,$8D,$87,$27,$36,$63
-     .byte $E6,$85,$12,$D1,$F2,$32,$97,$4D,$B5,$FA,$08,$A9,$97,$2A,$5A,$C2
-     .byte $FD,$2D,$A4,$27,$57,$7C,$EC,$BD,$CC,$67,$19,$21,$46,$D4,$CD,$D6
-     .byte $CB,$55,$D4,$E2,$9E,$F3,$32,$2E,$AA,$F8,$BB,$B3,$F6,$3A,$CC,$08
-     .byte $64,$8B,$C2,$5F,$58,$66,$AF,$67,$B3,$44,$2C,$66,$72,$E7,$3B,$3F
-     .byte $5B,$87,$0C,$17,$58,$E2,$B4,$A0,$70,$18,$81,$E6,$42,$56,$12,$CE
-     .byte $BB,$13,$46,$3C,$BE,$5A,$FB,$53
diff --git a/tests/cpu_instrs/source/10-bit ops.s b/tests/cpu_instrs/source/10-bit ops.s
deleted file mode 100644
index e58aa3d..0000000
--- a/tests/cpu_instrs/source/10-bit ops.s	
+++ /dev/null
@@ -1,315 +0,0 @@
-; Tests most register instructions.
-; Takes 15 seconds.
-
-;.define PRINT_CHECKSUMS 1
-.include "shell.inc"
-.include "instr_test.s"
-
-instrs:
-     .byte $CB,$40,0 ; BIT  0,B
-     .byte $CB,$41,0 ; BIT  0,C
-     .byte $CB,$42,0 ; BIT  0,D
-     .byte $CB,$43,0 ; BIT  0,E
-     .byte $CB,$44,0 ; BIT  0,H
-     .byte $CB,$45,0 ; BIT  0,L
-     .byte $CB,$47,0 ; BIT  0,A
-     
-     .byte $CB,$48,0 ; BIT  1,B
-     .byte $CB,$49,0 ; BIT  1,C
-     .byte $CB,$4A,0 ; BIT  1,D
-     .byte $CB,$4B,0 ; BIT  1,E
-     .byte $CB,$4C,0 ; BIT  1,H
-     .byte $CB,$4D,0 ; BIT  1,L
-     .byte $CB,$4F,0 ; BIT  1,A
-     
-     .byte $CB,$50,0 ; BIT  2,B
-     .byte $CB,$51,0 ; BIT  2,C
-     .byte $CB,$52,0 ; BIT  2,D
-     .byte $CB,$53,0 ; BIT  2,E
-     .byte $CB,$54,0 ; BIT  2,H
-     .byte $CB,$55,0 ; BIT  2,L
-     .byte $CB,$57,0 ; BIT  2,A
-     
-     .byte $CB,$58,0 ; BIT  3,B
-     .byte $CB,$59,0 ; BIT  3,C
-     .byte $CB,$5A,0 ; BIT  3,D
-     .byte $CB,$5B,0 ; BIT  3,E
-     .byte $CB,$5C,0 ; BIT  3,H
-     .byte $CB,$5D,0 ; BIT  3,L
-     .byte $CB,$5F,0 ; BIT  3,A
-     
-     .byte $CB,$60,0 ; BIT  4,B
-     .byte $CB,$61,0 ; BIT  4,C
-     .byte $CB,$62,0 ; BIT  4,D
-     .byte $CB,$63,0 ; BIT  4,E
-     .byte $CB,$64,0 ; BIT  4,H
-     .byte $CB,$65,0 ; BIT  4,L
-     .byte $CB,$67,0 ; BIT  4,A
-     
-     .byte $CB,$68,0 ; BIT  5,B
-     .byte $CB,$69,0 ; BIT  5,C
-     .byte $CB,$6A,0 ; BIT  5,D
-     .byte $CB,$6B,0 ; BIT  5,E
-     .byte $CB,$6C,0 ; BIT  5,H
-     .byte $CB,$6D,0 ; BIT  5,L
-     .byte $CB,$6F,0 ; BIT  5,A
-     
-     .byte $CB,$70,0 ; BIT  6,B
-     .byte $CB,$71,0 ; BIT  6,C
-     .byte $CB,$72,0 ; BIT  6,D
-     .byte $CB,$73,0 ; BIT  6,E
-     .byte $CB,$74,0 ; BIT  6,H
-     .byte $CB,$75,0 ; BIT  6,L
-     .byte $CB,$77,0 ; BIT  6,A
-     
-     .byte $CB,$78,0 ; BIT  7,B
-     .byte $CB,$79,0 ; BIT  7,C
-     .byte $CB,$7A,0 ; BIT  7,D
-     .byte $CB,$7B,0 ; BIT  7,E
-     .byte $CB,$7C,0 ; BIT  7,H
-     .byte $CB,$7D,0 ; BIT  7,L
-     .byte $CB,$7F,0 ; BIT  7,A
-     
-     .byte $CB,$80,0 ; RES  0,B
-     .byte $CB,$81,0 ; RES  0,C
-     .byte $CB,$82,0 ; RES  0,D
-     .byte $CB,$83,0 ; RES  0,E
-     .byte $CB,$84,0 ; RES  0,H
-     .byte $CB,$85,0 ; RES  0,L
-     .byte $CB,$87,0 ; RES  0,A
-     
-     .byte $CB,$88,0 ; RES  1,B
-     .byte $CB,$89,0 ; RES  1,C
-     .byte $CB,$8A,0 ; RES  1,D
-     .byte $CB,$8B,0 ; RES  1,E
-     .byte $CB,$8C,0 ; RES  1,H
-     .byte $CB,$8D,0 ; RES  1,L
-     .byte $CB,$8F,0 ; RES  1,A
-     
-     .byte $CB,$90,0 ; RES  2,B
-     .byte $CB,$91,0 ; RES  2,C
-     .byte $CB,$92,0 ; RES  2,D
-     .byte $CB,$93,0 ; RES  2,E
-     .byte $CB,$94,0 ; RES  2,H
-     .byte $CB,$95,0 ; RES  2,L
-     .byte $CB,$97,0 ; RES  2,A
-     
-     .byte $CB,$98,0 ; RES  3,B
-     .byte $CB,$99,0 ; RES  3,C
-     .byte $CB,$9A,0 ; RES  3,D
-     .byte $CB,$9B,0 ; RES  3,E
-     .byte $CB,$9C,0 ; RES  3,H
-     .byte $CB,$9D,0 ; RES  3,L
-     .byte $CB,$9F,0 ; RES  3,A
-     
-     .byte $CB,$A0,0 ; RES  4,B
-     .byte $CB,$A1,0 ; RES  4,C
-     .byte $CB,$A2,0 ; RES  4,D
-     .byte $CB,$A3,0 ; RES  4,E
-     .byte $CB,$A4,0 ; RES  4,H
-     .byte $CB,$A5,0 ; RES  4,L
-     .byte $CB,$A7,0 ; RES  4,A
-     
-     .byte $CB,$A8,0 ; RES  5,B
-     .byte $CB,$A9,0 ; RES  5,C
-     .byte $CB,$AA,0 ; RES  5,D
-     .byte $CB,$AB,0 ; RES  5,E
-     .byte $CB,$AC,0 ; RES  5,H
-     .byte $CB,$AD,0 ; RES  5,L
-     .byte $CB,$AF,0 ; RES  5,A
-     
-     .byte $CB,$B0,0 ; RES  6,B
-     .byte $CB,$B1,0 ; RES  6,C
-     .byte $CB,$B2,0 ; RES  6,D
-     .byte $CB,$B3,0 ; RES  6,E
-     .byte $CB,$B4,0 ; RES  6,H
-     .byte $CB,$B5,0 ; RES  6,L
-     .byte $CB,$B7,0 ; RES  6,A
-     
-     .byte $CB,$B8,0 ; RES  7,B
-     .byte $CB,$B9,0 ; RES  7,C
-     .byte $CB,$BA,0 ; RES  7,D
-     .byte $CB,$BB,0 ; RES  7,E
-     .byte $CB,$BC,0 ; RES  7,H
-     .byte $CB,$BD,0 ; RES  7,L
-     .byte $CB,$BF,0 ; RES  7,A
-     
-     .byte $CB,$C0,0 ; SET  0,B
-     .byte $CB,$C1,0 ; SET  0,C
-     .byte $CB,$C2,0 ; SET  0,D
-     .byte $CB,$C3,0 ; SET  0,E
-     .byte $CB,$C4,0 ; SET  0,H
-     .byte $CB,$C5,0 ; SET  0,L
-     .byte $CB,$C7,0 ; SET  0,A
-     
-     .byte $CB,$C8,0 ; SET  1,B
-     .byte $CB,$C9,0 ; SET  1,C
-     .byte $CB,$CA,0 ; SET  1,D
-     .byte $CB,$CB,0 ; SET  1,E
-     .byte $CB,$CC,0 ; SET  1,H
-     .byte $CB,$CD,0 ; SET  1,L
-     .byte $CB,$CF,0 ; SET  1,A
-     
-     .byte $CB,$D0,0 ; SET  2,B
-     .byte $CB,$D1,0 ; SET  2,C
-     .byte $CB,$D2,0 ; SET  2,D
-     .byte $CB,$D3,0 ; SET  2,E
-     .byte $CB,$D4,0 ; SET  2,H
-     .byte $CB,$D5,0 ; SET  2,L
-     .byte $CB,$D7,0 ; SET  2,A
-     
-     .byte $CB,$D8,0 ; SET  3,B
-     .byte $CB,$D9,0 ; SET  3,C
-     .byte $CB,$DA,0 ; SET  3,D
-     .byte $CB,$DB,0 ; SET  3,E
-     .byte $CB,$DC,0 ; SET  3,H
-     .byte $CB,$DD,0 ; SET  3,L
-     .byte $CB,$DF,0 ; SET  3,A
-     
-     .byte $CB,$E0,0 ; SET  4,B
-     .byte $CB,$E1,0 ; SET  4,C
-     .byte $CB,$E2,0 ; SET  4,D
-     .byte $CB,$E3,0 ; SET  4,E
-     .byte $CB,$E4,0 ; SET  4,H
-     .byte $CB,$E5,0 ; SET  4,L
-     .byte $CB,$E7,0 ; SET  4,A
-     
-     .byte $CB,$E8,0 ; SET  5,B
-     .byte $CB,$E9,0 ; SET  5,C
-     .byte $CB,$EA,0 ; SET  5,D
-     .byte $CB,$EB,0 ; SET  5,E
-     .byte $CB,$EC,0 ; SET  5,H
-     .byte $CB,$ED,0 ; SET  5,L
-     .byte $CB,$EF,0 ; SET  5,A
-     
-     .byte $CB,$F0,0 ; SET  6,B
-     .byte $CB,$F1,0 ; SET  6,C
-     .byte $CB,$F2,0 ; SET  6,D
-     .byte $CB,$F3,0 ; SET  6,E
-     .byte $CB,$F4,0 ; SET  6,H
-     .byte $CB,$F5,0 ; SET  6,L
-     .byte $CB,$F7,0 ; SET  6,A
-     
-     .byte $CB,$F8,0 ; SET  7,B
-     .byte $CB,$F9,0 ; SET  7,C
-     .byte $CB,$FA,0 ; SET  7,D
-     .byte $CB,$FB,0 ; SET  7,E
-     .byte $CB,$FC,0 ; SET  7,H
-     .byte $CB,$FD,0 ; SET  7,L
-     .byte $CB,$FF,0 ; SET  7,A
-instrs_end:    
-
-test_instr:
-     ld   c,$00
-     call test
-     ld   c,$F0
-     call test
-     ret
-     
-test:
-     ; Go through each value for A
-     ld   hl,values
-a_loop:
-     ld   b,(hl)
-     push hl
-     
-     ; Go through each value for other registers
-     ld   hl,values
-values_loop:
-     push bc
-     push hl
-     
-     push bc
-     
-     ; BC
-     ld   a,(hl+)
-     ld   b,a
-     ld   a,(hl+)
-     ld   c,a
-     
-     ; HL
-     ld   a,(hl+)
-     ld   d,a
-     ld   a,(hl+)
-     ld   e,a
-     push de
-     
-     ; DE
-     ld   a,(hl+)
-     ld   d,a
-     ld   a,(hl+)
-     ld   e,a
-     
-     pop  hl
-     pop  af
-     
-;    call print_regs
-     jp   instr
-instr_done:
-     
-     ; Checksum registers
-     call checksum_af_bc_de_hl
-     
-     pop  hl
-     pop  bc
-     inc  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,values_loop
-     
-     pop  hl
-     inc  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,a_loop
-     
-     ret
-
-values:
-     .byte $00,$01,$02,$04,$08,$10,$20,$40,$80,$FF
-values_end:
-     .byte $00,$01,$02,$04,$08,$10,$20,$40,$80,$FF
-     
-checksums:
-     .byte $46,$51,$4A,$16,$D4,$18,$B2,$4E,$ED,$B5,$15,$EA,$74,$66,$66,$3E
-     .byte $C2,$F3,$7F,$6A,$63,$CA,$62,$21,$72,$1E,$E4,$83,$6A,$56,$41,$1D
-     .byte $91,$90,$DB,$38,$54,$0A,$6C,$24,$02,$9E,$EA,$5B,$6D,$A7,$CB,$80
-     .byte $B4,$0B,$F3,$0F,$40,$38,$75,$BB,$AF,$30,$2B,$E5,$BD,$97,$D0,$33
-     .byte $83,$CB,$FD,$0A,$BB,$21,$93,$95,$28,$2F,$A2,$F6,$1B,$5F,$47,$E5
-     .byte $A3,$2E,$39,$63,$6C,$E0,$02,$BB,$78,$F1,$BA,$CB,$2C,$9F,$49,$E0
-     .byte $6C,$E0,$02,$BB,$04,$28,$A9,$FD,$5E,$D7,$2E,$93,$1B,$78,$08,$00
-     .byte $83,$CB,$FD,$0A,$BB,$21,$93,$95,$69,$17,$20,$96,$C3,$B4,$B6,$51
-     .byte $C1,$4E,$C3,$05,$72,$D0,$25,$98,$44,$F0,$99,$B7,$B4,$0B,$F3,$0F
-     .byte $54,$0A,$6C,$24,$45,$10,$2B,$9D,$86,$3C,$DF,$27,$02,$9E,$EA,$5B
-     .byte $B7,$B6,$4F,$60,$70,$E0,$E1,$AA,$C2,$F3,$7F,$6A,$63,$CA,$62,$21
-     .byte $80,$76,$41,$65,$AA,$3B,$D4,$2C,$ED,$B5,$15,$EA,$74,$66,$66,$3E
-     .byte $AD,$FF,$A0,$43,$7B,$4C,$06,$A4,$15,$32,$EE,$44,$43,$A6,$68,$3B
-     .byte $6F,$5D,$BE,$D4,$DA,$75,$1B,$EF,$9B,$4D,$99,$8F,$49,$E8,$A9,$1D
-     .byte $F5,$1B,$58,$3A,$92,$25,$2D,$51,$38,$5C,$62,$05,$DD,$A9,$63,$AD
-     .byte $E3,$78,$2F,$37,$90,$15,$DB,$62,$58,$E2,$E8,$35,$BB,$C1,$5A,$EA
-     .byte $06,$FE,$28,$AA,$4F,$5D,$64,$BF,$83,$CF,$7F,$B2,$F9,$A9,$90,$BF
-     .byte $DD,$06,$B6,$64,$25,$8A,$E0,$24,$FA,$40,$95,$13,$91,$61,$93,$0D
-     .byte $69,$A8,$0E,$0B,$AE,$FD,$DF,$1A,$D4,$98,$D8,$11,$61,$E9,$16,$66
-     .byte $BD,$82,$1F,$2C,$E2,$74,$26,$77,$13,$E4,$6A,$25,$D7,$DE,$8A,$4F
-     .byte $1F,$7B,$47,$BC,$DA,$DB,$31,$E7,$2B,$06,$2C,$39,$15,$FC,$1C,$0B
-     .byte $1A,$3B,$A0,$0F,$55,$E5,$D8,$1C,$6D,$6C,$7F,$B8,$14,$AD,$9C,$AF
-     .byte $92,$B6,$60,$40,$76,$E6,$6D,$2F,$9E,$CA,$45,$6D,$54,$97,$47,$35
-     .byte $EE,$39,$50,$63,$47,$8C,$8A,$AB,$18,$F7,$6D,$10,$B7,$A6,$74,$0C
-     .byte $11,$24,$9C,$F5,$64,$5D,$FB,$16,$65,$1C,$59,$C6,$B9,$E3,$30,$52
-     .byte $1D,$E4,$B8,$9E,$A3,$2F,$7B,$6F,$03,$20,$24,$41,$4C,$F7,$22,$B8
-     .byte $92,$A7,$75,$E3,$1D,$F2,$5E,$FD,$B7,$A4,$F3,$34,$BF,$F7,$37,$CA
-     .byte $67,$22,$D4,$4D,$DE,$1A,$99,$58,$B2,$65,$91,$12,$F2,$8C,$65,$08
-     .byte $69,$E2,$9B,$D3,$94,$8C,$71,$F1,$D8,$22,$29,$53,$E8,$6A,$D9,$55
-     .byte $3E,$24,$42,$EF,$38,$12,$AC,$02,$35,$84,$7D,$2C,$C2,$34,$AC,$E2
-     .byte $4B,$AA,$E0,$31,$8F,$A0,$F2,$13,$A8,$4F,$7B,$98,$02,$16,$3B,$D4
-     .byte $8D,$09,$58,$A4,$FF,$46,$CA,$17,$08,$AA,$78,$02,$4A,$CF,$72,$E1
-     .byte $A8,$55,$52,$89,$F8,$FD,$D6,$4E,$22,$E7,$8F,$C6,$80,$F1,$BB,$3C
-     .byte $09,$1B,$4A,$4A,$06,$A1,$FD,$54,$E4,$BF,$D8,$27,$14,$23,$42,$90
-     .byte $B3,$7B,$55,$14,$77,$22,$EE,$92,$E9,$37,$76,$8C,$7D,$CF,$B7,$C7
-     .byte $D2,$90,$17,$48,$BB,$52,$BC,$19,$AA,$91,$9F,$DC,$0D,$AA,$C9,$24
-     .byte $C8,$45,$DF,$AB,$B3,$83,$A8,$9E,$0F,$AA,$62,$2F,$C4,$C0,$28,$BA
-     .byte $32,$56,$99,$69,$C9,$77,$4B,$62,$6B,$FF,$B6,$DD,$42,$46,$7A,$00
-     .byte $DA,$E9,$67,$4D,$46,$9C,$B5,$92,$04,$B5,$F6,$03,$01,$3C,$A2,$47
-     .byte $40,$15,$4A,$D6,$04,$39,$BC,$2F,$E9,$E1,$39,$59,$9B,$6A,$A4,$12
-     .byte $97,$23,$99,$30,$9E,$A6,$70,$AD,$C7,$1B,$D6,$1F,$05,$15,$D2,$5B
-     .byte $29,$0F,$5A,$CC,$0A,$99,$A2,$68,$5D,$58,$ED,$9C,$B9,$82,$CD,$74
diff --git a/tests/cpu_instrs/source/11-op a,(hl).s b/tests/cpu_instrs/source/11-op a,(hl).s
deleted file mode 100644
index bbc40b1..0000000
--- a/tests/cpu_instrs/source/11-op a,(hl).s	
+++ /dev/null
@@ -1,162 +0,0 @@
-; Tests (HL/BC/DE) instructions.
-; Takes 20 seconds.
-
-;.define PRINT_CHECKSUMS 1
-.include "shell.inc"
-.include "instr_test.s"
-
-instrs:
-     .byte $0A,0,0     ; LD   A,(BC)
-     .byte $1A,0,0     ; LD   A,(DE)
-     .byte $02,0,0     ; LD   (BC),A
-     .byte $12,0,0     ; LD   (DE),A
-     .byte $2A,0,0     ; LD   A,(HL+)
-     .byte $3A,0,0     ; LD   A,(HL-)
-     .byte $22,0,0     ; LD   (HL+),A
-     .byte $32,0,0     ; LD   (HL-),A
-     .byte $B6,0,0     ; OR   (HL)
-     .byte $BE,0,0     ; CP   (HL)
-     .byte $86,0,0     ; ADD  (HL)
-     .byte $8E,0,0     ; ADC  (HL)
-     .byte $96,0,0     ; SUB  (HL)
-     .byte $9E,0,0     ; SBC  (HL)
-     .byte $A6,0,0     ; AND  (HL)
-     .byte $AE,0,0     ; XOR  (HL)
-     .byte $35,0,0     ; DEC  (HL)
-     .byte $34,0,0     ; INC  (HL)
-     .byte $CB,$06,0   ; RLC  (HL)
-     .byte $CB,$0E,0   ; RRC  (HL)
-     .byte $CB,$16,0   ; RL   (HL)
-     .byte $CB,$1E,0   ; RR   (HL)
-     .byte $CB,$26,0   ; SLA  (HL)
-     .byte $CB,$2E,0   ; SRA  (HL)
-     .byte $CB,$36,0   ; SWAP (HL)
-     .byte $CB,$3E,0   ; SRL  (HL)
-     .byte $CB,$46,0   ; BIT  0,(HL)
-     .byte $CB,$4E,0   ; BIT  1,(HL)
-     .byte $CB,$56,0   ; BIT  2,(HL)
-     .byte $CB,$5E,0   ; BIT  3,(HL)
-     .byte $CB,$66,0   ; BIT  4,(HL)
-     .byte $CB,$6E,0   ; BIT  5,(HL)
-     .byte $CB,$76,0   ; BIT  6,(HL)
-     .byte $CB,$7E,0   ; BIT  7,(HL)
-     .byte $CB,$86,0   ; RES  0,(HL)
-     .byte $CB,$8E,0   ; RES  1,(HL)
-     .byte $CB,$96,0   ; RES  2,(HL)
-     .byte $CB,$9E,0   ; RES  3,(HL)
-     .byte $CB,$A6,0   ; RES  4,(HL)
-     .byte $CB,$AE,0   ; RES  5,(HL)
-     .byte $CB,$B6,0   ; RES  6,(HL)
-     .byte $CB,$BE,0   ; RES  7,(HL)
-     .byte $CB,$C6,0   ; SET  0,(HL)
-     .byte $CB,$CE,0   ; SET  1,(HL)
-     .byte $CB,$D6,0   ; SET  2,(HL)
-     .byte $CB,$DE,0   ; SET  3,(HL)
-     .byte $CB,$E6,0   ; SET  4,(HL)
-     .byte $CB,$EE,0   ; SET  5,(HL)
-     .byte $CB,$F6,0   ; SET  6,(HL)
-     .byte $CB,$FE,0   ; SET  7,(HL)
-     .byte $27,0,0     ; DAA
-instrs_end:
-     
-test_instr:
-     ld   c,$00
-     call test
-     ld   c,$10
-     call test
-     ld   c,$E0
-     call test
-     ld   c,$F0
-     call test
-     ret
-
-test:
-     ; Go through each value for A
-     ld   hl,values
-a_loop:
-     ld   b,(hl)
-     push hl
-     
-     ; Go through each value for (HL)
-     ld   hl,values
-values_loop:
-     push bc
-     push hl
-     
-     push bc
-     
-     ; BC
-     ld   a,(hl+)
-     ld   bc,rp_temp
-     ld   (rp_temp),a
-     
-     ; DE
-     ld   a,(hl+)
-     ld   de,rp_temp+1
-     ld   (rp_temp+1),a
-     
-     ; HL
-     ld   a,(hl)
-     ld   hl,rp_temp+2
-     ld   (rp_temp+2),a
-     
-     ; AF
-     pop  af
-     
-;    call print_regs
-     jp   instr
-instr_done:
-     
-     ; Checksum AF, HL, and (HL)
-     push hl
-     push af
-     call update_crc_fast
-     pop  hl
-     ld   a,l
-     call update_crc_fast
-     pop  bc
-     ld   a,b
-     call update_crc_fast
-     ld   a,c
-     call update_crc_fast
-     ld   a,(rp_temp)
-     call update_crc_fast
-     ld   a,(rp_temp+1)
-     call update_crc_fast
-     ld   a,(rp_temp+2)
-     call update_crc_fast
-     
-     pop  hl
-     pop  bc
-     inc  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,values_loop
-     
-     pop  hl
-     inc  hl
-     ld   a,l
-     cp   <values_end
-     jr   nz,a_loop
-     
-     ret
-
-values:
-     .byte $00,$01,$0F,$10,$1F,$7F,$80,$F0,$FF,$02,$04,$08,$20,$40
-values_end:
-     .byte $00,$01,$0F,$10,$1F,$7F,$80,$F0,$FF,$02,$04,$08,$20,$40
-
-checksums:
-     .byte $E0,$E5,$09,$A7,$FB,$28,$0D,$AE,$AC,$BB,$91,$D8,$B3,$E2,$AF,$C4
-     .byte $3D,$B5,$02,$07,$4F,$6E,$5B,$7E,$AE,$02,$E7,$14,$DC,$D9,$BE,$6D
-     .byte $F1,$48,$A9,$42,$67,$08,$FE,$57,$06,$6A,$A9,$B1,$FD,$A5,$84,$F0
-     .byte $82,$FC,$24,$A9,$A8,$1D,$BB,$E2,$F8,$23,$8C,$DE,$0E,$1D,$64,$D1
-     .byte $05,$E0,$24,$41,$53,$75,$47,$55,$F4,$D9,$10,$6A,$38,$16,$28,$D8
-     .byte $D1,$28,$A3,$E0,$A2,$05,$B8,$FE,$B0,$F4,$F5,$8F,$4B,$39,$03,$B0
-     .byte $8A,$07,$BA,$90,$25,$99,$A7,$78,$E6,$9A,$D1,$49,$C9,$B2,$A3,$E5
-     .byte $36,$34,$CB,$5A,$97,$42,$71,$09,$39,$87,$25,$EC,$54,$EE,$C5,$B3
-     .byte $FC,$B5,$6F,$BD,$0B,$D8,$46,$6F,$6A,$27,$81,$9F,$F8,$38,$E2,$71
-     .byte $55,$19,$21,$83,$4B,$85,$9F,$4B,$A1,$78,$14,$60,$58,$08,$D9,$57
-     .byte $11,$8C,$83,$9A,$9F,$01,$D1,$90,$E8,$82,$0B,$5A,$BD,$75,$86,$21
-     .byte $DF,$83,$E9,$23,$1E,$B6,$7F,$D1,$4A,$18,$A5,$8E,$CF,$CF,$CA,$51
-     .byte $3F,$03,$A4,$96,$C3,$1F,$9E,$88,$0C,$DF,$1F,$B1
diff --git a/tests/cpu_instrs/source/common/apu.s b/tests/cpu_instrs/source/common/apu.s
deleted file mode 100644
index b54ac48..0000000
--- a/tests/cpu_instrs/source/common/apu.s
+++ /dev/null
@@ -1,215 +0,0 @@
-; Sound chip utilities
-
-; Turns APU off
-; Preserved: BC, DE, HL
-sound_off:
-     wreg NR52,0
-     ret
-
-
-; Turns APU on
-; Preserved: BC, DE, HL
-sound_on:
-     wreg NR52,$80  ; power
-     wreg NR51,$FF  ; mono
-     wreg NR50,$77  ; volume
-     ret
-
-
-; Synchronizes to APU length counter within
-; tens of clocks. Uses square 2 channel.
-; Preserved: BC, DE, HL
-sync_apu:
-     wreg NR24,$00  ; disable length
-     wreg NR21,$3E  ; length = 2 (in case of extra len clk)
-     wreg NR22,$08  ; silent without disabling channel
-     wreg NR24,$C0  ; start length
--    lda  NR52      ; wait for length to reach zero
-     and  $02
-     jr   nz,-
-     ret
-
-
-; Synchronizes to first square sweep within
-; tens of clocks. Uses square 1 channel.
-; Preserved: BC, DE, HL
-sync_sweep:
-     wreg NR10,$11  ; sweep period = 1, shift = 1
-     wreg NR12,$08  ; silent without disabling channel
-     wreg NR13,$FF  ; freq = $3FF
-     wreg NR14,$83  ; start
--    lda  NR52
-     and  $01
-     jr   nz,-
-     ret
-
-
-; Copies 16-byte wave from (HL) to wave RAM
-; Preserved: BC, DE
-load_wave:
-     push bc
-     wreg NR30,$00  ; disable while writing
-     ld   c,$30
--    ld   a,(hl+)
-     ld   ($FF00+c),a
-     inc  c
-     bit  6,c
-     jr   z,-
-     pop  bc
-     ret
-
-
-; Makes short beep
-; Preserved: BC, DE, HL
-beep:
-     xor  a         ; sound off
-     sta  NR52
-     dec  a
-     sta  NR52      ; sound on
-     sta  NR51      ; mono
-     sta  NR50      ; volume
-     wreg NR12,$F1  ; volume, envelope rate
-     wreg NR14,$86  ; note on, pitch
-     delay_msec 250
-     ret
-
-
-; Marks sound with bits of A encoded into volume
-; Preserved: BC, DE, HL
-mark_sound:
-     push bc
-     ld   c,a
-     ld   b,8
-     wreg NR10,0
-     wreg NR11,$80
-     wreg NR13,$F8
--    ld   a,$60
-     rl   c
-     jr   nc,+
-     ld   a,$A0
-+    sta  NR12
-     wreg NR14,$87
-     delay_usec 300
-     wreg NR12,0
-     delay_usec 100
-     dec  b
-     jr   nz,-
-     pop  bc
-     ret
-
-
-; Fills wave RAM with A
-; Preserved: BC, DE, HL
-fill_wave:
-     push bc
-     ld   c,$30
--    ld   ($FF00+c),a
-     inc  c
-     bit  6,c
-     jr   z,-
-     pop  bc
-     ret
-
-
-; Gets current length counter value for
-; channel with mask A into A. Length counter
-; must be enabled for that channel.
-; Preserved: BC, DE, HL
-get_len_a:
-     push bc
-     ld   c,a
-     ld   b,0
--    lda  NR52      ; 3
-     and  c         ; 1
-     jr   z,+       ; 2
-     delay 4096-10
-     inc  b         ; 1
-     jr   nz,-      ; 3
-+    ld   a,b
-     pop  bc
-     ret
-
-
-; Synchronizes exactly to length clock. Next length clock
-; occurs by 4079 clocks after this returns. Uses NR2x.
-; Preserved: AF, BC, DE, HL
-sync_length:
-     push af
-     push hl
-     
-     ld   hl,NR52
-     wreg NR22,$08  ; silent without disabling channel
-     wreg NR24,$40  ; avoids extra length clock on trigger
-     wreg NR21,-2   ; length = 2, in case clock occurs immediately
-     wreg NR24,$C0  ; start length
-     
-     ; Coarse sync
-     ld   a,$02
--    and  (hl)
-     jr   nz,-
-     
-     ; Fine sync. Slowly moves "forward" until
-     ; length clock occurs just before reading NR52.
--    delay 4097-20
-     wreg NR21,-1   ; 5
-     wreg NR24,$C0  ; 5
-     lda  NR52      ; 3
-     delay 2        ; 2
-     and  $02       ; 2
-     jr   nz,-      ; 3
-     
-     pop  hl
-     pop  af
-     ret
-
-
-; Delays n*4096 cycles
-; Preserved: BC, DE, HL
-.macro delay_frames ; n
-     ld   a,\1
-     call delay_frames_
-.endm
-
-
-; Delays A*4096+13 cycles (including CALL)
-; Preserved: BC, DE, HL
-delay_a_frames:
-     or   a              ; 1
-     jr   nz,+           ; 3
-                         ; -1
-     ret
-delay_frames_:           ; delays 4096*A-2 cycles (including CALL)
-     push af             ; 4
-     ld   a,256-13-20-12 ; 2
-     jr   ++             ; 3
-+
--    push af             ; 4
-     ld   a,256-13-20    ; 2
-++   call delay_a_20_cycles
-     delay 4096-256
-     pop  af             ; 3
-     dec  a              ; 1
-     jr   nz,-           ; 3
-                         ; -1
-     ret
-
-
-.macro test_chan_timing ; chan, iter
-     ld   a,\1
-     call print_dec
-     call print_space
-     ld   a,\2
--    push af
-     test_chan 1<<\1, \1*5+NR10
-     pop  af
-     dec  a
-     jr   nz,-
-     call print_newline
-.endm
-
-.macro test_chans ARGS iter
-     test_chan_timing 0,iter
-     test_chan_timing 1,iter
-     test_chan_timing 2,iter
-     test_chan_timing 3,iter
-.endm
diff --git a/tests/cpu_instrs/source/common/build_gbs.s b/tests/cpu_instrs/source/common/build_gbs.s
deleted file mode 100644
index 7ac8d3c..0000000
--- a/tests/cpu_instrs/source/common/build_gbs.s
+++ /dev/null
@@ -1,121 +0,0 @@
-; Build as GBS music file
-
-.memoryMap
-     defaultSlot 0
-     slot 0 $3000 size $1000
-     slot 1 $C000 size $1000
-.endMe
-
-.romBankSize $1000
-.romBanks 2
-
-
-;;;; GBS music file header
-
-.byte "GBS"
-.byte 1        ; vers
-.byte 1        ; songs
-.byte 1        ; first song
-.word load_addr
-.word reset
-.word gbs_play
-.word std_stack
-.byte 0,0      ; timer
-.ds $60,0
-load_addr:
-
-; WLA assumes we're building ROM and messes
-; with bytes at the beginning, so skip them.
-.ds $100,0
-
-
-;;;; Shell
-     
-.include "runtime.s"
-
-init_runtime:
-     ld   a,$01     ; Identify as DMG hardware
-     ld   (gb_id),a
-     .ifdef TEST_NAME
-          print_str TEST_NAME,newline,newline
-     .endif
-     ret
-
-std_print:
-     sta  SB
-     wreg SC,$81
-     delay 2304
-     ret
-
-post_exit:
-     call play_byte
-forever:
-     wreg NR52,0    ; sound off
--    jp   -
-
-.ifndef CUSTOM_RESET
-     gbs_play:
-.endif
-console_flush:
-console_normal:
-console_inverse:
-console_set_mode:
-     ret
-
-; Reports A in binary as high and low tones, with
-; leading low tone for reference. Omits leading
-; zeroes.
-; Preserved: AF, BC, DE, HL
-play_byte:
-     push af
-     push hl
-     
-     ; HL = (A << 1) | 1
-     scf
-     rla
-     ld   l,a
-     ld   h,0
-     rl   h
-     
-     ; Shift left until next-to-top bit is 1
--    add  hl,hl
-     bit  6,h
-     jr   z,-
-     
-     ; Reset sound
-     delay_msec 400
-     wreg NR52,0    ; sound off
-     wreg NR52,$80  ; sound on
-     wreg NR51,$FF  ; mono
-     wreg NR50,$77  ; volume
-     
--    add  hl,hl
-
-     ; Low or high pitch based on bit shifted out
-     ; of HL
-     ld   a,0
-     jr   nc,+
-     ld   a,$FF
-+    sta  NR23
-     
-     ; Play short tone
-     wreg NR21,$A0
-     wreg NR22,$F0
-     wreg NR24,$86
-     delay_msec 75
-     wreg NR22,0
-     wreg NR23,$F8
-     wreg NR24,$87
-     delay_msec 200
-     
-     ; Loop until HL = $8000
-     ld   a,h
-     xor  $80
-     or   l
-     jr   nz,-
-     
-     pop  hl
-     pop  af
-     ret
-
-.ends
diff --git a/tests/cpu_instrs/source/common/build_rom.s b/tests/cpu_instrs/source/common/build_rom.s
deleted file mode 100644
index e1e220f..0000000
--- a/tests/cpu_instrs/source/common/build_rom.s
+++ /dev/null
@@ -1,80 +0,0 @@
-; Build as GB ROM
-
-.memoryMap
-     defaultSlot 0
-     slot 0 $0000 size $4000
-     slot 1 $C000 size $4000
-.endMe
-
-.romBankSize   $4000 ; generates $8000 byte ROM
-.romBanks      2
-
-.cartridgeType 1 ; MBC1
-.computeChecksum
-.computeComplementCheck
-
-
-;;;; GB ROM header
-
-; GB header read by bootrom
-.org $100
-     nop
-     jp   reset
-
-; Nintendo logo required for proper boot
-.byte $CE,$ED,$66,$66,$CC,$0D,$00,$0B
-.byte $03,$73,$00,$83,$00,$0C,$00,$0D
-.byte $00,$08,$11,$1F,$88,$89,$00,$0E
-.byte $DC,$CC,$6E,$E6,$DD,$DD,$D9,$99
-.byte $BB,$BB,$67,$63,$6E,$0E,$EC,$CC
-.byte $DD,$DC,$99,$9F,$BB,$B9,$33,$3E
-
-; Internal name
-.ifdef ROM_NAME
-     .byte ROM_NAME
-.endif
-
-; CGB/DMG requirements
-.org $143
-     .ifdef REQUIRE_CGB
-          .byte $C0
-     .else
-          .ifndef REQUIRE_DMG
-               .byte $80
-          .endif
-     .endif
-
-.org $200
-
-
-;;;; Shell
-     
-.include "runtime.s"
-.include "console.s"
-
-init_runtime:
-     call console_init
-     .ifdef TEST_NAME
-          print_str TEST_NAME,newline,newline
-     .endif
-     ret
-
-std_print:
-     push af
-     sta  SB
-     wreg SC,$81
-     delay 2304
-     pop  af
-     jp   console_print
-
-post_exit:
-     call console_show
-     call play_byte
-forever:
-     wreg NR52,0    ; sound off
--    jr   -
-
-play_byte:
-     ret
-
-.ends
diff --git a/tests/cpu_instrs/source/common/checksums.s b/tests/cpu_instrs/source/common/checksums.s
deleted file mode 100644
index b83cb42..0000000
--- a/tests/cpu_instrs/source/common/checksums.s
+++ /dev/null
@@ -1,98 +0,0 @@
-; Multiple checksum table handling
-
-.define next_checksum    bss+0
-.redefine bss            bss+2
-
-; If PRINT_CHECKSUMS is defined, checksums are printed
-; rather than compared.
-
-; Initializes multiple checksum handler to use checksums
-; table (defined by user).
-; Preserved: BC, DE, HL
-checksums_init:
-     ld   a,<checksums
-     ld   (next_checksum),a
-     ld   a,>checksums
-     ld   (next_checksum+1),a
-     ret
-
-; Compares current checksum with next checksum in
-; list. Z if they match, NZ if not.
-; Preserved: BC, DE, HL
-checksums_compare:
-.ifdef PRINT_CHECKSUMS
-     lda  checksum+3
-     push af
-     lda  checksum+2
-     push af
-     lda  checksum+1
-     push af
-     lda  checksum+0
-     push af
-     
-     ld   a,(next_checksum)
-     inc  a
-     ld   (next_checksum),a
-     sub  <checksums+1
-     and  $03
-     ld   a,','
-     jr   nz,+
-     print_str newline,'.',"byte"
-     ld   a,' '
-+    call print_char
-
-     pop  af
-     call @print_byte
-     pop  af
-     call @print_byte
-     pop  af
-     call @print_byte
-     ld   a,'$'
-     call print_char
-     pop  af
-     call print_hex
-     
-     xor  a
-     ret
-     
-@print_byte:
-     push af
-     ld   a,'$'
-     call print_char
-     pop  af
-     call print_hex
-     ld   a,','
-     call print_char
-     ret
-.else
-     
-     push bc
-     push de
-     push hl
-     ld   a,(next_checksum)
-     ld   l,a
-     ld   a,(next_checksum+1)
-     ld   h,a
-     ld   de,checksum
-     ld   b,0
--    ld   a,(de)
-     xor  (hl)
-     or   b
-     ld   b,a
-     inc  hl
-     inc  e
-     ld   a,e
-     cp   <(checksum+4)
-     jr   nz,-
-     ld   a,l
-     ld   (next_checksum),a
-     ld   a,h
-     ld   (next_checksum+1),a
-     
-     ld   a,b
-     cp   0
-     pop  hl
-     pop  de
-     pop  bc
-     ret
-.endif
diff --git a/tests/cpu_instrs/source/common/console.bin b/tests/cpu_instrs/source/common/console.bin
deleted file mode 100644
index b02f2d37ee94c6570a3622734f2d704dfca44b0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 768
zcmX|9F=`|+5G))_B$f+182koBX5hr&r*zbT5qlFY8w?8X8GehSdBVQJIPe4Zu1Z?m
z2wEj|cXgKp3^N%Fwbp)6@0AO%)yuRSqFVOjFXoqd`4hj9QtEN1nR)XG+d{u=K$L$a
zcxBdDa9GaHO?x1~9ZyqY!B><xUm^-j`PPVa(a@5miRWo9wUMj&J_#51UGYs}IWs=A
z<ku-J;?;Wi46$TWucYVVUYUc3^OFDV>?@1~S_Jk8EuOnO>t1U_)GPUYcV}PSJ688I
zDZyK&1&Z3Yf=R|a=4{O6sIrFR>wY_q1954MiRzbDIv)c%zSNhFNh$uKIuubR9$M#%
zQVgthyMM7>6t%8<wJ>xc-*ZoU#;c~Eo^b8>ieF1Te%=ANe|UbtGOeuN<>ma4(yn>d
z&PyDPc+NXzR}RnDiJDL@@*5U1@Exf>ZKHTq^DiA1#(zox`Vp^snt$Nkdp#BumLA0V
yczj1Ga3U7XIy~nG6}avCt6hL`&VKmF{r{ZIvhq4Tb=k}k+hUx5zmKoWJ@6mAT&*eq

diff --git a/tests/cpu_instrs/source/common/console.s b/tests/cpu_instrs/source/common/console.s
deleted file mode 100644
index 5307f6b..0000000
--- a/tests/cpu_instrs/source/common/console.s
+++ /dev/null
@@ -1,291 +0,0 @@
-; Scrolling text console
-
-; Console is 20x18 characters. Buffers lines, so
-; output doesn't appear until a newline or flush.
-; If scrolling isn't supported (i.e. SCY is treated
-; as if always zero), the first 18 lines will
-; still print properly). Also works properly if
-; LY isn't supported (always reads back as the same
-; value).
-
-.define console_width 20
-
-.define console_buf      bss+0
-.define console_pos      bss+console_width
-.define console_mode     bss+console_width+1
-.define console_scroll   bss+console_width+2
-.redefine bss            bss+console_width+3
-
-
-; Waits for start of LCD blanking period
-; Preserved: BC, DE, HL
-console_wait_vbl:
-     push bc
-     
-     ; Wait for start of vblank, with
-     ; timeout in case LY doesn't work
-     ; or LCD is disabled.
-     ld   bc,-1250
--    inc  bc
-     ld   a,b
-     or   c
-     jr   z,@timeout
-     lda  LY
-     cp   144
-     jr   nz,-
-@timeout:
-     
-     pop  bc
-     ret
-
-
-; Initializes text console
-console_init:
-     call console_hide
-     
-     ; CGB-specific inits
-     ld   a,(gb_id)
-     and  gb_id_cgb
-     call nz,@init_cgb
-     
-     ; Clear nametable
-     ld   a,' '
-     call @fill_nametable
-     
-     ; Load tiles
-     ld   hl,TILES+$200
-     ld   c,0
-     call @load_tiles
-     ld   hl,TILES+$A00
-     ld   c,$FF
-     call @load_tiles
-     
-     ; Init state
-     ld   a,console_width
-     ld   (console_pos),a
-     ld   a,0
-     ld   (console_mode),a
-     ld   a,-8
-     ld   (console_scroll),a
-     call console_scroll_up_
-     jr   console_show
-
-@fill_nametable:
-     ld   hl,BGMAP0
-     ld   b,4
--    ld   (hl),a
-     inc  l
-     jr   nz,-
-     inc  h
-     dec  b
-     jr   nz,-
-     ret
-
-@init_cgb:
-     ; Clear palette
-     wreg $FF68,$80
-     ld   b,16
--    wreg $FF69,$FF
-     wreg $FF69,$7F
-     wreg $FF69,$00
-     wreg $FF69,$00
-     wreg $FF69,$00
-     wreg $FF69,$00
-     wreg $FF69,$00
-     wreg $FF69,$00
-     dec  b
-     jr   nz,-
-     
-     ; Clear attributes
-     ld   a,1
-     ld   (VBK),a
-     ld   a,0
-     call @fill_nametable
-     
-     ld   a,0
-     ld   (VBK),a
-     ret
-
-@load_tiles:
-     ld   de,ASCII
-     ld   b,96
---   push bc
-     ld   b,8
--    ld   a,(de)
-     inc  de
-     xor  c
-     ldi  (hl),a
-     ldi  (hl),a
-     dec  b
-     jr   nz,-
-     pop  bc
-     dec  b
-     jr   nz,--
-     ret
-
-
-; Shows console display
-; Preserved: AF, BC, DE, HL
-console_show:
-     push af
-     
-     ; Enable LCD
-     call console_wait_vbl
-     wreg LCDC,$91
-     wreg SCX,0
-     wreg BGP,$E4
-     
-     jp   console_apply_scroll_
-
-
-; Hides console display by turning LCD off
-; Preserved: AF, BC, DE, HL
-console_hide:
-     push af
-     
-     ; LCD off
-     call console_wait_vbl
-     wreg LCDC,$11
-     
-     pop  af
-     ret
-
-
-; Changes to normal text mode
-; Preserved: BC, DE, HL
-console_normal:
-     xor  a
-     jr   console_set_mode
-
-; Changes to inverse text mode
-; Preserved: BC, DE, HL
-console_inverse:
-     ld   a,$80
-
-; Changes console mode to A.
-; 0: Normal, $80: Inverse
-; Preserved: BC, DE, HL
-console_set_mode:
-     and  $80
-     ld   (console_mode),a
-     ret
-
-
-; Prints char A to console. Will not appear until
-; a newline or flush occurs.
-; Preserved: AF, BC, DE, HL
-console_print:
-     push af
-     
-     cp   10
-     jr   z,console_newline_
-     
-     push hl
-     push af
-     ld   hl,console_pos
-     ldi  a,(hl)
-     cp   <console_buf
-     jr   nz,@not_at_end
-     
-     ; Newline if at end of current line. If this
-     ; were done after writing to buffer, calling
-     ; console_newline would print extra newline.
-     ; Doing it before eliminates this.
-     
-     ; Ignore any spaces at end of line
-     pop  af
-     cp   ' '
-     jr   z,@ignore_space
-     call console_newline
-     push af
-     
-@not_at_end:
-     pop  af
-     or   (hl)      ; apply current attributes
-     dec  l         ; hl = console_pos
-     dec  (hl)      ; console_pos = console_pos - 1
-     ld   l,(hl)    ; hl = position in buffer
-     ld   (hl),a
-     
-@ignore_space
-     pop  hl
-     pop  af
-     ret
-
-
-; Displays current line and starts new one
-; Preserved: AF, BC, DE, HL
-console_newline:
-     push af
-console_newline_:
-     call console_wait_vbl
-     call console_flush_
-     call console_scroll_up_
-     call console_flush_
-     jp   console_apply_scroll_
-
-
-console_scroll_up_:
-     push bc
-     push hl
-     
-     ; Scroll up 8 pixels
-     ld   a,(console_scroll)
-     add  8
-     ld   (console_scroll),a
-     
-     ; Start new clear line
-     ld   a,' '
-     ld   hl,console_buf + console_width - 1
-     ld   b,console_width
--    ldd  (hl),a
-     dec  b
-     jr   nz,-
-     ld   a,<(console_buf + console_width)
-     ld   (console_pos),a
-     
-     pop  hl
-     pop  bc
-     ret
-
-
-; Displays current line's contents without scrolling.
-; Preserved: A, BC, DE, HL
-console_flush:
-     push af
-     call console_wait_vbl
-     call console_flush_
-console_apply_scroll_:
-     ld   a,(console_scroll)
-     sub  136
-     sta  SCY
-     pop  af
-     ret
-     
-console_flush_:
-     push de
-     push hl
-     
-     ; Address of row in nametable
-     ld   a,(console_scroll)
-     ld   l,a
-     ld   h,(>BGMAP0) >> 2
-     add  hl,hl
-     add  hl,hl
-     
-     ; Copy line
-     ld   de,console_buf + console_width
--    dec  e
-     ld   a,(de)
-     ldi  (hl),a
-     ld   a,e
-     cp   <console_buf
-     jr   nz,-
-     
-     pop  hl
-     pop  de
-     ret
-
-
-ASCII:
-     .incbin "console.bin"
diff --git a/tests/cpu_instrs/source/common/cpu_speed.s b/tests/cpu_instrs/source/common/cpu_speed.s
deleted file mode 100644
index 8eedb1b..0000000
--- a/tests/cpu_instrs/source/common/cpu_speed.s
+++ /dev/null
@@ -1,64 +0,0 @@
-; CPU speed manipulation.
-
-; Switches to normal speed. No effect on DMG.
-; Preserved: BC, DE, HL
-cpu_norm:
-     ; Do nothing if not CGB
-     ld   a,(gb_id)
-     and  gb_id_cgb
-     ret  z
-     
-     lda  KEY1
-     rlca
-     ret  nc
-     jr   cpu_speed_toggle
-
-
-; Switches to double speed. No effect on DMG.
-; Preserved: BC, DE, HL
-cpu_fast:
-     ; Do nothing if not CGB
-     ld   a,(gb_id)
-     and  gb_id_cgb
-     ret  z
-     
-     lda  KEY1
-     rlca
-     ret  c
-cpu_speed_toggle:
-     di
-     lda  IE
-     push af
-     xor  a
-     sta  IE
-     sta  IF
-     wreg P1,$30
-     wreg KEY1,1
-     stop
-     nop
-     pop  af
-     sta  IE
-     ret
-
-
-; Determines current CPU speed without using KEY1.
-; A=1 if fast, 0 if normal. Always 0 on DMG.
-; Preserved: BC, DE,HL
-get_cpu_speed:
-     push bc
-     call sync_apu
-     wreg NR14,$C0
-     wreg NR11,-1
-     wreg NR12,8
-     wreg NR14,$C0
-     ld   bc,-$262
--    inc  bc
-     lda  NR52
-     and  1
-     jr   nz,-
-     ld   a,0
-     bit  7,b
-     jr   nz,+
-     inc  a
-+    pop  bc
-     ret
diff --git a/tests/cpu_instrs/source/common/crc.s b/tests/cpu_instrs/source/common/crc.s
deleted file mode 100644
index 141d814..0000000
--- a/tests/cpu_instrs/source/common/crc.s
+++ /dev/null
@@ -1,78 +0,0 @@
-; CRC-32 checksum calculation
-
-.define checksum    dp+0 ; little-endian, complemented
-.redefine dp        dp+4
-
-
-; Initializes checksum module. Might initialize tables
-; in the future.
-init_crc:
-     jr   reset_crc
-
-
-; Clears CRC
-; Preserved: BC, DE, HL
-reset_crc:
-     ld   a,$FF
-     sta  checksum+0
-     sta  checksum+1
-     sta  checksum+2
-     sta  checksum+3
-     ret
-
-
-; Updates current checksum with byte A
-; Preserved: AF, BC, DE, HL
-; Time: 237 cycles average
-update_crc:
-     ; 65 cycles + 8*cycles per bit
-     ; min cycles per bit: 14
-     ; max cycles per bit: 29
-     push af
-     push bc
-     push de
-     push hl
-     
-     ld   hl,checksum+3
-     ld   b,(hl)
-     dec  l
-     ld   c,(hl)
-     dec  l
-     ld   d,(hl)
-     dec  l
-     xor  (hl)
-     
-     ld   h,8
--    srl  b
-     rr   c
-     rr   d
-     rra
-     jr   nc,+
-     ld   e,a
-     ld   a,b
-     xor  $ED
-     ld   b,a
-     ld   a,c
-     xor  $B8
-     ld   c,a
-     ld   a,d
-     xor  $83
-     ld   d,a
-     ld   a,e
-     xor  $20
-+    dec  h
-     jr   nz,-
-     
-     ld   h,>checksum
-     ldi  (hl),a
-     ld   (hl),d
-     inc  l
-     ld   (hl),c
-     inc  l
-     ld   (hl),b
-     
-     pop  hl
-     pop  de
-     pop  bc
-     pop  af
-     ret
diff --git a/tests/cpu_instrs/source/common/crc_fast.s b/tests/cpu_instrs/source/common/crc_fast.s
deleted file mode 100644
index d1088b0..0000000
--- a/tests/cpu_instrs/source/common/crc_fast.s
+++ /dev/null
@@ -1,88 +0,0 @@
-; Fast table-based CRC-32
-
-.define crc_tables  (bss+$FF)&$FF00 ; 256-byte aligned
-.redefine bss       crc_tables+$400
-
-
-; Initializes fast CRC tables and resets checksum.
-; Time: 47 msec
-init_crc_fast:
-     ld   l,0
-@next:
-     xor  a
-     ld   c,a
-     ld   d,a
-     ld   e,l
-     
-     ld   h,8
--    rra
-     rr   c
-     rr   d
-     rr   e
-     jr   nc,+
-     xor  $ED
-     ld   b,a
-     ld   a,c
-     xor  $B8
-     ld   c,a
-     ld   a,d
-     xor  $83
-     ld   d,a
-     ld   a,e
-     xor  $20
-     ld   e,a
-     ld   a,b
-     
-+    dec  h
-     jr   nz,-
-     
-     ld   h,>crc_tables
-     ld   (hl),e
-     inc  h
-     ld   (hl),d
-     inc  h
-     ld   (hl),c
-     inc  h
-     ld   (hl),a
-     
-     inc  l
-     jr   nz,@next
-     
-     jp   init_crc
-
-
-; Faster version of update_crc
-; Preserved: BC, DE
-; Time: 50 cycles (including CALL)
-update_crc_fast:
-
-; Fastest inline macro version of update_crc_fast
-; Time: 40 cycles
-; Size: 28 bytes
-.macro update_crc_fast
-     ld   l,a            ; 1
-     lda  checksum       ; 3
-     xor  l              ; 1
-     ld   l,a            ; 1
-     ld   h,>crc_tables  ; 2
-     
-     lda  checksum+1     ; 3
-     xor  (hl)           ; 2
-     inc  h              ; 1
-     sta  checksum       ; 3
-     
-     lda  checksum+2     ; 3
-     xor  (hl)           ; 2
-     inc  h              ; 1
-     sta  checksum+1     ; 3
-     
-     lda  checksum+3     ; 3
-     xor  (hl)           ; 2
-     inc  h              ; 1
-     sta  checksum+2     ; 3
-     
-     ld   a,(hl)         ; 2
-     sta  checksum+3     ; 3
-.endm
-     update_crc_fast
-     ret
diff --git a/tests/cpu_instrs/source/common/delay.s b/tests/cpu_instrs/source/common/delay.s
deleted file mode 100644
index 65eb9c0..0000000
--- a/tests/cpu_instrs/source/common/delay.s
+++ /dev/null
@@ -1,220 +0,0 @@
-; Delays in cycles, milliseconds, etc.
-
-; All routines are re-entrant (no global data). Routines never
-; touch BC, DE, or HL registers. These ASSUME CPU is at normal
-; speed. If running at double speed, msec/usec delays are half advertised.
-
-; Delays n cycles, from 0 to 16777215
-; Preserved: AF, BC, DE, HL
-.macro delay ARGS n
-     .if n < 0
-          .printt "Delay must be >= 0"
-          .fail
-     .endif
-     .if n > 16777215
-          .printt "Delay must be < 16777216"
-          .fail
-     .endif
-     delay_ n&$FFFF, n>>16
-.endm
-
-; Delays n clocks, from 0 to 16777216*4. Must be multiple of 4.
-; Preserved: AF, BC, DE, HL
-.macro delay_clocks ARGS n
-     .if n # 4 != 0
-          .printt "Delay must be a multiple of 4"
-          .fail
-     .endif
-     delay_ (n/4)&$FFFF,(n/4)>>16
-.endm
-
-; Delays n microseconds (1/1000000 second)
-; n can range from 0 to 4000 usec.
-; Preserved: AF, BC, DE, HL
-.macro delay_usec ARGS n
-     .if n < 0
-          .printt "Delay must be >= 0"
-          .fail
-     .endif
-     .if n > 4000
-          .printt "Delay must be <= 4000 usec"
-          .fail
-     .endif
-     delay_ ((n * 1048576 + 500000) / 1000000)&$FFFF,((n * 1048576 + 500000) / 1000000)>>16
-.endm
-
-; Delays n milliseconds (1/1000 second)
-; n can range from 0 to 10000 msec.
-; Preserved: AF, BC, DE, HL
-.macro delay_msec ARGS n
-     .if n < 0
-          .printt "Delay must be >= 0"
-          .fail
-     .endif
-     .if n > 10000
-          .printt "Delay must be <= 10000 msec"
-          .fail
-     .endif
-     delay_ ((n * 1048576 + 500) / 1000)&$FFFF, ((n * 1048576 + 500) / 1000)>>16
-.endm
-
-     ; All the low/high quantities are to deal wla-dx's asinine
-     ; restriction full expressions must evaluate to a 16-bit
-     ; value. If the author ever rectifies this, all "high"
-     ; arguments can be treated as zero and removed. Better yet,
-     ; I'll just find an assembler that didn't crawl out of
-     ; the sewer (this is one of too many bugs I've wasted
-     ; hours working around).
-
-     .define max_short_delay 28
-     
-     .macro delay_long_ ARGS n, high
-          ; 0+ to avoid assembler treating as memory read
-          ld   a,0+(((high<<16)+n) - 11) >> 16
-          call delay_65536a_9_cycles_
-          delay_nosave_ (((high<<16)+n) - 11)&$FFFF, 0
-     .endm
-     
-     ; Doesn't save AF, allowing minimization of AF save/restore
-     .macro delay_nosave_ ARGS n, high
-          ; 65536+11     = maximum delay using delay_256a_9_cycles_
-          ; 255+22  = maximum delay using delay_a_20_cycles
-          ; 22      = minimum delay using delay_a_20_cycles
-          .if high > 1
-               delay_long_ n, high
-          .else
-               .if high*n > 11
-                    delay_long_ n, high
-               .else
-                    .if (high*(255+22+1))|n > 255+22
-                         ld   a,>(((high<<16)+n) - 11)
-                         call delay_256a_9_cycles_
-                         delay_nosave_ <(((high<<16)+n) - 11), 0
-                    .else
-                         .if n >= 22
-                              ld   a,n - 22
-                              call delay_a_20_cycles
-                         .else
-                              delay_short_ n
-                         .endif
-                    .endif
-               .endif
-          .endif
-     .endm
-     
-     .macro delay_ ARGS low, high
-          .if (high*(max_short_delay+1))|low > max_short_delay
-               push af
-               delay_nosave_ ((high<<16)+low - 7)&$FFFF, ((high<<16)+low - 7)>>16
-               pop  af
-          .else
-               delay_short_ low
-          .endif
-     .endm
-
-
-; Delays A cycles + overhead
-; Preserved: BC, DE, HL
-; Time: A+20 cycles (including CALL)
-delay_a_20_cycles:
--    sub  5    ; 2
-     jr   nc,- ;3/2 do multiples of 5
-     rra       ; 1
-     jr   nc,+ ;3/2 bit 0
-+    adc  1    ; 2
-     ret  nc   ;5/2 -1: 0 cycles
-     ret  z    ;5/2  0: 2 cycles
-     nop       ; 1   1: 4 cycles
-     ret       ; 4 (thanks to dclxvi for original algorithm)
-
-; Delays A*256 cycles + overhead
-; Preserved: BC, DE, HL
-; Time: A*256+12 cycles (including CALL)
-delay_256a_12_cycles:
-     or   a              ; 1
-     ret  z              ; 5/2
-delay_256a_9_cycles_:
--    delay 256-4
-     dec  a              ; 1
-     jr   nz,-           ;3/2
-     ret                 ; 4
-
-; Delays A*65536 cycles + overhead
-; Preserved: BC, DE, HL
-; Time: A*65536+12 cycles (including CALL)
-delay_65536a_12_cycles:
-     or   a              ; 1
-     ret  z              ;5/2
-delay_65536a_9_cycles_:
--    delay 65536-4
-     dec  a              ; 1
-     jr   nz,-           ;3/2
-     ret                 ; 4
-
-; Delays H*256+L cycles + overhead
-; Preserved: AF, BC, DE, HL
-; Time: H*256+L+51 cycles
-delay_hl_51_cycles:
-     push af
-     ld   a,h
-     call delay_256a_12_cycles
-     ld   a,l
-     call delay_a_20_cycles
-     pop  af
-     ret
-
-     ; delay_short_ macro calls into these
-     .ds max_short_delay-10,$00 ; NOP repeated several times
-delay_unrolled_:
-     ret
-
-.macro delay_short_ ARGS n
-     .if n < 0
-          .fail
-     .endif
-     .if n > max_short_delay
-          .fail
-     .endif
-     
-     .if n == 1
-          nop
-     .endif
-     .if n == 2
-          nop
-          nop
-     .endif
-     .if n == 3
-          .byte $18,$00 ; JR +0
-     .endif
-     .if n == 4
-          .byte $18,$00 ; JR +0
-          nop
-     .endif
-     .if n == 5
-          .byte $18,$00 ; JR +0
-          nop
-          nop
-     .endif
-     .if n == 6
-          .byte $18,$00 ; JR +0
-          .byte $18,$00 ; JR +0
-     .endif
-     .if n == 7
-          push af
-          pop  af
-     .endif
-     .if n == 8
-          push af
-          pop  af
-          nop
-     .endif
-     .if n == 9
-          push af
-          pop  af
-          nop
-          nop
-     .endif
-     .if n >= 10
-          call delay_unrolled_ + 10 - n
-     .endif
-.endm
diff --git a/tests/cpu_instrs/source/common/gb.inc b/tests/cpu_instrs/source/common/gb.inc
deleted file mode 100644
index 31bbf14..0000000
--- a/tests/cpu_instrs/source/common/gb.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-; Game Boy hardware addresses
-
-; Memory
-.define VRAM   $8000 ; video memory
-.define TILES  $8000 ; tile images
-.define BGMAP0 $9800 ; first 32x32 tilemap
-.define BGMAP1 $9C00 ; second 32x32 tilemap
-.define WRAM   $C000 ; internal memory
-.define OAM    $FE00 ; sprite memory
-.define HRAM   $FF80 ; fast memory for LDH
-
-.define P1     $FF00
-
-; Game link I/O
-.define SB     $FF01
-.define SC     $FF02
-
-; Interrupts
-.define DIV    $FF04
-.define TIMA   $FF05
-.define TMA    $FF06
-.define TAC    $FF07
-.define IF     $FF0F
-.define IE     $FFFF
-
-; LCD registers
-.define LCDC   $FF40 ; control
-.define STAT   $FF41 ; status
-.define SCY    $FF42 ; scroll Y
-.define SCX    $FF43 ; scroll X
-.define LY     $FF44 ; current Y being rendered
-.define BGP    $FF47
-
-.define KEY1   $FF4D ; for changing CPU speed
-.define VBK    $FF4F
-
-; Sound registers
-.define NR10   $FF10
-.define NR11   $FF11
-.define NR12   $FF12
-.define NR13   $FF13
-.define NR14   $FF14
-
-.define NR21   $FF16
-.define NR22   $FF17
-.define NR23   $FF18
-.define NR24   $FF19
-
-.define NR30   $FF1A
-.define NR31   $FF1B
-.define NR32   $FF1C
-.define NR33   $FF1D
-.define NR34   $FF1E
-
-.define NR41   $FF20
-.define NR42   $FF21
-.define NR43   $FF22
-.define NR44   $FF23
-
-.define NR50   $FF24
-.define NR51   $FF25
-.define NR52   $FF26
-
-.define WAVE   $FF30
diff --git a/tests/cpu_instrs/source/common/instr_test.s b/tests/cpu_instrs/source/common/instr_test.s
deleted file mode 100644
index 5ed6e2c..0000000
--- a/tests/cpu_instrs/source/common/instr_test.s
+++ /dev/null
@@ -1,105 +0,0 @@
-; Framework for CPU instruction tests
-
-; Calls test_instr with each instruction copied
-; to instr, with a JP instr_done after it.
-; Verifies checksum after testing instruction and
-; prints opcode if it's wrong.
-
-.include "checksums.s"
-.include "cpu_speed.s"
-.include "apu.s"
-.include "crc_fast.s"
-
-.define instr $DEF8
-.define rp_temp (instr-4)
-
-.define temp   bss
-
-; Sets SP to word at addr
-; Preserved: BC, DE
-.macro ldsp ; addr
-     ld   a,(\1)
-     ld   l,a
-     ld   a,((\1)+1)
-     ld   h,a
-     ld   sp,hl
-.endm
-
-main:
-     call cpu_fast
-     call init_crc_fast
-     call checksums_init
-     set_test 0
-     
-     ld   hl,instrs
--    ; Copy instruction
-     ld   a,(hl+)
-     ld   (instr),a
-     ld   a,(hl+)
-     ld   (instr+1),a
-     ld   a,(hl+)
-     ld   (instr+2),a
-     push hl
-
-     ; Put JP instr_done after it
-     ld   a,$C3
-     ld   (instr+3),a
-     ld   a,<instr_done
-     ld   (instr+4),a
-     ld   a,>instr_done
-     ld   (instr+5),a
-     
-     call reset_crc
-     call test_instr
-     
-     call checksums_compare
-     jr   z,passed
-     
-     set_test 1
-     ld   a,(instr)
-     call print_a
-     cp   $CB
-     jr   nz,+
-     ld   a,(instr+1)
-     call print_a
-+    
-
-passed:
-     ; Next instruction
-     pop  hl
-     ld   a,l
-     cp   <instrs_end
-     jr   nz,-
-     ld   a,h
-     cp   >instrs_end
-     jr   nz,-
-     
-     jp   tests_done
-
-
-; Updates checksum with AF, BC, DE, and HL
-checksum_af_bc_de_hl:
-     push hl
-     
-     push af
-     update_crc_fast
-     pop  hl
-     ld   a,l
-     update_crc_fast
-     
-     ld   a,b
-     update_crc_fast
-     ld   a,c
-     update_crc_fast
-     
-     ld   a,d
-     update_crc_fast
-     ld   a,e
-     update_crc_fast
-     
-     pop  de
-     ld   a,d
-     update_crc_fast
-     ld   a,e
-     update_crc_fast
-     ret
diff --git a/tests/cpu_instrs/source/common/macros.inc b/tests/cpu_instrs/source/common/macros.inc
deleted file mode 100644
index c413bd5..0000000
--- a/tests/cpu_instrs/source/common/macros.inc
+++ /dev/null
@@ -1,73 +0,0 @@
-; General macros
-
-; Reads A from addr, from $FF00 to $FFFF
-; Preserved: F, BC, DE, HL
-; Time: 3 cycles
-.macro lda ARGS addr
-     ldh  a,(addr - $FF00)
-.endm
-
-; Writes A to addr, from $FF00 to $FFFF
-; Preserved: AF, BC, DE, HL
-; Time: 3 cycles
-.macro sta ARGS addr
-     ldh  (addr - $FF00),a
-.endm
-
-; Writes immediate data to addr, from $FF00 to $FFFF
-; Preserved: F, BC, DE, HL
-; Time: 5 cycles
-.macro wreg ARGS addr, data
-     ld   a,data
-     sta  addr
-.endm
-
-; Calls routine multiple times, with A having the
-; value 'start' the first time, 'start+step' the
-; second time, up to 'end' for the last time.
-; Preserved: BC, DE, HL
-.macro for_loop ; routine,start,end,step
-     ld   a,\2
-     
-for_loop\@:
-     push af
-     call \1
-     pop  af
-     
-     add  \4
-     cp   <(\3 + \4)
-     jr   nz,for_loop\@
-.endm
-
-; Calls routine n times. The value of A in the routine
-; counts from 0 to n-1.
-; Preserved: BC, DE, HL
-.macro loop_n_times ; routine,n
-     for_loop \1,0,\2 - 1,+1
-.endm
-
-; Same as for_loop, but counts with 16-bit value in BC.
-; Preserved: DE, HL
-.macro for_loop16 ; routine,start,end,step
-     ld   bc,\2
-     
-for_loop16\@:
-     push bc
-     call \1
-     pop  bc
-     
-     ld   a,c
-     add  <\4
-     ld   c,a
-     
-     ld   a,b
-     adc  >\4
-     ld   b,a
-     
-     cp   >(\3+\4)
-     jr   nz,for_loop16\@
-     
-     ld   a,c
-     cp   <(\3+\4)
-     jr   nz,for_loop16\@
-.endm
diff --git a/tests/cpu_instrs/source/common/multi_custom.s b/tests/cpu_instrs/source/common/multi_custom.s
deleted file mode 100644
index 4dbae9d..0000000
--- a/tests/cpu_instrs/source/common/multi_custom.s
+++ /dev/null
@@ -1,38 +0,0 @@
-; RST handlers
-.bank 0 slot 0
-.org 0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
-     .ds 6,0
-     inc  a
-     ret
diff --git a/tests/cpu_instrs/source/common/numbers.s b/tests/cpu_instrs/source/common/numbers.s
deleted file mode 100644
index 6d6faf8..0000000
--- a/tests/cpu_instrs/source/common/numbers.s
+++ /dev/null
@@ -1,177 +0,0 @@
-; Printing of numeric values
-
-; Prints value of indicated register/pair
-; as 2/4 hex digits, followed by a space.
-; Updates checksum with printed values.
-; Preserved: AF, BC, DE, HL
-
-print_regs:
-     call print_af
-     call print_bc
-     call print_de
-     call print_hl
-     call print_newline
-     ret
-
-print_a:
-     push af
-print_a_:
-     call print_hex
-     ld   a,' '
-     call print_char_nocrc
-     pop  af
-     ret
-
-print_af:
-     push af
-     call print_hex
-     pop  af
-print_f:
-     push bc
-     push af
-     pop  bc
-     call print_c
-     pop  bc
-     ret
-
-print_b:
-     push af
-     ld   a,b
-     jr   print_a_
-
-print_c:
-     push af
-     ld   a,c
-     jr   print_a_
-
-print_d:
-     push af
-     ld   a,d
-     jr   print_a_
-
-print_e:
-     push af
-     ld   a,e
-     jr   print_a_
-
-print_h:
-     push af
-     ld   a,h
-     jr   print_a_
-
-print_l:
-     push af
-     ld   a,l
-     jr   print_a_
-
-print_bc:
-     push af
-     push bc
-print_bc_:
-     ld   a,b
-     call print_hex
-     ld   a,c
-     pop  bc
-     jr   print_a_
-     
-print_de:
-     push af
-     push bc
-     ld   b,d
-     ld   c,e
-     jr   print_bc_
-     
-print_hl:
-     push af
-     push bc
-     ld   b,h
-     ld   c,l
-     jr   print_bc_
-     
-
-; Prints A as two hex chars and updates checksum
-; Preserved: BC, DE, HL
-print_hex:
-     call update_crc
-print_hex_nocrc:
-     push af
-     swap a
-     call +
-     pop  af
-     
-+    and  $0F
-     cp   10
-     jr   c,+
-     add  7
-+    add  '0'
-     jp   print_char_nocrc
-
-
-; Prints char_nz if Z flag is clear,
-; char_z if Z flag is set.
-; Preserved: AF, BC, DE, HL
-.macro print_nz ARGS char_nz, char_z
-     push af
-     ld   a,char_nz
-     jr   nz,print_nz\@
-     ld   a,char_z
-print_nz\@:
-     call print_char
-     pop  af
-.endm
-
-
-; Prints char_nc if C flag is clear,
-; char_c if C flag is set.
-; Preserved: AF, BC, DE, HL
-.macro print_nc ARGS char_nc, char_c
-     push af
-     ld   a,char_nc
-     jr   nz,print_nc\@
-     ld   a,char_c
-print_nc\@:
-     call print_char
-     pop  af
-.endm
-
-
-; Prints A as 2 decimal digits
-; Preserved: AF, BC, DE, HL
-print_dec2:
-     push af
-     push bc
-     jr   +
-
-
-; Prints A as 1-3 digit decimal value
-; Preserved: AF, BC, DE, HL
-print_dec:
-     push af
-     push bc
-     
-     cp   10
-     jr   c,++
-     ld   c,100
-     cp   c
-     call nc,@digit
-+    ld   c,10
-     call @digit
-++   add  '0'
-     call print_char
-     
-     pop  bc
-     pop  af
-     ret
-     
-@digit:
-     ld   b,'0'-1
--    inc  b
-     sub  c
-     jr   nc,-
-     add  c
-     
-     ld   c,a
-     ld   a,b
-     call print_char
-     ld   a,c
-     ret
diff --git a/tests/cpu_instrs/source/common/printing.s b/tests/cpu_instrs/source/common/printing.s
deleted file mode 100644
index ad9d811..0000000
--- a/tests/cpu_instrs/source/common/printing.s
+++ /dev/null
@@ -1,98 +0,0 @@
-; Main printing routine that checksums and
-; prints to output device
-
-; Character that does equivalent of print_newline
-.define newline 10
-
-; Prints char without updating checksum
-; Preserved: BC, DE, HL
-.define print_char_nocrc bss
-.redefine bss            bss+3
-
-
-; Initializes printing. HL = print routine
-init_printing:
-     ld   a,l
-     ld   (print_char_nocrc+1),a
-     ld   a,h
-     ld   (print_char_nocrc+2),a
-     jr   show_printing
-
-
-; Hides/shows further printing
-; Preserved: BC, DE, HL
-hide_printing:
-     ld   a,$C9     ; RET
-     jr   +
-show_printing:
-     ld   a,$C3     ; JP (nn)
-+    ld   (print_char_nocrc),a
-     ret
-
-
-; Prints character and updates checksum UNLESS
-; it's a newline.
-; Preserved: AF, BC, DE, HL
-print_char:
-     push af
-     cp   newline
-     call nz,update_crc
-     call print_char_nocrc
-     pop  af
-     ret
-
-
-; Prints space. Does NOT update checksum.
-; Preserved: AF, BC, DE, HL
-print_space:
-     push af
-     ld   a,' '
-     call print_char_nocrc
-     pop  af
-     ret
-
-
-; Advances to next line. Does NOT update checksum.
-; Preserved: AF, BC, DE, HL
-print_newline:
-     push af
-     ld   a,newline
-     call print_char_nocrc
-     pop  af
-     ret
-
-
-; Prints immediate string
-; Preserved: AF, BC, DE, HL
-.macro print_str ; string,string2
-     push hl
-     call print_str_
-     .byte \1
-     .if NARGS > 1
-          .byte \2
-     .endif
-     .if NARGS > 2
-          .byte \3
-     .endif
-     .byte 0
-     pop  hl
-.endm
-
-print_str_:
-     pop  hl
-     call print_str_hl
-     jp   hl
-
-
-; Prints zero-terminated string pointed to by HL.
-; On return, HL points to byte AFTER zero terminator.
-; Preserved: AF, BC, DE
-print_str_hl:
-     push af
-     jr   +
--    call print_char
-+    ldi  a,(hl)
-     or   a
-     jr   nz,-
-     pop  af
-     ret
diff --git a/tests/cpu_instrs/source/common/runtime.s b/tests/cpu_instrs/source/common/runtime.s
deleted file mode 100644
index 90cd24f..0000000
--- a/tests/cpu_instrs/source/common/runtime.s
+++ /dev/null
@@ -1,142 +0,0 @@
-; Common routines and runtime
-
-; Must be defined by target-specific runtime:
-;
-; init_runtime:     ; target-specific inits
-; std_print:        ; default routine to print char A
-; post_exit:        ; called at end of std_exit
-; report_byte:      ; report A to user
-
-.define RUNTIME_INCLUDED 1
-
-.ifndef bss
-     ; address of next normal variable
-     .define bss    $D800
-.endif
-
-.ifndef dp
-     ; address of next direct-page ($FFxx) variable
-     .define dp     $FF80
-.endif
-
-; DMG/CGB hardware identifier
-.define gb_id_cgb        $10  ; mask for testing CGB bit
-.define gb_id_devcart    $04 ; mask for testing "on devcart" bit
-
-.define gb_id  bss
-.redefine bss  bss+1
-
-; Stack is normally here
-.define std_stack $DFFF
-
-; Copies $1000 bytes from HL to $C000, then jumps to it.
-; A is preserved for jumped-to code.
-copy_to_wram_then_run:
-     ld   b,a
-     
-     ld   de,$C000
-     ld   c,$10
--    ldi  a,(hl)
-     ld   (de),a
-     inc  e
-     jr   nz,-
-     inc  d
-     dec  c
-     jr   nz,-
-     
-     ld   a,b
-     jp   $C000
-
-.ifndef CUSTOM_RESET
-     reset:
-          ; Run code from $C000, as is done on devcart. This
-          ; ensures minimal difference in how it behaves.
-          ld   hl,$4000
-          jp   copy_to_wram_then_run
-     
-     .bank 1 slot 1
-     .org $0 ; otherwise wla pads with lots of zeroes
-          jp   std_reset
-.endif
-
-; Common routines
-.include "gb.inc"
-.include "macros.inc"
-.include "delay.s"
-.include "crc.s"
-.include "printing.s"
-.include "numbers.s"
-.include "testing.s"
-     
-; Sets up hardware and runs main
-std_reset:
-
-     ; Init hardware
-     di
-     ld   sp,std_stack
-     
-     ; Save DMG/CGB id
-     ld   (gb_id),a
-     
-     ; Init hardware
-     .ifndef BUILD_GBS
-          wreg TAC,$00
-          wreg IF,$00
-          wreg IE,$00
-     .endif
-     
-     wreg NR52,0    ; sound off
-     wreg NR52,$80  ; sound on
-     wreg NR51,$FF  ; mono
-     wreg NR50,$77  ; volume
-     
-     ; TODO: clear all memory?
-     
-     ld   hl,std_print
-     call init_printing
-     call init_testing
-     call init_runtime
-     call reset_crc ; in case init_runtime prints anything
-     
-     delay_msec 250
-     
-     ; Run user code
-     call main
-     
-     ; Default is to successful exit
-     ld   a,0
-     jp   exit
-
-
-; Exits code and reports value of A
-exit:
-     ld   sp,std_stack
-     push af
-     call +
-     pop  af
-     jp   post_exit
-
-+    push af   
-     call print_newline
-     call show_printing
-     pop  af
-     
-     ; Report exit status
-     cp   1
-     
-     ; 0: ""
-     ret  c
-     
-     ; 1: "Failed"
-     jr   nz,+
-     print_str "Failed",newline
-     ret
-     
-     ; n: "Failed #n"
-+    print_str "Failed #"
-     call print_dec
-     call print_newline
-     ret
-
-; returnOrg puts this code AFTER user code.
-.section "runtime" returnOrg
diff --git a/tests/cpu_instrs/source/common/testing.s b/tests/cpu_instrs/source/common/testing.s
deleted file mode 100644
index c102f78..0000000
--- a/tests/cpu_instrs/source/common/testing.s
+++ /dev/null
@@ -1,176 +0,0 @@
-; Diagnostic and testing utilities
-
-.define result      bss+0
-.define test_name   bss+1
-.redefine bss       bss+3
-
-
-; Sets test code and optional error text
-; Preserved: AF, BC, DE, HL
-.macro set_test ; code[,text[,text2]]
-     push hl
-     call set_test_
-     jr   @set_test\@
-     .byte \1
-     .if NARGS > 1
-          .byte \2
-     .endif
-     .if NARGS > 2
-          .byte \3
-     .endif
-     .byte 0
-@set_test\@:
-     pop  hl
-.endm
-
-set_test_:
-     pop  hl
-     push hl
-     push af
-     inc  hl
-     inc  hl
-     ldi  a,(hl)
-     ld   (result),a
-     ld   a,l
-     ld   (test_name),a
-     ld   a,h
-     ld   (test_name+1),a
-     pop  af
-     ret
-
-
-; Initializes testing module
-init_testing:
-     set_test $FF
-     call init_crc
-     ret
-
-
-; Reports "Passed", then exits with code 0
-tests_passed:
-     call print_newline
-     print_str "Passed"
-     ld   a,0
-     jp   exit
-
-
-; Reports "Done" if set_test has never been used,
-; "Passed" if set_test 0 was last used, or
-; failure if set_test n was last used.
-tests_done:
-     ld   a,(result)
-     inc  a
-     jr   z,+
-     dec  a
-     jr   z,tests_passed
-     jr   test_failed
-+    print_str "Done"
-     ld   a,0
-     jp   exit
-
-
-; Reports current error text and exits with result code
-test_failed:
-     ld   a,(test_name)
-     ld   l,a
-     ld   a,(test_name+1)
-     ld   h,a
-     ld   a,(hl)
-     or   a
-     jr   z,+
-     call print_newline
-     call print_str_hl
-     call print_newline
-+    
-     ld   a,(result)
-     cp   1         ; if a = 0 then a = 1
-     adc  0
-     jp   exit
-
-
-; Prints checksum as 8-character hex value
-; Preserved: AF, BC, DE, HL
-print_crc:
-     push af
-     
-     ; Must read checksum entirely before printing,
-     ; since printing updates it.
-     lda  checksum
-     cpl
-     push af
-     
-     lda  checksum+1
-     cpl
-     push af
-     
-     lda  checksum+2
-     cpl
-     push af
-     
-     lda  checksum+3
-     cpl
-     
-     call print_hex
-     pop  af
-     call print_hex
-     pop  af
-     call print_hex
-     pop  af
-     call print_a
-     
-     pop  af
-     ret
-
-
-; If checksum doesn't match expected, reports failed test.
-; Passing 0 just prints checksum. Clears checksum afterwards.
-.macro check_crc ARGS crc
-     .if crc == 0
-          call show_printing
-          call print_newline
-          call print_crc
-     .else
-          ld   bc,(crc >> 16) ~ $FFFF
-          ld   de,(crc & $FFFF) ~ $FFFF
-          call check_crc_
-     .endif
-.endm
-
-check_crc_:
-     lda  checksum+0
-     cp   e
-     jr   nz,+
-     
-     lda  checksum+1
-     cp   d
-     jr   nz,+
-     
-     lda  checksum+2
-     cp   c
-     jr   nz,+
-     
-     lda  checksum+3
-     cp   b
-     jr   nz,+
-     
-     jp   reset_crc
-     
-+    call print_crc
-     jp   test_failed
-
-
-; Updates checksum with bytes from addr to addr+size-1
-.macro checksum_mem ARGS addr,size
-     ld   hl,addr
-     ld   bc,size
-     call checksum_mem_
-.endm
-
-checksum_mem_:
--    ldi  a,(hl)
-     call update_crc
-     dec  bc
-     ld   a,b
-     or   c
-     jr   nz,-
-     ret
diff --git a/tests/cpu_instrs/source/linkfile b/tests/cpu_instrs/source/linkfile
deleted file mode 100644
index 02a5a2e..0000000
--- a/tests/cpu_instrs/source/linkfile
+++ /dev/null
@@ -1,2 +0,0 @@
-[objects]
-test.o
diff --git a/tests/cpu_instrs/source/shell.inc b/tests/cpu_instrs/source/shell.inc
deleted file mode 100644
index 277a9b7..0000000
--- a/tests/cpu_instrs/source/shell.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-.incdir "common"
-
-; GBS music file
-.ifdef BUILD_GBS
-     .include "build_gbs.s"
-.endif
-
-; Devcart
-.ifdef BUILD_DEVCART
-     .include "build_devcart.s"
-.endif
-
-; Sub-test in a multi-test ROM
-.ifdef BUILD_MULTI
-     .include "build_multi.s"
-.endif
-
-; GB ROM (default)
-.ifndef RUNTIME_INCLUDED
-     .include "build_rom.s"
-.endif
diff --git a/tests/halt_bug.gb b/tests/halt_bug.gb
deleted file mode 100644
index 38e36625d805e68cb3b8cbf562d6dff500060bdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
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
E4gE)k{r~^~