mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

f_pc mostly linked for Wii/Shield (#3015)

Browse Source
This commit is contained in:
Max Roncace
2026-01-06 07:45:15 -05:00
committed by GitHub
parent 3679e7abab
commit fd863582d6
64 changed files with 363 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/RZDE01_00/splits.txt
+4 -3
View File
@@ -298,7 +298,7 @@ f_pc/f_pc_layer.cpp:
f_pc/f_pc_leaf.cpp:
.text start:0x80026A40 end:0x80026B64
.data start:0x803FA470 end:0x803FA488
.sbss start:0x8053A960 end:0x8053A970
.sbss start:0x8053A960 end:0x8053A968
f_pc/f_pc_layer_iter.cpp:
.text start:0x80026B64 end:0x80026CB8
@@ -318,6 +318,7 @@ f_pc/f_pc_load.cpp:
f_pc/f_pc_manager.cpp:
.text start:0x80027044 end:0x800272FC
.bss start:0x80481338 end:0x804813E0
.sbss start:0x8053A968 end:0x8053A970
f_pc/f_pc_method.cpp:
.text start:0x800272FC end:0x8002733C
@@ -341,7 +342,7 @@ f_pc/f_pc_priority.cpp:
f_pc/f_pc_profile.cpp:
.text start:0x80028140 end:0x80028150
.sbss start:0x8053A980 end:0x8053A990
.sbss start:0x8053A980 end:0x8053A988
f_pc/f_pc_searcher.cpp:
.text start:0x80028150 end:0x80028180
@@ -378,7 +379,7 @@ d/d_stage.cpp:
.data start:0x803FA5A8 end:0x803FDE58
.bss start:0x80481400 end:0x804928C8
.sdata start:0x80537908 end:0x8053793C
.sbss start:0x8053A990 end:0x8053A9B0
.sbss start:0x8053A988 end:0x8053A9B0
.sdata2 start:0x8053BD28 end:0x8053BD38
d/d_map.cpp:
config/RZDE01_00/symbols.txt
+5 -5
View File
@@ -28161,11 +28161,11 @@ g_fpcBs_type = .sbss:0x8053A950; // type:object size:0x4 scope:global align:4
l_fpcLy_CurrLayer_p = .sbss:0x8053A958; // type:object size:0x4 scope:global align:4 data:4byte
layer_id$46579 = .sbss:0x8053A95C; // type:object size:0x4 scope:local align:4 data:4byte
g_fpcLf_type = .sbss:0x8053A960; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053A968 = .sbss:0x8053A968; // type:object size:0x1 data:byte
l_dvdError$0 = .sbss:0x8053A968; // type:object size:0x1 data:byte
g_fpcNd_type = .sbss:0x8053A970; // type:object size:0x4 scope:global align:4 data:4byte
request_id$46742 = .sbss:0x8053A978; // type:object size:0x4 scope:local align:4 data:4byte
g_fpcPf_ProfileList_p = .sbss:0x8053A980; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8053A988 = .sbss:0x8053A988; // type:object size:0x8
tmp_name$50691 = .sbss:0x8053A988; // type:object size:0x8 scope:local align:1 data:byte
mProcID__20dStage_roomControl_c = .sbss:0x8053A990; // type:object size:0x4 scope:global align:4 data:4byte
mStayNo__20dStage_roomControl_c = .sbss:0x8053A994; // type:object size:0x1 data:byte
lbl_8053A995 = .sbss:0x8053A995; // type:object size:0x1 data:byte
@@ -28259,13 +28259,13 @@ m_b_Light8EcallBack__13dPa_control_c = .sbss:0x8053AAEC; // type:object size:0x4
m_b_Light8PcallBack__13dPa_control_c = .sbss:0x8053AAF0; // type:object size:0x4 scope:global align:4
m_d_Light8EcallBack__13dPa_control_c = .sbss:0x8053AAF4; // type:object size:0x4 scope:global align:4 data:4byte
m_d_Light8PcallBack__13dPa_control_c = .sbss:0x8053AAF8; // type:object size:0x4 scope:global align:4
lbl_8053AAFC = .sbss:0x8053AAFC; // type:object size:0x1 data:byte
mStatus__13dPa_control_c = .sbss:0x8053AAFC; // type:object size:0x1 data:byte
mParticleTracePCB__13dPa_control_c = .sbss:0x8053AB00; // type:object size:0x4 scope:global align:4
lbl_8053AB08 = .sbss:0x8053AB08; // type:object size:0x1 data:byte
mWipe__12dDlst_list_c = .sbss:0x8053AB08; // type:object size:0x1 data:byte
mWipeRate__12dDlst_list_c = .sbss:0x8053AB0C; // type:object size:0x4 scope:global align:4 data:float
mWipeSpeed__12dDlst_list_c = .sbss:0x8053AB10; // type:object size:0x4 scope:global align:4 data:float
lbl_8053AB14 = .sbss:0x8053AB14; // type:object size:0x4
lbl_8053AB18 = .sbss:0x8053AB18; // type:object size:0x1 data:byte
init$0000 = .sbss:0x8053AB18; // type:object size:0x1 scope:local data:byte
S_parcent_bak$99593 = .sbss:0x8053AB20; // type:object size:0x4 scope:local align:4 data:float
S_rot_work1$100790 = .sbss:0x8053AB24; // type:object size:0x2 scope:local align:2 data:2byte
S_rot_work2$100791 = .sbss:0x8053AB26; // type:object size:0x2 scope:local align:2 data:2byte
config/RZDE01_02/splits.txt
+4 -3
View File
@@ -298,7 +298,7 @@ f_pc/f_pc_layer.cpp:
f_pc/f_pc_leaf.cpp:
.text start:0x80026B38 end:0x80026C5C
.data start:0x803E5710 end:0x803E5728
.sbss start:0x80520968 end:0x80520978
.sbss start:0x80520968 end:0x80520970
f_pc/f_pc_layer_iter.cpp:
.text start:0x80026C5C end:0x80026DB0
@@ -318,6 +318,7 @@ f_pc/f_pc_load.cpp:
f_pc/f_pc_manager.cpp:
.text start:0x8002713C end:0x8002740C
.bss start:0x80468940 end:0x804689E8
.sbss start:0x80520970 end:0x80520978
f_pc/f_pc_method.cpp:
.text start:0x8002740C end:0x8002744C
@@ -341,7 +342,7 @@ f_pc/f_pc_priority.cpp:
f_pc/f_pc_profile.cpp:
.text start:0x80028250 end:0x80028260
.sbss start:0x80520988 end:0x80520998
.sbss start:0x80520988 end:0x80520990
f_pc/f_pc_searcher.cpp:
.text start:0x80028260 end:0x80028290
@@ -378,7 +379,7 @@ d/d_stage.cpp:
.data start:0x803E5848 end:0x803E90F8
.bss start:0x80468A08 end:0x80479ED0
.sdata start:0x8051D9A8 end:0x8051D9DC
.sbss start:0x80520998 end:0x805209B8
.sbss start:0x80520990 end:0x805209B8
.sdata2 start:0x80521D28 end:0x80521D38
d/d_map.cpp:
config/RZDE01_02/symbols.txt
+5 -5
View File
@@ -27711,11 +27711,11 @@ g_fpcBs_type = .sbss:0x80520958; // type:object size:0x4 scope:global align:4
l_fpcLy_CurrLayer_p = .sbss:0x80520960; // type:object size:0x4 scope:global align:4 data:4byte
layer_id$46579 = .sbss:0x80520964; // type:object size:0x4 scope:global align:4 data:4byte
g_fpcLf_type = .sbss:0x80520968; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80520970 = .sbss:0x80520970; // type:object size:0x1 data:byte
l_dvdError$0 = .sbss:0x80520970; // type:object size:0x1 data:byte
g_fpcNd_type = .sbss:0x80520978; // type:object size:0x4 scope:global align:4 data:4byte
request_id$46742 = .sbss:0x80520980; // type:object size:0x4 scope:global align:4 data:4byte
g_fpcPf_ProfileList_p = .sbss:0x80520988; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80520990 = .sbss:0x80520990; // type:object size:0x8
tmp_name$50691 = .sbss:0x80520990; // type:object size:0x8 scope:local align:1 data:byte
mProcID__20dStage_roomControl_c = .sbss:0x80520998; // type:object size:0x4 scope:global align:4 data:4byte
mStayNo__20dStage_roomControl_c = .sbss:0x8052099C; // type:object size:0x1 data:byte
mOldStayNo__20dStage_roomControl_c = .sbss:0x8052099D; // type:object size:0x1 data:byte
@@ -27809,13 +27809,13 @@ m_b_Light8EcallBack__13dPa_control_c = .sbss:0x80520AF4; // type:object size:0x4
m_b_Light8PcallBack__13dPa_control_c = .sbss:0x80520AF8; // type:object size:0x4 scope:global align:4
m_d_Light8EcallBack__13dPa_control_c = .sbss:0x80520AFC; // type:object size:0x4 scope:global align:4 data:4byte
m_d_Light8PcallBack__13dPa_control_c = .sbss:0x80520B00; // type:object size:0x4 scope:global align:4
lbl_80520B04 = .sbss:0x80520B04; // type:object size:0x1 data:byte
mStatus__13dPa_control_c = .sbss:0x80520B04; // type:object size:0x1 data:byte
mParticleTracePCB__13dPa_control_c = .sbss:0x80520B08; // type:object size:0x4 scope:global align:4
lbl_80520B10 = .sbss:0x80520B10; // type:object size:0x1 data:byte
mWipe__12dDlst_list_c = .sbss:0x80520B10; // type:object size:0x1 data:byte
mWipeRate__12dDlst_list_c = .sbss:0x80520B14; // type:object size:0x4 scope:global align:4 data:float
mWipeSpeed__12dDlst_list_c = .sbss:0x80520B18; // type:object size:0x4 scope:global align:4 data:float
lbl_80520B1C = .sbss:0x80520B1C; // type:object size:0x4
lbl_80520B20 = .sbss:0x80520B20; // type:object size:0x1 data:byte
init$0000 = .sbss:0x80520B20; // type:object size:0x1 scope:local data:byte
S_parcent_bak$99593 = .sbss:0x80520B28; // type:object size:0x4 scope:global align:4 data:float
S_rot_work1$100794 = .sbss:0x80520B2C; // type:object size:0x2 scope:global align:4 data:2byte
S_rot_work2$100795 = .sbss:0x80520B2E; // type:object size:0x2 scope:global align:2 data:2byte
config/RZDJ01/splits.txt
+4 -3
View File
@@ -298,7 +298,7 @@ f_pc/f_pc_layer.cpp:
f_pc/f_pc_leaf.cpp:
.text start:0x80026B48 end:0x80026C6C
.data start:0x803E3698 end:0x803E36B0
.sbss start:0x8051E7E8 end:0x8051E7F8
.sbss start:0x8051E7E8 end:0x8051E7F0
f_pc/f_pc_layer_iter.cpp:
.text start:0x80026C6C end:0x80026DC0
@@ -318,6 +318,7 @@ f_pc/f_pc_load.cpp:
f_pc/f_pc_manager.cpp:
.text start:0x8002714C end:0x8002741C
.bss start:0x804667C0 end:0x80466868
.sbss start:0x8051E7F0 end:0x8051E7F8
f_pc/f_pc_method.cpp:
.text start:0x8002741C end:0x8002745C
@@ -341,7 +342,7 @@ f_pc/f_pc_priority.cpp:
f_pc/f_pc_profile.cpp:
.text start:0x80028260 end:0x80028270
.sbss start:0x8051E808 end:0x8051E818
.sbss start:0x8051E808 end:0x8051E810
f_pc/f_pc_searcher.cpp:
.text start:0x80028270 end:0x800282A0
@@ -378,7 +379,7 @@ d/d_stage.cpp:
.data start:0x803E37D0 end:0x803E7080
.bss start:0x80466888 end:0x80477D50
.sdata start:0x8051B820 end:0x8051B854
.sbss start:0x8051E818 end:0x8051E838
.sbss start:0x8051E810 end:0x8051E838
.sdata2 start:0x8051FBA8 end:0x8051FBB8
d/d_map.cpp:
config/RZDJ01/symbols.txt
+5 -6
View File
@@ -27717,11 +27717,11 @@ g_fpcBs_type = .sbss:0x8051E7D8; // type:object size:0x4 scope:global align:4
l_fpcLy_CurrLayer_p = .sbss:0x8051E7E0; // type:object size:0x4 scope:global align:4 data:4byte
layer_id$46579 = .sbss:0x8051E7E4; // type:object size:0x4 scope:local align:4 data:4byte
g_fpcLf_type = .sbss:0x8051E7E8; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051E7F0 = .sbss:0x8051E7F0; // type:object size:0x1 data:byte
l_dvdError$0 = .sbss:0x8051E7F0; // type:object size:0x1 data:byte
g_fpcNd_type = .sbss:0x8051E7F8; // type:object size:0x4 scope:global align:4 data:4byte
request_id$46742 = .sbss:0x8051E800; // type:object size:0x4 scope:local align:4 data:4byte
g_fpcPf_ProfileList_p = .sbss:0x8051E808; // type:object size:0x4 scope:global align:4 data:4byte
lbl_8051E810 = .sbss:0x8051E810; // type:object size:0x8
tmp_name$50691 = .sbss:0x8051E810; // type:object size:0x8 scope:local align:1 data:byte
mProcID__20dStage_roomControl_c = .sbss:0x8051E818; // type:object size:0x4 scope:global align:4 data:4byte
mStayNo__20dStage_roomControl_c = .sbss:0x8051E81C; // type:object size:0x1 data:byte
mOldStayNo__20dStage_roomControl_c = .sbss:0x8051E81D; // type:object size:0x1 data:byte
@@ -27815,13 +27815,12 @@ m_b_Light8EcallBack__13dPa_control_c = .sbss:0x8051E974; // type:object size:0x4
m_b_Light8PcallBack__13dPa_control_c = .sbss:0x8051E978; // type:object size:0x4 scope:global align:4
m_d_Light8EcallBack__13dPa_control_c = .sbss:0x8051E97C; // type:object size:0x4 scope:global align:4 data:4byte
m_d_Light8PcallBack__13dPa_control_c = .sbss:0x8051E980; // type:object size:0x4 scope:global align:4
lbl_8051E984 = .sbss:0x8051E984; // type:object size:0x1 data:byte
mStatus__13dPa_control_c = .sbss:0x8051E984; // type:object size:0x1 data:byte
mParticleTracePCB__13dPa_control_c = .sbss:0x8051E988; // type:object size:0x4 scope:global align:4
lbl_8051E990 = .sbss:0x8051E990; // type:object size:0x1 data:byte
mWipe__12dDlst_list_c = .sbss:0x8051E990; // type:object size:0x1 data:byte
mWipeRate__12dDlst_list_c = .sbss:0x8051E994; // type:object size:0x4 scope:global align:4 data:float
mWipeSpeed__12dDlst_list_c = .sbss:0x8051E998; // type:object size:0x4 scope:global align:4 data:float
lbl_8051E99C = .sbss:0x8051E99C; // type:object size:0x4
lbl_8051E9A0 = .sbss:0x8051E9A0; // type:object size:0x1 data:byte
init$0000 = .sbss:0x8051E9A0; // type:object size:0x1 scope:local data:byte
S_parcent_bak$99593 = .sbss:0x8051E9A8; // type:object size:0x4 scope:local align:4 data:float
S_rot_work1$100794 = .sbss:0x8051E9AC; // type:object size:0x2 scope:local align:4 data:2byte
S_rot_work2$100795 = .sbss:0x8051E9AE; // type:object size:0x2 scope:local align:2 data:2byte
config/RZDP01/splits.txt
+4 -3
View File
@@ -298,7 +298,7 @@ f_pc/f_pc_layer.cpp:
f_pc/f_pc_leaf.cpp:
.text start:0x80026C04 end:0x80026D28
.data start:0x803E64C0 end:0x803E64D8
.sbss start:0x80521128 end:0x80521138
.sbss start:0x80521128 end:0x80521130
f_pc/f_pc_layer_iter.cpp:
.text start:0x80026D28 end:0x80026E7C
@@ -318,6 +318,7 @@ f_pc/f_pc_load.cpp:
f_pc/f_pc_manager.cpp:
.text start:0x80027208 end:0x800274C0
.bss start:0x80469238 end:0x804692E0
.sbss start:0x80521130 end:0x80521138
f_pc/f_pc_method.cpp:
.text start:0x800274C0 end:0x80027500
@@ -341,7 +342,7 @@ f_pc/f_pc_priority.cpp:
f_pc/f_pc_profile.cpp:
.text start:0x80028304 end:0x80028314
.sbss start:0x80521148 end:0x80521158
.sbss start:0x80521148 end:0x80521150
f_pc/f_pc_searcher.cpp:
.text start:0x80028314 end:0x80028344
@@ -378,7 +379,7 @@ d/d_stage.cpp:
.data start:0x803E65F8 end:0x803E9EA8
.bss start:0x80469300 end:0x8047A7C8
.sdata start:0x8051E2A8 end:0x8051E2DC
.sbss start:0x80521158 end:0x80521178
.sbss start:0x80521150 end:0x80521178
.sdata2 start:0x805224E8 end:0x805224F8
d/d_map.cpp:
config/RZDP01/symbols.txt
+6 -6
View File
@@ -1133,7 +1133,7 @@ fpcPause_Enable__FPvUc = .text:0x80028590; // type:function size:0x6C scope:glob
fpcPause_Disable__FPvUc = .text:0x800285FC; // type:function size:0x74 scope:global align:4
fpcPause_Init__FPv = .text:0x80028670; // type:function size:0xC scope:global align:4
fpcDw_Execute__FP18base_process_class = .text:0x8002867C; // type:function size:0x8C scope:global align:4
fpcDw_Handler__FPFi_iPFPvPv_i = .text:0x80028708; // type:function size:0x54 scope:global align:4
fpcDw_Handler__FPFPFPvPv_i_iPFPvPv_i = .text:0x80028708; // type:function size:0x54 scope:global align:4
fpcFCtRq_Do__FP19fast_create_request = .text:0x8002875C; // type:function size:0x50 scope:global align:4
fpcFCtRq_Delete__FP19fast_create_request = .text:0x800287AC; // type:function size:0x8 scope:global align:4
fpcFCtRq_Request__FP11layer_classsPFPvPv_iPvPv = .text:0x800287B4; // type:function size:0xD8 scope:global align:4
@@ -27602,11 +27602,11 @@ g_fpcBs_type = .sbss:0x80521118; // type:object size:0x4 scope:global align:4
l_fpcLy_CurrLayer_p = .sbss:0x80521120; // type:object size:0x4 scope:global align:4 data:4byte
layer_id$46579 = .sbss:0x80521124; // type:object size:0x4 scope:local align:4 data:4byte
g_fpcLf_type = .sbss:0x80521128; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80521130 = .sbss:0x80521130; // type:object size:0x1 data:byte
l_dvdError$0 = .sbss:0x80521130; // type:object size:0x1 data:byte
g_fpcNd_type = .sbss:0x80521138; // type:object size:0x4 scope:global align:4 data:4byte
request_id$46742 = .sbss:0x80521140; // type:object size:0x4 scope:local align:4 data:4byte
g_fpcPf_ProfileList_p = .sbss:0x80521148; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80521150 = .sbss:0x80521150; // type:object size:0x8
tmp_name$50691 = .sbss:0x80521150; // type:object size:0x8 scope:local align:1 data:byte
mProcID__20dStage_roomControl_c = .sbss:0x80521158; // type:object size:0x4 scope:global align:4 data:4byte
mStayNo__20dStage_roomControl_c = .sbss:0x8052115C; // type:object size:0x1 data:byte
lbl_8052115D = .sbss:0x8052115D; // type:object size:0x1 data:byte
@@ -27700,13 +27700,13 @@ m_b_Light8EcallBack__13dPa_control_c = .sbss:0x805212B4; // type:object size:0x4
m_b_Light8PcallBack__13dPa_control_c = .sbss:0x805212B8; // type:object size:0x4 scope:global align:4
m_d_Light8EcallBack__13dPa_control_c = .sbss:0x805212BC; // type:object size:0x4 scope:global align:4 data:4byte
m_d_Light8PcallBack__13dPa_control_c = .sbss:0x805212C0; // type:object size:0x4 scope:global align:4
lbl_805212C4 = .sbss:0x805212C4; // type:object size:0x1 data:byte
mStatus__13dPa_control_c = .sbss:0x805212C4; // type:object size:0x1 data:byte
mParticleTracePCB__13dPa_control_c = .sbss:0x805212C8; // type:object size:0x4 scope:global align:4
lbl_805212D0 = .sbss:0x805212D0; // type:object size:0x1 data:byte
mWipe__12dDlst_list_c = .sbss:0x805212D0; // type:object size:0x1 data:byte
mWipeRate__12dDlst_list_c = .sbss:0x805212D4; // type:object size:0x4 scope:global align:4 data:float
mWipeSpeed__12dDlst_list_c = .sbss:0x805212D8; // type:object size:0x4 scope:global align:4 data:float
lbl_805212DC = .sbss:0x805212DC; // type:object size:0x4
lbl_805212E0 = .sbss:0x805212E0; // type:object size:0x1 data:byte
init$0000 = .sbss:0x805212E0; // type:object size:0x1 scope:local data:byte
S_parcent_bak$99593 = .sbss:0x805212E8; // type:object size:0x4 scope:local align:4 data:float
S_rot_work1$100790 = .sbss:0x805212EC; // type:object size:0x2 scope:local align:4 data:2byte
S_rot_work2$100791 = .sbss:0x805212EE; // type:object size:0x2 scope:local align:2 data:2byte
config/Shield/symbols.txt
+3 -3
View File
@@ -25268,7 +25268,7 @@ g_fpcBs_type = .sbss:0x80508B28; // type:object size:0x4 scope:global data:4byte
l_fpcLy_CurrLayer_p = .sbss:0x80508B30; // type:object size:0x4 scope:global data:4byte hash:0x423940D3
@LOCAL@fpcLy_Create__FP11layer_classPvP15node_list_classi@layer_id@0 = .sbss:0x80508B34; // type:object size:0x4 scope:local data:4byte hash:0xBA834C41 dhash:0x97876181
g_fpcLf_type = .sbss:0x80508B38; // type:object size:0x4 scope:global data:4byte hash:0x24D2D5A5
lbl_80508B40 = .sbss:0x80508B40; // type:object size:0x1 data:byte hash:0x62392397 dhash:0xA26572E4
l_dvdError$0 = .sbss:0x80508B40; // type:object size:0x1 data:byte hash:0x62392397 dhash:0xA26572E4
g_fpcNd_type = .sbss:0x80508B48; // type:object size:0x4 scope:global data:4byte hash:0xEE05CFE5
@LOCAL@fpcNdRq_Create__FUl@request_id@0 = .sbss:0x80508B50; // type:object size:0x4 scope:local data:4byte hash:0x878F74E3 dhash:0xAAB980A1
g_fpcPf_ProfileList_p = .sbss:0x80508B58; // type:object size:0x4 scope:global data:4byte hash:0x2CADF2C7
@@ -25364,9 +25364,9 @@ m_b_Light8EcallBack__13dPa_control_c = .sbss:0x80508CD4; // type:object size:0x4
m_b_Light8PcallBack__13dPa_control_c = .sbss:0x80508CD8; // type:object size:0x4 scope:global data:4byte hash:0x50EB73E6 dhash:0x289FA544
m_d_Light8EcallBack__13dPa_control_c = .sbss:0x80508CDC; // type:object size:0x4 scope:global data:4byte hash:0xE99435D5 dhash:0xD8FEB517
m_d_Light8PcallBack__13dPa_control_c = .sbss:0x80508CE0; // type:object size:0x4 scope:global data:4byte hash:0x4A16DC20 dhash:0x4810E2C2
lbl_80508CE4 = .sbss:0x80508CE4; // type:object size:0x1 data:byte hash:0xEE07694F dhash:0xF8E160CD
mStatus__13dPa_control_c = .sbss:0x80508CE4; // type:object size:0x1 data:byte hash:0xEE07694F dhash:0xF8E160CD
mParticleTracePCB__13dPa_control_c = .sbss:0x80508CE8; // type:object size:0x4 scope:global data:4byte hash:0x02358A3F dhash:0xC17F907D
lbl_80508CF0 = .sbss:0x80508CF0; // type:object size:0x1 data:byte hash:0x23C263EA dhash:0x4666A2A9
mWipe__12dDlst_list_c = .sbss:0x80508CF0; // type:object size:0x1 data:byte hash:0x23C263EA dhash:0x4666A2A9
mWipeRate__12dDlst_list_c = .sbss:0x80508CF4; // type:object size:0x4 scope:global align:4 data:float hash:0x691395C8 dhash:0x88BEF30B
mWipeSpeed__12dDlst_list_c = .sbss:0x80508CF8; // type:object size:0x4 scope:global align:4 data:float hash:0x8B6109AD dhash:0xA0A5522E
mWipeColor__12dDlst_list_c = .sbss:0x80508CFC; // type:object size:0x4 scope:global data:byte hash:0x5EB93DD7 dhash:0x9F8AE694
config/ShieldD/splits.txt
+2 -1
View File
@@ -315,7 +315,7 @@ f_pc/f_pc_layer.cpp:
f_pc/f_pc_leaf.cpp:
.text start:0x800450A0 end:0x80045330
.data start:0x8066AD78 end:0x8066AD90
.sbss start:0x8074C540 end:0x8074C550
.sbss start:0x8074C540 end:0x8074C548
f_pc/f_pc_layer_iter.cpp:
.text start:0x80045330 end:0x80045560
@@ -336,6 +336,7 @@ f_pc/f_pc_manager.cpp:
.text start:0x800459D0 end:0x80046020
.data start:0x8066ADB0 end:0x8066ADC8
.sdata start:0x8073F9D8 end:0x8073F9E8
.sbss start:0x8074C548 end:0x8074C550
.bss start:0x80782160 end:0x80782208
f_pc/f_pc_method.cpp:
config/ShieldD/symbols.txt
+2 -2
View File
@@ -64289,7 +64289,7 @@ g_fpcBs_type = .sbss:0x8074C530; // type:object size:0x4 scope:global data:4byte
l_fpcLy_CurrLayer_p = .sbss:0x8074C538; // type:object size:0x4 scope:global data:4byte hash:0x423940D3
@LOCAL@fpcLy_Create__FP11layer_classPvP15node_list_classi@layer_id@0 = .sbss:0x8074C53C; // type:object size:0x4 scope:local data:4byte hash:0xBA834C41 dhash:0x97876181
g_fpcLf_type = .sbss:0x8074C540; // type:object size:0x4 scope:global data:4byte hash:0x24D2D5A5
lbl_8074C548 = .sbss:0x8074C548; // type:object size:0x1 data:byte hash:0x62392397 dhash:0xA26572E4
@LOCAL@fpcM_Management__FPFv_vPFv_v@l_dvdError = .sbss:0x8074C548; // type:object size:0x1 data:byte hash:0x62392397 dhash:0xA26572E4
g_fpcNd_type = .sbss:0x8074C550; // type:object size:0x4 scope:global data:4byte hash:0xEE05CFE5
@LOCAL@fpcNdRq_Create__FUl@request_id@0 = .sbss:0x8074C558; // type:object size:0x4 scope:local data:4byte hash:0x878F74E3 dhash:0xAAB980A1
g_fpcPf_ProfileList_p = .sbss:0x8074C560; // type:object size:0x4 scope:global data:4byte hash:0x2CADF2C7
@@ -64401,7 +64401,7 @@ m_b_Light8EcallBack__13dPa_control_c = .sbss:0x8074C714; // type:object size:0x4
m_b_Light8PcallBack__13dPa_control_c = .sbss:0x8074C718; // type:object size:0x4 scope:global hash:0x50EB73E6 dhash:0x289FA544
m_d_Light8EcallBack__13dPa_control_c = .sbss:0x8074C71C; // type:object size:0x4 scope:global hash:0xE99435D5 dhash:0xD8FEB517
m_d_Light8PcallBack__13dPa_control_c = .sbss:0x8074C720; // type:object size:0x4 scope:global hash:0x4A16DC20 dhash:0x4810E2C2
lbl_8074C724 = .sbss:0x8074C724; // type:object size:0x1 data:byte hash:0xEE07694F dhash:0xF8E160CD
mStatus__13dPa_control_c = .sbss:0x8074C724; // type:object size:0x1 data:byte hash:0xEE07694F dhash:0xF8E160CD
mParticleTracePCB__13dPa_control_c = .sbss:0x8074C728; // type:object size:0x4 scope:global hash:0x02358A3F dhash:0xC17F907D
@LOCAL@dPath_Draw__Fv@start_counter = .sbss:0x8074C730; // type:object size:0x4 scope:local data:4byte hash:0x1FFA3645 dhash:0x57844FC7
l_drawTexCount = .sbss:0x8074C738; // type:object size:0x4 scope:global data:4byte hash:0x3A9A327C
configure.py
+29 -29
View File
@@ -629,36 +629,36 @@ config.libs = [
Object(MatchingFor(ALL), "f_op/f_op_scene_pause.cpp"),
# f_pc
Object(MatchingFor(ALL_GCN), "f_pc/f_pc_base.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_create_iter.cpp"),
Object(MatchingFor(ALL_GCN), "f_pc/f_pc_create_req.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_create_tag.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_creator.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_delete_tag.cpp"),
Object(MatchingFor(ALL_GCN), "f_pc/f_pc_deletor.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_draw_priority.cpp"),
Object(MatchingFor(ALL_GCN), "f_pc/f_pc_executor.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_layer.cpp"),
Object(MatchingFor(ALL_GCN, "Shield"), "f_pc/f_pc_leaf.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_layer_iter.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_layer_tag.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_line.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_load.cpp"),
Object(MatchingFor(ALL_GCN, ALL_WII), "f_pc/f_pc_base.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_create_iter.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_create_req.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_create_tag.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_creator.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_delete_tag.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_deletor.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_draw_priority.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_executor.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_layer.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_leaf.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_layer_iter.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_layer_tag.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_line.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_load.cpp"),
Object(MatchingFor(ALL_GCN), "f_pc/f_pc_manager.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_method.cpp"),
Object(MatchingFor(ALL_GCN), "f_pc/f_pc_node.cpp"),
Object(MatchingFor(ALL_GCN), "f_pc/f_pc_node_req.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_priority.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_profile.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_searcher.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_line_tag.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_line_iter.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_method_iter.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_method_tag.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_pause.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_draw.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_fstcreate_req.cpp"),
Object(MatchingFor(ALL_GCN), "f_pc/f_pc_stdcreate_req.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_method.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_node.cpp"),
Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_node_req.cpp"),
Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_priority.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_profile.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_searcher.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_line_tag.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_line_iter.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_method_iter.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_method_tag.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_pause.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_draw.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_fstcreate_req.cpp"),
Object(MatchingFor(ALL), "f_pc/f_pc_stdcreate_req.cpp"),
Object(MatchingFor("ShieldD"), "f_pc/f_pc_debug_sv.cpp"),
],
},
include/DynamicLink.h
-2
View File
@@ -44,10 +44,8 @@ struct DynamicModuleControlBase {
inline DynamicModuleControlBase* getNextClass() { return mNext; }
bool isLinked() const { return mLinkCount != 0; }
#if DEBUG
static void resetDoLinkCount() {} // TODO
static void dumpTag() {} // TODO
#endif
static DynamicModuleControlBase* mFirst;
static DynamicModuleControlBase* mLast;
include/JSystem/JUtility/JUTAssert.h
+1 -1
View File
@@ -23,7 +23,7 @@
#define JUT_PANIC_F(LINE, MSG, ...) \
JUTAssertion::showAssert_f(JUTAssertion::getSDevice(), __FILE__, LINE, MSG, __VA_ARGS__); \
OSPanic(__FILE__, LINE, MSG, __VA_ARGS__);
OSPanic(__FILE__, LINE, "Halt");
#define JUT_WARN_DEVICE(LINE, DEVICE, ...) \
JUTAssertion::setWarningMessage_f(DEVICE, __FILE__, LINE, __VA_ARGS__); \
include/d/d_error_msg.h
+1 -3
View File
@@ -1,15 +1,13 @@
#ifndef D_D_ERROR_MSG_H
#define D_D_ERROR_MSG_H
#include "d/d_com_inf_game.h"
struct dShutdownErrorMsg_c {
static bool execute();
};
struct dDvdErrorMsg_c {
static void draw(s32);
static u8 execute();
static bool execute();
};
#if !PLATFORM_GCN
include/d/d_particle.h
+9 -2
View File
@@ -436,8 +436,15 @@ public:
}
static void onStatus(u8 status) { mStatus |= status; }
static void offStatus(u8 status) { mStatus &= ~status; }
static bool isStatus(u8 status) { return mStatus & status; }
static void offStatus(u8 status) {
//TODO: reconcile this
#if DEBUG
mStatus &= (u8)~status;
#else
mStatus &= ~status;
#endif
}
static BOOL isStatus(u8 status) { return mStatus & status; }
static dPa_selectTexEcallBack* getTsuboSelectTexEcallBack(int idx) {
return &mTsubo[idx];
include/d/d_resorce.h
-2
View File
@@ -130,11 +130,9 @@ public:
return getResInfo(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo));
}
#if DEBUG
void dumpTag() {
// TODO
}
#endif
/* 0x0000 */ dRes_info_c mObjectInfo[128];
/* 0x1200 */ dRes_info_c mStageInfo[64];
include/f_ap/f_ap_game.h
+5 -5
View File
@@ -22,11 +22,10 @@ public:
#endif
virtual ~fapGm_HIO_c();
#if DEBUG
static void startCpuTimer();
static void stopCpuTimer(const char*);
static void printCpuTimer(const char*);
static void executeCaptureScreen();
static void executeCaptureScreen() {}
static void createCaptureScreen() {
mCaptureScreen = new CaptureScreen(JFWDisplay::getManager());
@@ -34,7 +33,11 @@ public:
}
static bool isCaptureScreen() {
#if DEBUG
return mCaptureScreenFlag;
#else
return false;
#endif
}
static void onCpuTimer() {
@@ -50,9 +53,7 @@ public:
static u8 getCaptureScreenDivH() { return mCaptureScreenDivH; }
static u8 getCaptureScreenDivV() { return mCaptureScreenDivV; }
#endif
#if DEBUG
static u8 m_CpuTimerOn;
static u8 m_CpuTimerOff;
static u8 m_CpuTimerStart;
@@ -72,7 +73,6 @@ public:
static u8 mCaptureScreenDivH;
static u8 mCaptureScreenDivV;
#endif
/* 0x04 */ s8 field_0x04;
/* 0x05 */ u8 field_0x03[3];
include/f_pc/f_pc_create_tag.h
+1 -1
View File
@@ -11,7 +11,7 @@ typedef struct create_tag {
void fpcCtTg_ToCreateQ(create_tag* i_createTag);
void fpcCtTg_CreateQTo(create_tag* i_createTag);
s32 fpcCtTg_Init(create_tag* i_createTag, void* i_data);
int fpcCtTg_Init(create_tag* i_createTag, void* i_data);
extern node_list_class g_fpcCtTg_Queue;
include/f_pc/f_pc_delete_tag.h
+2 -2
View File
@@ -22,8 +22,8 @@ typedef struct delete_tag_class {
BOOL fpcDtTg_IsEmpty();
void fpcDtTg_ToDeleteQ(delete_tag_class* i_deleteTag);
void fpcDtTg_DeleteQTo(delete_tag_class* i_deleteTag);
s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func);
s32 fpcDtTg_Init(delete_tag_class* i_deleteTag, void* i_data);
int fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func);
int fpcDtTg_Init(delete_tag_class* i_deleteTag, void* i_data);
extern node_list_class g_fpcDtTg_Queue;
include/f_pc/f_pc_deletor.h
+3 -3
View File
@@ -7,9 +7,9 @@
typedef struct base_process_class base_process_class;
BOOL fpcDt_IsComplete();
s32 fpcDt_ToDeleteQ(base_process_class* i_proc);
s32 fpcDt_ToQueue(base_process_class* i_proc);
int fpcDt_ToDeleteQ(base_process_class* i_proc);
int fpcDt_ToQueue(base_process_class* i_proc);
void fpcDt_Handler();
s32 fpcDt_Delete(void* i_proc);
int fpcDt_Delete(void* i_proc);
#endif
include/f_pc/f_pc_draw.h
+2 -2
View File
@@ -8,7 +8,7 @@ typedef struct base_process_class base_process_class;
typedef int (*fpcDw_HandlerFunc)(void*, void*);
typedef int (*fpcDw_HandlerFuncFunc)(fpcDw_HandlerFunc);
s32 fpcDw_Execute(base_process_class* i_proc);
s32 fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func);
int fpcDw_Execute(base_process_class* i_proc);
int fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func);
#endif
include/f_pc/f_pc_executor.h
+4 -4
View File
@@ -11,10 +11,10 @@ typedef struct base_process_class base_process_class;
base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc i_judgeFunc, void* i_data);
base_process_class* fpcEx_SearchByID(fpc_ProcID i_id);
BOOL fpcEx_IsExist(fpc_ProcID i_id);
s32 fpcEx_ToLineQ(base_process_class* i_proc);
s32 fpcEx_ExecuteQTo(base_process_class* i_proc);
s32 fpcEx_Execute(base_process_class* i_proc);
s32 fpcEx_ToExecuteQ(base_process_class* i_proc);
int fpcEx_ToLineQ(base_process_class* i_proc);
int fpcEx_ExecuteQTo(base_process_class* i_proc);
int fpcEx_Execute(base_process_class* i_proc);
int fpcEx_ToExecuteQ(base_process_class* i_proc);
void fpcEx_Handler(fpcLnIt_QueueFunc i_queueFunc);
#endif
include/f_pc/f_pc_fstcreate_req.h
+2 -2
View File
@@ -14,8 +14,8 @@ typedef struct fast_create_request {
/* 0x4C */ void* data;
} fast_create_request; // Size: 0x50
s32 fpcFCtRq_Do(fast_create_request* i_createReq);
s32 fpcFCtRq_Delete(fast_create_request* i_createReq);
int fpcFCtRq_Do(fast_create_request* i_createReq);
int fpcFCtRq_Delete(fast_create_request* i_createReq);
base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procname,
fstCreateFunc i_createFunc, void* i_createData, void* i_append);
include/f_pc/f_pc_layer.h
+5 -5
View File
@@ -37,18 +37,18 @@ void fpcLy_DeletingMesg(layer_class* i_layer);
BOOL fpcLy_IsCreatingMesg(layer_class* i_layer);
BOOL fpcLy_IsDeletingMesg(layer_class* i_layer);
s32 fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no);
s32 fpcLy_ToQueue(layer_class* i_layer, int treeListIdx, create_tag_class* i_createTag);
s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag);
int fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no);
int fpcLy_ToQueue(layer_class* i_layer, int treeListIdx, create_tag_class* i_createTag);
int fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag);
int fpcLy_Cancel(layer_class* i_layer);
BOOL fpcLy_CancelMethod(process_method_tag_class* i_layer);
void fpcLy_CancelQTo(process_method_tag_class* i_methods);
s32 fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods);
int fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods);
void fpcLy_Create(layer_class* i_layer, void* i_node, node_list_class* i_nodeList, int i_numLists);
s32 fpcLy_Delete(layer_class* i_layer);
int fpcLy_Delete(layer_class* i_layer);
#endif
include/f_pc/f_pc_layer_iter.h
+3 -3
View File
@@ -13,9 +13,9 @@ typedef struct layer_iter {
typedef int (*fpcLyIt_OnlyHereFunc)(void*, void*);
typedef void* (*fpcLyIt_JudgeFunc)(void*, void*);
s32 fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data);
s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data);
s32 fpcLyIt_All(fpcLyIt_OnlyHereFunc i_func, void* i_data);
int fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data);
int fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data);
int fpcLyIt_All(fpcLyIt_OnlyHereFunc i_func, void* i_data);
void* fpcLyIt_Judge(layer_class* i_layer, fpcLyIt_JudgeFunc i_func, void* i_data);
void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc i_func, void* i_data);
include/f_pc/f_pc_layer_tag.h
+4 -4
View File
@@ -21,11 +21,11 @@ typedef struct layer_management_tag_class {
/* 0x1A */ u16 node_list_priority;
} layer_management_tag_class;
s32 fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag);
s32 fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, unsigned int i_layerID, u16 i_listID,
int fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag);
int fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, unsigned int i_layerID, u16 i_listID,
u16 i_listPriority);
s32 fpcLyTg_Move(layer_management_tag_class* i_layer_tag, unsigned int i_layerID, u16 i_listID,
int fpcLyTg_Move(layer_management_tag_class* i_layer_tag, unsigned int i_layerID, u16 i_listID,
u16 i_listPriority);
s32 fpcLyTg_Init(layer_management_tag_class* i_layer_tag, unsigned int i_id, void* i_data);
int fpcLyTg_Init(layer_management_tag_class* i_layer_tag, unsigned int i_id, void* i_data);
#endif
include/f_pc/f_pc_leaf.h
+6 -6
View File
@@ -28,12 +28,12 @@ typedef struct leaf_process_profile_definition {
} leaf_process_profile_definition;
s16 fpcLf_GetPriority(const leafdraw_class* i_leaf);
s32 fpcLf_DrawMethod(leafdraw_method_class* i_method, void* i_process);
s32 fpcLf_Draw(leafdraw_class* i_method);
s32 fpcLf_Execute(leafdraw_class* i_leaf);
s32 fpcLf_IsDelete(leafdraw_class* i_leaf);
s32 fpcLf_Delete(leafdraw_class* i_leaf);
s32 fpcLf_Create(leafdraw_class* i_leaf);
int fpcLf_DrawMethod(leafdraw_method_class* i_method, void* i_process);
int fpcLf_Draw(leafdraw_class* i_method);
int fpcLf_Execute(leafdraw_class* i_leaf);
int fpcLf_IsDelete(leafdraw_class* i_leaf);
int fpcLf_Delete(leafdraw_class* i_leaf);
int fpcLf_Create(leafdraw_class* i_leaf);
extern int g_fpcLf_type;
extern leafdraw_method_class g_fpcLf_Method;
include/f_pc/f_pc_line_tag.h
+2 -2
View File
@@ -9,9 +9,9 @@ typedef struct line_tag {
/* 0x14 */ int list_id;
} line_tag;
s32 fpcLnTg_Move(line_tag* i_lineTag, int i_newListID);
int fpcLnTg_Move(line_tag* i_lineTag, int i_newListID);
void fpcLnTg_QueueTo(line_tag* i_lineTag);
s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID);
int fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID);
void fpcLnTg_Init(line_tag* i_lineTag, void* i_data);
#endif
include/f_pc/f_pc_load.h
+1 -1
View File
@@ -7,6 +7,6 @@
BOOL fpcLd_Use(s16 i_procName);
BOOL fpcLd_IsLoaded(s16 i_procName);
void fpcLd_Free(s16 i_procName);
s32 fpcLd_Load(s16 i_procName);
int fpcLd_Load(s16 i_procName);
#endif
include/f_pc/f_pc_manager.h
+10 -9
View File
@@ -10,7 +10,8 @@
#include "f_pc/f_pc_searcher.h"
enum {
fpcM_ERROR_PROCESS_ID_e = 0xFFFFFFFF
fpcM_UNK_PROCESS_ID_e = 0xFFFFFFFE,
fpcM_ERROR_PROCESS_ID_e = 0xFFFFFFFF,
};
typedef int (*FastCreateReqFunc)(void*);
@@ -42,15 +43,15 @@ inline fpc_ProcID fpcM_Create(s16 i_procName, FastCreateReqFunc i_createFunc, vo
i_append);
}
inline s32 fpcM_DrawPriority(const void* i_process) {
return (s16)fpcLf_GetPriority((const leafdraw_class*)i_process);
inline int fpcM_DrawPriority(const void* i_process) {
return fpcLf_GetPriority((const leafdraw_class*)i_process);
}
inline s32 fpcM_ChangeLayerID(void* i_process, int i_layerID) {
inline int fpcM_ChangeLayerID(void* i_process, int i_layerID) {
return fpcPi_Change(&((base_process_class*)i_process)->priority, i_layerID, 0xFFFD, 0xFFFD);
}
inline s32 fpcM_MakeOfType(int* i_type) {
inline int fpcM_MakeOfType(int* i_type) {
return fpcBs_MakeOfType(i_type);
}
@@ -95,15 +96,15 @@ inline process_node_class* fpcM_Layer(void* i_process) {
}
void fpcM_Draw(void* i_process);
s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc);
s32 fpcM_Execute(void* i_process);
s32 fpcM_Delete(void* i_process);
int fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc);
int fpcM_Execute(void* i_process);
int fpcM_Delete(void* i_process);
BOOL fpcM_IsCreating(fpc_ProcID i_id);
void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_postExecuteFn);
void fpcM_Init();
base_process_class* fpcM_FastCreate(s16 i_procname, FastCreateReqFunc i_createReqFunc,
void* i_createData, void* i_append);
s32 fpcM_IsPause(void* i_process, u8 i_flag);
int fpcM_IsPause(void* i_process, u8 i_flag);
void fpcM_PauseEnable(void* i_process, u8 i_flag);
void fpcM_PauseDisable(void* i_process, u8 i_flag);
void* fpcM_JudgeInLayer(fpc_ProcID i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data);
include/f_pc/f_pc_method.h
+5 -6
View File
@@ -1,4 +1,3 @@
#ifndef F_PC_METHOD_H_
#define F_PC_METHOD_H_
@@ -13,10 +12,10 @@ typedef struct process_method_class {
/* 0xC */ process_method_func is_delete_method;
} process_method_class;
s32 fpcMtd_Method(process_method_func i_method, void* i_process);
s32 fpcMtd_Execute(process_method_class* i_methods, void* i_process);
s32 fpcMtd_IsDelete(process_method_class* i_methods, void* i_process);
s32 fpcMtd_Delete(process_method_class* i_methods, void* i_process);
s32 fpcMtd_Create(process_method_class* i_methods, void* i_process);
int fpcMtd_Method(process_method_func i_method, void* i_process);
int fpcMtd_Execute(process_method_class* i_methods, void* i_process);
int fpcMtd_IsDelete(process_method_class* i_methods, void* i_process);
int fpcMtd_Delete(process_method_class* i_methods, void* i_process);
int fpcMtd_Create(process_method_class* i_methods, void* i_process);
#endif
include/f_pc/f_pc_method_tag.h
+3 -3
View File
@@ -12,9 +12,9 @@ typedef struct process_method_tag_class {
/* 0x18 */ void* data;
} process_method_tag_class;
s32 fpcMtdTg_Do(process_method_tag_class* i_methodTag);
s32 fpcMtdTg_ToMethodQ(node_list_class* i_nodelist, process_method_tag_class* i_methodTag);
int fpcMtdTg_Do(process_method_tag_class* i_methodTag);
int fpcMtdTg_ToMethodQ(node_list_class* i_nodelist, process_method_tag_class* i_methodTag);
void fpcMtdTg_MethodQTo(process_method_tag_class* i_methodTag);
s32 fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_method, void* i_data);
int fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_method, void* i_data);
#endif
include/f_pc/f_pc_node.h
+7 -7
View File
@@ -25,14 +25,14 @@ typedef struct node_process_profile_definition {
/* 0x1C */ process_method_class* sub_methods;
} node_process_profile_definition;
s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData);
s32 fpcNd_Draw(process_node_class* pProcNode);
s32 fpcNd_Execute(process_node_class* pProcNode);
int fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData);
int fpcNd_Draw(process_node_class* pProcNode);
int fpcNd_Execute(process_node_class* pProcNode);
void* fpcNd_IsCreatingFromUnder(void* pProcNode);
s32 fpcNd_IsDeleteTiming(process_node_class* pProcNode);
s32 fpcNd_IsDelete(process_node_class* pProcNode);
s32 fpcNd_Delete(process_node_class* pProcNode);
s32 fpcNd_Create(process_node_class* pProcNode);
int fpcNd_IsDeleteTiming(process_node_class* pProcNode);
int fpcNd_IsDelete(process_node_class* pProcNode);
int fpcNd_Delete(process_node_class* pProcNode);
int fpcNd_Create(process_node_class* pProcNode);
extern int g_fpcNd_type;
extern nodedraw_method_class g_fpcNd_Method;
include/f_pc/f_pc_node_req.h
+14 -14
View File
@@ -49,18 +49,18 @@ typedef struct request_node_class {
void fpcNdRq_RequestQTo(node_create_request* i_request);
void fpcNdRq_ToRequestQ(node_create_request* i_request);
s32 fpcNdRq_phase_IsCreated(node_create_request* i_request);
s32 fpcNdRq_phase_Create(node_create_request* i_request);
s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request);
s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request);
s32 fpcNdRq_phase_Delete(node_create_request* i_request);
s32 fpcNdRq_DoPhase(node_create_request* i_request);
s32 fpcNdRq_Execute(node_create_request* i_request);
s32 fpcNdRq_Delete(node_create_request* i_request);
s32 fpcNdRq_Cancel(node_create_request* i_request);
s32 fpcNdRq_Handler();
s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode);
s32 fpcNdRq_IsIng(process_node_class* i_procNode);
int fpcNdRq_phase_IsCreated(node_create_request* i_request);
int fpcNdRq_phase_Create(node_create_request* i_request);
int fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request);
int fpcNdRq_phase_IsDeleted(node_create_request* i_request);
int fpcNdRq_phase_Delete(node_create_request* i_request);
int fpcNdRq_DoPhase(node_create_request* i_request);
int fpcNdRq_Execute(node_create_request* i_request);
int fpcNdRq_Delete(node_create_request* i_request);
int fpcNdRq_Cancel(node_create_request* i_request);
int fpcNdRq_Handler();
int fpcNdRq_IsPossibleTarget(process_node_class* i_procNode);
int fpcNdRq_IsIng(process_node_class* i_procNode);
node_create_request* fpcNdRq_Create(u32 i_requestSize);
node_create_request* fpcNdRq_ChangeNode(u32 i_requestSize, process_node_class* i_procNode,
s16 i_procName, void* i_data);
@@ -70,7 +70,7 @@ node_create_request*
fpcNdRq_Request(u32 i_requestSize, int i_reqType,
process_node_class* i_procNode, s16 i_procName, void* i_data,
node_create_request_method_class* i_create_req_methods);
s32 fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data);
s32 fpcNdRq_ReRequest(fpc_ProcID i_requestID, s16 i_procName, void* i_data);
int fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data);
int fpcNdRq_ReRequest(fpc_ProcID i_requestID, s16 i_procName, void* i_data);
#endif
include/f_pc/f_pc_pause.h
+3 -3
View File
@@ -3,9 +3,9 @@
#include "dolphin/types.h"
s32 fpcPause_IsEnable(void* pProc, u8 expected);
s32 fpcPause_Enable(void* pProc, u8 pauseMask);
s32 fpcPause_Disable(void* pProc, u8 pauseMask);
int fpcPause_IsEnable(void* pProc, u8 expected);
int fpcPause_Enable(void* pProc, u8 pauseMask);
int fpcPause_Disable(void* pProc, u8 pauseMask);
void fpcPause_Init(void* pProc);
#endif
include/f_pc/f_pc_priority.h
+8 -8
View File
@@ -23,15 +23,15 @@ typedef struct process_priority_class {
/* 0x38 */ priority_id current_info;
} process_priority_class;
s32 fpcPi_IsInQueue(process_priority_class* pPi);
s32 fpcPi_QueueTo(process_priority_class* pPi);
s32 fpcPi_ToQueue(process_priority_class* pPi);
int fpcPi_IsInQueue(process_priority_class* pPi);
int fpcPi_QueueTo(process_priority_class* pPi);
int fpcPi_ToQueue(process_priority_class* pPi);
process_priority_class* fpcPi_GetFromQueue(void);
s32 fpcPi_Delete(process_priority_class* pPi);
s32 fpcPi_IsNormal(unsigned int layer, u16 listID, u16 priority);
s32 fpcPi_Change(process_priority_class* pPi, unsigned int layer, u16 listID, u16 priority);
s32 fpcPi_Handler(void);
s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, unsigned int layer, u16 listID,
int fpcPi_Delete(process_priority_class* pPi);
int fpcPi_IsNormal(unsigned int layer, u16 listID, u16 priority);
int fpcPi_Change(process_priority_class* pPi, unsigned int layer, u16 listID, u16 priority);
int fpcPi_Handler(void);
int fpcPi_Init(process_priority_class* pPi, void* pUserData, unsigned int layer, u16 listID,
u16 priority);
#endif
include/f_pc/f_pc_stdcreate_req.h
+8 -8
View File
@@ -19,14 +19,14 @@ typedef struct standard_create_request_class {
#endif
} standard_create_request_class;
s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request);
s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request);
s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request);
s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request);
s32 fpcSCtRq_phase_Done(standard_create_request_class* i_request);
s32 fpcSCtRq_Handler(standard_create_request_class* i_request);
s32 fpcSCtRq_Delete(standard_create_request_class* i_request);
s32 fpcSCtRq_Cancel(standard_create_request_class* i_request);
int fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request);
int fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request);
int fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request);
int fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request);
int fpcSCtRq_phase_Done(standard_create_request_class* i_request);
int fpcSCtRq_Handler(standard_create_request_class* i_request);
int fpcSCtRq_Delete(standard_create_request_class* i_request);
int fpcSCtRq_Cancel(standard_create_request_class* i_request);
fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc,
void* param_4, void* i_append);
include/m_Do/m_Do_main.h
-2
View File
@@ -65,12 +65,10 @@ private:
};
struct mDoMain {
#if DEBUG
static int argument;
static int e3menu_no;
static u32 archiveHeapSize;
static u32 gameHeapSize;
#endif
static char COPYDATE_STRING[18];
static u32 memMargin;
src/d/d_error_msg.cpp
+2 -2
View File
@@ -209,8 +209,8 @@ void dDvdErrorMsg_c::draw(s32 status) {
JFWDisplay::getManager()->resetFader();
}
u8 dDvdErrorMsg_c::execute() {
static u8 l_dvdError;
bool dDvdErrorMsg_c::execute() {
static bool l_dvdError;
s32 drive_status = DVDGetDriveStatus();
if (drive_status != DVD_STATE_END && drive_status != DVD_STATE_BUSY && !l_dvdError) {
src/f_pc/f_pc_base.cpp
+3 -3
View File
@@ -95,8 +95,8 @@ int fpcBs_Delete(base_process_class* i_proc) {
JSUList<Z2SoundObjBase>* allList = Z2GetAudioMgr()->getAllList();
for (JSUListIterator<Z2SoundObjBase> it(allList->getFirst()); it != allList->getEnd(); it++) {
static JSULink<Z2SoundObjBase>* DUMMY_FILL_IT = NULL;
static Z2SoundObjBase* DUMMY_FILL_P = NULL;
static JSULink<Z2SoundObjBase>* DUMMY_FILL_IT = (JSULink<Z2SoundObjBase>*)0xdddddddd;
static Z2SoundObjBase* DUMMY_FILL_P = (Z2SoundObjBase*)0xdddddddd;
if (it == DUMMY_FILL_IT || it.getObject() == DUMMY_FILL_P) {
const char* stageName = dStage_getName2(profname, 0);
if (stageName == NULL) {
@@ -154,7 +154,7 @@ int fpcBs_SubCreate(base_process_class* i_proc) {
i_proc->state.create_phase = cPhs_NEXT_e;
return cPhs_NEXT_e;
case cPhs_INIT_e:
case cPhs_LOADING_e:
case cPhs_LOADING_e:
i_proc->state.init_state = 1;
i_proc->state.create_phase = cPhs_INIT_e;
return cPhs_INIT_e;
src/f_pc/f_pc_create_req.cpp
+2 -2
View File
@@ -13,8 +13,8 @@
#include "f_pc/f_pc_debug_sv.h"
BOOL fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_id) {
create_request* req = (create_request*)i_createTag->base.mpTagData;
if (req->id == *i_id) {
fpc_ProcID id = ((create_request*)i_createTag->base.mpTagData)->id;
if (id == *i_id) {
return TRUE;
} else {
return FALSE;
src/f_pc/f_pc_create_tag.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ void fpcCtTg_CreateQTo(create_tag* i_createTag) {
cTg_SingleCut(&i_createTag->base);
}
s32 fpcCtTg_Init(create_tag* i_createTag, void* i_data) {
int fpcCtTg_Init(create_tag* i_createTag, void* i_data) {
cTg_Create(&i_createTag->base, i_data);
return 1;
}
src/f_pc/f_pc_delete_tag.cpp
+2 -2
View File
@@ -26,7 +26,7 @@ void fpcDtTg_DeleteQTo(delete_tag_class* i_deleteTag) {
cTg_SingleCut(&i_deleteTag->base);
}
s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) {
int fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) {
if (i_deleteTag->timer <= 0) {
fpcDtTg_DeleteQTo(i_deleteTag);
@@ -50,7 +50,7 @@ s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) {
}
}
s32 fpcDtTg_Init(delete_tag_class* i_deleteTag, void* i_data) {
int fpcDtTg_Init(delete_tag_class* i_deleteTag, void* i_data) {
cTg_Create(&i_deleteTag->base, i_data);
return 1;
}
src/f_pc/f_pc_deletor.cpp
+17 -16
View File
@@ -16,7 +16,7 @@ BOOL fpcDt_IsComplete() {
return fpcDtTg_IsEmpty();
}
s32 fpcDt_deleteMethod(base_process_class* i_proc) {
int fpcDt_deleteMethod(base_process_class* i_proc) {
fpc_ProcID id = i_proc->id;
layer_class* layer = i_proc->delete_tag.layer;
s16 profname = i_proc->profname;
@@ -42,7 +42,7 @@ void fpcDt_Handler() {
cLsIt_Method(&g_fpcDtTg_Queue, (cNdIt_MethodFunc)fpcDtTg_Do, (void*)fpcDt_deleteMethod);
}
s32 fpcDt_ToQueue(base_process_class* i_proc) {
int fpcDt_ToQueue(base_process_class* i_proc) {
if (i_proc->unk_0xA != 1 && fpcBs_IsDelete(i_proc) == 1) {
if (fpcPi_IsInQueue(&i_proc->priority) == 1) {
fpcPi_Delete(&i_proc->priority);
@@ -51,13 +51,16 @@ s32 fpcDt_ToQueue(base_process_class* i_proc) {
i_proc->delete_tag.layer = i_proc->layer_tag.layer;
fpcDtTg_ToDeleteQ(&i_proc->delete_tag);
fpcLy_DeletingMesg(i_proc->layer_tag.layer);
#if DEBUG
i_proc->delete_tag.unk_0x1c = 60;
#endif
return 1;
}
return 0;
}
s32 fpcDt_ToDeleteQ(base_process_class* i_proc) {
int fpcDt_ToDeleteQ(base_process_class* i_proc) {
if (i_proc->unk_0xA == 1) {
return 0;
}
@@ -97,39 +100,37 @@ s32 fpcDt_ToDeleteQ(base_process_class* i_proc) {
i_proc->state.init_state = 3;
return 1;
}
return 0;
}
s32 fpcDt_Delete(void* i_proc) {
base_process_class* proc = (base_process_class*)i_proc;
if (proc != NULL) {
int fpcDt_Delete(void* i_proc) {
if (i_proc != NULL) {
#if DEBUG
if (!fpcBs_Is_JustOfType(g_fpcBs_type, proc->type)) {
if (!fpcBs_Is_JustOfType(g_fpcBs_type, ((base_process_class*)i_proc)->type)) {
if (g_fpcDbSv_service[12] != NULL) {
g_fpcDbSv_service[12](proc);
g_fpcDbSv_service[12](i_proc);
}
return 0;
}
#endif
if (fpcCt_IsDoing(proc) == TRUE)
if (fpcCt_IsDoing((base_process_class*)i_proc) == TRUE)
return 0;
if (proc->state.init_state == 3)
if (((base_process_class*)i_proc)->state.init_state == 3)
return 0;
int ret = fpcDt_ToDeleteQ(proc);
int ret = fpcDt_ToDeleteQ((base_process_class*)i_proc);
#if DEBUG
if (ret == 0) {
if (g_fpcDbSv_service[5] != NULL) {
g_fpcDbSv_service[5](proc);
g_fpcDbSv_service[5](i_proc);
}
}
#endif
return ret;
}
return 1;
}
src/f_pc/f_pc_draw.cpp
+4 -4
View File
@@ -9,10 +9,10 @@
#include "f_pc/f_pc_node.h"
#include "f_pc/f_pc_pause.h"
s32 fpcDw_Execute(base_process_class* i_proc) {
int fpcDw_Execute(base_process_class* i_proc) {
if (!fpcPause_IsEnable(i_proc, 2)) {
layer_class* save_layer;
s32 ret;
int ret;
process_method_func draw_func;
save_layer = fpcLy_CurrentLayer();
@@ -31,8 +31,8 @@ s32 fpcDw_Execute(base_process_class* i_proc) {
return 0;
}
s32 fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func) {
s32 ret;
int fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func) {
int ret;
cAPIGph_BeforeOfDraw();
ret = i_iterHandler(i_func);
cAPIGph_AfterOfDraw();
src/f_pc/f_pc_executor.cpp
+10 -9
View File
@@ -4,20 +4,21 @@
*/
#include "f_pc/f_pc_executor.h"
#include "f_pc/f_pc_debug_sv.h"
#include "f_pc/f_pc_manager.h"
#include "f_pc/f_pc_node.h"
#include "f_pc/f_pc_pause.h"
#include "f_pc/f_pc_searcher.h"
#include "f_pc/f_pc_debug_sv.h"
base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc i_judgeFunc, void* i_data) {
return (base_process_class*)fpcLyIt_AllJudge(i_judgeFunc, i_data);
}
base_process_class* fpcEx_SearchByID(fpc_ProcID i_id) {
if (i_id + 2 <= 1)
return NULL;
return fpcEx_Search(fpcSch_JudgeByID, &i_id);
if (!(i_id == fpcM_UNK_PROCESS_ID_e || i_id == fpcM_ERROR_PROCESS_ID_e)) {
return fpcEx_Search(fpcSch_JudgeByID, &i_id);
}
return NULL;
}
BOOL fpcEx_IsExist(fpc_ProcID i_id) {
@@ -28,14 +29,14 @@ BOOL fpcEx_IsExist(fpc_ProcID i_id) {
}
}
s32 fpcEx_Execute(base_process_class* i_proc) {
int fpcEx_Execute(base_process_class* i_proc) {
if (i_proc->state.init_state != 2 || fpcPause_IsEnable(i_proc, 1) == TRUE)
return 0;
return fpcBs_Execute(i_proc);
}
s32 fpcEx_ToLineQ(base_process_class* i_proc) {
int fpcEx_ToLineQ(base_process_class* i_proc) {
base_process_class* process = &i_proc->layer_tag.layer->process_node->base;
if (i_proc->layer_tag.layer->layer_id == fpcLy_ROOT_e || cTg_IsUse(&process->line_tag_.base) == TRUE) {
@@ -62,7 +63,7 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) {
return 0;
}
s32 fpcEx_ExecuteQTo(base_process_class* i_proc) {
int fpcEx_ExecuteQTo(base_process_class* i_proc) {
if (fpcLyTg_QueueTo(&i_proc->layer_tag) == 1) {
i_proc->state.init_state = 3;
return 1;
@@ -71,7 +72,7 @@ s32 fpcEx_ExecuteQTo(base_process_class* i_proc) {
return 0;
}
s32 fpcEx_ToExecuteQ(base_process_class* i_proc) {
int fpcEx_ToExecuteQ(base_process_class* i_proc) {
process_priority_class* priority = &i_proc->priority;
if (fpcLyTg_ToQueue(&i_proc->layer_tag, priority->current_info.layer_id, priority->current_info.list_id, priority->current_info.list_priority) == 1) {
fpcEx_ToLineQ(i_proc);
src/f_pc/f_pc_fstcreate_req.cpp
+2 -2
View File
@@ -8,7 +8,7 @@
#include "f_pc/f_pc_layer.h"
#include "f_pc/f_pc_load.h"
s32 fpcFCtRq_Do(fast_create_request* i_createReq) {
int fpcFCtRq_Do(fast_create_request* i_createReq) {
if (i_createReq->create_func != NULL &&
i_createReq->create_func(i_createReq->base.process, i_createReq->data) == 0)
{
@@ -18,7 +18,7 @@ s32 fpcFCtRq_Do(fast_create_request* i_createReq) {
}
}
s32 fpcFCtRq_Delete(fast_create_request* i_createReq) {
int fpcFCtRq_Delete(fast_create_request* i_createReq) {
return 1;
}
src/f_pc/f_pc_layer.cpp
+5 -5
View File
@@ -11,7 +11,7 @@ void fpcLy_CancelQTo(process_method_tag_class* i_methods) {
fpcMtdTg_MethodQTo(i_methods);
}
s32 fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods) {
int fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods) {
return fpcMtdTg_ToMethodQ(&i_layer->cancel_list, i_methods);
}
@@ -23,17 +23,17 @@ BOOL fpcLy_CancelMethod(process_method_tag_class* i_layer) {
}
}
s32 fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no) {
int fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no) {
int ret = cTg_InsertToTree(&i_layer->node_tree, i_treeListNo, i_createTag, i_no);
return ret;
}
s32 fpcLy_ToQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag) {
int fpcLy_ToQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag) {
int ret = cTg_AdditionToTree(&i_layer->node_tree, i_treeListNo, i_createTag);
return ret;
}
s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) {
int fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) {
UNUSED(i_layer);
int ret = cTg_SingleCutFromTree(i_createTag);
@@ -132,7 +132,7 @@ void fpcLy_Regist(layer_class* i_layer) {
cLs_Addition(&l_fpcLy_LayerList, (node_class*)i_layer);
}
s32 fpcLy_Delete(layer_class* i_layer) {
int fpcLy_Delete(layer_class* i_layer) {
if (i_layer->node_tree.mpLists->mSize == 0 && i_layer->cancel_list.mSize == 0) {
cLs_SingleCut((node_class*)i_layer);
*i_layer = l_fpcLy_Crear;
src/f_pc/f_pc_layer_iter.cpp
+4 -4
View File
@@ -8,15 +8,15 @@
#include "SSystem/SComponent/c_tree_iter.h"
#include "f_pc/f_pc_layer.h"
s32 fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
int fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
layer_iter iter;
iter.func = (void*)i_func;
iter.data = i_data;
return cTrIt_Method(&i_layer->node_tree, (cNdIt_MethodFunc)cTgIt_MethodCall, &iter);
}
s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
s32 result;
int fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
int result;
layer_class* save_layer = fpcLy_CurrentLayer();
fpcLy_SetCurrentLayer(i_layer);
@@ -26,7 +26,7 @@ s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void*
return result;
}
s32 fpcLyIt_All(fpcLyIt_OnlyHereFunc i_func, void* i_data) {
int fpcLyIt_All(fpcLyIt_OnlyHereFunc i_func, void* i_data) {
int ret = 1;
layer_iter iter;
src/f_pc/f_pc_layer_tag.cpp
+5 -5
View File
@@ -6,7 +6,7 @@
#include "f_pc/f_pc_layer_tag.h"
#include "f_pc/f_pc_layer.h"
s32 fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID,
int fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID,
u16 i_listPriority) {
if (i_layer_tag->layer == NULL && i_layerID == fpcLy_NONE_e) {
return 0;
@@ -17,7 +17,7 @@ s32 fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerI
}
if (i_layerID == fpcLy_NONE_e || i_layerID == fpcLy_CURRENT_e) {
s32 result = fpcLy_ToQueue(i_layer_tag->layer, i_listID, &i_layer_tag->create_tag);
int result = fpcLy_ToQueue(i_layer_tag->layer, i_listID, &i_layer_tag->create_tag);
if (result != 0) {
i_layer_tag->node_list_id = i_listID;
i_layer_tag->node_list_priority = result - 1;
@@ -34,7 +34,7 @@ s32 fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerI
return 0;
}
s32 fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag) {
int fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag) {
if (fpcLy_QueueTo(i_layer_tag->layer, &i_layer_tag->create_tag) == 1) {
i_layer_tag->layer = NULL;
i_layer_tag->node_list_id = 0xFFFF;
@@ -45,7 +45,7 @@ s32 fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag) {
return 0;
}
s32 fpcLyTg_Move(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID,
int fpcLyTg_Move(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID,
u16 i_listPriority) {
layer_class* layer = fpcLy_Layer(i_layerID);
if (layer == NULL) {
@@ -58,7 +58,7 @@ s32 fpcLyTg_Move(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID,
}
}
s32 fpcLyTg_Init(layer_management_tag_class* i_layer_tag, fpc_ProcID i_id, void* i_data) {
int fpcLyTg_Init(layer_management_tag_class* i_layer_tag, fpc_ProcID i_id, void* i_data) {
static layer_management_tag_class crear = {
NULL, NULL, NULL, NULL, 0, NULL, 0xFFFF, 0xFFFF,
};
src/f_pc/f_pc_leaf.cpp
+11 -9
View File
@@ -10,18 +10,19 @@ s16 fpcLf_GetPriority(const leafdraw_class* i_leaf) {
return fpcDwPi_Get(&i_leaf->draw_priority);
}
s32 fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_process) {
int fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_process) {
return fpcMtd_Method(i_methods->draw_method, i_process);
}
s32 fpcLf_Draw(leafdraw_class* i_leaf) {
s32 ret = 0;
if (i_leaf->unk_0xBC == 0)
int fpcLf_Draw(leafdraw_class* i_leaf) {
int ret = 0;
if (i_leaf->unk_0xBC == 0) {
ret = fpcLf_DrawMethod(i_leaf->leaf_methods, i_leaf);
}
return ret;
}
s32 fpcLf_Execute(leafdraw_class* i_leaf) {
int fpcLf_Execute(leafdraw_class* i_leaf) {
#if DEBUG
if (fpcBs_Is_JustOfType(g_fpcLf_type, i_leaf->base.subtype) == 0) {
if (g_fpcDbSv_service[12] != NULL) {
@@ -33,12 +34,13 @@ s32 fpcLf_Execute(leafdraw_class* i_leaf) {
return fpcMtd_Execute(&i_leaf->leaf_methods->base, i_leaf);
}
s32 fpcLf_IsDelete(leafdraw_class* i_leaf) {
int fpcLf_IsDelete(leafdraw_class* i_leaf) {
return fpcMtd_IsDelete(&i_leaf->leaf_methods->base, i_leaf);
}
s32 fpcLf_Delete(leafdraw_class* i_leaf) {
s32 ret = fpcMtd_Delete(&i_leaf->leaf_methods->base, i_leaf);
int fpcLf_Delete(leafdraw_class* i_leaf) {
int ret = fpcMtd_Delete(&i_leaf->leaf_methods->base, i_leaf);
UNUSED(ret); // possible fakematch? this line fixes debug regalloc
if (ret == 1) {
i_leaf->base.subtype = 0;
}
@@ -47,7 +49,7 @@ s32 fpcLf_Delete(leafdraw_class* i_leaf) {
int g_fpcLf_type;
s32 fpcLf_Create(leafdraw_class* i_leaf) {
int fpcLf_Create(leafdraw_class* i_leaf) {
if (i_leaf->base.state.init_state == 0) {
leaf_process_profile_definition* pprofile = (leaf_process_profile_definition*)i_leaf->base.profile;
i_leaf->leaf_methods = pprofile->sub_method;
src/f_pc/f_pc_line.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
static node_list_class l_fpcLn_Line[16];
void fpcLn_Create() {
s32 i = ARRAY_SIZEU(l_fpcLn_Line);
int i = ARRAY_SIZEU(l_fpcLn_Line);
node_list_class* line_node = l_fpcLn_Line;
while (i-- > 0)
cLs_Create(line_node++);
src/f_pc/f_pc_line_iter.cpp
+2 -2
View File
@@ -11,10 +11,10 @@
#include "f_pc/f_pc_line.h"
static s32 fpcLnIt_MethodCall(create_tag_class* i_createTag, method_filter* i_filter) {
static int fpcLnIt_MethodCall(create_tag_class* i_createTag, method_filter* i_filter) {
layer_class* layer = static_cast<base_process_class*>(i_createTag->mpTagData)->layer_tag.layer;
layer_class* save_layer = fpcLy_CurrentLayer();
s32 ret;
int ret;
fpcLy_SetCurrentLayer(layer);
ret = cTgIt_MethodCall(i_createTag, i_filter);
src/f_pc/f_pc_line_tag.cpp
+2 -2
View File
@@ -7,7 +7,7 @@
#include "f_pc/f_pc_line.h"
s32 fpcLnTg_Move(line_tag* i_lineTag, int i_newListID) {
int fpcLnTg_Move(line_tag* i_lineTag, int i_newListID) {
if (i_lineTag->list_id != i_newListID) {
fpcLnTg_QueueTo(i_lineTag);
return fpcLnTg_ToQueue(i_lineTag, i_newListID);
@@ -21,7 +21,7 @@ void fpcLnTg_QueueTo(line_tag* i_lineTag) {
i_lineTag->list_id = -1;
}
s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) {
int fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) {
if (cTg_AdditionToTree(&g_fpcLn_Queue, lineListID, &i_lineTag->base)) {
i_lineTag->list_id = lineListID;
return 1;
src/f_pc/f_pc_load.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ void fpcLd_Free(s16 i_procName) {
cDyl_Unlink((s16)i_procName);
}
s32 fpcLd_Load(s16 i_procName) {
int fpcLd_Load(s16 i_procName) {
switch (cDyl_LinkASync((s16)i_procName)) {
case cPhs_COMPLEATE_e:
return cPhs_COMPLEATE_e;
src/f_pc/f_pc_manager.cpp
+30 -10
View File
@@ -5,9 +5,13 @@
#include "f_pc/f_pc_manager.h"
#include "SSystem/SComponent/c_API_graphic.h"
#include "SSystem/SComponent/c_lib.h"
#include "Z2AudioLib/Z2SoundMgr.h"
#include "d/d_com_inf_game.h"
#include "d/d_error_msg.h"
#include "d/d_lib.h"
#include "f_op/f_op_scene.h"
#include "d/d_particle.h"
#include "f_ap/f_ap_game.h"
#include "f_pc/f_pc_creator.h"
#include "f_pc/f_pc_deletor.h"
#include "f_pc/f_pc_draw.h"
@@ -15,22 +19,21 @@
#include "f_pc/f_pc_line.h"
#include "f_pc/f_pc_pause.h"
#include "f_pc/f_pc_priority.h"
#include "f_pc/f_pc_profile.h"
#include "m_Do/m_Do_controller_pad.h"
void fpcM_Draw(void* i_proc) {
fpcDw_Execute((base_process_class*)i_proc);
}
s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc) {
int fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc) {
return fpcLyIt_OnlyHere(fpcLy_RootLayer(), (fpcLyIt_OnlyHereFunc)i_drawIterFunc, NULL);
}
s32 fpcM_Execute(void* i_proc) {
int fpcM_Execute(void* i_proc) {
return fpcEx_Execute((base_process_class*)i_proc);
}
s32 fpcM_Delete(void* i_proc) {
int fpcM_Delete(void* i_proc) {
return fpcDt_Delete((base_process_class*)i_proc);
}
@@ -40,7 +43,10 @@ BOOL fpcM_IsCreating(fpc_ProcID i_id) {
void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_postExecuteFn) {
MtxInit();
dComIfGd_peekZdata();
if (!fapGm_HIO_c::isCaptureScreen()) {
dComIfGd_peekZdata();
}
fapGm_HIO_c::executeCaptureScreen();
if (!dShutdownErrorMsg_c::execute()) {
static bool l_dvdError = false;
@@ -72,8 +78,12 @@ void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_p
i_preExecuteFn();
}
fpcEx_Handler((fpcLnIt_QueueFunc)fpcM_Execute);
fpcDw_Handler((fpcDw_HandlerFuncFunc)fpcM_DrawIterater, (fpcDw_HandlerFunc)fpcM_Draw);
if (!fapGm_HIO_c::isCaptureScreen()) {
fpcEx_Handler((fpcLnIt_QueueFunc)fpcM_Execute);
}
if (!fapGm_HIO_c::isCaptureScreen() || fapGm_HIO_c::getCaptureScreenDivH() != 1) {
fpcDw_Handler((fpcDw_HandlerFuncFunc)fpcM_DrawIterater, (fpcDw_HandlerFunc)fpcM_Draw);
}
if (i_postExecuteFn != NULL) {
i_postExecuteFn();
@@ -83,7 +93,16 @@ void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_p
} else if (!l_dvdError) {
dLib_time_c::stopTime();
Z2GetSoundMgr()->pauseAllGameSound(true);
mDoCPd_c::stopMotorWaveHard(0);
#if PLATFORM_GCN
#define FPCM_MANAGEMENT_GAMEPAD_COUNT 1
#elif PLATFORM_SHIELD && !DEBUG
#define FPCM_MANAGEMENT_GAMEPAD_COUNT 0
#else
#define FPCM_MANAGEMENT_GAMEPAD_COUNT 4
#endif
for (u32 i = 0; i < FPCM_MANAGEMENT_GAMEPAD_COUNT; i++) {
mDoCPd_c::stopMotorWaveHard(i);
}
l_dvdError = true;
}
}
@@ -103,7 +122,7 @@ base_process_class* fpcM_FastCreate(s16 i_procname, FastCreateReqFunc i_createRe
i_createData, i_append);
}
s32 fpcM_IsPause(void* i_proc, u8 i_flag) {
int fpcM_IsPause(void* i_proc, u8 i_flag) {
return fpcPause_IsEnable((base_process_class*)i_proc, i_flag & 0xFF);
}
@@ -127,3 +146,4 @@ void* fpcM_JudgeInLayer(fpc_ProcID i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, voi
return NULL;
}
src/f_pc/f_pc_method.cpp
+5 -5
View File
@@ -5,25 +5,25 @@
#include "f_pc/f_pc_method.h"
s32 fpcMtd_Method(process_method_func i_method, void* i_process) {
int fpcMtd_Method(process_method_func i_method, void* i_process) {
if (i_method != NULL)
return i_method(i_process);
else
return 1;
}
s32 fpcMtd_Execute(process_method_class* i_methods, void* i_process) {
int fpcMtd_Execute(process_method_class* i_methods, void* i_process) {
return fpcMtd_Method(i_methods->execute_method, i_process);
}
s32 fpcMtd_IsDelete(process_method_class* i_methods, void* i_process) {
int fpcMtd_IsDelete(process_method_class* i_methods, void* i_process) {
return fpcMtd_Method(i_methods->is_delete_method, i_process);
}
s32 fpcMtd_Delete(process_method_class* i_methods, void* i_process) {
int fpcMtd_Delete(process_method_class* i_methods, void* i_process) {
return fpcMtd_Method(i_methods->delete_method, i_process);
}
s32 fpcMtd_Create(process_method_class* i_methods, void* i_process) {
int fpcMtd_Create(process_method_class* i_methods, void* i_process) {
return fpcMtd_Method(i_methods->create_method, i_process);
}
src/f_pc/f_pc_method_tag.cpp
+3 -3
View File
@@ -5,11 +5,11 @@
#include "f_pc/f_pc_method_tag.h"
s32 fpcMtdTg_Do(process_method_tag_class* i_methodTag) {
int fpcMtdTg_Do(process_method_tag_class* i_methodTag) {
return i_methodTag->method(i_methodTag->data);
}
s32 fpcMtdTg_ToMethodQ(node_list_class* i_nodelist, process_method_tag_class* i_methodTag) {
int fpcMtdTg_ToMethodQ(node_list_class* i_nodelist, process_method_tag_class* i_methodTag) {
return cTg_Addition(i_nodelist, &i_methodTag->create_tag);
}
@@ -17,7 +17,7 @@ void fpcMtdTg_MethodQTo(process_method_tag_class* i_methodTag) {
cTg_SingleCut(&i_methodTag->create_tag);
}
s32 fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_method, void* i_data) {
int fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_method, void* i_data) {
cTg_Create(&i_methodTag->create_tag, i_methodTag);
i_methodTag->method = i_method;
i_methodTag->data = i_data;
src/f_pc/f_pc_node.cpp
+25 -26
View File
@@ -7,12 +7,12 @@
#include "f_pc/f_pc_layer_iter.h"
#include "f_pc/f_pc_debug_sv.h"
s32 fpcNd_DrawMethod(nodedraw_method_class* i_method_class, void* i_data) {
int fpcNd_DrawMethod(nodedraw_method_class* i_method_class, void* i_data) {
return fpcMtd_Method(i_method_class->draw_method, i_data);
}
s32 fpcNd_Draw(process_node_class* i_procNode) {
s32 ret = 0;
int fpcNd_Draw(process_node_class* i_procNode) {
int ret = 0;
process_node_class* var_r28 = i_procNode;
if (i_procNode->unk_0x1A8 == 0) {
@@ -25,8 +25,8 @@ s32 fpcNd_Draw(process_node_class* i_procNode) {
return ret;
}
s32 fpcNd_Execute(process_node_class* i_procNode) {
s32 ret = 0;
int fpcNd_Execute(process_node_class* i_procNode) {
int ret = 0;
layer_class* save_layer = fpcLy_CurrentLayer();
#if DEBUG
@@ -47,25 +47,24 @@ s32 fpcNd_Execute(process_node_class* i_procNode) {
int g_fpcNd_type;
void* fpcNd_IsCreatingFromUnder(void* i_procNode) {
layer_class* layer;
process_node_class* procnode = (process_node_class*)i_procNode;
if (procnode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, procnode->base.subtype) != FALSE)
if (i_procNode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, ((process_node_class*)i_procNode)->base.subtype) != FALSE)
{
layer = &procnode->layer;
layer_class* layer;
layer = &((process_node_class*)i_procNode)->layer;
if (fpcLy_IsCreatingMesg(layer) == FALSE) {
return (process_node_class*)fpcLyIt_Judge(
layer, (fpcLyIt_JudgeFunc)fpcNd_IsCreatingFromUnder, NULL);
} else {
return procnode;
return i_procNode;
}
}
return NULL;
}
BOOL g_fpcNd_IsCheckOfDeleteTiming = TRUE;
s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
int fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
if (g_fpcNd_IsCheckOfDeleteTiming == TRUE && fpcNd_IsCreatingFromUnder(i_procNode) != NULL) {
return 0;
}
@@ -73,11 +72,11 @@ s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
return 1;
}
s32 fpcNd_IsDelete(process_node_class* i_procNode) {
int fpcNd_IsDelete(process_node_class* i_procNode) {
return fpcMtd_IsDelete(&i_procNode->nodedraw_method->base, i_procNode);
}
s32 fpcNd_Delete(process_node_class* i_procNode) {
int fpcNd_Delete(process_node_class* i_procNode) {
if (!fpcLy_IsDeletingMesg(&i_procNode->layer) &&
fpcMtd_Delete(&i_procNode->nodedraw_method->base, i_procNode) == 1)
{
@@ -88,22 +87,22 @@ s32 fpcNd_Delete(process_node_class* i_procNode) {
return 0;
}
s32 fpcNd_Create(process_node_class* i_procNode) {
process_node_class* procnode = (process_node_class*)i_procNode;
int fpcNd_Create(process_node_class* i_procNode) {
int ret;
layer_class* save_layer;
s32 ret;
if (procnode->base.state.init_state == 0) {
node_process_profile_definition* pprofile = (node_process_profile_definition*)procnode->base.profile;
procnode->base.subtype = fpcBs_MakeOfType(&g_fpcNd_type);
procnode->nodedraw_method = (nodedraw_method_class*)pprofile->sub_methods;
fpcLy_Create(&procnode->layer, procnode, procnode->layer_nodelist, 16);
procnode->unk_0x1A8 = 0;
if (i_procNode->base.state.init_state == 0) {
node_process_profile_definition* pprofile =
(node_process_profile_definition*)i_procNode->base.profile;
i_procNode->base.subtype = fpcBs_MakeOfType(&g_fpcNd_type);
i_procNode->nodedraw_method =
(nodedraw_method_class*)pprofile->sub_methods;
fpcLy_Create(&i_procNode->layer, i_procNode, i_procNode->layer_nodelist, 16);
i_procNode->unk_0x1A8 = 0;
}
save_layer = fpcLy_CurrentLayer();
fpcLy_SetCurrentLayer(&procnode->layer);
ret = fpcMtd_Create(&procnode->nodedraw_method->base, procnode);
fpcLy_SetCurrentLayer(&i_procNode->layer);
ret = fpcMtd_Create(&i_procNode->nodedraw_method->base, i_procNode);
fpcLy_SetCurrentLayer(save_layer);
return ret;
}
src/f_pc/f_pc_node_req.cpp
+19 -20
View File
@@ -27,7 +27,7 @@ void fpcNdRq_ToRequestQ(node_create_request* i_request) {
fpcLy_CreatingMesg(i_request->layer);
}
s32 fpcNdRq_phase_IsCreated(node_create_request* i_request) {
int fpcNdRq_phase_IsCreated(node_create_request* i_request) {
if (fpcCtRq_IsCreatingByID(i_request->creating_id) == TRUE) {
#if DEBUG
if (i_request->unk_0x64-- <= 0) {
@@ -46,7 +46,7 @@ s32 fpcNdRq_phase_IsCreated(node_create_request* i_request) {
}
}
s32 fpcNdRq_phase_Create(node_create_request* i_request) {
int fpcNdRq_phase_Create(node_create_request* i_request) {
i_request->creating_id =
fpcSCtRq_Request(i_request->layer, i_request->name,
(stdCreateFunc)i_request->create_req_methods->post_method, i_request,
@@ -58,11 +58,11 @@ s32 fpcNdRq_phase_Create(node_create_request* i_request) {
return cPhs_NEXT_e;
}
s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request) {
int fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request) {
return cPhs_NEXT_e;
}
s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request) {
int fpcNdRq_phase_IsDeleted(node_create_request* i_request) {
if (fpcDt_IsComplete() == FALSE) {
#if DEBUG
if (i_request->unk_0x68-- <= 0) {
@@ -78,7 +78,7 @@ s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request) {
return cPhs_NEXT_e;
}
s32 fpcNdRq_phase_Delete(node_create_request* i_request) {
int fpcNdRq_phase_Delete(node_create_request* i_request) {
if (i_request->node_proc.node != NULL) {
if (fpcDt_Delete(&i_request->node_proc.node->base) == 0) {
return cPhs_INIT_e;
@@ -89,16 +89,16 @@ s32 fpcNdRq_phase_Delete(node_create_request* i_request) {
return cPhs_NEXT_e;
}
s32 fpcNdRq_DoPhase(node_create_request* i_request) {
s32 result = cPhs_Handler(&i_request->phase_request, i_request->phase_handler, i_request);
int fpcNdRq_DoPhase(node_create_request* i_request) {
int result = cPhs_Handler(&i_request->phase_request, i_request->phase_handler, i_request);
if (result == cPhs_NEXT_e) {
return fpcNdRq_DoPhase(i_request);
}
return result;
}
s32 fpcNdRq_Execute(node_create_request* i_request) {
s32 result = fpcNdRq_DoPhase(i_request);
int fpcNdRq_Execute(node_create_request* i_request) {
int result = fpcNdRq_DoPhase(i_request);
switch (result) {
case cPhs_INIT_e:
case cPhs_LOADING_e:
@@ -113,7 +113,7 @@ s32 fpcNdRq_Execute(node_create_request* i_request) {
}
}
s32 fpcNdRq_Delete(node_create_request* i_request) {
int fpcNdRq_Delete(node_create_request* i_request) {
fpcNdRq_RequestQTo(i_request);
if (i_request->create_req_methods != NULL && i_request->create_req_methods->delete_method != NULL &&
fpcMtd_Method(i_request->create_req_methods->delete_method, i_request) == 0)
@@ -125,7 +125,7 @@ s32 fpcNdRq_Delete(node_create_request* i_request) {
return 1;
}
s32 fpcNdRq_Cancel(node_create_request* i_request) {
int fpcNdRq_Cancel(node_create_request* i_request) {
if (i_request->create_req_methods != NULL &&
fpcMtd_Method(i_request->create_req_methods->cancel_method, i_request) == 0)
{
@@ -137,7 +137,7 @@ s32 fpcNdRq_Cancel(node_create_request* i_request) {
#define NODE_GET_NEXT(pNode) (pNode ? pNode->mpNextNode : NULL)
s32 fpcNdRq_Handler() {
int fpcNdRq_Handler() {
node_class* node = l_fpcNdRq_Queue.mpHead;
#if DEBUG
@@ -170,8 +170,8 @@ s32 fpcNdRq_Handler() {
return 1;
}
s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
fpc_ProcID id = i_procNode->base.id;
int fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
fpc_ProcID id = ((process_node_class*)i_procNode)->base.id;
request_node_class* req_node = (request_node_class*)l_fpcNdRq_Queue.mpHead;
while (req_node != NULL) {
@@ -187,14 +187,13 @@ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
return 1;
}
s32 fpcNdRq_IsIng(process_node_class* i_procNode) {
int fpcNdRq_IsIng(process_node_class* i_procNode) {
request_node_class* req_node;
node_create_request* create_req;
fpc_ProcID id = i_procNode->base.id;
fpc_ProcID id = ((process_node_class*)i_procNode)->base.id;
req_node = (request_node_class*)l_fpcNdRq_Queue.mpHead;
while (req_node != NULL) {
create_req = req_node->node_create_req;
node_create_request* create_req = req_node->node_create_req;
if (create_req->creating_id == id) {
return 1;
}
@@ -328,7 +327,7 @@ node_create_request* fpcNdRq_Request(u32 i_requestSize, int i_reqType,
return req;
}
s32 fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
int fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
request_node_class* req_node;
req_node = (request_node_class*)l_fpcNdRq_Queue.mpHead;
@@ -348,6 +347,6 @@ s32 fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
return 0;
}
s32 fpcNdRq_ReRequest(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
int fpcNdRq_ReRequest(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
return fpcNdRq_ReChangeNode(i_requestID, i_procName, i_data);
}
src/f_pc/f_pc_pause.cpp
+3 -3
View File
@@ -7,7 +7,7 @@
#include "f_pc/f_pc_node.h"
#include "f_pc/f_pc_layer_iter.h"
s32 fpcPause_IsEnable(void* i_proc, u8 i_flag) {
int fpcPause_IsEnable(void* i_proc, u8 i_flag) {
if ((((base_process_class*)i_proc)->pause_flag & i_flag) == i_flag) {
return 1;
} else {
@@ -15,7 +15,7 @@ s32 fpcPause_IsEnable(void* i_proc, u8 i_flag) {
}
}
s32 fpcPause_Enable(void* i_proc, u8 i_flag) {
int fpcPause_Enable(void* i_proc, u8 i_flag) {
((base_process_class*)i_proc)->pause_flag |= i_flag;
if (fpcBs_Is_JustOfType(g_fpcNd_type, ((base_process_class*)i_proc)->subtype)) {
@@ -25,7 +25,7 @@ s32 fpcPause_Enable(void* i_proc, u8 i_flag) {
return 1;
}
s32 fpcPause_Disable(void* i_proc, u8 i_flag) {
int fpcPause_Disable(void* i_proc, u8 i_flag) {
u8 var_r31 = 0xFF - i_flag;
((base_process_class*)i_proc)->pause_flag &= var_r31;
src/f_pc/f_pc_priority.cpp
+8 -8
View File
@@ -7,11 +7,11 @@
#include "f_pc/f_pc_base.h"
#include "f_pc/f_pc_layer.h"
s32 fpcPi_IsInQueue(process_priority_class* i_procPriority) {
int fpcPi_IsInQueue(process_priority_class* i_procPriority) {
return cTg_IsUse(&i_procPriority->base);
}
s32 fpcPi_QueueTo(process_priority_class* i_procPriority) {
int fpcPi_QueueTo(process_priority_class* i_procPriority) {
cTg_SingleCut(&i_procPriority->base);
fpcLy_CancelQTo(&i_procPriority->method_tag);
return 1;
@@ -19,7 +19,7 @@ s32 fpcPi_QueueTo(process_priority_class* i_procPriority) {
static node_list_class l_fpcPi_Queue;
s32 fpcPi_ToQueue(process_priority_class* i_procPriority) {
int fpcPi_ToQueue(process_priority_class* i_procPriority) {
fpc_ProcID layer = i_procPriority->queue_info.layer_id;
if (cTg_Addition(&l_fpcPi_Queue, &i_procPriority->base)) {
@@ -49,7 +49,7 @@ process_priority_class* fpcPi_GetFromQueue() {
return NULL;
}
s32 fpcPi_Delete(process_priority_class* i_procPriority) {
int fpcPi_Delete(process_priority_class* i_procPriority) {
static priority_id crear = {
fpcLy_NONE_e,
0xFFFF,
@@ -61,14 +61,14 @@ s32 fpcPi_Delete(process_priority_class* i_procPriority) {
return 1;
}
s32 fpcPi_IsNormal(fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
int fpcPi_IsNormal(fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
if ((i_layerID < fpcLy_SPECIAL_e) && (i_listID < 0xFFFE) && (i_priority < fpcPi_SPECIAL_e))
return 1;
return 0;
}
s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
int fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData;
BOOL changed = FALSE;
@@ -108,7 +108,7 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u
return 0;
}
s32 fpcPi_Handler() {
int fpcPi_Handler() {
process_priority_class* i_procPriority;
while (i_procPriority = fpcPi_GetFromQueue()) {
base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData;
@@ -128,7 +128,7 @@ s32 fpcPi_Handler() {
return 1;
}
s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, fpc_ProcID i_layerID, u16 i_listID,
int fpcPi_Init(process_priority_class* i_procPriority, void* i_data, fpc_ProcID i_layerID, u16 i_listID,
u16 i_priority) {
if (!fpcPi_IsNormal(i_layerID, i_listID, i_priority))
return 0;
src/f_pc/f_pc_stdcreate_req.cpp
+14 -12
View File
@@ -10,7 +10,7 @@
#include "f_pc/f_pc_debug_sv.h"
#include <dolphin/dolphin.h>
s32 fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
int fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
int ret = fpcLd_Load(i_request->process_name);
switch (ret) {
@@ -25,7 +25,7 @@ s32 fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
}
}
s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request) {
int fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request) {
fpcLy_SetCurrentLayer(i_request->base.layer);
i_request->base.process =
fpcBs_Create(i_request->process_name, i_request->base.id, i_request->process_append);
@@ -40,7 +40,7 @@ s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request) {
}
}
s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) {
int fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) {
fpcLy_SetCurrentLayer(i_request->base.layer);
int ret = fpcBs_SubCreate(i_request->base.process);
@@ -56,8 +56,9 @@ s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) {
return ret;
}
s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request) {
process_node_class* procNode = (process_node_class*)i_request->base.process;
int fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request) {
process_node_class* procNode =
(process_node_class*)((standard_create_request_class*)i_request)->base.process;
if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->base.subtype) == TRUE) {
if (fpcLy_IsCreatingMesg(&procNode->layer) == TRUE) {
return cPhs_INIT_e;
@@ -66,7 +67,7 @@ s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request) {
return cPhs_NEXT_e;
}
s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request) {
int fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request) {
stdCreateFunc create_func = i_request->create_post_method;
if (create_func != NULL) {
@@ -79,30 +80,31 @@ s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request) {
return cPhs_NEXT_e;
}
s32 fpcSCtRq_phase_Done(standard_create_request_class* i_request) {
int fpcSCtRq_phase_Done(standard_create_request_class* i_request) {
return cPhs_NEXT_e;
}
s32 fpcSCtRq_Handler(standard_create_request_class* i_request) {
s32 phase_state = cPhs_Do(&i_request->phase_request, i_request);
int fpcSCtRq_Handler(standard_create_request_class* i_request) {
int phase_state = cPhs_Do(&i_request->phase_request, i_request);
switch (phase_state) {
case cPhs_NEXT_e:
return fpcSCtRq_Handler(i_request);
case cPhs_COMPLEATE_e:
return cPhs_COMPLEATE_e;
case cPhs_LOADING_e:
case cPhs_INIT_e:
case cPhs_UNK3_e:
case cPhs_ERROR_e:
default:
return phase_state;
}
}
s32 fpcSCtRq_Delete(standard_create_request_class* i_request) {
int fpcSCtRq_Delete(standard_create_request_class* i_request) {
return 1;
}
s32 fpcSCtRq_Cancel(standard_create_request_class* i_request) {
int fpcSCtRq_Cancel(standard_create_request_class* i_request) {
return 1;
}