From 54b254a829d973345b0d282b7a4ffd7458a5c7da Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sun, 7 Nov 2021 12:58:11 -0500
Subject: Add CRY_MODE constants

---
 src/intro.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/intro.c')

diff --git a/src/intro.c b/src/intro.c
index 5cf99c97e..00cb42ac2 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1925,7 +1925,7 @@ static void Task_Scene3_Groudon(u8 taskId)
             tScreenX = 80;
             tScreenY = 41;
             tDelay = 16;
-            PlayCryInternal(SPECIES_GROUDON, 0, 100, 10, 0);
+            PlayCryInternal(SPECIES_GROUDON, 0, 100, 10, CRY_MODE_NORMAL);
             tState++;
         }
         break;
-- 
cgit v1.2.3


From c4169cfd290dcf7703b79debd66142b277af5613 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sun, 7 Nov 2021 13:54:44 -0500
Subject: Disambiguate cry functions

---
 src/intro.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/intro.c')

diff --git a/src/intro.c b/src/intro.c
index 00cb42ac2..3e805dca4 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1925,7 +1925,7 @@ static void Task_Scene3_Groudon(u8 taskId)
             tScreenX = 80;
             tScreenY = 41;
             tDelay = 16;
-            PlayCryInternal(SPECIES_GROUDON, 0, 100, 10, CRY_MODE_NORMAL);
+            PlayCryInternal(SPECIES_GROUDON, 0, 100, CRY_PRIORITY_NORMAL, CRY_MODE_NORMAL);
             tState++;
         }
         break;
@@ -2127,7 +2127,7 @@ static void Task_Scene3_Kyogre(u8 taskId)
             {
                 tDelay = 1;
                 tState++;
-                PlayCryInternal(SPECIES_KYOGRE, 0, 120, 10, 0);
+                PlayCryInternal(SPECIES_KYOGRE, 0, 120, CRY_PRIORITY_NORMAL, CRY_MODE_NORMAL);
             }
         }
         break;
-- 
cgit v1.2.3


From adf773f1ed272f31ae34e2613d20ec796b651bf8 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Thu, 28 Oct 2021 22:54:41 -0400
Subject: Document remainder of save.c

---
 src/intro.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/intro.c')

diff --git a/src/intro.c b/src/intro.c
index 5cf99c97e..0f044c642 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1145,7 +1145,7 @@ void CB2_InitCopyrightScreenAfterBootup(void)
         SetSaveBlocksPointers(GetSaveBlocksPointersBaseOffset());
         ResetMenuAndMonGlobals();
         Save_ResetSaveCounters();
-        Save_LoadGameData(SAVE_NORMAL);
+        LoadGameSave(SAVE_NORMAL);
         if (gSaveFileStatus == SAVE_STATUS_EMPTY || gSaveFileStatus == SAVE_STATUS_CORRUPT)
             Sav2_ClearSetDefault();
         SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound);
-- 
cgit v1.2.3