summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorEvan <eroelke@gmail.com>2019-11-16 19:45:55 -0700
committerEvan <eroelke@gmail.com>2019-11-19 14:21:00 -0700
commita48e03b78c0e4f1b72e9e62b4c927f4c59836339 (patch)
treee970815002238d9a37b470a86df785ca2fbfa4fd /include/global.h
parent1849ad778d5a94edc076ce5ecf7aec97aa8db4fa (diff)
remove compile errors
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/global.h b/include/global.h
index 2f34de1a0..63c6923bd 100644
--- a/include/global.h
+++ b/include/global.h
@@ -291,11 +291,11 @@ struct SaveBlock2
/*0x012*/ u8 playTimeVBlanks;
/*0x013*/ u8 optionsButtonMode; // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A]
/*0x014*/ u16 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST]
- u16 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes
- u16 optionsSound:1; // OPTIONS_SOUND_[MONO/STEREO]
- u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET]
- u16 optionsBattleSceneOff:1; // whether battle animations are disabled
- u16 regionMapZoom:1; // whether the map is zoomed in
+ u16 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes
+ /*0x15*/ u16 optionsSound:1; // OPTIONS_SOUND_[MONO/STEREO]
+ u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET]
+ u16 optionsBattleSceneOff:1; // whether battle animations are disabled
+ u16 regionMapZoom:1; // whether the map is zoomed in
/*0x018*/ struct Pokedex pokedex;
/*0x090*/ u8 filler_90[0x8];
/*0x098*/ struct Time localTimeOffset;