From 4d911ea86fa66162fb361e6e920bb77ed1aeb8cc Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Mon, 1 Aug 2016 22:52:52 -0700
Subject: Label SaveBlock2.optionsTextBoxFrameType. Label gSaveBlock2.

---
 include/global.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/global.h b/include/global.h
index 5e6bd5bd4..65700837f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -39,6 +39,9 @@ struct Time
 struct SaveBlock2
 {
     u8 playerName[8];
+
+    // 0 = Male
+    // 1 = Female
     u8 playerGender;
     u8 sb2_field_9;
     u8 playerTrainerId[4];
@@ -46,9 +49,19 @@ struct SaveBlock2
     u8 playTimeMinutes;
     u8 playTimeSeconds;
     u8 playTimeVBlanks;
+
+    // 0 = "NORMAL"
+    // 1 = "LR"
+    // 2 = "L=A"
     u8 optionsButtonMode;
+
+    // 0 = "SLOW"
+    // 1 = "MID"
+    // 2 = "FAST"
     u8 optionsTextSpeed:3;
-    u8 optionsUnk:5;
+
+    // Specifies one of the 20 decorative borders for text boxes
+    u8 optionsTextBoxFrameType:5;
     u8 filler[0x83];
     struct Time localTimeOffset;
 };
-- 
cgit v1.2.3


From 3fd70a5723de9b46f4677f24b7155a8089994b87 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Mon, 1 Aug 2016 23:21:27 -0700
Subject: Add enums for options.

---
 include/global.h | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'include')

diff --git a/include/global.h b/include/global.h
index 65700837f..d94fe1bbd 100644
--- a/include/global.h
+++ b/include/global.h
@@ -22,6 +22,20 @@ enum
     FEMALE
 };
 
+enum
+{
+    OPTIONS_BUTTON_MODE_NORMAL,
+    OPTIONS_BUTTON_MODE_LR,
+    OPTIONS_BUTTON_MODE_L_EQUALS_A
+};
+
+enum
+{
+    OPTIONS_TEXT_SPEED_SLOW,
+    OPTIONS_TEXT_SPEED_MID,
+    OPTIONS_TEXT_SPEED_FAST
+};
+
 struct Coords16
 {
     s16 x;
@@ -40,28 +54,16 @@ struct SaveBlock2
 {
     u8 playerName[8];
 
-    // 0 = Male
-    // 1 = Female
-    u8 playerGender;
+    u8 playerGender; // MALE, FEMALE
     u8 sb2_field_9;
     u8 playerTrainerId[4];
     u16 playTimeHours;
     u8 playTimeMinutes;
     u8 playTimeSeconds;
     u8 playTimeVBlanks;
-
-    // 0 = "NORMAL"
-    // 1 = "LR"
-    // 2 = "L=A"
-    u8 optionsButtonMode;
-
-    // 0 = "SLOW"
-    // 1 = "MID"
-    // 2 = "FAST"
-    u8 optionsTextSpeed:3;
-
-    // Specifies one of the 20 decorative borders for text boxes
-    u8 optionsTextBoxFrameType:5;
+    u8 optionsButtonMode;  // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A]
+    u8 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST]
+    u8 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes
     u8 filler[0x83];
     struct Time localTimeOffset;
 };
-- 
cgit v1.2.3


From ad2d354a77f4b543f6a40845d691ce7ff6c37ec4 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Mon, 1 Aug 2016 23:22:42 -0700
Subject: Remove extra line.

---
 include/global.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include')

diff --git a/include/global.h b/include/global.h
index d94fe1bbd..2f47e7ed0 100644
--- a/include/global.h
+++ b/include/global.h
@@ -53,7 +53,6 @@ struct Time
 struct SaveBlock2
 {
     u8 playerName[8];
-
     u8 playerGender; // MALE, FEMALE
     u8 sb2_field_9;
     u8 playerTrainerId[4];
-- 
cgit v1.2.3