From ef7b2b2b6dc34e766c0cb93dad84d7b4208a9d40 Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Tue, 24 Oct 2023 23:09:39 +0200
Subject: [PATCH] Shift instructions are shift man...

---
 DMGTRIS.GBC         | Bin 32768 -> 32768 bytes
 src/field.asm       |  36 ++++++++++++++++++------------------
 src/state_title.asm |  24 ++++++++++++------------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/DMGTRIS.GBC b/DMGTRIS.GBC
index 22739252969d650bcf6272288e87af162441df5b..3564e3ea52b3db5e1a44b616c73e96255dc119c3 100644
GIT binary patch
delta 204
zcmZo@U}|V!n$X5>Xk}n(WoR+6_aKvT^yUD@8Xac!)9Rbg>z-u-F(%J9$N<w^hE`zO
z-OvL}Pcn=G)9(#k!L+%N8;IWAU}VX{YI9olw9V#yX1*3+Ilg=`8K9iM;`CU~kXS|i
znT#w9XH^*1yZ>Taa2jNZL%x_PSixqng7pXmac4jZ{1x|uCEg<>;=vM|yYov00A}V#
ATmS$7

delta 204
zcmZo@U}|V!n$X5>U}a)vWoj_7_aKx0?#%&=H9E}fr`b23*FDPwVoaWIkO8K-46VSl
zyP*e|o@5vWrr#U7f@yOjHxRwK!N`(@Rp+$qX`Rjc%zQ1ta(ww>GC(<h#p$t}A+d`3
zGZ|SJ&Z;o1cmKt<;55h*hkP+pu!7BC1?v$C;?95+_$%%QOT0%&#DgU^cjuQ1001AT
BL>K@7

diff --git a/src/field.asm b/src/field.asm
index 02207b0..6a3fb82 100644
--- a/src/field.asm
+++ b/src/field.asm
@@ -224,8 +224,8 @@ SetPieceData:
 
 SetPieceDataOffset:
     ldh a, [hCurrentPieceRotationState]
-    rlc a
-    rlc a
+    sla a
+    sla a
     ldh [hPieceDataOffset], a
     ret
 
@@ -796,8 +796,8 @@ FieldProcess::
     ldh a, [hPieceDataBase+1]
     ld h, a
     ldh a, [hWantRotation]
-    rlc a
-    rlc a
+    sla a
+    sla a
     push bc
     ld c, a
     xor a, a
@@ -865,8 +865,8 @@ FieldProcess::
     ldh a, [hPieceDataBaseFast+1]
     ld h, a
     ldh a, [hWantRotation]
-    rlc a
-    rlc a
+    sla a
+    sla a
     push bc
     ld c, a
     xor a, a
@@ -903,8 +903,8 @@ FieldProcess::
     ldh a, [hPieceDataBaseFast+1]
     ld h, a
     ldh a, [hWantRotation]
-    rlc a
-    rlc a
+    sla a
+    sla a
     push bc
     ld c, a
     xor a, a
@@ -951,8 +951,8 @@ FieldProcess::
     ldh a, [hPieceDataBaseFast+1]
     ld h, a
     ldh a, [hWantRotation]
-    rlc a
-    rlc a
+    sla a
+    sla a
     push bc
     ld c, a
     xor a, a
@@ -1011,8 +1011,8 @@ FieldProcess::
     ldh a, [hPieceDataBaseFast+1]
     ld h, a
     ldh a, [hWantRotation]
-    rlc a
-    rlc a
+    sla a
+    sla a
     push bc
     ld c, a
     xor a, a
@@ -1055,8 +1055,8 @@ FieldProcess::
     ldh a, [hPieceDataBaseFast+1]
     ld h, a
     ldh a, [hWantRotation]
-    rlc a
-    rlc a
+    sla a
+    sla a
     push bc
     ld c, a
     xor a, a
@@ -1100,8 +1100,8 @@ FieldProcess::
     ldh a, [hPieceDataBaseFast+1]
     ld h, a
     ldh a, [hWantRotation]
-    rlc a
-    rlc a
+    sla a
+    sla a
     push bc
     ld c, a
     xor a, a
@@ -1808,9 +1808,9 @@ FieldDelay::
     ld h, a
 
     ; Divide by 4.
-    sra h
+    srl h
     rr l
-    sra h
+    srl h
     rr l
 
     ; Add 1.
diff --git a/src/state_title.asm b/src/state_title.asm
index a22860c..0273b11 100644
--- a/src/state_title.asm
+++ b/src/state_title.asm
@@ -575,8 +575,8 @@ TitleVBlankHandler::
     xor a, a
     ld b, a
     ld a, [wSwapABState]
-    rlc a
-    rlc a
+    sla a
+    sla a
     ld c, a
     ld hl, sOption0
     add hl, bc
@@ -590,8 +590,8 @@ TitleVBlankHandler::
     xor a, a
     ld b, a
     ld a, [wRNGModeState]
-    rlc a
-    rlc a
+    sla a
+    sla a
     ld c, a
     ld hl, sOption1
     add hl, bc
@@ -605,8 +605,8 @@ TitleVBlankHandler::
     xor a, a
     ld b, a
     ld a, [rRotModeState]
-    rlc a
-    rlc a
+    sla a
+    sla a
     ld c, a
     ld hl, sOption2
     add hl, bc
@@ -620,8 +620,8 @@ TitleVBlankHandler::
     xor a, a
     ld b, a
     ld a, [rDropModeState]
-    rlc a
-    rlc a
+    sla a
+    sla a
     ld c, a
     ld hl, sOption3
     add hl, bc
@@ -635,8 +635,8 @@ TitleVBlankHandler::
     xor a, a
     ld b, a
     ld a, [wSpeedCurveState]
-    rlc a
-    rlc a
+    sla a
+    sla a
     ld c, a
     ld hl, sOption4
     add hl, bc
@@ -650,8 +650,8 @@ TitleVBlankHandler::
     xor a, a
     ld b, a
     ld a, [wAlways20GState]
-    rlc a
-    rlc a
+    sla a
+    sla a
     ld c, a
     ld hl, sOption5
     add hl, bc