depreciate use of shared_syms

3 files changed, 10 insertions, 12 deletions

diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c
index 9df2d56da..0f745b391 100644
--- a/src/scene/contest_painting.c
+++ b/src/scene/contest_painting.c
@@ -25,9 +25,6 @@ u8 gUnknown_03005E40[0x4C];
 struct ContestEntry *gUnknown_03005E8C;
 u16 (*gUnknown_03005E90)[];
 
-extern struct ContestEntry unk_2015de0;
-extern struct Unk2015E00 unk_2015e00;
-
 static const u16 gPictureFramePalettes[][16] =
 {
     INCBIN_U16("graphics/picture_frame/bg0.gbapal"),
@@ -152,7 +149,7 @@ static void ShowContestPainting(void)
     case 0:
         remove_some_task();
         SetVBlankCallback(NULL);
-        gUnknown_03005E8C = &unk_2015de0;
+        gUnknown_03005E8C = &ewram15DE0;
         ContestPaintingInitVars(TRUE);
         ContestPaintingInitBG();
         gMain.state++;
@@ -752,8 +749,8 @@ static u8 sub_8106EE0(u8 arg0)
 
 static void sub_8106F4C(void)
 {
-    gUnknown_03005E90 = &unk_2015e00.unk2017e00;
-    gUnknown_03005E10 = &unk_2015e00.unk2015e00;
+    gUnknown_03005E90 = &ewram15E00.unk2017e00;
+    gUnknown_03005E10 = &ewram15E00.unk2015e00;
 }
 
 static void sub_8106F6C(u8 arg0)
diff --git a/src/scene/credits.c b/src/scene/credits.c
index 882dc557f..d9e97c570 100644
--- a/src/scene/credits.c
+++ b/src/scene/credits.c
@@ -163,10 +163,8 @@ struct CreditsEntry
     u8 *text;
 };
 
-extern struct HallOfFame gHallOfFame;
 extern u8 unk_201e800[0x800];
 extern u8 unk_201f000[0x800];
-extern u16 unk_201f800[];
 
 extern struct SpriteTemplate gUnknown_02024E8C;
 
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c
index 73cb7e5e7..c68acafc4 100644
--- a/src/scene/evolution_scene.c
+++ b/src/scene/evolution_scene.c
@@ -77,7 +77,6 @@ extern u8 gBattleTerrain;
 extern u8 gReservedSpritePaletteCount;
 extern u16 gMoveToLearn;
 extern struct SpriteTemplate gUnknown_02024E8C;
-extern u8 gUnk_2009000[]; // won't match if I 'ewram' it
 extern bool8 gAffineAnimsDisabled;
 extern u8 gDisplayedStringBattle[];
 extern u8 gBattleTextBuff2[];
@@ -179,6 +178,10 @@ void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStop
     SetMainCallback2(CB2_BeginEvolutionScene);
 }
 
+struct Struct2009000 {
+	u16 pal[0x30];
+};
+
 void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID)
 {
     u8 name[20];
@@ -275,7 +278,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
     gTasks[ID].tEvoWasStopped = FALSE;
     gTasks[ID].tPartyID = partyID;
 
-    memcpy(gUnk_2009000, &gPlttBufferUnfaded[0x20], 0x60);
+    memcpy(ewram9000_hack, &gPlttBufferUnfaded[0x20], 0x60);
 
     REG_DISPCNT = DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP;
     SetHBlankCallback(EvoDummyFunc);
@@ -638,7 +641,7 @@ static void Task_EvolutionScene(u8 taskID)
         {
             m4aMPlayAllStop();
             PlayCry1(gTasks[taskID].tPostEvoSpecies, 0);
-            memcpy(&gPlttBufferUnfaded[0x20], gUnk_2009000, 0x60);
+            memcpy(&gPlttBufferUnfaded[0x20], ewram9000_hack, 0x60);
             BeginNormalPaletteFade(0x1C, 0, 0x10, 0, 0);
             gTasks[taskID].tState++;
         }
@@ -980,7 +983,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         if (IsSEPlaying())
         {
             PlayCry1(gTasks[taskID].tPostEvoSpecies, 0);
-            memcpy(&gPlttBufferUnfaded[0x20], gUnk_2009000, 0x60);
+            memcpy(&gPlttBufferUnfaded[0x20], ewram9000_hack, 0x60);
             BeginNormalPaletteFade(1, 0, 0x10, 0, 0);
             gTasks[taskID].tState++;
         }