ovl_En_Test4 with 1 non-matching (#319)

* Decompile update and stuff

* Decompile some more

* func_80A41FA4 non_matching

* init is a disaster

* Import bss

* match func_80A41D70

* Improve func_80A42AB8 a bit

* equivalent EnTest4_Init

* Import data

* CLOCK_TIME

* Run formatter

* func_80A42AB8 may be equivalent now, not completely sure

* match func_80A42AB8

* Some minor renames

* Name some struct members

* Format

* format in bigpo

* fix merge issue

* Apply suggestions from code review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Description: Day transition effects

* Un-rename unk_144

* Update include/macros.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* sIsLoaded

* Update src/overlays/actors/ovl_En_Test4/z_en_test4.c

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* review

* format

* daytemp

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

include/functions.h

@@ -1768,7 +1768,7 @@ void func_800FAAB4(GlobalContext* globalCtx, u8 arg1);
 // void func_800FB010(void);
 void func_800FB320(GlobalContext* globalCtx, u8 param_2);
 // void func_800FB388(void);
-// void func_800FB758(void);
+void func_800FB758(GlobalContext* globalCtx);
 // void func_800FB9B4(void);
 // void func_800FBCBC(void);
 // void func_800FBDEC(void);
@@ -1814,7 +1814,7 @@ void func_800FE658(f32 arg0);
 // void func_800FEA50(void);
 void func_800FEAB0(void);
 // void func_800FEAC0(void);
-// void func_800FEAF4(void);
+void func_800FEAF4(EnvironmentContext* envCtx);
 void* Lib_MemCpy(void* dest, void* src, size_t size);
 void* Lib_MemSet(void* buffer, s32 value, size_t size);
 f32 Math_CosS(s16 angle);
@@ -2127,7 +2127,7 @@ void func_8010E9F0(s16 arg0, s16 arg1);
 // void func_8010EB50(void);
 // void func_8010EBA0(void);
 // void func_8010EC54(void);
-// void func_8010EE74(void);
+void func_8010EE74(GlobalContext* globalCtx, s32 day);
 void Interface_ChangeAlpha(u16 param_1);
 // void func_8010EF9C(void);
 // void func_8010F0D4(void);
@@ -2879,7 +2879,7 @@ void func_80150D08(GlobalContext* globalCtx, u32 uParm2);
 // void func_801514B0(void);
 void func_801518B0(GlobalContext* globalCtx, u16 textId, Actor* Actor);
 void func_80151938(GlobalContext* globalCtx, u16 textId);
-void func_80151A68(GlobalContext* globalCtx, u16 param_2);
+void func_80151A68(GlobalContext* globalCtx, u16 textId);
 void func_80151BB4(GlobalContext* globalCtx, u32 uParm2);
 // void func_80151C9C(void);
 // void func_80151DA4(void);
@@ -3058,7 +3058,7 @@ void func_80169EFC(GlobalContext* globalCtx);
 s32 FrameAdvance_IsEnabled(GlobalContext* globalCtx);
 // UNK_TYPE4 func_8016A02C(s32 param_1, s32 param_2, s16* param_3);
 // void func_8016A0AC(void);
-// void func_8016A168(void);
+s32 func_8016A168(void);
 // void func_8016A178(void);
 // void func_8016A268(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE1 param_6);
 void Play_Init(GameState* gameState);
@@ -3871,7 +3871,7 @@ void func_8019FDC8(UNK_PTR arg0, u16 sfxId, UNK_TYPE arg2);
 // void func_8019FF9C(void);
 // void func_801A0048(void);
 // void func_801A00EC(void);
-// void func_801A0124(void);
+void func_801A0124(Vec3f* pos, u8 arg1);
 // void func_801A0184(void);
 // void func_801A01C4(void);
 void func_801A0204(UNK_TYPE);

include/macros.h

@@ -49,6 +49,7 @@
 #define CURRENT_DAY (((void)0, gSaveContext.day) % 5)
 
 #define CLOCK_TIME(hr, min) ((s32)(((hr) * 60 + (min)) * 0x10000 / (24 * 60)))
+#define CLOCK_TIME_MINUTE  (CLOCK_TIME(0, 1))
 
 #define SLOT(item) gItemSlots[item]
 #define AMMO(item) gSaveContext.inventory.ammo[SLOT(item)]

include/variables.h

@@ -949,7 +949,7 @@ extern GameStateOverlay daytelopGameStateInfo;
 // extern UNK_TYPE2 D_801BDA74;
 // extern UNK_TYPE2 D_801BDA78;
 // extern UNK_TYPE2 D_801BDA7C;
-// extern UNK_TYPE4 D_801BDA9C;
+extern s32 D_801BDA9C;
 extern UNK_TYPE4 D_801BDAA0;
 // extern UNK_TYPE4 D_801BDAA4;
 // extern UNK_TYPE2 D_801BDAA8;
@@ -3312,7 +3312,7 @@ extern u8 actorCutsceneNextCutscenes[16];
 extern f32 D_801F4E70;
 // extern UNK_TYPE1 D_801F4E74;
 // extern UNK_TYPE1 D_801F4E78;
-// extern UNK_TYPE1 D_801F4E7A;
+extern s16 D_801F4E7A;
 // extern UNK_TYPE1 D_801F4E80;
 // extern UNK_TYPE1 D_801F4EE0;
 // extern UNK_TYPE1 D_801F4EE8;

include/z64item.h

@@ -20,7 +20,8 @@ typedef enum {
 } UpgradeType;
 
 typedef enum {
-    /* 0x01 */ ITEM_BOW = 0x01,
+    /* 0x00 */ ITEM_OCARINA,
+    /* 0x01 */ ITEM_BOW,
     /* 0x06 */ ITEM_BOMB = 0x06,
     /* 0x07 */ ITEM_BOMBCHU,
     /* 0x08 */ ITEM_STICK,

include/z64light.h

@@ -93,9 +93,7 @@ typedef enum LightType {
     /* 0x02 */ LIGHT_POINT_GLOW
 } LightType;
 
-typedef struct GlobalContext GlobalContext;
-
 typedef void (*LightsBindFunc)(Lights* lights, LightParams* params, Vec3f* vec);
-typedef void (*LightsPosBindFunc)(Lights* lights, LightParams* params, GlobalContext* globalCtx);
+typedef void (*LightsPosBindFunc)(Lights* lights, LightParams* params, struct GlobalContext* globalCtx);
 
 #endif

include/z64player.h

@@ -176,7 +176,7 @@ typedef struct Player {
     /* 0x386 */ u16 unk_386;
     /* 0x388 */ Actor* unk_388;
     /* 0x38C */ s16 unk_38C;
-    /* 0x390 */ Actor* unk_390;
+    /* 0x390 */ Actor* rideActor;
     /* 0x394 */ u8 unk_394;
     /* 0x395 */ u8 unk_395;
     /* 0x396 */ u8 unk_396;