fopScnM_ChangeReq OK

This commit is contained in:
Pheenoh
2021-02-21 17:50:16 -05:00
parent f256d97ddf
commit eeecf4cf69
20 changed files with 58 additions and 40 deletions
+14 -21
View File
@@ -2,27 +2,17 @@
#include "f/f_op/f_op_scene_mng.h"
#include "f/f_op/f_op_scene_iter.h"
#include "f/f_op/f_op_scene_req.h"
#include "f/f_pc/f_pc_searcher.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 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 fopScnIt_Judge__FPFPvPv_PvPv(void);
void fopScnRq_Request__FiP11scene_classsPvsUs(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 int l_scnRqID;
// matches but is proabably wrong
void* fopScnM_SearchByID(unsigned int id) {
@@ -31,31 +21,35 @@ void* fopScnM_SearchByID(unsigned int id) {
return fopScnIt_Judge(fpcSch_JudgeByID, (void*)local_8);
}
extern "C" {
// 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"
int fopScnM_ChangeReq(scene_class* pScene, s16 param_2, s16 param_3, u16 param_4) {
u32 sceneRequestID = fopScnRq_Request(2, pScene, param_2, 0, param_3, param_4);
if (sceneRequestID == -1) {
return 0;
}
l_scnRqID = sceneRequestID;
return 1;
}
// fopScnM_DeleteReq__FP11scene_class
// fopScnM_DeleteReq(scene_class*)
asm void fopScnM_DeleteReq(void) {
asm void fopScnM_DeleteReq(scene_class*) {
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) {
asm void fopScnM_CreateReq(s16, s16, u16, u32) {
nofralloc
#include "f/f_op_scene_mng/asm/func_8001ED84.s"
}
// fopScnM_ReRequest__FsUl
// fopScnM_ReRequest(s16, u32)
asm void fopScnM_ReRequest(void) {
asm void fopScnM_ReRequest(s16, u32) {
nofralloc
#include "f/f_op_scene_mng/asm/func_8001EDCC.s"
}
@@ -73,4 +67,3 @@ asm void fopScnM_Init(void) {
nofralloc
#include "f/f_op_scene_mng/asm/func_8001EE30.s"
}
};