rename functions

6 files changed, 36 insertions, 36 deletions

diff --git a/src/new_game.c b/src/new_game.c
index 11449a7c7..3225ba2bd 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -109,7 +109,7 @@ void NewGameInitData(void)
     sub_80AB1B0();
     sub_80530AC();
     sub_8052DA8();
-    GameFreakRTC_Reset();
+    InitLinkBattleRecords();
     InitShroomishSizeRecord();
     InitBarboachSizeRecord();
     gPlayerPartyCount = 0;
diff --git a/src/pokedex.c b/src/pokedex.c
index ae4aafbf2..b45a123d5 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -81,8 +81,8 @@ extern u8 gUnknown_0839F73C[];
 extern void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
 extern bool8 BeginNormalPaletteFade(u32, s8, u8, u8, u16);
 extern void remove_some_task(void);
-extern bool32 sub_806912C(void);
-extern u16 pokedex_count(u8);
+extern bool32 IsNationalPokedex(void);
+extern u16 GetNationalPokedexCount(u8);
 extern u8 sub_8091E3C(void);
 extern void sub_80690C8(void);
 extern void sub_805469C(void);
@@ -120,7 +120,7 @@ void sub_808F284(struct PokedexListItem *, u8);
 bool8 sub_808F250(u8);
 bool8 sub_808E71C(void);
 void sub_808CCC4(u8 taskId);
-u16 sub_8090F68(u8);
+u16 GetHoennPokedexCount(u8);
 void sub_808D690(u8, u8);
 void Task_PokedexResultsScreen(u8 taskId);
 void sub_808D118(u8 taskId);
@@ -290,22 +290,22 @@ void CB2_InitPokedex(void)
             ClearPokedexView(gUnknown_0202FFB4);
             CreateTask(Task_PokedexShowMainScreen, 0);
             gUnknown_0202FFB4->unk612 = gSaveBlock2.pokedex.unknown1;
-            if(!sub_806912C())
+            if(!IsNationalPokedex())
                 gUnknown_0202FFB4->unk612 = 0;
             gUnknown_0202FFB4->unk616 = gSaveBlock2.pokedex.order;
             gUnknown_0202FFB4->unk60E = gUnknown_0202FFB8;
             gUnknown_0202FFB4->unk62C = gUnknown_0202FFBA;
             gUnknown_0202FFB4->unk64D = 0;
             gUnknown_0202FFB4->unk64E = 0;
-            if(!sub_806912C())
+            if(!IsNationalPokedex())
             {
-                gUnknown_0202FFB4->unk61A = sub_8090F68(0);
-                gUnknown_0202FFB4->unk61C = sub_8090F68(1);
+                gUnknown_0202FFB4->unk61A = GetHoennPokedexCount(0);
+                gUnknown_0202FFB4->unk61C = GetHoennPokedexCount(1);
             }
             else
             {
-                gUnknown_0202FFB4->unk61A = pokedex_count(0);
-                gUnknown_0202FFB4->unk61C = pokedex_count(1);
+                gUnknown_0202FFB4->unk61A = GetNationalPokedexCount(0);
+                gUnknown_0202FFB4->unk61C = GetNationalPokedexCount(1);
             }
             gUnknown_0202FFB4->unk62D = 8;
             gMain.state++;
@@ -542,7 +542,7 @@ void sub_808CB8C(u8 taskId)
             gUnknown_0202FFB4->unk62C = gUnknown_0202FFB4->unk62A;
             gUnknown_0202FFB4->unk60E = gUnknown_0202FFB4->unk610;
             gUnknown_0202FFB4->unk612 = gUnknown_0202FFB4->unk614;
-            if(!sub_806912C())
+            if(!IsNationalPokedex())
                 gUnknown_0202FFB4->unk612 = 0;
             gUnknown_0202FFB4->unk616 = gUnknown_0202FFB4->unk618;
             gTasks[taskId].func = Task_PokedexShowMainScreen;
