name daily event functions

10 files changed, 23 insertions, 22 deletions

diff --git a/asm/battle_1.s b/asm/battle_1.s
index 5fe4672d9..44d0b245f 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -1358,7 +1358,7 @@ _0800E148:
 	ldrsh r0, [r1, r5]
 	cmp r0, 0
 	beq _0800E154
-	bl sub_800DC24
+	bl PrintLinkBattleWinLossTie
 _0800E154:
 	movs r0, 0x78
 	bl PlaySE
diff --git a/asm/field_specials.s b/asm/field_specials.s
index 269f45a33..63677b6a0 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -3695,8 +3695,8 @@ _0810F612:
 	bx r1
 	thumb_func_end sub_810F5BC
 
-	thumb_func_start sub_810F618
-sub_810F618: @ 810F618
+	thumb_func_start SetShoalItemFlag
+SetShoalItemFlag: @ 810F618
 	push {lr}
 	ldr r0, _0810F624 @ =0x0000085f
 	bl FlagSet
@@ -3704,7 +3704,7 @@ sub_810F618: @ 810F618
 	bx r0
 	.align 2, 0
 _0810F624: .4byte 0x0000085f
-	thumb_func_end sub_810F618
+	thumb_func_end SetShoalItemFlag
 
 	thumb_func_start PutZigzagoonInPlayerParty
 PutZigzagoonInPlayerParty: @ 810F628
diff --git a/asm/field_weather.s b/asm/field_weather.s
index 01190c75e..92d2ffab2 100644
--- a/asm/field_weather.s
+++ b/asm/field_weather.s
@@ -7537,8 +7537,8 @@ _0808082E:
 	bx r1
 	thumb_func_end TranslateWeatherNum
 
-	thumb_func_start sub_8080834
-sub_8080834: @ 8080834
+	thumb_func_start UpdateWeatherPerDay
+UpdateWeatherPerDay: @ 8080834
 	lsls r0, 16
 	ldr r2, _08080850 @ =gSaveBlock1
 	adds r2, 0x2F
@@ -7554,7 +7554,7 @@ sub_8080834: @ 8080834
 	bx lr
 	.align 2, 0
 _08080850: .4byte gSaveBlock1
-	thumb_func_end sub_8080834
+	thumb_func_end UpdateWeatherPerDay
 
 	thumb_func_start UpdateRainCounter
 UpdateRainCounter: @ 8080854
diff --git a/include/dewford_trend.h b/include/dewford_trend.h
index af1b61363..a37de3389 100644
--- a/include/dewford_trend.h
+++ b/include/dewford_trend.h
@@ -4,7 +4,7 @@
 #define ARRAY_2007800 ((struct EasyChatPair *)(unk_2000000 + 0x7800))
 #define ARRAY_2007900 ((struct EasyChatPair *)(unk_2000000 + 0x7900))
 
-void InitDewfordTrends(void);
+void InitDewfordTrend(void);
 void sub_80FA4E4(void *, u32, u8);
 
 #endif
diff --git a/include/flags.h b/include/flags.h
index 0c0cebc5f..56325dea6 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -51,6 +51,7 @@
 #define SYS_BRAILLE_WAIT     0x851
 #define SYS_BRAILLE_FLY      0x852
 
+#define SYS_SHOAL_ITEM       0x85F
 #define SYS_B_DASH           0x860 // got Running Shoes
 #define SYS_CTRL_OBJ_DELETE  0x861
 #define SYS_RESET_RTC_ENABLE 0x862
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);