diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-07-25 08:10:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 08:10:18 -0700 |
| commit | 919e7b4387556ce59e2d3a3bcb2ad44fe76ee8ee (patch) | |
| tree | 345f52571b2d6c5505441e914f73d576acff7c9a /include | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
| parent | 7270e73fee332d53c4f30069af4525d89cd165b0 (diff) | |
Merge pull request #279 from Diegoisawesome/master
Move strings to C, misc cleanup
Diffstat (limited to 'include')
| -rw-r--r-- | include/dynamic_placeholder_text_util.h | 9 | ||||
| -rw-r--r-- | include/overworld.h | 2 | ||||
| -rw-r--r-- | include/unk_text_util.h | 9 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/dynamic_placeholder_text_util.h b/include/dynamic_placeholder_text_util.h new file mode 100644 index 000000000..19bca71bb --- /dev/null +++ b/include/dynamic_placeholder_text_util.h @@ -0,0 +1,9 @@ +#ifndef GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H +#define GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H + +void DynamicPlaceholderTextUtil_Reset(void); +void DynamicPlaceholderTextUtil_SetPlaceholderPtr(u8 idx, const u8 *ptr); +u8 *DynamicPlaceholderTextUtil_ExpandPlaceholders(u8 *dest, const u8 *src); +const u8 *DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 idx); + +#endif //GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H diff --git a/include/overworld.h b/include/overworld.h index 6869d7084..341e44278 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -126,8 +126,8 @@ void CB2_ReturnToFieldLocal(void); void CB2_ReturnToFieldLink(void); void c2_8056854(void); void CB2_ReturnToFieldWithOpenMenu(void); -void sub_80861B0(void); void CB2_ReturnToFieldContinueScript(void); +void CB2_ReturnToFieldContinueScriptPlayMapMusic(void); void sub_80861E8(void); void CB2_ContinueSavedGame(void); void sub_8086C2C(void); diff --git a/include/unk_text_util.h b/include/unk_text_util.h deleted file mode 100644 index 72243a90e..000000000 --- a/include/unk_text_util.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef GUARD_UNK_TEXT_UTIL_H -#define GUARD_UNK_TEXT_UTIL_H - -void UnkTextUtil_Reset(void); -void UnkTextUtil_SetPtrI(u8 idx, const u8 *ptr); -u8 *UnkTextUtil_StringExpandPlaceholders(u8 *dest, const u8 *src); -const u8 *UnkTextUtil_GetPtrI(u8 idx); - -#endif //GUARD_UNK_TEXT_UTIL_H |