Sync some function names with pokeemerald.

5 files changed, 17 insertions, 17 deletions

diff --git a/src/battle_records.c b/src/battle_records.c
index 3c2032641..38889ca67 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -279,7 +279,7 @@ static void ResetBGPos(void)
     ChangeBgY(3, 0, 0);
 }
 
-static void InitLinkBattleRecord(struct LinkBattleRecord * record)
+static void ClearLinkBattleRecord(struct LinkBattleRecord *record)
 {
     CpuFill16(0, record, sizeof(*record));
     record->name[0] = EOS;
@@ -289,12 +289,12 @@ static void InitLinkBattleRecord(struct LinkBattleRecord * record)
     record->draws = 0;
 }
 
-static void InitLinkBattleRecords_(struct LinkBattleRecords * records)
+static void ClearLinkBattleRecords(struct LinkBattleRecords *records)
 {
     s32 i;
 
     for (i = 0; i < LINK_B_RECORDS_COUNT; i++)
-        InitLinkBattleRecord(&records->entries[i]);
+        ClearLinkBattleRecord(&records->entries[i]);
     SetGameStat(GAME_STAT_LINK_BATTLE_WINS, 0);
     SetGameStat(GAME_STAT_LINK_BATTLE_LOSSES, 0);
     SetGameStat(GAME_STAT_LINK_BATTLE_DRAWS, 0);
@@ -404,7 +404,7 @@ static void AddOpponentLinkBattleRecord(struct LinkBattleRecords * records, cons
     {
         i = LINK_B_RECORDS_COUNT - 1;
         record = &records->entries[LINK_B_RECORDS_COUNT - 1];
-        InitLinkBattleRecord(record);
+        ClearLinkBattleRecord(record);
         StringCopyN(record->name, namebuf, OT_NAME_LENGTH);
         record->trainerId = trainerId;
     }
@@ -412,9 +412,9 @@ static void AddOpponentLinkBattleRecord(struct LinkBattleRecords * records, cons
     SortLinkBattleRecords(records);
 }
 
-void InitLinkBattleRecords(void)
+void ClearPlayerLinkBattleRecords(void)
 {
-    InitLinkBattleRecords_(&gSaveBlock2Ptr->linkBattleRecords);
+    ClearLinkBattleRecords(&gSaveBlock2Ptr->linkBattleRecords);
 }
 
 static void IncTrainerCardWinCount(s32 battlerId)
diff --git a/src/item.c b/src/item.c
index 3f33f464d..42dfd334e 100644
--- a/src/item.c
+++ b/src/item.c
@@ -326,7 +326,7 @@ void ClearPCItemSlots(void)
     }
 }
 
-void ClearItemSlotsInAllBagPockets(void)
+void ClearBag(void)
 {
     u16 i;
 
diff --git a/src/new_game.c b/src/new_game.c
index 72780c810..3b10d7ddd 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -125,23 +125,23 @@ void NewGameInitData(void)
     InitPlayerTrainerId();
     PlayTimeCounter_Reset();
     ClearPokedexFlags();
-    sub_806E0D0();
+    InitEventData();
     ResetFameChecker();
     SetMoney(&gSaveBlock1Ptr->money, 3000);
-    sub_8054E68();
-    InitLinkBattleRecords();
+    ResetGameStats();
+    ClearPlayerLinkBattleRecords();
     sub_80A0904();
     sub_80A0958();
     sub_806E190();
     gPlayerPartyCount = 0;
     ZeroPlayerPartyMons();
-    sub_808C7E0();
+    ResetPokemonStorageSystem();
     ClearRoamerData();
     gSaveBlock1Ptr->registeredItem = 0;
-    ClearItemSlotsInAllBagPockets();
-    sub_80EB658();
+    ClearBag();
+    NewGameInitPCItems();
     sub_809C794();
-    sub_80BDD34();
+    InitEasyChatPhrases();
     sub_8113044();
     copy_strings_to_sav1();
     ResetMiniGamesResults();
@@ -150,7 +150,7 @@ void NewGameInitData(void)
     WarpToPlayersRoom();
     ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags);
     StringCopy(gSaveBlock1Ptr->rivalName, rivalName);
-    sub_815EE0C();
+    ResetTrainerTowerResults();
 }
 
 static void ResetMiniGamesResults(void)
diff --git a/src/quest_log.c b/src/quest_log.c
index 8b9ee9395..065b42cef 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -986,7 +986,7 @@ void sub_8111368(void)
 {
     gUnknown_203ADFA = 2;
     sub_806E6FC();
-    ClearItemSlotsInAllBagPockets();
+    ClearBag();
     ClearPCItemSlots();
     if (sub_8110AC8() == 1)
     {
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index da3cf6dda..17f6b9e09 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -1458,7 +1458,7 @@ void sub_815EDF4(u32 * counter, u32 value)
     *counter = value ^ gSaveBlock2Ptr->encryptionKey;
 }
 
-void sub_815EE0C(void)
+void ResetTrainerTowerResults(void)
 {
     s32 i;