diff options
| author | Evan <eroelke@gmail.com> | 2019-11-19 15:02:58 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-19 15:02:58 -0700 |
| commit | d52bd495b142cd99ae41476a4ecb5bdf0833ebbf (patch) | |
| tree | 3f71eb4a0ba2adbb4f6bb3b4a4c370153e3b7438 /src | |
| parent | 30d967a51a90cc717aedc0fde4aba68772dc15dd (diff) | |
| parent | 5a56fc245b2c159e45650564c1fd7c3b352bb9d0 (diff) | |
various format fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/option_menu.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index fb4844bec..1729b36d1 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -40,6 +40,16 @@ enum }; // RAM sumbols +struct OptionMenu +{ + /*0x00*/ u16 option[MENUITEM_COUNT]; + /*0x0E*/ u16 unkE; + /*0x10*/ u8 state3; + /*0x11*/ u8 state; + /*0x12*/ u8 state2; + /*0x13*/ u8 unk13; +}; + EWRAM_DATA struct OptionMenu *sOptionMenuPtr = NULL; //Function Declarataions @@ -158,6 +168,7 @@ static const u8 *const sBattleStyleOptions[] = gText_BattleStyleShift, gText_BattleStyleSet }; + static const u8 *const sSoundOptions[] = { gText_SoundMono, @@ -174,16 +185,7 @@ static const u8 *const sButtonTypeOptions[] = static const u8 sOptionMenuPickSwitchCancelTextColor[] = {TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY}; static const u8 sOptionMenuTextColor[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_RED, TEXT_COLOR_RED}; -struct OptionMenu -{ - /*0x00*/ u16 option[MENUITEM_COUNT]; - /*0x0E*/ u16 unkE; - /*0x10*/ u8 state3; - /*0x11*/ u8 state; - /*0x12*/ u8 state2; - /*0x13*/ u8 unk13; -}; - +// Functions static void CB2_InitOptionMenu(void) { RunTasks(); @@ -836,7 +838,6 @@ static void CloseAndSaveOptionMenu(u8 taskId) gFieldCallback = sub_807DF64; SetMainCallback2(gMain.savedCallback); FreeAllWindowBuffers(); - gSaveBlock2Ptr->optionsTextSpeed = (u8) sOptionMenuPtr->option[MENUITEM_TEXTSPEED]; gSaveBlock2Ptr->optionsBattleSceneOff = (u8) sOptionMenuPtr->option[MENUITEM_BATTLESCENE]; gSaveBlock2Ptr->optionsBattleStyle = (u8) sOptionMenuPtr->option[MENUITEM_BATTLESTYLE]; |