Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 42 insertions, 42 deletions

diff --git a/src/link_rfu.c b/src/link_rfu.c
index 4b0b0a2a5..cedc6b2fb 100644
--- a/src/link_rfu.c
+++ b/src/link_rfu.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "battle.h"
 #include "berry_blender.h"
 #include "decompress.h"
@@ -2165,9 +2165,9 @@ void sub_800DD94(struct UnkLinkRfuStruct_02022B14 *data, u8 r9, bool32 r2, s32 r
     data->unk_00.unk_00_4 = 0;
     data->unk_00.unk_00_5 = 0;
     data->unk_00.unk_00_6 = 0;
-    data->unk_00.unk_00_7 = FlagGet(FLAG_IS_CHAMPION);
-    data->unk_00.unk_01_0 = IsNationalPokedexEnabled();
-    data->unk_00.unk_01_1 = FlagGet(FLAG_SYS_GAME_CLEAR);
+    data->unk_00.isChampion = FlagGet(FLAG_IS_CHAMPION);
+    data->unk_00.hasNationalDex = IsNationalPokedexEnabled();
+    data->unk_00.gameClear = FlagGet(FLAG_SYS_GAME_CLEAR);
 }
 
 bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx)
@@ -3169,7 +3169,7 @@ bool32 sub_800F4F0(void)
             sub_8011A64(2, 0x9000);
         rfu_clearAllSlot();
         gReceivedRemoteLinkPlayers = FALSE;
-        gUnknown_03005000.unk_00 = 0;
+        gUnknown_03005000.linkRfuCallback = NULL;
         if (gUnknown_03005000.unk_ce4 == 1)
         {
             sub_8011A64(2, 0x9000);
@@ -3264,17 +3264,17 @@ struct UnkLinkRfuStruct_02022B14 *sub_800F7DC(void)
 
 bool32 IsSendingKeysToRfu(void)
 {
-    return gUnknown_03005000.unk_00 == rfu_func_080F97B8;
+    return gUnknown_03005000.linkRfuCallback == rfu_func_080F97B8;
 }
 
 void sub_800F804(void)
 {
-    gUnknown_03005000.unk_00 = rfu_func_080F97B8;
+    gUnknown_03005000.linkRfuCallback = rfu_func_080F97B8;
 }
 
-void Rfu_set_zero(void)
+void ClearLinkRfuCallback(void)
 {
-    gUnknown_03005000.unk_00 = NULL;
+    gUnknown_03005000.linkRfuCallback = NULL;
 }
 
 void sub_800F820(void)
@@ -3287,8 +3287,8 @@ void sub_800F820(void)
 
 void sub_800F850(void)
 {
-    if (gUnknown_03005000.unk_00 == NULL)
-        gUnknown_03005000.unk_00 = sub_800F820;
+    if (gUnknown_03005000.linkRfuCallback == NULL)
+        gUnknown_03005000.linkRfuCallback = sub_800F820;
 }
 
 static void sub_800F86C(u8 unused)
@@ -3507,7 +3507,7 @@ void sub_800FE50(void *a0)
 bool32 sub_800FE84(const u8 *src, size_t size)
 {
     bool8 r4;
-    if (gUnknown_03005000.unk_00 != NULL)
+    if (gUnknown_03005000.linkRfuCallback != NULL)
         return FALSE;
     if (gSendCmd[0] != 0)
         return FALSE;
@@ -3530,7 +3530,7 @@ bool32 sub_800FE84(const u8 *src, size_t size)
         gUnknown_03005000.unk_6c.unk_04 = gBlockSendBuffer;
     }
     sub_800FD14(0x8800);
-    gUnknown_03005000.unk_00 = rfufunc_80F9F44;
+    gUnknown_03005000.linkRfuCallback = rfufunc_80F9F44;
     gUnknown_03005000.unk_5b = 0;
     return TRUE;
 }
