diff --git a/src/f/f_op/f_op_camera.cpp b/src/f/f_op/f_op_camera.cpp
index 41b3b5e5eac..f82fac3e5ab 100644
--- a/src/f/f_op/f_op_camera.cpp
+++ b/src/f/f_op/f_op_camera.cpp
@@ -1,66 +1,64 @@
 /* f_op_camera.cpp autogenerated by split.py v0.4 at 2021-02-15 20:13:32.027855 */
 
-#include "global.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "global.h"
 
 // additional symbols needed for f_op_camera.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:13:32.027886
 extern "C" {
-    void fopCam_Draw(void);
-    void fopDwTg_DrawQTo(void);
-    void fopDwTg_Init(void);
-    void fopDwTg_ToDrawQ(void);
-    void fpcLf_DrawMethod(void);
-    void fpcLf_GetPriority(void);
-    void fpcMtd_Create(void);
-    void fpcMtd_Delete(void);
-    void fpcMtd_Execute(void);
-    void fpcMtd_IsDelete(void);
-    void func_8001E180(void);
-    void func_8001E1C8(void);
-    void func_8001E21C(void);
-    void func_8001E270(void);
+void fopCam_Draw(void);
+void fopDwTg_DrawQTo(void);
+void fopDwTg_Init(void);
+void fopDwTg_ToDrawQ(void);
+void fpcLf_DrawMethod(void);
+void fpcLf_GetPriority(void);
+void fpcMtd_Create(void);
+void fpcMtd_Delete(void);
+void fpcMtd_Execute(void);
+void fpcMtd_IsDelete(void);
+void func_8001E180(void);
+void func_8001E1C8(void);
+void func_8001E21C(void);
+void func_8001E270(void);
 }
 
 // additional symbols needed for f_op_camera.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:13:32.027892
 extern u8 lbl_80451124;
 
-
 extern "C" {
 // fopCam_Draw__FP12camera_class
 // fopCam_Draw(camera_class*)
 asm void fopCam_Draw(void) {
     nofralloc
-    #include "f/f_op/f_op_camera/asm/func_8001E140.s"
+#include "f/f_op/f_op_camera/asm/func_8001E140.s"
 }
 
 // fopCam_Execute__FP12camera_class
 // fopCam_Execute(camera_class*)
 asm void func_8001E180(void) {
     nofralloc
-    #include "f/f_op/f_op_camera/asm/func_8001E180.s"
+#include "f/f_op/f_op_camera/asm/func_8001E180.s"
 }
 
 // fopCam_IsDelete__FP12camera_class
 // fopCam_IsDelete(camera_class*)
 asm void func_8001E1C8(void) {
     nofralloc
-    #include "f/f_op/f_op_camera/asm/func_8001E1C8.s"
+#include "f/f_op/f_op_camera/asm/func_8001E1C8.s"
 }
 
 // fopCam_Delete__FP12camera_class
 // fopCam_Delete(camera_class*)
 asm void func_8001E21C(void) {
     nofralloc
-    #include "f/f_op/f_op_camera/asm/func_8001E21C.s"
+#include "f/f_op/f_op_camera/asm/func_8001E21C.s"
 }
 
 // fopCam_Create__FPv
 // fopCam_Create(void*)
 asm void func_8001E270(void) {
     nofralloc
-    #include "f/f_op/f_op_camera/asm/func_8001E270.s"
+#include "f/f_op/f_op_camera/asm/func_8001E270.s"
 }
-
 };
diff --git a/src/f/f_op/f_op_draw_iter.cpp b/src/f/f_op/f_op_draw_iter.cpp
index fa9af8cb5d7..ec047bf10dd 100644
--- a/src/f/f_op/f_op_draw_iter.cpp
+++ b/src/f/f_op/f_op_draw_iter.cpp
@@ -5,9 +5,9 @@
 // additional symbols needed for f_op_draw_iter.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:16:49.147373
 extern "C" {
-    void fopDwIt_Begin(void);
-    void fopDwIt_GetTag(void);
-    void fopDwIt_Next(void);
+void fopDwIt_Begin(void);
+void fopDwIt_GetTag(void);
+void fopDwIt_Next(void);
 }
 
 // additional symbols needed for f_op_draw_iter.cpp
