Merge pull request #190 from DizzyEggg/decompile_time_events

decompile time events

5 files changed, 133 insertions, 15 deletions

diff --git a/src/decoration.c b/src/decoration.c
index a9777c86f..68a455285 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -529,7 +529,7 @@ void SecretBasePC_PutAway(u8 taskId)
     {
         sub_8126A58(0);
         sub_8197434(0, 0);
-        fade_screen(1, 0);
+        FadeScreen(1, 0);
         gTasks[taskId].data[2] = 0;
         gTasks[taskId].func = sub_8129ABC;
     }
@@ -1247,7 +1247,7 @@ void sub_8127F68(u8 taskId)
     {
         if (sub_8127F38() == TRUE)
         {
-            fade_screen(1, 0);
+            FadeScreen(1, 0);
             gTasks[taskId].data[2] = 0;
             gTasks[taskId].func = sub_8128060;
         }
@@ -1661,7 +1661,7 @@ void sub_8128BA0(u8 taskId)
 
 void sub_8128BBC(u8 taskId)
 {
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = c1_overworld_prev_quest;
 }
@@ -2635,7 +2635,7 @@ void sub_812A1A0(u8 taskId)
 
 void sub_812A1C0(u8 taskId)
 {
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = sub_81298EC;
 }
@@ -2654,7 +2654,7 @@ void sub_812A210(u8 taskId)
 
 void sub_812A22C(u8 taskId)
 {
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     gTasks[taskId].data[2] = 0;
     gTasks[taskId].func = sub_812A25C;
 }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 435886638..e8f22e903 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -61,7 +61,7 @@ extern u8 sav1_map_get_name(void);
 extern s8 ProcessMenuInputNoWrap_(void);
 extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8);
 extern void sub_806A068(u16, u8);
-extern void fade_screen(u8, u8);
+extern void FadeScreen(u8, u8);
 extern void overworld_free_bg_tilemaps(void);
 extern void sub_80AF168(void);
 extern void AllocateMonSpritesGfx(void);
@@ -465,7 +465,7 @@ void EggHatch(void)
 {
     ScriptContext2_Enable();
     CreateTask(Task_EggHatch, 10);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
 }
 
 static void Task_EggHatch(u8 taskID)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 0557cd95e..1768f0d4c 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -638,7 +638,7 @@ static bool8 IsPaletteNotActive(void)
 
 bool8 ScrCmd_fadescreen(struct ScriptContext *ctx)
 {
-    fade_screen(ScriptReadByte(ctx), 0);
+    FadeScreen(ScriptReadByte(ctx), 0);
     SetupNativeScript(ctx, IsPaletteNotActive);
     return TRUE;
 }
@@ -648,7 +648,7 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx)
     u8 mode = ScriptReadByte(ctx);
     u8 speed = ScriptReadByte(ctx);
 
-    fade_screen(mode, speed);
+    FadeScreen(mode, speed);
     SetupNativeScript(ctx, IsPaletteNotActive);
     return TRUE;
 }
@@ -662,12 +662,12 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
         case 1:
         default:
             CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE);
-            fade_screen(mode, 0);
+            FadeScreen(mode, 0);
             break;
         case 0:
         case 2:
             CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE);
-            fade_screen(mode, 0);
+            FadeScreen(mode, 0);
             break;
     }
 
@@ -726,7 +726,7 @@ bool8 ScrCmd_setweather(struct ScriptContext *ctx)
 
 bool8 ScrCmd_resetweather(struct ScriptContext *ctx)
 {
-    sub_80AEDBC();
+    SetSav1WeatherFromCurrMapHeader();
     return FALSE;
 }
 
diff --git a/src/secret_base.c b/src/secret_base.c
index bf6bec1f8..61c2511b7 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -394,7 +394,7 @@ void sub_80E8FD0(u8 taskId)
 void sub_80E9068(void)
 {
     CreateTask(sub_80E8FD0, 0);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
     saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
 }
 
@@ -451,7 +451,7 @@ void sub_80E916C(u8 taskId)
 void sub_80E91F8(void)
 {
     CreateTask(sub_80E916C, 0);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
 }
 
 bool8 CurrentMapIsSecretBase(void)
@@ -651,7 +651,7 @@ void sub_80E96A4(u8 taskId)
 void sub_80E9728(void)
 {
     CreateTask(sub_80E96A4, 0);
-    fade_screen(1, 0);
+    FadeScreen(1, 0);
 }
 
 void sub_80E9744(void)
diff --git a/src/time_events.c b/src/time_events.c
new file mode 100644
index 000000000..1f169a5c6
--- /dev/null
+++ b/src/time_events.c
@@ -0,0 +1,118 @@
+#include "global.h"
+#include "time_events.h"
+#include "event_data.h"
+#include "field_weather.h"
+#include "pokemon.h"
+#include "random.h"
+#include "overworld.h"
+#include "rtc.h"
+#include "script.h"
+#include "task.h"
+
+static u32 GetMirageRnd(void)
+{
+    u32 hi = VarGet(VAR_MIRAGE_RND_H);
+    u32 lo = VarGet(VAR_MIRAGE_RND_L);
+    return (hi << 16) | lo;
+}
+
+static void SetMirageRnd(u32 rnd)
+{
+    VarSet(VAR_MIRAGE_RND_H, rnd >> 16);
+    VarSet(VAR_MIRAGE_RND_L, rnd);
+}
+
+// unused
+void InitMirageRnd(void)
+{
+    SetMirageRnd((Random() << 16) | Random());
+}
+
+void UpdateMirageRnd(u16 days)
+{
+    s32 rnd = GetMirageRnd();
+    while (days)
+    {
+        rnd = 1103515245 * rnd + 12345;
+        days--;
+    }
+    SetMirageRnd(rnd);
+}
+
+bool8 IsMirageIslandPresent(void)
+{
+    u16 rnd = GetMirageRnd() >> 16;
+    int i;
+
+    for (i = 0; i < PARTY_SIZE; i++)
+        if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) && (GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY) & 0xFFFF) == rnd)
+            return TRUE;
+
+    return FALSE;
+}
+
+void UpdateShoalTideFlag(void)
+{
+    static const u8 tide[] =
+    {
+        1, // 00
+        1, // 01
+        1, // 02
+        0, // 03
+        0, // 04
+        0, // 05
+        0, // 06
+        0, // 07
+        0, // 08
+        1, // 09
+        1, // 10
+        1, // 11
+        1, // 12
+        1, // 13
+        1, // 14
+        0, // 15
+        0, // 16
+        0, // 17
+        0, // 18
+        0, // 19
+        0, // 20
+        1, // 21
+        1, // 22
+        1, // 23
+    };
+
+    if (is_light_level_1_2_3_5_or_6(get_map_light_from_warp0()))
+    {
+        RtcCalcLocalTime();
+        if (tide[gLocalTime.hours])
+            FlagSet(FLAG_SYS_SHOAL_TIDE);
+        else
+            FlagClear(FLAG_SYS_SHOAL_TIDE);
+    }
+}
+
+static void Task_WaitWeather(u8 taskId)
+{
+    if (IsWeatherChangeComplete())
+    {
+        EnableBothScriptContexts();
+        DestroyTask(taskId);
+    }
+}
+
+void WaitWeather(void)
+{
+    CreateTask(Task_WaitWeather, 80);
+}
+
+void InitBirchState(void)
+{
+    *GetVarPointer(VAR_BIRCH_STATE) = 0;
+}
+
+void UpdateBirchState(u16 days)
+{
+    u16 *state = GetVarPointer(VAR_BIRCH_STATE);
+    *state += days;
+    *state %= 7;
+}