From cc307730a12b3f9f2b3194aa77f8d7f66946a193 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Tue, 23 Jan 2018 21:34:15 -0600
Subject: [PATCH] Add entry in sym_ewram.txt and organize a bit

---
 src/naming_screen.c | 15 ++++++++-------
 sym_ewram.txt       |  4 +---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/naming_screen.c b/src/naming_screen.c
index 403254f9f4..c8dcfc1b1e 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -27,14 +27,10 @@
 #include "text_window.h"
 #include "overworld.h"
 
-extern EWRAM_DATA struct NamingScreenData *gNamingScreenData;
+EWRAM_DATA static struct NamingScreenData *gNamingScreenData = NULL;
 extern u16 gKeyRepeatStartDelay;
 
-// graphics
-static const u8 gSpriteImage_858BBF8[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp");
-static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_icon/1.4bpp");
-const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
-static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal");
+// extern graphics
 extern const u16 gNamingScreenMenu_Pal[];
 extern const u8 gNamingScreenMenu_Gfx[];
 extern const u8 gUnknown_08DD4544[];
@@ -48,7 +44,7 @@ extern const u8 gNamingScreenCursor_Gfx[];
 extern const u8 gNamingScreenRightPointingTriangleTiles[];
 extern const u8 gNamingScreenUnderscoreTiles[];
 
-// text
+// extern text
 extern const u8 gExpandedPlaceholder_Empty[];
 extern const u8 gText_PkmnTransferredSomeonesPC[];
 extern const u8 gText_PkmnTransferredLanettesPC[];
@@ -61,6 +57,11 @@ extern const u8 gText_PkmnsNickname[];
 extern const u8 gText_TellHimTheWords[];
 
 // start of .rodata
+static const u8 gSpriteImage_858BBF8[] = INCBIN_U8("graphics/naming_screen/pc_icon/0.4bpp");
+static const u8 gSpriteImage_858BCB8[] = INCBIN_U8("graphics/naming_screen/pc_icon/1.4bpp");
+static const u16 gUnknown_0858BD78[] = INCBIN_U16("graphics/naming_screen/0.gbapal");
+static const u16 gUnknown_0858BD98[] = INCBIN_U16("graphics/naming_screen/1.gbapal");
+
 static const u8 *const gUnknown_0858BDB8[] = 
 {
     gText_PkmnTransferredSomeonesPC,
diff --git a/sym_ewram.txt b/sym_ewram.txt
index bb2e36fc9e..c04f524d8f 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -945,9 +945,7 @@ gUnknown_02039F8C: @ 2039F8C
 gUnknown_02039F90: @ 2039F90
 	.space 0x4
 
-gNamingScreenData: @ 2039F94
-	.space 0x4
-
+    .include "src/naming_screen.o"
     .include "src/money.o"
     
     .align 2