From 42cfbcb197bb271e675a4b2b9e70a2647bd65532 Mon Sep 17 00:00:00 2001
From: golem galvanize <golemgalvanize@github.com>
Date: Sun, 11 Feb 2018 18:00:45 -0500
Subject: [PATCH] some fixes

---
 include/graphics.h |  9 +++++++++
 src/main_menu.c    | 16 +++++-----------
 sym_ewram.txt      |  5 +----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/graphics.h b/include/graphics.h
index 39662c8c1f..4eac258565 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2713,6 +2713,15 @@ extern const u8 gRaySceneHushBg_Pal[];
 extern const u8 gRaySceneHushBg_Gfx[];
 extern const u8 gRaySceneHushRing_Gfx[];
 
+//main menu/birch graphics
+extern const u16 gMainMenuBgPal[];
+extern const u16 gMainMenuTextPal[];
+extern const u16 gUnknown_082FECFC[];
+extern const u16 gUnknown_082FF028[];
+extern const u16 gUnknown_082FF018[];
+extern const u8 gBirchIntroShadowGfx[];
+extern const u8 gUnknown_082FEEF0[];
+
 //menu graphics
 extern const u16 gFireRedMenuElements1_Pal[16];
 extern const u16 gFireRedMenuElements2_Pal[16];
diff --git a/src/main_menu.c b/src/main_menu.c
index f4241edb07..c8a8682519 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -11,6 +11,7 @@
 #include "event_data.h"
 #include "field_effect.h"
 #include "gpu_regs.h"
+#include "graphics.h"
 #include "international_string_util.h"
 #include "link.h"
 #include "main.h"
@@ -43,8 +44,8 @@
 
 // Static RAM declarations
 
-extern u8 gUnknown_02022D04;
-extern u16 gUnknown_02022D06;
+EWRAM_DATA u8 gUnknown_02022D04 = 0;
+EWRAM_DATA u16 gUnknown_02022D06 = 0;
 
 IWRAM_DATA u8 gUnknown_03000DD0;
 
@@ -67,8 +68,6 @@ struct ArrowStruct {
     u16 unk6[5];
 };
 
-extern u16 gMainMenuBgPal[];
-extern u16 gMainMenuTextPal[];
 extern struct BgTemplate gUnknown_082FF0E8[];
 extern struct WindowTemplate gUnknown_082FF038[];
 extern struct WindowTemplate gUnknown_082FF070[];
@@ -76,13 +75,8 @@ extern u8 gUnknown_082FF0E0[];
 extern struct WindowTemplate gUnknown_082FF048[];
 extern struct ArrowStruct gUnknown_082FF0F4;
 extern struct BgTemplate gUnknown_082FF0F0;
-extern u8 gBirchIntroShadowGfx[];
-extern u8 gUnknown_082FEEF0[];
-extern u16 gUnknown_082FECFC[];
-extern u16 gUnknown_082FF028[];
 extern struct WindowTemplate gUnknown_082FF080[];
 extern const union AffineAnimCmd *const gUnknown_082FF114[];
-extern u16 gUnknown_082FF018[];
 extern struct WindowTemplate gUnknown_082FF088[];
 extern const struct MenuAction gUnknown_082FF118[];
 extern u8* gMalePresetNames[];
@@ -93,7 +87,7 @@ u32 InitMainMenu(bool8);
 void Task_MainMenuCheckSaveFile(u8);
 void Task_MainMenuCheckBattery(u8);
 void Task_WaitForSaveFileErrorWindow(u8);
-void CreateMainMenuErrorWindow(u8*);
+void CreateMainMenuErrorWindow(const u8*);
 void sub_8032250(struct WindowTemplate*);
 void Task_DisplayMainMenu(u8);
 void Task_WaitForBatteryDryErrorWindow(u8);
@@ -1686,7 +1680,7 @@ void set_default_player_name(u8 nameId)
     gSaveBlock2Ptr->playerName[7] = 0xFF;
 }
 
-void CreateMainMenuErrorWindow(u8* str)
+void CreateMainMenuErrorWindow(const u8* str)
 {
     FillWindowPixelBuffer(7, 17);
     PrintTextOnWindow(7, 1, str, 0, 1, 2, 0);
diff --git a/sym_ewram.txt b/sym_ewram.txt
index fb7c7a4e7b..d94cde7884 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -179,10 +179,7 @@ gUnknown_02022D00: @ 2022D00
 	.space 0x4
 
 gUnknown_02022D04: @ 2022D04
-	.space 0x2
-
-gUnknown_02022D06: @ 2022D06
-	.space 0x2
+	.include "src/main_menu.o"
 
 gUnknown_02022D08: @ 2022D08
 	.space 0x1