@@ -3543,12 +3543,12 @@ static void rfufunc_80F9F44(void)
         if (gUnknown_03005000.unk_0c == 1)
         {
             if (++gUnknown_03005000.unk_5b > 2)
-                gUnknown_03005000.unk_00 = sub_800FFB0;
+                gUnknown_03005000.linkRfuCallback = sub_800FFB0;
         }
         else
         {
             if ((gRecvCmds[GetMultiplayerId()][0] & 0xff00) == 0x8800)
-                gUnknown_03005000.unk_00 = sub_800FFB0;
+                gUnknown_03005000.linkRfuCallback = sub_800FFB0;
         }
     }
 }
@@ -3564,7 +3564,7 @@ static void sub_800FFB0(void)
     if (gUnknown_03005000.unk_6c.unk_02 <= gUnknown_03005000.unk_6c.unk_00)
     {
         gUnknown_03005000.unk_6c.unk_10 = 0;
-        gUnknown_03005000.unk_00 = rfufunc_80FA020;
+        gUnknown_03005000.linkRfuCallback = rfufunc_80FA020;
     }
 }
 
@@ -3586,11 +3586,11 @@ static void rfufunc_80FA020(void)
                 gUnknown_02022B44.unk_64++;
             }
             else
-                gUnknown_03005000.unk_00 = NULL;
+                gUnknown_03005000.linkRfuCallback = NULL;
         }
     }
     else
-        gUnknown_03005000.unk_00 = NULL;
+        gUnknown_03005000.linkRfuCallback = NULL;
 }
 
 bool8 sub_8010100(u8 a0)
@@ -3606,7 +3606,7 @@ void sub_801011C(void)
     sub_800C048();
     gReceivedRemoteLinkPlayers = 0;
     gUnknown_03005000.unk_ef = 1;
-    gUnknown_03005000.unk_00 = NULL;
+    gUnknown_03005000.linkRfuCallback = NULL;
 }
 
 void sub_8010148(void)
@@ -3624,7 +3624,7 @@ void sub_8010168(void)
         gUnknown_03005000.unk_ce4 = 2;
     }
     else
-        gUnknown_03005000.unk_00 = sub_8010148;
+        gUnknown_03005000.linkRfuCallback = sub_8010148;
 }
 
 void LinkRfu_FatalError(void)
@@ -3654,7 +3654,7 @@ void sub_80101CC(void)
             sub_8010168();
         }
         else
-            gUnknown_03005000.unk_00 = sub_8010168;
+            gUnknown_03005000.linkRfuCallback = sub_8010168;
     }
 }
 
@@ -3663,16 +3663,16 @@ void sub_801022C(void)
     if (gSendCmd[0] == 0 && gUnknown_03005000.unk_ce8 == 0)
     {
         sub_800FD14(0x5f00);
-        gUnknown_03005000.unk_00 = sub_80101CC;
+        gUnknown_03005000.linkRfuCallback = sub_80101CC;
     }
 }
 
 void sub_8010264(u8 taskId)
 {
-    if (gUnknown_03005000.unk_00 == NULL)
+    if (gUnknown_03005000.linkRfuCallback == NULL)
     {
         gUnknown_03005000.unk_cd9 = 1;
-        gUnknown_03005000.unk_00 = sub_801022C;
+        gUnknown_03005000.linkRfuCallback = sub_801022C;
         DestroyTask(taskId);
     }
 }
@@ -3708,7 +3708,7 @@ void sub_80102B8(void)
         for (i = 0; i < MAX_RFU_PLAYERS; i++)
             gUnknown_03005000.unk_e9[i] = 0;
         gUnknown_03005000.unk_100++;
-        gUnknown_03005000.unk_00 = NULL;
+        gUnknown_03005000.linkRfuCallback = NULL;
     }
     gUnknown_03005000.unk_fe++;
 }
@@ -3718,7 +3718,7 @@ void sub_8010358(void)
     if (gUnknown_03005000.unk_124.unk_8c2 == 0 && gSendCmd[0] == 0)
     {
         sub_800FD14(0x6600);
-        gUnknown_03005000.unk_00 = sub_80102B8;
+        gUnknown_03005000.linkRfuCallback = sub_80102B8;
     }
 }
 
