Merge pull request #934 from GriffinRichards/constants-fade

Use fadescreen constants

14 files changed, 27 insertions, 26 deletions

diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index 5a9fd5687..bdd1b1462 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -357,7 +357,7 @@ static void sub_81C4F10(void)
 void ChooseItemsToTossFromPyramidBag(void)
 {
     ScriptContext2_Enable();
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
     CreateTask(Task_ChooseItemsToTossFromPyramidBag, 10);
 }
 
diff --git a/src/cable_club.c b/src/cable_club.c
index b1675030b..ab72ee3f2 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -816,7 +816,7 @@ static void sub_80B32B4(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        FadeScreen(1, 0);
+        FadeScreen(FADE_TO_BLACK, 0);
         gLinkType = LINKTYPE_BATTLE;
         ClearLinkCallback_2();
         task->data[0]++;
@@ -862,7 +862,7 @@ static void sub_80B33BC(u8 taskId)
     switch (data[0])
     {
     case 0:
-        FadeScreen(1, 0);
+        FadeScreen(FADE_TO_BLACK, 0);
         gLinkType = LINKTYPE_BATTLE;
         ClearLinkCallback_2();
         data[0] = 1;
@@ -1077,7 +1077,7 @@ static void sub_80B37FC(u8 taskId)
     {
     case 0:
         ScriptContext2_Enable();
-        FadeScreen(1, 0);
+        FadeScreen(FADE_TO_BLACK, 0);
         ClearLinkCallback_2();
         task->data[0]++;
         break;
@@ -1110,7 +1110,7 @@ static void sub_80B3894(u8 taskId)
     {
     case 0:
         ScriptContext2_Enable();
-        FadeScreen(1, 0);
+        FadeScreen(FADE_TO_BLACK, 0);
         ClearLinkRfuCallback();
         data[0]++;
         break;
diff --git a/src/decoration.c b/src/decoration.c
index 2a47dd553..4198f432f 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -608,7 +608,7 @@ static void DecorationMenuAction_PutAway(u8 taskId)
     {
         RemoveDecorationWindow(0);
         ClearDialogWindowAndFrame(0, 0);
-        FadeScreen(1, 0);
+        FadeScreen(FADE_TO_BLACK, 0);
         gTasks[taskId].data[2] = 0;
         gTasks[taskId].func = sub_8129ABC;
     }
@@ -1292,7 +1292,7 @@ void sub_8127F68(u8 taskId)
     {
         if (sub_8127F38() == TRUE)
         {
-            FadeScreen(1, 0);
+            FadeScreen(FADE_TO_BLACK, 0);
             gTasks[taskId].data[2] = 0;
             gTasks[taskId].func = sub_8128060;
         }
@@ -1682,7 +1682,7 @@ void CancelDecorating(u8 taskId)
 
 void sub_8128BBC(u8 taskId)
 {
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = c1_overworld_prev_quest;
 }
@@ -2551,7 +2551,7 @@ void ReturnDecorationPrompt(u8 taskId)
 
 void PutAwayDecoration(u8 taskId)
 {
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = sub_81298EC;
 }
@@ -2570,7 +2570,7 @@ void StopPuttingAwayDecorations(u8 taskId)
 
 void sub_812A22C(u8 taskId)
 {
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = sub_812A25C;
 }
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 995a2bc7e..6bb1d9c86 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -1341,7 +1341,7 @@ static void CB2_QuizLadyQuestion(void)
     switch (gMain.state)
     {
     case 0:
-        FadeScreen(1, 0);
+        FadeScreen(FADE_TO_BLACK, 0);
         break;
     case 1:
         if (!gPaletteFade.active)
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 2ce2c04bb..2a942c9d9 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -461,7 +461,7 @@ void EggHatch(void)
 {
     ScriptContext2_Enable();
     CreateTask(Task_EggHatch, 10);
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
 }
 
 static void Task_EggHatch(u8 taskID)
diff --git a/src/item_use.c b/src/item_use.c
index 0b7625054..4d5796f59 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -601,7 +601,7 @@ void ItemUseOutOfBattle_PokeblockCase(u8 taskId)
     else
     {
         gFieldCallback = sub_80AF6D4;
-        FadeScreen(1, 0);
+        FadeScreen(FADE_TO_BLACK, 0);
         gTasks[taskId].func = sub_80FDC00;
     }
 }
diff --git a/src/player_pc.c b/src/player_pc.c
index 94484ab72..e10af43b8 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -484,7 +484,7 @@ static void ItemStorageMenuProcessInput(u8 taskId)
 static void ItemStorage_Deposit(u8 taskId)
 {
     gTasks[taskId].func = Task_ItemStorage_Deposit;
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
 }
 
 static void Task_ItemStorage_Deposit(u8 taskId)
@@ -714,7 +714,7 @@ static void Mailbox_MailOptionsProcessInput(u8 taskId)
 
 static void Mailbox_DoMailRead(u8 taskId)
 {
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
     gTasks[taskId].func = Mailbox_FadeAndReadMail;
 }
 
@@ -813,7 +813,7 @@ static void Mailbox_Give(u8 taskId)
         Mailbox_NoPokemonForMail(taskId);
     else
     {
-        FadeScreen(1, 0);
+        FadeScreen(FADE_TO_BLACK, 0);
         gTasks[taskId].func = Mailbox_DoGiveMailPokeMenu;
     }
 }
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index fae152bb2..3118f66cd 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -1790,7 +1790,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
             }
             else
             {
-                FadeScreen(1, 0);
+                FadeScreen(FADE_TO_BLACK, 0);
                 task->data[0] = 4;
             }
             break;
diff --git a/src/pokenav.c b/src/pokenav.c
index 6b971bc00..a7b7c95a3 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -320,7 +320,7 @@ void CB2_InitPokeNav(void)
 void OpenPokenavForTutorial(void)
 {
     SetMainCallback2(CB2_InitPokenavForTutorial);
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
 }
 
 static void CB2_InitPokenavForTutorial(void)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index a9be5c3ef..a6ead183b 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -650,13 +650,14 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
 
     switch (mode)
     {
-        case 1:
+        case FADE_TO_BLACK:
+        case FADE_TO_WHITE:   
         default:
             CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE);
             FadeScreen(mode, 0);
             break;
-        case 0:
-        case 2:
+        case FADE_FROM_BLACK:
+        case FADE_FROM_WHITE:
             CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE);
             FadeScreen(mode, 0);
             break;
diff --git a/src/secret_base.c b/src/secret_base.c
index b9826a257..1d5313383 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -423,7 +423,7 @@ static void Task_EnterSecretBase(u8 taskId)
 void EnterSecretBase(void)
 {
     CreateTask(Task_EnterSecretBase, 0);
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
     SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
 
diff --git a/src/shop.c b/src/shop.c
index 324154d2e..3fe490941 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -348,7 +348,7 @@ static void Task_HandleShopMenuBuy(u8 taskId)
     data[8] = (u32)CB2_InitBuyMenu >> 16;
     data[9] = (u32)CB2_InitBuyMenu;
     gTasks[taskId].func = Task_GoToBuyOrSellMenu;
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
 }
 
 static void Task_HandleShopMenuSell(u8 taskId)
@@ -357,7 +357,7 @@ static void Task_HandleShopMenuSell(u8 taskId)
     data[8] = (u32)CB2_GoToSellMenu >> 16;
     data[9] = (u32)CB2_GoToSellMenu;
     gTasks[taskId].func = Task_GoToBuyOrSellMenu;
-    FadeScreen(1, 0);
+    FadeScreen(FADE_TO_BLACK, 0);
 }
 
 void CB2_ExitSellMenu(void)
diff --git a/src/start_menu.c b/src/start_menu.c
index d0e28cf02..b9ecf77be 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -581,7 +581,7 @@ static bool8 HandleStartMenuInput(void)
             && gMenuCallback != StartMenuSafariZoneRetireCallback
             && gMenuCallback != StartMenuBattlePyramidRetireCallback)
         {
-           FadeScreen(1, 0);
+           FadeScreen(FADE_TO_BLACK, 0);
         }
 
         return FALSE;
diff --git a/src/union_room.c b/src/union_room.c
index ba973a7d9..1655b78da 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -1583,7 +1583,7 @@ void sub_8014790(u8 taskId)
     case 1:
         if (!ScriptContext1_IsScriptSetUp())
         {
-            FadeScreen(1, 0);
+            FadeScreen(FADE_TO_BLACK, 0);
             data[0] = 2;
         }
         break;