diff --git a/.clangd b/.clangd index aed8f88e8..4975d5c64 100644 --- a/.clangd +++ b/.clangd @@ -24,3 +24,8 @@ If: PathMatch: src/PowerPC_EABI_Support/MSL/MSL_C\+\+/.*\.h CompileFlags: Add: ["--language=c++", "--std=c++98"] +--- +If: + PathMatch: .*\.pch +CompileFlags: + Add: ["--language=c++", "--std=c++98"] diff --git a/.vscode/settings.json b/.vscode/settings.json index 8fe9ad9c1..6e21e35cc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,6 +11,8 @@ "files.trimFinalNewlines": true, "files.associations": { "*.inc": "cpp", + "*.pch": "cpp", + "*.pch++": "cpp", ".clangd": "yaml", "*.json": "json", "dspproc.c": "cpp", @@ -26,6 +28,7 @@ "build/*/report.json": true, "build/**/*.MAP": true, "build/*/include/assets/**": true, + "build/*/include/pch/**": true, "build.ninja": true, ".ninja_*": true, "objdiff.json": true, diff --git a/configure.py b/configure.py index f0e7f1f4d..c0aa7e692 100755 --- a/configure.py +++ b/configure.py @@ -344,6 +344,13 @@ def EquivalentFor(*versions): config.warn_missing_config = True config.warn_missing_source = False +config.precompiled_headers = [ + { + "source": "d/dolzel.pch", + "mw_version": "GC/1.3.2", + "cflags": ["-lang=c++", *cflags_dolzel], + } +] config.libs = [ { "lib": "machine", @@ -352,13 +359,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 +403,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 +418,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"), @@ -456,15 +463,15 @@ config.libs = [ "progress_category": "game", "host": True, "objects": [ - Object(Equivalent, "d/d_stage.cpp"), # weak func order + Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_stage.cpp"), 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 +488,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 +531,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 +544,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 +613,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"), @@ -684,7 +691,7 @@ config.libs = [ "J3DU", [ Object(Matching, "JSystem/J3DU/J3DUClipper.cpp"), - Object(NonMatching, "JSystem/J3DU/J3DUMotion.cpp"), + Object(Matching, "JSystem/J3DU/J3DUMotion.cpp"), Object(Matching, "JSystem/J3DU/J3DUDL.cpp"), ], ), @@ -735,7 +742,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 +770,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 +927,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 +1001,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 +1359,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 +1394,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(Matching, "d_a_obj_pirateship"), 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_ykgr"), 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 +1510,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(MatchingFor("GZLE01", "GZLP01"), "d_a_obj_barrier"), 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 +1560,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 +1580,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 +1605,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 +1617,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(MatchingFor("GZLE01", "GZLP01"), "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 +1653,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 +1664,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 +1685,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 +1727,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/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h index 922a7554e..cc110153f 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJoint.h +++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h @@ -51,8 +51,7 @@ public: virtual ~J3DMtxCalcBasic() {} virtual void init(const Vec& vec, const Mtx& mtx) { J3DSys::mCurrentS = vec; - // TODO: Same issue as J3DMtxCalcMaya::init. - // J3DSys::mParentS = (Vec){1.0f, 1.0f, 1.0f}; + J3DSys::mParentS = (Vec){1.0f, 1.0f, 1.0f}; J3DSys::mCurrentMtx[0][0] = mtx[0][0] * J3DSys::mCurrentS.x; J3DSys::mCurrentMtx[0][1] = mtx[0][1] * J3DSys::mCurrentS.y; J3DSys::mCurrentMtx[0][2] = mtx[0][2] * J3DSys::mCurrentS.z; @@ -94,11 +93,7 @@ public: J3DMtxCalcMaya() : J3DMtxCalcBasic() {} virtual ~J3DMtxCalcMaya() {} virtual void init(const Vec& vec, const Mtx& mtx) { - // TODO: This breaks some TUs by adding extra data ({0x3F800000, 0x3F800000, 0x3F800000}) - // This seems to be responsible for the @2100 Vec literal that gets added to most TUs. - // The strange part is that @2100 needs to be in the .data section, but uncommenting this - // will put it in the .rodata sections. - // J3DSys::mParentS = (Vec){1.0f, 1.0f, 1.0f}; + J3DSys::mParentS = (Vec){1.0f, 1.0f, 1.0f}; J3DSys::mCurrentS = vec; J3DSys::mCurrentMtx[0][0] = mtx[0][0] * J3DSys::mCurrentS.x; J3DSys::mCurrentMtx[0][1] = mtx[0][1] * J3DSys::mCurrentS.y; diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 38af72365..c8eaef865 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -992,7 +992,10 @@ struct J3DColorChan { info.mDiffuseFn, info.mAttnFn, ambSrc); } J3DColorChan(u16 id) : mChanCtrl(id) {} - GXAttnFn getAttnFn(); + GXAttnFn getAttnFn() { + u8 attnFnTbl[] = { GX_AF_NONE, GX_AF_SPEC, GX_AF_NONE, GX_AF_SPOT }; + return GXAttnFn(attnFnTbl[mChanCtrl >> 9 & 0x03]); + } GXDiffuseFn getDiffuseFn() { return GXDiffuseFn(mChanCtrl >> 7 & 3); } u8 getLightMask() { return ((mChanCtrl >> 2 & 0x0f) | (mChanCtrl >> 11 & 0x0f) << 4); } void setLightMask(u8 mask) { diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index 0e77c6489..e82c6f9d7 100644 --- a/include/JSystem/JUtility/JUTDirectPrint.h +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -4,7 +4,6 @@ #include "JSystem/JUtility/TColor.h" #include "stdarg.h" - namespace std { // no idea what this is or why it is used instead of va_list struct __tag_va_List : __va_list_struct {}; 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_hys.h b/include/d/actor/d_a_hys.h index 5b2097c93..3ccb87f6b 100644 --- a/include/d/actor/d_a_hys.h +++ b/include/d/actor/d_a_hys.h @@ -2,6 +2,7 @@ #define D_A_HYS_H #include "d/d_bg_s_movebg_actor.h" +#include "m_Do/m_Do_ext.h" class daHys_c : public dBgS_MoveBgActor { public: 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_mtoge.h b/include/d/actor/d_a_mtoge.h index d38e82292..2942f3b0f 100644 --- a/include/d/actor/d_a_mtoge.h +++ b/include/d/actor/d_a_mtoge.h @@ -5,7 +5,6 @@ #include "d/d_bg_w.h" #include "f_op/f_op_actor.h" - class daMtoge_c : public fopAc_ac_c { public: inline BOOL draw(); diff --git a/include/d/actor/d_a_npc_bs1.h b/include/d/actor/d_a_npc_bs1.h index 212a0ce9e..f95e5a8cc 100644 --- a/include/d/actor/d_a_npc_bs1.h +++ b/include/d/actor/d_a_npc_bs1.h @@ -8,7 +8,6 @@ #include "f_op/f_op_actor.h" #include "m_Do/m_Do_hostIO.h" - class daNpc_Bs1_c : public fopAc_ac_c { public: typedef BOOL (daNpc_Bs1_c::*ActionFunc)(void*); @@ -167,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 90e1fdbf0..d22dd3c56 100644 --- a/include/d/actor/d_a_npc_btsw.h +++ b/include/d/actor/d_a_npc_btsw.h @@ -7,8 +7,6 @@ #include "f_op/f_op_actor.h" #include "m_Do/m_Do_hostIO.h" - - class SwMail2_c { public: typedef void (SwMail2_c::*SwMail_Func)(); @@ -213,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 4e155c98b..5ae7f16d4 100644 --- a/include/d/actor/d_a_npc_km1.h +++ b/include/d/actor/d_a_npc_km1.h @@ -5,8 +5,6 @@ #include "f_op/f_op_actor.h" #include "m_Do/m_Do_hostIO.h" - - class daNpc_Km1_c : public fopNpc_npc_c { public: typedef int (daNpc_Km1_c::*ActionFunc)(void*); @@ -134,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_barrier.h b/include/d/actor/d_a_obj_barrier.h index 02b9705e9..d56a474a4 100644 --- a/include/d/actor/d_a_obj_barrier.h +++ b/include/d/actor/d_a_obj_barrier.h @@ -28,6 +28,11 @@ public: class daObjBarrier_ef_c { public: + daObjBarrier_ef_c() { + mActiveEffFlags = 0; + } + ~daObjBarrier_ef_c() {} + void setDummyTexture(int); bool checkHitActor(fopAc_ac_c*); void birth(fopAc_ac_c*, f32, cXyz, cXyz, int); @@ -62,10 +67,6 @@ public: PRM_MOYA_S = 0x08, }; - daObjBarrier_c() { - mEffect.mActiveEffFlags = 0; - } - void init_mtx(); static int solidHeapCB(fopAc_ac_c*); bool create_heap(); 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_eskban.h b/include/d/actor/d_a_obj_eskban.h index 2edebc5ec..fb2a75765 100644 --- a/include/d/actor/d_a_obj_eskban.h +++ b/include/d/actor/d_a_obj_eskban.h @@ -3,6 +3,8 @@ #include "d/d_bg_s_movebg_actor.h" +class dPa_smokeEcallBack; + namespace daObjEskban { static const int DESTROY_VIBRATION_LEN = 35; 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_ojtree.h b/include/d/actor/d_a_obj_ojtree.h index 58df099df..bde981664 100644 --- a/include/d/actor/d_a_obj_ojtree.h +++ b/include/d/actor/d_a_obj_ojtree.h @@ -4,7 +4,6 @@ #include "f_op/f_op_actor.h" #include "d/d_bg_s_movebg_actor.h" - namespace daObjOjtree { class Act_c : public dBgS_MoveBgActor { public: diff --git a/include/d/actor/d_a_obj_pirateship.h b/include/d/actor/d_a_obj_pirateship.h index 92f9ac238..8b91fcedc 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" @@ -28,7 +29,7 @@ namespace daObjPirateship { inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); - bool _execute(); + inline bool _execute(); void getKajiID() {} void set_mtx(); diff --git a/include/d/actor/d_a_obj_swhammer.h b/include/d/actor/d_a_obj_swhammer.h index 362e47399..de1b559fa 100644 --- a/include/d/actor/d_a_obj_swhammer.h +++ b/include/d/actor/d_a_obj_swhammer.h @@ -2,6 +2,7 @@ #define D_A_OBJ_SWHAMMER_H #include "d/d_bg_s_movebg_actor.h" +#include "d/d_particle.h" class J3DNode; 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_stone2.h b/include/d/actor/d_a_stone2.h index 2d2c9b93c..37200a849 100644 --- a/include/d/actor/d_a_stone2.h +++ b/include/d/actor/d_a_stone2.h @@ -5,6 +5,7 @@ #include "d/d_cc_d.h" #include "d/d_bg_s_acch.h" #include "d/d_a_obj.h" +#include "d/d_particle.h" namespace daStone2 { struct Attr_c { 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/actor/d_a_tpota.h b/include/d/actor/d_a_tpota.h index 9194c2ee6..89fb1e798 100644 --- a/include/d/actor/d_a_tpota.h +++ b/include/d/actor/d_a_tpota.h @@ -3,7 +3,6 @@ #include "f_op/f_op_actor.h" - class JPABaseEmitter; class JPABaseParticle; diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h index 214bb43a3..403bebaff 100644 --- a/include/d/actor/d_a_ykgr.h +++ b/include/d/actor/d_a_ykgr.h @@ -2,7 +2,7 @@ #define D_A_YKGR_H #include "f_op/f_op_actor.h" -#include "Jsystem/JParticle/JPAEmitter.h" +#include "JSystem/JParticle/JPAEmitter.h" #include "f_op/f_op_camera_mng.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_hostIO.h" @@ -69,6 +69,7 @@ public: m18 = 0.0f; m1C = true; } + ~dPa_YkgrPcallBack() {} void draw(JPABaseEmitter*, JPABaseParticle*); void setParam(float); 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_com_inf_game.h b/include/d/d_com_inf_game.h index dc032bf98..89f4b0bfb 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -237,7 +237,7 @@ public: ~dComIfG_play_c() {} dStage_roomControl_c* getRoomControl() { return &mRoomCtrl; } - dStage_stageDt_c& getStage() { return mStageData; } + dStage_dt_c& getStage() { return mStageData; } dEvt_control_c& getEvent() { return mEvtCtrl; } dEvent_manager_c& getEvtManager() { return mEvtManager; } dPa_control_c* getParticle() { return mParticle; } @@ -2131,6 +2131,10 @@ inline void dComIfGp_setCb1Player(fopAc_ac_c* player) { g_dComIfG_gameInfo.play.setPlayerPtr(1, player); } +inline dStage_dt_c& dComIfGp_getStage() { + return g_dComIfG_gameInfo.play.getStage(); +} + inline roomRead_class* dComIfGp_getStageRoom() { return g_dComIfG_gameInfo.play.getStage().getRoom(); } @@ -2175,6 +2179,10 @@ inline u16 dComIfGp_getStagePlayerNum() { return g_dComIfG_gameInfo.play.getStage().getPlayerNum(); } +inline stage_scls_info_dummy_class* dComIfGp_getStageSclsInfo() { + return g_dComIfG_gameInfo.play.getStage().getSclsInfo(); +} + inline daShip_c* dComIfGp_getShipActor() { return (daShip_c*)g_dComIfG_gameInfo.play.getPlayerPtr(2); } @@ -2207,14 +2215,6 @@ inline u8 dComIfGp_getIkadaShipBeforeRoomId() { return g_dComIfG_gameInfo.play.getIkadaShipBeforeRoomId(); } -inline stage_scls_info_dummy_class* dComIfGp_getStageSclsInfo() { - return g_dComIfG_gameInfo.play.getStage().getSclsInfo(); -} - -inline dStage_stageDt_c& dComIfGp_getStage() { - return g_dComIfG_gameInfo.play.getStage(); -} - inline dVibration_c& dComIfGp_getVibration() { return g_dComIfG_gameInfo.play.getVibration(); } diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h index 1effa5cf8..7ac44ce7b 100644 --- a/include/d/d_gameover.h +++ b/include/d/d_gameover.h @@ -8,7 +8,6 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "SSystem/SComponent/c_phase.h" - class dDlst_Gameover_CAPTURE_c : public dDlst_base_c { public: virtual ~dDlst_Gameover_CAPTURE_c() {} 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/d_stage.h b/include/d/d_stage.h index f20c09881..36757b6f4 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -597,6 +597,7 @@ public: class dStage_roomDt_c : public dStage_dt_c { public: + void setRoomNo(int roomNo) { mRoomNo = roomNo; } /* vt[ 2] */ virtual void init(); /* vt[ 3] */ virtual int getRoomNo() const { return mRoomNo; } /* vt[ 4] */ virtual void setCamera(stage_camera_class* i_camera) { mpCamera = i_camera; } diff --git a/include/d/dolzel.h b/include/d/dolzel.h new file mode 100644 index 000000000..d93de8926 --- /dev/null +++ b/include/d/dolzel.h @@ -0,0 +1,10 @@ +#ifndef DOLZEL_H +#define DOLZEL_H + +#ifdef __MWERKS__ +#include "d/dolzel.mch" +#else +#include "d/dolzel.pch" +#endif + +#endif /* DOLZEL_H */ diff --git a/include/d/dolzel.pch b/include/d/dolzel.pch new file mode 100644 index 000000000..323321146 --- /dev/null +++ b/include/d/dolzel.pch @@ -0,0 +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/include/weak_bss_3569.h b/include/weak_bss_3569.h index cf4686551..9475d52a0 100644 --- a/include/weak_bss_3569.h +++ b/include/weak_bss_3569.h @@ -2,14 +2,14 @@ #define WEAK_BSS_3569_H // Fake header. -// This is some kind of weak objects that get included in the .bss sections of several TUs. +// This is some kind of weak object that get included in several TUs. +// Goes in either .bss (for RELs) or .rodata (for main.dol: d_snap, J3DUClipper). // Its true source is currently unknown, so include this header in TUs that need it to match for now. -#include "dolphin/types.h" -template struct bss_3569 { u8 val[0xC]; }; +#include "dolphin/mtx/mtx.h" static inline void dummy_bss_3569() { - bss_3569(); // @3569 + Vec vec = (Vec){0.0f, 0.0f, 0.0f}; // @3569 / @3599 } #endif /* WEAK_BSS_3569_H */ diff --git a/include/weak_bss_936_to_1036.h b/include/weak_bss_936_to_1036.h index dfadbce5e..196dd06e2 100644 --- a/include/weak_bss_936_to_1036.h +++ b/include/weak_bss_936_to_1036.h @@ -13,7 +13,6 @@ // any of these weak bss objects. So that constructor is moved to functionvalue.cpp and this fake // header should be included where necessary instead. -#include "weak_bss_3569.h" // IWYU pragma: keep #include "JSystem/JStudio/JStudio/functionvalue.h" // IWYU pragma: keep // They each have size 1, and alignment 1 in the debug maps, but alignment 4 in the non-debug maps. diff --git a/include/weak_data_1811.h b/include/weak_data_1811.h deleted file mode 100644 index 611df4bd8..000000000 --- a/include/weak_data_1811.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef WEAK_DATA_1811_H -#define WEAK_DATA_1811_H - -// Fake header. - -#include "dolphin/gx/GXEnum.h" -#include "weak_data_2100_2080.h" // IWYU pragma: keep - -// @1811 is a weak object that gets included in the .data sections of several TUs. -// Its true source is this line: -// u8 attnFnTbl[] = { GX_AF_NONE, GX_AF_SPEC, GX_AF_NONE, GX_AF_SPOT }; -// Which appears in the weak function J3DColorChan::getAttnFn, which is supposed to go in a header. -// But that line causes the weak object to appear in .rodata, while this weak object need to be in .data. -// So for now, that function is moved to the .cpp file, and TUs that need this object should include this header. - -static inline void fake_getAttnFn() { - // Value is equivalent to: {0x02, 0x00, 0x02, 0x01} - static u8 attnFnTbl_1811[] = { GX_AF_NONE, GX_AF_SPEC, GX_AF_NONE, GX_AF_SPOT }; -} - -// These two weak objects are strange, as they have no symbols associated with them. -// They always seems to come after @1811 ends at offset 0x1C, getting padded to start at 0x20 and ending at 0x30. -// These are likely the 3.0 and .5 double literals from std::sqrtf. -// But those literals get placed in .rodata, while these weak objects need to be in .data. -// Also, the order of these two literals is reversed. std::sqrtf has _half before _three. -// static f64 data_no_symbol_3_5[2] = {3.0, 0.5}; - -extern inline void fake_sqrtf(float x) { - static double _three[1] = {3.0}; - static double _half[1] = {.5}; -} - -// Note: These weak objects get stripped out for main.dol, because all three of them are within the -// 8-byte limit for .sdata. They do not get stripped out in RELs. - -#endif /* WEAK_DATA_1811_H */ diff --git a/include/weak_data_2100_2080.h b/include/weak_data_2100_2080.h deleted file mode 100644 index 578f1ef30..000000000 --- a/include/weak_data_2100_2080.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef WEAK_DATA_2100_2080_H -#define WEAK_DATA_2100_2080_H - -// Fake header. - -#include "dolphin/mtx/vec.h" - -// @2100 and @2080 are weak objects that get included in the .data sections of several TUs. -// Their true source is likely this line of code that appears twice in J3DJoint.h: -// J3DSys::mParentS = (Vec){1.0f, 1.0f, 1.0f}; -// But that line causes the weak objects to appear in .rodata, while this weak object need to be in .data. -// So for now, the line is commented out, and TUs that need these objects should include this header. -// Note: For d_snap and J3DUClipper, these objects *are* supposed to appear in .rodata, but those are the only ones. -// Also, d_snap and J3DUClipper seem to be the only ones where the two symbols are in order by the compiler-generated -// names. In TUs where they appear in .data instead, their order is reversed (@2100 coming before @2080). - -static inline void fake_data_2100() { - // Value is equivalent to: {0x3F800000, 0x3F800000, 0x3F800000} - static Vec data_2100 = {1.0f, 1.0f, 1.0f}; -} - -static inline void fake_data_2080() { - // Value is equivalent to: {0x3F800000, 0x3F800000, 0x3F800000} - static Vec data_2080 = {1.0f, 1.0f, 1.0f}; -} - -#endif /* WEAK_DATA_2100_2080_H */ diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 161a205c9..adf20758d 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -14,11 +14,6 @@ #include "dolphin/types.h" #include "string.h" -inline GXAttnFn J3DColorChan::getAttnFn() { - u8 attnFnTbl[] = { GX_AF_NONE, GX_AF_SPEC, GX_AF_NONE, GX_AF_SPOT }; - return GXAttnFn(attnFnTbl[mChanCtrl >> 9 & 0x03]); -} - extern bool isTexNoReg(void*); extern u16 getTexNoReg(void*); extern void loadTexNo(u32, const u16 &); diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/src/JSystem/J3DU/J3DUClipper.cpp index 4f761c661..ecb733bc1 100644 --- a/src/JSystem/J3DU/J3DUClipper.cpp +++ b/src/JSystem/J3DU/J3DUClipper.cpp @@ -8,10 +8,7 @@ #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "math.h" -// Needed for the .rodata section to match. -static const f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; -static const f32 dummy2[3] = {1.0f, 1.0f, 1.0f}; -static const f32 dummy3[3] = {0.0f, 0.0f, 0.0f}; +#include "weak_bss_3569.h" // IWYU pragma: keep static const f32 Deg2Rad = 0.017453292f; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h index 6446a7b8f..3b10706d9 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h @@ -86,8 +86,8 @@ inline float tanf(float x) { return tan(x); } namespace std { #endif extern inline float sqrtf(float x) { - const double _half = .5; - const double _three = 3.0; + static const double _half = .5; + static const double _three = 3.0; volatile float y; if (x > 0.0f) { double guess = __frsqrte((double)x); // returns an approximation to diff --git a/src/SSystem/SComponent/c_lib.cpp b/src/SSystem/SComponent/c_lib.cpp index 338eef7c6..0f1f94fe4 100644 --- a/src/SSystem/SComponent/c_lib.cpp +++ b/src/SSystem/SComponent/c_lib.cpp @@ -8,7 +8,6 @@ #include "SSystem/SComponent/c_math.h" #include "dolphin/mtx/mtxvec.h" - /* 802528A4-802528C4 .text cLib_memCpy__FPvPCvUl */ void cLib_memCpy(void* dst, const void* src, unsigned long size) { memcpy(dst, src, size); diff --git a/src/d/actor/d_a_acorn_leaf.cpp b/src/d/actor/d_a_acorn_leaf.cpp index 3d96e938a..7d6fa27be 100644 --- a/src/d/actor/d_a_acorn_leaf.cpp +++ b/src/d/actor/d_a_acorn_leaf.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_acorn_leaf.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_acorn_leaf.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 88e8dccf1..38ccd472b 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -3,6 +3,7 @@ * Tingle Tuner Cursor */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_agb.h" #include "d/res/res_agb.h" #include "JSystem/JKernel/JKRHeap.h" @@ -25,8 +26,39 @@ #include "d/actor/d_a_bomb.h" #include "stdio.h" -#include "weak_bss_3569.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep +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; diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index fcc57eb6a..1fbad5dbe 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -3,12 +3,10 @@ // Translation Unit: d_a_agbsw0.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "global.h" #include "d/d_procname.h" #include "d/d_priority.h" - -#include "weak_data_1811.h" // IWYU pragma: keep - #include "d/actor/d_a_agbsw0.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 7dc518c3e..34b6767dc 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_alldie.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_alldie.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 479b248a2..189f6bf91 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -3,6 +3,7 @@ * Enemy - Armos Knight */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_am.h" #include "d/res/res_am.h" #include "f_op/f_op_actor_mng.h" @@ -26,8 +27,6 @@ #include "d/actor/d_a_bomb.h" #include "d/actor/d_a_bomb2.h" -#include "weak_data_1811.h" // IWYU pragma: keep - enum Action { ACTION_DOUSA = 0, ACTION_MODORU_MOVE = 1, diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index ca982a772..7479ec293 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -3,6 +3,7 @@ * Enemy - Armos */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_am2.h" #include "d/res/res_am2.h" #include "f_op/f_op_actor_mng.h" @@ -23,8 +24,6 @@ #include "f_op/f_op_camera.h" #include "f_op/f_op_kankyo_mng.h" -#include "weak_data_1811.h" // IWYU pragma: keep - enum Action { ACTION_DOUSA = 0x0, ACTION_MAHI = 0x1, diff --git a/src/d/actor/d_a_amiprop.cpp b/src/d/actor/d_a_amiprop.cpp index 61ff24682..4b4e4d5a0 100644 --- a/src/d/actor/d_a_amiprop.cpp +++ b/src/d/actor/d_a_amiprop.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_amiprop.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_amiprop.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp index e2e310d82..0d0cdf1fa 100644 --- a/src/d/actor/d_a_andsw0.cpp +++ b/src/d/actor/d_a_andsw0.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_andsw0.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_andsw0.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index de91c9701..e7b7e68f2 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_andsw2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_andsw2.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 8a412ff85..f21cf77d0 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -3,6 +3,7 @@ * Item - Arrow */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_arrow.h" #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" @@ -16,8 +17,6 @@ #include "d/d_s_play.h" #include "d/res/res_link.h" -#include "weak_data_1811.h" // IWYU pragma: keep - s16 daArrow_c::m_count; const char daArrow_c::m_arc_name[] = "Link"; diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index 39bc2fa3a..5cffc54ce 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_arrow_iceeff.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_arrow_iceeff.h" #include "m_Do/m_Do_mtx.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index 80b9ac29e..cc3a60d30 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_arrow_lighteff.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_arrow_lighteff.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_arrow.h" diff --git a/src/d/actor/d_a_atdoor.cpp b/src/d/actor/d_a_atdoor.cpp index 9cde9a372..953d13d37 100644 --- a/src/d/actor/d_a_atdoor.cpp +++ b/src/d/actor/d_a_atdoor.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_atdoor.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_atdoor.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_att.cpp b/src/d/actor/d_a_att.cpp index 7179249d6..28f59d3cc 100644 --- a/src/d/actor/d_a_att.cpp +++ b/src/d/actor/d_a_att.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_att.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_att.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -10,10 +11,6 @@ #include "f_op/f_op_actor_mng.h" #include "d/actor/d_a_bgn.h" -#if VERSION == VERSION_USA -#include "weak_data_1811.h" // IWYU pragma: keep -#endif - static bgn_class* boss; static cXyz non_pos(-30000.0f, -30000.0f, -30000.0f); diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 840439381..2c689ef43 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_auction.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_auction.h" #include "d/actor/d_a_npc_auction.h" #include "d/actor/d_a_player.h" @@ -12,9 +13,6 @@ #include "d/d_priority.h" #include "m_Do/m_Do_controller_pad.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - struct NpcDatStruct { /* 0x00 */ f32 field_0x00; /* 0x04 */ f32 field_0x04; diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index 0362e5257..eaf83ad7b 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -3,6 +3,7 @@ * Enemy - Kargaroc */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bb.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" @@ -115,7 +116,6 @@ public: /* 0x7C */ f32 unk_7C; }; // size = 0x80 -#include "weak_data_1811.h" // IWYU pragma: keep static s8 callback_check_index[] = {0xFF, 0xFF, 0xFF, 0x64, 0xFF, 0xFF, 0xFF, 0xFF, 0x64, 0xFF, 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x64, 0x64, 0x64, 0xFF, 0xFF, 0xFF, 0xFF, 0x64, 0x64}; static f32 tial_scale[] = { 0.25f, 0.275f, 0.2875f, 0.3f, 0.325f, 0.375f, 0.4625f, 0.575f, 0.8f, diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 91346c7d6..0fddb89b8 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -3,6 +3,7 @@ * Boss - Helmaroc King */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bdk.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_bdkobj.cpp b/src/d/actor/d_a_bdkobj.cpp index 16c19e34e..8012860c4 100644 --- a/src/d/actor/d_a_bdkobj.cpp +++ b/src/d/actor/d_a_bdkobj.cpp @@ -3,6 +3,7 @@ * Object - Helmaroc King fight objects (wooden bridges, wooden planks floating in water, etc.). */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bdkobj.h" #include "d/d_bg_w.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index f7c856347..151791771 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/src/d/actor/d_a_beam.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_beam.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_beam.h" #include "d/d_cc_d.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp index 9b3f44f0b..2cfb66f76 100644 --- a/src/d/actor/d_a_bflower.cpp +++ b/src/d/actor/d_a_bflower.cpp @@ -3,6 +3,7 @@ * Object - Bomb Flower - Flower */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bflower.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -11,8 +12,6 @@ #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_bomb2.h" -#include "weak_data_1811.h" // IWYU pragma: keep - static cXyz bomb_offset(0.0f, 0.0f, 0.0f); static dCcD_SrcCyl l_cyl_src = { diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 595386ac1..06f4194d4 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_bg.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bg.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp index fb16f94b3..52378598a 100644 --- a/src/d/actor/d_a_bgn.cpp +++ b/src/d/actor/d_a_bgn.cpp @@ -3,6 +3,7 @@ * Boss - Puppet Ganon (Phase 1) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bgn.h" #include "d/actor/d_a_bgn2.h" #include "d/actor/d_a_bgn3.h" diff --git a/src/d/actor/d_a_bgn2.cpp b/src/d/actor/d_a_bgn2.cpp index ef8eb4b1a..11a2cbf76 100644 --- a/src/d/actor/d_a_bgn2.cpp +++ b/src/d/actor/d_a_bgn2.cpp @@ -3,6 +3,7 @@ * Boss - Puppet Ganon (Phase 2) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bgn2.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_bgn3.cpp b/src/d/actor/d_a_bgn3.cpp index 171cf7d44..8cc8798bb 100644 --- a/src/d/actor/d_a_bgn3.cpp +++ b/src/d/actor/d_a_bgn3.cpp @@ -3,6 +3,7 @@ * Boss - Puppet Ganon (Phase 3) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bgn3.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_bigelf.cpp b/src/d/actor/d_a_bigelf.cpp index fcdde6d8b..2d9638824 100644 --- a/src/d/actor/d_a_bigelf.cpp +++ b/src/d/actor/d_a_bigelf.cpp @@ -3,6 +3,7 @@ * NPC - Great Fairy */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bigelf.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index d05a45acd..33cd31f6e 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -3,6 +3,7 @@ * Object - Wooden platforms (Gohma fight) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bita.h" #include "d/res/res_bita.h" #include "f_op/f_op_actor_mng.h" @@ -16,8 +17,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep - static btd_class* btd = NULL; static u32 ita_bmd[] = { BITA_BDL_MBIT1, BITA_BDL_MBIT2 }; diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index a6fbdafe7..c1e87e811 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -3,6 +3,7 @@ * Enemy - Bokoblin */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bk.h" #include "d/d_bg_s_gnd_chk.h" #include "d/res/res_bk.h" @@ -29,9 +30,6 @@ #include "d/d_snap.h" #include "JSystem/JUtility/JUTReport.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - static u8 hio_set; static u8 another_hit; static fopAc_ac_c* ken; diff --git a/src/d/actor/d_a_bl.cpp b/src/d/actor/d_a_bl.cpp index 2c0cae964..5db31137a 100644 --- a/src/d/actor/d_a_bl.cpp +++ b/src/d/actor/d_a_bl.cpp @@ -3,6 +3,7 @@ * Enemy - Bubble */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bl.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp index 014d5d6b3..12ca23984 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/src/d/actor/d_a_bmd.cpp @@ -3,6 +3,7 @@ * Boss - Kalle Demos */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bmd.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index c057472d3..7cf58a0aa 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/src/d/actor/d_a_bmdfoot.cpp @@ -3,6 +3,7 @@ * Boss - Kalle Demos (floor tentacles) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bmdfoot.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_bmdhand.cpp b/src/d/actor/d_a_bmdhand.cpp index dfc1aac1b..02e496323 100644 --- a/src/d/actor/d_a_bmdhand.cpp +++ b/src/d/actor/d_a_bmdhand.cpp @@ -3,6 +3,7 @@ * Boss - Kalle Demos (ceiling tentacles) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bmdhand.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_bo.cpp b/src/d/actor/d_a_bo.cpp index edc5f73e8..d8a674d31 100644 --- a/src/d/actor/d_a_bo.cpp +++ b/src/d/actor/d_a_bo.cpp @@ -3,6 +3,7 @@ * Enemy - Boko Baba */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bo.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index ed21c6be8..0662d8708 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/src/d/actor/d_a_boko.cpp @@ -3,15 +3,13 @@ * Object - Enemy weapons */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_boko.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/d_priority.h" #include "d/d_bg_s_lin_chk.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - u32 daBoko_c::m_bound_se[6] = { JA_SE_CM_BOKOBOU_BOUND, JA_SE_CM_NATA_BOUND, diff --git a/src/d/actor/d_a_bomb.cpp b/src/d/actor/d_a_bomb.cpp index f2a87fd8d..330b29ba9 100644 --- a/src/d/actor/d_a_bomb.cpp +++ b/src/d/actor/d_a_bomb.cpp @@ -3,4 +3,5 @@ * Item - Bomb */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bomb3.inc" diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 662909169..602ba2b89 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -3,6 +3,7 @@ * Object - Bomb Flower - Bomb */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bomb2.h" #include "d/actor/d_a_sea.h" #include "d/actor/d_a_player.h" @@ -16,8 +17,6 @@ #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daBomb2 { namespace { struct Attr_c { diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index ea5841289..5c948b925 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -2,6 +2,7 @@ // Furthermore, the symbol maps show that d_a_bomb.o's first .text section is 0 bytes large, with everything going in // its second .text section, which suggests that d_a_bomb.cpp is empty except including d_a_bomb3.inc. +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bomb.h" #include "SSystem/SComponent/c_counter.h" #include "d/d_a_obj.h" @@ -17,8 +18,6 @@ #include "m_Do/m_Do_lib.h" #include "d/res/res_vbakh.h" -#include "weak_data_1811.h" // IWYU pragma: keep - namespace { enum AttrSt_e { ATTR_STATE_0 = 0x00, diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 28856516a..f7600af54 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -3,13 +3,14 @@ * Item - Boomerang */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_boomerang.h" #include "d/d_procname.h" #include "d/d_priority.h" +#include "d/d_cc_d.h" #include "assets/l_sightMatDL.h" #include "assets/l_sightDL__d_a_boomerang.h" -#include "d/d_cc_d.h" static dCcD_SrcCps l_at_cps_src = { // dCcD_SrcGObjInf diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp index 8a2909233..556f4810d 100644 --- a/src/d/actor/d_a_boss_item.cpp +++ b/src/d/actor/d_a_boss_item.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_boss_item.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_boss_item.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index 48ab3e0e8..934821d70 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -3,6 +3,7 @@ * Boss - Jalhalla */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bpw.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 04cbd74ea..b690ebc0d 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -3,6 +3,7 @@ * Object - Forest of Fairies - Tree branch (Tetra) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_branch.h" #include "d/res/res_kwood_00.h" #include "JSystem/JUtility/JUTAssert.h" diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp index c20be03cb..ec8ee88c8 100644 --- a/src/d/actor/d_a_bridge.cpp +++ b/src/d/actor/d_a_bridge.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_bridge.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bridge.h" #include "d/d_bg_w.h" #include "d/d_procname.h" @@ -20,7 +21,6 @@ #include "d/d_kankyo_wether.h" #include "f_op/f_op_camera.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep static cXyz* wind_vec; static s16 wy; static f32* wp; diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index 4bbd0a7b6..10e20fc1d 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -3,6 +3,7 @@ * Boss - Gohdan */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bst.h" #include "d/actor/d_a_bomb.h" #include "d/d_bg_s_lin_chk.h" diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index dcac0f538..51985e4af 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -3,6 +3,7 @@ * Boss - Gohma */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_btd.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index eaa464d6c..b1fd52a75 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/src/d/actor/d_a_bwd.cpp @@ -3,6 +3,7 @@ * Boss - Molgera */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bwd.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp index 349576691..bf5b66860 100644 --- a/src/d/actor/d_a_bwdg.cpp +++ b/src/d/actor/d_a_bwdg.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_bwdg.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bwdg.h" #include "d/res/res_bwdg.h" #include "d/d_bg_w_hf.h" diff --git a/src/d/actor/d_a_bwds.cpp b/src/d/actor/d_a_bwds.cpp index 517c0262c..497a5a30c 100644 --- a/src/d/actor/d_a_bwds.cpp +++ b/src/d/actor/d_a_bwds.cpp @@ -3,6 +3,7 @@ * Enemy - Molgera Larva */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bwds.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp index b681a1d58..c5e3da543 100644 --- a/src/d/actor/d_a_canon.cpp +++ b/src/d/actor/d_a_canon.cpp @@ -3,6 +3,7 @@ * Cannon Minigame */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_canon.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp index 7c50081f5..63b11f232 100644 --- a/src/d/actor/d_a_cc.cpp +++ b/src/d/actor/d_a_cc.cpp @@ -3,6 +3,7 @@ * Enemy - ChuChu */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_cc.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_coming2.cpp b/src/d/actor/d_a_coming2.cpp index 3afb4d636..587906eed 100644 --- a/src/d/actor/d_a_coming2.cpp +++ b/src/d/actor/d_a_coming2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_coming2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_coming2.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -14,9 +15,6 @@ #include "d/actor/d_a_sea.h" #include "d/actor/d_a_obj_barrel2.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - s32 daComing2::coming_make_item_no_table[] = { dItem_GREEN_RUPEE_e, dItem_GREEN_RUPEE_e, dItem_GREEN_RUPEE_e, dItem_GREEN_RUPEE_e, dItem_GREEN_RUPEE_e, dItem_BLUE_RUPEE_e, dItem_BLUE_RUPEE_e, dItem_BLUE_RUPEE_e, dItem_BLUE_RUPEE_e, dItem_BLUE_RUPEE_e, diff --git a/src/d/actor/d_a_coming3.cpp b/src/d/actor/d_a_coming3.cpp index 67d16fc24..5c9625503 100644 --- a/src/d/actor/d_a_coming3.cpp +++ b/src/d/actor/d_a_coming3.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_coming3.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_coming3.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_sea.h" @@ -13,9 +14,6 @@ #include "d/d_bg_s_gnd_chk.h" #include "d/d_bg_s_wtr_chk.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daComing3 { namespace { static const u8 L_Attr[0x28] = { diff --git a/src/d/actor/d_a_dai.cpp b/src/d/actor/d_a_dai.cpp index 55c0eb1cc..178330a09 100644 --- a/src/d/actor/d_a_dai.cpp +++ b/src/d/actor/d_a_dai.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_dai.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_dai.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp index 981eeb02b..0ddb8367a 100644 --- a/src/d/actor/d_a_dai_item.cpp +++ b/src/d/actor/d_a_dai_item.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_dai_item.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_dai_item.h" #include "SSystem/SComponent/c_math.h" #include "d/d_kankyo_wether.h" @@ -12,10 +13,6 @@ #include "d/res/res_fdai.h" #include "d/res/res_cloth.h" -#include "f_op/f_op_actor.h" -#include "weak_bss_3569.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - const char daStandItem_c::m_arcname[] = "Fdai"; const s16 daStandItem_c::m_bmdidx[] = { FDAI_BDL_FOBJ00, /* FLOWER_1 */ diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index b13478574..b13172a2f 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/src/d/actor/d_a_daiocta.cpp @@ -3,6 +3,7 @@ * Mini-Boss - Big Octo (body) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_daiocta.h" #include "d/d_cc_d.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp index f18a33657..ef10c6eeb 100644 --- a/src/d/actor/d_a_daiocta_eye.cpp +++ b/src/d/actor/d_a_daiocta_eye.cpp @@ -3,6 +3,7 @@ * Mini-Boss - Big Octo (eye) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_daiocta_eye.h" #include "d/d_cc_d.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index 2a9981a3e..fbd552950 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -3,14 +3,13 @@ * Item - Deku Leaf (collectable) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_deku_item.h" #include "d/res/res_deku.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/d_priority.h" -#include "weak_data_1811.h" // IWYU pragma: keep - const char daDekuItem_c::m_arcname[] = "Deku"; static dCcD_SrcCyl l_cyl_src = { diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index dded7d4e4..9663d91d5 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_demo00.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_demo00.h" #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h" #include "JSystem/J3DGraphBase/J3DSys.h" diff --git a/src/d/actor/d_a_demo_dk.cpp b/src/d/actor/d_a_demo_dk.cpp index 22748388d..ccd9a6b85 100644 --- a/src/d/actor/d_a_demo_dk.cpp +++ b/src/d/actor/d_a_demo_dk.cpp @@ -3,6 +3,7 @@ * NPC - Helmaroc King (Forsaken Fortress 1 exterior) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_demo_dk.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 8a6bffd12..03398237c 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -3,6 +3,7 @@ * Item - Cutscene Item */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_demo_item.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -15,8 +16,6 @@ #include "m_Do/m_Do_mtx.h" #include "f_op/f_op_camera.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - const int daDitem_c::m_rot_time = 8*30; u8 daDitem_c::m_effect_type[0x100] = { diff --git a/src/d/actor/d_a_demo_kmm.cpp b/src/d/actor/d_a_demo_kmm.cpp index 4a7d9f0ee..655565d23 100644 --- a/src/d/actor/d_a_demo_kmm.cpp +++ b/src/d/actor/d_a_demo_kmm.cpp @@ -3,6 +3,7 @@ * NPC - Seagull (cutscenes) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_demo_kmm.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 0f443c1e9..24bd05072 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_disappear.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_disappear.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp index 243597b2f..2bd2f3fb3 100644 --- a/src/d/actor/d_a_dk.cpp +++ b/src/d/actor/d_a_dk.cpp @@ -3,6 +3,7 @@ * NPC - Helmaroc King (Forsaken Fortress 1 tower, Outset Island) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_dk.h" #include "d/res/res_dk.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_door10.cpp b/src/d/actor/d_a_door10.cpp index 1bb651a15..e80cdda6b 100644 --- a/src/d/actor/d_a_door10.cpp +++ b/src/d/actor/d_a_door10.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_door10.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_door10.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_door12.cpp b/src/d/actor/d_a_door12.cpp index 4aa59f5f0..311b5395d 100644 --- a/src/d/actor/d_a_door12.cpp +++ b/src/d/actor/d_a_door12.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_door12.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_door12.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index 9710e7b66..8f6000214 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/src/d/actor/d_a_dr.cpp @@ -3,6 +3,7 @@ * NPC - Valoo (Overworld) / ドラゴン (Dragon) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_dr.h" #include "d/res/res_dr.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp index 2a52ba64d..0831ad8b7 100644 --- a/src/d/actor/d_a_dr2.cpp +++ b/src/d/actor/d_a_dr2.cpp @@ -3,6 +3,7 @@ * NPC - Gohma fight - Valoo (body & tail) + lava pit & ceiling rock */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_dr2.h" #include "d/res/res_dr2.h" #include "m_Do/m_Do_ext.h" diff --git a/src/d/actor/d_a_dummy.cpp b/src/d/actor/d_a_dummy.cpp index d917ffc78..1c818b2c2 100644 --- a/src/d/actor/d_a_dummy.cpp +++ b/src/d/actor/d_a_dummy.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_dummy.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_dummy.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index d1e17b69c..d346fdd37 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -3,6 +3,7 @@ * Object - Torches */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ep.h" #include "d/res/res_ep.h" #include "d/d_procname.h" @@ -16,7 +17,6 @@ #include "d/d_bg_s_lin_chk.h" #include "m_Do/m_Do_lib.h" - void daEp_ToFore(ep_class* i_this) { } diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp index 39b9da8bc..6431a7caf 100644 --- a/src/d/actor/d_a_esa.cpp +++ b/src/d/actor/d_a_esa.cpp @@ -3,6 +3,7 @@ * Item - All-Purpose Bait */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_esa.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_sea.h" @@ -16,8 +17,6 @@ #include "d/res/res_link.h" #include "f_op/f_op_actor_mng.h" -#include "weak_bss_3569.h" // IWYU pragma: keep - /* 800E7E60-800E7EA8 .text daEsa_Draw__FP9esa_class */ static BOOL daEsa_Draw(esa_class* i_this) { g_env_light.setLightTevColorType(i_this->mpModel, &i_this->tevStr); diff --git a/src/d/actor/d_a_fallrock.cpp b/src/d/actor/d_a_fallrock.cpp index fe78f62cf..e60ba9a9b 100644 --- a/src/d/actor/d_a_fallrock.cpp +++ b/src/d/actor/d_a_fallrock.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_fallrock.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_fallrock.h" #include "d/res/res_always.h" #include "d/d_com_inf_game.h" @@ -12,7 +13,6 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" - char daFallRock_c::m_arcname[] = "Always"; f32 daFallRock_c::m_falllen = 7000.0f; s16 daFallRock_c::m_rot_speed = 0x3E8; diff --git a/src/d/actor/d_a_fallrock_tag.cpp b/src/d/actor/d_a_fallrock_tag.cpp index 49211817d..e645614b3 100644 --- a/src/d/actor/d_a_fallrock_tag.cpp +++ b/src/d/actor/d_a_fallrock_tag.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_fallrock_tag.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_fallrock_tag.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 3345aa5c3..1b7a6f052 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_fan.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_fan.h" #include "d/res/res_hsen1.h" #include "d/res/res_hsen3.h" diff --git a/src/d/actor/d_a_ff.cpp b/src/d/actor/d_a_ff.cpp index c95e4a849..7def9fb3e 100644 --- a/src/d/actor/d_a_ff.cpp +++ b/src/d/actor/d_a_ff.cpp @@ -3,6 +3,7 @@ * Object - Firefly (not collectable) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ff.h" #include "d/actor/d_a_player.h" #include "d/d_bg_s_gnd_chk.h" diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index fd86364b1..e98a28db0 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -3,6 +3,7 @@ * Mini-Boss - Phantom Ganon */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_fganon.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -20,9 +21,6 @@ #include "d/res/res_pgsw.h" #include "f_op/f_op_camera.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - fganon_class* master; u8 hio_set; daFganon_HIO_c l_HIO; diff --git a/src/d/actor/d_a_fgmahou.cpp b/src/d/actor/d_a_fgmahou.cpp index 1aa4074e6..68a0305f7 100644 --- a/src/d/actor/d_a_fgmahou.cpp +++ b/src/d/actor/d_a_fgmahou.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_fgmahou.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_fgmahou.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_fire.cpp b/src/d/actor/d_a_fire.cpp index 94cf88004..87216ad5c 100644 --- a/src/d/actor/d_a_fire.cpp +++ b/src/d/actor/d_a_fire.cpp @@ -3,14 +3,13 @@ // Translation Unit: d_a_fire.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_fire.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" #include "d/d_priority.h" -#include "weak_data_1811.h" // IWYU pragma: keep - static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp index 982b1a77d..2d5a5ddc4 100644 --- a/src/d/actor/d_a_floor.cpp +++ b/src/d/actor/d_a_floor.cpp @@ -3,6 +3,7 @@ * Object - Wind Temple - Breakable floor (Iron Boots, Bombs, etc.) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_floor.h" #include "d/res/res_hhyu1.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index 8693c0504..513693082 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -3,6 +3,7 @@ * Enemy - Floormaster */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_fm.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index 2362fdfbc..ebc696e09 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_ghostship.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ghostship.h" #include "d/res/res_ayush.h" #include "SSystem/SComponent/c_math.h" @@ -14,8 +15,6 @@ #include "d/d_kankyo_wether.h" #include "d/res/res_cloth.h" -#include "weak_data_1811.h" // IWYU pragma: keep - const u32 daGhostship_c::m_heapsize = 0x1EA0; const char daGhostship_c::m_arc_name[] = "Ayush"; const char daGhostship_c::m_cloth_arc_name[] = "Cloth"; diff --git a/src/d/actor/d_a_gm.cpp b/src/d/actor/d_a_gm.cpp index 524d1ccee..f6a473890 100644 --- a/src/d/actor/d_a_gm.cpp +++ b/src/d/actor/d_a_gm.cpp @@ -3,6 +3,7 @@ * Mini-Boss - Mothula / Enemy - Mothula Larva */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_gm.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_gnd.cpp b/src/d/actor/d_a_gnd.cpp index fd402cdb8..08865f1da 100644 --- a/src/d/actor/d_a_gnd.cpp +++ b/src/d/actor/d_a_gnd.cpp @@ -3,6 +3,7 @@ * Boss - Ganondorf */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_gnd.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index b95453559..69ea768bf 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -3,6 +3,7 @@ * Object - Big red finish line flag (Boating Course, Flight Control Platform) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_goal_flag.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 897f1e6f6..ad02959c6 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_grass.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_grass.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" @@ -14,8 +15,6 @@ #include "d/d_tree.h" #include "SSystem/SComponent/c_sxyz.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - namespace daGrass_prm { inline s8 getItemNo(grass_class* ac) { return (fopAcM_GetParam(ac) >> 6) & 0x3F; } inline u8 getKind(grass_class* ac) { return (fopAcM_GetParam(ac) >> 4) & 0x03; } diff --git a/src/d/actor/d_a_grid.cpp b/src/d/actor/d_a_grid.cpp index aad47f4cb..11f2bd6f9 100644 --- a/src/d/actor/d_a_grid.cpp +++ b/src/d/actor/d_a_grid.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_grid.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_grid.h" #include "JSystem/J3DGraphBase/J3DPacket.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_gy.cpp b/src/d/actor/d_a_gy.cpp index b3d0056db..ab2d0af76 100644 --- a/src/d/actor/d_a_gy.cpp +++ b/src/d/actor/d_a_gy.cpp @@ -3,6 +3,7 @@ * Enemy - Gyorg */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_gy.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_gy_ctrl.cpp b/src/d/actor/d_a_gy_ctrl.cpp index b74830dc6..334645729 100644 --- a/src/d/actor/d_a_gy_ctrl.cpp +++ b/src/d/actor/d_a_gy_ctrl.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_gy_ctrl.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_gy_ctrl.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index 3364d5e00..94ec5b158 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/src/d/actor/d_a_himo2.cpp @@ -3,6 +3,7 @@ * Item - Grappling Hook */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_himo2.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp index 471b96cda..bbc92b271 100644 --- a/src/d/actor/d_a_himo3.cpp +++ b/src/d/actor/d_a_himo3.cpp @@ -3,6 +3,7 @@ * Object - Rope (Pirate Ship rope minigame, Forsaken Fortress) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_himo3.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index 55b5263b0..2e040acd4 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_hitobj.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_hitobj.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor.h" diff --git a/src/d/actor/d_a_hmlif.cpp b/src/d/actor/d_a_hmlif.cpp index 5a5c493eb..9bc2ccd4c 100644 --- a/src/d/actor/d_a_hmlif.cpp +++ b/src/d/actor/d_a_hmlif.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods - Glowing platform */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_hmlif.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index a811da7fa..f12f7645c 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -3,6 +3,7 @@ * Item - Hookshot */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_hookshot.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" @@ -12,8 +13,6 @@ #include "d/d_procname.h" #include "d/d_priority.h" -#include "weak_data_1811.h" // IWYU pragma: keep - #include "assets/l_chainS3TCTEX__d_hookshot.h" const u16 l_chainS3TCTEX__width = 32; const u16 l_chainS3TCTEX__height = 32; diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp index e4c282704..abb6cb28f 100644 --- a/src/d/actor/d_a_hot_floor.cpp +++ b/src/d/actor/d_a_hot_floor.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_hot_floor.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_hot_floor.h" #include "f_op/f_op_actor_mng.h" #include "JSystem/JParticle/JPAParticle.h" diff --git a/src/d/actor/d_a_hys.cpp b/src/d/actor/d_a_hys.cpp index 25df721b6..9267bc6e9 100644 --- a/src/d/actor/d_a_hys.cpp +++ b/src/d/actor/d_a_hys.cpp @@ -3,6 +3,7 @@ * Object - Eye switch */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_hys.h" #include "d/res/res_hys.h" #include "d/d_com_inf_game.h" @@ -10,8 +11,6 @@ #include "d/d_procname.h" #include "d/d_priority.h" -#include "weak_data_1811.h" // IWYU pragma: keep - const char* daHys_c::m_arcname[2] = {"Hys", "Hys"}; /* Model file indexes. */ @@ -223,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_ib.cpp b/src/d/actor/d_a_ib.cpp index c3e2c956b..7dee2d810 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_ib.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ib.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -15,8 +16,6 @@ #include "global.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep - struct daIball_c__data { /* 0x00 */ u8 m00; /* 0x01 */ u8 m01; diff --git a/src/d/actor/d_a_icelift.cpp b/src/d/actor/d_a_icelift.cpp index de443bcd4..eadadcea5 100644 --- a/src/d/actor/d_a_icelift.cpp +++ b/src/d/actor/d_a_icelift.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_icelift.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_icelift.h" #include "d/d_bg_w.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp index e7efada4e..0b4d52ce5 100644 --- a/src/d/actor/d_a_ikari.cpp +++ b/src/d/actor/d_a_ikari.cpp @@ -3,6 +3,7 @@ * Object - Forsaken Fortress - Anchors */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ikari.h" #include "d/res/res_ikari.h" #include "d/d_kankyo_wether.h" diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index c8d6f9b0e..874e7380f 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -3,6 +3,7 @@ * Item - Field Item */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_item.h" #include "d/d_item_data.h" #include "d/actor/d_a_item.h" @@ -15,8 +16,6 @@ #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_controller_pad.h" -#include "weak_data_1811.h" // IWYU pragma: keep - s32 daItem_c::m_timer_max = 10000; /* 800F4BC8-800F4BD4 .text getData__12daItemBase_cFv */ diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index 282b6d15e..762304229 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -3,6 +3,7 @@ * Item - Base Item Class */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_itembase.h" #include "d/d_item.h" #include "d/d_item_data.h" diff --git a/src/d/actor/d_a_jbo.cpp b/src/d/actor/d_a_jbo.cpp index d64747e56..3accebb22 100644 --- a/src/d/actor/d_a_jbo.cpp +++ b/src/d/actor/d_a_jbo.cpp @@ -3,6 +3,7 @@ * Object - Baba Bud */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_jbo.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index 191941091..d9c9ca25f 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -3,6 +3,7 @@ * Object - Ship's wheel (Tetra's Ship) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kaji.h" #include "d/res/res_kaji.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_kamome.cpp b/src/d/actor/d_a_kamome.cpp index a12fcab73..fc07166db 100644 --- a/src/d/actor/d_a_kamome.cpp +++ b/src/d/actor/d_a_kamome.cpp @@ -3,6 +3,7 @@ * NPC - Seagull */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kamome.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp index 2a7d6ddd6..56fe843be 100644 --- a/src/d/actor/d_a_kanban.cpp +++ b/src/d/actor/d_a_kanban.cpp @@ -3,6 +3,7 @@ * Object - Cuttable sign */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kanban.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_bomb.h" @@ -18,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_kantera.cpp b/src/d/actor/d_a_kantera.cpp index 1da18112b..ced39f278 100644 --- a/src/d/actor/d_a_kantera.cpp +++ b/src/d/actor/d_a_kantera.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_kantera.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kantera.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_kb.cpp b/src/d/actor/d_a_kb.cpp index 9f0da4777..9d02f4612 100644 --- a/src/d/actor/d_a_kb.cpp +++ b/src/d/actor/d_a_kb.cpp @@ -3,6 +3,7 @@ * NPC - Pig */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kb.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_kddoor.cpp b/src/d/actor/d_a_kddoor.cpp index e6afbc6af..a16704949 100644 --- a/src/d/actor/d_a_kddoor.cpp +++ b/src/d/actor/d_a_kddoor.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_kddoor.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kddoor.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index ff13429b9..dbd1e56a3 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -3,6 +3,7 @@ * Enemy - Keese */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ki.h" #include "d/actor/d_a_player.h" #include "m_Do/m_Do_ext.h" @@ -21,9 +22,6 @@ #include "d/d_bg_s_lin_chk.h" #include "JSystem/JUtility/JUTReport.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - class kiHIO_c : public JORReflexible { public: kiHIO_c() { diff --git a/src/d/actor/d_a_kita.cpp b/src/d/actor/d_a_kita.cpp index 0edd8481d..673211e38 100644 --- a/src/d/actor/d_a_kita.cpp +++ b/src/d/actor/d_a_kita.cpp @@ -3,6 +3,7 @@ * Object - Forbidden Woods - Hanging flower platform */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kita.h" #include "SSystem/SComponent/c_phase.h" #include "d/actor/d_a_player.h" @@ -18,9 +19,6 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_bg_s_movebg_actor.h" -#include "weak_data_1811.h" // IWYU pragma: keep - - /* 00000078-0000032C .text ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void ride_call_back(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) { kita_class* pActor = static_cast(i_ac); diff --git a/src/d/actor/d_a_klft.cpp b/src/d/actor/d_a_klft.cpp index b121c298e..ca9ae96f9 100644 --- a/src/d/actor/d_a_klft.cpp +++ b/src/d/actor/d_a_klft.cpp @@ -3,6 +3,7 @@ * Object - Forbidden Woods - Lift (moving wooden platform) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_klft.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_kmon.cpp b/src/d/actor/d_a_kmon.cpp index 3d113ddc8..770235198 100644 --- a/src/d/actor/d_a_kmon.cpp +++ b/src/d/actor/d_a_kmon.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_kmon.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kmon.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_kn.cpp b/src/d/actor/d_a_kn.cpp index 2fd6562b1..aa175cbbf 100644 --- a/src/d/actor/d_a_kn.cpp +++ b/src/d/actor/d_a_kn.cpp @@ -3,6 +3,7 @@ * NPC - Crab */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kn.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_knob00.cpp b/src/d/actor/d_a_knob00.cpp index 57c7bd26c..ed674d51e 100644 --- a/src/d/actor/d_a_knob00.cpp +++ b/src/d/actor/d_a_knob00.cpp @@ -3,6 +3,7 @@ * Object - Regular doors (with knobs, not sliding) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_knob00.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_obj_pirateship.h" diff --git a/src/d/actor/d_a_kokiie.cpp b/src/d/actor/d_a_kokiie.cpp index d85298b74..289740692 100644 --- a/src/d/actor/d_a_kokiie.cpp +++ b/src/d/actor/d_a_kokiie.cpp @@ -3,6 +3,7 @@ * Object - Forbidden Woods - Hanging flower house */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kokiie.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_komore.cpp b/src/d/actor/d_a_komore.cpp index 171645426..ddc754452 100644 --- a/src/d/actor/d_a_komore.cpp +++ b/src/d/actor/d_a_komore.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_komore.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_komore.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp index 15a9b59ff..61d09f8f5 100644 --- a/src/d/actor/d_a_ks.cpp +++ b/src/d/actor/d_a_ks.cpp @@ -3,6 +3,7 @@ * Enemy - Morth */ +#include "d/dolzel.h" // IWYU pragma: keep // Fakematch? Having sym off before d_a_ks.h but then turning it on before // d_a_player_main.h fixes the weak function ordering of // `daPy_py_c::getSwordTopPos() const` and `daPy_py_c::getHeadTopPos() const` @@ -20,9 +21,6 @@ #include "d/actor/d_a_gm.h" #include "d/res/res_ks.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - static int KS_ALL_COUNT = 0; static int KUTTUKU_ALL_COUNT = 0; static BOOL HEAVY_IN = FALSE; diff --git a/src/d/actor/d_a_kt.cpp b/src/d/actor/d_a_kt.cpp index afae2d146..3ce5be703 100644 --- a/src/d/actor/d_a_kt.cpp +++ b/src/d/actor/d_a_kt.cpp @@ -3,6 +3,7 @@ * NPC - Unused - Small bird */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kt.h" #include "d/res/res_kt.h" #include "d/d_bg_s_gnd_chk.h" diff --git a/src/d/actor/d_a_kui.cpp b/src/d/actor/d_a_kui.cpp index 12aaf7a63..d51ce7db1 100644 --- a/src/d/actor/d_a_kui.cpp +++ b/src/d/actor/d_a_kui.cpp @@ -3,6 +3,7 @@ * Object - Grappling Hook objects */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kui.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_btd.h" diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index fef14ece8..be1e57cf0 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_kytag00.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag00.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 228fe572b..9e7b34570 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_kytag01.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag01.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index c3148a6b8..72bf54941 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_kytag02.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag02.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index 88c6420d8..73b458ae4 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_kytag03.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag03.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 05edbc668..7ddfc8287 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -3,6 +3,7 @@ * Tag - Weather Tag 4 */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag04.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index b9222e3c6..3eaf42e4b 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -3,6 +3,7 @@ * Tag - Weather Tag 5 */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag05.h" #include "JAZelAudio/JAIZelBasic.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index e2596aae5..3857d6581 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -3,6 +3,7 @@ * Tag - Weather Tag 6 */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag06.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index ca14c3af2..c2e2e5308 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_kytag07.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag07.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index a7763aaa8..8287370b5 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -3,6 +3,7 @@ * Object - Generic wall lamp */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_lamp.h" #include "d/res/res_lamp.h" #include "d/d_com_inf_game.h" @@ -10,8 +11,6 @@ #include "d/d_priority.h" #include "m_Do/m_Do_mtx.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - /* 000000EC-00000158 .text daLamp_Draw__FP10lamp_class */ static BOOL daLamp_Draw(lamp_class* i_this) { g_env_light.settingTevStruct(TEV_TYPE_BG0, &i_this->current.pos, &i_this->tevStr); diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index 927dc2bd4..45a047063 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods - Glowing light bridge */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_lbridge.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index 83309669e..762423897 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/src/d/actor/d_a_leaflift.cpp @@ -3,6 +3,7 @@ * Object - Forest Haven - Lilypad lift */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_leaflift.h" #include "d/d_bg_s_func.h" #include "d/d_bg_s_movebg_actor.h" diff --git a/src/d/actor/d_a_lod_bg.cpp b/src/d/actor/d_a_lod_bg.cpp index c42d63f06..6a704bdfc 100644 --- a/src/d/actor/d_a_lod_bg.cpp +++ b/src/d/actor/d_a_lod_bg.cpp @@ -3,6 +3,7 @@ * Background island LOD model actor */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_lod_bg.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" @@ -15,8 +16,6 @@ #include "JSystem/J3DGraphLoader/J3DModelLoader.h" #include -#include "weak_data_1811.h" // IWYU pragma: keep - const char daLodbg_c::LodAllPath[] = "/res/Stage/sea/LODALL.arc"; daLodbg_c::daLodbg_c() { diff --git a/src/d/actor/d_a_lstair.cpp b/src/d/actor/d_a_lstair.cpp index f292306ce..759349cfb 100644 --- a/src/d/actor/d_a_lstair.cpp +++ b/src/d/actor/d_a_lstair.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods - Glowing stairs */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_lstair.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_lwood.cpp b/src/d/actor/d_a_lwood.cpp index 59b211911..dc878d6de 100644 --- a/src/d/actor/d_a_lwood.cpp +++ b/src/d/actor/d_a_lwood.cpp @@ -3,6 +3,7 @@ * Object - Normal tree */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_lwood.h" #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_machine.cpp b/src/d/actor/d_a_machine.cpp index 79daadb28..b604b34a5 100644 --- a/src/d/actor/d_a_machine.cpp +++ b/src/d/actor/d_a_machine.cpp @@ -3,6 +3,7 @@ * Enemy - Blade Trap (biting) (Wind Temple - giant fan room) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_machine.h" #include "d/actor/d_a_player.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp index 2ab986492..39f599efd 100644 --- a/src/d/actor/d_a_magma.cpp +++ b/src/d/actor/d_a_magma.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_magma.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_magma.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index 4416cf403..661f2e664 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_majuu_flag.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_majuu_flag.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" @@ -17,8 +18,6 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_graphic.h" -#include "weak_data_1811.h" // IWYU pragma: keep - class daMajuu_Flag_HIO_c : public mDoHIO_entry_c { public: daMajuu_Flag_HIO_c() { diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 99c2a892f..9ebd36613 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -3,6 +3,7 @@ * Object - Phantom Ganon's cape/Darknut cape */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mant.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index 8137d6571..2f1d52d2a 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/src/d/actor/d_a_mbdoor.cpp @@ -3,6 +3,7 @@ * Object - Double doors (Forsaken Fortress tower & Puppet Ganon boss rooms) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mbdoor.h" #include "d/res/res_mbdoor.h" #include "d/res/res_gbdoor.h" diff --git a/src/d/actor/d_a_mdoor.cpp b/src/d/actor/d_a_mdoor.cpp index 5069fe438..951e4a954 100644 --- a/src/d/actor/d_a_mdoor.cpp +++ b/src/d/actor/d_a_mdoor.cpp @@ -3,6 +3,7 @@ * Object - Wooden/Metal bars (Forbidden Woods, Cabana Maze, Dragon Roost Cavern, Earth Temple, etc.) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mdoor.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_mflft.cpp b/src/d/actor/d_a_mflft.cpp index 7337017a8..60cb08e19 100644 --- a/src/d/actor/d_a_mflft.cpp +++ b/src/d/actor/d_a_mflft.cpp @@ -3,6 +3,7 @@ * Object - Dragon Roost Cavern - Flame lift (platform lifted up by lava plume) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mflft.h" #include "d/d_bg_w.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_mgameboard.cpp b/src/d/actor/d_a_mgameboard.cpp index 1be7048dd..71fed6606 100644 --- a/src/d/actor/d_a_mgameboard.cpp +++ b/src/d/actor/d_a_mgameboard.cpp @@ -3,6 +3,7 @@ * Squid-Hunt/"Sploosh Kaboom" Minigame */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mgameboard.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index 900c107b7..714f406b0 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/src/d/actor/d_a_mmusic.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_mmusic.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mmusic.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp index 7dffc60ca..c2982ff10 100644 --- a/src/d/actor/d_a_mo2.cpp +++ b/src/d/actor/d_a_mo2.cpp @@ -3,6 +3,7 @@ * Enemy - Moblin */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mo2.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index bb368815c..d3375d4b0 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -11,6 +11,7 @@ #pragma optimization_level 1 #endif +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_movie_player.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" @@ -20,8 +21,6 @@ #include "dolphin/os/OSMessage.h" #include "dolphin/base/PPCArch.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - static u8 THPStatistics[0x460]; // TODO static THPHuffmanTab* Ydchuff ALIGN_DECL(32); diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index f7c3ec8e7..8149f7c1f 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -3,6 +3,7 @@ * Enemy - Moblin Statue / モ石像 (Mo Sekizou) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mozo.h" #include "d/res/res_mozo.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_msw.cpp b/src/d/actor/d_a_msw.cpp index 2afe3b8a7..8000d1829 100644 --- a/src/d/actor/d_a_msw.cpp +++ b/src/d/actor/d_a_msw.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_msw.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_msw.h" #include "d/res/res_msw.h" #include "d/d_bg_s_movebg_actor.h" diff --git a/src/d/actor/d_a_mt.cpp b/src/d/actor/d_a_mt.cpp index a7e182320..1fadb378e 100644 --- a/src/d/actor/d_a_mt.cpp +++ b/src/d/actor/d_a_mt.cpp @@ -3,6 +3,7 @@ * Enemy - Magtail */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mt.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_mtoge.cpp b/src/d/actor/d_a_mtoge.cpp index fb7f70420..b099a89ff 100644 --- a/src/d/actor/d_a_mtoge.cpp +++ b/src/d/actor/d_a_mtoge.cpp @@ -3,6 +3,7 @@ * Object - Forsaken Fortress - Spikes */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mtoge.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index ee27c396f..c90b55c4e 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -3,6 +3,7 @@ * Item - Forest Firefly / 森のほたる (Mori no Hotaru) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_nh.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_npc_ac1.cpp b/src/d/actor/d_a_npc_ac1.cpp index 184de7249..5968d7a66 100644 --- a/src/d/actor/d_a_npc_ac1.cpp +++ b/src/d/actor/d_a_npc_ac1.cpp @@ -3,6 +3,7 @@ * NPC - Prince Komali (after Dragon Roost Cavern) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ac1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_ah.cpp b/src/d/actor/d_a_npc_ah.cpp index 707084f0c..4723b4856 100644 --- a/src/d/actor/d_a_npc_ah.cpp +++ b/src/d/actor/d_a_npc_ah.cpp @@ -3,6 +3,7 @@ * NPC - Old Man Ho Ho */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ah.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_aj1.cpp b/src/d/actor/d_a_npc_aj1.cpp index 54dde9b18..4bdc6a707 100644 --- a/src/d/actor/d_a_npc_aj1.cpp +++ b/src/d/actor/d_a_npc_aj1.cpp @@ -3,6 +3,7 @@ * NPC - Sturgeon */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_aj1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_auction.cpp b/src/d/actor/d_a_npc_auction.cpp index bc9854548..645e6c69b 100644 --- a/src/d/actor/d_a_npc_auction.cpp +++ b/src/d/actor/d_a_npc_auction.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_npc_auction.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_auction.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp index a09f435b9..2fe4b74a8 100644 --- a/src/d/actor/d_a_npc_ba1.cpp +++ b/src/d/actor/d_a_npc_ba1.cpp @@ -3,6 +3,7 @@ * NPC - Link's Grandma */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ba1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_bj1.cpp b/src/d/actor/d_a_npc_bj1.cpp index f04144a63..d8b88fce8 100644 --- a/src/d/actor/d_a_npc_bj1.cpp +++ b/src/d/actor/d_a_npc_bj1.cpp @@ -3,6 +3,7 @@ * NPC - Generic Koroks */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bj1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp index 813662826..9eefeecb9 100644 --- a/src/d/actor/d_a_npc_bm1.cpp +++ b/src/d/actor/d_a_npc_bm1.cpp @@ -3,6 +3,7 @@ * NPC - Generic Ritos */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bm1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_bmcon1.cpp b/src/d/actor/d_a_npc_bmcon1.cpp index 6bd2a702a..ca6ab3b3b 100644 --- a/src/d/actor/d_a_npc_bmcon1.cpp +++ b/src/d/actor/d_a_npc_bmcon1.cpp @@ -3,6 +3,7 @@ * NPC - Willi & Obli (Flight Control Platform) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bmcon1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_bms1.cpp b/src/d/actor/d_a_npc_bms1.cpp index 2522914f5..6820f7550 100644 --- a/src/d/actor/d_a_npc_bms1.cpp +++ b/src/d/actor/d_a_npc_bms1.cpp @@ -3,6 +3,7 @@ * NPC - Bomb-Master Cannon (Windfall Bomb Shop shopkeeper) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bms1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp index b627ef46e..98de39412 100644 --- a/src/d/actor/d_a_npc_bmsw.cpp +++ b/src/d/actor/d_a_npc_bmsw.cpp @@ -3,6 +3,7 @@ * NPC - Koboli (Rito mail sorter) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bmsw.h" #include "d/res/res_bmsw.h" #include "d/d_shop.h" @@ -16,10 +17,6 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_hostIO.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - - daNpc_Bmsw_HIO_c l_HIO; diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 64387be41..0ecf78147 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -3,6 +3,7 @@ * NPC - Beedle / ボ−トショップ店員 (Boat shopkeeper) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bs1.h" #include "d/res/res_bs.h" #include "JSystem/J3DGraphBase/J3DSys.h" @@ -22,7 +23,36 @@ #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_controller_pad.h" -#include "weak_data_1811.h" // IWYU pragma: keep +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; diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index 6ffb5a5a5..360b81bc3 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -3,6 +3,7 @@ * NPC - Baito */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_btsw.h" #include "d/d_letter.h" #include "d/d_snap.h" @@ -15,8 +16,36 @@ #include "d/d_priority.h" #include "d/d_cc_d.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep +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; diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 921c82c62..70584615f 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_npc_btsw2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_btsw2.h" #include "d/res/res_btsw.h" #include "d/d_com_inf_game.h" @@ -15,8 +16,21 @@ #include "m_Do/m_Do_mtx.h" #include "SSystem/SComponent/c_angle.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep +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; diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index 7823005ee..8763a023a 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/src/d/actor/d_a_npc_cb1.cpp @@ -3,6 +3,7 @@ * Player - Makar */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_cb1.h" #include "d/actor/d_a_obj_vmc.h" #include "d/actor/d_a_ship.h" @@ -19,9 +20,6 @@ #include "d/actor/d_a_player_main.h" #include "d/res/res_cb.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - daNpc_Cb1_HIO_c l_HIO; static dCcD_SrcCyl l_cyl_src = { diff --git a/src/d/actor/d_a_npc_co1.cpp b/src/d/actor/d_a_npc_co1.cpp index be1b8468f..98c1ea731 100644 --- a/src/d/actor/d_a_npc_co1.cpp +++ b/src/d/actor/d_a_npc_co1.cpp @@ -3,6 +3,7 @@ * NPC - Prince Komali (before Dragon Roost Cavern) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_co1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_de1.cpp b/src/d/actor/d_a_npc_de1.cpp index c44c58226..b5ae1e7ee 100644 --- a/src/d/actor/d_a_npc_de1.cpp +++ b/src/d/actor/d_a_npc_de1.cpp @@ -3,6 +3,7 @@ * NPC - Deku Tree */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_de1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_ds1.cpp b/src/d/actor/d_a_npc_ds1.cpp index 0f4522fae..8b21a7ec8 100644 --- a/src/d/actor/d_a_npc_ds1.cpp +++ b/src/d/actor/d_a_npc_ds1.cpp @@ -3,6 +3,7 @@ * NPC - Doc Bandam (Windfall Potion Shop shopkeeper) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ds1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_fa1.cpp b/src/d/actor/d_a_npc_fa1.cpp index c488b6887..425ffa051 100644 --- a/src/d/actor/d_a_npc_fa1.cpp +++ b/src/d/actor/d_a_npc_fa1.cpp @@ -3,6 +3,7 @@ * Item - Fairy / 回復妖精 (Recovery fairy) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_fa1.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" @@ -12,8 +13,88 @@ #include "d/d_snap.h" #include "f_op/f_op_actor_mng.h" -#include "weak_data_2100_2080.h" // IWYU pragma: keep +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() { diff --git a/src/d/actor/d_a_npc_gk1.cpp b/src/d/actor/d_a_npc_gk1.cpp index 947760f1f..6113a4a67 100644 --- a/src/d/actor/d_a_npc_gk1.cpp +++ b/src/d/actor/d_a_npc_gk1.cpp @@ -3,6 +3,7 @@ * NPC - Mila's Father (poor) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gk1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_gp1.cpp b/src/d/actor/d_a_npc_gp1.cpp index 3b259581f..53209c28e 100644 --- a/src/d/actor/d_a_npc_gp1.cpp +++ b/src/d/actor/d_a_npc_gp1.cpp @@ -3,6 +3,7 @@ * NPC - Maggie's Father (rich) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gp1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp index 0b8020629..22896f982 100644 --- a/src/d/actor/d_a_npc_hi1.cpp +++ b/src/d/actor/d_a_npc_hi1.cpp @@ -3,6 +3,7 @@ * NPC - King of Hyrule */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_hi1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_ho.cpp b/src/d/actor/d_a_npc_ho.cpp index f2bf8acb4..4aa726521 100644 --- a/src/d/actor/d_a_npc_ho.cpp +++ b/src/d/actor/d_a_npc_ho.cpp @@ -3,6 +3,7 @@ * NPC - Mrs. Marie (Windfall Island teacher) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ho.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp index 09001e67d..69b44dd82 100644 --- a/src/d/actor/d_a_npc_hr.cpp +++ b/src/d/actor/d_a_npc_hr.cpp @@ -3,6 +3,7 @@ * NPC - Zephos & Cyclos */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_hr.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp index e9516cd5e..20927920f 100644 --- a/src/d/actor/d_a_npc_jb1.cpp +++ b/src/d/actor/d_a_npc_jb1.cpp @@ -3,6 +3,7 @@ * NPC - Jabun */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_jb1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 020ed7c01..8c859b9df 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -3,6 +3,7 @@ * NPC - Orca / 爺さん (Jiisan) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ji1.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_tsubo.h" @@ -16,9 +17,6 @@ #include "d/d_lib.h" #include "f_op/f_op_msg.h" -#include "weak_data_1811.h" // IWYU pragma: keep -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - static BOOL daNpc_Ji1_setHairAngle(daNpc_Ji1_c*); static daNpc_Ji1_HIO_c l_HIO; diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index ba81177e8..2ddde3753 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -3,6 +3,7 @@ * Player - Hyoi Seagull */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kamome.h" #include "d/res/res_kamome.h" #include "d/d_com_inf_game.h" @@ -17,8 +18,55 @@ #include "d/d_snap.h" #include "d/d_camera.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep +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; diff --git a/src/d/actor/d_a_npc_kf1.cpp b/src/d/actor/d_a_npc_kf1.cpp index 1318b4e57..3da95c23d 100644 --- a/src/d/actor/d_a_npc_kf1.cpp +++ b/src/d/actor/d_a_npc_kf1.cpp @@ -3,6 +3,7 @@ * NPC - Mila's Father (rich) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kf1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_kg1.cpp b/src/d/actor/d_a_npc_kg1.cpp index 2c95452c5..260fa3056 100644 --- a/src/d/actor/d_a_npc_kg1.cpp +++ b/src/d/actor/d_a_npc_kg1.cpp @@ -3,6 +3,7 @@ * NPC - Salvatore (Squid-Hunt/"Sploosh Kaboom" Minigame) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kg1.h" #include "d/d_lib.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_kg2.cpp b/src/d/actor/d_a_npc_kg2.cpp index d074d9648..ec869f542 100644 --- a/src/d/actor/d_a_npc_kg2.cpp +++ b/src/d/actor/d_a_npc_kg2.cpp @@ -3,6 +3,7 @@ * NPC - Salvatore (Cannon Minigame) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kg2.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_kk1.cpp b/src/d/actor/d_a_npc_kk1.cpp index a638ef7b7..4685f0ec6 100644 --- a/src/d/actor/d_a_npc_kk1.cpp +++ b/src/d/actor/d_a_npc_kk1.cpp @@ -3,6 +3,7 @@ * NPC - Mila (poor) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kk1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index 703110aac..fe613e56e 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -3,6 +3,7 @@ * NPC - Mila (rich) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_km1.h" #include "d/d_com_inf_game.h" #include "d/d_snap.h" @@ -11,7 +12,36 @@ #include "d/d_priority.h" #include "d/res/res_km.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep +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; diff --git a/src/d/actor/d_a_npc_ko1.cpp b/src/d/actor/d_a_npc_ko1.cpp index 0781949f6..7c13fccee 100644 --- a/src/d/actor/d_a_npc_ko1.cpp +++ b/src/d/actor/d_a_npc_ko1.cpp @@ -3,6 +3,7 @@ * NPC - Joel & Zill (Outset Island) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ko1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_kp1.cpp b/src/d/actor/d_a_npc_kp1.cpp index 9d2d12a2c..d5f937b49 100644 --- a/src/d/actor/d_a_npc_kp1.cpp +++ b/src/d/actor/d_a_npc_kp1.cpp @@ -3,6 +3,7 @@ * NPC - Maggie (rich) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kp1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp index cc20516af..cc1ab87ef 100644 --- a/src/d/actor/d_a_npc_ls1.cpp +++ b/src/d/actor/d_a_npc_ls1.cpp @@ -3,6 +3,7 @@ * NPC - Aryll */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ls1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 6ae73dca6..efa57eed3 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -3,6 +3,7 @@ * Player - Medli */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_md.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -17,9 +18,6 @@ #include "d/d_camera.h" #include "d/d_detect.h" -#include "weak_data_1811.h" // IWYU pragma: keep -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - static daNpc_Md_HIO_c l_HIO; static cXyz l_ms_light_local_vec(0.0f, 0.0f, -10000.0f); diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index 508db8b45..763131f36 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -3,6 +3,7 @@ * NPC - Ivan */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_mk.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_mn.cpp b/src/d/actor/d_a_npc_mn.cpp index 06fa604e6..3efdb9959 100644 --- a/src/d/actor/d_a_npc_mn.cpp +++ b/src/d/actor/d_a_npc_mn.cpp @@ -3,6 +3,7 @@ * NPC - Manny */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_mn.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp index 89edcf7e5..59ebcb534 100644 --- a/src/d/actor/d_a_npc_mt.cpp +++ b/src/d/actor/d_a_npc_mt.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_npc_mt.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_mt.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index 5622ab770..ba296113c 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -3,6 +3,7 @@ * NPC - Rat (shopkeeper) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_nz.h" #include "d/res/res_nz.h" #include "d/res/res_npcnz.h" @@ -13,8 +14,31 @@ #include "d/d_procname.h" #include "d/d_priority.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep +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_ob1.cpp b/src/d/actor/d_a_npc_ob1.cpp index 346330bb8..4e4bd6954 100644 --- a/src/d/actor/d_a_npc_ob1.cpp +++ b/src/d/actor/d_a_npc_ob1.cpp @@ -3,6 +3,7 @@ * NPC - Rose */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ob1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 1a939267d..06fcfe692 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -3,6 +3,7 @@ * Player - Servant of the Tower / お供石像 (Companion Statue) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_os.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" @@ -14,8 +15,67 @@ #include "f_op/f_op_camera.h" #include "m_Do/m_Do_controller_pad.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep +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; diff --git a/src/d/actor/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp index 25b6d0bfe..c76cfa23f 100644 --- a/src/d/actor/d_a_npc_p1.cpp +++ b/src/d/actor/d_a_npc_p1.cpp @@ -3,6 +3,7 @@ * NPC - Gonzo, Senza, & Nudge */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_p1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index e422351c5..25d325308 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -3,6 +3,7 @@ * NPC - Zuko, Niko, & Mako */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_p2.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index 7d4995215..e8a33dab4 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_npc_people.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_people.h" #include "d/actor/d_a_kb.h" #include "d/actor/d_a_player.h" @@ -19,8 +20,6 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_lib.h" -#include "weak_data_1811.h" // IWYU pragma: keep - extern dCcD_SrcCyl dNpc_cyl_src; static char* l_npc_staff_id[] = { diff --git a/src/d/actor/d_a_npc_pf1.cpp b/src/d/actor/d_a_npc_pf1.cpp index 912760a7c..2d4ed836b 100644 --- a/src/d/actor/d_a_npc_pf1.cpp +++ b/src/d/actor/d_a_npc_pf1.cpp @@ -3,6 +3,7 @@ * NPC - Maggie's Father (poor) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_pf1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index 650e20c75..27c329473 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -3,6 +3,7 @@ * NPC - Lenzo */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_photo.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -18,9 +19,6 @@ #include "d/d_picture_box.h" #include "d/actor/d_a_tag_photo.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - extern dCcD_SrcCyl dNpc_cyl_src; const char daNpcPhoto_c::m_arcname[] = "Auc"; diff --git a/src/d/actor/d_a_npc_pm1.cpp b/src/d/actor/d_a_npc_pm1.cpp index 337885a07..e6dbddac8 100644 --- a/src/d/actor/d_a_npc_pm1.cpp +++ b/src/d/actor/d_a_npc_pm1.cpp @@ -3,6 +3,7 @@ * NPC - Maggie (poor) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_pm1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 026f4c38e..fc4586dc0 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -3,6 +3,7 @@ * NPC - Traveling Merchants */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_roten.h" #include "d/res/res_ro.h" #include "m_Do/m_Do_ext.h" @@ -15,8 +16,6 @@ #include "d/d_a_obj.h" #include "d/d_snap.h" -#include "weak_data_1811.h" // IWYU pragma: keep - extern dCcD_SrcCyl dNpc_cyl_src; static const char* l_arcname_tbl[] = { diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp index 8ed0a639b..02826242a 100644 --- a/src/d/actor/d_a_npc_rsh1.cpp +++ b/src/d/actor/d_a_npc_rsh1.cpp @@ -3,6 +3,7 @@ * NPC - Zunari */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_rsh1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_sarace.cpp b/src/d/actor/d_a_npc_sarace.cpp index d521740a0..9f03da8d5 100644 --- a/src/d/actor/d_a_npc_sarace.cpp +++ b/src/d/actor/d_a_npc_sarace.cpp @@ -3,6 +3,7 @@ * NPC - Loot the Sailor (Boating Course) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_sarace.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_so.cpp b/src/d/actor/d_a_npc_so.cpp index afdd16414..22bdfd770 100644 --- a/src/d/actor/d_a_npc_so.cpp +++ b/src/d/actor/d_a_npc_so.cpp @@ -3,6 +3,7 @@ * NPC - Fishman (blue fish) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_so.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_sv.cpp b/src/d/actor/d_a_npc_sv.cpp index 6d5004f7a..200c7e8a2 100644 --- a/src/d/actor/d_a_npc_sv.cpp +++ b/src/d/actor/d_a_npc_sv.cpp @@ -3,6 +3,7 @@ * NPC - Salvage Corp group members */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_sv.h" #include "m_Do/m_Do_ext.h" #include "d/actor/d_a_obj_ikada.h" diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp index 1e6675624..1b2f1896d 100644 --- a/src/d/actor/d_a_npc_tc.cpp +++ b/src/d/actor/d_a_npc_tc.cpp @@ -3,6 +3,7 @@ * NPC - Tingle, Ankle, David Jr. & Knuckle */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tc.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp index a301330e6..1b6aeb97e 100644 --- a/src/d/actor/d_a_npc_tt.cpp +++ b/src/d/actor/d_a_npc_tt.cpp @@ -3,6 +3,7 @@ * NPC - Tott */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tt.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_uk.cpp b/src/d/actor/d_a_npc_uk.cpp index ed8573eb9..67fcffadd 100644 --- a/src/d/actor/d_a_npc_uk.cpp +++ b/src/d/actor/d_a_npc_uk.cpp @@ -3,6 +3,7 @@ * NPC - Jin, Jan, & Jun-Roberto */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_uk.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_npc_ym1.cpp b/src/d/actor/d_a_npc_ym1.cpp index 109b86f4e..7cb8ce60a 100644 --- a/src/d/actor/d_a_npc_ym1.cpp +++ b/src/d/actor/d_a_npc_ym1.cpp @@ -3,6 +3,7 @@ * NPC - Mesa & Abe */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ym1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_yw1.cpp b/src/d/actor/d_a_npc_yw1.cpp index 887bd2032..835df13c7 100644 --- a/src/d/actor/d_a_npc_yw1.cpp +++ b/src/d/actor/d_a_npc_yw1.cpp @@ -3,6 +3,7 @@ * NPC - Sue-Belle */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_yw1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_zk1.cpp b/src/d/actor/d_a_npc_zk1.cpp index d32968a06..3ac3456f4 100644 --- a/src/d/actor/d_a_npc_zk1.cpp +++ b/src/d/actor/d_a_npc_zk1.cpp @@ -3,6 +3,7 @@ * NPC - Rito Chieftain */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zk1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index 03e9df7e1..3f85a6f4b 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/src/d/actor/d_a_npc_zl1.cpp @@ -3,6 +3,7 @@ * NPC - Tetra */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zl1.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_nz.cpp b/src/d/actor/d_a_nz.cpp index 6d3716c94..4e7651402 100644 --- a/src/d/actor/d_a_nz.cpp +++ b/src/d/actor/d_a_nz.cpp @@ -3,6 +3,7 @@ * Enemy - Rat */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_nz.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_nzg.cpp b/src/d/actor/d_a_nzg.cpp index 0cb9a67dd..eefbf4662 100644 --- a/src/d/actor/d_a_nzg.cpp +++ b/src/d/actor/d_a_nzg.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_nzg.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_nzg.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index d823db57c..77f3dc486 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -3,6 +3,7 @@ * Object - Water inside Jabun's cave */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_AjavW.h" #include "d/res/res_ajavw.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_Itnak.cpp b/src/d/actor/d_a_obj_Itnak.cpp index 8f8b9591e..4958ccfd3 100644 --- a/src/d/actor/d_a_obj_Itnak.cpp +++ b/src/d/actor/d_a_obj_Itnak.cpp @@ -3,6 +3,7 @@ * Object - Unused - Darknut statue */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Itnak.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_Vds.cpp b/src/d/actor/d_a_obj_Vds.cpp index 9a3d97f9d..b0ed49dbc 100644 --- a/src/d/actor/d_a_obj_Vds.cpp +++ b/src/d/actor/d_a_obj_Vds.cpp @@ -3,6 +3,7 @@ * Object - Earth Temple - Face statue (lights up when eyes are hit with Mirror Shield) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Vds.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index eccd4ff9b..8fe740830 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/src/d/actor/d_a_obj_Vteng.cpp @@ -3,6 +3,7 @@ * Object - Puppet Ganon curtains (intro cutscene) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Vteng.h" #include "d/res/res_vteng.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_YLzou.cpp b/src/d/actor/d_a_obj_YLzou.cpp index c90cd2816..89710f7cd 100644 --- a/src/d/actor/d_a_obj_YLzou.cpp +++ b/src/d/actor/d_a_obj_YLzou.cpp @@ -3,6 +3,7 @@ * Object - Hyrule Castle - Link statue */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_YLzou.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp index 419aec585..f087c1f98 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/src/d/actor/d_a_obj_Yboil.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_Yboil.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Yboil.h" #include "d/res/res_yboil.h" #include "d/d_a_obj.h" diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index 9bdf14512..389c204dd 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_Ygush00.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Ygush00.h" #include "d/res/res_ygush00.h" #include "f_op/f_op_actor_mng.h" @@ -15,7 +16,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep namespace { static const char l_arcname[] = "Ygush00"; }; diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp index b3816dab7..9977fdaca 100644 --- a/src/d/actor/d_a_obj_adnno.cpp +++ b/src/d/actor/d_a_obj_adnno.cpp @@ -3,6 +3,7 @@ * Object - Unused - Triforce prayer mural */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_adnno.h" #include "d/res/res_adnno.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_ajav.cpp b/src/d/actor/d_a_obj_ajav.cpp index e2e6b1d23..6ec9c4e85 100644 --- a/src/d/actor/d_a_obj_ajav.cpp +++ b/src/d/actor/d_a_obj_ajav.cpp @@ -3,6 +3,7 @@ * Object - Stone wall blocking the entrance to Jabun's cave */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ajav.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp index 73675aed7..6a490a8f6 100644 --- a/src/d/actor/d_a_obj_akabe.cpp +++ b/src/d/actor/d_a_obj_akabe.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_akabe.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_akabe.h" #include "d/res/res_akabe.h" #include "d/res/res_akabed.h" diff --git a/src/d/actor/d_a_obj_apzl.cpp b/src/d/actor/d_a_obj_apzl.cpp index 194f62f39..509b51d4e 100644 --- a/src/d/actor/d_a_obj_apzl.cpp +++ b/src/d/actor/d_a_obj_apzl.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_apzl.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_apzl.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_ashut.cpp b/src/d/actor/d_a_obj_ashut.cpp index 6be97eb2d..5e82685c0 100644 --- a/src/d/actor/d_a_obj_ashut.cpp +++ b/src/d/actor/d_a_obj_ashut.cpp @@ -3,6 +3,7 @@ * Object - Metal bars (Pirate Ship rope minigame) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ashut.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_auzu.cpp b/src/d/actor/d_a_obj_auzu.cpp index 26fc00f4d..ccab0f69c 100644 --- a/src/d/actor/d_a_obj_auzu.cpp +++ b/src/d/actor/d_a_obj_auzu.cpp @@ -3,6 +3,7 @@ * Object - Big Octo/Jabun's cave whirlpool */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_auzu.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_aygr.cpp b/src/d/actor/d_a_obj_aygr.cpp index a9d43a61a..0d91f3e04 100644 --- a/src/d/actor/d_a_obj_aygr.cpp +++ b/src/d/actor/d_a_obj_aygr.cpp @@ -3,6 +3,7 @@ * Object - Lookout Platform */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_aygr.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_balancelift.cpp b/src/d/actor/d_a_obj_balancelift.cpp index 2027d644d..7f3ce716a 100644 --- a/src/d/actor/d_a_obj_balancelift.cpp +++ b/src/d/actor/d_a_obj_balancelift.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods - Pair of scales */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_balancelift.h" #include "d/d_bg_w.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp index 58d66f121..7566655a3 100644 --- a/src/d/actor/d_a_obj_barrel.cpp +++ b/src/d/actor/d_a_obj_barrel.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_barrel.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_barrel.h" #include "d/actor/d_a_obj_eff.h" #include "d/res/res_ktaru_01.h" @@ -12,8 +13,6 @@ #include "d/d_priority.h" #include "d/d_com_inf_game.h" -#include "weak_data_1811.h" // IWYU pragma: keep - const char daObjBarrel::Act_c::M_arcname[] = "Ktaru_01"; const float daObjBarrel::Act_c::l_s_radius = 45.0f; const float daObjBarrel::Act_c::l_l_radius = 50.0f; diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp index 520706290..af5119490 100644 --- a/src/d/actor/d_a_obj_barrel2.cpp +++ b/src/d/actor/d_a_obj_barrel2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_barrel2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_barrel2.h" #include "d/actor/d_a_obj_buoyflag.h" #include "d/actor/d_a_race_item.h" @@ -14,11 +15,8 @@ #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_kankyo_mng.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep daRaceItem_c* daObjBarrel2::Act_c::M_tmp_item_actor; -#include "weak_data_1811.h" // IWYU pragma: keep - const char daObjBarrel2::Act_c::M_arcname[] = "Ktaru_00"; const char daObjBarrel2::Act_c::M_evname_brk[] = "barrel2_brk"; const dCcD_SrcCyl daObjBarrel2::Act_c::M_cyl_src = { diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 997a6b52c..262faf419 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -3,6 +3,7 @@ * Object - Hyrule barrier */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_barrier.h" #include "d/res/res_ycage.h" #include "JSystem/JUtility/JUTAssert.h" diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index d498a60b0..3435bf03c 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -3,6 +3,7 @@ * Enemy - Beamos */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bemos.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index 06169a2da..4018d1a73 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/src/d/actor/d_a_obj_bscurtain.cpp @@ -3,6 +3,7 @@ * Object - Curtains (Beedle's Shop) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bscurtain.h" #include "d/res/res_ptc.h" #include "f_op/f_op_actor_mng.h" @@ -14,8 +15,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - daObj_Bscurtain_HIO_c l_HIO; /* 000000EC-00000118 .text __ct__21daObj_Bscurtain_HIO_cFv */ diff --git a/src/d/actor/d_a_obj_buoyflag.cpp b/src/d/actor/d_a_obj_buoyflag.cpp index 53e152d91..e8729138a 100644 --- a/src/d/actor/d_a_obj_buoyflag.cpp +++ b/src/d/actor/d_a_obj_buoyflag.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_buoyflag.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_buoyflag.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_buoyrace.cpp b/src/d/actor/d_a_obj_buoyrace.cpp index 5cee98f3b..478362261 100644 --- a/src/d/actor/d_a_obj_buoyrace.cpp +++ b/src/d/actor/d_a_obj_buoyrace.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_buoyrace.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_buoyrace.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp index 33fad06b2..b5bdd8839 100644 --- a/src/d/actor/d_a_obj_cafelmp.cpp +++ b/src/d/actor/d_a_obj_cafelmp.cpp @@ -3,6 +3,7 @@ * Object - Lamp (Cafe Bar) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cafelmp.h" #include "d/res/res_cafelmp.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp index 30419919d..006a52511 100644 --- a/src/d/actor/d_a_obj_canon.cpp +++ b/src/d/actor/d_a_obj_canon.cpp @@ -3,6 +3,7 @@ * Object - Great Sea enemy cannon */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_canon.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/J3DGraphAnimator/J3DNode.h" @@ -19,8 +20,6 @@ #include "d/d_s_play.h" #include "d/res/res_wallbom.h" -#include "weak_data_1811.h" // IWYU pragma: keep - daObj_Canon_HIO_c l_HIO; const u32 daObj_Canon_c::m_heapsize = 0x8C0; diff --git a/src/d/actor/d_a_obj_coming.cpp b/src/d/actor/d_a_obj_coming.cpp index bbe121b88..1cb5cdd79 100644 --- a/src/d/actor/d_a_obj_coming.cpp +++ b/src/d/actor/d_a_obj_coming.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_coming.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_coming.h" #include "d/actor/d_a_obj_barrel2.h" #include "d/actor/d_a_obj_buoyflag.h" @@ -13,13 +14,9 @@ #include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - dBgS_ObjGndChk daObjComing::Act_c::M_gnd_work; dBgS_ObjLinChk daObjComing::Act_c::M_wall_work; -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daObjComing { namespace { struct Attr_c { diff --git a/src/d/actor/d_a_obj_correct.cpp b/src/d/actor/d_a_obj_correct.cpp index e1adfce54..8b931d3b5 100644 --- a/src/d/actor/d_a_obj_correct.cpp +++ b/src/d/actor/d_a_obj_correct.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_obj_correct.cpp // +#include "d/dolzel.h" // IWYU pragma: keep + // This include needs to be before d_a_obj_correct.h for ordering of the // daObj::PrmAbstract symbols. #include "d/actor/d_a_obj_movebox.h" @@ -14,8 +16,6 @@ #include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daObjCorrect { namespace { diff --git a/src/d/actor/d_a_obj_demo_barrel.cpp b/src/d/actor/d_a_obj_demo_barrel.cpp index bbe3ab171..a7844fda4 100644 --- a/src/d/actor/d_a_obj_demo_barrel.cpp +++ b/src/d/actor/d_a_obj_demo_barrel.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_demo_barrel.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_demo_barrel.h" #include "d/d_bg_s_func.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index 31787c70c..1684087d6 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/src/d/actor/d_a_obj_dmgroom.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_dmgroom.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_dmgroom.h" #include "d/res/res_dmgroom.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp index 530e43939..c81b26439 100644 --- a/src/d/actor/d_a_obj_doguu.cpp +++ b/src/d/actor/d_a_obj_doguu.cpp @@ -3,6 +3,7 @@ * Object - Goddess Statues (Triangle Islands) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_doguu.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp index d104641c1..92195f661 100644 --- a/src/d/actor/d_a_obj_doguu_demo.cpp +++ b/src/d/actor/d_a_obj_doguu_demo.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_doguu_demo.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_doguu_demo.h" #include "d/res/res_doguud.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp index 8c823bff5..b53c5e98e 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/src/d/actor/d_a_obj_dragonhead.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_dragonhead.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_dragonhead.h" #include "d/res/res_qdghd.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_drift.cpp b/src/d/actor/d_a_obj_drift.cpp index a0fb70b3f..25b2af794 100644 --- a/src/d/actor/d_a_obj_drift.cpp +++ b/src/d/actor/d_a_obj_drift.cpp @@ -3,6 +3,7 @@ * Object - Floating tree platform */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_drift.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp index be75128e7..0873e6239 100644 --- a/src/d/actor/d_a_obj_eayogn.cpp +++ b/src/d/actor/d_a_obj_eayogn.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_eayogn.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_eayogn.h" #include "d/res/res_eayogn.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp index 1780f0061..49b4beafa 100644 --- a/src/d/actor/d_a_obj_ebomzo.cpp +++ b/src/d/actor/d_a_obj_ebomzo.cpp @@ -3,6 +3,7 @@ * Object - Bombable statues (outside Dragon Roost Cavern entrance) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ebomzo.h" #include "dolphin/types.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index 4ea68fd55..dc10e12cf 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -2,15 +2,13 @@ // Generated by dtk // Translation Unit: d_a_obj_eff.cpp // + +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_eff.h" #include "d/d_procname.h" #include "d/d_priority.h" #include "d/d_com_inf_game.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep -#include "weak_data_2100_2080.h" - const GXColor daObjEff::BarrelSmokeCB::original_color = {0xAF, 0x96, 0x64, 0xFF}; diff --git a/src/d/actor/d_a_obj_ekskz.cpp b/src/d/actor/d_a_obj_ekskz.cpp index 79d7f24d9..32ab714dd 100644 --- a/src/d/actor/d_a_obj_ekskz.cpp +++ b/src/d/actor/d_a_obj_ekskz.cpp @@ -3,6 +3,7 @@ * Object - Stone statue blowing strong gust of wind (Gale Isle) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ekskz.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp index 9056a0f03..45d1e2bd4 100644 --- a/src/d/actor/d_a_obj_eskban.cpp +++ b/src/d/actor/d_a_obj_eskban.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_eskban.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_eskban.h" #include "d/res/res_eskban.h" #include "d/d_procname.h" @@ -10,9 +11,6 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daObjEskban { Mtx Act_c::M_tmp_mtx; const char Act_c::M_arcname[7] = "Eskban"; @@ -409,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_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp index 92a935ae2..a6c5b2bad 100644 --- a/src/d/actor/d_a_obj_ferris.cpp +++ b/src/d/actor/d_a_obj_ferris.cpp @@ -3,6 +3,7 @@ * Object - Windfall Island - Ferris wheel */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ferris.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" @@ -13,8 +14,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - namespace daObjFerris { namespace { static const Attr_c L_attr = { 45, 0x01, 50.0f, 195.0f, { 0.0f, -100.0f, -135.0f }, 1820.0f, 0.0f, 30.0f }; diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index 9bd3f2056..7549dfb31 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -3,6 +3,7 @@ * Object - Nintendo Gallery figurines + stand */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_figure.h" #include "d/res/res_figure.h" #include "d/res/res_figure2.h" @@ -17,8 +18,6 @@ #include "d/actor/d_a_player_main.h" #include "m_Do/m_Do_controller_pad.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - #define TOTAL_FIGURE_COUNT 0x86 static const char* l_arcname_tbl[] = { diff --git a/src/d/actor/d_a_obj_firewall.cpp b/src/d/actor/d_a_obj_firewall.cpp index 19bfd9047..fd1572683 100644 --- a/src/d/actor/d_a_obj_firewall.cpp +++ b/src/d/actor/d_a_obj_firewall.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_firewall.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_firewall.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_flame.cpp b/src/d/actor/d_a_obj_flame.cpp index 8b1ff8dce..d7a9b4e11 100644 --- a/src/d/actor/d_a_obj_flame.cpp +++ b/src/d/actor/d_a_obj_flame.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_flame.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_flame.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_ftree.cpp b/src/d/actor/d_a_obj_ftree.cpp index 0b6386cca..1fb04f4eb 100644 --- a/src/d/actor/d_a_obj_ftree.cpp +++ b/src/d/actor/d_a_obj_ftree.cpp @@ -3,6 +3,7 @@ * Object - Forest Trees */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ftree.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp index 6e1c2d2c8..5e01b114e 100644 --- a/src/d/actor/d_a_obj_ganonbed.cpp +++ b/src/d/actor/d_a_obj_ganonbed.cpp @@ -3,6 +3,7 @@ * Object - Bed (Puppet Ganon intro cutscene) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ganonbed.h" #include "d/res/res_gbed.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_gaship.cpp b/src/d/actor/d_a_obj_gaship.cpp index c2169118b..7bcd92c87 100644 --- a/src/d/actor/d_a_obj_gaship.cpp +++ b/src/d/actor/d_a_obj_gaship.cpp @@ -3,6 +3,7 @@ * Object - Ganon Room exterior (Forsaken Fortress) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gaship.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" @@ -11,8 +12,6 @@ #include "m_Do/m_Do_mtx.h" #include "d/res/res_gaship.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - const char daObjGaship::Act_c::M_arcname[7] = "GaShip"; /* 000000EC-000002DC .text birth_flag__Q211daObjGaship5Act_cFv */ diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp index 673ac615f..216b0f349 100644 --- a/src/d/actor/d_a_obj_gaship2.cpp +++ b/src/d/actor/d_a_obj_gaship2.cpp @@ -3,6 +3,7 @@ * Object - Ganon Room (destroyed) (Forsaken Fortress 3) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gaship2.h" #include "d/res/res_yakerom.h" #include "SSystem/SComponent/c_bg_w.h" diff --git a/src/d/actor/d_a_obj_gnnbtltaki.cpp b/src/d/actor/d_a_obj_gnnbtltaki.cpp index 829ad058f..d7c7f5278 100644 --- a/src/d/actor/d_a_obj_gnnbtltaki.cpp +++ b/src/d/actor/d_a_obj_gnnbtltaki.cpp @@ -3,6 +3,7 @@ * Object - Ganondorf Fight - Background waterfalls (during fight) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gnnbtltaki.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_gnndemotakie.cpp b/src/d/actor/d_a_obj_gnndemotakie.cpp index 20b91ba3e..25b296ddf 100644 --- a/src/d/actor/d_a_obj_gnndemotakie.cpp +++ b/src/d/actor/d_a_obj_gnndemotakie.cpp @@ -3,6 +3,7 @@ * Object - Ganondorf Fight - Central waterfall (after fight) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gnndemotakie.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_gnndemotakis.cpp b/src/d/actor/d_a_obj_gnndemotakis.cpp index 371ccc41c..33ea8ec4d 100644 --- a/src/d/actor/d_a_obj_gnndemotakis.cpp +++ b/src/d/actor/d_a_obj_gnndemotakis.cpp @@ -3,6 +3,7 @@ * Object - Ganondorf Fight - Background waterfalls (before fight) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gnndemotakis.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index f97485fc5..18cc11a70 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/src/d/actor/d_a_obj_gong.cpp @@ -3,6 +3,7 @@ * Object - Gong (Tetra's Ship) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gong.h" #include "d/res/res_vdora.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index c96ead3ea..5ebafaf20 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/src/d/actor/d_a_obj_gryw00.cpp @@ -3,11 +3,11 @@ // Translation Unit: d_a_obj_gryw00.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_com_inf_game.h" #include "d/d_particle.h" #include "d/d_procname.h" #include "d/d_priority.h" - #include "d/actor/d_a_obj_gryw00.h" #include "d/res/res_gryw00.h" diff --git a/src/d/actor/d_a_obj_gtaki.cpp b/src/d/actor/d_a_obj_gtaki.cpp index 956fcc3d2..533aca28f 100644 --- a/src/d/actor/d_a_obj_gtaki.cpp +++ b/src/d/actor/d_a_obj_gtaki.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_gtaki.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gtaki.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_hami2.cpp b/src/d/actor/d_a_obj_hami2.cpp index 4267f2e62..11f97f713 100644 --- a/src/d/actor/d_a_obj_hami2.cpp +++ b/src/d/actor/d_a_obj_hami2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_hami2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hami2.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_hami3.cpp b/src/d/actor/d_a_obj_hami3.cpp index 499cccaab..b6fa8cc70 100644 --- a/src/d/actor/d_a_obj_hami3.cpp +++ b/src/d/actor/d_a_obj_hami3.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_hami3.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hami3.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_hami4.cpp b/src/d/actor/d_a_obj_hami4.cpp index 5d17a2401..d30469b4f 100644 --- a/src/d/actor/d_a_obj_hami4.cpp +++ b/src/d/actor/d_a_obj_hami4.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_hami4.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hami4.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp index f53d4ff0f..5e3b3b9d1 100644 --- a/src/d/actor/d_a_obj_hat.cpp +++ b/src/d/actor/d_a_obj_hat.cpp @@ -3,6 +3,7 @@ * Object - Hats (Traveling Merchants) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hat.h" #include "d/actor/d_a_npc_roten.h" #include "d/d_a_obj.h" diff --git a/src/d/actor/d_a_obj_hbrf1.cpp b/src/d/actor/d_a_obj_hbrf1.cpp index b777e12d4..c9d4daad9 100644 --- a/src/d/actor/d_a_obj_hbrf1.cpp +++ b/src/d/actor/d_a_obj_hbrf1.cpp @@ -3,6 +3,7 @@ * Object - Wind Temple - Elevator (giant fan room) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hbrf1.h" #include "d/res/res_hbrf1.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_hcbh.cpp b/src/d/actor/d_a_obj_hcbh.cpp index 715c1508d..8f07cab35 100644 --- a/src/d/actor/d_a_obj_hcbh.cpp +++ b/src/d/actor/d_a_obj_hcbh.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods - Pillar with Companion Statue's face on it. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hcbh.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index 1a4e8fd2a..9074df247 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -3,6 +3,7 @@ * Object - Hookshot target */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hfuck1.h" #include "d/res/res_hfuck1.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index 92b23dd14..d412d7db8 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods - Entrance waterfall */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hha.h" #include "d/actor/d_a_tag_waterlevel.h" #include "d/d_bg_s_func.h" diff --git a/src/d/actor/d_a_obj_hlift.cpp b/src/d/actor/d_a_obj_hlift.cpp index 91bded600..d452b19e4 100644 --- a/src/d/actor/d_a_obj_hlift.cpp +++ b/src/d/actor/d_a_obj_hlift.cpp @@ -3,6 +3,7 @@ * Object - Wooden platforms (Pirate ship rope minigame 1) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hlift.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index 5a43c90b7..d1c7839ee 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -3,6 +3,7 @@ * Object - Grotto */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hole.h" #include "d/res/res_aana.h" #include "d/d_bg_s_lin_chk.h" @@ -17,8 +18,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep - static daObj_Hole_HIO_c l_HIO; const char daObj_Hole_c::m_arc_name[] = "Aana"; diff --git a/src/d/actor/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp index a3b80eb84..1082b3bd9 100644 --- a/src/d/actor/d_a_obj_homen.cpp +++ b/src/d/actor/d_a_obj_homen.cpp @@ -3,6 +3,7 @@ * Object - Wind Temple - Face stone Hookshot target */ +#include "d/dolzel.h" // IWYU pragma: keep #pragma sym off #include "d/actor/d_a_obj_homen.h" #pragma sym on @@ -13,9 +14,6 @@ #include "d/res/res_homen.h" #include "f_op/f_op_actor_mng.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daObjHomen { // This unnamed namespace holds the HIO class and its attributes which are unused in retail. diff --git a/src/d/actor/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp index f2a97781d..664e6d627 100644 --- a/src/d/actor/d_a_obj_homensmoke.cpp +++ b/src/d/actor/d_a_obj_homensmoke.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_homensmoke.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_homensmoke.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -10,8 +11,6 @@ #include "m_Do/m_Do_mtx.h" #include "d/d_com_inf_game.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - namespace daObjHomensmoke { /* 000000EC-00000230 .text set_mtx__Q215daObjHomensmoke5Act_cFv */ void Act_c::set_mtx() { diff --git a/src/d/actor/d_a_obj_hsehi1.cpp b/src/d/actor/d_a_obj_hsehi1.cpp index 0f8894ebe..f28831127 100644 --- a/src/d/actor/d_a_obj_hsehi1.cpp +++ b/src/d/actor/d_a_obj_hsehi1.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods - Command Melody monument & blue monument next to Companion Statue */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hsehi1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_htetu1.cpp b/src/d/actor/d_a_obj_htetu1.cpp index 0907f8da9..f9990b91a 100644 --- a/src/d/actor/d_a_obj_htetu1.cpp +++ b/src/d/actor/d_a_obj_htetu1.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods - Large yellow gate (blocks room containing Small Key) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_htetu1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_ice.cpp b/src/d/actor/d_a_obj_ice.cpp index 48321cf29..ced0fc29f 100644 --- a/src/d/actor/d_a_obj_ice.cpp +++ b/src/d/actor/d_a_obj_ice.cpp @@ -3,6 +3,7 @@ * Object - Block of ice (blocks treasure chests, enemies, rupees, etc.) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ice.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_iceisland.cpp b/src/d/actor/d_a_obj_iceisland.cpp index 2a8482b73..610ee8ba7 100644 --- a/src/d/actor/d_a_obj_iceisland.cpp +++ b/src/d/actor/d_a_obj_iceisland.cpp @@ -3,6 +3,7 @@ * Object - Icy clouds surrounding Ice Ring Isle */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_iceisland.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index 4153449c7..dde1b10e7 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -3,6 +3,7 @@ * Object - Various Great Sea ships (Beedle, Submarines, Skull Platforms/Rafts, and Salvage Corp.) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ikada.h" #include "d/actor/d_a_bomb.h" #include "d/actor/d_a_majuu_flag.h" @@ -21,14 +22,10 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - cXyz daObj_Ikada_c::m_rope_base_vec(0.0f, -10.0f, 0.0f); cXyz daObj_Ikada_c::m_crane_offset(200.0f, -340.0f, 0.0f); static daObj_Ikada_HIO_c l_HIO; -#include "weak_data_1811.h" // IWYU pragma: keep - const u32 daObj_Ikada_c::m_heapsize[] = {0x1D00, 0x2F60, 0x2E20, 0x32E0, 0x6D60}; const char daObj_Ikada_c::m_arc_name[] = "IkadaH"; const f32 daObj_Ikada_c::m_rope_joint_len = 10.0f; diff --git a/src/d/actor/d_a_obj_jump.cpp b/src/d/actor/d_a_obj_jump.cpp index a2ab8c63a..cb21585bc 100644 --- a/src/d/actor/d_a_obj_jump.cpp +++ b/src/d/actor/d_a_obj_jump.cpp @@ -3,6 +3,7 @@ * Object - Wind Temple - Iron Boots springboard */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_jump.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp index ba4cf2656..c7ea82017 100644 --- a/src/d/actor/d_a_obj_kanat.cpp +++ b/src/d/actor/d_a_obj_kanat.cpp @@ -3,6 +3,7 @@ * Object - Forbidden Woods - Solid vine floor (blocks entry to B1) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kanat.h" #include "d/res/res_kanat.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_kanoke.cpp b/src/d/actor/d_a_obj_kanoke.cpp index 75c006666..3be3e636d 100644 --- a/src/d/actor/d_a_obj_kanoke.cpp +++ b/src/d/actor/d_a_obj_kanoke.cpp @@ -3,6 +3,7 @@ * Object - Earth Temple - Coffin */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kanoke.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index c2449f7bb..871571c76 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -3,14 +3,13 @@ * Object - Drop-down ladder */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ladder.h" #include "d/res/res_mhsg.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/d_priority.h" -#include "weak_data_1811.h" // IWYU pragma: keep - Mtx daObjLadder::Act_c::M_tmp_mtx; namespace daObjLadder { @@ -328,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_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp index 9d3ea7b51..e1c143cec 100644 --- a/src/d/actor/d_a_obj_leaves.cpp +++ b/src/d/actor/d_a_obj_leaves.cpp @@ -3,6 +3,7 @@ * Object - Pile of orange leaves (fades away when blown with Deku Leaf) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_leaves.h" #include "d/actor/d_a_player.h" #include "d/res/res_vochi.h" diff --git a/src/d/actor/d_a_obj_light.cpp b/src/d/actor/d_a_obj_light.cpp index f86a9ca36..e592240f8 100644 --- a/src/d/actor/d_a_obj_light.cpp +++ b/src/d/actor/d_a_obj_light.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_light.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_light.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_lpalm.cpp b/src/d/actor/d_a_obj_lpalm.cpp index c9c38a304..d7000e291 100644 --- a/src/d/actor/d_a_obj_lpalm.cpp +++ b/src/d/actor/d_a_obj_lpalm.cpp @@ -3,6 +3,7 @@ * Object - Palm tree */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lpalm.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" diff --git a/src/d/actor/d_a_obj_magmarock.cpp b/src/d/actor/d_a_obj_magmarock.cpp index b9f5dc2dd..182bafe03 100644 --- a/src/d/actor/d_a_obj_magmarock.cpp +++ b/src/d/actor/d_a_obj_magmarock.cpp @@ -3,6 +3,7 @@ * Object - Dragon Roost Cavern - Lava slab */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_magmarock.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_majyuu_door.cpp b/src/d/actor/d_a_obj_majyuu_door.cpp index 6cee902a2..c7be560fd 100644 --- a/src/d/actor/d_a_obj_majyuu_door.cpp +++ b/src/d/actor/d_a_obj_majyuu_door.cpp @@ -3,6 +3,7 @@ * Object - Forsaken Fortress - Large wooden barricade (blocks entrance, destroyed with Bombs) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_majyuu_door.h" #include "d/d_cc_d.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_mkie.cpp b/src/d/actor/d_a_obj_mkie.cpp index 1f0108ac3..17d37fa9b 100644 --- a/src/d/actor/d_a_obj_mkie.cpp +++ b/src/d/actor/d_a_obj_mkie.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_mkie.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mkie.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_mkiek.cpp b/src/d/actor/d_a_obj_mkiek.cpp index b116abc53..1892f6273 100644 --- a/src/d/actor/d_a_obj_mkiek.cpp +++ b/src/d/actor/d_a_obj_mkiek.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_mkiek.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mkiek.h" #include "d/d_com_inf_game.h" #include "d/d_a_obj.h" diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index f0105db7c..6b375a11c 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -3,6 +3,7 @@ * Object - Earth God's Lyric/Wind God's Aria statues */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mknjd.h" #include "d/d_s_play.h" // IWYU pragma: keep #include "d/res/res_mknjd.h" @@ -25,7 +26,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" - #define ACT_SETGOAL 0 #define ACT_SETANGLE 1 #define ACT_WAIT 2 diff --git a/src/d/actor/d_a_obj_mmrr.cpp b/src/d/actor/d_a_obj_mmrr.cpp index a441f41e3..317a3e81d 100644 --- a/src/d/actor/d_a_obj_mmrr.cpp +++ b/src/d/actor/d_a_obj_mmrr.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_mmrr.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mmrr.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp index db96c83d1..69404d81d 100644 --- a/src/d/actor/d_a_obj_monument.cpp +++ b/src/d/actor/d_a_obj_monument.cpp @@ -3,6 +3,7 @@ * Object - Wind's Requiem stone monument */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_monument.h" #include "d/res/res_esekh.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 93a501977..2e59b7b55 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -3,6 +3,7 @@ * Object - Pushable Box */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_movebox.h" #include "d/res/res_ecube.h" #include "d/res/res_hbox2.h" @@ -24,9 +25,6 @@ #include "d/actor/d_a_obj_mkie.h" #include "d/actor/d_a_player.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daObjMovebox { dBgS_ObjGndChk Bgc_c::M_gnd_work[23]; dBgS_WtrChk Bgc_c::M_wrt_work; @@ -1894,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_msdan.cpp b/src/d/actor/d_a_obj_msdan.cpp index ddb4679e7..583b6ef4a 100644 --- a/src/d/actor/d_a_obj_msdan.cpp +++ b/src/d/actor/d_a_obj_msdan.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_msdan.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msdan.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_msdan2.cpp b/src/d/actor/d_a_obj_msdan2.cpp index 0b5af3e2a..f21b8095c 100644 --- a/src/d/actor/d_a_obj_msdan2.cpp +++ b/src/d/actor/d_a_obj_msdan2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_msdan2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msdan2.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_msdan_sub.cpp b/src/d/actor/d_a_obj_msdan_sub.cpp index eb776c838..5fb71b56a 100644 --- a/src/d/actor/d_a_obj_msdan_sub.cpp +++ b/src/d/actor/d_a_obj_msdan_sub.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_msdan_sub.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msdan_sub.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_msdan_sub2.cpp b/src/d/actor/d_a_obj_msdan_sub2.cpp index 99bdc850e..ade337c77 100644 --- a/src/d/actor/d_a_obj_msdan_sub2.cpp +++ b/src/d/actor/d_a_obj_msdan_sub2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_msdan_sub2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msdan_sub2.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_mshokki.cpp b/src/d/actor/d_a_obj_mshokki.cpp index d5c8d295b..0351ff88c 100644 --- a/src/d/actor/d_a_obj_mshokki.cpp +++ b/src/d/actor/d_a_obj_mshokki.cpp @@ -3,6 +3,7 @@ * Object - Dishes and cutlery inside Forsaken Fortress */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mshokki.h" #include "d/res/res_mshokki.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index 3c5244d96..d1c7168af 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_mtest.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mtest.h" #include "d/res/res_mtest.h" #include "d/res/res_owater.h" @@ -13,9 +14,6 @@ #include "d/d_com_inf_game.h" #include "m_Do/m_Do_mtx.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - char* daObjMtest::Act_c::M_arcname[Type_Max] = { "Mtest", "Mtest", @@ -367,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_nest.cpp b/src/d/actor/d_a_obj_nest.cpp index 66a9f0310..3ab33960e 100644 --- a/src/d/actor/d_a_obj_nest.cpp +++ b/src/d/actor/d_a_obj_nest.cpp @@ -3,6 +3,7 @@ * Object - Kargaroc nest */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_nest.h" #include "d/res/res_mtorisu.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_ohatch.cpp b/src/d/actor/d_a_obj_ohatch.cpp index 89c2dd176..0c5c00eb5 100644 --- a/src/d/actor/d_a_obj_ohatch.cpp +++ b/src/d/actor/d_a_obj_ohatch.cpp @@ -3,6 +3,7 @@ * Object - Hatch door leading to the Nintendo Gallery */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ohatch.h" #include "d/res/res_ohatch.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp index 23da9bb96..7112ef895 100644 --- a/src/d/actor/d_a_obj_ojtree.cpp +++ b/src/d/actor/d_a_obj_ojtree.cpp @@ -3,6 +3,7 @@ * Object - Tall thin poles leading to the Deku Leaf (Forest Haven interior) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/res/res_ojtree.h" #include "d/actor/d_a_obj_ojtree.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_ospbox.cpp b/src/d/actor/d_a_obj_ospbox.cpp index f130423c6..341bdd8e8 100644 --- a/src/d/actor/d_a_obj_ospbox.cpp +++ b/src/d/actor/d_a_obj_ospbox.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_ospbox.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ospbox.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" @@ -14,8 +15,6 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "m_Do/m_Do_mtx.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - const char daObjOspbox::Act_c::M_arcname[] = "Ospbox"; const dCcD_SrcCyl daObjOspbox::Act_c::M_cyl_src = { // dCcD_SrcGObjInf diff --git a/src/d/actor/d_a_obj_otble.cpp b/src/d/actor/d_a_obj_otble.cpp index afdc317c5..7af098b64 100644 --- a/src/d/actor/d_a_obj_otble.cpp +++ b/src/d/actor/d_a_obj_otble.cpp @@ -3,6 +3,7 @@ * Object - Generic brown wooden tables */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_otble.h" #include "d/res/res_okmono.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index 2bfc8e447..c9cbf358a 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_paper.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_paper.h" #include "d/res/res_opaper.h" #include "d/res/res_ppos.h" @@ -21,8 +22,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daObjPaper { namespace { struct Attr_c { diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp index 706ae75a2..4c8a66dc6 100644 --- a/src/d/actor/d_a_obj_pbco.cpp +++ b/src/d/actor/d_a_obj_pbco.cpp @@ -3,6 +3,7 @@ * Object - Windfall Island - Bomb Shop - Flip up countertop/counter door */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pbco.h" #include "d/res/res_pbco.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index 69cd7ee6f..b224c6678 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -3,6 +3,7 @@ * Object - Windfall Island - Bomb Shop - Ceiling fan */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pbka.h" #include "d/res/res_pbka.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_pfall.cpp b/src/d/actor/d_a_obj_pfall.cpp index cbb4a049e..75d6af375 100644 --- a/src/d/actor/d_a_obj_pfall.cpp +++ b/src/d/actor/d_a_obj_pfall.cpp @@ -3,6 +3,7 @@ * NPC - Rat (crawlspaces) (opens trap doors) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pfall.h" #include "d/d_procname.h" #include "d/d_com_inf_game.h" @@ -11,9 +12,6 @@ #include "d/actor/d_a_player_main.h" #include "d/d_priority.h" -#include "weak_data_1811.h" // IWYU pragma: keep -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - static const int l_bck_ix_tbl[] = { PFALL_BCK_NZ_WAIT, PFALL_BCK_HIKU, diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index 8cf5f1070..d2f9232b2 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/src/d/actor/d_a_obj_pirateship.cpp @@ -3,6 +3,7 @@ * Object - Pirate Ship */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pirateship.h" #include "d/actor/d_a_knob00.h" #include "d/res/res_kaizokusen.h" @@ -15,9 +16,6 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - class daObjPirateShipHIO_c : public JORReflexible { public: daObjPirateShipHIO_c() { @@ -405,6 +403,63 @@ cPhs_State daObjPirateship::Method::Create(void* v_this) { return ((daObjPirateship::Act_c*)v_this)->_create(); } +/* 000012A4-000017E0 .text _execute__Q215daObjPirateship5Act_cFv */ +bool daObjPirateship::Act_c::_execute() { + dBgS_GndChk gndChk; + cXyz sp14(current.pos.x, current.pos.y + 50.0f, current.pos.z); + gndChk.SetPos(&sp14); + gndChk.OffWall(); + if (dComIfG_Bgsp()->GroundCross(&gndChk) > -G_CM3D_F_INF) { + s32 roomNo = dComIfG_Bgsp()->GetRoomId(gndChk); + JUT_ASSERT(VERSION_SELECT(717, 720, 739, 739), 0 <= roomNo && roomNo < 64) + fopAcM_SetRoomNo(this, roomNo); + } + + if (!demo_move()) { + if (l_HIO.m05 == 0 && m4A8 != NULL) { + dLib_pathMove(¤t.pos, &m4A4, m4A8, 3.0f, path_move_call_back, (void*)this); + if (m32E > 0x4000 || m32E < -0x4000) { + cLib_addCalcAngleS2(&m330, l_HIO.m12, 0x10, 0x300); + } else { + cLib_addCalcAngleS2(&m330, l_HIO.m10, 0x10, 0x300); + } + m32E += m330; + current.pos.y = home.pos.y + (l_HIO.m0C + 10.0f) * cM_ssin(m32E); + } + m2CA = l_HIO.m06; + } + + if (m2CC == 0) { + if (dComIfGs_isEventBit(0x310)) { +#if VERSION > VERSION_JPN + if (!dComIfGs_isEventBit(1)) { + CreateWave(); + } +#endif + m2CC = 1; + } else { + return false; + } + } else if (m2CD == 0 && dComIfGs_isEventBit(1)) { + m2CD = 1; + pirateCreate(create_idx_tbl_1stIsland_demo); +#if VERSION > VERSION_JPN + DeleteWave(); +#endif + } + + m2E4 = NULL; + m2E4 = fopAcM_SearchByID(m_sail_id); + m2EC = NULL; + m2EC = fopAcM_SearchByID(m2F0); + m2FC = NULL; + m2FC = fopAcM_SearchByID(m300); + set_mtx(); + sound_proc(); + SetWave(); + return MoveBGExecute() != FALSE; +} + /* 00000F10-000012A4 .text _create__Q215daObjPirateship5Act_cFv */ cPhs_State daObjPirateship::Act_c::_create() { fopAcM_SetupActor(this, daObjPirateship::Act_c); @@ -511,63 +566,6 @@ bool daObjPirateship::Act_c::_draw() { return MoveBGDraw(); } -/* 000012A4-000017E0 .text _execute__Q215daObjPirateship5Act_cFv */ -bool daObjPirateship::Act_c::_execute() { - dBgS_GndChk gndChk; - cXyz sp14(current.pos.x, current.pos.y + 50.0f, current.pos.z); - gndChk.SetPos(&sp14); - gndChk.OffWall(); - if (dComIfG_Bgsp()->GroundCross(&gndChk) > -G_CM3D_F_INF) { - s32 roomNo = dComIfG_Bgsp()->GetRoomId(gndChk); - JUT_ASSERT(VERSION_SELECT(717, 720, 739, 739), 0 <= roomNo && roomNo < 64) - fopAcM_SetRoomNo(this, roomNo); - } - - if (!demo_move()) { - if (l_HIO.m05 == 0 && m4A8 != NULL) { - dLib_pathMove(¤t.pos, &m4A4, m4A8, 3.0f, path_move_call_back, (void*)this); - if (m32E > 0x4000 || m32E < -0x4000) { - cLib_addCalcAngleS2(&m330, l_HIO.m12, 0x10, 0x300); - } else { - cLib_addCalcAngleS2(&m330, l_HIO.m10, 0x10, 0x300); - } - m32E += m330; - current.pos.y = home.pos.y + (l_HIO.m0C + 10.0f) * cM_ssin(m32E); - } - m2CA = l_HIO.m06; - } - - if (m2CC == 0) { - if (dComIfGs_isEventBit(0x310)) { -#if VERSION > VERSION_JPN - if (!dComIfGs_isEventBit(1)) { - CreateWave(); - } -#endif - m2CC = 1; - } else { - return false; - } - } else if (m2CD == 0 && dComIfGs_isEventBit(1)) { - m2CD = 1; - pirateCreate(create_idx_tbl_1stIsland_demo); -#if VERSION > VERSION_JPN - DeleteWave(); -#endif - } - - m2E4 = NULL; - m2E4 = fopAcM_SearchByID(m_sail_id); - m2EC = NULL; - m2EC = fopAcM_SearchByID(m2F0); - m2FC = NULL; - m2FC = fopAcM_SearchByID(m300); - set_mtx(); - sound_proc(); - SetWave(); - return MoveBGExecute() != FALSE; -} - /* 00001E8C-00001F50 .text Delete__Q215daObjPirateship6MethodFPv */ BOOL daObjPirateship::Method::Delete(void* v_this) { return ((daObjPirateship::Act_c*)v_this)->_delete(); diff --git a/src/d/actor/d_a_obj_plant.cpp b/src/d/actor/d_a_obj_plant.cpp index 5d7a3a017..a7598a179 100644 --- a/src/d/actor/d_a_obj_plant.cpp +++ b/src/d/actor/d_a_obj_plant.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_plant.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_plant.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_quake.cpp b/src/d/actor/d_a_obj_quake.cpp index 259bdda0e..9196af134 100644 --- a/src/d/actor/d_a_obj_quake.cpp +++ b/src/d/actor/d_a_obj_quake.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_quake.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_quake.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_rcloud.cpp b/src/d/actor/d_a_obj_rcloud.cpp index 05621785e..4018e27de 100644 --- a/src/d/actor/d_a_obj_rcloud.cpp +++ b/src/d/actor/d_a_obj_rcloud.cpp @@ -3,13 +3,13 @@ * Object - Dragon Roost Island - Clouds near Valoo */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rcloud.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/d_priority.h" #include "m_Do/m_Do_hostIO.h" #include "d/res/res_bvkumo.h" -#include "weak_data_1811.h" // IWYU pragma: keep namespace { const char l_arcname[] = "BVkumo"; diff --git a/src/d/actor/d_a_obj_rflw.cpp b/src/d/actor/d_a_obj_rflw.cpp index 59564eec1..4ff448cf6 100644 --- a/src/d/actor/d_a_obj_rflw.cpp +++ b/src/d/actor/d_a_obj_rflw.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_rflw.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rflw.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_rforce.cpp b/src/d/actor/d_a_obj_rforce.cpp index a97c40198..8bebb3cd6 100644 --- a/src/d/actor/d_a_obj_rforce.cpp +++ b/src/d/actor/d_a_obj_rforce.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_rforce.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rforce.h" #include "d/d_bg_s_movebg_actor.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index 60273fc9b..58cd6b222 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -3,6 +3,7 @@ * Object - Zunari's Shop models (wooden posts and curtains on top) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_roten.h" #include "d/res/res_roten.h" #include "m_Do/m_Do_mtx.h" diff --git a/src/d/actor/d_a_obj_search.cpp b/src/d/actor/d_a_obj_search.cpp index ea37b3fd0..4d5835d15 100644 --- a/src/d/actor/d_a_obj_search.cpp +++ b/src/d/actor/d_a_obj_search.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_search.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_search.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_shelf.cpp b/src/d/actor/d_a_obj_shelf.cpp index 98ad82947..91a84c651 100644 --- a/src/d/actor/d_a_obj_shelf.cpp +++ b/src/d/actor/d_a_obj_shelf.cpp @@ -3,6 +3,7 @@ * Object - Wooden shelf */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_shelf.h" #include "d/res/res_otana.h" #include "d/d_procname.h" @@ -11,8 +12,6 @@ #include "d/actor/d_a_npc_ba1.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep - Mtx daObjShelf::Act_c::M_tmp_mtx; namespace daObjShelf { diff --git a/src/d/actor/d_a_obj_shmrgrd.cpp b/src/d/actor/d_a_obj_shmrgrd.cpp index 268d3b16c..62732ae76 100644 --- a/src/d/actor/d_a_obj_shmrgrd.cpp +++ b/src/d/actor/d_a_obj_shmrgrd.cpp @@ -3,6 +3,7 @@ * Object - Skull Hammer switch (spiked) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_shmrgrd.h" #include "d/res/res_shmrgrd.h" #include "d/d_procname.h" @@ -11,9 +12,6 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - struct Attr_c { /* 0x00 */ f32 mVSpring; /* 0x04 */ f32 mIntVSpeedDecay; diff --git a/src/d/actor/d_a_obj_smplbg.cpp b/src/d/actor/d_a_obj_smplbg.cpp index 87178e671..3ac363d6b 100644 --- a/src/d/actor/d_a_obj_smplbg.cpp +++ b/src/d/actor/d_a_obj_smplbg.cpp @@ -3,6 +3,7 @@ * Object - Top/"head" of Tingle Tower */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_smplbg.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp index 6b08ef564..06b229e2a 100644 --- a/src/d/actor/d_a_obj_stair.cpp +++ b/src/d/actor/d_a_obj_stair.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_stair.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_stair.h" #include "d/d_bg_w.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_swflat.cpp b/src/d/actor/d_a_obj_swflat.cpp index ed4eda878..874a07458 100644 --- a/src/d/actor/d_a_obj_swflat.cpp +++ b/src/d/actor/d_a_obj_swflat.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods - Floor switch (requires statues to stay active) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swflat.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp index 6948ec46e..6cfc5a8b9 100644 --- a/src/d/actor/d_a_obj_swhammer.cpp +++ b/src/d/actor/d_a_obj_swhammer.cpp @@ -3,6 +3,7 @@ * Object - Skull Hammer switch (normal) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swhammer.h" #include "d/res/res_mhmrsw.h" #include "d/d_procname.h" @@ -10,9 +11,6 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daObjSwhammer { namespace { struct Attr_c { @@ -462,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_swheavy.cpp b/src/d/actor/d_a_obj_swheavy.cpp index 1719543e9..04c660b2c 100644 --- a/src/d/actor/d_a_obj_swheavy.cpp +++ b/src/d/actor/d_a_obj_swheavy.cpp @@ -3,6 +3,7 @@ * Object - Wind Temple - Iron Boots switch */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swheavy.h" #include "d/res/res_hhbot.h" #include "d/d_com_inf_game.h" @@ -10,8 +11,6 @@ #include "d/d_priority.h" #include "d/actor/d_a_player.h" -#include "weak_data_1811.h" // IWYU pragma: keep - const char daObjSwheavy::Act_c::M_arcname[] = "Hhbot"; const daObjSwheavy::Attr_c daObjSwheavy::Act_c::M_attr[] = { { diff --git a/src/d/actor/d_a_obj_swlight.cpp b/src/d/actor/d_a_obj_swlight.cpp index 2ae10808f..077c6aa2f 100644 --- a/src/d/actor/d_a_obj_swlight.cpp +++ b/src/d/actor/d_a_obj_swlight.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_swlight.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swlight.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index 9d46eb436..aa6946cc9 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -3,6 +3,7 @@ * Object - Yellow switch (activated by stepping on it) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swpush.h" #include "d/res/res_kbota_00.h" #include "d/res/res_hhbot.h" @@ -12,9 +13,6 @@ #include "d/d_bg_w_sv.h" #include "d/actor/d_a_player.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - const char daObjSwpush::Act_c::M_arcname_kbota[] = "Kbota_00"; const char daObjSwpush::Act_c::M_arcname_hhbot[] = "Hhbot"; diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index ead1999ea..fd6615dd7 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_table.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_table.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "SSystem/SComponent/c_phase.h" diff --git a/src/d/actor/d_a_obj_tapestry.cpp b/src/d/actor/d_a_obj_tapestry.cpp index 7bf10e901..220f32e95 100644 --- a/src/d/actor/d_a_obj_tapestry.cpp +++ b/src/d/actor/d_a_obj_tapestry.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_tapestry.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tapestry.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_tenmado.cpp b/src/d/actor/d_a_obj_tenmado.cpp index aae543798..88ba35e6e 100644 --- a/src/d/actor/d_a_obj_tenmado.cpp +++ b/src/d/actor/d_a_obj_tenmado.cpp @@ -3,6 +3,7 @@ * Object - Earth Temple - Doors blocking ceiling light beam */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tenmado.h" #include "d/res/res_tenmado.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_tide.cpp b/src/d/actor/d_a_obj_tide.cpp index 952de2baa..677469f2b 100644 --- a/src/d/actor/d_a_obj_tide.cpp +++ b/src/d/actor/d_a_obj_tide.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_tide.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tide.h" #include "d/actor/d_a_tag_waterlevel.h" #include "d/d_procname.h" @@ -51,8 +52,6 @@ inline const Attr_c& attr(Type_e type) { Mtx Act_c::M_tmp_mtx; -#include "weak_data_1811.h" // IWYU pragma: keep - /* 00000078-00000644 .text CreateHeap__Q29daObjTide5Act_cFv */ BOOL Act_c::CreateHeap() { const char* arcname = attr(M_type).arcName; diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index 7ac79d5c8..19f759ef2 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -3,13 +3,12 @@ * Object - Timer */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_timer.h" #include "d/d_procname.h" #include "d/d_priority.h" #include "d/d_com_inf_game.h" // IWYU pragma: keep // Needed for dComIfGs_isSwitch inline definition -#include "weak_data_1811.h" // IWYU pragma: keep - /* 00000078-00000114 .text _create__Q210daObjTimer5Act_cFv */ cPhs_State daObjTimer::Act_c::_create() { fopAcM_SetupActor(this, daObjTimer::Act_c); diff --git a/src/d/actor/d_a_obj_tntrap.cpp b/src/d/actor/d_a_obj_tntrap.cpp index b037343d5..05065aa1a 100644 --- a/src/d/actor/d_a_obj_tntrap.cpp +++ b/src/d/actor/d_a_obj_tntrap.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_tntrap.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tntrap.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 1cdd7c357..ef87828a4 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -3,6 +3,7 @@ * Object - Rito Postbox */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_toripost.h" #include "d/res/res_toripost.h" #include "JSystem/JUtility/JUTAssert.h" @@ -19,7 +20,21 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep +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; diff --git a/src/d/actor/d_a_obj_tousekiki.cpp b/src/d/actor/d_a_obj_tousekiki.cpp index 87f95caa0..222d290bc 100644 --- a/src/d/actor/d_a_obj_tousekiki.cpp +++ b/src/d/actor/d_a_obj_tousekiki.cpp @@ -3,6 +3,7 @@ * Object - Catapult (Tetra's Ship) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tousekiki.h" #include "d/actor/d_a_obj_pirateship.h" #include "d/res/res_touseki.h" diff --git a/src/d/actor/d_a_obj_tower.cpp b/src/d/actor/d_a_obj_tower.cpp index 47827c98e..ded7ec313 100644 --- a/src/d/actor/d_a_obj_tower.cpp +++ b/src/d/actor/d_a_obj_tower.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods exterior */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tower.h" #include "d/res/res_x_tower.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_trap.cpp b/src/d/actor/d_a_obj_trap.cpp index d36087355..7e5f2e9db 100644 --- a/src/d/actor/d_a_obj_trap.cpp +++ b/src/d/actor/d_a_obj_trap.cpp @@ -3,6 +3,7 @@ * Enemy - Blade Trap (normal) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_trap.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_tribox.cpp b/src/d/actor/d_a_obj_tribox.cpp index b1019d5e0..88fde9ec3 100644 --- a/src/d/actor/d_a_obj_tribox.cpp +++ b/src/d/actor/d_a_obj_tribox.cpp @@ -3,6 +3,7 @@ * Object - Hyrule Castle - Pushable triangle blocks */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tribox.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_try.cpp b/src/d/actor/d_a_obj_try.cpp index 6921bc1f0..0a8667d36 100644 --- a/src/d/actor/d_a_obj_try.cpp +++ b/src/d/actor/d_a_obj_try.cpp @@ -3,6 +3,7 @@ * Object - Tower of the Gods - Glowing blue/pink statue/pillar */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_try.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_usovmc.cpp b/src/d/actor/d_a_obj_usovmc.cpp index 926e8fdc3..29364591f 100644 --- a/src/d/actor/d_a_obj_usovmc.cpp +++ b/src/d/actor/d_a_obj_usovmc.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_usovmc.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_usovmc.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 9ec00053f..1d0336b50 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -3,6 +3,7 @@ * Object - Ganon's Tower - Phantom Ganon door */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vfan.h" #include "d/res/res_vfan.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index 7549960fb..67b65fee4 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -3,6 +3,7 @@ * Object - Ganon's Tower - Trials door */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vgnfd.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -10,8 +11,6 @@ #include "d/res/res_vgnfd.h" #include "JSystem/JUtility/JUTAssert.h" -#include "weak_data_1811.h" // IWYU pragma: keep - const s32 daObjVgnfd_c::M_bdl_table[] = { VGNFD_BDL_VGNFD0, VGNFD_BDL_VGNFD1, diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index 4e39c27d9..ef99fb003 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -3,6 +3,7 @@ * Object - Mound of soft soil + Makar tree */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vmc.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_vmsdz.cpp b/src/d/actor/d_a_obj_vmsdz.cpp index 693d2dd3d..81e700c95 100644 --- a/src/d/actor/d_a_obj_vmsdz.cpp +++ b/src/d/actor/d_a_obj_vmsdz.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_vmsdz.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vmsdz.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_vmsms.cpp b/src/d/actor/d_a_obj_vmsms.cpp index fdd75c4c9..26a81a05a 100644 --- a/src/d/actor/d_a_obj_vmsms.cpp +++ b/src/d/actor/d_a_obj_vmsms.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_vmsms.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vmsms.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp index 29d750386..e35212b0f 100644 --- a/src/d/actor/d_a_obj_volcano.cpp +++ b/src/d/actor/d_a_obj_volcano.cpp @@ -3,6 +3,7 @@ * Object - Fire Mountain Exterior - Lava */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_volcano.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_vtil.cpp b/src/d/actor/d_a_obj_vtil.cpp index c804ccec5..807d0f8ba 100644 --- a/src/d/actor/d_a_obj_vtil.cpp +++ b/src/d/actor/d_a_obj_vtil.cpp @@ -3,6 +3,7 @@ * Object - Tingle statues */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vtil.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_vyasi.cpp b/src/d/actor/d_a_obj_vyasi.cpp index f0df2c163..d6bc02f93 100644 --- a/src/d/actor/d_a_obj_vyasi.cpp +++ b/src/d/actor/d_a_obj_vyasi.cpp @@ -3,6 +3,7 @@ * Object - Palm tree blowing in the wind (Gale Isle) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vyasi.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index cdb974e5b..a107be480 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -3,6 +3,7 @@ * Object - Warp pot */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_warpt.h" #include "d/actor/d_a_player.h" #include "d/res/res_ltubw.h" @@ -16,8 +17,6 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" -#include "weak_data_1811.h" // IWYU pragma: keep - class daObj_Warpt_HIO_c : public mDoHIO_entry_c { public: daObj_Warpt_HIO_c(); diff --git a/src/d/actor/d_a_obj_wood.cpp b/src/d/actor/d_a_obj_wood.cpp index 5a32c9910..3b6af2f60 100644 --- a/src/d/actor/d_a_obj_wood.cpp +++ b/src/d/actor/d_a_obj_wood.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_wood.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_wood.h" #include "d/d_wood.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_xfuta.cpp b/src/d/actor/d_a_obj_xfuta.cpp index 0d1ec8141..504ba62f2 100644 --- a/src/d/actor/d_a_obj_xfuta.cpp +++ b/src/d/actor/d_a_obj_xfuta.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_xfuta.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_xfuta.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index d598aa6a8..44e79c191 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -3,6 +3,7 @@ * Object - Hyrule Castle - Knight statues (Master Sword chamber) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_zouK.h" #include "d/res/res_vzouk.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_oq.cpp b/src/d/actor/d_a_oq.cpp index 06cac8e26..7d132456a 100644 --- a/src/d/actor/d_a_oq.cpp +++ b/src/d/actor/d_a_oq.cpp @@ -3,6 +3,7 @@ * Enemy - Octorok */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_oq.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp index a6f477576..142ca1e2d 100644 --- a/src/d/actor/d_a_oship.cpp +++ b/src/d/actor/d_a_oship.cpp @@ -3,6 +3,7 @@ * Enemy - Warship (Great Sea enemy ship) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_oship.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index 846d50e35..5c7bc648a 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -3,14 +3,13 @@ // Translation Unit: d_a_pedestal.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_pedestal.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/d_priority.h" #include "d/res/res_hdai1.h" -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daPedestal { const char daPds_c::m_arcname[] = "Hdai1"; diff --git a/src/d/actor/d_a_ph.cpp b/src/d/actor/d_a_ph.cpp index 58279339c..bf385af2b 100644 --- a/src/d/actor/d_a_ph.cpp +++ b/src/d/actor/d_a_ph.cpp @@ -3,6 +3,7 @@ * Enemy - Peahat/Seahat */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ph.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp index 3cc78e5f4..a701f0fe7 100644 --- a/src/d/actor/d_a_pirate_flag.cpp +++ b/src/d/actor/d_a_pirate_flag.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_pirate_flag.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_pirate_flag.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -11,8 +12,38 @@ #include "d/actor/d_a_obj_pirateship.h" #include "d/d_kankyo_wether.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep +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}, @@ -284,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_player.cpp b/src/d/actor/d_a_player.cpp index cac239367..26628476f 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -3,6 +3,7 @@ * Player - Base Player Class */ +#include "d/dolzel.h" // IWYU pragma: keep #include "dolphin/types.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_player_HIO.inc b/src/d/actor/d_a_player_HIO.inc index c6a073527..7a4a25aac 100644 --- a/src/d/actor/d_a_player_HIO.inc +++ b/src/d/actor/d_a_player_HIO.inc @@ -13,6 +13,7 @@ * But the debug version had implementations for all of Link's HIO classes. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" daPy_HIO_c::daPy_HIO_c() {} diff --git a/src/d/actor/d_a_player_battle.inc b/src/d/actor/d_a_player_battle.inc index a45657fa0..136475c6c 100644 --- a/src/d/actor/d_a_player_battle.inc +++ b/src/d/actor/d_a_player_battle.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_player_main.h" diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc index 9c6915879..13a808d6e 100644 --- a/src/d/actor/d_a_player_boomerang.inc +++ b/src/d/actor/d_a_player_boomerang.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_player_main.h" diff --git a/src/d/actor/d_a_player_bottle.inc b/src/d/actor/d_a_player_bottle.inc index 1de4ea4b0..fc7ce9810 100644 --- a/src/d/actor/d_a_player_bottle.inc +++ b/src/d/actor/d_a_player_bottle.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" #include "d/d_camera.h" diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc index 0f14d5137..3a4af9eb1 100644 --- a/src/d/actor/d_a_player_bow.inc +++ b/src/d/actor/d_a_player_bow.inc @@ -10,6 +10,7 @@ * a function from this file. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_arrow.h" #include "d/actor/d_a_npc_so.h" #include "d/actor/d_a_player_HIO.h" diff --git a/src/d/actor/d_a_player_climb.inc b/src/d/actor/d_a_player_climb.inc index d908c9d75..82de52bf4 100644 --- a/src/d/actor/d_a_player_climb.inc +++ b/src/d/actor/d_a_player_climb.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc index 00d8c96a6..562d63169 100644 --- a/src/d/actor/d_a_player_crawl.inc +++ b/src/d/actor/d_a_player_crawl.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_main_data.h" diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index a39ed9f1e..d12fdc658 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -10,6 +10,7 @@ * a function from this file. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_boko.h" #include "d/actor/d_a_demo_item.h" diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 2c8cc13bf..13ba6bbe7 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -10,6 +10,7 @@ * a function from this file. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_player_main.h" #include "d/d_kankyo_wether.h" diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc index 38ee333b4..8099a833f 100644 --- a/src/d/actor/d_a_player_food.inc +++ b/src/d/actor/d_a_player_food.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" #include "d/d_camera.h" diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc index 3358d4a14..3a7581842 100644 --- a/src/d/actor/d_a_player_grab.inc +++ b/src/d/actor/d_a_player_grab.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_boko.h" #include "d/actor/d_a_obj_barrel.h" #include "d/actor/d_a_player_main.h" diff --git a/src/d/actor/d_a_player_hammer.inc b/src/d/actor/d_a_player_hammer.inc index 568c039dd..80180e527 100644 --- a/src/d/actor/d_a_player_hammer.inc +++ b/src/d/actor/d_a_player_hammer.inc @@ -10,6 +10,7 @@ * a function from this file. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" diff --git a/src/d/actor/d_a_player_hang.inc b/src/d/actor/d_a_player_hang.inc index b8d755ad7..bc9595d6d 100644 --- a/src/d/actor/d_a_player_hang.inc +++ b/src/d/actor/d_a_player_hang.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_player_main.h" diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc index db0df2f0f..ccd1af9ca 100644 --- a/src/d/actor/d_a_player_hook.inc +++ b/src/d/actor/d_a_player_hook.inc @@ -10,6 +10,7 @@ * a function from this file. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_hookshot.h" #include "d/actor/d_a_player_HIO.h" diff --git a/src/d/actor/d_a_player_ladder.inc b/src/d/actor/d_a_player_ladder.inc index 833eaa7f4..ee41953c7 100644 --- a/src/d/actor/d_a_player_ladder.inc +++ b/src/d/actor/d_a_player_ladder.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 5d51fdf54..9bfee6f7d 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -8,6 +8,7 @@ * The original split locations are indicated in the map file. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_demo_item.h" #include "d/actor/d_a_npc_fa1.h" @@ -43,8 +44,6 @@ #include "SSystem/SComponent/c_counter.h" #include "m_Do/m_Do_graphic.h" -#include "weak_bss_3569.h" // IWYU pragma: keep - JGeometry::TVec3 l_hammer_splash_particle_scale(0.67f, 0.67f, 0.67f); #include "d/actor/d_a_player_main_data.inc" diff --git a/src/d/actor/d_a_player_main_data.inc b/src/d/actor/d_a_player_main_data.inc index 66f8fd65e..5f6ba0268 100644 --- a/src/d/actor/d_a_player_main_data.inc +++ b/src/d/actor/d_a_player_main_data.inc @@ -1,9 +1,8 @@ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_main_data.h" -#include "weak_data_2100_2080.h" // IWYU pragma: keep - char l_arcName[] = "Link"; char l_tact_event_label[] = "OPTION_CHAR_START"; diff --git a/src/d/actor/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp index 7f87d478d..f21a4a52d 100644 --- a/src/d/actor/d_a_player_npc.cpp +++ b/src/d/actor/d_a_player_npc.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_player_npc.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_npc.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" diff --git a/src/d/actor/d_a_player_particle.inc b/src/d/actor/d_a_player_particle.inc index 812b77439..0d49149e9 100644 --- a/src/d/actor/d_a_player_particle.inc +++ b/src/d/actor/d_a_player_particle.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_main_data.h" #include "d/actor/d_a_player_HIO.h" diff --git a/src/d/actor/d_a_player_pushpull.inc b/src/d/actor/d_a_player_pushpull.inc index 7f1e6eb59..19be79286 100644 --- a/src/d/actor/d_a_player_pushpull.inc +++ b/src/d/actor/d_a_player_pushpull.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_player_main.h" diff --git a/src/d/actor/d_a_player_rope.inc b/src/d/actor/d_a_player_rope.inc index 4a1610599..eac8bdda8 100644 --- a/src/d/actor/d_a_player_rope.inc +++ b/src/d/actor/d_a_player_rope.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_himo2.h" diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc index 3dc1107a8..53ff90dfc 100644 --- a/src/d/actor/d_a_player_ship.inc +++ b/src/d/actor/d_a_player_ship.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_hookshot.h" #include "d/actor/d_a_player_HIO.h" diff --git a/src/d/actor/d_a_player_swim.inc b/src/d/actor/d_a_player_swim.inc index 368bc8641..84b500d46 100644 --- a/src/d/actor/d_a_player_swim.inc +++ b/src/d/actor/d_a_player_swim.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" #include "f_op/f_op_kankyo_mng.h" diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 4eb3c2d4f..9f7bfc93c 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -10,6 +10,7 @@ * a function from this file. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_boko.h" #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index d7dea1c78..bb7431dc0 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_main_data.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" diff --git a/src/d/actor/d_a_player_vomit.inc b/src/d/actor/d_a_player_vomit.inc index 9699e42ec..a367229d0 100644 --- a/src/d/actor/d_a_player_vomit.inc +++ b/src/d/actor/d_a_player_vomit.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_player_weapon.inc b/src/d/actor/d_a_player_weapon.inc index db3aed9df..81335c77d 100644 --- a/src/d/actor/d_a_player_weapon.inc +++ b/src/d/actor/d_a_player_weapon.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_boko.h" diff --git a/src/d/actor/d_a_player_whide.inc b/src/d/actor/d_a_player_whide.inc index 435c57097..d9dc8af7f 100644 --- a/src/d/actor/d_a_player_whide.inc +++ b/src/d/actor/d_a_player_whide.inc @@ -10,6 +10,7 @@ * based on the original names of the functions it contains. */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player_HIO.h" #include "d/actor/d_a_player_main.h" diff --git a/src/d/actor/d_a_pt.cpp b/src/d/actor/d_a_pt.cpp index e6faa7ba7..72f314f99 100644 --- a/src/d/actor/d_a_pt.cpp +++ b/src/d/actor/d_a_pt.cpp @@ -3,6 +3,7 @@ * Enemy - Miniblin */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_pt.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index 1ee719922..cc2f50b19 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -3,6 +3,7 @@ * Enemy - Poe */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_pw.h" #include "d/actor/d_a_player.h" #include "d/d_bg_s_lin_chk.h" diff --git a/src/d/actor/d_a_pz.cpp b/src/d/actor/d_a_pz.cpp index 484a379b3..fbac8df3f 100644 --- a/src/d/actor/d_a_pz.cpp +++ b/src/d/actor/d_a_pz.cpp @@ -3,6 +3,7 @@ * NPC - Princess Zelda */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_pz.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -45,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_race_item.cpp b/src/d/actor/d_a_race_item.cpp index f7e46278b..807db6175 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/src/d/actor/d_a_race_item.cpp @@ -3,6 +3,7 @@ * Item - Barrel Item */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_race_item.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_sea.h" diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 7767e2e1e..dcfd213dc 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -3,6 +3,7 @@ * Enemy - ReDead */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_rd.h" #include "d/res/res_rd.h" #include "d/d_procname.h" @@ -20,8 +21,45 @@ #include "d/d_item_data.h" #include "m_Do/m_Do_controller_pad.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep +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; diff --git a/src/d/actor/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp index e3464f451..c16106621 100644 --- a/src/d/actor/d_a_rectangle.cpp +++ b/src/d/actor/d_a_rectangle.cpp @@ -3,6 +3,7 @@ * Unused Dummy Actor */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_rectangle.h" #include "f_op/f_op_actor.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp index 4432f07c4..9402c3409 100644 --- a/src/d/actor/d_a_sail.cpp +++ b/src/d/actor/d_a_sail.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_sail.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_sail.h" #if VERSION == VERSION_DEMO #include "d/d_s_play.h" @@ -19,8 +20,31 @@ #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_angle.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep +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) diff --git a/src/d/actor/d_a_saku.cpp b/src/d/actor/d_a_saku.cpp index ed241e1b7..db5f52ebc 100644 --- a/src/d/actor/d_a_saku.cpp +++ b/src/d/actor/d_a_saku.cpp @@ -3,6 +3,7 @@ * Object - Brown wooden barricade */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_saku.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index 16c33cd9c..e1b5c6e9a 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_salvage.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_salvage.h" #include "d/actor/d_a_ship.h" #include "d/actor/d_a_sea.h" diff --git a/src/d/actor/d_a_salvage_tbox.cpp b/src/d/actor/d_a_salvage_tbox.cpp index 6f1ebc25c..996897f9b 100644 --- a/src/d/actor/d_a_salvage_tbox.cpp +++ b/src/d/actor/d_a_salvage_tbox.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_salvage_tbox.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_salvage_tbox.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_sbox.cpp b/src/d/actor/d_a_sbox.cpp index 6ea83eeb0..a3b166fd8 100644 --- a/src/d/actor/d_a_sbox.cpp +++ b/src/d/actor/d_a_sbox.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_sbox.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_sbox.h" #include "d/actor/d_a_ship.h" #include "d/res/res_dalways.h" diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp index 7d9a2e5c3..52cfe21dd 100644 --- a/src/d/actor/d_a_scene_change.cpp +++ b/src/d/actor/d_a_scene_change.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_scene_change.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_scene_change.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp index f45035829..990f33cc2 100644 --- a/src/d/actor/d_a_sea.cpp +++ b/src/d/actor/d_a_sea.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_sea.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_sea.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_shand.cpp b/src/d/actor/d_a_shand.cpp index 25a03fe9e..22e14b111 100644 --- a/src/d/actor/d_a_shand.cpp +++ b/src/d/actor/d_a_shand.cpp @@ -3,6 +3,7 @@ * Object - Forbidden Woods - Ceiling tentacle / 汎用触手 (general purpose tentacle) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_shand.h" #include "d/res/res_shand.h" #include "d/d_bg_s_gnd_chk.h" diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index a7a6a61b9..00725a41f 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -3,6 +3,7 @@ * King of Red Lions */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ship.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -24,9 +25,6 @@ #include "d/actor/d_a_grid.h" #include "d/res/res_ship.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - static char l_arcName[] = "Ship"; static Vec l_cannon_top = {85.0f, 0.0f, 10.0f}; static Vec l_tiller_top_offset = {34.0f, 0.0f, 15.0f}; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index c0b3f2fda..f8f96f155 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -3,6 +3,7 @@ * Item - Shop Item */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_shop_item.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_shutter.cpp b/src/d/actor/d_a_shutter.cpp index 84ac1ed89..a058dc4ca 100644 --- a/src/d/actor/d_a_shutter.cpp +++ b/src/d/actor/d_a_shutter.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_shutter.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_shutter.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_shutter2.cpp b/src/d/actor/d_a_shutter2.cpp index af4495a1d..aedaabcdf 100644 --- a/src/d/actor/d_a_shutter2.cpp +++ b/src/d/actor/d_a_shutter2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_shutter2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_shutter2.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_sie_flag.cpp b/src/d/actor/d_a_sie_flag.cpp index 5156599a2..b76dbdae1 100644 --- a/src/d/actor/d_a_sie_flag.cpp +++ b/src/d/actor/d_a_sie_flag.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_sie_flag.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_sie_flag.h" #include "d/d_a_obj.h" #include "d/d_cc_d.h" @@ -16,7 +17,6 @@ #include "d/res/res_eshata.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf diff --git a/src/d/actor/d_a_sitem.cpp b/src/d/actor/d_a_sitem.cpp index b035b21db..2cb2dec69 100644 --- a/src/d/actor/d_a_sitem.cpp +++ b/src/d/actor/d_a_sitem.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_sitem.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_sitem.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_sk.cpp b/src/d/actor/d_a_sk.cpp index c22f54548..b41636925 100644 --- a/src/d/actor/d_a_sk.cpp +++ b/src/d/actor/d_a_sk.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_sk.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_sk.h" #include "d/res/res_sk.h" #include "m_Do/m_Do_ext.h" diff --git a/src/d/actor/d_a_sk2.cpp b/src/d/actor/d_a_sk2.cpp index 70848b354..39ab041e3 100644 --- a/src/d/actor/d_a_sk2.cpp +++ b/src/d/actor/d_a_sk2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_sk2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_sk2.h" #include "d/res/res_sk2.h" #include "m_Do/m_Do_ext.h" diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp index 36d94fd69..3b387cc9e 100644 --- a/src/d/actor/d_a_spc_item01.cpp +++ b/src/d/actor/d_a_spc_item01.cpp @@ -3,10 +3,10 @@ // Translation Unit: d_a_spc_item01.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_spc_item01.h" #include "d/d_procname.h" #include "d/d_priority.h" - #include "d/d_bg_s_acch.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp index be4f26bb0..d8c4f9489 100644 --- a/src/d/actor/d_a_spotbox.cpp +++ b/src/d/actor/d_a_spotbox.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_spotbox.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_spotbox.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_ss.cpp b/src/d/actor/d_a_ss.cpp index 6a56b22f1..b05a783f7 100644 --- a/src/d/actor/d_a_ss.cpp +++ b/src/d/actor/d_a_ss.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_ss.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ss.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_ssk.cpp b/src/d/actor/d_a_ssk.cpp index e05090b76..743ca8b27 100644 --- a/src/d/actor/d_a_ssk.cpp +++ b/src/d/actor/d_a_ssk.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_ssk.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ssk.h" #include "d/res/res_ssk.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_sss.cpp b/src/d/actor/d_a_sss.cpp index 299aca394..764ef2da8 100644 --- a/src/d/actor/d_a_sss.cpp +++ b/src/d/actor/d_a_sss.cpp @@ -3,6 +3,7 @@ * Enemy - Dexivine (Forbidden Woods, Wind Temple) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_sss.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_st.cpp b/src/d/actor/d_a_st.cpp index d8ccdce8f..8fe548e1d 100644 --- a/src/d/actor/d_a_st.cpp +++ b/src/d/actor/d_a_st.cpp @@ -3,6 +3,7 @@ * Enemy - Stalfos */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_st.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_steam_tag.cpp b/src/d/actor/d_a_steam_tag.cpp index 9f2ffc64d..c1c471332 100644 --- a/src/d/actor/d_a_steam_tag.cpp +++ b/src/d/actor/d_a_steam_tag.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_steam_tag.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_steam_tag.h" #include "JSystem/JParticle/JPAEmitter.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp index cb4d02e20..fd284b02c 100644 --- a/src/d/actor/d_a_stone.cpp +++ b/src/d/actor/d_a_stone.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_stone.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_stone.h" #include "d/actor/d_a_sea.h" #include "d/actor/d_a_player.h" @@ -16,11 +17,6 @@ #include "f_op/f_op_camera.h" #include "m_Do/m_Do_mtx.h" -#if VERSION == VERSION_DEMO -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#endif -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daStone { cXyz Act_c::M_axis = cXyz::BaseZ; diff --git a/src/d/actor/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp index ab0beb6ea..fe2ee9596 100644 --- a/src/d/actor/d_a_stone2.cpp +++ b/src/d/actor/d_a_stone2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_stone2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_stone2.h" #include "d/actor/d_a_player.h" #include "d/res/res_always.h" @@ -12,9 +13,6 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daStone2 { Mtx daStone2::Act_c::M_tmp_mtx; @@ -769,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_swattack.cpp b/src/d/actor/d_a_swattack.cpp index 70920dafd..4d723add2 100644 --- a/src/d/actor/d_a_swattack.cpp +++ b/src/d/actor/d_a_swattack.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_swattack.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_swattack.h" #include "f_op/f_op_actor_mng.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 21a663237..86e8cbc86 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_swc00.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_swc00.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 7c0c6c9fd..547c7dd18 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_swhit0.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_swhit0.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index 14a52a309..3aff31b88 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/src/d/actor/d_a_switem.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_switem.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_switem.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_swpropeller.cpp b/src/d/actor/d_a_swpropeller.cpp index b1543268e..0b5e9fa4e 100644 --- a/src/d/actor/d_a_swpropeller.cpp +++ b/src/d/actor/d_a_swpropeller.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_swpropeller.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_swpropeller.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp index e390a12db..c648e895b 100644 --- a/src/d/actor/d_a_swtact.cpp +++ b/src/d/actor/d_a_swtact.cpp @@ -3,6 +3,7 @@ * Object - Wind Crest (Wind's Requiem blue floor decoration) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_swtact.h" #include "d/res/res_itact.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp index 316b0af0b..dc51837ab 100644 --- a/src/d/actor/d_a_swtdoor.cpp +++ b/src/d/actor/d_a_swtdoor.cpp @@ -3,6 +3,7 @@ * Object - Forsaken Fortress tower (Helmaroc King fight) - gray "doors" blocking windows */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_swtdoor.h" #include "d/res/res_swtdoor.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index d46b712ce..ab0b9d9e2 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -3,6 +3,7 @@ * Object - Unused - Chandelier (Spaceworld 2001 trailer) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_syan.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" @@ -11,9 +12,6 @@ #include "d/d_s_play.h" #include "d/res/res_syan.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - static f32 b_pos_x[6] = { 870.0f, 420.0f, -420.0f, -880.0f, -400.0f, 440.0f }; static f32 b_pos_y[6] = { -560.0f, -760.0f, -630.0f, -710.0f, -670.0f, -690.0f }; static f32 b_pos_z[6] = { 0.0f, 750.0f, 750.0f, 0.0f, -720.0f, -750.0f }; diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index 1332ea743..4b310d35f 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_attention.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_attention.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_tag_ba1.cpp b/src/d/actor/d_a_tag_ba1.cpp index af1e2fb8a..d7f36af91 100644 --- a/src/d/actor/d_a_tag_ba1.cpp +++ b/src/d/actor/d_a_tag_ba1.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_ba1.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_ba1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_tag_etc.cpp b/src/d/actor/d_a_tag_etc.cpp index 490a63fe7..2a348f832 100644 --- a/src/d/actor/d_a_tag_etc.cpp +++ b/src/d/actor/d_a_tag_etc.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_etc.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_etc.h" #include "d/actor/d_a_npc_md.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index b9f7d47bb..7ec854445 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_event.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_event.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_tag_evsw.cpp b/src/d/actor/d_a_tag_evsw.cpp index 0ca7ea5b0..92ade27a1 100644 --- a/src/d/actor/d_a_tag_evsw.cpp +++ b/src/d/actor/d_a_tag_evsw.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_evsw.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_evsw.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp index 166774ebe..d8e672bc2 100644 --- a/src/d/actor/d_a_tag_ghostship.cpp +++ b/src/d/actor/d_a_tag_ghostship.cpp @@ -3,13 +3,12 @@ // Translation Unit: d_a_tag_ghostship.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_ghostship.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/d_priority.h" -#include "weak_data_1811.h" // IWYU pragma: keep - static daTag_Gship_HIO_c l_HIO; /* 000000EC-0000010C .text __ct__17daTag_Gship_HIO_cFv */ diff --git a/src/d/actor/d_a_tag_hint.cpp b/src/d/actor/d_a_tag_hint.cpp index 40f37fbd3..57395a4d1 100644 --- a/src/d/actor/d_a_tag_hint.cpp +++ b/src/d/actor/d_a_tag_hint.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_hint.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_hint.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_npc_os.h" @@ -13,8 +14,6 @@ #include "d/d_bg_s_lin_chk.h" #include "f_op/f_op_actor_mng.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - static LIGHT_INFLUENCE plight; static LIGHT_INFLUENCE elight; static fpc_ProcID l_msgId; diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp index a0dfeee6d..31e24376a 100644 --- a/src/d/actor/d_a_tag_island.cpp +++ b/src/d/actor/d_a_tag_island.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_island.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_island.h" #include "d/actor/d_a_obj_ikada.h" #include "d/actor/d_a_player_main.h" diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp index 022f9b1f0..0918b48b5 100644 --- a/src/d/actor/d_a_tag_kb_item.cpp +++ b/src/d/actor/d_a_tag_kb_item.cpp @@ -3,6 +3,7 @@ * */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_kb_item.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_kf1.cpp b/src/d/actor/d_a_tag_kf1.cpp index 768095a91..e45285990 100644 --- a/src/d/actor/d_a_tag_kf1.cpp +++ b/src/d/actor/d_a_tag_kf1.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_kf1.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_kf1.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_tag_kk1.cpp b/src/d/actor/d_a_tag_kk1.cpp index f1166e98e..23d8c3443 100644 --- a/src/d/actor/d_a_tag_kk1.cpp +++ b/src/d/actor/d_a_tag_kk1.cpp @@ -3,12 +3,29 @@ // Translation Unit: d_a_tag_kk1.cpp // - +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_kk1.h" #include "d/d_com_inf_game.h" #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; diff --git a/src/d/actor/d_a_tag_light.cpp b/src/d/actor/d_a_tag_light.cpp index 343b3818a..61eb062cb 100644 --- a/src/d/actor/d_a_tag_light.cpp +++ b/src/d/actor/d_a_tag_light.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_light.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_light.h" #include "d/res/res_mspot.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_tag_md_cb.cpp b/src/d/actor/d_a_tag_md_cb.cpp index c80425f21..bd4f5f9b2 100644 --- a/src/d/actor/d_a_tag_md_cb.cpp +++ b/src/d/actor/d_a_tag_md_cb.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_md_cb.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_md_cb.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_tag_mk.cpp b/src/d/actor/d_a_tag_mk.cpp index b7e2c0922..345b342d8 100644 --- a/src/d/actor/d_a_tag_mk.cpp +++ b/src/d/actor/d_a_tag_mk.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_mk.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_mk.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index f9db5fe95..660ffe36b 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -3,14 +3,13 @@ // Translation Unit: d_a_tag_msg.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_msg.h" #include "d/actor/d_a_player_main.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/d_priority.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - static fpc_ProcID l_msgId; static msg_class* l_msg; static u8 msg_mode; diff --git a/src/d/actor/d_a_tag_photo.cpp b/src/d/actor/d_a_tag_photo.cpp index ec109a3b3..de41f812a 100644 --- a/src/d/actor/d_a_tag_photo.cpp +++ b/src/d/actor/d_a_tag_photo.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_photo.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_photo.h" #include "d/actor/d_a_npc_photo.h" #include "d/d_a_obj.h" @@ -12,8 +13,6 @@ #include "d/d_priority.h" #include "f_op/f_op_actor_mng.h" -#include "weak_data_1811.h" // IWYU pragma: keep - static u32 l_msg_talk[] = { 0x2A6D, 0x2A70, diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp index 1b89a0b5e..b651fcfa1 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/src/d/actor/d_a_tag_ret.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_ret.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_ret.h" #include "d/d_item.h" #include "d/d_item_data.h" diff --git a/src/d/actor/d_a_tag_so.cpp b/src/d/actor/d_a_tag_so.cpp index 20732551e..5768cbb23 100644 --- a/src/d/actor/d_a_tag_so.cpp +++ b/src/d/actor/d_a_tag_so.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_so.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_so.h" #include "d/d_lib.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_volcano.cpp b/src/d/actor/d_a_tag_volcano.cpp index b8306fad5..69875b21b 100644 --- a/src/d/actor/d_a_tag_volcano.cpp +++ b/src/d/actor/d_a_tag_volcano.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_volcano.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_volcano.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_waterlevel.cpp b/src/d/actor/d_a_tag_waterlevel.cpp index 06f0e94c4..731c29202 100644 --- a/src/d/actor/d_a_tag_waterlevel.cpp +++ b/src/d/actor/d_a_tag_waterlevel.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tag_waterlevel.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_waterlevel.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" diff --git a/src/d/actor/d_a_tama.cpp b/src/d/actor/d_a_tama.cpp index 85bba67e3..a5f909c09 100644 --- a/src/d/actor/d_a_tama.cpp +++ b/src/d/actor/d_a_tama.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tama.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tama.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index b434d4b82..d3cdf6670 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -3,6 +3,7 @@ * Treasure Chest / 宝箱 (Takarabako) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tbox.h" #include "d/res/res_dalways.h" #include "JSystem/JUtility/JUTAssert.h" @@ -20,7 +21,6 @@ #include "m_Do/m_Do_hostIO.h" #include "m_Do/m_Do_mtx.h" - #define FUNC_TYPE_NORMAL 0 #define FUNC_TYPE_SWITCH 1 #define FUNC_TYPE_ENEMIES 2 @@ -31,8 +31,6 @@ #define FUNC_TYPE_EXTRA_SAVE_INFO 7 #define FUNC_TYPE_EXTRA_SAVE_INFO_SPAWN 8 -#include "weak_data_1811.h" // IWYU pragma: keep - extern dCcD_SrcCyl dNpc_cyl_src; static daTbox_HIO_c l_HIO; diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 733c2ec47..d2fce5100 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -3,6 +3,7 @@ * Title Screen manager & logo */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_title.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index d85918d05..eaad1a497 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -3,6 +3,7 @@ * Enemy - Darknut / Mini-Boss - Darknut (Tower of the Gods) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tn.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp index c60d23b71..b7fb49697 100644 --- a/src/d/actor/d_a_toge.cpp +++ b/src/d/actor/d_a_toge.cpp @@ -3,6 +3,7 @@ * Object - Wind Temple - Floor spikes */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_toge.h" #include "d/res/res_htoge1.h" #include "d/actor/d_a_wind_tag.h" diff --git a/src/d/actor/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp index b5d0d9cf2..01a510613 100644 --- a/src/d/actor/d_a_tori_flag.cpp +++ b/src/d/actor/d_a_tori_flag.cpp @@ -3,6 +3,7 @@ * Object - Great Sea - Small red flag (Flight Control Platform, Horseshoe Island) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tori_flag.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -15,8 +16,6 @@ #include "f_op/f_op_actor_mng.h" #include "d/d_a_obj.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index 28217000b..9e75acada 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -3,6 +3,7 @@ * Ballad Of Gales Tornado */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tornado.h" #include "d/res/res_trnd.h" #include "f_op/f_op_actor_mng.h" @@ -13,8 +14,6 @@ #include "d/actor/d_a_ship.h" #include "d/d_kankyo_wether.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - static char l_arcName[] = "Trnd"; const float daTornado_HIO_c0::move_dis = 7500.0f; diff --git a/src/d/actor/d_a_tpota.cpp b/src/d/actor/d_a_tpota.cpp index 0ad89f968..565e1fed9 100644 --- a/src/d/actor/d_a_tpota.cpp +++ b/src/d/actor/d_a_tpota.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_tpota.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tpota.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_tsubo.cpp b/src/d/actor/d_a_tsubo.cpp index a5f4ed35d..55205e901 100644 --- a/src/d/actor/d_a_tsubo.cpp +++ b/src/d/actor/d_a_tsubo.cpp @@ -3,6 +3,7 @@ * Small, carriable objects (pots, skulls, etc.) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_tsubo.h" #include "d/actor/d_a_boko.h" #include "d/actor/d_a_player.h" @@ -29,9 +30,6 @@ #include "f_op/f_op_camera.h" #include "f_op/f_op_kankyo_mng.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daTsubo { #if VERSION == VERSION_DEMO diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index 8ff266724..be96f6592 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_vrbox.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_vrbox.h" #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 1664cd591..bbbe247f2 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_vrbox2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_vrbox2.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera.h" diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index e2b25324b..0bf526612 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -3,6 +3,7 @@ * Object - Bombable walls */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_wall.h" #include "d/res/res_hbw1.h" #include "d/res/res_htw1.h" @@ -14,8 +15,6 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep - const s16 daWall_c::m_heapsize[3] = { 0x1160, 0x1DD0, diff --git a/src/d/actor/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp index b2046d055..bdf734b70 100644 --- a/src/d/actor/d_a_warpdm20.cpp +++ b/src/d/actor/d_a_warpdm20.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_warpdm20.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_warpdm20.h" #include "d/actor/d_a_ship.h" #include "d/actor/d_a_player.h" @@ -14,8 +15,6 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" -#include "weak_data_1811.h" // IWYU pragma: keep - typedef void (daWarpdm20_c::*EventInitFunc)(int); typedef BOOL (daWarpdm20_c::*EventActionFunc)(int); diff --git a/src/d/actor/d_a_warpf.cpp b/src/d/actor/d_a_warpf.cpp index 5c4a453ed..549fffded 100644 --- a/src/d/actor/d_a_warpf.cpp +++ b/src/d/actor/d_a_warpf.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_warpf.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_warpf.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp index d113bc6d8..d3f665365 100644 --- a/src/d/actor/d_a_warpfout.cpp +++ b/src/d/actor/d_a_warpfout.cpp @@ -3,14 +3,13 @@ // Translation Unit: d_a_warpfout.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_warpfout.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/d_priority.h" -#include "weak_data_1811.h" // IWYU pragma: keep - static daWarpfout_c::EventActionInitFunc event_init_tbl[] = { &daWarpfout_c::initWarp1, &daWarpfout_c::initWarp2, &daWarpfout_c::initWarp3, &daWarpfout_c::initWarp4, &daWarpfout_c::initEnd, diff --git a/src/d/actor/d_a_warpgn.cpp b/src/d/actor/d_a_warpgn.cpp index afb15b523..9d91b5580 100644 --- a/src/d/actor/d_a_warpgn.cpp +++ b/src/d/actor/d_a_warpgn.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_warpgn.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_warpgn.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp index 6cc422d67..09da471f7 100644 --- a/src/d/actor/d_a_warphr.cpp +++ b/src/d/actor/d_a_warphr.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_warphr.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_warphr.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_ship.h" @@ -13,9 +14,6 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_graphic.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - namespace daWarphr_prm { static inline u8 getType(daWarphr_c* i_this) { return (fopAcM_GetParam(i_this) >> 0x1C) & 0xFF; diff --git a/src/d/actor/d_a_warpls.cpp b/src/d/actor/d_a_warpls.cpp index c9b09c3a4..72b6f9c32 100644 --- a/src/d/actor/d_a_warpls.cpp +++ b/src/d/actor/d_a_warpls.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_warpls.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_warpls.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_warpmj.cpp b/src/d/actor/d_a_warpmj.cpp index 5c75e924e..a3e172d20 100644 --- a/src/d/actor/d_a_warpmj.cpp +++ b/src/d/actor/d_a_warpmj.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_warpmj.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_warpmj.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_waterfall.cpp b/src/d/actor/d_a_waterfall.cpp index c2437c559..a036bf5d9 100644 --- a/src/d/actor/d_a_waterfall.cpp +++ b/src/d/actor/d_a_waterfall.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_waterfall.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_waterfall.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/actor/d_a_wbird.cpp b/src/d/actor/d_a_wbird.cpp index f5a68549d..0b4f068c5 100644 --- a/src/d/actor/d_a_wbird.cpp +++ b/src/d/actor/d_a_wbird.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_wbird.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_wbird.h" #include "d/d_procname.h" #include "d/d_priority.h" @@ -11,7 +12,6 @@ #include "SSystem/SComponent/c_angle.h" #include "d/actor/d_a_player.h" - const char daWbird_c::M_arcname[] = "Wbird"; /* 00000078-000000AC .text calcMtx__9daWbird_cFv */ void daWbird_c::calcMtx() { diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 2bdd1673d..77494dbe6 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_wind_tag.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_wind_tag.h" #include "d/res/res_yaflw00.h" #include "d/res/res_ybgaf00.h" diff --git a/src/d/actor/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp index fa12e79a1..bdf5db2d3 100644 --- a/src/d/actor/d_a_windmill.cpp +++ b/src/d/actor/d_a_windmill.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_windmill.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_windmill.h" #include "d/actor/d_a_wind_tag.h" #include "d/res/res_hpu1.h" @@ -14,9 +15,6 @@ #include "d/d_cc_d.h" #include "d/d_bg_s_movebg_actor.h" -#include "weak_data_1811.h" // IWYU pragma: keep - - const char* daWindMill_c::m_arcname[] = { "Hpu1", "Hpu2" }; static dCcD_SrcSph l_sph_src = { diff --git a/src/d/actor/d_a_wz.cpp b/src/d/actor/d_a_wz.cpp index 500879179..761059bbc 100644 --- a/src/d/actor/d_a_wz.cpp +++ b/src/d/actor/d_a_wz.cpp @@ -3,6 +3,7 @@ * Enemy - Wizzrobe / Mini-Boss - Wizzrobe (Wind Temple) */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_wz.h" #include "m_Do/m_Do_ext.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index a62f29f19..0937fe2fc 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_ygcwp.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ygcwp.h" #include "d/actor/d_a_player.h" #include "d/res/res_ygcwp.h" diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index bcc57a118..8ca248561 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_ykgr.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ykgr.h" #include "d/actor/d_a_player.h" #include "d/d_procname.h" @@ -11,8 +12,6 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep - class daYkgr_HIO_c : #if VERSION == VERSION_DEMO public JORReflexible diff --git a/src/d/actor/d_a_yougan.cpp b/src/d/actor/d_a_yougan.cpp index 22e7aa2fe..8f2786f6e 100644 --- a/src/d/actor/d_a_yougan.cpp +++ b/src/d/actor/d_a_yougan.cpp @@ -3,6 +3,7 @@ * Object - Unused - Lava bubbles */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_yougan.h" #include "d/d_procname.h" #include "d/d_priority.h" diff --git a/src/d/d_2dnumber.cpp b/src/d/d_2dnumber.cpp index fa2b0b7e0..f8bb69d73 100644 --- a/src/d/d_2dnumber.cpp +++ b/src/d/d_2dnumber.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_2dnumber.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_2dnumber.h" #include "d/d_com_inf_game.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" diff --git a/src/d/d_a_boko_static.cpp b/src/d/d_a_boko_static.cpp index 4f73f2abb..2291db067 100644 --- a/src/d/d_a_boko_static.cpp +++ b/src/d/d_a_boko_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_boko_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_boko.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/d_a_bomb_static.cpp b/src/d/d_a_bomb_static.cpp index c799d8086..de484c9e2 100644 --- a/src/d/d_a_bomb_static.cpp +++ b/src/d/d_a_bomb_static.cpp @@ -3,6 +3,7 @@ * Bomb - Static */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_bomb.h" #include "d/actor/d_a_bomb2.h" #include "d/d_a_obj.h" diff --git a/src/d/d_a_branch_static.cpp b/src/d/d_a_branch_static.cpp index c57fbc8d3..ba6be3dca 100644 --- a/src/d/d_a_branch_static.cpp +++ b/src/d/d_a_branch_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_branch_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_branch.h" #include "dolphin/types.h" #include "JSystem/JUtility/JUTAssert.h" diff --git a/src/d/d_a_item_static.cpp b/src/d/d_a_item_static.cpp index 0e2f03031..c8f8b2a85 100644 --- a/src/d/d_a_item_static.cpp +++ b/src/d/d_a_item_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_item_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_item.h" #include "dolphin/types.h" diff --git a/src/d/d_a_itembase_static.cpp b/src/d/d_a_itembase_static.cpp index c67c7f388..8c592245b 100644 --- a/src/d/d_a_itembase_static.cpp +++ b/src/d/d_a_itembase_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_itembase_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_itembase.h" #include "d/d_item_data.h" #include "SSystem/SComponent/c_lib.h" @@ -118,4 +119,3 @@ BOOL CheckFieldItemCreateHeap(fopAc_ac_c* i_ac) { -1 ); } - diff --git a/src/d/d_a_leaflift_static.cpp b/src/d/d_a_leaflift_static.cpp index e7d933503..bec7f2720 100644 --- a/src/d/d_a_leaflift_static.cpp +++ b/src/d/d_a_leaflift_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_leaflift_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_leaflift.h" #include "d/d_com_inf_game.h" #include "dolphin/types.h" diff --git a/src/d/d_a_mgameboard_static.cpp b/src/d/d_a_mgameboard_static.cpp index c4fce0dbb..d8e1a4a60 100644 --- a/src/d/d_a_mgameboard_static.cpp +++ b/src/d/d_a_mgameboard_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_mgameboard_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_mgameboard.h" /* 800685F8-80068608 .text checkClearGame__11daMgBoard_cFv */ diff --git a/src/d/d_a_npc_cb1_static.cpp b/src/d/d_a_npc_cb1_static.cpp index 5a250ce41..e2efed2d1 100644 --- a/src/d/d_a_npc_cb1_static.cpp +++ b/src/d/d_a_npc_cb1_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_npc_cb1_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_cb1.h" #include "dolphin/types.h" @@ -15,4 +16,3 @@ u16 daNpc_Cb1_c::m_status; s16 daNpc_Cb1_c::getMaxFlyingTimer() { return 15*30; } - diff --git a/src/d/d_a_npc_mk_static.cpp b/src/d/d_a_npc_mk_static.cpp index a3d0df9c1..2a62f05b6 100644 --- a/src/d/d_a_npc_mk_static.cpp +++ b/src/d/d_a_npc_mk_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_npc_mk_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_mk_static.h" #include "dolphin/types.h" diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index c2de23568..a9031bd79 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_a_obj.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_a_obj_tribox_static.cpp b/src/d/d_a_obj_tribox_static.cpp index cf3be139f..905284f7b 100644 --- a/src/d/d_a_obj_tribox_static.cpp +++ b/src/d/d_a_obj_tribox_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_obj_tribox_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tribox.h" cXyz daObjTribox::Act_c::M_sound_pos; diff --git a/src/d/d_a_race_item_static.cpp b/src/d/d_a_race_item_static.cpp index 79989b36f..0c5f30cb8 100644 --- a/src/d/d_a_race_item_static.cpp +++ b/src/d/d_a_race_item_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_race_item_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_race_item.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" diff --git a/src/d/d_a_ship_static.cpp b/src/d/d_a_ship_static.cpp index 3dcbcdc6d..d594d4aab 100644 --- a/src/d/d_a_ship_static.cpp +++ b/src/d/d_a_ship_static.cpp @@ -3,6 +3,7 @@ * King of Red Lions - Static */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_ship.h" /* 80067D94-80067E78 .text initStartPos__8daShip_cFPC4cXyzs */ diff --git a/src/d/d_a_shop_item_static.cpp b/src/d/d_a_shop_item_static.cpp index fe2d81589..a95109e37 100644 --- a/src/d/d_a_shop_item_static.cpp +++ b/src/d/d_a_shop_item_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_a_shop_item_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_shop_item.h" #include "d/d_item_data.h" @@ -549,4 +550,3 @@ cXyz daShopItem_c::getCenter() { cXyz ret(0.0f, height / 2.0f, 0.0f); return ret; } - diff --git a/src/d/d_att_dist.cpp b/src/d/d_att_dist.cpp index d4209e677..fd68c8348 100644 --- a/src/d/d_att_dist.cpp +++ b/src/d/d_att_dist.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_att_dist.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_attention.h" dAttention_c::DistTbl dAttention_c::dist_table[] = { diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 354d98fb0..fd565b20d 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_attention.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_attention.h" #include "d/d_procname.h" #include "d/actor/d_a_player_main.h" diff --git a/src/d/d_auction_screen.cpp b/src/d/d_auction_screen.cpp index 39de94fa5..ebd25942d 100644 --- a/src/d/d_auction_screen.cpp +++ b/src/d/d_auction_screen.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_auction_screen.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_auction_screen.h" #include "f_op/f_op_msg.h" diff --git a/src/d/d_boss_magma.cpp b/src/d/d_boss_magma.cpp index 05d420e67..489af6716 100644 --- a/src/d/d_boss_magma.cpp +++ b/src/d/d_boss_magma.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_boss_magma.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_magma.h" #include "dolphin/types.h" @@ -30,4 +31,3 @@ void dMagma_ballBoss_c::setup(f32, u8, int) { dMagma_ballBoss_c::~dMagma_ballBoss_c() { /* Nonmatching */ } - diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp index b3229efe8..077ea7388 100644 --- a/src/d/d_cam_param.cpp +++ b/src/d/d_cam_param.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_cam_param.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cam_param.h" #include "d/d_kankyo_wether.h" #include "m_Do/m_Do_mtx.h" diff --git a/src/d/d_cam_style.cpp b/src/d/d_cam_style.cpp index d7ccc514b..6c22b0d9c 100644 --- a/src/d/d_cam_style.cpp +++ b/src/d/d_cam_style.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_cam_style.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cam_param.h" #include "global.h" diff --git a/src/d/d_cam_type.cpp b/src/d/d_cam_type.cpp index 377b493f0..f839b494d 100644 --- a/src/d/d_cam_type.cpp +++ b/src/d/d_cam_type.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_cam_type.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_camera.h" const dCamera__Type dCamera_c::types[] = { diff --git a/src/d/d_cam_type2.cpp b/src/d/d_cam_type2.cpp index 104f863c3..398966d9e 100644 --- a/src/d/d_cam_type2.cpp +++ b/src/d/d_cam_type2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_cam_type2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_camera.h" const char* dCamera_c::mvBGTypes[35] = { diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index a715592a5..d11442ce8 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_camera.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_camera.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_bg_s_lin_chk.h" @@ -30,10 +31,6 @@ #include "d/actor/d_a_tsubo.h" #include "d/actor/d_a_npc_cb1.h" - -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - namespace { static f32 limitf(f32 value, f32 min, f32 max) { if (value > max) { @@ -249,9 +246,9 @@ void dCamera_c::initialize(camera_class* camera, fopAc_ac_c* playerActor, u32 ca mTrimSize = 0; mTrimTypeForce = -1; - dStage_stageDt_c* stage_dt = &dComIfGp_getStage(); + dStage_dt_c* stage_dt = &dComIfGp_getStage(); if (stage_dt != NULL) { - stage_stag_info_class* stag_info = stage_dt->getStagInfo(); + stage_stag_info_class* stag_info = stage_dt->getStagInfo(); if (stag_info && stag_info->mCameraMapToolID != -1) { // Bug, comparing unsigned value with -1 mapToolType = GetCameraTypeFromMapToolID(stag_info->mCameraMapToolID, -1); if (mapToolType != 0xFF && Chtyp(mapToolType)) { @@ -1513,7 +1510,7 @@ bool dCamera_c::onStyleChange(s32 i_style1, s32 i_style2) { /* 80164F5C-8016513C .text GetCameraTypeFromMapToolID__9dCamera_cFll */ int dCamera_c::GetCameraTypeFromMapToolID(s32 r27, s32 i_roomNo) { - dStage_stageDt_c& stage_dt = *(dStage_stageDt_c*)&dComIfGp_getStage(); + dStage_dt_c& stage_dt = *(dStage_dt_c*)&dComIfGp_getStage(); int cam_type_num; int arrowIdx; @@ -4636,7 +4633,7 @@ void store(camera_process_class* i_this) { int camera_id = get_camera_id(a_this); - dStage_stageDt_c* stage = &dComIfGp_getStage(); + dStage_dt_c* stage = &dComIfGp_getStage(); cXyz oldCenter = *fopCamM_GetCenter_p(a_this); cXyz oldEye = *fopCamM_GetEye_p(a_this); @@ -4837,7 +4834,7 @@ cPhs_State init_phase2(camera_class* i_this) { float farPlane = 160000.0f; if (dComIfGp_getStage().getStagInfo() != NULL) { - dStage_stageDt_c* stage_dt = &dComIfGp_getStage(); + dStage_dt_c* stage_dt = &dComIfGp_getStage(); stage_dt->getStagInfo(); farPlane = stage_dt->getStagInfo()->mFarPlane; diff --git a/src/d/d_chain.cpp b/src/d/d_chain.cpp index 7bccdc5a4..126662930 100644 --- a/src/d/d_chain.cpp +++ b/src/d/d_chain.cpp @@ -3,13 +3,12 @@ // Translation Unit: d_chain.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_chain.h" #include "d/d_a_obj.h" #include "d/d_s_play.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep - #include "assets/l_chainS3TCTEX__d_chain.h" const u16 l_chainS3TCTEX__width = 32; const u16 l_chainS3TCTEX__height = 32; diff --git a/src/d/d_cloth_packet.cpp b/src/d/d_cloth_packet.cpp index 682859d36..ecc4a4054 100644 --- a/src/d/d_cloth_packet.cpp +++ b/src/d/d_cloth_packet.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_cloth_packet.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cloth_packet.h" /* 80062D5C-800630B0 .text __ct__15dCloth_packet_cFP7ResTIMGiiffP12dKy_tevstr_cPP4cXyz */ diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 0ce78705e..8009479c4 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -3,6 +3,7 @@ * Game - Shared Runtime Data ("Common Info Game") */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_com_inf_game.h" #include "JSystem/JUtility/JUTAssert.h" #include "string.h" diff --git a/src/d/d_com_lib_game.cpp b/src/d/d_com_lib_game.cpp index a663262dd..2c5b7dde5 100644 --- a/src/d/d_com_lib_game.cpp +++ b/src/d/d_com_lib_game.cpp @@ -3,6 +3,7 @@ * Game - Shared Library ("Common Library Game") */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_com_lib_game.h" #include "SSystem/SComponent/c_phase.h" diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 3aade6f89..0b1893073 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_com_static.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "dolphin/types.h" #include "d/d_com_inf_game.h" #include "d/d_salvage.h" @@ -39,8 +40,6 @@ #include "d/actor/d_a_npc_bs1.h" #include "SSystem/SComponent/c_counter.h" -#include "weak_bss_3569.h" // IWYU pragma: keep - s32 daLodbg_c::sObjectCount; JKRExpHeap* daLodbg_c::sLocalHeap; diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 4df413e59..e78c12233 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_demo.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_demo.h" #include "f_op/f_op_camera.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_detect.cpp b/src/d/d_detect.cpp index af605c484..f8723a30e 100644 --- a/src/d/d_detect.cpp +++ b/src/d/d_detect.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_detect.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_detect.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp index d402ccc53..59f777c06 100644 --- a/src/d/d_door.cpp +++ b/src/d/d_door.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_door.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_door.h" #include "d/d_com_inf_game.h" #include "d/d_vibration.h" diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index bd1955a95..7dce6cc98 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_drawlist.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_drawlist.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" @@ -18,9 +19,6 @@ #include "SSystem/SComponent/c_bg_s_shdw_draw.h" #include "global.h" -#include "weak_bss_3569.h" // IWYU pragma: keep -#include "weak_data_2100_2080.h" // IWYU pragma: keep - GXTexObj dDlst_shadowControl_c::mSimpleTexObj; /* 800804A4-800804C0 .text setViewPort__14dDlst_window_cFffffff */ diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index c9da779ab..1028727d4 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_envse.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_envse.h" #include "d/d_priority.h" #include "f_op/f_op_kankyo.h" diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 990f53a35..0f8092cd1 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_ev_camera.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_camera.h" #include "dolphin/types.h" diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 46526dc1c..042dd0635 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_event.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index d6c8b9021..855a068de 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_event_data.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event_data.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index e9b38721c..deeb4b8c4 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_event_manager.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event_manager.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/d_file_error.cpp b/src/d/d_file_error.cpp index 58701918a..ffd4e16bf 100644 --- a/src/d/d_file_error.cpp +++ b/src/d/d_file_error.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_file_error.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_file_error.h" #include "dolphin/types.h" diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 73f77692b..315a3ed12 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_file_select.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_file_select.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" @@ -15,8 +16,6 @@ #include "m_Do/m_Do_controller_pad.h" #include -#include "weak_data_2100_2080.h" // IWYU pragma: keep - dFs_HIO_c g_fsHIO; /* 8017F8B0-8017FA20 .text __ct__9dFs_HIO_cFv */ diff --git a/src/d/d_flower.cpp b/src/d/d_flower.cpp index 7aab25379..a8d21f14e 100644 --- a/src/d/d_flower.cpp +++ b/src/d/d_flower.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_flower.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_flower.h" #include "dolphin/types.h" diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index b1ee77cfb..d0262a1d3 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_gameover.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_gameover.h" #include "d/d_meter.h" #include "d/d_procname.h" @@ -12,7 +13,6 @@ #include "m_Do/m_Do_Reset.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" - /* 8018E1CC-8018E4B4 .text draw__24dDlst_Gameover_CAPTURE_cFv */ void dDlst_Gameover_CAPTURE_c::draw() { GXTexObj texObj; diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp index 2c7befe74..78f8ef0fd 100644 --- a/src/d/d_grass.cpp +++ b/src/d/d_grass.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_grass.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_grass.h" #include "f_op/f_op_overlap_mng.h" #include "d/d_bg_s_gnd_chk.h" @@ -17,8 +18,6 @@ #include "SSystem/SComponent/c_counter.h" #include "dolphin/gf/GF.h" -#include "weak_data_1811.h" // IWYU pragma: keep - #include "assets/l_K_kusa_00TEX.h" const u32 l_K_kusa_00TEX__width = 64; const u32 l_K_kusa_00TEX__height = 128; diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 995ea7744..81048c41e 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_item.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_item.h" #include "dolphin/types.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index ddf58504e..caad1681e 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_item_data.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_item_data.h" #include "d/d_particle_name.h" #include "JSystem/JUtility/JUTAssert.h" @@ -114,8 +115,6 @@ #include "d/res/res_vtin5.h" #include "d/res/res_vbeso.h" -#include "weak_data_1811.h" // IWYU pragma: keep - /* 80383F20-803840E0 .data item_arcname_tbl__10dItem_data */ char* dItem_data::item_arcname_tbl[0x70] = { "Always", diff --git a/src/d/d_jnt_hit.cpp b/src/d/d_jnt_hit.cpp index 34c0eb440..e43bb0d36 100644 --- a/src/d/d_jnt_hit.cpp +++ b/src/d/d_jnt_hit.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_jnt_hit.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_jnt_hit.h" #include "m_Do/m_Do_mtx.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index aaca7e9f0..29f02fc12 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_kankyo.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kankyo.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_com_inf_game.h" @@ -23,8 +24,6 @@ #include "m_Do/m_Do_printf.h" #include "math.h" -#include "weak_data_2100_2080.h" // IWYU pragma: keep - #include "d/d_kankyo_dayproc.inc" struct dKy_setLight__Status { diff --git a/src/d/d_kankyo_data.cpp b/src/d/d_kankyo_data.cpp index 6107f5fdd..01911217d 100644 --- a/src/d/d_kankyo_data.cpp +++ b/src/d/d_kankyo_data.cpp @@ -3,6 +3,7 @@ * Environment Data */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kankyo_data.h" #include "d/d_stage.h" diff --git a/src/d/d_kankyo_demo.cpp b/src/d/d_kankyo_demo.cpp index 9caf5c5d2..c24638777 100644 --- a/src/d/d_kankyo_demo.cpp +++ b/src/d/d_kankyo_demo.cpp @@ -3,6 +3,7 @@ * */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kankyo.h" #include "d/d_kankyo_demo.h" diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 3bc65a38c..0c050b1d5 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_kankyo_rain.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kankyo_rain.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_bg_s_roof_chk.h" diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index ba5e6973f..e95bc2706 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_kankyo_wether.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kankyo_wether.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index fde1a55d2..63e54c502 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_ky_thunder.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ky_thunder.h" #include "d/d_priority.h" #include "f_op/f_op_kankyo.h" diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index e7e74b474..fe9ed9bb1 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_kyeff.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kyeff.h" #include "d/d_priority.h" #include "f_op/f_op_kankyo.h" diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index 5b715d189..1ac112f3d 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_kyeff2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kyeff2.h" #include "d/d_priority.h" #include "f_op/f_op_kankyo.h" diff --git a/src/d/d_letter.cpp b/src/d/d_letter.cpp index ca4b8b911..f1eb92e91 100644 --- a/src/d/d_letter.cpp +++ b/src/d/d_letter.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_letter.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_letter.h" #include "d/d_com_inf_game.h" @@ -64,4 +65,3 @@ void dLetter_autoStock(u16 idx) { bool dLetter_isDelivery(u16 idx) { return !dLetter_isNoSend(idx); } - diff --git a/src/d/d_level_se.cpp b/src/d/d_level_se.cpp index fbca11947..ad37473e4 100644 --- a/src/d/d_level_se.cpp +++ b/src/d/d_level_se.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_level_se.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_level_se.h" #include "d/d_priority.h" #include "f_op/f_op_kankyo.h" diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index c0352515b..8327635ad 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_lib.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_lib.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" diff --git a/src/d/d_magma.cpp b/src/d/d_magma.cpp index e438be274..b5615f044 100644 --- a/src/d/d_magma.cpp +++ b/src/d/d_magma.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_magma.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_magma.h" #include "d/d_com_inf_game.h" #include "d/d_path.h" @@ -12,9 +13,6 @@ // #pragma sym on -#include "weak_bss_3569.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - Mtx l_kuroOrthoMtx; Mtx l_colOrthoMtx; GXTexObj dMagma_packet_c::mKuroTexObj; diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index 23045f57a..a8ba16026 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_map.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_map.h" #include "d/d_com_inf_game.h" #include "d/d_stage.h" diff --git a/src/d/d_material.cpp b/src/d/d_material.cpp index 41cfe4ba1..af9092d05 100644 --- a/src/d/d_material.cpp +++ b/src/d/d_material.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_material.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_material.h" #include "d/d_com_inf_game.h" #include "JSystem/JKernel/JKRSolidHeap.h" diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp index e5ada460e..96e645be6 100644 --- a/src/d/d_menu_cloth.cpp +++ b/src/d/d_menu_cloth.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_menu_cloth.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_cloth.h" /* 8019940C-8019966C .text __ct__13daCLOTH_HIO_cFv */ diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index bf5f31bc7..f920598b8 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -3,14 +3,12 @@ // Translation Unit: d_menu_collect.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_collect.h" #include "dolphin/types.h" #include "stdio.h" #include "d/d_com_inf_game.h" -#include "weak_bss_936_to_1036.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - static dMc_HIO_c g_mcHIO; /* 8019BE8C-8019BF14 .text __ct__9dMc_HIO_cFv */ diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index ecf496812..bb6d4029a 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_menu_dmap.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_dmap.h" #include "d/d_stage.h" diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index df6960424..19790c552 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_menu_fmap.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_fmap.h" /* 801AF4F0-801AF848 .text __ct__9dMf_HIO_cFv */ diff --git a/src/d/d_menu_fmap2.cpp b/src/d/d_menu_fmap2.cpp index 8a26d8185..56b1e5a07 100644 --- a/src/d/d_menu_fmap2.cpp +++ b/src/d/d_menu_fmap2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_menu_fmap2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_fmap2.h" /* 801BB3E4-801BB5B8 .text __ct__10dMf2_HIO_cFv */ diff --git a/src/d/d_menu_item.cpp b/src/d/d_menu_item.cpp index aee0b91aa..9f79d1278 100644 --- a/src/d/d_menu_item.cpp +++ b/src/d/d_menu_item.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_menu_item.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_item.h" /* 801C7B4C-801C7C7C .text __ct__9dMi_HIO_cFv */ diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index c1747fcca..32766f697 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_menu_option.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_option.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JUtility/JUTAssert.h" diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 33d3e45e1..28428222a 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_menu_save.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_save.h" #include "dolphin/types.h" diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index e4ed9d284..8a6d88db6 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_menu_window.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_window.h" #include "f_op/f_op_msg.h" diff --git a/src/d/d_mesg.cpp b/src/d/d_mesg.cpp index 28e4f3459..089701e11 100644 --- a/src/d/d_mesg.cpp +++ b/src/d/d_mesg.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_mesg.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_mesg.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPicture.h" diff --git a/src/d/d_message.cpp b/src/d/d_message.cpp index d068a2e75..923f3d4f4 100644 --- a/src/d/d_message.cpp +++ b/src/d/d_message.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_message.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_message.h" #include "f_op/f_op_msg.h" diff --git a/src/d/d_message_paper.cpp b/src/d/d_message_paper.cpp index f47a5d149..8dd735061 100644 --- a/src/d/d_message_paper.cpp +++ b/src/d/d_message_paper.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_message_paper.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_message_paper.h" #include "f_op/f_op_msg.h" diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index a157f6554..5fc866cc4 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_meter.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -15,8 +16,6 @@ #include "d/d_timer.h" #include "stdio.h" -#include "weak_bss_3569.h" // IWYU pragma: keep - dMeter_info_c dMeter_Info; fopMsgM_pane_class item_parts; dMeter_map_HIO_c g_meter_mapHIO; diff --git a/src/d/d_metronome.cpp b/src/d/d_metronome.cpp index 6e96f1d3d..f00fc6cfb 100644 --- a/src/d/d_metronome.cpp +++ b/src/d/d_metronome.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_metronome.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_metronome.h" #include "d/actor/d_a_player_main.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_minigame_starter.cpp b/src/d/d_minigame_starter.cpp index 48bc384f0..9b212c157 100644 --- a/src/d/d_minigame_starter.cpp +++ b/src/d/d_minigame_starter.cpp @@ -3,6 +3,7 @@ * Boating Course - "3-2-1 GO!" text */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_minigame_starter.h" #include "f_op/f_op_msg.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/d_minigame_terminater.cpp b/src/d/d_minigame_terminater.cpp index 0f1d92ec7..38d4b23b0 100644 --- a/src/d/d_minigame_terminater.cpp +++ b/src/d/d_minigame_terminater.cpp @@ -3,6 +3,7 @@ * Boating Course - Completion text */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_minigame_terminater.h" #include "f_op/f_op_msg.h" diff --git a/src/d/d_msg.cpp b/src/d/d_msg.cpp index 7beeeabb7..f2893bd02 100644 --- a/src/d/d_msg.cpp +++ b/src/d/d_msg.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_msg.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg.h" #include "dolphin/types.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 38131e2bf..18916bac5 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_name.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_name.h" #include "dolphin/types.h" diff --git a/src/d/d_npc.cpp b/src/d/d_npc.cpp index 7f0436b5a..1f1bcd411 100644 --- a/src/d/d_npc.cpp +++ b/src/d/d_npc.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_npc.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_npc.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -12,8 +13,6 @@ #include "m_Do/m_Do_mtx.h" #include "d/d_item_data.h" -#include "weak_data_1811.h" // IWYU pragma: keep - /* 8021A7B4-8021A858 .text angCalcS__14dNpc_JntCtrl_cFPssss */ bool dNpc_JntCtrl_c::angCalcS(s16* out, s16 targetY, s16 speed, s16 maxVel) { s16 diff = *out - targetY; diff --git a/src/d/d_operate_wind.cpp b/src/d/d_operate_wind.cpp index fc60b5c3a..adfa770aa 100644 --- a/src/d/d_operate_wind.cpp +++ b/src/d/d_operate_wind.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_operate_wind.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_operate_wind.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index 5d5043a5e..da90b7b59 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_ovlp_fade.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ovlp_fade.h" #include "d/d_priority.h" #include "f_op/f_op_overlap.h" diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index b37525bd1..9795569bf 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_ovlp_fade2.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ovlp_fade2.h" #include "d/d_com_inf_game.h" #include "d/d_priority.h" diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index a1c723c7a..7c956006f 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_ovlp_fade3.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_drawlist.h" #include "m_Do/m_Do_graphic.h" #include "dolphin/gx/GX.h" @@ -14,4 +15,3 @@ void dDlst_snapShot_c::draw() { GXCopyTex(mDoGph_gInf_c::getFrameBufferTex(), GX_FALSE); GXPixModeSync(); } - diff --git a/src/d/d_ovlp_fade4.cpp b/src/d/d_ovlp_fade4.cpp index 3700cb3e3..e73d43f8b 100644 --- a/src/d/d_ovlp_fade4.cpp +++ b/src/d/d_ovlp_fade4.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_ovlp_fade4.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ovlp_fade4.h" #include "d/d_com_inf_game.h" #include "d/d_priority.h" diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index f920c07f7..a0fe70bdf 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_particle.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_particle.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" #include "JSystem/JParticle/JPAEmitter.h" @@ -23,9 +24,6 @@ #include "m_Do/m_Do_lib.h" #include "stdio.h" -#include "weak_bss_3569.h" // IWYU pragma: keep -#include "weak_data_1811.h" // IWYU pragma: keep - /* 8007A4D8-8007A514 .text __ct__18dPa_modelEmitter_cFv */ dPa_modelEmitter_c::dPa_modelEmitter_c() { cNd_ForcedClear(this); diff --git a/src/d/d_particle_name.cpp b/src/d/d_particle_name.cpp index 1ea2e4b60..de599fec1 100644 --- a/src/d/d_particle_name.cpp +++ b/src/d/d_particle_name.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_particle_name.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_particle_name.h" namespace dPa_name { diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp index fd92df6db..7c6c905ed 100644 --- a/src/d/d_path.cpp +++ b/src/d/d_path.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_path.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_path.h" #include "d/d_com_inf_game.h" #include "JSystem/JUtility/JUTAssert.h" diff --git a/src/d/d_picture_box.cpp b/src/d/d_picture_box.cpp index a66431594..f431d12e9 100644 --- a/src/d/d_picture_box.cpp +++ b/src/d/d_picture_box.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_picture_box.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_picture_box.h" #include "f_op/f_op_msg.h" diff --git a/src/d/d_place_name.cpp b/src/d/d_place_name.cpp index 0188b4bbb..9d9790fad 100644 --- a/src/d/d_place_name.cpp +++ b/src/d/d_place_name.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_place_name.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_place_name.h" #include "d/d_priority.h" #include "f_op/f_op_msg.h" diff --git a/src/d/d_point_wind.cpp b/src/d/d_point_wind.cpp index b9f930356..951de2f01 100644 --- a/src/d/d_point_wind.cpp +++ b/src/d/d_point_wind.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_point_wind.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_point_wind.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" @@ -57,4 +58,3 @@ void dPointWind_c::set_pwind_move() { void dPointWind_c::set_pwind_delete() { dKyw_pntwind_cut(&mWind); } - diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 846b9687f..1c9983296 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_resorce.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_resorce.h" #include "JSystem/JKernel/JKRMemArchive.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_s_actor_data_mng.cpp b/src/d/d_s_actor_data_mng.cpp index 74c999936..d8a34d698 100644 --- a/src/d/d_s_actor_data_mng.cpp +++ b/src/d/d_s_actor_data_mng.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_s_actor_data_mng.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_actor_data_mng.h" #include "JSystem/JUtility/JUTAssert.h" diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index c8ce9eec8..cf8910f94 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_s_logo.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_logo.h" #include "d/res/res_logo.h" #include "d/res/res_system.h" diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 82efefa59..6c5e2f6c1 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -3,6 +3,7 @@ * Debug Map Select menu */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_menu.h" #include "JSystem/JFramework/JFWDisplay.h" #include "JSystem/JFramework/JFWSystem.h" diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 26d4f1f19..ff0f9a316 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_s_name.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_name.h" #include "d/d_com_inf_game.h" #include "d/d_com_lib_game.h" @@ -32,8 +33,6 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include "weak_data_1811.h" // IWYU pragma: keep - dSn_HIO_c g_snHIO; /* 8022F86C-8022F8F0 .text __ct__9dSn_HIO_cFv */ diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp index d030b42b6..09a756247 100644 --- a/src/d/d_s_open.cpp +++ b/src/d/d_s_open.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_s_open.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_open.h" #include "f_op/f_op_scene.h" #include "f_op/f_op_draw_iter.h" diff --git a/src/d/d_s_open_sub.cpp b/src/d/d_s_open_sub.cpp index fc05d3b59..77debb266 100644 --- a/src/d/d_s_open_sub.cpp +++ b/src/d/d_s_open_sub.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_s_open_sub.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DPane.h" #include "d/d_s_open.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index e7c953c76..58e4400ed 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_s_play.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_play.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTAssert.h" @@ -40,8 +41,6 @@ #include "m_Do/m_Do_machine.h" #include -#include "weak_bss_3569.h" // IWYU pragma: keep - static const int PRELOAD_RES_MAX = 0x23; static const int PRELOAD_DYL_MAX = 0x1B; diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 2e40350fa..74b3d523f 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_s_room.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_room.h" #include "f_op/f_op_scene.h" #include "f_op/f_op_scene_mng.h" @@ -190,7 +191,7 @@ cPhs_State phase_2(room_of_scene_class* i_this) { } i_this->mpRoomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo); - i_this->mpRoomDt->mRoomNo = roomNo; + i_this->mpRoomDt->setRoomNo(roomNo); i_this->mpRoomData = dComIfG_getStageRes(arcName, "room.dzr"); if (i_this->mpRoomData != NULL) { diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 951689bc4..65ef5ef62 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_s_title.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JAudio/JAIBankWave.h" #include "f_op/f_op_scene.h" #include "f_op/f_op_draw_iter.h" diff --git a/src/d/d_salvage.cpp b/src/d/d_salvage.cpp index e8d78d045..022bd6199 100644 --- a/src/d/d_salvage.cpp +++ b/src/d/d_salvage.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_salvage.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_salvage.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_salvage.h" diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 612fd4bb8..8ca7fb311 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_save.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_save.h" #include "d/d_save_init.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_save_init.cpp b/src/d/d_save_init.cpp index 8ec34892f..679c7fd5f 100644 --- a/src/d/d_save_init.cpp +++ b/src/d/d_save_init.cpp @@ -3,6 +3,7 @@ * */ +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_save_init.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_npc_kg1.h" diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 74e43e35f..6b0a39f49 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_scope.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_scope.h" #include "f_op/f_op_msg.h" diff --git a/src/d/d_seafightgame.cpp b/src/d/d_seafightgame.cpp index a3127abf1..ce13ca2ca 100644 --- a/src/d/d_seafightgame.cpp +++ b/src/d/d_seafightgame.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_seafightgame.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_seafightgame.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp index dd6beb05b..600e04c15 100644 --- a/src/d/d_shop.cpp +++ b/src/d/d_shop.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_shop.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_shop.h" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_msg.h" diff --git a/src/d/d_snap.cpp b/src/d/d_snap.cpp index 9afd19d98..9bb79342e 100644 --- a/src/d/d_snap.cpp +++ b/src/d/d_snap.cpp @@ -11,10 +11,7 @@ #include "m_Do/m_Do_lib.h" #include "JSystem/JUtility/JUTAssert.h" -// Needed for the .rodata section to match. -static const f32 dummy_2080[3] = {1.0f, 1.0f, 1.0f}; -static const f32 dummy_2100[3] = {1.0f, 1.0f, 1.0f}; -static const f32 dummy_3599[3] = {0.0f, 0.0f, 0.0f}; +#include "weak_bss_3569.h" // IWYU pragma: keep int (dSnap_packet::*dSnap_packet::m_judge_tbl[])() = { NULL, diff --git a/src/d/d_spline_path.cpp b/src/d/d_spline_path.cpp index 939e4282a..16137a416 100644 --- a/src/d/d_spline_path.cpp +++ b/src/d/d_spline_path.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_spline_path.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_spline_path.h" #include "SSystem/SComponent/c_xyz.h" diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index b228b4eba..fe5e54753 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_stage.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_stage.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTAssert.h" @@ -22,8 +23,6 @@ #include "m_Do/m_Do_mtx.h" #include "d/actor/d_a_sea.h" -#include "weak_bss_3569.h" // IWYU pragma: keep - /* 80040900-80040938 .text set__18dStage_nextStage_cFPCcScsScSc */ void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe) { if (!mEnable) { diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index 8c63da1b1..bb65b3a8d 100644 --- a/src/d/d_throwstone.cpp +++ b/src/d/d_throwstone.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_throwstone.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_throwstone.h" #include "d/res/res_aisi.h" #include "f_op/f_op_actor.h" diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 6463c5721..15ebdb71e 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_timer.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_timer.h" #include "d/d_com_inf_game.h" #include "d/d_meter.h" diff --git a/src/d/d_tree.cpp b/src/d/d_tree.cpp index d5d77414e..021382941 100644 --- a/src/d/d_tree.cpp +++ b/src/d/d_tree.cpp @@ -3,10 +3,10 @@ // Translation Unit: d_tree.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_tree.h" #include "dolphin/types.h" -#include "weak_data_1811.h" // IWYU pragma: keep #include "assets/l_Txa_swood_aTEX.h" const u16 l_Txa_swood_aTEX__width = 64; diff --git a/src/d/d_vib_pattern.cpp b/src/d/d_vib_pattern.cpp index 304360296..a78261a1e 100644 --- a/src/d/d_vib_pattern.cpp +++ b/src/d/d_vib_pattern.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_vib_pattern.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_vibration.h" /* Motor Shock (MS) predefined patterns */ diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index 13aea7119..1a743b6ff 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_vibration.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_vibration.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" diff --git a/src/d/d_water_mark.cpp b/src/d/d_water_mark.cpp index 9db0269b6..17f09daac 100644 --- a/src/d/d_water_mark.cpp +++ b/src/d/d_water_mark.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_water_mark.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_water_mark.h" #include "f_op/f_op_kankyo.h" diff --git a/src/d/d_wind_arrow.cpp b/src/d/d_wind_arrow.cpp index 9d7c6dc2f..d83f2ff9c 100644 --- a/src/d/d_wind_arrow.cpp +++ b/src/d/d_wind_arrow.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_wind_arrow.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_wind_arrow.h" #include "d/d_kankyo_wether.h" #include "d/d_priority.h" diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp index e90a93b75..675597854 100644 --- a/src/d/d_wood.cpp +++ b/src/d/d_wood.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_wood.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_wood.h" #include "JAZelAudio/JAIZelBasic.h" #include "JSystem/JUtility/JUTAssert.h" @@ -22,8 +23,6 @@ #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_mtx.h" -#include "weak_data_1811.h" // IWYU pragma: keep - //----------------------------------------- // Types //----------------------------------------- diff --git a/src/d/d_wpillar.cpp b/src/d/d_wpillar.cpp index f59226211..3d8dd1520 100644 --- a/src/d/d_wpillar.cpp +++ b/src/d/d_wpillar.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_wpillar.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_wpillar.h" #include "f_op/f_op_kankyo.h" diff --git a/src/d/d_wpot_water.cpp b/src/d/d_wpot_water.cpp index 3cb0b76a1..5a099e83f 100644 --- a/src/d/d_wpot_water.cpp +++ b/src/d/d_wpot_water.cpp @@ -3,6 +3,7 @@ // Translation Unit: d_wpot_water.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_wpot_water.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_com_inf_game.h" diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index c114bc4a7..d0747787b 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -3,6 +3,7 @@ // Translation Unit: f_op_actor_mng.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "f_op/f_op_actor_mng.h" #include "d/actor/d_a_npc_fa1.h" #include "f_op/f_op_actor.h" @@ -28,8 +29,6 @@ #include "JSystem/JUtility/JUTAssert.h" #include "SSystem/SComponent/c_malloc.h" -#include "weak_bss_3569.h" // IWYU pragma: keep - #define MAKE_ITEM_PARAMS(itemNo, itemBitNo, switchNo2, type, action) \ ((itemNo & 0xFF) << 0 | (itemBitNo & 0xFF) << 8 | (switchNo2 & 0xFF) << 16 | (type & 0x3) << 24 | (action & 0x3F) << 26) diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 7e6f1852b..97632c0f2 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -3,6 +3,7 @@ // Translation Unit: f_op_msg_mng.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "f_op/f_op_msg_mng.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JUtility/JUTDataHeader.h" @@ -26,8 +27,6 @@ #include "m_Do/m_Do_controller_pad.h" #include -#include "global.h" - STControl stick; fpc_ProcID i_msgID = fpcM_ERROR_PROCESS_ID_e; 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" diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index c51fb1109..9625099ef 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -3,6 +3,7 @@ // Translation Unit: m_Do_audio.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "m_Do/m_Do_audio.h" #include "JSystem/JAudio/JAIGlobalParameter.h" #include "JSystem/JAudio/JAISequenceMgr.h" @@ -18,8 +19,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_printf.h" -#include "weak_bss_3569.h" // IWYU pragma: keep - JAIZelInst mDoAud_zelAudio_c::mTact; mDoAud_zelAudio_c g_mDoAud_zelAudio; diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 89b1818ad..5178a6d1f 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -3,6 +3,7 @@ // Translation Unit: m_Do_ext.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "m_Do/m_Do_ext.h" #include "JSystem/J3DGraphBase/J3DTransform.h" #include "JSystem/JKernel/JKRArchive.h" @@ -128,7 +129,6 @@ void mDoExt_bpkAnm::entry(J3DModelData* i_modelData, f32 param_1) { /* 8000E014-8000E2A8 .text init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifssbi */ int mDoExt_bpkAnm::init(J3DMaterialTable* i_matTable, J3DAnmColor* i_bpk, BOOL i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify, BOOL i_entry) { - JUT_ASSERT(531, i_modify || isCurrentSolidHeap()); JUT_ASSERT(533, i_matTable != NULL && i_bpk != NULL); mpAnm = i_bpk; diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index e71c579a7..9d5964e0f 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -3,6 +3,7 @@ // Translation Unit: m_Do_graphic.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "m_Do/m_Do_graphic.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" @@ -32,10 +33,6 @@ #include "JSystem/JUtility/JUTXfb.h" #include "dolphin/base/PPCArch.h" -#if VERSION == VERSION_DEMO -#include "weak_data_2100_2080.h" // IWYU pragma: keep -#endif - JUTFader * mDoGph_gInf_c::mFader; ResTIMG * mDoGph_gInf_c::mFrameBufferTimg; GXTexObj mDoGph_gInf_c::mFrameBufferTexObj; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 94e12424c..ed26301b5 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -3,6 +3,7 @@ * Main Initialization */ +#include "d/dolzel.h" // IWYU pragma: keep #include "m_Do/m_Do_main.h" #include "DynamicLink.h" #include "JSystem/JFramework/JFWSystem.h" @@ -27,8 +28,6 @@ #include "m_Do/m_Do_printf.h" #include -#include "weak_data_2100_2080.h" // IWYU pragma: keep - /* 800056E0-80005748 .text version_check__Fv */ void version_check() { if (strcmp("05Sep2002", "05Sep2002") == 0 && strcmp("", "") == 0) { diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index bc2bc98e5..bc6f3e843 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -3,14 +3,13 @@ // Translation Unit: m_Do_mtx.cpp // +#include "d/dolzel.h" // IWYU pragma: keep #include "m_Do/m_Do_mtx.h" #include "dolphin/mtx/mtx.h" #include "JSystem/JUtility/JUTAssert.h" #include "SSystem/SComponent/c_m3d.h" #include "SSystem/SComponent/c_math.h" -#include "weak_bss_3569.h" // IWYU pragma: keep - Mtx mDoMtx_stack_c::now; Mtx mDoMtx_stack_c::buffer[16]; diff --git a/tools/project.py b/tools/project.py index e3f7a393f..2d00df463 100644 --- a/tools/project.py +++ b/tools/project.py @@ -45,6 +45,9 @@ if sys.platform == "cygwin": Library = Dict[str, Any] +PrecompiledHeader = Dict[str, Any] + + class Object: def __init__(self, completed: bool, name: str, **options: Any) -> None: self.name = name @@ -164,6 +167,7 @@ class ProjectConfig: self.asflags: Optional[List[str]] = None # Assembler flags self.ldflags: Optional[List[str]] = None # Linker flags self.libs: Optional[List[Library]] = None # List of libraries + self.precompiled_headers: Optional[List[PrecompiledHeader]] = None # List of precompiled headers self.linker_version: Optional[str] = None # mwld version self.version: Optional[str] = None # Version name self.warn_missing_config: bool = False # Warn on missing unit configuration @@ -298,7 +302,7 @@ def file_is_c(path: Path) -> bool: def file_is_cpp(path: Path) -> bool: - return path.suffix.lower() in (".cc", ".cp", ".cpp", ".cxx") + return path.suffix.lower() in (".cc", ".cp", ".cpp", ".cxx", ".pch++") def file_is_c_cpp(path: Path) -> bool: @@ -344,6 +348,16 @@ def make_flags_str(flags: Optional[List[str]]) -> str: return " ".join(flags) +def get_pch_out_name(config: ProjectConfig, pch: PrecompiledHeader) -> str: + pch_rel_path = Path(pch["source"]) + pch_out_name = pch_rel_path.with_suffix(".mch") + # Use absolute path as a workaround to allow this target to be matched with absolute paths in depfiles. + # + # Without this any object which includes the PCH would depend on the .mch filesystem entry but not the + # corresponding Ninja task, so the MCH would not be implicitly rebuilt when the PCH is modified. + return os.path.abspath(config.out_path() / "include" / pch_out_name) + + # Unit configuration class BuildConfigUnit(TypedDict): object: Optional[str] @@ -649,6 +663,14 @@ def generate_build_ninja( mwcc_sjis_cmd = f"{wrapper_cmd}{sjiswrap} {mwcc} $cflags -MMD -c $in -o $basedir" mwcc_sjis_implicit: List[Optional[Path]] = [*mwcc_implicit, sjiswrap] + # MWCC for precompiled headers + mwcc_pch_cmd = f"{wrapper_cmd}{mwcc} $cflags -MMD -c $in -o $basedir -precompile $basefilestem.mch" + mwcc_pch_implicit: List[Optional[Path]] = [*mwcc_implicit] + + # MWCC for precompiled headers with UTF-8 to Shift JIS wrapper + mwcc_pch_sjis_cmd = f"{wrapper_cmd}{sjiswrap} {mwcc} $cflags -MMD -c $in -o $basedir -precompile $basefilestem.mch" + mwcc_pch_sjis_implicit: List[Optional[Path]] = [*mwcc_implicit, sjiswrap] + # MWCC with extab post-processing mwcc_extab_cmd = f"{CHAIN}{mwcc_cmd} && {dtk} extab clean --padding \"$extab_padding\" $out $out" mwcc_extab_implicit: List[Optional[Path]] = [*mwcc_implicit, dtk] @@ -674,10 +696,14 @@ def generate_build_ninja( transform_dep = config.tools_dir / "transform_dep.py" mwcc_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" mwcc_sjis_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" + mwcc_pch_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" + mwcc_pch_sjis_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" mwcc_extab_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" mwcc_sjis_extab_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" mwcc_implicit.append(transform_dep) mwcc_sjis_implicit.append(transform_dep) + mwcc_pch_implicit.append(transform_dep) + mwcc_pch_sjis_implicit.append(transform_dep) mwcc_extab_implicit.append(transform_dep) mwcc_sjis_extab_implicit.append(transform_dep) @@ -749,6 +775,26 @@ def generate_build_ninja( ) n.newline() + n.comment("Build precompiled header") + n.rule( + name="mwcc_pch", + command=mwcc_pch_cmd, + description="PCH $out", + depfile="$basefile.d", + deps="gcc", + ) + n.newline() + + n.comment("Build precompiled header (with UTF-8 to Shift JIS wrapper)") + n.rule( + name="mwcc_pch_sjis", + command=mwcc_pch_sjis_cmd, + description="PCH $out", + depfile="$basefile.d", + deps="gcc", + ) + n.newline() + if len(config.custom_build_rules or {}) > 0: n.comment("Custom project build rules (pre/post-processing)") for rule in config.custom_build_rules or {}: @@ -766,7 +812,7 @@ def generate_build_ninja( ) n.newline() - def write_custom_step(step: str, prev_step: Optional[str] = None) -> None: + def write_custom_step(step: str, prev_step: Optional[str] = None, extra_inputs: Optional[List[str]] = None) -> None: implicit: List[Union[str, Path]] = [] if config.custom_build_steps and step in config.custom_build_steps: n.comment(f"Custom build steps ({step})") @@ -790,15 +836,18 @@ def generate_build_ninja( dyndep=custom_step.get("dyndep", None), ) n.newline() + n.build( outputs=step, rule="phony", inputs=implicit, order_only=prev_step, + implicit=extra_inputs, ) # Add all build steps needed before we compile (e.g. processing assets) - write_custom_step("pre-compile") + pch_out_names = [get_pch_out_name(config, pch) for pch in config.precompiled_headers or []] + write_custom_step("pre-compile", extra_inputs=pch_out_names) ### # Source files @@ -898,6 +947,38 @@ def generate_build_ninja( source_inputs: List[Path] = [] source_added: Set[Path] = set() + if config.precompiled_headers: + for pch in config.precompiled_headers: + src_path_rel_str = Path(pch["source"]) + src_path_rel = Path(src_path_rel_str) + pch_out_name = src_path_rel.with_suffix(".mch") + pch_out_abs_path = Path(get_pch_out_name(config, pch)) + # Add appropriate language flag if it doesn't exist already + cflags = pch["cflags"] + if not any(flag.startswith("-lang") for flag in cflags): + if file_is_cpp(src_path_rel): + cflags.insert(0, "-lang=c++") + else: + cflags.insert(0, "-lang=c") + + cflags_str = make_flags_str(cflags) + + n.comment(f"Precompiled header {pch_out_name}") + n.build( + outputs=pch_out_abs_path, + rule="mwcc_pch_sjis" if pch.get("shift_jis", config.shift_jis) else "mwcc_pch", + inputs=f"include/{src_path_rel_str}", + variables={ + "mw_version": Path(pch["mw_version"]), + "cflags": cflags_str, + "basedir": os.path.dirname(pch_out_abs_path), + "basefile": pch_out_abs_path.with_suffix(""), + "basefilestem": pch_out_abs_path.stem, + }, + implicit=[*mwcc_implicit], + ) + n.newline() + def c_build(obj: Object, src_path: Path) -> Optional[Path]: # Avoid creating duplicate build rules if obj.src_obj_path is None or obj.src_obj_path in source_added: @@ -1469,6 +1550,8 @@ def generate_objdiff_config( "*.h", "*.hpp", "*.inc", + "*.pch", + "*.pch++", "*.py", "*.yml", "*.txt",