3 files changed, 9 insertions, 8 deletions
diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index 303dcf3e0..a9532fd09 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -539,7 +539,7 @@ static void sub_814217C(u8 taskID)
             ewram1E000(i) = 0;
     }
     else
-        sub_8125EC8(3);
+        Save_LoadGameData(SAVE_HALL_OF_FAME);
 
     for (i = 0; i < HALL_OF_FAME_MAX_TEAMS; i++, lastSavedTeam++)
     {
@@ -566,7 +566,7 @@ static void sub_814217C(u8 taskID)
 static void sub_8142274(u8 taskID)
 {
     gGameContinueCallback = sub_8141FC4;
-    TrySavingData(3);
+    Save_WriteData(3);
     PlaySE(SE_SAVE);
     gTasks[taskID].func = sub_81422B8;
     gTasks[taskID].tFrameCount = 32;
@@ -840,7 +840,7 @@ void sub_81428CC(void)
 
 static void sub_8142A28(u8 taskID)
 {
-    if (sub_8125EC8(3) != 1)
+    if (Save_LoadGameData(SAVE_HALL_OF_FAME) != SAVE_STATUS_OK)
         gTasks[taskID].func = sub_8142FEC;
     else
     {
diff --git a/src/scene/intro.c b/src/scene/intro.c
index d7d772a40..f7e196133 100644
--- a/src/scene/intro.c
+++ b/src/scene/intro.c
@@ -930,8 +930,8 @@ void CB2_InitCopyrightScreenAfterBootup(void)
     if (!SetUpCopyrightScreen())
     {
         sub_8052E4C();
-        ResetSaveCounters();
-        sub_8125EC8(0);
+        Save_ResetSaveCounters();
+        Save_LoadGameData(SAVE_NORMAL);
         if (gSaveFileStatus == 0 || gSaveFileStatus == 2)
             ClearSav2();
         SetPokemonCryStereo(gSaveBlock2.optionsSound);
diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c
index f0f1264a0..7f6765ef6 100755..100644
--- a/src/scene/intro_credits_graphics.c
+++ b/src/scene/intro_credits_graphics.c
@@ -301,9 +301,10 @@ const struct CompressedSpriteSheet gUnknown_08416E34[] = {
 };
 
 
-extern u16 gUnknown_02039358;
-extern s16 gUnknown_0203935A;
-extern s16 gUnknown_0203935C;
+EWRAM_DATA u16 gUnknown_02039358 = 0;
+EWRAM_DATA s16 gUnknown_0203935A = 0;
+EWRAM_DATA s16 gUnknown_0203935C = 0;
+
 extern u8 gReservedSpritePaletteCount;
 
 void sub_8149248();