cast fixes

5 files changed, 16 insertions, 18 deletions

diff --git a/src/berry_pouch.c b/src/berry_pouch.c
index 35ac513c2..b8b66c0bc 100644
--- a/src/berry_pouch.c
+++ b/src/berry_pouch.c
@@ -457,7 +457,7 @@ static void CB2_InitBerryPouch(void)
 {
     while (1)
     {
-        if ((u8) sub_80BF72C() == TRUE)
+        if ((u8)sub_80BF72C() == TRUE)
             break;
         if (RunBerryPouchInit() == TRUE)
             break;
@@ -934,7 +934,7 @@ static void Task_BerryPouchMain(u8 taskId)
 {
     s16 * data = gTasks[taskId].data;
     s32 menuInput;
-    if (!gPaletteFade.active && (u8) sub_80BF72C() != TRUE)
+    if (!gPaletteFade.active && (u8)sub_80BF72C() != TRUE)
     {
         menuInput = ListMenu_ProcessInput(data[0]);
         ListMenuGetScrollAndRow(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow);
@@ -1040,7 +1040,7 @@ static void Task_NormalContextMenu(u8 taskId)
 static void Task_NormalContextMenu_HandleInput(u8 taskId)
 {
     s8 input;
-    if ((u8) sub_80BF72C() != TRUE)
+    if ((u8)sub_80BF72C() != TRUE)
     {
         input = Menu_ProcessInputNoWrapAround();
         switch (input)
diff --git a/src/item_pc.c b/src/item_pc.c
index 895c4b693..60a74ac59 100644
--- a/src/item_pc.c
+++ b/src/item_pc.c
@@ -384,7 +384,7 @@ static bool8 ItemPc_DoGfxSetup(void)
         gMain.state++;
         break;
     case 20:
-        if ((u8) sub_80BF72C() != TRUE)
+        if ((u8)sub_80BF72C() != TRUE)
             gMain.state++;
         break;
     default:
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index a41e59187..f17bff0d0 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -130,12 +130,12 @@ bool32 sub_80BF72C(void)
     if (!MenuHelpers_LinkSomething())
         return FALSE;
     else
-        return (u8) sub_8058244();
+        return (u8)sub_8058244();
 }
 
 bool8 sub_80BF748(void)
 {
-    if ((u8) sub_80BF72C() == TRUE)
+    if ((u8)sub_80BF72C() == TRUE)
         return TRUE;
     else if (sub_800B270() != TRUE)
         return FALSE;
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);    
     }
 }
 
diff --git a/src/tm_case.c b/src/tm_case.c
index e48941d42..25fe9a72c 100644
--- a/src/tm_case.c
+++ b/src/tm_case.c
@@ -305,7 +305,7 @@ static void CB2_SetUpTMCaseUI_Blocking(void)
 {
     while (1)
     {
-        if ((u8) sub_80BF72C() == TRUE)
+        if ((u8)sub_80BF72C() == TRUE)
             break;
         if (DoSetUpTMCaseUI() == TRUE)
             break;
@@ -734,7 +734,7 @@ static void Task_TMCaseMain(u8 taskId)
 
     if (!gPaletteFade.active)
     {
-        if ((u8) sub_80BF72C() != TRUE)
+        if ((u8)sub_80BF72C() != TRUE)
         {
             input = ListMenu_ProcessInput(data[0]);
             ListMenuGetScrollAndRow(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow);
@@ -815,7 +815,7 @@ static void Task_TMContextMenu_HandleInput(u8 taskId)
 {
     s8 input;
 
-    if ((u8) sub_80BF72C() != TRUE)
+    if ((u8)sub_80BF72C() != TRUE)
     {
         input = Menu_ProcessInputNoWrapAround();
         switch (input)