@@ -555,7 +555,7 @@ void Task_ClosePokedex(u8 taskId)
     if(!gPaletteFade.active)
     {
         gSaveBlock2.pokedex.unknown1 = gUnknown_0202FFB4->unk612;
-        if(!sub_806912C())
+        if(!IsNationalPokedex())
             gSaveBlock2.pokedex.unknown1 = 0;
         gSaveBlock2.pokedex.order = gUnknown_0202FFB4->unk616;
         DestroyTask(taskId);
@@ -726,7 +726,7 @@ void Task_PokedexResultsScreenReturnToMainScreen(u8 taskId)
         gUnknown_0202FFB4->unk62C = gUnknown_0202FFB4->unk62A;
         gUnknown_0202FFB4->unk60E = gUnknown_0202FFB4->unk610;
         gUnknown_0202FFB4->unk612 = gUnknown_0202FFB4->unk614;
-        if(!sub_806912C())
+        if(!IsNationalPokedex())
             gUnknown_0202FFB4->unk612 = 0;
         gUnknown_0202FFB4->unk616 = gUnknown_0202FFB4->unk618;
         gTasks[taskId].func = Task_PokedexShowMainScreen;
@@ -740,7 +740,7 @@ void Task_PokedexResultsScreenExitPokedex(u8 taskId)
         gUnknown_0202FFB4->unk62C = gUnknown_0202FFB4->unk62A;
         gUnknown_0202FFB4->unk60E = gUnknown_0202FFB4->unk610;
         gUnknown_0202FFB4->unk612 = gUnknown_0202FFB4->unk614;
-        if(!sub_806912C())
+        if(!IsNationalPokedex())
             gUnknown_0202FFB4->unk612 = 0;
         gUnknown_0202FFB4->unk616 = gUnknown_0202FFB4->unk618;
         gTasks[taskId].func = Task_ClosePokedex;
@@ -837,7 +837,7 @@ void sub_808D640(void)
 {
     if(gUnknown_0202FFB4->unk64C_1)
         LoadPalette(gUnknown_0839F67C + 0x2, 1, 0xBE);
-    else if(!sub_806912C())
+    else if(!IsNationalPokedex())
         LoadPalette(gPokedexMenu_Pal + 0x2, 1, 0xBE);
     else
         LoadPalette(gUnknown_0839F73C + 0x2, 1, 0xBE);
@@ -859,7 +859,7 @@ void sub_808D690(u8 a, u8 mode)
             vars[1] = 1;
             break;
         case 1:
-            if(sub_806912C())
+            if(IsNationalPokedex())
             {
                 vars[0] = 386;
                 vars[1] = 0;
diff --git a/src/rom4.c b/src/rom4.c
index 3223c7680..ce067b104 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -283,7 +283,7 @@ void sub_805308C(void)
 {
     FlagReset(2092);
     sub_8054164();
-    wild_pokemon_reroll();
+    ResetCyclingRoadChallengeData();
     mapnumbers_history_shift_sav1_0_2_4_out();
     sub_8134348();
 }
@@ -638,7 +638,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     set_current_map_header_from_sav1_save_old_name();
     sub_8053154();
     sub_806906C();
-    wild_pokemon_reroll();
+    ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
     sub_8082BD0(mapGroup, mapNum);
     DoTimeBasedEvents();
@@ -671,7 +671,7 @@ void sub_8053994(u32 a1)
     v2 = is_light_level_1_2_3_5_or_6(gMapHeader.light);
     v3 = is_light_level_8_or_9(gMapHeader.light);
     sub_806906C();
-    wild_pokemon_reroll();
+    ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
     sub_8082BD0(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
     if (a1 != 1)
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index d7c07673f..c5c00500e 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -127,10 +127,10 @@ u16 GetPokedexSeenCount()
 {
     u16 pokedexSeenCount;
     
-    if ( sub_806912C() ) // national dex check?
-        pokedexSeenCount = pokedex_count(1);
+    if ( IsNationalPokedex() ) // national dex check?
+        pokedexSeenCount = GetNationalPokedexCount(1);
     else
-        pokedexSeenCount = sub_8090F68(1);
+        pokedexSeenCount = GetHoennPokedexCount(1);
     
     return pokedexSeenCount;
 }
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 871e5cce2..d25ce88e0 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -90,7 +90,7 @@ extern bool8 sub_80B58C4(u16, u8, u8);
 extern void *picbox_close(void);
 extern void sub_8106630(u32);
 extern void ShowContestWinner(void);
-extern u8 sub_810F87C(void);
+extern u8 GetLeadMonIndex(void);
 extern void CopyItemName(u16, u8 *);
 extern u8 sub_80BF0B8(u32);
 extern void sub_80B79B8(u32 *, u32);
@@ -99,9 +99,9 @@ extern bool8 IsEnoughMoney(u32, u32);
 extern void sub_80B7C14(u32, u8, u8);
 extern void RemoveMoneyLabelObject(u8, u8);
 extern void sub_80B7BEC(u32, u8, u8);
-extern void sub_811A72C(u32, u8, u8);
-extern void sub_811A770(u8, u8);
-extern void sub_811A704(u32, u8, u8);
+extern void ShowCoinsWindow(u32, u8, u8);
+extern void HideCoinsWindow(u8, u8);
+extern void UpdateCoinsWindow(u32, u8, u8);
 extern void *TrainerBattleConfigure(u8 *);
 extern void sub_80825E4(void);
 extern u8 *sub_80826E8(void);
@@ -131,8 +131,8 @@ extern bool8 sub_805870C(u32, u32);
 extern bool8 sub_805877C(void);
 extern void sub_80586B4(u32, u32);
 extern void sub_80586E0(u32, u32);
-extern void sub_810E7AC(u8, u8, u8, u8);
-extern void sub_810E824(void);
+extern void ScriptAddElevatorMenuItem(u8, u8, u8, u8);
+extern void ScriptShowElevatorMenu(void);
 extern u16 GetCoins(void);
 extern bool8 GiveCoins(u16);
 extern bool8 TakeCoins(u16);
@@ -1451,7 +1451,7 @@ bool8 ScrCmd_bufferfirstpoke(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u8 *dest = gUnknown_083762F0[stringVarIndex];
-    u8 partyIndex = sub_810F87C();
+    u8 partyIndex = GetLeadMonIndex();
     u32 species = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPECIES, NULL);
     StringCopy(dest, gSpeciesNames[species]);
     return FALSE;
@@ -1640,7 +1640,7 @@ bool8 ScrCmd_showcoins(struct ScriptContext *ctx)
 {
     u8 v2 = ScriptReadByte(ctx);
     u8 v3 = ScriptReadByte(ctx);
-    sub_811A72C(gSaveBlock1.coins, v2, v3);
+    ShowCoinsWindow(gSaveBlock1.coins, v2, v3);
     return FALSE;
 }
 
@@ -1648,7 +1648,7 @@ bool8 ScrCmd_hidecoins(struct ScriptContext *ctx)
 {
     u8 v2 = ScriptReadByte(ctx);
     u8 v3 = ScriptReadByte(ctx);
-    sub_811A770(v2, v3);
+    HideCoinsWindow(v2, v3);
     return FALSE;
 }
 
@@ -1656,7 +1656,7 @@ bool8 ScrCmd_updatecoins(struct ScriptContext *ctx)
 {
     u8 v2 = ScriptReadByte(ctx);
     u8 v3 = ScriptReadByte(ctx);
-    sub_811A704(gSaveBlock1.coins, v2, v3);
+    UpdateCoinsWindow(gSaveBlock1.coins, v2, v3);
     return FALSE;
 }
 
@@ -1933,13 +1933,13 @@ bool8 ScrCmd_event_b1(struct ScriptContext *ctx)
     u16 v5 = VarGet(ScriptReadHalfword(ctx));
     u16 v7 = VarGet(ScriptReadHalfword(ctx));
     u16 v9 = VarGet(ScriptReadHalfword(ctx));
-    sub_810E7AC(v3, v5, v7, v9);
+    ScriptAddElevatorMenuItem(v3, v5, v7, v9);
     return FALSE;
 }
 
 bool8 ScrCmd_event_b2(struct ScriptContext *ctx)
 {
-    sub_810E824();
+    ScriptShowElevatorMenu();
     ScriptContext1_Stop();
     return TRUE;
 }
diff --git a/src/start_menu.c b/src/start_menu.c
index b3a0fe4c6..0c2acc5b7 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -33,7 +33,7 @@ extern void sub_80EBA5C(void);
 extern void sub_80A53F8(void);
 extern void sub_8089A70(void);
 extern void CB2_InitPokedex(void);
-extern u16 pokedex_count(u8);
+extern u16 GetNationalPokedexCount(u8);
 extern void fade_screen(u8, u8);
 extern bool32 is_c1_link_related_active();
 extern void sub_80594C0(void);
@@ -346,7 +346,7 @@ static u8 StartMenu_InputProcessCallback(void)
         PlaySE(SE_SELECT);
         if(gStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].callback == StartMenu_PokedexCallback)
         {
-            if(pokedex_count(0) == 0)
+            if(GetNationalPokedexCount(0) == 0)
                 return 0;
         }
         gCallback_03004AE8 = gStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].callback;