1 files changed, 73 insertions, 76 deletions

diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index e53eb30cb..abc4dbc9e 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -3,6 +3,7 @@
 #include "battle.h"
 #include "berry.h"
 #include "contest.h"
+#include "data2.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "items.h"
@@ -21,9 +22,6 @@
 #define CONTEST_ENTRY_PIC_LEFT 10
 #define CONTEST_ENTRY_PIC_TOP 3
 
-extern const struct SpriteSheet gMonFrontPicTable[];
-extern struct MonCoords gMonFrontPicCoords[];
-
 extern void sub_80C46EC(void);
 extern void sub_80C4740(void);
 extern void sub_80C48F4(void);
@@ -35,7 +33,6 @@ extern void sub_8042044(struct Pokemon *mon, u16, u8);
 extern void sub_8121E10(void);
 extern void sub_8121E34(void);
 
-extern void *gUnknown_081FAF4C[];
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern struct SpritePalette *sub_80409C8(u16, u32, u32);
 
@@ -73,18 +70,18 @@ void sub_80C4C28(void)
 
     switch(specialVar)
     {
-        case 0:
-            var = 3;
-            break;
-        case 1:
-            var = 4;
-            break;
-        case 2:
-            var = 5;
-            break;
-        default:
-            var = 100;
-            break;
+    case 0:
+        var = 3;
+        break;
+    case 1:
+        var = 4;
+        break;
+    case 2:
+        var = 5;
+        break;
+    default:
+        var = 100;
+        break;
     }
     gSpecialVar_0x8004 = var;
 }
@@ -103,22 +100,22 @@ void sub_80C4C78(void)
 
     switch(gScriptContestCategory)
     {
-        case 0:
-            var = 8;
-            break;
-        case 1:
-            var = 9;
-            break;
-        case 2:
-            var = 10;
-            break;
-        case 3:
-            var = 11;
-            break;
-        case 4:
-        default:
-            var = 12;
-            break;
+    case 0:
+        var = 8;
+        break;
+    case 1:
+        var = 9;
+        break;
+    case 2:
+        var = 10;
+        break;
+    case 3:
+        var = 11;
+        break;
+    case 4:
+    default:
+        var = 12;
+        break;
     }
 
     returnVar = gSaveBlock1.sbStruct.unkSB2.sb1_2EFC_struct2[var].var;
@@ -437,7 +434,7 @@ void ShowContestEntryMonPic(void)
         gTasks[taskId].data[0] = 0;
         gTasks[taskId].data[1] = species;
         HandleLoadSpecialPokePic((struct SpriteSheet *)&gMonFrontPicTable[species].data,
-        gMonFrontPicCoords[species].x, gMonFrontPicCoords[species].y,
+        gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset,
         (u32)gUnknown_081FAF4C[0], gUnknown_081FAF4C[1], species, var1);
         paletteData = sub_80409C8(species, var2, var1);
         LoadCompressedObjectPalette(paletteData);
@@ -467,26 +464,26 @@ void sub_80C5190(u8 taskId)
 
     switch(task->data[0])
     {
-        case 2:
-            sprite = &gSprites[task->data[2]];
-            FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum));
-
-            if(sprite->oam.affineMode)
-                FreeOamMatrix(sprite->oam.matrixNum);
-
-            DestroySprite(sprite);
-            task->data[0]++;
-            break;
-        case 0:
-            task->data[0]++;
-            break;
-        case 3:
-            MenuZeroFillWindowRect(task->data[3], task->data[4], task->data[3] + 9, task->data[4] + 10);
-            DestroyTask(taskId);
-            break;
-        case 1:
-        default:
-            break;
+    case 2:
+        sprite = &gSprites[task->data[2]];
+        FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum));
+
+        if(sprite->oam.affineMode)
+            FreeOamMatrix(sprite->oam.matrixNum);
+
+        DestroySprite(sprite);
+        task->data[0]++;
+        break;
+    case 0:
+        task->data[0]++;
+        break;
+    case 3:
+        MenuZeroFillWindowRect(task->data[3], task->data[4], task->data[3] + 9, task->data[4] + 10);
+        DestroyTask(taskId);
+        break;
+    case 1:
+    default:
+        break;
     }
 }
 
@@ -593,15 +590,15 @@ void CheckForAlivePartyMons(void)
 
     switch(var)
     {
-        case 1:
-            gScriptResult = var;
-            break;
-        case 0:
-            gScriptResult = var;
-            break;
-        case 2:
-            gScriptResult = var;
-            break;
+    case 1:
+        gScriptResult = var;
+        break;
+    case 0:
+        gScriptResult = var;
+        break;
+    case 2:
+        gScriptResult = var;
+        break;
     }
 }
 
@@ -663,12 +660,12 @@ void sub_80C5580(void)
 
     switch(var)
     {
-        case 0:
-            gScriptResult = 0;
-            break;
-        default:
-            gScriptResult = 1;
-            break;
+    case 0:
+        gScriptResult = 0;
+        break;
+    default:
+        gScriptResult = 1;
+        break;
     }
 
     SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
@@ -686,14 +683,14 @@ void SetBattleTowerPlayerParty(void)
 
     switch(var)
     {
-        case 0: // player quit battle tower?
-            LoadPlayerParty();
-            gScriptResult = 0;
-            break;
-        default: // load battle tower.
-            ReducePlayerPartyToThree();
-            gScriptResult = 1;
-            break;
+    case 0: // player quit battle tower?
+        LoadPlayerParty();
+        gScriptResult = 0;
+        break;
+    default: // load battle tower.
+        ReducePlayerPartyToThree();
+        gScriptResult = 1;
+        break;
     }
 
     SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);