Rename specials according to Ruby

7 files changed, 24 insertions, 24 deletions

diff --git a/src/daycare.c b/src/daycare.c
index fede86156..ca9eb14f7 100644
--- a/src/daycare.c
+++ b/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);
 }
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 6a539b60e..de9f09ff0 100644
--- a/src/field_fadetransition.c
+++ b/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();
diff --git a/src/field_specials.c b/src/field_specials.c
index 0589fb77a..1554cfd2d 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -61,8 +61,8 @@ static void Task_AnimatePcTurnOn(u8 taskId);
 static void PcTurnOnUpdateMetatileId(bool16 flag);
 static void Task_ShakeScreen(u8 taskId);
 static void Task_EndScreenShake(u8 taskId);
-static u16 SampleResortGoregeousMon(void);
-static u16 SampleResortGoregeousReward(void);
+static u16 SampleResortGorgeousMon(void);
+static u16 SampleResortGorgeousReward(void);
 static void Task_ElevatorShake(u8 taskId);
 static void AnimateElevatorWindowView(u16 nfloors, bool8 direction);
 static void Task_AnimateElevatorWindowView(u8 taskId);
@@ -654,12 +654,12 @@ static const u16 sResortGorgeousDeluxeRewards[] = {
 void IncrementResortGorgeousStepCounter(void)
 {
     u16 var4035 = VarGet(VAR_RESORT_GOREGEOUS_STEP_COUNTER);
-    if (VarGet(VAR_RESORT_GOREGOUS_REQUESTED_MON) != SPECIES_NONE)
+    if (VarGet(VAR_RESORT_GORGEOUS_REQUESTED_MON) != SPECIES_NONE)
     {
         var4035++;
         if (var4035 >= 250)
         {
-            VarSet(VAR_RESORT_GOREGOUS_REQUESTED_MON, 0xFFFF);
+            VarSet(VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF);
             VarSet(VAR_RESORT_GOREGEOUS_STEP_COUNTER, 0);
         }
         else
@@ -671,17 +671,17 @@ void IncrementResortGorgeousStepCounter(void)
 
 void Special_SampleResortGorgeousMonAndReward(void)
 {
-    u16 var4036 = VarGet(VAR_RESORT_GOREGOUS_REQUESTED_MON);
+    u16 var4036 = VarGet(VAR_RESORT_GORGEOUS_REQUESTED_MON);
     if (var4036 == SPECIES_NONE || var4036 == 0xFFFF)
     {
-        VarSet(VAR_RESORT_GOREGOUS_REQUESTED_MON, SampleResortGoregeousMon());
-        VarSet(VAR_RESORT_GOREGOUS_REWARD, SampleResortGoregeousReward());
+        VarSet(VAR_RESORT_GORGEOUS_REQUESTED_MON, SampleResortGorgeousMon());
+        VarSet(VAR_RESORT_GORGEOUS_REWARD, SampleResortGorgeousReward());
         VarSet(VAR_RESORT_GOREGEOUS_STEP_COUNTER, 0);
     }
-    StringCopy(gStringVar1, gSpeciesNames[VarGet(VAR_RESORT_GOREGOUS_REQUESTED_MON)]);
+    StringCopy(gStringVar1, gSpeciesNames[VarGet(VAR_RESORT_GORGEOUS_REQUESTED_MON)]);
 }
 
-static u16 SampleResortGoregeousMon(void)
+static u16 SampleResortGorgeousMon(void)
 {
     u16 i;
     u16 species;
@@ -701,7 +701,7 @@ static u16 SampleResortGoregeousMon(void)
     return species;
 }
 
-static u16 SampleResortGoregeousReward(void)
+static u16 SampleResortGorgeousReward(void)
 {
     if ((Random() % 100) >= 30)
         return ITEM_LUXURY_BALL;
@@ -1565,7 +1565,7 @@ s32 CountDigits(s32 number)
         return 1;
 }
 
-bool8 sub_80CBFA0(void)
+bool8 NameRaterWasNicknameChanged(void)
 {
     struct Pokemon * pokemon = &gPlayerParty[gSpecialVar_0x8004];
     GetMonData(pokemon, MON_DATA_NICKNAME, gStringVar1);
diff --git a/src/player_pc.c b/src/player_pc.c
index bb073e3a6..f454cd07f 100644
--- a/src/player_pc.c
+++ b/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;
 
diff --git a/src/prof_pc.c b/src/prof_pc.c
index aeabc8644..d1f06a2ba 100644
--- a/src/prof_pc.c
+++ b/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));
 }
diff --git a/src/quest_log.c b/src/quest_log.c
index 1c951867e..ffced87ee 100644
--- a/src/quest_log.c
+++ b/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;
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index c0145e22d..6ae92236f 100644
--- a/src/vs_seeker.c
+++ b/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 sub_810CE64(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);
 }