diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-19 10:50:39 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-19 10:50:39 +0000 |
| commit | 625be4bf04c9f14c4e1ee2e1ab74e7a5a7964a33 (patch) | |
| tree | 72fd9ebb925fe96cf83c4e7264b56af4b69e1eda /src/battle_message.c | |
| parent | 370e47beeef3f115d071161a7b2f09dcfbd2168b (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
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 4bd6ca5b7..9c37cf646 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 sav2_get_text_speed(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 = sav2_get_text_speed(); |