summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-18 20:24:10 -0700
committerYamaArashi <shadow962@live.com>2016-10-18 20:24:10 -0700
commit1cd137f7660764164d08eb57cdbd99da64443ca7 (patch)
treee9a1d962e11adcd166743fc9b97109f001d2c9b5 /src
parent1bd681722bdf3f918f15aaf9d6c7ae2becfa9457 (diff)
name some functions
Diffstat (limited to 'src')
-rw-r--r--src/new_game.c4
-rw-r--r--src/rom4.c6
-rw-r--r--src/scrcmd.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/new_game.c b/src/new_game.c
index 3d7722505..0dab6116c 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -34,7 +34,7 @@ void set_player_trainer_id(void)
write_word_to_mem((Random() << 16) | Random(), gSaveBlock2.playerTrainerId);
}
-void sub_8052D54(void)
+void SetDefaultOptions(void)
{
gSaveBlock2.optionsTextSpeed = OPTIONS_TEXT_SPEED_MID;
gSaveBlock2.optionsWindowFrameType = 0;
@@ -73,7 +73,7 @@ void sub_8052E04(void)
void ClearSav2(void)
{
CpuFill16(0, &gSaveBlock2, sizeof(gSaveBlock2));
- sub_8052D54();
+ SetDefaultOptions();
}
void sub_8052E4C(void)
diff --git a/src/rom4.c b/src/rom4.c
index 7abb15460..75786eb33 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -551,7 +551,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
wild_pokemon_reroll();
prev_quest_postbuffer_cursor_backup_reset();
sub_8082BD0(mapGroup, mapNum);
- InTrainerHill();
+ DoDailyEvents();
sub_80806E4();
sub_8054164();
sub_8053C98();
@@ -585,7 +585,7 @@ void sub_8053994(u32 a1)
prev_quest_postbuffer_cursor_backup_reset();
sub_8082BD0(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
if (a1 != 1)
- InTrainerHill();
+ DoDailyEvents();
sub_80806E4();
sub_8054164();
if (v2)
@@ -1287,7 +1287,7 @@ void CB2_ContinueSavedGame(void)
sub_805338C();
sub_8053198();
sub_806451C();
- InTrainerHill();
+ DoDailyEvents();
sub_805308C();
sub_8055FC0();
PlayTimeCounter_Start();
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 53262d183..9acca98dc 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -32,7 +32,7 @@ extern void sav12_xor_increment(u8);
extern void sub_8081594(u8);
extern void sub_8053CE4(u32);
extern void fade_screen(u8, u8);
-extern void InTrainerHill(void);
+extern void DoDailyEvents(void);
extern void sub_80806B4(u32);
extern void sub_80806E4(void);
extern void sub_808073C(void);
@@ -708,7 +708,7 @@ bool8 ScrCmd_compareflags(struct ScriptContext *ctx)
bool8 ScrCmd_checkdailyflags(struct ScriptContext *ctx)
{
- InTrainerHill();
+ DoDailyEvents();
return FALSE;
}