diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 18:34:41 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 18:34:41 -0400 |
commit | ed7ded0748b38b5266cdc6092446c7b184f75778 (patch) | |
tree | 0779eacd2dc6107e2dc47370abf82a1793cde6ed /include/battle_message.h | |
parent | 975e28c01e70c63587c8633ffc3c50b7d1759dec (diff) | |
parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) |
Merge branch 'master' into easy_chat
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[]; |