diff --git a/DMGTRIS.GBC b/DMGTRIS.GBC
index 2273925..3564e3e 100644
Binary files a/DMGTRIS.GBC and b/DMGTRIS.GBC differ
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