sub_80C88AC

3 files changed, 39 insertions, 6 deletions

diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index b86e7bb9c..937193172 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "ewram.h"
+#include "random.h"
 #include "task.h"
 #include "contest.h"
 #include "text.h"
@@ -296,6 +297,38 @@ void sub_80C8734(u8 taskId)
     }
 }
 
+void sub_80C88AC(u8 taskId)
+{
+    switch (gTasks[taskId].data[0])
+    {
+        default:
+            gTasks[taskId].data[0] = 0;
+            SwitchTaskToFollowupFunc(taskId);
+            break;
+        case 0:
+            if (GetMultiplayerId() == 0)
+            {
+                if (sub_8007ECC())
+                {
+                    sub_80C857C(&gRngValue, sizeof(u32));
+                    gTasks[taskId].data[0]++;
+                }
+            }
+            else
+            {
+                gTasks[taskId].data[0]++;
+            }
+            break;
+        case 1:
+            if (sub_80C85AC(0))
+            {
+                memcpy(&gRngValue, gBlockRecvBuffer[0], sizeof(u32));
+                memcpy(&gContestRngValue, gBlockRecvBuffer[0], sizeof(u32));
+                gTasks[taskId].data[0]++;
+            }
+            break;
+    }
+}
 
 asm(".section .text_de");
 
diff --git a/src/contest.c b/src/contest.c
index 93d1a8efc..ce29d80b0 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -59,7 +59,7 @@ extern u16 gBattle_BG0_Y;
 extern u16 gBattle_BG0_X;
 extern u16 gBattle_BG1_X;
 extern u16 gBattle_WIN0H;
-extern u32 gUnknown_03005D28;  // saved RNG value
+extern u32 gContestRngValue;  // saved RNG value
 
 extern struct SpriteTemplate gUnknown_02024E8C;
 
@@ -495,7 +495,7 @@ void sub_80AB6B4(u8 taskId)
         GetMultiplayerId();  // unused return value
         DestroyTask(taskId);
         gTasks[sContest.mainTaskId].func = sub_80AB960;
-        gRngValue = gUnknown_03005D28;
+        gRngValue = gContestRngValue;
     }
 }
 
@@ -1812,7 +1812,7 @@ void sub_80ADDA4(u8 taskId)
     sub_80AF668();
     sub_80AF138();
     sub_80BE23C(sContestantStatus[gContestPlayerMonIndex].prevMove);
-    gUnknown_03005D28 = gRngValue;
+    gContestRngValue = gRngValue;
     StringExpandPlaceholders(gStringVar4, gUnknown_083CB02C);
     Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15);
     gTasks[taskId].data[2] = 0;
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index f991297ab..e51bc3522 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -45,7 +45,7 @@ extern u16 gSpecialVar_ContestCategory;
 extern u16 gSpecialVar_ContestRank;
 extern u16 gSpecialVar_Result;
 
-extern u32 gUnknown_03005D28;
+extern u32 gContestRngValue;
 
 extern u8 gUnknown_02038694;
 extern u8 gUnknown_0203856C;
@@ -373,8 +373,8 @@ void ScriptRandom(void)
 
     if(gIsLinkContest & 1)
     {
-        gUnknown_03005D28 = 1103515245 * gUnknown_03005D28 + 24691;
-        random = gUnknown_03005D28 >> 16;
+        gContestRngValue = 1103515245 * gContestRngValue + 24691;
+        random = gContestRngValue >> 16;
         scriptPtr = &gSpecialVar_Result;
     }
     else