more kankyo work / d_a_kytag08 work

include/JSystem/J3DGraphBase/J3DMatBlock.h

@@ -541,7 +541,7 @@ private:
 extern const u16 j3dDefaultZModeID;
 
 inline u16 calcZModeID(u8 param_0, u8 param_1, u8 param_2) {
-    return param_0 * 0x10 + param_2 + param_1 * 2;
+    return ((param_1 * 2) & 0x1FE) + (param_0 * 0x10) + param_2;
 }
 
 struct J3DZModeInfo {
@@ -631,6 +631,10 @@ struct J3DAlphaComp {
         mRef1 = param_1.field_0x4;
         u32 p1_mref1 = param_1.mRef1;
         field_0x0 = calcAlphaCmpID(param_1.field_0x0, param_1.mRef0, p1_mref1);
+
+        // this matches for `dKy_bg_MAxx_proc` but causes `addWarpMaterial` to fail,
+        // while the above matches for `addWarpMaterial` but causes `dKy_bg_MAxx_proc` to fail?
+        // field_0x0 = calcAlphaCmpID(param_1.field_0x0, param_1.mRef0, param_1.mRef1);
     }
 
     /* 0x00 */ u16 field_0x0;

include/d/a/d_a_player.h

@@ -712,6 +712,7 @@ public:
     void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
     void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
     void onNotHang() { i_onEndResetFlg0(ERFLG0_NOT_HANG); }
+    void onFogFade() { i_onNoResetFlg2(FLG2_UNK_4000); }
     
     void offGoronSideMove() {
         if (i_checkGoronSideMove()) {

include/d/d_stage.h

@@ -88,7 +88,10 @@ struct stage_scls_info_dummy_class {
 
 struct stage_pure_lightvec_info_class {
     // LGT
-};
+    /* 0x00 */ u8 field_0x0[0x1E - 0x0];
+    /* 0x1E */ u8 field_0x1e;
+    /* 0x1F */ u8 field_0x1f;
+};  // Size: 0x20
 
 // Col
 struct stage_pselect_info_class {

include/d/kankyo/d_kankyo.h

@@ -50,6 +50,9 @@ static void dKy_calc_color_set(_GXColorS10* param_0, color_RGB_class* param_1,
                                color_RGB_class* param_4, f32 param_5, f32 param_6,
                                _GXColorS10 param_7, f32 param_8);
 static void dKy_twilight_camelight_set();
+u8 dKy_shadow_mode_check(u8 mode);
+void dKy_shadow_mode_set(u8 mode);
+void dKy_shadow_mode_reset(u8 mode);
 
 struct LIGHT_INFLUENCE {
     /* 800CFC7C */ ~LIGHT_INFLUENCE() {}
@@ -101,6 +104,7 @@ struct SND_INFLUENCE {
 struct DALKMIST_INFLUENCE {
     /* 0x00 */ cXyz mPos;
     /* 0x0C */ f32 field_0xc;
+    /* 0x10 */ s8 mIndex;
 };
 
 struct DUNGEON_LIGHT {

include/d/kankyo/d_kankyo_wether.h

@@ -27,6 +27,7 @@ cXyz dKyw_get_wind_vecpow();
 void dKyw_evt_wind_set(s16 angleX, s16 angleY);
 void dKyw_custom_windpower(f32 pow);
 void dKyw_evt_wind_set_go();
+void dKyw_wether_proc();
 
 class dKankyo_sun_Packet : public J3DPacket {
 public:

include/m_Do/m_Do_audio.h

@@ -115,6 +115,14 @@ inline void mDoAud_heartGaugeOn() {
     Z2AudioMgr::getInterface()->mStatusMgr.heartGaugeOn();
 }
 
+inline void mDoAud_setFogWipeWidth(f32 i_width) {
+    g_mEnvSeMgr.setFogWipeWidth(i_width);
+}
+
+inline void mDoAud_startFogWipeTrigger(const Vec* param_0) {
+    g_mEnvSeMgr.startFogWipeTrigger((Vec*)param_0);
+}
+
 inline void mDoAud_mEnvse_framework() {
     g_mEnvSeMgr.framework();
 }

include/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.h

@@ -6,10 +6,10 @@
 class kytag08_class : public fopAc_ac_c {
 public:
     /* 0x568 */ J3DModel* mpModel;
-    /* 0x56C */ mDoExt_btkAnm field_0x56c;
-    /* 0x584 */ mDoExt_brkAnm field_0x584;
-    /* 0x59C */ JPABaseEmitter* field_0x59c;
-    /* 0x5A0 */ JPABaseEmitter* field_0x5a0;
+    /* 0x56C */ mDoExt_btkAnm mBtk;
+    /* 0x584 */ mDoExt_brkAnm mBrk;
+    /* 0x59C */ JPABaseEmitter* mpEmitter1;
+    /* 0x5A0 */ JPABaseEmitter* mpEmitter2;
     /* 0x5A4 */ request_of_phase_process_class mPhase;
     /* 0x5AC */ cXyz field_0x5ac;
     /* 0x5B8 */ cXyz field_0x5b8;

include/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.h

@@ -2,7 +2,6 @@
 #define D_A_TAG_LIGHTBALL_H
 
 #include "d/kankyo/d_kankyo.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 class daTagLightBall_c : public fopAc_ac_c {
@@ -19,11 +18,8 @@ public:
     u32 getType() { return fopAcM_GetParamBit(this, 8, 4); }
 
     /* 0x568 */ DALKMIST_INFLUENCE mInfluence;
-    /* 0x578 */ int field_0x578;
     /* 0x57C */ u8 field_0x57c;
-    /* 0x57D */ u8 field_0x57d;
-    /* 0x57E */ u8 field_0x57e;
-    /* 0x57F */ u8 field_0x57f;
+    /* 0x57D */ u8 mInfSet;
 };
 
 #endif /* D_A_TAG_LIGHTBALL_H */