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/battle_anim.c | |
| parent | 6dffa6d17c35fe13f5878bd7bbf8a3fe1054c20c (diff) | |
| parent | ebbe826133661d3faabc17f9167fa565b405514a (diff) | |
Merge with master
Diffstat (limited to 'src/battle_anim.c')
| -rw-r--r-- | src/battle_anim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index 1e1219800..2d211c411 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1605,8 +1605,8 @@ static void ScriptCmd_loadspritegfx(void) sBattleAnimScriptPtr++; index = T1_READ_16(sBattleAnimScriptPtr); - LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)]); - LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]); + LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(index)]); + LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(index)]); sBattleAnimScriptPtr += 2; AddSpriteIndex(GET_TRUE_SPRITE_INDEX(index)); gAnimFramesToWait = 1; |