diff --git a/test/test11/golden.s b/test/test11/golden.s
index ead9461..124841c 100644
--- a/test/test11/golden.s
+++ b/test/test11/golden.s
@@ -9960,9 +9960,9 @@ _MAININTRO:
 	clr.l (a2)
 	clr.l 4(a2)
 	lea _SMemA+4,a0
+	clr.l (a0)+
+	clr.l (a0)+
 	clr.l (a0)
-	clr.l 4(a0)
-	clr.l 8(a0)
 	clr.l _IMemA
 	clr.l _IMemA+4
 	jsr _LOADSOUNDS
diff --git a/test/test11/test.s b/test/test11/test.s
index ead9461..124841c 100644
--- a/test/test11/test.s
+++ b/test/test11/test.s
@@ -9960,9 +9960,9 @@ _MAININTRO:
 	clr.l (a2)
 	clr.l 4(a2)
 	lea _SMemA+4,a0
+	clr.l (a0)+
+	clr.l (a0)+
 	clr.l (a0)
-	clr.l 4(a0)
-	clr.l 8(a0)
 	clr.l _IMemA
 	clr.l _IMemA+4
 	jsr _LOADSOUNDS
diff --git a/test/test13/bbb/board.s b/test/test13/bbb/board.s
index 72a438b..280e7d1 100644
--- a/test/test13/bbb/board.s
+++ b/test/test13/bbb/board.s
@@ -226,14 +226,14 @@ _isAttacked:
 	cmp.b #2,(a1,d7.l)
 	jeq .L140
 .L41:
-	moveq #31,d1
-	add.l a0,d1
-	moveq #119,d0
-	not.b d0
-	and.l d1,d0
+	moveq #31,d0
+	add.l a0,d0
+	moveq #119,d1
+	not.b d1
+	and.l d0,d1
 	jne .L42
 	lea _board,a1
-	cmp.b #3,(a1,d1.l)
+	cmp.b #3,(a1,d0.l)
 	jeq .L140
 .L42:
 	moveq #16,d1
diff --git a/test/test13/bbb/move.s b/test/test13/bbb/move.s
index 6e9db2e..713a0c7 100644
--- a/test/test13/bbb/move.s
+++ b/test/test13/bbb/move.s
@@ -205,18 +205,18 @@ _move_to_san:
 	jeq .L66
 	lea _buffer.2847,a2
 	lea _buffer.2847,a0
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
 	clr.b (a0)
-	clr.b 1(a0)
-	clr.b 2(a0)
-	clr.b 3(a0)
-	clr.b 4(a0)
-	clr.b 5(a0)
-	clr.b 6(a0)
-	clr.b 7(a0)
-	clr.b 8(a0)
-	clr.b 9(a0)
-	clr.b 10(a0)
-	clr.b 11(a0)
 	move.l d1,d7
 	clr.w d7
 	swap d7
@@ -577,9 +577,10 @@ _moveToUCI:
 	cmp.l d2,d0
 	jeq .L87
 	jge .L94
-	subq.l #6,d2
+	moveq #6,d0
+	cmp.l d2,d0
 	jeq .L90
-	subq.l #1,d2
+	subq.l #7,d2
 	jne .L86
 	move.b #113,_buffer.2880+4
 .L86:
@@ -694,9 +695,10 @@ _printMoveList:
 .L111:
 	cmp.l d2,d0
 	jge .L110
-	subq.l #6,d2
+	moveq #6,d0
+	cmp.l d2,d0
 	jeq .L102
-	subq.l #1,d2
+	subq.l #7,d2
 	jne .L98
 	pea .LC17
 	jsr (a3)
@@ -5629,9 +5631,10 @@ _printLine:
 	cmp.l d2,d0
 	jeq .L844
 	jge .L891
-	subq.l #6,d2
+	moveq #6,d0
+	cmp.l d2,d0
 	jeq .L845
-	subq.l #1,d2
+	subq.l #7,d2
 	jne .L843
 	pea .LC10
 	jsr (a2)
@@ -5712,9 +5715,10 @@ _printLine:
 	cmp.l d2,d0
 	jeq .L849
 	jge .L892
-	subq.l #6,d2
+	moveq #6,d0
+	cmp.l d2,d0
 	jeq .L852
-	subq.l #1,d2
+	subq.l #7,d2
 	jne .L848
 	pea .LC10
 	move.l d5,a0
@@ -5970,9 +5974,10 @@ _printLine:
 	cmp.l d3,d0
 	jeq .L866
 	jge .L895
-	subq.l #6,d3
+	moveq #6,d0
+	cmp.l d3,d0
 	jeq .L869
-	subq.l #1,d3
+	subq.l #7,d3
 	jne .L865
 	pea .LC10
 	move.l d2,a0
@@ -6759,9 +6764,10 @@ _Divide:
 	cmp.l d4,d0
 	jeq .L968
 	jge .L995
-	subq.l #6,d4
+	moveq #6,d0
+	cmp.l d4,d0
 	jeq .L971
-	subq.l #1,d4
+	subq.l #7,d4
 	jne .L967
 	pea .LC10
 	move.l 62(sp),a1
