Merge branch 'master' into various3

src/f_op/f_op_actor.cpp

@@ -4,12 +4,16 @@
  */
 
 #include "f_op/f_op_actor.h"
+#include "d/a/d_a_alink.h"
 #include "d/com/d_com_inf_actor.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/com/d_com_static.h"
 #include "d/d_demo.h"
 #include "d/s/d_s_play.h"
+#include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_actor_tag.h"
+#include "f_op/f_op_draw_tag.h"
+#include "f_pc/f_pc_manager.h"
 
 /* 80018B64-80018BD0 0134A4 006C+00 0/0 7/7 562/562 .text            __ct__10fopAc_ac_cFv */
 fopAc_ac_c::fopAc_ac_c() {}

src/f_op/f_op_actor_mng.cpp

@@ -6,25 +6,27 @@
 #include "f_op/f_op_actor_mng.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DU/J3DUClipper.h"
-#include "JSystem/JKernel/JKRHeap.h"
+#include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
+#include "JSystem/JMath/JMath.h"
 #include "MSL_C/math.h"
 #include "SSystem/SComponent/c_lib.h"
 #include "SSystem/SComponent/c_malloc.h"
-#include "dol2asm.h"
-#include "global.h"
-#include "d/com/d_com_inf_game.h"
-#include "JSystem/JMath/JMath.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_path.h"
 #include "d/d_procname.h"
 #include "d/d_stage.h"
+#include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "f_op/f_op_actor.h"
+#include "f_op/f_op_scene_mng.h"
 #include "global.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_mtx.h"
 #include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h"
-#include "d/d_path.h"
 
 //
 // Types:

src/f_op/f_op_actor_tag.cpp

@@ -4,6 +4,7 @@
  */
 
 #include "f_op/f_op_actor_tag.h"
+#include "SSystem/SComponent/c_list.h"
 
 /* ############################################################################################## */
 /* 803A35E0-803A35F0 000700 000C+04 1/1 2/2 0/0 .data            g_fopAcTg_Queue */

src/f_op/f_op_camera.cpp

@@ -6,6 +6,8 @@
 #include "f_op/f_op_camera.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/s/d_s_play.h"
+#include "f_op/f_op_draw_tag.h"
+#include "f_pc/f_pc_manager.h"
 
 /* 8001E140-8001E180 018A80 0040+00 1/0 0/0 0/0 .text            fopCam_Draw__FP12camera_class */
 static s32 fopCam_Draw(camera_class* i_this) {

src/f_op/f_op_camera_mng.cpp

@@ -4,6 +4,7 @@
  */
 
 #include "f_op/f_op_camera_mng.h"
+#include "f_pc/f_pc_layer.h"
 #include "f_pc/f_pc_stdcreate_req.h"
 
 /* ############################################################################################## */

src/f_op/f_op_draw_iter.cpp

@@ -4,6 +4,8 @@
  */
 
 #include "f_op/f_op_draw_iter.h"
+#include "SSystem/SComponent/c_list.h"
+#include "SSystem/SComponent/c_tag.h"
 #include "f_op/f_op_draw_tag.h"
 
 /* ############################################################################################## */

src/f_op/f_op_draw_tag.cpp

@@ -4,6 +4,8 @@
  */
 
 #include "f_op/f_op_draw_tag.h"
+#include "SSystem/SComponent/c_list.h"
+#include "SSystem/SComponent/c_tag.h"
 #include "global.h"
 
 /* ############################################################################################## */

src/f_op/f_op_kankyo.cpp

@@ -7,6 +7,8 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "d/s/d_s_play.h"
+#include "f_op/f_op_draw_tag.h"
+#include "f_op/f_op_kankyo_mng.h"
 #include "f_pc/f_pc_manager.h"
 
 /* 8001F284-8001F2C0 019BC4 003C+00 1/0 0/0 0/0 .text            fopKy_Draw__FPv */

src/f_op/f_op_msg.cpp

@@ -5,7 +5,9 @@
 
 #include "f_op/f_op_msg.h"
 #include "d/s/d_s_play.h"
+#include "f_op/f_op_draw_tag.h"
 #include "f_op/f_op_msg_mng.h"
+#include "f_pc/f_pc_manager.h"
 
 /* 8001F488-8001F4B0 019DC8 0028+00 1/0 0/0 0/0 .text            fopMsg_Draw__FPv */
 static int fopMsg_Draw(void* i_this) {

src/f_op/f_op_msg_mng.cpp

@@ -5,13 +5,18 @@
 
 #include "f_op/f_op_msg_mng.h"
 #include "JSystem/J2DGraph/J2DPane.h"
+#include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JMath/JMath.h"
 #include "SSystem/SComponent/c_malloc.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/com/d_com_inf_game.h"
+#include "d/meter/d_meter2.h"
+#include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_scene_mng.h"
+#include "global.h"
 
 //
 // Forward References:

src/f_op/f_op_overlap.cpp

@@ -3,6 +3,7 @@
  * Overlap Process Framework
  */
 
+#include "SSystem/SComponent/c_request.h"
 #include "f_op/f_op_overlap.h"
 #include "f_op/f_op_overlap_mng.h"
 #include "f_pc/f_pc_manager.h"

src/f_op/f_op_overlap_mng.cpp

@@ -3,6 +3,7 @@
  * Overlap Process Manager
  */
 
+#include "SSystem/SComponent/c_request.h"
 #include "f_op/f_op_overlap_mng.h"
 #include "f_op/f_op_overlap_req.h"
 #include "f_op/f_op_scene_pause.h"

src/f_op/f_op_overlap_req.cpp

@@ -3,6 +3,7 @@
  * Overlap Process Request
  */
 
+#include "SSystem/SComponent/c_request.h"
 #include "f_op/f_op_overlap_req.h"
 #include "f_pc/f_pc_executor.h"
 #include "f_pc/f_pc_manager.h"

src/f_op/f_op_scene_pause.cpp

@@ -4,6 +4,7 @@
  */
 
 #include "f_op/f_op_scene_pause.h"
+#include "f_op/f_op_scene.h"
 #include "f_pc/f_pc_executor.h"
 #include "f_pc/f_pc_manager.h"
 

src/f_op/f_op_scene_req.cpp

@@ -5,6 +5,8 @@
 
 #include "f_op/f_op_scene_req.h"
 #include "f_op/f_op_overlap_mng.h"
+#include "f_op/f_op_scene.h"
+#include "f_op/f_op_scene_pause.h"
 #include "f_pc/f_pc_executor.h"
 
 /* 8001EE34-8001EE64 019774 0030+00 1/0 0/0 0/0 .text

src/f_op/f_op_scene_tag.cpp

@@ -3,6 +3,7 @@
  * Scene Process Tag
  */
 
+#include "SSystem/SComponent/c_tag.h"
 #include "f_op/f_op_scene_tag.h"
 
 /* 8001F13C-8001F15C 019A7C 0020+00 0/0 1/1 0/0 .text fopScnTg_QueueTo__FP15scene_tag_class */