diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
| commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
| tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /include/dynamic_placeholder_text_util.h | |
| parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
fix conflicts
Diffstat (limited to 'include/dynamic_placeholder_text_util.h')
| -rw-r--r-- | include/dynamic_placeholder_text_util.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/dynamic_placeholder_text_util.h b/include/dynamic_placeholder_text_util.h index 31cfe8d30..bae92eb01 100644 --- a/include/dynamic_placeholder_text_util.h +++ b/include/dynamic_placeholder_text_util.h @@ -1,5 +1,5 @@ -#ifndef GUARD_UNK_TEXT_UTIL_H -#define GUARD_UNK_TEXT_UTIL_H +#ifndef GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H +#define GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H #include "global.h" @@ -9,4 +9,4 @@ u8 *DynamicPlaceholderTextUtil_ExpandPlaceholders(u8 *dest, const u8 *src); const u8 *DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 idx); u8 GetColorFromTextColorTable(u16 graphicId); -#endif //GUARD_UNK_TEXT_UTIL_H +#endif //GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H |