@@ -7051,11 +7057,11 @@ _generatePawnCaptureMoves:
 	jeq .L1002
 	moveq #0,d0
 	move.b d1,d0
-	moveq #8,d7
-	and.l d7,d1
+	moveq #8,d5
+	and.l d5,d1
 	cmp.l d3,d1
 	jeq .L1002
-	cmp.l d3,d7
+	cmp.l d3,d5
 	jeq .L1038
 	tst.l d3
 	jne .L1014
@@ -8353,13 +8359,13 @@ _generateKingCaptureMoves:
 	and.l d3,d4
 	jne .L1252
 	lea _board,a1
-	move.b (a1,d3.l),d6
+	move.b (a1,d3.l),d4
 	jeq .L1252
-	moveq #8,d4
-	and.l d6,d4
-	cmp.l a5,d4
+	moveq #8,d6
+	and.l d4,d6
+	cmp.l a5,d6
 	jeq .L1252
-	and.l #255,d6
+	and.l #255,d4
 	move.l d1,a2
 	add.l d1,a2
 	add.l d1,a2
@@ -8368,14 +8374,14 @@ _generateKingCaptureMoves:
 	lea (a0,a2.l),a2
 	lsl.l #8,d3
 	or.l d2,d3
-	move.l d6,d4
-	lsl.w #4,d4
-	swap d4
-	clr.w d4
-	or.l d4,d3
+	move.l d4,d6
+	lsl.w #4,d6
+	swap d6
+	clr.w d6
+	or.l d6,d3
 	move.l d3,(a2)
-	lsl.l #4,d6
-	move.l d6,a1
+	lsl.l #4,d4
+	move.l d4,a1
 	add.l d5,a1
 	add.l a1,a1
 	add.l a1,a1
@@ -8394,7 +8400,7 @@ _generateKingCaptureMoves:
 	jne .L1239
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1282
 .L1239:
 	moveq #-15,d4
@@ -8416,7 +8422,7 @@ _generateKingCaptureMoves:
 	jne .L1241
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1284
 .L1241:
 	move.l d0,d4
@@ -8427,7 +8433,7 @@ _generateKingCaptureMoves:
 	jne .L1242
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1285
 .L1242:
 	moveq #15,d4
@@ -8438,7 +8444,7 @@ _generateKingCaptureMoves:
 	jne .L1243
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1286
 .L1243:
 	moveq #16,d4
@@ -8586,11 +8592,11 @@ _generateKingCaptureMoves:
 	jra .L1240
 .L1282:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1239
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -8621,11 +8627,11 @@ _generateKingCaptureMoves:
 	jra .L1239
 .L1285:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1242
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -8656,11 +8662,11 @@ _generateKingCaptureMoves:
 	jra .L1242
 .L1284:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1241
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -8691,11 +8697,11 @@ _generateKingCaptureMoves:
 	jra .L1241
 .L1286:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1243
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -8746,13 +8752,13 @@ _generateKnightCaptureMoves:
 	and.l d3,d4
 	jne .L1303
 	lea _board,a1
-	move.b (a1,d3.l),d6
+	move.b (a1,d3.l),d4
 	jeq .L1303
-	moveq #8,d4
-	and.l d6,d4
-	cmp.l a5,d4
+	moveq #8,d6
+	and.l d4,d6
+	cmp.l a5,d6
 	jeq .L1303
-	and.l #255,d6
+	and.l #255,d4
 	move.l d1,a2
 	add.l d1,a2
 	add.l d1,a2
@@ -8761,14 +8767,14 @@ _generateKnightCaptureMoves:
 	lea (a0,a2.l),a2
 	lsl.l #8,d3
 	or.l d2,d3
-	move.l d6,d4
-	lsl.w #4,d4
-	swap d4
-	clr.w d4
-	or.l d4,d3
+	move.l d4,d6
+	lsl.w #4,d6
+	swap d6
+	clr.w d6
+	or.l d6,d3
 	move.l d3,(a2)
-	lsl.l #4,d6
-	move.l d6,a1
+	lsl.l #4,d4
+	move.l d4,a1
 	add.l d5,a1
 	add.l a1,a1
 	add.l a1,a1
@@ -8787,7 +8793,7 @@ _generateKnightCaptureMoves:
 	jne .L1290
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1333
 .L1290:
 	moveq #-18,d4
@@ -8809,7 +8815,7 @@ _generateKnightCaptureMoves:
 	jne .L1292
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1335
 .L1292:
 	moveq #14,d4
@@ -8820,7 +8826,7 @@ _generateKnightCaptureMoves:
 	jne .L1293
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1336
 .L1293:
 	moveq #18,d4
@@ -8831,7 +8837,7 @@ _generateKnightCaptureMoves:
 	jne .L1294
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1337
 .L1294:
 	moveq #31,d4
