diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-11-27 13:34:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 13:34:15 -0600 |
| commit | 64e648098870bbae6f28ede1e391d0bacab60ffa (patch) | |
| tree | 116e6a90c275191d25b9b892fac3851e3674e580 /src/battle_message.c | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
| parent | 237261e193d75addf47fc0736b2d9ed10c8d3195 (diff) | |
Merge pull request #116 from DizzyEggg/decompile_berry_blender
Decompile berry blender
Diffstat (limited to 'src/battle_message.c')
| -rw-r--r-- | src/battle_message.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index 9c37cf646..65ff19741 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -59,7 +59,7 @@ 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 GetTextSpeedInRecordedBattle(void); -extern u8 sav2_get_text_speed(void); +extern u8 GetPlayerTextSpeed(void); // this file's functions static void sub_814F8F8(u8 *textPtr); @@ -2118,7 +2118,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) StringGetEnd10(dst); srcID += 3; break; - case B_BUFF_NEGATIVE_FLAVOUR: // flavour table + case B_BUFF_NEGATIVE_FLAVOR: // flavor table StringAppend(dst, gPokeblockWasTooXStringTable[src[srcID + 1]]); srcID += 2; break; @@ -2266,7 +2266,7 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1) else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) speed = sRecordedBattleTextSpeeds[GetTextSpeedInRecordedBattle()]; else - speed = sav2_get_text_speed(); + speed = GetPlayerTextSpeed(); gTextFlags.flag_0 = 1; } |