diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-06 08:20:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-06 08:20:41 -0500 |
| commit | b9e38a569eac79572fa0676b82e2d755e30b1357 (patch) | |
| tree | 9d3b25dec0536b47a88cc190773794ff53c1b95c /src/battle_gfx_sfx_util.c | |
| parent | 3d50d01a93314569a3b647bf52c87b52c1dcf41c (diff) | |
| parent | 17c5b4089ae0477c8500f6d2ccd686a75aab784e (diff) | |
Merge pull request #320 from DizzyEggg/anims
Document battle animation scripts
Diffstat (limited to 'src/battle_gfx_sfx_util.c')
| -rw-r--r-- | src/battle_gfx_sfx_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index b4dcf586d..e5c8582a9 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -29,7 +29,7 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const u8 gUnknown_0831C604[]; -extern const u8 * const gBattleAnims_VariousTable[]; +extern const u8 * const gBattleAnims_General[]; extern const u8 * const gBattleAnims_Special[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const struct CompressedSpriteSheet gMonBackPicTable[]; @@ -437,7 +437,7 @@ bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattler, u8 atkBattler, u8 de gBattleAnimAttacker = atkBattler; gBattleAnimTarget = defBattler; gBattleSpritesDataPtr->animationData->animArg = argument; - LaunchBattleAnimation(gBattleAnims_VariousTable, tableId, FALSE); + LaunchBattleAnimation(gBattleAnims_General, tableId, FALSE); taskId = CreateTask(Task_ClearBitWhenBattleTableAnimDone, 10); gTasks[taskId].tBattlerId = activeBattler; gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].animFromTableActive = 1; |