Merge branch 'master' into slot_machine

1 files changed, 3 insertions, 2 deletions

diff --git a/src/unk_815C980.c b/src/unk_815C980.c
index 9d0dd3341..09b92c834 100644
--- a/src/unk_815C980.c
+++ b/src/unk_815C980.c
@@ -41,6 +41,7 @@ static void sub_815CFEC(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
 static bool32 SharesTileWithAnyActive(u32 id);
 static bool32 SharesPalWithAnyActive(u32 id);
 static void sub_8035648(void);
+static u8 sub_815D324(u32 shape, u32 size);
 
 // ewram
 static EWRAM_DATA struct UnkStruct1 *gUnknown_203F454 = {0};
@@ -127,7 +128,7 @@ bool32 sub_815CA40(u32 id, s32 arg1, const struct UnkStruct3 *arg2)
 
             compObjectPic = *(struct CompressedSpriteSheet*)(arg2->spriteSheet);
             compObjectPic.size = GetDecompressedDataSize(arg2->spriteSheet->data);
-            gUnknown_203F454->array[id].tileStart = LoadCompressedObjectPic(&compObjectPic);
+            gUnknown_203F454->array[id].tileStart = LoadCompressedSpriteSheet(&compObjectPic);
         }
 
         if (gUnknown_203F454->array[id].tileStart == 0xFFFF)
@@ -430,7 +431,7 @@ static bool32 SharesPalWithAnyActive(u32 id)
     return FALSE;
 }
 
-u8 sub_815D324(u32 shape, u32 size)
+static u8 sub_815D324(u32 shape, u32 size)
 {
     return gUnknown_8479658[shape][size];
 }