diff options
| author | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-11-19 20:11:02 -0800 |
|---|---|---|
| committer | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-11-19 20:11:02 -0800 |
| commit | 9d36bf245b25376b678e7f1d9a2c82a7b47464c9 (patch) | |
| tree | 91aa27f9e0dece2e811dd08bc6917029a2e33195 | |
| parent | 3e77fcdd38e9dfab732e8ce72ac1496cec652c0e (diff) | |
gBattleAnims_Unknown2 to gBattleAnims_Special
| -rw-r--r-- | data/battle_anim_scripts.s | 2 | ||||
| -rw-r--r-- | src/battle/battle_7.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index d38bfaf60..08ef8be32 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -408,7 +408,7 @@ gBattleAnims_General:: @ 81C771C .4byte General_WishHeal .align 2 -gBattleAnims_Unknown2:: @ 81C7778 +gBattleAnims_Special:: @ 81C7778 .4byte Special_LevelUp .4byte Special_SwitchOutPlayerMon .4byte Special_SwitchOutOpponentMon diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 6c2bdcb9b..0728b4b71 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -44,7 +44,7 @@ extern u8 gBattleAnimBankTarget; extern void (*gAnimScriptCallback)(void); extern u8 gAnimScriptActive; extern const u8 *const gBattleAnims_General[]; -extern const u8 *const gBattleAnims_Unknown2[]; +extern const u8 *const gBattleAnims_Special[]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct MonCoords gTrainerFrontPicCoords[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; @@ -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; |