From 0ceb8955d2a4f31e752f2e9d04b1a1c0cc55bd8e Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Tue, 7 Jan 2020 05:54:44 +0000
Subject: [PATCH] More-accurate Caret.cpp variable arrangement

---
 src/Caret.cpp | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/Caret.cpp b/src/Caret.cpp
index 20ce8381..0e1c178c 100644
--- a/src/Caret.cpp
+++ b/src/Caret.cpp
@@ -11,6 +11,27 @@
 #define CARET_MAX 0x40
 CARET gCrt[CARET_MAX];
 
+CARET_TABLE gCaretTable[18] = {
+	{0, 0},
+	{0x800, 0x800},
+	{0x1000, 0x1000},
+	{0x1000, 0x1000},
+	{0x1000, 0x1000},
+	{0x800, 0x800},
+	{0x1000, 0x1000},
+	{0x800, 0x800},
+	{0x1000, 0x1000},
+	{0x1000, 0x1000},
+	{0x3800, 0x1000},
+	{0x800, 0x800},
+	{0x2000, 0x2000},
+	{0x800, 0x800},
+	{0x2800, 0x2800},
+	{0x800, 0x800},
+	{0x2800, 0x800},
+	{0x6800, 0x800}
+};
+
 void InitCaret(void)
 {
 	memset(gCrt, 0, sizeof(gCrt));
@@ -468,28 +489,6 @@ void ActCaret17(CARET *crt)
 		crt->rect = rcLeft[1];
 }
 
-// Tables
-CARET_TABLE gCaretTable[18] = {
-	{0, 0},
-	{0x800, 0x800},
-	{0x1000, 0x1000},
-	{0x1000, 0x1000},
-	{0x1000, 0x1000},
-	{0x800, 0x800},
-	{0x1000, 0x1000},
-	{0x800, 0x800},
-	{0x1000, 0x1000},
-	{0x1000, 0x1000},
-	{0x3800, 0x1000},
-	{0x800, 0x800},
-	{0x2000, 0x2000},
-	{0x800, 0x800},
-	{0x2800, 0x2800},
-	{0x800, 0x800},
-	{0x2800, 0x800},
-	{0x6800, 0x800}
-};
-
 typedef void (*CARETFUNCTION)(CARET*);
 CARETFUNCTION gpCaretFuncTbl[] =
 {