From c900a043b89786d5e594ec883d9acd92e0db6bc7 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 28 Feb 2026 13:11:00 -0700 Subject: [PATCH] Some GCC compilation fixes (#3114) * Fix 6-byte multichar literals * Add `struct` to `e_ga_class::ga_s` * Fix remaining wrong forward declares (struct/class) * Replace `#include ` with `#include ` * Guard FLT_EPSILON define to prevent redefinition * Add missing `#include ` for direct cstring function usage --- .../J3DGraphLoader/J3DMaterialFactory.h | 2 +- .../J3DGraphLoader/J3DMaterialFactory_v21.h | 2 +- .../JSystem/J3DGraphLoader/J3DModelLoader.h | 2 +- include/JSystem/JAudio2/JAISound.h | 2 +- include/JSystem/JAudio2/JASChannel.h | 2 +- include/JSystem/JAudio2/JASCmdStack.h | 2 +- include/JSystem/JAudio2/JASSeqCtrl.h | 2 +- include/JSystem/JAudio2/JASWSParser.h | 4 +- include/JSystem/JGadget/search.h | 1 + include/JSystem/JGadget/std-streambuf.h | 2 +- include/JSystem/JGeometry.h | 2 + include/SSystem/SComponent/c_m2d.h | 2 +- include/d/actor/d_a_e_ga.h | 2 +- include/d/actor/d_a_e_pm.h | 2 +- include/d/actor/d_a_npc.h | 1 + include/d/actor/d_a_npc_bou.h | 1 + include/d/actor/d_a_npc_cdn3.h | 1 + include/d/actor/d_a_npc_kn.h | 1 + include/d/actor/d_a_npc_kolin.h | 1 + include/d/actor/d_a_npc_the.h | 1 + include/d/actor/d_a_obj_cblock.h | 2 +- include/d/actor/d_a_passer_mng.h | 2 +- include/d/d_bg_s_cap_poly.h | 2 +- include/d/d_bg_w.h | 2 +- include/d/d_bg_w_base.h | 2 +- include/d/d_bg_w_kcol.h | 4 +- include/d/d_com_inf_game.h | 1 + include/d/d_debug_camera.h | 1 + include/d/d_map.h | 1 + include/d/d_menu_fmap_map.h | 1 + include/d/d_msg_object.h | 1 + include/d/d_name.h | 1 + include/m_Do/m_Do_hostIO.h | 2 +- src/JSystem/J2DGraph/J2DPrint.cpp | 1 + src/JSystem/J2DGraph/J2DTextBox.cpp | 1 + src/JSystem/JAHostIO/JAHioNode.cpp | 1 + src/JSystem/JAudio2/JAUSectionHeap.cpp | 1 + src/JSystem/JUtility/JUTCacheFont.cpp | 1 + src/JSystem/JUtility/JUTDbPrint.cpp | 1 + src/JSystem/JUtility/JUTException.cpp | 1 + src/Z2AudioCS/SpkSpeakerCtrl.cpp | 1 + src/Z2AudioLib/Z2AudioArcLoader.cpp | 1 + src/Z2AudioLib/Z2SceneMgr.cpp | 1 + src/Z2AudioLib/Z2SoundObjMgr.cpp | 1 + src/Z2AudioLib/Z2StatusMgr.cpp | 1 + src/c/c_dylink.cpp | 1 + src/d/actor/d_a_alink.cpp | 1 + src/d/actor/d_a_alink_HIO.inc | 1 + src/d/actor/d_a_alink_demo.inc | 1 + src/d/actor/d_a_b_gg.cpp | 1 + src/d/actor/d_a_b_tn.cpp | 1 + src/d/actor/d_a_b_yo.cpp | 1 + src/d/actor/d_a_balloon_2D.cpp | 1 + src/d/actor/d_a_bd.cpp | 1 + src/d/actor/d_a_bg.cpp | 1 + src/d/actor/d_a_bg_obj.cpp | 1 + src/d/actor/d_a_canoe.cpp | 1 + src/d/actor/d_a_coach_2D.cpp | 1 + src/d/actor/d_a_cow.cpp | 1 + src/d/actor/d_a_cstaF.cpp | 1 + src/d/actor/d_a_demo00.cpp | 1 + src/d/actor/d_a_demo_item.cpp | 1 + src/d/actor/d_a_do.cpp | 1 + src/d/actor/d_a_door_bossL1.cpp | 1 + src/d/actor/d_a_door_knob00.cpp | 1 + src/d/actor/d_a_door_shutter.cpp | 1 + src/d/actor/d_a_e_bi.cpp | 1 + src/d/actor/d_a_e_bug.cpp | 1 + src/d/actor/d_a_e_dn.cpp | 1 + src/d/actor/d_a_e_fs.cpp | 1 + src/d/actor/d_a_e_gb.cpp | 1 + src/d/actor/d_a_e_hp.cpp | 1 + src/d/actor/d_a_e_mf.cpp | 1 + src/d/actor/d_a_e_mk.cpp | 1 + src/d/actor/d_a_e_ms.cpp | 1 + src/d/actor/d_a_e_nest.cpp | 1 + src/d/actor/d_a_e_oc.cpp | 1 + src/d/actor/d_a_e_ph.cpp | 1 + src/d/actor/d_a_e_po.cpp | 1 + src/d/actor/d_a_e_rd.cpp | 1 + src/d/actor/d_a_e_rdb.cpp | 1 + src/d/actor/d_a_e_rdy.cpp | 1 + src/d/actor/d_a_e_s1.cpp | 1 + src/d/actor/d_a_e_sf.cpp | 1 + src/d/actor/d_a_e_sm.cpp | 1 + src/d/actor/d_a_e_sm2.cpp | 1 + src/d/actor/d_a_e_st.cpp | 1 + src/d/actor/d_a_e_warpappear.cpp | 1 + src/d/actor/d_a_e_wb.cpp | 1 + src/d/actor/d_a_e_ww.cpp | 1 + src/d/actor/d_a_e_ym.cpp | 1 + src/d/actor/d_a_e_zh.cpp | 1 + src/d/actor/d_a_fr.cpp | 1 + src/d/actor/d_a_horse.cpp | 1 + src/d/actor/d_a_kago.cpp | 1 + src/d/actor/d_a_kytag04.cpp | 1 + src/d/actor/d_a_kytag06.cpp | 1 + src/d/actor/d_a_kytag12.cpp | 1 + src/d/actor/d_a_kytag13.cpp | 1 + src/d/actor/d_a_kytag15.cpp | 1 + src/d/actor/d_a_kytag16.cpp | 1 + src/d/actor/d_a_mg_fish.cpp | 1 + src/d/actor/d_a_mg_rod.cpp | 1 + src/d/actor/d_a_movie_player.cpp | 1 + src/d/actor/d_a_myna.cpp | 1 + src/d/actor/d_a_nbomb.cpp | 1 + src/d/actor/d_a_ni.cpp | 1 + src/d/actor/d_a_npc.cpp | 1 + src/d/actor/d_a_npc_aru.cpp | 1 + src/d/actor/d_a_npc_ash.cpp | 1 + src/d/actor/d_a_npc_ashB.cpp | 1 + src/d/actor/d_a_npc_bans.cpp | 1 + src/d/actor/d_a_npc_besu.cpp | 1 + src/d/actor/d_a_npc_bou.cpp | 1 + src/d/actor/d_a_npc_bouS.cpp | 53 ++++++++++--------- src/d/actor/d_a_npc_cd.cpp | 1 + src/d/actor/d_a_npc_cd2_HIO.inc | 1 + src/d/actor/d_a_npc_cdn3.cpp | 1 + src/d/actor/d_a_npc_clerka.cpp | 1 + src/d/actor/d_a_npc_clerkb.cpp | 1 + src/d/actor/d_a_npc_clerkt.cpp | 1 + src/d/actor/d_a_npc_coach.cpp | 1 + src/d/actor/d_a_npc_doc.cpp | 1 + src/d/actor/d_a_npc_fairy.cpp | 1 + src/d/actor/d_a_npc_fairy_seirei.cpp | 1 + src/d/actor/d_a_npc_fish.cpp | 1 + src/d/actor/d_a_npc_gnd.cpp | 1 + src/d/actor/d_a_npc_gra.cpp | 1 + src/d/actor/d_a_npc_grc.cpp | 1 + src/d/actor/d_a_npc_grm.cpp | 1 + src/d/actor/d_a_npc_grmc.cpp | 1 + src/d/actor/d_a_npc_gro.cpp | 1 + src/d/actor/d_a_npc_grr.cpp | 1 + src/d/actor/d_a_npc_grs.cpp | 1 + src/d/actor/d_a_npc_grz.cpp | 1 + src/d/actor/d_a_npc_hanjo.cpp | 1 + src/d/actor/d_a_npc_henna.cpp | 1 + src/d/actor/d_a_npc_hoz.cpp | 1 + src/d/actor/d_a_npc_impal.cpp | 1 + src/d/actor/d_a_npc_ins.cpp | 1 + src/d/actor/d_a_npc_jagar.cpp | 1 + src/d/actor/d_a_npc_kakashi.cpp | 1 + src/d/actor/d_a_npc_kkri.cpp | 1 + src/d/actor/d_a_npc_kn.cpp | 1 + src/d/actor/d_a_npc_kn_base.inc | 1 + src/d/actor/d_a_npc_knj.cpp | 1 + src/d/actor/d_a_npc_kolin.cpp | 1 + src/d/actor/d_a_npc_kolinb.cpp | 1 + src/d/actor/d_a_npc_ks.cpp | 1 + src/d/actor/d_a_npc_kyury.cpp | 1 + src/d/actor/d_a_npc_len.cpp | 1 + src/d/actor/d_a_npc_lud.cpp | 1 + src/d/actor/d_a_npc_maro.cpp | 1 + src/d/actor/d_a_npc_midp.cpp | 1 + src/d/actor/d_a_npc_moi.cpp | 1 + src/d/actor/d_a_npc_moir.cpp | 1 + src/d/actor/d_a_npc_myna2.cpp | 1 + src/d/actor/d_a_npc_ne.cpp | 1 + src/d/actor/d_a_npc_pachi_besu.cpp | 1 + src/d/actor/d_a_npc_pachi_maro.cpp | 1 + src/d/actor/d_a_npc_pachi_taro.cpp | 1 + src/d/actor/d_a_npc_post.cpp | 1 + src/d/actor/d_a_npc_pouya.cpp | 1 + src/d/actor/d_a_npc_raca.cpp | 1 + src/d/actor/d_a_npc_rafrel.cpp | 1 + src/d/actor/d_a_npc_saru.cpp | 1 + src/d/actor/d_a_npc_seib.cpp | 1 + src/d/actor/d_a_npc_seic.cpp | 1 + src/d/actor/d_a_npc_seid.cpp | 1 + src/d/actor/d_a_npc_seira.cpp | 1 + src/d/actor/d_a_npc_seira2.cpp | 1 + src/d/actor/d_a_npc_seirei.cpp | 1 + src/d/actor/d_a_npc_shad.cpp | 1 + src/d/actor/d_a_npc_shaman.cpp | 1 + src/d/actor/d_a_npc_shop0.cpp | 1 + src/d/actor/d_a_npc_sola.cpp | 1 + src/d/actor/d_a_npc_taro.cpp | 1 + src/d/actor/d_a_npc_the.cpp | 1 + src/d/actor/d_a_npc_theB.cpp | 53 ++++++++++--------- src/d/actor/d_a_npc_tk.cpp | 1 + src/d/actor/d_a_npc_tkc.cpp | 1 + src/d/actor/d_a_npc_tkj.cpp | 1 + src/d/actor/d_a_npc_tkj2.cpp | 1 + src/d/actor/d_a_npc_tks.cpp | 1 + src/d/actor/d_a_npc_toby.cpp | 1 + src/d/actor/d_a_npc_uri.cpp | 1 + src/d/actor/d_a_npc_wrestler.cpp | 1 + src/d/actor/d_a_npc_yamid.cpp | 1 + src/d/actor/d_a_npc_yamis.cpp | 1 + src/d/actor/d_a_npc_yamit.cpp | 1 + src/d/actor/d_a_npc_yelia.cpp | 1 + src/d/actor/d_a_npc_ykm.cpp | 1 + src/d/actor/d_a_npc_ykw.cpp | 1 + src/d/actor/d_a_npc_zanb.cpp | 1 + src/d/actor/d_a_npc_zant.cpp | 1 + src/d/actor/d_a_npc_zelR.cpp | 1 + src/d/actor/d_a_npc_zelRo.cpp | 1 + src/d/actor/d_a_npc_zelda.cpp | 1 + src/d/actor/d_a_npc_zra.cpp | 1 + src/d/actor/d_a_npc_zrz.cpp | 1 + src/d/actor/d_a_obj_ari.cpp | 1 + src/d/actor/d_a_obj_batta.cpp | 1 + src/d/actor/d_a_obj_bemos.cpp | 1 + src/d/actor/d_a_obj_bky_rock.cpp | 1 + src/d/actor/d_a_obj_bosswarp.cpp | 1 + src/d/actor/d_a_obj_brg.cpp | 1 + src/d/actor/d_a_obj_carry.cpp | 1 + src/d/actor/d_a_obj_cho.cpp | 1 + src/d/actor/d_a_obj_crystal.cpp | 1 + src/d/actor/d_a_obj_dan.cpp | 1 + src/d/actor/d_a_obj_dmelevator.cpp | 1 + src/d/actor/d_a_obj_drop.cpp | 1 + src/d/actor/d_a_obj_fchain.cpp | 1 + src/d/actor/d_a_obj_gadget.cpp | 1 + src/d/actor/d_a_obj_ganonwall.cpp | 1 + src/d/actor/d_a_obj_ganonwall2.cpp | 1 + src/d/actor/d_a_obj_gb.cpp | 1 + src/d/actor/d_a_obj_gra2.cpp | 1 + src/d/actor/d_a_obj_gra2_soldier.inc | 1 + src/d/actor/d_a_obj_ihasi.cpp | 1 + src/d/actor/d_a_obj_itamato.cpp | 1 + src/d/actor/d_a_obj_kabuto.cpp | 1 + src/d/actor/d_a_obj_kag.cpp | 1 + src/d/actor/d_a_obj_kago.cpp | 1 + src/d/actor/d_a_obj_kaisou.cpp | 1 + src/d/actor/d_a_obj_kamakiri.cpp | 1 + src/d/actor/d_a_obj_katatsumuri.cpp | 1 + src/d/actor/d_a_obj_kbacket.cpp | 1 + src/d/actor/d_a_obj_key.cpp | 1 + src/d/actor/d_a_obj_kkanban.cpp | 1 + src/d/actor/d_a_obj_kuwagata.cpp | 1 + src/d/actor/d_a_obj_life_container.cpp | 1 + src/d/actor/d_a_obj_lp.cpp | 1 + src/d/actor/d_a_obj_lv6bemos2.cpp | 1 + src/d/actor/d_a_obj_maki.cpp | 1 + src/d/actor/d_a_obj_mirror_table.cpp | 1 + src/d/actor/d_a_obj_nan.cpp | 1 + src/d/actor/d_a_obj_octhashi.cpp | 1 + src/d/actor/d_a_obj_picture.cpp | 1 + src/d/actor/d_a_obj_pillar.cpp | 1 + src/d/actor/d_a_obj_pumpkin.cpp | 1 + src/d/actor/d_a_obj_rope_bridge.cpp | 1 + src/d/actor/d_a_obj_scannon.cpp | 1 + src/d/actor/d_a_obj_scannon_crs.cpp | 1 + src/d/actor/d_a_obj_scannon_ten.cpp | 1 + src/d/actor/d_a_obj_sekizoa.cpp | 1 + src/d/actor/d_a_obj_smallkey.cpp | 1 + src/d/actor/d_a_obj_snow_soup.cpp | 1 + src/d/actor/d_a_obj_so.cpp | 1 + src/d/actor/d_a_obj_swLight.cpp | 1 + src/d/actor/d_a_obj_swhang.cpp | 1 + src/d/actor/d_a_obj_swpropeller.cpp | 1 + src/d/actor/d_a_obj_swpush.cpp | 1 + src/d/actor/d_a_obj_ten.cpp | 1 + src/d/actor/d_a_obj_toby.cpp | 1 + src/d/actor/d_a_obj_tobyhouse.cpp | 1 + src/d/actor/d_a_obj_tombo.cpp | 1 + src/d/actor/d_a_obj_volcbom.cpp | 1 + src/d/actor/d_a_obj_warp_kbrg.cpp | 1 + src/d/actor/d_a_obj_warp_obrg.cpp | 1 + src/d/actor/d_a_obj_ystone.cpp | 1 + src/d/actor/d_a_shop_item.cpp | 1 + src/d/actor/d_a_swhit0.cpp | 1 + src/d/actor/d_a_tag_Lv8Gate.cpp | 1 + src/d/actor/d_a_tag_allmato.cpp | 1 + src/d/actor/d_a_tag_evt.cpp | 1 + src/d/actor/d_a_tag_lantern.cpp | 1 + src/d/actor/d_a_tag_mhint.cpp | 1 + src/d/actor/d_a_tag_msg.cpp | 1 + src/d/actor/d_a_tag_shop_item.cpp | 1 + src/d/actor/d_a_tag_smk_emt.cpp | 1 + src/d/actor/d_a_tag_sppath.cpp | 1 + src/d/actor/d_a_tbox.cpp | 1 + src/d/actor/d_a_tbox2.cpp | 1 + src/d/actor/d_a_vrbox2.cpp | 1 + src/d/actor/d_a_ykgr.cpp | 1 + src/d/actor/d_grass.inc | 1 + src/d/d_attention.cpp | 1 + src/d/d_bg_parts.cpp | 1 + src/d/d_cam_param.cpp | 1 + src/d/d_camera.cpp | 1 + src/d/d_com_inf_game.cpp | 1 + src/d/d_com_static.cpp | 1 + src/d/d_debug_camera.cpp | 1 + src/d/d_demo.cpp | 1 + src/d/d_ev_camera.cpp | 1 + src/d/d_event.cpp | 1 + src/d/d_event_data.cpp | 1 + src/d/d_eye_hl.cpp | 1 + src/d/d_file_sel_info.cpp | 1 + src/d/d_file_select.cpp | 1 + src/d/d_gameover.cpp | 1 + src/d/d_item.cpp | 1 + src/d/d_jnt_col.cpp | 1 + src/d/d_kankyo.cpp | 1 + src/d/d_kankyo_debug.cpp | 1 + src/d/d_kankyo_rain.cpp | 1 + src/d/d_ky_thunder.cpp | 1 + src/d/d_kyeff.cpp | 1 + src/d/d_map.cpp | 1 + src/d/d_map_path.cpp | 1 + src/d/d_map_path_fmap.cpp | 1 + src/d/d_menu_calibration.cpp | 1 + src/d/d_menu_collect.cpp | 1 + src/d/d_menu_dmap.cpp | 1 + src/d/d_menu_fishing.cpp | 1 + src/d/d_menu_fmap.cpp | 1 + src/d/d_menu_fmap2D.cpp | 1 + src/d/d_menu_fmap_map.cpp | 1 + src/d/d_menu_insect.cpp | 1 + src/d/d_menu_item_explain.cpp | 1 + src/d/d_menu_letter.cpp | 1 + src/d/d_menu_save.cpp | 1 + src/d/d_menu_skill.cpp | 1 + src/d/d_meter2.cpp | 1 + src/d/d_meter2_info.cpp | 1 + src/d/d_meter_HIO.cpp | 1 + src/d/d_meter_button.cpp | 1 + src/d/d_meter_hakusha.cpp | 1 + src/d/d_meter_map.cpp | 1 + src/d/d_meter_string.cpp | 1 + src/d/d_msg_class.cpp | 1 + src/d/d_msg_flow.cpp | 1 + src/d/d_msg_object.cpp | 1 + src/d/d_msg_scrn_explain.cpp | 1 + src/d/d_msg_scrn_item.cpp | 1 + src/d/d_msg_scrn_jimaku.cpp | 1 + src/d/d_msg_scrn_talk.cpp | 1 + src/d/d_msg_string_base.cpp | 1 + src/d/d_msg_unit.cpp | 1 + src/d/d_name.cpp | 1 + src/d/d_resorce.cpp | 1 + src/d/d_s_logo.cpp | 1 + src/d/d_s_menu.cpp | 1 + src/d/d_s_play.cpp | 1 + src/d/d_s_room.cpp | 1 + src/d/d_save.cpp | 1 + src/d/d_select_cursor.cpp | 1 + src/d/d_shop_system.cpp | 1 + src/d/d_stage.cpp | 1 + src/d/d_timer.cpp | 1 + src/f_ap/f_ap_game.cpp | 1 + src/m_Do/m_Do_MemCard.cpp | 1 + src/m_Do/m_Do_MemCardRWmng.cpp | 1 + src/m_Do/m_Do_ext.cpp | 1 + src/m_Do/m_Do_ext2.cpp | 1 + src/m_Do/m_Do_graphic.cpp | 1 + 347 files changed, 402 insertions(+), 73 deletions(-) diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h index bed19cd693..6c5f371b1d 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h @@ -84,7 +84,7 @@ struct J3DDisplayListInit { }; // size 8 struct J3DTexCoord2Info; -struct J3DCurrentMtxInfo; +class J3DCurrentMtxInfo; /** * @ingroup jsystem-j3d diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h index af166e1b13..e59d158959 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h @@ -7,7 +7,7 @@ class J3DMaterial; struct J3DTexCoord2Info; -struct J3DCurrentMtxInfo; +class J3DCurrentMtxInfo; /** * @ingroup jsystem-j3d diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h index a06260f3dc..e2569cee19 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h @@ -6,7 +6,7 @@ class J3DModelData; class J3DMaterialTable; -class J3DModelHierarchy; +struct J3DModelHierarchy; /** * @ingroup jsystem-j3d diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index 96e6d96d9a..5e414ade24 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -68,7 +68,7 @@ public: } id_; }; -class JASTrack; +struct JASTrack; /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASChannel.h b/include/JSystem/JAudio2/JASChannel.h index 5b4a959372..8c80268d46 100644 --- a/include/JSystem/JAudio2/JASChannel.h +++ b/include/JSystem/JAudio2/JASChannel.h @@ -8,7 +8,7 @@ #include "JSystem/JAudio2/JASWaveInfo.h" #include -class JASDSPChannel; +struct JASDSPChannel; namespace JASDsp { struct TChannel; diff --git a/include/JSystem/JAudio2/JASCmdStack.h b/include/JSystem/JAudio2/JASCmdStack.h index c35a1146cb..2ad327362b 100644 --- a/include/JSystem/JAudio2/JASCmdStack.h +++ b/include/JSystem/JAudio2/JASCmdStack.h @@ -3,7 +3,7 @@ #include "JSystem/JSupport/JSUList.h" -class JASTrack; +struct JASTrack; /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASSeqCtrl.h b/include/JSystem/JAudio2/JASSeqCtrl.h index 974f1c7065..d481192d6f 100644 --- a/include/JSystem/JAudio2/JASSeqCtrl.h +++ b/include/JSystem/JAudio2/JASSeqCtrl.h @@ -3,7 +3,7 @@ #include "JSystem/JAudio2/JASSeqReader.h" -class JASTrack; +struct JASTrack; class JASSeqParser; /** diff --git a/include/JSystem/JAudio2/JASWSParser.h b/include/JSystem/JAudio2/JASWSParser.h index 000aee0069..1dc68674cf 100644 --- a/include/JSystem/JAudio2/JASWSParser.h +++ b/include/JSystem/JAudio2/JASWSParser.h @@ -5,8 +5,8 @@ class JKRHeap; class JASWaveBank; -class JASBasicWaveBank; -class JASSimpleWaveBank; +struct JASBasicWaveBank; +struct JASSimpleWaveBank; /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h index bbc5c9ce6c..12507f3dc7 100644 --- a/include/JSystem/JGadget/search.h +++ b/include/JSystem/JGadget/search.h @@ -5,6 +5,7 @@ #include #include #include +#include namespace JGadget { namespace search { diff --git a/include/JSystem/JGadget/std-streambuf.h b/include/JSystem/JGadget/std-streambuf.h index d6bf291415..dae56d317c 100644 --- a/include/JSystem/JGadget/std-streambuf.h +++ b/include/JSystem/JGadget/std-streambuf.h @@ -2,7 +2,7 @@ #define JGADGET_STD_STREAMBUF_H #include -#include +#include namespace JGadget { template diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 696d2f60a4..d0e7c8c03e 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -7,8 +7,10 @@ #ifndef __MWERKS__ #include +#if !defined(FLT_EPSILON) #define FLT_EPSILON std::numeric_limits::epsilon() #endif +#endif namespace JGeometry { diff --git a/include/SSystem/SComponent/c_m2d.h b/include/SSystem/SComponent/c_m2d.h index f6fe537a76..482dcab0e3 100644 --- a/include/SSystem/SComponent/c_m2d.h +++ b/include/SSystem/SComponent/c_m2d.h @@ -2,7 +2,7 @@ #define C_M2D_H -struct cM2dGCir; +class cM2dGCir; void cM2d_CrossCirLin(cM2dGCir&, float, float, float, float, float*, float*); diff --git a/include/d/actor/d_a_e_ga.h b/include/d/actor/d_a_e_ga.h index 1b357771c6..e690a68fc8 100644 --- a/include/d/actor/d_a_e_ga.h +++ b/include/d/actor/d_a_e_ga.h @@ -34,7 +34,7 @@ public: /* 0x0570 */ u8 prm0; /* 0x0571 */ u8 prm1; /* 0x0572 */ u8 prm2; - /* 0x0574 */ ga_s ga_s[256]; + /* 0x0574 */ struct ga_s ga_s[256]; /* 0x4D74 */ int ga_num; /* 0x4D78 */ u8 HIOInit; /* 0x4D79 */ u8 initialized; diff --git a/include/d/actor/d_a_e_pm.h b/include/d/actor/d_a_e_pm.h index 9077a4d56d..edec93c6a2 100644 --- a/include/d/actor/d_a_e_pm.h +++ b/include/d/actor/d_a_e_pm.h @@ -9,7 +9,7 @@ #include "d/d_cc_uty.h" #include "d/d_msg_flow.h" -class dPath; +struct dPath; /** * @ingroup actors-enemies diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h index 205a242050..ea081165be 100644 --- a/include/d/actor/d_a_npc.h +++ b/include/d/actor/d_a_npc.h @@ -10,6 +10,7 @@ #include "d/d_msg_flow.h" #include "d/d_particle_copoly.h" #include "global.h" +#include struct daNpc_GetParam1 { // name unknown /* 0x0 */ int fileIdx; diff --git a/include/d/actor/d_a_npc_bou.h b/include/d/actor/d_a_npc_bou.h index 9a1b460ae4..583c90ff3e 100644 --- a/include/d/actor/d_a_npc_bou.h +++ b/include/d/actor/d_a_npc_bou.h @@ -2,6 +2,7 @@ #define D_A_NPC_BOU_H #include "d/actor/d_a_npc.h" +#include struct daNpc_Bou_HIOParam { /* 0x00 */ daNpcT_HIOParam common; diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h index 890f362862..6a2e9d7b55 100644 --- a/include/d/actor/d_a_npc_cdn3.h +++ b/include/d/actor/d_a_npc_cdn3.h @@ -4,6 +4,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_npc_cd2.h" #include "d/actor/d_a_tag_schedule.h" +#include /** * @ingroup actors-npcs diff --git a/include/d/actor/d_a_npc_kn.h b/include/d/actor/d_a_npc_kn.h index fe30a4769f..a14a89aefe 100644 --- a/include/d/actor/d_a_npc_kn.h +++ b/include/d/actor/d_a_npc_kn.h @@ -2,6 +2,7 @@ #define D_A_NPC_KN_H #include "d/actor/d_a_npc.h" +#include struct daNpc_Kn_HIOParam { /* 0x00 */ daNpcT_HIOParam common; diff --git a/include/d/actor/d_a_npc_kolin.h b/include/d/actor/d_a_npc_kolin.h index 314a29541b..b6fded937b 100644 --- a/include/d/actor/d_a_npc_kolin.h +++ b/include/d/actor/d_a_npc_kolin.h @@ -2,6 +2,7 @@ #define D_A_NPC_KOLIN_H #include "d/actor/d_a_npc.h" +#include struct daNpc_Kolin_HIOParam { /* 0x00 */ daNpcT_HIOParam common; diff --git a/include/d/actor/d_a_npc_the.h b/include/d/actor/d_a_npc_the.h index 6e9a24d42b..bc78a93925 100644 --- a/include/d/actor/d_a_npc_the.h +++ b/include/d/actor/d_a_npc_the.h @@ -2,6 +2,7 @@ #define D_A_NPC_THE_H #include "d/actor/d_a_npc4.h" +#include struct daNpcThe_HIOParam { /* 0x00 */ daNpcF_HIOParam common; diff --git a/include/d/actor/d_a_obj_cblock.h b/include/d/actor/d_a_obj_cblock.h index 1a7119a9aa..04881776ec 100644 --- a/include/d/actor/d_a_obj_cblock.h +++ b/include/d/actor/d_a_obj_cblock.h @@ -5,7 +5,7 @@ #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" -class dPath; +struct dPath; /** * @ingroup actors-objects diff --git a/include/d/actor/d_a_passer_mng.h b/include/d/actor/d_a_passer_mng.h index f0ee36903f..aa2a55c00f 100644 --- a/include/d/actor/d_a_passer_mng.h +++ b/include/d/actor/d_a_passer_mng.h @@ -5,7 +5,7 @@ #include "d/d_kankyo.h" #include "f_op/f_op_actor_mng.h" -class dPath; +struct dPath; /** * @ingroup actors-unsorted diff --git a/include/d/d_bg_s_cap_poly.h b/include/d/d_bg_s_cap_poly.h index 0cda04c739..ca4a38542c 100644 --- a/include/d/d_bg_s_cap_poly.h +++ b/include/d/d_bg_s_cap_poly.h @@ -4,7 +4,7 @@ #include "d/d_bg_s_chk.h" #include "SSystem/SComponent/c_m3d_g_aab.h" -struct dBgS_CaptPoly; +class dBgS_CaptPoly; typedef void (*CaptPolyCallback)(dBgS_CaptPoly&, cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*); diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h index fa4ba70105..f7f38688f7 100644 --- a/include/d/d_bg_w.h +++ b/include/d/d_bg_w.h @@ -11,7 +11,7 @@ class cBgS_GrpPassChk; class cBgS_PolyPassChk; class fopAc_ac_c; struct cBgD_Vtx_t; -struct dBgS_CaptPoly; +class dBgS_CaptPoly; class cBgW_TriElm { public: diff --git a/include/d/d_bg_w_base.h b/include/d/d_bg_w_base.h index 0a05467820..089af244b8 100644 --- a/include/d/d_bg_w_base.h +++ b/include/d/d_bg_w_base.h @@ -11,7 +11,7 @@ class cBgS_GndChk; class cBgS_LinChk; class cBgS_ShdwDraw; class dBgS_Acch; -struct dBgS_CaptPoly; +class dBgS_CaptPoly; class dBgS_RoofChk; class dBgS_SphChk; class dBgS_SplGrpChk; diff --git a/include/d/d_bg_w_kcol.h b/include/d/d_bg_w_kcol.h index 36e2f9d970..7bb96ccbd4 100644 --- a/include/d/d_bg_w_kcol.h +++ b/include/d/d_bg_w_kcol.h @@ -9,8 +9,8 @@ class cBgS_GrpPassChk; class cBgS_PolyPassChk; -struct dBgPc; -struct dBgS_CaptPoly; +class dBgPc; +class dBgS_CaptPoly; struct KC_PrismData { /* 0x0 */ f32 height; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 25f48c5fd6..c4278cb3cb 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -15,6 +15,7 @@ #include "global.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include enum dComIfG_ButtonStatus { /* 0x00 */ BUTTON_STATUS_NONE, diff --git a/include/d/d_debug_camera.h b/include/d/d_debug_camera.h index d5cd7403ac..2292f46859 100644 --- a/include/d/d_debug_camera.h +++ b/include/d/d_debug_camera.h @@ -3,6 +3,7 @@ #include "d/d_camera.h" #include "JSystem/JHostIO/JORFile.h" +#include enum dDbgCam_KeyAction { /* | */ dDbgCam_KeyAction_FIXEDFRM, diff --git a/include/d/d_map.h b/include/d/d_map.h index bbd21787ca..5718e331b2 100644 --- a/include/d/d_map.h +++ b/include/d/d_map.h @@ -3,6 +3,7 @@ #include "d/d_map_path_dmap.h" #include "JSystem/JHostIO/JORReflexible.h" +#include struct dMap_HIO_prm_other_s { /* 0x00 */ u8 field_0x0; diff --git a/include/d/d_menu_fmap_map.h b/include/d/d_menu_fmap_map.h index b5b6f7e8d1..b77e43ba70 100644 --- a/include/d/d_menu_fmap_map.h +++ b/include/d/d_menu_fmap_map.h @@ -3,6 +3,7 @@ #include "SSystem/SComponent/c_counter.h" #include +#include #include "d/d_menu_fmap.h" #include "d/d_map.h" #include "d/d_map_path.h" diff --git a/include/d/d_msg_object.h b/include/d/d_msg_object.h index ef7135f09d..2ef3f0ad69 100644 --- a/include/d/d_msg_object.h +++ b/include/d/d_msg_object.h @@ -4,6 +4,7 @@ #include "JSystem/JMessage/control.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_msg.h" +#include class COutFont_c; class J2DTextBox; diff --git a/include/d/d_name.h b/include/d/d_name.h index 16ff3414f6..0d877e6b09 100644 --- a/include/d/d_name.h +++ b/include/d/d_name.h @@ -2,6 +2,7 @@ #define D_D_NAME_H #include "d/d_select_cursor.h" +#include class CPaneMgr; class CPaneMgrAlpha; diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index 4542ff4ab9..fa4eb8b1af 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -2,7 +2,7 @@ #define M_DO_M_DO_HOSTIO_H #include "JSystem/JHostIO/JORReflexible.h" -#include +#include class mDoHIO_child_c { public: diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index b6c8876aee..1dbaf1c681 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -5,6 +5,7 @@ #include "JSystem/JUtility/JUTFont.h" #include #include +#include char* J2DPrint::mStrBuff; diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/src/JSystem/J2DGraph/J2DTextBox.cpp index d82fd37586..8f8a168104 100644 --- a/src/JSystem/J2DGraph/J2DTextBox.cpp +++ b/src/JSystem/J2DGraph/J2DTextBox.cpp @@ -5,6 +5,7 @@ #include "JSystem/JSupport/JSURandomInputStream.h" #include "JSystem/JUtility/JUTResFont.h" #include "JSystem/JUtility/JUTResource.h" +#include J2DTextBox::J2DTextBox() : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() { diff --git a/src/JSystem/JAHostIO/JAHioNode.cpp b/src/JSystem/JAHostIO/JAHioNode.cpp index abca30fb39..5eef2f7e92 100644 --- a/src/JSystem/JAHostIO/JAHioNode.cpp +++ b/src/JSystem/JAHostIO/JAHioNode.cpp @@ -4,6 +4,7 @@ #include "JSystem/JAHostIO/JAHioMessage.h" #include "JSystem/JAHostIO/JAHioMgr.h" #include "JSystem/JHostIO/JORServer.h" +#include JAHioNode::JAHioNode(const char* name) : mTree(this) { mLastChild = NULL; diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp index ad2b5beb95..8a9bbf8277 100644 --- a/src/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp @@ -15,6 +15,7 @@ #include "JSystem/JAudio2/JAUStreamFileTable.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include +#include namespace { class TPushCurrentHeap { diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index 3dac794756..e58f619871 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -7,6 +7,7 @@ #include "JSystem/JKernel/JKRAram.h" #include #include +#include #include "angle_utils.h" JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) { diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index 11d901b260..c037db9b2c 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -5,6 +5,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" #include +#include JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { mFont = pFont; diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index 01e91964fa..13c370797c 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -9,6 +9,7 @@ #include #include #include +#include struct CallbackObject { /* 0x00 */ JUTExceptionUserCallback callback; diff --git a/src/Z2AudioCS/SpkSpeakerCtrl.cpp b/src/Z2AudioCS/SpkSpeakerCtrl.cpp index 112dfd3a2f..5e29cea3df 100644 --- a/src/Z2AudioCS/SpkSpeakerCtrl.cpp +++ b/src/Z2AudioCS/SpkSpeakerCtrl.cpp @@ -5,6 +5,7 @@ #include "JSystem/JAudio2/JASCriticalSection.h" #include #include +#include OSAlarm sSpeakerAlarm; SpeakerInfo sSpeakerInfo[WPAD_MAX_CONTROLLERS]; diff --git a/src/Z2AudioLib/Z2AudioArcLoader.cpp b/src/Z2AudioLib/Z2AudioArcLoader.cpp index 93343014c5..1b4ab57e91 100644 --- a/src/Z2AudioLib/Z2AudioArcLoader.cpp +++ b/src/Z2AudioLib/Z2AudioArcLoader.cpp @@ -5,6 +5,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "Z2AudioLib/Z2FxLineMgr.h" #include "m_Do/m_Do_ext.h" +#include Z2AudioArcLoader::Z2AudioArcLoader(JAUSection* section) : JAUAudioArcLoader(section) {} diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp index 3aa7e99950..9e3bf2c91c 100644 --- a/src/Z2AudioLib/Z2SceneMgr.cpp +++ b/src/Z2AudioLib/Z2SceneMgr.cpp @@ -11,6 +11,7 @@ #include "Z2AudioLib/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2StatusMgr.h" #include "d/d_com_inf_game.h" +#include Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance(true) { sceneNum = -1; diff --git a/src/Z2AudioLib/Z2SoundObjMgr.cpp b/src/Z2AudioLib/Z2SoundObjMgr.cpp index a1d87e6633..6b080134fb 100644 --- a/src/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/src/Z2AudioLib/Z2SoundObjMgr.cpp @@ -4,6 +4,7 @@ #include "Z2AudioLib/Z2Calc.h" #include "Z2AudioLib/Z2SceneMgr.h" #include "Z2AudioLib/Z2LinkMgr.h" +#include Z2SoundObjMgr::Z2SoundObjMgr() : JASGlobalInstance(true) { ghostEnemyState_ = 0; diff --git a/src/Z2AudioLib/Z2StatusMgr.cpp b/src/Z2AudioLib/Z2StatusMgr.cpp index c86b86eee3..fd907b48c8 100644 --- a/src/Z2AudioLib/Z2StatusMgr.cpp +++ b/src/Z2AudioLib/Z2StatusMgr.cpp @@ -2,6 +2,7 @@ #include "Z2AudioLib/Z2Param.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include static const char* sSpotName[] = { "F_SP00", diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index 27113d7a2a..f175c04b54 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -9,6 +9,7 @@ #include "JSystem/JKernel/JKRSolidHeap.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" +#include #if DEBUG #include "f_pc/f_pc_debug_sv.h" diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index e6f8548bef..8977c2c076 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -52,6 +52,7 @@ #include "d/d_s_play.h" #include "res/Object/Alink.h" +#include static int daAlink_Create(fopAc_ac_c* i_this); static int daAlink_Delete(daAlink_c* i_this); diff --git a/src/d/actor/d_a_alink_HIO.inc b/src/d/actor/d_a_alink_HIO.inc index b7b24593de..a2692ae4ad 100644 --- a/src/d/actor/d_a_alink_HIO.inc +++ b/src/d/actor/d_a_alink_HIO.inc @@ -6,6 +6,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" +#include #if DEBUG diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index c601c35695..6ef8241974 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -21,6 +21,7 @@ #include "d/actor/d_a_npc_zra.h" #include "d/actor/d_a_obj_tks.h" #include "d/actor/d_a_npc_tkc.h" +#include BOOL daAlink_c::checkEventRun() const { return dComIfGp_event_runCheck() || checkPlayerDemoMode(); diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index 90a24c0150..dc37eae4e8 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -12,6 +12,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include class daB_GG_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 608cbf6336..82e0f3d844 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_b_tn.h" #include +#include #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_nbomb.h" diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index 61f7610b59..c837457a8d 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -23,6 +23,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" +#include class daB_YO_HIO_c { public: diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index 4584d696ff..d7df1327ed 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -18,6 +18,7 @@ #include "d/d_pane_class.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" +#include class daBalloon2D_HIO_c : public mDoHIO_entry_c { public: diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index f006f90dbe..76ecb88607 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -13,6 +13,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 39f7e07990..825ace2314 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -16,6 +16,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include const char* daBg_c::setArcName() { static char arcName[32]; diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index bf131498f5..599a69d452 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -9,6 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include #include +#include #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index c5650cc69e..7a0e4706e6 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -14,6 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "JSystem/JAudio2/JAUSectionHeap.h" #include "Z2AudioLib/Z2Instances.h" +#include #if DEBUG static BOOL l_debugMode; diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index fd21f2dac0..660d279218 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -12,6 +12,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include class daCoach2D_HIO_c : public mDoHIO_entry_c { public: diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index d4d7bff17b..8244ee8446 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -16,6 +16,7 @@ #include "d/d_meter2_info.h" #include "d/d_timer.h" #include +#include #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_ext.h" diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 833a9f5892..f680728f54 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_alink.h" #include "d/actor/d_a_crod.h" #include "d/d_bg_w.h" +#include enum daCstaF_Action { ACTION_WAIT, diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index c9eda75917..f4b3b1de5c 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -20,6 +20,7 @@ #include "d/actor/d_a_movie_player.h" #if DEBUG #include "d/d_debug_viewer.h" +#include #endif struct UnknownLightData { diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index aaac0e030b..0c69f34b52 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_player.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "Z2AudioLib/Z2Instances.h" +#include static cXyz l_player_offset = cXyz(0.0f, 115.0f, 54.0f); diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index f8632be6c9..6a6dee6067 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -15,6 +15,7 @@ #include "d/d_a_item_static.h" #include "m_Do/m_Do_controller_pad.h" #include "Z2AudioLib/Z2Instances.h" +#include static bool noFallCheck; static bool hio_set; diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index 83e9454a61..8a5fd0c752 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -13,6 +13,7 @@ #include "d/d_meter2_info.h" #include "SSystem/SComponent/c_math.h" #include "f_op/f_op_actor_mng.h" +#include static char* l_stageName[20] = { "D_MN05", diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index 05958a9b45..68872b4bbe 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -12,6 +12,7 @@ #include "d/d_meter2_info.h" #include "SSystem/SComponent/c_math.h" #include +#include u32 knob_param_c::getDoorModel(fopAc_ac_c* i_this) { return fopAcM_GetParamBit(i_this, 5, 3); diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 4689faed0a..60bde824e6 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -15,6 +15,7 @@ #include "d/d_map_path_dmap.h" #include "SSystem/SComponent/c_math.h" #include +#include char* daDoor20_c::getStopBmdName() { switch (door_param2_c::getKind(this)) { diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index c93217979a..8be64c55a8 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_obj_fw.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_actor_enemy.h" +#include class daE_BI_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index c58787169d..ec098f20b4 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -10,6 +10,7 @@ #include "d/d_path.h" #include "d/actor/d_a_nbomb.h" #include "Z2AudioLib/Z2Instances.h" +#include enum E_bug_RES_File_ID { /* BMDG */ diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index a4c76df7cc..728f9787e5 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_horse.h" #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +#include class daE_DN_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 7e57585d0e..2014c21ebc 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -16,6 +16,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +#include class daE_Fs_HIO_c { public: diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index 747ac44ec9..47215b9690 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_obj_smallkey.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include enum Head_Action { /* 0x0 */ HEAD_ACTION_WAIT, diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index f51abeba26..49d563fec3 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_alink.h" #include "d/d_debug_viewer.h" #include "f_op/f_op_actor_enemy.h" +#include class daE_HP_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index 42ad76cfd7..8477c6d351 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -13,6 +13,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "d/actor/d_a_horse.h" #include "d/d_com_inf_game.h" +#include class daE_MF_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index fef3a86675..a5a3bf869c 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -19,6 +19,7 @@ #include "d/d_camera.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include class daE_MK_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index a70515fe13..61690490ab 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -11,6 +11,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "d/d_s_play.h" #include "f_op/f_op_actor_enemy.h" +#include class daE_MS_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 2b5a540bbe..37d3ad8d95 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -14,6 +14,7 @@ #include "d/d_bomb.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include static bool hio_set; diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 248d48c197..b1f7d965f4 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -14,6 +14,7 @@ #include "d/d_cc_uty.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include enum OC_ACTIONS { diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index e2d853a1a8..3d766b8e3e 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +#include #define PH_BMD 20 diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 8b500de1b8..9a13c7e182 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -12,6 +12,7 @@ #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include static s16 mAttackNo = 3; diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 92a2d12f15..585cdcb63f 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -24,6 +24,7 @@ #include "d/actor/d_a_npc_tk.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_actor_enemy.h" +#include class daE_RD_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index f5c533fcb7..f1d8fb180b 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -14,6 +14,7 @@ #include "m_Do/m_Do_graphic.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include class daE_RDB_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 5ed41b451b..05971e055f 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -19,6 +19,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_actor_enemy.h" #include "m_Do/m_Do_graphic.h" +#include class daE_RDY_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index 352cdb985f..f91adc3e2e 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -14,6 +14,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include class daE_S1_HIO_c { public: diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index 55414997c4..22e73cfb0b 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -11,6 +11,7 @@ #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include enum E_sf_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index b04d99b964..51e7972f24 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_arrow.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_camera_mng.h" +#include enum E_SM_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index 066a8243e2..e1bd691a5d 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -12,6 +12,7 @@ #include "SSystem/SComponent/c_counter.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include class daE_SM2_HIO_c : public fOpAcm_HIO_entry_c { public: diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index e5b148b07a..8a7392d32c 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -9,6 +9,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +#include enum E_st_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index 820b084ca7..ca93e3a89d 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_horse.h" #include "d/actor/d_a_obj_ihasi.h" #include "f_op/f_op_camera_mng.h" +#include static int daE_Warpappear_Draw(e_warpappear_class* i_this) { int sw = (fopAcM_GetParam(i_this) >> 8) & 0xFF; diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 905bd9df39..70a9b87e56 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -18,6 +18,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "res/Object/Always.h" +#include class daE_WB_HIO_c : public JORReflexible { diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index 3e6730e94f..4385f5e916 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -11,6 +11,7 @@ #include "d/d_cc_uty.h" #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +#include enum E_ww_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 15c0179abf..1bcc56551d 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -14,6 +14,7 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include class daE_YM_HIO_c: public JORReflexible { public: diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 4cae4a1adc..099d07ce37 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -13,6 +13,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/d_debug_viewer.h" #include "f_op/f_op_camera_mng.h" +#include enum E_ZH_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index 47c90ee0a7..4daceb2679 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -14,6 +14,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "f_op/f_op_kankyo_mng.h" +#include class daFr_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 84e51945e6..433a9030b1 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -18,6 +18,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" #include +#include #define ANM_HS_BACK_WALK 6 #define ANM_HS_WALK_START 7 diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 654c2d8a22..6eb85ad6f7 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -11,6 +11,7 @@ #include "d/d_msg_object.h" #include +#include #include "d/actor/d_a_balloon_2D.h" #include "d/actor/d_a_e_ym.h" diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 353bb396b5..f1b6f691b4 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc4.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" +#include static int daKytag04_Draw(kytag04_class* i_this) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 7271bcf924..b4e1b87131 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -12,6 +12,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) { dScnKy_env_light_c* env_light = dKy_getEnvlight(); diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index 04d8c94f39..b19ee7a35a 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -11,6 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" #include "d/d_kankyo_wether.h" +#include static BOOL d_kytag12_cut_turn_check() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index 7af7ae597d..a320e1b875 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" #include "f_op/f_op_camera_mng.h" +#include static int daKytag13_Draw(kytag13_class* i_this) { return 1; diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp index dd5abd20a6..4483f376b9 100644 --- a/src/d/actor/d_a_kytag15.cpp +++ b/src/d/actor/d_a_kytag15.cpp @@ -9,6 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include static int daKytag15_Draw(kytag15_class* i_this) { cXyz scale; diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp index 9e05cd5778..0216dc67b5 100644 --- a/src/d/actor/d_a_kytag16.cpp +++ b/src/d/actor/d_a_kytag16.cpp @@ -10,6 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include static int daKytag16_Draw(kytag16_class* i_this) { return 1; diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index 7a351d1b50..04ed18875e 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -22,6 +22,7 @@ #include "d/d_s_play.h" #include "d/d_vibration.h" #include "f_op/f_op_kankyo_mng.h" +#include #define ANM_MG_FISH_MOUTH_CLOSE 4 #define ANM_MG_FISH_MOUTH_OPEN 5 diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 92cca27822..c849337c1e 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -23,6 +23,7 @@ #include "SSystem/SComponent/c_counter.h" #include "Z2AudioLib/Z2Instances.h" #include +#include class dmg_rod_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index f6b727f0cd..94cdc99ce5 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -20,6 +20,7 @@ #include "d/actor/d_a_movie_player.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_overlap_mng.h" +#include inline s32 daMP_NEXT_READ_SIZE(daMP_THPReadBuffer* readBuf) { return *(s32*)readBuf->ptr; diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index 6e28336fd2..73eaf967c6 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_tag_myna_light.h" #include "Z2AudioLib/Z2Instances.h" #include "d/d_s_play.h" +#include static daMyna_c::ProcFunc init_proc[] = { &daMyna_c::attack_wait_init, diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 6e1f937010..5090950574 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -14,6 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "d/actor/d_a_mirror.h" #include "JSystem/JAudio2/JAUSectionHeap.h" +#include void daNbomb_c::coHitCallback(fopAc_ac_c* i_hitActor) { if (fopAcM_GetGroup(i_hitActor) == fopAc_ENEMY_e || diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index 5ded6087c4..9d31126b3e 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -13,6 +13,7 @@ #include "c/c_damagereaction.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_camera_mng.h" +#include enum Joint { /* 0x0 */ JNT_WAIST, diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index c625bf0cb5..de72aae604 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -12,6 +12,7 @@ #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_lib.h" +#include #if DEBUG void daNpcT_cmnListenPropertyEvent(char* param_0, int* param_1, daNpcT_HIOParam* param_2) { diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index ef1bb9d3ff..9dc918bc66 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -17,6 +17,7 @@ #if DEBUG #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" +#include #endif enum Aru_RES_File_ID { diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index 5f285ace08..0e3c0028ea 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" +#include const daNpcAsh_HIOParam daNpcAsh_Param_c::m = { 35.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 237c93aa58..6f2c60dc2c 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_ashB.h" #include "d/actor/d_a_npc.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" +#include const daNpcAshB_HIOParam daNpcAshB_Param_c::m = { 205.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 8bb1ec6260..98fec99130 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "d/actor/d_a_tag_kmsg.h" #include "d/actor/d_a_npc_len.h" +#include enum Bans_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 366dcacb2e..6a586c0eae 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -13,6 +13,7 @@ #if DEBUG #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" +#include #endif enum Besu_RES_File_ID { diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index fe6f44846e..7bf2689db1 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_npc_jagar.h" #include "d/actor/d_a_tag_push.h" #include "d/d_meter2_info.h" +#include static int l_bmdData[1][2] = { {11, 1}, diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index 2eb763f042..6d807edacd 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -12,6 +12,7 @@ #include "d/actor/d_a_npc_wrestler.h" #include "Z2AudioLib/Z2Instances.h" #include "d/d_camera.h" +#include enum Bou_RES_File_ID { /* BCK */ @@ -1360,22 +1361,22 @@ int daNpcBouS_c::EvCut_BousIntroSumo1(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': setLookMode(LOOK_PLAYER_TALK); mActorMngrs[0].entry(daPy_getPlayerActorClass()); break; - case '0x0002': - case '0x0003': - case '0x0005': - case '0x0006': - case '0x0007': - case '0x0008': - case '0x0009': + case '0002': + case '0003': + case '0005': + case '0006': + case '0007': + case '0008': + case '0009': initTalk(9, NULL); break; - case '0x0004': + case '0004': setExpressionAnm(ANM_FH_TALK_B, true); break; @@ -1396,17 +1397,17 @@ int daNpcBouS_c::EvCut_BousIntroSumo1(int i_staffId) { } switch (*cutName) { - case '0x0001': - case '0x0004': + case '0001': + case '0004': return 1; - case '0x0002': - case '0x0003': - case '0x0005': - case '0x0006': - case '0x0007': - case '0x0008': - case '0x0009': + case '0002': + case '0003': + case '0005': + case '0006': + case '0007': + case '0008': + case '0009': if (talkProc(NULL, TRUE, NULL)) { s32 choiceNo = mFlow.getChoiceNo(); OS_REPORT("二択分岐 %s\n", choiceNo == 0 ? "はい" : "いいえ"); @@ -1434,7 +1435,7 @@ int daNpcBouS_c::EvCut_BousIntroSumo2(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': initTalk(9, NULL); setLookMode(LOOK_PLAYER_TALK); mActorMngrs[0].entry(daPy_getPlayerActorClass()); @@ -1456,7 +1457,7 @@ int daNpcBouS_c::EvCut_BousIntroSumo2(int i_staffId) { } switch (*cutName) { - case '0x0001': + case '0001': if (mCurAngle.y == fopAcM_searchPlayerAngleY(this)) { if (talkProc(NULL, TRUE, NULL)) { int choiceNo = mFlow.getChoiceNo(); @@ -1489,15 +1490,15 @@ int daNpcBouS_c::EvCut_BousIntroSumo3(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': setLookMode(LOOK_PLAYER_TALK); mActorMngrs[0].entry(daPy_getPlayerActorClass()); break; - case '0x0003': + case '0003': setMotion(MOT_WALK, -1.0f, 0); // fallthrough - case '0x0002': + case '0002': setAngle(-0x2AAA); initTalk(9, NULL); break; @@ -1521,16 +1522,16 @@ int daNpcBouS_c::EvCut_BousIntroSumo3(int i_staffId) { } switch (*cutName) { - case '0x0001': + case '0001': return 1; - case '0x0002': + case '0002': if (talkProc(NULL, TRUE, NULL)) { return 1; } break; - case '0x0003': { + case '0003': { cXyz* pos = dComIfGp_evmng_getMyXyzP(i_staffId, "pos"); if (pos != NULL) { if (cLib_chaseAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, pos), 0x100)) { diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index 629f029a92..1c9cc3c89d 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -2,6 +2,7 @@ #include "d/actor/d_a_npc_cd.h" #include "d/actor/d_a_player.h" +#include static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) { if (param_1 == 0) { diff --git a/src/d/actor/d_a_npc_cd2_HIO.inc b/src/d/actor/d_a_npc_cd2_HIO.inc index 463a6f2e64..f0677570d5 100644 --- a/src/d/actor/d_a_npc_cd2_HIO.inc +++ b/src/d/actor/d_a_npc_cd2_HIO.inc @@ -1,4 +1,5 @@ #include "d/actor/d_a_npc_cd2.h" +#include daNpcCd2_HIO_c::daNpcCd2_HIO_c() { static daNpcCd2_HIO_Jnt_UnkStruct_s a_jntTbl_M[16][19] = { diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index 6f7a28e6a3..ff0e484c8d 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_cdn3.h" #include "d/d_msg_object.h" #include "d/d_s_play.h" +#include const daNpcCdn3_c::ActionPair daNpcCdn3_c::ActionTable[8] = { {&daNpcCdn3_c::initWait, &daNpcCdn3_c::executeWait}, diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index 21b089eb67..e6f6404cbb 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_clerka.h" #include "d/d_msg_object.h" +#include const daNpc_clerkA_HIOParam daNpc_clerkA_Param_c::m = { 220.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index c6400f90a0..39e08d5a27 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_clerkb.h" #include "d/d_msg_object.h" +#include const daNpc_clerkB_HIOParam daNpc_clerkB_Param_c::m = { 220.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index 21398595be..2e47b5f836 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_clerkt.h" #include "d/d_msg_object.h" +#include const daNpcClerkt_HIOParam daNpcClerkt_Param_c::m = { 120.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 759f9b82be..1ae9adda9f 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -13,6 +13,7 @@ #include "d/d_bg_w.h" #include "d/d_meter2_info.h" #include "d/d_tresure.h" +#include enum Coach_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 3300891133..bffee6496b 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_doc.h" #include "Z2AudioLib/Z2Instances.h" +#include static int l_bmdData[1][2] = { {14, 1}, diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index c1187ab9e5..850c5baa7b 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc4.h" #include "d/d_s_play.h" #include "JSystem/JHostIO/JORFile.h" +#include enum fairy_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index f5cc87f8f4..df6fc76ebb 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_fairy_seirei.h" #include "d/actor/d_a_npc4.h" +#include static daNpcT_evtData_c l_evtList[1] = { diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index 64a8f81e01..8e023bd44a 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_fish.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" +#include static int daNpc_Fish_Draw(npc_fish_class* i_this) { return 1; diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index 8856e476d0..a1bfe2dd16 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gnd.h" +#include static int l_bmdData[1][2] = { {11, 1}, diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index d6978ec3cb..c486572932 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -12,6 +12,7 @@ #include "d/actor/d_a_npc_gra.h" #include "d/actor/d_a_tag_gra.h" #include "Z2AudioLib/Z2Instances.h" +#include const daNpc_grA_HIOParam daNpc_grA_Param_c::m = { {90.0f, -4.0f, 1.0f, 850.0f, 255.0f, 280.0f, 40.0f, 100.0f, 0.0f, 0.0f, 20.0f, diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 39637c0317..c19b264a19 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_grc.h" #include "d/actor/d_a_npc.h" #include "Z2AudioLib/Z2Instances.h" +#include enum grC_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index 96e22082a0..819b40db8c 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grm.h" +#include enum grA_Base_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index d88ff0fa3d..0f61ac33d0 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_grmc.h" #include "d/actor/d_a_npc4.h" +#include enum grC_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index 564d0b1d8b..afe283c125 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -11,6 +11,7 @@ #include "d/d_debug_viewer.h" #include "d/actor/d_a_tag_push.h" #include "Z2AudioLib/Z2Instances.h" +#include enum grO_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index a01093ccb6..5af37cf19a 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_grr.h" #include "d/actor/d_a_npc.h" #include "Z2AudioLib/Z2Instances.h" +#include enum grR_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 760b8a6139..ba99deac5d 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -9,6 +9,7 @@ #include "d/d_debug_viewer.h" #include "d/actor/d_a_tag_push.h" #include "Z2AudioLib/Z2Instances.h" +#include enum Event_Cut_Nums { NUM_EVT_CUTS_e = 2, diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 39f3b84bd1..7aade0ff2e 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_obj_grz_rock.h" #include "Z2AudioLib/Z2Instances.h" +#include enum grZ_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index b03f22d716..06dc3c57a7 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "d/d_cc_uty.h" #include "Z2AudioLib/Z2Instances.h" +#include static int l_bmdData[4][2] = { {14, 1}, {26, 2}, diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index b6936f96f5..53eb4bb2d8 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -12,6 +12,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "c/c_damagereaction.h" #include +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_mg_fshop.h" diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index 0b67504bb8..bf45bcd082 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_arrow.h" #include "d/actor/d_a_canoe.h" #include "d/d_meter2_info.h" +#include static int l_bmdData[2][2] = { {13, 1}, diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 00e9a02905..db4505f9eb 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_impal.h" #include "d/actor/d_a_npc.h" +#include daNpcImpal_HIOParam const daNpcImpal_Param_c::m = { 135.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index c228481ad2..865c12ea59 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc.h" #include "d/d_meter2_info.h" #include "d/d_msg_object.h" +#include enum Ins_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index b27eb6f554..118f536b5c 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_npc_bou.h" #include "d/d_meter2_info.h" #include "d/actor/d_a_tag_push.h" +#include enum Jagar_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index efa8931a47..3da4a5eea5 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -9,6 +9,7 @@ #include "d/d_com_static.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" +#include static int l_bmdData[3][2] = { {10, 1}, diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 9be15f2f63..1a086a2c6f 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_kkri.h" #include "d/actor/d_a_e_ym.h" +#include static int l_bmdData[2][2] = { {35, 1}, diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index 3419650c5e..6a6568f9d5 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -14,6 +14,7 @@ #if DEBUG #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" +#include #endif dCcD_SrcCyl daNpc_Kn_c::mCcDCyl = { diff --git a/src/d/actor/d_a_npc_kn_base.inc b/src/d/actor/d_a_npc_kn_base.inc index aa331fb4d5..547a8877e3 100644 --- a/src/d/actor/d_a_npc_kn_base.inc +++ b/src/d/actor/d_a_npc_kn_base.inc @@ -1,6 +1,7 @@ #include "d/actor/d_a_npc_kn.h" #include "d/d_msg_object.h" #include "d/d_k_wmark.h" +#include void daNpc_Kn_c::tgHitCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf, fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) { diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index 7a6993223f..31bdb993a9 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_knj.h" +#include const daNpc_Knj_HIOParam daNpc_Knj_Param_c::m = { 0.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index b4cd80eb38..a68846b7eb 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_npc_len.h" #include "d/actor/d_a_horse.h" #include "d/actor/d_a_tag_evtarea.h" +#include enum Kolin_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index a9036c679d..32d7297382 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kolinb.h" +#include enum Kolinb_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index fc55d7a6d4..0633f52680 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -21,6 +21,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +#include class daNpc_Ks_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index fc17e0fa54..8c103bde0c 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kyury.h" +#include const daNpc_Kyury_HIOParam daNpc_Kyury_Param_c::m = { 200.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 6d3586be20..b8cc97f1ab 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_len.h" #include "d/actor/d_a_tag_push.h" +#include enum Type { /* 0x0 */ TYPE_0, diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index b15297f89d..265901426d 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_len.h" #include "d/actor/d_a_npc_lud.h" +#include const daNpc_Lud_HIOParam daNpc_Lud_Param_c::m = { 160.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 709e27cb5c..2301e4fc8a 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -19,6 +19,7 @@ #include "d/d_timer.h" #if DEBUG #include "d/d_debug_viewer.h" +#include #endif const daNpc_Maro_HIOParam daNpc_Maro_Param_c::m = { diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index 91228a5fc5..8593541b7c 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_midp.h" +#include enum midP_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index 50462a6f25..5bd49a1db5 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_npc4.h" #include "d/actor/d_a_npc_moi.h" #include "d/actor/d_a_npc_uri.h" +#include const daNpc_Moi_HIOParam daNpc_Moi_Param_c::m = { 200.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index 64ab83e0d9..963c646ea8 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_moir.h" #include "d/actor/d_a_ni.h" #include "d/actor/d_a_npc_tk.h" +#include enum MoiR_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index e8725b9f70..8c2aa84525 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_player.h" #include "Z2AudioLib/Z2Instances.h" +#include enum { NUM_EVT_CUTS_e = 5, diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index a02e60a4e3..5d1c8bde1e 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -18,6 +18,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "c/c_damagereaction.h" #include "Z2AudioLib/Z2Instances.h" +#include static home_path_pnt home_path[38] = { {0, {561.0f, 87.0f, -1110.0f}}, diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index 637836d06f..e8f8cb604f 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_pachi_besu.h" #include "d/actor/d_a_npc_pachi_taro.h" #include "Z2AudioLib/Z2Instances.h" +#include enum Besu_RES_File_ID { /* BMDR */ diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index c22bd4ccb0..161f563c5c 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -9,6 +9,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" #include "d/actor/d_a_npc_pachi_taro.h" +#include enum Maro_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index da1530e99e..d7f674810f 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_npc_pachi_maro.h" #include "d/actor/d_a_npc_pachi_besu.h" #include "d/d_debug_viewer.h" +#include enum Taro_RES_File_ID { /* BMDR */ diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index 7b8fb2018c..cd04616d26 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -12,6 +12,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "d/d_debug_viewer.h" #include "Z2AudioLib/Z2Instances.h" +#include enum post_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index 2129c5c52f..5190ccd5c2 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_pouya.h" +#include const daNpc_Pouya_HIOParam daNpc_Pouya_Param_c::m = { 120.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index b32a06b630..75293bd87a 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_raca.h" #include "d/actor/d_a_tag_evtarea.h" #include "d/d_s_play.h" +#include enum Raca_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index 152b9fc5d2..71d6ec6e74 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_rafrel.h" #include "d/actor/d_a_npc.h" #include "d/d_debug_viewer.h" +#include static daNpc_GetParam2 l_bckGetParamList[29] = { {-1, 2, 0}, diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 32440db991..af50f2f769 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc_ks.h" #include "d/actor/d_a_obj_so.h" #include "d/actor/d_a_e_ym.h" +#include enum saru_TW_RES_File_ID { /* BMDR */ diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 3d430c0e47..382a5350f5 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_seib.h" +#include static int l_bmdData[2][1] = {12, 1}; diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index 5b75031fd4..b3a688f721 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_seic.h" #include "SSystem/SComponent/c_counter.h" +#include static int l_bmdData[1][2] = { {9, 1} diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index de3a3c2c72..ba0e82bd49 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_seid.h" #include "SSystem/SComponent/c_counter.h" +#include static int l_bmdData[1][2] = { {5, 1} diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index a0ec617f87..6969645ed1 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_seira.h" #include "d/d_meter_HIO.h" +#include static int l_bmdData[2][2] = { diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 7f79648d9a..ed9e2ea3c9 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_seira2.h" +#include static int l_bmdData[2][2] = { {4, 3}, diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index 306df2a332..87216b3ee1 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_seirei.h" #include "d/d_meter2_info.h" +#include enum Seirei_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index bffc93e883..395d5a0f87 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_tag_evtarea.h" #include "d/d_msg_object.h" +#include const daNpcShad_HIOParam daNpcShad_Param_c::m = { 35.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index aedba3e5f9..d1c31ea12e 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_shaman.h" #include "JSystem/JHostIO/JORFile.h" +#include #if DEBUG daNpc_Sha_HIO_c::daNpc_Sha_HIO_c() { diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 78157b3ba8..1c6d3d1c36 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_shop0.h" +#include static int createHeapCallBack(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index a8361e6b7e..cf026eb243 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_sola.h" +#include enum Bans_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 32956de232..4e501fcb67 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -19,6 +19,7 @@ #include "f_op/f_op_actor.h" #include "f_op/f_op_camera_mng.h" #include +#include daNpc_Maro_c::actionFunc dummy_lit_3931() { return &daNpc_Maro_c::choccai; diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 79c169935d..06b9686bc7 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" +#include const daNpcThe_HIOParam daNpcThe_Param_c::m = { 220.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 67a19b8468..5cde34a632 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_npc_coach.h" #include "d/actor/d_a_startAndGoal.h" #include "d/actor/d_a_coach_2D.h" +#include enum Coach_RES_File_ID { /* BCK */ @@ -1176,10 +1177,10 @@ int daNpcTheB_c::EvCut_PersonalCombatIntro(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': break; - case '0x0002': + case '0002': initTalk(0x16, NULL); setLookMode(LOOK_PLAYER); mActorMngrs[0].entry(daPy_getPlayerActorClass()); @@ -1204,10 +1205,10 @@ int daNpcTheB_c::EvCut_PersonalCombatIntro(int i_staffId) { } switch (*cutName) { - case '0x0001': + case '0001': return 1; - case '0x0002': + case '0002': if (talkProc(NULL, TRUE, NULL)) { dComIfGs_onSaveDunSwitch(52); dComIfGs_onSaveDunSwitch(53); @@ -1229,7 +1230,7 @@ int daNpcTheB_c::EvCut_PersonalCombatRevenge(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': { + case '0001': { fopAc_ac_c* actor_p = getEvtAreaTagP(5, 0); cXyz* pos = dComIfGp_evmng_getMyXyzP(i_staffId, "pos"); int* angle = dComIfGp_evmng_getMyIntegerP(i_staffId, "angle"); @@ -1248,13 +1249,13 @@ int daNpcTheB_c::EvCut_PersonalCombatRevenge(int i_staffId) { break; } - case '0x0002': + case '0002': initTalk(0x17, NULL); setLookMode(LOOK_PLAYER); mActorMngrs[0].entry(daPy_getPlayerActorClass()); break; - case '0x0003': + case '0003': break; default: @@ -1282,19 +1283,19 @@ int daNpcTheB_c::EvCut_PersonalCombatRevenge(int i_staffId) { } switch (*cutName) { - case '0x0001': + case '0001': if (getCoachSpeed() == 0.0f) { return 1; } break; - case '0x0002': + case '0002': if (talkProc(NULL, TRUE, NULL)) { return 1; } break; - case '0x0003': + case '0003': return 1; default: @@ -1411,7 +1412,7 @@ int daNpcTheB_c::EvCut_AnnulationFieldRace(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': if (startAndGoal_p != NULL) { startAndGoal_p->readyStartTimer(); } @@ -1424,7 +1425,7 @@ int daNpcTheB_c::EvCut_AnnulationFieldRace(int i_staffId) { } switch (*cutName) { - case '0x0001': + case '0001': if (startAndGoal_p != NULL && startAndGoal_p->isStartCheck()) { return 1; } @@ -1444,15 +1445,15 @@ int daNpcTheB_c::EvCut_TheBHint(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': setMotionAnm(ANM_SIT, 0.0f); break; - case '0x0002': + case '0002': initTalk(mHintMsgNo, NULL); break; - case '0x0003': { + case '0003': { cXyz pos; csXyz angle; daNpcF_getPlayerInfoFromPlayerList(field_0xe04, mRoomNo, pos, angle); @@ -1479,11 +1480,11 @@ int daNpcTheB_c::EvCut_TheBHint(int i_staffId) { } switch (*cutName) { - case '0x0001': - case '0x0003': + case '0001': + case '0003': return 1; - case '0x0002': + case '0002': if (talkProc(NULL, TRUE, NULL)) { mHintEvtFlag = 0; return 1; @@ -1504,22 +1505,22 @@ int daNpcTheB_c::EvCut_CoachGuardGameOver(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': Z2GetAudioMgr()->bgmStart(Z2BGM_GAME_OVER, 0, 0); break; - case '0x0002': { + case '0002': { daNpcCoach_c* coach_p = (daNpcCoach_c*)fopAcM_SearchByID(parentActorID); cXyz pos(0.0f, -30000.0f, 0.0f); coach_p->setPosAngle(pos, shape_angle); break; } - case '0x0003': + case '0003': ((daCoach2D_c*)fpcM_SearchByName(PROC_COACH2D))->hide(); break; - case '0x0004': + case '0004': break; default: @@ -1529,12 +1530,12 @@ int daNpcTheB_c::EvCut_CoachGuardGameOver(int i_staffId) { } switch (*cutName) { - case '0x0001': - case '0x0002': - case '0x0003': + case '0001': + case '0002': + case '0003': return 1; - case '0x0004': + case '0004': daPy_getPlayerActorClass()->onForceGameOver(); return 1; diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 0bfefbe1d5..09e5a64514 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -16,6 +16,7 @@ #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +#include class daNPC_TK_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index bb9581eca1..a0a89a007d 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_tkc.h" #include "d/actor/d_a_npc.h" #include "d/d_camera.h" +#include enum Tkc_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index 8cf5ac0250..74589199c9 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_tkj.h" #include "d/actor/d_a_npc4.h" +#include static int l_bmdData[1][2] = { {12, 1}, diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 5d047e150b..103a9d57f2 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_tkj2.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" +#include enum Tkj2_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index 0f1a529b5c..ef740d3c26 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -11,6 +11,7 @@ #include "d/d_a_obj.h" #include "d/d_meter2_info.h" #include "f_op/f_op_kankyo_mng.h" +#include enum TKS_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 232d107471..bbd636138b 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -14,6 +14,7 @@ #include "d/actor/d_a_obj_automata.h" #include "d/d_msg_object.h" #include "d/actor/d_a_obj_scannon.h" +#include const daNpc_Toby_HIOParam daNpc_Toby_Param_c::m = { 160.0f, diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index c3d835e6a3..2d0db6e9b8 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -8,6 +8,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_npc_uri.h" #include "m_Do/m_Do_graphic.h" +#include const daNpc_Uri_HIOParam daNpc_Uri_Param_c::m = { 200.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 3d9eefe1e7..e385f97b43 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_wrestler.h" #include "d/d_timer.h" #include +#include #include "d/actor/d_a_tag_arena.h" #include "d/actor/d_a_npc_gra.h" #include "d/actor/d_a_npc_bouS.h" diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index ea0f13ea94..f55f755e04 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_yamid.h" #include "JSystem/JHostIO/JORFile.h" +#include enum yamiD_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index 64d36e12f2..6db606a991 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_yamis.h" +#include enum RES_Name { /* 0x0 */ NONE, diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index 611bdc9feb..fb74a15e52 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_yamit.h" #include "d/actor/d_a_tag_yami.h" +#include enum RES_Name { /* 0x0 */ NONE, diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index 55e13fd4a1..d26b030a49 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_yelia.h" #include "d/actor/d_a_demo_item.h" +#include static daNpc_GetParam1 l_bmdData[3] = { {3, 1}, diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 08b9087092..1cae05166a 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -18,6 +18,7 @@ #include "d/d_meter2_info.h" #include "d/d_timer.h" #include "d/d_tresure.h" +#include enum ykM_RES_File_ID { diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 36c55f22e7..7aac0c1340 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -18,6 +18,7 @@ #include "d/d_tresure.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_ext.h" +#include #if DEBUG class daNpc_ykW_HIO_c : public mDoHIO_entry_c { diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index 93058921fc..296e81c21b 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zanb.h" +#include enum zanB_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index 0353f6ccc8..3fdcf6d84c 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -9,6 +9,7 @@ #include "SSystem/SComponent/c_counter.h" #include "f_op/f_op_actor_mng.h" #include "SSystem/SComponent/c_counter.h" +#include static int l_bmdData[2] = { 7, 1 diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index 0e5da0c5c2..dee038bd59 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zelR.h" +#include enum RES_Name { /* 0x0 */ NONE, diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index f1bd201c7a..7d8c74cad5 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zelRo.h" +#include enum zelRo_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 563fcea24c..42dc79070a 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -10,6 +10,7 @@ #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_hozelda.h" #include "d/d_debug_viewer.h" +#include static u32 l_bmdData[2] = { 11, 1 }; diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index aa78729989..4386b54190 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -18,6 +18,7 @@ #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_npc_hoz.h" #include "d/actor/d_a_obj_zraMark.h" +#include static NPC_ZRA_HIO_CLASS l_HIO; diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index a600f217cc..6adc1e99d7 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -12,6 +12,7 @@ #include "d/actor/d_a_obj_grave_stone.h" #include "d/actor/d_a_obj_zra_rock.h" #include "Z2AudioLib/Z2Instances.h" +#include static NPC_ZRZ_HIO_CLASS l_HIO; diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index f97e72aa49..09568aa6f6 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -12,6 +12,7 @@ #include "d/d_menu_insect.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include static bool hio_set; diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 03dc458775..23ce104482 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -12,6 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" #include "f_pc/f_pc_name.h" +#include class daObj_BattaHIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 25dd1587ef..4503e9435c 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -16,6 +16,7 @@ #endif #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" +#include enum Action_e { /* 0x0 */ ACTION_SW_WAIT_e, diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index f5894f7c7a..d2918eeaeb 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_model.h" #include "d/d_com_inf_game.h" +#include static int daBkyRock_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index ab8f014d15..19fe7f3a41 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -12,6 +12,7 @@ #include "d/d_procname.h" #include "d/actor/d_a_obj_life_container.h" #include "d/actor/d_a_obj_ystone.h" +#include static char* l_arcName = "ef_Portal"; diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index 243f10f978..2085c5e0e1 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -14,6 +14,7 @@ #include "d/d_path.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_camera_mng.h" +#include static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) { obj_brg_class* a_this = (obj_brg_class*)i_bgActor; diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index a666ca8d43..4178763965 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" #include +#include #include "d/d_com_inf_game.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_obj_swBallA.h" diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index 33088afbdd..8082da406a 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -12,6 +12,7 @@ #include "d/d_menu_insect.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include static bool hio_set; diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp index bca278b944..0c490dca02 100644 --- a/src/d/actor/d_a_obj_crystal.cpp +++ b/src/d/actor/d_a_obj_crystal.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_crystal.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include static int CheckCreateHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->CreateHeap(); diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 3c5f1cc226..e8497b2985 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -12,6 +12,7 @@ #include "d/d_menu_insect.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include static bool hio_set; diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index 69123a477a..2e89ee2f85 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_bg_w.h" #include "d/d_path.h" +#include static const Vec l_swOffset = { 0.0f, diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index eff54e3af1..549bda0bb9 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_drop.h" #include "SSystem/SComponent/c_math.h" #include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index 390e1ab36b..0dc8a9c300 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -10,6 +10,7 @@ #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" +#include static char const l_arcName[] = "Fchain"; diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 43b3317770..73bcda8a77 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -13,6 +13,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "SSystem/SComponent/c_counter.h" #include "JSystem/JHostIO/JORFile.h" +#include #if DEBUG #define PARAM field_0x568->mAttr diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index 7f6704af47..71c103bc2c 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_ganonwall.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +#include static u8 const l_idx[24][4] = { {0x17, 0x05, 0x06, 0x01}, {0x17, 0x05, 0x06, 0x02}, {0x17, 0x05, 0x06, 0x03}, diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index 80513d1bc1..2663d8fc6d 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_obj_ganonwall2.h" #include "d/d_com_inf_game.h" +#include static u8 const l_idx[24][4] = { 0x17, 0x05, 0x06, 0x01, 0x17, 0x05, 0x06, 0x02, 0x17, 0x05, 0x06, 0x03, 0x17, 0x05, 0x06, 0x04, diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 238099a0f6..55e2bd5ecf 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -10,6 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" +#include static int daObj_Gb_Draw(obj_gb_class* i_this) { g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr); diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 9ac731d7ac..7a88390269 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -18,6 +18,7 @@ #include "d/d_msg_object.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include class daObj_GrA_Param_c { public: diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index f31da3b0fe..b94a6117e6 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -2,6 +2,7 @@ #include "d/d_camera.h" #include "d/actor/d_a_tag_gra.h" #include +#include f32 daObj_GrA_c::getSrchCircleR() { f32 srchCircleR; diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index f0feb4a3b9..b5e62fb9d0 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_obj_ihasi.h" #include "d/d_com_inf_game.h" +#include static int daObj_Ihasi_Draw(obj_ihasi_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index c4c4775bf2..d577fda4f3 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -9,6 +9,7 @@ #include "d/d_cc_d.h" #include "d/actor/d_a_npc.h" #include "JSystem/JHostIO/JORFile.h" +#include struct daObj_ItaMato_HIOParam { /* 0x00 */ f32 attn_offset; diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 4e5413fa63..c1435c9724 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -12,6 +12,7 @@ #include "d/d_menu_insect.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include static bool hio_set; diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index 22db0ab5cb..0b6f0dfcc3 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -9,6 +9,7 @@ #include "d/d_menu_insect.h" #include "d/d_s_play.h" #include "d/d_cc_uty.h" +#include enum I_Kag_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index 9b0361f48a..904166228e 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -13,6 +13,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +#include daObj_Kago_HIOParam const daObj_Kago_Param_c::m = { 0.0f, diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index d854741350..7899d06e9c 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -9,6 +9,7 @@ #include "d/d_cc_d.h" #include "d/actor/d_a_player.h" #include "d/d_s_play.h" +#include enum Joint { /* 0x0 */ JNT_JOINT1, diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index b8cc58c5fa..b654e91fa5 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -13,6 +13,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_lib.h" +#include static u8 hio_set; diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index d3fd476cd5..9f1e3a555f 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -13,6 +13,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_lib.h" +#include static u8 hio_set; diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 24ef2eae4d..d200074e31 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" +#include static s32 l_bmdData[4] = { 8, 0, 9, 0 }; diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index 3ba6a097c8..904dd8a9e5 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -16,6 +16,7 @@ #include "d/actor/d_a_e_oc.h" #include "d/actor/d_a_e_db.h" #include "SSystem/SComponent/c_counter.h" +#include class daObj_Key_HIO_c : public JORReflexible{ public: diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp index fbd4e58223..ccfc068e3d 100644 --- a/src/d/actor/d_a_obj_kkanban.cpp +++ b/src/d/actor/d_a_obj_kkanban.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_kkanban.h" #include "SSystem/SComponent/c_math.h" #include "d/d_procname.h" +#include static int nodeCallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index fd99731c64..31481c7faf 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -11,6 +11,7 @@ #include "d/d_cc_d.h" #include "d/d_menu_insect.h" #include "f_pc/f_pc_name.h" +#include class daObj_KuwHIO_c : public JORReflexible{ public: diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 8f89c82a04..8365818ea3 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_item_data.h" #include "SSystem/SComponent/c_math.h" +#include const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index 5148a8a6e2..4d75aacb08 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -12,6 +12,7 @@ #include "d/actor/d_a_player.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include static int daObj_Lp_Draw(obj_lp_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor; diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index b56db1563e..c7e58cc22a 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -11,6 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_camera.h" #include "d/d_s_play.h" +#include enum E_bm6_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index c555335745..9d79d4847c 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -20,6 +20,7 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" #include +#include daObj_Maki_HIO_c::daObj_Maki_HIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index 5746ad13d1..2ccb112a26 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_procname.h" +#include static char const* l_arcName = "MR-Table"; diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index 03284cf3d9..26e2ede5f1 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -10,6 +10,7 @@ #include "d/d_menu_insect.h" #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" +#include class daObj_NanHIO_c { public: diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index b1f99c034e..7dc32dbb15 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -11,6 +11,7 @@ #include "d/d_bg_w.h" #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" +#include const static dCcD_SrcSph ccSphSrc = { { diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 35943067e0..69e508971d 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_picture.h" +#include static int daObjPicture_c_createHeap(fopAc_ac_c* i_this) { return ((daObjPicture_c*)i_this)->createHeap(); diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index 24064df752..4640d5693c 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_obj_carry.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" +#include #define ACTION_WAIT 0 #define ACTION_SWON 1 diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index 57e374dc9f..2d77fbaa4d 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -14,6 +14,7 @@ #if DEBUG #include "SSystem/SComponent/c_counter.h" #include "JSystem/JHostIO/JORFile.h" +#include #endif const daObj_Pumpkin_HIOParam daObj_Pumpkin_Param_c::m = { diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index c50e0ed155..9c0874ccab 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_rope_bridge.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include static char* l_arcName[2] = {"L_RopeB_S", "L_RopeB_L"}; diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 475dddbe5d..4a67dd0f3a 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_obj_scannon.h" #include "d/actor/d_a_player.h" #include "d/d_s_play.h" +#include char* l_arcName_Comp = "SkyCannon"; diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index d682aec9cb..e911437d42 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_scannon_crs.h" #include "d/actor/d_a_player.h" #include "d/d_meter2_info.h" +#include static int daSCannonCrs_c_createHeap(fopAc_ac_c* i_this) { return ((daSCannonCrs_c*)i_this)->createHeap(); diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index 6d9025f079..233e442b06 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +#include static char* l_arcName = "SCanTen"; diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index 490005649b..1e2ff2ccbd 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "d/actor/d_a_tag_kmsg.h" #include +#include #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg.h" diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index d20800fdd7..c5e18e4756 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -11,6 +11,7 @@ #include "d/d_item_data.h" #include "d/d_tresure.h" #include "f_op/f_op_camera_mng.h" +#include const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp index 9fca736a54..7a2d491b63 100644 --- a/src/d/actor/d_a_obj_snow_soup.cpp +++ b/src/d/actor/d_a_obj_snow_soup.cpp @@ -9,6 +9,7 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include static int daObjSnowSoup_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 3dce537dab..0431d31851 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -15,6 +15,7 @@ #include "d/d_cc_uty.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +#include daObj_So_HIO_c::daObj_So_HIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 2ed7130f13..c127fffa5f 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_swLight.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" +#include #if DEBUG class daObjSwLight_HIO_c : public mDoHIO_entry_c { diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index 8b75c9b5db..d6834c3704 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -11,6 +11,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include static u32 const l_bmdIdx[5] = { 4, 4, 4, 4, 4, diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index 5c4f1c6b4b..4dfa188862 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_swpropeller.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include #define MODEL_K_PURO 0 #define MODEL_LV9_PURO 1 diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index f4866be6ad..5b8f23d3b6 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" +#include enum Kbota_00_RES_File_ID { /* BMDR */ diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 1404757c2c..3b93a8ee2e 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -15,6 +15,7 @@ #include "SSystem/SComponent/c_lib.h" #include "m_Do/m_Do_lib.h" #include "d/d_menu_insect.h" +#include daObj_TenHIO_c::daObj_TenHIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 6e98282eb1..246b26e423 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -16,6 +16,7 @@ #if DEBUG #include "d/d_debug_viewer.h" +#include #endif static s8 r05yuka_image[192] = { diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index ae0b860467..d184d92217 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -12,6 +12,7 @@ #include "d/d_bomb.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include #if DEBUG daObjTobyHouse_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 4dcf667b72..60ef3736c8 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -13,6 +13,7 @@ #include "f_op/f_op_camera_mng.h" #include "f_pc/f_pc_name.h" #include "m_Do/m_Do_lib.h" +#include class daObj_TomHIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 1c239ff129..8e2d138d59 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -14,6 +14,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" +#include #if DEBUG daObjVolcBom_HIO_c::daObjVolcBom_HIO_c() { diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 7532b31a0a..367144686c 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -12,6 +12,7 @@ #include "d/d_s_play.h" #include "d/d_bg_w.h" #include "d/d_meter2_info.h" +#include static const int l_bmd_idx[] = {9, 11}; diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index c040f6b6b5..e974f99f9b 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_midna.h" #include "d/d_bg_w.h" +#include static char* l_arcName = "Obj_obrg"; diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index e7352efcab..9d8efbff08 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_ystone.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include static char const* l_arcName[7] = { "N_gD_mskF", diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 64748a1dae..136d429b9a 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -9,6 +9,7 @@ #include "JSystem/JKernel/JKRSolidHeap.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" +#include const char* daShopItem_c::getShopArcname() { switch (m_itemNo) { diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 040e698754..43c7256176 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_swhit0.h" #include "d/d_com_inf_game.h" +#include #define COLOR_YELLOW 0 #define COLOR_BLUE 1 diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index 892653e6ed..6927449e86 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -7,6 +7,7 @@ #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/actor/d_a_obj_mirror_table.h" +#include static char* l_arcName = "Lv8Gate"; diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index bf833803ec..b1a4549e2c 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_itamato.h" #include "d/actor/d_a_arrow.h" #include "f_op/f_op_camera_mng.h" +#include static daNpcT_evtData_c l_evtList[8] = { {"", 0}, diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index 81ada5a6fe..47606b7e02 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -6,6 +6,7 @@ #include "d/d_com_static.h" #include "d/d_save.h" #include "f_op/f_op_actor_mng.h" +#include static char* l_evtNameList[] = { NULL, diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index b27a4facc9..7475077177 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -10,6 +10,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" #include "d/d_procname.h" +#include static TAG_LANTERN_HIO_CLASS l_HIO; diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp index ee66c938b7..d1ac38d8ad 100644 --- a/src/d/actor/d_a_tag_mhint.cpp +++ b/src/d/actor/d_a_tag_mhint.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" #include "d/d_meter2_info.h" +#include int daTagMhint_c::create() { fopAcM_ct(this, daTagMhint_c); diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index d9cbd2bf66..ececc7926e 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_tag_msg.h" #include "d/d_com_inf_game.h" #include "d/d_debug_viewer.h" +#include static int createHeapCallBack(fopAc_ac_c* i_this) { daTag_Msg_c* msg = (daTag_Msg_c*)i_this; diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index 0671f06374..d4c9a9cad1 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_tag_shop_item.h" #include "d/d_procname.h" +#include int daTag_ShopItem_c::create() { fopAcM_ct(this, daTag_ShopItem_c); diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp index 8e91fcb7ca..865474bc18 100644 --- a/src/d/actor/d_a_tag_smk_emt.cpp +++ b/src/d/actor/d_a_tag_smk_emt.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_tag_smk_emt.h" #include "d/d_procname.h" +#include daTagSmkEmt_c::daTagSmkEmt_c() { memset(&mParticles,0,0xc); diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 162facf5cc..f1d2cb6a1a 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_tag_sppath.h" #include "d/actor/d_a_player.h" #include +#include static dCcD_SrcCyl l_cylSrc = { { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index a9a58b44fd..12b0d6468e 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -10,6 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include +#include static const f32 l_cull_size_box[6] = { -150.0f, -10.0f, -150.0f, 150.0f, 300.0f, 100.0f }; diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index d148a5343f..0d0d62397d 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_tbox2.h" #include "d/d_bg_w.h" #include "d/actor/d_a_midna.h" +#include void daTbox2_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index deb1905c74..33d9a27762 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -12,6 +12,7 @@ #include "f_op/f_op_camera_mng.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" +#include static int daVrbox2_color_set(vrbox2_class* param_0); diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index cb267e5ef6..1225cad07b 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -11,6 +11,7 @@ #include "f_op/f_op_camera_mng.h" #include "JSystem/JKernel/JKRHeap.h" #include "Z2AudioLib/Z2Instances.h" +#include struct daYkgr_HIO_c : public mDoHIO_entry_c { daYkgr_HIO_c(); diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index 11553d5e05..b78ccd8112 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -6,6 +6,7 @@ #include "SSystem/SComponent/c_lib.h" #include "f_op/f_op_overlap_mng.h" #include +#include #include "d/d_camera.h" #include "f_op/f_op_camera_mng.h" diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 237a1a7770..f3318b63c2 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -10,6 +10,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "SSystem/SComponent/c_counter.h" +#include #define DRAW_TYPE_YELLOW 0 #define DRAW_TYPE_RED 1 diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp index 3799fe52da..d4e8ff019a 100644 --- a/src/d/d_bg_parts.cpp +++ b/src/d/d_bg_parts.cpp @@ -6,6 +6,7 @@ #include "f_op/f_op_camera_mng.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" +#include void dBgp_c::material_c::draw() { material_c* material = this; diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp index 015325d6a1..45c45d6038 100644 --- a/src/d/d_cam_param.cpp +++ b/src/d/d_cam_param.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_player.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" +#include enum CameraFlags { CAM_PARAM_GAPX, CAM_PARAM_GAPZ, diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 9e7bf7c9d2..4d3c281163 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -21,6 +21,7 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" #include +#include #if DEBUG #include "d/d_debug_pad.h" diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 117d23da6f..c2ec47a986 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -23,6 +23,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include +#include void dComIfG_play_c::ct() { mWindowNum = 0; diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 806efb5637..ee05d34170 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -17,6 +17,7 @@ #include "d/actor/d_grass.h" #include "d/actor/d_flower.h" #include +#include s16 const daObjMovebox::Act_c::M_dir_base[4] = { 0x0000, diff --git a/src/d/d_debug_camera.cpp b/src/d/d_debug_camera.cpp index b2ebdf699e..10c5edd71f 100644 --- a/src/d/d_debug_camera.cpp +++ b/src/d/d_debug_camera.cpp @@ -8,6 +8,7 @@ #include "JSystem/JHostIO/JORServer.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTReport.h" +#include namespace zevwork { const int CutMaxNum = 32; diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 023f1fcbdc..9c38bcb3a2 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_movie_player.h" #include "JSystem/JGadget/pointer.h" #include "JSystem/JGadget/define.h" +#include s16 dDemo_c::m_branchId = -1; diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 1cd4c3e3b7..287aa9f3d8 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -11,6 +11,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_drawlist.h" #include "d/actor/d_a_alink.h" +#include namespace { static bool isStageEvent(int param_0) { diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 7958ea5fad..cdf3a9efe8 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_tag_mstop.h" #include "d/d_event_debug.h" #include "SSystem/SComponent/c_counter.h" +#include namespace { static u8 event_debug_evnt() { diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index 55ba5f71b9..421ab79c73 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -13,6 +13,7 @@ #include "d/d_msg_object.h" #include "m_Do/m_Do_graphic.h" #include "SSystem/SComponent/c_counter.h" +#include inline BOOL dEvDtFlagCheck(int i_flag) { return dComIfGp_getEventManager().getFlags().flagCheck(i_flag); diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index 668e948ecf..16161b5ee7 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -9,6 +9,7 @@ #include "JSystem/J3DGraphBase/J3DTexture.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include void dEyeHL_c::entry(J3DModelData* p_mData, char const* name) { J3DTexture* tex = p_mData->getTexture(); diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index 313d73bb5c..8c64684010 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -12,6 +12,7 @@ #include "d/d_meter2_info.h" #include "d/d_pane_class_alpha.h" #include +#include dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { mArchive = i_archive; diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 19db401276..b2104bc00a 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -21,6 +21,7 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include static s32 SelStartFrameTbl[3] = { 59, diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 4bf16c7e42..6b4838c3b7 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -12,6 +12,7 @@ #include "d/d_pane_class.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/J2DGraph/J2DGrafContext.h" +#include class dGov_HIO_c : public mDoHIO_entry_c { public: diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 905ec191eb..0a7314fb31 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -8,6 +8,7 @@ #include "d/d_item.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" +#include static void (*item_func_ptr[256])() = { item_func_HEART, diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index c50b551992..7cf0d4af2b 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -12,6 +12,7 @@ #include "SSystem/SComponent/c_m3d_g_cyl.h" #include "d/d_debug_viewer.h" #include "f_op/f_op_actor_mng.h" +#include #if DEBUG dJntCol_HIO_c l_HIO; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 1a8596eb74..8ac0947461 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -25,6 +25,7 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" #include +#include static void GxXFog_set(); diff --git a/src/d/d_kankyo_debug.cpp b/src/d/d_kankyo_debug.cpp index 973f281119..db88bf37d3 100644 --- a/src/d/d_kankyo_debug.cpp +++ b/src/d/d_kankyo_debug.cpp @@ -7,6 +7,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include static void add_update_proc(u8* mode, s16* param_1, s16* param_2, s16* param_3) { int value; diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 3769ab6f10..73e9af07cc 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -11,6 +11,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" +#include static void vectle_calc(DOUBLE_POS* i_pos, cXyz* o_out) { double s = sqrt(i_pos->x * i_pos->x + i_pos->y * i_pos->y + i_pos->z * i_pos->z); diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 77545a769c..0dd064f69a 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -13,6 +13,7 @@ #include "d/d_kankyo_rain.h" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_kankyo_mng.h" +#include #define EF_THUNDER01_BMD 0x1E #define EF_THUNDER02_BMD 0x1F diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index d3223fd46c..92d4b97b8e 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -8,6 +8,7 @@ #include "d/d_kyeff.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" +#include #if DEBUG class dKyeff_HIO_c : public JORReflexible { diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index 6678e6d9af..2455f691be 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -13,6 +13,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" +#include #if DEBUG void dMap_HIO_c::genMessage(JORMContext* mctx) { diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp index 7e39f4a685..2ddd0815ec 100644 --- a/src/d/d_map_path.cpp +++ b/src/d/d_map_path.cpp @@ -12,6 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/d_map_path.h" #include "m_Do/m_Do_lib.h" +#include void dMpath_n::dTexObjAggregate_c::create() { static int const data[7] = { diff --git a/src/d/d_map_path_fmap.cpp b/src/d/d_map_path_fmap.cpp index f3fbef9441..8cf6a4a580 100644 --- a/src/d/d_map_path_fmap.cpp +++ b/src/d/d_map_path_fmap.cpp @@ -2,6 +2,7 @@ #include "d/d_com_inf_game.h" #include "d/d_map_path_fmap.h" +#include void fmpTresTypeGroupDataList_c::addTypeGroupData(u8 i_typeGroupNo, dTres_c::data_s const* i_tresData) { diff --git a/src/d/d_menu_calibration.cpp b/src/d/d_menu_calibration.cpp index 72ec058eec..69f28f4109 100644 --- a/src/d/d_menu_calibration.cpp +++ b/src/d/d_menu_calibration.cpp @@ -12,6 +12,7 @@ #include "d/d_meter_HIO.h" #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" +#include // Need 0xC bytes of padding with no symbol between dMenu_Calibration_c::__vtable and the end of .data // This is likely caused by the vtable of an abstract base class getting put there and then stripped out. diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index 0351608c18..ba9728c1a5 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -28,6 +28,7 @@ #include "d/d_lib.h" #include "d/d_meter2_info.h" #include +#include #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_mtx.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index b20fcedee0..70367af4e3 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -23,6 +23,7 @@ #include "d/d_menu_window.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_graphic.h" +#include #if (PLATFORM_WII || PLATFORM_SHIELD) #define POINTER_OPT dComIfGs_getOptPointer() diff --git a/src/d/d_menu_fishing.cpp b/src/d/d_menu_fishing.cpp index 09aa3b057a..315d820e59 100644 --- a/src/d/d_menu_fishing.cpp +++ b/src/d/d_menu_fishing.cpp @@ -14,6 +14,7 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include typedef void (dMenu_Fishing_c::*initFunc)(); initFunc map_init_process[] = { diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 5c89256e06..a9e88c8696 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -6,6 +6,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" #include +#include #include "f_op/f_op_msg_mng.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index 3815e83bad..20d798b947 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -17,6 +17,7 @@ #include "d/d_msg_scrn_explain.h" #include "m_Do/m_Do_graphic.h" #include "d/actor/d_a_midna.h" +#include dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dMeter2Info_setMapDrugFlag(0); diff --git a/src/d/d_menu_fmap_map.cpp b/src/d/d_menu_fmap_map.cpp index fb51845497..39e23e5ef8 100644 --- a/src/d/d_menu_fmap_map.cpp +++ b/src/d/d_menu_fmap_map.cpp @@ -8,6 +8,7 @@ #include "d/d_debug_viewer.h" #include "d/d_menu_fmap_map.h" #include "m_Do/m_Do_graphic.h" +#include static u8 twoValueLineInterpolation(u8 i_value1, u8 i_value2, f32 i_param) { return (u8)((f32)i_value1 + i_param * ((f32)i_value2 - (f32)i_value1)); diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index c8f8cc6d51..239195a51b 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -20,6 +20,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include +#include typedef void (dMenu_Insect_c::*initFunc)(); static initFunc map_init_process[] = { diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index 0f2f0fcf55..0e4fd1ffe9 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -10,6 +10,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTTexture.h" #include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index faf96802cb..ee1be7dc6a 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -11,6 +11,7 @@ #include "d/d_meter_HIO.h" #include "d/d_msg_string.h" #include +#include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "d/d_msg_scrn_arrow.h" diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 823ea577fc..78ff06dc24 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -4,6 +4,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" #include +#include #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" diff --git a/src/d/d_menu_skill.cpp b/src/d/d_menu_skill.cpp index 8aaececff3..59a4610309 100644 --- a/src/d/d_menu_skill.cpp +++ b/src/d/d_menu_skill.cpp @@ -16,6 +16,7 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include typedef void (dMenu_Skill_c::*initFunc)(); static initFunc map_init_process[] = { diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index e4261c8d3e..28cebd533b 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -22,6 +22,7 @@ #include "d/d_meter_string.h" #include "f_op/f_op_msg_mng.h" #include "d/actor/d_a_horse.h" +#include int dMeter2_c::_create() { stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index 138c15eb33..dba0acf6fb 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -11,6 +11,7 @@ #include "d/d_meter_map.h" #include "d/d_msg_class.h" #include "d/d_msg_object.h" +#include enum ITEMICON_RES_FILE_ID { ITEMICON_BTI_ARI_MESU_00=0x3, diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index 7d3513aade..73fe999993 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -10,6 +10,7 @@ #include "d/d_menu_fmap_map.h" #include "d/d_meter_map.h" #include "m_Do/m_Do_ext.h" +#include dMeter_menuHIO_c::dMeter_menuHIO_c() { mGameover = 70; diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index 7147e97bc3..82be060e44 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -16,6 +16,7 @@ #include "d/d_msg_out_font.h" #include "d/d_msg_string.h" #include "d/d_pane_class.h" +#include #if VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 diff --git a/src/d/d_meter_hakusha.cpp b/src/d/d_meter_hakusha.cpp index ab9a0fc833..8e11b76757 100644 --- a/src/d/d_meter_hakusha.cpp +++ b/src/d/d_meter_hakusha.cpp @@ -13,6 +13,7 @@ #include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" #include "d/d_pane_class.h" +#include dMeterHakusha_c::dMeterHakusha_c(void* i_screen) { field_0x004 = (J2DScreen*)i_screen; diff --git a/src/d/d_meter_map.cpp b/src/d/d_meter_map.cpp index 08050a230d..79bffe0018 100644 --- a/src/d/d_meter_map.cpp +++ b/src/d/d_meter_map.cpp @@ -16,6 +16,7 @@ #include "f_op/f_op_overlap_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "d/d_camera.h" +#include #if (PLATFORM_WII || PLATFORM_SHIELD) dMeter_map_HIO_c g_meter_mapHIO; diff --git a/src/d/d_meter_string.cpp b/src/d/d_meter_string.cpp index c416244d18..cd0b402505 100644 --- a/src/d/d_meter_string.cpp +++ b/src/d/d_meter_string.cpp @@ -16,6 +16,7 @@ #include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" #include "d/d_pane_class.h" +#include dMeterString_c::dMeterString_c(int i_stringID) { mpMapArchive = dComIfGp_getAllMapArchive(); diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index eb9e9552f0..1c7edf2dd4 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -2,6 +2,7 @@ #include "d/d_msg_class.h" #include +#include #include "d/d_meter2_info.h" #include "d/d_msg_object.h" #include "d/d_msg_unit.h" diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index 29075fe597..ef60b8ab69 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_myna.h" #include "d/actor/d_a_obj_ss_base.h" #include "SSystem/SComponent/c_math.h" +#include dMsgFlow_c::dMsgFlow_c() { mNonStopJunpFlowFlag = 0; diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 920c35d2cf..aa2a6957aa 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -23,6 +23,7 @@ #include "d/actor/d_a_midna.h" #include "f_op/f_op_msg_mng.h" #include +#include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index 60d1379b50..a68029cc23 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -12,6 +12,7 @@ #include "d/d_pane_class.h" #include "m_Do/m_Do_controller_pad.h" #include +#include #if VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index e6cd7f582a..e85eaa6907 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -22,6 +22,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTTexture.h" +#include dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { if (param_3 != NULL) { diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp index 53d83df320..d921c160d3 100644 --- a/src/d/d_msg_scrn_jimaku.cpp +++ b/src/d/d_msg_scrn_jimaku.cpp @@ -13,6 +13,7 @@ #include "d/d_msg_object.h" #include "d/d_msg_scrn_light.h" #include "d/d_pane_class.h" +#include dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { if (i_heap != NULL) { diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index 5324728edc..6bc3682516 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -18,6 +18,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" +#include dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { if (param_3 != NULL) { diff --git a/src/d/d_msg_string_base.cpp b/src/d/d_msg_string_base.cpp index 2e3124e6bd..2a57a87fb8 100644 --- a/src/d/d_msg_string_base.cpp +++ b/src/d/d_msg_string_base.cpp @@ -10,6 +10,7 @@ #include "d/d_meter2_info.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/J2DGraph/J2DTextBox.h" +#include dMsgStringBase_c::dMsgStringBase_c() { field_0x20 = 0; diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index 7ea5111958..bfa7d7b667 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -3,6 +3,7 @@ #include "d/d_msg_unit.h" #include "d/d_com_inf_game.h" #include +#include #include "d/d_kankyo.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index e45a9ee0d1..f83eda6abb 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -7,6 +7,7 @@ #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_controller_pad.h" #include +#include #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index f39c537ed6..88b3203049 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -17,6 +17,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_graphic.h" #include +#include dRes_info_c::dRes_info_c() { mCount = 0; diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index e905222717..5ccdcd95a2 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -17,6 +17,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" +#include #if PLATFORM_WII #include "d/d_cursor_mng.h" diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index bc7414f8e4..8fb2ff819b 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -20,6 +20,7 @@ #include "JSystem/JUtility/JUTReport.h" #include +#include #if DEBUG void dScnMenu_setItem(int i_slotNo, u8 i_itemNo); diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 5e6e97467d..69512ffea2 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -26,6 +26,7 @@ #include "m_Do/m_Do_graphic.h" #include "d/actor/d_a_suspend.h" #include "d/actor/d_a_ykgr.h" +#include #if PLATFORM_WII #include "d/d_cursor_mng.h" diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 9b858680ff..4e87bcef37 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -12,6 +12,7 @@ #include "d/d_bg_parts.h" #include "m_Do/m_Do_Reset.h" #include +#include static int dScnRoom_Draw(room_of_scene_class* i_this) { return 1; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 8d54b31fa0..01bdb19ddf 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -14,6 +14,7 @@ #include "d/d_save_init.h" #include "f_op/f_op_scene_mng.h" #include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index c2fc86ab0d..6bbd3faa91 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -5,6 +5,7 @@ #include "d/d_com_inf_game.h" #include "JSystem/J2DGraph/J2DAnimation.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include dSelect_cursorHIO_c::dSelect_cursorHIO_c() { field_0x8 = 1.0f; diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index 155e010da1..a10ef7556e 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -17,6 +17,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" #include "d/actor/d_a_tag_shop_item.h" +#include static daTag_ShopItem_c* dShopSystem_itemActor[7] = { diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 22d3b156fb..22e7b00c64 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -20,6 +20,7 @@ #include "global.h" #include "m_Do/m_Do_Reset.h" #include +#include void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe, u8 i_speed) { diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 4bb87da478..4ae3a54280 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -21,6 +21,7 @@ #include "d/d_pane_class.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_lib.h" +#include static int dTimer_createStart2D(s32 param_0, u16 param_1); diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index b03bdc2561..014d0b1e3a 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -19,6 +19,7 @@ #include "d/d_model.h" #include "d/actor/d_a_grass.h" #include "d/d_tresure.h" +#include fapGm_HIO_c::fapGm_HIO_c() { mUsingHostIO = true; diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index 1467bd56c2..29c72ac187 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -13,6 +13,7 @@ #if PLATFORM_WII || PLATFORM_SHIELD #include #include +#include #endif #define SLOT_A 0 diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index d04abc96ee..d1d0352daa 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -9,6 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_save.h" #include +#include #if VERSION == VERSION_GCN_JPN #define HEADER_TITLE "ゼルダの伝説 ﾄﾜｲﾗｲﾄﾌﾟﾘﾝｾｽ" diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 7f4bf6f8f9..310fe4f5b1 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -23,6 +23,7 @@ #include "m_Do/m_Do_main.h" #include "m_Do/m_Do_mtx.h" #include +#include u8 mDoExt::CurrentHeapAdjustVerbose; u8 mDoExt::HeapAdjustVerbose; diff --git a/src/m_Do/m_Do_ext2.cpp b/src/m_Do/m_Do_ext2.cpp index 9d4c18228f..2dad761fc7 100644 --- a/src/m_Do/m_Do_ext2.cpp +++ b/src/m_Do/m_Do_ext2.cpp @@ -2,6 +2,7 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "m_Do/m_Do_ext2.h" +#include FixedMemoryCheck* FixedMemoryCheck::sFirst; diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 08842cd792..5fab98666f 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -31,6 +31,7 @@ #include "d/d_meter2_info.h" #include "d/d_s_play.h" #include "DynamicLink.h" +#include #if PLATFORM_WII || PLATFORM_SHIELD #include