@@ -8979,11 +8985,11 @@ _generateKnightCaptureMoves:
 	jra .L1291
 .L1333:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1290
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -9014,11 +9020,11 @@ _generateKnightCaptureMoves:
 	jra .L1290
 .L1336:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1293
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -9049,11 +9055,11 @@ _generateKnightCaptureMoves:
 	jra .L1293
 .L1335:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1292
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -9084,11 +9090,11 @@ _generateKnightCaptureMoves:
 	jra .L1292
 .L1337:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1294
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
diff --git a/test/test13/bbb/rkiss.s b/test/test13/bbb/rkiss.s
index 84f639f..d6f5b20 100644
--- a/test/test13/bbb/rkiss.s
+++ b/test/test13/bbb/rkiss.s
@@ -97,8 +97,8 @@ _rand64:
 _rkissSeed:
 	lea (-32,sp),sp
 	movem.l #16188,-(sp)
-	move.l 76(sp),a5
-	cmp.w #0,a5
+	move.l 76(sp),a1
+	cmp.w #0,a1
 	jeq .L6
 	clr.l _a
 	move.l #-236298515,_a+4
@@ -108,7 +108,7 @@ _rkissSeed:
 	move.l #-723440521,_c+4
 	clr.l _b
 	move.l #-723440521,_b+4
-	cmp.w #0,a5
+	cmp.w #0,a1
 	jle .L2
 	clr.l d2
 	move.l #-723440521,d3
@@ -118,13 +118,13 @@ _rkissSeed:
 	move.l d3,d1
 	clr.l d6
 	move.l #-236298515,d7
-	sub.l a1,a1
-	move.l a1,a0
+	sub.l a2,a2
+	move.l a2,a0
 	move.l d6,48(sp)
 	move.l d7,52(sp)
 	move.l d2,40(sp)
 	move.l d3,44(sp)
-	move.l a5,68(sp)
+	move.l a1,68(sp)
 .L4:
 	move.l d1,d2
 	moveq #25,d3
diff --git a/test/test13/bbb/search.s b/test/test13/bbb/search.s
index 9cfb3c8..a3914c9 100644
--- a/test/test13/bbb/search.s
+++ b/test/test13/bbb/search.s
@@ -1388,11 +1388,11 @@ _think:
 	jne .L199
 	move.l 24(a2),d6
 	move.l 28(a2),d7
-	move.l d3,d1
-	sub.l 4(a2),d1
+	move.l d3,d0
+	sub.l 4(a2),d0
 	cmp.w #0,a4
 	jne .L203
-	move.l d1,-(sp)
+	move.l d0,-(sp)
 	move.l d7,d0
 	moveq #27,d1
 	lsr.l d1,d0
@@ -1641,7 +1641,7 @@ _think:
 	lea (16,sp),sp
 	jra .L199
 .L203:
-	move.l d1,-(sp)
+	move.l d0,-(sp)
 	move.l d7,d0
 	moveq #27,d1
 	lsr.l d1,d0
diff --git a/test/test13/bbb/sillychess.s b/test/test13/bbb/sillychess.s
index a84f4e3..7b21aa6 100644
--- a/test/test13/bbb/sillychess.s
+++ b/test/test13/bbb/sillychess.s
@@ -152,6 +152,7 @@ _testPerft:
 	addq.l #1,d5
 	jra .L24
 .L5:
+	move.b (a4),d0
 	trap #7
 .L23:
 	pea .LC3
diff --git a/test/test13/golden/board.s b/test/test13/golden/board.s
index 72a438b..280e7d1 100644
--- a/test/test13/golden/board.s
+++ b/test/test13/golden/board.s
@@ -226,14 +226,14 @@ _isAttacked:
 	cmp.b #2,(a1,d7.l)
 	jeq .L140
 .L41:
-	moveq #31,d1
-	add.l a0,d1
-	moveq #119,d0
-	not.b d0
-	and.l d1,d0
+	moveq #31,d0
+	add.l a0,d0
+	moveq #119,d1
+	not.b d1
+	and.l d0,d1
 	jne .L42
 	lea _board,a1
-	cmp.b #3,(a1,d1.l)
+	cmp.b #3,(a1,d0.l)
 	jeq .L140
 .L42:
 	moveq #16,d1
diff --git a/test/test13/golden/move.s b/test/test13/golden/move.s
index 6e9db2e..713a0c7 100644
--- a/test/test13/golden/move.s
+++ b/test/test13/golden/move.s
@@ -205,18 +205,18 @@ _move_to_san:
 	jeq .L66
 	lea _buffer.2847,a2
 	lea _buffer.2847,a0
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
+	clr.b (a0)+
 	clr.b (a0)
-	clr.b 1(a0)
-	clr.b 2(a0)
-	clr.b 3(a0)
-	clr.b 4(a0)
-	clr.b 5(a0)
-	clr.b 6(a0)
-	clr.b 7(a0)
-	clr.b 8(a0)
-	clr.b 9(a0)
-	clr.b 10(a0)
-	clr.b 11(a0)
 	move.l d1,d7
 	clr.w d7
 	swap d7
@@ -577,9 +577,10 @@ _moveToUCI:
 	cmp.l d2,d0
 	jeq .L87
 	jge .L94
-	subq.l #6,d2
+	moveq #6,d0
+	cmp.l d2,d0
 	jeq .L90
-	subq.l #1,d2
+	subq.l #7,d2
 	jne .L86
 	move.b #113,_buffer.2880+4
 .L86:
