WIP dWeatherTag_c

config/SOUE01/splits.txt

@@ -1408,13 +1408,19 @@ d/d_camera.cpp:
 d/d_light_obj.cpp:
 	.text       start:0x8019ED10 end:0x801A65C8 align:16
 	.data       start:0x8052C230 end:0x8052C430
+	.sdata      start:0x80572EB8 end:0x80573118
 	.sbss       start:0x80575710 end:0x80575740
+	.sdata2     start:0x8057AFA8 end:0x8057B160
+	.bss        start:0x805B27D8 end:0x805B28B0
 
 d/tg/d_t_weather.cpp:
 	.text       start:0x801A65D0 end:0x801AF7D8 align:16
 	.ctors      start:0x804DB804 end:0x804DB808
 	.rodata     start:0x804EA918 end:0x804EA950
 	.data       start:0x8052C430 end:0x8052C858
+	.sdata      start:0x80573118 end:0x80573248
+	.sdata2     start:0x8057B160 end:0x8057B4D8
+	.bss        start:0x805B28B0 end:0x805B29E0
 
 d/d_message.cpp:
 	.text       start:0x801AF7E0 end:0x801B329C align:16

include/d/d_light_env.h

@@ -243,6 +243,10 @@ struct WIND_INFLUENCE {
     /* 0x00 */ mVec3_c mVel;
     /* 0x0C */ f32 field_0x0C;
     /* 0x10 */ f32 field_0x10;
+
+    mVec3_c getVel() const {
+        return mVel;
+    }
 };
 
 struct PaletteEAF_smol_entry {
@@ -303,8 +307,8 @@ struct Mist {
 };
 
 struct SpfSetting {
-    s16 mIdxStart;
-    s16 mIdxEnd;
+    u16 mIdxStart;
+    u16 mIdxEnd;
     f32 mRatio;
 };
 
@@ -348,6 +352,12 @@ class dLightEnv_c {
 
     void setLightFilter(f32 ratio);
     void set0x35B0(f32 f);
+    void set0x35B0_i(f32 f) {
+        mWind.field_0x10 = f;
+    }
+    const WIND_INFLUENCE &wind_influence() const {
+        return mWind;
+    }
 
     // Params are guesses
     void setBPM8(const mVec3_c *pos, u32 type, f32 radius);
@@ -418,6 +428,10 @@ class dLightEnv_c {
         return mOverrideSpfSetting;
     }
 
+    const SpfSetting &getSpfSetting() const {
+        return mCurrentSpfSetting;
+    }
+
     const PaletteEAF_smol_entry &getSmallEAF(s32 idx1, s32 idx2) {
         return field_0x38E4.field_0x00[idx1].field_0x00[idx2];
     }
@@ -466,6 +480,14 @@ class dLightEnv_c {
         field_0x38DC = v;
     }
 
+    u8 getField_0x38E0() const {
+        return field_0x38E0;
+    }
+
+    void setField_0x38E1(u8 val) {
+        field_0x38E1 = val;
+    }
+
     f32 getfield_0x5D44() const {
         return field_0x5D44;
     }
@@ -474,6 +496,22 @@ class dLightEnv_c {
         field_0x5D48 = val;
     }
 
+    Mist &getMist() {
+        return mMistInfo;
+    }
+
+    const mVec3_c &getMistPos() const {
+        return mMistPos;
+    }
+
+    bool getField_0x5D59(int i) const {
+        return field_0x5D59[i].mEnabled;
+    }
+
+    u8 getField_0x5D6C() const {
+        return field_0x5D6C;
+    }
+
 private:
     /* 0x0004 */ Spf currentSpf;
     /* 0x020C */ Spf spfs[20];
@@ -525,8 +563,9 @@ class dLightEnv_c {
     /* 0x38C8 */ mVec3_c field_0x38C8;
     /* 0x38D4 */ u32 mPlayerRoomId;
     /* 0x38D8 */ s32 mAlternateRoomId;
-    /* 0x38D8 */ u32 field_0x38DC;
-    /* 0x38D8 */ s32 field_0x38E0;
+    /* 0x38DC */ u32 field_0x38DC;
+    /* 0x38E0 */ u8 field_0x38E0;
+    /* 0x38E1 */ u8 field_0x38E1;
     /* 0x38E4 */ Bpm3 field_0x38E4;
     /* 0x48E4 */ Bpm4 field_0x48E4;
     /* 0x5CE4 */ PaletteDefaultMCF field_0x5CE4;
@@ -538,7 +577,8 @@ class dLightEnv_c {
         bool mEnabled;
         u8 mValue;
     } field_0x5D59[9];
-    /* 0x5D6C */ u8 field_0x5D6C[0x5D70 - 0x5D6C];
+    /* 0x5D6B */ u8 field_0x5D6B;
+    /* 0x5D6C */ u8 field_0x5D6C;
 
     static dLightEnv_c sInstance;
     static dLightEnv_c *sPInstance;