5 files changed, 27 insertions, 18 deletions
diff --git a/src/menu.c b/src/menu.c
index 75afb8acb..8bd6f3e90 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -92,13 +92,14 @@ extern void sub_814A7FC(void);
 
 static struct Menu gMenu;
 
-extern struct Window gMenuWindow;
-extern struct Window *gMenuWindowPtr;
-extern u8 gMenuMultistepInitState;
-extern u16 gMenuTextTileOffset;
-extern u16 gMenuTextWindowTileOffset;
-extern u16 gMenuTextWindowContentTileOffset;
-extern u16 gMenuMessageBoxContentTileOffset;
+EWRAM_DATA struct Window gMenuWindow = {0};
+EWRAM_DATA u8 gFiller_202E908[0x90] = {0};
+EWRAM_DATA struct Window *gMenuWindowPtr = NULL;
+EWRAM_DATA u8 gMenuMultistepInitState = 0;
+EWRAM_DATA u16 gMenuTextTileOffset = 0;
+EWRAM_DATA u16 gMenuTextWindowTileOffset = 0;
+EWRAM_DATA u16 gMenuTextWindowContentTileOffset = 0;
+EWRAM_DATA u16 gMenuMessageBoxContentTileOffset = 0;
 
 extern const u8 *gUnknown_08376D74[][2];
 
diff --git a/src/palette.c b/src/palette.c
index 33138d452..7db7f749a 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -40,7 +40,13 @@ struct PaletteStruct
 extern void sub_800D238(const void *src, void *dest);
 extern void BlendPalette(u16, u16, u8, u16);
 
-extern struct PaletteStruct gPaletteStructs[];
+EWRAM_DATA u16 gPlttBufferUnfaded[0x200] = {0};
+EWRAM_DATA u16 gPlttBufferFaded[0x200] = {0};
+EWRAM_DATA struct PaletteStruct gPaletteStructs[0x10] = {0};
+EWRAM_DATA struct PaletteFadeControl gPaletteFade = {0};
+EWRAM_DATA u32 gFiller_202F394 = 0;
+EWRAM_DATA u32 gPlttBufferTransferPending = 0;
+EWRAM_DATA u8 gPaletteDecompressionBuffer[0x400] = {0};
 
 extern struct PaletteStructTemplate gDummyPaletteStructTemplate;
 
diff --git a/src/play_time.c b/src/play_time.c
index f950e31a5..4eabf38cc 100644
--- a/src/play_time.c
+++ b/src/play_time.c
@@ -8,13 +8,13 @@ enum
     MAXED_OUT
 };
 
-extern u8 gPlayTimeCounterState;
+static u8 sPlayTimeCounterState;
 
 void PlayTimeCounter_SetToMax();
 
 void PlayTimeCounter_Reset()
 {
-    gPlayTimeCounterState = STOPPED;
+    sPlayTimeCounterState = STOPPED;
 
     gSaveBlock2.playTimeHours = 0;
     gSaveBlock2.playTimeMinutes = 0;
@@ -24,7 +24,7 @@ void PlayTimeCounter_Reset()
 
 void PlayTimeCounter_Start()
 {
-    gPlayTimeCounterState = RUNNING;
+    sPlayTimeCounterState = RUNNING;
 
     if (gSaveBlock2.playTimeHours > 999)
         PlayTimeCounter_SetToMax();
@@ -32,12 +32,12 @@ void PlayTimeCounter_Start()
 
 void PlayTimeCounter_Stop()
 {
-    gPlayTimeCounterState = STOPPED;
+    sPlayTimeCounterState = STOPPED;
 }
 
 void PlayTimeCounter_Update()
 {
-    if (gPlayTimeCounterState == RUNNING)
+    if (sPlayTimeCounterState == RUNNING)
     {
         gSaveBlock2.playTimeVBlanks++;
 
@@ -66,7 +66,7 @@ void PlayTimeCounter_Update()
 
 void PlayTimeCounter_SetToMax()
 {
-    gPlayTimeCounterState = MAXED_OUT;
+    sPlayTimeCounterState = MAXED_OUT;
 
     gSaveBlock2.playTimeHours = 999;
     gSaveBlock2.playTimeMinutes = 59;
diff --git a/src/rng.c b/src/rng.c
index 959a2db9f..89c6d2baf 100644
--- a/src/rng.c
+++ b/src/rng.c
@@ -1,6 +1,8 @@
 #include "global.h"
 #include "rng.h"
 
+u32 gRngValue;
+
 u16 Random(void)
 {
     gRngValue = 0x41c64e6d * gRngValue + 0x00006073;
diff --git a/src/script.c b/src/script.c
index e4be0442e..df2763a36 100644
--- a/src/script.c
+++ b/src/script.c
@@ -9,10 +9,10 @@ extern u16 VarGet(u16);
 extern u8 *gUnknown_0202E8AC;
 extern u32 gUnknown_0202E8B0;
 
-extern u8 sScriptContext1Status;
-extern struct ScriptContext sScriptContext1;
-extern struct ScriptContext sScriptContext2;
-extern bool8 sScriptContext2Enabled;
+static u8 sScriptContext1Status;
+static struct ScriptContext sScriptContext1;
+static struct ScriptContext sScriptContext2;
+static bool8 sScriptContext2Enabled;
 
 extern ScrCmdFunc gScriptCmdTable[];
 extern ScrCmdFunc gScriptCmdTableEnd[];