@@ -694,9 +695,10 @@ _printMoveList:
 .L111:
 	cmp.l d2,d0
 	jge .L110
-	subq.l #6,d2
+	moveq #6,d0
+	cmp.l d2,d0
 	jeq .L102
-	subq.l #1,d2
+	subq.l #7,d2
 	jne .L98
 	pea .LC17
 	jsr (a3)
@@ -5629,9 +5631,10 @@ _printLine:
 	cmp.l d2,d0
 	jeq .L844
 	jge .L891
-	subq.l #6,d2
+	moveq #6,d0
+	cmp.l d2,d0
 	jeq .L845
-	subq.l #1,d2
+	subq.l #7,d2
 	jne .L843
 	pea .LC10
 	jsr (a2)
@@ -5712,9 +5715,10 @@ _printLine:
 	cmp.l d2,d0
 	jeq .L849
 	jge .L892
-	subq.l #6,d2
+	moveq #6,d0
+	cmp.l d2,d0
 	jeq .L852
-	subq.l #1,d2
+	subq.l #7,d2
 	jne .L848
 	pea .LC10
 	move.l d5,a0
@@ -5970,9 +5974,10 @@ _printLine:
 	cmp.l d3,d0
 	jeq .L866
 	jge .L895
-	subq.l #6,d3
+	moveq #6,d0
+	cmp.l d3,d0
 	jeq .L869
-	subq.l #1,d3
+	subq.l #7,d3
 	jne .L865
 	pea .LC10
 	move.l d2,a0
@@ -6759,9 +6764,10 @@ _Divide:
 	cmp.l d4,d0
 	jeq .L968
 	jge .L995
-	subq.l #6,d4
+	moveq #6,d0
+	cmp.l d4,d0
 	jeq .L971
-	subq.l #1,d4
+	subq.l #7,d4
 	jne .L967
 	pea .LC10
 	move.l 62(sp),a1
@@ -7051,11 +7057,11 @@ _generatePawnCaptureMoves:
 	jeq .L1002
 	moveq #0,d0
 	move.b d1,d0
-	moveq #8,d7
-	and.l d7,d1
+	moveq #8,d5
+	and.l d5,d1
 	cmp.l d3,d1
 	jeq .L1002
-	cmp.l d3,d7
+	cmp.l d3,d5
 	jeq .L1038
 	tst.l d3
 	jne .L1014
@@ -8353,13 +8359,13 @@ _generateKingCaptureMoves:
 	and.l d3,d4
 	jne .L1252
 	lea _board,a1
-	move.b (a1,d3.l),d6
+	move.b (a1,d3.l),d4
 	jeq .L1252
-	moveq #8,d4
-	and.l d6,d4
-	cmp.l a5,d4
+	moveq #8,d6
+	and.l d4,d6
+	cmp.l a5,d6
 	jeq .L1252
-	and.l #255,d6
+	and.l #255,d4
 	move.l d1,a2
 	add.l d1,a2
 	add.l d1,a2
@@ -8368,14 +8374,14 @@ _generateKingCaptureMoves:
 	lea (a0,a2.l),a2
 	lsl.l #8,d3
 	or.l d2,d3
-	move.l d6,d4
-	lsl.w #4,d4
-	swap d4
-	clr.w d4
-	or.l d4,d3
+	move.l d4,d6
+	lsl.w #4,d6
+	swap d6
+	clr.w d6
+	or.l d6,d3
 	move.l d3,(a2)
-	lsl.l #4,d6
-	move.l d6,a1
+	lsl.l #4,d4
+	move.l d4,a1
 	add.l d5,a1
 	add.l a1,a1
 	add.l a1,a1
@@ -8394,7 +8400,7 @@ _generateKingCaptureMoves:
 	jne .L1239
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1282
 .L1239:
 	moveq #-15,d4
@@ -8416,7 +8422,7 @@ _generateKingCaptureMoves:
 	jne .L1241
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1284
 .L1241:
 	move.l d0,d4
@@ -8427,7 +8433,7 @@ _generateKingCaptureMoves:
 	jne .L1242
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1285
 .L1242:
 	moveq #15,d4
@@ -8438,7 +8444,7 @@ _generateKingCaptureMoves:
 	jne .L1243
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1286
 .L1243:
 	moveq #16,d4
@@ -8586,11 +8592,11 @@ _generateKingCaptureMoves:
 	jra .L1240
 .L1282:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1239
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -8621,11 +8627,11 @@ _generateKingCaptureMoves:
 	jra .L1239
 .L1285:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1242
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -8656,11 +8662,11 @@ _generateKingCaptureMoves:
 	jra .L1242
 .L1284:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1241
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -8691,11 +8697,11 @@ _generateKingCaptureMoves:
 	jra .L1241
 .L1286:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1243
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -8746,13 +8752,13 @@ _generateKnightCaptureMoves:
 	and.l d3,d4
 	jne .L1303
 	lea _board,a1
-	move.b (a1,d3.l),d6
+	move.b (a1,d3.l),d4
 	jeq .L1303
