diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-22 16:12:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 16:12:27 -0600 |
| commit | ebbe826133661d3faabc17f9167fa565b405514a (patch) | |
| tree | 52687e79258567b4d88c184b6692e035d0ff3e14 /src/pokedex.c | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
| parent | c805bab48324f946845e1f81002035e4bdb07e62 (diff) | |
Merge pull request #437 from DizzyEggg/storage
Pokemon Storage System
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++) |