Merge branch 'master' into various3

src/d/a/d_a_alink.cpp

@@ -5,7 +5,9 @@
 
 #include "d/a/d_a_alink.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
+#include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
+#include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JMath/JMath.h"
 #include "JSystem/JStudio/JStudio/stb.h"
 #include "MSL_C/float.h"
@@ -17,13 +19,20 @@
 #include "d/d_item.h"
 #include "d/d_path.h"
 #include "d/d_procname.h"
+#include "d/meter/d_meter2_draw.h"
 #include "d/msg/d_msg_object.h"
+#include "d/pane/d_pane_class.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
+#include "f_op/f_op_actor_mng.h"
+#include "global.h"
+#include "m_Do/m_Do_controller_pad.h"
 #include "rel/d/a/d_a_crod/d_a_crod.h"
 #include "rel/d/a/d_a_horse/d_a_horse.h"
 #include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h"
 #include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h"
 #include "rel/d/a/d_a_spinner/d_a_spinner.h"
+#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
 #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
 #include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h"
 

src/d/a/d_a_horse_static.cpp

@@ -6,6 +6,7 @@
 #include "d/a/d_a_horse_static.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
 
 BOOL e_wb_class::checkWait() {
     return field_0x5b4 == 0x2A;

src/d/a/d_a_itembase.cpp

@@ -7,7 +7,9 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/d_item_data.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
 
 //
 // External References:

src/d/a/d_a_itembase_static.cpp

@@ -4,6 +4,7 @@
 //
 
 #include "d/a/d_a_itembase_static.h"
+#include "d/a/d_a_itembase.h"
 #include "SSystem/SComponent/c_lib.h"
 #include "d/d_item_data.h"
 #include "dol2asm.h"

src/d/a/d_a_npc.cpp

@@ -4,13 +4,15 @@
 //
 
 #include "d/a/d_a_npc.h"
+#include "SSystem/SComponent/c_math.h"
 #include "d/a/d_a_player.h"
 #include "d/d_procname.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+#include "global.h"
 #include "m_Do/m_Do_mtx.h"
 #include "rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h"
-#include "SSystem/SComponent/c_math.h"
 #include "m_Do/m_Do_lib.h"
 
 //

src/d/a/d_a_obj.cpp

@@ -7,6 +7,7 @@
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
 
 //
 // Types:

src/d/a/d_a_obj_item.cpp

@@ -5,11 +5,14 @@
 
 #include "d/a/d_a_obj_item.h"
 #include "SSystem/SComponent/c_math.h"
+#include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_item.h"
 #include "d/d_item_data.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+#include "global.h"
 #include "m_Do/m_Do_mtx.h"
 
 //

src/d/a/d_a_obj_ss_base.cpp

@@ -6,6 +6,7 @@
 #include "d/a/d_a_obj_ss_base.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
 
 //
 // Declarations:

src/d/a/d_a_player.cpp

@@ -5,7 +5,9 @@
 
 #include "d/a/d_a_player.h"
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
+#include "JSystem/JKernel/JKRSolidHeap.h"
 #include "SSystem/SComponent/c_math.h"
+#include "d/a/d_a_alink.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/mtx/mtx.h"