-	moveq #8,d4
-	and.l d6,d4
-	cmp.l a5,d4
+	moveq #8,d6
+	and.l d4,d6
+	cmp.l a5,d6
 	jeq .L1303
-	and.l #255,d6
+	and.l #255,d4
 	move.l d1,a2
 	add.l d1,a2
 	add.l d1,a2
@@ -8761,14 +8767,14 @@ _generateKnightCaptureMoves:
 	lea (a0,a2.l),a2
 	lsl.l #8,d3
 	or.l d2,d3
-	move.l d6,d4
-	lsl.w #4,d4
-	swap d4
-	clr.w d4
-	or.l d4,d3
+	move.l d4,d6
+	lsl.w #4,d6
+	swap d6
+	clr.w d6
+	or.l d6,d3
 	move.l d3,(a2)
-	lsl.l #4,d6
-	move.l d6,a1
+	lsl.l #4,d4
+	move.l d4,a1
 	add.l d5,a1
 	add.l a1,a1
 	add.l a1,a1
@@ -8787,7 +8793,7 @@ _generateKnightCaptureMoves:
 	jne .L1290
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1333
 .L1290:
 	moveq #-18,d4
@@ -8809,7 +8815,7 @@ _generateKnightCaptureMoves:
 	jne .L1292
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1335
 .L1292:
 	moveq #14,d4
@@ -8820,7 +8826,7 @@ _generateKnightCaptureMoves:
 	jne .L1293
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1336
 .L1293:
 	moveq #18,d4
@@ -8831,7 +8837,7 @@ _generateKnightCaptureMoves:
 	jne .L1294
 	lea _board,a1
 	move.b (a1,d4.l),d3
-	move.w d3,a2
+	move.w d3,a1
 	jne .L1337
 .L1294:
 	moveq #31,d4
@@ -8979,11 +8985,11 @@ _generateKnightCaptureMoves:
 	jra .L1291
 .L1333:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1290
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -9014,11 +9020,11 @@ _generateKnightCaptureMoves:
 	jra .L1290
 .L1336:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1293
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -9049,11 +9055,11 @@ _generateKnightCaptureMoves:
 	jra .L1293
 .L1335:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1292
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
@@ -9084,11 +9090,11 @@ _generateKnightCaptureMoves:
 	jra .L1292
 .L1337:
 	moveq #8,d3
-	move.l a2,d7
+	move.l a1,d7
 	and.l d7,d3
 	cmp.l a5,d3
 	jeq .L1294
-	move.w a2,d3
+	move.w a1,d3
 	moveq #0,d6
 	move.b d3,d6
 	move.l d1,a2
diff --git a/test/test13/golden/rkiss.s b/test/test13/golden/rkiss.s
index 84f639f..d6f5b20 100644
--- a/test/test13/golden/rkiss.s
+++ b/test/test13/golden/rkiss.s
@@ -97,8 +97,8 @@ _rand64:
 _rkissSeed:
 	lea (-32,sp),sp
 	movem.l #16188,-(sp)
-	move.l 76(sp),a5
-	cmp.w #0,a5
+	move.l 76(sp),a1
+	cmp.w #0,a1
 	jeq .L6
 	clr.l _a
 	move.l #-236298515,_a+4
@@ -108,7 +108,7 @@ _rkissSeed:
 	move.l #-723440521,_c+4
 	clr.l _b
 	move.l #-723440521,_b+4
-	cmp.w #0,a5
+	cmp.w #0,a1
 	jle .L2
 	clr.l d2
 	move.l #-723440521,d3
@@ -118,13 +118,13 @@ _rkissSeed:
 	move.l d3,d1
 	clr.l d6
 	move.l #-236298515,d7
-	sub.l a1,a1
-	move.l a1,a0
+	sub.l a2,a2
+	move.l a2,a0
 	move.l d6,48(sp)
 	move.l d7,52(sp)
 	move.l d2,40(sp)
 	move.l d3,44(sp)
-	move.l a5,68(sp)
+	move.l a1,68(sp)
 .L4:
 	move.l d1,d2
 	moveq #25,d3
diff --git a/test/test13/golden/search.s b/test/test13/golden/search.s
index 9cfb3c8..a3914c9 100644
--- a/test/test13/golden/search.s
+++ b/test/test13/golden/search.s
@@ -1388,11 +1388,11 @@ _think:
 	jne .L199
 	move.l 24(a2),d6
 	move.l 28(a2),d7
-	move.l d3,d1
-	sub.l 4(a2),d1
+	move.l d3,d0
+	sub.l 4(a2),d0
 	cmp.w #0,a4
 	jne .L203
-	move.l d1,-(sp)
+	move.l d0,-(sp)
 	move.l d7,d0
 	moveq #27,d1
 	lsr.l d1,d0
@@ -1641,7 +1641,7 @@ _think:
 	lea (16,sp),sp
 	jra .L199
 .L203:
-	move.l d1,-(sp)
+	move.l d0,-(sp)
 	move.l d7,d0
 	moveq #27,d1
 	lsr.l d1,d0
diff --git a/test/test13/golden/sillychess.s b/test/test13/golden/sillychess.s
index a84f4e3..7b21aa6 100644
--- a/test/test13/golden/sillychess.s
+++ b/test/test13/golden/sillychess.s
@@ -152,6 +152,7 @@ _testPerft:
 	addq.l #1,d5
 	jra .L24
 .L5:
