diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
| commit | 99f9d40be14633630503ebcd75787fc7fdfe1486 (patch) | |
| tree | c3962867c76bca0f06311bc39791aa42889e877d /include/battle_message.h | |
| parent | 294cbd8beb08b14a24385a78f1a8435f5fbe2f8c (diff) | |
| parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) | |
Merge remote-tracking branch 'origin/master' into field_specials
Diffstat (limited to 'include/battle_message.h')
| -rw-r--r-- | include/battle_message.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_message.h b/include/battle_message.h index 04a7770a3..1ac20ce30 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -1,7 +1,7 @@ #ifndef GUARD_BATTLE_MESSAGE_H #define GUARD_BATTLE_MESSAGE_H -void get_battle_strings_(u8 *); -void sub_8120FFC(const u8 *, u8 *); +void StrCpyDecodeToDisplayedStringBattle(u8 *); +void StrCpyDecodeBattle(const u8 *, u8 *); #endif // GUARD_BATTLE_MESSAGE_H |