diff options
| author | yenatch <yenatch@gmail.com> | 2017-05-23 21:21:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 21:21:59 -0400 |
| commit | 9640df02dd8651d5b05cf3767f6c7e16a697db3b (patch) | |
| tree | df7fed98e02c4113507f6994e615b8f8074dd69e /src/naming_screen.c | |
| parent | 21ffe2fa910ede21f0f18a3013ed8ba29c70011e (diff) | |
| parent | 3f7d0a195afd90c182cd631e14f5acb5d29be34b (diff) | |
Merge pull request #303 from marijnvdwerf/clean/includes
Clean/includes
Diffstat (limited to 'src/naming_screen.c')
| -rw-r--r-- | src/naming_screen.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/naming_screen.c b/src/naming_screen.c index b14c690e2..53ee5ff19 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1,6 +1,7 @@ #include "global.h" #include "naming_screen.h" #include "asm.h" +#include "data2.h" #include "main.h" #include "menu.h" #include "palette.h" @@ -8,6 +9,7 @@ #include "sound.h" #include "sprite.h" #include "string_util.h" +#include "strings2.h" #include "task.h" #include "text.h" #include "trig.h" @@ -48,7 +50,6 @@ extern const struct SpriteTemplate gSpriteTemplate_83CE670; extern const struct SpriteTemplate gSpriteTemplate_83CE688; extern const struct SpriteSheet gUnknown_083CE6A0[]; extern const struct SpritePalette gUnknown_083CE708[]; -extern const u8 gOtherText_SentToPC[]; extern const u8 gNamingScreenMenu_Gfx[]; extern u16 gMenuMessageBoxContentTileOffset; extern const u16 gNamingScreenPalettes[]; @@ -56,10 +57,6 @@ extern const u16 gUnknown_083CE748[]; extern const u16 gUnknown_083CEBF8[]; extern const u16 gUnknown_083CF0A8[]; extern const u16 gUnknown_08E86258[]; -extern const u8 gSpeciesNames[][11]; -extern const u8 OtherText_YourName[]; -extern const u8 OtherText_BoxName[]; -extern const u8 OtherText_PokeName[]; static void C2_NamingScreen(void); static void sub_80B5AA0(void); |