diff options
| author | Evan <eroelke@gmail.com> | 2019-11-20 15:10:56 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-20 15:10:56 -0700 |
| commit | c39dcbc602cb7ad84148e6ad5cb7f0bbed31ab40 (patch) | |
| tree | 21d9c789e909ada2ca58cfaa851189e87746383e /src/option_menu.c | |
| parent | 80e84c2f48c83448be224e07a97ba0288d744ed6 (diff) | |
cast fixes
Diffstat (limited to 'src/option_menu.c')
| -rw-r--r-- | src/option_menu.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index b7840d373..abfc7a0f7 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -292,7 +292,7 @@ static void SetOptionMenuTask(void) static void InitOptionMenuBg(void) { - void * dest = (void *) VRAM; + void * dest = (void *)VRAM; DmaClearLarge16(3, dest, VRAM_SIZE, 0x1000); DmaClear32(3, (void *)OAM, OAM_SIZE); DmaClear16(3, (void *)PLTT, PLTT_SIZE); @@ -362,8 +362,6 @@ static bool8 LoadOptionMenuPalette(void) return FALSE; } - -//#ifdef NONMATCHING static void Task_OptionMenu(u8 taskId) { switch (sOptionMenuPtr->state3) @@ -514,12 +512,12 @@ 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]; + gSaveBlock2Ptr->optionsTextSpeed = (u8)sOptionMenuPtr->option[MENUITEM_TEXTSPEED]; + gSaveBlock2Ptr->optionsBattleSceneOff = (u8)sOptionMenuPtr->option[MENUITEM_BATTLESCENE]; + gSaveBlock2Ptr->optionsBattleStyle = (u8)sOptionMenuPtr->option[MENUITEM_BATTLESTYLE]; gSaveBlock2Ptr->optionsSound = sOptionMenuPtr->option[MENUITEM_SOUND]; - gSaveBlock2Ptr->optionsButtonMode = (u8) sOptionMenuPtr->option[MENUITEM_BUTTONMODE]; - gSaveBlock2Ptr->optionsWindowFrameType = (u8) sOptionMenuPtr->option[MENUITEM_FRAMETYPE]; + gSaveBlock2Ptr->optionsButtonMode = (u8)sOptionMenuPtr->option[MENUITEM_BUTTONMODE]; + gSaveBlock2Ptr->optionsWindowFrameType = (u8)sOptionMenuPtr->option[MENUITEM_FRAMETYPE]; SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound); FREE_AND_SET_NULL(sOptionMenuPtr); DestroyTask(taskId); @@ -564,7 +562,7 @@ static void LoadOptionMenuItemNames(void) FillWindowPixelBuffer(1, PIXEL_FILL(1)); for (i = 0; i < MENUITEM_COUNT; i++) { - AddTextPrinterParameterized(WIN_OPTIONS, 2, sOptionMenuItemsNames[i], 8, (u8) ((i * (GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT))) + 2) - i, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(WIN_OPTIONS, 2, sOptionMenuItemsNames[i], 8, (u8)((i * (GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT))) + 2) - i, TEXT_SPEED_FF, NULL); } } |