summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-05-09 19:33:43 -0700
committerYamaArashi <shadow962@live.com>2017-05-09 19:33:43 -0700
commitb7efd72ac411800d709082dab220470544541c90 (patch)
treec58dd7fa0bf86492cbe061f39c8d7038cb34fe21 /src
parentc0c3d2c52ad839450041d1ca6a29691efc5c5d35 (diff)
name daily event functions
Diffstat (limited to 'src')
-rw-r--r--src/clock.c16
-rw-r--r--src/dewford_trend.c6
-rw-r--r--src/new_game.c2
-rw-r--r--src/rom_800D42C.c2
-rw-r--r--src/tv.c2
5 files changed, 14 insertions, 14 deletions
diff --git a/src/clock.c b/src/clock.c
index 4ec49807c..48f937989 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -8,13 +8,13 @@
#include "rtc.h"
#include "wallclock.h"
-extern void sub_80FA220(u16);
-extern void sub_80BE8C4(u16);
-extern void sub_8080834(u16);
+extern void UpdateDewfordTrendPerDay(u16);
+extern void UpdateTVShowsPerDay(u16);
+extern void UpdateWeatherPerDay(u16);
extern void UpdatePartyPokerusTime(u16);
extern void UpdateMirageRnd(u16);
extern void UpdateBirchState(u16);
-extern void sub_810F618(u16);
+extern void SetShoalItemFlag(u16);
static void InitTimeBasedEvents(void);
static void UpdatePerDay(struct Time *time);
@@ -49,13 +49,13 @@ static void UpdatePerDay(struct Time *time)
{
newDays = time->days - days;
ClearUpperFlags();
- sub_80FA220(newDays);
- sub_80BE8C4(newDays);
- sub_8080834(newDays);
+ UpdateDewfordTrendPerDay(newDays);
+ UpdateTVShowsPerDay(newDays);
+ UpdateWeatherPerDay(newDays);
UpdatePartyPokerusTime(newDays);
UpdateMirageRnd(newDays);
UpdateBirchState(newDays);
- sub_810F618(newDays);
+ SetShoalItemFlag(newDays);
SetRandomLotteryNumber(newDays);
*varPtr = time->days;
}
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index fe9311655..d69baef7f 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 InitDewfordTrends(void)
+void InitDewfordTrend(void)
{
u16 i;
@@ -39,7 +39,7 @@ void InitDewfordTrends(void)
}
#ifdef NONMATCHING
-void sub_80FA220(u16 a)
+void UpdateDewfordTrendPerDay(u16 a)
{
u16 i;
u32 sp0;
@@ -103,7 +103,7 @@ void sub_80FA220(u16 a)
#else
__attribute__((naked))
-void sub_80FA220(u16 a)
+void UpdateDewfordTrendPerDay(u16 a)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
diff --git a/src/new_game.c b/src/new_game.c
index 6d2722c44..12e04a4ef 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -145,7 +145,7 @@ void NewGameInitData(void)
ClearDecorationInventories();
InitEasyChatPhrases();
SetMauvilleOldMan();
- InitDewfordTrends();
+ InitDewfordTrend();
ResetFanClub();
ResetLotteryCorner();
WarpToTruck();
diff --git a/src/rom_800D42C.c b/src/rom_800D42C.c
index 93fbce556..ac564eddd 100644
--- a/src/rom_800D42C.c
+++ b/src/rom_800D42C.c
@@ -34,7 +34,7 @@ extern u8 BattleText_Tie[];
#define PRINT_MESSAGE_LEFT(text, tileDataStartOffset) PRINT_MESSAGE(text, tileDataStartOffset, LEFT_MESSAGE_X)
#define PRINT_MESSAGE_RIGHT(text, tileDataStartOffset) PRINT_MESSAGE(text, tileDataStartOffset, RIGHT_MESSAGE_X)
-void sub_800DC24(void)
+void PrintLinkBattleWinLossTie(void)
{
if (gUnknown_02024D26 == 3)
diff --git a/src/tv.c b/src/tv.c
index dd523594d..c0d4bde4d 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -256,7 +256,7 @@ void EndMassOutbreak(void)
gSaveBlock1.outbreakUnk5 = 0;
}
-void sub_80BE8C4(u16 arg0)
+void UpdateTVShowsPerDay(u16 arg0)
{
sub_80BE8EC(arg0);
UpdateMassOutbreakTimeLeft(arg0);