1 files changed, 23 insertions, 34 deletions

diff --git a/src/starter_choose.c b/src/starter_choose.c
index 6ef410d21..32b6adf36 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "starter_choose.h"
 #include "asm.h"
+#include "data2.h"
 #include "decompress.h"
 #include "main.h"
 #include "menu.h"
@@ -11,23 +12,11 @@
 #include "species.h"
 #include "sprite.h"
 #include "string_util.h"
+#include "strings.h"
 #include "task.h"
 #include "trig.h"
 
-struct MonCoords
-{
-    u8 x, y;
-};
-
-extern void * const gUnknown_081FAF4C[];
-extern const u8 gOtherText_DoYouChoosePoke[];
 extern u16 gScriptResult;
-extern const u8 gSpeciesNames[][11];
-extern const u8 gOtherText_Poke[];
-extern const struct SpriteSheet gMonFrontPicTable[];
-extern const struct MonCoords gMonFrontPicCoords[];
-extern const struct SpritePalette gMonPaletteTable[];
-extern const u8 gOtherText_BirchInTrouble[];
 extern struct SpriteTemplate gUnknown_02024E8C;
 
 //--------------------------------------------------
@@ -448,26 +437,26 @@ static void Task_StarterChoose5(u8 taskId)
 
     switch (ProcessMenuInputNoWrap_())
     {
-        case 0:  // YES
-            //Return the starter choice and exit.
-            gScriptResult = gTasks[taskId].tStarterSelection;
-            SetMainCallback2(gMain.savedCallback);
-            break;
-        case 1:  // NO
-        case -1: // B button
-            PlaySE(SE_SELECT);
-            MenuZeroFillWindowRect(21, 7, 27, 12);
-
-            spriteId = gTasks[taskId].tPkmnSpriteId;
-            FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum));
-            FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
-            DestroySprite(&gSprites[spriteId]);
-
-            spriteId = gTasks[taskId].tCircleSpriteId;
-            FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
-            DestroySprite(&gSprites[spriteId]);
-            gTasks[taskId].func = Task_StarterChoose6;
-            break;
+    case 0:  // YES
+        //Return the starter choice and exit.
+        gScriptResult = gTasks[taskId].tStarterSelection;
+        SetMainCallback2(gMain.savedCallback);
+        break;
+    case 1:  // NO
+    case -1: // B button
+        PlaySE(SE_SELECT);
+        MenuZeroFillWindowRect(21, 7, 27, 12);
+
+        spriteId = gTasks[taskId].tPkmnSpriteId;
+        FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum));
+        FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
+        DestroySprite(&gSprites[spriteId]);
+
+        spriteId = gTasks[taskId].tCircleSpriteId;
+        FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
+        DestroySprite(&gSprites[spriteId]);
+        gTasks[taskId].func = Task_StarterChoose6;
+        break;
     }
 }
 
@@ -567,7 +556,7 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
 
     DecompressPicFromTable_2(
       &gMonFrontPicTable[species],
-      gMonFrontPicCoords[species].x, gMonFrontPicCoords[species].y,
+      gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset,
       gUnknown_081FAF4C[0], gUnknown_081FAF4C[1],
       species);
     LoadCompressedObjectPalette(&gMonPaletteTable[species]);