summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYamaArashi <YamaArashi@users.noreply.github.com>2016-08-01 23:26:45 -0700
committerGitHub <noreply@github.com>2016-08-01 23:26:45 -0700
commit28fcaa216f39c06e1ad58cb25c13c47be5299bd0 (patch)
tree7dd82d6a0df235d742496462355b504cc90879d7 /include
parent0a73fc4885aa3c4a15fe675c0ffbb8a6811605f1 (diff)
parentad2d354a77f4b543f6a40845d691ce7ff6c37ec4 (diff)
Merge pull request #28 from huderlem/master
Diffstat (limited to 'include')
-rw-r--r--include/global.h22
1 files changed, 18 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h
index 5e6bd5bd4..2f47e7ed0 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;
@@ -39,16 +53,16 @@ struct Time
struct SaveBlock2
{
u8 playerName[8];
- u8 playerGender;
+ u8 playerGender; // MALE, FEMALE
u8 sb2_field_9;
u8 playerTrainerId[4];
u16 playTimeHours;
u8 playTimeMinutes;
u8 playTimeSeconds;
u8 playTimeVBlanks;
- u8 optionsButtonMode;
- u8 optionsTextSpeed:3;
- u8 optionsUnk: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;
};