Merge branch 'master' into battle

src/daycare.c

@@ -1739,7 +1739,7 @@ static bool8 sub_8046E34(struct DayCare *daycare, u8 daycareId)
     return FALSE;
 }
 
-bool8 sub_8046EAC(void)
+bool8 DaycareMonReceivedMail(void)
 {
     return sub_8046E34(&gSaveBlock1Ptr->daycare, gSpecialVar_0x8004);
 }

src/field_fadetransition.c

@@ -639,7 +639,7 @@ static void sub_807E5EC(u8 taskId)
     }
 }
 
-void sub_807E654(void)
+void DoCableClubWarp(void)
 {
     ScriptContext2_Enable();
     sub_8055F88();

src/item_use.c

@@ -397,7 +397,7 @@ void FieldUseFunc_TmCase(u8 taskId)
     }
     else
     {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
         fade_screen(1, 0);
         gTasks[taskId].func = Task_InitTMCaseFromField;
     }
@@ -428,7 +428,7 @@ void FieldUseFunc_BerryPouch(u8 taskId)
     }
     else
     {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
         fade_screen(1, 0);
         gTasks[taskId].func = Task_InitBerryPouchFromField;
     }
@@ -471,7 +471,7 @@ void FieldUseFunc_TeachyTv(u8 taskId)
     }
     else
     {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
         fade_screen(1, 0);
         gTasks[taskId].func = Task_InitTeachyTvFromField;
     }
@@ -601,7 +601,7 @@ void FieldUseFunc_TownMap(u8 taskId)
     }
     else
     {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
         fade_screen(1, 0);
         gTasks[taskId].func = sub_80A1CC0;
     }
@@ -633,7 +633,7 @@ void FieldUseFunc_FameChecker(u8 taskId)
     }
     else
     {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
         fade_screen(1, 0);
         gTasks[taskId].func = sub_80A1D68;
     }

src/itemfinder.c

@@ -17,7 +17,7 @@ static void Task_NoResponse_CleanUp(u8 taskId);
 static void Task_ItemfinderResponseSoundsAndAnims(u8 taskId);
 static void Task_ItemfinderUnderfootSoundsAndAnims(u8 taskId);
 static bool8 HiddenItemIsWithinRangeOfPlayer(struct MapEvents * events, u8 taskId);
-static void SetUnderfootHiddenItem(u8 taskId, struct HiddenItemStruct hiddenItem);
+static void SetUnderfootHiddenItem(u8 taskId, u32 hiddenItem);
 static void SetNormalHiddenItem(u8 taskId);
 static void FindHiddenItemsInConnectedMaps(u8 taskId);
 static void RegisterHiddenItemRelativeCoordsIfCloser(u8 taskId, s16 dx, s16 dy);
@@ -239,7 +239,7 @@ static bool8 HiddenItemIsWithinRangeOfPlayer(struct MapEvents * events, u8 taskI
     return FALSE;
 }
 
-static void SetUnderfootHiddenItem(u8 taskId, struct HiddenItemStruct hiddenItem)
+static void SetUnderfootHiddenItem(u8 taskId, u32 hiddenItem)
 {
     s16 *data = gTasks[taskId].data;
     gSpecialVar_0x8004 = GetHiddenItemAttr(hiddenItem, HIDDEN_ITEM_FLAG);

src/mevent.c

@@ -588,7 +588,7 @@ void DestroyWonderCard(void)
     ClearRamScript();
     sub_806E2D0();
     sub_806E370();
-    sub_80E7524(gSaveBlock2Ptr->unk_B0.field_3F0);
+    sub_80E7524(&gSaveBlock2Ptr->unk_B0.field_3F0);
 }
 
 bool32 sub_8143F68(const struct MEventBuffer_32E0_Sub * data)

src/mevent_server.c

@@ -226,7 +226,7 @@ static u32 ish_mainseq_4(struct mevent_client * svr)
             sub_8069EA4(svr->recvBuffer, 1000);
             break;
         case 18:
-            memcpy(gSaveBlock2Ptr->unk_B0.field_3F0, svr->recvBuffer, 0xbc);
+            memcpy(&gSaveBlock2Ptr->unk_B0.field_3F0, svr->recvBuffer, sizeof(struct BattleTowerEReaderTrainer));
             ValidateEReaderTrainer();
             break;
         case 21:

