diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-20 16:23:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-20 16:23:51 -0800 |
| commit | 3ac76ce81a3dc000bdfec684192c9423af4619a6 (patch) | |
| tree | 91aa27f9e0dece2e811dd08bc6917029a2e33195 /src/battle/battle_7.c | |
| parent | 0f42ef11742cfc141b720846777e43d96a64ffc3 (diff) | |
| parent | 9d36bf245b25376b678e7f1d9a2c82a7b47464c9 (diff) | |
Merge pull request #464 from sceptillion/label_battle_anims
label battle anims
Diffstat (limited to 'src/battle/battle_7.c')
| -rw-r--r-- | src/battle/battle_7.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 8766b5b77..0728b4b71 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -43,8 +43,8 @@ extern u8 gBattleAnimBankAttacker; extern u8 gBattleAnimBankTarget; extern void (*gAnimScriptCallback)(void); extern u8 gAnimScriptActive; -extern const u8 *const gBattleAnims_Unknown1[]; -extern const u8 *const gBattleAnims_Unknown2[]; +extern const u8 *const gBattleAnims_General[]; +extern const u8 *const gBattleAnims_Special[]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct MonCoords gTrainerFrontPicCoords[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; @@ -177,7 +177,7 @@ bool8 move_anim_start_t3(u8 a, u8 b, u8 c, u8 d, u16 e) gBattleAnimBankAttacker = b; gBattleAnimBankTarget = c; ewram17840.unk0 = e; - DoMoveAnim(gBattleAnims_Unknown1, d, 0); + DoMoveAnim(gBattleAnims_General, d, 0); taskId = CreateTask(sub_80315E8, 10); gTasks[taskId].data[0] = a; ewram17810[gTasks[taskId].data[0]].unk0_5 = 1; @@ -216,7 +216,7 @@ void move_anim_start_t4(u8 a, u8 b, u8 c, u8 d) gBattleAnimBankAttacker = b; gBattleAnimBankTarget = c; - DoMoveAnim(gBattleAnims_Unknown2, d, 0); + DoMoveAnim(gBattleAnims_Special, d, 0); taskId = CreateTask(sub_80316CC, 10); gTasks[taskId].data[0] = a; ewram17810[gTasks[taskId].data[0]].unk0_6 = 1; |