Fix fake-matching DrawMonDescriptorStatus()

4 files changed, 32 insertions, 32 deletions

diff --git a/src/choose_party.c b/src/choose_party.c
index e81f53a1b..6f1481c45 100644
--- a/src/choose_party.c
+++ b/src/choose_party.c
@@ -31,7 +31,7 @@ EWRAM_DATA u8 gSelectedOrderFromParty[3] = {0};
 
 extern u8 sub_806BD58(u8, u8);
 extern void PartyMenuPrintMonsLevelOrStatus(void);
-extern void sub_806BC3C(u8, u8);
+extern void DrawMonDescriptorStatus(u8, u8);
 extern u8 GetMonStatusAndPokerus();
 extern void PartyMenuPrintHP();
 extern bool8 sub_80F9344(void); 
@@ -130,16 +130,16 @@ bool8 SetupBattleTowerPartyMenu(void)
             {
                 if (gSelectedOrderFromParty[j] == i + 1)
                 {
-                    sub_806BC3C(i, j * 14 + 0x1C);
+                    DrawMonDescriptorStatus(i, j * 14 + 0x1C);
                     break;
                 }
             }
             if (j == 3)
             {
                 if (IsMonAllowedInBattleTower(&gPlayerParty[i]) == TRUE)
-                    sub_806BC3C(i, 0x70);
+                    DrawMonDescriptorStatus(i, 0x70);
                 else
-                    sub_806BC3C(i, 0x7E);
+                    DrawMonDescriptorStatus(i, 0x7E);
             }
         }
         ewram1B000_alt.setupState++;
@@ -453,7 +453,7 @@ static void BattleTowerEntryMenuCallback_Enter(u8 taskId)
         if (gSelectedOrderFromParty[i] == 0)
         {
             gSelectedOrderFromParty[i] = gLastFieldPokeMenuOpened + 1;
-            sub_806BC3C(gLastFieldPokeMenuOpened, i * 14 + 0x1C);
+            DrawMonDescriptorStatus(gLastFieldPokeMenuOpened, i * 14 + 0x1C);
             if (i == 2)
                 SelectBattleTowerOKButton(taskId);
             BattleTowerEntryMenuCallback_Exit(taskId);
@@ -505,11 +505,11 @@ static void BattleTowerEntryMenuCallback_NoEntry(u8 taskId)
             break;  // exit loop
         }
     }
-    sub_806BC3C(gLastFieldPokeMenuOpened, 0x70);
+    DrawMonDescriptorStatus(gLastFieldPokeMenuOpened, 0x70);
     if (gSelectedOrderFromParty[0] != 0)
-        sub_806BC3C(gSelectedOrderFromParty[0] - 1, 0x1C);
+        DrawMonDescriptorStatus(gSelectedOrderFromParty[0] - 1, 0x1C);
     if (gSelectedOrderFromParty[1] != 0)
-        sub_806BC3C(gSelectedOrderFromParty[1] - 1, 0x2A);
+        DrawMonDescriptorStatus(gSelectedOrderFromParty[1] - 1, 0x2A);
     BattleTowerEntryMenuCallback_Exit(taskId);
 }
 
diff --git a/src/party_menu.c b/src/party_menu.c
index 8887bb554..785d86007 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1213,29 +1213,29 @@ void sub_806BBEC(u8 a)
     }
 }
 
-void sub_806BC3C(u8 monIndex, u8 b)
+// Draws the descriptor text in the mon's party bubble.
+// Descriptor texts are things like "ABLE", "NOT ABLE", "LEARNED", etc.
+void DrawMonDescriptorStatus(u8 monIndex, u8 descriptorOffset)
 {
-    u16 *vramPtr = gUnknown_08376918[IsDoubleBattle()][monIndex];
     u8 i;
-    u16 var1;
+    u32 offset;
+    u16 *vramPtr = gUnknown_08376918[IsDoubleBattle()][monIndex];
+    int paletteNum = 0;
 
-    for (i = 0, var1 = (b / 7) * 32; i <= PARTY_SIZE; i++)
+    for (i = 0; i < 7; i++)
     {
-        u32 offset = i + var1;
-        vramPtr[i] = gUnknown_08E9A300[offset] + 0x10C;
-        vramPtr[i + 0x20] = gUnknown_08E9A300[offset + 0x20] + 0x10C;
+        offset = i + (descriptorOffset / 7) * 32;
+        vramPtr[i] = paletteNum | (gUnknown_08E9A300[offset] + 0x10C);
+        vramPtr[i + 0x20] = paletteNum | (gUnknown_08E9A300[offset + 0x20] + 0x10C);
     }
-
-    // Some dead code was likely optimized out, but the compiler still think r8 was used.
-    asm("":::"r8");
 }
 
-void unref_sub_806BCB8(u8 a)
+void unref_sub_806BCB8(u8 descriptorOffset)
 {
     u8 i;
 
     for (i = 0; i < gPlayerPartyCount; i++)
-        sub_806BC3C(i, a);
+        DrawMonDescriptorStatus(i, descriptorOffset);
 }
 
 // This is ultimately unreferenced, since it's caller is unreferenced.
@@ -1250,19 +1250,19 @@ void sub_806BCE8()
             switch (GetMonGender(&gPlayerParty[i]))
             {
             case MON_MALE:
-                sub_806BC3C(i, 0x54);
+                DrawMonDescriptorStatus(i, 0x54);
                 break;
             case MON_FEMALE:
-                sub_806BC3C(i, 0x62);
+                DrawMonDescriptorStatus(i, 0x62);
                 break;
             default:
-                sub_806BC3C(i, 0x46);
+                DrawMonDescriptorStatus(i, 0x46);
                 break;
             }
         }
         else
         {
-            sub_806BC3C(i, 0x46);
+            DrawMonDescriptorStatus(i, 0x46);
         }
     }    
 }
diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c
index df8621b4b..bafa32afa 100644
--- a/src/pokemon_menu.c
+++ b/src/pokemon_menu.c
@@ -944,11 +944,11 @@ static void sub_808AE8C(void)
              gUnknown_020297ED == 0 &&
 #endif
              (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !CanMonLearnTMHM(&gPlayerParty[i], arg)))
-                sub_806BC3C(i, 0x9A);
+                DrawMonDescriptorStatus(i, 0x9A);
             else if (pokemon_has_move(&gPlayerParty[i], ItemIdToBattleMoveId(gSpecialVar_ItemId)))
-                sub_806BC3C(i, 0xA8);
+                DrawMonDescriptorStatus(i, 0xA8);
             else
-                sub_806BC3C(i, 0x8C);
+                DrawMonDescriptorStatus(i, 0x8C);
         }
     }
 }
@@ -963,7 +963,7 @@ static void sub_808AF20(void)
             if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) || !GetEvolutionTargetSpecies(&gPlayerParty[i], 3, gSpecialVar_ItemId))
             {
                 sub_806D668(i);
-                sub_806BC3C(i, 0);
+                DrawMonDescriptorStatus(i, 0);
             }
         }
     }
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);
     }
 }