1 files changed, 15 insertions, 13 deletions

diff --git a/src/save.c b/src/save.c
index a26e0da98..2771b4ea5 100644
--- a/src/save.c
+++ b/src/save.c
@@ -2,8 +2,10 @@
 #include "save.h"
 #include "asm.h"
 #include "gba/gba.h"
+#include "load_save.h"
 #include "rom4.h"
 #include "gba/flash_internal.h"
+#include "save_failed_screen.h"
 
 extern struct SaveSection unk_2000000;
 
@@ -550,27 +552,27 @@ u8 sub_8125C3C(u8 a1)
             sav12_xor_increment(10);
         for (i = 0; i < 2; i++)
             sub_81253C8(28 + i, gHallOfFameSaveSectionLocations[i].data, gHallOfFameSaveSectionLocations[i].size);
-        save_serialize_game();
+        SaveSerializedGame();
         save_write_to_flash(0xFFFF, gSaveSectionLocations);
         break;
     case 0:
     default:
-        save_serialize_game();
+        SaveSerializedGame();
         save_write_to_flash(0xFFFF, gSaveSectionLocations);
         break;
     case 1:
-        save_serialize_game();
+        SaveSerializedGame();
         for (i = 0; i < 5; i++)
             save_write_to_flash(i, gSaveSectionLocations);
         break;
     case 2:
-        save_serialize_game();
+        SaveSerializedGame();
         save_write_to_flash(0, gSaveSectionLocations);
         break;
     case 4:
         for (i = 28; i < 32; i++)
             EraseFlashSector(i);
-        save_serialize_game();
+        SaveSerializedGame();
         save_write_to_flash(0xFFFF, gSaveSectionLocations);
         break;
     }
@@ -584,7 +586,7 @@ u8 sub_8125D44(u8 a1)
     sub_8125C3C(a1);
     if (!gUnknown_03005EA8)
         return 1;
-    fullscreen_save_activate(a1);
+    DoSaveFailedScreen(a1);
     return 0xFF;
 }
 
@@ -592,7 +594,7 @@ u8 sub_8125D80(void)
 {
     if (gUnknown_3004820 != 1)
         return 1;
-    save_serialize_game();
+    SaveSerializedGame();
     sub_812546C(gSaveSectionLocations);
     return 0;
 }
@@ -601,7 +603,7 @@ bool8 sub_8125DA8(void)
 {
     u8 v0 = sub_812550C(14, gSaveSectionLocations);
     if (gUnknown_03005EA8)
-        fullscreen_save_activate(0);
+        DoSaveFailedScreen(0);
     if (v0 == 0xFF)
         return 1;
     else
@@ -612,7 +614,7 @@ u8 sub_8125DDC(void)
 {
     sub_812556C(14, gSaveSectionLocations);
     if (gUnknown_03005EA8)
-        fullscreen_save_activate(0);
+        DoSaveFailedScreen(0);
     return 0;
 }
 
@@ -620,7 +622,7 @@ u8 sub_8125E04(void)
 {
     sub_8125758(14, gSaveSectionLocations);
     if (gUnknown_03005EA8)
-        fullscreen_save_activate(0);
+        DoSaveFailedScreen(0);
     return 0;
 }
 
@@ -629,7 +631,7 @@ u8 sub_8125E2C(void)
     if (gUnknown_3004820 != 1)
         return 1;
 
-    save_serialize_game();
+    SaveSerializedGame();
     sub_81254C8(gSaveSectionLocations);
     sub_812556C(gUnknown_03005EB4 + 1, gSaveSectionLocations);
     return 0;
@@ -650,7 +652,7 @@ u8 sub_8125E6C(void)
         retVal = 1;
     }
     if (gUnknown_03005EA8)
-        fullscreen_save_activate(1);
+        DoSaveFailedScreen(1);
     return retVal;
 }
 
@@ -669,7 +671,7 @@ u8 sub_8125EC8(u8 a1)
     case 0:
     default:
         result = sub_812587C(0xFFFF, gSaveSectionLocations);
-        save_deserialize_game();
+        LoadSerializedGame();
         gSaveFileStatus = result;
         gUnknown_03005EBC = 0;
         break;