Merge branch 'master' into extern-cleanup

2019-03-08 02:45:26 -05:00
parent 80a4ee1145 bd157b301d
commit 5886f82ef5
229 changed files with 3431 additions and 3446 deletions
--- a/src/save.c
+++ b/src/save.c
@@ -656,10 +656,10 @@ static void UpdateSaveAddresses(void)
 u8 HandleSavingData(u8 saveType)
 {
    u8 i;
-    u32 *backupVar = gUnknown_0203CF5C;
+    u32 *backupVar = gTrainerHillVBlankCounter;
    u8 *tempAddr;

-    gUnknown_0203CF5C = NULL;
+    gTrainerHillVBlankCounter = NULL;
    UpdateSaveAddresses();
    switch (saveType)
    {
@@ -702,7 +702,7 @@ u8 HandleSavingData(u8 saveType)
        save_write_to_flash(0xFFFF, gRamSaveSectionLocations);
        break;
    }
-    gUnknown_0203CF5C = backupVar;
+    gTrainerHillVBlankCounter = backupVar;
    return 0;
 }