+	move.b (a4),d0
 	trap #7
 .L23:
 	pea .LC3
diff --git a/test/test3/golden.s b/test/test3/golden.s
index d92dd00..28e39fa 100755
--- a/test/test3/golden.s
+++ b/test/test3/golden.s
@@ -64,22 +64,22 @@ _gfx_fillRectSmallScreen:
 	and.l d3,d5
 	jsr (a2)
 	move.l #14676032,a0
-	move.w #970,(a0)
-	clr.w 2(a0)
-	move.w #-1,4(a0)
-	move.w #-1,6(a0)
-	move.w #198,38(a0)
-	move.w #198,32(a0)
-	clr.w 34(a0)
-	clr.w 36(a0)
-	move.w d7,52(a0)
+	move.w #970,(a0)+
+	clr.w (a0)+
+	move.w #-1,(a0)+
+	move.w #-1,(a0)+
+	move.w #198,30(a0)
+	move.w #198,24(a0)
+	clr.w 26(a0)
+	clr.w 28(a0)
+	move.w d7,44(a0)
 	tst.l d5
 	sne d0
 	ext.w d0
-	move.w d0,50(a0)
-	move.l a5,8(a0)
-	move.l a5,20(a0)
-	move.w d2,24(a0)
+	move.w d0,42(a0)
+	move.l a5,(a0)
+	move.l a5,12(a0)
+	move.w d2,16(a0)
 	jsr (a2)
 	move.l #14676032,a0
 	move.w #970,(a0)
@@ -173,22 +173,22 @@ _gfx_fillRectSmallScreen:
 	lsl.l d4,d5
 	and.l d3,d5
 	jsr (a2)
-	move.w #970,(a3)
-	clr.w 2(a3)
-	move.w #-1,4(a3)
-	move.w #-1,6(a3)
-	move.w #198,38(a3)
-	move.w #198,32(a3)
-	clr.w 34(a3)
-	clr.w 36(a3)
-	move.w d7,52(a3)
+	move.w #970,(a3)+
+	clr.w (a3)+
+	move.w #-1,(a3)+
+	move.w #-1,(a3)+
+	move.w #198,30(a3)
+	move.w #198,24(a3)
+	clr.w 26(a3)
+	clr.w 28(a3)
+	move.w d7,44(a3)
 	tst.l d5
 	sne d0
 	ext.w d0
-	move.w d0,50(a3)
-	move.l a5,8(a3)
-	move.l a5,20(a3)
-	move.w d2,24(a3)
+	move.w d0,42(a3)
+	move.l a5,(a3)
+	move.l a5,12(a3)
+	move.w d2,16(a3)
 	lea (40,a5),a5
 	addq.l #1,d4
 	moveq #5,d1
diff --git a/test/test3/test.s b/test/test3/test.s
index d92dd00..28e39fa 100644
--- a/test/test3/test.s
+++ b/test/test3/test.s
@@ -64,22 +64,22 @@ _gfx_fillRectSmallScreen:
 	and.l d3,d5
 	jsr (a2)
 	move.l #14676032,a0
-	move.w #970,(a0)
-	clr.w 2(a0)
-	move.w #-1,4(a0)
-	move.w #-1,6(a0)
-	move.w #198,38(a0)
-	move.w #198,32(a0)
-	clr.w 34(a0)
-	clr.w 36(a0)
-	move.w d7,52(a0)
+	move.w #970,(a0)+
+	clr.w (a0)+
+	move.w #-1,(a0)+
+	move.w #-1,(a0)+
+	move.w #198,30(a0)
+	move.w #198,24(a0)
+	clr.w 26(a0)
+	clr.w 28(a0)
+	move.w d7,44(a0)
 	tst.l d5
 	sne d0
 	ext.w d0
-	move.w d0,50(a0)
-	move.l a5,8(a0)
-	move.l a5,20(a0)
-	move.w d2,24(a0)
+	move.w d0,42(a0)
+	move.l a5,(a0)
+	move.l a5,12(a0)
+	move.w d2,16(a0)
 	jsr (a2)
 	move.l #14676032,a0
 	move.w #970,(a0)
@@ -173,22 +173,22 @@ _gfx_fillRectSmallScreen:
 	lsl.l d4,d5
 	and.l d3,d5
 	jsr (a2)
-	move.w #970,(a3)
-	clr.w 2(a3)
-	move.w #-1,4(a3)
-	move.w #-1,6(a3)
-	move.w #198,38(a3)
-	move.w #198,32(a3)
-	clr.w 34(a3)
-	clr.w 36(a3)
-	move.w d7,52(a3)
+	move.w #970,(a3)+
+	clr.w (a3)+
+	move.w #-1,(a3)+
+	move.w #-1,(a3)+
+	move.w #198,30(a3)
+	move.w #198,24(a3)
+	clr.w 26(a3)
+	clr.w 28(a3)
+	move.w d7,44(a3)
 	tst.l d5
 	sne d0
 	ext.w d0
