diff --git a/config/RZDE01_02/symbols.txt b/config/RZDE01_02/symbols.txt index f8348267706..35726805875 100644 --- a/config/RZDE01_02/symbols.txt +++ b/config/RZDE01_02/symbols.txt @@ -28000,7 +28000,7 @@ dylPreLoadTime1 = .sbss:0x80520E18; // type:object size:0x8 scope:global align:4 resPreLoadTime0 = .sbss:0x80520E20; // type:object size:0x8 scope:global align:4 data:4byte resPreLoadTime1 = .sbss:0x80520E28; // type:object size:0x8 scope:global align:4 data:4byte g_preLoadHIO = .sbss:0x80520E30; // type:object size:0x4 scope:global align:4 -lbl_80520E34 = .sbss:0x80520E34; // type:object size:0x1 data:byte +pauseTimer__9dScnPly_c = .sbss:0x80520E34; // type:object size:0x1 data:byte lbl_80520E35 = .sbss:0x80520E35; // type:object size:0x1 data:byte g_regHIO = .sbss:0x80520E38; // type:object size:0x4 scope:global align:4 m_nowID__9dkWmark_c = .sbss:0x80520E40; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/RZDJ01/symbols.txt b/config/RZDJ01/symbols.txt index 83f6d7e6e77..7e636232029 100644 --- a/config/RZDJ01/symbols.txt +++ b/config/RZDJ01/symbols.txt @@ -28004,7 +28004,7 @@ dylPreLoadTime1 = .sbss:0x8051EC88; // type:object size:0x8 scope:global align:4 resPreLoadTime0 = .sbss:0x8051EC90; // type:object size:0x8 scope:global align:4 data:4byte resPreLoadTime1 = .sbss:0x8051EC98; // type:object size:0x8 scope:global align:4 data:4byte g_preLoadHIO = .sbss:0x8051ECA0; // type:object size:0x4 scope:global align:4 -lbl_8051ECA4 = .sbss:0x8051ECA4; // type:object size:0x1 data:byte +pauseTimer__9dScnPly_c = .sbss:0x8051ECA4; // type:object size:0x1 data:byte lbl_8051ECA5 = .sbss:0x8051ECA5; // type:object size:0x1 data:byte g_regHIO = .sbss:0x8051ECA8; // type:object size:0x4 scope:global align:4 m_nowID__9dkWmark_c = .sbss:0x8051ECB0; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/RZDP01/symbols.txt b/config/RZDP01/symbols.txt index 570d80796b3..752db8a4f28 100644 --- a/config/RZDP01/symbols.txt +++ b/config/RZDP01/symbols.txt @@ -27891,7 +27891,7 @@ dylPreLoadTime1 = .sbss:0x805215D8; // type:object size:0x8 scope:global align:4 resPreLoadTime0 = .sbss:0x805215E0; // type:object size:0x8 scope:global align:4 data:4byte resPreLoadTime1 = .sbss:0x805215E8; // type:object size:0x8 scope:global align:4 data:4byte g_preLoadHIO = .sbss:0x805215F0; // type:object size:0x4 scope:global align:4 -lbl_805215F4 = .sbss:0x805215F4; // type:object size:0x1 data:byte +pauseTimer__9dScnPly_c = .sbss:0x805215F4; // type:object size:0x1 data:byte lbl_805215F5 = .sbss:0x805215F5; // type:object size:0x1 data:byte g_regHIO = .sbss:0x805215F8; // type:object size:0x4 scope:global align:4 m_nowID__9dkWmark_c = .sbss:0x80521600; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/Shield/symbols.txt b/config/Shield/symbols.txt index ee6a502e1dd..814a870c54d 100644 --- a/config/Shield/symbols.txt +++ b/config/Shield/symbols.txt @@ -25503,7 +25503,7 @@ dylPreLoadTime1 = .sbss:0x80508F18; // type:object size:0x8 scope:global data:4b resPreLoadTime0 = .sbss:0x80508F20; // type:object size:0x8 scope:global data:4byte hash:0xA1124705 resPreLoadTime1 = .sbss:0x80508F28; // type:object size:0x8 scope:global data:4byte hash:0xA1124704 g_preLoadHIO = .sbss:0x80508F30; // type:object size:0x4 scope:global data:4byte hash:0x2AE34DF2 -lbl_80508F34 = .sbss:0x80508F34; // type:object size:0x1 data:byte hash:0x2421530A dhash:0x54C04193 +pauseTimer__9dScnPly_c = .sbss:0x80508F34; // type:object size:0x1 data:byte hash:0x2421530A dhash:0x54C04193 lbl_80508F35 = .sbss:0x80508F35; // type:object size:0x1 data:byte hash:0x16684D2D dhash:0x100CD5B4 g_regHIO = .sbss:0x80508F38; // type:object size:0x4 scope:global data:4byte hash:0x944FCFA3 m_nowID__9dkWmark_c = .sbss:0x80508F40; // type:object size:0x4 scope:global data:4byte hash:0x8C7CDEA4 dhash:0x6AA81CDD diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index 3ca04979235..34fd67714c6 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -239,12 +239,12 @@ f_op/f_op_view.cpp: f_op/f_op_kankyo.cpp: .text start:0x800414A0 end:0x800417A0 .data start:0x8066AB58 end:0x8066ABA0 - .sbss start:0x8074C508 end:0x8074C514 + .sbss start:0x8074C508 end:0x8074C510 f_op/f_op_msg.cpp: .text start:0x800417A0 end:0x80041A50 .data start:0x8066ABA0 end:0x8066ABE8 - .sbss start:0x8074C514 end:0x8074C518 + .sbss start:0x8074C510 end:0x8074C518 f_op/f_op_kankyo_mng.cpp: .text start:0x80041A50 end:0x80041FD0 diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index 92c851fbae5..232039cea8f 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -64280,7 +64280,7 @@ mWaterY__11fopAcM_wt_c = .sbss:0x8074C4F4; // type:object size:0x4 scope:global l_fopOvlpM_overlap = .sbss:0x8074C4F8; // type:object size:0x4 scope:global data:4byte hash:0x0EF2800B l_fopScnRq_IsUsingOfOverlap = .sbss:0x8074C500; // type:object size:0x4 scope:global data:4byte hash:0xB8D9D5AB fopKy_KANKYO_TYPE = .sbss:0x8074C508; // type:object size:0x4 scope:global data:4byte hash:0xBC1E6A2F -lbl_8074C510 = .sbss:0x8074C510; // type:object size:0x1 data:byte hash:0x69766C30 dhash:0xE973ADA6 +MemCheck__6fopMsg = .sbss:0x8074C510; // type:object size:0x1 scope:global data:byte hash:0x69766C30 dhash:0xE973ADA6 fopMsg_MSG_TYPE = .sbss:0x8074C514; // type:object size:0x4 scope:global hash:0xAC9753E4 @LOCAL@fopMsgM_createExpHeap__FUlP7JKRHeap@displayed = .sbss:0x8074C518; // type:object size:0x4 scope:local data:4byte hash:0xA29E9C43 dhash:0xFD9484E8 l_fopDwTg_id = .sbss:0x8074C520; // type:object size:0x4 scope:global data:4byte hash:0xBA0582FD diff --git a/configure.py b/configure.py index 260320b07b3..0dc22911f90 100755 --- a/configure.py +++ b/configure.py @@ -547,6 +547,10 @@ Equivalent = config.non_matching # Object should be linked when configured with ALL_GCN = ["GZ2E01", "GZ2P01", "GZ2J01"] +ALL_WII = ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01"] # , "RZDK01"] +ALL_DEMO = ["DZDE01", "DZDP01"] +ALL_SHIELD = ["Shield", "ShieldD"] # , "ShieldP"] +ALL = ALL_GCN + ALL_WII + ALL_SHIELD # Object is only matching for specific versions @@ -630,58 +634,58 @@ config.libs = [ # f_op Object(MatchingFor(ALL_GCN), "f_op/f_op_actor.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_op/f_op_actor_iter.cpp"), - Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_actor_tag.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_actor_iter.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_actor_tag.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_camera.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_actor_mng.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_camera_mng.cpp"), # ShieldD inlines + Object(MatchingFor(ALL_GCN), "f_op/f_op_camera_mng.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_overlap.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_overlap_mng.cpp"), + Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_overlap_mng.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_overlap_req.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_scene.cpp"), + Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_scene.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_scene_iter.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_scene_mng.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_scene_req.cpp"), - Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_scene_tag.cpp"), - Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_view.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_kankyo.cpp"), # ShieldD lbl_8074C510 undefined - Object(MatchingFor(ALL_GCN), "f_op/f_op_msg.cpp"), # ShieldD fopMsg::MemCheck + Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_scene_mng.cpp"), + Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_scene_req.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_scene_tag.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_view.cpp"), + Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_kankyo.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_msg.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_kankyo_mng.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_msg_mng.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_draw_iter.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_op/f_op_draw_tag.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_op/f_op_scene_pause.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_draw_tag.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_scene_pause.cpp"), # f_pc Object(MatchingFor(ALL_GCN), "f_pc/f_pc_base.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_create_iter.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, "Shield", "ShieldD"), "f_pc/f_pc_create_tag.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_creator.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_delete_tag.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, "Shield", "ShieldD"), "f_pc/f_pc_draw_priority.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, "Shield", "ShieldD"), "f_pc/f_pc_line.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), "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, "Shield", "ShieldD"), "f_pc/f_pc_profile.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_searcher.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, "Shield", "ShieldD"), "f_pc/f_pc_method_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, "Shield", "ShieldD"), "f_pc/f_pc_pause.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, "Shield", "ShieldD"), "f_pc/f_pc_fstcreate_req.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("ShieldD"), "f_pc/f_pc_debug_sv.cpp"), ], @@ -703,7 +707,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bomb.cpp"), # debug weak func order Object(MatchingFor(ALL_GCN), "d/d_lib.cpp"), Object(MatchingFor(ALL_GCN), "d/d_save.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_save_init.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_save_init.cpp"), Object(MatchingFor(ALL_GCN), "d/d_jnt_col.cpp"), Object(MatchingFor(ALL_GCN), "d/d_a_obj.cpp"), Object(MatchingFor(ALL_GCN), "d/d_a_itembase_static.cpp"), @@ -735,8 +739,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield"), "d/d_vib_pattern.cpp"), Object(MatchingFor(ALL_GCN), "d/d_attention.cpp"), Object(NonMatching, "d/d_bg_parts.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_bg_pc.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_att_dist.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_bg_pc.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_att_dist.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bg_plc.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s_acch.cpp"), @@ -748,8 +752,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "ShieldD"), "d/d_bg_s_sph_chk.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s_spl_grp_chk.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s_poly_pass_chk.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_bg_s_roof_chk.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_bg_s_wtr_chk.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_bg_s_roof_chk.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_bg_s_wtr_chk.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w_base.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w_kcol.cpp"), @@ -892,23 +896,23 @@ config.libs = [ "progress_category": "third_party", "host": True, "objects": [ - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_malloc.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_API.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_API_controller_pad.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_API_graphic.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_malloc.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_API.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_API_controller_pad.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_API_graphic.cpp"), Object(MatchingFor(ALL_GCN), "SSystem/SComponent/c_cc_d.cpp"), Object(MatchingFor(ALL_GCN), "SSystem/SComponent/c_cc_s.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_counter.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_counter.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_list.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_list_iter.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_list_iter.cpp"), Object(MatchingFor(ALL_GCN), "SSystem/SComponent/c_node.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_node_iter.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_tree.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_tree.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_tree_iter.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_phase.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_request.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_tag.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_tag_iter.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_tag.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_tag_iter.cpp"), Object(MatchingFor(ALL_GCN), "SSystem/SComponent/c_xyz.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_sxyz.cpp"), Object(MatchingFor(ALL_GCN), "SSystem/SComponent/c_math.cpp"), # debug weak literal order @@ -977,14 +981,14 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JStage/JSGFog.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JStage/JSGLight.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JStage/JSGObject.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "JSystem/JStage/JSGSystem.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "JSystem/JStage/JSGSystem.cpp"), ], ), JSystemLib( "JStudio", [ Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/ctb.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "JSystem/JStudio/JStudio/ctb-data.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "JSystem/JStudio/JStudio/ctb-data.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/functionvalue.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/fvb.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "JSystem/JStudio/JStudio/fvb-data.cpp"), @@ -993,7 +997,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield"), "JSystem/JStudio/JStudio/jstudio-data.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/jstudio-math.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/jstudio-object.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "JSystem/JStudio/JStudio/object-id.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "JSystem/JStudio/JStudio/object-id.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/stb.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "JSystem/JStudio/JStudio/stb-data-parse.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/stb-data.cpp"), @@ -1206,7 +1210,7 @@ config.libs = [ [ Object(MatchingFor(ALL_GCN), "JSystem/JSupport/JSUList.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JSupport/JSUInputStream.cpp"), - Object(MatchingFor("Shield", "ShieldD"), "JSystem/JSupport/JSUOutputStream.cpp"), + Object(MatchingFor(ALL_SHIELD), "JSystem/JSupport/JSUOutputStream.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JSupport/JSUMemoryStream.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JSupport/JSUFileStream.cpp"), ], @@ -1241,7 +1245,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JUtility/JUTProcBar.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JUtility/JUTConsole.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JUtility/JUTDirectFile.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp"), ], ), JSystemLib( @@ -1972,7 +1976,7 @@ config.libs = [ ), ], }, - Rel("f_pc_profile_lst", [Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_profile_lst.cpp")]), + Rel("f_pc_profile_lst", [Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_profile_lst.cpp")]), ActorRel(MatchingFor(ALL_GCN), "d_a_andsw"), ActorRel(MatchingFor(ALL_GCN), "d_a_bg"), ActorRel(MatchingFor(ALL_GCN), "d_a_bg_obj"), diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index 4aa5f05d012..c7227843865 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -1,9 +1,8 @@ #ifndef F_F_OP_CAMERA_MNG_H_ #define F_F_OP_CAMERA_MNG_H_ -#include "SSystem/SComponent/c_phase.h" -#include "d/d_camera.h" #include "f_op/f_op_view.h" +#include "d/d_camera.h" typedef struct leafdraw_method_class leafdraw_method_class; diff --git a/include/f_op/f_op_scene_req.h b/include/f_op/f_op_scene_req.h index 283e000eaec..c9d68d3bdd3 100644 --- a/include/f_op/f_op_scene_req.h +++ b/include/f_op/f_op_scene_req.h @@ -15,6 +15,6 @@ public: fpc_ProcID fopScnRq_Request(int i_reqType, scene_class* i_scene, s16 i_procName, void* i_data, s16 param_5, u16 param_6); s32 fopScnRq_ReRequest(fpc_ProcID i_requestId, s16 i_procName, void* i_data); -void fopScnRq_Handler(); +int fopScnRq_Handler(); #endif diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index b96e5afc71a..c65007622a1 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -11,7 +11,6 @@ #include "f_op/f_op_kankyo_mng.h" static int fopKy_KANKYO_TYPE; -// static int lbl_8074C510; void fopKy_IsKankyo(void* i_this) { fpcM_IsJustType(fopKy_KANKYO_TYPE, ((kankyo_class*)i_this)->type); diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index a36df47584d..ba1f3221396 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -41,8 +41,14 @@ u32 fopScnM_ReRequest(s16 i_procName, u32 i_data) { } void fopScnM_Management() { - fopScnRq_Handler(); +#if DEBUG + if (fopScnRq_Handler()) { + return; + }; JUT_ASSERT(326, 0); +#else + fopScnRq_Handler(); +#endif } void fopScnM_Init() {} diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp index b64055cc5e1..d3136962ae1 100644 --- a/src/f_op/f_op_scene_req.cpp +++ b/src/f_op/f_op_scene_req.cpp @@ -157,6 +157,6 @@ s32 fopScnRq_ReRequest(fpc_ProcID i_requestId, s16 i_procName, void* i_data) { return fpcNdRq_ReRequest(i_requestId, i_procName, i_data); } -void fopScnRq_Handler() { +int fopScnRq_Handler() { fpcNdRq_Handler(); }