Merge branch 'master' into ac_douzou

include/ac_train0.h

@@ -3,11 +3,37 @@
 
 #include "types.h"
 #include "m_actor.h"
+#include "c_keyframe.h"
+#include "m_lib.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef int (*aTR0_SETUP_ACTOR_PROC)(GAME_PLAY*, mActor_name_t,int,int,int,int,int,int,int);
+
+typedef struct ac_train0_clip_s{
+    aTR0_SETUP_ACTOR_PROC setup_actor_proc;
+}aTR0_Clip_c;
+
+typedef struct train0_s{
+    ACTOR actor_class;
+    int steam_available;
+    cKF_SkeletonInfo_R_c keyframe;
+    int steam_timer;
+    s_xyz work[15];
+    s_xyz target[15];
+    u8 pad4[0x2b4 - 0x2A0];
+    int tr_action;
+    u8 pad5[0x2BC - 0x2B8];
+    int effect_num;
+    int unk2c0;
+    ACTOR* tr_actor_p;
+    f32 tr1_pos;
+    f32 tr_speed;
+    u8 pad6[0x2D8 - 0x2CC];
+}TRAIN0_ACTOR;
+
 extern ACTOR_PROFILE Train0_Profile;
 
 #ifdef __cplusplus

include/ac_train1.h

@@ -3,11 +3,31 @@
 
 #include "types.h"
 #include "m_actor.h"
+#include "c_keyframe.h"
+#include "m_lib.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef struct train1_s{
+    ACTOR actor_class;
+    int anim_state;
+    cKF_SkeletonInfo_R_c keyframe;
+    int timer;
+    s_xyz work[15];
+    s_xyz morph[15];
+    u8 pad4[0x2b4 - 0x2A0];
+    int tr_action;
+    int player_pass_exists;
+    int player_pass_leaving; //Not sure about this one
+    int unk2c0;
+    ACTOR* tr_actor_p;
+    f32 tr_speed;
+    f32 tr0_pos;
+    u8 pad2[0x2D8-0x2CC];
+}TRAIN1_ACTOR;
+
 extern ACTOR_PROFILE Train1_Profile;
 
 #ifdef __cplusplus

include/ac_train_window.h

