diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/string_util.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/string_util.c')
| -rw-r--r-- | src/string_util.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/string_util.c b/src/string_util.c index 3fbf79d87..8ce9a97ed 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -2,7 +2,11 @@ #include "string_util.h" #include "text.h" -EWRAM_DATA u8 gUnknownStringVar[16] = {0}; +EWRAM_DATA u8 gStringVar1[0x100] = {0}; +EWRAM_DATA u8 gStringVar2[0x100] = {0}; +EWRAM_DATA u8 gStringVar3[0x100] = {0}; +EWRAM_DATA u8 gStringVar4[0x3E8] = {0}; +EWRAM_DATA static u8 sUnknownStringVar[16] = {0}; static const u8 sDigits[] = __("0123456789ABCDEF"); @@ -421,7 +425,7 @@ u8 *StringBraille(u8 *dest, const u8 *src) static const u8 *ExpandPlaceholder_UnknownStringVar(void) { - return gUnknownStringVar; + return sUnknownStringVar; } static const u8 *ExpandPlaceholder_PlayerName(void) |