-	move.w d0,50(a3)
-	move.l a5,8(a3)
-	move.l a5,20(a3)
-	move.w d2,24(a3)
+	move.w d0,42(a3)
+	move.l a5,(a3)
+	move.l a5,12(a3)
+	move.w d2,16(a3)
 	lea (40,a5),a5
 	addq.l #1,d4
 	moveq #5,d1
diff --git a/test/test5/golden.s b/test/test5/golden.s
index 4d742ed..ff68502 100755
--- a/test/test5/golden.s
+++ b/test/test5/golden.s
@@ -31,10 +31,10 @@ _gfx_screenWidthBitBlitNoMask:
 	lsl.w d1,d0
 	or.w #2544,d0
 	move.l #14676032,a1
-	move.w d0,(a1)
+	move.w d0,(a1)+
 	lsl.w d1,d3
-	move.w d3,2(a1)
-	clr.w 6(a1)
+	move.w d3,(a1)
+	clr.w 4(a1)
 	move.w d2,a0
 	moveq #15,d0
 	add.l a0,d0
@@ -44,16 +44,16 @@ _gfx_screenWidthBitBlitNoMask:
 	add.w d0,d1
 	moveq #40,d2
 	sub.w d1,d2
+	move.w d2,34(a1)
 	move.w d2,36(a1)
-	move.w d2,38(a1)
-	move.l d5,16(a1)
-	move.l a2,20(a1)
+	move.l d5,14(a1)
+	move.l a2,18(a1)
 	move.w d4,d1
 	add.w d4,d1
 	add.w d1,d1
 	add.w d4,d1
 	lsl.w #6,d1
 	or.w d1,d0
-	move.w d0,24(a1)
+	move.w d0,22(a1)
 	movem.l (sp)+,#3324
 	rts
diff --git a/test/test5/test.s b/test/test5/test.s
index 4d742ed..ff68502 100644
--- a/test/test5/test.s
+++ b/test/test5/test.s
@@ -31,10 +31,10 @@ _gfx_screenWidthBitBlitNoMask:
 	lsl.w d1,d0
 	or.w #2544,d0
 	move.l #14676032,a1
-	move.w d0,(a1)
+	move.w d0,(a1)+
 	lsl.w d1,d3
-	move.w d3,2(a1)
-	clr.w 6(a1)
+	move.w d3,(a1)
+	clr.w 4(a1)
 	move.w d2,a0
 	moveq #15,d0
 	add.l a0,d0
@@ -44,16 +44,16 @@ _gfx_screenWidthBitBlitNoMask:
 	add.w d0,d1
 	moveq #40,d2
 	sub.w d1,d2
+	move.w d2,34(a1)
 	move.w d2,36(a1)
-	move.w d2,38(a1)
-	move.l d5,16(a1)
-	move.l a2,20(a1)
+	move.l d5,14(a1)
+	move.l a2,18(a1)
 	move.w d4,d1
 	add.w d4,d1
 	add.w d1,d1
 	add.w d4,d1
 	lsl.w #6,d1
 	or.w d1,d0
-	move.w d0,24(a1)
+	move.w d0,22(a1)
 	movem.l (sp)+,#3324
 	rts
diff --git a/test/test6/golden.s b/test/test6/golden.s
index 8d8041e..e4b1d6b 100755
--- a/test/test6/golden.s
+++ b/test/test6/golden.s
@@ -951,20 +951,20 @@ _object_restoreBackground:
 	subq.l #8,sp
 	movem.l #16190,-(sp)
 	move.l a0,a5
-	move.l _object_activeList,a4
+	move.l _object_activeList,a2
 	jsr _gfx_setupRenderTile
 	lea _gfx_quickRenderTile,a6
-	cmp.w #0,a4
+	cmp.w #0,a2
 	jeq .L178
 .L190:
-	tst.w 88(a4)
+	tst.w 88(a2)
 	jne .L183
-	move.l 68(a4),a0
+	move.l 68(a2),a0
 	move.w 4(a0),d0
 	jne .L199
 .L183:
-	move.l 8(a4),a4
-	cmp.w #0,a4
+	move.l 8(a2),a2
+	cmp.w #0,a2
 	jne .L190
 .L178:
 	movem.l (sp)+,#31996
@@ -1002,7 +1002,7 @@ _object_restoreBackground:
 	add.l a3,a3
 	add.l #_level,a3
 	lsl.w #4,d1
-	move.l a4,48(sp)
+	move.l a2,48(sp)
 	move.w d1,a4
 .L185:
 	move.l a3,a2
@@ -1030,9 +1030,9 @@ _object_restoreBackground:
 	lea (32,a3),a3
 	cmp.l 44(sp),d6
 	jle .L185
-	move.l 48(sp),a4
-	move.l 8(a4),a4
-	cmp.w #0,a4
+	move.l 48(sp),a2
+	move.l 8(a2),a2
+	cmp.w #0,a2
 	jne .L190
 	jra .L178
 .L200:
diff --git a/test/test6/test.s b/test/test6/test.s
index 8d8041e..e4b1d6b 100644
--- a/test/test6/test.s
+++ b/test/test6/test.s
@@ -951,20 +951,20 @@ _object_restoreBackground:
 	subq.l #8,sp
 	movem.l #16190,-(sp)
 	move.l a0,a5
