diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
| commit | 6748ef72fb31e1b0af250472a34e50cb3966c5f8 (patch) | |
| tree | f6dafca53a0e45e5a2a6cdb262a2766f2bde8753 /src/naming_screen.c | |
| parent | 2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff) | |
| parent | 170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/naming_screen.c')
| -rw-r--r-- | src/naming_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/naming_screen.c b/src/naming_screen.c index 9902df04c..e6d146b85 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1,6 +1,6 @@ #include "global.h" #include "naming_screen.h" -#include "malloc.h" +#include "alloc.h" #include "palette.h" #include "task.h" #include "sprite.h" @@ -150,7 +150,7 @@ static const struct WindowTemplate gUnknown_0858BE10[] = DUMMY_WIN_TEMPLATE }; -static const u8 gUnknown_0858BE40[] = __("abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?♂♀/- …“”‘’ "); +static const u8 gUnknown_0858BE40[] = __("abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?♂♀/- …“”‘' "); static const u8 gUnknown_0858BEA0[] = { 8, 8, 6 }; static const u8 gUnknown_0858BEA3[] = { 0, 12, 24, 56, 68, 80, 92, 123, 0, 12, 24, 56, 68, 80, 92, 123, 0, 22, 44, 66, 88, 110, 0, 0 }; |