ac_weather OK (#155)

* weather werk

* ac_weather OK

* format

* review

12 files changed, 58 insertions, 29 deletions

diff --git a/include/6792F0.h b/include/6792F0.h
index 2cd1e57..8e42fb7 100644
--- a/include/6792F0.h
+++ b/include/6792F0.h
@@ -12,7 +12,7 @@
 // void func_80055B84_jp();
 // void mAGrw_PrintFossilHaniwa_debug();
 // void func_80055D94_jp();
-// void func_80055E20_jp();
+void mAGrw_OrderSetHaniwa(void);
 // void func_80055E34_jp();
 // void func_80055E5C_jp();
 // void func_80055EF8_jp();
diff --git a/include/683030.h b/include/683030.h
index 663caf6..a20a1c3 100644
--- a/include/683030.h
+++ b/include/683030.h
@@ -2,9 +2,16 @@
 #define C_683030_H
 
 #include "ultra64.h"
+#include "unk.h"
+#include "z64math.h"
 
 struct Game_Play;
-struct xyz_t;
+
+typedef struct Camera2{
+    /* 0x000 */ xyz_t unk0;
+    /* 0x00C */ xyz_t unk4; 
+    /* 0x018 */ UNK_TYPE1 unk18[0x120];
+} Camera2; //size = 0x138
 
 // void func_8005F390_jp();
 // void func_8005F3DC_jp();
@@ -37,7 +44,7 @@ struct xyz_t;
 // void func_80060574_jp();
 // void func_8006058C_jp();
 // void func_800608C8_jp();
-// void func_800608DC_jp();
+xyz_t* Camera2_getCenterPos_p(void);
 // void func_800608F0_jp();
 // void func_80060904_jp();
 // void func_80060918_jp();
@@ -47,7 +54,7 @@ struct xyz_t;
 void Camera2_ClearActorTalking_Cull(struct Game_Play* game_play);
 // void func_80060D1C_jp();
 // void func_80060D58_jp();
-struct xyz_t* Camera2_getMicPos_p(struct Game_Play* game_play);
+xyz_t* Camera2_getMicPos_p(struct Game_Play* game_play);
 // void func_80060D78_jp();
 // void func_80060DA8_jp();
 // void func_80060FDC_jp();
diff --git a/include/6EDD10.h b/include/6EDD10.h
index 905fd1e..6d4f338 100644
--- a/include/6EDD10.h
+++ b/include/6EDD10.h
@@ -9,8 +9,8 @@ struct lbRTC_time_c;
 // void func_800CA070_jp();
 void mTM_set_season(void);
 // void func_800CA230_jp();
-// void func_800CA240_jp();
-// void func_800CA278_jp();
+s32 mTM_check_renew_time(u8);
+void mTM_off_renew_time(u8);
 // void func_800CA2A8_jp();
 void mTM_set_renew_time(struct lbRTC_ymd_t*, struct lbRTC_time_c*);
 void mTM_renewal_renew_time(void);
diff --git a/include/color.h b/include/color.h
index def50ca..c763bb3 100644
--- a/include/color.h
+++ b/include/color.h
@@ -12,7 +12,7 @@ typedef struct {
     /* 0x2 */ u8 b;
 } Color_RGB8; // size = 0x3
 
-typedef struct {
+typedef struct Color_RGBA8 {
     /* 0x0 */ u8 r;
     /* 0x1 */ u8 g;
     /* 0x2 */ u8 b;
diff --git a/include/m_clip.h b/include/m_clip.h
index c06a214..f58b2ba 100644
--- a/include/m_clip.h
+++ b/include/m_clip.h
@@ -3,6 +3,7 @@
 
 #include "ultra64.h"
 #include "unk.h"
+#include "color.h"
 
 struct Actor;
 struct ActorOverlay;
@@ -14,6 +15,7 @@ struct struct_809AEFA4;
 struct ToolClip;
 struct ShadowData;
 struct FurnitureActor;
+struct WeatherClip;
 
 typedef UNK_RET (*Clip_unk_040_unk_04)(struct ActorOverlay*, const struct struct_801161E8_jp*, size_t, s32);
 typedef UNK_RET (*Clip_unk_040_unk_08)(void);
@@ -106,10 +108,16 @@ typedef struct Clip_unk_08C {
     /* 0x86C */ UNK_TYPE unk_86C;
 } Clip_unk_08C; // size >= 0x870
 
+typedef void (*Clip_unk_090_unk_30)(Color_RGBA8, s16,s16,s32);
+typedef struct Clip_unk_090 {
+    /* 0x00 */ UNK_TYPE1 unk_00[0x30];
+    /* 0x30 */ Clip_unk_090_unk_30 unk_30;
+} Clip_unk_090; // size >= 0x34
+
 typedef void (*Clip_unk_0D8_unk_00)(struct Game_Play* game_play);
 typedef struct Clip_unk_0D8 {
-               Clip_unk_0D8_unk_00 unk_00;
-} Clip_unk_0D8;
+    /* 0x00 */ Clip_unk_0D8_unk_00 unk_00;
+} Clip_unk_0D8; // size >= 0x4
 
 
 typedef struct Clip {
@@ -119,11 +127,12 @@ typedef struct Clip {
     /* 0x06C */ Clip_unk_06C* unk_06C;
     /* 0x070 */ UNK_TYPE1 unk_070[0x4];
     /* 0x074 */ Clip_unk_074* unk_074;
-    /* 0x078 */ UNK_TYPE1 unk_078[0x8];
+    /* 0x078 */ struct WeatherClip* weatherClip;
+    /* 0x07C */ UNK_TYPE1 unk_07C[0x4];
     /* 0x080 */ Clip_unk_080* unk_080;
     /* 0x084 */ UNK_TYPE1 unk_084[0x8];
     /* 0x08C */ Clip_unk_08C* unk_08C;
-    /* 0x090 */ UNK_TYPE1 unk_090[0x4];
+    /* 0x090 */ Clip_unk_090* unk_090;
     /* 0x094 */ struct ToolClip* toolClip;
     /* 0x098 */ UNK_TYPE1 unk_098[0x40];
     /* 0x0D8 */ Clip_unk_0D8* unk_0D8;
diff --git a/include/m_common_data.h b/include/m_common_data.h
index e296bff..e32ea78 100644
--- a/include/m_common_data.h
+++ b/include/m_common_data.h
@@ -170,7 +170,9 @@ typedef struct CommonData {
     /* 0x10A82 */ s16 unk_10A82;
     /* 0x10A84 */ UNK_TYPE1 unk_10A84[0x2C];
     /* 0x10AB0 */ u8 unk_10AB0; // named "pad_connected" in AC GCN decomp
-    /* 0x10AB1 */ UNK_TYPE1 unk_10AB1[0x7];
+    /* 0x10AB1 */ UNK_TYPE1 unk_10AB1;
+    /* 0x10AB2 */ s16 currentSoundEffect;
+    /* 0x10AB4 */ UNK_TYPE1 unk_10AB4[0x4];
 } CommonData; // size = 0x10AB8
 
 void common_data_reinit(void);
diff --git a/include/m_event.h b/include/m_event.h
index 8a13010..88d61af 100644
--- a/include/m_event.h
+++ b/include/m_event.h
@@ -45,7 +45,7 @@ void mEv_ClearEventInfo(void);
 // void func_8007D578_jp();
 // void func_8007D58C_jp();
 // void func_8007D59C_jp();
-// void func_8007D5D4_jp();
+s32 mEv_CheckRealArbeit(void);
 // void func_8007D650_jp();
 s32 mEv_CheckFirstJob(void);
 // void func_8007D734_jp();
@@ -60,7 +60,7 @@ s32 mEv_CheckTitleDemo(void);
 // void func_8007D930_jp();
 // void func_8007D9C8_jp();
 // void func_8007DA64_jp();
-// void func_8007DA6C_jp();
+void mEv_GetEventWeather(s16*,s16*);
 // void func_8007DACC_jp();
 // void func_8007DB20_jp();
 // void func_8007DBB0_jp();
diff --git a/include/m_kankyo.h b/include/m_kankyo.h
index 8061f79..b640d21 100644
--- a/include/m_kankyo.h
+++ b/include/m_kankyo.h
@@ -7,6 +7,7 @@
 struct Actor;
 struct Global_light;
 struct Lights;
+struct s_xyz;
 
 typedef void (*Kankyo_unk_C0)(struct Actor*);
 
@@ -57,9 +58,9 @@ void Global_kankyo_ct(struct Game_Play* game_play, struct Kankyo* kankyo);
 // void func_8009836C_jp();
 // void func_800983F0_jp();
 void Global_kankyo_set(struct Game_Play* game_play, struct Kankyo* kankyo, struct Global_light* arg2);
-// void func_80098558_jp();
+void mEnv_DecideWindDirect(struct s_xyz*, s16,s16);
 // void func_8009867C_jp();
-// void func_80098794_jp();
+void mEnv_RandomWeather(s16*, s16*);
 // void func_8009895C_jp();
 // void func_80098980_jp();
 // void func_80098990_jp();
diff --git a/include/m_player_lib.h b/include/m_player_lib.h
index 0cd50ca..14e9150 100644
--- a/include/m_player_lib.h
+++ b/include/m_player_lib.h
@@ -116,7 +116,7 @@ void mPlib_change_player_cloth_info_lv2(struct PrivateInfo*, u16);
 // void func_800B33AC_jp();
 s32 mPlib_able_submenu_type1(struct Game_Play* game_play);
 // void func_800B34B8_jp();
-// void func_800B34F4_jp();
+s32 mPlib_check_player_open_umbrella(struct Game_Play* game_play);
 // void func_800B3534_jp();
 // void func_800B3588_jp();
 // void func_800B35E4_jp();
diff --git a/include/segment_symbols.h b/include/segment_symbols.h
index 7d7cbc1..f320ec6 100644
--- a/include/segment_symbols.h
+++ b/include/segment_symbols.h
@@ -97,6 +97,12 @@ DECLARE_SEGMENT(catalog_ovl);
 DECLARE_SEGMENT(ac_set_ovl_insect);
 DECLARE_SEGMENT(ac_set_ovl_gyoei);
 
+DECLARE_SEGMENT(ac_weather_fine);
+DECLARE_SEGMENT(ac_weather_rain);
+DECLARE_SEGMENT(ac_weather_snow);
+DECLARE_SEGMENT(ac_weather_sakura);
+DECLARE_SEGMENT(ac_weather_leaf);
+
 DECLARE_SEGMENT(locerrmsg);
 
 DECLARE_SEGMENT(segment_00A58000);
@@ -105,6 +111,10 @@ DECLARE_SEGMENT(segment_00E02000);
 DECLARE_SEGMENT(segment_00E03000);
 DECLARE_SEGMENT(segment_00E04000);
 DECLARE_SEGMENT(segment_00E0D000);
-
+ 
+DECLARE_SEGMENT(segment_01408000);
+DECLARE_SEGMENT(segment_01409000);
+DECLARE_SEGMENT(segment_0140A000);
+DECLARE_SEGMENT(segment_0140B000);
 
 #endif
diff --git a/include/tables/dmatables/dmadata_table_jp.h b/include/tables/dmatables/dmadata_table_jp.h
index 876c72b..78b6d2f 100644
--- a/include/tables/dmatables/dmadata_table_jp.h
+++ b/include/tables/dmatables/dmadata_table_jp.h
@@ -522,16 +522,16 @@ DEFINE_DMA_ENTRY(ovl__009031F0, "ovl__009031F0")
 DEFINE_DMA_ENTRY(ovl__009031F0_reloc, "ovl__009031F0_reloc")
 DEFINE_DMA_ENTRY(ovl__00903460, "ovl__00903460")
 DEFINE_DMA_ENTRY(ovl__00903460_reloc, "ovl__00903460_reloc")
-DEFINE_DMA_ENTRY(ovl__00903B90, "ovl__00903B90")
-DEFINE_DMA_ENTRY(ovl__00903B90_reloc, "ovl__00903B90_reloc")
-DEFINE_DMA_ENTRY(ovl__00903BD0, "ovl__00903BD0")
-DEFINE_DMA_ENTRY(ovl__00903BD0_reloc, "ovl__00903BD0_reloc")
-DEFINE_DMA_ENTRY(ovl__00904330, "ovl__00904330")
-DEFINE_DMA_ENTRY(ovl__00904330_reloc, "ovl__00904330_reloc")
-DEFINE_DMA_ENTRY(ovl__00904AB0, "ovl__00904AB0")
-DEFINE_DMA_ENTRY(ovl__00904AB0_reloc, "ovl__00904AB0_reloc")
-DEFINE_DMA_ENTRY(ovl__00905280, "ovl__00905280")
-DEFINE_DMA_ENTRY(ovl__00905280_reloc, "ovl__00905280_reloc")
+DEFINE_DMA_ENTRY(ac_weather_fine, "ac_weather_fine")
+DEFINE_DMA_ENTRY(ac_weather_fine_reloc, "ac_weather_fine_reloc")
+DEFINE_DMA_ENTRY(ac_weather_rain, "ac_weather_rain")
+DEFINE_DMA_ENTRY(ac_weather_rain_reloc, "ac_weather_rain_reloc")
+DEFINE_DMA_ENTRY(ac_weather_snow, "ac_weather_snow")
+DEFINE_DMA_ENTRY(ac_weather_snow_reloc, "ac_weather_snow_reloc")
+DEFINE_DMA_ENTRY(ac_weather_sakura, "ac_weather_sakura")
+DEFINE_DMA_ENTRY(ac_weather_sakura_reloc, "ac_weather_sakura_reloc")
+DEFINE_DMA_ENTRY(ac_weather_leaf, "ac_weather_leaf")
+DEFINE_DMA_ENTRY(ac_weather_leaf_reloc, "ac_weather_leaf_reloc")
 DEFINE_DMA_ENTRY(ovl__00905A30, "ovl__00905A30")
 DEFINE_DMA_ENTRY(ovl__00905A30_reloc, "ovl__00905A30_reloc")
 DEFINE_DMA_ENTRY(ovl__00906060, "ovl__00906060")
diff --git a/include/z64math.h b/include/z64math.h
index 9828756..4187622 100644
--- a/include/z64math.h
+++ b/include/z64math.h
@@ -30,7 +30,7 @@ typedef struct {
     /* 0x4 */ u16 z;
 } Vec3us; // size = 0x6
 
-typedef struct {
+typedef struct s_xyz {
     /* 0x0 */ s16 x;
     /* 0x2 */ s16 y;
     /* 0x4 */ s16 z;