@@ -15,27 +15,25 @@ extern "C" {
 extern u8 lbl_804505D0;
 extern u8 lbl_80450CF8;
 
-
 extern "C" {
 // fopDwIt_GetTag__Fv
 // fopDwIt_GetTag(void)
 asm void fopDwIt_GetTag(void) {
     nofralloc
-    #include "f/f_op/f_op_draw_iter/asm/func_80020400.s"
+#include "f/f_op/f_op_draw_iter/asm/func_80020400.s"
 }
 
 // fopDwIt_Begin__Fv
 // fopDwIt_Begin(void)
 asm void fopDwIt_Begin(void) {
     nofralloc
-    #include "f/f_op/f_op_draw_iter/asm/func_80020444.s"
+#include "f/f_op/f_op_draw_iter/asm/func_80020444.s"
 }
 
 // fopDwIt_Next__FP16create_tag_class
 // fopDwIt_Next(create_tag_class*)
 asm void fopDwIt_Next(void) {
     nofralloc
-    #include "f/f_op/f_op_draw_iter/asm/func_80020480.s"
+#include "f/f_op/f_op_draw_iter/asm/func_80020480.s"
 }
-
 };
diff --git a/src/f/f_op/f_op_draw_tag.cpp b/src/f/f_op/f_op_draw_tag.cpp
index 0afb14a3a46..fadf9c7a1da 100644
--- a/src/f/f_op/f_op_draw_tag.cpp
+++ b/src/f/f_op/f_op_draw_tag.cpp
@@ -5,14 +5,14 @@
 // additional symbols needed for f_op_draw_tag.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:18:52.463040
 extern "C" {
-    void cTg_AdditionToTree(void);
-    void cTg_Create(void);
-    void cTg_SingleCutFromTree(void);
-    void cTr_Create(void);
-    void fopDwTg_CreateQueue(void);
-    void fopDwTg_DrawQTo(void);
-    void fopDwTg_Init(void);
-    void fopDwTg_ToDrawQ(void);
+void cTg_AdditionToTree(void);
+void cTg_Create(void);
+void cTg_SingleCutFromTree(void);
+void cTr_Create(void);
+void fopDwTg_CreateQueue(void);
+void fopDwTg_DrawQTo(void);
+void fopDwTg_Init(void);
+void fopDwTg_ToDrawQ(void);
 }
 
 // additional symbols needed for f_op_draw_tag.cpp
@@ -20,34 +20,32 @@ extern "C" {
 extern u8 lbl_803F1E10;
 extern u8 lbl_804505D0;
 
-
 extern "C" {
 // fopDwTg_ToDrawQ__FP16create_tag_classi
 // fopDwTg_ToDrawQ(create_tag_class*, int)
 asm void fopDwTg_ToDrawQ(void) {
     nofralloc
-    #include "f/f_op/f_op_draw_tag/asm/func_800204AC.s"
+#include "f/f_op/f_op_draw_tag/asm/func_800204AC.s"
 }
 
 // fopDwTg_DrawQTo__FP16create_tag_class
 // fopDwTg_DrawQTo(create_tag_class*)
 asm void fopDwTg_DrawQTo(void) {
     nofralloc
-    #include "f/f_op/f_op_draw_tag/asm/func_800204D4.s"
+#include "f/f_op/f_op_draw_tag/asm/func_800204D4.s"
 }
 
 // fopDwTg_Init__FP16create_tag_classPv
 // fopDwTg_Init(create_tag_class*, void*)
 asm void fopDwTg_Init(void) {
     nofralloc
-    #include "f/f_op/f_op_draw_tag/asm/func_800204F4.s"
+#include "f/f_op/f_op_draw_tag/asm/func_800204F4.s"
 }
 
 // fopDwTg_CreateQueue__Fv
 // fopDwTg_CreateQueue(void)
 asm void fopDwTg_CreateQueue(void) {
     nofralloc
-    #include "f/f_op/f_op_draw_tag/asm/func_80020518.s"
+#include "f/f_op/f_op_draw_tag/asm/func_80020518.s"
 }
-
 };
diff --git a/src/f/f_op/f_op_kankyo_mng.cpp b/src/f/f_op/f_op_kankyo_mng.cpp
index cf4a3b8b4c1..7ec436ac1fb 100644
--- a/src/f/f_op/f_op_kankyo_mng.cpp
+++ b/src/f/f_op/f_op_kankyo_mng.cpp
@@ -1,30 +1,30 @@
 /* f_op_kankyo_mng.cpp autogenerated by split.py v0.4 at 2021-02-15 20:20:10.089723 */
 
-#include "global.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "global.h"
 
 // additional symbols needed for f_op_kankyo_mng.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:20:10.089754
 extern "C" {
-    void _restgpr_28(void);
-    void _restgpr_29(void);
-    void _savegpr_28(void);
-    void _savegpr_29(void);
-    void cLib_memSet__FPviUl(void);
-    void createAppend_X1_(void);
-    void dPa_control_c_NS_set(void);
-    void fopKyM_Create(void);
-    void fopKyM_CreateAppend(void);
-    void fopKyM_Delete(void);
-    void fopKyM_create(void);
-    void fopKyM_createWpillar(void);
-    void fopKyM_fastCreate(void);
-    void fpcLy_CurrentLayer(void);
-    void fpcM_Delete(void);
-    void fpcM_FastCreate(void);
-    void fpcSCtRq_Request(void);
-    void func_8001F90C(void);
-    void memalignB__3cMlFiUl(void);
+void _restgpr_28(void);
+void _restgpr_29(void);
+void _savegpr_28(void);
+void _savegpr_29(void);
+void cLib_memSet__FPviUl(void);
+void createAppend_X1_(void);
+void dPa_control_c_NS_set(void);
+void fopKyM_Create(void);
+void fopKyM_CreateAppend(void);
+void fopKyM_Delete(void);
+void fopKyM_create(void);
+void fopKyM_createWpillar(void);
+void fopKyM_fastCreate(void);
+void fpcLy_CurrentLayer(void);
+void fpcM_Delete(void);
+void fpcM_FastCreate(void);
+void fpcSCtRq_Request(void);
+void func_8001F90C(void);
+void memalignB__3cMlFiUl(void);
 }
 
 // additional symbols needed for f_op_kankyo_mng.cpp
@@ -32,62 +32,60 @@ extern "C" {
 extern u8 lbl_804505C0;
 extern u8 lbl_80451C68;
 
-
 extern "C" {
 // fopKyM_CreateAppend__Fv
 // fopKyM_CreateAppend(void)
 asm void fopKyM_CreateAppend(void) {
     nofralloc
-    #include "f/f_op/f_op_kankyo_mng/asm/func_8001F660.s"
+#include "f/f_op/f_op_kankyo_mng/asm/func_8001F660.s"
 }
 
 // createAppend__FiP4cXyzP4cXyz
 // createAppend(int, cXyz*, cXyz*)
 asm void createAppend_X1_(void) {
     nofralloc
-    #include "f/f_op/f_op_kankyo_mng/asm/func_8001F6B8.s"
+#include "f/f_op/f_op_kankyo_mng/asm/func_8001F6B8.s"
 }
 
 // fopKyM_Delete__FPv
 // fopKyM_Delete(void*)
 asm void fopKyM_Delete(void) {
     nofralloc
-    #include "f/f_op/f_op_kankyo_mng/asm/func_8001F748.s"
+#include "f/f_op/f_op_kankyo_mng/asm/func_8001F748.s"
 }
 
 // fopKyM_Create__FsPFPv_iPv
 // fopKyM_Create(s16, int (*)(void*), void*)
 asm void fopKyM_Create(void) {
     nofralloc
-    #include "f/f_op/f_op_kankyo_mng/asm/func_8001F768.s"
+#include "f/f_op/f_op_kankyo_mng/asm/func_8001F768.s"
 }
 
 // fopKyM_create__FsiP4cXyzP4cXyzPFPv_i
 // fopKyM_create(s16, int, cXyz*, cXyz*, int (*)(void*))
 asm void fopKyM_create(void) {
     nofralloc
-    #include "f/f_op/f_op_kankyo_mng/asm/func_8001F7B8.s"
+#include "f/f_op/f_op_kankyo_mng/asm/func_8001F7B8.s"
 }
 
 // fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i
 // fopKyM_fastCreate(s16, int, cXyz*, cXyz*, int (*)(void*))
 asm void fopKyM_fastCreate(void) {
     nofralloc
-    #include "f/f_op/f_op_kankyo_mng/asm/func_8001F818.s"
+#include "f/f_op/f_op_kankyo_mng/asm/func_8001F818.s"
 }
 
 // fopKyM_createWpillar__FPC4cXyzfi
 // fopKyM_createWpillar(const cXyz*, f32, int)
 asm void fopKyM_createWpillar(void) {
     nofralloc
-    #include "f/f_op/f_op_kankyo_mng/asm/func_8001F87C.s"
+#include "f/f_op/f_op_kankyo_mng/asm/func_8001F87C.s"
 }
 
 // fopKyM_createMpillar__FPC4cXyzf
 // fopKyM_createMpillar(const cXyz*, f32)
 asm void func_8001F90C(void) {
     nofralloc
-    #include "f/f_op/f_op_kankyo_mng/asm/func_8001F90C.s"
+#include "f/f_op/f_op_kankyo_mng/asm/func_8001F90C.s"
 }
-
 };
diff --git a/src/f/f_op/f_op_msg_mng.cpp b/src/f/f_op/f_op_msg_mng.cpp
index ba4f3a0e23f..158c9fe8e81 100644
--- a/src/f/f_op/f_op_msg_mng.cpp
+++ b/src/f/f_op/f_op_msg_mng.cpp
@@ -1,57 +1,57 @@
 /* f_op_msg_mng.cpp autogenerated by split.py v0.4 at 2021-02-15 20:21:51.945184 */
 
-#include "global.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "global.h"
 
 // additional symbols needed for f_op_msg_mng.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:21:51.945228
 extern "C" {
-    void _restgpr_26(void);
-    void _restgpr_27(void);
-    void _restgpr_28(void);
-    void _restgpr_29(void);
-    void _savegpr_26(void);
-    void _savegpr_27(void);
-    void _savegpr_28(void);
-    void _savegpr_29(void);
-    void createAppend_X2_(void);
-    void createTimerAppend(void);
-    void create__10JKRExpHeapFUlP7JKRHeapb(void);
-    void dMeter2Info_c_NS_getString(void);
-    void dMeter2_c_NS_emphasisButtonDelete(void);
-    void dMsgObject_c_NS_endFlowGroup(void);
-    void dMsgObject_c_NS_setMessageIndex(void);
-    void dMsgObject_c_NS_setMessageIndexDemo(void);
-    void dMsgObject_c_NS_setTalkActor(void);
-    void dMsgObject_c_NS_setTalkPartner(void);
-    void destroy__7JKRHeapFv(void);
-    void fopMsgM_Create(void);
-    void fopMsgM_Delete(void);
-    void fopMsgM_GetAppend(void);
-    void fopMsgM_SearchByID(void);
-    void fopMsgM_create(void);
-    void fopMsgM_createExpHeap(void);
-    void fopMsgM_destroyExpHeap(void);
-    void fopMsgM_messageGet(void);
-    void fopMsgM_messageSet(void);
-    void fopMsgM_messageSetDemo(void);
-    void fopMsgM_messageSet_X1_(void);
-    void fopMsgM_setMessageID(void);
-    void fopMsgM_setStageLayer(void);
-    void fopMsgM_valueIncrease(void);
-    void fopScnM_SearchByID(void);
-    void fop_Timer_create(void);
-    void fpcBs_Is_JustOfType(void);
-    void fpcEx_SearchByID(void);
-    void fpcLy_CurrentLayer(void);
-    void fpcM_Delete(void);
-    void fpcPi_Change(void);
-    void fpcSCtRq_Request(void);
-    void func_80020158(void);
-    void func_800202CC(void);
-    void func_80020338(void);
-    void func_80020368(void);
-    void memalignB__3cMlFiUl(void);
+void _restgpr_26(void);
+void _restgpr_27(void);
+void _restgpr_28(void);
+void _restgpr_29(void);
+void _savegpr_26(void);
+void _savegpr_27(void);
+void _savegpr_28(void);
+void _savegpr_29(void);
+void createAppend_X2_(void);
+void createTimerAppend(void);
+void create__10JKRExpHeapFUlP7JKRHeapb(void);
+void dMeter2Info_c_NS_getString(void);
+void dMeter2_c_NS_emphasisButtonDelete(void);
+void dMsgObject_c_NS_endFlowGroup(void);
+void dMsgObject_c_NS_setMessageIndex(void);
+void dMsgObject_c_NS_setMessageIndexDemo(void);
+void dMsgObject_c_NS_setTalkActor(void);
+void dMsgObject_c_NS_setTalkPartner(void);
+void destroy__7JKRHeapFv(void);
+void fopMsgM_Create(void);
+void fopMsgM_Delete(void);
+void fopMsgM_GetAppend(void);
+void fopMsgM_SearchByID(void);
+void fopMsgM_create(void);
+void fopMsgM_createExpHeap(void);
+void fopMsgM_destroyExpHeap(void);
+void fopMsgM_messageGet(void);
+void fopMsgM_messageSet(void);
+void fopMsgM_messageSetDemo(void);
+void fopMsgM_messageSet_X1_(void);
+void fopMsgM_setMessageID(void);
+void fopMsgM_setStageLayer(void);
+void fopMsgM_valueIncrease(void);
+void fopScnM_SearchByID(void);
+void fop_Timer_create(void);
+void fpcBs_Is_JustOfType(void);
+void fpcEx_SearchByID(void);
+void fpcLy_CurrentLayer(void);
+void fpcM_Delete(void);
+void fpcPi_Change(void);
+void fpcSCtRq_Request(void);
+void func_80020158(void);
+void func_800202CC(void);
+void func_80020338(void);
+void func_80020368(void);
+void memalignB__3cMlFiUl(void);
 }
 
 // additional symbols needed for f_op_msg_mng.cpp
@@ -70,153 +70,151 @@ extern u8 lbl_80451C80;
 extern u8 lbl_80451C84;
 extern u8 lbl_80451C88;
 
-
 extern "C" {
 // fopMsgM_setStageLayer__FPv
 // fopMsgM_setStageLayer(void*)
 asm void fopMsgM_setStageLayer(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001F9B4.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001F9B4.s"
 }
 
 // fopMsgM_SearchByID__FUi
 // fopMsgM_SearchByID(unsigned int)
 asm void fopMsgM_SearchByID(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001FA24.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001FA24.s"
 }
 
 // fopMsgM_GetAppend__FPv
 // fopMsgM_GetAppend(void*)
 asm void fopMsgM_GetAppend(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001FA44.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001FA44.s"
 }
 
 // fopMsgM_Delete__FPv
 // fopMsgM_Delete(void*)
 asm void fopMsgM_Delete(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001FA4C.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001FA4C.s"
 }
 
 // createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi
 // createAppend(fopAc_ac_c*, cXyz*, u32*, u32*, unsigned int)
 asm void createAppend_X2_(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001FA6C.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001FA6C.s"
 }
 
 // createTimerAppend__FiUlUcUcffffUi
 // createTimerAppend(int, u32, u8, u8, f32, f32, f32, f32, unsigned int)
 asm void createTimerAppend(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001FB50.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001FB50.s"
 }
 
 // fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i
 // fopMsgM_create(s16, fopAc_ac_c*, cXyz*, u32*, u32*, int (*)(void*))
 asm void fopMsgM_create(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001FC4C.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001FC4C.s"
 }
 
 // fop_Timer_create__FsUcUlUcUcffffPFPv_i
 // fop_Timer_create(s16, u8, u32, u8, u8, f32, f32, f32, f32, int (*)(void*))
 asm void fop_Timer_create(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001FCC0.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001FCC0.s"
 }
 
 // fopMsgM_messageSet__FUlP10fopAc_ac_cUl
 // fopMsgM_messageSet(u32, fopAc_ac_c*, u32)
 asm void fopMsgM_messageSet(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001FD34.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001FD34.s"
 }
 
 // fopMsgM_messageSet__FUlUl
 // fopMsgM_messageSet(u32, u32)
 asm void fopMsgM_messageSet_X1_(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001FE84.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001FE84.s"
 }
 
 // fopMsgM_messageSetDemo__FUl
 // fopMsgM_messageSetDemo(u32)
 asm void fopMsgM_messageSetDemo(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8001FFC4.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8001FFC4.s"
 }
 
 // fopMsgM_messageGet__FPcUl
 // fopMsgM_messageGet(s8*, u32)
 asm void fopMsgM_messageGet(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_800200C0.s"
+#include "f/f_op/f_op_msg_mng/asm/func_800200C0.s"
 }
 
 // fopMsgM_setMessageID__FUi
 // fopMsgM_setMessageID(unsigned int)
 asm void fopMsgM_setMessageID(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_80020100.s"
+#include "f/f_op/f_op_msg_mng/asm/func_80020100.s"
 }
 
 // fopMsgM_Create__FsPFPv_iPv
 // fopMsgM_Create(s16, int (*)(void*), void*)
 asm void fopMsgM_Create(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_80020108.s"
+#include "f/f_op/f_op_msg_mng/asm/func_80020108.s"
 }
 
 // setAlpha__7J2DPaneFUc
 // J2DPane::setAlpha(u8)
 asm void func_80020158(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_80020158.s"
+#include "f/f_op/f_op_msg_mng/asm/func_80020158.s"
 }
 
 // fopMsgM_valueIncrease__FiiUc
 // fopMsgM_valueIncrease(int, int, u8)
 asm void fopMsgM_valueIncrease(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_80020160.s"
+#include "f/f_op/f_op_msg_mng/asm/func_80020160.s"
 }
 
 // setBlendRatio__10J2DPictureFff
 // J2DPicture::setBlendRatio(f32, f32)
 asm void func_800202CC(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_800202CC.s"
+#include "f/f_op/f_op_msg_mng/asm/func_800202CC.s"
 }
 
 // append__10J2DPictureFPCcf
 // J2DPicture::append(const s8*, f32)
 asm void func_80020338(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_80020338.s"
+#include "f/f_op/f_op_msg_mng/asm/func_80020338.s"
 }
 
 // insert__10J2DPictureFPCcUcf
 // J2DPicture::insert(const s8*, u8, f32)
 asm void func_80020368(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_80020368.s"
+#include "f/f_op/f_op_msg_mng/asm/func_80020368.s"
 }
 
 // fopMsgM_createExpHeap__FUlP7JKRHeap
 // fopMsgM_createExpHeap(u32, JKRHeap*)
 asm void fopMsgM_createExpHeap(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_8002039C.s"
+#include "f/f_op/f_op_msg_mng/asm/func_8002039C.s"
 }
 
 // fopMsgM_destroyExpHeap__FP10JKRExpHeap
 // fopMsgM_destroyExpHeap(JKRExpHeap*)
 asm void fopMsgM_destroyExpHeap(void) {
     nofralloc
-    #include "f/f_op/f_op_msg_mng/asm/func_800203E0.s"
+#include "f/f_op/f_op_msg_mng/asm/func_800203E0.s"
 }
-
 };
diff --git a/src/f/f_op/f_op_overlap_req.cpp b/src/f/f_op/f_op_overlap_req.cpp
index edf5ef4fb3d..0c4da5d73ae 100644
--- a/src/f/f_op/f_op_overlap_req.cpp
+++ b/src/f/f_op/f_op_overlap_req.cpp
@@ -5,131 +5,129 @@
 // additional symbols needed for f_op_overlap_req.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:24:53.163652
 extern "C" {
-    void _restgpr_29(void);
-    void _savegpr_29(void);
-    void cPhs_Do(void);
-    void cPhs_Set(void);
-    void cReq_Command__FP18request_base_classUc(void);
-    void cReq_Create__FP18request_base_classUc(void);
-    void cReq_Done__FP18request_base_class(void);
-    void cReq_Is_Done__FP18request_base_class(void);
-    void fopOvlpReq_Cancel__FP21overlap_request_class(void);
-    void fopOvlpReq_Handler__FP21overlap_request_class(void);
-    void fopOvlpReq_Is_PeektimeLimit(void);
-    void fopOvlpReq_OverlapClr__FP21overlap_request_class(void);
-    void fopOvlpReq_Request__FP21overlap_request_classsUs(void);
-    void fopOvlpReq_SetPeektime(void);
-    void fopOvlpReq_phase_Done(void);
-    void fpcEx_SearchByID(void);
-    void fpcLy_CurrentLayer(void);
-    void fpcLy_RootLayer(void);
-    void fpcLy_SetCurrentLayer(void);
-    void fpcM_Delete(void);
-    void fpcM_IsCreating(void);
-    void fpcSCtRq_Request(void);
-    void func_8001E748(void);
-    void func_8001E794(void);
-    void func_8001E7E4(void);
-    void func_8001E854(void);
-    void func_8001E8A4(void);
-    void func_8001E904(void);
+void _restgpr_29(void);
+void _savegpr_29(void);
+void cPhs_Do(void);
+void cPhs_Set(void);
+void cReq_Command__FP18request_base_classUc(void);
+void cReq_Create__FP18request_base_classUc(void);
+void cReq_Done__FP18request_base_class(void);
+void cReq_Is_Done__FP18request_base_class(void);
+void fopOvlpReq_Cancel__FP21overlap_request_class(void);
+void fopOvlpReq_Handler__FP21overlap_request_class(void);
+void fopOvlpReq_Is_PeektimeLimit(void);
+void fopOvlpReq_OverlapClr__FP21overlap_request_class(void);
+void fopOvlpReq_Request__FP21overlap_request_classsUs(void);
+void fopOvlpReq_SetPeektime(void);
+void fopOvlpReq_phase_Done(void);
+void fpcEx_SearchByID(void);
+void fpcLy_CurrentLayer(void);
+void fpcLy_RootLayer(void);
+void fpcLy_SetCurrentLayer(void);
+void fpcM_Delete(void);
+void fpcM_IsCreating(void);
+void fpcSCtRq_Request(void);
+void func_8001E748(void);
+void func_8001E794(void);
+void func_8001E7E4(void);
+void func_8001E854(void);
+void func_8001E8A4(void);
+void func_8001E904(void);
 }
 
 // additional symbols needed for f_op_overlap_req.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:24:53.163658
 extern u8 lbl_803A3890;
 
-
 extern "C" {
 // fopOvlpReq_phase_Done__FP21overlap_request_class
 // fopOvlpReq_phase_Done(overlap_request_class*)
 asm void fopOvlpReq_phase_Done(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001E6EC.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001E6EC.s"
 }
 
 // fopOvlpReq_phase_IsDone__FP21overlap_request_class
 // fopOvlpReq_phase_IsDone(overlap_request_class*)
 asm void func_8001E748(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001E748.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001E748.s"
 }
 
 // fopOvlpReq_phase_IsWaitOfFadeout__FP21overlap_request_class
 // fopOvlpReq_phase_IsWaitOfFadeout(overlap_request_class*)
 asm void func_8001E794(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001E794.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001E794.s"
 }
 
 // fopOvlpReq_phase_WaitOfFadeout__FP21overlap_request_class
 // fopOvlpReq_phase_WaitOfFadeout(overlap_request_class*)
 asm void func_8001E7E4(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001E7E4.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001E7E4.s"
 }
 
 // fopOvlpReq_phase_IsComplete__FP21overlap_request_class
 // fopOvlpReq_phase_IsComplete(overlap_request_class*)
 asm void func_8001E854(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001E854.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001E854.s"
 }
 
 // fopOvlpReq_phase_IsCreated__FP21overlap_request_class
 // fopOvlpReq_phase_IsCreated(overlap_request_class*)
 asm void func_8001E8A4(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001E8A4.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001E8A4.s"
 }
 
 // fopOvlpReq_phase_Create__FP21overlap_request_class
 // fopOvlpReq_phase_Create(overlap_request_class*)
 asm void func_8001E904(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001E904.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001E904.s"
 }
 
 // fopOvlpReq_Request__FP21overlap_request_classsUs
 // fopOvlpReq_Request(overlap_request_class*, s16, u16)
 asm void fopOvlpReq_Request__FP21overlap_request_classsUs(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001E954.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001E954.s"
 }
 
 // fopOvlpReq_Handler__FP21overlap_request_class
 // fopOvlpReq_Handler(overlap_request_class*)
 asm void fopOvlpReq_Handler__FP21overlap_request_class(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001E9F0.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001E9F0.s"
 }
 
 // fopOvlpReq_Cancel__FP21overlap_request_class
 // fopOvlpReq_Cancel(overlap_request_class*)
 asm void fopOvlpReq_Cancel__FP21overlap_request_class(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001EA88.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001EA88.s"
 }
 
 // fopOvlpReq_Is_PeektimeLimit__FP21overlap_request_class
 // fopOvlpReq_Is_PeektimeLimit(overlap_request_class*)
 asm void fopOvlpReq_Is_PeektimeLimit(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001EAB4.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001EAB4.s"
 }
 
 // fopOvlpReq_SetPeektime__FP21overlap_request_classUs
 // fopOvlpReq_SetPeektime(overlap_request_class*, u16)
 asm void fopOvlpReq_SetPeektime(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001EAC4.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001EAC4.s"
 }
 
 // fopOvlpReq_OverlapClr__FP21overlap_request_class
 // fopOvlpReq_OverlapClr(overlap_request_class*)
 asm void fopOvlpReq_OverlapClr__FP21overlap_request_class(void) {
     nofralloc
-    #include "f/f_op/f_op_overlap_req/asm/func_8001EAD8.s"
+#include "f/f_op/f_op_overlap_req/asm/func_8001EAD8.s"
 }
-
 };
diff --git a/src/f/f_op/f_op_scene_iter.cpp b/src/f/f_op/f_op_scene_iter.cpp
index 65e12526f7d..4a4a1f1e0e0 100644
--- a/src/f/f_op/f_op_scene_iter.cpp
+++ b/src/f/f_op/f_op_scene_iter.cpp
@@ -1,26 +1,24 @@
 /* f_op_scene_iter.cpp autogenerated by split.py v0.4 at 2021-02-15 20:27:34.795954 */
 
-#include "global.h"
 #include "SComponent/c_tag_iter.h"
+#include "global.h"
 
 // additional symbols needed for f_op_scene_iter.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:27:34.795974
 extern "C" {
-    void cLsIt_Judge(void);
-    void fopScnIt_Judge(void);
+void cLsIt_Judge(void);
+void fopScnIt_Judge(void);
 }
 
 // additional symbols needed for f_op_scene_iter.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:27:34.795978
 extern u8 lbl_803A3918;
 
-
 extern "C" {
 // fopScnIt_Judge__FPFPvPv_PvPv
 // fopScnIt_Judge(void* (*)(void*, void*), void*)
 asm void fopScnIt_Judge(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_iter/asm/func_8001EC74.s"
+#include "f/f_op/f_op_scene_iter/asm/func_8001EC74.s"
 }
-
 };
diff --git a/src/f/f_op/f_op_scene_pause.cpp b/src/f/f_op/f_op_scene_pause.cpp
index 75917d362a1..06fbb53f1e7 100644
--- a/src/f/f_op/f_op_scene_pause.cpp
+++ b/src/f/f_op/f_op_scene_pause.cpp
@@ -5,32 +5,29 @@
 // additional symbols needed for f_op_scene_pause.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:28:00.829561
 extern "C" {
-    void fopScnPause_Disable__FP11scene_class(void);
-    void fopScnPause_Enable__FP11scene_class(void);
-    void fpcEx_IsExist(void);
-    void fpcM_IsPause(void);
-    void fpcM_PauseDisable(void);
-    void fpcM_PauseEnable(void);
+void fopScnPause_Disable__FP11scene_class(void);
+void fopScnPause_Enable__FP11scene_class(void);
+void fpcEx_IsExist(void);
+void fpcM_IsPause(void);
+void fpcM_PauseDisable(void);
+void fpcM_PauseEnable(void);
 }
 
 // additional symbols needed for f_op_scene_pause.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:28:00.829565
 
-
-
 extern "C" {
 // fopScnPause_Enable__FP11scene_class
 // fopScnPause_Enable(scene_class*)
 asm void fopScnPause_Enable__FP11scene_class(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_pause/asm/func_80020548.s"
+#include "f/f_op/f_op_scene_pause/asm/func_80020548.s"
 }
 
 // fopScnPause_Disable__FP11scene_class
 // fopScnPause_Disable(scene_class*)
 asm void fopScnPause_Disable__FP11scene_class(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_pause/asm/func_80020594.s"
+#include "f/f_op/f_op_scene_pause/asm/func_80020594.s"
 }
-
 };
diff --git a/src/f/f_op/f_op_scene_req.cpp b/src/f/f_op/f_op_scene_req.cpp
index 6181a1b1a8a..30aeacb44a6 100644
--- a/src/f/f_op/f_op_scene_req.cpp
+++ b/src/f/f_op/f_op_scene_req.cpp
@@ -5,36 +5,36 @@
 // additional symbols needed for f_op_scene_req.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:29:06.358877
 extern "C" {
-    void _restgpr_26(void);
-    void _savegpr_26(void);
-    void cPhs_Do(void);
-    void cPhs_Set(void);
-    void fopOvlpM_Cancel__Fv(void);
-    void fopOvlpM_ClearOfReq__Fv(void);
-    void fopOvlpM_IsDoingReq__Fv(void);
-    void fopOvlpM_IsDone__Fv(void);
-    void fopOvlpM_Request__FsUs(void);
-    void fopOvlpM_ToldAboutID__FUi(void);
-    void fopScnPause_Disable__FP11scene_class(void);
-    void fopScnPause_Enable__FP11scene_class(void);
-    void fopScnRq_Execute(void);
-    void fopScnRq_FadeRequest(void);
-    void fopScnRq_Handler(void);
-    void fopScnRq_ReRequest(void);
-    void fopScnRq_Request(void);
-    void fopScnRq_phase_ClearOverlap(void);
-    void fpcEx_SearchByID(void);
-    void fpcNdRq_Delete(void);
-    void fpcNdRq_Execute(void);
-    void fpcNdRq_Handler(void);
-    void fpcNdRq_ReRequest(void);
-    void fpcNdRq_Request(void);
-    void func_8001EE64(void);
-    void func_8001EE84(void);
-    void func_8001EEB4(void);
-    void func_8001EEE4(void);
-    void func_8001EF6C(void);
-    void func_8001EFB0(void);
+void _restgpr_26(void);
+void _savegpr_26(void);
+void cPhs_Do(void);
+void cPhs_Set(void);
+void fopOvlpM_Cancel__Fv(void);
+void fopOvlpM_ClearOfReq__Fv(void);
+void fopOvlpM_IsDoingReq__Fv(void);
+void fopOvlpM_IsDone__Fv(void);
+void fopOvlpM_Request__FsUs(void);
+void fopOvlpM_ToldAboutID__FUi(void);
+void fopScnPause_Disable__FP11scene_class(void);
+void fopScnPause_Enable__FP11scene_class(void);
+void fopScnRq_Execute(void);
+void fopScnRq_FadeRequest(void);
+void fopScnRq_Handler(void);
+void fopScnRq_ReRequest(void);
+void fopScnRq_Request(void);
+void fopScnRq_phase_ClearOverlap(void);
+void fpcEx_SearchByID(void);
+void fpcNdRq_Delete(void);
+void fpcNdRq_Execute(void);
+void fpcNdRq_Handler(void);
+void fpcNdRq_ReRequest(void);
+void fpcNdRq_Request(void);
+void func_8001EE64(void);
+void func_8001EE84(void);
+void func_8001EEB4(void);
+void func_8001EEE4(void);
+void func_8001EF6C(void);
+void func_8001EFB0(void);
 }
 
 // additional symbols needed for f_op_scene_req.cpp
@@ -42,90 +42,88 @@ extern "C" {
 extern u8 lbl_803A38C8;
 extern u8 lbl_80450CE0;
 
-
 extern "C" {
 // fopScnRq_phase_ClearOverlap__FP19scene_request_class
 // fopScnRq_phase_ClearOverlap(scene_request_class*)
 asm void fopScnRq_phase_ClearOverlap(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001EE34.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001EE34.s"
 }
 
 // fopScnRq_phase_Execute__FP19scene_request_class
 // fopScnRq_phase_Execute(scene_request_class*)
 asm void func_8001EE64(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001EE64.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001EE64.s"
 }
 
 // fopScnRq_phase_IsDoingOverlap__FP19scene_request_class
 // fopScnRq_phase_IsDoingOverlap(scene_request_class*)
 asm void func_8001EE84(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001EE84.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001EE84.s"
 }
 
 // fopScnRq_phase_IsDoneOverlap__FP19scene_request_class
 // fopScnRq_phase_IsDoneOverlap(scene_request_class*)
 asm void func_8001EEB4(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001EEB4.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001EEB4.s"
 }
 
 // fopScnRq_phase_Done__FP19scene_request_class
 // fopScnRq_phase_Done(scene_request_class*)
 asm void func_8001EEE4(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001EEE4.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001EEE4.s"
 }
 
 // fopScnRq_Execute__FP19scene_request_class
 // fopScnRq_Execute(scene_request_class*)
 asm void fopScnRq_Execute(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001EF24.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001EF24.s"
 }
 
 // fopScnRq_PostMethod__FPvP19scene_request_class
 // fopScnRq_PostMethod(void*, scene_request_class*)
 asm void func_8001EF6C(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001EF6C.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001EF6C.s"
 }
 
 // fopScnRq_Cancel__FP19scene_request_class
 // fopScnRq_Cancel(scene_request_class*)
 asm void func_8001EFB0(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001EFB0.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001EFB0.s"
 }
 
 // fopScnRq_FadeRequest__FsUs
 // fopScnRq_FadeRequest(s16, u16)
 asm void fopScnRq_FadeRequest(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001EFF0.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001EFF0.s"
 }
 
 // fopScnRq_Request__FiP11scene_classsPvsUs
 // fopScnRq_Request(int, scene_class*, s16, void*, s16, u16)
 asm void fopScnRq_Request(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001F034.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001F034.s"
 }
 
 // fopScnRq_ReRequest__FUisPv
 // fopScnRq_ReRequest(unsigned int, s16, void*)
 asm void fopScnRq_ReRequest(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001F0FC.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001F0FC.s"
 }
 
 // fopScnRq_Handler__Fv
 // fopScnRq_Handler(void)
 asm void fopScnRq_Handler(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_req/asm/func_8001F11C.s"
+#include "f/f_op/f_op_scene_req/asm/func_8001F11C.s"
 }
-
 };
diff --git a/src/f/f_op/f_op_scene_tag.cpp b/src/f/f_op/f_op_scene_tag.cpp
index 8c8c66557d8..c7a4a8a5d2c 100644
--- a/src/f/f_op/f_op_scene_tag.cpp
+++ b/src/f/f_op/f_op_scene_tag.cpp
@@ -5,39 +5,37 @@
 // additional symbols needed for f_op_scene_tag.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:28:40.331363
 extern "C" {
-    void cTg_Addition(void);
-    void cTg_Create(void);
-    void cTg_SingleCut(void);
-    void fopScnTg_Init(void);
-    void fopScnTg_QueueTo(void);
-    void fopScnTg_ToQueue(void);
+void cTg_Addition(void);
+void cTg_Create(void);
+void cTg_SingleCut(void);
+void fopScnTg_Init(void);
+void fopScnTg_QueueTo(void);
+void fopScnTg_ToQueue(void);
 }
 
 // additional symbols needed for f_op_scene_tag.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:28:40.331367
 extern u8 lbl_803A3918;
 
-
 extern "C" {
 // fopScnTg_QueueTo__FP15scene_tag_class
 // fopScnTg_QueueTo(scene_tag_class*)
 asm void fopScnTg_QueueTo(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_tag/asm/func_8001F13C.s"
+#include "f/f_op/f_op_scene_tag/asm/func_8001F13C.s"
 }
 
 // fopScnTg_ToQueue__FP15scene_tag_class
 // fopScnTg_ToQueue(scene_tag_class*)
 asm void fopScnTg_ToQueue(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_tag/asm/func_8001F15C.s"
+#include "f/f_op/f_op_scene_tag/asm/func_8001F15C.s"
 }
 
 // fopScnTg_Init__FP15scene_tag_classPv
 // fopScnTg_Init(scene_tag_class*, void*)
 asm void fopScnTg_Init(void) {
     nofralloc
-    #include "f/f_op/f_op_scene_tag/asm/func_8001F188.s"
+#include "f/f_op/f_op_scene_tag/asm/func_8001F188.s"
 }
-
 };