diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-05 09:38:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-05 09:38:27 -0400 |
| commit | 3d3ec3150a7d297efe8b1dffe28a28275692f819 (patch) | |
| tree | e86983f4601dc74a8113dae471fa12315effb02f /include/battle_message.h | |
| parent | 78535eea89e8b71f37e188289793e3e18c9bb985 (diff) | |
| parent | f89f80daec6d1e9ec85fdc898f1b7914a126612e (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'include/battle_message.h')
| -rw-r--r-- | include/battle_message.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/battle_message.h b/include/battle_message.h index 9c27994ee..97a42bbf8 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_MESSAGE_H #define GUARD_BATTLE_MESSAGE_H +#define TEXT_BUFF_ARRAY_COUNT 16 + struct StringInfoBattle { u16 currentMove; @@ -154,7 +156,7 @@ struct StringInfoBattle } void BufferStringBattle(u16 stringID); -u32 StrCpyDecodeToDisplayedStringBattle(const u8* src); -u32 StrCpyDecodeBattle(const u8* src, u8* dst); +u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src); +u32 BattleStringExpandPlaceholders(const u8* src, u8* dst); #endif // GUARD_BATTLE_MESSAGE_H |