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/pokedex.c | |
| parent | 6dffa6d17c35fe13f5878bd7bbf8a3fe1054c20c (diff) | |
| parent | ebbe826133661d3faabc17f9167fa565b405514a (diff) | |
Merge with master
Diffstat (limited to 'src/pokedex.c')
| -rw-r--r-- | src/pokedex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index ef8905bb6..755a46821 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1803,7 +1803,7 @@ bool8 sub_80BC514(u8 a) ResetSpriteData(); FreeAllSpritePalettes(); gReservedSpritePaletteCount = 8; - LoadCompressedObjectPic(&sInterfaceSpriteSheet[0]); + LoadCompressedSpriteSheet(&sInterfaceSpriteSheet[0]); LoadSpritePalettes(sInterfaceSpritePalette); CreateInterfaceSprites(a); gMain.state++; @@ -4815,7 +4815,7 @@ void sub_80C12E0(u8 taskId) } break; case 1: - LoadCompressedObjectPic(sInterfaceSpriteSheet); + LoadCompressedSpriteSheet(sInterfaceSpriteSheet); LoadSpritePalettes(sInterfaceSpritePalette); sub_80C2594(taskId); for (i = 0; i < 16; i++) |