diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-14 01:17:28 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-14 01:17:28 +0100 |
| commit | 30858625ff6c82d7a6380a44acf5c75baa988f20 (patch) | |
| tree | 5814ac66984c481382418db28ff97f018ffc04d7 /src/battle/battle_controller_player.c | |
| parent | 29d16a0af10c2de52de8ff37c13dd5aa3401c98f (diff) | |
| parent | 2e8f0cd4b33a7a3ea92b2b42742d78d98959d1e5 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle_anim_data
Diffstat (limited to 'src/battle/battle_controller_player.c')
| -rw-r--r-- | src/battle/battle_controller_player.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index a5f833b6c..2bdf448db 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -98,7 +98,7 @@ extern void move_anim_start_t2_for_situation(); extern void bx_blink_t1(void); extern void sub_8047858(); extern u8 GetBankSide(u8); -extern void sub_80E43C0(); +extern void StartBattleIntroAnim(); extern void oamt_add_pos2_onto_pos1(); extern void sub_8078B34(struct Sprite *); extern void StoreSpriteCallbackInData(); @@ -2875,7 +2875,7 @@ void PlayerHandleFaintingCry(void) void PlayerHandleIntroSlide(void) { - sub_80E43C0(gBattleBufferA[gActiveBank][1]); + StartBattleIntroAnim(gBattleBufferA[gActiveBank][1]); gUnknown_02024DE8 |= 1; PlayerBufferExecCompleted(); } |