diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
| commit | 1ff1e8ce9547d646b17b135b3013a516d17f35db (patch) | |
| tree | c23fbb425b230e81529932482ddb0fe7fc6a1376 /src/battle/battle_controller_player.c | |
| parent | daa0a98ee0129be1797274de318a35df30d39020 (diff) | |
| parent | b9388f078ed95e80ac73b35eeb206e52ce376b0c (diff) | |
Merge branch 'master' into pokemon_storage_system
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(); } |