From e2d51bf9564c60435cfd5ee3fc05adddc8db04c7 Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Wed, 25 Oct 2023 13:16:56 -0700
Subject: d_envse mostly OK. more work on kankyo_rain (#1969)

* d_envse OK, work on kankyo_rain

* remove asm
---
 include/d/kankyo/d_kankyo_wether.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'include/d/kankyo')

diff --git a/include/d/kankyo/d_kankyo_wether.h b/include/d/kankyo/d_kankyo_wether.h
index c48120144a..bf4dabd49a 100644
--- a/include/d/kankyo/d_kankyo_wether.h
+++ b/include/d/kankyo/d_kankyo_wether.h
@@ -122,7 +122,7 @@ struct SNOW_EFF {
     /* 80056D58 */ ~SNOW_EFF();
     /* 80056D94 */ SNOW_EFF();
 
-    /* 0x00 */ u8 mStatus;
+    /* 0x00 */ s8 mStatus;
     /* 0x04 */ cXyz mPosition;
     /* 0x10 */ cXyz mBasePos;
     /* 0x1C */ f32 mPosWaveX;
@@ -130,7 +130,7 @@ struct SNOW_EFF {
     /* 0x24 */ f32 mGravity;
     /* 0x28 */ f32 mWindSpeed;
     /* 0x2C */ f32 mScale;
-    /* 0x30 */ u8 field_0x30[4];
+    /* 0x30 */ f32 field_0x30;
     /* 0x34 */ s16 mTimer;
 };  // Size: 0x38
 
@@ -144,7 +144,7 @@ public:
     /* 0x6D74 */ cXyz field_0x6d74;
     /* 0x6D80 */ f32 field_0x6d80;
     /* 0x6D84 */ f32 field_0x6d84;
-    /* 0x6D88 */ u16 field_0x6d88;
+    /* 0x6D88 */ s16 field_0x6d88;
     /* 0x6D8A */ u16 field_0x6d8a;
     /* 0x6D8C */ u32 field_0x6d8c;
     /* 0x6D90 */ u8 field_0x6d90;
@@ -264,7 +264,10 @@ struct EF_ODOUR_EFF {
     /* 0x00 */ u8 mStatus;
     /* 0x04 */ cXyz mPosition;
     /* 0x10 */ cXyz mBasePos;
-    /* 0x1C */ u8 field_0x1c[0x14];
+    /* 0x1C */ u8 field_0x1c[0x24 - 0x1C];
+    /* 0x24 */ f32 field_0x24;
+    /* 0x28 */ f32 field_0x28;
+    /* 0x2C */ f32 field_0x2c;
 };  // Size: 0x30
 
 class dKankyo_odour_Packet : public J3DPacket {
-- 
cgit v1.2.3