@@ -3732,7 +3732,7 @@ void sub_8010390(void)
         if (gUnknown_03005000.unk_124.unk_8c2 == 0 && gSendCmd[0] == 0)
         {
             sub_800FD14(0x6600);
-            gUnknown_03005000.unk_00 = sub_80102B8;
+            gUnknown_03005000.linkRfuCallback = sub_80102B8;
         }
     }
     else
@@ -3748,7 +3748,7 @@ void sub_8010390(void)
             if (gUnknown_03005000.unk_124.unk_8c2 == 0 && gSendCmd[0] == 0)
             {
                 sub_800FD14(0x6600);
-                gUnknown_03005000.unk_00 = sub_8010358;
+                gUnknown_03005000.linkRfuCallback = sub_8010358;
             }
         }
     }
@@ -3756,9 +3756,9 @@ void sub_8010390(void)
 
 void sub_8010434(void)
 {
-    if (gUnknown_03005000.unk_00 == NULL)
+    if (gUnknown_03005000.linkRfuCallback == NULL)
     {
-        gUnknown_03005000.unk_00 = sub_8010390;
+        gUnknown_03005000.linkRfuCallback = sub_8010390;
         gUnknown_03005000.unk_fe = 0;
     }
 }
@@ -3800,17 +3800,17 @@ u8 sub_80104F4(void)
     return gUnknown_03005000.playerCount;
 }
 
-bool8 sub_8010500(void)
+bool8 IsLinkRfuTaskFinished(void)
 {
     if (gUnknown_03005000.unk_f1 == 2)
         return FALSE;
-    return gUnknown_03005000.unk_00 ? FALSE : TRUE;
+    return gUnknown_03005000.linkRfuCallback ? FALSE : TRUE;
 }
 
 static void sub_8010528(void)
 {
-    if (gUnknown_03005000.unk_00)
-        gUnknown_03005000.unk_00();
+    if (gUnknown_03005000.linkRfuCallback)
+        gUnknown_03005000.linkRfuCallback();
 }
 
 bool8 sub_8010540(void)
@@ -4255,11 +4255,11 @@ void sub_8010FA0(bool32 a0, bool32 a1)
     gUnknown_02022B14.unk_00.unk_00_5 = a1;
 }
 
-void sub_8010FCC(u32 a0, u32 a1, u32 a2)
+void sub_8010FCC(u32 type, u32 species, u32 level)
 {
-    gUnknown_02022B14.type = a0;
-    gUnknown_02022B14.species = a1;
-    gUnknown_02022B14.unk_0b_1 = a2;
+    gUnknown_02022B14.type = type;
+    gUnknown_02022B14.species = species;
+    gUnknown_02022B14.level = level;
 }
 
 u8 sub_801100C(s32 a0)
@@ -4345,12 +4345,12 @@ void sub_80111B0(bool32 a0)
 void sub_80111DC(void)
 {
     sub_8011E94(gUnknown_03004140.unk_00, 1);
-    gUnknown_03005000.unk_00 = NULL;
+    gUnknown_03005000.linkRfuCallback = NULL;
 }
 
 void sub_80111FC(void)
 {
-    gUnknown_03005000.unk_00 = sub_80111DC;
+    gUnknown_03005000.linkRfuCallback = sub_80111DC;
 }
 
 void sub_801120C(u8 a0, u8 unused1)
@@ -4741,7 +4741,7 @@ void sub_8011AFC(void)
     SetVBlankCallback(sub_8011AE8);
     if (IsWirelessAdapterConnected())
     {
-        gLinkType = 0x1111;
+        gLinkType = LINKTYPE_0x1111;
         sub_800B488();
         OpenLink();
         SeedRng(gMain.vblankCounter2);
@@ -4979,7 +4979,7 @@ bool32 sub_801200C(s16 a1, struct UnkLinkRfuStruct_02022B14 *structPtr)
                 return TRUE;
         }
         else if (structPtr->species != structPtr2->species
-                 || structPtr->unk_0b_1 != structPtr2->unk_0b_1
+                 || structPtr->level != structPtr2->level
                  || structPtr->type != structPtr2->type)
         {
             return TRUE;