Document Contest Hall berry blenders and misc

6 files changed, 24 insertions, 22 deletions

diff --git a/src/berry_blender.c b/src/berry_blender.c
index b4874c3b1..72f3056d3 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1030,7 +1030,7 @@ static void sub_807FAC8(void)
             UnsetBgTilemapBuffer(2);
             UnsetBgTilemapBuffer(1);
             SetVBlankCallback(NULL);
-            sub_81AABF0(sub_807FFA4);
+            ChooseBerrySetCallback(sub_807FFA4);
 
             sBerryBlenderData->mainState = 0;
         }
@@ -1109,7 +1109,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum)
         sBerryBlenderData->playersNo = 2;
         StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName);
 
-        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS))
+        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER))
             StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]);
         else
             StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]);
@@ -1432,7 +1432,7 @@ static void Blender_SetOpponentsBerryData(u16 playerBerryItemId, u8 playersNum,
     {
         opponentBerryId = sOpponentBerrySets[opponentSetId][i];
         var = playerBerryItemId - 163;
-        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS) && gSpecialVar_0x8004 == 1)
+        if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER) && gSpecialVar_0x8004 == 1)
         {
             opponentSetId %= 5;
             opponentBerryId = sSpecialOpponentBerrySets[opponentSetId];
@@ -1632,7 +1632,7 @@ static void sub_80808D4(void)
 
         if (gSpecialVar_0x8004 == 1)
         {
-            if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS))
+            if (!FlagGet(FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER))
                 sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10);
             else
                 sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10);
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 8b4c7a545..74a71f089 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -249,7 +249,7 @@ static void sub_8020D8C(void)
 void sub_8020E1C(void)
 {
     DestroyTask(gUnknown_02022C90->unkA);
-    sub_81AABF0(sub_8020D8C);
+    ChooseBerrySetCallback(sub_8020D8C);
 }
 
 static void sub_8020E3C(void)
diff --git a/src/cable_club.c b/src/cable_club.c
index 1375789c3..26239eb50 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -203,7 +203,7 @@ static void sub_80B2634(u8 taskId)
     if (data[0] == 0)
     {
         OpenLinkTimed();
-        sub_800AB98();
+        ResetLinkPlayerCount();
         ResetLinkPlayers();
         data[5] = AddWindow(&gUnknown_08550594);
     }
@@ -678,9 +678,9 @@ static void sub_80B2EE4(u8 taskId)
     }
 }
 
-void sub_80B2FD8(void)
+void TryBerryBlenderLinkup(void)
 {
-    gLinkType = LINKTYPE_0x4411;
+    gLinkType = LINKTYPE_BERRY_BLENDER_SETUP;
     gBattleTypeFlags = 0;
     sub_80B236C(2, 4);
 }
diff --git a/src/field_specials.c b/src/field_specials.c
index 109d57fd1..3d92f621d 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -4051,7 +4051,7 @@ void UpdateTrainerFanClubGameClear(void)
 
 u8 sub_813BADC(u8 a0)
 {
-    static const u8 gUnknown_085B3470[] = { 0x02, 0x01, 0x02, 0x01 };
+    static const u8 gUnknown_085B3470[] = { 2, 1, 2, 1 };
 
     if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2)
     {
@@ -4078,12 +4078,15 @@ u8 sub_813BADC(u8 a0)
 
 static u16 sub_813BB74(void)
 {
-    static const u8 gUnknown_085B3474[] = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f };
+    static const u8 gUnknown_085B3474[NUM_TRAINER_CLUB_MEMBERS] = 
+    { 
+        8, 9, 10, 11, 12, 13, 14, 15 
+    };
 
     u8 i;
     u8 retVal = 0;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(gUnknown_085B3474); i++)
     {
         if (!((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_085B3474[i]) & 1))
         {
@@ -4101,7 +4104,10 @@ static u16 sub_813BB74(void)
 
 static u16 sub_813BC00(void)
 {
-    static const u8 gUnknown_085B347C[] = { 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09 };
+    static const u8 gUnknown_085B347C[NUM_TRAINER_CLUB_MEMBERS] = 
+    { 
+        8, 13, 14, 11, 10, 12, 15, 9 
+    };
 
     u8 i;
     u8 retVal = 0;
@@ -4111,7 +4117,7 @@ static u16 sub_813BC00(void)
         return 0;
     }
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < ARRAY_COUNT(gUnknown_085B347C); i++)
     {
         if (((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> gUnknown_085B347C[i]) & 1) != 0)
         {
@@ -4137,7 +4143,7 @@ u16 GetNumMovedLilycoveFanClubMembers(void)
     u8 i;
     u8 retVal = 0;
 
-    for (i = 0; i < 8; i++)
+    for (i = 0; i < NUM_TRAINER_CLUB_MEMBERS; i++)
     {
         if (((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> (i + 8)) & 1) != 0)
         {
@@ -4160,7 +4166,7 @@ void UpdateMovedLilycoveFanClubMembers(void)
                 gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_2 - VARS_START] = gSaveBlock2Ptr->playTimeHours;
                 break;
             }
-            else if (i == 8)
+            else if (i == NUM_TRAINER_CLUB_MEMBERS)
             {
                 break;
             }
@@ -4266,14 +4272,10 @@ void sub_813BF10(void)
     if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2)
     {
         sub_813BA30();
-        if (gBattleOutcome == 1)
-        {
+        if (gBattleOutcome == B_OUTCOME_WON)
             sub_813BB74();
-        }
         else
-        {
             sub_813BC00();
-        }
     }
 }
 
diff --git a/src/item_menu.c b/src/item_menu.c
index 2814aa5b9..40a0f0439 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -477,7 +477,7 @@ void CB2_ChooseBerry(void)
     GoToBagMenu(RETURN_LOCATION_FIELD_2, BERRIES_POCKET, CB2_ReturnToFieldContinueScript);
 }
 
-void sub_81AABF0(void (*callback)(void))
+void ChooseBerrySetCallback(void (*callback)(void))
 {
     GoToBagMenu(RETURN_LOCATION_FIELD_3, BERRIES_POCKET, callback);
 }
diff --git a/src/link.c b/src/link.c
index 3ca8236ed..b010558a5 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1399,7 +1399,7 @@ void sub_800AB18(void)
     }
 }
 
-void sub_800AB98(void)
+void ResetLinkPlayerCount(void)
 {
     gSavedLinkPlayerCount = 0;
     gSavedMultiplayerId = 0;