summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-11-21 11:35:50 -0500
committerGitHub <noreply@github.com>2019-11-21 11:35:50 -0500
commit74b05cfb0a5b54acc269a557c765f84431afe559 (patch)
tree11a039ad7737c105d4b81ae653ba899d342b6e57 /include/global.h
parent1234d0252cbe2b0001784b10b75f0d339824632d (diff)
parent407d22af8e685076bc92f837266786dfe78e7123 (diff)
Merge pull request #159 from ghoulslash/master
option_menu to src
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..744d23eb3 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;