1 files changed, 17 insertions, 12 deletions

diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index c8171db52..ecfd8111b 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -31,7 +31,7 @@ extern struct SpriteTemplate gUnknown_02024E8C;
 extern u8 gContestPlayerMonIndex;
 extern u8 gIsLinkContest;
 extern u8 gPlayerPartyCount;
-extern u8 gSelectedOrderFromParty[];
+extern u8 gBufferedMoves[];
 
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
@@ -407,7 +407,7 @@ u8 sub_80C5044(void)
 
 void ShowContestEntryMonPic(void)
 {
-    struct SpritePalette *paletteData;
+    const struct CompressedSpritePalette *palette;
     u32 var1, var2;
     u16 species;
     u8 spriteId;
@@ -425,13 +425,18 @@ void ShowContestEntryMonPic(void)
         taskId = CreateTask(sub_80C5190, 0x50);
         gTasks[taskId].data[0] = 0;
         gTasks[taskId].data[1] = species;
-        HandleLoadSpecialPokePic((struct SpriteSheet *)&gMonFrontPicTable[species].data,
-        gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset,
-        (u32)gUnknown_081FAF4C[0], gUnknown_081FAF4C[1], species, var1);
-        paletteData = (struct SpritePalette *) sub_80409C8(species, var2, var1);
-        LoadCompressedObjectPalette(paletteData);
+        HandleLoadSpecialPokePic(
+          &gMonFrontPicTable[species],
+          gMonFrontPicCoords[species].coords,
+          gMonFrontPicCoords[species].y_offset,
+          (u32)gUnknown_081FAF4C[0],
+          gUnknown_081FAF4C[1],
+          species,
+          var1);
+        palette = sub_80409C8(species, var2, var1);
+        LoadCompressedObjectPalette(palette);
         GetMonSpriteTemplate_803C56C(species, 1);
-        gUnknown_02024E8C.paletteTag = paletteData->tag;
+        gUnknown_02024E8C.paletteTag = palette->tag;
         spriteId = CreateSprite(&gUnknown_02024E8C, 0x78, 0x40, 0);
         gTasks[taskId].data[2] = spriteId;
         gTasks[taskId].data[3] = left;
@@ -648,7 +653,7 @@ void sub_80C5568(void)
 
 void sub_80C5580(void)
 {
-    u8 var = gSelectedOrderFromParty[0];
+    u8 var = gBufferedMoves[0];
 
     switch(var)
     {
@@ -671,7 +676,7 @@ void ChooseBattleTowerPlayerParty(void)
 
 void SetBattleTowerPlayerParty(void)
 {
-    u8 var = gSelectedOrderFromParty[0];
+    u8 var = gBufferedMoves[0];
 
     switch(var)
     {
@@ -697,8 +702,8 @@ void ReducePlayerPartyToThree(void)
 
     // copy the selected pokemon according to the order.
     for(i = 0; i < 3; i++)
-        if(gSelectedOrderFromParty[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop
-            party[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1]; // index is 0 based, not literal
+        if(gBufferedMoves[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop
+            party[i] = gPlayerParty[gBufferedMoves[i] - 1]; // index is 0 based, not literal
 
     // delete the last 3 pokemon
     CpuFill32(0, gPlayerParty, sizeof gPlayerParty);