diff options
| author | Pheenoh <pheenoh@gmail.com> | 2021-02-13 15:42:35 -0500 |
|---|---|---|
| committer | Pheenoh <pheenoh@gmail.com> | 2021-02-13 15:42:35 -0500 |
| commit | 86a69bbb4b443df055bf899c6581089583b03863 (patch) | |
| tree | 22c91d8d4f69a23c510cd559a626ffb34dc12963 /src | |
| parent | 304cae803a6a4af9e1b7577d60e644b9cbefe916 (diff) | |
fapGm_After OK, split f_op_scene_mng, split f_op_camera_mng, split f_op_overlap_mng
Diffstat (limited to 'src')
| -rw-r--r-- | src/f/f_ap_game.cpp | 18 | ||||
| -rw-r--r-- | src/f/f_op/f_op_camera_mng.cpp | 52 | ||||
| -rw-r--r-- | src/f/f_op/f_op_overlap_mng.cpp | 130 | ||||
| -rw-r--r-- | src/f/f_op/f_op_scene_mng.cpp | 76 |
4 files changed, 265 insertions, 11 deletions
diff --git a/src/f/f_ap_game.cpp b/src/f/f_ap_game.cpp index 88c08cf5ab..b56b5a9791 100644 --- a/src/f/f_ap_game.cpp +++ b/src/f/f_ap_game.cpp @@ -1,6 +1,9 @@ /* f_ap_game.cpp autogenerated by split.py v0.4 at 2021-02-13 20:07:21.300413 */ #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" @@ -15,12 +18,12 @@ 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 fopCamM_Management(void); void fopDwTg_CreateQueue(void); void fopOvlpM_Init(void); -void fopOvlpM_Management(void); +// void fopOvlpM_Management(void); void fopScnM_Init(void); -void fopScnM_Management(void); +// void fopScnM_Management(void); void fpcM_Init(void); // void fpcM_Management__FPFv_vPFv_v(void); void func_80018B28(void); @@ -42,11 +45,10 @@ asm void fapGm_HIO_c(void) { #include "f/f_ap_game/asm/func_80018944.s" } -// fapGm_After__Fv -// fapGm_After(void) -asm void fapGm_After(void) { - nofralloc -#include "f/f_ap_game/asm/func_80018A44.s" +void fapGm_After(void) { + fopScnM_Management(); + fopOvlpM_Management(); + fopCamM_Management(); } void fapGm_Execute(void) { diff --git a/src/f/f_op/f_op_camera_mng.cpp b/src/f/f_op/f_op_camera_mng.cpp index 4bf93c8658..24e2a083e6 100644 --- a/src/f/f_op/f_op_camera_mng.cpp +++ b/src/f/f_op/f_op_camera_mng.cpp @@ -1 +1,51 @@ -// ok +/* f_op_camera_mng.cpp autogenerated by split.py v0.4 at 2021-02-13 20:39:01.831629 */ + +#include "f/f_op/f_op_camera_mng.h" +#include "global.h" + +// additional symbols needed for f_op_camera_mng.cpp +// autogenerated by split.py v0.4 at 2021-02-13 20:39:01.831652 +extern "C" { +void _restgpr_29(void); +void _savegpr_29(void); +void fopCamM_Create(void); +void fopCamM_GetParam(void); +void fopCamM_Init(void); +void fopCamM_Management(void); +void fpcLy_CurrentLayer(void); +void fpcSCtRq_Request(void); +} + +// additional symbols needed for f_op_camera_mng.cpp +// autogenerated by split.py v0.4 at 2021-02-13 20:39:01.831656 +extern u8 lbl_803F1DD8; + +extern "C" { +// fopCamM_GetParam__FP12camera_class +// fopCamM_GetParam(camera_class*) +asm void fopCamM_GetParam(void) { + nofralloc +#include "f/f_op_camera_mng/asm/func_8001E308.s" +} + +// fopCamM_Create__FisPv +// fopCamM_Create(int, s16, void*) +asm void fopCamM_Create(void) { + nofralloc +#include "f/f_op_camera_mng/asm/func_8001E310.s" +} + +// fopCamM_Management__Fv +// fopCamM_Management(void) +asm void fopCamM_Management(void) { + nofralloc +#include "f/f_op_camera_mng/asm/func_8001E374.s" +} + +// fopCamM_Init__Fv +// fopCamM_Init(void) +asm void fopCamM_Init(void) { + nofralloc +#include "f/f_op_camera_mng/asm/func_8001E378.s" +} +}; diff --git a/src/f/f_op/f_op_overlap_mng.cpp b/src/f/f_op/f_op_overlap_mng.cpp index 4bf93c8658..bfa801f735 100644 --- a/src/f/f_op/f_op_overlap_mng.cpp +++ b/src/f/f_op/f_op_overlap_mng.cpp @@ -1 +1,129 @@ -// ok +/* f_op_overlap_mng.cpp autogenerated by split.py v0.4 at 2021-02-13 20:35:13.072583 */ + +#include "f/f_op/f_op_overlap_mng.h" +#include "global.h" + +// additional symbols needed for f_op_overlap_mng.cpp +// autogenerated by split.py v0.4 at 2021-02-13 20:35:13.072614 +extern "C" { +void cReq_Done__FP18request_base_class(void); +void cReq_Is_Done__FP18request_base_class(void); +void fopOvlpM_Cancel(void); +void fopOvlpM_ClearOfReq(void); +void fopOvlpM_Done(void); +void fopOvlpM_Init(void); +void fopOvlpM_IsDoingReq(void); +void fopOvlpM_IsDone(void); +void fopOvlpM_IsOutReq(void); +void fopOvlpM_IsPeek(void); +void fopOvlpM_Management(void); +void fopOvlpM_Request(void); +void fopOvlpM_SceneIsStart(void); +void fopOvlpM_SceneIsStop(void); +void fopOvlpM_ToldAboutID(void); +void fopOvlpReq_Cancel(void); +void fopOvlpReq_Handler(void); +void fopOvlpReq_OverlapClr(void); +void fopOvlpReq_Request(void); +void fopScnPause_Disable(void); +void fopScnPause_Enable(void); +void fpcEx_SearchByID(void); +} + +// additional symbols needed for f_op_overlap_mng.cpp +// autogenerated by split.py v0.4 at 2021-02-13 20:35:13.072619 +extern u8 lbl_803F1DE8; +extern u8 lbl_804505B0; + +extern "C" { +// fopOvlpM_SceneIsStop__Fv +// fopOvlpM_SceneIsStop(void) +asm void fopOvlpM_SceneIsStop(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E484.s" +} + +// fopOvlpM_SceneIsStart__Fv +// fopOvlpM_SceneIsStart(void) +asm void fopOvlpM_SceneIsStart(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E4C4.s" +} + +// fopOvlpM_IsOutReq__FP18overlap_task_class +// fopOvlpM_IsOutReq(overlap_task_class*) +asm void fopOvlpM_IsOutReq(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E504.s" +} + +// fopOvlpM_Done__FP18overlap_task_class +// fopOvlpM_Done(overlap_task_class*) +asm void fopOvlpM_Done(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E51C.s" +} + +// fopOvlpM_ToldAboutID__FUi +// fopOvlpM_ToldAboutID(unsigned int) +asm void fopOvlpM_ToldAboutID(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E540.s" +} + +// fopOvlpM_IsPeek__Fv +// fopOvlpM_IsPeek(void) +asm void fopOvlpM_IsPeek(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E558.s" +} + +// fopOvlpM_IsDone__Fv +// fopOvlpM_IsDone(void) +asm void fopOvlpM_IsDone(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E574.s" +} + +// fopOvlpM_IsDoingReq__Fv +// fopOvlpM_IsDoingReq(void) +asm void fopOvlpM_IsDoingReq(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E5A8.s" +} + +// fopOvlpM_ClearOfReq__Fv +// fopOvlpM_ClearOfReq(void) +asm void fopOvlpM_ClearOfReq(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E5D0.s" +} + +// fopOvlpM_Request__FsUs +// fopOvlpM_Request(s16, u16) +asm void fopOvlpM_Request(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E604.s" +} + +// fopOvlpM_Management__Fv +// fopOvlpM_Management(void) +asm void fopOvlpM_Management(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E650.s" +} + +// fopOvlpM_Cancel__Fv +// fopOvlpM_Cancel(void) +asm void fopOvlpM_Cancel(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E698.s" +} + +// fopOvlpM_Init__Fv +// fopOvlpM_Init(void) +asm void fopOvlpM_Init(void) { + nofralloc +#include "f/f_op_overlap_mng/asm/func_8001E6E8.s" +} +}; diff --git a/src/f/f_op/f_op_scene_mng.cpp b/src/f/f_op/f_op_scene_mng.cpp index 4bf93c8658..1af9e04971 100644 --- a/src/f/f_op/f_op_scene_mng.cpp +++ b/src/f/f_op/f_op_scene_mng.cpp @@ -1 +1,75 @@ -// ok +/* f_op_scene_mng.cpp autogenerated by split.py v0.4 at 2021-02-13 20:33:37.409351 */ + +#include "f/f_op/f_op_scene_mng.h" +#include "global.h" + +// additional symbols needed for f_op_scene_mng.cpp +// autogenerated by split.py v0.4 at 2021-02-13 20:33:37.409404 +extern "C" { +void fopScnIt_Judge(void); +void fopScnM_ChangeReq(void); +void fopScnM_CreateReq(void); +void fopScnM_DeleteReq(void); +void fopScnM_Init(void); +void fopScnM_ReRequest(void); +void fopScnM_SearchByID(void); +void fopScnRq_Handler(void); +void fopScnRq_ReRequest(void); +void fopScnRq_Request(void); +void fpcSch_JudgeByID(void); +} + +// additional symbols needed for f_op_scene_mng.cpp +// autogenerated by split.py v0.4 at 2021-02-13 20:33:37.409412 +extern u8 lbl_804505B8; + +extern "C" { +// fopScnM_SearchByID__FUi +// fopScnM_SearchByID(unsigned int) +asm void fopScnM_SearchByID(void) { + nofralloc +#include "f/f_op_scene_mng/asm/func_8001ECB0.s" +} + +// fopScnM_ChangeReq__FP11scene_classssUs +// fopScnM_ChangeReq(scene_class*, s16, s16, u16) +asm void fopScnM_ChangeReq(void) { + nofralloc +#include "f/f_op_scene_mng/asm/func_8001ECE0.s" +} + +// fopScnM_DeleteReq__FP11scene_class +// fopScnM_DeleteReq(scene_class*) +asm void fopScnM_DeleteReq(void) { + nofralloc +#include "f/f_op_scene_mng/asm/func_8001ED3C.s" +} + +// fopScnM_CreateReq__FssUsUl +// fopScnM_CreateReq(s16, s16, u16, u32) +asm void fopScnM_CreateReq(void) { + nofralloc +#include "f/f_op_scene_mng/asm/func_8001ED84.s" +} + +// fopScnM_ReRequest__FsUl +// fopScnM_ReRequest(s16, u32) +asm void fopScnM_ReRequest(void) { + nofralloc +#include "f/f_op_scene_mng/asm/func_8001EDCC.s" +} + +// fopScnM_Management__Fv +// fopScnM_Management(void) +asm void fopScnM_Management(void) { + nofralloc +#include "f/f_op_scene_mng/asm/func_8001EE10.s" +} + +// fopScnM_Init__Fv +// fopScnM_Init(void) +asm void fopScnM_Init(void) { + nofralloc +#include "f/f_op_scene_mng/asm/func_8001EE30.s" +} +}; |
