Pass spritesheets to LoadCompressedObjectPic

4 files changed, 15 insertions, 14 deletions

diff --git a/src/pokedex.c b/src/pokedex.c
index 8d574ed57..aa832a681 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -70,7 +70,7 @@ extern u8 gUnknown_08E96738[];
 extern u8 gUnknown_08E9C6DC[];
 extern u8 gUnknown_08E96888[];
 extern u8 gUnknown_08E96994[];
-extern u8 gUnknown_083A05CC[];
+extern struct SpriteSheet gUnknown_083A05CC;
 extern struct SpritePalette gUnknown_083A05DC[];
 extern u8 gUnknown_0839FA7C[];
 extern u8 gUnknown_0839F67C[];
@@ -771,7 +771,7 @@ bool8 sub_808D344(u8 a)
             ResetSpriteData();
             FreeAllSpritePalettes();
             gReservedSpritePaletteCount = 8;
-            LoadCompressedObjectPic(gUnknown_083A05CC);
+            LoadCompressedObjectPic(&gUnknown_083A05CC);
             LoadSpritePalettes(gUnknown_083A05DC);
             sub_808E978(a);
             gMain.state++;
diff --git a/src/starter_choose.c b/src/starter_choose.c
index f21ddde1c..341f73e4c 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -11,6 +11,7 @@
 #include "task.h"
 #include "trig.h"
 #include "decompress.h"
+#include "sprite.h"
 
 struct MonCoords
 {
@@ -22,8 +23,8 @@ extern const u8 gStarterChoose_PokeballCoords[][2];
 extern u8 gUnknown_083F66F0[];
 extern u8 gBirchBagTilemap[];
 extern u8 gBirchGrassTilemap[];
-extern u8 gUnknown_083F7794[];
-extern u8 gUnknown_083F77A4[];
+extern struct SpriteSheet gUnknown_083F7794;
+extern struct SpriteSheet gUnknown_083F77A4;
 extern u8 gUnknown_083F62EC[];
 extern const u8 gStarterChoose_LabelCoords[][2];
 extern u16 gStarterMons[];
@@ -116,8 +117,8 @@ void CB2_ChooseStarter(void)
     ResetPaletteFade();
     FreeAllSpritePalettes();
     LoadPalette(gUnknown_083F62EC, 0, 0x40);
-    LoadCompressedObjectPic(gUnknown_083F7794);
-    LoadCompressedObjectPic(gUnknown_083F77A4);
+    LoadCompressedObjectPic(&gUnknown_083F7794);
+    LoadCompressedObjectPic(&gUnknown_083F77A4);
     LoadSpritePalettes(gUnknown_083F77B4);
     SetUpWindowConfig(&gWindowConfig_81E6C3C);
     InitMenuWindow(&gWindowConfig_81E6CE4);
diff --git a/src/title_screen.c b/src/title_screen.c
index 6100fbdc5..272c01047 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -25,12 +25,12 @@ extern u8 gUnknown_08393BF8[];
 extern u16 gUnknown_08393E64[];
 extern struct SpriteTemplate gSpriteTemplate_8393ECC;
 extern struct SpriteTemplate gSpriteTemplate_8393EE4;
-extern u8 gUnknown_08393EFC[];
+extern struct SpriteSheet gUnknown_08393EFC;
 extern struct SpriteTemplate gSpriteTemplate_8393F74;
-extern u8 gUnknown_08393F8C[];
+extern struct SpriteSheet gUnknown_08393F8C;
 extern u8 gUnknown_08393F9C[];
 extern struct SpriteTemplate gSpriteTemplate_8393FC0;
-extern u8 gUnknown_08393FD8[];
+extern struct SpriteSheet gUnknown_08393FD8;
 extern u8 gUnknown_08E9D8CC[];
 extern u8 gUnknown_08E9F624[];
 extern u8 gUnknown_08E9F7E4[];
@@ -253,9 +253,9 @@ void CB2_InitTitleScreen(void)
         ResetSpriteData();
         FreeAllSpritePalettes();
         gReservedSpritePaletteCount = 14;
-        LoadCompressedObjectPic(gUnknown_08393EFC);
-        LoadCompressedObjectPic(gUnknown_08393F8C);
-        LoadCompressedObjectPic(gUnknown_08393FD8);
+        LoadCompressedObjectPic(&gUnknown_08393EFC);
+        LoadCompressedObjectPic(&gUnknown_08393F8C);
+        LoadCompressedObjectPic(&gUnknown_08393FD8);
         LoadPalette(gUnknown_08E9F624, 0x100, 0x1C0);
         LoadSpritePalette(gUnknown_08393F9C);
         gMain.state = 2;
diff --git a/src/wallclock.c b/src/wallclock.c
index abfc4a12a..b6d648d33 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -15,7 +15,7 @@ extern u16 gSpecialVar_0x8004;
 extern u16 gMiscClockMale_Pal[];
 extern u16 gMiscClockFemale_Pal[];
 extern u8 gMiscClock_Gfx[];
-extern u8 gUnknown_083F7A90[];
+extern struct SpriteSheet gUnknown_083F7A90;
 extern struct SpritePalette gUnknown_083F7AA0;
 extern u8 gUnknown_08E95774[];
 extern u8 gUnknown_08E954B0[];
@@ -122,7 +122,7 @@ static void LoadWallClockGraphics(void)
     ResetSpriteData();
     ResetPaletteFade();
     FreeAllSpritePalettes();
-    LoadCompressedObjectPic(gUnknown_083F7A90);
+    LoadCompressedObjectPic(&gUnknown_083F7A90);
     LoadSpritePalettes(&gUnknown_083F7AA0);
     SetUpWindowConfig(&gWindowConfig_81E6C3C);
     InitMenuWindow(&gWindowConfig_81E6CE4);