From ac8ff10650d7a2f54888a182dba630dd711ac03d Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Wed, 20 Aug 2025 19:09:06 -0400 Subject: [PATCH] Fix most weak function ordering issues --- .vscode/settings.json | 1 + configure.py | 352 +++++++++++++-------------- include/d/actor/d_a_agb.h | 34 --- include/d/actor/d_a_bomb.h | 2 - include/d/actor/d_a_hookshot.h | 1 - include/d/actor/d_a_kanban.h | 14 -- include/d/actor/d_a_knob00.h | 2 +- include/d/actor/d_a_npc_bs1.h | 31 --- include/d/actor/d_a_npc_btsw.h | 31 --- include/d/actor/d_a_npc_btsw2.h | 16 -- include/d/actor/d_a_npc_fa1.h | 83 ------- include/d/actor/d_a_npc_kamome.h | 51 ---- include/d/actor/d_a_npc_km1.h | 31 --- include/d/actor/d_a_npc_nz.h | 26 -- include/d/actor/d_a_npc_os.h | 65 +---- include/d/actor/d_a_obj_eff.h | 1 - include/d/actor/d_a_obj_hha.h | 2 - include/d/actor/d_a_obj_movebox.h | 1 + include/d/actor/d_a_obj_pirateship.h | 1 + include/d/actor/d_a_obj_toripost.h | 16 -- include/d/actor/d_a_pirate_flag.h | 33 --- include/d/actor/d_a_rd.h | 41 ---- include/d/actor/d_a_sail.h | 26 -- include/d/actor/d_a_tag_kk1.h | 19 -- include/d/d_bg_s_movebg_actor.h | 6 - include/d/d_shop.h | 1 - include/d/dolzel.pch | 15 ++ include/f_op/f_op_actor_mng.h | 2 - src/d/actor/d_a_agb.cpp | 34 +++ src/d/actor/d_a_hys.cpp | 3 - src/d/actor/d_a_kanban.cpp | 16 +- src/d/actor/d_a_npc_bs1.cpp | 31 +++ src/d/actor/d_a_npc_btsw.cpp | 31 +++ src/d/actor/d_a_npc_btsw2.cpp | 16 ++ src/d/actor/d_a_npc_fa1.cpp | 83 +++++++ src/d/actor/d_a_npc_kamome.cpp | 50 ++++ src/d/actor/d_a_npc_km1.cpp | 31 +++ src/d/actor/d_a_npc_nz.cpp | 26 ++ src/d/actor/d_a_npc_os.cpp | 62 +++++ src/d/actor/d_a_obj_eskban.cpp | 3 - src/d/actor/d_a_obj_ladder.cpp | 3 - src/d/actor/d_a_obj_movebox.cpp | 4 - src/d/actor/d_a_obj_mtest.cpp | 3 - src/d/actor/d_a_obj_swhammer.cpp | 3 - src/d/actor/d_a_obj_toripost.cpp | 16 ++ src/d/actor/d_a_pirate_flag.cpp | 41 +++- src/d/actor/d_a_pz.cpp | 2 +- src/d/actor/d_a_rd.cpp | 40 +++ src/d/actor/d_a_sail.cpp | 26 ++ src/d/actor/d_a_stone2.cpp | 2 - src/d/actor/d_a_tag_kk1.cpp | 18 ++ src/d/d_bg_s.cpp | 1 - src/d/d_bg_s_acch.cpp | 1 - src/d/d_bg_s_func.cpp | 1 - src/d/d_bg_s_lin_chk.cpp | 1 - src/d/d_bg_s_movebg_actor.cpp | 1 - src/d/d_bg_s_spl_grp_chk.cpp | 1 - src/d/d_bg_s_wtr_chk.cpp | 1 - src/d/d_bg_w.cpp | 1 - src/d/d_bg_w_deform.cpp | 1 - src/d/d_bg_w_hf.cpp | 1 - src/d/d_bg_w_sv.cpp | 1 - src/d/d_cc_d.cpp | 1 - src/d/d_cc_mass_s.cpp | 1 - src/d/d_cc_s.cpp | 1 - src/d/d_cc_uty.cpp | 1 - src/f_pc/f_pc_manager.cpp | 1 + 67 files changed, 716 insertions(+), 748 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 40fcfeb43..6e21e35cc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,6 +12,7 @@ "files.associations": { "*.inc": "cpp", "*.pch": "cpp", + "*.pch++": "cpp", ".clangd": "yaml", "*.json": "json", "dspproc.c": "cpp", diff --git a/configure.py b/configure.py index f8917d781..d2f8e9858 100755 --- a/configure.py +++ b/configure.py @@ -352,13 +352,13 @@ config.libs = [ "progress_category": "core", "host": True, "objects": [ - Object(Matching, "m_Do/m_Do_main.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(Matching, "m_Do/m_Do_main.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "m_Do/m_Do_printf.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "m_Do/m_Do_audio.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "m_Do/m_Do_controller_pad.cpp"), Object(NonMatching, "m_Do/m_Do_graphic.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "m_Do/m_Do_machine.cpp"), - Object(Matching, "m_Do/m_Do_mtx.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(Matching, "m_Do/m_Do_mtx.cpp"), Object(NonMatching, "m_Do/m_Do_ext.cpp", extra_cflags=["-sym off"]), Object(NonMatching, "m_Do/m_Do_lib.cpp"), Object(Matching, "m_Do/m_Do_hostIO.cpp"), @@ -396,7 +396,7 @@ config.libs = [ Object(Matching, "f_op/f_op_actor.cpp", extra_cflags=["-sym off"]), Object(Matching, "f_op/f_op_actor_iter.cpp"), Object(Matching, "f_op/f_op_actor_tag.cpp"), - Object(Equivalent, "f_op/f_op_actor_mng.cpp", extra_cflags=['-pragma "nosyminline on"']), # weak func order + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "f_op/f_op_actor_mng.cpp"), Object(Matching, "f_op/f_op_camera.cpp"), Object(Matching, "f_op/f_op_camera_mng.cpp"), Object(Matching, "f_op/f_op_overlap.cpp"), @@ -411,7 +411,7 @@ config.libs = [ Object(Matching, "f_op/f_op_kankyo.cpp"), Object(Matching, "f_op/f_op_msg.cpp"), Object(Matching, "f_op/f_op_kankyo_mng.cpp"), - Object(NonMatching, "f_op/f_op_msg_mng.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(NonMatching, "f_op/f_op_msg_mng.cpp"), Object(Matching, "f_op/f_op_draw_iter.cpp"), Object(Matching, "f_op/f_op_draw_tag.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "f_op/f_op_scene_pause.cpp"), @@ -460,11 +460,11 @@ config.libs = [ Object(NonMatching, "d/d_map.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_com_inf_game.cpp", extra_cflags=['-sym off']), Object(Matching, "d/d_com_lib_game.cpp"), - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_com_static.cpp", extra_cflags=['-sym off']), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_com_static.cpp"), Object(Matching, "d/d_lib.cpp"), - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_save.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_save.cpp"), Object(Matching, "d/d_save_init.cpp"), - Object(Matching, "d/d_shop.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(Matching, "d/d_shop.cpp"), Object(Matching, "d/d_jnt_hit.cpp"), Object(Matching, "d/d_chain.cpp"), Object(NonMatching, "d/d_cloth_packet.cpp"), @@ -481,20 +481,20 @@ config.libs = [ Object(Matching, "d/d_a_race_item_static.cpp"), Object(Matching, "d/d_a_leaflift_static.cpp"), Object(NonMatching, "d/d_demo.cpp"), - Object(Matching, "d/d_door.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_resorce.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(Matching, "d/d_door.cpp"), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_resorce.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_material.cpp"), Object(Matching, "d/d_event.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_event_data.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_event_manager.cpp"), Object(NonMatching, "d/d_magma.cpp", extra_cflags=['-sym off']), Object(NonMatching, "d/d_boss_magma.cpp"), - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_grass.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_grass.cpp"), Object(NonMatching, "d/d_tree.cpp"), Object(NonMatching, "d/d_particle.cpp"), Object(Matching, "d/d_particle_name.cpp"), Object(Matching, "d/d_path.cpp"), - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_drawlist.cpp", extra_cflags=['-sym off']), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_drawlist.cpp"), Object(Matching, "d/d_kankyo_data.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_kankyo_wether.cpp"), Object(NonMatching, "d/d_kankyo_rain.cpp"), @@ -524,7 +524,7 @@ config.libs = [ Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_cam_style.cpp"), Object(Matching, "d/d_cam_type2.cpp"), Object(NonMatching, "d/d_ev_camera.cpp"), - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_wood.cpp", extra_cflags=["-sym off"]), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_wood.cpp"), Object(NonMatching, "d/d_flower.cpp"), Object(Matching, "d/d_item_data.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_seafightgame.cpp"), @@ -537,38 +537,38 @@ config.libs = [ Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_salvage.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_snap.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_point_wind.cpp"), - Object(Equivalent, "d/actor/d_a_agb.cpp", extra_cflags=['-pragma "nosyminline on"']), # weak func order + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_agb.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_arrow.cpp", extra_cflags=["-sym off"]), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_bg.cpp"), - Object(Equivalent, "d/actor/d_a_bomb.cpp", extra_cflags=['-pragma "nosyminline on"']), # weak func order + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_bomb.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_bomb2.cpp"), Object(NonMatching, "d/actor/d_a_boomerang.cpp"), - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_dai_item.cpp", extra_cflags=["-sym off"]), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_dai_item.cpp"), Object(NonMatching, "d/actor/d_a_demo00.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_disappear.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_esa.cpp"), Object(NonMatching, "d/actor/d_a_grid.cpp"), Object(NonMatching, "d/actor/d_a_himo2.cpp"), - Object(Equivalent, "d/actor/d_a_hookshot.cpp"), # weak func order - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_ib.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZLE01"), "d/actor/d_a_hookshot.cpp"), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_ib.cpp"), Object(NonMatching, "d/actor/d_a_item.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_itembase.cpp"), Object(Matching, "d/actor/d_a_nh.cpp"), - Object(Equivalent, "d/actor/d_a_npc_fa1.cpp"), # weak func order + Object(Matching, "d/actor/d_a_npc_fa1.cpp"), Object(NonMatching, "d/actor/d_a_obj_search.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_player.cpp"), Object(NonMatching, "d/actor/d_a_player_main.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_player_npc.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_sea.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_spc_item01.cpp"), - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_vrbox.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_vrbox.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_vrbox2.cpp"), Object(NonMatching, "d/d_auction_screen.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_place_name.cpp"), Object(NonMatching, "d/d_camera.cpp"), Object(Matching, "d/d_envse.cpp"), Object(NonMatching, "d/d_file_error.cpp"), - Object(MatchingFor("D44J01", "GZLJ01", "GZLE01"), "d/d_file_select.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("D44J01", "GZLJ01", "GZLE01"), "d/d_file_select.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_gameover.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_kankyo.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_kyeff.cpp"), @@ -606,8 +606,8 @@ config.libs = [ Object(NonMatching, "d/d_s_name.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_s_open.cpp"), Object(NonMatching, "d/d_s_open_sub.cpp"), - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_s_play.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_s_room.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_s_play.cpp"), + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_s_room.cpp"), Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_s_title.cpp"), Object(NonMatching, "d/d_scope.cpp"), Object(Matching, "d/d_throwstone.cpp"), @@ -735,7 +735,7 @@ config.libs = [ Object(Matching, "JSystem/JStudio/JStudio/fvb-data.cpp"), Object(Matching, "JSystem/JStudio/JStudio/fvb-data-parse.cpp"), Object(Matching, "JSystem/JStudio/JStudio/object-id.cpp"), - Object(Matching, "JSystem/JStudio/JStudio/stb.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(Matching, "JSystem/JStudio/JStudio/stb.cpp", extra_cflags=['-pragma "nosyminline on"']), # TODO: nosyminline may be a fakematch. jsystem pch? Object(Matching, "JSystem/JStudio/JStudio/stb-data.cpp"), Object(Matching, "JSystem/JStudio/JStudio/stb-data-parse.cpp"), ], @@ -763,7 +763,7 @@ config.libs = [ "JStudio_JParticle", [ Object(Matching, "JSystem/JStudio/JStudio_JParticle/control.cpp"), - Object(Matching, "JSystem/JStudio/JStudio_JParticle/object-particle.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(Matching, "JSystem/JStudio/JStudio_JParticle/object-particle.cpp", extra_cflags=['-pragma "nosyminline on"']), # TODO: nosyminline may be a fakematch. jsystem pch? ], ), JSystemLib( @@ -920,7 +920,7 @@ config.libs = [ Object(Matching, "JSystem/JKernel/JKRFile.cpp"), Object(Matching, "JSystem/JKernel/JKRDvdFile.cpp"), Object(Matching, "JSystem/JKernel/JKRDvdRipper.cpp"), - Object(Matching, "JSystem/JKernel/JKRDvdAramRipper.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(Matching, "JSystem/JKernel/JKRDvdAramRipper.cpp", extra_cflags=['-pragma "nosyminline on"']), # TODO: nosyminline may be a fakematch. jsystem pch? Object(Matching, "JSystem/JKernel/JKRDecomp.cpp"), ], ), @@ -994,7 +994,7 @@ config.libs = [ Object(Matching, "JSystem/J3DGraphBase/J3DVertex.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DTransform.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DPacket.cpp"), - Object(Matching, "JSystem/J3DGraphBase/J3DShapeMtx.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(Matching, "JSystem/J3DGraphBase/J3DShapeMtx.cpp", extra_cflags=['-pragma "nosyminline on"']), # TODO: nosyminline may be a fakematch. jsystem pch? Object(Matching, "JSystem/J3DGraphBase/J3DShape.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DMaterial.cpp"), Object(NonMatching, "JSystem/J3DGraphBase/J3DMatBlock.cpp"), @@ -1352,31 +1352,31 @@ config.libs = [ ], }, Rel("f_pc_profile_lst", [Object(Matching, "f_pc/f_pc_profile_lst.cpp")]), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_agbsw0", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_agbsw0"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_andsw0"), ActorRel(Matching, "d_a_andsw2"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_att", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_bflower", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_bita", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_att"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_bflower"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_bita"), ActorRel(Matching, "d_a_branch"), ActorRel(NonMatching, "d_a_bridge"), - ActorRel(NonMatching, "d_a_coming2", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_coming3", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(NonMatching, "d_a_coming2"), + ActorRel(Matching, "d_a_coming3"), ActorRel(Matching, "d_a_demo_dk"), ActorRel(Matching, "d_a_demo_kmm"), - ActorRel(Equivalent, "d_a_door10", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(Matching, "d_a_door10"), ActorRel(Matching, "d_a_dr"), ActorRel(Equivalent, "d_a_dr2"), - ActorRel(Matching, "d_a_ep", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_ep"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_floor"), ActorRel(Matching, "d_a_grass"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_hitobj", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_hot_floor", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_hitobj"), + ActorRel(Matching, "d_a_hot_floor"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_ikari"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_jbo", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_jbo"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_kaji"), - ActorRel(Equivalent, "d_a_kanban", extra_cflags=['-pragma "nosyminline on"']), # weak func order - ActorRel(Matching, "d_a_ki", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_kanban"), + ActorRel(Matching, "d_a_ki"), ActorRel(Matching, "d_a_knob00"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_kui"), ActorRel(Matching, "d_a_kytag00"), @@ -1387,115 +1387,115 @@ config.libs = [ ActorRel(Matching, "d_a_kytag05"), ActorRel(Matching, "d_a_kytag06"), ActorRel(Matching, "d_a_kytag07"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_lamp", extra_cflags=['-sym off']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_lamp"), ActorRel(NonMatching, "d_a_lod_bg"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_lwood"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_magma"), - ActorRel(Equivalent, "d_a_majuu_flag", extra_cflags=['-pragma "nosyminline on"']), # weak func order - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_mdoor", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("D44J01"), "d_a_msw", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_majuu_flag"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_mdoor"), + ActorRel(MatchingFor("D44J01"), "d_a_msw"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_mtoge"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_AjavW", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_Ygush00", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_AjavW"), + ActorRel(Matching, "d_a_obj_Ygush00"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_akabe"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_barrel", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_barrel2", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_bscurtain", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_barrel"), + ActorRel(Matching, "d_a_obj_barrel2"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_bscurtain"), ActorRel(Matching, "d_a_obj_cafelmp"), ActorRel(NonMatching, "d_a_obj_coming"), ActorRel(Matching, "d_a_obj_demo_barrel"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_doguu", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_doguu"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_doguu_demo"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gryw00", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_hfuck1", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_hole", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_ice", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(NonMatching, "d_a_obj_ikada", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gryw00"), + ActorRel(Matching, "d_a_obj_hfuck1"), + ActorRel(Matching, "d_a_obj_hole"), + ActorRel(Matching, "d_a_obj_ice"), + ActorRel(NonMatching, "d_a_obj_ikada"), ActorRel(Matching, "d_a_obj_kanat"), - ActorRel(Matching, "d_a_obj_leaves", extra_cflags=["-sym off"]), + ActorRel(Matching, "d_a_obj_leaves"), ActorRel(Matching, "d_a_obj_lpalm"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_monument"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_movebox", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_mshokki", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_movebox"), + ActorRel(Matching, "d_a_obj_mshokki"), ActorRel(Matching, "d_a_obj_ohatch"), - ActorRel(Matching, "d_a_obj_otble", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_obj_otble"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_pbco"), - ActorRel(Equivalent, "d_a_obj_pirateship", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(Equivalent, "d_a_obj_pirateship"), # weak func order ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_quake"), - ActorRel(Matching, "d_a_obj_rcloud", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_roten", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_obj_rcloud"), + ActorRel(Matching, "d_a_obj_roten"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_shelf"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_shmrgrd", extra_cflags=["-sym off"]), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_swpush", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_shmrgrd"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_swpush"), ActorRel(Matching, "d_a_obj_table"), ActorRel(Matching, "d_a_obj_tenmado"), ActorRel(Equivalent, "d_a_obj_tide"), ActorRel(Matching, "d_a_obj_timer"), - ActorRel(Equivalent, "d_a_obj_toripost", extra_cflags=['-pragma "nosyminline on"']), # weak func order - ActorRel(Matching, "d_a_obj_tousekiki", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_warpt", extra_cflags=["-sym off"]), - ActorRel(Matching, "d_a_obj_wood", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Equivalent, "d_a_pirate_flag"), # weak func order - ActorRel(Equivalent, "d_a_race_item", extra_cflags=['-pragma "nosyminline on"']), # weak func order - ActorRel(Equivalent, "d_a_rd", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_toripost"), + ActorRel(Matching, "d_a_obj_tousekiki"), + ActorRel(Matching, "d_a_obj_warpt"), + ActorRel(Matching, "d_a_obj_wood"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_pirate_flag"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_race_item"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_rd"), ActorRel(Matching, "d_a_rectangle"), - ActorRel(Equivalent, "d_a_salvage"), # weak func order - ActorRel(Matching, "d_a_sbox", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_sk", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_sk2", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_salvage"), + ActorRel(Matching, "d_a_sbox"), + ActorRel(Matching, "d_a_sk"), + ActorRel(Matching, "d_a_sk2"), ActorRel(Matching, "d_a_spotbox"), - ActorRel(Matching, "d_a_ssk", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Equivalent, "d_a_stone", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Equivalent, "d_a_stone2", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_ssk"), + ActorRel(Equivalent, "d_a_stone"), + ActorRel(Equivalent, "d_a_stone2"), ActorRel(Matching, "d_a_swc00"), - ActorRel(Equivalent, "d_a_swhit0", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_swhit0"), ActorRel(Matching, "d_a_swtdoor"), - ActorRel(Equivalent, "d_a_tag_attention", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(Matching, "d_a_tag_attention"), ActorRel(NonMatching, "d_a_tag_ba1"), ActorRel(Matching, "d_a_tag_event"), - ActorRel(Matching, "d_a_tag_evsw", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_tag_evsw"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tag_ghostship"), - ActorRel(Equivalent, "d_a_tag_hint", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(Matching, "d_a_tag_hint"), ActorRel(Matching, "d_a_tag_kb_item"), - ActorRel(Equivalent, "d_a_tag_kk1", extra_cflags=['-pragma "nosyminline on"']), # weak func order - ActorRel(Equivalent, "d_a_tag_light", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_tag_kk1"), + ActorRel(Equivalent, "d_a_tag_light"), ActorRel(Matching, "d_a_tag_msg"), - ActorRel(Matching, "d_a_tag_photo"), + ActorRel(Matching, "d_a_tag_photo"), ActorRel(Matching, "d_a_tag_waterlevel"), - ActorRel(Matching, "d_a_tama", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tbox", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_tpota", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Equivalent, "d_a_tsubo", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_tama"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tbox"), + ActorRel(Matching, "d_a_tpota"), + ActorRel(Equivalent, "d_a_tsubo"), ActorRel(Matching, "d_a_warpdm20", extra_cflags=['-pragma "nosyminline on"']), ActorRel(Matching, "d_a_warphr", extra_cflags=['-pragma "nosyminline on"']), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_wbird"), ActorRel(Equivalent, "d_a_ykgr", extra_cflags=['-pragma "nosyminline on"']), ActorRel(Matching, "d_a_alldie"), - ActorRel(Matching, "d_a_am", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_am2", extra_cflags=["-sym off"]), - ActorRel(Matching, "d_a_amiprop", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_arrow_iceeff", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_arrow_lighteff", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_am"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_am2"), + ActorRel(Matching, "d_a_amiprop"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_arrow_iceeff"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_arrow_lighteff"), ActorRel(NonMatching, "d_a_beam"), ActorRel(NonMatching, "d_a_boko"), ActorRel(NonMatching, "d_a_canon"), ActorRel(NonMatching, "d_a_cc"), ActorRel(NonMatching, "d_a_dai"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_demo_item", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_demo_item"), ActorRel(NonMatching, "d_a_door12"), - ActorRel(Matching, "d_a_fallrock", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_ff", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_fallrock"), + ActorRel(Matching, "d_a_ff"), ActorRel(NonMatching, "d_a_gy_ctrl"), ActorRel(NonMatching, "d_a_himo3"), ActorRel(NonMatching, "d_a_hmlif"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_hys", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_hys"), ActorRel(NonMatching, "d_a_kamome"), ActorRel(NonMatching, "d_a_kamome2"), # Demo-only ActorRel(NonMatching, "d_a_kantera"), ActorRel(NonMatching, "d_a_kn"), ActorRel(NonMatching, "d_a_kokiie"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_ks", extra_cflags=["-sym off"]), - ActorRel(NonMatching, "d_a_kt"), # regalloc, weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_ks"), + ActorRel(NonMatching, "d_a_kt"), # regalloc ActorRel(NonMatching, "d_a_mflft"), ActorRel(NonMatching, "d_a_npc_cb1"), ActorRel(NonMatching, "d_a_npc_md"), @@ -1503,46 +1503,46 @@ config.libs = [ ActorRel(NonMatching, "d_a_nzg"), ActorRel(NonMatching, "d_a_obj_aygr"), ActorRel(NonMatching, "d_a_obj_balancelift"), - ActorRel(Equivalent, "d_a_obj_barrier", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(Equivalent, "d_a_obj_barrier"), # weak func order ActorRel(NonMatching, "d_a_obj_bemos"), - ActorRel(Matching, "d_a_obj_canon", extra_cflags=["-sym off"]), - ActorRel(Matching, "d_a_obj_eff", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_obj_canon"), + ActorRel(Matching, "d_a_obj_eff"), ActorRel(NonMatching, "d_a_obj_magmarock"), ActorRel(NonMatching, "d_a_obj_majyuu_door"), ActorRel(NonMatching, "d_a_obj_stair"), ActorRel(NonMatching, "d_a_obj_swflat"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_swhammer", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_swhammer"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_swheavy"), ActorRel(NonMatching, "d_a_obj_swlight"), ActorRel(NonMatching, "d_a_oq"), - ActorRel(Equivalent, "d_a_pedestal", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_pedestal"), ActorRel(NonMatching, "d_a_saku"), ActorRel(Matching, "d_a_seatag"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_shand", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(NonMatching, "d_a_ship", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Equivalent, "d_a_shop_item"), # weak func order - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_sie_flag", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_shand"), + ActorRel(NonMatching, "d_a_ship"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_shop_item"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_sie_flag"), ActorRel(NonMatching, "d_a_sitem"), ActorRel(NonMatching, "d_a_ss"), ActorRel(NonMatching, "d_a_sss"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_syan", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_syan"), ActorRel(NonMatching, "d_a_tag_md_cb"), ActorRel(NonMatching, "d_a_tag_mk"), ActorRel(Matching, "d_a_tag_so"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tornado", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tornado"), ActorRel(NonMatching, "d_a_warpf"), ActorRel(NonMatching, "d_a_wind_tag"), - ActorRel(Matching, "d_a_acorn_leaf", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_acorn_leaf"), ActorRel(Matching, "d_a_atdoor"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_auction", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_bb", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_auction"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_bb"), ActorRel(NonMatching, "d_a_bdk"), ActorRel(NonMatching, "d_a_bdkobj"), ActorRel(NonMatching, "d_a_bgn"), ActorRel(NonMatching, "d_a_bgn2"), ActorRel(NonMatching, "d_a_bgn3"), ActorRel(NonMatching, "d_a_bigelf"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_bk", extra_cflags=["-sym off"]), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_bk"), ActorRel(NonMatching, "d_a_bl"), ActorRel(NonMatching, "d_a_bmd"), ActorRel(NonMatching, "d_a_bmdfoot"), @@ -1553,18 +1553,18 @@ config.libs = [ ActorRel(NonMatching, "d_a_bst", extra_cflags=["-sym off"]), ActorRel(NonMatching, "d_a_btd"), ActorRel(NonMatching, "d_a_bwd"), - ActorRel(Equivalent, "d_a_bwdg", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_bwdg"), ActorRel(NonMatching, "d_a_bwds"), ActorRel(NonMatching, "d_a_daiocta"), ActorRel(NonMatching, "d_a_daiocta_eye"), - ActorRel(Matching, "d_a_deku_item", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_deku_item"), ActorRel(NonMatching, "d_a_dk"), ActorRel(Matching, "d_a_dummy"), ActorRel(NonMatching, "d_a_fallrock_tag"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_fan", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_fganon", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_fan"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_fganon"), ActorRel(NonMatching, "d_a_fgmahou"), - ActorRel(Matching, "d_a_fire", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_fire"), ActorRel(NonMatching, "d_a_fm"), ActorRel(NonMatching, "d_a_gm"), ActorRel(NonMatching, "d_a_gnd"), @@ -1573,14 +1573,14 @@ config.libs = [ ActorRel(NonMatching, "d_a_icelift"), ActorRel(NonMatching, "d_a_kb"), ActorRel(NonMatching, "d_a_kddoor"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_kita", extra_cflags=['-pragma "sym off"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_kita"), ActorRel(NonMatching, "d_a_klft"), ActorRel(NonMatching, "d_a_kmon"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_komore", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_lbridge", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_leaflift", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_komore"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_lbridge"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_leaflift"), ActorRel(NonMatching, "d_a_lstair"), - ActorRel(Matching, "d_a_machine", extra_cflags=['-sym off']), + ActorRel(Matching, "d_a_machine"), ActorRel(NonMatching, "d_a_mant"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_mbdoor"), ActorRel(NonMatching, "d_a_mgameboard"), @@ -1598,9 +1598,9 @@ config.libs = [ ActorRel(NonMatching, "d_a_npc_bmcon1"), ActorRel(NonMatching, "d_a_npc_bms1"), ActorRel(Equivalent, "d_a_npc_bmsw", extra_cflags=['-sym off']), - ActorRel(NonMatching, "d_a_npc_bs1"), # regalloc, weak func order - ActorRel(Equivalent, "d_a_npc_btsw", extra_cflags=['-pragma "nosyminline on"']), # weak func order - ActorRel(Equivalent, "d_a_npc_btsw2", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(NonMatching, "d_a_npc_bs1"), # regalloc + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_btsw"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_btsw2"), ActorRel(NonMatching, "d_a_npc_co1"), ActorRel(NonMatching, "d_a_npc_de1"), ActorRel(NonMatching, "d_a_npc_ds1"), @@ -1610,29 +1610,29 @@ config.libs = [ ActorRel(NonMatching, "d_a_npc_ho"), ActorRel(NonMatching, "d_a_npc_hr"), ActorRel(NonMatching, "d_a_npc_jb1"), - ActorRel(NonMatching, "d_a_npc_ji1", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Equivalent, "d_a_npc_kamome", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(NonMatching, "d_a_npc_ji1"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_kamome"), ActorRel(NonMatching, "d_a_npc_kf1"), ActorRel(NonMatching, "d_a_npc_kg1"), ActorRel(NonMatching, "d_a_npc_kg2"), ActorRel(NonMatching, "d_a_npc_kk1"), - ActorRel(Equivalent, "d_a_npc_km1", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_km1"), ActorRel(NonMatching, "d_a_npc_ko1"), ActorRel(NonMatching, "d_a_npc_kp1"), ActorRel(NonMatching, "d_a_npc_ls1"), ActorRel(NonMatching, "d_a_npc_mk"), ActorRel(NonMatching, "d_a_npc_mn"), ActorRel(NonMatching, "d_a_npc_mt"), - ActorRel(Equivalent, "d_a_npc_nz", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_nz"), ActorRel(NonMatching, "d_a_npc_ob1"), - ActorRel(Equivalent, "d_a_npc_os", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_os"), ActorRel(NonMatching, "d_a_npc_p1"), ActorRel(NonMatching, "d_a_npc_p2"), - ActorRel(NonMatching, "d_a_npc_people", extra_cflags=['-pragma "nosyminline on"']), # regalloc, weak func order + ActorRel(NonMatching, "d_a_npc_people"), # regalloc ActorRel(NonMatching, "d_a_npc_pf1"), - ActorRel(Equivalent, "d_a_npc_photo", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Equivalent, "d_a_npc_photo"), ActorRel(NonMatching, "d_a_npc_pm1"), - ActorRel(Equivalent, "d_a_npc_roten", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_roten"), ActorRel(NonMatching, "d_a_npc_rsh1"), ActorRel(NonMatching, "d_a_npc_sarace"), ActorRel(NonMatching, "d_a_npc_sv"), @@ -1646,9 +1646,9 @@ config.libs = [ ActorRel(NonMatching, "d_a_nz"), ActorRel(NonMatching, "d_a_obj_Itnak"), ActorRel(NonMatching, "d_a_obj_Vds"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_Vteng", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_Vteng"), ActorRel(NonMatching, "d_a_obj_YLzou"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_Yboil", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_Yboil"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_adnno"), ActorRel(NonMatching, "d_a_obj_ajav"), ActorRel(NonMatching, "d_a_obj_apzl"), @@ -1657,20 +1657,20 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_buoyflag"), ActorRel(NonMatching, "d_a_obj_buoyrace"), ActorRel(Matching, "d_a_obj_correct"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_dmgroom", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_dragonhead", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_dmgroom"), + ActorRel(Matching, "d_a_obj_dragonhead"), ActorRel(NonMatching, "d_a_obj_drift"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_eayogn"), - ActorRel(Matching, "d_a_obj_ebomzo", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_obj_ebomzo"), ActorRel(NonMatching, "d_a_obj_ekskz"), - ActorRel(Matching, "d_a_obj_eskban", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_ferris", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_figure", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_obj_eskban"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_ferris"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_figure"), ActorRel(NonMatching, "d_a_obj_firewall"), ActorRel(NonMatching, "d_a_obj_flame"), ActorRel(NonMatching, "d_a_obj_ftree"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_ganonbed", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gaship", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_ganonbed"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gaship"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gaship2"), ActorRel(NonMatching, "d_a_obj_gnnbtltaki"), ActorRel(NonMatching, "d_a_obj_gnndemotakie"), @@ -1678,41 +1678,41 @@ config.libs = [ ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_gong"), ActorRel(NonMatching, "d_a_obj_gtaki"), ActorRel(NonMatching, "d_a_obj_hami2"), - ActorRel(Matching, "d_a_obj_hami3"), + ActorRel(Matching, "d_a_obj_hami3"), ActorRel(Matching, "d_a_obj_hami4"), - ActorRel(Equivalent, "d_a_obj_hat"), # weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_hat"), ActorRel(Matching, "d_a_obj_hbrf1"), ActorRel(NonMatching, "d_a_obj_hcbh"), - ActorRel(Equivalent, "d_a_obj_hha"), # weak func order + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_hha"), ActorRel(NonMatching, "d_a_obj_hlift"), - ActorRel(Matching, "d_a_obj_homen", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_homensmoke", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_obj_homen"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_homensmoke"), ActorRel(NonMatching, "d_a_obj_hsehi1"), ActorRel(NonMatching, "d_a_obj_htetu1"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_iceisland", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_iceisland"), ActorRel(NonMatching, "d_a_obj_jump"), ActorRel(NonMatching, "d_a_obj_kanoke"), - ActorRel(Matching, "d_a_obj_ladder", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_obj_ladder"), ActorRel(NonMatching, "d_a_obj_light"), ActorRel(NonMatching, "d_a_obj_mkie"), - ActorRel(Matching, "d_a_obj_mkiek", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_mknjd", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_obj_mkiek"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_mknjd"), ActorRel(NonMatching, "d_a_obj_mmrr"), ActorRel(NonMatching, "d_a_obj_msdan"), ActorRel(NonMatching, "d_a_obj_msdan2"), ActorRel(NonMatching, "d_a_obj_msdan_sub"), ActorRel(NonMatching, "d_a_obj_msdan_sub2"), - ActorRel(Matching, "d_a_obj_mtest", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_obj_mtest"), ActorRel(Matching, "d_a_obj_nest"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_ojtree"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_ospbox", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_paper", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_ospbox"), + ActorRel(Matching, "d_a_obj_paper"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_pbka"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_pfall", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_pfall"), ActorRel(NonMatching, "d_a_obj_plant"), ActorRel(NonMatching, "d_a_obj_rflw"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_rforce"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_smplbg", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_smplbg"), ActorRel(NonMatching, "d_a_obj_tapestry"), ActorRel(NonMatching, "d_a_obj_tntrap"), ActorRel(Matching, "d_a_obj_tower"), @@ -1720,52 +1720,52 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_tribox"), ActorRel(NonMatching, "d_a_obj_try"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_usovmc"), - ActorRel(Matching, "d_a_obj_vfan", extra_cflags=[ '-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_vgnfd", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_obj_vmc", extra_cflags=["-sym off"]), + ActorRel(Matching, "d_a_obj_vfan"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_vgnfd"), + ActorRel(Matching, "d_a_obj_vmc"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_vmsdz"), ActorRel(Matching, "d_a_obj_vmsms"), ActorRel(NonMatching, "d_a_obj_volcano"), ActorRel(NonMatching, "d_a_obj_vtil"), ActorRel(NonMatching, "d_a_obj_vyasi"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_xfuta"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_zouK", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_zouK"), ActorRel(NonMatching, "d_a_oship"), ActorRel(NonMatching, "d_a_ph"), ActorRel(NonMatching, "d_a_pt"), ActorRel(NonMatching, "d_a_pw"), ActorRel(NonMatching, "d_a_pz"), - ActorRel(Equivalent, "d_a_sail", extra_cflags=['-pragma "nosyminline on"']), # weak func order + ActorRel(Matching, "d_a_sail"), ActorRel(NonMatching, "d_a_salvage_tbox"), ActorRel(Matching, "d_a_scene_change"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_shutter", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_shutter"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_shutter2"), ActorRel(NonMatching, "d_a_st"), - ActorRel(Matching, "d_a_steam_tag", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_swattack", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(Matching, "d_a_switem", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(Matching, "d_a_steam_tag"), + ActorRel(Matching, "d_a_swattack"), + ActorRel(Matching, "d_a_switem"), ActorRel(NonMatching, "d_a_swpropeller"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_swtact"), ActorRel(Matching, "d_a_tag_etc"), ActorRel(Matching, "d_a_tag_island"), ActorRel(NonMatching, "d_a_tag_kf1"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tag_ret", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tag_ret"), ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tag_volcano"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_title", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_title"), ActorRel(NonMatching, "d_a_tn"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_toge", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tori_flag", extra_cflags=['-pragma "nosyminline on"']), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_wall", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_toge"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tori_flag"), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_wall"), ActorRel(Matching, "d_a_warpfout"), ActorRel(NonMatching, "d_a_warpgn"), ActorRel(NonMatching, "d_a_warpls"), ActorRel(NonMatching, "d_a_warpmj"), ActorRel(NonMatching, "d_a_waterfall"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_windmill", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_windmill"), ActorRel(NonMatching, "d_a_wz"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_ygcwp", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_ygcwp"), ActorRel(NonMatching, "d_a_yougan"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_ghostship", extra_cflags=['-pragma "nosyminline on"']), + ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_ghostship"), ActorRel(NonMatching, "d_a_movie_player", extra_cflags=["-O3,p"]), ] diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h index cfef2c1ce..96f7b02c9 100644 --- a/include/d/actor/d_a_agb.h +++ b/include/d/actor/d_a_agb.h @@ -10,40 +10,6 @@ #include "m_Do/m_Do_hostIO.h" #include "f_op/f_op_msg.h" -class daAgb_HIO_c : public mDoHIO_entry_c { -public: - daAgb_HIO_c(); - virtual ~daAgb_HIO_c() {} - - void genMessage(JORMContext* ctx); - -public: - /* 0x04 */ J3DGXColorS10 field_0x04[2]; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1c; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2c; - /* 0x30 */ f32 field_0x30; -}; - -class dMsgCtrl_c { -public: - int init(u16); - int execute(); - ~dMsgCtrl_c() {} - - int getSelectNum() { return mpMsg->mSelectNum; } - void setMsgStatus(u16 status) { mpMsg->mStatus = status; } - -public: - /* 0x00 */ u16 field_0x0; - /* 0x04 */ fpc_ProcID mMsgID; - /* 0x08 */ msg_class* mpMsg; -}; - class daAgb_c : public fopAc_ac_c { public: struct daAgb_BmRp_c { diff --git a/include/d/actor/d_a_bomb.h b/include/d/actor/d_a_bomb.h index bd8b16f8e..024b46003 100644 --- a/include/d/actor/d_a_bomb.h +++ b/include/d/actor/d_a_bomb.h @@ -55,8 +55,6 @@ class daBomb_c : public fopAc_ac_c { public: typedef bool(daBomb_c::*procFunc)(); - daBomb_c() {} - void draw_norm(); void draw_nut(); BOOL draw(); diff --git a/include/d/actor/d_a_hookshot.h b/include/d/actor/d_a_hookshot.h index 2390b8d68..95f003414 100644 --- a/include/d/actor/d_a_hookshot.h +++ b/include/d/actor/d_a_hookshot.h @@ -48,7 +48,6 @@ public: void offObjHookFlg() { mObjHookFlg = FALSE; } bool checkShipRideFlg() const { return mShipRideFlg; } - daHookshot_c() {} BOOL draw(); BOOL procWait_init(BOOL); BOOL procWait(); diff --git a/include/d/actor/d_a_kanban.h b/include/d/actor/d_a_kanban.h index 0ee9bd472..ae192a7b0 100644 --- a/include/d/actor/d_a_kanban.h +++ b/include/d/actor/d_a_kanban.h @@ -48,18 +48,4 @@ struct kanban_class { /* 0x5B0 */ dCcD_Cyl m5B0; }; // size = 0x6E0 -class daKanban_HIO_c : public mDoHIO_entry_c { -public: - daKanban_HIO_c(); - virtual ~daKanban_HIO_c() {} - - void genMessage(JORMContext* ctx); - -public: - /* 0x04 */ f32 m04; - /* 0x08 */ s16 m08; - /* 0x0A */ s16 m0A; - /* 0x0C */ f32 m0C; -}; // size = 0x10 - #endif /* D_A_KANBAN_H */ diff --git a/include/d/actor/d_a_knob00.h b/include/d/actor/d_a_knob00.h index d306bb253..48d0ae1d5 100644 --- a/include/d/actor/d_a_knob00.h +++ b/include/d/actor/d_a_knob00.h @@ -66,7 +66,7 @@ public: /* 0x2FC */ s8 m_jnt; /* 0x2FD */ u8 m2FD[0x300 - 0x2FD]; /* 0x300 */ dBgW* mpBgW; - /* 0x304 */ u8 m304[0x310 - 0x304]; + /* 0x304 */ dDoor_stop_c mStopBars; /* 0x310 */ u8 mAction; /* 0x311 */ u8 m311[0x312 - 0x311]; /* 0x312 */ u16 m312; diff --git a/include/d/actor/d_a_npc_bs1.h b/include/d/actor/d_a_npc_bs1.h index d0998d83b..f95e5a8cc 100644 --- a/include/d/actor/d_a_npc_bs1.h +++ b/include/d/actor/d_a_npc_bs1.h @@ -166,35 +166,4 @@ public: /* 0x840 */ u32 m840; }; // Size: 0x844 -class daNpc_Bs1_childHIO_c { -public: - daNpc_Bs1_childHIO_c(); - virtual ~daNpc_Bs1_childHIO_c() {} - -public: - /* 0x000 */ // this.__vt - /* 0x004 */ dNpc_HIO_c mNpc; - /* 0x02C */ u8 m2C; - /* 0x02D */ u8 m2D[0x3]; - /* 0x030 */ f32 m30; - /* 0x034 */ f32 m34; - /* 0x038 */ f32 m38; - /* 0x03C */ f32 m3C; - /* 0x040 */ f32 m40; -}; // Size: 0x44 - -class daNpc_Bs1_HIO_c : public JORReflexible { -public: - daNpc_Bs1_HIO_c(); - virtual ~daNpc_Bs1_HIO_c() {} - - void genMessage(JORMContext* ctx); - -public: - /* 0x000 */ // this.__vt - /* 0x004 */ s8 mNo; - /* 0x008 */ int m8; - /* 0x00C */ daNpc_Bs1_childHIO_c mChild[2]; -}; // Size: 0x94 - #endif /* D_A_NPC_BS1_H */ diff --git a/include/d/actor/d_a_npc_btsw.h b/include/d/actor/d_a_npc_btsw.h index d84a967ac..d22dd3c56 100644 --- a/include/d/actor/d_a_npc_btsw.h +++ b/include/d/actor/d_a_npc_btsw.h @@ -211,35 +211,4 @@ public: /* 0x9CE */ u8 field_0x9CE[0x9D0 - 0x9CE]; }; // Size: 0x9D0 -class daNpc_Btsw_HIO_c : public JORReflexible { -public: - daNpc_Btsw_HIO_c(); - virtual ~daNpc_Btsw_HIO_c() {} - - void genMessage(JORMContext* ctx); - -public: - /* 0x04 */ s8 mNo; - /* 0x05 */ u8 field_0x05[0x08 - 0x05]; - /* 0x08 */ dNpc_HIO_c mNpc; - /* 0x30 */ s16 field_0x30; - /* 0x32 */ s16 field_0x32; - /* 0x34 */ s16 field_0x34; - /* 0x36 */ s16 r_1; - /* 0x38 */ s16 g_1; - /* 0x3A */ s16 b_1; - /* 0x3C */ s16 r_2; - /* 0x3E */ s16 g_2; - /* 0x40 */ s16 b_2; - /* 0x42 */ u8 field_0x42[0x44 - 0x42]; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4C; - /* 0x50 */ f32 field_0x50; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ u8 field_0x58; - /* 0x59 */ u8 field_0x59[0x5C - 0x59]; - /* 0x5C */ f32 field_0x5C; -}; // Size: 0x60 - #endif /* D_A_NPC_BTSW_H */ diff --git a/include/d/actor/d_a_npc_btsw2.h b/include/d/actor/d_a_npc_btsw2.h index 54967c8c4..532a30c13 100644 --- a/include/d/actor/d_a_npc_btsw2.h +++ b/include/d/actor/d_a_npc_btsw2.h @@ -88,20 +88,4 @@ public: /* 0x74A */ s8 mActionStatus; }; -class daNpc_Btsw2_HIO_c { -public: - daNpc_Btsw2_HIO_c(); - virtual ~daNpc_Btsw2_HIO_c() {} - -public: - /* 0x04 */ s8 mNo; - /* 0x08 */ dNpc_HIO_c mNpc; - /* 0x30 */ s16 m30; - /* 0x32 */ s16 m32; - /* 0x34 */ f32 m34; - /* 0x38 */ f32 m38; - /* 0x3C */ s16 m3C; - /* 0x3E */ s16 m3E; -}; - #endif /* D_A_NPC_BTSW2_H */ diff --git a/include/d/actor/d_a_npc_fa1.h b/include/d/actor/d_a_npc_fa1.h index 416ffe7f5..be44fd03e 100644 --- a/include/d/actor/d_a_npc_fa1.h +++ b/include/d/actor/d_a_npc_fa1.h @@ -182,87 +182,4 @@ public: /* 0x7A0 */ f32 m7A0; }; -class daNpc_Fa1_HIO3_c { -public: - struct hio_prm_c { - // Note: Offsets are relative to daNpc_Fa1_HIO3_c instead of hio_prm_c for convenience. - /* 0x08 */ f32 m08; - /* 0x0C */ f32 m0C; - /* 0x10 */ f32 m10; - /* 0x14 */ f32 m14; - /* 0x18 */ s16 m18; - }; - - daNpc_Fa1_HIO3_c(); - virtual ~daNpc_Fa1_HIO3_c() {}; - -public: - /* 0x04 */ s8 mNo; - /* 0x08 */ hio_prm_c prm; -}; - -class daNpc_Fa1_HIO2_c { -public: - struct hio_prm_c { - // Note: Offsets are relative to daNpc_Fa1_HIO2_c instead of hio_prm_c for convenience. - /* 0x08 */ f32 m08; - /* 0x0C */ f32 m0C; - /* 0x10 */ f32 m10; - /* 0x14 */ f32 m14; - /* 0x18 */ f32 m18; - /* 0x1C */ f32 m1C; - /* 0x20 */ s16 m20; - /* 0x22 */ s16 m22; - /* 0x24 */ s16 m24; - }; - - daNpc_Fa1_HIO2_c(); - virtual ~daNpc_Fa1_HIO2_c() {}; - -public: - /* 0x04 */ s8 mNo; - /* 0x08 */ hio_prm_c prm; -}; - -class daNpc_Fa1_HIO_c : public JORReflexible { -public: - struct hio_prm_c { - // Note: Offsets are relative to daNpc_Fa1_HIO_c instead of hio_prm_c for convenience. - /* 0x08 */ f32 m08; - /* 0x0C */ f32 m0C; - /* 0x10 */ f32 m10; - /* 0x14 */ f32 m14; - /* 0x18 */ f32 m18; - /* 0x1C */ f32 m1C; - /* 0x20 */ f32 m20; - /* 0x24 */ f32 m24; - /* 0x28 */ f32 m28; - /* 0x2C */ f32 m2C; - /* 0x30 */ f32 m30; - /* 0x34 */ f32 m34; - /* 0x38 */ f32 m38; - /* 0x3C */ s16 m3C; - /* 0x3E */ s16 m3E; - /* 0x40 */ s16 m40; - /* 0x42 */ s16 m42; - /* 0x44 */ s16 m44; - /* 0x46 */ s16 m46; - /* 0x48 */ s16 m48; - /* 0x4A */ s16 m4A; - /* 0x4C */ s16 m4C; - /* 0x4E */ s16 m4E; - }; - - daNpc_Fa1_HIO_c(); - virtual ~daNpc_Fa1_HIO_c() {}; - - void genMessage(JORMContext* ctx); - -public: - /* 0x04 */ s8 mNo; - /* 0x08 */ hio_prm_c prm; - /* 0x50 */ daNpc_Fa1_HIO2_c m50; - /* 0x78 */ daNpc_Fa1_HIO3_c m78; -}; - #endif /* D_A_NPC_FA1_H */ diff --git a/include/d/actor/d_a_npc_kamome.h b/include/d/actor/d_a_npc_kamome.h index f490d677c..2eee198ea 100644 --- a/include/d/actor/d_a_npc_kamome.h +++ b/include/d/actor/d_a_npc_kamome.h @@ -8,56 +8,6 @@ class JORMContext; class daNpc_kam_c; -class daNpc_kam_HIO1_c { -public: - daNpc_kam_HIO1_c(); - virtual ~daNpc_kam_HIO1_c() {} - - void genMessage(JORMContext*); - -public: - /* 0x04 */ f32 mSpeedF; - /* 0x08 */ f32 mUnused08; - /* 0x0C */ f32 mFlappingSpeedF; - /* 0x10 */ f32 mAccelF; - /* 0x14 */ s16 mGlidingAngVelY; - /* 0x16 */ s16 mGlidingAngVelX; - /* 0x18 */ s16 mMaxAngleZ; - /* 0x1A */ s16 mFlappingAngVelY; - /* 0x1C */ s16 mFlappingAngVelX; - /* 0x1E */ s16 mAngVelStepScale; - /* 0x20 */ s16 mAngVelMaxStep; - /* 0x22 */ s16 mAngVelMinStep; - /* 0x24 */ s16 mFlapDuration; - /* 0x26 */ s16 mFlapExhaustedDuration; - /* 0x28 */ s16 mFlapEnergyDuration; -}; // Size: 0x2C - -class daNpc_kam_HIO_c : public JORReflexible { -public: - struct hio_prm_c { - // Note: Offsets are relative to daNpc_kam_HIO_c instead of hio_prm_c for convenience. - /* 0x08 */ f32 m08; - /* 0x0C */ f32 m0C; - /* 0x10 */ f32 m10; - /* 0x14 */ f32 m14; - /* 0x18 */ f32 m18; - /* 0x1C */ s16 m1C; - /* 0x1E */ u8 m1E; - }; // Size: 0x18 - - daNpc_kam_HIO_c(); - virtual ~daNpc_kam_HIO_c() {} - - void genMessage(JORMContext* ctx); - -public: - /* 0x04 */ s8 mNo; - /* 0x08 */ hio_prm_c prm; - /* 0x20 */ daNpc_kam_c* mpActor; - /* 0x24 */ daNpc_kam_HIO1_c mHio1; -}; // Size: 0x50 - class daNpc_kam_c : public daPy_npc_c { public: enum ActionStatus { @@ -103,7 +53,6 @@ public: void setBaseMtx(); BOOL createHeap(); cPhs_State create(); - daNpc_kam_c() {} BOOL init(); BOOL setAction(ActionFunc*, ActionFunc, void*); void npcAction(void*); diff --git a/include/d/actor/d_a_npc_km1.h b/include/d/actor/d_a_npc_km1.h index c80e46154..5ae7f16d4 100644 --- a/include/d/actor/d_a_npc_km1.h +++ b/include/d/actor/d_a_npc_km1.h @@ -132,35 +132,4 @@ public: /* 0x7D7 */ s8 field_0x7D7; }; // Size: 0x7D8 -class daNpc_Km1_HIO_c : public JORReflexible{ -public: - struct hio_prm_c { - s16 field_0; - s16 field_2; - s16 field_4; - s16 field_6; - s16 field_8; - s16 field_A; - s16 field_C; - s16 field_E; - s16 field_10; - s16 field_12; - f32 mAttentionArrowYOffset; - f32 field_18; - }; // Size: 0x1C - - daNpc_Km1_HIO_c(); - virtual ~daNpc_Km1_HIO_c() {}; - - void genMessage(JORMContext* ctx); - -public: - /* 0x04 */ s8 mNo; - /* 0x05 */ s8 field_0x5; - /* 0x06 */ s8 field_0x6; - /* 0x07 */ s8 field_0x7; - /* 0x08 */ int field_0x8; - /* 0x0C */ hio_prm_c mPrmTbl; -}; - #endif /* D_A_NPC_KM1_H */ diff --git a/include/d/actor/d_a_npc_nz.h b/include/d/actor/d_a_npc_nz.h index 1f4564026..ced87719c 100644 --- a/include/d/actor/d_a_npc_nz.h +++ b/include/d/actor/d_a_npc_nz.h @@ -111,30 +111,4 @@ public: /* 0xA90 */ s16 field_0xA90; }; // Size: 0xA92 -class daNpc_Nz_HIO_c : public JORReflexible { -public: - daNpc_Nz_HIO_c(); - virtual ~daNpc_Nz_HIO_c() {} - - void genMessage(JORMContext* ctx); - -public: - /* 0x00 - vtable */ - /* 0x04 */ s8 mNo; - /* 0x06 */ s16 field_0x06; - /* 0x08 */ s16 field_0x08; - /* 0x0A */ s16 field_0x0A; - /* 0x0C */ s16 field_0x0C; - /* 0x0E */ s16 field_0x0E; - /* 0x10 */ s16 field_0x10; - /* 0x12 */ s16 field_0x12; - /* 0x14 */ s16 field_0x14; - /* 0x16 */ s16 field_0x16; - /* 0x18 */ s16 field_0x18; - /* 0x1A */ s8 field_0x1A; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; -}; // Size: 0x28 - #endif /* D_A_NPC_NZ_H */ diff --git a/include/d/actor/d_a_npc_os.h b/include/d/actor/d_a_npc_os.h index 13fd2e39a..10cec0130 100644 --- a/include/d/actor/d_a_npc_os.h +++ b/include/d/actor/d_a_npc_os.h @@ -14,6 +14,8 @@ namespace daPedestal { class daPds_c; } class daNpc_Os_infiniteEcallBack_c : public dPa_levelEcallBack { public: + ~daNpc_Os_infiniteEcallBack_c() {} + void end(); void makeEmitter(u16, const cXyz*, const csXyz*, const cXyz*); void execute(JPABaseEmitter*) {} @@ -31,7 +33,6 @@ class daNpc_Os_c : public daPy_npc_c { public: typedef int(daNpc_Os_c::*ActionFunc_t)(void*); - daNpc_Os_c() {} ~daNpc_Os_c(); BOOL chkNpcAction(ActionFunc_t action) { return mNpcAction == action; @@ -226,66 +227,4 @@ private: /* 0x7FC */ cBgS_PolyInfo field_0x7FC; }; // Size: 0x80C -class daNpc_Os_HIO2_c : public JORReflexible { -public: - daNpc_Os_HIO2_c(); - virtual ~daNpc_Os_HIO2_c() {} - - void genMessage(JORMContext* ctx); - -public: - /* 0x00 - vtable */ - - /* 0x04 */ f32 field_0x04; - /* 0x08 */ f32 field_0x08; - /* 0x0C */ f32 field_0x0C; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ s16 field_0x24; - /* 0x26 */ s16 field_0x26; - /* 0x28 */ s16 field_0x28; -}; // Size: 0x2A - -class daNpc_Os_HIO_c : public JORReflexible { -public: - daNpc_Os_HIO_c(); - virtual ~daNpc_Os_HIO_c() {} - - void genMessage(JORMContext* ctx); - -public: - /* 0x00 - vtable*/ - - /* 0x04 */ s8 mNo; - - /* 0x08 */ daNpc_Os_HIO2_c mOs2; - /* 0x34 */ dNpc_HIO_c mNpc; - - /* 0x5C */ daNpc_Os_c* field_0x5C; - /* 0x60 */ f32 field_0x60; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; - /* 0x6C */ f32 field_0x6C; - /* 0x70 */ f32 field_0x70; - /* 0x74 */ f32 field_0x74; - /* 0x78 */ f32 field_0x78; - /* 0x7C */ f32 field_0x7C; - /* 0x80 */ f32 field_0x80; - /* 0x84 */ f32 field_0x84; - /* 0x88 */ f32 field_0x88; - /* 0x8C */ f32 field_0x8C; - /* 0x90 */ f32 field_0x90; - /* 0x94 */ f32 field_0x94; - /* 0x98 */ f32 field_0x98; - /* 0x9C */ f32 field_0x9C; - /* 0xA0 */ f32 field_0xA0; - /* 0xA4 */ f32 field_0xA4; - /* 0xA8 */ f32 field_0xA8; - /* 0xAC */ f32 field_0xAC; - /* 0xB0 */ f32 field_0xB0; -}; // Size: 0xB4 - #endif /* D_A_NPC_OS_H */ diff --git a/include/d/actor/d_a_obj_eff.h b/include/d/actor/d_a_obj_eff.h index 263e865e5..67eb1085d 100644 --- a/include/d/actor/d_a_obj_eff.h +++ b/include/d/actor/d_a_obj_eff.h @@ -10,7 +10,6 @@ namespace daObjEff { class Act_c : public fopAc_ac_c { public: - typedef BOOL (Act_c::*Proc)(); typedef void (Act_c::*voidProc)(); typedef bool (Act_c::*HeapProc)(); diff --git a/include/d/actor/d_a_obj_hha.h b/include/d/actor/d_a_obj_hha.h index d1a0b6405..fe643d697 100644 --- a/include/d/actor/d_a_obj_hha.h +++ b/include/d/actor/d_a_obj_hha.h @@ -40,8 +40,6 @@ public: class daObjHhaSplash_c { public: - daObjHhaSplash_c() {} - ~daObjHhaSplash_c() {} cXyz get_base_pos() { return mBasePos; }; cXyz get_pos() { return mPos; }; diff --git a/include/d/actor/d_a_obj_movebox.h b/include/d/actor/d_a_obj_movebox.h index 21746632a..dfef72383 100644 --- a/include/d/actor/d_a_obj_movebox.h +++ b/include/d/actor/d_a_obj_movebox.h @@ -6,6 +6,7 @@ #include "d/d_bg_s_wtr_chk.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_bg_w.h" +#include "d/d_particle.h" struct dPath; diff --git a/include/d/actor/d_a_obj_pirateship.h b/include/d/actor/d_a_obj_pirateship.h index 92f9ac238..b549ead2d 100644 --- a/include/d/actor/d_a_obj_pirateship.h +++ b/include/d/actor/d_a_obj_pirateship.h @@ -3,6 +3,7 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_bg_s_acch.h" +#include "d/d_particle.h" #include "f_op/f_op_actor.h" #include "d/d_bg_s_gnd_chk.h" diff --git a/include/d/actor/d_a_obj_toripost.h b/include/d/actor/d_a_obj_toripost.h index cc8470631..d16a50bba 100644 --- a/include/d/actor/d_a_obj_toripost.h +++ b/include/d/actor/d_a_obj_toripost.h @@ -117,20 +117,4 @@ private: /* 0x8F7 */ s8 mEventIdx; }; -class daObjTpost_HIO_c { -public: - daObjTpost_HIO_c(); - virtual ~daObjTpost_HIO_c() {} - - /* 0x04 */ s8 mNo; - /* 0x05 */ bool debug_draw; - /* 0x06 */ s8 field_0x06; - /* 0x07 */ u8 field_0x07; - /* 0x08 */ f32 attn_pos_offset; - /* 0x0C */ f32 eye_pos_offset; - /* 0x10 */ f32 talk_distance; - /* 0x14 */ s16 field_0x14; - /* 0x16 */ s16 field_0x16; -}; - #endif /* D_A_OBJ_TORIPOST_H */ diff --git a/include/d/actor/d_a_pirate_flag.h b/include/d/actor/d_a_pirate_flag.h index cd24a5693..3ca8b17bf 100644 --- a/include/d/actor/d_a_pirate_flag.h +++ b/include/d/actor/d_a_pirate_flag.h @@ -50,39 +50,6 @@ public: /* 0x87F */ u8 m87F; }; -class daPirate_Flag_HIO_c : public JORReflexible { -public: - daPirate_Flag_HIO_c() { - mNo = -1; - m06 = 0; - m1C = 0.0f; - m05 = 0; - m07 = 0; - m08 = 0x40; - m0C = 13.0f; - m10 = 7.0f; - m14 = -3.5f; - m18 = 0.45f; - } - virtual ~daPirate_Flag_HIO_c() { - mNo = -1; - } - - void genMessage(JORMContext* ctx); - -public: - /* 0x04 */ s8 mNo; - /* 0x05 */ u8 m05; - /* 0x06 */ u8 m06; - /* 0x07 */ u8 m07; - /* 0x08 */ s32 m08; - /* 0x0C */ f32 m0C; - /* 0x10 */ f32 m10; - /* 0x14 */ f32 m14; - /* 0x18 */ f32 m18; - /* 0x1C */ f32 m1C; -}; - class pirate_flag_class : public fopAc_ac_c { public: /* 0x290 */ request_of_phase_process_class mPhs1; diff --git a/include/d/actor/d_a_rd.h b/include/d/actor/d_a_rd.h index ee03bc857..7953ab33e 100644 --- a/include/d/actor/d_a_rd.h +++ b/include/d/actor/d_a_rd.h @@ -7,46 +7,6 @@ #include "SSystem/SComponent/c_phase.h" #include "c/c_damagereaction.h" -class daRd_HIO_c : public mDoHIO_entry_c { -public: - daRd_HIO_c(); - virtual ~daRd_HIO_c() {} - - void genMessage(JORMContext* ctx); - -public: - /* 0x04 */ dNpc_HIO_c mNpc; - /* 0x2C */ u8 m2C; - /* 0x2D */ u8 m2D[0x30 - 0x2D]; - /* 0x30 */ f32 m30; - /* 0x34 */ f32 m34; - /* 0x38 */ f32 mCryRadius; - /* 0x3C */ f32 mAttackRadius; - /* 0x40 */ s16 m40; - /* 0x42 */ s16 mCrySpreadAngle; - /* 0x44 */ s16 mAttackSpreadAngle; - /* 0x46 */ s16 m46; - /* 0x48 */ s16 m48; - /* 0x4A */ s16 m4A; - /* 0x4C */ s16 m4C; - /* 0x4E */ s16 m4E; - /* 0x50 */ s16 m50; - /* 0x52 */ s16 m52; - /* 0x54 */ s16 m54; - /* 0x56 */ u8 m56[0x58 - 0x56]; - /* 0x58 */ f32 m58; - /* 0x5C */ f32 m5C; - /* 0x60 */ f32 m60; - /* 0x64 */ f32 m64; - /* 0x68 */ f32 m68; - /* 0x6C */ f32 mReturnWalkSpeed; - /* 0x70 */ f32 m70; - /* 0x74 */ f32 m74; - /* 0x78 */ s16 m78; - /* 0x7A */ s16 mParalysisDuration; - /* 0x7C */ JntHit_HIO_c m7C; -}; - class daRd_c #if VERSION == VERSION_DEMO : public fopAc_ac_c @@ -118,7 +78,6 @@ public: static const char m_arc_name[]; static const dCcD_SrcCyl m_cyl_src; - daRd_c() {} bool isAnm(s8 idx) { return mAnmPrmIdx == idx; } void onIkari() { mbIkari = true; } void offIkari() { mbIkari = false; } diff --git a/include/d/actor/d_a_sail.h b/include/d/actor/d_a_sail.h index 096161746..8ab8001b8 100644 --- a/include/d/actor/d_a_sail.h +++ b/include/d/actor/d_a_sail.h @@ -65,30 +65,4 @@ public: /* 0x02A0 */ daSail_packet_c mSailPacket; }; -class daSail_HIO_c : public JORReflexible { -public: - daSail_HIO_c() { - mNo = -1; - m05 = 1; - m06 = 1; - m10 = 0.0f; - m07 = 0; - } - virtual ~daSail_HIO_c() { - mNo = -1; - } - - void genMessage(JORMContext* ctx); - -public: - /* 0x04 */ s8 mNo; - /* 0x05 */ u8 m05; - /* 0x06 */ u8 m06; - /* 0x07 */ u8 m07; - /* 0x08 */ u8 m08; - /* 0x09 */ u8 m09[0x0C - 0x09]; - /* 0x0C */ f32 m0C; - /* 0x10 */ f32 m10; -}; - #endif /* D_A_SAIL_H */ diff --git a/include/d/actor/d_a_tag_kk1.h b/include/d/actor/d_a_tag_kk1.h index 1c49bccb3..bea93b761 100644 --- a/include/d/actor/d_a_tag_kk1.h +++ b/include/d/actor/d_a_tag_kk1.h @@ -18,23 +18,4 @@ public: /* 0x6C6 */ bool mNameIsWrong; }; // Size: 0x6C8 - -class daTag_Kk1_HIO_c : public JORReflexible { -public: - struct hio_prm_c { - /* 0x08 */ f32 mHorizontalDistance; - /* 0x0C */ f32 mVerticalDistance; - /* 0x10 */ u8 field_0x10; - }; - - daTag_Kk1_HIO_c(); - virtual ~daTag_Kk1_HIO_c() {}; - - void genMessage(JORMContext* ctx); - -public: - /* 0x04 */ s8 mNo; - /* 0x08 */ hio_prm_c prm; -}; - #endif /* D_A_TAG_KK1_H */ diff --git a/include/d/d_bg_s_movebg_actor.h b/include/d/d_bg_s_movebg_actor.h index 5278a24a3..8996ecb32 100644 --- a/include/d/d_bg_s_movebg_actor.h +++ b/include/d/d_bg_s_movebg_actor.h @@ -3,13 +3,7 @@ #include "SSystem/SComponent/c_bg_s_poly_info.h" #include "f_op/f_op_actor.h" -// Fakematch to fix weak func order/.text section splitting of some TUs that include this header. -// Some affected TUs: d_a_hys, d_a_obj_swhammer, d_a_obj_eskban, d_a_obj_mtest, d_a_obj_movebox. -#pragma push -#pragma sym off #include "d/d_a_obj.h" -#include "d/d_particle.h" -#pragma pop class dBgW; typedef void (*MoveBGActor_SetFunc)(dBgW*, void*, cBgS_PolyInfo&, bool, cXyz*, csXyz*, csXyz*); diff --git a/include/d/d_shop.h b/include/d/d_shop.h index 5ae09e933..e446c29cf 100644 --- a/include/d/d_shop.h +++ b/include/d/d_shop.h @@ -114,7 +114,6 @@ public: mItemIsSoldOut[i] = false; } } - ~ShopItems_c() {} BOOL isSoldOutItem(s16 i) { return mItemIsSoldOut[i] == true; } BOOL isHide() { return mbIsHide; } diff --git a/include/d/dolzel.pch b/include/d/dolzel.pch index 7daa3283d..323321146 100644 --- a/include/d/dolzel.pch +++ b/include/d/dolzel.pch @@ -1,10 +1,25 @@ #ifndef DOLZEL_PCH #define DOLZEL_PCH +// Fixes weak .data #include "math.h" // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DJoint.h" // IWYU pragma: export + +// Fixes weak .bss #include "weak_bss_936_to_1036.h" // IWYU pragma: keep #include "weak_bss_3569.h" // IWYU pragma: keep +// Fixes weak function ordering +#include "d/d_com_inf_game.h" // IWYU pragma: export +#include "SSystem/SComponent/c_xyz.h" // IWYU pragma: export +#include "d/d_cc_d.h" // IWYU pragma: export +#include "d/d_bg_s_acch.h" // IWYU pragma: export +#include "SSystem/SComponent/c_lib.h" // IWYU pragma: export +#include "JSystem/JKernel/JKRHeap.h" // IWYU pragma: export +#include "JSystem/JKernel/JKRFileFinder.h" // IWYU pragma: export +#include "d/d_bg_s_lin_chk.h" // IWYU pragma: export +#include "m_Do/m_Do_hostIO.h" // IWYU pragma: export +#include "d/d_cc_uty.h" // IWYU pragma: export + #endif /* DOLZEL_PCH */ diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index aa2ab1a50..35b9c841e 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -611,8 +611,6 @@ void* fopAcM_fastCreateItem(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_an void* fopAcM_createStealItem(cXyz* p_pos, int i_tblNo, int i_roomNo, csXyz* p_angle, int i_itemBitNo); -BOOL stealItem_CB(void* actor); - fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo); fpc_ProcID fopAcM_createDisappear(fopAc_ac_c* i_actor, cXyz* p_pos, u8 i_scale, u8 i_dropType, u8 i_itemBitNo = -1); diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 0ee2528dd..38ccd472b 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -26,6 +26,40 @@ #include "d/actor/d_a_bomb.h" #include "stdio.h" +class daAgb_HIO_c : public mDoHIO_entry_c { +public: + daAgb_HIO_c(); + virtual ~daAgb_HIO_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x04 */ J3DGXColorS10 field_0x04[2]; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; +}; + +class dMsgCtrl_c { +public: + int init(u16); + int execute(); + ~dMsgCtrl_c() {} + + int getSelectNum() { return mpMsg->mSelectNum; } + void setMsgStatus(u16 status) { mpMsg->mStatus = status; } + +public: + /* 0x00 */ u16 field_0x0; + /* 0x04 */ fpc_ProcID mMsgID; + /* 0x08 */ msg_class* mpMsg; +}; + static mDoDvdThd_toMainRam_c* l_gbaCommand; int daAgb_c::mEffect; diff --git a/src/d/actor/d_a_hys.cpp b/src/d/actor/d_a_hys.cpp index 8b4129959..9267bc6e9 100644 --- a/src/d/actor/d_a_hys.cpp +++ b/src/d/actor/d_a_hys.cpp @@ -222,9 +222,6 @@ static BOOL daHys_Draw(void* i_this) { return ((daHys_c*)i_this)->MoveBGDraw(); } -// Fakematch to fix weak func order/.text section splitting of dBgS_MoveBgActor::Draw(). -#pragma nosyminline off - /* 00000C08-00000C28 .text daHys_Execute__FPv */ static BOOL daHys_Execute(void* i_this) { return ((daHys_c*)i_this)->MoveBGExecute(); diff --git a/src/d/actor/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp index 4066d3903..56fe843be 100644 --- a/src/d/actor/d_a_kanban.cpp +++ b/src/d/actor/d_a_kanban.cpp @@ -19,9 +19,23 @@ #include "d/d_com_inf_game.h" #include "d/res/res_kanban.h" +class daKanban_HIO_c : public mDoHIO_entry_c { +public: + daKanban_HIO_c(); + virtual ~daKanban_HIO_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x04 */ f32 m04; + /* 0x08 */ s16 m08; + /* 0x0A */ s16 m0A; + /* 0x0C */ f32 m0C; +}; // size = 0x10 + static daKanban_HIO_c l_HIO; -static s32 target_info_count; static fopAc_ac_c* target_info[10]; +static s32 target_info_count; static s16 pl_cut_real_no_dt[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}; static s16 pl_cut_no_dt[] = {255, 0, 4, 3, 3, 1, 0, 4, 4, 4, 1, 3, 1, 3, 1, 1, 1, 3, 1, 1, 0, 1, 0, 1, 0, 1, 1, 4, 0, 1, 1, 1}; diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index cba9010dd..0ecf78147 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -23,6 +23,37 @@ #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_controller_pad.h" +class daNpc_Bs1_childHIO_c { +public: + daNpc_Bs1_childHIO_c(); + virtual ~daNpc_Bs1_childHIO_c() {} + +public: + /* 0x000 */ // this.__vt + /* 0x004 */ dNpc_HIO_c mNpc; + /* 0x02C */ u8 m2C; + /* 0x02D */ u8 m2D[0x3]; + /* 0x030 */ f32 m30; + /* 0x034 */ f32 m34; + /* 0x038 */ f32 m38; + /* 0x03C */ f32 m3C; + /* 0x040 */ f32 m40; +}; // Size: 0x44 + +class daNpc_Bs1_HIO_c : public JORReflexible { +public: + daNpc_Bs1_HIO_c(); + virtual ~daNpc_Bs1_HIO_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x000 */ // this.__vt + /* 0x004 */ s8 mNo; + /* 0x008 */ int m8; + /* 0x00C */ daNpc_Bs1_childHIO_c mChild[2]; +}; // Size: 0x94 + static fpc_ProcID l_msgId; static msg_class* l_msg; static daNpc_Bs1_HIO_c l_HIO; diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index 47349cdd2..360b81bc3 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -16,6 +16,37 @@ #include "d/d_priority.h" #include "d/d_cc_d.h" +class daNpc_Btsw_HIO_c : public JORReflexible { +public: + daNpc_Btsw_HIO_c(); + virtual ~daNpc_Btsw_HIO_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x04 */ s8 mNo; + /* 0x05 */ u8 field_0x05[0x08 - 0x05]; + /* 0x08 */ dNpc_HIO_c mNpc; + /* 0x30 */ s16 field_0x30; + /* 0x32 */ s16 field_0x32; + /* 0x34 */ s16 field_0x34; + /* 0x36 */ s16 r_1; + /* 0x38 */ s16 g_1; + /* 0x3A */ s16 b_1; + /* 0x3C */ s16 r_2; + /* 0x3E */ s16 g_2; + /* 0x40 */ s16 b_2; + /* 0x42 */ u8 field_0x42[0x44 - 0x42]; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ u8 field_0x58; + /* 0x59 */ u8 field_0x59[0x5C - 0x59]; + /* 0x5C */ f32 field_0x5C; +}; // Size: 0x60 + daNpc_Btsw_HIO_c l_HIO; static dCcD_SrcCyl l_cyl_src = { diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index f25e22290..70584615f 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -16,6 +16,22 @@ #include "m_Do/m_Do_mtx.h" #include "SSystem/SComponent/c_angle.h" +class daNpc_Btsw2_HIO_c { +public: + daNpc_Btsw2_HIO_c(); + virtual ~daNpc_Btsw2_HIO_c() {} + +public: + /* 0x04 */ s8 mNo; + /* 0x08 */ dNpc_HIO_c mNpc; + /* 0x30 */ s16 m30; + /* 0x32 */ s16 m32; + /* 0x34 */ f32 m34; + /* 0x38 */ f32 m38; + /* 0x3C */ s16 m3C; + /* 0x3E */ s16 m3E; +}; + static daNpc_Btsw2_HIO_c l_HIO; static dCcD_SrcCyl l_cyl_src = { diff --git a/src/d/actor/d_a_npc_fa1.cpp b/src/d/actor/d_a_npc_fa1.cpp index 913029e08..425ffa051 100644 --- a/src/d/actor/d_a_npc_fa1.cpp +++ b/src/d/actor/d_a_npc_fa1.cpp @@ -13,6 +13,89 @@ #include "d/d_snap.h" #include "f_op/f_op_actor_mng.h" +class daNpc_Fa1_HIO3_c { +public: + struct hio_prm_c { + // Note: Offsets are relative to daNpc_Fa1_HIO3_c instead of hio_prm_c for convenience. + /* 0x08 */ f32 m08; + /* 0x0C */ f32 m0C; + /* 0x10 */ f32 m10; + /* 0x14 */ f32 m14; + /* 0x18 */ s16 m18; + }; + + daNpc_Fa1_HIO3_c(); + virtual ~daNpc_Fa1_HIO3_c() {} + +public: + /* 0x04 */ s8 mNo; + /* 0x08 */ hio_prm_c prm; +}; + +class daNpc_Fa1_HIO2_c { +public: + struct hio_prm_c { + // Note: Offsets are relative to daNpc_Fa1_HIO2_c instead of hio_prm_c for convenience. + /* 0x08 */ f32 m08; + /* 0x0C */ f32 m0C; + /* 0x10 */ f32 m10; + /* 0x14 */ f32 m14; + /* 0x18 */ f32 m18; + /* 0x1C */ f32 m1C; + /* 0x20 */ s16 m20; + /* 0x22 */ s16 m22; + /* 0x24 */ s16 m24; + }; + + daNpc_Fa1_HIO2_c(); + virtual ~daNpc_Fa1_HIO2_c() {} + +public: + /* 0x04 */ s8 mNo; + /* 0x08 */ hio_prm_c prm; +}; + +class daNpc_Fa1_HIO_c : public JORReflexible { +public: + struct hio_prm_c { + // Note: Offsets are relative to daNpc_Fa1_HIO_c instead of hio_prm_c for convenience. + /* 0x08 */ f32 m08; + /* 0x0C */ f32 m0C; + /* 0x10 */ f32 m10; + /* 0x14 */ f32 m14; + /* 0x18 */ f32 m18; + /* 0x1C */ f32 m1C; + /* 0x20 */ f32 m20; + /* 0x24 */ f32 m24; + /* 0x28 */ f32 m28; + /* 0x2C */ f32 m2C; + /* 0x30 */ f32 m30; + /* 0x34 */ f32 m34; + /* 0x38 */ f32 m38; + /* 0x3C */ s16 m3C; + /* 0x3E */ s16 m3E; + /* 0x40 */ s16 m40; + /* 0x42 */ s16 m42; + /* 0x44 */ s16 m44; + /* 0x46 */ s16 m46; + /* 0x48 */ s16 m48; + /* 0x4A */ s16 m4A; + /* 0x4C */ s16 m4C; + /* 0x4E */ s16 m4E; + }; + + daNpc_Fa1_HIO_c(); + virtual ~daNpc_Fa1_HIO_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x04 */ s8 mNo; + /* 0x08 */ hio_prm_c prm; + /* 0x50 */ daNpc_Fa1_HIO2_c m50; + /* 0x78 */ daNpc_Fa1_HIO3_c m78; +}; + /* 800FAFC0-800FB004 .text __ct__16daNpc_Fa1_HIO3_cFv */ daNpc_Fa1_HIO3_c::daNpc_Fa1_HIO3_c() { mNo = -1; diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index cc7df589c..2ddde3753 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -18,6 +18,56 @@ #include "d/d_snap.h" #include "d/d_camera.h" +class daNpc_kam_HIO1_c { +public: + daNpc_kam_HIO1_c(); + virtual ~daNpc_kam_HIO1_c() {} + + void genMessage(JORMContext*); + +public: + /* 0x04 */ f32 mSpeedF; + /* 0x08 */ f32 mUnused08; + /* 0x0C */ f32 mFlappingSpeedF; + /* 0x10 */ f32 mAccelF; + /* 0x14 */ s16 mGlidingAngVelY; + /* 0x16 */ s16 mGlidingAngVelX; + /* 0x18 */ s16 mMaxAngleZ; + /* 0x1A */ s16 mFlappingAngVelY; + /* 0x1C */ s16 mFlappingAngVelX; + /* 0x1E */ s16 mAngVelStepScale; + /* 0x20 */ s16 mAngVelMaxStep; + /* 0x22 */ s16 mAngVelMinStep; + /* 0x24 */ s16 mFlapDuration; + /* 0x26 */ s16 mFlapExhaustedDuration; + /* 0x28 */ s16 mFlapEnergyDuration; +}; // Size: 0x2C + +class daNpc_kam_HIO_c : public JORReflexible { +public: + struct hio_prm_c { + // Note: Offsets are relative to daNpc_kam_HIO_c instead of hio_prm_c for convenience. + /* 0x08 */ f32 m08; + /* 0x0C */ f32 m0C; + /* 0x10 */ f32 m10; + /* 0x14 */ f32 m14; + /* 0x18 */ f32 m18; + /* 0x1C */ s16 m1C; + /* 0x1E */ u8 m1E; + }; // Size: 0x18 + + daNpc_kam_HIO_c(); + virtual ~daNpc_kam_HIO_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x04 */ s8 mNo; + /* 0x08 */ hio_prm_c prm; + /* 0x20 */ daNpc_kam_c* mpActor; + /* 0x24 */ daNpc_kam_HIO1_c mHio1; +}; // Size: 0x50 + static char* l_staff_name = "HyoiKam"; static daNpc_kam_HIO_c l_HIO; static int l_hio_counter; diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index 40ec6307e..fe613e56e 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -12,6 +12,37 @@ #include "d/d_priority.h" #include "d/res/res_km.h" +class daNpc_Km1_HIO_c : public JORReflexible{ +public: + struct hio_prm_c { + s16 field_0; + s16 field_2; + s16 field_4; + s16 field_6; + s16 field_8; + s16 field_A; + s16 field_C; + s16 field_E; + s16 field_10; + s16 field_12; + f32 mAttentionArrowYOffset; + f32 field_18; + }; // Size: 0x1C + + daNpc_Km1_HIO_c(); + virtual ~daNpc_Km1_HIO_c() {}; + + void genMessage(JORMContext* ctx); + +public: + /* 0x04 */ s8 mNo; + /* 0x05 */ s8 field_0x5; + /* 0x06 */ s8 field_0x6; + /* 0x07 */ s8 field_0x7; + /* 0x08 */ int field_0x8; + /* 0x0C */ hio_prm_c mPrmTbl; +}; + static daNpc_Km1_HIO_c l_HIO; /* 000000EC-00000144 .text __ct__15daNpc_Km1_HIO_cFv */ diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index 8c2f98f5b..ba296113c 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -14,6 +14,32 @@ #include "d/d_procname.h" #include "d/d_priority.h" +class daNpc_Nz_HIO_c : public JORReflexible { +public: + daNpc_Nz_HIO_c(); + virtual ~daNpc_Nz_HIO_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x00 - vtable */ + /* 0x04 */ s8 mNo; + /* 0x06 */ s16 field_0x06; + /* 0x08 */ s16 field_0x08; + /* 0x0A */ s16 field_0x0A; + /* 0x0C */ s16 field_0x0C; + /* 0x0E */ s16 field_0x0E; + /* 0x10 */ s16 field_0x10; + /* 0x12 */ s16 field_0x12; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ s16 field_0x18; + /* 0x1A */ s8 field_0x1A; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; +}; // Size: 0x28 + const char daNpc_Nz_c::m_arc_name[] = "NZ"; const char daNpc_Nz_c::m_bdl_arc_name[] = "Npcnz"; diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 70dd35a63..06fcfe692 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -15,6 +15,68 @@ #include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" +class daNpc_Os_HIO2_c : public JORReflexible { +public: + daNpc_Os_HIO2_c(); + virtual ~daNpc_Os_HIO2_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x00 - vtable */ + + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ f32 field_0x0C; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ s16 field_0x24; + /* 0x26 */ s16 field_0x26; + /* 0x28 */ s16 field_0x28; +}; // Size: 0x2A + +class daNpc_Os_HIO_c : public JORReflexible { +public: + daNpc_Os_HIO_c(); + virtual ~daNpc_Os_HIO_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x00 - vtable*/ + + /* 0x04 */ s8 mNo; + + /* 0x08 */ daNpc_Os_HIO2_c mOs2; + /* 0x34 */ dNpc_HIO_c mNpc; + + /* 0x5C */ daNpc_Os_c* field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; + /* 0x7C */ f32 field_0x7C; + /* 0x80 */ f32 field_0x80; + /* 0x84 */ f32 field_0x84; + /* 0x88 */ f32 field_0x88; + /* 0x8C */ f32 field_0x8C; + /* 0x90 */ f32 field_0x90; + /* 0x94 */ f32 field_0x94; + /* 0x98 */ f32 field_0x98; + /* 0x9C */ f32 field_0x9C; + /* 0xA0 */ f32 field_0xA0; + /* 0xA4 */ f32 field_0xA4; + /* 0xA8 */ f32 field_0xA8; + /* 0xAC */ f32 field_0xAC; + /* 0xB0 */ f32 field_0xB0; +}; // Size: 0xB4 + static daNpc_Os_HIO_c l_HIO; static s32 l_hio_counter = 0; static cXyz l_smoke_scale(0.5f, 0.5f, 0.5f); diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp index 7de43acf0..45d1e2bd4 100644 --- a/src/d/actor/d_a_obj_eskban.cpp +++ b/src/d/actor/d_a_obj_eskban.cpp @@ -407,9 +407,6 @@ BOOL Mthd_Draw(void* i_this) { return ((Act_c*)i_this)->MoveBGDraw(); } -// Fakematch to fix weak func order/.text section splitting of dBgS_MoveBgActor::Draw(). -#pragma nosyminline off - /* 00001540-0000156C .text Mthd_IsDelete__Q211daObjEskban28@unnamed@d_a_obj_eskban_cpp@FPv */ BOOL Mthd_IsDelete(void* i_this) { return ((Act_c*)i_this)->MoveBGIsDelete(); diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index 69ffdfdd9..871571c76 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -327,9 +327,6 @@ static BOOL Mthd_Draw(void* i_this) { return static_cast(i_this)->MoveBGDraw(); } -// Fakematch to fix weak func order/.text section splitting of dBgS_MoveBgActor::Draw(). -#pragma nosyminline off - /* 000011CC-000011F8 .text Mthd_IsDelete__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@FPv */ static BOOL Mthd_IsDelete(void* i_this) { return static_cast(i_this)->MoveBGIsDelete(); diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index a5c953e18..2e59b7b55 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -1892,10 +1892,6 @@ namespace daObjMovebox { cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->Mthd_Create(); } - -// Fakematch to fix weak func order/.text section splitting of daObjMovebox::EffSmokeCB's ctor and dtor. -// Also fixes weak func order/.text section splitting of dBgS_MoveBgActor::Draw(). -#pragma nosyminline off /* 000044E0-00004544 .text Mthd_Delete__Q212daObjMovebox29@unnamed@d_a_obj_movebox_cpp@FPv */ BOOL Mthd_Delete(void* i_this) { diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index 205d701ae..d1c7168af 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -365,9 +365,6 @@ namespace daObjMtest { return ((Act_c*)i_this)->MoveBGDraw(); } -// Fakematch to fix weak func order/.text section splitting of dBgS_MoveBgActor::Draw(). -#pragma nosyminline off - BOOL Mthd_IsDelete(void* i_this) { return ((Act_c*)i_this)->MoveBGIsDelete(); } diff --git a/src/d/actor/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp index 1b9e11113..6cfc5a8b9 100644 --- a/src/d/actor/d_a_obj_swhammer.cpp +++ b/src/d/actor/d_a_obj_swhammer.cpp @@ -460,9 +460,6 @@ BOOL Mthd_Draw(void* i_this) { return static_cast(i_this)->MoveBGDraw(); } -// Fakematch to fix weak func order/.text section splitting of dBgS_MoveBgActor::Draw(). -#pragma nosyminline off - /* 000015F4-00001620 .text Mthd_IsDelete__Q213daObjSwhammer30@unnamed@d_a_obj_swhammer_cpp@FPv */ BOOL Mthd_IsDelete(void* i_this) { return static_cast(i_this)->MoveBGIsDelete(); diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 066a433b0..ef87828a4 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -20,6 +20,22 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" +class daObjTpost_HIO_c { +public: + daObjTpost_HIO_c(); + virtual ~daObjTpost_HIO_c() {} + + /* 0x04 */ s8 mNo; + /* 0x05 */ bool debug_draw; + /* 0x06 */ s8 field_0x06; + /* 0x07 */ u8 field_0x07; + /* 0x08 */ f32 attn_pos_offset; + /* 0x0C */ f32 eye_pos_offset; + /* 0x10 */ f32 talk_distance; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; +}; + extern dScnPly_reg_HIO_c g_regHIO; const char daObjTpost_c::m_arc_name[] = "Toripost"; diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp index 336081e02..a701f0fe7 100644 --- a/src/d/actor/d_a_pirate_flag.cpp +++ b/src/d/actor/d_a_pirate_flag.cpp @@ -12,6 +12,39 @@ #include "d/actor/d_a_obj_pirateship.h" #include "d/d_kankyo_wether.h" +class daPirate_Flag_HIO_c : public JORReflexible { +public: + daPirate_Flag_HIO_c() { + mNo = -1; + m06 = 0; + m1C = 0.0f; + m05 = 0; + m07 = 0; + m08 = 0x40; + m0C = 13.0f; + m10 = 7.0f; + m14 = -3.5f; + m18 = 0.45f; + } + virtual ~daPirate_Flag_HIO_c() { + mNo = -1; + } + + void genMessage(JORMContext* ctx); + +public: + /* 0x04 */ s8 mNo; + /* 0x05 */ u8 m05; + /* 0x06 */ u8 m06; + /* 0x07 */ u8 m07; + /* 0x08 */ s32 m08; + /* 0x0C */ f32 m0C; + /* 0x10 */ f32 m10; + /* 0x14 */ f32 m14; + /* 0x18 */ f32 m18; + /* 0x1C */ f32 m1C; +}; + static Vec l_pos[25] = { {0.0f, 2200.0f, 0.0f}, {0.0f, 2200.0f, 200.0f}, @@ -282,9 +315,11 @@ void daPirate_Flag_packet_c::draw() { #endif } -const u8 dummy_4241[] = {0x00, 0xFF, 0x00, 0x80}; -const u8 dummy_4243[] = {0x00, 0x00, 0xFF, 0x80}; -const u8 dummy_4245[] = {0xFF, 0x00, 0x00, 0x80}; +static void dummy() { + (GXColor){0x00, 0xFF, 0x00, 0x80}; + (GXColor){0x00, 0x00, 0xFF, 0x80}; + (GXColor){0xFF, 0x00, 0x00, 0x80}; +} /* 00000E44-000011A0 .text daPirate_Flag_Draw__FP17pirate_flag_class */ static BOOL daPirate_Flag_Draw(pirate_flag_class* i_this) { diff --git a/src/d/actor/d_a_pz.cpp b/src/d/actor/d_a_pz.cpp index d044025f4..fbac8df3f 100644 --- a/src/d/actor/d_a_pz.cpp +++ b/src/d/actor/d_a_pz.cpp @@ -46,7 +46,7 @@ daPz_HIO_c::daPz_HIO_c() { } /* 00000310-00000340 .text stealItem_CB__FPv */ -void stealItem_CB(void*) { +static void stealItem_CB(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 1c4eff53b..dcfd213dc 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -21,6 +21,46 @@ #include "d/d_item_data.h" #include "m_Do/m_Do_controller_pad.h" +class daRd_HIO_c : public mDoHIO_entry_c { +public: + daRd_HIO_c(); + virtual ~daRd_HIO_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x04 */ dNpc_HIO_c mNpc; + /* 0x2C */ u8 m2C; + /* 0x2D */ u8 m2D[0x30 - 0x2D]; + /* 0x30 */ f32 m30; + /* 0x34 */ f32 m34; + /* 0x38 */ f32 mCryRadius; + /* 0x3C */ f32 mAttackRadius; + /* 0x40 */ s16 m40; + /* 0x42 */ s16 mCrySpreadAngle; + /* 0x44 */ s16 mAttackSpreadAngle; + /* 0x46 */ s16 m46; + /* 0x48 */ s16 m48; + /* 0x4A */ s16 m4A; + /* 0x4C */ s16 m4C; + /* 0x4E */ s16 m4E; + /* 0x50 */ s16 m50; + /* 0x52 */ s16 m52; + /* 0x54 */ s16 m54; + /* 0x56 */ u8 m56[0x58 - 0x56]; + /* 0x58 */ f32 m58; + /* 0x5C */ f32 m5C; + /* 0x60 */ f32 m60; + /* 0x64 */ f32 m64; + /* 0x68 */ f32 m68; + /* 0x6C */ f32 mReturnWalkSpeed; + /* 0x70 */ f32 m70; + /* 0x74 */ f32 m74; + /* 0x78 */ s16 m78; + /* 0x7A */ s16 mParalysisDuration; + /* 0x7C */ JntHit_HIO_c m7C; +}; + static daRd_HIO_c l_HIO; const u32 daRd_c::m_heapsize = 0x2520; diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp index caf5f96b6..9402c3409 100644 --- a/src/d/actor/d_a_sail.cpp +++ b/src/d/actor/d_a_sail.cpp @@ -20,6 +20,32 @@ #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_angle.h" +class daSail_HIO_c : public JORReflexible { +public: + daSail_HIO_c() { + mNo = -1; + m05 = 1; + m06 = 1; + m10 = 0.0f; + m07 = 0; + } + virtual ~daSail_HIO_c() { + mNo = -1; + } + + void genMessage(JORMContext* ctx); + +public: + /* 0x04 */ s8 mNo; + /* 0x05 */ u8 m05; + /* 0x06 */ u8 m06; + /* 0x07 */ u8 m07; + /* 0x08 */ u8 m08; + /* 0x09 */ u8 m09[0x0C - 0x09]; + /* 0x0C */ f32 m0C; + /* 0x10 */ f32 m10; +}; + #if VERSION == VERSION_DEMO #define REG_SAIL_F(i) REG10_F(i) #define REG_SAIL_S(i) REG10_S(i) diff --git a/src/d/actor/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp index 9a55ce5ec..fe2ee9596 100644 --- a/src/d/actor/d_a_stone2.cpp +++ b/src/d/actor/d_a_stone2.cpp @@ -767,8 +767,6 @@ BOOL Act_c::Draw() { return TRUE; } -#pragma nosyminline off - namespace { /* 0000273C-0000275C .text Mthd_Create__Q28daStone224@unnamed@d_a_stone2_cpp@FPv */ cPhs_State Mthd_Create(void* i_this) { diff --git a/src/d/actor/d_a_tag_kk1.cpp b/src/d/actor/d_a_tag_kk1.cpp index 21d90586e..23d8c3443 100644 --- a/src/d/actor/d_a_tag_kk1.cpp +++ b/src/d/actor/d_a_tag_kk1.cpp @@ -9,6 +9,24 @@ #include "d/d_procname.h" #include "d/d_priority.h" +class daTag_Kk1_HIO_c : public JORReflexible { +public: + struct hio_prm_c { + /* 0x08 */ f32 mHorizontalDistance; + /* 0x0C */ f32 mVerticalDistance; + /* 0x10 */ u8 field_0x10; + }; + + daTag_Kk1_HIO_c(); + virtual ~daTag_Kk1_HIO_c() {} + + void genMessage(JORMContext* ctx); + +public: + /* 0x04 */ s8 mNo; + /* 0x08 */ hio_prm_c prm; +}; + static daTag_Kk1_HIO_c l_HIO; static const u8 dummy5[] = { 0x00, 0xFF, 0x00, 0x80}; diff --git a/src/d/d_bg_s.cpp b/src/d/d_bg_s.cpp index 5bddb6982..41381cb0c 100644 --- a/src/d/d_bg_s.cpp +++ b/src/d/d_bg_s.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_s.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s.h" #include "d/d_bg_s_acch.h" #include "d/d_bg_s_sph_chk.h" diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp index 33be223d0..1f683a983 100644 --- a/src/d/d_bg_s_acch.cpp +++ b/src/d/d_bg_s_acch.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_s_acch.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_acch.h" #include "d/d_bg_s.h" #include "dolphin/types.h" diff --git a/src/d/d_bg_s_func.cpp b/src/d/d_bg_s_func.cpp index 436851cb0..4c3078ba9 100644 --- a/src/d/d_bg_s_func.cpp +++ b/src/d/d_bg_s_func.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_s_func.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_func.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_bg_s_spl_grp_chk.h" diff --git a/src/d/d_bg_s_lin_chk.cpp b/src/d/d_bg_s_lin_chk.cpp index ce6d3d27a..7d21ac108 100644 --- a/src/d/d_bg_s_lin_chk.cpp +++ b/src/d/d_bg_s_lin_chk.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_s_lin_chk.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_lin_chk.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/d_bg_s_movebg_actor.cpp b/src/d/d_bg_s_movebg_actor.cpp index dad0db60b..72520f87b 100644 --- a/src/d/d_bg_s_movebg_actor.cpp +++ b/src/d/d_bg_s_movebg_actor.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_s_movebg_actor.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_movebg_actor.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_bg_s_spl_grp_chk.cpp b/src/d/d_bg_s_spl_grp_chk.cpp index 8e8537ec4..b86142927 100644 --- a/src/d/d_bg_s_spl_grp_chk.cpp +++ b/src/d/d_bg_s_spl_grp_chk.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_s_spl_grp_chk.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_spl_grp_chk.h" #include "SSystem/SComponent/c_bg_s.h" diff --git a/src/d/d_bg_s_wtr_chk.cpp b/src/d/d_bg_s_wtr_chk.cpp index a78736d3e..2dc7ad614 100644 --- a/src/d/d_bg_s_wtr_chk.cpp +++ b/src/d/d_bg_s_wtr_chk.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_s_wtr_chk.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_wtr_chk.h" /* 800A5BDC-800A5C3C .text __ct__11dBgS_WtrChkFv */ diff --git a/src/d/d_bg_w.cpp b/src/d/d_bg_w.cpp index 56e0940f4..24433c0fb 100644 --- a/src/d/d_bg_w.cpp +++ b/src/d/d_bg_w.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_w.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_w.h" #include "d/d_bg_s.h" #include "d/d_bg_s_acch.h" diff --git a/src/d/d_bg_w_deform.cpp b/src/d/d_bg_w_deform.cpp index f88d0aacb..91ad2e29d 100644 --- a/src/d/d_bg_w_deform.cpp +++ b/src/d/d_bg_w_deform.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_w_deform.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_w_deform.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" diff --git a/src/d/d_bg_w_hf.cpp b/src/d/d_bg_w_hf.cpp index f3974c465..4029a493f 100644 --- a/src/d/d_bg_w_hf.cpp +++ b/src/d/d_bg_w_hf.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_w_hf.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_w_hf.h" #include "SSystem/SComponent/c_bg_s.h" #include "dolphin/types.h" diff --git a/src/d/d_bg_w_sv.cpp b/src/d/d_bg_w_sv.cpp index 9906d7f72..67d92e3fc 100644 --- a/src/d/d_bg_w_sv.cpp +++ b/src/d/d_bg_w_sv.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_bg_w_sv.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_w_sv.h" #include "SSystem/SComponent/c_bg_s_poly_info.h" diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index 301db292f..c669bad27 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_cc_d.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" #include "dolphin/types.h" diff --git a/src/d/d_cc_mass_s.cpp b/src/d/d_cc_mass_s.cpp index cacaee910..d4f0d8a51 100644 --- a/src/d/d_cc_mass_s.cpp +++ b/src/d/d_cc_mass_s.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_cc_mass_s.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cc_mass_s.h" #include "d/d_cc_d.h" #include "JSystem/JUtility/JUTAssert.h" diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp index 8ab09a3c4..4a1fee476 100644 --- a/src/d/d_cc_s.cpp +++ b/src/d/d_cc_s.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_cc_s.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cc_s.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index 1c43ff0d4..9c8c6c69d 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_cc_uty.cpp // -#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index a3c7fe721..d05f82b30 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -3,6 +3,7 @@ // Translation Unit: f_pc_manager.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_creator.h" #include "f_pc/f_pc_draw.h"