-	move.l _object_activeList,a4
+	move.l _object_activeList,a2
 	jsr _gfx_setupRenderTile
 	lea _gfx_quickRenderTile,a6
-	cmp.w #0,a4
+	cmp.w #0,a2
 	jeq .L178
 .L190:
-	tst.w 88(a4)
+	tst.w 88(a2)
 	jne .L183
-	move.l 68(a4),a0
+	move.l 68(a2),a0
 	move.w 4(a0),d0
 	jne .L199
 .L183:
-	move.l 8(a4),a4
-	cmp.w #0,a4
+	move.l 8(a2),a2
+	cmp.w #0,a2
 	jne .L190
 .L178:
 	movem.l (sp)+,#31996
@@ -1002,7 +1002,7 @@ _object_restoreBackground:
 	add.l a3,a3
 	add.l #_level,a3
 	lsl.w #4,d1
-	move.l a4,48(sp)
+	move.l a2,48(sp)
 	move.w d1,a4
 .L185:
 	move.l a3,a2
@@ -1030,9 +1030,9 @@ _object_restoreBackground:
 	lea (32,a3),a3
 	cmp.l 44(sp),d6
 	jle .L185
-	move.l 48(sp),a4
-	move.l 8(a4),a4
-	cmp.w #0,a4
+	move.l 48(sp),a2
+	move.l 8(a2),a2
+	cmp.w #0,a2
 	jne .L190
 	jra .L178
 .L200:
diff --git a/test/test7/golden.s b/test/test7/golden.s
index 5dc77ef..975c7bc 100755
--- a/test/test7/golden.s
+++ b/test/test7/golden.s
@@ -290,8 +290,8 @@ _level1_doorIntelligence:
 	move.w d3,d0
 	ext.l d0
 	jsr _object_collision
+	move.w d0,d4
 	addq.l #4,sp
-	tst.w d0
 	jeq .L51
 	tst.l 40(sp)
 	jeq .L52
@@ -331,11 +331,11 @@ _level1_doorIntelligence:
 	jge .L56
 	move.w 16(a2),d0
 	cmp.w 16(a4),d0
-	sge d0
-	ext.w d0
-	or.w #1,d0
+	sge d4
+	ext.w d4
+	or.w #1,d4
 .L56:
-	move.w d0,26(a2)
+	move.w d4,26(a2)
 	move.w 18(a2),a0
 	sub.w 18(a4),a0
 	move.l a0,d0
@@ -508,8 +508,8 @@ _enemy_intelligence:
 	move.w d3,d0
 	ext.l d0
 	jsr _object_collision
+	move.w d0,d4
 	addq.l #4,sp
-	tst.w d0
 	jeq .L98
 	tst.l 40(sp)
 	jeq .L99
@@ -545,11 +545,11 @@ _enemy_intelligence:
 	jge .L103
 	move.w 16(a2),d0
 	cmp.w 16(a4),d0
-	sge d0
-	ext.w d0
-	or.w #1,d0
+	sge d4
+	ext.w d4
+	or.w #1,d4
 .L103:
-	move.w d0,26(a2)
+	move.w d4,26(a2)
 	move.w 18(a2),a0
 	sub.w 18(a4),a0
 	move.l a0,d0
diff --git a/test/test7/test.s b/test/test7/test.s
index 5dc77ef..975c7bc 100644
--- a/test/test7/test.s
+++ b/test/test7/test.s
@@ -290,8 +290,8 @@ _level1_doorIntelligence:
 	move.w d3,d0
 	ext.l d0
 	jsr _object_collision
+	move.w d0,d4
 	addq.l #4,sp
-	tst.w d0
 	jeq .L51
 	tst.l 40(sp)
 	jeq .L52
@@ -331,11 +331,11 @@ _level1_doorIntelligence:
 	jge .L56
 	move.w 16(a2),d0
 	cmp.w 16(a4),d0
-	sge d0
-	ext.w d0
-	or.w #1,d0
+	sge d4
+	ext.w d4
+	or.w #1,d4
 .L56:
-	move.w d0,26(a2)
+	move.w d4,26(a2)
 	move.w 18(a2),a0
 	sub.w 18(a4),a0
 	move.l a0,d0
@@ -508,8 +508,8 @@ _enemy_intelligence:
 	move.w d3,d0
 	ext.l d0
 	jsr _object_collision
+	move.w d0,d4
 	addq.l #4,sp
-	tst.w d0
 	jeq .L98
 	tst.l 40(sp)
 	jeq .L99
@@ -545,11 +545,11 @@ _enemy_intelligence:
 	jge .L103
 	move.w 16(a2),d0
 	cmp.w 16(a4),d0
-	sge d0
-	ext.w d0
-	or.w #1,d0
+	sge d4
+	ext.w d4
+	or.w #1,d4
 .L103:
-	move.w d0,26(a2)
+	move.w d4,26(a2)
 	move.w 18(a2),a0
 	sub.w 18(a4),a0
 	move.l a0,d0