diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:37:41 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:37:41 -0400 |
| commit | 9cfdc8b7e8cba38bc530b16993f628c92f69c025 (patch) | |
| tree | d37bef6a048f87491011addb679cb75ef0d8c74a /include/battle_message.h | |
| parent | 1b499670bd8a428f9b0d5506c334aa88bf4272a3 (diff) | |
| parent | 63210c07897e86953bf093397eee5a33e95b8c91 (diff) | |
Merge branch 'master' into heal_location
Diffstat (limited to 'include/battle_message.h')
| -rw-r--r-- | include/battle_message.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/battle_message.h b/include/battle_message.h index 3b154c5a6..3f9b38cad 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -204,7 +204,7 @@ struct StringInfoBattle void BufferStringBattle(u16 stringID); u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src); u32 BattleStringExpandPlaceholders(const u8* src, u8* dst); -void sub_814F9EC(const u8* text, u8 arg1); +void BattleHandleAddTextPrinter(const u8* text, u8 arg1); void SetPpNumbersPaletteInMoveSelection(void); u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp); @@ -215,6 +215,7 @@ extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT]; +extern const u8* const gBattleStringsTable[]; extern const u8* const gStatNamesTable[]; extern const u8* const gPokeblockWasTooXStringTable[]; extern const u8* const gRefereeStringsTable[]; |