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

Merge pull request #860 from LagoLunatic/pch

Browse Source 
Use precompiled header (dolzel.pch), fix weak data issues and weak function ordering issues
This commit is contained in:
LagoLunatic
2025-08-22 00:37:28 -04:00
committed by GitHub
parent a32174dff6 e22f51b444
commit cb4fe5cf27
647 changed files with 1518 additions and 1248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.clangd
+5
View File
@@ -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"]
.vscode/settings.json
Vendored
+3
View File
@@ -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,
configure.py
+186 -179
View File
@@ -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"]),
]
include/JSystem/J3DGraphAnimator/J3DJoint.h
+2 -7
View File
@@ -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;
include/JSystem/J3DGraphBase/J3DMatBlock.h
+4 -1
View File
@@ -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) {
include/JSystem/JUtility/JUTDirectPrint.h
-1
View File
@@ -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 {};
include/d/actor/d_a_agb.h
-34
View File
@@ -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 {
include/d/actor/d_a_bomb.h
-2
View File
@@ -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();
include/d/actor/d_a_hookshot.h
-1
View File
@@ -48,7 +48,6 @@ public:
void offObjHookFlg() { mObjHookFlg = FALSE; }
bool checkShipRideFlg() const { return mShipRideFlg; }
daHookshot_c() {}
BOOL draw();
BOOL procWait_init(BOOL);
BOOL procWait();
include/d/actor/d_a_hys.h
+1
View File
@@ -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:
include/d/actor/d_a_kanban.h
-14
View File
@@ -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 */
include/d/actor/d_a_knob00.h
+1 -1
View File
@@ -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;
include/d/actor/d_a_mtoge.h
-1
View File
@@ -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();
include/d/actor/d_a_npc_bs1.h
-32
View File
@@ -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 */
include/d/actor/d_a_npc_btsw.h
-33
View File
@@ -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 */
include/d/actor/d_a_npc_btsw2.h
-16
View File
@@ -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 */
include/d/actor/d_a_npc_fa1.h
-83
View File
@@ -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 */
include/d/actor/d_a_npc_kamome.h
-51
View File
@@ -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*);
include/d/actor/d_a_npc_km1.h
-33
View File
@@ -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 */
include/d/actor/d_a_npc_nz.h
-26
View File
@@ -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 */
include/d/actor/d_a_npc_os.h
+2 -63
View File
@@ -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 */
include/d/actor/d_a_obj_barrier.h
+5 -4
View File
@@ -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();
include/d/actor/d_a_obj_eff.h
-1
View File
@@ -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)();
include/d/actor/d_a_obj_eskban.h
+2
View File
@@ -3,6 +3,8 @@
#include "d/d_bg_s_movebg_actor.h"
class dPa_smokeEcallBack;
namespace daObjEskban {
static const int DESTROY_VIBRATION_LEN = 35;
include/d/actor/d_a_obj_hha.h
-2
View File
@@ -40,8 +40,6 @@ public:
class daObjHhaSplash_c {
public:
daObjHhaSplash_c() {}
~daObjHhaSplash_c() {}
cXyz get_base_pos() { return mBasePos; };
cXyz get_pos() { return mPos; };
include/d/actor/d_a_obj_movebox.h
+1
View File
@@ -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;
include/d/actor/d_a_obj_ojtree.h
-1
View File
@@ -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:
include/d/actor/d_a_obj_pirateship.h
+2 -1
View File
@@ -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();
include/d/actor/d_a_obj_swhammer.h
+1
View File
@@ -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;
include/d/actor/d_a_obj_toripost.h
-16
View File
@@ -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 */
include/d/actor/d_a_pirate_flag.h
-33
View File
@@ -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;
include/d/actor/d_a_rd.h
-41
View File
@@ -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; }
include/d/actor/d_a_sail.h
-26
View File
@@ -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 */
include/d/actor/d_a_stone2.h
+1
View File
@@ -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 {
include/d/actor/d_a_tag_kk1.h
-19
View File
@@ -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 */
include/d/actor/d_a_tpota.h
-1
View File
@@ -3,7 +3,6 @@
#include "f_op/f_op_actor.h"
class JPABaseEmitter;
class JPABaseParticle;
include/d/actor/d_a_ykgr.h
+2 -1
View File
@@ -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);
include/d/d_bg_s_movebg_actor.h
-6
View File
@@ -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*);
include/d/d_com_inf_game.h
+9 -9
View File
@@ -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();
}
include/d/d_gameover.h
-1
View File
@@ -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() {}
include/d/d_shop.h
-1
View File
@@ -114,7 +114,6 @@ public:
mItemIsSoldOut[i] = false;
}
}
~ShopItems_c() {}
BOOL isSoldOutItem(s16 i) { return mItemIsSoldOut[i] == true; }
BOOL isHide() { return mbIsHide; }
include/d/d_stage.h
+1
View File
@@ -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; }
include/d/dolzel.h
+10
View File
@@ -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 */
include/d/dolzel.pch
+25
View File
@@ -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 */
include/f_op/f_op_actor_mng.h
-2
View File
@@ -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);
include/weak_bss_3569.h
+4 -4
View File
@@ -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 <typename T> struct bss_3569 { u8 val[0xC]; };
#include "dolphin/mtx/mtx.h"
static inline void dummy_bss_3569() {
bss_3569<void*>(); // @3569
Vec vec = (Vec){0.0f, 0.0f, 0.0f}; // @3569 / @3599
}
#endif /* WEAK_BSS_3569_H */
include/weak_bss_936_to_1036.h
-1
View File
@@ -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.
include/weak_data_1811.h
-36
View File
@@ -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 */
include/weak_data_2100_2080.h
-27
View File
@@ -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 */
src/JSystem/J3DGraphBase/J3DMatBlock.cpp
-5
View File
@@ -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 &);
src/JSystem/J3DU/J3DUClipper.cpp
+1 -4
View File
@@ -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;
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h
+2 -2
View File
@@ -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
src/SSystem/SComponent/c_lib.cpp
-1
View File
@@ -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);
src/d/actor/d_a_acorn_leaf.cpp
+1
View File
@@ -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"
src/d/actor/d_a_agb.cpp
+34 -2
View File
@@ -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;
src/d/actor/d_a_agbsw0.cpp
+1 -3
View File
@@ -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"
src/d/actor/d_a_alldie.cpp
+1
View File
@@ -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"
src/d/actor/d_a_am.cpp
+1 -2
View File
@@ -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,
src/d/actor/d_a_am2.cpp
+1 -2
View File
@@ -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,
src/d/actor/d_a_amiprop.cpp
+1
View File
@@ -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"
src/d/actor/d_a_andsw0.cpp
+1
View File
@@ -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"
src/d/actor/d_a_andsw2.cpp
+1
View File
@@ -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"
src/d/actor/d_a_arrow.cpp
+1 -2
View File
@@ -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";
src/d/actor/d_a_arrow_iceeff.cpp
+1
View File
@@ -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"
src/d/actor/d_a_arrow_lighteff.cpp
+1
View File
@@ -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"
src/d/actor/d_a_atdoor.cpp
+1
View File
@@ -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"
src/d/actor/d_a_att.cpp
+1 -4
View File
@@ -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);
src/d/actor/d_a_auction.cpp
+1 -3
View File
@@ -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;
src/d/actor/d_a_bb.cpp
+1 -1
View File
@@ -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,
src/d/actor/d_a_bdk.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bdkobj.cpp
+1
View File
@@ -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"
src/d/actor/d_a_beam.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bflower.cpp
+1 -2
View File
@@ -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 = {
src/d/actor/d_a_bg.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bgn.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bgn2.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bgn3.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bigelf.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bita.cpp
+1 -2
View File
@@ -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 };
src/d/actor/d_a_bk.cpp
+1 -3
View File
@@ -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;
src/d/actor/d_a_bl.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bmd.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bmdfoot.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bmdhand.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bo.cpp
+1
View File
@@ -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"
src/d/actor/d_a_boko.cpp
+1 -3
View File
@@ -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,
src/d/actor/d_a_bomb.cpp
+1
View File
@@ -3,4 +3,5 @@
* Item - Bomb
*/
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/actor/d_a_bomb3.inc"
src/d/actor/d_a_bomb2.cpp
+1 -2
View File
@@ -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 {
src/d/actor/d_a_bomb3.inc
+1 -2
View File
@@ -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,
src/d/actor/d_a_boomerang.cpp
+2 -1
View File
@@ -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
src/d/actor/d_a_boss_item.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bpw.cpp
+1
View File
@@ -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"
src/d/actor/d_a_branch.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bridge.cpp
+1 -1
View File
@@ -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;
src/d/actor/d_a_bst.cpp
+1
View File
@@ -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"
src/d/actor/d_a_btd.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bwd.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bwdg.cpp
+1
View File
@@ -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"
src/d/actor/d_a_bwds.cpp
+1
View File
@@ -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"
src/d/actor/d_a_canon.cpp
+1
View File
@@ -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"

Some files were not shown because too many files have changed in this diff Show More