@@ -8,6 +8,34 @@
 extern "C" {
 #endif
 
+typedef int (*TRAIN_WINDOW_DRAW_TYPE)(ACTOR*, GAME*);
+
+#define CRV_DEBUG_LOD_VALUE 87
+#define CRV_DEBUG_RED_VALUE 88
+#define CRV_DEBUG_GREEN_VALUE 89
+#define CRV_DEBUG_BLUE_VALUE 90
+
+
+typedef struct train_window_s{
+    ACTOR actor_class;
+    TRAIN_WINDOW_DRAW_TYPE draw_type;
+    s16 pallete_id;
+    int unk17C;
+    u16* current_pallete;
+    u32 Single_Scrollx;
+    u32 Single_Scrolly;
+    u32 Two_Scrollx1;
+    u32 Two_Scrolly1;
+    u32 Two_Scrollx2;
+    u32 Two_Scrolly2;
+    int TreeScrollx;
+    int TreeScrolly;
+    f32 xlu_alpha;
+    f32 scroll_speed;
+    s_xyz pos;
+    f32 lod_factor;
+}TRAIN_WINDOW_ACTOR;
+
 extern ACTOR_PROFILE Train_Window_Profile;
 
 #ifdef __cplusplus

include/evw_anime.h

@@ -0,0 +1,23 @@
+#ifndef EVW_ANIME_H
+#define EVW_ANIME_H
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+
+typedef struct evw_anime_s{
+    s16 unk0;
+    s16 unk4;
+    void* data_p;
+}EVW_ANIME_DATA;
+
+void Evw_Anime_Set(GAME*, EVW_ANIME_DATA*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/m_actor.h

@@ -28,6 +28,7 @@ typedef void (*mActor_proc)(ACTOR*, GAME*);
 #define ACTOR_OBJ_BANK_7 7
 #define ACTOR_OBJ_BANK_11 11
 #define ACTOR_OBJ_BANK_12 12
+#define ACTOR_OBJ_BANK_41 41
 
 enum actor_part {
   ACTOR_PART_FG,

include/m_clip.h

@@ -2,6 +2,7 @@
 #define M_CLIP_H
 
 #include "types.h"
+#include "ac_train0.h"
 #include "ac_gyoei_h.h"
 #include "ac_insect_h.h"
 #include "ac_structure.h"
@@ -16,7 +17,9 @@ extern "C" {
 
 /* sizeof(Clip_c) == 0x104 */
 typedef struct clip_s {
-  /* 0x000 */ void* _000[(0x074 - 0x000) / sizeof(void*)];
+  /* 0x000 */ void* _000[(0x040 - 0x000) / sizeof(void*)];
+  /* 0x040 */ aTR0_Clip_c* train0_clip;
+  /* 0x044 */ void* _044[(0x074 - 0x044) / sizeof(void*)];
   /* 0x074 */ bIT_Clip_c* bg_item_clip;
   /* 0x078 */ void* _078;
   /* 0x07C */ aINS_Clip_c* insect_clip;

include/m_kankyo.h

@@ -26,6 +26,12 @@ enum weather_intensity {
   mEnv_WEATHER_INTENSITY_NUM,
 };
 
+typedef struct kankyo_s{
+    /*0x00 */ u8 pad[0x9A];
+    /*0x9A */ u8 ambientColor[3];
+    /*0x9E */ u8 pad2[0x32];  
+}Kankyo;
+
 extern int mEnv_NowWeather();
 
 #ifdef __cplusplus

include/m_lights.h

@@ -13,6 +13,15 @@ typedef struct lightsn_s {
   Lights7 lights;
 } LightsN;
 
+
+typedef struct global_light_s {
+    /* 0x0 */ void* list;
+    /* 0x4 */ u8 ambientColor[3];
+    /* 0x7 */ u8 fogColor[3];
+    /* 0xA */ s16 fogNear;
+    /* 0xC */ s16 fogFar; 
+} Global_light;
+
 #ifdef __cplusplus
 }
 #endif

include/m_name_table.h

@@ -566,6 +566,7 @@ extern int mNT_check_unknown(mActor_name_t item_no);
 #define ETC_AIRPLANE ETC_START
 #define ETC_BOXTRICK (ETC_START + 4)
 #define ETC_BOXMANAGER (ETC_START + 5)
+#define ETC_TRAIN_WINDOW (ETC_START + 17)
 
 #define MISC_ACTOR_START 0x9000
 #define MISC_ACTOR_SAMPLE MISC_ACTOR_START

include/m_play.h

@@ -7,6 +7,8 @@
 #include "m_view.h"
 #include "m_camera2.h"
 #include "m_submenu.h"
+#include "m_kankyo.h"
+#include "m_lights.h"
 #include "m_pause.h"
 #include "m_field_info.h"
 #include "m_fbdemo_wipe.h"
@@ -29,7 +31,8 @@ struct game_play_s {
   /* 0x0110 */ Object_Exchange_c object_exchange;
   /* 0x1A68 */ View view;
   /* 0x1B88 */ Camera2 camera;
-  /* 0x1CC0 */ u8 _1CC0[0x1DA0 - 0x1CC0];
+  /* 0x1CC0 */ Kankyo kankyo; 
+  /* 0x1D90 */ Global_light global_light;
   /* 0x1DA0 */ pause_t pause;
   /* 0x1DA8 */ Actor_info actor_info;
   /* 0x1DEC */ Submenu submenu;

include/sys_math3d.h

@@ -21,6 +21,7 @@ extern void sMath_RotateY(xyz_t* pos, f32 rad);
 extern void sMath_RotateZ(xyz_t* pos, f32 rad);
 
 extern xyz_t ZeroVec;
+extern s_xyz ZeroSVec;
 
 #ifdef __cplusplus
 }