mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-21 22:10:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add fpc_ProcID type and use it for all process IDs

Browse Source 
See https://github.com/zeldaret/tp/pull/2173
This commit is contained in:
LagoLunatic
2024-07-12 21:14:13 -04:00
parent 61d9f474a5
commit 2def735282
159 changed files with 401 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f_pc/f_pc_base.h
+5 -3
View File
@@ -8,13 +8,15 @@
#include "f_pc/f_pc_priority.h"
#include "f_pc/f_pc_profile.h"
typedef unsigned int fpc_ProcID;
typedef struct create_request create_request;
typedef struct process_method_class process_method_class;
typedef struct profile_method_class profile_method_class;
typedef struct base_process_class {
/* 0x00 */ u32 mBsType;
/* 0x04 */ uint mBsPcId;
/* 0x04 */ fpc_ProcID mBsPcId;
/* 0x08 */ s16 mProcName;
/* 0x0A */ s8 mUnk0;
/* 0x0B */ u8 mPauseFlag;
@@ -35,12 +37,12 @@ typedef struct base_process_class {
BOOL fpcBs_Is_JustOfType(int pType1, int pType2);
s32 fpcBs_MakeOfType(int* pType);
s32 fpcBs_MakeOfId(void);
fpc_ProcID fpcBs_MakeOfId(void);
s32 fpcBs_Execute(base_process_class* pProc);
void fpcBs_DeleteAppend(base_process_class* pProc);
s32 fpcBs_IsDelete(base_process_class* pProc);
s32 fpcBs_Delete(base_process_class* pProc);
base_process_class* fpcBs_Create(s16 pProcTypeID, uint pProcID, void* pData);
base_process_class* fpcBs_Create(s16 pProcTypeID, fpc_ProcID pProcID, void* pData);
s32 fpcBs_SubCreate(base_process_class* pProc);
extern "C" {
include/f_pc/f_pc_create_iter.h
+1 -1
View File
@@ -28,6 +28,6 @@ typedef struct fpcCtIt_jilprm_c {
s32 fpcCtIt_Method(fpcCtIt_MethodFunc pJudge, void* pUserData);
void* fpcCtIt_Judge(fpcCtIt_JudgeFunc pJudge, void* pUserData);
void* fpcCtIt_filter_JudgeInLayer(create_tag*, fpcCtIt_jilprm_c*);
void* fpcCtIt_JudgeInLayer(uint pUnk0, fpcCtIt_JudgeFunc pFunc, void* pUserData);
void* fpcCtIt_JudgeInLayer(uint i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data);
#endif
include/f_pc/f_pc_create_req.h
+4 -3
View File
@@ -6,6 +6,7 @@
#include "f_pc/f_pc_create_tag.h"
#include "f_pc/f_pc_method.h"
#include "f_pc/f_pc_method_tag.h"
#include "f_pc/f_pc_base.h"
typedef struct base_process_class base_process_class;
typedef struct layer_class layer_class;
@@ -23,13 +24,13 @@ typedef struct create_request {
process_method_tag_class mMtdTg;
create_request_method_class* mpCtRqMtd;
void* mpUnk1;
uint mBsPcId;
fpc_ProcID mBsPcId;
struct base_process_class* mpRes;
layer_class* mpLayer;
} create_request; // Size: 0x48
bool fpcCtRq_isCreatingByID(create_tag* pTag, uint* pId);
BOOL fpcCtRq_IsCreatingByID(uint id);
bool fpcCtRq_isCreatingByID(create_tag* pTag, fpc_ProcID* pId);
BOOL fpcCtRq_IsCreatingByID(fpc_ProcID id);
void fpcCtRq_CreateQTo(create_request* pReq);
void fpcCtRq_ToCreateQ(create_request* pReq);
BOOL fpcCtRq_Delete(create_request* pReq);
include/f_pc/f_pc_creator.h
+2 -1
View File
@@ -2,11 +2,12 @@
#ifndef F_PC_CREATOR_H_
#define F_PC_CREATOR_H_
#include "f_pc/f_pc_base.h"
#include "dolphin/types.h"
typedef struct base_process_class base_process_class;
BOOL fpcCt_IsCreatingByID(uint id);
BOOL fpcCt_IsCreatingByID(fpc_ProcID id);
s32 fpcCt_IsDoing(base_process_class* pProc);
BOOL fpcCt_Abort(base_process_class* pProc);
s32 fpcCt_Handler(void);
include/f_pc/f_pc_executor.h
+3 -2
View File
@@ -4,12 +4,13 @@
#include "f_pc/f_pc_layer_iter.h"
#include "f_pc/f_pc_line_iter.h"
#include "f_pc/f_pc_base.h"
typedef struct base_process_class base_process_class;
base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData);
base_process_class* fpcEx_SearchByID(uint id);
BOOL fpcEx_IsExist(uint id);
base_process_class* fpcEx_SearchByID(fpc_ProcID id);
BOOL fpcEx_IsExist(fpc_ProcID id);
s32 fpcEx_ToLineQ(base_process_class* pProc);
s32 fpcEx_ExecuteQTo(base_process_class* pProc);
s32 fpcEx_Execute(base_process_class* pProc);
include/f_pc/f_pc_layer.h
+2 -2
View File
@@ -26,8 +26,8 @@ typedef struct layer_class {
void fpcLy_SetCurrentLayer(layer_class* pLayer);
layer_class* fpcLy_CurrentLayer(void);
layer_class* fpcLy_RootLayer(void);
layer_class* fpcLy_Layer(uint id);
layer_class* fpcLy_Search(uint id);
layer_class* fpcLy_Layer(uint i_layerID);
layer_class* fpcLy_Search(uint i_layerIDid);
void fpcLy_Regist(layer_class* pLayer);
void fpcLy_CreatedMesg(layer_class* pLayer);
include/f_pc/f_pc_layer_tag.h
+6 -5
View File
@@ -20,10 +20,11 @@ typedef struct layer_management_tag_class {
u16 mNodeListIdx;
} layer_management_tag_class;
s32 fpcLyTg_QueueTo(layer_management_tag_class* pTag);
s32 fpcLyTg_ToQueue(layer_management_tag_class* pTag, uint layerID, u16 listID,
u16 listPrio);
s32 fpcLyTg_Move(layer_management_tag_class*, uint, u16, u16);
s32 fpcLyTg_Init(layer_management_tag_class*, uint, void*);
s32 fpcLyTg_QueueTo(layer_management_tag_class* i_lyTag);
s32 fpcLyTg_ToQueue(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID,
u16 i_listPriority);
s32 fpcLyTg_Move(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID,
u16 i_listPriority);
s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_layerID, void* i_data);
#endif
include/f_pc/f_pc_manager.h
+5 -5
View File
@@ -15,7 +15,7 @@ typedef int (*FastCreateReqFunc)(void*);
typedef void (*fpcM_ManagementFunc)(void);
typedef int (*fpcM_DrawIteraterFunc)(void*, void*);
inline uint fpcM_GetID(void* pProc) {
inline fpc_ProcID fpcM_GetID(void* pProc) {
return pProc != NULL ? ((base_process_class*)pProc)->mBsPcId : fpcM_ERROR_PROCESS_ID_e;
}
inline s16 fpcM_GetName(void* pActor) {
@@ -33,7 +33,7 @@ inline s16 fpcM_GetProfName(void* pActor) {
return ((base_process_class*)pActor)->mProfName;
}
inline uint fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) {
inline fpc_ProcID fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) {
return fpcSCtRq_Request(fpcLy_CurrentLayer(), procName, (stdCreateFunc)createFunc, NULL,
process);
}
@@ -66,7 +66,7 @@ inline void* fpcM_GetAppend(void* proc) {
return ((base_process_class*)proc)->mpUserData;
}
inline BOOL fpcM_IsExecuting(uint id) {
inline BOOL fpcM_IsExecuting(fpc_ProcID id) {
return fpcEx_IsExist(id);
}
@@ -82,7 +82,7 @@ void fpcM_Draw(void* pProc);
s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc);
s32 fpcM_Execute(void* pProc);
s32 fpcM_Delete(void* pProc);
BOOL fpcM_IsCreating(uint pID);
BOOL fpcM_IsCreating(fpc_ProcID pID);
void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2);
void fpcM_Init(void);
base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3,
@@ -90,7 +90,7 @@ base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2,
s32 fpcM_IsPause(void* pProc, u8 param_2);
void fpcM_PauseEnable(void* pProc, u8 param_2);
void fpcM_PauseDisable(void* pProc, u8 param_2);
void* fpcM_JudgeInLayer(uint pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData);
void* fpcM_JudgeInLayer(uint i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data);
extern "C" {
void fpcM_Delete__FPv(void);
include/f_pc/f_pc_node_req.h
+6 -5
View File
@@ -4,6 +4,7 @@
#include "SSystem/SComponent/c_phase.h"
#include "f_pc/f_pc_method.h"
#include "f_pc/f_pc_method_tag.h"
#include "f_pc/f_pc_base.h"
typedef struct layer_class layer_class;
typedef struct process_node_class process_node_class;
@@ -17,7 +18,7 @@ typedef struct node_create_request_method_class {
// needed to match struct copy
typedef struct unk_process_node_class {
process_node_class* mpNodeProc;
uint mProcId;
fpc_ProcID mProcId;
} unk_process_node_class;
typedef struct node_create_request {
@@ -27,10 +28,10 @@ typedef struct node_create_request {
cPhs__Handler* mpPhsHandler;
node_create_request_method_class* mpNodeCrReqMthCls;
s32 mParameter;
s32 mRequestId;
uint mRequestId;
unk_process_node_class mNodeProc;
layer_class* mpLayerClass;
uint mCreatingID;
fpc_ProcID mCreatingID;
s16 mProcName;
void* mpUserData;
s16 unk_0x60;
@@ -64,7 +65,7 @@ node_create_request* fpcNdRq_CreateNode(u32 pRequestSize, s16 param_2, void* par
node_create_request*
fpcNdRq_Request(u32 param_1, int param_2, process_node_class* param_3, s16 param_4,
void* param_5, node_create_request_method_class* pNodeCreateRequestMethodClass);
s32 fpcNdRq_ReChangeNode(uint pRequestId, s16 param_2, void* param_3);
s32 fpcNdRq_ReRequest(uint pRequestId, s16 param_2, void* param_3);
s32 fpcNdRq_ReChangeNode(uint i_requestID, s16 i_procName, void* i_data);
s32 fpcNdRq_ReRequest(uint i_requestID, s16 i_procName, void* i_data);
#endif
include/f_pc/f_pc_priority.h
+5 -4
View File
@@ -27,11 +27,12 @@ s32 fpcPi_QueueTo(process_priority_class* pPi);
s32 fpcPi_ToQueue(process_priority_class* pPi);
process_priority_class* fpcPi_GetFromQueue(void);
s32 fpcPi_Delete(process_priority_class* pPi);
s32 fpcPi_IsNormal(uint layer, u16 listID, u16 priority);
s32 fpcPi_Change(process_priority_class* pPi, uint layer, u16 listID, u16 priority);
s32 fpcPi_IsNormal(uint i_layer, u16 i_listID, u16 i_priority);
s32 fpcPi_Change(process_priority_class* i_procPriority, uint i_layer, u16 i_listID,
u16 i_priority);
s32 fpcPi_Handler(void);
s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, uint layer, u16 listID,
u16 priority);
s32 fpcPi_Init(process_priority_class* i_procPriority, void* pUserData, uint i_layer, u16 i_listID,
u16 i_priority);
extern s8 data_804505F0; // roomReadId
include/f_pc/f_pc_stdcreate_req.h
+1 -1
View File
@@ -24,6 +24,6 @@ s32 fpcSCtRq_phase_Done(standard_create_request_class*);
s32 fpcSCtRq_Handler(standard_create_request_class* pStdCreateReq);
s32 fpcSCtRq_Delete(standard_create_request_class*);
s32 fpcSCtRq_Cancel(standard_create_request_class*);
uint fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5);
fpc_ProcID fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5);
#endif