src/mystery_event_script.c

@@ -281,7 +281,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
 bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx)
 {
     u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0];
-    memcpy(gSaveBlock2Ptr->unk_B0.field_3F0, (void *)data, 0xBC);
+    memcpy(&gSaveBlock2Ptr->unk_B0.field_3F0, (void *)data, sizeof(struct BattleTowerEReaderTrainer));
     ValidateEReaderTrainer();
     StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNewTrainer);
     ctx->data[2] = 2;

src/player_pc.c

@@ -149,7 +149,7 @@ void NewGameInitPCItems(void)
         ;
 }
 
-void sub_80EB6AC(void)
+void BedroomPC(void)
 {
     u8 taskId;
 
@@ -161,7 +161,7 @@ void sub_80EB6AC(void)
     DisplayItemMessageOnField(taskId, 2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu);
 }
 
-void sub_80EB6FC(void)
+void PlayerPC(void)
 {
     u8 taskId;
 

src/prof_pc.c

@@ -36,7 +36,7 @@ u16 Special_GetPokedexCount(void)
     return IsNationalPokedexEnabled();
 }
 
-const u8 * sub_80CA424(u16 count)
+static const u8 *GetProfOaksRatingMessageByCount(u16 count)
 {
     gSpecialVar_Result = FALSE;
 
@@ -102,7 +102,7 @@ const u8 * sub_80CA424(u16 count)
     return gUnknown_81A6D17;
 }
 
-void sub_80CA524(void)
+void Special_GetProfOaksRatingMessage(void)
 {
-    ShowFieldMessage(sub_80CA424(gSpecialVar_0x8004));
+    ShowFieldMessage(GetProfOaksRatingMessageByCount(gSpecialVar_0x8004));
 }

src/quest_log.c

@@ -2594,7 +2594,7 @@ u8 sub_81131FC(struct Var4038Struct * a0)
     return gUnknown_8456940[retval];
 }
 
-u16 sub_8113288(void)
+u16 GetNumMovedSaffronFanClubMembers(void)
 {
     return sub_81132A0(VAR_0x4038_STRUCT);
 }
@@ -2613,7 +2613,7 @@ static u16 sub_81132A0(struct Var4038Struct * a0)
     return count;
 }
 
-void sub_81132CC(void)
+void UpdateMovedSaffronFanClubMembers(void)
 {
     sub_81132E0(VAR_0x4038_STRUCT);
 }
@@ -2645,7 +2645,7 @@ static void sub_81132E0(struct Var4038Struct * a0)
     }
 }
 
-bool16 sub_8113364(void)
+bool16 ShouldMoveSaffronFanClubMember(void)
 {
     return sub_811337C(VAR_0x4038_STRUCT);
 }
@@ -2662,7 +2662,7 @@ static void sub_8113390(struct Var4038Struct * a0)
     a0->unk_1 |= 4;
 }
 
-void sub_81133A4(void)
+void BufferStreakTrainerText(void)
 {
     u8 r3 = 0;
     u8 r2 = 0;

src/start_menu.c

@@ -445,7 +445,7 @@ static void StartMenu_FadeScreenIfLeavingOverworld(void)
      && sStartMenuCallback != StartMenuExitCallback
      && sStartMenuCallback != StartMenuSafariZoneRetireCallback)
     {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
         fade_screen(1, 0);
     }
 }

src/vs_seeker.c

@@ -1290,7 +1290,7 @@ static u8 GetRematchTrainerIdGivenGameState(const u16 * a0, u8 a1)
     return 0;
 }
 
-u8 sub_810CD4C(void)
+u8 ShouldTryRematchBattle(void)
 {
     if (sub_810CD80(sVsSeekerData, gTrainerBattleOpponent_A))
     {
@@ -1364,7 +1364,7 @@ s32 GetRematchTrainerId(u16 a0)
     return sVsSeekerData[i].trainerIdxs[j];
 }
 
-u8 sub_810CEB4(void) // unreferenced, or reference not disassembled
+u8 ScrSpecial_GetTrainerEyeRematchFlag(void) // unreferenced, or reference not disassembled
 {
     return sub_810CED0(sVsSeekerData, gTrainerBattleOpponent_A);
 }