diff --git a/include/f/f_ap_game/f_ap_game.h b/include/f/f_ap_game/f_ap_game.h
index 2a0e0134ed0..5376b5de256 100644
--- a/include/f/f_ap_game/f_ap_game.h
+++ b/include/f/f_ap_game/f_ap_game.h
@@ -1 +1,8 @@
-// finishme
\ No newline at end of file
+#ifndef F_F_AP_GAME_H_
+#define F_F_AP_GAME_H_
+
+void fapGm_After(void);
+void fapGm_Execute(void);
+void fapGm_Create(void);
+
+#endif
\ No newline at end of file
diff --git a/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h
index b93b20e23b9..3505006a843 100644
--- a/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h
+++ b/include/m_Do/m_Do_controller_pad/m_Do_controller_pad.h
@@ -9,7 +9,7 @@ extern interface_of_controller_pad m_cpadInfo[4];  // m_Do_controller_pad::mDoCP
 
 struct g_HIO_struct {
     u32 field_0x0;
-    u8 field_0x4;
+    s8 field_0x4;
     u8 field_0x5;
     u8 field_0x6;
     u8 field_0x7;
@@ -69,6 +69,8 @@ struct g_HIO_struct {
     u8 field_0x43;
 };
 
+extern g_HIO_struct g_HIO;
+
 struct mDoCPd_c {
     void create();
     void read();
diff --git a/include/variables.h b/include/variables.h
index 87150c3ddc1..47a2160ad66 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -10,8 +10,6 @@ extern u32 _sRumbleSupported;
 extern u8 lbl_803A2EF4;
 extern char lbl_803A2EE0[16];
 extern u8 lbl_80450B19;
-struct g_HIO_struct;
-extern g_HIO_struct g_HIO;
 extern s8 lbl_80450580;
 // extern u8 lbl_80450B1A;
 struct JUTGamePad;
diff --git a/src/f/f_ap_game.cpp b/src/f/f_ap_game.cpp
index b56b5a97915..bc04c5c935d 100644
--- a/src/f/f_ap_game.cpp
+++ b/src/f/f_ap_game.cpp
@@ -1,31 +1,24 @@
 /* f_ap_game.cpp autogenerated by split.py v0.4 at 2021-02-13 20:07:21.300413 */
-
+#include "f/f_ap_game/f_ap_game.h"
 #include "SComponent/c_counter.h"
 #include "f/f_op/f_op_camera_mng.h"
 #include "f/f_op/f_op_overlap_mng.h"
 #include "f/f_op/f_op_scene_mng.h"
 #include "f/f_pc/f_pc_manager.h"
 #include "global.h"
+#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
 // additional symbols needed for f_ap_game.cpp
 // autogenerated by split.py v0.4 at 2021-02-13 20:07:21.300465
 extern "C" {
 void __dl__FPv(void);
-// void cCt_Counter(void);
-void fapGm_After(void);
-void fapGm_Create(void);
-void fapGm_Execute(void);
 void fapGm_HIO_c(void);
 void fapGm_HIO_c_NS_dtor(void);
 void fopCamM_Init(void);
-// void fopCamM_Management(void);
 void fopDwTg_CreateQueue(void);
 void fopOvlpM_Init(void);
-// void fopOvlpM_Management(void);
 void fopScnM_Init(void);
-// void fopScnM_Management(void);
 void fpcM_Init(void);
-// void fpcM_Management__FPFv_vPFv_v(void);
 void func_80018B28(void);
 void func_80361C24(void);
 }
@@ -37,7 +30,6 @@ extern u8 lbl_803F1BB0;
 extern u8 lbl_80451BC0;
 extern u8 lbl_80451BC4;
 
-extern "C" {
 // __ct__11fapGm_HIO_cFv
 // fapGm_HIO_c::fapGm_HIO_c(void)
 asm void fapGm_HIO_c(void) {
@@ -56,13 +48,16 @@ void fapGm_Execute(void) {
     cCt_Counter(0);
 }
 
-// fapGm_Create__Fv
-// fapGm_Create(void)
-asm void fapGm_Create(void) {
-    nofralloc
-#include "f/f_ap_game/asm/func_80018AA0.s"
+void fapGm_Create(void) {
+    fpcM_Init();
+    fopScnM_Init();
+    fopOvlpM_Init();
+    fopCamM_Init();
+    fopDwTg_CreateQueue();
+    g_HIO.field_0x4 = -1;
 }
 
+extern "C" {
 // __dt__11fapGm_HIO_cFv
 // fapGm_HIO_c::~fapGm_HIO_c(void)
 asm void fapGm_HIO_c_NS_dtor(void) {
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index 7f2641c9001..9bd855af7c3 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -12,6 +12,7 @@
 #include "f/f_pc/f_pc_searcher.h"
 #include "global.h"
 #include "gx/GX.h"
+#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "m_Do/m_Do_main/m_Do_main.h"
 
 #ifdef NONMATCHING  // mr and addi swapped
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 91ff7b7ca0b..bca0aef8fe8 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -7,6 +7,7 @@
 #include "SComponent/c_API_controller_pad.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "dvd/dvd.h"
+#include "f/f_ap_game/f_ap_game.h"
 #include "f/f_op/f_op_actor_mng.h"
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"