6 files changed, 36 insertions, 11 deletions
diff --git a/include/d/bg/d_bg_w_kcol.h b/include/d/bg/d_bg_w_kcol.h
index f161995bb0..11c3a03321 100644
--- a/include/d/bg/d_bg_w_kcol.h
+++ b/include/d/bg/d_bg_w_kcol.h
@@ -11,7 +11,7 @@ struct dBgPc;
 struct dBgS_CaptPoly;
 
 struct KC_PrismData {
-    /* 0x0 */ f32 field_0x0;
+    /* 0x0 */ u16 field_0x0[2];
     /* 0x4 */ u16 field_0x4;
     /* 0x6 */ u16 field_0x6;
     /* 0x8 */ u16 field_0x8;
@@ -27,8 +27,12 @@ struct pkcdata {
     /* 0x0C */ KC_PrismData* m_block_data;
     /* 0x10 */ u8 field_0x10[4];
     /* 0x14 */ Vec m_area_min_pos;
-    /* 0x20 */ u8 field_0x20[4];
+    /* 0x20 */ u32 field_0x20;
     /* 0x24 */ u32 field_0x24;
+    /* 0x28 */ u32 field_0x28;
+    /* 0x2C */ u32 field_0x2c;
+    /* 0x30 */ u32 field_0x30;
+    /* 0x34 */ u32 field_0x34;
 };
 
 struct KCol_Header {
diff --git a/include/d/d_camera.h b/include/d/d_camera.h
index 2b7005def1..da4d36b67a 100644
--- a/include/d/d_camera.h
+++ b/include/d/d_camera.h
@@ -322,7 +322,7 @@ public:
     /* 80181560 */ void ForceLockOff(unsigned int);
     /* 8018159C */ void ForceLockOff(fopAc_ac_c*);
     /* 80181E20 */ void Up();
-    /* 80181E64 */ void Eye();
+    /* 80181E64 */ cXyz Eye();
     /* 80181E98 */ cXyz Center();
     /* 8018295C */ void footHeightOf(fopAc_ac_c*);
     /* 80182964 */ void push_any_key();
diff --git a/include/d/d_envse.h b/include/d/d_envse.h
index bed0ea9456..aadf2d4899 100644
--- a/include/d/d_envse.h
+++ b/include/d/d_envse.h
@@ -1,6 +1,23 @@
 #ifndef D_D_ENVSE_H
 #define D_D_ENVSE_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_kankyo.h"
+
+class dStage_SoundInfo_c;
+
+class dEnvSe_c : public kankyo_class {
+public:
+    /* 80182FD8 */ int execute_common(dStage_SoundInfo_c*, s8*, u8);
+    /* 80183480 */ int execute();
+
+    /* 0x0F8 */ u8 field_0xf8[0x0FC - 0x0F8];
+    /* 0x0FC */ s8 field_0xfc;
+    /* 0x0FD */ s8 field_0xfd;
+    /* 0x0FE */ s8 field_0xfe;
+    /* 0x0FF */ s8 field_0xff;
+    /* 0x100 */ u8 field_0x100[0x104 - 0x100];
+    /* 0x104 */ int mRoomNo;
+    /* 0x108 */ int field_0x108;
+};
 
 #endif /* D_D_ENVSE_H */
diff --git a/include/d/d_path.h b/include/d/d_path.h
index 96a51bd243..6906646b5f 100644
--- a/include/d/d_path.h
+++ b/include/d/d_path.h
@@ -19,7 +19,8 @@ struct dPath {
 inline int dPath_ChkClose(dPath* i_path) { return (i_path->m_closed & 1); }
 
 dPath* dPath_GetRoomPath(int path_index, int room_no);
-dStage_dPnt_c* dPath_GetPnt(dPath const* path, int pnt_index);
+dPath* dPath_GetNextRoomPath(dPath const* i_path, int room_no);
+dStage_dPnt_c* dPath_GetPnt(dPath const* i_path, int pnt_index);
 u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* param_2);
 
 #endif /* D_D_PATH_H */
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 4e710f6071..0955bdf316 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -270,8 +270,8 @@ struct stage_sound_data {
 
 struct dStage_SoundInfo_c {
     // SOND
-    /* 0x0 */ int field_0x0;
-    /* 0x4 */ stage_sound_data* field_0x4;
+    /* 0x0 */ int num;
+    /* 0x4 */ stage_sound_data* entries;
 };
 
 class dStage_FileList_dt_c {
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 {