summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-05-09 01:12:59 -0700
committerYamaArashi <shadow962@live.com>2017-05-09 01:12:59 -0700
commit60cf06cccacb692bbd2270b08ad0d583a8a76090 (patch)
treec5e38acf3b8eee549e7eb45a79acb6fbaa4b557c /src
parent964b665d2a17295ae3a06be0439ef6ae5ccc3444 (diff)
name new-game functions
Diffstat (limited to 'src')
-rw-r--r--src/dewford_trend.c2
-rw-r--r--src/new_game.c24
-rw-r--r--src/pokedex.c2
3 files changed, 14 insertions, 14 deletions
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index b90100d90..fe9311655 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -19,7 +19,7 @@ static bool8 SB1ContainsWords(u16 *a);
static bool8 IsEasyChatPairEqual(u16 *words1, u16 *words2);
static s16 sub_80FA828(struct EasyChatPair *a, u16 b);
-void sub_80FA17C(void)
+void InitDewfordTrends(void)
{
u16 i;
diff --git a/src/new_game.c b/src/new_game.c
index ca53ff15f..8fa946748 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -47,7 +47,7 @@ void copy_word_to_mem(u8 *copyTo, u8 *copyFrom)
copyTo[i] = copyFrom[i];
}
-void set_player_trainer_id(void)
+void InitPlayerTrainerId(void)
{
write_word_to_mem((Random() << 16) | Random(), gSaveBlock2.playerTrainerId);
}
@@ -113,21 +113,21 @@ void NewGameInitData(void)
gDifferentSaveFile = 1;
ZeroPlayerPartyMons();
ZeroEnemyPartyMons();
- sub_808C02C();
+ ResetPokedex();
sub_8052DE4();
memset(&gSaveBlock1, 0, sizeof(gSaveBlock1));
ClearMailData();
gSaveBlock2.specialSaveWarp = 0;
- set_player_trainer_id();
+ InitPlayerTrainerId();
PlayTimeCounter_Reset();
ClearPokedexFlags();
InitEventData();
- sub_80BD7A8();
- sub_80BDAB4();
- sub_80BB5B4();
+ ClearTVShowData();
+ ResetGabbyAndTy();
+ ResetSecretBases();
ClearBerryTrees();
gSaveBlock1.money = 3000;
- sub_80AB1B0();
+ ResetLinkContestBoolean();
ResetGameStats();
sub_8052DA8();
InitLinkBattleRecords();
@@ -135,18 +135,18 @@ void NewGameInitData(void)
InitBarboachSizeRecord();
gPlayerPartyCount = 0;
ZeroPlayerPartyMons();
- sub_80961D8();
+ ResetPokemonStorageSystem();
ClearRoamerData();
ClearRoamerLocationData();
gSaveBlock1.registeredItem = 0;
- sub_80A3714();
+ ClearItems();
NewGameInitPCItems();
sub_810C994();
sub_8133F80();
- sub_80E6764();
+ InitEasyChatPhrases();
SetMauvilleOldMan();
- sub_80FA17C();
- sub_810FA54();
+ InitDewfordTrends();
+ ResetFanClub();
ResetLotteryCorner();
WarpToTruck();
ScriptContext2_RunNewScript(gUnknown_0819FA81);
diff --git a/src/pokedex.c b/src/pokedex.c
index 3ef1de51e..d31d649e0 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -115,7 +115,7 @@ u16 NationalPokedexNumToSpecies(u16);
// asm/pokedex_area_screen
void ShowPokedexAreaScreen(u16 species, u8 *string);
-void sub_808C02C(void)
+void ResetPokedex(void)
{
u16 i;