diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-19 22:58:13 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-19 22:58:13 +0100 |
| commit | ad3a97e178b93c38b1d43f8120449b042ac23a0e (patch) | |
| tree | 1c0e790d275ae85cc82360406fd2e655ae262d1f /src/battle_message.c | |
| parent | a3b5af17eabb255e983e61c6306e30f27de82524 (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) | |
berry blender merge conflicts
Diffstat (limited to 'src/battle_message.c')
| -rw-r--r-- | src/battle_message.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index 1f39d5397..acdb18699 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -58,7 +58,7 @@ extern const u8* GetTrainer1LoseText(void); // battle_setup extern const u8* GetTrainer2LoseText(void); // battle_setup extern void GetFrontierTrainerName(u8 *dst, u16 trainerId); extern s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, const u8 *str, s32 totalWidth, s16 letterSpacing); -extern u8 sub_8185FC4(void); +extern u8 GetTextSpeedInRecordedBattle(void); extern u8 GetPlayerTextSpeed(void); // this file's functions @@ -2264,7 +2264,7 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1) if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) speed = 1; else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) - speed = sRecordedBattleTextSpeeds[sub_8185FC4()]; + speed = sRecordedBattleTextSpeeds[GetTextSpeedInRecordedBattle()]; else speed = GetPlayerTextSpeed(); |