dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cast fixes

Browse Source
This commit is contained in:
Evan
2019-11-20 15:10:56 -07:00
parent 80e84c2f48
commit c39dcbc602
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/berry_pouch.c
+3 -3
View File
@@ -457,7 +457,7 @@ static void CB2_InitBerryPouch(void)
{ {
while (1) while (1)
{ {
if ((u8) sub_80BF72C() == TRUE) if ((u8)sub_80BF72C() == TRUE)
break; break;
if (RunBerryPouchInit() == TRUE) if (RunBerryPouchInit() == TRUE)
break; break;
@@ -934,7 +934,7 @@ static void Task_BerryPouchMain(u8 taskId)
{ {
s16 * data = gTasks[taskId].data; s16 * data = gTasks[taskId].data;
s32 menuInput; s32 menuInput;
if (!gPaletteFade.active && (u8) sub_80BF72C() != TRUE) if (!gPaletteFade.active && (u8)sub_80BF72C() != TRUE)
{ {
menuInput = ListMenu_ProcessInput(data[0]); menuInput = ListMenu_ProcessInput(data[0]);
ListMenuGetScrollAndRow(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow); ListMenuGetScrollAndRow(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow);
@@ -1040,7 +1040,7 @@ static void Task_NormalContextMenu(u8 taskId)
static void Task_NormalContextMenu_HandleInput(u8 taskId) static void Task_NormalContextMenu_HandleInput(u8 taskId)
{ {
s8 input; s8 input;
if ((u8) sub_80BF72C() != TRUE) if ((u8)sub_80BF72C() != TRUE)
{ {
input = Menu_ProcessInputNoWrapAround(); input = Menu_ProcessInputNoWrapAround();
switch (input) switch (input)
src/item_pc.c
+1 -1
View File
@@ -384,7 +384,7 @@ static bool8 ItemPc_DoGfxSetup(void)
gMain.state++; gMain.state++;
break; break;
case 20: case 20:
if ((u8) sub_80BF72C() != TRUE) if ((u8)sub_80BF72C() != TRUE)
gMain.state++; gMain.state++;
break; break;
default: default:
src/menu_helpers.c
+2 -2
View File
@@ -130,12 +130,12 @@ bool32 sub_80BF72C(void)
if (!MenuHelpers_LinkSomething()) if (!MenuHelpers_LinkSomething())
return FALSE; return FALSE;
else else
return (u8) sub_8058244(); return (u8)sub_8058244();
} }
bool8 sub_80BF748(void) bool8 sub_80BF748(void)
{ {
if ((u8) sub_80BF72C() == TRUE) if ((u8)sub_80BF72C() == TRUE)
return TRUE; return TRUE;
else if (sub_800B270() != TRUE) else if (sub_800B270() != TRUE)
return FALSE; return FALSE;
src/option_menu.c
+7 -9
View File
@@ -292,7 +292,7 @@ static void SetOptionMenuTask(void)
static void InitOptionMenuBg(void) static void InitOptionMenuBg(void)
{ {
void * dest = (void *) VRAM; void * dest = (void *)VRAM;
DmaClearLarge16(3, dest, VRAM_SIZE, 0x1000); DmaClearLarge16(3, dest, VRAM_SIZE, 0x1000);
DmaClear32(3, (void *)OAM, OAM_SIZE); DmaClear32(3, (void *)OAM, OAM_SIZE);
DmaClear16(3, (void *)PLTT, PLTT_SIZE); DmaClear16(3, (void *)PLTT, PLTT_SIZE);
@@ -362,8 +362,6 @@ static bool8 LoadOptionMenuPalette(void)
return FALSE; return FALSE;
} }
//#ifdef NONMATCHING
static void Task_OptionMenu(u8 taskId) static void Task_OptionMenu(u8 taskId)
{ {
switch (sOptionMenuPtr->state3) switch (sOptionMenuPtr->state3)
@@ -514,12 +512,12 @@ static void CloseAndSaveOptionMenu(u8 taskId)
gFieldCallback = sub_807DF64; gFieldCallback = sub_807DF64;
SetMainCallback2(gMain.savedCallback); SetMainCallback2(gMain.savedCallback);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
gSaveBlock2Ptr->optionsTextSpeed = (u8) sOptionMenuPtr->option[MENUITEM_TEXTSPEED]; gSaveBlock2Ptr->optionsTextSpeed = (u8)sOptionMenuPtr->option[MENUITEM_TEXTSPEED];
gSaveBlock2Ptr->optionsBattleSceneOff = (u8) sOptionMenuPtr->option[MENUITEM_BATTLESCENE]; gSaveBlock2Ptr->optionsBattleSceneOff = (u8)sOptionMenuPtr->option[MENUITEM_BATTLESCENE];
gSaveBlock2Ptr->optionsBattleStyle = (u8) sOptionMenuPtr->option[MENUITEM_BATTLESTYLE]; gSaveBlock2Ptr->optionsBattleStyle = (u8)sOptionMenuPtr->option[MENUITEM_BATTLESTYLE];
gSaveBlock2Ptr->optionsSound = sOptionMenuPtr->option[MENUITEM_SOUND]; gSaveBlock2Ptr->optionsSound = sOptionMenuPtr->option[MENUITEM_SOUND];
gSaveBlock2Ptr->optionsButtonMode = (u8) sOptionMenuPtr->option[MENUITEM_BUTTONMODE]; gSaveBlock2Ptr->optionsButtonMode = (u8)sOptionMenuPtr->option[MENUITEM_BUTTONMODE];
gSaveBlock2Ptr->optionsWindowFrameType = (u8) sOptionMenuPtr->option[MENUITEM_FRAMETYPE]; gSaveBlock2Ptr->optionsWindowFrameType = (u8)sOptionMenuPtr->option[MENUITEM_FRAMETYPE];
SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound); SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound);
FREE_AND_SET_NULL(sOptionMenuPtr); FREE_AND_SET_NULL(sOptionMenuPtr);
DestroyTask(taskId); DestroyTask(taskId);
@@ -564,7 +562,7 @@ static void LoadOptionMenuItemNames(void)
FillWindowPixelBuffer(1, PIXEL_FILL(1)); FillWindowPixelBuffer(1, PIXEL_FILL(1));
for (i = 0; i < MENUITEM_COUNT; i++) 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);
} }
} }
src/tm_case.c
+3 -3
View File
@@ -305,7 +305,7 @@ static void CB2_SetUpTMCaseUI_Blocking(void)
{ {
while (1) while (1)
{ {
if ((u8) sub_80BF72C() == TRUE) if ((u8)sub_80BF72C() == TRUE)
break; break;
if (DoSetUpTMCaseUI() == TRUE) if (DoSetUpTMCaseUI() == TRUE)
break; break;
@@ -734,7 +734,7 @@ static void Task_TMCaseMain(u8 taskId)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
if ((u8) sub_80BF72C() != TRUE) if ((u8)sub_80BF72C() != TRUE)
{ {
input = ListMenu_ProcessInput(data[0]); input = ListMenu_ProcessInput(data[0]);
ListMenuGetScrollAndRow(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow); ListMenuGetScrollAndRow(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow);
@@ -815,7 +815,7 @@ static void Task_TMContextMenu_HandleInput(u8 taskId)
{ {
s8 input; s8 input;
if ((u8) sub_80BF72C() != TRUE) if ((u8)sub_80BF72C() != TRUE)
{ {
input = Menu_ProcessInputNoWrapAround(); input = Menu_ProcessInputNoWrapAround();
switch (input) switch (input)