From 4ee671c9bf6e4ba920f58cd8d4a6facc8bed431d Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Mon, 21 May 2018 08:50:36 -0700
Subject: Standardize args to palette blend functions

---
 src/script_pokemon_util_80F99CC.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/script_pokemon_util_80F99CC.c')

diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index df83d3e2d..7612c44e1 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -36,7 +36,7 @@ void sub_80F99CC(void)
     ScriptContext2_Enable();
     taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA);
     gTasks[taskId].data[0] = PARTY_MENU_TYPE_CONTEST;
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
 }
 
 void SelectMonForNPCTrade(void)
@@ -46,7 +46,7 @@ void SelectMonForNPCTrade(void)
     ScriptContext2_Enable();
     taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA);
     gTasks[taskId].data[0] = PARTY_MENU_TYPE_IN_GAME_TRADE;
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
 }
 
 void SelectMoveTutorMon(void)
@@ -56,7 +56,7 @@ void SelectMoveTutorMon(void)
     ScriptContext2_Enable();
     taskId = CreateTask((void *)OpenPartyMenuFromScriptContext, 0xA);
     gTasks[taskId].data[0] = PARTY_MENU_TYPE_MOVE_TUTOR;
-    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
 }
 
 void OpenPartyMenuFromScriptContext(u8 taskId)
-- 
cgit v1.2.3


From dc6fb7be6a6391f705b052906d0b566e9eb0891e Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Thu, 7 Jun 2018 17:06:59 -0500
Subject: Fix fake-matching DrawMonDescriptorStatus()

---
 src/script_pokemon_util_80F99CC.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/script_pokemon_util_80F99CC.c')

diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index 7612c44e1..b292265a6 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -144,11 +144,11 @@ void sub_80F9C00(void)
         case 0:
         case 3:
         case 4:
-            sub_806BC3C(i, 0x7E);
+            DrawMonDescriptorStatus(i, 0x7E);
             break;
         case 1:
         case 2:
-            sub_806BC3C(i, 0x70);
+            DrawMonDescriptorStatus(i, 0x70);
             break;
         }
     }
@@ -246,9 +246,9 @@ void sub_80F9E1C(void)
     for (i = 0; i < gPlayerPartyCount; i++)
     {
         if (!sub_8040574(&gPlayerParty[i]))
-            sub_806BC3C(i, 0x9A);
+            DrawMonDescriptorStatus(i, 0x9A);
         else
-            sub_806BC3C(i, 0x8C);
+            DrawMonDescriptorStatus(i, 0x8C);
     }
 }
 
-- 
cgit v1.2.3