diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-22 23:30:41 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-22 23:30:41 +0100 |
| commit | adb4927504784f101a327c07425a7d05d00c2602 (patch) | |
| tree | 00c5646fc6c2b206836f71143bf7441de2c98433 /src/contest.c | |
| parent | 6dffa6d17c35fe13f5878bd7bbf8a3fe1054c20c (diff) | |
| parent | ebbe826133661d3faabc17f9167fa565b405514a (diff) | |
Merge with master
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/contest.c b/src/contest.c index 3d74109cb..34662b490 100644 --- a/src/contest.c +++ b/src/contest.c @@ -2484,7 +2484,7 @@ u8 sub_80DB0C4(void) { u8 spriteId; - LoadCompressedObjectPic(&gUnknown_08587C00); + LoadCompressedSpriteSheet(&gUnknown_08587C00); LoadCompressedPalette(gContest2Pal, 0x110, 32); spriteId = CreateSprite(&gSpriteTemplate_8587BE8, 112, 36, 30); gSprites[spriteId].oam.paletteNum = 1; @@ -2496,8 +2496,8 @@ u8 sub_80DB120(void) { u8 spriteId; - LoadCompressedObjectPic(&gUnknown_08587C08); - LoadCompressedObjectPalette(&gUnknown_08587C10); + LoadCompressedSpriteSheet(&gUnknown_08587C08); + LoadCompressedSpritePalette(&gUnknown_08587C10); spriteId = CreateSprite(&gSpriteTemplate_8587C18, 96, 10, 29); gSprites[spriteId].invisible = TRUE; gSprites[spriteId].data[0] = gSprites[spriteId].oam.tileNum; |