summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2019-10-06 13:06:13 -0700
committerultima-soul <akshayjhanji@hotmail.com>2019-10-06 13:06:13 -0700
commit0873084a5d143c4e7eab682f7d27a3255ed281b7 (patch)
tree97a40e025017f29ed3faf7118e1080c9d9b75b98 /include
parentd4ba74fb34c78a6f80e5e51ac3ccc295191e7128 (diff)
Sync some function names with pokeemerald.
Diffstat (limited to 'include')
-rw-r--r--include/battle_records.h1
-rw-r--r--include/easy_chat.h2
-rw-r--r--include/event_data.h1
-rw-r--r--include/item.h2
-rw-r--r--include/overworld.h2
-rw-r--r--include/player_pc.h2
-rw-r--r--include/pokemon_storage_system.h2
-rw-r--r--include/trainer_tower.h2
8 files changed, 6 insertions, 8 deletions
diff --git a/include/battle_records.h b/include/battle_records.h
index 5ddb11472..88ff6adc9 100644
--- a/include/battle_records.h
+++ b/include/battle_records.h
@@ -4,7 +4,6 @@
extern u8 gRecordsWindowId;
void ClearPlayerLinkBattleRecords(void);
-void InitLinkBattleRecords(void);
void UpdatePlayerLinkBattleRecords(s32 battlerId);
void ShowLinkBattleRecords(void);
void RemoveRecordsWindow(void);
diff --git a/include/easy_chat.h b/include/easy_chat.h
index e6a48fccc..a487c9456 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -38,7 +38,7 @@ void InitializeEasyChatWordArray(u16 *words, u16 length);
void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
void sub_80BDE28(void);
-void sub_80BDD34(void);
+void InitEasyChatPhrases(void);
void EnableRareWord(u8);
#endif // GUARD_EASYCHAT_H
diff --git a/include/event_data.h b/include/event_data.h
index c461c1d55..5f455467d 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -37,7 +37,6 @@ void sub_806E6FC(void);
void sub_806E2D0(void);
void sub_806E370(void);
bool32 sub_806E25C(void);
-void sub_806E0D0(void);
void sub_806E190(void);
extern u16 gSpecialVar_0x8000;
diff --git a/include/item.h b/include/item.h
index 583a47cdc..6e0af31bb 100644
--- a/include/item.h
+++ b/include/item.h
@@ -62,7 +62,7 @@ u8 ItemId_GetBattleUsage(u16 itemId);
ItemUseFunc ItemId_GetBattleFunc(u16 itemId);
u8 ItemId_GetSecondaryId(u16 itemId);
u16 itemid_get_market_price(u16 itemId);
-void ClearItemSlotsInAllBagPockets(void);
+void ClearBag(void);
void ClearPCItemSlots(void);
void sub_809A824(u16 itemId);
bool8 AddBagItem(u16 itemId, u16 amount);
diff --git a/include/overworld.h b/include/overworld.h
index 52f292357..f2ef24e9e 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -137,7 +137,7 @@ u8 get_map_light_from_warp0(void);
const struct MapHeader *warp1_get_mapheader(void);
void sub_8055F88(void);
void sub_8056788(void);
-void sub_8054E68(void);
+void ResetGameStats(void);
void Overworld_CreditsMainCB(void);
bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8);
diff --git a/include/player_pc.h b/include/player_pc.h
index ff1c33d1a..06ab0cb0f 100644
--- a/include/player_pc.h
+++ b/include/player_pc.h
@@ -21,6 +21,6 @@ struct PlayerPC_Unk_203AAC4
// Exported ROM declarations
void sub_816B060(u8 taskId);
-void sub_80EB658(void);
+void NewGameInitPCItems(void);
#endif //GUARD_PLAYER_PC_H
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index e6d7c5018..6790fb775 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -14,7 +14,7 @@ u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
void sub_808BCB4(u8 boxId, u8 monPosition);
u8 * GetBoxNamePtr(u8 boxId);
void sub_808CE60(void);
-void sub_808C7E0(void);
+void ResetPokemonStorageSystem(void);
u8 StorageGetCurrentBox(void);
#endif // GUARD_POKEMON_STORAGE_SYSTEM_H
diff --git a/include/trainer_tower.h b/include/trainer_tower.h
index d7fde9362..82a3e6cdc 100644
--- a/include/trainer_tower.h
+++ b/include/trainer_tower.h
@@ -6,6 +6,6 @@ void InitTrainerTowerBattleStruct(void);
void FreeTrainerTowerBattleStruct(void);
u8 GetTrainerTowerTrainerFrontSpriteId(void);
void sub_815D838(void);
-void sub_815EE0C(void);
+void ResetTrainerTowerResults(void);
#endif //GUARD_TRAINER_TOWER_H