From ffd010d45c4b994f69d197383d4b3395e355963e Mon Sep 17 00:00:00 2001 From: Max Roncace Date: Thu, 21 Aug 2025 23:39:50 -0400 Subject: [PATCH] Add a precompiled header for RELs --- .clangd | 5 + .vscode/settings.json | 2 + configure.py | 392 +++++++++--------- .../JSystem/J3DGraphAnimator/J3DMaterialAnm.h | 14 +- include/JSystem/J3DGraphBase/J3DMatBlock.h | 10 +- include/JSystem/JAudio2/JASBasicWaveBank.h | 1 - include/JSystem/JAudio2/JASSimpleWaveBank.h | 1 - include/SSystem/SComponent/c_sxyz.h | 2 +- include/SSystem/SComponent/c_xyz.h | 2 +- include/Z2AudioLib/Z2Calc.h | 4 + include/d/actor/d_a_b_dr.h | 47 --- include/d/actor/d_a_b_gg.h | 17 - include/d/actor/d_a_b_mgn.h | 17 - include/d/actor/d_a_b_tn.h | 21 - include/d/actor/d_a_b_yo.h | 24 -- include/d/actor/d_a_b_yo_ice.h | 12 - include/d/actor/d_a_balloon_2D.h | 71 +--- include/d/actor/d_a_coach_2D.h | 80 ---- include/d/actor/d_a_e_ba.h | 15 - include/d/actor/d_a_e_bi.h | 15 - include/d/actor/d_a_e_bs.h | 17 - include/d/actor/d_a_e_bu.h | 16 - include/d/actor/d_a_e_cr.h | 14 - include/d/actor/d_a_e_db.h | 16 - include/d/actor/d_a_e_dd.h | 20 - include/d/actor/d_a_e_df.h | 13 - include/d/actor/d_a_e_dn.h | 22 - include/d/actor/d_a_e_dt.h | 18 - include/d/actor/d_a_e_fm.h | 57 --- include/d/actor/d_a_e_fs.h | 15 - include/d/actor/d_a_e_fz.h | 48 --- include/d/actor/d_a_e_gi.h | 20 - include/d/actor/d_a_e_gob.h | 18 - include/d/actor/d_a_e_hb.h | 19 - include/d/actor/d_a_e_kg.h | 12 - include/d/actor/d_a_e_kk.h | 16 - include/d/actor/d_a_e_kr.h | 80 ---- include/d/actor/d_a_e_mf.h | 21 - include/d/actor/d_a_e_ms.h | 15 - include/d/actor/d_a_e_nz.h | 17 - include/d/actor/d_a_e_oc.h | 18 - include/d/actor/d_a_e_ot.h | 15 - include/d/actor/d_a_e_pm.h | 32 -- include/d/actor/d_a_e_pz.h | 17 - include/d/actor/d_a_e_rb.h | 11 - include/d/actor/d_a_e_rd.h | 42 -- include/d/actor/d_a_e_rdb.h | 12 - include/d/actor/d_a_e_rdy.h | 33 -- include/d/actor/d_a_e_s1.h | 19 - include/d/actor/d_a_e_sm2.h | 17 - include/d/actor/d_a_e_sw.h | 17 - include/d/actor/d_a_e_th.h | 14 - include/d/actor/d_a_e_vt.h | 22 - include/d/actor/d_a_e_yk.h | 18 - include/d/actor/d_a_e_ym.h | 16 - include/d/actor/d_a_e_ymb.h | 14 - include/d/actor/d_a_e_yr.h | 80 ---- include/d/actor/d_a_e_zs.h | 11 - include/d/actor/d_a_ep.h | 5 - include/d/actor/d_a_formation_mng.h | 11 +- include/d/actor/d_a_mg_rod.h | 16 - include/d/actor/d_a_myna.h | 29 -- include/d/actor/d_a_nbomb.h | 1 - include/d/actor/d_a_npc_bou.h | 4 +- include/d/actor/d_a_npc_doorboy.h | 2 +- include/d/actor/d_a_npc_fguard.h | 2 +- include/d/actor/d_a_npc_grc.h | 2 +- include/d/actor/d_a_npc_grr.h | 2 +- include/d/actor/d_a_npc_henna.h | 29 -- include/d/actor/d_a_npc_ks.h | 23 - include/d/actor/d_a_npc_shad.h | 16 - include/d/actor/d_a_npc_shop_maro.h | 4 +- include/d/actor/d_a_npc_tk.h | 25 -- include/d/actor/d_a_obj_Turara.h | 19 - include/d/actor/d_a_obj_amiShutter.h | 16 +- include/d/actor/d_a_obj_batta.h | 12 - include/d/actor/d_a_obj_bhbridge.h | 13 +- include/d/actor/d_a_obj_flag2.h | 2 +- include/d/actor/d_a_obj_fw.h | 4 + include/d/actor/d_a_obj_grave_stone.h | 3 - include/d/actor/d_a_obj_key.h | 12 - include/d/actor/d_a_obj_klift00.h | 15 - include/d/actor/d_a_obj_laundry.h | 3 - include/d/actor/d_a_obj_lv3Water.h | 13 +- include/d/actor/d_a_obj_lv3Water2.h | 10 - include/d/actor/d_a_obj_lv4CandleDemoTag.h | 10 - include/d/actor/d_a_obj_lv4chandelier.h | 8 - include/d/actor/d_a_obj_nan.h | 11 - include/d/actor/d_a_obj_poCandle.h | 2 +- include/d/actor/d_a_obj_poFire.h | 21 - include/d/actor/d_a_obj_sekizoa.h | 15 +- include/d/actor/d_a_obj_sw.h | 3 - include/d/actor/d_a_obj_syRock.h | 32 +- include/d/actor/d_a_obj_waterGate.h | 2 +- include/d/actor/d_a_obj_waterPillar.h | 31 +- include/d/actor/d_a_obj_zraMark.h | 7 +- include/d/actor/d_a_title.h | 17 - include/d/d_com_inf_game.h | 22 +- include/d/d_drawlist.h | 2 +- include/d/d_map_path_fmap.h | 11 +- include/d/d_stage.h | 5 +- include/d/dolzel.h | 10 + include/d/dolzel.pch | 6 + include/d/dolzel_base.pch | 25 ++ include/d/dolzel_rel.h | 11 + include/d/dolzel_rel.pch | 6 + include/f_op/f_op_actor_mng.h | 9 +- include/global.h | 31 -- include/m_Do/m_Do_graphic.h | 6 - include/weak_bss_1109_to_1009.h | 23 + src/DynamicLink.cpp | 2 +- src/JSystem/J2DGraph/J2DTextBox.cpp | 2 +- src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 5 - src/JSystem/J3DU/J3DUDL.cpp | 2 +- src/JSystem/JAudio2/JAISoundHandles.cpp | 2 +- src/JSystem/JAudio2/JAISoundInfo.cpp | 2 +- src/JSystem/JAudio2/JASAudioReseter.cpp | 2 +- src/JSystem/JAudio2/JASCallback.cpp | 2 +- src/JSystem/JAudio2/JASDSPChannel.cpp | 2 +- src/JSystem/JAudio2/JASDrumSet.cpp | 2 +- src/JSystem/JAudio2/JASDvdThread.cpp | 2 +- src/JSystem/JAudio2/JASLfo.cpp | 2 +- src/JSystem/JAudio2/JASOscillator.cpp | 2 +- src/JSystem/JAudio2/JASProbe.cpp | 2 +- src/JSystem/JAudio2/JASRegisterParam.cpp | 2 +- src/JSystem/JAudio2/JASResArcLoader.cpp | 2 +- src/JSystem/JAudio2/JASSeqCtrl.cpp | 2 +- src/JSystem/JAudio2/JASSoundParams.cpp | 2 +- src/JSystem/JAudio2/JASTrackPort.cpp | 2 +- src/JSystem/JAudio2/JASVoiceBank.cpp | 2 +- .../JAudio2/JAUAudioArcInterpreter.cpp | 2 +- src/JSystem/JAudio2/JAUAudioArcLoader.cpp | 2 +- src/JSystem/JAudio2/JAUSeqCollection.cpp | 2 +- src/JSystem/JAudio2/JAUSoundAnimator.cpp | 2 +- src/JSystem/JMath/JMath.cpp | 2 +- src/JSystem/JMath/random.cpp | 2 +- src/JSystem/JParticle/JPAExTexShape.cpp | 2 +- src/JSystem/JParticle/JPAResourceManager.cpp | 2 +- src/JSystem/JParticle/JPATexture.cpp | 2 +- .../JStudio/JStudio/fvb-data-parse.cpp | 2 +- src/JSystem/JSupport/JSUFileStream.cpp | 2 +- src/JSystem/JSupport/JSUList.cpp | 2 +- src/JSystem/JUtility/JUTCacheFont.cpp | 2 +- src/JSystem/JUtility/JUTDbPrint.cpp | 2 +- src/JSystem/JUtility/JUTFader.cpp | 2 +- src/JSystem/JUtility/JUTFont.cpp | 2 +- src/JSystem/JUtility/JUTGraphFifo.cpp | 2 +- src/JSystem/JUtility/JUTNameTab.cpp | 2 +- .../MSL/MSL_C/MSL_Common/Include/cmath.h | 1 - .../MSL/MSL_C/MSL_Common/Include/math.h | 12 +- src/SSystem/SStandard/s_basic.cpp | 2 +- src/Z2AudioLib/Z2Calc.cpp | 2 +- src/Z2AudioLib/Z2EnvSeMgr.cpp | 7 +- src/Z2AudioLib/Z2SoundObject.cpp | 8 +- src/d/actor/d_a_L7demo_dr.cpp | 2 + src/d/actor/d_a_L7low_dr.cpp | 2 + src/d/actor/d_a_L7op_demo_dr.cpp | 2 + src/d/actor/d_a_alink.cpp | 7 +- src/d/actor/d_a_alldie.cpp | 2 + src/d/actor/d_a_andsw.cpp | 2 + src/d/actor/d_a_andsw2.cpp | 2 + src/d/actor/d_a_arrow.cpp | 21 +- src/d/actor/d_a_b_bh.cpp | 4 +- src/d/actor/d_a_b_bq.cpp | 4 +- src/d/actor/d_a_b_dr.cpp | 57 ++- src/d/actor/d_a_b_dre.cpp | 21 +- src/d/actor/d_a_b_ds.cpp | 98 +---- src/d/actor/d_a_b_gg.cpp | 22 +- src/d/actor/d_a_b_gm.cpp | 21 +- src/d/actor/d_a_b_gnd.cpp | 5 +- src/d/actor/d_a_b_go.cpp | 2 + src/d/actor/d_a_b_gos.cpp | 2 + src/d/actor/d_a_b_mgn.cpp | 22 +- src/d/actor/d_a_b_ob.cpp | 6 +- src/d/actor/d_a_b_oh.cpp | 97 +---- src/d/actor/d_a_b_oh2.cpp | 2 + src/d/actor/d_a_b_tn.cpp | 71 ++-- src/d/actor/d_a_b_yo.cpp | 30 +- src/d/actor/d_a_b_yo_ice.cpp | 23 +- src/d/actor/d_a_b_zant.cpp | 22 +- src/d/actor/d_a_b_zant_magic.cpp | 4 +- src/d/actor/d_a_b_zant_mobile.cpp | 2 + src/d/actor/d_a_b_zant_sima.cpp | 2 + src/d/actor/d_a_balloon_2D.cpp | 193 ++++++--- src/d/actor/d_a_bd.cpp | 5 +- src/d/actor/d_a_bg.cpp | 2 + src/d/actor/d_a_bg_obj.cpp | 228 +--------- src/d/actor/d_a_boomerang.cpp | 5 +- src/d/actor/d_a_bullet.cpp | 2 + src/d/actor/d_a_canoe.cpp | 4 +- src/d/actor/d_a_coach_2D.cpp | 82 ++++ src/d/actor/d_a_coach_fire.cpp | 4 +- src/d/actor/d_a_cow.cpp | 9 +- src/d/actor/d_a_crod.cpp | 2 + src/d/actor/d_a_cstaF.cpp | 2 + src/d/actor/d_a_cstatue.cpp | 7 +- src/d/actor/d_a_demo00.cpp | 6 +- src/d/actor/d_a_demo_item.cpp | 19 +- src/d/actor/d_a_disappear.cpp | 2 + src/d/actor/d_a_dmidna.cpp | 2 + src/d/actor/d_a_do.cpp | 273 +----------- src/d/actor/d_a_door_boss.cpp | 17 +- src/d/actor/d_a_door_bossL1.cpp | 20 +- src/d/actor/d_a_door_bossL5.cpp | 20 +- src/d/actor/d_a_door_dbdoor00.cpp | 20 +- src/d/actor/d_a_door_knob00.cpp | 20 +- src/d/actor/d_a_door_mbossL1.cpp | 17 +- src/d/actor/d_a_door_push.cpp | 20 +- src/d/actor/d_a_door_shutter.cpp | 20 +- src/d/actor/d_a_door_spiral.cpp | 2 + src/d/actor/d_a_dshutter.cpp | 22 +- src/d/actor/d_a_e_ai.cpp | 3 +- src/d/actor/d_a_e_arrow.cpp | 115 +---- src/d/actor/d_a_e_ba.cpp | 18 +- src/d/actor/d_a_e_bee.cpp | 91 +--- src/d/actor/d_a_e_bg.cpp | 2 + src/d/actor/d_a_e_bi.cpp | 23 +- src/d/actor/d_a_e_bi_leaf.cpp | 2 + src/d/actor/d_a_e_bs.cpp | 20 +- src/d/actor/d_a_e_bu.cpp | 19 +- src/d/actor/d_a_e_bug.cpp | 6 +- src/d/actor/d_a_e_cr.cpp | 17 +- src/d/actor/d_a_e_cr_egg.cpp | 2 + src/d/actor/d_a_e_db.cpp | 19 +- src/d/actor/d_a_e_db_leaf.cpp | 2 + src/d/actor/d_a_e_dd.cpp | 22 +- src/d/actor/d_a_e_df.cpp | 19 +- src/d/actor/d_a_e_dk.cpp | 4 +- src/d/actor/d_a_e_dn.cpp | 25 +- src/d/actor/d_a_e_dt.cpp | 38 +- src/d/actor/d_a_e_fb.cpp | 96 +---- src/d/actor/d_a_e_fk.cpp | 95 +---- src/d/actor/d_a_e_fm.cpp | 62 ++- src/d/actor/d_a_e_fs.cpp | 20 +- src/d/actor/d_a_e_fz.cpp | 31 +- src/d/actor/d_a_e_ga.cpp | 2 + src/d/actor/d_a_e_gb.cpp | 5 +- src/d/actor/d_a_e_ge.cpp | 3 +- src/d/actor/d_a_e_gi.cpp | 23 +- src/d/actor/d_a_e_gm.cpp | 96 +---- src/d/actor/d_a_e_gob.cpp | 21 +- src/d/actor/d_a_e_gs.cpp | 2 + src/d/actor/d_a_e_hb.cpp | 22 +- src/d/actor/d_a_e_hb_leaf.cpp | 2 + src/d/actor/d_a_e_hm.cpp | 95 +---- src/d/actor/d_a_e_hp.cpp | 6 +- src/d/actor/d_a_e_hz.cpp | 95 +---- src/d/actor/d_a_e_hzelda.cpp | 4 +- src/d/actor/d_a_e_is.cpp | 4 +- src/d/actor/d_a_e_kg.cpp | 14 +- src/d/actor/d_a_e_kk.cpp | 22 +- src/d/actor/d_a_e_kr.cpp | 84 +++- src/d/actor/d_a_e_mb.cpp | 4 +- src/d/actor/d_a_e_md.cpp | 2 + src/d/actor/d_a_e_mf.cpp | 25 +- src/d/actor/d_a_e_mk.cpp | 4 +- src/d/actor/d_a_e_mk_bo.cpp | 115 +---- src/d/actor/d_a_e_mm.cpp | 3 +- src/d/actor/d_a_e_mm_mt.cpp | 3 +- src/d/actor/d_a_e_ms.cpp | 21 +- src/d/actor/d_a_e_nest.cpp | 2 + src/d/actor/d_a_e_nz.cpp | 21 +- src/d/actor/d_a_e_oc.cpp | 36 +- src/d/actor/d_a_e_oct_bg.cpp | 109 +---- src/d/actor/d_a_e_ot.cpp | 35 +- src/d/actor/d_a_e_ph.cpp | 2 + src/d/actor/d_a_e_pm.cpp | 77 ++-- src/d/actor/d_a_e_po.cpp | 8 +- src/d/actor/d_a_e_pz.cpp | 22 +- src/d/actor/d_a_e_rb.cpp | 22 +- src/d/actor/d_a_e_rd.cpp | 91 ++-- src/d/actor/d_a_e_rdb.cpp | 19 +- src/d/actor/d_a_e_rdy.cpp | 57 ++- src/d/actor/d_a_e_s1.cpp | 43 +- src/d/actor/d_a_e_sb.cpp | 4 +- src/d/actor/d_a_e_sf.cpp | 95 +---- src/d/actor/d_a_e_sg.cpp | 7 +- src/d/actor/d_a_e_sh.cpp | 3 +- src/d/actor/d_a_e_sm.cpp | 95 +---- src/d/actor/d_a_e_sm2.cpp | 23 +- src/d/actor/d_a_e_st.cpp | 96 +---- src/d/actor/d_a_e_st_line.cpp | 2 + src/d/actor/d_a_e_sw.cpp | 21 +- src/d/actor/d_a_e_th.cpp | 18 +- src/d/actor/d_a_e_th_ball.cpp | 2 + src/d/actor/d_a_e_tk.cpp | 4 +- src/d/actor/d_a_e_tk2.cpp | 4 +- src/d/actor/d_a_e_tk_ball.cpp | 4 +- src/d/actor/d_a_e_tt.cpp | 96 +---- src/d/actor/d_a_e_vt.cpp | 120 ++---- src/d/actor/d_a_e_warpappear.cpp | 4 +- src/d/actor/d_a_e_wb.cpp | 117 +----- src/d/actor/d_a_e_ws.cpp | 4 +- src/d/actor/d_a_e_ww.cpp | 96 +---- src/d/actor/d_a_e_yc.cpp | 2 + src/d/actor/d_a_e_yd.cpp | 3 +- src/d/actor/d_a_e_yd_leaf.cpp | 2 + src/d/actor/d_a_e_yg.cpp | 95 +---- src/d/actor/d_a_e_yh.cpp | 3 +- src/d/actor/d_a_e_yk.cpp | 21 +- src/d/actor/d_a_e_ym.cpp | 18 +- src/d/actor/d_a_e_ym_tag.cpp | 2 + src/d/actor/d_a_e_ymb.cpp | 20 +- src/d/actor/d_a_e_yr.cpp | 82 +++- src/d/actor/d_a_e_zh.cpp | 6 +- src/d/actor/d_a_e_zm.cpp | 3 +- src/d/actor/d_a_e_zs.cpp | 12 +- src/d/actor/d_a_econt.cpp | 2 + src/d/actor/d_a_ep.cpp | 4 +- src/d/actor/d_a_formation_mng.cpp | 21 +- src/d/actor/d_a_fr.cpp | 2 + src/d/actor/d_a_grass.cpp | 5 +- src/d/actor/d_a_guard_mng.cpp | 2 + src/d/actor/d_a_hitobj.cpp | 2 + src/d/actor/d_a_horse.cpp | 21 +- src/d/actor/d_a_hozelda.cpp | 2 + src/d/actor/d_a_itembase.cpp | 2 + src/d/actor/d_a_izumi_gate.cpp | 2 + src/d/actor/d_a_kago.cpp | 2 + src/d/actor/d_a_kytag00.cpp | 2 + src/d/actor/d_a_kytag01.cpp | 2 + src/d/actor/d_a_kytag02.cpp | 2 + src/d/actor/d_a_kytag03.cpp | 2 + src/d/actor/d_a_kytag04.cpp | 2 + src/d/actor/d_a_kytag05.cpp | 2 + src/d/actor/d_a_kytag06.cpp | 115 +---- src/d/actor/d_a_kytag07.cpp | 2 + src/d/actor/d_a_kytag08.cpp | 2 + src/d/actor/d_a_kytag09.cpp | 2 + src/d/actor/d_a_kytag10.cpp | 2 + src/d/actor/d_a_kytag11.cpp | 2 + src/d/actor/d_a_kytag12.cpp | 2 + src/d/actor/d_a_kytag13.cpp | 2 + src/d/actor/d_a_kytag14.cpp | 2 + src/d/actor/d_a_kytag15.cpp | 2 + src/d/actor/d_a_kytag16.cpp | 2 + src/d/actor/d_a_kytag17.cpp | 2 + src/d/actor/d_a_mant.cpp | 4 +- src/d/actor/d_a_mg_fish.cpp | 6 +- src/d/actor/d_a_mg_fshop.cpp | 110 +---- src/d/actor/d_a_mg_rod.cpp | 26 +- src/d/actor/d_a_midna.cpp | 4 +- src/d/actor/d_a_mirror.cpp | 2 + src/d/actor/d_a_movie_player.cpp | 19 +- src/d/actor/d_a_myna.cpp | 33 +- src/d/actor/d_a_nbomb.cpp | 31 +- src/d/actor/d_a_ni.cpp | 8 +- src/d/actor/d_a_no_chg_room.cpp | 2 + src/d/actor/d_a_npc.cpp | 7 +- src/d/actor/d_a_npc2.cpp | 2 + src/d/actor/d_a_npc3.cpp | 2 + src/d/actor/d_a_npc4.cpp | 2 + src/d/actor/d_a_npc_aru.cpp | 116 +----- src/d/actor/d_a_npc_ash.cpp | 17 +- src/d/actor/d_a_npc_ashB.cpp | 4 +- src/d/actor/d_a_npc_bans.cpp | 20 +- src/d/actor/d_a_npc_besu.cpp | 3 +- src/d/actor/d_a_npc_blue_ns.cpp | 20 +- src/d/actor/d_a_npc_bou.cpp | 4 +- src/d/actor/d_a_npc_bouS.cpp | 114 +---- src/d/actor/d_a_npc_cd.cpp | 23 +- src/d/actor/d_a_npc_cd2.cpp | 8 +- src/d/actor/d_a_npc_cdn3.cpp | 4 +- src/d/actor/d_a_npc_chat.cpp | 113 +---- src/d/actor/d_a_npc_chin.cpp | 20 +- src/d/actor/d_a_npc_clerka.cpp | 20 +- src/d/actor/d_a_npc_clerkb.cpp | 20 +- src/d/actor/d_a_npc_clerkt.cpp | 20 +- src/d/actor/d_a_npc_coach.cpp | 2 + src/d/actor/d_a_npc_df.cpp | 95 +---- src/d/actor/d_a_npc_doc.cpp | 113 +---- src/d/actor/d_a_npc_doorboy.cpp | 9 +- src/d/actor/d_a_npc_drainSol.cpp | 2 + src/d/actor/d_a_npc_du.cpp | 2 + src/d/actor/d_a_npc_fairy.cpp | 20 +- src/d/actor/d_a_npc_fairy_seirei.cpp | 6 +- src/d/actor/d_a_npc_fguard.cpp | 2 + src/d/actor/d_a_npc_fish.cpp | 20 +- src/d/actor/d_a_npc_gnd.cpp | 20 +- src/d/actor/d_a_npc_gra.cpp | 113 +---- src/d/actor/d_a_npc_grc.cpp | 13 +- src/d/actor/d_a_npc_grd.cpp | 113 +---- src/d/actor/d_a_npc_grm.cpp | 20 +- src/d/actor/d_a_npc_grmc.cpp | 4 +- src/d/actor/d_a_npc_gro.cpp | 113 +---- src/d/actor/d_a_npc_grr.cpp | 13 +- src/d/actor/d_a_npc_grs.cpp | 113 +---- src/d/actor/d_a_npc_grz.cpp | 113 +---- src/d/actor/d_a_npc_guard.cpp | 21 +- src/d/actor/d_a_npc_gwolf.cpp | 113 +---- src/d/actor/d_a_npc_hanjo.cpp | 6 +- src/d/actor/d_a_npc_henna.cpp | 35 +- src/d/actor/d_a_npc_henna0.cpp | 2 + src/d/actor/d_a_npc_hoz.cpp | 20 +- src/d/actor/d_a_npc_impal.cpp | 6 +- src/d/actor/d_a_npc_inko.cpp | 2 + src/d/actor/d_a_npc_ins.cpp | 20 +- src/d/actor/d_a_npc_jagar.cpp | 6 +- src/d/actor/d_a_npc_kakashi.cpp | 113 +---- src/d/actor/d_a_npc_kasi_hana.cpp | 114 +---- src/d/actor/d_a_npc_kasi_kyu.cpp | 114 +---- src/d/actor/d_a_npc_kasi_mich.cpp | 114 +---- src/d/actor/d_a_npc_kdk.cpp | 2 + src/d/actor/d_a_npc_kkri.cpp | 20 +- src/d/actor/d_a_npc_kn.cpp | 5 +- src/d/actor/d_a_npc_knj.cpp | 20 +- src/d/actor/d_a_npc_kolin.cpp | 6 +- src/d/actor/d_a_npc_kolinb.cpp | 4 +- src/d/actor/d_a_npc_ks.cpp | 28 +- src/d/actor/d_a_npc_kyury.cpp | 20 +- src/d/actor/d_a_npc_len.cpp | 20 +- src/d/actor/d_a_npc_lf.cpp | 2 + src/d/actor/d_a_npc_lud.cpp | 20 +- src/d/actor/d_a_npc_maro.cpp | 4 +- src/d/actor/d_a_npc_midp.cpp | 4 +- src/d/actor/d_a_npc_mk.cpp | 2 + src/d/actor/d_a_npc_moi.cpp | 7 +- src/d/actor/d_a_npc_moir.cpp | 4 +- src/d/actor/d_a_npc_myna2.cpp | 113 +---- src/d/actor/d_a_npc_ne.cpp | 91 +--- src/d/actor/d_a_npc_p2.cpp | 2 + src/d/actor/d_a_npc_pachi_besu.cpp | 113 +---- src/d/actor/d_a_npc_pachi_maro.cpp | 20 +- src/d/actor/d_a_npc_pachi_taro.cpp | 20 +- src/d/actor/d_a_npc_passer.cpp | 20 +- src/d/actor/d_a_npc_passer2.cpp | 21 +- src/d/actor/d_a_npc_post.cpp | 113 +---- src/d/actor/d_a_npc_pouya.cpp | 20 +- src/d/actor/d_a_npc_prayer.cpp | 4 +- src/d/actor/d_a_npc_raca.cpp | 20 +- src/d/actor/d_a_npc_rafrel.cpp | 20 +- src/d/actor/d_a_npc_saru.cpp | 4 +- src/d/actor/d_a_npc_seib.cpp | 6 +- src/d/actor/d_a_npc_seic.cpp | 4 +- src/d/actor/d_a_npc_seid.cpp | 4 +- src/d/actor/d_a_npc_seira.cpp | 20 +- src/d/actor/d_a_npc_seira2.cpp | 20 +- src/d/actor/d_a_npc_seirei.cpp | 20 +- src/d/actor/d_a_npc_shad.cpp | 20 +- src/d/actor/d_a_npc_shaman.cpp | 20 +- src/d/actor/d_a_npc_shoe.cpp | 17 +- src/d/actor/d_a_npc_shop0.cpp | 2 + src/d/actor/d_a_npc_shop_maro.cpp | 39 +- src/d/actor/d_a_npc_sola.cpp | 20 +- src/d/actor/d_a_npc_soldierA.cpp | 113 +---- src/d/actor/d_a_npc_soldierB.cpp | 113 +---- src/d/actor/d_a_npc_sq.cpp | 2 + src/d/actor/d_a_npc_taro.cpp | 6 +- src/d/actor/d_a_npc_the.cpp | 17 +- src/d/actor/d_a_npc_theB.cpp | 20 +- src/d/actor/d_a_npc_tk.cpp | 31 +- src/d/actor/d_a_npc_tkc.cpp | 20 +- src/d/actor/d_a_npc_tkj.cpp | 20 +- src/d/actor/d_a_npc_tkj2.cpp | 2 + src/d/actor/d_a_npc_tks.cpp | 20 +- src/d/actor/d_a_npc_toby.cpp | 113 +---- src/d/actor/d_a_npc_tr.cpp | 2 + src/d/actor/d_a_npc_uri.cpp | 8 +- src/d/actor/d_a_npc_worm.cpp | 2 + src/d/actor/d_a_npc_wrestler.cpp | 4 +- src/d/actor/d_a_npc_yamid.cpp | 4 +- src/d/actor/d_a_npc_yamis.cpp | 20 +- src/d/actor/d_a_npc_yamit.cpp | 20 +- src/d/actor/d_a_npc_yelia.cpp | 4 +- src/d/actor/d_a_npc_ykm.cpp | 6 +- src/d/actor/d_a_npc_ykw.cpp | 113 +---- src/d/actor/d_a_npc_zanb.cpp | 20 +- src/d/actor/d_a_npc_zant.cpp | 4 +- src/d/actor/d_a_npc_zelR.cpp | 4 +- src/d/actor/d_a_npc_zelRo.cpp | 20 +- src/d/actor/d_a_npc_zelda.cpp | 4 +- src/d/actor/d_a_npc_zra.cpp | 157 ++----- src/d/actor/d_a_npc_zrc.cpp | 21 +- src/d/actor/d_a_npc_zrz.cpp | 110 +---- src/d/actor/d_a_obj_Lv5Key.cpp | 2 + src/d/actor/d_a_obj_Turara.cpp | 44 +- src/d/actor/d_a_obj_TvCdlst.cpp | 2 + src/d/actor/d_a_obj_Y_taihou.cpp | 19 +- src/d/actor/d_a_obj_amiShutter.cpp | 15 +- src/d/actor/d_a_obj_ari.cpp | 2 + src/d/actor/d_a_obj_automata.cpp | 20 +- src/d/actor/d_a_obj_avalanche.cpp | 20 +- src/d/actor/d_a_obj_balloon.cpp | 113 +---- src/d/actor/d_a_obj_barDesk.cpp | 17 +- src/d/actor/d_a_obj_batta.cpp | 14 +- src/d/actor/d_a_obj_bbox.cpp | 2 + src/d/actor/d_a_obj_bed.cpp | 2 + src/d/actor/d_a_obj_bemos.cpp | 116 +----- src/d/actor/d_a_obj_bhashi.cpp | 3 +- src/d/actor/d_a_obj_bhbridge.cpp | 2 + src/d/actor/d_a_obj_bk_leaf.cpp | 16 +- src/d/actor/d_a_obj_bkdoor.cpp | 2 + src/d/actor/d_a_obj_bky_rock.cpp | 20 +- src/d/actor/d_a_obj_bmWindow.cpp | 20 +- src/d/actor/d_a_obj_bmshutter.cpp | 6 +- src/d/actor/d_a_obj_bombf.cpp | 2 + src/d/actor/d_a_obj_bosswarp.cpp | 20 +- src/d/actor/d_a_obj_boumato.cpp | 2 + src/d/actor/d_a_obj_brakeeff.cpp | 2 + src/d/actor/d_a_obj_brg.cpp | 4 +- src/d/actor/d_a_obj_bsGate.cpp | 17 +- src/d/actor/d_a_obj_bubblePilar.cpp | 20 +- src/d/actor/d_a_obj_burnbox.cpp | 4 +- src/d/actor/d_a_obj_carry.cpp | 4 +- src/d/actor/d_a_obj_catdoor.cpp | 2 + src/d/actor/d_a_obj_cb.cpp | 2 + src/d/actor/d_a_obj_cblock.cpp | 189 +-------- src/d/actor/d_a_obj_cboard.cpp | 2 + src/d/actor/d_a_obj_cdoor.cpp | 17 +- src/d/actor/d_a_obj_chandelier.cpp | 17 +- src/d/actor/d_a_obj_chest.cpp | 20 +- src/d/actor/d_a_obj_cho.cpp | 2 + src/d/actor/d_a_obj_cowdoor.cpp | 2 + src/d/actor/d_a_obj_crope.cpp | 2 + src/d/actor/d_a_obj_crvfence.cpp | 3 +- src/d/actor/d_a_obj_crvgate.cpp | 4 +- src/d/actor/d_a_obj_crvhahen.cpp | 4 +- src/d/actor/d_a_obj_crvlh_down.cpp | 3 +- src/d/actor/d_a_obj_crvlh_up.cpp | 3 +- src/d/actor/d_a_obj_crvsteel.cpp | 2 + src/d/actor/d_a_obj_crystal.cpp | 2 + src/d/actor/d_a_obj_cwall.cpp | 98 +---- src/d/actor/d_a_obj_damCps.cpp | 2 + src/d/actor/d_a_obj_dan.cpp | 2 + src/d/actor/d_a_obj_digholl.cpp | 2 + src/d/actor/d_a_obj_digplace.cpp | 2 + src/d/actor/d_a_obj_digsnow.cpp | 20 +- src/d/actor/d_a_obj_dmelevator.cpp | 8 +- src/d/actor/d_a_obj_drop.cpp | 22 +- src/d/actor/d_a_obj_dust.cpp | 2 + src/d/actor/d_a_obj_eff.cpp | 2 + src/d/actor/d_a_obj_enemy_create.cpp | 2 + src/d/actor/d_a_obj_fallobj.cpp | 2 + src/d/actor/d_a_obj_fan.cpp | 2 + src/d/actor/d_a_obj_fchain.cpp | 2 + src/d/actor/d_a_obj_fireWood.cpp | 2 + src/d/actor/d_a_obj_fireWood2.cpp | 2 + src/d/actor/d_a_obj_firepillar.cpp | 21 +- src/d/actor/d_a_obj_firepillar2.cpp | 20 +- src/d/actor/d_a_obj_flag.cpp | 2 + src/d/actor/d_a_obj_flag2.cpp | 4 +- src/d/actor/d_a_obj_flag3.cpp | 2 + src/d/actor/d_a_obj_fmobj.cpp | 2 + src/d/actor/d_a_obj_food.cpp | 2 + src/d/actor/d_a_obj_fw.cpp | 2 + src/d/actor/d_a_obj_gadget.cpp | 115 +---- src/d/actor/d_a_obj_ganonwall.cpp | 2 + src/d/actor/d_a_obj_ganonwall2.cpp | 2 + src/d/actor/d_a_obj_gb.cpp | 21 +- src/d/actor/d_a_obj_geyser.cpp | 21 +- src/d/actor/d_a_obj_glowSphere.cpp | 23 +- src/d/actor/d_a_obj_gm.cpp | 23 +- src/d/actor/d_a_obj_goGate.cpp | 6 +- src/d/actor/d_a_obj_gomikabe.cpp | 2 + src/d/actor/d_a_obj_gpTaru.cpp | 21 +- src/d/actor/d_a_obj_gra2.cpp | 7 +- src/d/actor/d_a_obj_graWall.cpp | 2 + src/d/actor/d_a_obj_gra_rock.cpp | 2 + src/d/actor/d_a_obj_grave_stone.cpp | 2 + src/d/actor/d_a_obj_groundwater.cpp | 20 +- src/d/actor/d_a_obj_grz_rock.cpp | 3 +- src/d/actor/d_a_obj_h_saku.cpp | 97 +---- src/d/actor/d_a_obj_hakai_brl.cpp | 4 +- src/d/actor/d_a_obj_hakai_ftr.cpp | 4 +- src/d/actor/d_a_obj_hasu2.cpp | 3 +- src/d/actor/d_a_obj_hata.cpp | 73 +--- src/d/actor/d_a_obj_hb.cpp | 4 +- src/d/actor/d_a_obj_hbombkoya.cpp | 2 + src/d/actor/d_a_obj_heavySw.cpp | 20 +- src/d/actor/d_a_obj_hfuta.cpp | 10 +- src/d/actor/d_a_obj_hhashi.cpp | 2 + src/d/actor/d_a_obj_hsTarget.cpp | 2 + src/d/actor/d_a_obj_ice_l.cpp | 2 + src/d/actor/d_a_obj_ice_s.cpp | 2 + src/d/actor/d_a_obj_iceblock.cpp | 22 +- src/d/actor/d_a_obj_iceleaf.cpp | 6 +- src/d/actor/d_a_obj_ihasi.cpp | 4 +- src/d/actor/d_a_obj_ikada.cpp | 3 +- src/d/actor/d_a_obj_inobone.cpp | 3 +- src/d/actor/d_a_obj_ita.cpp | 3 +- src/d/actor/d_a_obj_itamato.cpp | 2 + src/d/actor/d_a_obj_item.cpp | 7 +- src/d/actor/d_a_obj_ito.cpp | 2 + src/d/actor/d_a_obj_kabuto.cpp | 2 + src/d/actor/d_a_obj_kag.cpp | 21 +- src/d/actor/d_a_obj_kage.cpp | 3 +- src/d/actor/d_a_obj_kago.cpp | 6 +- src/d/actor/d_a_obj_kaisou.cpp | 3 +- src/d/actor/d_a_obj_kamakiri.cpp | 4 +- src/d/actor/d_a_obj_kanban2.cpp | 4 +- src/d/actor/d_a_obj_kantera.cpp | 4 +- src/d/actor/d_a_obj_katatsumuri.cpp | 2 + src/d/actor/d_a_obj_kazeneko.cpp | 2 + src/d/actor/d_a_obj_kbacket.cpp | 4 +- src/d/actor/d_a_obj_kbox.cpp | 96 +---- src/d/actor/d_a_obj_key.cpp | 14 + src/d/actor/d_a_obj_keyhole.cpp | 6 +- src/d/actor/d_a_obj_kgate.cpp | 20 +- src/d/actor/d_a_obj_ki.cpp | 2 + src/d/actor/d_a_obj_kiPot.cpp | 4 +- src/d/actor/d_a_obj_kita.cpp | 2 + src/d/actor/d_a_obj_kjgjs.cpp | 2 + src/d/actor/d_a_obj_kkanban.cpp | 2 + src/d/actor/d_a_obj_klift00.cpp | 82 ++-- src/d/actor/d_a_obj_knBullet.cpp | 3 +- src/d/actor/d_a_obj_kshutter.cpp | 21 +- src/d/actor/d_a_obj_ktOnFire.cpp | 3 +- src/d/actor/d_a_obj_kuwagata.cpp | 3 +- src/d/actor/d_a_obj_kwheel00.cpp | 2 + src/d/actor/d_a_obj_kwheel01.cpp | 2 + src/d/actor/d_a_obj_kznkarm.cpp | 21 +- src/d/actor/d_a_obj_ladder.cpp | 20 +- src/d/actor/d_a_obj_laundry.cpp | 12 +- src/d/actor/d_a_obj_laundry_rope.cpp | 4 +- src/d/actor/d_a_obj_lbox.cpp | 2 + src/d/actor/d_a_obj_life_container.cpp | 4 +- src/d/actor/d_a_obj_lp.cpp | 4 +- src/d/actor/d_a_obj_lv1Candle00.cpp | 2 + src/d/actor/d_a_obj_lv1Candle01.cpp | 2 + src/d/actor/d_a_obj_lv2Candle.cpp | 2 + src/d/actor/d_a_obj_lv3Candle.cpp | 2 + src/d/actor/d_a_obj_lv3Water.cpp | 33 +- src/d/actor/d_a_obj_lv3Water2.cpp | 14 +- src/d/actor/d_a_obj_lv3WaterB.cpp | 2 + src/d/actor/d_a_obj_lv3saka00.cpp | 2 + src/d/actor/d_a_obj_lv3waterEff.cpp | 2 + src/d/actor/d_a_obj_lv4CandleDemoTag.cpp | 12 +- src/d/actor/d_a_obj_lv4CandleTag.cpp | 31 +- src/d/actor/d_a_obj_lv4EdShutter.cpp | 21 +- src/d/actor/d_a_obj_lv4Gate.cpp | 21 +- src/d/actor/d_a_obj_lv4HsTarget.cpp | 2 + src/d/actor/d_a_obj_lv4PoGate.cpp | 18 +- src/d/actor/d_a_obj_lv4RailWall.cpp | 21 +- src/d/actor/d_a_obj_lv4SlideWall.cpp | 21 +- src/d/actor/d_a_obj_lv4bridge.cpp | 21 +- src/d/actor/d_a_obj_lv4chandelier.cpp | 8 + src/d/actor/d_a_obj_lv4digsand.cpp | 20 +- src/d/actor/d_a_obj_lv4floor.cpp | 21 +- src/d/actor/d_a_obj_lv4gear.cpp | 2 + src/d/actor/d_a_obj_lv4prelvtr.cpp | 4 +- src/d/actor/d_a_obj_lv4prwall.cpp | 3 +- src/d/actor/d_a_obj_lv4sand.cpp | 21 +- src/d/actor/d_a_obj_lv5FloorBoard.cpp | 20 +- src/d/actor/d_a_obj_lv5IceWall.cpp | 20 +- src/d/actor/d_a_obj_lv5SwIce.cpp | 20 +- src/d/actor/d_a_obj_lv5ychndlr.cpp | 2 + src/d/actor/d_a_obj_lv5yiblltray.cpp | 2 + src/d/actor/d_a_obj_lv6ChangeGate.cpp | 21 +- src/d/actor/d_a_obj_lv6FurikoTrap.cpp | 3 +- src/d/actor/d_a_obj_lv6Lblock.cpp | 21 +- src/d/actor/d_a_obj_lv6SwGate.cpp | 21 +- src/d/actor/d_a_obj_lv6SzGate.cpp | 6 +- src/d/actor/d_a_obj_lv6Tenbin.cpp | 3 +- src/d/actor/d_a_obj_lv6TogeRoll.cpp | 6 +- src/d/actor/d_a_obj_lv6TogeTrap.cpp | 21 +- src/d/actor/d_a_obj_lv6bemos.cpp | 4 +- src/d/actor/d_a_obj_lv6bemos2.cpp | 4 +- src/d/actor/d_a_obj_lv6egate.cpp | 3 +- src/d/actor/d_a_obj_lv6elevta.cpp | 3 +- src/d/actor/d_a_obj_lv6swturn.cpp | 21 +- src/d/actor/d_a_obj_lv7BsGate.cpp | 21 +- src/d/actor/d_a_obj_lv7PropellerY.cpp | 21 +- src/d/actor/d_a_obj_lv7bridge.cpp | 21 +- src/d/actor/d_a_obj_lv8KekkaiTrap.cpp | 21 +- src/d/actor/d_a_obj_lv8Lift.cpp | 4 +- src/d/actor/d_a_obj_lv8OptiLift.cpp | 22 +- src/d/actor/d_a_obj_lv8UdFloor.cpp | 21 +- src/d/actor/d_a_obj_lv9SwShutter.cpp | 21 +- src/d/actor/d_a_obj_magLift.cpp | 20 +- src/d/actor/d_a_obj_magLiftRot.cpp | 4 +- src/d/actor/d_a_obj_magne_arm.cpp | 7 +- src/d/actor/d_a_obj_maki.cpp | 4 +- src/d/actor/d_a_obj_master_sword.cpp | 4 +- src/d/actor/d_a_obj_mato.cpp | 3 +- src/d/actor/d_a_obj_metalbox.cpp | 2 + src/d/actor/d_a_obj_mgate.cpp | 21 +- src/d/actor/d_a_obj_mhole.cpp | 4 +- src/d/actor/d_a_obj_mie.cpp | 97 +---- src/d/actor/d_a_obj_mirror_6pole.cpp | 21 +- src/d/actor/d_a_obj_mirror_chain.cpp | 2 + src/d/actor/d_a_obj_mirror_sand.cpp | 2 + src/d/actor/d_a_obj_mirror_screw.cpp | 17 +- src/d/actor/d_a_obj_mirror_table.cpp | 2 + src/d/actor/d_a_obj_movebox.cpp | 8 +- src/d/actor/d_a_obj_msima.cpp | 4 +- src/d/actor/d_a_obj_mvstair.cpp | 4 +- src/d/actor/d_a_obj_myogan.cpp | 2 + src/d/actor/d_a_obj_nagaisu.cpp | 3 +- src/d/actor/d_a_obj_nameplate.cpp | 4 +- src/d/actor/d_a_obj_nan.cpp | 12 +- src/d/actor/d_a_obj_ndoor.cpp | 3 +- src/d/actor/d_a_obj_nougu.cpp | 3 +- src/d/actor/d_a_obj_octhashi.cpp | 6 + src/d/actor/d_a_obj_oiltubo.cpp | 17 +- src/d/actor/d_a_obj_onsen.cpp | 2 + src/d/actor/d_a_obj_onsenFire.cpp | 2 + src/d/actor/d_a_obj_onsenTaru.cpp | 20 +- src/d/actor/d_a_obj_ornament_cloth.cpp | 3 +- src/d/actor/d_a_obj_pdoor.cpp | 4 +- src/d/actor/d_a_obj_pdtile.cpp | 4 +- src/d/actor/d_a_obj_pdwall.cpp | 3 +- src/d/actor/d_a_obj_picture.cpp | 3 +- src/d/actor/d_a_obj_pillar.cpp | 4 +- src/d/actor/d_a_obj_pleaf.cpp | 2 + src/d/actor/d_a_obj_poCandle.cpp | 21 +- src/d/actor/d_a_obj_poFire.cpp | 46 +- src/d/actor/d_a_obj_poTbox.cpp | 21 +- src/d/actor/d_a_obj_prop.cpp | 2 + src/d/actor/d_a_obj_pumpkin.cpp | 21 +- src/d/actor/d_a_obj_rcircle.cpp | 2 + src/d/actor/d_a_obj_rfHole.cpp | 4 +- src/d/actor/d_a_obj_rgate.cpp | 4 +- src/d/actor/d_a_obj_riverrock.cpp | 2 + src/d/actor/d_a_obj_rock.cpp | 2 + src/d/actor/d_a_obj_rope_bridge.cpp | 4 +- src/d/actor/d_a_obj_rotBridge.cpp | 3 +- src/d/actor/d_a_obj_rotTrap.cpp | 21 +- src/d/actor/d_a_obj_roten.cpp | 2 + src/d/actor/d_a_obj_rstair.cpp | 4 +- src/d/actor/d_a_obj_rw.cpp | 4 +- src/d/actor/d_a_obj_sWallShutter.cpp | 22 +- src/d/actor/d_a_obj_saidan.cpp | 20 +- src/d/actor/d_a_obj_sakuita.cpp | 2 + src/d/actor/d_a_obj_sakuita_rope.cpp | 2 + src/d/actor/d_a_obj_scannon.cpp | 21 +- src/d/actor/d_a_obj_scannon_crs.cpp | 20 +- src/d/actor/d_a_obj_scannon_ten.cpp | 21 +- src/d/actor/d_a_obj_sekidoor.cpp | 4 +- src/d/actor/d_a_obj_sekizo.cpp | 17 +- src/d/actor/d_a_obj_sekizoa.cpp | 26 +- src/d/actor/d_a_obj_shield.cpp | 4 +- src/d/actor/d_a_obj_sm_door.cpp | 2 + src/d/actor/d_a_obj_smallkey.cpp | 4 +- src/d/actor/d_a_obj_smgdoor.cpp | 21 +- src/d/actor/d_a_obj_smoke.cpp | 2 + src/d/actor/d_a_obj_smtile.cpp | 2 + src/d/actor/d_a_obj_smw_stone.cpp | 2 + src/d/actor/d_a_obj_snowEffTag.cpp | 2 + src/d/actor/d_a_obj_snow_soup.cpp | 2 + src/d/actor/d_a_obj_so.cpp | 2 + src/d/actor/d_a_obj_spinLift.cpp | 21 +- src/d/actor/d_a_obj_ss_base.cpp | 4 +- src/d/actor/d_a_obj_ss_drink.cpp | 21 +- src/d/actor/d_a_obj_ss_item.cpp | 2 + src/d/actor/d_a_obj_stairBlock.cpp | 3 +- src/d/actor/d_a_obj_stick.cpp | 2 + src/d/actor/d_a_obj_stone.cpp | 4 +- src/d/actor/d_a_obj_stoneMark.cpp | 2 + src/d/actor/d_a_obj_stopper.cpp | 7 +- src/d/actor/d_a_obj_stopper2.cpp | 20 +- src/d/actor/d_a_obj_suisya.cpp | 2 + src/d/actor/d_a_obj_sw.cpp | 4 +- src/d/actor/d_a_obj_swBallA.cpp | 4 +- src/d/actor/d_a_obj_swBallB.cpp | 4 +- src/d/actor/d_a_obj_swBallC.cpp | 20 +- src/d/actor/d_a_obj_swLight.cpp | 21 +- src/d/actor/d_a_obj_swchain.cpp | 2 + src/d/actor/d_a_obj_swhang.cpp | 4 +- src/d/actor/d_a_obj_sword.cpp | 6 +- src/d/actor/d_a_obj_swpropeller.cpp | 2 + src/d/actor/d_a_obj_swpush.cpp | 6 +- src/d/actor/d_a_obj_swpush2.cpp | 21 +- src/d/actor/d_a_obj_swpush5.cpp | 114 +---- src/d/actor/d_a_obj_swspinner.cpp | 2 + src/d/actor/d_a_obj_swturn.cpp | 4 +- src/d/actor/d_a_obj_syRock.cpp | 35 +- src/d/actor/d_a_obj_szbridge.cpp | 3 +- src/d/actor/d_a_obj_taFence.cpp | 21 +- src/d/actor/d_a_obj_table.cpp | 2 + src/d/actor/d_a_obj_takaraDai.cpp | 4 +- src/d/actor/d_a_obj_tatigi.cpp | 2 + src/d/actor/d_a_obj_ten.cpp | 2 + src/d/actor/d_a_obj_testcube.cpp | 2 + src/d/actor/d_a_obj_tgake.cpp | 2 + src/d/actor/d_a_obj_thashi.cpp | 3 +- src/d/actor/d_a_obj_thdoor.cpp | 4 +- src/d/actor/d_a_obj_timeFire.cpp | 2 + src/d/actor/d_a_obj_timer.cpp | 4 +- src/d/actor/d_a_obj_tks.cpp | 4 +- src/d/actor/d_a_obj_tmoon.cpp | 2 + src/d/actor/d_a_obj_toaru_maki.cpp | 2 + src/d/actor/d_a_obj_toby.cpp | 4 +- src/d/actor/d_a_obj_tobyhouse.cpp | 6 +- src/d/actor/d_a_obj_togeTrap.cpp | 4 +- src/d/actor/d_a_obj_tombo.cpp | 2 + src/d/actor/d_a_obj_tornado.cpp | 2 + src/d/actor/d_a_obj_tornado2.cpp | 2 + src/d/actor/d_a_obj_tp.cpp | 21 +- src/d/actor/d_a_obj_treesh.cpp | 2 + src/d/actor/d_a_obj_twGate.cpp | 2 + src/d/actor/d_a_obj_udoor.cpp | 2 + src/d/actor/d_a_obj_usaku.cpp | 2 + src/d/actor/d_a_obj_vground.cpp | 2 + src/d/actor/d_a_obj_volcball.cpp | 17 +- src/d/actor/d_a_obj_volcbom.cpp | 4 +- src/d/actor/d_a_obj_warp_kbrg.cpp | 4 +- src/d/actor/d_a_obj_warp_obrg.cpp | 4 +- src/d/actor/d_a_obj_waterGate.cpp | 5 +- src/d/actor/d_a_obj_waterPillar.cpp | 39 +- src/d/actor/d_a_obj_waterfall.cpp | 2 + src/d/actor/d_a_obj_wchain.cpp | 2 + src/d/actor/d_a_obj_wdStick.cpp | 4 +- src/d/actor/d_a_obj_web0.cpp | 2 + src/d/actor/d_a_obj_web1.cpp | 2 + src/d/actor/d_a_obj_well_cover.cpp | 20 +- src/d/actor/d_a_obj_wflag.cpp | 2 + src/d/actor/d_a_obj_wind_stone.cpp | 2 + src/d/actor/d_a_obj_window.cpp | 2 + src/d/actor/d_a_obj_wood_pendulum.cpp | 2 + src/d/actor/d_a_obj_wood_statue.cpp | 4 +- src/d/actor/d_a_obj_wsword.cpp | 2 + src/d/actor/d_a_obj_yel_bag.cpp | 21 +- src/d/actor/d_a_obj_yobikusa.cpp | 20 +- src/d/actor/d_a_obj_yousei.cpp | 4 +- src/d/actor/d_a_obj_ystone.cpp | 2 + src/d/actor/d_a_obj_zcloth.cpp | 2 + src/d/actor/d_a_obj_zdoor.cpp | 2 + src/d/actor/d_a_obj_zrTurara.cpp | 4 +- src/d/actor/d_a_obj_zrTuraraRock.cpp | 17 +- src/d/actor/d_a_obj_zraMark.cpp | 9 +- src/d/actor/d_a_obj_zra_freeze.cpp | 2 + src/d/actor/d_a_obj_zra_rock.cpp | 2 + src/d/actor/d_a_passer_mng.cpp | 2 + src/d/actor/d_a_path_line.cpp | 2 + src/d/actor/d_a_peru.cpp | 6 +- src/d/actor/d_a_player.cpp | 2 + src/d/actor/d_a_ppolamp.cpp | 4 +- src/d/actor/d_a_scene_exit.cpp | 2 + src/d/actor/d_a_scene_exit2.cpp | 21 +- src/d/actor/d_a_set_bgobj.cpp | 2 + src/d/actor/d_a_shop_item.cpp | 2 + src/d/actor/d_a_skip_2D.cpp | 2 + src/d/actor/d_a_spinner.cpp | 4 +- src/d/actor/d_a_sq.cpp | 2 + src/d/actor/d_a_startAndGoal.cpp | 2 + src/d/actor/d_a_suspend.cpp | 2 + src/d/actor/d_a_swBall.cpp | 4 +- src/d/actor/d_a_swLBall.cpp | 21 +- src/d/actor/d_a_swTime.cpp | 2 + src/d/actor/d_a_swc00.cpp | 6 +- src/d/actor/d_a_swhit0.cpp | 2 + src/d/actor/d_a_tag_CstaSw.cpp | 2 + src/d/actor/d_a_tag_Lv6Gate.cpp | 2 + src/d/actor/d_a_tag_Lv7Gate.cpp | 2 + src/d/actor/d_a_tag_Lv8Gate.cpp | 2 + src/d/actor/d_a_tag_TWgate.cpp | 20 +- src/d/actor/d_a_tag_ajnot.cpp | 2 + src/d/actor/d_a_tag_allmato.cpp | 2 + src/d/actor/d_a_tag_arena.cpp | 2 + src/d/actor/d_a_tag_assistance.cpp | 2 + src/d/actor/d_a_tag_attack_item.cpp | 2 + src/d/actor/d_a_tag_attention.cpp | 2 + src/d/actor/d_a_tag_bottle_item.cpp | 2 + src/d/actor/d_a_tag_camera.cpp | 2 + src/d/actor/d_a_tag_chgrestart.cpp | 2 + src/d/actor/d_a_tag_chkpoint.cpp | 2 + src/d/actor/d_a_tag_csw.cpp | 20 +- src/d/actor/d_a_tag_escape.cpp | 2 + src/d/actor/d_a_tag_event.cpp | 2 + src/d/actor/d_a_tag_evt.cpp | 2 + src/d/actor/d_a_tag_evtarea.cpp | 2 + src/d/actor/d_a_tag_evtmsg.cpp | 20 +- src/d/actor/d_a_tag_firewall.cpp | 2 + src/d/actor/d_a_tag_gra.cpp | 2 + src/d/actor/d_a_tag_gstart.cpp | 2 + src/d/actor/d_a_tag_guard.cpp | 2 + src/d/actor/d_a_tag_hinit.cpp | 2 + src/d/actor/d_a_tag_hjump.cpp | 2 + src/d/actor/d_a_tag_howl.cpp | 2 + src/d/actor/d_a_tag_hstop.cpp | 2 + src/d/actor/d_a_tag_instruction.cpp | 2 + src/d/actor/d_a_tag_kago_fall.cpp | 2 + src/d/actor/d_a_tag_kmsg.cpp | 2 + src/d/actor/d_a_tag_lantern.cpp | 2 + src/d/actor/d_a_tag_lightball.cpp | 2 + src/d/actor/d_a_tag_lv2prchk.cpp | 21 +- src/d/actor/d_a_tag_lv5soup.cpp | 2 + src/d/actor/d_a_tag_lv6CstaSw.cpp | 2 + src/d/actor/d_a_tag_magne.cpp | 2 + src/d/actor/d_a_tag_mhint.cpp | 2 + src/d/actor/d_a_tag_mist.cpp | 2 + src/d/actor/d_a_tag_mmsg.cpp | 2 + src/d/actor/d_a_tag_msg.cpp | 2 + src/d/actor/d_a_tag_mstop.cpp | 2 + src/d/actor/d_a_tag_mwait.cpp | 2 + src/d/actor/d_a_tag_myna2.cpp | 2 + src/d/actor/d_a_tag_myna_light.cpp | 2 + src/d/actor/d_a_tag_pachi.cpp | 2 + src/d/actor/d_a_tag_poFire.cpp | 2 + src/d/actor/d_a_tag_push.cpp | 2 + src/d/actor/d_a_tag_qs.cpp | 2 + src/d/actor/d_a_tag_ret_room.cpp | 2 + src/d/actor/d_a_tag_river_back.cpp | 21 +- src/d/actor/d_a_tag_rmbit_sw.cpp | 2 + src/d/actor/d_a_tag_schedule.cpp | 2 + src/d/actor/d_a_tag_setBall.cpp | 2 + src/d/actor/d_a_tag_setrestart.cpp | 2 + src/d/actor/d_a_tag_shop_camera.cpp | 4 +- src/d/actor/d_a_tag_shop_item.cpp | 2 + src/d/actor/d_a_tag_smk_emt.cpp | 2 + src/d/actor/d_a_tag_spinner.cpp | 2 + src/d/actor/d_a_tag_sppath.cpp | 2 + src/d/actor/d_a_tag_spring.cpp | 2 + src/d/actor/d_a_tag_ss_drink.cpp | 2 + src/d/actor/d_a_tag_statue_evt.cpp | 15 +- src/d/actor/d_a_tag_stream.cpp | 2 + src/d/actor/d_a_tag_telop.cpp | 2 + src/d/actor/d_a_tag_theB_hint.cpp | 2 + src/d/actor/d_a_tag_wara_howl.cpp | 2 + src/d/actor/d_a_tag_watchge.cpp | 2 + src/d/actor/d_a_tag_waterfall.cpp | 2 + src/d/actor/d_a_tag_wljump.cpp | 3 +- src/d/actor/d_a_tag_yami.cpp | 4 +- src/d/actor/d_a_talk.cpp | 2 + src/d/actor/d_a_tbox.cpp | 21 +- src/d/actor/d_a_tbox2.cpp | 20 +- src/d/actor/d_a_tboxSw.cpp | 2 + src/d/actor/d_a_title.cpp | 20 +- src/d/actor/d_a_vrbox.cpp | 2 + src/d/actor/d_a_vrbox2.cpp | 2 + src/d/actor/d_a_warp_bug.cpp | 2 + src/d/actor/d_a_ykgr.cpp | 19 +- src/d/d_a_horse_static.cpp | 4 +- src/d/d_a_item_static.cpp | 4 +- src/d/d_a_itembase_static.cpp | 2 + src/d/d_a_obj.cpp | 2 + src/d/d_a_shop_item_static.cpp | 4 +- src/d/d_att_dist.cpp | 4 +- src/d/d_attention.cpp | 2 + src/d/d_bg_parts.cpp | 1 + src/d/d_bg_pc.cpp | 4 +- src/d/d_bg_plc.cpp | 2 + src/d/d_bg_s.cpp | 2 + src/d/d_bg_s_acch.cpp | 6 +- src/d/d_bg_s_chk.cpp | 4 +- src/d/d_bg_s_gnd_chk.cpp | 4 +- src/d/d_bg_s_grp_pass_chk.cpp | 2 +- src/d/d_bg_s_lin_chk.cpp | 4 +- src/d/d_bg_s_movebg_actor.cpp | 4 +- src/d/d_bg_s_poly_pass_chk.cpp | 4 +- src/d/d_bg_s_roof_chk.cpp | 4 +- src/d/d_bg_s_sph_chk.cpp | 4 +- src/d/d_bg_s_spl_grp_chk.cpp | 4 +- src/d/d_bg_s_wtr_chk.cpp | 4 +- src/d/d_bg_w.cpp | 2 + src/d/d_bg_w_base.cpp | 4 +- src/d/d_bg_w_kcol.cpp | 2 + src/d/d_bg_w_sv.cpp | 4 +- src/d/d_bomb.cpp | 4 +- src/d/d_bright_check.cpp | 24 +- src/d/d_cam_param.cpp | 2 + src/d/d_camera.cpp | 33 +- src/d/d_cc_d.cpp | 4 +- src/d/d_cc_mass_s.cpp | 4 +- src/d/d_cc_s.cpp | 2 + src/d/d_cc_uty.cpp | 2 + src/d/d_com_inf_actor.cpp | 2 + src/d/d_com_inf_game.cpp | 12 +- src/d/d_debug_viewer.cpp | 2 + src/d/d_demo.cpp | 2 + src/d/d_door_param2.cpp | 2 + src/d/d_drawlist.cpp | 12 +- src/d/d_envse.cpp | 2 + src/d/d_error_msg.cpp | 10 +- src/d/d_ev_camera.cpp | 2 + src/d/d_event.cpp | 2 + src/d/d_event_data.cpp | 2 + src/d/d_event_debug.cpp | 2 + src/d/d_event_lib.cpp | 7 +- src/d/d_event_manager.cpp | 2 + src/d/d_eye_hl.cpp | 2 + src/d/d_file_sel_info.cpp | 22 +- src/d/d_file_sel_warning.cpp | 8 +- src/d/d_file_select.cpp | 25 +- src/d/d_gameover.cpp | 7 +- src/d/d_home_button.cpp | 2 + src/d/d_insect.cpp | 2 + src/d/d_item.cpp | 2 + src/d/d_item_data.cpp | 4 +- src/d/d_jnt_col.cpp | 4 +- src/d/d_k_wmark.cpp | 2 + src/d/d_k_wpillar.cpp | 2 + src/d/d_kankyo.cpp | 7 +- src/d/d_kankyo_data.cpp | 2 + src/d/d_kankyo_rain.cpp | 12 +- src/d/d_kankyo_wether.cpp | 2 + src/d/d_kantera_icon_meter.cpp | 4 +- src/d/d_ky_thunder.cpp | 2 + src/d/d_kyeff.cpp | 2 + src/d/d_kyeff2.cpp | 2 + src/d/d_lib.cpp | 4 +- src/d/d_map.cpp | 3 + src/d/d_map_path.cpp | 4 +- src/d/d_map_path_dmap.cpp | 2 + src/d/d_map_path_fmap.cpp | 17 +- src/d/d_menu_calibration.cpp | 7 +- src/d/d_menu_collect.cpp | 7 +- src/d/d_menu_dmap.cpp | 7 +- src/d/d_menu_dmap_map.cpp | 17 +- src/d/d_menu_fishing.cpp | 7 +- src/d/d_menu_fmap.cpp | 7 +- src/d/d_menu_fmap2D.cpp | 2 + src/d/d_menu_fmap_map.cpp | 4 +- src/d/d_menu_insect.cpp | 7 +- src/d/d_menu_item_explain.cpp | 7 +- src/d/d_menu_letter.cpp | 7 +- src/d/d_menu_map_common.cpp | 2 + src/d/d_menu_option.cpp | 17 +- src/d/d_menu_ring.cpp | 7 +- src/d/d_menu_save.cpp | 34 +- src/d/d_menu_skill.cpp | 7 +- src/d/d_menu_window.cpp | 11 +- src/d/d_menu_window_HIO.cpp | 2 + src/d/d_meter2.cpp | 2 + src/d/d_meter2_draw.cpp | 2 + src/d/d_meter2_info.cpp | 10 +- src/d/d_meter_HIO.cpp | 2 + src/d/d_meter_button.cpp | 2 + src/d/d_meter_haihai.cpp | 2 + src/d/d_meter_hakusha.cpp | 2 + src/d/d_meter_map.cpp | 2 + src/d/d_meter_string.cpp | 2 + src/d/d_model.cpp | 2 + src/d/d_msg_class.cpp | 2 + src/d/d_msg_flow.cpp | 7 +- src/d/d_msg_object.cpp | 2 + src/d/d_msg_out_font.cpp | 4 +- src/d/d_msg_scrn_3select.cpp | 7 +- src/d/d_msg_scrn_arrow.cpp | 2 + src/d/d_msg_scrn_base.cpp | 2 + src/d/d_msg_scrn_boss.cpp | 4 +- src/d/d_msg_scrn_explain.cpp | 7 +- src/d/d_msg_scrn_howl.cpp | 7 +- src/d/d_msg_scrn_item.cpp | 2 + src/d/d_msg_scrn_jimaku.cpp | 2 + src/d/d_msg_scrn_kanban.cpp | 4 +- src/d/d_msg_scrn_light.cpp | 2 + src/d/d_msg_scrn_place.cpp | 4 +- src/d/d_msg_scrn_staff.cpp | 4 +- src/d/d_msg_scrn_talk.cpp | 2 + src/d/d_msg_scrn_tree.cpp | 4 +- src/d/d_msg_string.cpp | 4 +- src/d/d_msg_string_base.cpp | 4 +- src/d/d_msg_unit.cpp | 2 + src/d/d_name.cpp | 7 +- src/d/d_npc_lib.cpp | 2 + src/d/d_ovlp_fade.cpp | 2 + src/d/d_ovlp_fade2.cpp | 2 + src/d/d_ovlp_fade3.cpp | 4 +- src/d/d_pane_class.cpp | 6 +- src/d/d_pane_class_alpha.cpp | 4 +- src/d/d_pane_class_ex.cpp | 4 +- src/d/d_particle_copoly.cpp | 10 +- src/d/d_particle_name.cpp | 4 +- src/d/d_path.cpp | 2 + src/d/d_resorce.cpp | 2 + src/d/d_s_logo.cpp | 7 +- src/d/d_s_menu.cpp | 2 + src/d/d_s_name.cpp | 7 +- src/d/d_s_play.cpp | 2 + src/d/d_s_room.cpp | 4 +- src/d/d_s_title.cpp | 2 + src/d/d_save.cpp | 12 +- src/d/d_save_HIO.cpp | 2 + src/d/d_save_init.cpp | 4 +- src/d/d_scope.cpp | 7 +- src/d/d_select_cursor.cpp | 13 +- src/d/d_select_icon.cpp | 2 + src/d/d_shop_camera.cpp | 2 + src/d/d_shop_item_ctrl.cpp | 4 +- src/d/d_shop_system.cpp | 6 +- src/d/d_simple_model.cpp | 2 + src/d/d_spline_path.cpp | 4 +- src/d/d_stage.cpp | 40 +- src/d/d_timer.cpp | 2 + src/d/d_tresure.cpp | 2 + src/d/d_vib_pattern.cpp | 2 + src/d/d_vibration.cpp | 2 + src/f_op/f_op_actor.cpp | 6 +- src/f_op/f_op_actor_iter.cpp | 2 +- src/f_op/f_op_actor_mng.cpp | 11 +- src/f_op/f_op_msg_mng.cpp | 4 +- src/m_Do/m_Do_Reset.cpp | 2 +- src/m_Do/m_Do_graphic.cpp | 21 +- tools/project.py | 272 ++++++++---- 1085 files changed, 4484 insertions(+), 12581 deletions(-) create mode 100644 include/d/dolzel.h create mode 100644 include/d/dolzel.pch create mode 100644 include/d/dolzel_base.pch create mode 100644 include/d/dolzel_rel.h create mode 100644 include/d/dolzel_rel.pch create mode 100644 include/weak_bss_1109_to_1009.h diff --git a/.clangd b/.clangd index 0b01309a9ea..a4ba6af63e1 100644 --- a/.clangd +++ b/.clangd @@ -14,3 +14,8 @@ Diagnostics: - "bound_member_function" - "typecheck_subscript_value" - "unknown_typename" +--- +If: + PathMatch: .*\.pch +CompileFlags: + Add: ["--language=c++", "--std=c++98"] diff --git a/.vscode/settings.json b/.vscode/settings.json index c8a7d84e4c3..af435d1bb98 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,6 +16,8 @@ "files.trimFinalNewlines": true, "files.associations": { "*.inc": "cpp", + "*.pch": "cpp", + "*.pch++": "cpp", ".clangd": "yaml", }, // Disable C/C++ IntelliSense, use clangd instead diff --git a/configure.py b/configure.py index c942146caa3..a099af3280b 100755 --- a/configure.py +++ b/configure.py @@ -347,6 +347,14 @@ "-sdata2 0", ] +cflags_dolzel_framework = [ + *cflags_framework, +] + +cflags_dolzel_rel = [ + *cflags_rel, +] + def MWVersion(cfg_version: str | None) -> str: match cfg_version: case "GZ2E01": @@ -381,7 +389,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]: return { "lib": lib_name, "mw_version": MWVersion(config.version), - "cflags": [*cflags_rel, '-pragma "nosyminline on"'], + "cflags": [*cflags_rel], "progress_category": "game", "objects": objects, } @@ -396,7 +404,7 @@ def JSystemLib(lib_name: str, objects: List[Object], progress_category: str="thi return { "lib": lib_name, "mw_version": MWVersion(config.version), - "cflags": [*cflags_framework, '-pragma "nosyminline on"'], + "cflags": [*cflags_framework], "progress_category": progress_category, "objects": objects, } @@ -419,6 +427,18 @@ def MatchingFor(*versions) -> bool: config.warn_missing_config = True config.warn_missing_source = False +config.precompiled_headers = [ + { + "source": "d/dolzel.pch", + "mw_version": MWVersion(config.version), + "cflags": ["-lang=c++", *cflags_dolzel_framework], + }, + { + "source": "d/dolzel_rel.pch", + "mw_version": MWVersion(config.version), + "cflags": ["-lang=c++", *cflags_dolzel_rel], + }, +] config.libs = [ { "lib": "machine", @@ -468,11 +488,11 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "f_ap/f_ap_game.cpp"), # f_op - Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_actor.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_actor.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_actor_iter.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_actor_tag.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_actor_mng.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_camera.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_actor_mng.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_camera_mng.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_overlap.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_overlap_mng.cpp"), @@ -486,7 +506,7 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_kankyo.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_msg.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_kankyo_mng.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_msg_mng.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_msg_mng.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_draw_iter.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_draw_tag.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "f_op/f_op_scene_pause.cpp"), @@ -533,30 +553,30 @@ def MatchingFor(*versions) -> bool: "host": True, "objects": [ Object(NonMatching, "d/d_home_button.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_stage.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_map.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_com_inf_game.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_stage.cpp"), + Object(Equivalent, "d/d_map.cpp"), # weak func order + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_com_inf_game.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_com_static.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_com_inf_actor.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bomb.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_lib.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_save.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_save_init.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_jnt_col.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_jnt_col.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_a_obj.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_a_itembase_static.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_a_item_static.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_a_shop_item_static.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_a_horse_static.cpp"), Object(MatchingFor("GZ2E01"), "d/d_demo.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_door_param2.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_door_param2.cpp"), Object(NonMatching, "d/d_resorce.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_map_path.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_map_path_fmap.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_map_path_fmap.cpp"), Object(NonMatching, "d/d_map_path_dmap.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_event.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_event_data.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_event_manager.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_event_manager.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_event_lib.cpp"), Object(Equivalent, "d/d_event_debug.cpp"), # RTTI & vtable padding Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_simple_model.cpp"), @@ -564,13 +584,13 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_particle_name.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_particle_copoly.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_path.cpp"), - Object(Equivalent, "d/d_drawlist.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(Equivalent, "d/d_drawlist.cpp"), # missing vtable Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_kankyo_data.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_kankyo_wether.cpp"), Object(NonMatching, "d/d_kankyo_rain.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_vibration.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_vib_pattern.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_attention.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_attention.cpp"), Object(NonMatching, "d/d_bg_parts.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_pc.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_att_dist.cpp"), @@ -587,15 +607,15 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_poly_pass_chk.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_roof_chk.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_s_wtr_chk.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_w.cpp", extra_cflags=['-pragma "nosyminline on"']), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_w_base.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_w.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_w_base.cpp"), Object(NonMatching, "d/d_bg_w_kcol.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bg_w_sv.cpp"), - Object(Equivalent, "d/d_cc_d.cpp", extra_cflags=['-sym off']), # weak func order - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_cc_mass_s.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(Equivalent, "d/d_cc_d.cpp"), # weak func order + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_cc_mass_s.cpp"), Object(NonMatching, "d/d_cc_s.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_cc_uty.cpp"), - Object(Equivalent, "d/d_cam_param.cpp", extra_cflags=['-pragma "nosyminline on"']), # weak func order + Object(Equivalent, "d/d_cam_param.cpp"), # weak func order Object(NonMatching, "d/d_ev_camera.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_spline_path.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_item_data.cpp"), @@ -609,7 +629,7 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "d/actor/d_a_itembase.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/actor/d_a_no_chg_room.cpp"), Object(NonMatching, "d/actor/d_a_npc.cpp"), - Object(Equivalent, "d/actor/d_a_npc_cd.cpp"), # weak func order + Object(MatchingFor("GZ2E01"), "d/actor/d_a_npc_cd.cpp"), Object(NonMatching, "d/actor/d_a_npc_cd2.cpp"), Object(NonMatching, "d/actor/d_a_obj_item.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_insect.cpp"), @@ -621,8 +641,8 @@ def MatchingFor(*versions) -> bool: Object(NonMatching, "d/d_file_sel_warning.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_file_sel_info.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_bright_check.cpp"), - Object(Equivalent, "d/d_scope.cpp", extra_cflags=['-pragma "nosyminline on"']), # weak func order - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_select_cursor.cpp"), + Object(MatchingFor("GZ2E01"), "d/d_scope.cpp"), + Object(Equivalent, "d/d_select_cursor.cpp"), # vtable padding Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_select_icon.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_shop_camera.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_shop_item_ctrl.cpp"), @@ -639,15 +659,15 @@ def MatchingFor(*versions) -> bool: Object(Equivalent, "d/d_menu_dmap_map.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_menu_map_common.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_menu_fishing.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_menu_fmap.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_menu_fmap.cpp"), Object(NonMatching, "d/d_menu_fmap_map.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_fmap2D.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_insect.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_item_explain.cpp"), - Object(Equivalent, "d/d_menu_letter.cpp", extra_cflags=['-pragma "nosyminline on"']), # weak function order + Object(MatchingFor("GZ2E01"), "d/d_menu_letter.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_option.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_ring.cpp"), - Object(Equivalent, "d/d_menu_save.cpp"), # missing 0x30 bytes of padding between vtables, likely some abstract base class vtable that gets stripped out + Object(MatchingFor("GZ2E01"), "d/d_menu_save.cpp"), # missing 0x24 bytes of padding between vtables, likely some abstract base class vtable that gets stripped out Object(MatchingFor("GZ2E01"), "d/d_menu_skill.cpp"), Object(MatchingFor("GZ2E01"), "d/d_menu_window_HIO.cpp"), Object(Equivalent, "d/d_menu_window.cpp"), # weak func order @@ -658,13 +678,13 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_meter_map.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_meter_string.cpp"), Object(MatchingFor("GZ2E01"), "d/d_meter2_draw.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_meter2_info.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01"), "d/d_meter2_info.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_meter2.cpp"), Object(MatchingFor("GZ2E01"), "d/d_msg_out_font.cpp"), Object(NonMatching, "d/d_msg_class.cpp"), Object(NonMatching, "d/d_msg_object.cpp"), Object(NonMatching, "d/d_msg_unit.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_3select.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_3select.cpp"), Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_arrow.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_msg_scrn_base.cpp"), Object(MatchingFor("GZ2E01"), "d/d_msg_scrn_boss.cpp"), @@ -684,11 +704,11 @@ def MatchingFor(*versions) -> bool: Object(Equivalent, "d/d_name.cpp"), # missing vtable padding Object(NonMatching, "d/d_npc_lib.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_ovlp_fade.cpp"), - Object(Equivalent, "d/d_ovlp_fade2.cpp"), # weak func order + Object(MatchingFor("GZ2E01"), "d/d_ovlp_fade2.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_ovlp_fade3.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_pane_class.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_pane_class_alpha.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_pane_class_ex.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_pane_class_ex.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_s_logo.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_s_menu.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "d/d_s_name.cpp"), @@ -747,7 +767,7 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m2d.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_aab.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_cir.cpp", extra_cflags=['-pragma "nosyminline on"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_cir.cpp", extra_cflags=['-pragma "nosyminline on"']), # PCH fixes need for nosyminline - maybe SSystem has one? Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_cps.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_cyl.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "SSystem/SComponent/c_m3d_g_lin.cpp"), @@ -778,7 +798,7 @@ def MatchingFor(*versions) -> bool: "JParticle", [ Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAResourceManager.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAResource.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAResource.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPABaseShape.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAExtraShape.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAChildShape.cpp"), @@ -788,7 +808,7 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAKeyBlock.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPATexture.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAResourceLoader.cpp"), - Object(Equivalent, "JSystem/JParticle/JPAEmitterManager.cpp", extra_cflags=['-pragma "nosyminline off"']), # weak func order + Object(Equivalent, "JSystem/JParticle/JPAEmitterManager.cpp"), # weak func order Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAEmitter.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAParticle.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JParticle/JPAMath.cpp"), @@ -811,7 +831,7 @@ def MatchingFor(*versions) -> bool: [ Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/ctb.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/ctb-data.cpp"), - Object(Equivalent, "JSystem/JStudio/JStudio/functionvalue.cpp", extra_cflags=['-pragma "nosyminline off"']), # weak func order + Object(Equivalent, "JSystem/JStudio/JStudio/functionvalue.cpp"), # weak func order Object(NonMatching, "JSystem/JStudio/JStudio/fvb.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/fvb-data.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/fvb-data-parse.cpp"), @@ -820,7 +840,7 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/jstudio-math.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/jstudio-object.cpp", extra_cflags=['-pragma "sym off"']), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/object-id.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/stb.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/stb.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/stb-data-parse.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio/stb-data.cpp"), ], @@ -830,7 +850,7 @@ def MatchingFor(*versions) -> bool: [ Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/control.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object-actor.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object-actor.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object-camera.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JStage/object-fog.cpp"), @@ -848,22 +868,22 @@ def MatchingFor(*versions) -> bool: "JStudio_JParticle", [ Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JParticle/control.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JParticle/object-particle.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JStudio/JStudio_JParticle/object-particle.cpp", extra_cflags=['-pragma "nosyminline on"']), ], ), JSystemLib( "JAudio2", [ - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASCalc.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASCalc.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(NonMatching, "JSystem/JAudio2/JASTaskThread.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASDvdThread.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASCallback.cpp"), - Object(NonMatching, "JSystem/JAudio2/JASHeapCtrl.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(NonMatching, "JSystem/JAudio2/JASHeapCtrl.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASResArcLoader.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASProbe.cpp"), Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASReport.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASCmdStack.cpp"), - Object(NonMatching, "JSystem/JAudio2/JASTrack.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(NonMatching, "JSystem/JAudio2/JASTrack.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASTrackPort.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASRegisterParam.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASSeqCtrl.cpp"), @@ -871,16 +891,16 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASSeqReader.cpp"), Object(NonMatching, "JSystem/JAudio2/JASAramStream.cpp"), Object(NonMatching, "JSystem/JAudio2/JASBank.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASBasicBank.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASBasicBank.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASVoiceBank.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASBasicInst.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASBasicInst.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASDrumSet.cpp"), - Object(NonMatching, "JSystem/JAudio2/JASBasicWaveBank.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(NonMatching, "JSystem/JAudio2/JASBasicWaveBank.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASSimpleWaveBank.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASWSParser.cpp"), Object(NonMatching, "JSystem/JAudio2/JASBNKParser.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASWaveArcLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASChannel.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASWaveArcLoader.cpp"), + Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JASChannel.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASLfo.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JASOscillator.cpp"), Object(NonMatching, "JSystem/JAudio2/JASAiCtrl.cpp"), @@ -897,25 +917,25 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAIAudible.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAIAudience.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISe.cpp"), - Object(Equivalent, "JSystem/JAudio2/JAISeMgr.cpp", extra_cflags=['-pragma "nosyminline off"']), # weak function order - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISeq.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(Equivalent, "JSystem/JAudio2/JAISeMgr.cpp"), # weak function order + Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISeq.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISeqDataMgr.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISeqMgr.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAISeqMgr.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISound.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISoundChild.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISoundHandles.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISoundInfo.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISoundParams.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAISoundStarter.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIStream.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIStream.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAIStreamDataMgr.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIStreamMgr.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAIStreamMgr.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUAudioArcInterpreter.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUAudioArcLoader.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUAudioMgr.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUBankTable.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUClusterSound.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUInitializer.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01"), "JSystem/JAudio2/JAUInitializer.cpp"), Object(NonMatching, "JSystem/JAudio2/JAUSectionHeap.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUSeqCollection.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JAudio2/JAUSeqDataBlockMgr.cpp"), @@ -929,7 +949,7 @@ def MatchingFor(*versions) -> bool: [ Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JMessage/control.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JMessage/data.cpp"), - Object(NonMatching, "JSystem/JMessage/processor.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(NonMatching, "JSystem/JMessage/processor.cpp"), Object(NonMatching, "JSystem/JMessage/resource.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JMessage/locale.cpp"), ], @@ -991,18 +1011,18 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAramPiece.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAramStream.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRFileLoader.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRFileFinder.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRFileFinder.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRFileCache.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRArchivePub.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRArchivePri.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRMemArchive.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAramArchive.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRAramArchive.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDvdArchive.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRCompArchive.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRFile.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDvdFile.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDvdRipper.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDvdAramRipper.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDvdAramRipper.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JKernel/JKRDecomp.cpp"), ], ), @@ -1021,7 +1041,7 @@ def MatchingFor(*versions) -> bool: [ Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JGadget/binary.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JGadget/linklist.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JGadget/std-vector.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JGadget/std-vector.cpp"), ], ), JSystemLib( @@ -1034,16 +1054,16 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTNameTab.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTGraphFifo.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTFont.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTResFont.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTResFont.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTDbPrint.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTGamePad.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTGamePad.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTException.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTDirectPrint.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTAssert.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTVideo.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTXfb.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTFader.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTProcBar.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTProcBar.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTConsole.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTDirectFile.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp"), @@ -1055,19 +1075,19 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DGrafContext.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DOrthoGraph.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DTevs.cpp"), - Object(Equivalent, "JSystem/J2DGraph/J2DMaterial.cpp", extra_cflags=['-pragma "nosyminline off"']), # weak func order + Object(Equivalent, "JSystem/J2DGraph/J2DMaterial.cpp"), # weak func order Object(NonMatching, "JSystem/J2DGraph/J2DMatBlock.cpp"), Object(NonMatching, "JSystem/J2DGraph/J2DMaterialFactory.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DPrint.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DPane.cpp"), Object(NonMatching, "JSystem/J2DGraph/J2DScreen.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DWindow.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DPicture.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DPicture.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DTextBox.cpp"), Object(NonMatching, "JSystem/J2DGraph/J2DWindowEx.cpp"), Object(NonMatching, "JSystem/J2DGraph/J2DPictureEx.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DTextBoxEx.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DAnmLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DAnmLoader.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DAnimation.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J2DGraph/J2DManage.cpp"), ], @@ -1081,10 +1101,10 @@ def MatchingFor(*versions) -> bool: Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DTransform.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DTexture.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DPacket.cpp"), - Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DShapeMtx.cpp"), + Object(MatchingFor("GZ2E01"), "JSystem/J3DGraphBase/J3DShapeMtx.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(NonMatching, "JSystem/J3DGraphBase/J3DShapeDraw.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DShape.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DMaterial.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DMaterial.cpp"), Object(Equivalent, "JSystem/J3DGraphBase/J3DMatBlock.cpp"), # virtual function order Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DTevs.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphBase/J3DDrawBuffer.cpp"), @@ -1096,10 +1116,10 @@ def MatchingFor(*versions) -> bool: [ Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DShapeTable.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DJointTree.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DModelData.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DModelData.cpp"), Object(NonMatching, "JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DModel.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DAnimation.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DAnimation.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp"), Object(NonMatching, "JSystem/J3DGraphAnimator/J3DSkinDeform.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphAnimator/J3DCluster.cpp"), @@ -1110,14 +1130,14 @@ def MatchingFor(*versions) -> bool: JSystemLib( "J3DGraphLoader", [ - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DMaterialFactory.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DMaterialFactory.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DClusterLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DModelLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DClusterLoader.cpp"), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DModelLoader.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DJointFactory.cpp"), Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"), - Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DAnmLoader.cpp", extra_cflags=['-pragma "nosyminline off"']), + Object(MatchingFor("GZ2E01", "GZ2J01"), "JSystem/J3DGraphLoader/J3DAnmLoader.cpp"), ], ), JSystemLib( @@ -1481,7 +1501,7 @@ def MatchingFor(*versions) -> bool: Rel("f_pc_profile_lst", [Object(Matching, "f_pc/f_pc_profile_lst.cpp")]), ActorRel(MatchingFor("GZ2E01"), "d_a_andsw"), ActorRel(NonMatching, "d_a_bg"), - ActorRel(Equivalent, "d_a_bg_obj"), + ActorRel(MatchingFor("GZ2E01"), "d_a_bg_obj"), ActorRel(MatchingFor("GZ2E01"), "d_a_dmidna"), ActorRel(MatchingFor("GZ2E01"), "d_a_door_dbdoor00"), ActorRel(MatchingFor("GZ2E01"), "d_a_door_knob00"), @@ -1498,25 +1518,25 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_obj_carry"), ActorRel(NonMatching, "d_a_obj_ito"), ActorRel(NonMatching, "d_a_obj_movebox"), - ActorRel(Equivalent, "d_a_obj_swpush"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_swpush"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_timer"), ActorRel(MatchingFor("GZ2E01"), "d_a_path_line"), ActorRel(NonMatching, "d_a_scene_exit"), ActorRel(MatchingFor("GZ2E01"), "d_a_set_bgobj"), ActorRel(MatchingFor("GZ2E01"), "d_a_swhit0"), - ActorRel(NonMatching, "d_a_tag_allmato", extra_cflags=['-pragma "nosyminline off"']), + ActorRel(NonMatching, "d_a_tag_allmato"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_camera"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_chkpoint"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_event"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_evt"), - ActorRel(MatchingFor("GZ2E01"), "d_a_tag_evtarea", extra_cflags=['-pragma "nosyminline off"']), + ActorRel(MatchingFor("GZ2E01"), "d_a_tag_evtarea"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_evtmsg"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_howl"), ActorRel(NonMatching, "d_a_tag_kmsg"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_lantern"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_mist"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_msg"), - ActorRel(MatchingFor("GZ2E01"), "d_a_tag_push", extra_cflags=['-pragma "nosyminline off"']), + ActorRel(MatchingFor("GZ2E01"), "d_a_tag_push"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_telop"), ActorRel(NonMatching, "d_a_tbox"), ActorRel(MatchingFor("GZ2E01"), "d_a_tbox2"), @@ -1531,23 +1551,23 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_midna"), ActorRel(Equivalent, "d_a_nbomb"), # weak func order ActorRel(MatchingFor("GZ2E01"), "d_a_obj_life_container"), - ActorRel(Equivalent, "d_a_obj_yousei"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_yousei"), ActorRel(MatchingFor("GZ2E01"), "d_a_spinner"), ActorRel(MatchingFor("GZ2E01"), "d_a_suspend"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_attention"), ActorRel(MatchingFor("GZ2E01"), "d_a_alldie"), ActorRel(MatchingFor("GZ2E01"), "d_a_andsw2"), - ActorRel(Equivalent, "d_a_bd"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_bd"), ActorRel(MatchingFor("GZ2E01"), "d_a_canoe"), ActorRel(MatchingFor("GZ2E01"), "d_a_cstaF"), ActorRel(MatchingFor("GZ2E01"), "d_a_demo_item"), ActorRel(MatchingFor("GZ2E01"), "d_a_door_bossL1"), - ActorRel(Equivalent, "d_a_e_dn"), # weak func order - ActorRel(Equivalent, "d_a_e_fm"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_dn"), + ActorRel(Equivalent, "d_a_e_fm"), # regalloc ActorRel(MatchingFor("GZ2E01"), "d_a_e_ga"), - ActorRel(Equivalent, "d_a_e_hb"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_hb"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_nest"), - ActorRel(Equivalent, "d_a_e_rd"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_rd"), ActorRel(MatchingFor("GZ2E01"), "d_a_econt"), ActorRel(NonMatching, "d_a_fr"), ActorRel(NonMatching, "d_a_grass"), @@ -1556,13 +1576,13 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_kytag11"), ActorRel(MatchingFor("GZ2E01"), "d_a_kytag14"), ActorRel(MatchingFor("GZ2E01"), "d_a_mg_fish"), - ActorRel(Equivalent, "d_a_npc_besu"), # weak func order - ActorRel(Equivalent, "d_a_npc_fairy_seirei"), + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_besu"), + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_fairy_seirei"), ActorRel(MatchingFor("GZ2E01"), "d_a_npc_fish"), ActorRel(Equivalent, "d_a_npc_henna"), # weak func order ActorRel(NonMatching, "d_a_npc_kakashi"), ActorRel(NonMatching, "d_a_npc_kkri"), - ActorRel(Equivalent, "d_a_npc_kolin"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_kolin"), ActorRel(Equivalent, "d_a_npc_maro"), # weak func order ActorRel(NonMatching, "d_a_npc_taro"), ActorRel(NonMatching, "d_a_npc_tkj"), @@ -1578,7 +1598,7 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_obj_kanban2"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kbacket"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kgate"), - ActorRel(Equivalent, "d_a_obj_klift00"), # vtable order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_klift00"), ActorRel(NonMatching, "d_a_obj_ktOnFire"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ladder"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv2Candle"), @@ -1614,33 +1634,33 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_ykgr"), ActorRel(MatchingFor("GZ2E01"), "d_a_L7demo_dr"), ActorRel(MatchingFor("GZ2E01"), "d_a_L7low_dr"), - ActorRel(Equivalent, "d_a_L7op_demo_dr"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_L7op_demo_dr"), ActorRel(MatchingFor("GZ2E01"), "d_a_b_bh"), ActorRel(NonMatching, "d_a_b_bq"), - ActorRel(Equivalent, "d_a_b_dr"), # weak func order - ActorRel(Equivalent, "d_a_b_dre"), # weak func order - ActorRel(Equivalent, "d_a_b_ds"), - ActorRel(Equivalent, "d_a_b_gg"), + ActorRel(MatchingFor("GZ2E01"), "d_a_b_dr"), + ActorRel(MatchingFor("GZ2E01"), "d_a_b_dre"), + ActorRel(MatchingFor("GZ2E01"), "d_a_b_ds"), + ActorRel(MatchingFor("GZ2E01"), "d_a_b_gg"), ActorRel(NonMatching, "d_a_b_gm"), ActorRel(NonMatching, "d_a_b_gnd"), ActorRel(MatchingFor("GZ2E01"), "d_a_b_go"), ActorRel(MatchingFor("GZ2E01"), "d_a_b_gos"), - ActorRel(Equivalent, "d_a_b_mgn"), + ActorRel(Equivalent, "d_a_b_mgn"), # extra mr/regalloc ActorRel(NonMatching, "d_a_b_ob"), ActorRel(NonMatching, "d_a_b_oh"), ActorRel(MatchingFor("GZ2E01"), "d_a_b_oh2"), - ActorRel(Equivalent, "d_a_b_tn"), # weak func order - ActorRel(Equivalent, "d_a_b_yo"), # weak func order - ActorRel(Equivalent, "d_a_b_yo_ice"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_b_tn"), + ActorRel(MatchingFor("GZ2E01"), "d_a_b_yo"), + ActorRel(MatchingFor("GZ2E01"), "d_a_b_yo_ice"), ActorRel(MatchingFor("GZ2E01"), "d_a_b_zant"), ActorRel(MatchingFor("GZ2E01"), "d_a_b_zant_magic"), ActorRel(MatchingFor("GZ2E01"), "d_a_b_zant_mobile"), ActorRel(MatchingFor("GZ2E01"), "d_a_b_zant_sima"), - ActorRel(Equivalent, "d_a_balloon_2D"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_balloon_2D"), ActorRel(MatchingFor("GZ2E01"), "d_a_bullet"), - ActorRel(Equivalent, "d_a_coach_2D"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_coach_2D"), ActorRel(MatchingFor("GZ2E01"), "d_a_coach_fire"), - ActorRel(Equivalent, "d_a_cow"), + ActorRel(MatchingFor("GZ2E01"), "d_a_cow"), ActorRel(MatchingFor("GZ2E01"), "d_a_cstatue"), ActorRel(Equivalent, "d_a_do"), # Z2SoundObjSimple dtor ActorRel(MatchingFor("GZ2E01"), "d_a_door_boss"), @@ -1649,31 +1669,31 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_door_push"), ActorRel(NonMatching, "d_a_e_ai"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_arrow"), - ActorRel(Equivalent, "d_a_e_ba"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_ba"), ActorRel(NonMatching, "d_a_e_bee"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_bg"), - ActorRel(Equivalent, "d_a_e_bi"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_bi"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_bi_leaf"), - ActorRel(Equivalent, "d_a_e_bs"), # weak func order - ActorRel(Equivalent, "d_a_e_bu"), - ActorRel(Equivalent, "d_a_e_bug"), # weak func order - ActorRel(Equivalent, "d_a_e_cr"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_bs"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_bu"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_bug"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_cr"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_cr_egg"), - ActorRel(Equivalent, "d_a_e_db"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_db"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_db_leaf"), - ActorRel(Equivalent, "d_a_e_dd"), # weak func order - ActorRel(Equivalent, "d_a_e_df"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_dd"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_df"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_dk"), ActorRel(Equivalent, "d_a_e_dt"), # weak func order ActorRel(NonMatching, "d_a_e_fb"), ActorRel(NonMatching, "d_a_e_fk"), - ActorRel(Equivalent, "d_a_e_fs"), # weak func order - ActorRel(Equivalent, "d_a_e_fz"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_fs"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_fz"), ActorRel(NonMatching, "d_a_e_gb"), ActorRel(NonMatching, "d_a_e_ge"), - ActorRel(Equivalent, "d_a_e_gi"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_gi"), ActorRel(NonMatching, "d_a_e_gm"), - ActorRel(Equivalent, "d_a_e_gob"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_gob"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_gs"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_hb_leaf"), ActorRel(NonMatching, "d_a_e_hm"), @@ -1681,46 +1701,46 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_e_hz"), ActorRel(NonMatching, "d_a_e_hzelda"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_is"), - ActorRel(Equivalent, "d_a_e_kg"), - ActorRel(Equivalent, "d_a_e_kk"), # weak func order - ActorRel(Equivalent, "d_a_e_kr"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_kg"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_kk"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_kr"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_mb"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_md"), - ActorRel(Equivalent, "d_a_e_mf"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_mf"), ActorRel(NonMatching, "d_a_e_mk"), ActorRel(NonMatching, "d_a_e_mk_bo"), ActorRel(NonMatching, "d_a_e_mm"), ActorRel(NonMatching, "d_a_e_mm_mt"), - ActorRel(Equivalent, "d_a_e_ms"), # weak func order - ActorRel(Equivalent, "d_a_e_nz"), # weak func order - ActorRel(Equivalent, "d_a_e_oc"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_ms"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_nz"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_oc"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_oct_bg"), - ActorRel(Equivalent, "d_a_e_ot"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_ot"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_ph"), - ActorRel(NonMatching, "d_a_e_pm"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_pm"), ActorRel(NonMatching, "d_a_e_po"), - ActorRel(Equivalent, "d_a_e_pz", extra_cflags=['-pragma "nosyminline off"']), # weak func order, inline issue - ActorRel(Equivalent, "d_a_e_rb"), # weak func order - ActorRel(Equivalent, "d_a_e_rdb"), # weak func order - ActorRel(Equivalent, "d_a_e_rdy"), # weak func order - ActorRel(NonMatching, "d_a_e_s1"), + ActorRel(Equivalent, "d_a_e_pz"), # inline issue + ActorRel(MatchingFor("GZ2E01"), "d_a_e_rb"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_rdb"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_rdy"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_s1"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_sb"), ActorRel(NonMatching, "d_a_e_sf"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_sg"), ActorRel(NonMatching, "d_a_e_sh"), ActorRel(NonMatching, "d_a_e_sm"), - ActorRel(Equivalent, "d_a_e_sm2"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_sm2"), ActorRel(NonMatching, "d_a_e_st"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_st_line"), - ActorRel(Equivalent, "d_a_e_sw"), # weak func order - ActorRel(Equivalent, "d_a_e_th"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_sw"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_th"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_th_ball"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_tk"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_tk2"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_tk_ball"), ActorRel(NonMatching, "d_a_e_tt"), - ActorRel(Equivalent, "d_a_e_vt"), - ActorRel(Equivalent, "d_a_e_warpappear"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_vt"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_warpappear"), ActorRel(NonMatching, "d_a_e_wb"), ActorRel(NonMatching, "d_a_e_ws"), ActorRel(NonMatching, "d_a_e_ww"), @@ -1729,14 +1749,14 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_e_yd_leaf"), ActorRel(NonMatching, "d_a_e_yg"), ActorRel(NonMatching, "d_a_e_yh"), - ActorRel(Equivalent, "d_a_e_yk"), # weak func order - ActorRel(Equivalent, "d_a_e_ym"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_yk"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_ym"), ActorRel(MatchingFor("GZ2E01"), "d_a_e_ym_tag"), - ActorRel(Equivalent, "d_a_e_ymb"), # weak func order - ActorRel(Equivalent, "d_a_e_yr"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_e_ymb"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_yr"), ActorRel(NonMatching, "d_a_e_zh"), ActorRel(NonMatching, "d_a_e_zm"), - ActorRel(Equivalent, "d_a_e_zs"), + ActorRel(MatchingFor("GZ2E01"), "d_a_e_zs"), ActorRel(MatchingFor("GZ2E01"), "d_a_formation_mng"), ActorRel(MatchingFor("GZ2E01"), "d_a_guard_mng"), ActorRel(NonMatching, "d_a_horse"), @@ -1758,14 +1778,14 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_mg_fshop"), ActorRel(MatchingFor("GZ2E01"), "d_a_mirror"), ActorRel(NonMatching, "d_a_movie_player", extra_cflags=["-O3,p"]), - ActorRel(Equivalent, "d_a_myna"), # weak function order + ActorRel(Equivalent, "d_a_myna"), # weird missing function issue ActorRel(NonMatching, "d_a_ni"), ActorRel(NonMatching, "d_a_npc_aru"), ActorRel(NonMatching, "d_a_npc_ash", extra_cflags=[DANPCF_C_HACK]), ActorRel(NonMatching, "d_a_npc_ashB", extra_cflags=[DANPCF_C_HACK]), ActorRel(NonMatching, "d_a_npc_bans"), ActorRel(NonMatching, "d_a_npc_blue_ns"), - ActorRel(Equivalent, "d_a_npc_bou"), + ActorRel(Equivalent, "d_a_npc_bou"), # weak func order ActorRel(NonMatching, "d_a_npc_bouS"), ActorRel(NonMatching, "d_a_npc_cdn3"), ActorRel(NonMatching, "d_a_npc_chat"), @@ -1776,24 +1796,24 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_npc_coach"), ActorRel(NonMatching, "d_a_npc_df"), ActorRel(NonMatching, "d_a_npc_doc"), - ActorRel(Equivalent, "d_a_npc_doorboy", extra_cflags=[DANPCF_C_HACK]), + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_doorboy", extra_cflags=[DANPCF_C_HACK]), # weak func order ActorRel(NonMatching, "d_a_npc_drainSol"), ActorRel(NonMatching, "d_a_npc_du"), ActorRel(NonMatching, "d_a_npc_fairy"), - ActorRel(Equivalent, "d_a_npc_fguard"), # weak func order + ActorRel(Equivalent, "d_a_npc_fguard"), # vtable order ActorRel(NonMatching, "d_a_npc_gnd"), ActorRel(NonMatching, "d_a_npc_gra"), - ActorRel(Equivalent, "d_a_npc_grc", extra_cflags=[DANPCF_C_HACK]), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_grc", extra_cflags=[DANPCF_C_HACK]), ActorRel(NonMatching, "d_a_npc_grd"), ActorRel(NonMatching, "d_a_npc_grm"), - ActorRel(Equivalent, "d_a_npc_grmc"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_grmc"), ActorRel(NonMatching, "d_a_npc_gro"), - ActorRel(Equivalent, "d_a_npc_grr", extra_cflags=[DANPCF_C_HACK]), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_grr", extra_cflags=[DANPCF_C_HACK]), ActorRel(NonMatching, "d_a_npc_grs"), ActorRel(NonMatching, "d_a_npc_grz"), ActorRel(NonMatching, "d_a_npc_guard"), ActorRel(NonMatching, "d_a_npc_gwolf"), - ActorRel(Equivalent, "d_a_npc_hanjo"), + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_hanjo"), ActorRel(MatchingFor("GZ2E01"), "d_a_npc_henna0"), ActorRel(NonMatching, "d_a_npc_hoz"), ActorRel(NonMatching, "d_a_npc_impal", extra_cflags=[DANPCF_C_HACK]), @@ -1806,8 +1826,8 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_npc_kdk"), ActorRel(NonMatching, "d_a_npc_kn"), ActorRel(NonMatching, "d_a_npc_knj"), - ActorRel(Equivalent, "d_a_npc_kolinb"), # weak func order - ActorRel(Equivalent, "d_a_npc_ks"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_kolinb"), + ActorRel(Equivalent, "d_a_npc_ks"), # weak func order ActorRel(NonMatching, "d_a_npc_kyury"), ActorRel(NonMatching, "d_a_npc_len"), ActorRel(MatchingFor("GZ2E01"), "d_a_npc_lf"), @@ -1826,44 +1846,44 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_npc_passer2"), ActorRel(NonMatching, "d_a_npc_post"), ActorRel(NonMatching, "d_a_npc_pouya"), - ActorRel(Equivalent, "d_a_npc_prayer", extra_cflags=[DANPCF_C_HACK]), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_prayer", extra_cflags=[DANPCF_C_HACK]), ActorRel(NonMatching, "d_a_npc_raca"), ActorRel(NonMatching, "d_a_npc_rafrel"), ActorRel(NonMatching, "d_a_npc_saru"), - ActorRel(Equivalent, "d_a_npc_seib"), # weak func order - ActorRel(Equivalent, "d_a_npc_seic"), # weak func order - ActorRel(Equivalent, "d_a_npc_seid"), # Rodata oddity + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_seib"), + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_seic"), + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_seid"), ActorRel(NonMatching, "d_a_npc_seira"), ActorRel(NonMatching, "d_a_npc_seira2"), ActorRel(NonMatching, "d_a_npc_seirei"), - ActorRel(Equivalent, "d_a_npc_shad", extra_cflags=[DANPCF_C_HACK]), + ActorRel(Equivalent, "d_a_npc_shad", extra_cflags=[DANPCF_C_HACK]), # weak func order ActorRel(NonMatching, "d_a_npc_shaman"), ActorRel(NonMatching, "d_a_npc_shoe", extra_cflags=[DANPCF_C_HACK]), ActorRel(MatchingFor("GZ2E01"), "d_a_npc_shop0"), - ActorRel(Equivalent, "d_a_npc_shop_maro"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_shop_maro"), ActorRel(NonMatching, "d_a_npc_sola"), ActorRel(NonMatching, "d_a_npc_soldierA"), ActorRel(NonMatching, "d_a_npc_soldierB"), ActorRel(MatchingFor("GZ2E01"), "d_a_npc_sq"), ActorRel(NonMatching, "d_a_npc_the", extra_cflags=[DANPCF_C_HACK]), ActorRel(NonMatching, "d_a_npc_theB"), - ActorRel(Equivalent, "d_a_npc_tk"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_tk"), ActorRel(NonMatching, "d_a_npc_tkc"), - ActorRel(Equivalent, "d_a_npc_tkj2"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_tkj2"), ActorRel(NonMatching, "d_a_npc_tks"), ActorRel(NonMatching, "d_a_npc_toby"), ActorRel(MatchingFor("GZ2E01"), "d_a_npc_tr"), ActorRel(NonMatching, "d_a_npc_uri"), - ActorRel(MatchingFor("GZ2E01"), "d_a_npc_worm", extra_cflags=['-pragma "nosyminline off"']), + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_worm"), ActorRel(NonMatching, "d_a_npc_wrestler", extra_cflags=[DANPCF_C_HACK]), - ActorRel(Equivalent, "d_a_npc_yamid"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_yamid"), ActorRel(NonMatching, "d_a_npc_yamis"), ActorRel(NonMatching, "d_a_npc_yamit"), - ActorRel(Equivalent, "d_a_npc_yelia"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_yelia"), ActorRel(NonMatching, "d_a_npc_ykm"), ActorRel(NonMatching, "d_a_npc_ykw"), ActorRel(NonMatching, "d_a_npc_zanb"), - ActorRel(Equivalent, "d_a_npc_zant"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_npc_zant"), ActorRel(NonMatching, "d_a_npc_zelR"), ActorRel(NonMatching, "d_a_npc_zelRo"), ActorRel(Equivalent, "d_a_npc_zelda"), # weak function order @@ -1871,16 +1891,16 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_npc_zrc", extra_cflags=[DANPCF_C_HACK]), ActorRel(NonMatching, "d_a_npc_zrz", extra_cflags=[DANPCF_C_HACK]), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_Lv5Key"), - ActorRel(Equivalent, "d_a_obj_Turara"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_Turara"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_TvCdlst"), - ActorRel(Equivalent, "d_a_obj_Y_taihou"), # weak func ordering. - ActorRel(Equivalent, "d_a_obj_amiShutter"), # function ordr + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_Y_taihou"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_amiShutter"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ari"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_automata"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_avalanche"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_balloon"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_barDesk"), - ActorRel(Equivalent, "d_a_obj_batta"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_batta"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bbox"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bed"), ActorRel(NonMatching, "d_a_obj_bemos"), @@ -1896,7 +1916,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bubblePilar"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_catdoor"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_cb"), - ActorRel(Equivalent, "d_a_obj_cblock"), + ActorRel(Equivalent, "d_a_obj_cblock"), # unsure why this doesn't match, .rel files seem to be identical ActorRel(MatchingFor("GZ2E01"), "d_a_obj_cdoor"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_chandelier"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_chest"), @@ -1910,7 +1930,7 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_obj_crvlh_up"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_crvsteel"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_crystal"), - ActorRel(Equivalent, "d_a_obj_cwall"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_cwall"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_damCps"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_dan"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_digholl"), @@ -1921,7 +1941,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_obj_enemy_create"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fallobj"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fan"), - ActorRel(Equivalent, "d_a_obj_fchain"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fchain"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fireWood"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fireWood2"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_firepillar"), @@ -1930,7 +1950,7 @@ def MatchingFor(*versions) -> bool: ActorRel(Equivalent, "d_a_obj_flag2"), # weak function order ActorRel(NonMatching, "d_a_obj_flag3"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_food"), - ActorRel(Equivalent, "d_a_obj_fw"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_fw"), ActorRel(NonMatching, "d_a_obj_gadget"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ganonwall"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ganonwall2"), @@ -1952,7 +1972,7 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_obj_hasu2"), ActorRel(NonMatching, "d_a_obj_hata"), ActorRel(NonMatching, "d_a_obj_hb"), - ActorRel(Equivalent, "d_a_obj_hbombkoya"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hbombkoya"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_heavySw"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hfuta"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hsTarget"), @@ -1975,7 +1995,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_obj_katatsumuri"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kazeneko"), ActorRel(NonMatching, "d_a_obj_kbox"), - ActorRel(Equivalent, "d_a_obj_key"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_key"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_keyhole"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ki"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kiPot"), @@ -1985,22 +2005,22 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_obj_knBullet"), ActorRel(NonMatching, "d_a_obj_kshutter"), ActorRel(NonMatching, "d_a_obj_kuwagata"), - ActorRel(Equivalent, "d_a_obj_kwheel00"), # weak func order - ActorRel(Equivalent, "d_a_obj_kwheel01"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kwheel00"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_kwheel01"), ActorRel(NonMatching, "d_a_obj_kznkarm"), - ActorRel(Equivalent, "d_a_obj_laundry"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_laundry"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_laundry_rope"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lbox"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lp"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv1Candle00"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv1Candle01"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3Candle"), - ActorRel(Equivalent, "d_a_obj_lv3Water"), - ActorRel(Equivalent, "d_a_obj_lv3Water2"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3Water"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3Water2"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3WaterB"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3saka00"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3waterEff"), - ActorRel(Equivalent, "d_a_obj_lv4CandleDemoTag"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4CandleDemoTag"), ActorRel(NonMatching, "d_a_obj_lv4CandleTag"), ActorRel(NonMatching, "d_a_obj_lv4EdShutter"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4Gate"), @@ -2009,7 +2029,7 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_obj_lv4RailWall"), ActorRel(NonMatching, "d_a_obj_lv4SlideWall"), ActorRel(NonMatching, "d_a_obj_lv4bridge"), - ActorRel(Equivalent, "d_a_obj_lv4chandelier"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4chandelier"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4digsand"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4floor"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4gear"), @@ -2058,10 +2078,10 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_obj_mvstair"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_myogan"), ActorRel(NonMatching, "d_a_obj_nagaisu"), - ActorRel(Equivalent, "d_a_obj_nan"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_nan"), ActorRel(NonMatching, "d_a_obj_ndoor"), ActorRel(NonMatching, "d_a_obj_nougu"), - ActorRel(Equivalent, "d_a_obj_octhashi"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_octhashi"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_oiltubo"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_onsen"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_onsenFire"), @@ -2073,7 +2093,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_obj_pillar"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_pleaf"), ActorRel(NonMatching, "d_a_obj_poCandle"), - ActorRel(Equivalent, "d_a_obj_poFire"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_poFire"), ActorRel(NonMatching, "d_a_obj_poTbox"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_prop"), ActorRel(NonMatching, "d_a_obj_pumpkin"), @@ -2095,7 +2115,7 @@ def MatchingFor(*versions) -> bool: ActorRel(NonMatching, "d_a_obj_scannon_ten"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekidoor"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekizo"), - ActorRel(Equivalent, "d_a_obj_sekizoa"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekizoa"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_shield"), ActorRel(Equivalent, "d_a_obj_sm_door"), # vtable order ActorRel(MatchingFor("GZ2E01"), "d_a_obj_smallkey"), @@ -2114,18 +2134,18 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_obj_stopper"), ActorRel(NonMatching, "d_a_obj_stopper2"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_suisya"), - ActorRel(Equivalent, "d_a_obj_sw"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sw"), ActorRel(NonMatching, "d_a_obj_swBallA"), ActorRel(NonMatching, "d_a_obj_swBallB"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_swBallC"), ActorRel(NonMatching, "d_a_obj_swLight"), ActorRel(NonMatching, "d_a_obj_swchain"), - ActorRel(Equivalent, "d_a_obj_swhang"), # vtable order + ActorRel(Equivalent, "d_a_obj_swhang"), # weak func + vtable order ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sword"), ActorRel(NonMatching, "d_a_obj_swpush2"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_swspinner"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_swturn"), - ActorRel(Equivalent, "d_a_obj_syRock"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_syRock"), ActorRel(NonMatching, "d_a_obj_szbridge"), ActorRel(NonMatching, "d_a_obj_taFence"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_table"), @@ -2141,7 +2161,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tmoon"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_toaru_maki"), ActorRel(NonMatching, "d_a_obj_toby"), - ActorRel(Equivalent, "d_a_obj_tobyhouse"), # weak function order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tobyhouse"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_togeTrap"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tombo"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tornado"), @@ -2157,7 +2177,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_obj_warp_kbrg"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_warp_obrg"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_waterGate"), - ActorRel(Equivalent, "d_a_obj_waterPillar"), # vtable order + ActorRel(Equivalent, "d_a_obj_waterPillar"), # weak func order ActorRel(MatchingFor("GZ2E01"), "d_a_obj_waterfall"), ActorRel(NonMatching, "d_a_obj_wchain"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_wdStick"), @@ -2176,14 +2196,14 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zdoor"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zrTurara"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zrTuraraRock"), - ActorRel(Equivalent, "d_a_obj_zraMark"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zraMark"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zra_freeze"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zra_rock"), ActorRel(NonMatching, "d_a_passer_mng"), - ActorRel(Equivalent, "d_a_peru"), + ActorRel(MatchingFor("GZ2E01"), "d_a_peru"), ActorRel(MatchingFor("GZ2E01"), "d_a_ppolamp"), ActorRel(MatchingFor("GZ2E01"), "d_a_skip_2D"), - ActorRel(MatchingFor("GZ2E01"), "d_a_startAndGoal", extra_cflags=['-pragma "nosyminline off"']), + ActorRel(MatchingFor("GZ2E01"), "d_a_startAndGoal"), ActorRel(MatchingFor("GZ2E01"), "d_a_swBall"), ActorRel(MatchingFor("GZ2E01"), "d_a_swLBall"), ActorRel(MatchingFor("GZ2E01"), "d_a_swTime"), @@ -2230,10 +2250,10 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor("GZ2E01"), "d_a_tag_watchge"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_waterfall"), ActorRel(MatchingFor("GZ2E01"), "d_a_tag_wljump"), - ActorRel(MatchingFor("GZ2E01"), "d_a_tag_yami", extra_cflags=['-pragma "nosyminline off"']), + ActorRel(MatchingFor("GZ2E01"), "d_a_tag_yami"), ActorRel(MatchingFor("GZ2E01"), "d_a_talk"), ActorRel(MatchingFor("GZ2E01"), "d_a_tboxSw"), - ActorRel(Equivalent, "d_a_title"), # weak func order + ActorRel(MatchingFor("GZ2E01"), "d_a_title"), # weak func order ActorRel(MatchingFor("GZ2E01"), "d_a_warp_bug"), ] diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h index 59375ef26d7..e77a5504627 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h @@ -12,8 +12,8 @@ typedef struct _GXColorS10 GXColorS10; */ class J3DMatColorAnm { public: - /* 8003B2B8 */ ~J3DMatColorAnm() {}; - /* 8003B2F4 */ J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {}; + /* 8003B2B8 */ ~J3DMatColorAnm() {} + /* 8003B2F4 */ J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {} J3DMatColorAnm(u16 param_1, J3DAnmColor* param_2) { field_0x0 = param_1; mAnmFlag = 1; @@ -42,8 +42,8 @@ class J3DMatColorAnm { */ class J3DTexNoAnm { public: - /* 8003B1F8 */ ~J3DTexNoAnm() {}; - /* 8003B240 */ J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {}; + /* 8003B1F8 */ ~J3DTexNoAnm() {} + /* 8003B240 */ J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {} J3DTexNoAnm(u16 param_1, J3DAnmTexPattern* param_2) { field_0x4 = param_1; mAnmFlag = 1; @@ -73,8 +73,8 @@ class J3DTexNoAnm { */ class J3DTexMtxAnm { public: - /* 8003B264 */ ~J3DTexMtxAnm() {}; - /* 8003B2A0 */ J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {}; + /* 8003B264 */ ~J3DTexMtxAnm() {} + /* 8003B2A0 */ J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {} J3DTexMtxAnm(u16 param_1, J3DAnmTextureSRTKey* param_2) { field_0x0 = param_1; mAnmFlag = 1; @@ -174,7 +174,7 @@ class J3DMaterialAnm { /* 8032C664 */ void setTevColorAnm(int, J3DTevColorAnm*); /* 8032C6A4 */ void setTevKColorAnm(int, J3DTevKColorAnm*); - /* 800A4820 */ virtual ~J3DMaterialAnm() {}; + /* 800A4820 */ virtual ~J3DMaterialAnm() {} /* 8032C3C4 */ virtual void calc(J3DMaterial*) const; const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; } diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 771043c25bf..6e5517a9c48 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -137,8 +137,10 @@ struct J3DColorChan { u8 getAmbSrc() const { return (GXColorSrc)((u32)(mColorChanID & (1 << 6)) >> 6); } u8 getMatSrc() const { return (GXColorSrc)(mColorChanID & 1); } u8 getDiffuseFn() const { return ((u32)(mColorChanID & (3 << 7)) >> 7); } - // This function has to appear in J3DMatBlock.cpp because it generates extra data in .sdata2 - inline u8 getAttnFn() const; + u8 getAttnFn() const { + u8 AttnArr[] = {2,0,2,1}; + return AttnArr[(u32)(mColorChanID & (3 << 9)) >> 9]; + } void load() const { J3DGDWrite_u32(setChanCtrlMacro(getEnable(), (GXColorSrc)getAmbSrc(), (GXColorSrc)getMatSrc(), getLightMask(), @@ -1549,12 +1551,13 @@ struct J3DAlphaComp { mRef1 = info.mRef1; } - J3DAlphaComp& operator=(u16 id) { mID = id; } + J3DAlphaComp& operator=(u16 id) { mID = id; return *this; } J3DAlphaComp& operator=(const J3DAlphaComp& rhs) { mID = rhs.mID; mRef0 = rhs.mRef0; mRef1 = rhs.mRef1; + return *this; } void setAlphaCompInfo(const J3DAlphaCompInfo& info) { @@ -1599,6 +1602,7 @@ struct J3DIndTexOrder : public J3DIndTexOrderInfo { /* 8000E128 */ J3DIndTexOrder() : J3DIndTexOrderInfo(j3dDefaultIndTexOrderNull) {} J3DIndTexOrder& operator=(J3DIndTexOrder const& other) { *(u32*)this = *(u32*)&other; + return *this; } J3DIndTexOrder(J3DIndTexOrderInfo const& info) : J3DIndTexOrderInfo(info) {} u8 getMap() const { return (GXTexMapID)mMap; } diff --git a/include/JSystem/JAudio2/JASBasicWaveBank.h b/include/JSystem/JAudio2/JASBasicWaveBank.h index d3a9619d657..1c4f69d7613 100644 --- a/include/JSystem/JAudio2/JASBasicWaveBank.h +++ b/include/JSystem/JAudio2/JASBasicWaveBank.h @@ -33,7 +33,6 @@ class JASWaveBank { */ struct JASBasicWaveBank : public JASWaveBank { struct TWaveHandle : public JASWaveHandle { - /* 802985E4 */ ~TWaveHandle() {} /* 80298B64 */ int getWavePtr() const; /* 80298C18 */ TWaveHandle() { mHeap = NULL; } /* 80298C64 */ const JASWaveInfo* getWaveInfo() const { return &field_0x4; } diff --git a/include/JSystem/JAudio2/JASSimpleWaveBank.h b/include/JSystem/JAudio2/JASSimpleWaveBank.h index 72e83c6b5ba..c5b1a93458b 100644 --- a/include/JSystem/JAudio2/JASSimpleWaveBank.h +++ b/include/JSystem/JAudio2/JASSimpleWaveBank.h @@ -7,7 +7,6 @@ struct JASSimpleWaveBank : JASWaveBank, JASWaveArc { struct TWaveHandle : JASWaveHandle { - /* 80298D84 */ ~TWaveHandle() {} /* 80298F38 */ int getWavePtr() const; /* 80298F5C */ TWaveHandle(); /* 80298F90 */ const JASWaveInfo* getWaveInfo() const; diff --git a/include/SSystem/SComponent/c_sxyz.h b/include/SSystem/SComponent/c_sxyz.h index 7f0ebc23dc3..b44d511c107 100644 --- a/include/SSystem/SComponent/c_sxyz.h +++ b/include/SSystem/SComponent/c_sxyz.h @@ -10,7 +10,7 @@ struct SVec { class csXyz : public SVec { public: static const csXyz Zero; - /* 80018BD0 */ ~csXyz() {}; + /* 80018BD0 */ ~csXyz() {} /* inline */ csXyz() {} /* inline */ csXyz(const csXyz& other) : SVec(other){}; /* 802673F4 */ csXyz(s16, s16, s16); diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 88dd42600b1..489769cb72e 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -100,7 +100,7 @@ struct cXyz : Vec { void zero() { set(0.0f, 0.0f, 0.0f); } f32 getSquareMag() const { return VECSquareMag(this); } - f32 getSquareDistance(const Vec& other) const { return VECSquareDistance(this, &other); } + f32 getSquareDistance(const Vec& other) const { return PSVECSquareDistance(this, &other); } static f32 getNearZeroValue() { return 8e-11f; } diff --git a/include/Z2AudioLib/Z2Calc.h b/include/Z2AudioLib/Z2Calc.h index de5f10d71c3..d942ad6d3d5 100644 --- a/include/Z2AudioLib/Z2Calc.h +++ b/include/Z2AudioLib/Z2Calc.h @@ -2,8 +2,12 @@ #define Z2CALC_H #include "dolphin/types.h" +#include "m_Do/m_Do_lib.h" namespace Z2Calc { +// hack for f_op_actor, having this present breaks its weak func ordering +static const Vec cNullVec = {0.0f, 0.0f, 0.0f}; + enum CurveSign { CURVE_SIGN_0 = 0, CURVE_SIGN_1 = 1, diff --git a/include/d/actor/d_a_b_dr.h b/include/d/actor/d_a_b_dr.h index 6fcb9509339..0da39d304d0 100644 --- a/include/d/actor/d_a_b_dr.h +++ b/include/d/actor/d_a_b_dr.h @@ -175,51 +175,4 @@ class daB_DR_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daB_DR_c) == 0x2860); - -class daB_DR_HIO_c : public JORReflexible { -public: - /* 805BAE6C */ daB_DR_HIO_c(); - /* 805C6B94 */ virtual ~daB_DR_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 model_size; - /* 0x0C */ f32 fall_accel; - /* 0x10 */ f32 fall_accel_max; - /* 0x14 */ f32 wind_large_attack_lockon_range; - /* 0x18 */ f32 unk_0x18; - /* 0x1C */ f32 wind_small_attack_power; - /* 0x20 */ f32 wind_attack_power; - /* 0x24 */ f32 glide_wind_power; - /* 0x28 */ f32 breath_attack_threshold; - /* 0x2C */ f32 unk_0x2c; - /* 0x30 */ f32 breath_move_speed_max; - /* 0x34 */ f32 breath_move_speed_min; - /* 0x38 */ s16 tail_hit_chance_time; - /* 0x3A */ s16 center_wind_time; - /* 0x3C */ s16 breath_continue_time; - /* 0x3E */ s16 breath_continue_no_armor_time; - /* 0x40 */ s16 breath_feint1_time; - /* 0x42 */ s16 breath_feint2_time; - /* 0x44 */ s16 breath_feint3_time; - /* 0x46 */ s16 no_attack_time; - /* 0x48 */ s16 unk_0x48; - /* 0x4A */ s16 no_attack_no_armor_time; - /* 0x4C */ s16 unk_0x4c; - /* 0x4E */ s16 back_hit_chance_time; - /* 0x50 */ s16 after_breath_chance_time; - /* 0x52 */ s16 neck_search_speed; - /* 0x54 */ s16 neck_search2_speed; - /* 0x56 */ s16 neck_search_speed_max; - /* 0x58 */ s16 body_search_speed; - /* 0x5A */ s16 body_search2_speed; - /* 0x5C */ s16 body_search_speed_max; - /* 0x5E */ s16 body_search_feint_speed_max; - /* 0x60 */ s16 feint_angle; - /* 0x62 */ s16 unk_0x62; - /* 0x64 */ u8 display_range; - /* 0x65 */ u8 breath_feint2_OFF; -}; - #endif /* D_A_B_DR_H */ diff --git a/include/d/actor/d_a_b_gg.h b/include/d/actor/d_a_b_gg.h index 5a5f38df787..a269e6a3231 100644 --- a/include/d/actor/d_a_b_gg.h +++ b/include/d/actor/d_a_b_gg.h @@ -175,21 +175,4 @@ class daB_GG_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daB_GG_c) == 0x116c); -class daB_GG_HIO_c : public JORReflexible { -public: - /* 805DE40C */ daB_GG_HIO_c(); - /* 805EC9C4 */ virtual ~daB_GG_HIO_c() {} - void genMessage(JORMContext*) {} - - /* 0x04 */ s8 id; - /* 0x08 */ f32 base_size; - /* 0x0C */ s16 takeoff_time; - /* 0x0E */ s16 fly_attack_wait_time; - /* 0x10 */ f32 fly_attack_speed; - /* 0x14 */ s16 takeoff2_time; - /* 0x16 */ s16 max_hp; - /* 0x18 */ f32 field_0x18; -}; - - #endif /* D_A_B_GG_H */ diff --git a/include/d/actor/d_a_b_mgn.h b/include/d/actor/d_a_b_mgn.h index edbd9370acb..192f2cf98bc 100644 --- a/include/d/actor/d_a_b_mgn.h +++ b/include/d/actor/d_a_b_mgn.h @@ -16,23 +16,6 @@ * */ -class daB_MGN_HIO_c : public JORReflexible { -public: - /* 8060572C */ daB_MGN_HIO_c(); - /* 8060F8D0 */ virtual ~daB_MGN_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 no; - /* 0x08 */ f32 base_size; - /* 0x0C */ f32 dash_speed; - /* 0x10 */ f32 turn_speed; - /* 0x14 */ f32 dash_anim; - /* 0x18 */ f32 jewel_R; - /* 0x1C */ f32 jewel_G; - /* 0x20 */ f32 jewel_B; -}; - class daB_MGN_c : public fopEn_enemy_c { public: enum daB_MGN_ACTION { diff --git a/include/d/actor/d_a_b_tn.h b/include/d/actor/d_a_b_tn.h index b637fb2d3b8..edb095eff95 100644 --- a/include/d/actor/d_a_b_tn.h +++ b/include/d/actor/d_a_b_tn.h @@ -130,7 +130,6 @@ class daB_TN_c : public fopEn_enemy_c { /* 8062C7C8 */ int _delete(); /* 8062C868 */ int CreateHeap(); /* 8062CD78 */ int create(); - /* 8062D2F0 */ daB_TN_c() {}; private: /* 0x05AC */ request_of_phase_process_class mPhaseReq1; @@ -227,24 +226,4 @@ class daB_TN_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daB_TN_c) == 0x5630); -class daB_TN_HIO_c { -public: - /* 8061EBEC */ daB_TN_HIO_c(); - /* 8062D98C */ virtual ~daB_TN_HIO_c() {}; - - /* 0x04 */ s8 mUnk1; - /* 0x08 */ f32 mScale; - /* 0x0C */ f32 mKColorA; - /* 0x10 */ f32 mTimer3Wolf; - /* 0x14 */ f32 mTimer3HumanType0; - /* 0x18 */ f32 mTimer3HumanType1; - /* 0x1C */ f32 mTimer3NormalType0; - /* 0x20 */ f32 mTimer3NormalType1; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 mTimer1Action1; - /* 0x2C */ f32 mTimer1Action2; -}; - -STATIC_ASSERT(sizeof(daB_TN_HIO_c) == 0x30); - #endif /* D_A_B_TN_H */ diff --git a/include/d/actor/d_a_b_yo.h b/include/d/actor/d_a_b_yo.h index ade6df2a97c..534d6a2b3a6 100644 --- a/include/d/actor/d_a_b_yo.h +++ b/include/d/actor/d_a_b_yo.h @@ -231,28 +231,4 @@ class daB_YO_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daB_YO_c) == 0x1B88); -class daB_YO_HIO_c { -public: - /* 8062F46C */ daB_YO_HIO_c(); - /* 806395E4 */ virtual ~daB_YO_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mScale[8]; - /* 0x28 */ f32 mFreezardNum; - /* 0x2C */ f32 mMaxFallSpeed; - /* 0x30 */ f32 mReboundSpeedRatio; - /* 0x34 */ f32 mChaseSpeed; - /* 0x38 */ f32 mReboundSpeedMax; - /* 0x3C */ bool field_0x3c; - /* 0x40 */ f32 mGatherTimer; - /* 0x44 */ f32 mAttackTimer; - /* 0x48 */ f32 mFreezardRadius; - /* 0x4C */ f32 field_0x4c; - /* 0x50 */ f32 field_0x50; - /* 0x54 */ bool field_0x54; - /* 0x58 */ f32 field_0x58; -}; - -STATIC_ASSERT(sizeof(daB_YO_HIO_c) == 0x5C); - #endif /* D_A_B_YO_H */ diff --git a/include/d/actor/d_a_b_yo_ice.h b/include/d/actor/d_a_b_yo_ice.h index 9ad22251737..ed0279d33ac 100644 --- a/include/d/actor/d_a_b_yo_ice.h +++ b/include/d/actor/d_a_b_yo_ice.h @@ -102,16 +102,4 @@ class daB_YOI_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daB_YOI_c) == 0xB3C); -class daB_YOI_HIO_c { -public: - /* 8063A14C */ daB_YOI_HIO_c(); - /* 8063DBD0 */ virtual ~daB_YOI_HIO_c() {} - - /* 0x4 */ s8 field_0x4; - /* 0x8 */ f32 mScaleY; - /* 0xC */ f32 mScaleXZ; -}; - -STATIC_ASSERT(sizeof(daB_YOI_HIO_c) == 0x10); - #endif /* D_A_B_YO_ICE_H */ diff --git a/include/d/actor/d_a_balloon_2D.h b/include/d/actor/d_a_balloon_2D.h index ba578b58a2b..019e7d35c7c 100644 --- a/include/d/actor/d_a_balloon_2D.h +++ b/include/d/actor/d_a_balloon_2D.h @@ -13,75 +13,6 @@ class J2DPicture; class J2DPane; class J2DTextBox; -class daBalloon2D_HIO_c : public mDoHIO_entry_c { -public: - inline daBalloon2D_HIO_c(); - /* 806553A8 */ virtual ~daBalloon2D_HIO_c(); - -#if DEBUG - void genMessage(JORMContext*); - -#endif - - void resetAddScoreSetFlag(); - - struct param { - /* 0x04 */ u8 mAdjustmentToggle; - /* 0x08 */ s32 mScore; - /* 0x0C */ u8 mComboCount; - /* 0x0D */ u8 mBalloonSize; - /* 0x0E */ u8 mOverheadScoreToggle; - /* 0x10 */ s32 mOverheadScore; - /* 0x14 */ s32 field_0x14; - /* 0x18 */ f32 field_0x1c; - /* 0x1C */ f32 field_0x20; - /* 0x20 */ f32 mScorePosX; - /* 0x24 */ f32 mScorePosY; - /* 0x28 */ f32 mScoreSize; - /* 0x2C */ f32 m5DNumberPosX; - /* 0x30 */ f32 m5DNumberPosY; - /* 0x34 */ f32 m5DNumberSizeX; - /* 0x38 */ f32 m5DNumberSizeY; - /* 0x3C */ f32 m5DNumberAlpha; - /* 0x40 */ f32 m5DNumber2PosX; - /* 0x44 */ f32 m5DNumber2PosY; - /* 0x48 */ f32 m5DNumber2Size; - /* 0x4C */ f32 mUnkPosX; - /* 0x50 */ f32 mUnkPosY; - /* 0x54 */ f32 mUnkSize; - /* 0x58 */ f32 mComboPosX; - /* 0x5C */ f32 mComboPosY; - /* 0x60 */ f32 mComboSize; - /* 0x64 */ f32 m2DNumberPosX; - /* 0x68 */ f32 m2DNumberPosY; - /* 0x6C */ f32 m2DNumberSizeX; - /* 0x70 */ f32 m2DNumberSizeY; - /* 0x74 */ f32 field_0x78; - /* 0x78 */ f32 m2DNumberComboPosX; - /* 0x7C */ f32 m2DNumberComboPosY; - /* 0x80 */ f32 m2DNumberComboSize; - /* 0x84 */ f32 m2DNumberComboAlpha; - /* 0x88 */ f32 mBalloonLargePosX; - /* 0x8C */ f32 mBalloonLargePosY; - /* 0x90 */ f32 mBalloonLargeSize; - /* 0x94 */ f32 mBalloonLargeAlpha; - /* 0x98 */ f32 mBalloonMedPosX; - /* 0x9C */ f32 mBalloonMedPosY; - /* 0xA0 */ f32 mBalloonMedSize; - /* 0xA4 */ f32 mBalloonMedAlpha; - /* 0xA8 */ f32 mBalloonSmallPosX; - /* 0xAC */ f32 mBalloonSmallPosY; - /* 0xB0 */ f32 mBalloonSmallSize; - /* 0xB4 */ f32 mBalloonSmallAlpha; - /* 0xB8 */ f32 m2DNumberCombo2PosX; - /* 0xBC */ f32 m2DNumberCombo2PosY; - /* 0xC0 */ f32 m2DNumberCombo2Size; - /* 0xC4 */ f32 m2DNumberCombo2PosX43; - }; - - param m; -}; - /** * @ingroup actors-unsorted * @class daBalloon2D_c @@ -127,7 +58,7 @@ class daBalloon2D_c : public fopAc_ac_c, public request_of_phase_process_class { /* 80654E8C */ void setHIO(bool); /* 80655494 */ virtual - ~daBalloon2D_c(); + ~daBalloon2D_c() {} void show() { mIsVisible = 1; } void hide() { mIsVisible = 0; } diff --git a/include/d/actor/d_a_coach_2D.h b/include/d/actor/d_a_coach_2D.h index f20a6668d55..1a085d781ba 100644 --- a/include/d/actor/d_a_coach_2D.h +++ b/include/d/actor/d_a_coach_2D.h @@ -76,84 +76,4 @@ class daCoach2D_c : public fopAc_ac_c, public request_of_phase_process_class { STATIC_ASSERT(sizeof(daCoach2D_c) == 0x784); -class daCoach2D_HIO_c : public mDoHIO_entry_c { -public: - struct Param { - /* 0x00 */ f32 pos_x; - /* 0x04 */ f32 pos_y; - /* 0x08 */ f32 size; - /* 0x0C */ f32 alpha; - /* 0x10 */ f32 icon_space_x; - /* 0x14 */ f32 icon_pos_x; - /* 0x18 */ f32 icon_pos_y; - /* 0x1C */ f32 icon_size; - /* 0x20 */ f32 icon_alpha; - /* 0x24 */ f32 coach_pos_x; - /* 0x28 */ f32 coach_pos_y; - /* 0x2C */ f32 coach_size; - /* 0x30 */ f32 coach_alpha; - /* 0x34 */ f32 blink_speed_min; - /* 0x38 */ f32 blink_speed_max; - /* 0x3C */ f32 pikari_scale; - /* 0x40 */ f32 pikari_anim_speed; - /* 0x44 */ u8 pikari_moyaR0_R; - /* 0x45 */ u8 pikari_moyaR0_G; - /* 0x46 */ u8 pikari_moyaR0_B; - /* 0x47 */ u8 pikari_moyaR0_A; - /* 0x48 */ u8 pikari_moyaR1_R; - /* 0x49 */ u8 pikari_moyaR1_G; - /* 0x4A */ u8 pikari_moyaR1_B; - /* 0x4B */ u8 pikari_moyaR1_A; - /* 0x4C */ u8 unk_0x4C; - /* 0x4D */ u8 unk_0x4D; - /* 0x4E */ u8 unk_0x4E; - /* 0x4F */ u8 unk_0x4F; - /* 0x50 */ u8 unk_0x50; - /* 0x51 */ u8 unk_0x51; - /* 0x52 */ u8 unk_0x52; - /* 0x53 */ u8 unk_0x53; - /* 0x54 */ u8 debug_ON; - /* 0x55 */ u8 max_damage_num; - /* 0x56 */ u8 now_damage_num; - /* 0x57 */ u8 reverse_flag; - }; - - daCoach2D_HIO_c() { - static Param aParam = { - 45.0f, - -15.0f, - 1.0f, - 1.0f, - 7.5f, - -6.5f, - 0.0f, - 0.5f, - 1.0f, - 0.0f, - 0.0f, - 1.0f, - 1.0f, - 1.0f, - 5.0f, - 3.0f, - 8.0f, - 0xFF, 0xFF, 0xFF, 0xB9, - 0x00, 0x9B, 0x00, 0x00, - 0xFF, 0xFF, 0xFF, 0x57, - 0x00, 0x73, 0x00, 0x00, - false, - 20, - 0, - 1, - }; - - memcpy(¶m, &aParam, sizeof(Param)); - } - - /* 80657738 */ virtual ~daCoach2D_HIO_c() {} - void genMessage(JORMContext*) {} - - /* 0x4 */ Param param; -}; - #endif /* D_A_COACH_2D_H */ diff --git a/include/d/actor/d_a_e_ba.h b/include/d/actor/d_a_e_ba.h index e8b0dc3ecf1..aeb4b3506b2 100644 --- a/include/d/actor/d_a_e_ba.h +++ b/include/d/actor/d_a_e_ba.h @@ -100,19 +100,4 @@ class e_ba_class { STATIC_ASSERT(sizeof(e_ba_class) == 0xAA4); -class daE_BA_HIO_c { -public: - /* 8067ECEC */ daE_BA_HIO_c(); - /* 80681F00 */ virtual ~daE_BA_HIO_c() {} - - /* 0x04 */ s8 field_0x04; - /* 0x08 */ f32 mScale; - /* 0x0C */ f32 mFlySpeed; - /* 0x10 */ f32 mFightDistance; - /* 0x14 */ f32 mFightSpeed; - /* 0x18 */ f32 mAttackSpeed; -}; - -STATIC_ASSERT(sizeof(daE_BA_HIO_c) == 0x1C); - #endif /* D_A_E_BA_H */ diff --git a/include/d/actor/d_a_e_bi.h b/include/d/actor/d_a_e_bi.h index b6e0c49c139..e1cdc14f9c2 100644 --- a/include/d/actor/d_a_e_bi.h +++ b/include/d/actor/d_a_e_bi.h @@ -69,19 +69,4 @@ class e_bi_class { STATIC_ASSERT(sizeof(e_bi_class) == 0xc00); -class daE_BI_HIO_c : public JORReflexible { -public: - /* 8068A5EC */ daE_BI_HIO_c(); - /* 8068D2DC */ virtual ~daE_BI_HIO_c() {} - - /* 爆弾虫 - Bomb Bug */ - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 basic_size; // 基本サイズ - Basic Size - /* 0x0C */ f32 search_range; // サーチ範囲 - Search Range - /* 0x10 */ f32 track_range; // 追尾範囲 - Track Range - /* 0x14 */ s16 time_to_get_going; // 動き出すまでの時間 - Time To Get Going - /* 0x18 */ f32 movement_spd; // 移動速度 - Movement Speed -}; - - #endif /* D_A_E_BI_H */ diff --git a/include/d/actor/d_a_e_bs.h b/include/d/actor/d_a_e_bs.h index 03f0e40d4f7..7ed03eea640 100644 --- a/include/d/actor/d_a_e_bs.h +++ b/include/d/actor/d_a_e_bs.h @@ -64,21 +64,4 @@ class e_bs_class { STATIC_ASSERT(sizeof(e_bs_class) == 0xcfc); -class daE_BS_HIO_c : public JORReflexible { -public: - /* 8068E12C */ daE_BS_HIO_c(); - /* 8069091C */ virtual ~daE_BS_HIO_c() {} - - void genMessage(JORMContext* ctx); - - /* 0x04 */ s8 id; - /* 0x08 */ f32 base_size; - /* 0x0C */ f32 move_speed; - /* 0x10 */ f32 rush_speed; - /* 0x14 */ f32 pl_recognize_dist; - /* 0x18 */ f32 attack_start_range; - /* 0x1C */ f32 battle_start_range; -}; - - #endif /* D_A_E_BS_H */ diff --git a/include/d/actor/d_a_e_bu.h b/include/d/actor/d_a_e_bu.h index 639ab6c7a98..51e5c02876b 100644 --- a/include/d/actor/d_a_e_bu.h +++ b/include/d/actor/d_a_e_bu.h @@ -67,20 +67,4 @@ class e_bu_class { STATIC_ASSERT(sizeof(e_bu_class) == 0xaa4); -class daE_BU_HIO_c : public JORReflexible { -public: - /* 806911AC */ daE_BU_HIO_c(); - /* 806941D4 */ virtual ~daE_BU_HIO_c() {} - - void genMessage(JORMContext* ctx); - - /* 0x04 */ s8 id; - /* 0x08 */ f32 base_size; - /* 0x0C */ f32 fly_speed; - /* 0x10 */ f32 attack_range; - /* 0x14 */ f32 attack_speed; - /* 0x18 */ f32 dash_speed; -}; - - #endif /* D_A_E_BU_H */ diff --git a/include/d/actor/d_a_e_cr.h b/include/d/actor/d_a_e_cr.h index 503e40c6330..f55a3746559 100644 --- a/include/d/actor/d_a_e_cr.h +++ b/include/d/actor/d_a_e_cr.h @@ -51,18 +51,4 @@ class e_cr_class { STATIC_ASSERT(sizeof(e_cr_class) == 0xa60); -class daE_CR_HIO_c : public JORReflexible { -public: - /* 8069800C */ daE_CR_HIO_c(); - /* 806997F4 */ virtual ~daE_CR_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 id; - /* 0x08 */ f32 base_size; - /* 0x0C */ f32 move_speed; - /* 0x10 */ f32 pl_search_range; -}; - - #endif /* D_A_E_CR_H */ diff --git a/include/d/actor/d_a_e_db.h b/include/d/actor/d_a_e_db.h index d0bc0c3e9bb..a95722a6d14 100644 --- a/include/d/actor/d_a_e_db.h +++ b/include/d/actor/d_a_e_db.h @@ -84,20 +84,4 @@ class e_db_class { STATIC_ASSERT(sizeof(e_db_class) == 0x1270); -class daE_DB_HIO_c : public JORReflexible { -public: - /* 8069AAEC */ daE_DB_HIO_c(); - /* 806A13D8 */ virtual ~daE_DB_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 id; - /* 0x08 */ f32 base_size; - /* 0x0C */ f32 flower_size; - /* 0x10 */ f32 appear_size; - /* 0x14 */ s16 roof_reappear_interval; - /* 0x16 */ s16 attack_freq; -}; - - #endif /* D_A_E_DB_H */ diff --git a/include/d/actor/d_a_e_dd.h b/include/d/actor/d_a_e_dd.h index 20f7e54b351..af5ca291e24 100644 --- a/include/d/actor/d_a_e_dd.h +++ b/include/d/actor/d_a_e_dd.h @@ -80,24 +80,4 @@ class e_dd_class { STATIC_ASSERT(sizeof(e_dd_class) == 0xe94); -class daE_DD_HIO_c : public JORReflexible { -public: - /* 806A226C */ daE_DD_HIO_c(); - /* 806A6D08 */ virtual ~daE_DD_HIO_c() {} - - void genMessage(JORMContext*); - - /* ドドンゴ - Dodongo */ - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 basic_size; // 基本サイズ - Basic Size - /* 0x0C */ f32 walk_speed; // 歩速度 - Walk Speed - /* 0x10 */ f32 run_speed; // 走速度 - Run Speed - /* 0x14 */ f32 search_area; // サーチエリア - Search Area - /* 0x18 */ f32 flame_distance; // 炎距離 - Flame Distance - /* 0x1C */ f32 horned_head; // 首曲角 - Horned Head - /* 0x20 */ s16 flame_time; // 炎時間 - Flame Time - /* 0x24 */ f32 flame_mot_speed; // 炎モーション速 - Flame Motion Speed -}; - - #endif /* D_A_E_DD_H */ diff --git a/include/d/actor/d_a_e_df.h b/include/d/actor/d_a_e_df.h index ed9bc4fefb6..ea7ae152c9f 100644 --- a/include/d/actor/d_a_e_df.h +++ b/include/d/actor/d_a_e_df.h @@ -91,17 +91,4 @@ class daE_DF_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_DF_c) == 0x838); -class daE_DF_HIO_c : public JORReflexible { -public: - /* 806A76EC */ daE_DF_HIO_c(); - /* 806A9A84 */ virtual ~daE_DF_HIO_c() {}; - - void genMessage(JORMContext*); - - /* 0x4 */ s8 mNo; - /* 0x8 */ f32 field_0x8; -}; - -STATIC_ASSERT(sizeof(daE_DF_HIO_c) == 0xC); - #endif /* D_A_E_DF_H */ diff --git a/include/d/actor/d_a_e_dn.h b/include/d/actor/d_a_e_dn.h index 7e5472f77bb..7afbcd183e9 100644 --- a/include/d/actor/d_a_e_dn.h +++ b/include/d/actor/d_a_e_dn.h @@ -143,26 +143,4 @@ class e_dn_class { STATIC_ASSERT(sizeof(e_dn_class) == 0x110c); -class daE_DN_HIO_c : public JORReflexible { -public: - /* 804E51AC */ daE_DN_HIO_c(); - /* 804EE39C */ virtual ~daE_DN_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 model_size; // 基本サイズ - /* 0x0C */ f32 movement_speed; // 移動速度 - /* 0x10 */ f32 dash_speed; // 突進速度 - /* 0x14 */ f32 battle_init_range; // 戦闘開始範囲 - /* 0x18 */ f32 attack_init_range; // 攻撃開始範囲 - /* 0x1C */ s16 field_0x1c; // 防御静止間 - /* 0x1E */ s16 field_0x1e; // 魂抜間 弱 - /* 0x20 */ s16 field_0x20; // 魂抜間 強 - /* 0x22 */ u8 field_0x22; - /* 0x23 */ u8 invulnerable; // 不死身 - /* 0x24 */ u8 field_0x24; // 学習なし -}; - - #endif /* D_A_E_DN_H */ diff --git a/include/d/actor/d_a_e_dt.h b/include/d/actor/d_a_e_dt.h index ebf2703d7db..803dfce39a2 100644 --- a/include/d/actor/d_a_e_dt.h +++ b/include/d/actor/d_a_e_dt.h @@ -174,24 +174,6 @@ class daE_DT_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_DT_c) == 0x1174); -class daE_DT_HIO_c { -public: - /* 806AD90C */ daE_DT_HIO_c(); - /* 806B5BDC */ virtual ~daE_DT_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mScale; - /* 0x0C */ f32 mWalkSpeed; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 mStunTimer; - /* 0x20 */ f32 mPressTimer; - /* 0x24 */ f32 mMaxFallSpeed; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2c; -}; - struct E_DT_n { static f32 eDt_ShakeFrame[10]; static f32 eDt_ShakeFrameDemo[10]; diff --git a/include/d/actor/d_a_e_fm.h b/include/d/actor/d_a_e_fm.h index 8ece67184ab..9a2ed1ee619 100644 --- a/include/d/actor/d_a_e_fm.h +++ b/include/d/actor/d_a_e_fm.h @@ -178,61 +178,4 @@ class e_fm_class : public fopEn_enemy_c { STATIC_ASSERT(sizeof(e_fm_class) == 0x1b084); -class daE_FM_HIO_c : public JORReflexible { -public: - /* 804EF0EC */ daE_FM_HIO_c(); - - void genMessage(JORMContext*); - /* 804FA3D8 */ virtual ~daE_FM_HIO_c() {} - - /* 0x04 */ s8 no; - /* 0x08 */ f32 base_size; - /* 0x0C */ f32 field_0xc; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1c; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2c; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ s16 field_0x34; - /* 0x36 */ s16 field_0x36; - /* 0x38 */ s16 field_0x38; - /* 0x3C */ f32 field_0x3c; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 chain_size; - /* 0x4C */ f32 field_0x4c; - /* 0x50 */ f32 field_0x50; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ f32 field_0x58; - /* 0x5C */ f32 field_0x5c; - /* 0x60 */ u8 field_0x60; - /* 0x61 */ u8 field_0x61; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; - /* 0x6C */ f32 field_0x6c; - /* 0x70 */ f32 field_0x70; - /* 0x74 */ f32 field_0x74; - /* 0x78 */ f32 field_0x78; - /* 0x7C */ f32 field_0x7c; - /* 0x80 */ f32 field_0x80; - /* 0x84 */ f32 field_0x84; - /* 0x88 */ f32 field_0x88; - /* 0x8C */ f32 field_0x8c; - /* 0x90 */ f32 field_0x90; - /* 0x94 */ s16 field_0x94; - /* 0x96 */ s16 field_0x96; - /* 0x98 */ s16 field_0x98; - /* 0x9A */ s16 field_0x9a; - /* 0x9C */ s16 field_0x9c; - /* 0xA0 */ f32 field_0xa0; - /* 0xA4 */ f32 field_0xa4; - /* 0xA8 */ f32 field_0xa8; - /* 0xAC */ u8 field_0xac; -}; - - #endif /* D_A_E_FM_H */ diff --git a/include/d/actor/d_a_e_fs.h b/include/d/actor/d_a_e_fs.h index f03dda24d3a..a3b15f79284 100644 --- a/include/d/actor/d_a_e_fs.h +++ b/include/d/actor/d_a_e_fs.h @@ -62,19 +62,4 @@ class e_fs_class { STATIC_ASSERT(sizeof(e_fs_class) == 0xB9C); -class daE_Fs_HIO_c { -public: - /* 806BBACC */ daE_Fs_HIO_c(); - /* 806BDF94 */ virtual ~daE_Fs_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mScale; - /* 0x0C */ f32 mAttackRange; - /* 0x10 */ f32 mAttackDistance; - /* 0x14 */ f32 mMoveSpeedRatio; - /* 0x18 */ f32 mDeleteRange; -}; - -STATIC_ASSERT(sizeof(daE_Fs_HIO_c) == 0x1C); - #endif /* D_A_E_FS_H */ diff --git a/include/d/actor/d_a_e_fz.h b/include/d/actor/d_a_e_fz.h index 628af5d9dd7..3dc46b69c20 100644 --- a/include/d/actor/d_a_e_fz.h +++ b/include/d/actor/d_a_e_fz.h @@ -32,30 +32,6 @@ enum daE_FZ_Action { (during the Blizzeta fight).*/ }; -/** - * @brief Temporary HIO struct to get a match. Remove later. - * - */ -struct daE_FZ_HIO_c_tmp { - void* vtable; - /* 0x04 */ s8 field_0x04; - /* 0x05 */ u8 field_0x05[0x06 - 0x05]; - /* 0x06 */ s16 field_0x06; - /* 0x08 */ s16 field_0x08; - /* 0x0A */ u8 field_0x0A[0x0C - 0x0A]; - /* 0x0C */ f32 field_0x0c; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1c; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2c; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; -}; - /** * @ingroup actors-enemies * @class daE_FZ_c @@ -143,28 +119,4 @@ class daE_FZ_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_FZ_c) == 0xC24); -class daE_FZ_HIO_c { -public: - /* 806BE94C */ daE_FZ_HIO_c(); - /* 806C1440 */ virtual ~daE_FZ_HIO_c() {}; - -public: - /* 0x04 */ s8 field_0x04; - /* 0x05 */ u8 field_0x05[0x06 - 0x05]; - /* 0x06 */ s16 field_0x06; - /* 0x08 */ s16 field_0x08; - /* 0x0A */ u8 field_0x0A[0x0C - 0x0A]; - /* 0x0C */ f32 field_0x0c; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1c; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2c; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; -}; - #endif /* D_A_E_FZ_H */ diff --git a/include/d/actor/d_a_e_gi.h b/include/d/actor/d_a_e_gi.h index 004b8788194..ad86ca787bc 100644 --- a/include/d/actor/d_a_e_gi.h +++ b/include/d/actor/d_a_e_gi.h @@ -93,24 +93,4 @@ class daE_GI_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_GI_c) == 0x107c); -class daE_GI_HIO_c : public JORReflexible { -public: - /* 806CD48C */ daE_GI_HIO_c(); - /* 806D098C */ virtual ~daE_GI_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 id; - /* 0x08 */ f32 model_size; - /* 0x0C */ f32 move_speed; - /* 0x10 */ f32 player_detect_range; - /* 0x14 */ f32 player_attack_range; - /* 0x18 */ f32 attack_angle; - /* 0x1C */ f32 link_stun_time; - /* 0x20 */ f32 wolf_stun_time; - /* 0x24 */ f32 scream_prevention_time; - /* 0x28 */ f32 lever_spin_time; -}; - - #endif /* D_A_E_GI_H */ diff --git a/include/d/actor/d_a_e_gob.h b/include/d/actor/d_a_e_gob.h index edaa1a43533..ff71e3cd4e9 100644 --- a/include/d/actor/d_a_e_gob.h +++ b/include/d/actor/d_a_e_gob.h @@ -99,22 +99,4 @@ class e_gob_class : public fopEn_enemy_c { STATIC_ASSERT(sizeof(e_gob_class) == 0xde4); -class daE_GOB_HIO_c : public JORReflexible { -public: - /* 806D808C */ daE_GOB_HIO_c(); - - void genMessage(JORMContext*); - /* 806DECD0 */ virtual ~daE_GOB_HIO_c() {} - - /* 0x04 */ s8 id; - /* 0x08 */ f32 size; - /* 0x0C */ f32 normal_walk_speed; - /* 0x10 */ f32 battle_walk_speed; - /* 0x14 */ f32 roll_speed; - /* 0x18 */ s16 rotation_speed; - /* 0x1A */ s16 swing_time_a; - /* 0x1C */ s16 swing_time_b; -}; - - #endif /* D_A_E_GOB_H */ diff --git a/include/d/actor/d_a_e_hb.h b/include/d/actor/d_a_e_hb.h index bf355b11f33..a7e0241007c 100644 --- a/include/d/actor/d_a_e_hb.h +++ b/include/d/actor/d_a_e_hb.h @@ -77,23 +77,4 @@ class e_hb_class { STATIC_ASSERT(sizeof(e_hb_class) == 0x1268); -class daE_HB_HIO_c : public JORReflexible { -public: -#if DEBUG - virtual void genMessage(JORMContext*); -#endif - - /* 804FBD6C */ daE_HB_HIO_c(); - /* 805005D0 */ virtual ~daE_HB_HIO_c() {} - - /* 0x04 */ s8 id; - /* 0x08 */ f32 base_size; - /* 0x0C */ f32 flower_size; - /* 0x10 */ f32 appear_size; - /* 0x14 */ s16 roof_reappear_interval; - /* 0x16 */ s16 attack_freq; - /* 0x18 */ u8 bite_pattern; -}; - - #endif /* D_A_E_HB_H */ diff --git a/include/d/actor/d_a_e_kg.h b/include/d/actor/d_a_e_kg.h index 9d430bcf95c..f353fb8a9ff 100644 --- a/include/d/actor/d_a_e_kg.h +++ b/include/d/actor/d_a_e_kg.h @@ -53,16 +53,4 @@ class e_kg_class : public fopEn_enemy_c { STATIC_ASSERT(sizeof(e_kg_class) == 0xa74); -class daE_KG_HIO_c { -public: - /* 806F7EEC */ daE_KG_HIO_c(); - /* 806F9EE8 */ virtual ~daE_KG_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mSize; - /* 0x0c */ f32 field_0xc; - /* 0x10 */ f32 mCheckRange; -}; - - #endif /* D_A_E_KG_H */ diff --git a/include/d/actor/d_a_e_kk.h b/include/d/actor/d_a_e_kk.h index 0205055153f..350bf1e371f 100644 --- a/include/d/actor/d_a_e_kk.h +++ b/include/d/actor/d_a_e_kk.h @@ -97,20 +97,4 @@ class daE_KK_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_KK_c) == 0x13d4); -class daE_KK_HIO_c : public JORReflexible { -public: - /* 806FA70C */ daE_KK_HIO_c(); - /* 806FF0F0 */ virtual ~daE_KK_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 model_size; - /* 0x0C */ f32 spear_throw_range; - /* 0x10 */ f32 direct_attack_range; - /* 0x14 */ f32 default_moving_range; - /* 0x18 */ s16 escape_time; - /* 0x1A */ u8 range_display; -}; - #endif /* D_A_E_KK_H */ diff --git a/include/d/actor/d_a_e_kr.h b/include/d/actor/d_a_e_kr.h index 9252341cba9..b59b54d5722 100644 --- a/include/d/actor/d_a_e_kr.h +++ b/include/d/actor/d_a_e_kr.h @@ -117,84 +117,4 @@ class e_kr_class { STATIC_ASSERT(sizeof(e_kr_class) == 0xf08); -class e_krHIO_c : public fOpAcm_HIO_entry_c { -public: - e_krHIO_c() { - field_0x4 = 0; - field_0x5 = 0; - field_0x8 = 20.0f; - field_0xc = 2500.0f; - field_0x14 = 1.0f; - field_0x18 = 2000; - field_0x1a = 2500; - field_0x1c = 2000; - field_0x1e = 2500; - field_0x20 = 0.35f; - field_0x24 = 0.5f; - field_0x28 = 1.0f; - field_0x2c = 1.0f; - field_0x30 = 1.0f; - field_0x38 = 1.0f; - field_0x3c = 1.0f; - field_0x40 = 30; - field_0x44 = 1.0f; - field_0x48 = 1.0f; - field_0x4c = 1.5f; - field_0x50 = 1100; - field_0x54 = 3.5f; - field_0x34 = 60; - field_0x58 = 60.0f; - field_0x5c = 40.0f; - field_0x60 = 1; - field_0x64 = 8000.0f; - field_0x70 = 3000.0f; - field_0x6c = 20000; - field_0x68 = 1500.0f; - field_0x74 = 2000.0f; - field_0x6e = 20000; - field_0x78 = -40.0f; - } - /* 80705574 */ virtual ~e_krHIO_c() {} - void genMessage(JORMContext*); - - /* 0x04 */ u8 field_0x4; - /* 0x05 */ u8 field_0x5; - /* 0x06 */ u8 field_0x6; - /* 0x08 */ f32 field_0x8; - /* 0x0C */ f32 field_0xc; - /* 0x10 */ u8 field_0x10[0x14 - 0x10]; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ s16 field_0x18; - /* 0x1A */ s16 field_0x1a; - /* 0x1C */ s16 field_0x1c; - /* 0x1E */ s16 field_0x1e; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2c; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ s16 field_0x34; - /* 0x38 */ f32 field_0x38; - /* 0x3C */ f32 field_0x3c; - /* 0x40 */ s16 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4c; - /* 0x50 */ s16 field_0x50; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ f32 field_0x58; - /* 0x5C */ f32 field_0x5c; - /* 0x60 */ s16 field_0x60; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; - /* 0x6C */ s16 field_0x6c; - /* 0x6E */ s16 field_0x6e; - /* 0x70 */ f32 field_0x70; - /* 0x74 */ f32 field_0x74; - /* 0x78 */ f32 field_0x78; -}; - -STATIC_ASSERT(sizeof(e_krHIO_c) == 0x7c); - - #endif /* D_A_E_KR_H */ diff --git a/include/d/actor/d_a_e_mf.h b/include/d/actor/d_a_e_mf.h index d75a115010c..0260ba23701 100644 --- a/include/d/actor/d_a_e_mf.h +++ b/include/d/actor/d_a_e_mf.h @@ -137,25 +137,4 @@ class e_mf_class { STATIC_ASSERT(sizeof(e_mf_class) == 0x10ec); -class daE_MF_HIO_c : public JORReflexible { -public: - /* 8070A70C */ daE_MF_HIO_c(); - /* 80713464 */ virtual ~daE_MF_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 model_size; // 基本サイズ - /* 0x0C */ f32 movement_speed; // 移動速度 - /* 0x10 */ f32 dash_speed; // 突進速度 - /* 0x14 */ f32 battle_init_range; // 戦闘開始範囲 - /* 0x18 */ f32 attack_init_range; // 攻撃開始範囲 - /* 0x1C */ s16 field_0x1c; // 防御静止間 - /* 0x1E */ s16 field_0x1e; // 魂抜間 弱 - /* 0x20 */ s16 field_0x20; // 魂抜間 強 - /* 0x22 */ u8 field_0x22; - /* 0x23 */ u8 invulnerable; // 不死身 -}; - - #endif /* D_A_E_MF_H */ diff --git a/include/d/actor/d_a_e_ms.h b/include/d/actor/d_a_e_ms.h index 87f4511df77..5de2529a0c8 100644 --- a/include/d/actor/d_a_e_ms.h +++ b/include/d/actor/d_a_e_ms.h @@ -59,19 +59,4 @@ class e_ms_class : public fopEn_enemy_c { STATIC_ASSERT(sizeof(e_ms_class) == 0xbbc); -class daE_MS_HIO_c : public JORReflexible { -public: - /* 80725B8C */ daE_MS_HIO_c(); - /* 8072900C */ virtual ~daE_MS_HIO_c() {}; - - void genMessage(JORMContext*); - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mScale; - /* 0x0C */ f32 mTargetSpeed1; - /* 0x10 */ f32 mSpeedF; - /* 0x14 */ f32 mTargetSpeed2; - /* 0x18 */ f32 mPlayerDistanceLimit; -}; - #endif /* D_A_E_MS_H */ diff --git a/include/d/actor/d_a_e_nz.h b/include/d/actor/d_a_e_nz.h index d13ce5148fd..9de2046c55f 100644 --- a/include/d/actor/d_a_e_nz.h +++ b/include/d/actor/d_a_e_nz.h @@ -55,21 +55,4 @@ class e_nz_class { STATIC_ASSERT(sizeof(e_nz_class) == 0xa88); -class daE_NZ_HIO_c : public JORReflexible { -public: - /* 807299EC */ daE_NZ_HIO_c(); - /* 8072BC88 */ virtual ~daE_NZ_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 mId; - /* 0x08 */ f32 mBasicSize; - /* 0x0C */ f32 mSpeed; - /* 0x10 */ f32 mAttackSpeed; - /* 0x14 */ s16 mWaitTime; - /* 0x18 */ f32 mCurrentAlphaSpeed; - /* 0x1C */ f32 mVanishingAlphaSpeed; -}; - - #endif /* D_A_E_NZ_H */ diff --git a/include/d/actor/d_a_e_oc.h b/include/d/actor/d_a_e_oc.h index d0964399481..584cb98956c 100644 --- a/include/d/actor/d_a_e_oc.h +++ b/include/d/actor/d_a_e_oc.h @@ -167,23 +167,6 @@ class daE_OC_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_OC_c) == 0xe88); -class daE_OC_HIO_c { -public: - /* 8072C5CC */ daE_OC_HIO_c(); - /* 80735630 */ virtual ~daE_OC_HIO_c() {} - - /* 0x04 */ s8 field_0x04; - /* 0x05 */ u8 field_0x05; - /* 0x08 */ f32 field_0x08; - /* 0x0c */ f32 field_0x0c; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1c */ f32 field_0x1c; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; -}; - struct E_OC_n { static f32 const oc_attackb_trans[10]; static f32 const oc_attackc_trans[10]; @@ -195,5 +178,4 @@ struct E_OC_n { static daE_OC_c* m_talk_oc; }; - #endif /* D_A_E_OC_H */ diff --git a/include/d/actor/d_a_e_ot.h b/include/d/actor/d_a_e_ot.h index 12276c18e07..e07eb89227f 100644 --- a/include/d/actor/d_a_e_ot.h +++ b/include/d/actor/d_a_e_ot.h @@ -87,19 +87,4 @@ class daE_OT_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_OT_c) == 0xb98); -class daE_OT_HIO_c { -public: - /* 8073A2CC */ daE_OT_HIO_c(); - /* 8073C9B0 */ virtual ~daE_OT_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mAttackSpeed; - /* 0x0C */ f32 mHeartDropRate; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1c; -}; - - #endif /* D_A_E_OT_H */ diff --git a/include/d/actor/d_a_e_pm.h b/include/d/actor/d_a_e_pm.h index 9355e652741..1c5bdd89ce3 100644 --- a/include/d/actor/d_a_e_pm.h +++ b/include/d/actor/d_a_e_pm.h @@ -151,36 +151,4 @@ class daE_PM_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_PM_c) == 0xB7C); -class daE_PM_HIO_c { -public: - /* 80741EEC */ daE_PM_HIO_c(); - /* 8074BA68 */ virtual ~daE_PM_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mLampParticleScale; - /* 0x0C */ f32 mGlowEffectScale; - /* 0x10 */ f32 mEscapeRange; - /* 0x14 */ s16 mGlowColor1R; - /* 0x16 */ s16 mGlowColor1G; - /* 0x18 */ s16 mGlowColor1B; - /* 0x1A */ s16 mGlowColor2R; - /* 0x1C */ s16 mGlowColor2G; - /* 0x1E */ s16 mGlowColor2B; - /* 0x20 */ s16 mGlowColor1A; - /* 0x22 */ s16 mBossEscapeTimer; - /* 0x24 */ s16 field_0x24; - /* 0x26 */ s16 mAdditionalPuppetNum; - /* 0x28 */ f32 mCreateTimer; - /* 0x2C */ f32 field_0x2c; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; - /* 0x38 */ f32 mBossLightR; - /* 0x3C */ f32 mBossLightG; - /* 0x40 */ f32 mBossLightB; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; -}; - -STATIC_ASSERT(sizeof(daE_PM_HIO_c) == 0x4C); - #endif /* D_A_E_PM_H */ diff --git a/include/d/actor/d_a_e_pz.h b/include/d/actor/d_a_e_pz.h index a87afadc091..105d2c98e78 100644 --- a/include/d/actor/d_a_e_pz.h +++ b/include/d/actor/d_a_e_pz.h @@ -125,21 +125,4 @@ class daE_PZ_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_PZ_c) == 0xEF8); -class daE_PZ_HIO_c : public JORReflexible { -public: - /* 8075856C */ daE_PZ_HIO_c(); - /* 80760C60 */ virtual ~daE_PZ_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 no; - /* 0x08 */ f32 body_model_size; - /* 0x0C */ f32 portal_model_size; - /* 0x10 */ f32 bullet_speed; - /* 0x14 */ f32 weapon_hit_warp_speed; - /* 0x18 */ s16 after_attack_wait_time; - /* 0x1A */ s16 blur_start_timing; -}; - - #endif /* D_A_E_PZ_H */ diff --git a/include/d/actor/d_a_e_rb.h b/include/d/actor/d_a_e_rb.h index 410d8846a5b..8845e99567e 100644 --- a/include/d/actor/d_a_e_rb.h +++ b/include/d/actor/d_a_e_rb.h @@ -62,15 +62,4 @@ class e_rb_class { STATIC_ASSERT(sizeof(e_rb_class) == 0xa6c); -class daE_RB_HIO_c { -public: - /* 8076238C */ daE_RB_HIO_c(); - /* 80764838 */ virtual ~daE_RB_HIO_c() {} - - /* 0x4 */ s8 id; - /* 0x8 */ f32 base_size; - /* 0xC */ f32 ground_depth; -}; - - #endif /* D_A_E_RB_H */ diff --git a/include/d/actor/d_a_e_rd.h b/include/d/actor/d_a_e_rd.h index 50c49a493ad..4c76cdb026f 100644 --- a/include/d/actor/d_a_e_rd.h +++ b/include/d/actor/d_a_e_rd.h @@ -196,46 +196,4 @@ class e_rd_class { STATIC_ASSERT(sizeof(e_rd_class) == 0x1368); -class daE_RD_HIO_c : public JORReflexible { -public: - /* 80504A6C */ daE_RD_HIO_c(); - /* 8051801C */ virtual ~daE_RD_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x00 */ s8 field_0x4; - - /* ライダー (Rider) */ - /* 0x08 */ f32 model_size; // 基本サイズ (Basic size) - /* 0x0C */ f32 field_0xc; // リーダーサイズ比 (Leader size ratio) - /* 0x10 */ f32 movement_speed; // 移動速度 (Movement speed) - - /* こん棒兵の場合 (In the case of the club soldier) */ - /* 0x14 */ f32 dash_speed; // 突進速度 (Rush speed) - /* 0x18 */ f32 battle_init_range; // 戦闘開始範囲 (Battle starting range) - /* 0x1C */ f32 attack_init_range; // 攻撃開始範囲 (Attack starting range) - /* 0x20 */ f32 swing_speed; // 振り速さ (Swing speed) - - /* 矢兵の場合 (In the case of arrow soldiers) */ - /* 0x24 */ s16 field_0x24; // 号令→構えの間 (Command → Preparation) - /* 0x26 */ u8 padding[2]; - /* 0x28 */ f32 attack_range; // 攻撃範囲 (Attack range) - /* 0x2C */ f32 mounted_launch_distance; // 騎乗発射距離 (Mounted launch distance) - /* 0x30 */ f32 wolf_falling_power_y; // 狼倒れ力Y (Wolf falling power Y) - /* 0x34 */ f32 wolf_falling_power_z; // 狼倒れ力Z (Wolf falling power Z) - - /* 0x38 */ u8 field_0x38; - /* 0x39 */ u8 invulnerable; // 不死身 (Invulnerability) - /* 0x3A */ u8 eye_polygon; // 目ポリゴン (Eye polygon) - /* 0x3B */ u8 one_hit_kill; // 一撃必殺 (One hit kill) - /* 0x3C */ f32 field_0x3c; // 一騎（ダ）サイズ (One-man army (Da) size) - /* 0x40 */ f32 jump_g; // 飛びＧ (Jump G) - /* 0x44 */ f32 jump_z; // 飛びＺ (Jump Z) - /* 0x48 */ f32 field_0x48; // 飛びＺ（騎乗停止） (Jump Z (Stop riding)) - /* 0x4C */ f32 jump_y; // 飛びＹ (Jump Y) - - -}; - - #endif /* D_A_E_RD_H */ diff --git a/include/d/actor/d_a_e_rdb.h b/include/d/actor/d_a_e_rdb.h index 50f67eebdd0..f764b79cc55 100644 --- a/include/d/actor/d_a_e_rdb.h +++ b/include/d/actor/d_a_e_rdb.h @@ -110,8 +110,6 @@ class e_rdb_class { /* 0x5B */ BMDR_SHOULDERR_ARMOR, }; - /* 8076AA0C */ e_rdb_class() {}; - /* 0x0000 */ fopEn_enemy_c enemy; /* 0x05ac */ request_of_phase_process_class mPhase; /* 0x05B4 */ s16 mMode; @@ -200,14 +198,4 @@ class e_rdb_class { STATIC_ASSERT(sizeof(e_rdb_class) == 0x1154); -class daE_RDB_HIO_c : public JORReflexible { -public: - /* 807650CC */ daE_RDB_HIO_c(); - /* 8076AF64 */ virtual ~daE_RDB_HIO_c() {}; - - void genMessage(JORMContext*); - /* 0x04 */ s8 mID; - /* 0x08 */ f32 field_0x8; -}; - #endif /* D_A_E_RDB_H */ diff --git a/include/d/actor/d_a_e_rdy.h b/include/d/actor/d_a_e_rdy.h index 21be9c904ff..9cf8a10524f 100644 --- a/include/d/actor/d_a_e_rdy.h +++ b/include/d/actor/d_a_e_rdy.h @@ -169,37 +169,4 @@ class e_rdy_class { STATIC_ASSERT(sizeof(e_rdy_class) == 0x142C); -class daE_RDY_HIO_c : public JORReflexible { -public: - /* 8076BDCC */ daE_RDY_HIO_c(); - /* 80779880 */ virtual ~daE_RDY_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mScale; - /* 0x0C */ f32 field_0xc; - /* 0x10 */ f32 mWalkSpeed; - /* 0x14 */ f32 mRunSpeed; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1c; - /* 0x20 */ f32 mAttackAnmSpeed; - /* 0x24 */ s16 field_0x24; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2c; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; - /* 0x38 */ u8 field_0x38; - /* 0x39 */ u8 field_0x39; - /* 0x3A */ u8 mDrawEyeModel; - /* 0x3B */ u8 field_0x3b; - /* 0x3C */ f32 field_0x3c; - /* 0x40 */ f32 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4c; -}; - -STATIC_ASSERT(sizeof(daE_RDY_HIO_c) == 0x50); - #endif /* D_A_E_RDY_H */ diff --git a/include/d/actor/d_a_e_s1.h b/include/d/actor/d_a_e_s1.h index 80f98fbe9d6..a631ba47ac5 100644 --- a/include/d/actor/d_a_e_s1.h +++ b/include/d/actor/d_a_e_s1.h @@ -85,23 +85,4 @@ class e_s1_class : public fopEn_enemy_c { STATIC_ASSERT(sizeof(e_s1_class) == 0x3084); -class daE_S1_HIO_c { -public: - /* 8077AB8C */ daE_S1_HIO_c(); - /* 80780840 */ virtual ~daE_S1_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mBaseSize; - /* 0x0C */ f32 mMoveSpeed; - /* 0x10 */ u8 field_0x10[0x14 - 0x10]; - /* 0x14 */ f32 mDashSpeed; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ s16 mFallSEWaitTime; - /* 0x1E */ s16 mAllDeadWaitTime; - /* 0x20 */ f32 mReactionDist; - /* 0x24 */ f32 mReactionAngle; - /* 0x28 */ s16 mReactionTime; - /* 0x2A */ u8 mInvincible; -}; - #endif /* D_A_E_S1_H */ diff --git a/include/d/actor/d_a_e_sm2.h b/include/d/actor/d_a_e_sm2.h index 5e3a4d3bd09..bf16a45f98a 100644 --- a/include/d/actor/d_a_e_sm2.h +++ b/include/d/actor/d_a_e_sm2.h @@ -108,21 +108,4 @@ class e_sm2_class { STATIC_ASSERT(sizeof(e_sm2_class) == 0xff0); -class daE_SM2_HIO_c : public fOpAcm_HIO_entry_c { -public: - /* 80798B4C */ daE_SM2_HIO_c(); - /* 8079CE94 */ virtual ~daE_SM2_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s16 unk_0x4; - /* 0x06 */ u8 merge_OFF; - /* 0x07 */ u8 unk_0x7; - /* 0x08 */ u8 color_debug_ON; - /* 0x0A */ s16 color_debug_R; - /* 0x0C */ s16 color_debug_G; - /* 0x0E */ s16 color_debug_B; -}; - - #endif /* D_A_E_SM2_H */ diff --git a/include/d/actor/d_a_e_sw.h b/include/d/actor/d_a_e_sw.h index 59387efeb5c..ee966cf1cde 100644 --- a/include/d/actor/d_a_e_sw.h +++ b/include/d/actor/d_a_e_sw.h @@ -148,21 +148,4 @@ class daE_SW_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_SW_c) == 0xb18); -class daE_SW_HIO_c { -public: - /* サンドワーム (Sandworm) */ - /* 807A740C */ daE_SW_HIO_c(); - /* 807AF870 */ virtual ~daE_SW_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 basic_size; // 基本サイズ (Basic Size) - /* 0x0C */ f32 bomb_notice_dist; // 爆弾認識距離 (Bomb Recognition Distance) - /* 0x10 */ f32 bomb_attack_start_range; // 爆弾攻撃開始範囲 (Bomb Attack Start Range) - /* 0x14 */ f32 human_attack_init_range; // 人用攻撃開始範囲 (Human Attack Initiation Range) - /* 0x18 */ f32 horse_attack_init_range; // 馬用攻撃開始範囲 (Horse Attack Initiation Range) - /* 0x1C */ f32 character_notice_dist; // 人認識距離(ダンジョン用) (Character Recognition Distance (For Dungeon)) - /* 0x20 */ u8 movement_range_debug_display; // 移動範囲デバック表示 (Movement Range Debug Display) -}; - - #endif /* D_A_E_SW_H */ diff --git a/include/d/actor/d_a_e_th.h b/include/d/actor/d_a_e_th.h index eb89f87673e..4fc76287531 100644 --- a/include/d/actor/d_a_e_th.h +++ b/include/d/actor/d_a_e_th.h @@ -93,18 +93,4 @@ class e_th_class : public fopEn_enemy_c { STATIC_ASSERT(sizeof(e_th_class) == 0x123c); -class daE_TH_HIO_c : public JORReflexible { -public: - /* 807B038C */ daE_TH_HIO_c(); - /* 807B3FA4 */ virtual ~daE_TH_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ s8 no; - /* 0x08 */ f32 base_size; - /* 0x0C */ u8 unk_0xC[0x10 - 0xC]; - /* 0x10 */ f32 move_range; - /* 0x14 */ f32 middle_move_range; -}; - #endif /* D_A_E_TH_H */ diff --git a/include/d/actor/d_a_e_vt.h b/include/d/actor/d_a_e_vt.h index 176ecbafd95..fe2f29a10a7 100644 --- a/include/d/actor/d_a_e_vt.h +++ b/include/d/actor/d_a_e_vt.h @@ -282,26 +282,4 @@ class daE_VA_c : public fopEn_enemy_c { /* 0x10FF8 */ u8 mInitHIO; }; -class daE_VA_HIO_c { -public: - /* 807C25EC */ daE_VA_HIO_c(); - /* 807CE2AC */ virtual ~daE_VA_HIO_c() {} - - /* 0x04 */ s8 field_0x04; - /* 0x08 */ f32 mModelSize; - /* 0x0C */ f32 mAttackRange; - /* 0x10 */ f32 mBiteCount; - /* 0x14 */ f32 mCircleAttackRadius; - /* 0x18 */ f32 mFadeAwayTime; - /* 0x1C */ f32 mDownTime; - /* 0x20 */ f32 mDownHP; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2c; - /* 0x30 */ f32 mKRegLightR; - /* 0x34 */ f32 mKRegLightG; - /* 0x38 */ f32 mKRegLightB; - /* 0x3C */ f32 mKRegLightA; -}; - #endif /* D_A_E_VT_H */ diff --git a/include/d/actor/d_a_e_yk.h b/include/d/actor/d_a_e_yk.h index cd416db9bab..5a4688ea5f0 100644 --- a/include/d/actor/d_a_e_yk.h +++ b/include/d/actor/d_a_e_yk.h @@ -34,24 +34,6 @@ enum daE_YK_Action { ACT_WIND /**< Keese is caught in Gale Boomerang's wind, spins around it. */ }; -/** - * @class daE_YK_HIO_c - * @brief Shadow Keese Host Input Output class. - * - */ -class daE_YK_HIO_c { -public: - /* 8080482C */ daE_YK_HIO_c(); - /* 808077E0 */ virtual ~daE_YK_HIO_c() {} - - /* 0x04 */ s8 field_0x04; ///< @brief Initialized to -1, appears unused. - /* 0x08 */ f32 mModelScale; ///< @brief Base model scale factor (default: 1.0). - /* 0x0C */ f32 mFlySpeed; ///< @brief Base flying speed (default: 15.0). - /* 0x10 */ f32 mAttackRange; ///< @brief Distance threshold for entering attack state (default: 250.0). - /* 0x14 */ f32 mCruiseSpeed; ///< @brief Speed when flying normally (default: 15.0). - /* 0x18 */ f32 mChargeSpeed; ///< @brief Speed when charging at player (default: 40.0). -}; - /** * @ingroup actors-enemies * @class e_yk_class diff --git a/include/d/actor/d_a_e_ym.h b/include/d/actor/d_a_e_ym.h index a6fc0dd1a29..10256c787e7 100644 --- a/include/d/actor/d_a_e_ym.h +++ b/include/d/actor/d_a_e_ym.h @@ -11,22 +11,6 @@ class daKago_c; -class daE_YM_HIO_c { -public: - /* 8080812C */ daE_YM_HIO_c(); - - /* 80815458 */ virtual ~daE_YM_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mModelSize; - /* 0x0C */ f32 mElectricInvincibilityTimeExtension; - /* 0x10 */ f32 mMoveSpeed; - /* 0x14 */ f32 mFlyMoveSpeed; - /* 0x18 */ f32 mFlyAttackSpeed; - /* 0x1C */ f32 mSurpriseDistance; - /* 0x20 */ f32 mMoveRange; -}; - /** * @ingroup actors-enemies * @class daE_YM_c diff --git a/include/d/actor/d_a_e_ymb.h b/include/d/actor/d_a_e_ymb.h index 9a0112279a4..96677987b2c 100644 --- a/include/d/actor/d_a_e_ymb.h +++ b/include/d/actor/d_a_e_ymb.h @@ -167,18 +167,4 @@ class daE_YMB_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_YMB_c) == 0x1524); -struct daE_YMB_HIO_c { -public: - /* 8081610C */ daE_YMB_HIO_c(); - /* 80821460 */ virtual ~daE_YMB_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 model_size; // モデルサイズ (Model Size) - /* 0x0C */ f32 fly_movement_speed; // 飛行移動速度 (Fly Movement Speed) - /* 0x10 */ f32 swim_attack_speed; // 泳ぎ攻撃速度 (Swim Attack Speed) - /* 0x14 */ f32 fly_attack_speed; // 飛行攻撃速度 (Fly Attack Speed) - /* 0x18 */ f32 rollover_time; // ひっくり返り時間 (Rollover Time) - /* 0x1C */ f32 fly_height_adjust; // 飛行高度-加減値 (Fly Height Adjust) -}; - #endif /* D_A_E_YMB_H */ diff --git a/include/d/actor/d_a_e_yr.h b/include/d/actor/d_a_e_yr.h index 9794671a3e2..b07eb88150f 100644 --- a/include/d/actor/d_a_e_yr.h +++ b/include/d/actor/d_a_e_yr.h @@ -117,84 +117,4 @@ class e_yr_class { STATIC_ASSERT(sizeof(e_yr_class) == 0xf20); -class e_yrHIO_c : public fOpAcm_HIO_entry_c { -public: - e_yrHIO_c() { - mInvulnerable = 0; - mStationary = 0; - field_0x8 = 20.0f; - field_0xc = 2500.0f; - mModelScale = 1.0f; - mAttackAMinTime = 2000; - mAttackAMaxTime = 2500; - mAttackBMinTime = 2000; - mAttackBMaxTime = 2500; - mAttackMoveSpeed = 0.35f; - mAttackFrequency = 0.5f; - mFlyPlaybackSpeed = 1.0f; - mHoveringPlaybackSpeed = 1.0f; - mAttackPlaybackSpeed = 1.0f; - field_0x38 = 1.0f; - mChancePlaybackSpeed = 1.0f; - field_0x40 = 30; - field_0x44 = 1.0f; - field_0x48 = 1.0f; - field_0x4c = 1.5f; - mBrakeStartDist = 1100; - field_0x54 = 3.5f; - mChanceTime = 60; - mLargeDamage = 60.0f; - mSmallDamage = 40.0f; - mHitOccurrenceFrame = 1; - mDetectDistSky = 8000.0f; - mDetectHeightSky = 3000.0f; - mDetectAngleSky = 20000; - mDetectDistGround = 1500.0f; - mDetectHeightGround = 2000.0f; - mDetectAngleGround = 20000; - } - - /* 808282CC */ virtual ~e_yrHIO_c() {} - -#if DEBUG - void genMessage(JORMContext*); -#endif - - /* 0x04 */ u8 mInvulnerable; - /* 0x05 */ u8 mStationary; - /* 0x06 */ u8 mSuddenAttack; - /* 0x08 */ f32 field_0x8; - /* 0x0C */ f32 field_0xc; - /* 0x10 */ f32 mTurningRadius; - /* 0x14 */ f32 mModelScale; - /* 0x18 */ s16 mAttackAMinTime; - /* 0x1A */ s16 mAttackAMaxTime; - /* 0x1C */ s16 mAttackBMinTime; - /* 0x1E */ s16 mAttackBMaxTime; - /* 0x20 */ f32 mAttackMoveSpeed; - /* 0x24 */ f32 mAttackFrequency; - /* 0x28 */ f32 mFlyPlaybackSpeed; - /* 0x2C */ f32 mHoveringPlaybackSpeed; - /* 0x30 */ f32 mAttackPlaybackSpeed; - /* 0x34 */ s16 mChanceTime; - /* 0x38 */ f32 field_0x38; - /* 0x3C */ f32 mChancePlaybackSpeed; - /* 0x40 */ s16 field_0x40; - /* 0x44 */ f32 field_0x44; - /* 0x48 */ f32 field_0x48; - /* 0x4C */ f32 field_0x4c; - /* 0x50 */ s16 mBrakeStartDist; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ f32 mLargeDamage; - /* 0x5C */ f32 mSmallDamage; - /* 0x60 */ s16 mHitOccurrenceFrame; - /* 0x64 */ f32 mDetectDistSky; - /* 0x68 */ f32 mDetectDistGround; - /* 0x6C */ s16 mDetectAngleSky; - /* 0x6E */ s16 mDetectAngleGround; - /* 0x70 */ f32 mDetectHeightSky; - /* 0x74 */ f32 mDetectHeightGround; -}; - - #endif /* D_A_E_YR_H */ diff --git a/include/d/actor/d_a_e_zs.h b/include/d/actor/d_a_e_zs.h index c02db9ffdd5..6901e01e277 100644 --- a/include/d/actor/d_a_e_zs.h +++ b/include/d/actor/d_a_e_zs.h @@ -68,15 +68,4 @@ class daE_ZS_c : public fopEn_enemy_c { STATIC_ASSERT(sizeof(daE_ZS_c) == 0xa3c); -class daE_ZS_HIO_c { -public: - /* 808330AC */ daE_ZS_HIO_c(); - /* 80834DDC */ virtual ~daE_ZS_HIO_c() {} - - /* 0x4 */ s8 field_0x4; - /* 0x8 */ f32 field_0x8; - /* 0xc */ f32 field_0xc; -}; - - #endif /* D_A_E_ZS_H */ diff --git a/include/d/actor/d_a_ep.h b/include/d/actor/d_a_ep.h index ad1ad30d57c..281663b45c0 100644 --- a/include/d/actor/d_a_ep.h +++ b/include/d/actor/d_a_ep.h @@ -8,9 +8,6 @@ class ep_hahen_s { public: - /* 8046ACC0 */ ~ep_hahen_s() {}; - /* 8046AD44 */ ep_hahen_s() {}; - /* 0x00 */ J3DModel* mpModel; /* 0x04 */ cXyz field_0x4; /* 0x10 */ cXyz field_0x10; @@ -39,8 +36,6 @@ STATIC_ASSERT(sizeof(ep_hahen_s) == 0xa8); class ep_class : public fopAc_ac_c { public: - /* 8046AB2C */ ep_class() {}; - /* 0x0568 */ request_of_phase_process_class mPhase; /* 0x0570 */ Mtx field_0x570; /* 0x05A0 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_formation_mng.h b/include/d/actor/d_a_formation_mng.h index 0758f046078..bebe53b07e7 100644 --- a/include/d/actor/d_a_formation_mng.h +++ b/include/d/actor/d_a_formation_mng.h @@ -93,17 +93,12 @@ struct daFmtMng_Path_c { }; struct FmtPos_c : public daFmtMng_Path_c { - /* 80836C24 */ ~FmtPos_c() {} - /* 80836C60 */ FmtPos_c() {} /* 0x10 */ cXyz field_0x10; /* 0x1C */ s16 field_0x1c; /* 0x1E */ s16 field_0x1e; }; struct FmtMember_c { - /* 80837458 */ ~FmtMember_c() {} - /* 80837798 */ FmtMember_c() {} - /* 0x00 */ u32 mNpcId; /* 0x04 */ cXyz field_0x04; /* 0x10 */ cXyz field_0x10; @@ -145,7 +140,7 @@ struct daFmtMng_c : public fopAc_ac_c { /* 80837078 */ void executeFight(); /* 808374B4 */ int create(); /* 8083750C */ void create_init(); - + ~daFmtMng_c() { FmtMember_c* member = mMember; for (int i = 0; i < mFormationLine * mFormationRow; i++, member++) { @@ -158,14 +153,14 @@ struct daFmtMng_c : public fopAc_ac_c { int getTimeHour() { if (dKy_darkworld_check()) { return dKy_getDarktime_hour(); - } + } return dKy_getdaytime_hour(); } int getTimeMinute() { if (dKy_darkworld_check()) { return dKy_getDarktime_minute(); - } + } return dKy_getdaytime_minute(); } diff --git a/include/d/actor/d_a_mg_rod.h b/include/d/actor/d_a_mg_rod.h index 2f0b8f82dd7..9e748987045 100644 --- a/include/d/actor/d_a_mg_rod.h +++ b/include/d/actor/d_a_mg_rod.h @@ -302,20 +302,4 @@ class dmg_rod_class { STATIC_ASSERT(sizeof(dmg_rod_class) == 0x1690); -class dmg_rod_HIO_c { -public: - /* 804A95EC */ dmg_rod_HIO_c(); - /* 804BB070 */ virtual ~dmg_rod_HIO_c() {} - - /* 0x04 */ s8 id; - /* 0x08 */ f32 field_0x8; - /* 0x0C */ f32 field_0xc; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1c; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ u8 force_fish_msg_output; -}; - #endif /* D_A_MG_ROD_H */ diff --git a/include/d/actor/d_a_myna.h b/include/d/actor/d_a_myna.h index 77d06ac21cb..c4b16f10c88 100644 --- a/include/d/actor/d_a_myna.h +++ b/include/d/actor/d_a_myna.h @@ -8,35 +8,6 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_hostIO.h" - -class daMyna_HIO_c : public mDoHIO_entry_c { -public: - /* 8094A960 */ virtual ~daMyna_HIO_c() {} - - // Must be inlined but defined in .cpp for sinit to match - inline daMyna_HIO_c(); - - void genMessage(JORMContext*); - - /* 0x04 */ f32 field_0x04; // DAT_8094ba40 - /* 0x08 */ f32 field_0x08; // DAT_8094ba44 - /* 0x0C */ f32 field_0x0C; // DAT_8094ba48 - /* 0x10 */ f32 field_0x10; // DAT_8094ba4c - /* 0x14 */ f32 field_0x14; // DAT_8094ba50 - /* 0x18 */ f32 field_0x18; // DAT_8094ba54 - /* 0x1C */ f32 field_0x1C; // DAT_8094ba58 - /* 0x20 */ f32 field_0x20; // DAT_8094ba5c - /* 0x24 */ s16 field_0x24; // DAT_8094ba60 - /* 0x26 */ s16 field_0x26; // DAT_8094ba62 - /* 0x28 */ s16 field_0x28; // DAT_8094ba64 - /* 0x2A */ s16 field_0x2A; // DAT_8094ba66 - /* 0x2C */ s16 field_0x2C; // DAT_8094ba68 - /* 0x2E */ s16 field_0x2E; // DAT_8094ba6a - /* 0x30 */ s16 field_0x30; // DAT_8094ba6c -}; - -STATIC_ASSERT(sizeof(daMyna_HIO_c) == 0x34); - // This struct may end up belonging elsewhere struct ShopItem { /* 0x0 */ u32 mTargetActorID; diff --git a/include/d/actor/d_a_nbomb.h b/include/d/actor/d_a_nbomb.h index e8402dee4d8..35a6a6ae245 100644 --- a/include/d/actor/d_a_nbomb.h +++ b/include/d/actor/d_a_nbomb.h @@ -49,7 +49,6 @@ class daNbomb_c : public dBomb_c { /* 804C6FD8 */ int searchEnemy(fopAc_ac_c*); /* 804C7114 */ int createHeap(); /* 804C7324 */ int create(); - /* 804C7B44 */ daNbomb_c(); /* 804C7EB4 */ ~daNbomb_c(); /* 804C8294 */ bool checkTimerStop(); /* 804C82D8 */ BOOL checkExplode(); diff --git a/include/d/actor/d_a_npc_bou.h b/include/d/actor/d_a_npc_bou.h index abf29b9c121..63de402f657 100644 --- a/include/d/actor/d_a_npc_bou.h +++ b/include/d/actor/d_a_npc_bou.h @@ -14,7 +14,7 @@ class daNpc_Bou_Param_c { public: /* 809727F4 */ virtual ~daNpc_Bou_Param_c() {} - + struct Data { /* 0x00 */ f32 field_0x00; // 255.0f /* 0x04 */ f32 field_0x04; // 3.0f @@ -59,7 +59,7 @@ /* 0x94 */ f32 field_0x94; // 500.0f /* 0x98 */ f32 field_0x98; // -500.0f }; - + static const Data m; }; diff --git a/include/d/actor/d_a_npc_doorboy.h b/include/d/actor/d_a_npc_doorboy.h index f9a6b4e423b..a7173ea6daf 100644 --- a/include/d/actor/d_a_npc_doorboy.h +++ b/include/d/actor/d_a_npc_doorboy.h @@ -46,7 +46,7 @@ class daNpcDoorBoy_c : public daNpcF_c { /* 809ACE18 */ inline void lookat(); /* 809ACFF8 */ void setMotionAnm(int, f32); /* 809AD0C8 */ BOOL drawDbgInfo(); - /* 809AD938 */ void adjustShapeAngle(); + /* 809AD938 */ void adjustShapeAngle() {} inline u16 getMessageNo() { return fopAcM_GetParam(this) >> 8; } inline void playMotion(); diff --git a/include/d/actor/d_a_npc_fguard.h b/include/d/actor/d_a_npc_fguard.h index 900655185d9..07f2de72ab6 100644 --- a/include/d/actor/d_a_npc_fguard.h +++ b/include/d/actor/d_a_npc_fguard.h @@ -18,7 +18,7 @@ class daNpcFgd_c : public daNpcCd2_c { /* 809BA53C */ void initPosAngle(Vec&, s16); /* 809BA584 */ cPhs__Step create(); /* 809BA730 */ void create_init(); - /* 809BAA80 */ ~daNpcFgd_c(); + /* 809BAA80 */ virtual ~daNpcFgd_c(); int getType() { return fopAcM_GetParam(this) & 0xFF; } int getObjNum() { return (fopAcM_GetParam(this) >> 8) & 0xFF; } diff --git a/include/d/actor/d_a_npc_grc.h b/include/d/actor/d_a_npc_grc.h index f0ef22eaab6..c49f8833fd8 100644 --- a/include/d/actor/d_a_npc_grc.h +++ b/include/d/actor/d_a_npc_grc.h @@ -60,7 +60,7 @@ class daNpc_grC_c : public daNpcF_c { /* 809CE7C4 */ BOOL talk(void*); /* 809CEA6C */ BOOL test(void*); /* 809CEB50 */ void setPrtcl(); - /* 809CF4AC */ void adjustShapeAngle(); + /* 809CF4AC */ void adjustShapeAngle() {} static char* mEvtCutNameList; static EventFn mEvtCutList[1]; diff --git a/include/d/actor/d_a_npc_grr.h b/include/d/actor/d_a_npc_grr.h index a2c51cdd003..cd2854db1e9 100644 --- a/include/d/actor/d_a_npc_grr.h +++ b/include/d/actor/d_a_npc_grr.h @@ -73,7 +73,7 @@ class daNpc_grR_c : public daNpcF_c { /* 809E29B8 */ int waitMaro(void*); /* 809E2B48 */ int talk(void*); /* 809E2E84 */ int test(void*); - /* 809E3868 */ void adjustShapeAngle(); + /* 809E3868 */ void adjustShapeAngle() {} static char* mEvtCutNameList; static cutFunc mEvtCutList[1]; diff --git a/include/d/actor/d_a_npc_henna.h b/include/d/actor/d_a_npc_henna.h index 41af0b9254f..6456c55f591 100644 --- a/include/d/actor/d_a_npc_henna.h +++ b/include/d/actor/d_a_npc_henna.h @@ -125,33 +125,4 @@ class npc_henna_class { STATIC_ASSERT(sizeof(npc_henna_class) == 0x7fc); -class daNpc_Henna_HIO_c : public JORReflexible { -public: - /* 80542F0C */ daNpc_Henna_HIO_c(); - /* 80549E40 */ virtual ~daNpc_Henna_HIO_c() {} - void genMessage(JORMContext*); - - s8 field_0x4; - f32 field_0x8; - s16 field_0xc; - s16 mSeasonDefColorR; - s16 mSeasonDefColorG; - s16 mSeasonDefColorB; - s16 mSeason2ColorR; - s16 mSeason2ColorG; - s16 mSeason2ColorB; - s16 mSeason3ColorR; - s16 mSeason3ColorG; - s16 mSeason3ColorB; - f32 mSeasonDefLightDist; - s16 mSeasonDefLightAngle; - f32 mSeason2LightDist; - s16 mSeason2LightAngle; - f32 mSeason3LightDist; - s16 mSeason3LightAngle; -}; - - - - #endif /* D_A_NPC_HENNA_H */ diff --git a/include/d/actor/d_a_npc_ks.h b/include/d/actor/d_a_npc_ks.h index bdfe7bd9518..0975f3d1f7f 100644 --- a/include/d/actor/d_a_npc_ks.h +++ b/include/d/actor/d_a_npc_ks.h @@ -206,27 +206,4 @@ class npc_ks_class { STATIC_ASSERT(sizeof(npc_ks_class) == 0xc20); -class daNpc_Ks_HIO_c : public JORReflexible { -public: - /* 80A48F8C */ daNpc_Ks_HIO_c(); - /* 80A5DA90 */ virtual ~daNpc_Ks_HIO_c() {}; - - void genMessage(JORMContext*); - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 field_0x8; - /* 0x0C */ f32 field_0xc; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1c; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ u8 field_0x28; - /* 0x2C */ f32 field_0x2c; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; -}; - - #endif /* D_A_NPC_KS_H */ diff --git a/include/d/actor/d_a_npc_shad.h b/include/d/actor/d_a_npc_shad.h index 594a3307be3..28d26687bf2 100644 --- a/include/d/actor/d_a_npc_shad.h +++ b/include/d/actor/d_a_npc_shad.h @@ -12,22 +12,6 @@ * */ -struct daNpcShad_HIOParam { - /* 0x00 */ daNpcF_HIOParam common; - /* 0x6C */ f32 traveling_speed; // 走行速度 (Traveling Speed) -}; - -class daNpcShad_Param_c: public JORReflexible { -public: - /* 80AE1F70 */ virtual ~daNpcShad_Param_c() {} - -#ifdef DEBUG - void genMessage(JORMContext*); -#endif - - static const daNpcShad_HIOParam m; -}; - class daNpcShad_c : public daNpcF_c { public: typedef bool (daNpcShad_c::*ActionFn)(void*); diff --git a/include/d/actor/d_a_npc_shop_maro.h b/include/d/actor/d_a_npc_shop_maro.h index cf0342dd935..d7e20749bf9 100644 --- a/include/d/actor/d_a_npc_shop_maro.h +++ b/include/d/actor/d_a_npc_shop_maro.h @@ -14,8 +14,8 @@ class daNpc_shopMaro_c : public dShopSystem_c { public: /* 80AEBEB4 */ int create(); - /* 80AEBF04 */ daNpc_shopMaro_c(); - /* 80AEBF64 */ virtual ~daNpc_shopMaro_c(); + /* 80AEBF04 */ daNpc_shopMaro_c() : dShopSystem_c(0,0,0,0,0,0,0,0) {} + /* 80AEBF64 */ virtual ~daNpc_shopMaro_c() {} }; STATIC_ASSERT(sizeof(daNpc_shopMaro_c) == 0xf7c); diff --git a/include/d/actor/d_a_npc_tk.h b/include/d/actor/d_a_npc_tk.h index 086cce76943..d6cc44b203e 100644 --- a/include/d/actor/d_a_npc_tk.h +++ b/include/d/actor/d_a_npc_tk.h @@ -181,29 +181,4 @@ class daNPC_TK_c : public fopAc_ac_c { STATIC_ASSERT(sizeof(daNPC_TK_c) == 0xB44); -class daNPC_TK_HIO_c : public JORReflexible { -public: - daNPC_TK_HIO_c(); - virtual ~daNPC_TK_HIO_c() {} - - void genMessage(JORMContext*) {} - - s8 field_0x4; - f32 field_0x8; - f32 field_0xc; - f32 field_0x10; - f32 field_0x14; - f32 field_0x18; - f32 field_0x1c; - f32 field_0x20; - f32 field_0x24; - f32 field_0x28; - f32 mFlySpeed; - f32 field_0x30; - f32 field_0x34; - f32 field_0x38; - u8 field_0x3c; -}; - - #endif /* D_A_NPC_TK_H */ diff --git a/include/d/actor/d_a_obj_Turara.h b/include/d/actor/d_a_obj_Turara.h index 243de5b0dee..a3f6d12e681 100644 --- a/include/d/actor/d_a_obj_Turara.h +++ b/include/d/actor/d_a_obj_Turara.h @@ -84,23 +84,4 @@ class daTurara_c : public dBgS_MoveBgActor, public request_of_phase_process_clas STATIC_ASSERT(sizeof(daTurara_c) == 0x998); -class daTurara_HIO_c : public fOpAcm_HIO_entry_c { -public: - /* 80B9CB8C */ daTurara_HIO_c(); - /* 80B9E5B4 */ virtual ~daTurara_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ f32 field_0x04; - /* 0x08 */ f32 mGravity; - /* 0x0c */ f32 mMaxGravity; - /* 0x10 */ u8 mWaitTime; - /* 0x11 */ u8 mShockStrength; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1c */ f32 field_0x1c; -}; - -STATIC_ASSERT(sizeof(daTurara_HIO_c) == 0x20); - #endif /* D_A_OBJ_TURARA_H */ diff --git a/include/d/actor/d_a_obj_amiShutter.h b/include/d/actor/d_a_obj_amiShutter.h index 95feafa49be..6fc4627bd6a 100644 --- a/include/d/actor/d_a_obj_amiShutter.h +++ b/include/d/actor/d_a_obj_amiShutter.h @@ -29,7 +29,7 @@ class daAmiShutter_c : public dBgS_MoveBgActor, public request_of_phase_process_ }; daAmiShutter_c(): dEvLib_callback_c(this) {} - /* 80BA22E8 */ ~daAmiShutter_c() {}; + /* 80BA22E8 */ ~daAmiShutter_c() {} /* 80BA155C */ void setBaseMtx(); /* 80BA15E4 */ int CreateHeap(); @@ -77,18 +77,4 @@ class daAmiShutter_c : public dBgS_MoveBgActor, public request_of_phase_process_ STATIC_ASSERT(sizeof(daAmiShutter_c) == 0x5dc); -struct daAmiShutter_HIO_c : public mDoHIO_entry_c { - /* 0x04 */ f32 mRange; - /* 0x08 */ f32 mMaxOpenSpeed; - /* 0x0c */ f32 mMaxCloseSpeed; - /* 0x10 */ u8 mWaitTime; - /* 0x11 */ u8 field_0x11; - - /* 80BA14CC */ daAmiShutter_HIO_c(); - /* 80BA21E0 */ ~daAmiShutter_HIO_c() {}; - - void genMessage(JORMContext*); -}; - - #endif /* D_A_OBJ_AMISHUTTER_H */ diff --git a/include/d/actor/d_a_obj_batta.h b/include/d/actor/d_a_obj_batta.h index b5607cf92fa..908fc8ecac7 100644 --- a/include/d/actor/d_a_obj_batta.h +++ b/include/d/actor/d_a_obj_batta.h @@ -69,16 +69,4 @@ class daObjBATTA_c : public dInsect_c { STATIC_ASSERT(sizeof(daObjBATTA_c) == 0x9f8); -class daObj_BattaHIO_c : public JORReflexible { -public: - /* 80BA9E2C */ daObj_BattaHIO_c(); - /* 80BAC874 */ virtual ~daObj_BattaHIO_c() {} - - void genMessage(JORMContext* ctx); - - /* 0x4 */ s8 mId; - /* 0x8 */ f32 mModelScaleFemale; - /* 0xC */ f32 mModelScaleMale; -}; - #endif /* D_A_OBJ_BATTA_H */ diff --git a/include/d/actor/d_a_obj_bhbridge.h b/include/d/actor/d_a_obj_bhbridge.h index b36d7148ee1..fe29bf88d26 100644 --- a/include/d/actor/d_a_obj_bhbridge.h +++ b/include/d/actor/d_a_obj_bhbridge.h @@ -1,8 +1,9 @@ #ifndef D_A_OBJ_BHBRIDGE_H #define D_A_OBJ_BHBRIDGE_H -#include "d/d_bg_s_movebg_actor.h" +#include "d/d_a_obj.h" #include "d/d_bg_s_acch.h" +#include "d/d_bg_s_movebg_actor.h" /** * @ingroup actors-objects @@ -18,11 +19,11 @@ class daObjBhbridge_c : public dBgS_MoveBgActor { /* 80BB5380 */ int Check_RideOn(); /* 80BB558C */ void initBaseMtx(); /* 80BB55B8 */ void setBaseMtx(); - /* 80BB5934 */ int CreateHeap(); - /* 80BB59AC */ int Create(); - /* 80BB5A14 */ int Execute(f32 (**)[3][4]); - /* 80BB5E10 */ int Draw(); - /* 80BB5EB4 */ int Delete(); + /* 80BB5934 */ virtual int CreateHeap(); + /* 80BB59AC */ virtual int Create(); + /* 80BB5A14 */ virtual int Execute(f32 (**)[3][4]); + /* 80BB5E10 */ virtual int Draw(); + /* 80BB5EB4 */ virtual int Delete(); inline int create(); diff --git a/include/d/actor/d_a_obj_flag2.h b/include/d/actor/d_a_obj_flag2.h index 4a8dc481f2c..7b6f2046c72 100644 --- a/include/d/actor/d_a_obj_flag2.h +++ b/include/d/actor/d_a_obj_flag2.h @@ -23,7 +23,7 @@ class FlagCloth_c : public J3DPacket { /* 80BECCE4 */ void setCcSphere(); /* 80BECD98 */ void execute(); /* 80BEE0B8 */ cXyz getTargetPos() { return mPositions[4]; } - + /* 80BECF30 */ void draw(); /* 80BED9C4 */ virtual ~FlagCloth_c() {} diff --git a/include/d/actor/d_a_obj_fw.h b/include/d/actor/d_a_obj_fw.h index f603c5b298b..2dddcb76f1e 100644 --- a/include/d/actor/d_a_obj_fw.h +++ b/include/d/actor/d_a_obj_fw.h @@ -51,6 +51,10 @@ class daObj_Fw_HIO_c : public JORReflexible { /* 80BF204C */ daObj_Fw_HIO_c(); /* 80BF2AB0 */ virtual ~daObj_Fw_HIO_c() {} +#if DEBUG + void genMessage(JORMContext*); +#endif + /* 流木 - Driftwood */ /* 0x4 */ s8 field_0x4; /* 0x8 */ f32 size; // 大きさ - Size diff --git a/include/d/actor/d_a_obj_grave_stone.h b/include/d/actor/d_a_obj_grave_stone.h index 02d062e3e4b..0bccd918b00 100644 --- a/include/d/actor/d_a_obj_grave_stone.h +++ b/include/d/actor/d_a_obj_grave_stone.h @@ -17,9 +17,6 @@ class daGraveStone_c : public dBgS_MoveBgActor { public: class daObj_GrvStn_prtclMngr_c { public: - /* 80C12EF0 */ ~daObj_GrvStn_prtclMngr_c() {} - /* 80C12F2C */ daObj_GrvStn_prtclMngr_c() {} - /* 0x00 */ bool field_0x00; /* 0x04 */ cXyz mPos; /* 0x10 */ csXyz mAngle; diff --git a/include/d/actor/d_a_obj_key.h b/include/d/actor/d_a_obj_key.h index 8df94987ed3..61148ac7e91 100644 --- a/include/d/actor/d_a_obj_key.h +++ b/include/d/actor/d_a_obj_key.h @@ -47,17 +47,5 @@ class obj_key_class { STATIC_ASSERT(sizeof(obj_key_class) == 0x9b8); -class daObj_Key_HIO_c : public JORReflexible{ -public: - /* 80C3F40C */ daObj_Key_HIO_c(); - /* 80C40F28 */ virtual ~daObj_Key_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x4 */ s8 id; - /* 0x8 */ f32 size; - /* 0xC */ f32 chain_size; -}; - #endif /* D_A_OBJ_KEY_H */ diff --git a/include/d/actor/d_a_obj_klift00.h b/include/d/actor/d_a_obj_klift00.h index 96a1f2d9511..b81aabc5bbc 100644 --- a/include/d/actor/d_a_obj_klift00.h +++ b/include/d/actor/d_a_obj_klift00.h @@ -68,19 +68,4 @@ class daObjKLift00_c : public dBgS_MoveBgActor, public request_of_phase_process_ STATIC_ASSERT(sizeof(daObjKLift00_c) == 0x1160); -struct daObjKLift00_HIO_c : public mDoHIO_entry_c { - daObjKLift00_HIO_c(); - ~daObjKLift00_HIO_c() {}; - - void genMessage(JORMContext*); - - /* 0x04 */ f32 mChainGravity; - /* 0x08 */ f32 mRideParameters; - /* 0x0C */ f32 mWindSwayOccuranceFactor; - /* 0x10 */ f32 mWindMagnitudeChain; - /* 0x14 */ f32 mWindMagnitudeFoundation; - /* 0x18 */ f32 mChainHitSpeed; - /* 0x1C */ f32 field_0x1C; -}; - #endif /* D_A_OBJ_KLIFT00_H */ diff --git a/include/d/actor/d_a_obj_laundry.h b/include/d/actor/d_a_obj_laundry.h index cfb59c76d0a..85fda6916a4 100644 --- a/include/d/actor/d_a_obj_laundry.h +++ b/include/d/actor/d_a_obj_laundry.h @@ -14,9 +14,6 @@ */ class LaundJoint_c { public: - /* 80C51D2C */ ~LaundJoint_c(); - /* 80C51EC0 */ LaundJoint_c(); - cXyz mPos1; cXyz mPos2; cXyz mPos3; diff --git a/include/d/actor/d_a_obj_lv3Water.h b/include/d/actor/d_a_obj_lv3Water.h index f9ef9bb6c66..22115076591 100644 --- a/include/d/actor/d_a_obj_lv3Water.h +++ b/include/d/actor/d_a_obj_lv3Water.h @@ -37,7 +37,7 @@ class daLv3Water_c : public dBgS_MoveBgActor, /* 80C598BC */ virtual int Draw(); /* 80C59AA0 */ virtual int Delete(); - /* 80C59D80 */ virtual ~daLv3Water_c(); + /* 80C59D80 */ virtual ~daLv3Water_c() {} /* 80C59AE0 */ virtual bool eventStart(); int getParam() { return fpcM_GetParam(this) >> 0xC & 0x0FFF; } @@ -66,15 +66,4 @@ class daLv3Water_c : public dBgS_MoveBgActor, STATIC_ASSERT(sizeof(daLv3Water_c) == 0x628); -class daLv3Water_HIO_c : public mDoHIO_entry_c { -public: - /* 80C587CC */ daLv3Water_HIO_c(); - /* 80C59C34 */ virtual ~daLv3Water_HIO_c(); - - void genMessage(JORMContext*); - - /* 0x00 */ /* vtable */ - /* 0x04 */ u8 field_0x04; -}; - #endif /* D_A_OBJ_LV3WATER_H */ diff --git a/include/d/actor/d_a_obj_lv3Water2.h b/include/d/actor/d_a_obj_lv3Water2.h index 8996f471b92..462f84429f1 100644 --- a/include/d/actor/d_a_obj_lv3Water2.h +++ b/include/d/actor/d_a_obj_lv3Water2.h @@ -87,14 +87,4 @@ class daLv3Water2_c : public dBgS_MoveBgActor, public request_of_phase_process_c STATIC_ASSERT(sizeof(daLv3Water2_c) == 0x610); -struct daLv3Water2_HIO_c : public mDoHIO_entry_c { - /* 80C5A40C */ daLv3Water2_HIO_c(); - /* 80C5B14C */ ~daLv3Water2_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x04 */ u8 mLevelControlWaitFrames; -}; - - #endif /* D_A_OBJ_LV3WATER2_H */ diff --git a/include/d/actor/d_a_obj_lv4CandleDemoTag.h b/include/d/actor/d_a_obj_lv4CandleDemoTag.h index b7cdb98686f..7e0ff03a378 100644 --- a/include/d/actor/d_a_obj_lv4CandleDemoTag.h +++ b/include/d/actor/d_a_obj_lv4CandleDemoTag.h @@ -54,15 +54,5 @@ class dalv4CandleDemoTag_c : public fopAc_ac_c, public request_of_phase_process_ STATIC_ASSERT(sizeof(dalv4CandleDemoTag_c) == 0x590); -class dalv4CandleDemoTag_HIO_c : public mDoHIO_entry_c { -public: - /* 80C5C9EC */ dalv4CandleDemoTag_HIO_c(); - /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x4 */ s16 mEnemyWaitTime; -}; - #endif /* D_A_OBJ_LV4CANDLEDEMOTAG_H */ diff --git a/include/d/actor/d_a_obj_lv4chandelier.h b/include/d/actor/d_a_obj_lv4chandelier.h index 9fed59121d5..6430a3d1b37 100644 --- a/include/d/actor/d_a_obj_lv4chandelier.h +++ b/include/d/actor/d_a_obj_lv4chandelier.h @@ -85,12 +85,4 @@ class daObjLv4Chan_c : public dBgS_MoveBgActor, public request_of_phase_process_ STATIC_ASSERT(sizeof(daObjLv4Chan_c) == 0x24a4); -#ifdef DEBUG -class daObjLv4Chan_HIO_c : public mDoHIO_entry_c { -public: - daObjLv4Chan_HIO_c(); - void genMessage(JORMContext*); -}; -#endif - #endif /* D_A_OBJ_LV4CHANDELIER_H */ diff --git a/include/d/actor/d_a_obj_nan.h b/include/d/actor/d_a_obj_nan.h index aa7b2cb4755..1dc55637a52 100644 --- a/include/d/actor/d_a_obj_nan.h +++ b/include/d/actor/d_a_obj_nan.h @@ -71,15 +71,4 @@ class daObjNAN_c : public dInsect_c { STATIC_ASSERT(sizeof(daObjNAN_c) == 0x800); -class daObj_NanHIO_c { -public: - /* 80CA05AC */ daObj_NanHIO_c(); - /* 80CA30D0 */ virtual ~daObj_NanHIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 field_0x8; - /* 0x0C */ f32 field_0xc; -}; - - #endif /* D_A_OBJ_NAN_H */ diff --git a/include/d/actor/d_a_obj_poCandle.h b/include/d/actor/d_a_obj_poCandle.h index dd6d7439d98..f11e6a40583 100644 --- a/include/d/actor/d_a_obj_poCandle.h +++ b/include/d/actor/d_a_obj_poCandle.h @@ -33,7 +33,7 @@ class daPoCandle_c : public fopAc_ac_c { /* 80CB242C */ void Delete(); /* 80CB2610 */ ~daPoCandle_c(); - /* 80CB3E3C */ cXyz getFirePos(); // implemented in d_a_obj_poFire.cpp + /* 80CB3E3C */ cXyz getFirePos() { return static_cast(mFirePos); } u8 getIDNum() {return mIDNum;} void setFireFlag(u8 flag) { field_0x5D2 = flag; } diff --git a/include/d/actor/d_a_obj_poFire.h b/include/d/actor/d_a_obj_poFire.h index 5afc413e38a..0be09abb88a 100644 --- a/include/d/actor/d_a_obj_poFire.h +++ b/include/d/actor/d_a_obj_poFire.h @@ -99,25 +99,4 @@ class daPoFire_c : public fopAc_ac_c, STATIC_ASSERT(sizeof(daPoFire_c) == 0x618); -class daPoFire_HIO_c : public mDoHIO_entry_c { -public: - /* 80CB294C */ daPoFire_HIO_c(); - /* 80CB3D24 */ virtual ~daPoFire_HIO_c() {} - - void genMessage(JORMContext*); - - /* 0x06 */ s8 unk6; - /* 0x08 */ f32 mWaitPeriod; // Wait oscillation period - /* 0x0C */ f32 mWaitVertRange; // Wait oscillation amplitude, vertical range - /* 0x10 */ f32 mWaitVertSpeed; // Wait oscillation speed, vertical speed - /* 0x14 */ f32 mMovePeriod1; // Move period - /* 0x18 */ f32 mMoveSwingSpeed1; // Move oscillation speed - /* 0x1C */ f32 mMoveSpeed; // Move speed - /* 0x20 */ f32 mMovePeriod2; // Move period ?? - /* 0x24 */ f32 mMoveSwingSpeed2; // Move oscillation speed - /* 0x28 */ f32 mMoveSwingRange; // Move oscillation range - /* 0x2C */ f32 mPickupRange; // Horizontal dist ? - /* 0x30 */ u8 mFireWaitTime; // Fire wait -}; - #endif /* D_A_OBJ_POFIRE_H */ diff --git a/include/d/actor/d_a_obj_sekizoa.h b/include/d/actor/d_a_obj_sekizoa.h index 13fcff20ca2..ad8ba62ea06 100644 --- a/include/d/actor/d_a_obj_sekizoa.h +++ b/include/d/actor/d_a_obj_sekizoa.h @@ -2,6 +2,7 @@ #define D_A_OBJ_SEKIZOA_H #include "d/actor/d_a_npc.h" +#include "d/actor/d_a_tag_evtarea.h" /** * @ingroup actors-objects @@ -97,7 +98,19 @@ class daObj_Sekizoa_c : public daNpcT_c { daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, daNpcT_evtData_c const* param_7, char** param_8) : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {} - /* 80CD5B84 */ BOOL chkGoal(); + /* 80CD5B84 */ BOOL chkGoal() { + daTag_EvtArea_c* evt_area_A = (daTag_EvtArea_c*)mActorMngrs[5].getActorP(); + if (evt_area_A->chkPointInArea(current.pos)) { + return true; + } + + daTag_EvtArea_c* evt_area_B = (daTag_EvtArea_c*)mActorMngrs[6].getActorP(); + if (evt_area_B->chkPointInArea(current.pos)) { + mReverseStatues = (mType == TYPE_0); + return true; + } + return false; + } /* 80CD5B7C */ s32 getBackboneJointNo() { return 1; } /* 80CD5B74 */ s32 getHeadJointNo() { return 3; } diff --git a/include/d/actor/d_a_obj_sw.h b/include/d/actor/d_a_obj_sw.h index d7b0099ab6a..64674b0b9c2 100644 --- a/include/d/actor/d_a_obj_sw.h +++ b/include/d/actor/d_a_obj_sw.h @@ -14,9 +14,6 @@ struct obj_sc_s { public: - /* 80CF2F3C */ ~obj_sc_s() {}; - /* 80CF2FA8 */ obj_sc_s() {}; - /* 0x00 */ s8 field_0x0; /* 0x01 */ u8 field_0x1[0x4 - 0x1]; /* 0x04 */ cXyz field_0x4; diff --git a/include/d/actor/d_a_obj_syRock.h b/include/d/actor/d_a_obj_syRock.h index 6f99ebbb7d2..af4a96898d0 100644 --- a/include/d/actor/d_a_obj_syRock.h +++ b/include/d/actor/d_a_obj_syRock.h @@ -16,7 +16,7 @@ class daSyRock_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c { public: daSyRock_c() : dEvLib_callback_c(this) {} - /* 80D03DAC */ ~daSyRock_c() {}; + /* 80D03DAC */ ~daSyRock_c() {} /* 80D0237C */ void setBaseMtx(); /* 80D02454 */ int CreateHeap(); @@ -103,35 +103,5 @@ class daSyRock_c : public dBgS_MoveBgActor, public request_of_phase_process_clas STATIC_ASSERT(sizeof(daSyRock_c) == 0x9a0); -class daSyRock_HIO_c : public mDoHIO_entry_c { -public: - /* 80D022AC */ daSyRock_HIO_c(); - /* 80D03C44 */ ~daSyRock_HIO_c() {}; - - void genMessage(JORMContext*); - - /* 0x04 */ f32 mShakeAmplitude; // "揺れ強さ" "Shake strength" | Slider - /* 0x08 */ f32 mShakeXOscillationAngle; // "振幅Ｘ" "Amplitude X" | Slider - /* 0x0C */ f32 mShakeZOscillationAngle; // "振幅Ｚ" "Amplitude Z" | Slider - /* 0x10 */ f32 mShakeDamping; // "揺れ減衰" "Shake damping" | Slider - /* 0x14 */ f32 mShakeMaxDecay; // "最大減衰量" "Maximum decay" | Slider - /* 0x18 */ f32 mShakeMinDecay; // "最小減衰量" "Minimum decay" | Slider - /* 0x1C */ f32 mFallAcceleration; // "落下速度" "Fall speed" | Slider - /* 0x20 */ f32 mMaxFallSpeed; // "最大落下速度" "Maximum falling speed" | Slider - /* 0x24 */ u8 mWaitFrames; // "wait time" | Slider (unused) - /* 0x25 */ u8 mShockStrength; // "振動" "Vibration" | Combo Box - /* "強さ１" "Strength 1" - "強さ２" "Strength 2" - "強さ３" "Strength 3" - "強さ４" "Strength 4" - "強さ５" "Strength 5" - "強さ６" "Strength 6" - "強さ７" "Strength 7" - "強さ８" "Strength 8" */ - /* 0x28 */ f32 mEffectScale; // "eff scale" | Slider - /* 0x2C */ f32 mFallWaterBouyancy; // "sink speed" | Slider - /* 0x30 */ f32 mMaxWaterPillarRange; // "renge" | "Range" | Slider -}; - #endif /* D_A_OBJ_SYROCK_H */ diff --git a/include/d/actor/d_a_obj_waterGate.h b/include/d/actor/d_a_obj_waterGate.h index b0d9d62422b..074b5af7afa 100644 --- a/include/d/actor/d_a_obj_waterGate.h +++ b/include/d/actor/d_a_obj_waterGate.h @@ -56,7 +56,7 @@ STATIC_ASSERT(sizeof(daWtGate_c) == 0x5bc); struct daWtGate_HIO_c : public mDoHIO_entry_c { /* 80D2BB8C */ daWtGate_HIO_c(); - /* 80D2C3C0 */ ~daWtGate_HIO_c() {}; + /* 80D2C3C0 */ ~daWtGate_HIO_c() {} void genMessage(JORMContext*); diff --git a/include/d/actor/d_a_obj_waterPillar.h b/include/d/actor/d_a_obj_waterPillar.h index f0de372a498..200b58ec4ef 100644 --- a/include/d/actor/d_a_obj_waterPillar.h +++ b/include/d/actor/d_a_obj_waterPillar.h @@ -17,7 +17,7 @@ class daWtPillar_c : public fopAc_ac_c, public request_of_phase_process_class, public dEvLib_callback_c { public: daWtPillar_c(); - ~daWtPillar_c() {} + ~daWtPillar_c(); /* 80D2C7B0 */ void setBaseMtx(); /* 80D2C838 */ static int createHeapCallBack(fopAc_ac_c*); @@ -142,33 +142,4 @@ class daWtPillar_c : public fopAc_ac_c, public request_of_phase_process_class, p STATIC_ASSERT(sizeof(daWtPillar_c) == 0xb7c); -struct daWtPillar_HIO_c : public mDoHIO_entry_c { - /* 80D2C6CC */ daWtPillar_HIO_c(); - /* 80D2DF34 */ ~daWtPillar_HIO_c() {}; - - void genMessage(JORMContext*); - - /* 0x04 */ cXyz field_0x04; - /* 0x10 */ csXyz field_0x10; - /* 0x16 */ s8 mForTesting; // "----------- テスト用 ----------" "----------- For Testing ----------" | Checkbox - /* 0x17 */ s8 mDisableDrawing; // "モデル描画ＯＦＦ" "Model Drawing OFF" | Checkbox - /* 0x18 */ s8 mStopTime; // "停止時間" "Stop time" | Slider - /* 0x19 */ u8 mUpFirstWaitFrames; // "待ち時間" "Waiting time" | Slider - /* 0x1A */ u8 field_0x1A[6]; - /* 0x20 */ f32 field_0x20; // "速度" "Velocity" | Slider - /* 0x24 */ u8 field_0x24[4]; - /* 0x28 */ f32 field_0x28; // mColliderUpdateScaleFactor? - /* 0x2C */ u8 mUpWaitFrames; // "待ち時間" "Waiting time" | Slider - /* 0x2D */ u8 field_0x2D[4]; - /* 0x34 */ f32 field_0x34; // "速度" "Velocity" | Slider - /* 0x38 */ u8 field_0x38[8]; - /* 0x40 */ f32 mDownwardSpeedUnitsPerSecond; // "速度" "Velocity" | Slider - /* 0x44 */ f32 mEffectOscillationAngle; // "振幅Ｙ" "Y Amplitude" | Slider - /* 0x48 */ f32 mEffectOscillationAmplitude; // "移動強さ" "Moving strength" | Slider - /* 0x4C */ f32 mEffectOscillationDampingScale; // "揺れ減衰" "Sway damping" | Slider - /* 0x50 */ f32 mEffectOscillationMaxDecay; // "最大減衰量" "Maximum decay" | Slider - /* 0x54 */ f32 mEffectOscillationMinDecay; // "最小減衰量" "Minimum decay" | Slider -}; - - #endif /* D_A_OBJ_WATERPILLAR_H */ diff --git a/include/d/actor/d_a_obj_zraMark.h b/include/d/actor/d_a_obj_zraMark.h index 7e4cc1ebedd..a23117ea3b8 100644 --- a/include/d/actor/d_a_obj_zraMark.h +++ b/include/d/actor/d_a_obj_zraMark.h @@ -10,7 +10,12 @@ class daNpc_Hoz_c; class _ZraMark_Hahen_c { public: - inline _ZraMark_Hahen_c(); + ~_ZraMark_Hahen_c() {} + + _ZraMark_Hahen_c() { + mpModel = NULL; + setColor(0); + } /* 80D4347C */ int create(cXyz const&, s8, s8, s8, s8); /* 80D434F8 */ BOOL loadModel(); diff --git a/include/d/actor/d_a_title.h b/include/d/actor/d_a_title.h index 1da60967025..fdaf89a6bb7 100644 --- a/include/d/actor/d_a_title.h +++ b/include/d/actor/d_a_title.h @@ -73,21 +73,4 @@ typedef void (daTitle_c::*procFunc)(); STATIC_ASSERT(sizeof(daTitle_c) == 0x608); -class daTit_HIO_c { -public: - /* 80D66B0C */ daTit_HIO_c(); - - /* 80D67A08 */ virtual ~daTit_HIO_c() {} - - /* 0x04 */ s8 field_0x4; - /* 0x08 */ f32 mPSScaleX; - /* 0x0C */ f32 mPSScaleY; - /* 0x10 */ f32 mPSPosX; - /* 0x14 */ f32 mPSPosY; - /* 0x18 */ u8 mAppear; - /* 0x19 */ u8 mArrow; - /* 0x1A */ u8 field_0x1a; -}; - - #endif /* D_A_TITLE_H */ diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index cab9d3f57db..4ae8c7100bd 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -280,7 +280,7 @@ class dComIfG_play_c { dMsgObject_c* getMsgObjectClass() { return mItemInfo.mMsgObjectClass; } dStage_roomControl_c* getRoomControl() { return &mRoomControl; } - dStage_stageDt_c& getStage() { return mStageData; } + dStage_dt_c& getStage() { return mStageData; } dEvt_control_c& getEvent() { return mEvent; } daHorse_c* getHorseActor() { return (daHorse_c*)mPlayerPtr[1]; } J2DGrafContext* getCurrentGrafPort() { return (J2DGrafContext*)mCurrentGrafPort; } @@ -2758,6 +2758,10 @@ inline void dComIfGp_setItem(u8 slot, u8 i_no) { g_dComIfG_gameInfo.play.setItem(slot, i_no); } +inline dStage_dt_c* dComIfGp_getStage() { + return &g_dComIfG_gameInfo.play.getStage(); +} + inline roomRead_class* dComIfGp_getStageRoom() { return g_dComIfG_gameInfo.play.getStage().getRoom(); } @@ -2790,12 +2794,16 @@ inline int dComIfGp_getStagePlightNumInfo() { return g_dComIfG_gameInfo.play.getStage().getPlightNumInfo(); } +inline stage_scls_info_dummy_class* dComIfGp_getStageSclsInfo() { + return g_dComIfG_gameInfo.play.getStage().getSclsInfo(); +} + inline s16 dComIfGp_getStageWorldRollAngleX() { - return g_dComIfG_gameInfo.play.getStage().getWorldRollAngleX(); + return ((dStage_stageDt_c&)g_dComIfG_gameInfo.play.getStage()).getWorldRollAngleX(); } inline s16 dComIfGp_getStageWorldRollDirAngleY() { - return g_dComIfG_gameInfo.play.getStage().getWorldRollDirAngleY(); + return ((dStage_stageDt_c&)g_dComIfG_gameInfo.play.getStage()).getWorldRollDirAngleY(); } inline u8 dComIfGp_isHeapLockFlag() { @@ -2929,14 +2937,6 @@ inline void dComIfGp_clearPlayerStatus1(int param_0, u32 flag) { g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 1, flag); } -inline dStage_stageDt_c* dComIfGp_getStage() { - return &g_dComIfG_gameInfo.play.getStage(); -} - -inline stage_scls_info_dummy_class* dComIfGp_getStageSclsInfo() { - return g_dComIfG_gameInfo.play.getStage().getSclsInfo(); -} - inline void dComIfGp_setItemNowLife(u16 life) { g_dComIfG_gameInfo.play.setItemNowLife(life); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 4135ff329f6..3daf9c57243 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -377,7 +377,7 @@ class dDlst_list_c { m3DLineMatSortPacket[param_1->getMaterialID()].setMat(param_1); } - void set3DlineMatDark(mDoExt_3DlineMat_c *param_1) { + void set3DlineMatDark(mDoExt_3DlineMat_c *param_1) { m3DLineMatSortPacket[param_1->getMaterialID()].setMatDark(param_1); } diff --git a/include/d/d_map_path_fmap.h b/include/d/d_map_path_fmap.h index c86364fd719..24723195645 100644 --- a/include/d/d_map_path_fmap.h +++ b/include/d/d_map_path_fmap.h @@ -32,8 +32,15 @@ class fmpTresTypeGroupData_c { class fmpTresTypeGroupDataList_c { public: /* 8003D790 */ void addTypeGroupData(u8, dTres_c::data_s const*); - /* 8003EB10 */ ~fmpTresTypeGroupDataList_c(); - /* 8003EC90 */ fmpTresTypeGroupDataList_c(); + /* 8003EB10 */ ~fmpTresTypeGroupDataList_c() { + if (mpTypeGroupDataHead != NULL) { + delete mpTypeGroupDataHead; + } + } + /* 8003EC90 */ fmpTresTypeGroupDataList_c() { + mpTypeGroupDataHead = NULL; + mpNextData = NULL; + } fmpTresTypeGroupData_c* getTypeGroupDataHead() { return mpTypeGroupDataHead; } diff --git a/include/d/d_stage.h b/include/d/d_stage.h index c51b4388877..6d7a39be83d 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -651,7 +651,7 @@ class dStage_stageDt_c : public dStage_dt_c { /* vt[89] */ virtual void setMapPath(void* i_MapPath) { return; } /* vt[90] */ virtual void* getMapPath(void) { return NULL; } /* vt[91] */ virtual void setElst(dStage_Elst_c* i_Elst) { mElst = i_Elst; } - /* vt[92] */ virtual dStage_Elst_c* getElst(void) { return mElst; } + /* vt[92] */ virtual dStage_Elst_c* getElst(void); s16 getWorldRollAngleX() { return (s16)mWorldRollAngleX; } s16 getWorldRollDirAngleY() { return mWorldRollDirAngleY; } @@ -1012,8 +1012,6 @@ class dStage_roomStatus_c { /* 0x400 */ dBgW_base* mpBgW; int getZoneNo() const { return mZoneNo; } - ~dStage_roomStatus_c() {} - dStage_roomStatus_c() {} }; // Size: 0x404 STATIC_ASSERT(sizeof(dStage_roomStatus_c) == 0x404); @@ -1198,7 +1196,6 @@ struct dStage_objectNameInf { class dStage_KeepDoorInfo { public: - /* 80028418 */ ~dStage_KeepDoorInfo() {} /* 0x000 */ int mNum; /* 0x004 */ stage_tgsc_data_class mDrTgData[0x40]; }; // Size = 0x904 diff --git a/include/d/dolzel.h b/include/d/dolzel.h new file mode 100644 index 00000000000..0f08b1d64f3 --- /dev/null +++ b/include/d/dolzel.h @@ -0,0 +1,10 @@ +#ifndef DOLZEL_H +#define DOLZEL_H + +#if __MWERKS__ +#include "d/dolzel.mch" +#else +#include "d/dolzel.pch" +#endif + +#endif // dolzel.h diff --git a/include/d/dolzel.pch b/include/d/dolzel.pch new file mode 100644 index 00000000000..8c4611d50a6 --- /dev/null +++ b/include/d/dolzel.pch @@ -0,0 +1,6 @@ +#ifndef DOLZEL_PCH +#define DOLZEL_PCH + +#include "d/dolzel_base.pch" + +#endif // DOLZEL_PCH diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch new file mode 100644 index 00000000000..b3ad052e57a --- /dev/null +++ b/include/d/dolzel_base.pch @@ -0,0 +1,25 @@ +#ifndef DOLZEL_BASE_PCH +#define DOLZEL_BASE_PCH + +// Fixes weak .bss +#include "weak_bss_1109_to_1009.h" // IWYU pragma: export + +// Fixes weak .data +#include "math.h" // IWYU pragma: export +#include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export +#include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export + +// Fixes weak function ordering +#include "string.h" +#include "d/d_com_inf_game.h" // IWYU pragma: export +#include "d/d_bg_w.h" // IWYU pragma: export +#include "JSystem/J2DGraph/J2DOrthograph.h" // IWYU pragma: export +#include "JSystem/J2DGraph/J2DPane.h" // IWYU pragma: export +#include "JSystem/J2DGraph/J2DPictureEx.h" // IWYU pragma: export +#include "JSystem/J2DGraph/J2DScreen.h" // IWYU pragma: export +#include "JSystem/J2DGraph/J2DTextBoxEx.h" // IWYU pragma: export +#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export +#include "JSystem/JUtility/JUTFont.h" // IWYU pragma: export +#include "JSystem/JUtility/JUTReport.h" // IWYU pragma: export + +#endif // DOLZEL_BASE_PCH diff --git a/include/d/dolzel_rel.h b/include/d/dolzel_rel.h new file mode 100644 index 00000000000..49c0f2e3d50 --- /dev/null +++ b/include/d/dolzel_rel.h @@ -0,0 +1,11 @@ +#ifndef DOLZEL_REL_H +#define DOLZEL_REL_H + +// PCH breaks debug build for RELs right now +#if __MWERKS__ && !DEBUG +#include "d/dolzel_rel.mch" +#else +#include "d/dolzel_rel.pch" +#endif + +#endif // DOLZEL_REL_H diff --git a/include/d/dolzel_rel.pch b/include/d/dolzel_rel.pch new file mode 100644 index 00000000000..0a83b35bf38 --- /dev/null +++ b/include/d/dolzel_rel.pch @@ -0,0 +1,6 @@ +#ifndef DOLZEL_REL_PCH +#define DOLZEL_REL_PCH + +#include "d/dolzel_base.pch" + +#endif // DOLZEL_REL_PCH diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 12c179e77d1..466b8ba326b 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -94,19 +94,14 @@ struct fOpAcm_HIO_entry_c : public mDoHIO_entry_c { void removeHIO(const fopAc_ac_c& i_this) { removeHIO(static_cast(i_this)); } void removeHIO(const leafdraw_class& i_this) { removeHIO(i_this.base); } void removeHIO(const base_process_class& i_this) { removeHIO(i_this.state); } - void removeHIO(const state_class& state) { + void removeHIO(const state_class& state) { if (state.create_phase == cPhs_NEXT_e) { - mDoHIO_entry_c::removeHIO(); + mDoHIO_entry_c::removeHIO(); } } #endif }; -class l_HIO { -public: - /* 8001E098 */ ~l_HIO() {} -}; - dBgS& dComIfG_Bgsp(); class dKy_tevstr_c; diff --git a/include/global.h b/include/global.h index d919f2109b2..81afcd5f47e 100644 --- a/include/global.h +++ b/include/global.h @@ -77,37 +77,6 @@ void* __memcpy(void*, const void*, int); #define UNK_BSS(name) \ static u8 lit_##name[1 + 3 /* padding */]; -#define UNK_REL_BSS \ - static u8 lit_1109[1]; \ - static u8 lit_1107[1]; \ - static u8 lit_1105[1]; \ - static u8 lit_1104[1]; \ - static u8 lit_1099[1]; \ - static u8 lit_1097[1]; \ - static u8 lit_1095[1]; \ - static u8 lit_1094[1]; \ - static u8 lit_1057[1]; \ - static u8 lit_1055[1]; \ - static u8 lit_1053[1]; \ - static u8 lit_1052[1]; \ - static u8 lit_1014[1]; \ - static u8 lit_1012[1]; \ - static u8 lit_1010[1]; \ - static u8 lit_1009[1]; - - -#define UNK_REL_DATA \ - static u8 cNullVec__6Z2Calc[12] = { \ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ - }; \ - static u32 lit_1787[1 + 4 /* padding */] = { \ - 0x02000201, \ - 0x40080000, \ - 0x00000000, \ - 0x3FE00000, \ - 0x00000000, \ - }; - #define READU32_BE(ptr, offset) \ (((u32)ptr[offset] << 24) | ((u32)ptr[offset + 1] << 16) | ((u32)ptr[offset + 2] << 8) | (u32)ptr[offset + 3]); diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index c19da2cedac..eea4fa66612 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -4,12 +4,6 @@ #include "JSystem/JFramework/JFWDisplay.h" #include "dolphin/mtx.h" #include "global.h" -// Possibly fakematch? -// Using `sym off` for this header fixes cXyz::~cXyz being incorrectly placed in -// a separate .text section. -#pragma sym off -#include "SSystem/SComponent/c_xyz.h" -#pragma sym on int mDoGph_Create(); void mDoGph_drawFilterQuad(s8 param_0, s8 param_1); diff --git a/include/weak_bss_1109_to_1009.h b/include/weak_bss_1109_to_1009.h new file mode 100644 index 00000000000..37284302a58 --- /dev/null +++ b/include/weak_bss_1109_to_1009.h @@ -0,0 +1,23 @@ +#ifndef WEAK_BSS_1109_TO_1009_H +#define WEAK_BSS_1109_TO_1009_H + +#include "dolphin/types.h" + +static u8 lit_1009[1]; +static u8 lit_1010[1]; +static u8 lit_1012[1]; +static u8 lit_1014[1]; +static u8 lit_1052[1]; +static u8 lit_1053[1]; +static u8 lit_1055[1]; +static u8 lit_1057[1]; +static u8 lit_1094[1]; +static u8 lit_1095[1]; +static u8 lit_1097[1]; +static u8 lit_1099[1]; +static u8 lit_1104[1]; +static u8 lit_1105[1]; +static u8 lit_1107[1]; +static u8 lit_1109[1]; + +#endif // WEAK_BSS_1109_TO_1009_H diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 9577d0c3953..8b9124909f7 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -554,4 +554,4 @@ extern "C" void ModuleDestructorsX(void (**dtors)()) { /* 80263210-80263218 25DB50 0008+00 1/0 0/0 0/0 .text getModuleSize__24DynamicModuleControlBaseCFv */ -/* 80263218-80263220 25DB58 0008+00 1/0 0/0 0/0 .text getModuleName__20DynamicModuleControlCFv */ \ No newline at end of file +/* 80263218-80263220 25DB58 0008+00 1/0 0/0 0/0 .text getModuleName__20DynamicModuleControlCFv */ diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/src/JSystem/J2DGraph/J2DTextBox.cpp index b08ac705ac4..6aba94f1d35 100644 --- a/src/JSystem/J2DGraph/J2DTextBox.cpp +++ b/src/JSystem/J2DGraph/J2DTextBox.cpp @@ -488,4 +488,4 @@ bool J2DTextBox::isUsed(ResTIMG const* p_timg) { /* 80300C90-80300C94 2FB5D0 0004+00 1/0 0/0 0/0 .text rewriteAlpha__10J2DTextBoxFv */ void J2DTextBox::rewriteAlpha() { /* empty function */ -} \ No newline at end of file +} diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 068f3b5bb16..c4076f9c256 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -337,11 +337,6 @@ static u8 sdata_padding[4] = {}; /* 804515D8-804515DC 000AD8 0004+00 2/2 0/0 0/0 .sbss SizeOfJ3DColorBlockLightOffLoad */ static u32 SizeOfJ3DColorBlockLightOffLoad = SizeOfLoadMatColors + SizeOfLoadColorChans; -u8 J3DColorChan::getAttnFn() const { - u8 AttnArr[] = {2,0,2,1}; - return AttnArr[(u32)(mColorChanID & (3 << 9)) >> 9]; -} - /* 80317C0C-8031816C 31254C 0560+00 1/0 0/0 0/0 .text load__21J3DColorBlockLightOffFv */ void J3DColorBlockLightOff::load() { GDOverflowCheck(SizeOfJ3DColorBlockLightOffLoad); diff --git a/src/JSystem/J3DU/J3DUDL.cpp b/src/JSystem/J3DU/J3DUDL.cpp index ae546b7f888..a57a23f8c2f 100644 --- a/src/JSystem/J3DU/J3DUDL.cpp +++ b/src/JSystem/J3DU/J3DUDL.cpp @@ -9,4 +9,4 @@ // Fake function to make the weak function J3DShapeMtx::getUseMtxNum appear in this TU u32 J3DUGetUseMtxNum(J3DShapeMtx* i_shapeMtx) { return i_shapeMtx->getUseMtxNum(); -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JAISoundHandles.cpp b/src/JSystem/JAudio2/JAISoundHandles.cpp index a2d8a3bef5c..1e85149715f 100644 --- a/src/JSystem/JAudio2/JAISoundHandles.cpp +++ b/src/JSystem/JAudio2/JAISoundHandles.cpp @@ -35,4 +35,4 @@ JAISoundHandle* JAISoundHandles::getFreeHandle() { } } return NULL; -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JAISoundInfo.cpp b/src/JSystem/JAudio2/JAISoundInfo.cpp index 266e2a8a2f1..0d2aba6270b 100644 --- a/src/JSystem/JAudio2/JAISoundInfo.cpp +++ b/src/JSystem/JAudio2/JAISoundInfo.cpp @@ -25,4 +25,4 @@ JAISoundInfo::JAISoundInfo(bool param_0) : JASGlobalInstance(param /* 802A2D50-802A2DB4 29D690 0064+00 1/0 2/2 0/0 .text __dt__12JAISoundInfoFv */ JAISoundInfo::~JAISoundInfo() { -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASAudioReseter.cpp b/src/JSystem/JAudio2/JASAudioReseter.cpp index bc376dc0bc9..95fb409c503 100644 --- a/src/JSystem/JAudio2/JASAudioReseter.cpp +++ b/src/JSystem/JAudio2/JASAudioReseter.cpp @@ -114,4 +114,4 @@ s32 JASAudioReseter::calc() { /* 8029D2D4-8029D2F4 297C14 0020+00 1/1 0/0 0/0 .text callback__15JASAudioReseterFPv */ s32 JASAudioReseter::callback(void* param_0) { return ((JASAudioReseter*)param_0)->calc(); -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASCallback.cpp b/src/JSystem/JAudio2/JASCallback.cpp index a5d26a59081..7b1e770b5c1 100644 --- a/src/JSystem/JAudio2/JASCallback.cpp +++ b/src/JSystem/JAudio2/JASCallback.cpp @@ -60,4 +60,4 @@ void JASCallbackMgr::callback() { mCallbacks[i].mArgument = NULL; } } -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASDSPChannel.cpp b/src/JSystem/JAudio2/JASDSPChannel.cpp index 0411c12ab54..a559b51ee92 100644 --- a/src/JSystem/JAudio2/JASDSPChannel.cpp +++ b/src/JSystem/JAudio2/JASDSPChannel.cpp @@ -245,4 +245,4 @@ int JASDSPChannel::killActiveChannel() { /* 8029D948-8029D958 298288 0010+00 0/0 1/1 0/0 .text getHandle__13JASDSPChannelFUl */ JASDSPChannel* JASDSPChannel::getHandle(u32 i_index) { return &sDspChannels[i_index]; -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/src/JSystem/JAudio2/JASDrumSet.cpp index d0cf3601656..0bd89189ca1 100644 --- a/src/JSystem/JAudio2/JASDrumSet.cpp +++ b/src/JSystem/JAudio2/JASDrumSet.cpp @@ -118,4 +118,4 @@ void JASDrumSet::TPerc::setRelease(u32 param_0) { } /* 802984EC-802984F8 292E2C 000C+00 1/0 0/0 0/0 .text getType__10JASDrumSetCFv */ -u32 JASDrumSet::getType() const { return 'PERC'; } \ No newline at end of file +u32 JASDrumSet::getType() const { return 'PERC'; } diff --git a/src/JSystem/JAudio2/JASDvdThread.cpp b/src/JSystem/JAudio2/JASDvdThread.cpp index 731a05a7a95..3da1a6e22ed 100644 --- a/src/JSystem/JAudio2/JASDvdThread.cpp +++ b/src/JSystem/JAudio2/JASDvdThread.cpp @@ -36,4 +36,4 @@ bool JASDvd::createThread(s32 priority, int param_1, u32 param_2) { sThread->setCurrentHeap(JKRGetSystemHeap()); OSResumeThread(sThread->getThreadRecord()); return true; -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASLfo.cpp b/src/JSystem/JAudio2/JASLfo.cpp index ccff708eb4a..06ffc83cd94 100644 --- a/src/JSystem/JAudio2/JASLfo.cpp +++ b/src/JSystem/JAudio2/JASLfo.cpp @@ -82,4 +82,4 @@ void JASLfo::resetCounter() { } } -/* 8029BE6C-8029BE94 2967AC 0028+00 0/0 1/0 0/0 .text __sinit_JASLfo_cpp */ \ No newline at end of file +/* 8029BE6C-8029BE94 2967AC 0028+00 0/0 1/0 0/0 .text __sinit_JASLfo_cpp */ diff --git a/src/JSystem/JAudio2/JASOscillator.cpp b/src/JSystem/JAudio2/JASOscillator.cpp index 29192e18a8d..5674d0cf1de 100644 --- a/src/JSystem/JAudio2/JASOscillator.cpp +++ b/src/JSystem/JAudio2/JASOscillator.cpp @@ -214,4 +214,4 @@ void JASOscillator::updateCurrentValue(f32 param_0) { f32 fVar2 = (1.0f - fVar3) * table[index]; f32 fVar4 = fVar2 + fVar3 * table[index + 1]; _08 = _0C * fVar4 + _10 * (1.0f - fVar4); -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASProbe.cpp b/src/JSystem/JAudio2/JASProbe.cpp index ef5161d0ab7..6e3d3c35e42 100644 --- a/src/JSystem/JAudio2/JASProbe.cpp +++ b/src/JSystem/JAudio2/JASProbe.cpp @@ -68,4 +68,4 @@ void JASProbe::stop(s32 index) { sProbeTable[index]->stop(); } } -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASRegisterParam.cpp b/src/JSystem/JAudio2/JASRegisterParam.cpp index 53829f46eaa..5cf9120db45 100644 --- a/src/JSystem/JAudio2/JASRegisterParam.cpp +++ b/src/JSystem/JAudio2/JASRegisterParam.cpp @@ -147,4 +147,4 @@ u32 JASRegisterParam::read(JASRegisterParam::RegID param_0) { break; } return rv; -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASResArcLoader.cpp b/src/JSystem/JAudio2/JASResArcLoader.cpp index 4db44e3846f..aa56efa512b 100644 --- a/src/JSystem/JAudio2/JASResArcLoader.cpp +++ b/src/JSystem/JAudio2/JASResArcLoader.cpp @@ -68,4 +68,4 @@ int JASResArcLoader::loadResourceAsync(JKRArchive* archive, u16 id, u8* buffer, args.mCallbackArg = cbArg; return JASDvd::getThreadPointer()->sendCmdMsg(&loadResourceCallback, (void*)&args, sizeof(CallbackArgs)); -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASSeqCtrl.cpp b/src/JSystem/JAudio2/JASSeqCtrl.cpp index 780759d8469..3bfbf12d2cd 100644 --- a/src/JSystem/JAudio2/JASSeqCtrl.cpp +++ b/src/JSystem/JAudio2/JASSeqCtrl.cpp @@ -155,4 +155,4 @@ void JASSeqCtrl::timerProcess() { } } -/* ############################################################################################## */ \ No newline at end of file +/* ############################################################################################## */ diff --git a/src/JSystem/JAudio2/JASSoundParams.cpp b/src/JSystem/JAudio2/JASSoundParams.cpp index 6e83f9f2721..890a8179db2 100644 --- a/src/JSystem/JAudio2/JASSoundParams.cpp +++ b/src/JSystem/JAudio2/JASSoundParams.cpp @@ -22,4 +22,4 @@ void JASSoundParams::combine(const JASSoundParams &other1, const JASSoundParams mFxMix = other1.mFxMix + other2.mFxMix; mPan = other1.mPan + other2.mPan - 0.5f; mDolby = other1.mDolby + other2.mDolby; -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASTrackPort.cpp b/src/JSystem/JAudio2/JASTrackPort.cpp index 229cf473544..beeaaf54881 100644 --- a/src/JSystem/JAudio2/JASTrackPort.cpp +++ b/src/JSystem/JAudio2/JASTrackPort.cpp @@ -46,4 +46,4 @@ u32 JASTrackPort::checkImport(u32 param_0) const { /* 80293628-80293644 28DF68 001C+00 0/0 1/1 0/0 .text checkExport__12JASTrackPortCFUl */ u32 JASTrackPort::checkExport(u32 param_0) const { return field_0x2 & 1 << param_0 ? 1 : 0; -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JASVoiceBank.cpp b/src/JSystem/JAudio2/JASVoiceBank.cpp index 88a77072e05..1d61123fece 100644 --- a/src/JSystem/JAudio2/JASVoiceBank.cpp +++ b/src/JSystem/JAudio2/JASVoiceBank.cpp @@ -39,4 +39,4 @@ JASVoiceBank::~JASVoiceBank() {} /* 80298008-80298014 292948 000C+00 1/0 0/0 0/0 .text getType__12JASVoiceBankCFv */ u32 JASVoiceBank::getType() const { return 'VOIC'; -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp b/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp index 8cd7805c1ab..50346f3abb9 100644 --- a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp +++ b/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp @@ -130,4 +130,4 @@ bool JAUAudioArcInterpreter::readCommand_() { break; } return true; -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp b/src/JSystem/JAudio2/JAUAudioArcLoader.cpp index acc79dfd3d1..9d5c7b97375 100644 --- a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp +++ b/src/JSystem/JAudio2/JAUAudioArcLoader.cpp @@ -105,4 +105,4 @@ void JAUAudioArcLoader::readMaxSeCategory(int param_0, int param_1, int param_2) seMgr->getCategory(param_0)->setMaxActiveSe(param_1); seMgr->getCategory(param_0)->setMaxInactiveSe(param_2); } -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JAUSeqCollection.cpp b/src/JSystem/JAudio2/JAUSeqCollection.cpp index d7c45582682..7654b26fa1f 100644 --- a/src/JSystem/JAudio2/JAUSeqCollection.cpp +++ b/src/JSystem/JAudio2/JAUSeqCollection.cpp @@ -103,4 +103,4 @@ JAUSeqDataMgr_SeqCollection::SeqDataReturnValue JAUSeqDataMgr_SeqCollection::get } /* 802A6894-802A68F4 2A11D4 0060+00 1/0 0/0 0/0 .text __dt__27JAUSeqDataMgr_SeqCollectionFv */ -JAUSeqDataMgr_SeqCollection::~JAUSeqDataMgr_SeqCollection() {} \ No newline at end of file +JAUSeqDataMgr_SeqCollection::~JAUSeqDataMgr_SeqCollection() {} diff --git a/src/JSystem/JAudio2/JAUSoundAnimator.cpp b/src/JSystem/JAudio2/JAUSoundAnimator.cpp index 77b25dd1e6c..472c4606679 100644 --- a/src/JSystem/JAudio2/JAUSoundAnimator.cpp +++ b/src/JSystem/JAudio2/JAUSoundAnimator.cpp @@ -25,4 +25,4 @@ int JAUSoundAnimation::getEndSoundIndex(f32 param_0) const { } } return i; -} \ No newline at end of file +} diff --git a/src/JSystem/JMath/JMath.cpp b/src/JSystem/JMath/JMath.cpp index 9c999ddacfa..23cb3d4bdbb 100644 --- a/src/JSystem/JMath/JMath.cpp +++ b/src/JSystem/JMath/JMath.cpp @@ -135,4 +135,4 @@ void JMAMTXApplyScale(register const Mtx src, register Mtx dst, register f32 xSc psq_st z, 40(dst), 0, 0 } #endif // clang-format on -} \ No newline at end of file +} diff --git a/src/JSystem/JMath/random.cpp b/src/JSystem/JMath/random.cpp index 56f2aebbf2b..78532ed98cf 100644 --- a/src/JSystem/JMath/random.cpp +++ b/src/JSystem/JMath/random.cpp @@ -8,4 +8,4 @@ /* 80339AE4-80339AEC -00001 0008+00 0/0 0/0 0/0 .text __ct__Q25JMath13TRandom_fast_FUl */ JMath::TRandom_fast_::TRandom_fast_(u32 param_0) { value = param_0; -} \ No newline at end of file +} diff --git a/src/JSystem/JParticle/JPAExTexShape.cpp b/src/JSystem/JParticle/JPAExTexShape.cpp index 4763459ae64..a0105eb5fe7 100644 --- a/src/JSystem/JParticle/JPAExTexShape.cpp +++ b/src/JSystem/JParticle/JPAExTexShape.cpp @@ -32,4 +32,4 @@ void JPALoadExTex(JPAEmitterWorkData* work) { /* 8027B13C-8027B144 -00001 0008+00 0/0 0/0 0/0 .text __ct__13JPAExTexShapeFPCUc */ JPAExTexShape::JPAExTexShape(u8 const* data) { mpData = (const JPAExTexShapeData*)data; -} \ No newline at end of file +} diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/src/JSystem/JParticle/JPAResourceManager.cpp index e06be753391..487a20488d7 100644 --- a/src/JSystem/JParticle/JPAResourceManager.cpp +++ b/src/JSystem/JParticle/JPAResourceManager.cpp @@ -81,4 +81,4 @@ u32 JPAResourceManager::getResUserWork(u16 usrIdx) const { ret = res->getDyn()->getResUserWork(); return ret; -} \ No newline at end of file +} diff --git a/src/JSystem/JParticle/JPATexture.cpp b/src/JSystem/JParticle/JPATexture.cpp index 17aac8021b1..76ba6f43d04 100644 --- a/src/JSystem/JParticle/JPATexture.cpp +++ b/src/JSystem/JParticle/JPATexture.cpp @@ -12,4 +12,4 @@ JPATexture::JPATexture(u8 const* pData) { } /* 8027D83C-8027D8A0 27817C 0064+00 1/0 0/0 0/0 .text __dt__10JPATextureFv */ -JPATexture::~JPATexture() {} \ No newline at end of file +JPATexture::~JPATexture() {} diff --git a/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp b/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp index a0c879d1930..1a1936a2148 100644 --- a/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp +++ b/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp @@ -34,4 +34,4 @@ void JStudio::fvb::data::TParse_TParagraph::getData(TParse_TParagraph::TData* da data->pContent = parse; data->next = parse + ((t + 3) >> 1 & ~1); } -} \ No newline at end of file +} diff --git a/src/JSystem/JSupport/JSUFileStream.cpp b/src/JSystem/JSupport/JSUFileStream.cpp index cf204565fd5..42790bb45f5 100644 --- a/src/JSystem/JSupport/JSUFileStream.cpp +++ b/src/JSystem/JSupport/JSUFileStream.cpp @@ -71,4 +71,4 @@ s32 JSUFileInputStream::getLength() const { /* 802DC85C-802DC864 2D719C 0008+00 1/0 0/0 0/0 .text getPosition__18JSUFileInputStreamCFv */ s32 JSUFileInputStream::getPosition() const { return mPosition; -} \ No newline at end of file +} diff --git a/src/JSystem/JSupport/JSUList.cpp b/src/JSystem/JSupport/JSUList.cpp index eb9065084b8..887a3eaeee3 100644 --- a/src/JSystem/JSupport/JSUList.cpp +++ b/src/JSystem/JSupport/JSUList.cpp @@ -159,4 +159,4 @@ JSUPtrLink* JSUPtrList::getNthLink(u32 index) const { } return node; -} \ No newline at end of file +} diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index 06ef091bdda..7e9694e9e54 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -529,4 +529,4 @@ s32 JUTResFont::getDescent() const { /* 802DE01C-802DE078 2D895C 005C+00 1/0 1/0 0/0 .text getHeight__10JUTResFontCFv */ s32 JUTResFont::getHeight() const { return getAscent() + getDescent(); -} \ No newline at end of file +} diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index fd49e6c6e58..c3a180c1c74 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -129,4 +129,4 @@ void JUTReport(int param_0, int param_1, int param_2, char const* fmt, ...) { return; } JUTDbPrint::sDebugPrint->enter(param_0, param_1, param_2, buf, ret < 0x100 ? ret : 0xFF); -} \ No newline at end of file +} diff --git a/src/JSystem/JUtility/JUTFader.cpp b/src/JSystem/JUtility/JUTFader.cpp index 833459157a5..0cd2d3b9546 100644 --- a/src/JSystem/JUtility/JUTFader.cpp +++ b/src/JSystem/JUtility/JUTFader.cpp @@ -116,4 +116,4 @@ void JUTFader::setStatus(JUTFader::EStatus i_status, int param_1) { } /* 802E5840-802E5888 2E0180 0048+00 1/0 0/0 0/0 .text __dt__8JUTFaderFv */ -JUTFader::~JUTFader() {} \ No newline at end of file +JUTFader::~JUTFader() {} diff --git a/src/JSystem/JUtility/JUTFont.cpp b/src/JSystem/JUtility/JUTFont.cpp index 9dab22e5be8..bc04308a7c4 100644 --- a/src/JSystem/JUtility/JUTFont.cpp +++ b/src/JSystem/JUtility/JUTFont.cpp @@ -56,4 +56,4 @@ f32 JUTFont::drawString_size_scale(f32 a1, f32 a2, f32 a3, f32 a4, const char* s } return a1 - temp; -} \ No newline at end of file +} diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/src/JSystem/JUtility/JUTGraphFifo.cpp index ae72d2cb7ef..bc23716ef4b 100644 --- a/src/JSystem/JUtility/JUTGraphFifo.cpp +++ b/src/JSystem/JUtility/JUTGraphFifo.cpp @@ -44,4 +44,4 @@ JUTGraphFifo::~JUTGraphFifo() { sCurrentFifo = NULL; } JKRFreeToSysHeap(mBase); -} \ No newline at end of file +} diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/src/JSystem/JUtility/JUTNameTab.cpp index dd8bbb7fb8a..b25e67e1332 100644 --- a/src/JSystem/JUtility/JUTNameTab.cpp +++ b/src/JSystem/JUtility/JUTNameTab.cpp @@ -49,4 +49,4 @@ u16 JUTNameTab::calcKeyCode(const char* pName) const { while (*pName) keyCode = (keyCode * 3) + *pName++; return keyCode; -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h index 2cc68dd01b0..74e3f1e959a 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h @@ -1,7 +1,6 @@ #ifndef STD_CMATH_H_ #define STD_CMATH_H_ - namespace std { template inline double fabs(T x) { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h index 5449e4e342e..b6fa199ca38 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h @@ -68,16 +68,14 @@ double sqrt(double); double tan(double); float tanf(float); -inline double sqrt_step(double tmpd, float mag) { - return tmpd * 0.5 * (3.0 - mag * (tmpd * tmpd)); -} - inline float sqrtf(float mag) { + static const double _half = 0.5; + static const double _three = 3.0; if (mag > 0.0f) { double tmpd = __frsqrte(mag); - tmpd = sqrt_step(tmpd, mag); - tmpd = sqrt_step(tmpd, mag); - tmpd = sqrt_step(tmpd, mag); + tmpd = tmpd * _half * (_three - mag * (tmpd * tmpd)); + tmpd = tmpd * _half * (_three - mag * (tmpd * tmpd)); + tmpd = tmpd * _half * (_three - mag * (tmpd * tmpd)); return mag * tmpd; } else if (mag < 0.0) { return NAN; diff --git a/src/SSystem/SStandard/s_basic.cpp b/src/SSystem/SStandard/s_basic.cpp index 106ca37729a..94d72e90874 100644 --- a/src/SSystem/SStandard/s_basic.cpp +++ b/src/SSystem/SStandard/s_basic.cpp @@ -17,4 +17,4 @@ void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue) { /* 80271CAC-80271CD0 0024+00 s=0 e=2 z=0 None .text sBs_ClearArea__FPvUl */ void sBs_ClearArea(void* pPtr, u32 pNumBytes) { sBs_FillArea_s(pPtr, pNumBytes, 0); -} \ No newline at end of file +} diff --git a/src/Z2AudioLib/Z2Calc.cpp b/src/Z2AudioLib/Z2Calc.cpp index 67a08ec2ad1..ba2d32a19c6 100644 --- a/src/Z2AudioLib/Z2Calc.cpp +++ b/src/Z2AudioLib/Z2Calc.cpp @@ -139,4 +139,4 @@ f32 Z2Calc::FNoise1f::calcNoise1f(void) { this->unk4 = temp2; return this->unk0; -} \ No newline at end of file +} diff --git a/src/Z2AudioLib/Z2EnvSeMgr.cpp b/src/Z2AudioLib/Z2EnvSeMgr.cpp index 7d7004897ae..8fc04e2b3aa 100644 --- a/src/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/src/Z2AudioLib/Z2EnvSeMgr.cpp @@ -85,9 +85,6 @@ bool Z2EnvSeBase::startEnvSeLevel(JAISoundID param_1, f32 param_2, f32 param_3, return rv; } -/* 8039C250-8039C260 0288B0 000C+04 2/2 0/0 0/0 .rodata cNullVec__6Z2Calc */ -static Vec const cNullVec__6Z2Calc = {0.0f, 0.0f, 0.0f}; - /* 802C5C9C-802C5D1C 2C05DC 0080+00 1/1 0/0 0/0 .text __ct__10Z2EnvSeDirFP3Vec */ Z2EnvSeDir::Z2EnvSeDir(Vec* param_0) { field_0x8 = 0.5f; @@ -95,7 +92,7 @@ Z2EnvSeDir::Z2EnvSeDir(Vec* param_0) { if (param_0) { setPanDir(param_0); } else { - mPanDir = cNullVec__6Z2Calc; + mPanDir = Z2Calc::cNullVec; } } @@ -895,7 +892,7 @@ void Z2EnvSeMgr::initStrongWindSe() { /* 802C7FC8-802C800C 2C2908 0044+00 0/0 1/1 1/1 .text setWindDirection__10Z2EnvSeMgrFP3Vec */ void Z2EnvSeMgr::setWindDirection(Vec* param_0) { if (mWindType == WIND_TYPE_3) { - field_0x144.setPanDir((Vec*)&cNullVec__6Z2Calc); + field_0x144.setPanDir(const_cast(&Z2Calc::cNullVec)); } else { field_0x144.setPanDir(param_0); } diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp index 58b1c8ce9d3..839b7730b61 100644 --- a/src/Z2AudioLib/Z2SoundObject.cpp +++ b/src/Z2AudioLib/Z2SoundObject.cpp @@ -177,14 +177,10 @@ Z2SoundHandlePool* Z2SoundObjBase::startCollisionSE(u32 pId, u32 pUserData, Z2So return handle; } -/* ############################################################################################## */ -/* 8039C230-8039C240 028890 000C+04 1/1 0/0 0/0 .rodata cNullVec__6Z2Calc */ -static Vec const cNullVec__6Z2Calc = {0.0f, 0.0f, 0.0f}; - /* 802BE5A0-802BE5FC 2B8EE0 005C+00 1/1 0/0 0/0 .text __ct__21Z2DopplerSoundObjBaseFv */ Z2DopplerSoundObjBase::Z2DopplerSoundObjBase() : Z2SoundObjBase() { - field_0x20 = cNullVec__6Z2Calc; - field_0x2c = cNullVec__6Z2Calc; + field_0x20 = Z2Calc::cNullVec; + field_0x2c = Z2Calc::cNullVec; } /* 802BE5FC-802BE65C 2B8F3C 0060+00 0/0 0/0 1/1 .text __dt__21Z2DopplerSoundObjBaseFv */ diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index 5de9ec0ac08..689c8790e61 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_L7demo_dr.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_obj_lv7bridge.h" diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp index fb77472dd57..8bf4c097cf0 100644 --- a/src/d/actor/d_a_L7low_dr.cpp +++ b/src/d/actor/d_a_L7low_dr.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_L7low_dr.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index ac0385a492e..a06a402b8f7 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_L7op_demo_dr.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index b18d30ba56f..6c3516d9d71 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -3,6 +3,8 @@ * Player (Link) Actor */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_alink.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -175,11 +177,6 @@ static char const l_wolfWorldChangeEventName[21] = "WOLF_WORLD_CHANGE_IN"; /* 8038FA38-8038FA48 01C098 0010+00 0/1 0/0 0/0 .rodata l_defaultGetEventName */ static char const l_defaultGetEventName[16] = "DEFAULT_GETITEM"; -/* 803AF990-803AF99C 00CAB0 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803AF99C-803AF9A8 00CABC 000A+02 2/2 0/0 0/0 .data l_peepEventName */ static char l_peepEventName[10] = "PEEP_HOLE"; diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 3f4df493bba..84267f3f30f 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -3,6 +3,8 @@ * Activates a switch when all enemies are defeated */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_alldie.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 3bd81ae6785..62c14923e6b 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -3,6 +3,8 @@ * AND - Switch */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_andsw.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 88a2613b35a..3fa3a770a32 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_andsw2.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 08789741d9e..edf64707d33 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_arrow.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/JAudio2/JAUSectionHeap.h" @@ -404,23 +406,6 @@ void daArrow_c::setNormalMatrix() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) - /* 8049AF18-8049AFEC 001398 00D4+00 3/3 0/0 0/0 .text setSmokePos__9daArrow_cFv */ void daArrow_c::setSmokePos() { static cXyz localOffset(-3.3f, -3.0f, 94.0f); @@ -512,8 +497,6 @@ bool daArrow_c::checkReget() { } } -UNK_REL_DATA - /* 8049B45C-8049B764 0018DC 0308+00 1/0 0/0 0/0 .text procWait__9daArrow_cFv */ int daArrow_c::procWait() { setKeepMatrix(); diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index b4c0d234caf..acaee780475 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_bh.h" #include "d/actor/d_a_b_bq.h" #include "d/d_bomb.h" @@ -95,8 +97,6 @@ static int daB_BH_Draw(b_bh_class* i_this) { return 1; } -UNK_REL_BSS; - /* 805B33ED 0003+00 data_805B33ED None */ static u8 l_initHIO; diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index e7b65c1f741..0c8375813e2 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -3,6 +3,8 @@ * Boss Baba (Diababa) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_bq.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -194,8 +196,6 @@ enum daB_BQ_JNT { JNT_SLEAF_UR2, }; -UNK_REL_DATA; - /* 805B356C-805B35A0 0000EC 0034+00 1/1 0/0 0/0 .text __ct__12daB_BQ_HIO_cFv */ daB_BQ_HIO_c::daB_BQ_HIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index d17b0da120f..ae73a7467c9 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_dr.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -14,6 +16,53 @@ #include "c/c_damagereaction.h" #include "Z2AudioLib/Z2Instances.h" + +class daB_DR_HIO_c : public JORReflexible { +public: + /* 805BAE6C */ daB_DR_HIO_c(); + /* 805C6B94 */ virtual ~daB_DR_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 model_size; + /* 0x0C */ f32 fall_accel; + /* 0x10 */ f32 fall_accel_max; + /* 0x14 */ f32 wind_large_attack_lockon_range; + /* 0x18 */ f32 unk_0x18; + /* 0x1C */ f32 wind_small_attack_power; + /* 0x20 */ f32 wind_attack_power; + /* 0x24 */ f32 glide_wind_power; + /* 0x28 */ f32 breath_attack_threshold; + /* 0x2C */ f32 unk_0x2c; + /* 0x30 */ f32 breath_move_speed_max; + /* 0x34 */ f32 breath_move_speed_min; + /* 0x38 */ s16 tail_hit_chance_time; + /* 0x3A */ s16 center_wind_time; + /* 0x3C */ s16 breath_continue_time; + /* 0x3E */ s16 breath_continue_no_armor_time; + /* 0x40 */ s16 breath_feint1_time; + /* 0x42 */ s16 breath_feint2_time; + /* 0x44 */ s16 breath_feint3_time; + /* 0x46 */ s16 no_attack_time; + /* 0x48 */ s16 unk_0x48; + /* 0x4A */ s16 no_attack_no_armor_time; + /* 0x4C */ s16 unk_0x4c; + /* 0x4E */ s16 back_hit_chance_time; + /* 0x50 */ s16 after_breath_chance_time; + /* 0x52 */ s16 neck_search_speed; + /* 0x54 */ s16 neck_search2_speed; + /* 0x56 */ s16 neck_search_speed_max; + /* 0x58 */ s16 body_search_speed; + /* 0x5A */ s16 body_search2_speed; + /* 0x5C */ s16 body_search_speed_max; + /* 0x5E */ s16 body_search_feint_speed_max; + /* 0x60 */ s16 feint_angle; + /* 0x62 */ s16 unk_0x62; + /* 0x64 */ u8 display_range; + /* 0x65 */ u8 breath_feint2_OFF; +}; + #define ANM_DR_BOOT_A 0x10 #define ANM_DR_BOOT_A_DEMO 0x11 #define ANM_DR_BOOT_B 0x12 @@ -86,8 +135,6 @@ enum daB_DR_Action { ACTION_DEAD, }; -UNK_REL_DATA - namespace { /* 805C7268-805C72AC 000020 0044+00 0/1 0/0 0/0 .data cc_dr_week_src__22@unnamed@d_a_b_dr_cpp@ */ static dCcD_SrcCyl cc_dr_week_src = { @@ -245,8 +292,6 @@ daB_DR_HIO_c::daB_DR_HIO_c() { breath_feint2_OFF = true; } -UNK_REL_BSS - /* 805C78FD 0003+00 l_initHIO None */ static u8 l_initHIO; @@ -879,6 +924,10 @@ void daB_DR_c::mHabatakiAnmSet(int param_0) { } } +static u8 dummy(u8 param_0) { + return cLib_calcTimer(¶m_0); +} + /* 805BC57C-805BC8B4 0017FC 0338+00 3/2 0/0 0/0 .text mGlider_AniSet__8daB_DR_cFb */ void daB_DR_c::mGlider_AniSet(bool param_0) { if (param_0 && mTimer[0] != 0 && mAnm == ANM_DR_FLY) { diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index 08ccf4567cb..9a8f380fc45 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_b_dre.cpp +* @file d_a_b_dre.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_dre.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" @@ -180,23 +182,6 @@ void daB_DRE_c::SetReleaseCam() { dComIfGp_event_reset(); } -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) - namespace { /* 805CB080-805CB084 000048 0004+00 0/1 0/0 0/0 .bss s_dis__23@unnamed@d_a_b_dre_cpp@ */ static f32 s_dis; diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 1e3334a0205..0c2d45d2d48 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -3,6 +3,8 @@ * Boss - Stallord */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_ds.h" #include "d/actor/d_a_player.h" #include "d/d_s_play.h" @@ -14,7 +16,6 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" enum daB_DS_Joint { @@ -207,99 +208,6 @@ daB_DS_HIO_c::daB_DS_HIO_c() { mP2HealthDebugOn = false; } -/* ############################################################################################## */ -/* 805DDA70-805DDA74 000008 0001+03 8/8 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 805DDA74-805DDA78 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 805DDA78-805DDA7C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 805DDA7C-805DDA80 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 805DDA80-805DDA84 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 805DDA84-805DDA88 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 805DDA88-805DDA8C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 805DDA8C-805DDA90 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 805DDA90-805DDA94 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 805DDA94-805DDA98 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 805DDA98-805DDA9C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 805DDA9C-805DDAA0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 805DDAA0-805DDAA4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 805DDAA4-805DDAA8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 805DDAA8-805DDAAC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 805DDAAC-805DDAB0 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 805DDAAC 0001+00 data_805DDAAC @1009 */ -/* 805DDAAD 0003+00 data_805DDAAD None */ -static u8 struct_805DDAAC; - static bool hioInit; /* 805DDABC-805DDB0C 000054 0050+00 21/23 0/0 0/0 .bss l_HIO */ @@ -5861,8 +5769,6 @@ static cPhs__Step daB_DS_Create(daB_DS_c* i_this) { return i_this->create(); } -#pragma nosyminline on - /* ############################################################################################## */ /* 805DE2AC-805DE2B0 000844 0004+00 0/0 0/0 0/0 .bss * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index e2fc1f1723b..dd9bcf3ad2c 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -3,15 +3,31 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_gg.h" #include "d/d_com_inf_game.h" #include "c/c_damagereaction.h" #include "m_Do/m_Do_graphic.h" #include "Z2AudioLib/Z2Instances.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daB_GG_HIO_c : public JORReflexible { +public: + /* 805DE40C */ daB_GG_HIO_c(); + /* 805EC9C4 */ virtual ~daB_GG_HIO_c() {} + void genMessage(JORMContext*) {} + + /* 0x04 */ s8 id; + /* 0x08 */ f32 base_size; + /* 0x0C */ s16 takeoff_time; + /* 0x0E */ s16 fly_attack_wait_time; + /* 0x10 */ f32 fly_attack_speed; + /* 0x14 */ s16 takeoff2_time; + /* 0x16 */ s16 max_hp; + /* 0x18 */ f32 field_0x18; +}; + enum daE_GG_TYPE { TYPE_L7_MBOSS = 0, TYPE_L7_W = 1, @@ -256,8 +272,6 @@ void daB_GG_c::initCc() { } } -UNK_REL_BSS - /* 805ED6FC-805ED700 -00001 0004+00 1/2 0/0 0/0 .bss None */ /* 805ED6FD 0003+00 l_HIOInit None */ static u8 l_HIOInit; diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 01a1b3e5023..b84d43c8d84 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_gm.h" #include "d/actor/d_a_e_gm.h" #include "d/actor/d_a_player.h" @@ -39,8 +41,6 @@ #define ANM_GOMA_UP_02 29 #define ANM_GOMA_WAIT 30 -UNK_REL_DATA; - enum daB_GM_ACTION { ACTION_WAIT, ACTION_MOVE, @@ -135,23 +135,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { return 1; } -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) - -static u8 lit_1009[1]; static u8 l_initHIO; /* 805F47DC-805F4828 000054 004C+00 11/12 0/0 0/0 .bss l_HIO */ diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 1ef8c7d807c..7b9a974abdf 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_gnd.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_alink.h" @@ -176,9 +178,6 @@ enum daB_GND_ACTION { ACTION_END = 22, }; -UNK_REL_DATA; -UNK_REL_BSS; - static u8 l_initHIO; /* 805F4A4C-805F4A94 0000EC 0048+00 1/1 0/0 0/0 .text __ct__13daB_GND_HIO_cFv */ diff --git a/src/d/actor/d_a_b_go.cpp b/src/d/actor/d_a_b_go.cpp index e12c2e5adb2..528a3e7e842 100644 --- a/src/d/actor/d_a_b_go.cpp +++ b/src/d/actor/d_a_b_go.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_go.h" #include "SSystem/SComponent/c_math.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index 77b7fde62f5..c52850651eb 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -3,6 +3,8 @@ * Combined Goron Child */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_gos.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index aa907334680..be4cf0ec709 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -3,16 +3,32 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_mgn.h" #include "d/actor/d_a_obj_bhashi.h" #include "d/d_camera.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_graphic.h" - -UNK_REL_DATA; - #include "f_op/f_op_actor_enemy.h" +class daB_MGN_HIO_c : public JORReflexible { +public: + /* 8060572C */ daB_MGN_HIO_c(); + /* 8060F8D0 */ virtual ~daB_MGN_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 no; + /* 0x08 */ f32 base_size; + /* 0x0C */ f32 dash_speed; + /* 0x10 */ f32 turn_speed; + /* 0x14 */ f32 dash_anim; + /* 0x18 */ f32 jewel_R; + /* 0x1C */ f32 jewel_G; + /* 0x20 */ f32 jewel_B; +}; + enum B_MGN_RES_FILE_ID { /* BCK */ /* 0x06 */ BCK_MGN_APPROACH = 6, diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index d8b5fe11885..afec483e903 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_b_ob // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_ob.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" @@ -19,8 +21,6 @@ #include "Z2AudioLib/Z2Instances.h" -UNK_REL_DATA; - /* 8061056C-806105BC 0000EC 0050+00 1/1 0/0 0/0 .text __ct__12daB_OB_HIO_cFv */ daB_OB_HIO_c::daB_OB_HIO_c() { field_0x04 = -1; @@ -102,8 +102,6 @@ static int TailCallBack(J3DJoint* i_joint, int param_1) { return 1; } -UNK_REL_BSS; - static u8 data_8061B4FD; /* 8061B500-8061B504 000048 0004+00 0/2 0/0 0/0 .bss moveSW */ diff --git a/src/d/actor/d_a_b_oh.cpp b/src/d/actor/d_a_b_oh.cpp index 8ea49bceeb5..1eba7c76717 100644 --- a/src/d/actor/d_a_b_oh.cpp +++ b/src/d/actor/d_a_b_oh.cpp @@ -8,6 +8,8 @@ * things like cCcD_ShapeAttr, dCcD/cCcD_Stts, etc */ +#include "d/dolzel_rel.h" + #include "dol2asm.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" @@ -196,101 +198,8 @@ static int daB_OH_Draw(b_oh_class* i_this) { return 1; } -/* 8061DB78-8061DB7C 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8061DB7C-8061DB80 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 8061DB80-8061DB84 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8061DB84-8061DB88 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 8061DB88-8061DB8C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8061DB8C-8061DB90 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 8061DB90-8061DB94 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8061DB94-8061DB98 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 8061DB98-8061DB9C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8061DB9C-8061DBA0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 8061DBA0-8061DBA4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8061DBA4-8061DBA8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 8061DBA8-8061DBAC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8061DBAC-8061DBB0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 8061DBB0-8061DBB4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - /* 8061DBB4-8061DBB8 -00001 0004+00 1/2 0/0 0/0 .bss None */ -/* 8061DBB4 0001+00 data_8061DBB4 @1009 */ /* 8061DBB5 0003+00 data_8061DBB5 None */ -#pragma push -#pragma force_active on -static u8 struct_8061DBB4; -#pragma pop - static u8 data_8061DBB5; /* 8061DBC4-8061DBD4 000054 0010+00 2/3 0/0 0/0 .bss l_HIO */ @@ -1206,4 +1115,4 @@ SECTION_DATA extern void* g_profile_B_OH[12] = { (void*)NULL, (void*)&g_fopAc_Method, (void*)0x00DA0000, (void*)&l_daB_OH_Method, (void*)0x00044000, (void*)0x020E0000, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_b_oh2.cpp b/src/d/actor/d_a_b_oh2.cpp index 348e982726a..d6c46fb5076 100644 --- a/src/d/actor/d_a_b_oh2.cpp +++ b/src/d/actor/d_a_b_oh2.cpp @@ -3,6 +3,8 @@ * Morpheel Tentacle */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_oh2.h" #include "d/actor/d_a_b_ob.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index eeb50d4a287..858f646db7c 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -1,18 +1,38 @@ /** - * @file d_a_b_tn.cpp +* @file d_a_b_tn.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_tn.h" #include #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_nbomb.h" -UNK_REL_DATA; - #include "f_op/f_op_actor_enemy.h" +class daB_TN_HIO_c { +public: + /* 8061EBEC */ daB_TN_HIO_c(); + /* 8062D98C */ virtual ~daB_TN_HIO_c() {}; + + /* 0x04 */ s8 mUnk1; + /* 0x08 */ f32 mScale; + /* 0x0C */ f32 mKColorA; + /* 0x10 */ f32 mTimer3Wolf; + /* 0x14 */ f32 mTimer3HumanType0; + /* 0x18 */ f32 mTimer3HumanType1; + /* 0x1C */ f32 mTimer3NormalType0; + /* 0x20 */ f32 mTimer3NormalType1; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 mTimer1Action1; + /* 0x2C */ f32 mTimer1Action2; +}; + +STATIC_ASSERT(sizeof(daB_TN_HIO_c) == 0x30); + enum B_TN_RES_FILE_ID { /* BCK */ /* 0x04 */ BCK_TN2B_DIE = 4, @@ -339,9 +359,6 @@ void daB_TN_c::calcWaistAngle() { cLib_addCalcAngleS2(&mWaistAngle, sVar1, 4, 0x1000); } -/* .bss None */ -UNK_REL_BSS; - /* 8062F01D 0003+00 data_8062F01D None */ static u8 s_hioinit; @@ -1123,45 +1140,45 @@ u32 daB_TN_c::getCutType() { } switch (daPy_getPlayerActorClass()->getCutType()) { - case 0x0: + case daPy_py_c::CUT_TYPE_TURN_LEFT: + case daPy_py_c::CUT_TYPE_TURN_RIGHT: if (mTimer13 == 0) { - return 32; + return 0x20; } - return rv | 32; + return rv | 0x20; + + case daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT: + case daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT: + return rv | 0x20; + + case daPy_py_c::CUT_TYPE_JUMP: + case daPy_py_c::CUT_TYPE_LARGE_JUMP: + return rv | 0x10; + + case daPy_py_c::CUT_TYPE_TWIRL: + return rv | 0x22; case daPy_py_c::CUT_TYPE_NM_VERTICAL: case daPy_py_c::CUT_TYPE_NM_RIGHT: case daPy_py_c::CUT_TYPE_FINISH_LEFT: case daPy_py_c::CUT_TYPE_FINISH_VERTICAL: case daPy_py_c::CUT_TYPE_DASH_UNK_26: - return rv | 32; + return rv | 0x12; case daPy_py_c::CUT_TYPE_NM_STAB: case daPy_py_c::CUT_TYPE_FINISH_STAB: - return rv | 16; + return rv | 0x02; case daPy_py_c::CUT_TYPE_NM_LEFT: case daPy_py_c::CUT_TYPE_DASH_UNK_25: - return rv | 34; + return rv | 0x21; - case daPy_py_c::CUT_TYPE_TURN_RIGHT: - case daPy_py_c::CUT_TYPE_TURN_LEFT: - return rv | 18; - - case daPy_py_c::CUT_TYPE_JUMP: - case daPy_py_c::CUT_TYPE_LARGE_JUMP: - return rv | 2; - - case daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT: - case daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT: - return rv | 33; - - case daPy_py_c::CUT_TYPE_TWIRL: - return rv | 1; + case daPy_py_c::CUT_TYPE_COMBO_STAB: + return rv | 0x01; default: - return rv | 3; + return rv | 0x03; } } diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index 0d31394ca89..650b52c97b0 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -4,6 +4,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_yo.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -20,6 +22,30 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +class daB_YO_HIO_c { +public: + /* 8062F46C */ daB_YO_HIO_c(); + /* 806395E4 */ virtual ~daB_YO_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mScale[8]; + /* 0x28 */ f32 mFreezardNum; + /* 0x2C */ f32 mMaxFallSpeed; + /* 0x30 */ f32 mReboundSpeedRatio; + /* 0x34 */ f32 mChaseSpeed; + /* 0x38 */ f32 mReboundSpeedMax; + /* 0x3C */ bool field_0x3c; + /* 0x40 */ f32 mGatherTimer; + /* 0x44 */ f32 mAttackTimer; + /* 0x48 */ f32 mFreezardRadius; + /* 0x4C */ f32 field_0x4c; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ bool field_0x54; + /* 0x58 */ f32 field_0x58; +}; + +STATIC_ASSERT(sizeof(daB_YO_HIO_c) == 0x5C); + enum B_YO_RES_FILE_ID { /* BCK */ /* 0x07 */ BCK_YKW_B_ANGRY = 7, @@ -94,16 +120,12 @@ enum L5_R50_RES_FIL_ID { /* 0x0A */ DZB_R50_P2, }; -UNK_REL_BSS; - /* 80639F74 0001+00 data_80639F74 @1009 */ static bool hioInit; /* 80639F84-80639FE0 000054 005C+00 12/13 0/0 0/0 .bss l_HIO */ static daB_YO_HIO_c l_HIO; -UNK_REL_DATA; - namespace { /* 80639A80-80639AC4 000020 0044+00 0/1 0/0 0/0 .data cc_yo_src__22@unnamed@d_a_b_yo_cpp@ */ diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index 62aa791cb5c..0f0cf6a5a32 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_yo_ice.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" @@ -13,21 +15,18 @@ #include "d/d_camera.h" #include "d/d_com_inf_game.h" -/* 8063DDA4-8063DDB0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +class daB_YOI_HIO_c { +public: + /* 8063A14C */ daB_YOI_HIO_c(); + /* 8063DBD0 */ virtual ~daB_YOI_HIO_c() {} -/* 8063DDB0-8063DDC4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, + /* 0x4 */ s8 field_0x4; + /* 0x8 */ f32 mScaleY; + /* 0xC */ f32 mScaleXZ; }; +STATIC_ASSERT(sizeof(daB_YOI_HIO_c) == 0x10); + /* 8063DFE8-8063DFEC 000008 0004+00 2/2 0/0 0/0 .bss None */ static bool hioInit; diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index e3ef04ab2e8..86477226ab8 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_zant.h" #include "d/actor/d_a_b_zant_mobile.h" #include "d/actor/d_a_nbomb.h" @@ -95,8 +97,6 @@ static u8 const lit_3757[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -UNK_REL_DATA - namespace { /* 8064EEAC-8064EEEC 000020 0040+00 0/1 0/0 0/0 .data cc_zant_src__24@unnamed@d_a_b_zant_cpp@ */ dCcD_SrcSph cc_zant_src = { @@ -418,26 +418,8 @@ void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) { } } -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) - /* 8064F5F4-8064F5F8 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 8064F5F4 0001+00 data_8064F5F4 @1009 */ /* 8064F5F5 0003+00 l_initHIO None */ -static u8 data_8064F5F4; static u8 l_initHIO; /* 8064F604-8064F648 000054 0044+00 12/13 0/0 0/0 .bss l_HIO */ diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index 4c4c853f2d5..88932e62d77 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_zant_magic.h" #include "d/actor/d_a_b_zant.h" #include "d/d_com_inf_game.h" @@ -21,8 +23,6 @@ static int daB_ZANTM_Draw(daB_ZANTM_c* i_this) { return i_this->draw(); } -UNK_REL_DATA - namespace { /* 80650508-80650554 000020 004C+00 0/1 0/0 0/0 .data cc_zant_src__30@unnamed@d_a_b_zant_magic_cpp@ */ dCcD_SrcCps cc_zant_src = { diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 851bdd83de8..15cd54a71dc 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_zant_mobile.h" #include "d/actor/d_a_b_zant.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_b_zant_sima.cpp b/src/d/actor/d_a_b_zant_sima.cpp index 2f7b879e9e6..3399bf8386f 100644 --- a/src/d/actor/d_a_b_zant_sima.cpp +++ b/src/d/actor/d_a_b_zant_sima.cpp @@ -3,6 +3,8 @@ * Boss Zant Lava Island */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_b_zant_sima.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_obj_msima.h" diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index 98daf52a320..44e5fae7b21 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_balloon_2D.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -16,6 +18,130 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" +class daBalloon2D_HIO_c : public mDoHIO_entry_c { +public: + inline daBalloon2D_HIO_c() { + static param aParam = { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0.0f, + 1.0f, + 0.0f, + -10.0f, + 0.8f, + 0.0f, + -13.0f, + 1.1f, + 0.9f, + 0.7f, + 0.0f, + 18.0f, + 1.0f, + -6.6f, + 6.6f, + 1.3f, + -1.3f, + 9.2f, + 1.0f, + 0.0f, + 6.6f, + 1.1f, + 0.9f, + 1.0f, + 3.9f, + -9.2f, + 0.85f, + 0.8f, + 6.6f, + 1.3f, + 0.75f, + 0.9f, + 3.9f, + 0.0f, + 0.85f, + 0.9f, + 3.9f, + 0.0f, + 0.95f, + 0.9f, + 22.0f, + -17.0f, + 1.0f, + 20.0f, + }; + memcpy(&m, &aParam, sizeof(aParam)); + } + /* 806553A8 */ virtual ~daBalloon2D_HIO_c() {} + +#if DEBUG + void genMessage(JORMContext*); + +#endif + + void resetAddScoreSetFlag(); + + struct param { + /* 0x04 */ u8 mAdjustmentToggle; + /* 0x08 */ s32 mScore; + /* 0x0C */ u8 mComboCount; + /* 0x0D */ u8 mBalloonSize; + /* 0x0E */ u8 mOverheadScoreToggle; + /* 0x10 */ s32 mOverheadScore; + /* 0x14 */ s32 field_0x14; + /* 0x18 */ f32 field_0x1c; + /* 0x1C */ f32 field_0x20; + /* 0x20 */ f32 mScorePosX; + /* 0x24 */ f32 mScorePosY; + /* 0x28 */ f32 mScoreSize; + /* 0x2C */ f32 m5DNumberPosX; + /* 0x30 */ f32 m5DNumberPosY; + /* 0x34 */ f32 m5DNumberSizeX; + /* 0x38 */ f32 m5DNumberSizeY; + /* 0x3C */ f32 m5DNumberAlpha; + /* 0x40 */ f32 m5DNumber2PosX; + /* 0x44 */ f32 m5DNumber2PosY; + /* 0x48 */ f32 m5DNumber2Size; + /* 0x4C */ f32 mUnkPosX; + /* 0x50 */ f32 mUnkPosY; + /* 0x54 */ f32 mUnkSize; + /* 0x58 */ f32 mComboPosX; + /* 0x5C */ f32 mComboPosY; + /* 0x60 */ f32 mComboSize; + /* 0x64 */ f32 m2DNumberPosX; + /* 0x68 */ f32 m2DNumberPosY; + /* 0x6C */ f32 m2DNumberSizeX; + /* 0x70 */ f32 m2DNumberSizeY; + /* 0x74 */ f32 field_0x78; + /* 0x78 */ f32 m2DNumberComboPosX; + /* 0x7C */ f32 m2DNumberComboPosY; + /* 0x80 */ f32 m2DNumberComboSize; + /* 0x84 */ f32 m2DNumberComboAlpha; + /* 0x88 */ f32 mBalloonLargePosX; + /* 0x8C */ f32 mBalloonLargePosY; + /* 0x90 */ f32 mBalloonLargeSize; + /* 0x94 */ f32 mBalloonLargeAlpha; + /* 0x98 */ f32 mBalloonMedPosX; + /* 0x9C */ f32 mBalloonMedPosY; + /* 0xA0 */ f32 mBalloonMedSize; + /* 0xA4 */ f32 mBalloonMedAlpha; + /* 0xA8 */ f32 mBalloonSmallPosX; + /* 0xAC */ f32 mBalloonSmallPosY; + /* 0xB0 */ f32 mBalloonSmallSize; + /* 0xB4 */ f32 mBalloonSmallAlpha; + /* 0xB8 */ f32 m2DNumberCombo2PosX; + /* 0xBC */ f32 m2DNumberCombo2PosY; + /* 0xC0 */ f32 m2DNumberCombo2Size; + /* 0xC4 */ f32 m2DNumberCombo2PosX43; + }; + + param m; +}; + /* 806534CC-80653518 0000EC 004C+00 1/0 0/0 0/0 .text draw__Q213daBalloon2D_c6c_listFv */ void daBalloon2D_c::c_list::draw() { dComIfGp_getCurrentGrafPort()->setup2D(); @@ -455,63 +581,6 @@ void daBalloon2D_c::setHIO(bool param_1) { } } -daBalloon2D_HIO_c::daBalloon2D_HIO_c() { - static param aParam = { - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0.0f, - 1.0f, - 0.0f, - -10.0f, - 0.8f, - 0.0f, - -13.0f, - 1.1f, - 0.9f, - 0.7f, - 0.0f, - 18.0f, - 1.0f, - -6.6f, - 6.6f, - 1.3f, - -1.3f, - 9.2f, - 1.0f, - 0.0f, - 6.6f, - 1.1f, - 0.9f, - 1.0f, - 3.9f, - -9.2f, - 0.85f, - 0.8f, - 6.6f, - 1.3f, - 0.75f, - 0.9f, - 3.9f, - 0.0f, - 0.85f, - 0.9f, - 3.9f, - 0.0f, - 0.95f, - 0.9f, - 22.0f, - -17.0f, - 1.0f, - 20.0f, - }; - memcpy(&m, &aParam, sizeof(aParam)); -} - void daBalloon2D_HIO_c::resetAddScoreSetFlag() { JORMContext* ctx = attachJORMContext(8); ctx->startUpdateNode(this); @@ -552,11 +621,6 @@ static int daBalloon2D_draw(daBalloon2D_c* i_this) { return i_this->draw(); } -/* 806553A8-80655404 001FC8 005C+00 2/1 0/0 0/0 .text __dt__17daBalloon2D_HIO_cFv */ -daBalloon2D_HIO_c::~daBalloon2D_HIO_c() { - // NONMATCHING -} - #if DEBUG void daBalloon2D_HIO_c::genMessage(JORMContext* ctx) { ctx->genCheckBox("調整ＯＮ", &m.mAdjustmentToggle, 1, 0, NULL, 0xffff, @@ -679,11 +743,6 @@ void daBalloon2D_HIO_c::genMessage(JORMContext* ctx) { } #endif -/* 80655494-80655524 0020B4 0090+00 1/0 0/0 0/0 .text __dt__13daBalloon2D_cFv */ -daBalloon2D_c::~daBalloon2D_c() { - // NONMATCHING -} - /* ############################################################################################## */ /* 806556D8-806556F8 -00001 0020+00 1/0 0/0 0/0 .data daBalloon2D_METHODS */ static actor_method_class daBalloon2D_METHODS = { diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index e4af9bcd821..faa7867a814 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_bd.cpp +* @file d_a_bd.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_bd.h" #include "d/actor/d_a_cow.h" #include "d/actor/d_a_horse.h" @@ -10,7 +12,6 @@ #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" -UNK_REL_BSS /* ############################################################################################## */ diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 32aeb1786b1..0f1aeb3dbfb 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_bg.h" #include "d/d_com_inf_game.h" #include "d/d_com_static.h" diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 46c0bbce742..210c4509ec6 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -3,200 +3,16 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_bg_obj.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "stdio.h" -#include "dol2asm.h" #include "dolphin/os.h" #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_math.h" -SECTION_DATA extern void* __vt__10cCcD_GStts[3]; -SECTION_DATA extern void* __vt__10dCcD_GStts[3]; -SECTION_DATA extern void* __vt__8cM3dGPla[3]; -SECTION_DATA extern void* __vt__8cM3dGTri[3]; -SECTION_DATA extern void* __vt__8cM3dGCyl[3]; -SECTION_DATA extern void* __vt__8cM3dGAab[3]; -SECTION_DATA extern void* __vt__9daBgObj_c[10]; -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3]; - -// -// Forward References: -// - -extern "C" static void getBmdName__Fii(); -extern "C" static void getBtkName__Fii(); -extern "C" static void getBrkName__Fii(); -extern "C" static void getDzbName__Fi(); -extern "C" void initParticleBlock__Q29daBgObj_c11spec_data_cFPUc(); -extern "C" void initSoundBlock__Q29daBgObj_c11spec_data_cFPUc(); -extern "C" void initTexShareBlock__Q29daBgObj_c11spec_data_cFPUc(); -extern "C" void initFarInfoBlock__Q29daBgObj_c11spec_data_cFPUc(); -extern "C" void Set__Q29daBgObj_c11spec_data_cFPv(); -extern "C" void release__9daBgObj_cFP4dBgW(); -extern "C" void regist__9daBgObj_cFP4dBgW(); -extern "C" void initAtt__9daBgObj_cFv(); -extern "C" void setAttentionInfo__9daBgObj_cFP10fopAc_ac_c(); -extern "C" void initBaseMtx__9daBgObj_cFv(); -extern "C" void setBaseMtx__9daBgObj_cFv(); -extern "C" void settingCullSizeBoxForCo__9daBgObj_cFi(); -extern "C" void settingCullSizeBoxForCull__9daBgObj_cFi(); -extern "C" void CreateInitType0__9daBgObj_cFv(); -extern "C" void CreateInitType1__9daBgObj_cFv(); -extern "C" void Create__9daBgObj_cFv(); -extern "C" void CreateHeapType0__9daBgObj_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void CreateHeapType1__9daBgObj_cFv(); -extern "C" void doShareTexture__9daBgObj_cFv(); -extern "C" void CreateHeap__9daBgObj_cFv(); -extern "C" void create1st__9daBgObj_cFv(); -extern "C" void setColCommon__9daBgObj_cFv(); -extern "C" void set_tri_0__9daBgObj_cFv(); -extern "C" void set_tri_1__9daBgObj_cFv(); -extern "C" void set_cyl_0__9daBgObj_cFv(); -extern "C" void set_tri_2__9daBgObj_cFv(); -extern "C" void set_tri_3__9daBgObj_cFv(); -extern "C" void setParticle__9daBgObj_cFv(); -extern "C" void setSe__9daBgObj_cFv(); -extern "C" void checkDestroy__9daBgObj_cFv(); -extern "C" void checkHitAt__9daBgObj_cFP8cCcD_Obj(); -extern "C" void orderWait_tri__9daBgObj_cFv(); -extern "C" void orderWait_cyl__9daBgObj_cFv(); -extern "C" void orderWait_spec__9daBgObj_cFv(); -extern "C" void actionOrderWait__9daBgObj_cFv(); -extern "C" void actionOrder__9daBgObj_cFv(); -extern "C" void actionEvent__9daBgObj_cFv(); -extern "C" bool actionWait__9daBgObj_cFv(); -extern "C" void ExecuteType0__9daBgObj_cFv(); -extern "C" void ExecuteType1__9daBgObj_cFv(); -extern "C" void Execute__9daBgObj_cFPPA3_A4_f(); -extern "C" void Draw__9daBgObj_cFv(); -extern "C" void indirectProc__9daBgObj_cFP8J3DModel(); -extern "C" void Delete__9daBgObj_cFv(); -extern "C" static void daBgObj_create1st__FP9daBgObj_c(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__8dCcD_TriFv(); -extern "C" void __ct__8dCcD_TriFv(); -extern "C" void __dt__8cM3dGTriFv(); -extern "C" void __dt__8cM3dGPlaFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" static void daBgObj_MoveBGDelete__FP9daBgObj_c(); -extern "C" static void daBgObj_MoveBGExecute__FP9daBgObj_c(); -extern "C" static void daBgObj_MoveBGDraw__FP9daBgObj_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __sinit_d_a_bg_obj_cpp(); -extern "C" extern char const* const d_a_bg_obj__stringBase0; -extern "C" u8 mCreateHeapFunc__9daBgObj_c[48]; -extern "C" u8 mCreateInitFunc__9daBgObj_c[48]; -extern "C" u8 mExecuteFunc__9daBgObj_c[48]; -extern "C" u8 mTgSetFunc__9daBgObj_c[60]; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData(); -extern "C" void mDoExt_setupStageTexture__FP12J3DModelData(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void fpcM_Execute__FPv(); -extern "C" void fpcSch_JudgeByID__FPvPv(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getArcName__12daSetBgObj_cFP10fopAc_ac_c(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(); -extern "C" void getObjectResName2Index__14dRes_control_cFPCcPCc(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void -setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void GetAc__22dCcD_GAtTgCoCommonBaseFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void ChkTgHit__12dCcD_GObjInfFv(); -extern "C" void GetTgHitObj__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_TriFRC11dCcD_SrcTri(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void dKy_bg_MAxx_proc__FPv(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void cM_atan2s__Fff(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void SetH__8cM3dGCylFf(); -extern "C" void SetR__8cM3dGCylFf(); -extern "C" void setPos__8cM3dGTriFPC3VecPC3VecPC3Vec(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_21(); -extern "C" void _savegpr_23(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_21(); -extern "C" void _restgpr_23(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Tri[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_TriAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - // // Declarations: // @@ -256,6 +72,10 @@ static const char* getDzbName(int param_0) { return l_dzbName; } +static const char* dummy() { + return "spec.dat"; +} + /* 804597E8-80459814 000208 002C+00 1/1 0/0 0/0 .text * initParticleBlock__Q29daBgObj_c11spec_data_cFPUc */ u8* daBgObj_c::spec_data_c::initParticleBlock(u8* i_dataPtr) { @@ -309,13 +129,6 @@ u8* daBgObj_c::spec_data_c::initFarInfoBlock(u8* i_dataPtr) { return i_dataPtr + 8; } -/* ############################################################################################## */ -/* 8045CA20-8045CA20 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8045CA7D = "spec.dat"; -#pragma pop - /* 80459904-80459B64 000324 0260+00 1/1 0/0 1/1 .text Set__Q29daBgObj_c11spec_data_cFPv */ // NONMATCHING - close-ish @@ -697,25 +510,6 @@ int daBgObj_c::CreateInitType1() { return 1; } -/* ############################################################################################## */ -/* 8045CAC4-8045CAD0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8045CAD0-8045CAE4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8045CAE4-8045CB38 000020 0054+00 4/4 0/0 0/0 .data l_tri_src */ static dCcD_SrcTri l_tri_src = { { @@ -734,10 +528,10 @@ static dCcD_SrcTri l_tri_src = { }; /* 8045CB38-8045CB3C -00001 0004+00 1/1 0/0 0/0 .data l_specName */ -SECTION_DATA static const char* const l_specName = "spec.dat"; +static char* l_specName = "spec.dat"; /* 8045CB6C-8045CB9C 0000A8 0030+00 1/2 0/0 0/0 .data mCreateHeapFunc__9daBgObj_c */ -SECTION_DATA createHeapFunc daBgObj_c::mCreateHeapFunc[] = { +createHeapFunc daBgObj_c::mCreateHeapFunc[] = { &daBgObj_c::CreateHeapType0, &daBgObj_c::CreateHeapType1, &daBgObj_c::CreateHeapType1, @@ -745,7 +539,7 @@ SECTION_DATA createHeapFunc daBgObj_c::mCreateHeapFunc[] = { }; /* 8045CBCC-8045CBFC 000108 0030+00 1/2 0/0 0/0 .data mCreateInitFunc__9daBgObj_c */ -SECTION_DATA createInitFunc daBgObj_c::mCreateInitFunc[] = { +createInitFunc daBgObj_c::mCreateInitFunc[] = { &daBgObj_c::CreateInitType0, &daBgObj_c::CreateInitType1, &daBgObj_c::CreateInitType1, @@ -758,7 +552,7 @@ int daBgObj_c::Create() { } /* 8045CC2C-8045CC5C 000168 0030+00 1/2 0/0 0/0 .data mExecuteFunc__9daBgObj_c */ -SECTION_DATA executeFunc daBgObj_c::mExecuteFunc[] = { +executeFunc daBgObj_c::mExecuteFunc[] = { &daBgObj_c::ExecuteType0, &daBgObj_c::ExecuteType1, &daBgObj_c::ExecuteType1, @@ -766,7 +560,7 @@ SECTION_DATA executeFunc daBgObj_c::mExecuteFunc[] = { }; /* 8045CC98-8045CCD4 0001D4 003C+00 1/2 0/0 0/0 .data mTgSetFunc__9daBgObj_c */ -SECTION_DATA tgSetFunc daBgObj_c::mTgSetFunc[] = { +tgSetFunc daBgObj_c::mTgSetFunc[] = { &daBgObj_c::set_tri_0, &daBgObj_c::set_tri_1, &daBgObj_c::set_cyl_0, &daBgObj_c::set_tri_2, &daBgObj_c::set_tri_3, }; diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index d4db6f51546..239f5be124d 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_boomerang.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "d/actor/d_a_alink.h" @@ -820,9 +822,6 @@ JPABaseEmitter* daBoomerang_c::setEffectTraceMatrix(u32* i_emitterID, u16 i_name return emitter; } -UNK_REL_DATA; -UNK_REL_BSS; - /* 804A2D10-804A2D14 000040 0001+03 0/0 0/0 0/0 .bss l_HIO */ static daBoomerang_HIO_c0 l_HIO; diff --git a/src/d/actor/d_a_bullet.cpp b/src/d/actor/d_a_bullet.cpp index dd96a502996..2b5906367b4 100644 --- a/src/d/actor/d_a_bullet.cpp +++ b/src/d/actor/d_a_bullet.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_bullet.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index c2d71c0782f..ad9690b5295 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_canoe.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" @@ -551,8 +553,6 @@ void daCanoe_c::frontBackBgCheck() { } } -UNK_REL_BSS - /* 804DC330-804DC554 001ED0 0224+00 1/1 0/0 0/0 .text setPaddleEffect__9daCanoe_cFv */ void daCanoe_c::setPaddleEffect() { static cXyz paddleRippleScale(0.7f, 0.7f, 0.7f); diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index 57c1cd5a949..f216a953f5a 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_coach_2D.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" @@ -11,6 +13,86 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" +class daCoach2D_HIO_c : public mDoHIO_entry_c { +public: + struct Param { + /* 0x00 */ f32 pos_x; + /* 0x04 */ f32 pos_y; + /* 0x08 */ f32 size; + /* 0x0C */ f32 alpha; + /* 0x10 */ f32 icon_space_x; + /* 0x14 */ f32 icon_pos_x; + /* 0x18 */ f32 icon_pos_y; + /* 0x1C */ f32 icon_size; + /* 0x20 */ f32 icon_alpha; + /* 0x24 */ f32 coach_pos_x; + /* 0x28 */ f32 coach_pos_y; + /* 0x2C */ f32 coach_size; + /* 0x30 */ f32 coach_alpha; + /* 0x34 */ f32 blink_speed_min; + /* 0x38 */ f32 blink_speed_max; + /* 0x3C */ f32 pikari_scale; + /* 0x40 */ f32 pikari_anim_speed; + /* 0x44 */ u8 pikari_moyaR0_R; + /* 0x45 */ u8 pikari_moyaR0_G; + /* 0x46 */ u8 pikari_moyaR0_B; + /* 0x47 */ u8 pikari_moyaR0_A; + /* 0x48 */ u8 pikari_moyaR1_R; + /* 0x49 */ u8 pikari_moyaR1_G; + /* 0x4A */ u8 pikari_moyaR1_B; + /* 0x4B */ u8 pikari_moyaR1_A; + /* 0x4C */ u8 unk_0x4C; + /* 0x4D */ u8 unk_0x4D; + /* 0x4E */ u8 unk_0x4E; + /* 0x4F */ u8 unk_0x4F; + /* 0x50 */ u8 unk_0x50; + /* 0x51 */ u8 unk_0x51; + /* 0x52 */ u8 unk_0x52; + /* 0x53 */ u8 unk_0x53; + /* 0x54 */ u8 debug_ON; + /* 0x55 */ u8 max_damage_num; + /* 0x56 */ u8 now_damage_num; + /* 0x57 */ u8 reverse_flag; + }; + + daCoach2D_HIO_c() { + static Param aParam = { + 45.0f, + -15.0f, + 1.0f, + 1.0f, + 7.5f, + -6.5f, + 0.0f, + 0.5f, + 1.0f, + 0.0f, + 0.0f, + 1.0f, + 1.0f, + 1.0f, + 5.0f, + 3.0f, + 8.0f, + 0xFF, 0xFF, 0xFF, 0xB9, + 0x00, 0x9B, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0x57, + 0x00, 0x73, 0x00, 0x00, + false, + 20, + 0, + 1, + }; + + memcpy(¶m, &aParam, sizeof(Param)); + } + + /* 80657738 */ virtual ~daCoach2D_HIO_c() {} + void genMessage(JORMContext*) {} + + /* 0x4 */ Param param; +}; + /* 806569CC-80656A18 0000EC 004C+00 1/0 0/0 0/0 .text draw__Q211daCoach2D_c6c_listFv */ void daCoach2D_c::c_list::draw() { dComIfGp_getCurrentGrafPort()->setup2D(); diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp index 85804887b28..76c9d20893b 100644 --- a/src/d/actor/d_a_coach_fire.cpp +++ b/src/d/actor/d_a_coach_fire.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_coach_fire.cpp +* @file d_a_coach_fire.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_coach_fire.h" /* 806583E8-806583F8 000000 0010+00 3/3 0/0 0/0 .rodata M_attr__13daCoachFire_c */ diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index e62afcaea67..4e1688fdfe4 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_cow.cpp +* @file d_a_cow.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_cow.h" #include "SSystem/SComponent/c_lib.h" #include "Z2AudioLib/Z2Instances.h" @@ -34,10 +36,7 @@ (val) = (min); \ } -#define CLAMP_COW_BODY_ANGLE(angle) CLAMP((angle), -0x2000, 0x2000) - -UNK_REL_DATA; -UNK_REL_BSS; +#define CLAMP_COW_BODY_ANGLE(angle) CLAMP((angle), -0x2000, 0x2000); namespace { static dCcD_SrcSph cc_sph_src = {{{0, {{0, 0, {0}}, {0xfbfdfb, {0x11}}, {{0x79}}}}, diff --git a/src/d/actor/d_a_crod.cpp b/src/d/actor/d_a_crod.cpp index 4ca4f649841..7ea5790863c 100644 --- a/src/d/actor/d_a_crod.cpp +++ b/src/d/actor/d_a_crod.cpp @@ -3,6 +3,8 @@ * Dominion Rod Object */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_crod.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_alink.h" diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 96b50c741ce..93968764f05 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_cstaF.h" #include "d/actor/d_a_alink.h" #include "d/actor/d_a_crod.h" diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 365b07434db..1873bf3390d 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_cstatue.cpp +* @file d_a_cstatue.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_cstatue.h" #include #include "d/actor/d_a_alink.h" @@ -11,9 +13,6 @@ #include "d/d_cc_d.h" #include "d/d_tresure.h" -UNK_REL_BSS; -UNK_REL_DATA; - static u8 const unused[12] = {}; /* 806676A4-806676AC 00000C 0008+00 0/1 0/0 0/0 .rodata l_arcName */ diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index 8c00ac754d0..f1ed7c50036 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_demo00.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "SSystem/SComponent/c_counter.h" @@ -62,8 +64,6 @@ demo_s1_ke_s::~demo_s1_ke_s() {} /* 804A8998-804A8998 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ static char const* const stringBase_804A8998 = "V_24_tri_joint"; -UNK_REL_DATA; - /* 804A4520-804A45A0 000300 0080+00 1/1 0/0 0/0 .text get_foward_angle__FP4cXyzP4cXyzPsPs */ static void get_foward_angle(cXyz* param_1, cXyz* param_2, s16* param_3, s16* param_4) { // NONMATCHING @@ -774,8 +774,6 @@ static void teduna_calc(cXyz* param_1, cXyz* param_2, cXyz* param_3, s16 param_4 } } -UNK_REL_BSS; - /* 804A8C64-804A8D24 000054 00C0+00 1/3 0/0 0/0 .bss teduna_posL */ static cXyz teduna_posL[16]; diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 149f97512fb..a6278de7d08 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_demo_item.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" @@ -12,23 +14,6 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "Z2AudioLib/Z2Instances.h" -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) - /* 804E1C34-804E1C40 000054 000C+00 0/2 0/0 0/0 .bss l_player_offset */ static cXyz l_player_offset = cXyz(0.0f, 115.0f, 54.0f); diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index c32dab1cb29..817da0f787f 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -3,6 +3,8 @@ * Disappear death effect when an enemy is defeated */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_disappear.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_dmidna.cpp b/src/d/actor/d_a_dmidna.cpp index 022091ae748..2d5a5258717 100644 --- a/src/d/actor/d_a_dmidna.cpp +++ b/src/d/actor/d_a_dmidna.cpp @@ -3,6 +3,8 @@ * Dying Midna Actor */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_dmidna.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index 7aaad5877ff..d22d55a2d68 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -5,110 +5,24 @@ // Every function matches, but a Z2SoundObjSimple dtor is generated that should not exist -#include "d/actor/d_a_do.h" +#include "d/dolzel_rel.h" + #include "JSystem/JGeometry.h" #include "SSystem/SComponent/c_math.h" -#include "m_Do/m_Do_controller_pad.h" +#include "Z2AudioLib/Z2Instances.h" #include "c/c_damagereaction.h" -#include "d/d_com_inf_game.h" +#include "d/actor/d_a_canoe.h" +#include "d/actor/d_a_do.h" +#include "d/actor/d_a_obj_food.h" #include "d/actor/d_a_player.h" #include "d/d_a_item_static.h" +#include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" -#include "d/actor/d_a_canoe.h" -#include "d/actor/d_a_obj_food.h" - -/* 8066F278-8066F27C 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8066F27C-8066F280 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 8066F280-8066F284 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8066F284-8066F288 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 8066F288-8066F28C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8066F28C-8066F290 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 8066F290-8066F294 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8066F294-8066F298 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 8066F298-8066F29C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8066F29C-8066F2A0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 8066F2A0-8066F2A4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8066F2A4-8066F2A8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 8066F2A8-8066F2AC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8066F2AC-8066F2B0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 8066F2B0-8066F2B4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop +#include "m_Do/m_Do_controller_pad.h" /* 8066F2B4-8066F2B8 -00001 0004+00 1/2 0/0 0/0 .bss None */ -/* 8066F2B4 0001+01 data_8066F2B4 @1009 */ /* 8066F2B6 0002+00 data_8066F2B6 None */ -static u8 data_8066F2B4; static bool noFallCheck; static bool hioInit; @@ -2628,176 +2542,7 @@ static cPhs__Step daDo_Create(fopAc_ac_c* i_this) { return step; } -/* 8066F32C-8066F330 0000BC 0004+00 0/0 0/0 0/0 .bss - * sInstance__40JASGlobalInstance<19JASDefaultBankTable> */ -#pragma push -#pragma force_active on -static u8 data_8066F32C[4]; -#pragma pop - -/* 8066F330-8066F334 0000C0 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14JASAudioThread> */ -#pragma push -#pragma force_active on -static u8 data_8066F330[4]; -#pragma pop - -/* 8066F334-8066F338 0000C4 0004+00 0/0 0/0 0/0 .bss sInstance__27JASGlobalInstance<7Z2SeMgr> */ -#pragma push -#pragma force_active on -static u8 data_8066F334[4]; -#pragma pop - -/* 8066F338-8066F33C 0000C8 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8Z2SeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_8066F338[4]; -#pragma pop - -/* 8066F33C-8066F340 0000CC 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8066F33C[4]; -#pragma pop - -/* 8066F340-8066F344 0000D0 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2StatusMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8066F340[4]; -#pragma pop - -/* 8066F344-8066F348 0000D4 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2DebugSys> - */ -#pragma push -#pragma force_active on -static u8 data_8066F344[4]; -#pragma pop - -/* 8066F348-8066F34C 0000D8 0004+00 0/0 0/0 0/0 .bss - * sInstance__36JASGlobalInstance<15JAISoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_8066F348[4]; -#pragma pop - -/* 8066F34C-8066F350 0000DC 0004+00 0/0 0/0 0/0 .bss - * sInstance__35JASGlobalInstance<14Z2SoundStarter> */ -#pragma push -#pragma force_active on -static u8 data_8066F34C[4]; -#pragma pop - -/* 8066F350-8066F354 0000E0 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12Z2SpeechMgr2> */ -#pragma push -#pragma force_active on -static u8 data_8066F350[4]; -#pragma pop - -/* 8066F354-8066F358 0000E4 0004+00 0/0 0/0 0/0 .bss sInstance__28JASGlobalInstance<8JAISeMgr> */ -#pragma push -#pragma force_active on -static u8 data_8066F354[4]; -#pragma pop - -/* 8066F358-8066F35C 0000E8 0004+00 0/0 0/0 0/0 .bss sInstance__29JASGlobalInstance<9JAISeqMgr> */ -#pragma push -#pragma force_active on -static u8 data_8066F358[4]; -#pragma pop - -/* 8066F35C-8066F360 0000EC 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAIStreamMgr> */ -#pragma push -#pragma force_active on -static u8 data_8066F35C[4]; -#pragma pop - -/* 8066F360-8066F364 0000F0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SoundMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8066F360[4]; -#pragma pop - -/* 8066F364-8066F368 0000F4 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAISoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_8066F364[4]; -#pragma pop - -/* 8066F368-8066F36C 0000F8 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13JAUSoundTable> */ -#pragma push -#pragma force_active on -static u8 data_8066F368[4]; -#pragma pop - -/* 8066F36C-8066F370 0000FC 0004+00 0/0 0/0 0/0 .bss - * sInstance__38JASGlobalInstance<17JAUSoundNameTable> */ -#pragma push -#pragma force_active on -static u8 data_8066F36C[4]; -#pragma pop - -/* 8066F370-8066F374 000100 0004+00 0/0 0/0 0/0 .bss - * sInstance__33JASGlobalInstance<12JAUSoundInfo> */ -#pragma push -#pragma force_active on -static u8 data_8066F370[4]; -#pragma pop - -/* 8066F374-8066F378 000104 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SoundInfo> - */ -#pragma push -#pragma force_active on -static u8 data_8066F374[4]; -#pragma pop - -/* 8066F378-8066F37C 000108 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2SoundObjMgr> */ -#pragma push -#pragma force_active on -static u8 data_8066F378[4]; -#pragma pop - -/* 8066F37C-8066F380 00010C 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2Audience> - */ -#pragma push -#pragma force_active on -static u8 data_8066F37C[4]; -#pragma pop - -/* 8066F380-8066F384 000110 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2FxLineMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8066F380[4]; -#pragma pop - -/* 8066F384-8066F388 000114 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2EnvSeMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8066F384[4]; -#pragma pop - -/* 8066F388-8066F38C 000118 0004+00 0/0 0/0 0/0 .bss sInstance__32JASGlobalInstance<11Z2SpeechMgr> - */ -#pragma push -#pragma force_active on -static u8 data_8066F388[4]; -#pragma pop - -/* 8066F38C-8066F390 00011C 0004+00 0/0 0/0 0/0 .bss - * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> */ -#pragma push -#pragma force_active on -static u8 data_8066F38C[4]; -#pragma pop +AUDIO_INSTANCES; /* 8066F1CC-8066F1EC -00001 0020+00 1/0 0/0 0/0 .data l_daDo_Method */ static actor_method_class l_daDo_Method = { diff --git a/src/d/actor/d_a_door_boss.cpp b/src/d/actor/d_a_door_boss.cpp index 44824316fc0..a380344aaa2 100644 --- a/src/d/actor/d_a_door_boss.cpp +++ b/src/d/actor/d_a_door_boss.cpp @@ -3,6 +3,8 @@ * Boss Door */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_door_boss.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -10,21 +12,6 @@ #include "d/d_door_param2.h" #include "SSystem/SComponent/c_math.h" -/* 80670A20-80670A2C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80670A2C-80670A40 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 8066F418-8066F424 000078 000C+00 4/4 0/0 0/0 .text getArcName__9daBdoor_cFv */ char* daBdoor_c::getArcName() { return "Z_bdor00"; diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index 5c6bac96f93..0f662449a05 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -2,6 +2,8 @@ // Translation Unit: Boss Door L1 // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_door_bossL1.h" #include "d/actor/d_a_obj_keyhole.h" #include "d/d_door_param2.h" @@ -12,24 +14,6 @@ #include "SSystem/SComponent/c_math.h" #include "f_op/f_op_actor_mng.h" -/* 804E4DF8-804E4E04 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 804E4E04-804E4E18 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 804E4E18-804E4E68 -00001 0050+00 1/1 0/0 0/0 .data l_stageName$3673 */ static char* l_stageName[20] = { "D_MN05", diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp index daf7f4c78f5..fbc91b4def8 100644 --- a/src/d/actor/d_a_door_bossL5.cpp +++ b/src/d/actor/d_a_door_bossL5.cpp @@ -2,6 +2,8 @@ // Boss Door Level 5 // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_door_bossL5.h" #include "d/actor/d_a_obj_keyhole.h" #include "d/d_com_inf_game.h" @@ -65,24 +67,6 @@ static char const l_door_open_demo_1st[26] = "DEFAULT_BS_SHUTTER_L5_1ST"; /* 806724FC-8067250C 000034 000D+03 3/3 0/0 0/0 .rodata l_staff_name */ static char const l_staff_name[13] = "SHUTTER_DOOR"; -/* 806725F4-80672600 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80672600-80672614 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80672614-8067264C -00001 0038+00 1/1 0/0 0/0 .data action_table$3861 */ static char* action_table[14] = { "WAIT", diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index b62493c31a6..6d97ebbf5f0 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -2,6 +2,8 @@ // d_a_door_dbdoor00 // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_door_dbdoor00.h" #include "printf.h" #include "SSystem/SComponent/c_math.h" @@ -52,24 +54,6 @@ char* daDbDoor00_c::getBmdArcName() { return "DbDoor0"; } -/* 8045E664-8045E670 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8045E670-8045E684 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8045E684-8045E688 -00001 0004+00 1/1 0/0 0/0 .data l_bmd_base_name */ static char* l_bmd_base_name = "door-pushDouble_"; diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index e0442c3860d..b9c5f9d8c03 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -2,6 +2,8 @@ // Door Knob // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_door_knob00.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" @@ -57,24 +59,6 @@ char* daKnob20_c::getDummyBmd() { return "door-knobDummy.bmd"; } -/* 80460874-80460880 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80460880-80460894 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80460894-80460898 -00001 0004+00 1/1 0/0 0/0 .data l_bmd_base_name */ static char* l_bmd_base_name = "door-knob_"; diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index 73b91fdf949..6f3e65ce8df 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_door_mbossL1.h" #include "d/actor/d_a_obj_stopper.h" #include "d/actor/d_a_obj_keyhole.h" @@ -62,21 +64,6 @@ static u16 const l_stop_heap_size[12] = { 0x0EA0, 0x0800, 0x0EB0, 0x0800, 0x0800, 0x1BD0, }; -/* 80677970-8067797C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8067797C-80677990 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80677990-806779BC -00001 002C+00 0/1 0/0 0/0 .data l_door_open_demo */ static char* l_door_open_demo[11] = { NULL, diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index 7e543fac722..b71d59d8303 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -3,6 +3,8 @@ * Door - Push */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_door_push.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" @@ -74,24 +76,6 @@ void daDoorPush_c::setBaseMtx() { } } -/* 80678F50-80678F5C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80678F5C-80678F70 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80678F70-80678F74 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ static char* l_arcName = "V_OsuDoor"; diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index d053c9ee053..39a66c9a834 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -2,6 +2,8 @@ // Door Shutter // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_door_shutter.h" #include "d/actor/d_a_obj_Lv5Key.h" #include "d/actor/d_a_obj_keyhole.h" @@ -34,24 +36,6 @@ char* daDoor20_c::getAlwaysArcName() { return "static"; } -/* 80466E7C-80466E88 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80466E88-80466E9C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80460BA4-80460C40 0000E4 009C+00 9/8 0/0 0/0 .text getArcName__10daDoor20_cFv */ char* daDoor20_c::getArcName() { switch (door_param2_c::getKind(this)) { diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp index 33ad41ea965..e6962461ea8 100644 --- a/src/d/actor/d_a_door_spiral.cpp +++ b/src/d/actor/d_a_door_spiral.cpp @@ -2,6 +2,8 @@ // Door Spiral // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_door_spiral.h" #include "f_op/f_op_actor.h" diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp index f49590b698c..3aa0d22a885 100644 --- a/src/d/actor/d_a_dshutter.cpp +++ b/src/d/actor/d_a_dshutter.cpp @@ -3,12 +3,11 @@ * Gates that shutter open / close */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_dshutter.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" -#include "dol2asm.h" - -UNK_REL_DATA /* 80467F7C-80467F88 -00001 000C+00 2/2 0/0 0/0 .data l_arcName */ static char* l_arcName[] = { @@ -98,23 +97,6 @@ int daDsh_c::initOpenWait() { return 1; } -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) - /* 804680B0-804680C8 000040 0018+00 2/3 0/0 0/0 .bss l_openWaitAction */ static daDsh_c::action_c l_openWaitAction(&daDsh_c::initOpenWait, &daDsh_c::executeOpenWait); diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index 9ad7c09e9b2..806b5e7d356 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -3,10 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ai.h" #include "d/d_cc_d.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index 06b98754ca6..13cb088089f 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -3,6 +3,8 @@ * Enemy Arrow */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_arrow.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_alink.h" @@ -96,101 +98,6 @@ static void fire_eff_set(e_arrow_class* i_this) { } } -// Unreferenced BSS -/* 8067EB18-8067EB1C 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8067EB1C-8067EB20 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB20-8067EB24 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB24-8067EB28 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB28-8067EB2C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB2C-8067EB30 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB30-8067EB34 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB34-8067EB38 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB38-8067EB3C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB3C-8067EB40 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB40-8067EB44 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB44-8067EB48 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB48-8067EB4C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB4C-8067EB50 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB50-8067EB54 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 8067EB54-8067EB58 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop -// end unreferenced BSS - /* 8067CBA4-8067D21C 0004C4 0678+00 1/1 0/0 0/0 .text hit_check__FP13e_arrow_class */ static void hit_check(e_arrow_class* i_this) { dBgS_ObjGndChk_Spl ground_chk; @@ -439,24 +346,6 @@ static void* s_limit_sub(void* i_actor, void* i_data) { return NULL; } -/* 8067E978-8067E984 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8067E984-8067E998 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8067D68C-8067DA70 000FAC 03E4+00 1/1 0/0 0/0 .text e_arrow_demo_fire__FP13e_arrow_class */ static void e_arrow_demo_fire(e_arrow_class* i_this) { cXyz sp9C; diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index 4461566e5c7..f0ff909de1d 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -3,6 +3,8 @@ * Enemy - Keese */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ba.h" #include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_math.h" @@ -10,9 +12,23 @@ #include "d/d_s_play.h" #include "d/actor/d_a_player.h" #include "d/d_procname.h" -UNK_REL_DATA #include "f_op/f_op_actor_enemy.h" +class daE_BA_HIO_c { +public: + /* 8067ECEC */ daE_BA_HIO_c(); + /* 80681F00 */ virtual ~daE_BA_HIO_c() {} + + /* 0x04 */ s8 field_0x04; + /* 0x08 */ f32 mScale; + /* 0x0C */ f32 mFlySpeed; + /* 0x10 */ f32 mFightDistance; + /* 0x14 */ f32 mFightSpeed; + /* 0x18 */ f32 mAttackSpeed; +}; + +STATIC_ASSERT(sizeof(daE_BA_HIO_c) == 0x1C); + /* 80682638-8068263C 000008 0004+00 2/2 0/0 0/0 .bss None */ static bool hioInit; diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index d6e7e4ffe26..dbd03d00d7c 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -3,6 +3,8 @@ * Enemy - Bees */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_bee.h" #include "d/actor/d_a_e_nest.h" #include "d/d_com_inf_game.h" @@ -11,97 +13,8 @@ #include "d/d_s_play.h" #include "SSystem/SComponent/c_math.h" -/* 80685638-8068563C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8068563C-80685640 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80685640-80685644 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80685644-80685648 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80685648-8068564C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8068564C-80685650 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80685650-80685654 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80685654-80685658 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80685658-8068565C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8068565C-80685660 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80685660-80685664 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80685664-80685668 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80685668-8068566C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8068566C-80685670 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80685670-80685674 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - /* 80685674-80685678 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 80685674 0001+00 data_80685674 @1009 */ /* 80685675 0003+00 data_80685675 None */ -static u8 struct_80685674; static bool hioInit; /* 80685684-80685694 000054 0010+00 6/6 0/0 0/0 .bss l_HIO */ diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index ab85c46996c..aec8345d8a5 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_bg.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_e_df.h" diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index 256a4b8e5a6..56d2a68fd78 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -3,14 +3,33 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_bi.h" #include "d/d_cc_d.h" #include "d/d_bomb.h" #include "d/actor/d_a_obj_fw.h" -UNK_REL_DATA; #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_actor_enemy.h" +class daE_BI_HIO_c : public JORReflexible { +public: + /* 8068A5EC */ daE_BI_HIO_c(); + /* 8068D2DC */ virtual ~daE_BI_HIO_c() {} + +#if DEBUG + void genMessage(JORMContext*); +#endif + + /* 爆弾虫 - Bomb Bug */ + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 basic_size; // 基本サイズ - Basic Size + /* 0x0C */ f32 search_range; // サーチ範囲 - Search Range + /* 0x10 */ f32 track_range; // 追尾範囲 - Track Range + /* 0x14 */ s16 time_to_get_going; // 動き出すまでの時間 - Time To Get Going + /* 0x18 */ f32 movement_spd; // 移動速度 - Movement Speed +}; + enum E_bi_RES_File_ID { /* BCK */ /* 0x4 */ BCK_BI_APPEAR = 0x4, @@ -167,8 +186,6 @@ static void damage_check(e_bi_class* i_this) { } } -UNK_REL_BSS; - /* 8068DB1C-8068DB20 -00001 0004+00 2/2 0/0 0/0 .bss None */ /* 8068DB1C 0001+00 data_8068DB1C @1009 */ /* 8068DB1D 0003+00 data_8068DB1D None */ diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp index 2b54eb9d668..40a1234b69f 100644 --- a/src/d/actor/d_a_e_bi_leaf.cpp +++ b/src/d/actor/d_a_e_bi_leaf.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_bi_leaf.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index 86f3826e0da..f65cb01d73b 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -3,11 +3,27 @@ * */ -#include "d/actor/d_a_e_bs.h" +#include "d/dolzel_rel.h" -UNK_REL_DATA; +#include "d/actor/d_a_e_bs.h" #include "f_op/f_op_actor_enemy.h" +class daE_BS_HIO_c : public JORReflexible { +public: + /* 8068E12C */ daE_BS_HIO_c(); + /* 8069091C */ virtual ~daE_BS_HIO_c() {} + + void genMessage(JORMContext* ctx); + + /* 0x04 */ s8 id; + /* 0x08 */ f32 base_size; + /* 0x0C */ f32 move_speed; + /* 0x10 */ f32 rush_speed; + /* 0x14 */ f32 pl_recognize_dist; + /* 0x18 */ f32 attack_start_range; + /* 0x1C */ f32 battle_start_range; +}; + enum daE_BS_ACTION { ACTION_APPEAR, ACTION_NORMAL, diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index 09661d030e1..7637ed7860a 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -3,11 +3,26 @@ * */ -#include "d/actor/d_a_e_bu.h" +#include "d/dolzel_rel.h" -UNK_REL_DATA; +#include "d/actor/d_a_e_bu.h" #include "f_op/f_op_actor_enemy.h" +class daE_BU_HIO_c : public JORReflexible { +public: + /* 806911AC */ daE_BU_HIO_c(); + /* 806941D4 */ virtual ~daE_BU_HIO_c() {} + + void genMessage(JORMContext* ctx); + + /* 0x04 */ s8 id; + /* 0x08 */ f32 base_size; + /* 0x0C */ f32 fly_speed; + /* 0x10 */ f32 attack_range; + /* 0x14 */ f32 attack_speed; + /* 0x18 */ f32 dash_speed; +}; + enum daE_BU_TYPE { TYPE_NORMAL, TYPE_FIRE, diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index faa1703e3fe..cf04735ee56 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_e_bug.cpp +* @file d_a_e_bug.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_bug.h" #include "d/actor/d_a_player.h" #include "d/d_path.h" @@ -22,8 +24,6 @@ daE_Bug_HIO_c::daE_Bug_HIO_c() { field_0xc = 1.0f; } -UNK_REL_BSS; - /* 80697E6C-80697E70 -00001 0004+00 1/2 0/0 0/0 .bss None */ /* 80697E6C 0001+00 data_80697E6C @1009 */ /* 80697E6D 0003+00 data_80697E6D None */ diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index 71c960027df..c4c2e809280 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -3,12 +3,25 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_cr.h" #include "d/d_cc_d.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_CR_HIO_c : public JORReflexible { +public: + /* 8069800C */ daE_CR_HIO_c(); + /* 806997F4 */ virtual ~daE_CR_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 id; + /* 0x08 */ f32 base_size; + /* 0x0C */ f32 move_speed; + /* 0x10 */ f32 pl_search_range; +}; + enum daE_CR_ACTION { ACTION_MOVE, ACTION_S_DAMAGE = 9, diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp index 343ab55ddbe..6f808deaff0 100644 --- a/src/d/actor/d_a_e_cr_egg.cpp +++ b/src/d/actor/d_a_e_cr_egg.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_cr_egg.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index 9dbaabdfbdb..7c1738daf62 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -3,13 +3,28 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_db.h" #include "d/actor/d_a_e_db_leaf.h" #include "f_op/f_op_kankyo_mng.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_DB_HIO_c : public JORReflexible { +public: + /* 8069AAEC */ daE_DB_HIO_c(); + /* 806A13D8 */ virtual ~daE_DB_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 id; + /* 0x08 */ f32 base_size; + /* 0x0C */ f32 flower_size; + /* 0x10 */ f32 appear_size; + /* 0x14 */ s16 roof_reappear_interval; + /* 0x16 */ s16 attack_freq; +}; + enum daE_DB_ACTION { ACTION_STAY, ACTION_APPEAR, diff --git a/src/d/actor/d_a_e_db_leaf.cpp b/src/d/actor/d_a_e_db_leaf.cpp index 6b3f5c1c988..9c74c040387 100644 --- a/src/d/actor/d_a_e_db_leaf.cpp +++ b/src/d/actor/d_a_e_db_leaf.cpp @@ -1,5 +1,7 @@ // Translation Unit: d_a_e_db_leaf +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_db_leaf.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index 22446c5fa34..1bbfb31b32f 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -3,13 +3,33 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_dd.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_bomb.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_DD_HIO_c : public JORReflexible { +public: + /* 806A226C */ daE_DD_HIO_c(); + /* 806A6D08 */ virtual ~daE_DD_HIO_c() {} + + void genMessage(JORMContext*); + + /* ドドンゴ - Dodongo */ + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 basic_size; // 基本サイズ - Basic Size + /* 0x0C */ f32 walk_speed; // 歩速度 - Walk Speed + /* 0x10 */ f32 run_speed; // 走速度 - Run Speed + /* 0x14 */ f32 search_area; // サーチエリア - Search Area + /* 0x18 */ f32 flame_distance; // 炎距離 - Flame Distance + /* 0x1C */ f32 horned_head; // 首曲角 - Horned Head + /* 0x20 */ s16 flame_time; // 炎時間 - Flame Time + /* 0x24 */ f32 flame_mot_speed; // 炎モーション速 - Flame Motion Speed +}; + enum E_dd_RES_File_ID { /* BCK */ /* 0x05 */ BCK_DD_DAMAGE_L = 0x5, diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index 3be0d2f7da3..982dc68155b 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -1,14 +1,27 @@ /** - * @file d_a_e_df.cpp +* @file d_a_e_df.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_df.h" #include "d/actor/d_a_obj_carry.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_DF_HIO_c : public JORReflexible { +public: + /* 806A76EC */ daE_DF_HIO_c(); + /* 806A9A84 */ virtual ~daE_DF_HIO_c() {}; + + void genMessage(JORMContext*); + + /* 0x4 */ s8 mNo; + /* 0x8 */ f32 field_0x8; +}; + +STATIC_ASSERT(sizeof(daE_DF_HIO_c) == 0xC); + #ifdef DEBUG inline void daE_DF_HIO_c::genMessage(JORMContext* i_ctx) { i_ctx->genLabel("デクレシア", 0x80000001, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index 9fe7a2b0234..b2f84991d72 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_dk.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" @@ -42,8 +44,6 @@ enum E_DK_RES_FILE_ID { }; -UNK_REL_DATA; - static dCcD_SrcSph cc_dk_src = { { // mObjInf { 0x0, { { 0, 0, { 0 } }, { (s32)0xd8fbbddf, { 3 } }, { { 0x75 } } } }, // mObj diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index 6f4b58513f8..7ba0078a74b 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -3,9 +3,10 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_dn.h" #include "d/d_cc_d.h" -UNK_REL_DATA; #include "d/d_bomb.h" #include "f_op/f_op_kankyo_mng.h" #include "d/actor/d_a_player.h" @@ -13,6 +14,26 @@ UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +class daE_DN_HIO_c : public JORReflexible { +public: + /* 804E51AC */ daE_DN_HIO_c(); + /* 804EE39C */ virtual ~daE_DN_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 model_size; // 基本サイズ + /* 0x0C */ f32 movement_speed; // 移動速度 + /* 0x10 */ f32 dash_speed; // 突進速度 + /* 0x14 */ f32 battle_init_range; // 戦闘開始範囲 + /* 0x18 */ f32 attack_init_range; // 攻撃開始範囲 + /* 0x1C */ s16 field_0x1c; // 防御静止間 + /* 0x1E */ s16 field_0x1e; // 魂抜間 弱 + /* 0x20 */ s16 field_0x20; // 魂抜間 強 + /* 0x22 */ u8 field_0x22; + /* 0x23 */ u8 invulnerable; // 不死身 + /* 0x24 */ u8 field_0x24; // 学習なし +}; enum Action { /* 0x00 */ ACTION_NORMAL = 0, @@ -288,8 +309,6 @@ static BOOL other_bg_check2(e_dn_class* i_this, cXyz* param_2) { return FALSE; } -UNK_REL_BSS; - /* 804EEF2D 0003+00 data_804EEF2D None */ u8 l_initHIO; diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 9a577dbcb82..88971ce4cba 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_dt.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" @@ -18,6 +20,24 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" +class daE_DT_HIO_c { +public: + /* 806AD90C */ daE_DT_HIO_c(); + /* 806B5BDC */ virtual ~daE_DT_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mScale; + /* 0x0C */ f32 mWalkSpeed; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 mStunTimer; + /* 0x20 */ f32 mPressTimer; + /* 0x24 */ f32 mMaxFallSpeed; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; +}; + enum Action { /* 0x0 */ ACT_WAIT, /* 0x1 */ ACT_CRY, @@ -139,26 +159,8 @@ dCcD_SrcSph E_DT_n::cc_dt_tongue_src = { } // mSphAttr }; -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) - /* 806B629C-806B62A0 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 806B629C 0001+00 data_806B629C @1009 */ /* 806B629D 0003+00 data_806B629D None */ -static u8 struct_806B629C; static bool hioInit; /* 806B62AC-806B62DC 000054 0030+00 7/8 0/0 0/0 .bss l_HIO */ diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index a810329c2dd..452a29cfc95 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_fb.h" #include "dol2asm.h" @@ -152,11 +154,9 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void __register_global_object(); // @@ -367,98 +367,6 @@ COMPILER_STRIP_GATE(0x806B8F9C, &lit_3750); SECTION_RODATA static f32 const lit_3751 = 1.0f; COMPILER_STRIP_GATE(0x806B8FA0, &lit_3751); -/* 806B91B0-806B91B4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 806B91B4-806B91B8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 806B91B8-806B91BC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 806B91BC-806B91C0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 806B91C0-806B91C4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 806B91C4-806B91C8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 806B91C8-806B91CC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 806B91CC-806B91D0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 806B91D0-806B91D4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 806B91D4-806B91D8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 806B91D8-806B91DC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 806B91DC-806B91E0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 806B91E0-806B91E4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 806B91E4-806B91E8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 806B91E8-806B91EC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 806B91EC-806B91F0 -00001 0004+00 1/2 0/0 0/0 .bss None */ -/* 806B91EC 0001+00 data_806B91EC @1009 */ -/* 806B91ED 0003+00 data_806B91ED None */ -static u8 struct_806B91EC[4]; - /* 806B91F0-806B91FC 000048 000C+00 1/1 0/0 0/0 .bss @3657 */ static u8 lit_3657[12]; diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index abaa0b3d624..f36fcdf0aea 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_fk.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -146,7 +148,6 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" void __register_global_object(); @@ -345,98 +346,6 @@ void daE_FK_c::initSwordSph() { SECTION_RODATA static f32 const lit_3951 = 400.0f; COMPILER_STRIP_GATE(0x806BB784, &lit_3951); -/* 806BB8D0-806BB8D4 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 806BB8D4-806BB8D8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 806BB8D8-806BB8DC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 806BB8DC-806BB8E0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 806BB8E0-806BB8E4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 806BB8E4-806BB8E8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 806BB8E8-806BB8EC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 806BB8EC-806BB8F0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 806BB8F0-806BB8F4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 806BB8F4-806BB8F8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 806BB8F8-806BB8FC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 806BB8FC-806BB900 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 806BB900-806BB904 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 806BB904-806BB908 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 806BB908-806BB90C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 806BB90C-806BB910 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 806BB90C 0001+00 data_806BB90C @1009 */ -/* 806BB90D 0003+00 data_806BB90D None */ -static u8 struct_806BB90C[4]; - /* 806BB910-806BB91C 000048 000C+00 0/1 0/0 0/0 .bss @3843 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 51e4d3e8921..ed2f0367341 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_fm.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -13,6 +15,62 @@ #include "f_op/f_op_msg_mng.h" #include "Z2AudioLib/Z2Instances.h" +class daE_FM_HIO_c : public JORReflexible { +public: + /* 804EF0EC */ daE_FM_HIO_c(); + + void genMessage(JORMContext*); + /* 804FA3D8 */ virtual ~daE_FM_HIO_c() {} + + /* 0x04 */ s8 no; + /* 0x08 */ f32 base_size; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ s16 field_0x34; + /* 0x36 */ s16 field_0x36; + /* 0x38 */ s16 field_0x38; + /* 0x3C */ f32 field_0x3c; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 chain_size; + /* 0x4C */ f32 field_0x4c; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5c; + /* 0x60 */ u8 field_0x60; + /* 0x61 */ u8 field_0x61; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6c; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; + /* 0x7C */ f32 field_0x7c; + /* 0x80 */ f32 field_0x80; + /* 0x84 */ f32 field_0x84; + /* 0x88 */ f32 field_0x88; + /* 0x8C */ f32 field_0x8c; + /* 0x90 */ f32 field_0x90; + /* 0x94 */ s16 field_0x94; + /* 0x96 */ s16 field_0x96; + /* 0x98 */ s16 field_0x98; + /* 0x9A */ s16 field_0x9a; + /* 0x9C */ s16 field_0x9c; + /* 0xA0 */ f32 field_0xa0; + /* 0xA4 */ f32 field_0xa4; + /* 0xA8 */ f32 field_0xa8; + /* 0xAC */ u8 field_0xac; +}; + enum E_FM_RES_FILE_ID { /* BCK */ /* 0x07 */ BCK_EF_FMATTACK_A = 7, @@ -112,8 +170,6 @@ enum daE_FM_TexAnm { TEXANM_DEMO_END02, }; -UNK_REL_DATA - /* 804EF0EC-804EF250 0000EC 0164+00 1/1 0/0 0/0 .text __ct__12daE_FM_HIO_cFv */ daE_FM_HIO_c::daE_FM_HIO_c() { no = -1; @@ -179,8 +235,6 @@ static void* s_fmobj_del(void* i_actor, void* i_data) { return NULL; } -UNK_REL_BSS; - /* 804FAE95 0003+00 data_804FAE95 None */ static u8 l_initHIO; diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index cfa9dbe398e..31291f2df31 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -3,6 +3,8 @@ * Enemy - Puppet */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_fs.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -12,10 +14,24 @@ #include "d/actor/d_a_npc_ks.h" #include "d/actor/d_a_player.h" #include "d/d_s_play.h" -UNK_REL_DATA #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +class daE_Fs_HIO_c { +public: + /* 806BBACC */ daE_Fs_HIO_c(); + /* 806BDF94 */ virtual ~daE_Fs_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mScale; + /* 0x0C */ f32 mAttackRange; + /* 0x10 */ f32 mAttackDistance; + /* 0x14 */ f32 mMoveSpeedRatio; + /* 0x18 */ f32 mDeleteRange; +}; + +STATIC_ASSERT(sizeof(daE_Fs_HIO_c) == 0x1C); + enum Animation { /* 0x4 */ ANM_APPEAR = 4, /* 0x5 */ ANM_ATTACK01, @@ -49,8 +65,6 @@ enum Joint { /* 0x14 */ JNT_FOOT_R, }; -UNK_REL_BSS - namespace { /* 806BE79C-806BE7A0 -00001 0004+00 1/1 0/0 0/0 .bss None */ diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp index 9199a7d7f6a..f62c3076616 100644 --- a/src/d/actor/d_a_e_fz.cpp +++ b/src/d/actor/d_a_e_fz.cpp @@ -1,12 +1,11 @@ /** - * @file d_a_obj_carry.cpp + * @file d_a_e_fz.cpp * @brief Enemy - Mini Freezard - * - * @details This should match in theory?? */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_fz.h" -UNK_REL_DATA #include "f_op/f_op_actor_enemy.h" #include "d/actor/d_a_mirror.h" #include "d/actor/d_a_b_yo.h" @@ -15,6 +14,30 @@ UNK_REL_DATA #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_xyz.h" +class daE_FZ_HIO_c { +public: + /* 806BE94C */ daE_FZ_HIO_c(); + /* 806C1440 */ virtual ~daE_FZ_HIO_c() {}; + +public: + /* 0x04 */ s8 field_0x04; + /* 0x05 */ u8 field_0x05[0x06 - 0x05]; + /* 0x06 */ s16 field_0x06; + /* 0x08 */ s16 field_0x08; + /* 0x0A */ u8 field_0x0A[0x0C - 0x0A]; + /* 0x0C */ f32 field_0x0c; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; +}; + namespace { /* 806C1A38-806C1A78 000038 0040+00 1/1 0/0 0/0 .data cc_fz_src__22@unnamed@d_a_e_fz_cpp@ diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp index f32af65aeae..879a2658fce 100644 --- a/src/d/actor/d_a_e_ga.cpp +++ b/src/d/actor/d_a_e_ga.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ga.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index 05021c29102..348a217d76c 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -3,10 +3,9 @@ * */ -#include "d/actor/d_a_e_gb.h" - -UNK_REL_DATA; +#include "d/dolzel_rel.h" +#include "d/actor/d_a_e_gb.h" #include "d/d_cc_d.h" #include "d/d_camera.h" #include "d/d_bomb.h" diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index 36dda8876a9..a6de69660ef 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -3,10 +3,11 @@ * Enemy - Guay */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ge.h" #include "d/d_cc_d.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" // diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index aa29dc41ec9..6892e38446c 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -3,12 +3,31 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_gi.h" #include "d/d_com_inf_game.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_GI_HIO_c : public JORReflexible { +public: + /* 806CD48C */ daE_GI_HIO_c(); + /* 806D098C */ virtual ~daE_GI_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 id; + /* 0x08 */ f32 model_size; + /* 0x0C */ f32 move_speed; + /* 0x10 */ f32 player_detect_range; + /* 0x14 */ f32 player_attack_range; + /* 0x18 */ f32 attack_angle; + /* 0x1C */ f32 link_stun_time; + /* 0x20 */ f32 wolf_stun_time; + /* 0x24 */ f32 scream_prevention_time; + /* 0x28 */ f32 lever_spin_time; +}; + enum daE_GI_ACTION_e { ACTION_SLEEP_e, ACTION_WAIT_e, diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index b65108852cb..4522796eb4e 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -3,9 +3,10 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_gm.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" @@ -772,99 +773,6 @@ void daE_GM_c::setAction(void (daE_GM_c::*param_0)()) { SECTION_RODATA static f32 const lit_4100 = -1.0f; COMPILER_STRIP_GATE(0x806D79E4, &lit_4100); -/* 806D7E78-806D7E7C 000008 0001+03 5/5 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 806D7E7C-806D7E80 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 806D7E80-806D7E84 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 806D7E84-806D7E88 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 806D7E88-806D7E8C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 806D7E8C-806D7E90 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 806D7E90-806D7E94 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 806D7E94-806D7E98 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 806D7E98-806D7E9C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 806D7E9C-806D7EA0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 806D7EA0-806D7EA4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 806D7EA4-806D7EA8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 806D7EA8-806D7EAC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 806D7EAC-806D7EB0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 806D7EB0-806D7EB4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 806D7EB4-806D7EB8 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 806D7EB8-806D7EC4 000048 000C+00 0/1 0/0 0/0 .bss @4050 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index 1d5f6bd8979..54b9be12b14 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_gob.h" #include "d/d_com_inf_game.h" #include "d/d_com_inf_actor.h" @@ -14,6 +16,23 @@ #include "c/c_damagereaction.h" #include "Z2AudioLib/Z2Instances.h" +class daE_GOB_HIO_c : public JORReflexible { +public: + /* 806D808C */ daE_GOB_HIO_c(); + + void genMessage(JORMContext*); + /* 806DECD0 */ virtual ~daE_GOB_HIO_c() {} + + /* 0x04 */ s8 id; + /* 0x08 */ f32 size; + /* 0x0C */ f32 normal_walk_speed; + /* 0x10 */ f32 battle_walk_speed; + /* 0x14 */ f32 roll_speed; + /* 0x18 */ s16 rotation_speed; + /* 0x1A */ s16 swing_time_a; + /* 0x1C */ s16 swing_time_b; +}; + enum E_gob_RES_file_ID { /* BCK */ /* 0x04 */ BCK_MG_ATTACK_A_A = 0x4, @@ -261,8 +280,6 @@ static void damage_check(e_gob_class* i_this) { } } -UNK_REL_BSS - /* 806DF2C4-806DF2C8 -00001 0004+00 2/2 0/0 0/0 .bss None */ /* 806DF2C5 0003+00 data_806DF2C5 None */ static u8 l_initHIO; diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index 14acc47bd35..773d57f5d84 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_gs.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index 1d6b22952c3..0f44222e8ec 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -3,10 +3,10 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_hb.h" #include "d/actor/d_a_e_hb_leaf.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" enum daE_HB_ACTION { @@ -21,6 +21,24 @@ enum daE_HB_ACTION { ACTION_DAMAGE }; +class daE_HB_HIO_c : public JORReflexible { +public: +#if DEBUG + virtual void genMessage(JORMContext*); +#endif + + /* 804FBD6C */ daE_HB_HIO_c(); + /* 805005D0 */ virtual ~daE_HB_HIO_c() {} + + /* 0x04 */ s8 id; + /* 0x08 */ f32 base_size; + /* 0x0C */ f32 flower_size; + /* 0x10 */ f32 appear_size; + /* 0x14 */ s16 roof_reappear_interval; + /* 0x16 */ s16 attack_freq; + /* 0x18 */ u8 bite_pattern; +}; + /* 804FBD6C-804FBDB8 0000EC 004C+00 1/1 0/0 0/0 .text __ct__12daE_HB_HIO_cFv */ daE_HB_HIO_c::daE_HB_HIO_c() { id = -1; diff --git a/src/d/actor/d_a_e_hb_leaf.cpp b/src/d/actor/d_a_e_hb_leaf.cpp index a882e9ec6f4..39a3721b55b 100644 --- a/src/d/actor/d_a_e_hb_leaf.cpp +++ b/src/d/actor/d_a_e_hb_leaf.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_hb_leaf.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index eea62227fc1..84898dc2c31 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -3,9 +3,10 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_hm.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" @@ -724,98 +725,6 @@ void daE_HM_c::UpDeathAction() { SECTION_RODATA static f32 const lit_4809 = 40.0f; COMPILER_STRIP_GATE(0x806E5A20, &lit_4809); -/* 806E5BD8-806E5BDC 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 806E5BDC-806E5BE0 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 806E5BE0-806E5BE4 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 806E5BE4-806E5BE8 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 806E5BE8-806E5BEC 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 806E5BEC-806E5BF0 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 806E5BF0-806E5BF4 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 806E5BF4-806E5BF8 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 806E5BF8-806E5BFC 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 806E5BFC-806E5C00 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 806E5C00-806E5C04 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 806E5C04-806E5C08 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 806E5C08-806E5C0C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 806E5C0C-806E5C10 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 806E5C10-806E5C14 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 806E5C14-806E5C18 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 806E5C14 0001+00 data_806E5C14 @1009 */ -/* 806E5C15 0003+00 data_806E5C15 None */ -static u8 struct_806E5C14[4]; - /* 806E5C18-806E5C24 000048 000C+00 0/1 0/0 0/0 .bss @3807 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 8fb33a95179..e9d36af0088 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -1,13 +1,13 @@ /** - * @file d_a_e_hp.cpp +* @file d_a_e_hp.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_hp.h" #include "d/actor/d_a_alink.h" #include "d/d_debug_viewer.h" -#include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" namespace { diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index a28af09eea3..0863fafd3aa 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -3,12 +3,13 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_hz.h" #include "d/d_cc_d.h" #include "dol2asm.h" #include "d/d_camera.h" #include "d/actor/d_a_obj_carry.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" @@ -483,98 +484,6 @@ SECTION_RODATA static f32 const lit_4115 = 500.0f; COMPILER_STRIP_GATE(0x806F08BC, &lit_4115); #pragma pop -/* 806F0B30-806F0B34 000008 0001+03 4/4 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 806F0B34-806F0B38 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B38-806F0B3C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B3C-806F0B40 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B40-806F0B44 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B44-806F0B48 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B48-806F0B4C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B4C-806F0B50 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B50-806F0B54 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B54-806F0B58 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B58-806F0B5C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B5C-806F0B60 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B60-806F0B64 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B64-806F0B68 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B68-806F0B6C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 806F0B6C-806F0B70 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 806F0B6C 0001+00 data_806F0B6C @1009 */ -/* 806F0B6D 0003+00 data_806F0B6D None */ -static u8 struct_806F0B6C[4]; - /* 806F0B70-806F0B7C 000048 000C+00 1/1 0/0 0/0 .bss @3982 */ static u8 lit_3982[12]; diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index 9df6899acb4..6744382a5ff 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_hzelda.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" @@ -95,8 +97,6 @@ enum hzelda_timer { TIMER_ATTACK_WAIT = 0, }; -UNK_REL_DATA - /* 806F0D4C-806F0D70 0000EC 0024+00 1/1 0/0 0/0 .text __ct__16daE_HZELDA_HIO_cFv */ daE_HZELDA_HIO_c::daE_HZELDA_HIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index 197a81921af..e90c1eb4af0 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_is.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -21,8 +23,6 @@ enum daE_IS_ACTION { ACTION_SEKIZOU = 100, }; -UNK_REL_DATA - /* 806F5A4C-806F5A94 0000EC 0048+00 1/1 0/0 0/0 .text __ct__12daE_IS_HIO_cFv */ daE_IS_HIO_c::daE_IS_HIO_c() { id = -1; diff --git a/src/d/actor/d_a_e_kg.cpp b/src/d/actor/d_a_e_kg.cpp index 02a699ade03..12a1ba6fbe1 100644 --- a/src/d/actor/d_a_e_kg.cpp +++ b/src/d/actor/d_a_e_kg.cpp @@ -3,11 +3,23 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_kg.h" #include "d/d_cc_d.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_KG_HIO_c { +public: + /* 806F7EEC */ daE_KG_HIO_c(); + /* 806F9EE8 */ virtual ~daE_KG_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mSize; + /* 0x0c */ f32 field_0xc; + /* 0x10 */ f32 mCheckRange; +}; + // NONMATCHING - weak function order /* 806F7EEC-806F7F24 0000EC 0038+00 1/1 0/0 0/0 .text __ct__12daE_KG_HIO_cFv */ diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index cfdc3f1057d..c13d3867ee3 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -1,16 +1,32 @@ /** - * @file d_a_e_kk.cpp +* @file d_a_e_kk.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_kk.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_KK_HIO_c : public JORReflexible { +public: + /* 806FA70C */ daE_KK_HIO_c(); + /* 806FF0F0 */ virtual ~daE_KK_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 model_size; + /* 0x0C */ f32 spear_throw_range; + /* 0x10 */ f32 direct_attack_range; + /* 0x14 */ f32 default_moving_range; + /* 0x18 */ s16 escape_time; + /* 0x1A */ u8 range_display; +}; + enum daE_KK_Action { ACTION_WAIT, ACTION_ICICLEWAIT, diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index 0e1111b0923..17cfa49444b 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -1,17 +1,95 @@ /** - * @file d_a_e_kr.cpp +* @file d_a_e_kr.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_kr.h" #include "d/actor/d_a_horse.h" #include "d/d_bomb.h" #include "d/d_cc_d.h" #include "d/d_cc_uty.h" +#include "f_op/f_op_actor_enemy.h" -UNK_REL_DATA; +class e_krHIO_c : public fOpAcm_HIO_entry_c { +public: + e_krHIO_c() { + field_0x4 = 0; + field_0x5 = 0; + field_0x8 = 20.0f; + field_0xc = 2500.0f; + field_0x14 = 1.0f; + field_0x18 = 2000; + field_0x1a = 2500; + field_0x1c = 2000; + field_0x1e = 2500; + field_0x20 = 0.35f; + field_0x24 = 0.5f; + field_0x28 = 1.0f; + field_0x2c = 1.0f; + field_0x30 = 1.0f; + field_0x38 = 1.0f; + field_0x3c = 1.0f; + field_0x40 = 30; + field_0x44 = 1.0f; + field_0x48 = 1.0f; + field_0x4c = 1.5f; + field_0x50 = 1100; + field_0x54 = 3.5f; + field_0x34 = 60; + field_0x58 = 60.0f; + field_0x5c = 40.0f; + field_0x60 = 1; + field_0x64 = 8000.0f; + field_0x70 = 3000.0f; + field_0x6c = 20000; + field_0x68 = 1500.0f; + field_0x74 = 2000.0f; + field_0x6e = 20000; + field_0x78 = -40.0f; + } + /* 80705574 */ virtual ~e_krHIO_c() {} + void genMessage(JORMContext*); + + /* 0x04 */ u8 field_0x4; + /* 0x05 */ u8 field_0x5; + /* 0x06 */ u8 field_0x6; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ u8 field_0x10[0x14 - 0x10]; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ s16 field_0x18; + /* 0x1A */ s16 field_0x1a; + /* 0x1C */ s16 field_0x1c; + /* 0x1E */ s16 field_0x1e; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ s16 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3c; + /* 0x40 */ s16 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4c; + /* 0x50 */ s16 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5c; + /* 0x60 */ s16 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ s16 field_0x6c; + /* 0x6E */ s16 field_0x6e; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; +}; -#include "f_op/f_op_actor_enemy.h" +STATIC_ASSERT(sizeof(e_krHIO_c) == 0x7c); /* 80705FF4-80706070 000014 007C+00 9/9 0/0 0/0 .bss l_e_krHIO */ static e_krHIO_c l_e_krHIO; diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index c51c23aeca0..dae460b693b 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_mb.h" #include "d/actor/d_a_b_bq.h" #include "d/d_com_inf_game.h" @@ -90,8 +92,6 @@ static int daE_MB_Draw(e_mb_class* i_this) { return 1; } -UNK_REL_BSS; - /* 80708C2D 0003+00 data_80708C2D None */ static u8 l_initHIO; diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index b8b0128ba34..b351886c4b6 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_md.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index 7f7c9f9a2bb..4126e6a0e15 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -3,16 +3,37 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_mf.h" #include "d/d_cc_d.h" #include "Z2AudioLib/Z2Instances.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" #include "d/d_bomb.h" #include "f_op/f_op_kankyo_mng.h" #include "d/actor/d_a_horse.h" #include "d/d_com_inf_game.h" +class daE_MF_HIO_c : public JORReflexible { +public: + /* 8070A70C */ daE_MF_HIO_c(); + /* 80713464 */ virtual ~daE_MF_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 model_size; // 基本サイズ + /* 0x0C */ f32 movement_speed; // 移動速度 + /* 0x10 */ f32 dash_speed; // 突進速度 + /* 0x14 */ f32 battle_init_range; // 戦闘開始範囲 + /* 0x18 */ f32 attack_init_range; // 攻撃開始範囲 + /* 0x1C */ s16 field_0x1c; // 防御静止間 + /* 0x1E */ s16 field_0x1e; // 魂抜間 弱 + /* 0x20 */ s16 field_0x20; // 魂抜間 強 + /* 0x22 */ u8 field_0x22; + /* 0x23 */ u8 invulnerable; // 不死身 +}; + enum Action { /* 0x00 */ ACTION_NORMAL = 0, /* 0x03 */ ACTION_FIGHT_RUN = 3, @@ -275,8 +296,6 @@ static BOOL other_bg_check2(e_mf_class* i_this, cXyz* param_2) { return FALSE; } -UNK_REL_BSS; - u8 l_initHIO; /* 80713F74-80713F98 000054 0024+00 9/10 0/0 0/0 .bss l_HIO */ diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 7b4abb8a2b9..203ee77d2cd 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_mk.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" @@ -17,8 +19,6 @@ #include "d/d_camera.h" #include "Z2AudioLib/Z2Instances.h" -UNK_REL_BSS; - /* 8071412C-8071417C 0000EC 0050+00 1/1 0/0 0/0 .text __ct__12daE_MK_HIO_cFv */ daE_MK_HIO_c::daE_MK_HIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_e_mk_bo.cpp b/src/d/actor/d_a_e_mk_bo.cpp index 1defd8b377b..909583c2f98 100644 --- a/src/d/actor/d_a_e_mk_bo.cpp +++ b/src/d/actor/d_a_e_mk_bo.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_mk_bo.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -125,9 +127,7 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -391,99 +391,6 @@ SECTION_RODATA static f32 const lit_4309 = 170.0f; COMPILER_STRIP_GATE(0x8071F6C4, &lit_4309); #pragma pop -/* 8071F820-8071F824 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8071F824-8071F828 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 8071F828-8071F82C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8071F82C-8071F830 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 8071F830-8071F834 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8071F834-8071F838 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 8071F838-8071F83C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8071F83C-8071F840 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 8071F840-8071F844 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8071F844-8071F848 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 8071F848-8071F84C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8071F84C-8071F850 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 8071F850-8071F854 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8071F854-8071F858 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 8071F858-8071F85C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 8071F85C-8071F860 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 8071F860-8071F870 000048 000C+04 0/1 0/0 0/0 .bss @4243 */ #pragma push #pragma force_active on @@ -519,24 +426,6 @@ SECTION_RODATA static f32 const lit_4580 = 100000.0f; COMPILER_STRIP_GATE(0x8071F6CC, &lit_4580); #pragma pop -/* 8071F6E0-8071F6EC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8071F6EC-8071F700 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8071F700-8071F708 000020 0008+00 0/1 0/0 0/0 .data bo_eno_1$4378 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index ce9cbc49054..8073b360aae 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -3,10 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_mm.h" #include "d/d_cc_d.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" diff --git a/src/d/actor/d_a_e_mm_mt.cpp b/src/d/actor/d_a_e_mm_mt.cpp index 74d4e58f2b6..19f887e18a8 100644 --- a/src/d/actor/d_a_e_mm_mt.cpp +++ b/src/d/actor/d_a_e_mm_mt.cpp @@ -3,10 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_mm_mt.h" #include "d/d_cc_d.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index f8aca8d1e70..737fe66cedd 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -1,18 +1,31 @@ /** - * @file d_a_e_ms.cpp +* @file d_a_e_ms.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ms.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_obj_carry.h" #include "f_op/f_op_kankyo_mng.h" #include "d/d_s_play.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" -UNK_REL_BSS; +class daE_MS_HIO_c : public JORReflexible { +public: + /* 80725B8C */ daE_MS_HIO_c(); + /* 8072900C */ virtual ~daE_MS_HIO_c() {}; + + void genMessage(JORMContext*); + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mScale; + /* 0x0C */ f32 mTargetSpeed1; + /* 0x10 */ f32 mSpeedF; + /* 0x14 */ f32 mTargetSpeed2; + /* 0x18 */ f32 mPlayerDistanceLimit; +}; /* 80725B8C-80725BD4 0000EC 0048+00 1/1 0/0 0/0 .text __ct__12daE_MS_HIO_cFv */ daE_MS_HIO_c::daE_MS_HIO_c() { diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 83a2fdc99d0..ef5cdda90c4 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -3,6 +3,8 @@ * Enemy - Beehive */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_nest.h" #include "d/actor/d_a_npc_tk.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index 269bf050a74..07b7a9b07cc 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -3,14 +3,31 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_nz.h" -UNK_REL_DATA; #include "c/c_damagereaction.h" #include "d/d_cc_d.h" #include "dol2asm.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_actor_enemy.h" +class daE_NZ_HIO_c : public JORReflexible { +public: + /* 807299EC */ daE_NZ_HIO_c(); + /* 8072BC88 */ virtual ~daE_NZ_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 mId; + /* 0x08 */ f32 mBasicSize; + /* 0x0C */ f32 mSpeed; + /* 0x10 */ f32 mAttackSpeed; + /* 0x14 */ s16 mWaitTime; + /* 0x18 */ f32 mCurrentAlphaSpeed; + /* 0x1C */ f32 mVanishingAlphaSpeed; +}; + enum Action { ACTION_NORMAL, ACTION_ATTACK, @@ -121,8 +138,6 @@ static int daE_NZ_Draw(e_nz_class* i_this) { return 1; } -UNK_REL_BSS - bool l_HIOInit; /* 8072C434-8072C454 000054 0020+00 5/6 0/0 0/0 .bss l_HIO */ diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index c2f9a39af09..6a65e5e198c 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_oc.h" #include "d/d_camera.h" #include "Z2AudioLib/Z2Instances.h" @@ -10,9 +12,24 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_obj_rotBridge.h" #include "d/d_cc_uty.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_OC_HIO_c { +public: + /* 8072C5CC */ daE_OC_HIO_c(); + /* 80735630 */ virtual ~daE_OC_HIO_c() {} + + /* 0x04 */ s8 field_0x04; + /* 0x05 */ u8 field_0x05; + /* 0x08 */ f32 field_0x08; + /* 0x0c */ f32 field_0x0c; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1c */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; +}; // // Declarations: @@ -132,23 +149,6 @@ static void daE_OC_Draw(daE_OC_c* i_this) { i_this->draw(); } -UNK_BSS(1109); -UNK_BSS(1107); -UNK_BSS(1105); -UNK_BSS(1104); -UNK_BSS(1099); -UNK_BSS(1097); -UNK_BSS(1095); -UNK_BSS(1094); -UNK_BSS(1057); -UNK_BSS(1055); -UNK_BSS(1053); -UNK_BSS(1052); -UNK_BSS(1014); -UNK_BSS(1012); -UNK_BSS(1010); -UNK_BSS(1009); - /* 80736040-80736044 000048 0004+00 0/2 0/0 0/0 .bss m_battle_oc__6E_OC_n */ daE_OC_c* E_OC_n::m_battle_oc; diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index 74ce2928d65..56799f606d7 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -1,26 +1,10 @@ // // d_a_e_oct_bg // -#include "dolphin/types.h" -// Needs to be declared before checkNormalAttk -/* 80739E54-80739E60 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +#include "d/dolzel_rel.h" -/* 80739E60-80739E74 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop +#include "dolphin/types.h" #include "d/actor/d_a_e_oct_bg.h" #include "f_op/f_op_actor_mng.h" @@ -179,97 +163,8 @@ void daE_OctBg_c::action() { } } -/* 8073A100-8073A104 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8073A104-8073A108 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 8073A108-8073A10C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8073A10C-8073A110 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 8073A110-8073A114 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8073A114-8073A118 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 8073A118-8073A11C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8073A11C-8073A120 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 8073A120-8073A124 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8073A124-8073A128 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 8073A128-8073A12C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8073A12C-8073A130 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 8073A130-8073A134 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8073A134-8073A138 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 8073A138-8073A13C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - /* 8073A13C-8073A140 -00001 0004+00 1/2 0/0 0/0 .bss None */ -/* 8073A13C 0001+00 data_8073A13C @1009 */ /* 8073A13D 0003+00 data_8073A13D None */ -static u8 struct_8073A13C; static u8 struct_8073A13D; /* 80736840-807368A8 000720 0068+00 1/1 0/0 0/0 .text _delete__11daE_OctBg_cFv */ diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index 77b2de42e87..e8ade10a7a9 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -3,11 +3,26 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ot.h" #include "Z2AudioLib/Z2Instances.h" -UNK_REL_DATA #include "f_op/f_op_actor_enemy.h" +class daE_OT_HIO_c { +public: + /* 8073A2CC */ daE_OT_HIO_c(); + /* 8073C9B0 */ virtual ~daE_OT_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mAttackSpeed; + /* 0x0C */ f32 mHeartDropRate; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; +}; + enum Animation { /* 0x6 */ ANM_BORN = 6, /* 0x7 */ ANM_DAMAGE, @@ -79,26 +94,8 @@ static dCcD_SrcSph cc_ot_at_src = { } // namespace -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) - /* 8073D2AC-8073D2B0 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 8073D2AC 0001+00 data_8073D2AC @1009 */ /* 8073D2AD 0003+00 data_8073D2AD None */ -static u8 data_8073D2AC; static bool hioInit; /* 8073D2BC-8073D2DC 000054 0020+00 4/4 0/0 0/0 .bss l_HIO */ diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index 2915273c2a6..cc9e703b1aa 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -3,6 +3,8 @@ * Peahat Enemy */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ph.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index c93459828f3..1efbb487cb7 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -3,6 +3,8 @@ * Enemy - Skull Kid */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_pm.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" @@ -14,9 +16,40 @@ #include "d/actor/d_a_e_fs.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_obj_smw_stone.h" -UNK_REL_DATA #include "f_op/f_op_actor_enemy.h" +class daE_PM_HIO_c { +public: + /* 80741EEC */ daE_PM_HIO_c(); + /* 8074BA68 */ virtual ~daE_PM_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mLampParticleScale; + /* 0x0C */ f32 mGlowEffectScale; + /* 0x10 */ f32 mEscapeRange; + /* 0x14 */ s16 mGlowColor1R; + /* 0x16 */ s16 mGlowColor1G; + /* 0x18 */ s16 mGlowColor1B; + /* 0x1A */ s16 mGlowColor2R; + /* 0x1C */ s16 mGlowColor2G; + /* 0x1E */ s16 mGlowColor2B; + /* 0x20 */ s16 mGlowColor1A; + /* 0x22 */ s16 mBossEscapeTimer; + /* 0x24 */ s16 field_0x24; + /* 0x26 */ s16 mAdditionalPuppetNum; + /* 0x28 */ f32 mCreateTimer; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 mBossLightR; + /* 0x3C */ f32 mBossLightG; + /* 0x40 */ f32 mBossLightB; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; +}; + +STATIC_ASSERT(sizeof(daE_PM_HIO_c) == 0x4C); + enum Action { /* 0x0 */ ACT_START, /* 0x1 */ ACT_WAIT, @@ -78,27 +111,9 @@ enum Joint { /* 0x19 */ JNT_FOOT_R, /* 0x1A */ JNT_SKIRT, }; - -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) /* 8074C384-8074C388 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 8074C384 0001+00 data_8074C384 @1009 */ /* 8074C385 0003+00 data_8074C385 None */ -static u8 struct_8074C384; static bool hioInit; /* 8074C394-8074C3E0 000054 004C+00 11/13 0/0 0/0 .bss l_HIO */ @@ -274,6 +289,10 @@ void daE_PM_c::SetAnm(int i_anm, int i_attr, f32 i_morf, f32 i_rate) { mAnm = i_anm; } +static void dummy() { + delete (cM3dGPla*)NULL; +} + /* 80742768-80742810 000968 00A8+00 2/2 0/0 0/0 .text way_bg_check2__FP8daE_PM_c4cXyz4cXyz */ static BOOL way_bg_check2(daE_PM_c* i_this, cXyz i_start, cXyz i_end) { dBgS_LinChk lin_chk; @@ -326,10 +345,13 @@ void daE_PM_c::SearchFarP() { f32 best_distance; int best_index; dPnt* pnt = dPath_GetPnt(mpPath, 0); - cXyz point(pnt->m_position.x, pnt->m_position.y, pnt->m_position.z); + Vec pos; + pos = pnt->m_position; + cXyz point(pos.x, pos.y, pos.z); for (int i = 0; i < mpPath->m_num; i++) { pnt = dPath_GetPnt(mpPath, i); - point.set(pnt->m_position.x, pnt->m_position.y, pnt->m_position.z); + pos = pnt->m_position; + point.set(pos.x, pos.y, pos.z); if (s_LinkPos->absXZ(point) > best_distance && mPointIndex != i) { best_index = i; best_distance = s_LinkPos->absXZ(point); @@ -2386,6 +2408,7 @@ void daE_PM_c::DamageAction() { /* 8074A210-8074A3DC 008410 01CC+00 1/1 0/0 0/0 .text At_Check__8daE_PM_cFv */ // NONMATCHING regalloc void daE_PM_c::At_Check() { + fopAc_ac_c* player = dComIfGp_getPlayer(0); mAtInfo.mpCollider = mCcCyl.GetTgHitObj(); mAtInfo.mpActor = at_power_check(&mAtInfo); @@ -2394,12 +2417,11 @@ void daE_PM_c::At_Check() { mAtInfo.mAttackPower = 0; } - s16 attack_power = mAtInfo.mAttackPower; - if (attack_power > 0) { - health -= attack_power; + if ((s16)mAtInfo.mAttackPower > 0) { + health -= (s16)mAtInfo.mAttackPower; } - u32 pause_timer; + u32 pause_timer = 0; if (mAtInfo.mAttackPower != 0 && health <= l_HIO.field_0x34) { mAtInfo.mHitStatus = 2; pause_timer = 5; @@ -2413,7 +2435,8 @@ void daE_PM_c::At_Check() { pause_timer = 0; } - u8 sound = ((dCcD_GObjInf*)mAtInfo.mpCollider)->GetAtSe(); + dCcD_GObjInf* collider = (dCcD_GObjInf*)mAtInfo.mpCollider; + u32 sound = collider->GetAtSe(); u32 var1 = 30; if (mAtInfo.mHitStatus == 1) { var1 = 31; @@ -2423,7 +2446,7 @@ void daE_PM_c::At_Check() { if (mAtInfo.mpSound != NULL) { if (mAtInfo.field_0x18 != 0) { - mAtInfo.mpSound->startCollisionSE(dCcD_GObjInf::getHitSeID(sound, FALSE), var1); + mAtInfo.mpSound->startCollisionSE(dCcD_GObjInf::getHitSeID(sound, FALSE), mAtInfo.field_0x18); } else { mAtInfo.mpSound->startCollisionSE(dCcD_GObjInf::getHitSeID(sound, FALSE), var1); } diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 518fdd88200..53d0d0a1a7c 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -1,20 +1,18 @@ /** - * @file d_a_e_po.cpp +* @file d_a_e_po.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_po.h" #include "d/actor/d_a_obj_poFire.h" #include "d/d_cc_d.h" #include "d/d_cc_uty.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" /* ############################################################################################## */ -static u8 padding[0x3C]; // Padding to align .bss - /* 80757ADA-80757ADC 000036 0002+00 6/7 0/0 0/0 .data mAttackNo */ static s16 mAttackNo = 3; diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index ef3d44cc0ed..d990573cc94 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_pz.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -10,10 +12,24 @@ #include "d/d_s_play.h" #include "c/c_damagereaction.h" #include "Z2AudioLib/Z2Instances.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_PZ_HIO_c : public JORReflexible { +public: + /* 8075856C */ daE_PZ_HIO_c(); + /* 80760C60 */ virtual ~daE_PZ_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 no; + /* 0x08 */ f32 body_model_size; + /* 0x0C */ f32 portal_model_size; + /* 0x10 */ f32 bullet_speed; + /* 0x14 */ f32 weapon_hit_warp_speed; + /* 0x18 */ s16 after_attack_wait_time; + /* 0x1A */ s16 blur_start_timing; +}; + namespace { /* 807617F4-80761838 000038 0044+00 0/1 0/0 0/0 .data cc_pz_src__22@unnamed@d_a_e_pz_cpp@ */ @@ -175,8 +191,6 @@ void daE_PZ_c::mEntrySUB(bool param_0) { } } -UNK_REL_BSS; - /* 80761DFD 0003+00 l_initHIO None */ static u8 l_initHIO; diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index cb1f6d3cb66..1ccb43385a7 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -3,12 +3,26 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_rb.h" #include "d/d_com_inf_game.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_RB_HIO_c : public JORReflexible { +public: + /* 8076238C */ daE_RB_HIO_c(); + /* 80764838 */ virtual ~daE_RB_HIO_c() {} + +#if DEBUG + void genMessage(JORMContext*); +#endif + + /* 0x4 */ s8 id; + /* 0x8 */ f32 base_size; + /* 0xC */ f32 ground_depth; +}; + enum daE_RB_ACTION { ACTION_STAY, ACTION_APPEAR, @@ -829,9 +843,9 @@ static int daE_RB_Create(fopAc_ac_c* i_this) { if (!l_HIOInit) { a_this->HIOInit = TRUE; l_HIOInit = TRUE; - //l_HIO.id = mDoHIO_CREATE_CHILD("リーバ", &l_HIO); + l_HIO.id = mDoHIO_CREATE_CHILD("リーバ", &l_HIO); } - + i_this->attention_info.flags = 4; fopAcM_SetMtx(i_this, a_this->modelMorf->getModel()->getBaseTRMtx()); i_this->health = 1; diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index f31360819d9..759720fb021 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_rd.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" @@ -20,11 +22,47 @@ #include "d/actor/d_a_e_arrow.h" #include "d/actor/d_a_npc_tk.h" #include "Z2AudioLib/Z2Instances.h" - -UNK_REL_DATA; - #include "f_op/f_op_actor_enemy.h" +class daE_RD_HIO_c : public JORReflexible { +public: + /* 80504A6C */ daE_RD_HIO_c(); + /* 8051801C */ virtual ~daE_RD_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x00 */ s8 field_0x4; + + /* ライダー (Rider) */ + /* 0x08 */ f32 model_size; // 基本サイズ (Basic size) + /* 0x0C */ f32 field_0xc; // リーダーサイズ比 (Leader size ratio) + /* 0x10 */ f32 movement_speed; // 移動速度 (Movement speed) + + /* こん棒兵の場合 (In the case of the club soldier) */ + /* 0x14 */ f32 dash_speed; // 突進速度 (Rush speed) + /* 0x18 */ f32 battle_init_range; // 戦闘開始範囲 (Battle starting range) + /* 0x1C */ f32 attack_init_range; // 攻撃開始範囲 (Attack starting range) + /* 0x20 */ f32 swing_speed; // 振り速さ (Swing speed) + + /* 矢兵の場合 (In the case of arrow soldiers) */ + /* 0x24 */ s16 field_0x24; // 号令→構えの間 (Command → Preparation) + /* 0x26 */ u8 padding[2]; + /* 0x28 */ f32 attack_range; // 攻撃範囲 (Attack range) + /* 0x2C */ f32 mounted_launch_distance; // 騎乗発射距離 (Mounted launch distance) + /* 0x30 */ f32 wolf_falling_power_y; // 狼倒れ力Y (Wolf falling power Y) + /* 0x34 */ f32 wolf_falling_power_z; // 狼倒れ力Z (Wolf falling power Z) + + /* 0x38 */ u8 field_0x38; + /* 0x39 */ u8 invulnerable; // 不死身 (Invulnerability) + /* 0x3A */ u8 eye_polygon; // 目ポリゴン (Eye polygon) + /* 0x3B */ u8 one_hit_kill; // 一撃必殺 (One hit kill) + /* 0x3C */ f32 field_0x3c; // 一騎（ダ）サイズ (One-man army (Da) size) + /* 0x40 */ f32 jump_g; // 飛びＧ (Jump G) + /* 0x44 */ f32 jump_z; // 飛びＺ (Jump Z) + /* 0x48 */ f32 field_0x48; // 飛びＺ（騎乗停止） (Jump Z (Stop riding)) + /* 0x4C */ f32 jump_y; // 飛びＹ (Jump Y) +}; + enum E_RD_RES_FILE_ID { /* BCK */ /* 0x04 */ BCK_RD_ARMAMENT = 4, @@ -551,8 +589,6 @@ static BOOL pl_pass_check(e_rd_class* i_this, f32 param_2) { return FALSE; } -UNK_REL_BSS; - /* 80519180-80519184 000048 0004+00 2/3 0/0 0/0 .bss boss */ static e_rd_class* boss; @@ -5678,7 +5714,7 @@ static void demo_camera(e_rd_class* i_this) { s16 sVar1 = 0; switch (i_this->mDemoMode + 1) { - case 1: + case 2: if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -5696,7 +5732,7 @@ static void demo_camera(e_rd_class* i_this) { i_this->field_0x1300 = 2000.0f; a_this->current.angle.y = i_this->mPlayerAngleY; // fallthrough - case 2: + case 3: if (i_this->field_0x12a6 < 85) { mDoMtx_stack_c::YrotS(a_this->current.angle.y); mDoMtx_stack_c::XrotM(0x640); @@ -5739,7 +5775,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 10: + case 11: if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -5759,7 +5795,7 @@ static void demo_camera(e_rd_class* i_this) { a_this->current.angle.y = i_this->mPlayerAngleY; i_this->field_0x1300 = 2000.0f; // fallthrough - case 11: + case 12: mDoMtx_stack_c::YrotS(a_this->current.angle.y); mDoMtx_stack_c::XrotM(0x640); sp38.x = 0.0f; @@ -5788,14 +5824,14 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 19: + case 20: if (player->getClothesChangeWaitTimer() == 0) { i_this->mDemoMode = 21; i_this->field_0x12a6 = 0; } break; - case 20: + case 21: if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -5823,7 +5859,7 @@ static void demo_camera(e_rd_class* i_this) { i_this->mDemoMode = 19; } // fallthrough - case 21: + case 22: daPy_getPlayerActorClass()->setPlayerPosAndAngle(&i_this->field_0x12f0, player->shape_angle.y, 0); if (i_this->mDemoMode != 19) { @@ -5867,7 +5903,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 22: + case 23: cam_3d_morf(i_this, BREG_F(17) + 0.2f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.15f, 1.0f, BREG_F(17) + 0.005f); cLib_addCalc2(&i_this->mDemoCamFovy, 55.0f, 0.1f, 0.5f); @@ -5889,7 +5925,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 23: + case 24: i_this->field_0x9a4 = 1; if (i_this->field_0x12a6 == 20) { @@ -5919,7 +5955,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 24: + case 25: i_this->field_0x9a4 = 1; i_this->field_0x980 = 0.0f; @@ -5955,7 +5991,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 25: + case 26: if (i_this->field_0x12a6 == 40) { mDoGph_gInf_c::fadeIn(0.5f, g_blackColor); i_this->mDemoCamFovy = 55.0f; @@ -5974,7 +6010,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 26: + case 27: cam_3d_morf(i_this, BREG_F(17) + 0.2f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.5f, 1.0f, BREG_F(17) + 0.01f); @@ -5989,7 +6025,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 27: + case 28: fpcM_Search(s_lv9rd_sub3, i_this); if (i_this->field_0x12a6 == 40) { @@ -6033,7 +6069,7 @@ static void demo_camera(e_rd_class* i_this) { i_this->field_0x12c0.set(-5058.0f, 2181.0f, 5124.0f); cam_spd_set(i_this); // fallthrough - case 28: + case 29: if (i_this->field_0x12a6 == 1) { player->changeDemoMode(20, 0, 0, 0); } @@ -6077,7 +6113,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 29: + case 30: i_this->mDemoCamFovy = 55.0f; i_this->mDemoCamEye.set(-3963.0f, 147.0f, 8094.0f); sp5c = a_hwk->current.pos; @@ -6099,7 +6135,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 30: + case 31: cam_3d_morf(i_this, BREG_F(17) + 0.1f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.1f, 1.0f, BREG_F(17) + 0.002f); @@ -6116,7 +6152,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 31: + case 32: cam_3d_morf(i_this, BREG_F(17) + 0.05f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.05f, 1.0f, BREG_F(17) + 0.001f); @@ -6129,7 +6165,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 32: + case 33: if (i_this->field_0x12a6 == 60) { i_this->mDemoCamCenter.set(-3906.0f, 42.0f, 8198.0f); i_this->mDemoCamEye.set(-4274.0f, 272.0f, 7969.0f); @@ -6139,7 +6175,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 33: + case 34: if (i_this->field_0x12a6 == 65) { daPy_getPlayerActorClass()->changeDemoMode(60, 1, 0, 0); } @@ -6153,7 +6189,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 34: + case 35: cLib_addCalc2(&i_this->mDemoCamFovy, 40.0f, 0.05f, 0.02f); if (i_this->field_0x12a6 == 80) { i_this->mDemoCamCenter.set(-4712.0f, 870.0f, 7432.0f); @@ -6165,7 +6201,7 @@ static void demo_camera(e_rd_class* i_this) { } break; - case 35: + case 36: if (i_this->field_0x12a6 == 120) { bVar1 = true; int swBit = (fopAcM_GetParam(a_this) & 0xFF000000) >> 24; @@ -6174,9 +6210,6 @@ static void demo_camera(e_rd_class* i_this) { } } break; - - case 36: - break; } if (bVar1) { diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index 6469066a895..b4db48df4d4 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_e_rdb.cpp +* @file d_a_e_rdb.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_rdb.h" #include "Z2AudioLib/Z2Instances.h" #include "c/c_damagereaction.h" @@ -10,10 +12,17 @@ #include "d/actor/d_a_e_wb.h" #include "d/d_msg_object.h" #include "m_Do/m_Do_graphic.h" +#include "f_op/f_op_actor_enemy.h" -UNK_REL_DATA; +class daE_RDB_HIO_c : public JORReflexible { +public: + /* 807650CC */ daE_RDB_HIO_c(); + /* 8076AF64 */ virtual ~daE_RDB_HIO_c() {}; -#include "f_op/f_op_actor_enemy.h" + void genMessage(JORMContext*); + /* 0x04 */ s8 mID; + /* 0x08 */ f32 field_0x8; +}; enum Action { /* 0x00 */ ACTION_START, @@ -888,8 +897,6 @@ static void* shot_s_sub(void* i_actor, void* i_data) { return NULL; } -UNK_REL_BSS; - /* 8076BA04-8076BA08 -00001 0004+00 2/2 0/0 0/0 .bss None */ static u8 s_HIOinit; @@ -1934,6 +1941,8 @@ static int daE_RDB_Create(fopAc_ac_c* actor) { return phase; } +static s32 unused_bss_29c = 0; + AUDIO_INSTANCES /* 8076B8F4-8076B914 -00001 0020+00 1/0 0/0 0/0 .data l_daE_RDB_Method */ diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index a636fdf9b9d..2a9fb25a7c8 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_rdy.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_e_arrow.h" @@ -14,12 +16,42 @@ #include "d/d_msg_object.h" #include "d/d_camera.h" #include "f_op/f_op_kankyo_mng.h" -#if VERSION != VERSION_SHIELD_DEBUG -UNK_REL_DATA; -#endif #include "f_op/f_op_actor_enemy.h" #include "m_Do/m_Do_graphic.h" +class daE_RDY_HIO_c : public JORReflexible { +public: + /* 8076BDCC */ daE_RDY_HIO_c(); + /* 80779880 */ virtual ~daE_RDY_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mScale; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 mWalkSpeed; + /* 0x14 */ f32 mRunSpeed; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 mAttackAnmSpeed; + /* 0x24 */ s16 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ u8 field_0x38; + /* 0x39 */ u8 field_0x39; + /* 0x3A */ u8 mDrawEyeModel; + /* 0x3B */ u8 field_0x3b; + /* 0x3C */ f32 field_0x3c; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4c; +}; + +STATIC_ASSERT(sizeof(daE_RDY_HIO_c) == 0x50); + enum Action { /* 0x00 */ ACT_NORMAL, /* 0x03 */ ACT_FIGHT_RUN = 3, @@ -158,25 +190,6 @@ enum Joint { /* 4 */ WEAPON_BOW_BOMB, }; -#if VERSION != VERSION_SHIELD_DEBUG -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) -#endif - /* 8077A870-8077A874 000048 0004+00 1/1 0/0 0/0 .bss boss */ static e_rdy_class* boss; diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index 3e4125146f4..88e2dd88a8a 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_e_s1.cpp +* @file d_a_e_s1.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_s1.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" @@ -10,11 +12,27 @@ #include "d/d_com_inf_game.h" #include "d/d_path.h" #include "d/d_s_play.h" - -UNK_REL_DATA - #include "f_op/f_op_actor_enemy.h" +class daE_S1_HIO_c { +public: + /* 8077AB8C */ daE_S1_HIO_c(); + /* 80780840 */ virtual ~daE_S1_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mBaseSize; + /* 0x0C */ f32 mMoveSpeed; + /* 0x10 */ u8 field_0x10[0x14 - 0x10]; + /* 0x14 */ f32 mDashSpeed; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ s16 mFallSEWaitTime; + /* 0x1E */ s16 mAllDeadWaitTime; + /* 0x20 */ f32 mReactionDist; + /* 0x24 */ f32 mReactionAngle; + /* 0x28 */ s16 mReactionTime; + /* 0x2A */ u8 mInvincible; +}; + #define ANM_ATTACK 5 #define ANM_ATTACK_02 6 #define ANM_DAMAGED 7 @@ -142,23 +160,6 @@ static BOOL pl_at_check(e_s1_class* i_this, f32 i_check_range) { return fopAcM_searchPlayerDistance(i_this) < i_check_range; } -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) - -static u8 data_8078137c; static u8 l_no_fail; // when enabled, enemy will never revive after defeated static u8 l_initHIO; diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index c4f4cf7cdda..53f60476bd9 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_sb.h" #include "d/actor/d_a_e_bg.h" #include "d/actor/d_a_player.h" @@ -263,8 +265,6 @@ static void* s_bomb_sub(void* arg0, void* arg1) { return NULL; } -UNK_REL_BSS; - static u8 l_HIOInit; /* 80784F84-80784FC4 000054 0040+00 14/16 0/0 0/0 .bss l_HIO */ diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index b8404751941..cda8c66a1de 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -3,11 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_sf.h" #include "d/d_cc_d.h" #include "dol2asm.h" #include "d/d_camera.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" @@ -579,98 +580,6 @@ SECTION_RODATA static f32 const lit_4239 = 2000.0f; COMPILER_STRIP_GATE(0x80789C9C, &lit_4239); #pragma pop -/* 8078A030-8078A034 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8078A034-8078A038 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 8078A038-8078A03C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8078A03C-8078A040 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 8078A040-8078A044 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8078A044-8078A048 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 8078A048-8078A04C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8078A04C-8078A050 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 8078A050-8078A054 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8078A054-8078A058 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 8078A058-8078A05C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8078A05C-8078A060 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 8078A060-8078A064 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8078A064-8078A068 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 8078A068-8078A06C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 8078A06C-8078A070 -00001 0004+00 1/2 0/0 0/0 .bss None */ -/* 8078A06C 0001+00 data_8078A06C @1009 */ -/* 8078A06D 0003+00 data_8078A06D None */ -static u8 struct_8078A06C[4]; - /* 8078A070-8078A07C 000048 000C+00 1/1 0/0 0/0 .bss @3924 */ static u8 lit_3924[12]; diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp index 7cf99c50b84..77ddb0459e8 100644 --- a/src/d/actor/d_a_e_sg.cpp +++ b/src/d/actor/d_a_e_sg.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_e_sg.cpp +* @file d_a_e_sg.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_sg.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_mg_rod.h" @@ -107,9 +109,6 @@ static int daE_SG_Draw(e_sg_class* i_this) { return 1; } -/* 8078E0A0-8078E0DC 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ -UNK_REL_BSS; - /* 8078E0DC-8078E0E0 -00001 0004+00 2/2 0/0 0/0 .bss None */ static bool hio_init; diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index d627963554a..8cbddfbc462 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -3,10 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_sh.h" #include "d/d_cc_d.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index 62aa8138ca7..803f612d991 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -3,11 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_sm.h" #include "d/d_cc_d.h" #include "dol2asm.h" #include "d/d_camera.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" @@ -676,98 +677,6 @@ SECTION_RODATA static f32 const lit_4547 = 1.0f / 5.0f; COMPILER_STRIP_GATE(0x807986A0, &lit_4547); #pragma pop -/* 80798980-80798984 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80798984-80798988 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80798988-8079898C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8079898C-80798990 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80798990-80798994 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80798994-80798998 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80798998-8079899C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8079899C-807989A0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 807989A0-807989A4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 807989A4-807989A8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 807989A8-807989AC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 807989AC-807989B0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 807989B0-807989B4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 807989B4-807989B8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 807989B8-807989BC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 807989BC-807989C0 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 807989BC 0001+00 data_807989BC @1009 */ -/* 807989BD 0003+00 data_807989BD None */ -static u8 struct_807989BC[4]; - /* 807989C0-807989CC 000048 000C+00 1/1 0/0 0/0 .bss @3936 */ static u8 lit_3936[12]; diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index a956a0d6ed7..4ffa63377b0 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -3,16 +3,31 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_sm2.h" #include "d/d_item.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_kankyo_mng.h" #include "SSystem/SComponent/c_counter.h" -#include "dol2asm.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_SM2_HIO_c : public fOpAcm_HIO_entry_c { +public: + /* 80798B4C */ daE_SM2_HIO_c(); + /* 8079CE94 */ virtual ~daE_SM2_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s16 unk_0x4; + /* 0x06 */ u8 merge_OFF; + /* 0x07 */ u8 unk_0x7; + /* 0x08 */ u8 color_debug_ON; + /* 0x0A */ s16 color_debug_R; + /* 0x0C */ s16 color_debug_G; + /* 0x0E */ s16 color_debug_B; +}; + /* 80798B4C-80798BA4 0000EC 0058+00 1/1 0/0 0/0 .text __ct__13daE_SM2_HIO_cFv */ daE_SM2_HIO_c::daE_SM2_HIO_c() { unk_0x4 = 4; @@ -196,8 +211,6 @@ static BOOL pl_check(e_sm2_class* i_this, f32 i_range) { } } -UNK_REL_BSS - /* 8079DBD4-8079DBE4 000054 0010+00 3/4 0/0 0/0 .bss l_HIO */ static daE_SM2_HIO_c l_HIO; diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index 61001ff67a4..0a64d03902e 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -3,10 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_st.h" #include "d/d_cc_d.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" @@ -601,99 +602,6 @@ SECTION_RODATA static f32 const lit_4090 = 700.0f; COMPILER_STRIP_GATE(0x807A6870, &lit_4090); #pragma pop -/* 807A6DA0-807A6DA4 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 807A6DA4-807A6DA8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DA8-807A6DAC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DAC-807A6DB0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DB0-807A6DB4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DB4-807A6DB8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DB8-807A6DBC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DBC-807A6DC0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DC0-807A6DC4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DC4-807A6DC8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DC8-807A6DCC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DCC-807A6DD0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DD0-807A6DD4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DD4-807A6DD8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DD8-807A6DDC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 807A6DDC-807A6DE0 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 807A6DE0-807A6DE4 000048 0004+00 9/10 0/0 0/0 .bss small */ static u8 small[4]; diff --git a/src/d/actor/d_a_e_st_line.cpp b/src/d/actor/d_a_e_st_line.cpp index 744e3ffbfd7..44ca08a6bb2 100644 --- a/src/d/actor/d_a_e_st_line.cpp +++ b/src/d/actor/d_a_e_st_line.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_st_line.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 7c98d479812..20160cef011 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -3,13 +3,30 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_sw.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" #include "d/d_bomb.h" #include #include "Z2AudioLib/Z2Instances.h" +class daE_SW_HIO_c { +public: + /* サンドワーム (Sandworm) */ + /* 807A740C */ daE_SW_HIO_c(); + /* 807AF870 */ virtual ~daE_SW_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 basic_size; // 基本サイズ (Basic Size) + /* 0x0C */ f32 bomb_notice_dist; // 爆弾認識距離 (Bomb Recognition Distance) + /* 0x10 */ f32 bomb_attack_start_range; // 爆弾攻撃開始範囲 (Bomb Attack Start Range) + /* 0x14 */ f32 human_attack_init_range; // 人用攻撃開始範囲 (Human Attack Initiation Range) + /* 0x18 */ f32 horse_attack_init_range; // 馬用攻撃開始範囲 (Horse Attack Initiation Range) + /* 0x1C */ f32 character_notice_dist; // 人認識距離(ダンジョン用) (Character Recognition Distance (For Dungeon)) + /* 0x20 */ u8 movement_range_debug_display; // 移動範囲デバック表示 (Movement Range Debug Display) +}; + enum E_SW_RES_File_ID { /* BCK */ /* 0x04 */ BCK_SW_ATTACK = 0x4, @@ -175,8 +192,6 @@ void daE_SW_c::setHideEffect() { } } -UNK_REL_BSS; - namespace { /* 807B01F8-807B01FC 000048 0004+00 1/2 0/0 0/0 .bss target_info__22@unnamed@d_a_e_sw_cpp@ */ static fopAc_ac_c* target_info; diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index 9388dd0f74e..559d31c6617 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -3,15 +3,29 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_th.h" #include "d/actor/d_a_e_th_ball.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "c/c_damagereaction.h" - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_TH_HIO_c : public JORReflexible { +public: + /* 807B038C */ daE_TH_HIO_c(); + /* 807B3FA4 */ virtual ~daE_TH_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ s8 no; + /* 0x08 */ f32 base_size; + /* 0x0C */ u8 unk_0xC[0x10 - 0xC]; + /* 0x10 */ f32 move_range; + /* 0x14 */ f32 middle_move_range; +}; + enum daE_TH_ACTION { ACTION_WAIT, ACTION_SPIN, diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp index 7f0b3c49785..131af368b11 100644 --- a/src/d/actor/d_a_e_th_ball.cpp +++ b/src/d/actor/d_a_e_th_ball.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_th_ball.h" #include "d/actor/d_a_e_th.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index 3589d9c3835..adc65b668bb 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_e_tk.cpp +* @file d_a_e_tk.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_tk.h" #include "d/actor/d_a_e_tk_ball.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index 11488cf10b7..c4b84eeadb6 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_e_tk2.cpp +* @file d_a_e_tk2.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_tk2.h" #include "d/actor/d_a_e_tk_ball.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp index 81a8e89cc7c..2d9d82975e2 100644 --- a/src/d/actor/d_a_e_tk_ball.cpp +++ b/src/d/actor/d_a_e_tk_ball.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_e_tk_ball.cpp +* @file d_a_e_tk_ball.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_tk_ball.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index 4032457d283..3c07e45d7ea 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -3,9 +3,10 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_tt.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" @@ -519,99 +520,6 @@ void daE_TT_c::calcHitGroundSpeed() { // NONMATCHING } -/* ############################################################################################## */ -/* 807C23A0-807C23A4 000008 0001+03 5/5 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 807C23A4-807C23A8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 807C23A8-807C23AC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 807C23AC-807C23B0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 807C23B0-807C23B4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 807C23B4-807C23B8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 807C23B8-807C23BC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 807C23BC-807C23C0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 807C23C0-807C23C4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 807C23C4-807C23C8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 807C23C8-807C23CC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 807C23CC-807C23D0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 807C23D0-807C23D4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 807C23D4-807C23D8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 807C23D8-807C23DC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 807C23DC-807C23E0 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 807C23DC 0001+00 data_807C23DC @1009 */ -/* 807C23DD 0003+00 data_807C23DD None */ -static u8 struct_807C23DC[4]; - /* 807C23E0-807C23EC 000048 000C+00 1/1 0/0 0/0 .bss @3924 */ static u8 lit_3924[12]; diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 2bdfd66d9c1..30b8a4351dc 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -3,6 +3,8 @@ * Variant Enemy (Death Sword) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_vt.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" @@ -12,13 +14,34 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/d_camera.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" #define WL_CUT_TYPE_SMALL 1 #define WL_CUT_TYPE_JUMP 2 #define WL_CUT_TYPE_LARGE 3 +class daE_VA_HIO_c { +public: + /* 807C25EC */ daE_VA_HIO_c(); + /* 807CE2AC */ virtual ~daE_VA_HIO_c() {} + + /* 0x04 */ s8 field_0x04; + /* 0x08 */ f32 mModelSize; + /* 0x0C */ f32 mAttackRange; + /* 0x10 */ f32 mBiteCount; + /* 0x14 */ f32 mCircleAttackRadius; + /* 0x18 */ f32 mFadeAwayTime; + /* 0x1C */ f32 mDownTime; + /* 0x20 */ f32 mDownHP; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 mKRegLightR; + /* 0x34 */ f32 mKRegLightG; + /* 0x38 */ f32 mKRegLightB; + /* 0x3C */ f32 mKRegLightA; +}; + enum daE_VA_JOINT { JNT_ROOT, JNT_BACKBONE_01, @@ -189,103 +212,8 @@ daE_VA_HIO_c::daE_VA_HIO_c() { mKRegLightA = 210.0f; } - -/* ############################################################################################## */ -/* 807CF478-807CF47C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 807CF47C-807CF480 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 807CF480-807CF484 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 807CF484-807CF488 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 807CF488-807CF48C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 807CF48C-807CF490 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 807CF490-807CF494 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 807CF494-807CF498 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 807CF498-807CF49C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 807CF49C-807CF4A0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 807CF4A0-807CF4A4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 807CF4A4-807CF4A8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 807CF4A8-807CF4AC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 807CF4AC-807CF4B0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 807CF4B0-807CF4B4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - /* 807CF4B4-807CF4B8 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 807CF4B4 0001+00 data_807CF4B4 @1009 */ /* 807CF4B5 0003+00 data_807CF4B5 None */ -#pragma push -#pragma force_active on -static u8 struct_807CF4B4; -#pragma pop - #pragma push #pragma force_active on static u8 init_hio; diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index 1f6460d14e0..0532316f1f1 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_e_warpappear.cpp +* @file d_a_e_warpappear.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_warpappear.h" #include "d/actor/d_a_e_s1.h" #include "d/actor/d_a_horse.h" diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 0fae423ffe1..4958371c582 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_wb.h" #include "d/d_com_inf_game.h" @@ -339,8 +341,7 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -//extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450C98[4]; +//extern "C" extern u8 struct_80450C98[4]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -461,24 +462,6 @@ SECTION_RODATA static f32 const lit_4454 = 3500.0f; COMPILER_STRIP_GATE(0x807E29D0, &lit_4454); #pragma pop -/* 807E2F58-807E2F64 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 807E2F64-807E2F78 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 807E2F78-807E2F7C 000020 0004+00 1/1 0/0 0/0 .data l_color$4786 */ SECTION_DATA static u8 l_color[4] = { 0x14, @@ -1078,100 +1061,6 @@ COMPILER_STRIP_GATE(0x807E29E8, &lit_4641); SECTION_RODATA static f32 const lit_4642 = 1.0f; COMPILER_STRIP_GATE(0x807E29EC, &lit_4642); -/* 807E3578-807E357C 000008 0001+03 11/11 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 807E357C-807E3580 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 807E3580-807E3584 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 807E3584-807E3588 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 807E3588-807E358C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 807E358C-807E3590 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 807E3590-807E3594 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 807E3594-807E3598 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 807E3598-807E359C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 807E359C-807E35A0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 807E35A0-807E35A4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 807E35A4-807E35A8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 807E35A8-807E35AC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 807E35AC-807E35B0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 807E35B0-807E35B4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 807E35B4-807E35B8 -00001 0004+00 3/7 0/0 0/0 .bss None */ -/* 807E35B4 0001+00 data_807E35B4 @1009 */ -/* 807E35B5 0001+00 data_807E35B5 None */ -/* 807E35B6 0001+00 data_807E35B6 None */ -/* 807E35B7 0001+00 data_807E35B7 None */ -static u8 struct_807E35B4[4]; - /* 807E35B8-807E35BC 000048 0004+00 1/2 0/0 0/0 .bss None */ static u8 data_807E35B8[4]; diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 1b58104b515..6e860cada8f 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -3,11 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ws.h" #include "d/actor/d_a_obj_carry.h" #include - -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" namespace { diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index 6ff58be7413..48bc23d4527 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -3,9 +3,10 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ww.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" @@ -619,99 +620,6 @@ extern "C" void __dt__14dBgS_ObjGndChkFv() { // NONMATCHING } -/* ############################################################################################## */ -/* 807EFB80-807EFB84 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 807EFB84-807EFB88 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 807EFB88-807EFB8C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 807EFB8C-807EFB90 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 807EFB90-807EFB94 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 807EFB94-807EFB98 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 807EFB98-807EFB9C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 807EFB9C-807EFBA0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 807EFBA0-807EFBA4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 807EFBA4-807EFBA8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 807EFBA8-807EFBAC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 807EFBAC-807EFBB0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 807EFBB0-807EFBB4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 807EFBB4-807EFBB8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 807EFBB8-807EFBBC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 807EFBBC-807EFBC0 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 807EFBBC 0001+00 data_807EFBBC @1009 */ -/* 807EFBBD 0003+00 data_807EFBBD None */ -static u8 struct_807EFBBC[4]; - /* 807EFBC0-807EFBCC 000048 000C+00 0/1 0/0 0/0 .bss @3921 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index f2e06c1b363..b1b342490eb 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -3,6 +3,8 @@ * Twilit Carrier Kargarok */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_yc.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/JKernel/JKRHeap.h" diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index 09b6e819644..4295a349323 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -3,12 +3,13 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_yd.h" #include "d/actor/d_a_e_yd_leaf.h" #include "d/d_bg_w.h" #include "d/d_cc_d.h" #include "d/d_cc_uty.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" /* 807F2C2C-807F2C78 0000EC 004C+00 1/1 0/0 0/0 .text __ct__12daE_YD_HIO_cFv */ diff --git a/src/d/actor/d_a_e_yd_leaf.cpp b/src/d/actor/d_a_e_yd_leaf.cpp index 3653445ae26..504a95d7482 100644 --- a/src/d/actor/d_a_e_yd_leaf.cpp +++ b/src/d/actor/d_a_e_yd_leaf.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_yd_leaf.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp index 3c441c2af5f..492725037b7 100644 --- a/src/d/actor/d_a_e_yg.cpp +++ b/src/d/actor/d_a_e_yg.cpp @@ -3,10 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_yg.h" #include "d/d_cc_d.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" @@ -504,98 +505,6 @@ SECTION_RODATA static f32 const lit_4031 = -68.0f; COMPILER_STRIP_GATE(0x807FCD1C, &lit_4031); #pragma pop -/* 807FD020-807FD024 000008 0001+03 3/3 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 807FD024-807FD028 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 807FD028-807FD02C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 807FD02C-807FD030 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 807FD030-807FD034 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 807FD034-807FD038 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 807FD038-807FD03C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 807FD03C-807FD040 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 807FD040-807FD044 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 807FD044-807FD048 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 807FD048-807FD04C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 807FD04C-807FD050 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 807FD050-807FD054 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 807FD054-807FD058 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 807FD058-807FD05C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 807FD05C-807FD060 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 807FD05C 0001+00 data_807FD05C @1009 */ -/* 807FD05D 0003+00 data_807FD05D None */ -static u8 struct_807FD05C[4]; - /* 807FD060-807FD06C 000048 000C+00 0/1 0/0 0/0 .bss @3817 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 624c6974d20..06f75a70ec4 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -3,10 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_yh.h" #include "d/d_cc_d.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index dac8ef48bfc..3a0a15b09f2 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -5,15 +5,34 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_yk.h" #include "c/c_damagereaction.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_math.h" -UNK_REL_DATA #include "f_op/f_op_actor_enemy.h" +/** + * @class daE_YK_HIO_c + * @brief Shadow Keese Host Input Output class. + * + */ +class daE_YK_HIO_c { +public: + /* 8080482C */ daE_YK_HIO_c(); + /* 808077E0 */ virtual ~daE_YK_HIO_c() {} + + /* 0x04 */ s8 field_0x04; ///< @brief Initialized to -1, appears unused. + /* 0x08 */ f32 mModelScale; ///< @brief Base model scale factor (default: 1.0). + /* 0x0C */ f32 mFlySpeed; ///< @brief Base flying speed (default: 15.0). + /* 0x10 */ f32 mAttackRange; ///< @brief Distance threshold for entering attack state (default: 250.0). + /* 0x14 */ f32 mCruiseSpeed; ///< @brief Speed when flying normally (default: 15.0). + /* 0x18 */ f32 mChargeSpeed; ///< @brief Speed when charging at player (default: 40.0). +}; + /* 80807EF8-80807EFC 000008 0004+00 2/2 0/0 0/0 .bss None */ static u8 data_80807EF8; diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 6f81433559e..ce5a5b768ae 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -3,6 +3,8 @@ * Enemy - Shadow Insect / 闇虫 (Yami Mushi) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ym.h" #include "c/c_damagereaction.h" #include "d/actor/d_a_kago.h" @@ -10,9 +12,23 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_tag_firewall.h" #include "d/d_com_inf_game.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class daE_YM_HIO_c { +public: + /* 8080812C */ daE_YM_HIO_c(); + + /* 80815458 */ virtual ~daE_YM_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mModelSize; + /* 0x0C */ f32 mElectricInvincibilityTimeExtension; + /* 0x10 */ f32 mMoveSpeed; + /* 0x14 */ f32 mFlyMoveSpeed; + /* 0x18 */ f32 mFlyAttackSpeed; + /* 0x1C */ f32 mSurpriseDistance; + /* 0x20 */ f32 mMoveRange; +}; // // Declarations: diff --git a/src/d/actor/d_a_e_ym_tag.cpp b/src/d/actor/d_a_e_ym_tag.cpp index 956ed937417..132a1846b21 100644 --- a/src/d/actor/d_a_e_ym_tag.cpp +++ b/src/d/actor/d_a_e_ym_tag.cpp @@ -3,6 +3,8 @@ * Enemy - Shadow Insect / 闇虫 (Yami Mushi) - Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ym_tag.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index f0eef310ecd..5e41a03b475 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_ymb.h" #include "d/actor/d_a_midna.h" #include "d/actor/d_a_obj_drop.h" @@ -11,6 +13,20 @@ #include #include "Z2AudioLib/Z2Instances.h" +struct daE_YMB_HIO_c { +public: + /* 8081610C */ daE_YMB_HIO_c(); + /* 80821460 */ virtual ~daE_YMB_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 model_size; // モデルサイズ (Model Size) + /* 0x0C */ f32 fly_movement_speed; // 飛行移動速度 (Fly Movement Speed) + /* 0x10 */ f32 swim_attack_speed; // 泳ぎ攻撃速度 (Swim Attack Speed) + /* 0x14 */ f32 fly_attack_speed; // 飛行攻撃速度 (Fly Attack Speed) + /* 0x18 */ f32 rollover_time; // ひっくり返り時間 (Rollover Time) + /* 0x1C */ f32 fly_height_adjust; // 飛行高度-加減値 (Fly Height Adjust) +}; + enum E_YB_RES_File_ID { /* BCK */ /* 0x06 */ BCK_YB_ATTACK_A = 0x6, @@ -152,8 +168,6 @@ enum Particle { /* 0x8646 */ ZL2_LIQUIDANIM_3 = 0x8646, }; -UNK_REL_DATA; - namespace { /* 80821B30-80821B70 000020 0040+00 0/1 0/0 0/0 .data cc_ymb_src__23@unnamed@d_a_e_ymb_cpp@ */ static dCcD_SrcSph cc_ymb_src = { @@ -504,8 +518,6 @@ void daE_YMB_c::setCameraSwitch() { } } -UNK_REL_BSS; - /* 80821E54-80821E58 -00001 0004+00 2/2 0/0 0/0 .bss None */ static u8 l_initHIO; diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index 43e7d61955b..fdb104b1415 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -3,13 +3,93 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_yr.h" #include "d/actor/d_a_horse.h" #include "d/d_cc_d.h" #include "d/d_path.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" +class e_yrHIO_c : public fOpAcm_HIO_entry_c { +public: + e_yrHIO_c() { + mInvulnerable = 0; + mStationary = 0; + field_0x8 = 20.0f; + field_0xc = 2500.0f; + mModelScale = 1.0f; + mAttackAMinTime = 2000; + mAttackAMaxTime = 2500; + mAttackBMinTime = 2000; + mAttackBMaxTime = 2500; + mAttackMoveSpeed = 0.35f; + mAttackFrequency = 0.5f; + mFlyPlaybackSpeed = 1.0f; + mHoveringPlaybackSpeed = 1.0f; + mAttackPlaybackSpeed = 1.0f; + field_0x38 = 1.0f; + mChancePlaybackSpeed = 1.0f; + field_0x40 = 30; + field_0x44 = 1.0f; + field_0x48 = 1.0f; + field_0x4c = 1.5f; + mBrakeStartDist = 1100; + field_0x54 = 3.5f; + mChanceTime = 60; + mLargeDamage = 60.0f; + mSmallDamage = 40.0f; + mHitOccurrenceFrame = 1; + mDetectDistSky = 8000.0f; + mDetectHeightSky = 3000.0f; + mDetectAngleSky = 20000; + mDetectDistGround = 1500.0f; + mDetectHeightGround = 2000.0f; + mDetectAngleGround = 20000; + } + + /* 808282CC */ virtual ~e_yrHIO_c() {} + +#if DEBUG + void genMessage(JORMContext*); +#endif + + /* 0x04 */ u8 mInvulnerable; + /* 0x05 */ u8 mStationary; + /* 0x06 */ u8 mSuddenAttack; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 mTurningRadius; + /* 0x14 */ f32 mModelScale; + /* 0x18 */ s16 mAttackAMinTime; + /* 0x1A */ s16 mAttackAMaxTime; + /* 0x1C */ s16 mAttackBMinTime; + /* 0x1E */ s16 mAttackBMaxTime; + /* 0x20 */ f32 mAttackMoveSpeed; + /* 0x24 */ f32 mAttackFrequency; + /* 0x28 */ f32 mFlyPlaybackSpeed; + /* 0x2C */ f32 mHoveringPlaybackSpeed; + /* 0x30 */ f32 mAttackPlaybackSpeed; + /* 0x34 */ s16 mChanceTime; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 mChancePlaybackSpeed; + /* 0x40 */ s16 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4c; + /* 0x50 */ s16 mBrakeStartDist; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 mLargeDamage; + /* 0x5C */ f32 mSmallDamage; + /* 0x60 */ s16 mHitOccurrenceFrame; + /* 0x64 */ f32 mDetectDistSky; + /* 0x68 */ f32 mDetectDistGround; + /* 0x6C */ s16 mDetectAngleSky; + /* 0x6E */ s16 mDetectAngleGround; + /* 0x70 */ f32 mDetectHeightSky; + /* 0x74 */ f32 mDetectHeightGround; +}; + #if DEBUG void e_yrHIO_c::genMessage(JORMContext* ctx) { // "Kagarok" diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index bf81bea8da6..0e4b764e908 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_zh.h" #include "d/actor/d_a_obj_carry.h" #include "d/d_com_inf_game.h" @@ -68,8 +70,6 @@ enum Particle { /* 0x8A70 */ ZL2_SMOKE00_7, }; -UNK_REL_DATA; - /* 8082F440-8082F480 000020 0040+00 0/1 0/0 0/0 .data cc_zhSph_src__22@unnamed@d_a_e_zh_cpp@ */ namespace { static dCcD_SrcSph cc_zhSph_src = { @@ -122,8 +122,6 @@ daE_ZH_HIO_c::daE_ZH_HIO_c() { dungeon_bit_check = 0; } -UNK_REL_BSS; - /* 8082F725 0003+00 data_8082F725 None */ static u8 l_initHIO; diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index fac10d7301a..ae4ac9e39a3 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -3,9 +3,10 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_zm.h" #include "dol2asm.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index e75fd940632..5a458175950 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -3,11 +3,21 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_e_zs.h" -UNK_REL_DATA; #include "f_op/f_op_actor_enemy.h" #include "d/actor/d_a_b_ds.h" +class daE_ZS_HIO_c { +public: + /* 808330AC */ daE_ZS_HIO_c(); + /* 80834DDC */ virtual ~daE_ZS_HIO_c() {} + + /* 0x4 */ s8 field_0x4; + /* 0x8 */ f32 field_0x8; + /* 0xc */ f32 field_0xc; +}; // // Declarations: diff --git a/src/d/actor/d_a_econt.cpp b/src/d/actor/d_a_econt.cpp index a2ef0f1cfac..903528aae78 100644 --- a/src/d/actor/d_a_econt.cpp +++ b/src/d/actor/d_a_econt.cpp @@ -3,6 +3,8 @@ * Encounter */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_econt.h" #include "d/d_timer.h" #include "d/d_meter2_info.h" diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 813db2d408d..c1c9207437b 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -2,14 +2,14 @@ // Translation Unit: d_a_ep // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_ep.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" #include "d/d_a_obj.h" #include "d/d_s_play.h" -UNK_REL_DATA - /* 804681F8-804682F8 000078 0100+00 1/1 0/0 0/0 .text hahen_draw__FP8ep_class */ static void hahen_draw(ep_class* i_this) { fopAc_ac_c* a_this = i_this; diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp index e0ac90acd1e..4b57145679b 100644 --- a/src/d/actor/d_a_formation_mng.cpp +++ b/src/d/actor/d_a_formation_mng.cpp @@ -2,6 +2,8 @@ // Formation Manager // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_formation_mng.h" #include "d/actor/d_a_npc_fguard.h" #include "d/d_save.h" @@ -63,25 +65,6 @@ void daFmtMng_c::initMemberPos() { } } -/* ############################################################################################## */ -/* 8083792C-80837938 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80837938-8083794C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 808379C4-80837A3C 000098 0078+00 6/7 0/0 0/0 .data ActionTable__10daFmtMng_c */ daFmtMng_c::ActionFunc daFmtMng_c::ActionTable[10] = { &daFmtMng_c::initWait, &daFmtMng_c::executeWait, diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index 4a2d003e81c..5d210d3df39 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_fr.h" #include "SSystem/SComponent/c_lib.h" #include "c/c_damagereaction.h" diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index eee43906f68..0b5e6a5c133 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_grass.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" @@ -13,9 +15,6 @@ #include #include -UNK_REL_DATA -UNK_REL_BSS; - #include "d/actor/d_grass.inc" #include "d/actor/d_flower.inc" diff --git a/src/d/actor/d_a_guard_mng.cpp b/src/d/actor/d_a_guard_mng.cpp index 8f640e8e214..09bd7dae630 100644 --- a/src/d/actor/d_a_guard_mng.cpp +++ b/src/d/actor/d_a_guard_mng.cpp @@ -3,6 +3,8 @@ * Guard */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_guard_mng.h" #include "f_pc/f_pc_executor.h" diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index bc95f97df5e..26bb2e83218 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_hitobj.h" #include "f_op/f_op_kankyo_mng.h" diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index ef7ab353df9..483e9998eb9 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_horse.h" #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" @@ -216,8 +218,6 @@ void daHorseRein_c::setReinPosPart(int param_0) { } } -UNK_REL_DATA - /* 808458F4-808458F8 000020 0004+00 1/2 0/0 0/0 .data l_autoUpHeight */ static f32 l_autoUpHeight = 50.0f; @@ -2145,23 +2145,6 @@ void daHorse_c::setRoomInfo(int param_0) { } } -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) - /* 80845C04-80845C10 000054 000C+00 1/2 0/0 0/0 .bss l_frontFootOffset */ static cXyz l_frontFootOffset(23.5f, -20.0f, 0.0f); diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp index d7218cd6a7e..97bfadd5b42 100644 --- a/src/d/actor/d_a_hozelda.cpp +++ b/src/d/actor/d_a_hozelda.cpp @@ -2,6 +2,8 @@ // Translation Unit: d_a_hozelda // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_hozelda.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_horse.h" diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index 4fbb91c0178..a9e76833016 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -3,6 +3,8 @@ * Item Actor base */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_itembase.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" diff --git a/src/d/actor/d_a_izumi_gate.cpp b/src/d/actor/d_a_izumi_gate.cpp index e8d642a0258..9f18568657f 100644 --- a/src/d/actor/d_a_izumi_gate.cpp +++ b/src/d/actor/d_a_izumi_gate.cpp @@ -3,6 +3,8 @@ * Spring - Gate */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_izumi_gate.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 0be0f5fdf28..8fa8fbbe53c 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kago.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 1462a13f707..9fc10689e20 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag00.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index a5daf5384a8..d9ff014af89 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -3,6 +3,8 @@ * Sacred Grove Mist Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag01.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2EnvSeMgr.h" diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index 5ff019540ba..3fc455ca61f 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag02.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index bc614b57ae8..d146c540ef4 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -3,6 +3,8 @@ * Odor generation tag / rail */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag03.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 78118e5d538..77e4250b8e8 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag04.h" #include "d/actor/d_a_npc.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index e9813ab5e17..cebdd84566d 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag05.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 8d05eead0b8..22ffa6b6904 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -3,6 +3,8 @@ * Weather System Manager */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag06.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" @@ -58,25 +60,6 @@ static void dice_rain_minus() { } } -/* 80859FA0-80859FAC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80859FAC-80859FC0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -// unused? -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80857A50-80857F28 0002D0 04D8+00 2/1 0/0 0/0 .text dKy_event_proc__Fv */ static void dKy_event_proc() { static f32 S_time_table[8] = {45.0f, 75.0f, 120.0f, 150.0f, 180.0f, 240.0f, 270.0f, 360.0f}; @@ -620,100 +603,6 @@ static void daKytag06_type_07_Execute(kytag06_class* i_this) { } } -/* 8085A130-8085A134 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -// all of these unused? -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8085A134-8085A138 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 8085A138-8085A13C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8085A13C-8085A140 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 8085A140-8085A144 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8085A144-8085A148 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 8085A148-8085A14C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8085A14C-8085A150 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 8085A150-8085A154 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8085A154-8085A158 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 8085A158-8085A15C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8085A15C-8085A160 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 8085A160-8085A164 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8085A164-8085A168 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 8085A168-8085A16C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 8085A16C-8085A170 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 808589E0-80858CD4 001260 02F4+00 1/1 0/0 0/0 .text daKytag06_type_06_Execute__FP13kytag06_class */ static void daKytag06_type_06_Execute(kytag06_class* i_this) { diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index 50f906d12de..7ccf8a91e4f 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -3,6 +3,8 @@ * Environment Tag 7 */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag07.h" #include "d/d_stage.h" #include "f_op/f_op_overlap_mng.h" diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp index 69065b77809..70eb7015006 100644 --- a/src/d/actor/d_a_kytag08.cpp +++ b/src/d/actor/d_a_kytag08.cpp @@ -3,6 +3,8 @@ * Fog Avoidance Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag08.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag09.cpp b/src/d/actor/d_a_kytag09.cpp index 60ac6a60666..b0e4718c5c9 100644 --- a/src/d/actor/d_a_kytag09.cpp +++ b/src/d/actor/d_a_kytag09.cpp @@ -3,6 +3,8 @@ * Twilight Film Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag09.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp index 1a071f12e84..f09cab41556 100644 --- a/src/d/actor/d_a_kytag10.cpp +++ b/src/d/actor/d_a_kytag10.cpp @@ -3,6 +3,8 @@ * Sparks Particle Emitter on a Path */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag10.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag11.cpp b/src/d/actor/d_a_kytag11.cpp index e7523ef4c3e..39250fd9439 100644 --- a/src/d/actor/d_a_kytag11.cpp +++ b/src/d/actor/d_a_kytag11.cpp @@ -3,6 +3,8 @@ * Time Control Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag11.h" #include "d/d_procname.h" #include "d/d_kankyo_static.h" diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index 2e1ce83b8ba..99f2909457c 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag12.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index 3019a989caa..73d136075a5 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -3,6 +3,8 @@ * Blowing Snow Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag13.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp index cfff615dd25..a76fb3df607 100644 --- a/src/d/actor/d_a_kytag14.cpp +++ b/src/d/actor/d_a_kytag14.cpp @@ -4,6 +4,8 @@ * Sets savefile spawn location */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag14.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp index 67a2cf178dd..7c2c4fd8b71 100644 --- a/src/d/actor/d_a_kytag15.cpp +++ b/src/d/actor/d_a_kytag15.cpp @@ -3,6 +3,8 @@ * Z Shake Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag15.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp index f6ff02ef99e..fd9f7623286 100644 --- a/src/d/actor/d_a_kytag16.cpp +++ b/src/d/actor/d_a_kytag16.cpp @@ -3,6 +3,8 @@ * Pikari Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag16.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_kytag17.cpp b/src/d/actor/d_a_kytag17.cpp index 144b99cfc7e..f5fdee396ae 100644 --- a/src/d/actor/d_a_kytag17.cpp +++ b/src/d/actor/d_a_kytag17.cpp @@ -3,6 +3,8 @@ * Light Mask Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_kytag17.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 9ca8d64f9bf..62353dc9f4e 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -3,14 +3,14 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_mant.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "d/actor/d_a_b_gnd.h" #include "d/d_com_inf_game.h" #include "dol2asm.h" -UNK_REL_DATA - /* 80862D40-80866D40 000020 4000+00 2/1 0/0 0/0 .data l_Egnd_mantTEX */ #include "assets/l_Egnd_mantTEX.h" diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index ab805e087b6..a5da649cb74 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_mg_fish.h" #include "JSystem/JKernel/JKRSolidHeap.h" @@ -63,8 +65,6 @@ #define GEDOU_KIND_ED 26 #define GEDOU_KIND_SY 27 -UNK_REL_DATA - /* 805364C4-805364CC 000020 0008+00 0/1 0/0 0/0 .data check_kind */ static u16 check_kind[4] = { 0xF57F, @@ -224,8 +224,6 @@ static void* s_bait_sub(void* a, void* b) { } return NULL; } - -UNK_REL_BSS static u8 lit_1008; static u8 lit_1007; diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index 081f7aa794d..2c806195bd2 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_mg_fshop.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/actor/d_a_npc_henna.h" @@ -219,99 +221,6 @@ static int frog_CallBack(J3DJoint* param_0, int param_1) { return 1; } -/* 80870958-8087095C 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8087095C-80870960 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80870960-80870964 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80870964-80870968 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80870968-8087096C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8087096C-80870970 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80870970-80870974 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80870974-80870978 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80870978-8087097C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8087097C-80870980 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80870980-80870984 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80870984-80870988 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80870988-8087098C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8087098C-80870990 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80870990-80870994 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80870994-80870998 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 808709A4-808709B0 000054 000C+00 2/3 0/0 0/0 .bss BallStartPos */ static cXyz BallStartPos; @@ -338,21 +247,6 @@ static void koro2_draw(fshop_class* param_1) { dComIfGd_setList(); } -/* 80870284-80870290 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80870290-808702A4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 808702A4-8087032C 000020 0087+01 1/1 0/0 0/0 .data koro2_map_LV1 */ static s8 koro2_map_LV1[135] = { 0x00, diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index d199590dff8..d518b420358 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_mg_rod.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -22,13 +24,31 @@ #include "Z2AudioLib/Z2Instances.h" #include +class dmg_rod_HIO_c : public JORReflexible { +public: + /* 804A95EC */ dmg_rod_HIO_c(); + /* 804BB070 */ virtual ~dmg_rod_HIO_c() {} + +#if DEBUG + void genMessage(JORMContext*); +#endif + + /* 0x04 */ s8 id; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ u8 force_fish_msg_output; +}; + /* 804BB534-804BB540 000000 000C+00 45/45 0/0 0/0 .rodata @3879 */ static u8 const lit_3879[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -UNK_REL_DATA - /* 804BB870-804BB878 000020 0008+00 1/2 0/0 0/0 .data check_kind */ static u16 check_kind[] = { 0xF57F, 0xF47F, 0xF37F, 0xF27F, @@ -483,8 +503,6 @@ static void rod_main(dmg_rod_class* i_this) { rod_control(i_this); } -UNK_REL_BSS; - /* 804BBBD0-804BBBD4 000048 0004+00 6/9 0/0 0/0 .bss henna */ static npc_henna_class* henna; diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 8300d3e5c63..421220f1854 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_midna.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -521,7 +523,7 @@ cPhs__Step daMidna_c::create() { return cPhs_ERROR_e; } - mpFunc = &checkMetamorphoseEnableBase; + mpFunc = &daMidna_c::checkMetamorphoseEnableBase; for (u16 i = 0; i < 3; i++) { mBckHeap[i].createHeap(daPy_anmHeap_c::HEAP_TYPE_3); diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 34d5d66b784..5303bb9a3ff 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -3,6 +3,8 @@ * Mirror of Twilight */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_mirror.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 00f93ed35ee..4740bbccde9 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + // This TU seems to disable inlining entirely, as there are several weak functions that get inlined // in other TUs, but not here. #pragma dont_inline on @@ -182,23 +184,6 @@ static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr) { info->encodeData++; } -UNK_BSS(1109); -UNK_BSS(1107); -UNK_BSS(1105); -UNK_BSS(1104); -UNK_BSS(1099); -UNK_BSS(1097); -UNK_BSS(1095); -UNK_BSS(1094); -UNK_BSS(1057); -UNK_BSS(1055); -UNK_BSS(1053); -UNK_BSS(1052); -UNK_BSS(1014); -UNK_BSS(1012); -UNK_BSS(1010); -UNK_BSS(1009); - /* 808795E0-80879A40 000040 0460+00 0/0 0/0 0/0 .bss THPStatistics */ static u8 THPStatistics[1120] ALIGN_DECL(32); diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index 54aadaa2861..b16928a95f2 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_myna.h" #include "d/actor/d_a_player.h" #include "d/d_kankyo.h" @@ -11,7 +13,33 @@ #include "d/actor/d_a_tag_myna_light.h" #include "SSystem/SComponent/c_math.h" -UNK_REL_DATA +class daMyna_HIO_c : public mDoHIO_entry_c { +public: + /* 8094A960 */ virtual ~daMyna_HIO_c() {} + + // Must be inlined but defined in .cpp for sinit to match + inline daMyna_HIO_c(); + + void genMessage(JORMContext*); + + /* 0x04 */ f32 field_0x04; // DAT_8094ba40 + /* 0x08 */ f32 field_0x08; // DAT_8094ba44 + /* 0x0C */ f32 field_0x0C; // DAT_8094ba48 + /* 0x10 */ f32 field_0x10; // DAT_8094ba4c + /* 0x14 */ f32 field_0x14; // DAT_8094ba50 + /* 0x18 */ f32 field_0x18; // DAT_8094ba54 + /* 0x1C */ f32 field_0x1C; // DAT_8094ba58 + /* 0x20 */ f32 field_0x20; // DAT_8094ba5c + /* 0x24 */ s16 field_0x24; // DAT_8094ba60 + /* 0x26 */ s16 field_0x26; // DAT_8094ba62 + /* 0x28 */ s16 field_0x28; // DAT_8094ba64 + /* 0x2A */ s16 field_0x2A; // DAT_8094ba66 + /* 0x2C */ s16 field_0x2C; // DAT_8094ba68 + /* 0x2E */ s16 field_0x2E; // DAT_8094ba6a + /* 0x30 */ s16 field_0x30; // DAT_8094ba6c +}; + +STATIC_ASSERT(sizeof(daMyna_HIO_c) == 0x34); /* 8094B488-8094B590 000128 0108+00 2/3 0/0 0/0 .data init_proc */ static daMyna_c::ProcFunc init_proc[] = { @@ -81,8 +109,6 @@ static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) { return 1; } -UNK_REL_BSS - /* 8094BA3C-8094BA70 000054 0034+00 15/15 0/0 0/0 .bss l_HOSTIO */ static daMyna_HIO_c l_HOSTIO; @@ -1265,6 +1291,7 @@ void daMyna_c::deleteItem(int i_itemIndex) { mShopItems[i_itemIndex].mItemStatus = 4; } +// this seems to be missing in the final REL?? /* 80949144-80949190 0035C4 004C+00 0/0 0/0 0/0 .text deleteItem__8daMyna_cFUi */ void daMyna_c::deleteItem(fpc_ProcID i_itemId) { for (int i = 0; i < mNumShopItems; i++) { diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 139f4c7dbb1..f729a49b04a 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -3,13 +3,14 @@ * Bomb Actor */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_nbomb.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" -#include "dol2asm.h" #include "f_op/f_op_kankyo_mng.h" #include "d/actor/d_a_mirror.h" @@ -39,13 +40,13 @@ static u8 const lit_3767[12] = { static Vec const l_localCenterOffset = {0.0f, 30.0f, 0.0f}; /* 804CC358-804CC360 000018 0006+02 1/0 0/0 0/0 .rodata l_arcNameBombF */ -SECTION_RODATA static char const l_arcNameBombF[] = "Bombf"; +static char const l_arcNameBombF[] = "Bombf"; /* 804CC360-804CC368 000020 0005+03 1/1 0/0 0/0 .rodata l_arcNameBombE */ -SECTION_RODATA static char const l_arcNameBombE[] = "E_BI"; +static char const l_arcNameBombE[] = "E_BI"; /* 804CC368-804CC370 000028 0005+03 1/1 0/0 0/0 .rodata l_arcNameBombEW */ -SECTION_RODATA static char const l_arcNameBombEW[] = "E_BG"; +static char const l_arcNameBombEW[] = "E_BG"; /* 804C6E34-804C6F78 000154 0144+00 1/1 0/0 0/0 .text tgHitCallback__9daNbomb_cFP12dCcD_GObjInf */ void daNbomb_c::tgHitCallback(dCcD_GObjInf* i_hitObj) { @@ -384,11 +385,6 @@ int daNbomb_c::create() { return cPhs_COMPLEATE_e; } -/* 804C7B44-804C7CC8 000E64 0184+00 1/1 0/0 0/0 .text __ct__9daNbomb_cFv */ -daNbomb_c::daNbomb_c() { - /* empty function */ -} - /* 804C7E94-804C7EB4 0011B4 0020+00 1/0 0/0 0/0 .text daNbomb_Create__FP10fopAc_ac_c */ static int daNbomb_Create(fopAc_ac_c* i_this) { return ((daNbomb_c*)i_this)->create(); @@ -509,23 +505,6 @@ void daNbomb_c::setSmokePos() { field_0xbe4 = (mEffectPosition - mEffectLastPosition) * 0.5f; } -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) - /* 804C8588-804C87F0 0018A8 0268+00 1/1 0/0 0/0 .text setEffect__9daNbomb_cFv */ void daNbomb_c::setEffect() { static cXyz effectScale(1.8f, 1.8f, 1.8f); diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index a9bba9bcf1a..1e9febcfc2e 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -3,11 +3,15 @@ // Translation Unit: d_a_ni // +#include "d/dolzel_rel.h" + /** * Basically entirely matching except for ONE float reg alloc in play_camera, * and some extra dtors being emitted that shouldnt be after daNi_Create */ +#include "d/dolzel_rel.h" + #include "d/d_msg_flow.h" #include "d/d_s_play.h" #include "dol2asm.h" @@ -218,8 +222,6 @@ extern "C" void __register_global_object(); // Declarations: // -UNK_REL_DATA - /* 8094BC2C-8094BCA8 0000EC 007C+00 1/1 0/0 0/0 .text __ct__10daNi_HIO_cFv */ daNi_HIO_c::daNi_HIO_c() { field_0x04 = -1; @@ -403,8 +405,6 @@ static void damage_check(ni_class* i_this) { } } -UNK_REL_BSS; - static u8 data_8095158d; /* 8095159C-809515D8 000054 003C+00 9/9 0/0 0/0 .bss l_HIO */ diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp index 530eae9a3ee..80ce52b5302 100644 --- a/src/d/actor/d_a_no_chg_room.cpp +++ b/src/d/actor/d_a_no_chg_room.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_no_chg_room.h" #include "d/d_s_room.h" #include "d/actor/d_a_horse.h" diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 005a873d434..61bf57141f8 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc.h" #include "d/actor/d_a_npc_tk.h" #include "d/actor/d_a_tag_evtarea.h" @@ -531,11 +533,6 @@ int daNpcT_Path_c::chkPassed1(cXyz i_pnt, int i_num) { return 0; } -/* 803B36A8-803B36B4 0107C8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 801464D8-8014698C 140E18 04B4+00 1/1 0/0 0/0 .text chkPassed2__13daNpcT_Path_cF4cXyzP4cXyzii */ int daNpcT_Path_c::chkPassed2(cXyz i_pnt, cXyz* param_2, int i_num, int param_4) { cXyz cStack_80; diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index d63cffe1e3b..f2f4153ed5f 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc.h" static s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, int param_4, int param_5); diff --git a/src/d/actor/d_a_npc3.cpp b/src/d/actor/d_a_npc3.cpp index 00ec3e979a4..4823005e89d 100644 --- a/src/d/actor/d_a_npc3.cpp +++ b/src/d/actor/d_a_npc3.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 9f1a79e95f4..4e1d1000ca9 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc.h" #include "d/actor/d_a_npc_tk.h" #include "d/d_msg_object.h" diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index 822a6221681..468dbe6474a 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_aru.h" #include "dol2asm.h" @@ -303,8 +305,7 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__14J3DMaterialAnm[4]; extern "C" u8 now__14mDoMtx_stack_c[48]; -// extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mFindActorPtrs__8daNpcT_c[200]; +// extern "C" u8 mFindActorPtrs__8daNpcT_c[200]; extern "C" extern u8 g_meter2_info[248]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mFindCount__8daNpcT_c[4]; @@ -337,24 +338,6 @@ SECTION_DEAD static char const* const stringBase_809578D4 = "Aru"; SECTION_DEAD static char const* const stringBase_809578D8 = "Aru1"; #pragma pop -/* 809578E8-809578F4 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809578F4-80957908 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80957908-80957910 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x01, @@ -1252,99 +1235,6 @@ SECTION_RODATA static u8 const lit_4995[8] = { }; COMPILER_STRIP_GATE(0x809577D8, &lit_4995); -/* 80958120-80958124 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80958124-80958128 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80958128-8095812C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8095812C-80958130 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80958130-80958134 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80958134-80958138 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80958138-8095813C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8095813C-80958140 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80958140-80958144 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80958144-80958148 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80958148-8095814C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8095814C-80958150 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80958150-80958154 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80958154-80958158 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80958158-8095815C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 8095815C-80958160 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80958160-8095816C 000048 000C+00 1/1 0/0 0/0 .bss @3874 */ static u8 lit_3874[12]; diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index aed4efbfb27..1b12ffa425a 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -3,6 +3,8 @@ * NPC - Ashei */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_ash.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" @@ -322,21 +324,6 @@ bool daNpcAsh_c::step(s16 i_angY, bool i_animate) { return mTurnMode > 1; } -/* 8095D990-8095D99C 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8095D99C-8095D9B0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 8095D9B0-8095DA88 000020 00D8+00 1/2 0/0 0/0 .data l_bckGetParamList */ static daNpc_GetParam2 l_bckGetParamList[18] = { {-1, 2, 0}, // diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 7724303179a..d9ae1918fd5 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_ashB.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "dol2asm.h" @@ -227,8 +229,6 @@ extern "C" void __register_global_object(); // Declarations: // -UNK_REL_DATA; - /* 80962438-80962534 000020 00FC+00 1/2 0/0 0/0 .data l_bckGetParamList */ static daNpc_GetParam2 l_bckGetParamList[21] = { {-1, 2, 0}, diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 7467c4314f6..47ad0c730fb 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_bans.h" #include "dol2asm.h" @@ -337,24 +339,6 @@ SECTION_DEAD static char const* const stringBase_80967FDD = "PURCHASE"; SECTION_DEAD static char const* const stringBase_80967FE6 = "GO_BACK"; #pragma pop -/* 80968000-8096800C 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8096800C-80968020 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80968020-80968040 000020 0020+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[32] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x02, diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 8e920c8a89a..e75220055b8 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_besu.h" #include "d/actor/d_a_npc_len.h" #include "d/actor/d_a_tag_push.h" @@ -278,7 +280,6 @@ enum Event { }; #ifndef DEBUG -UNK_REL_DATA; #endif diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index 994ec038aa6..be751db95e3 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_blue_ns.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -249,24 +251,6 @@ SECTION_DEAD static char const* const stringBase_8096CB71 = "CHG_YAMI_NOPPO"; SECTION_DEAD static char const* const stringBase_8096CB80 = "CHG_YAMI_NOPPO_STOPPER"; #pragma pop -/* 8096CBA0-8096CBAC 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8096CBAC-8096CBC0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8096CBC0-8096CC2C 000020 006C+00 1/1 0/0 0/0 .data l_bckGetParamList */ SECTION_DATA static u8 l_bckGetParamList[108] = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index 7b76804a50f..e14f429e003 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_bou.h" #include "d/actor/d_a_cow.h" #include "d/actor/d_a_horse.h" @@ -15,8 +17,6 @@ // Declarations: // -UNK_REL_DATA; - /* 80972AB0-80972AB8 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ 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 a985ee71656..f5c9c52ad07 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_bouS.h" #include "dol2asm.h" #include "d/d_camera.h" @@ -257,24 +259,6 @@ SECTION_DEAD static char const* const stringBase_80978783 = "BOUS_INTRO_SUMO3"; SECTION_DEAD static char const* const stringBase_80978794 = "BouS"; #pragma pop -/* 809787A4-809787B0 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809787B0-809787C4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809787C4-809788D8 000020 0114+00 1/2 0/0 0/0 .data l_bckGetParamList */ SECTION_DATA static u8 l_bckGetParamList[276] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, @@ -1367,100 +1351,6 @@ void daNpcBouS_c::setExpression(int param_0, f32 param_1) { // NONMATCHING } -/* ############################################################################################## */ -/* 80978B78-80978B7C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80978B7C-80978B80 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80978B80-80978B84 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80978B84-80978B88 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80978B88-80978B8C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80978B8C-80978B90 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80978B90-80978B94 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80978B94-80978B98 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80978B98-80978B9C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80978B9C-80978BA0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80978BA0-80978BA4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80978BA4-80978BA8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80978BA8-80978BAC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80978BAC-80978BB0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80978BB0-80978BB4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80978BB4-80978BB8 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80978BB8-80978BC4 000048 000C+00 0/1 0/0 0/0 .bss @4034 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index a90931819fd..dca33d6d980 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -3,6 +3,8 @@ // Translation Unit: a/npc/d_a_npc_cd // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_cd.h" #include "d/actor/d_a_player.h" @@ -357,6 +359,14 @@ J3DAnmTransform* daNpcCd_c::getAnmP(int param_1, int param_2) { return (J3DAnmTransform*)dComIfG_getObjectRes(anmTbl.arc_name, anmTbl.resource_index); } +/* 803B3B8C-803B3C04 -00001 0078+00 2/2 0/0 0/0 .data l_resNameTbl */ +static char* const* l_resNameTbl[30] = { + l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa, + l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2, + l_resWANa, l_resWADa, l_resMATa, l_resWCNa, l_resWONa, l_resWGNa, l_resWANb, l_resWANa2, + l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2, +}; + /* 803B3C04-803B3CF4 010D24 00F0+00 2/2 0/0 0/0 .data l_bmdTbl */ static anmTblPrm const l_bmdTbl[30] = { {l_resMANa[0], 3}, {l_resMADa[0], 3}, {l_resMCNa[0], 3}, {l_resMONa[0], 3}, @@ -406,19 +416,6 @@ int daNpcCd_c::setAttention(int i_idx) { return 1; } -/* 803B3B80-803B3B8C 010CA0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc UNK */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 803B3B8C-803B3C04 -00001 0078+00 2/2 0/0 0/0 .data l_resNameTbl */ -static char* const* l_resNameTbl[30] = { - l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa, - l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2, - l_resWANa, l_resWADa, l_resMATa, l_resWCNa, l_resWONa, l_resWGNa, l_resWANb, l_resWANa2, - l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2, -}; - /* 80156B4C-80156C50 15148C 0104+00 0/0 0/0 1/1 .text loadResrc__9daNpcCd_cFii */ int daNpcCd_c::loadResrc(int param_0, int param_1) { int result = cPhs_COMPLEATE_e; diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 897fe55bebe..8f1d9f61e9e 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -3,6 +3,8 @@ // Translation Unit: a/npc/d_a_npc_cd2 // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_cd2.h" #include "d/actor/d_a_player.h" #include "d/d_path.h" @@ -338,12 +340,6 @@ bool daNpcCd2_c::isM_() { return a_jntNum == JntM_NUM_e; } -/* ############################################################################################## */ -/* 803B61C0-803B61CC 0132E0 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803B61CC-803B6244 -00001 0078+00 2/2 0/0 0/0 .data l_resNameTbl */ static char* const* l_resNameTbl[30] = { l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa, diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index c8f6d768cf3..ed36d0c64c9 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_cdn3.h" #include "d/d_msg_object.h" #include "dol2asm.h" @@ -307,8 +309,6 @@ static int createHeapCallBack(fopAc_ac_c* param_0) { return rv; } -UNK_REL_DATA - /* 8097F788-8097F848 0000E0 00C0+00 1/2 0/0 0/0 .data ActionTable__11daNpcCdn3_c */ daNpcCdn3_c::actionFunc daNpcCdn3_c::ActionTable[8][2] = { &daNpcCdn3_c::initWait, diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 0097c9abf5a..e8ad6727385 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_chat.h" #include "dol2asm.h" @@ -830,24 +832,6 @@ SECTION_DEAD static char const* const stringBase_8098794A = "WAN_b2_TW"; SECTION_DEAD static char const* const stringBase_80987954 = "Chat"; #pragma pop -/* 8098795C-80987968 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80987968-8098797C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8098797C-809879F4 -00001 0078+00 2/2 0/0 0/0 .data l_resNameTbl */ SECTION_DATA static void* l_resNameTbl[30] = { (void*)&l_resMANa, (void*)&l_resMADa, (void*)&l_resMCNa, (void*)&l_resMONa, @@ -2462,99 +2446,6 @@ SECTION_RODATA static u8 const lit_4769[8] = { }; COMPILER_STRIP_GATE(0x80986F34, &lit_4769); -/* 8098BA80-8098BA84 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8098BA84-8098BA88 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 8098BA88-8098BA8C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8098BA8C-8098BA90 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 8098BA90-8098BA94 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8098BA94-8098BA98 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 8098BA98-8098BA9C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8098BA9C-8098BAA0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 8098BAA0-8098BAA4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8098BAA4-8098BAA8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 8098BAA8-8098BAAC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8098BAAC-8098BAB0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 8098BAB0-8098BAB4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8098BAB4-8098BAB8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 8098BAB8-8098BABC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 8098BABC-8098BAC0 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 8098BAC0-8098BACC 000048 000C+00 1/1 0/0 0/0 .bss @3881 */ static u8 lit_3881[12]; diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 8ca8cd5b221..5028306753a 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_chin.h" #include "dol2asm.h" @@ -344,24 +346,6 @@ SECTION_DEAD static char const* const stringBase_80991D5E = "chin1_evt"; SECTION_DEAD static char const* const stringBase_80991D68 = "SpotLight"; #pragma pop -/* 80991DDC-80991DE8 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80991DE8-80991DFC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80991DFC-80991F88 000020 018C+00 1/2 0/0 0/0 .data l_bckGetParamList */ SECTION_DATA static u8 l_bckGetParamList[396] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index dfc418ce585..c09bb1f851d 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_clerka.h" #include "dol2asm.h" @@ -274,24 +276,6 @@ SECTION_DEAD static char const* const stringBase_80995981 = "NO_RESPONSE"; SECTION_DEAD static char const* const stringBase_8099598D = "clerkA"; #pragma pop -/* 80995994-809959A0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809959A0-809959B4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809959B4-809959BC 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index 92fb310abf4..89a5c1f3c53 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_clerkb.h" #include "dol2asm.h" @@ -285,24 +287,6 @@ SECTION_DEAD static char const* const stringBase_80999A9D = "NO_RESPONSE"; SECTION_DEAD static char const* const stringBase_80999AA9 = "clerkB"; #pragma pop -/* 80999AB0-80999ABC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80999ABC-80999AD0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80999AD0-80999AD8 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index ceb91e25a1e..0f94b79ccde 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_clerkt.h" #include "dol2asm.h" @@ -267,24 +269,6 @@ SECTION_DEAD static char const* const stringBase_8099D33D = "DEFAULT_GETITEM"; SECTION_DEAD static char const* const stringBase_8099D34D = "Tkj"; #pragma pop -/* 8099D358-8099D364 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8099D364-8099D378 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8099D378-8099D380 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 5935106bd6a..db251966faa 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_coach.h" #include "d/actor/d_a_coach_2D.h" #include "d/actor/d_a_coach_fire.h" diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index fd5f0c5b7ad..724079106cb 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_df.h" #include "dol2asm.h" @@ -286,99 +288,6 @@ SECTION_RODATA static u8 const lit_3775[8] = { COMPILER_STRIP_GATE(0x809A690C, &lit_3775); #pragma pop -/* 809A6A10-809A6A14 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 809A6A14-809A6A18 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A18-809A6A1C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A1C-809A6A20 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A20-809A6A24 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A24-809A6A28 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A28-809A6A2C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A2C-809A6A30 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A30-809A6A34 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A34-809A6A38 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A38-809A6A3C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A3C-809A6A40 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A40-809A6A44 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A44-809A6A48 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A48-809A6A4C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 809A6A4C-809A6A50 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 809A6A50-809A6A54 000048 0004+00 3/4 0/0 0/0 .bss lrl */ static u8 lrl[4]; diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 804b30c1d86..965fc4ca575 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_doc.h" #include "dol2asm.h" @@ -264,24 +266,6 @@ SECTION_DEAD static char const* const stringBase_809AA435 = "Doc"; SECTION_DEAD static char const* const stringBase_809AA439 = "Doc1"; #pragma pop -/* 809AA440-809AA44C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809AA44C-809AA460 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809AA460-809AA468 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x01, @@ -950,99 +934,6 @@ SECTION_RODATA static u8 const lit_4775[8] = { }; COMPILER_STRIP_GATE(0x809AA3FC, &lit_4775); -/* 809AAAD0-809AAAD4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 809AAAD4-809AAAD8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 809AAAD8-809AAADC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 809AAADC-809AAAE0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 809AAAE0-809AAAE4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 809AAAE4-809AAAE8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 809AAAE8-809AAAEC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 809AAAEC-809AAAF0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 809AAAF0-809AAAF4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 809AAAF4-809AAAF8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 809AAAF8-809AAAFC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 809AAAFC-809AAB00 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 809AAB00-809AAB04 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 809AAB04-809AAB08 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 809AAB08-809AAB0C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 809AAB0C-809AAB10 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 809AAB10-809AAB1C 000048 000C+00 1/1 0/0 0/0 .bss @3816 */ static u8 lit_3816[12]; diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index f085d005a2e..ecbdcc31c0d 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_doorboy.h" enum DoorBoy_RES_File_ID { @@ -90,8 +92,6 @@ enum Motion { /* 0xB */ MOT_SIT_TO_WOLF_A, }; -UNK_REL_DATA; - /* 809ADB48-809ADB90 000020 0048+00 1/1 0/0 0/0 .data l_bckGetParamList */ static daNpc_GetParam2 l_bckGetParamList[6] = { {BCK_M_WAIT_A, J3DFrameCtrl::EMode_LOOP, MGENERAL}, @@ -892,11 +892,6 @@ BOOL daNpcDoorBoy_c::drawDbgInfo() { return FALSE; } -/* 809AD938-809AD93C 002D98 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__14daNpcDoorBoy_cFv */ -void daNpcDoorBoy_c::adjustShapeAngle() { - /* empty function */ -} - /* 809ADC24-809ADC44 -00001 0020+00 1/0 0/0 0/0 .data daNpcDoorBoy_MethodTable */ static actor_method_class daNpcDoorBoy_MethodTable = { (process_method_func)daNpcDoorBoy_Create, diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp index 4b9edb3c55b..f62ec85017e 100644 --- a/src/d/actor/d_a_npc_drainSol.cpp +++ b/src/d/actor/d_a_npc_drainSol.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_drainSol.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index 9e8de00f03f..dc24f063e14 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_du.h" #include "d/d_cc_d.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index ab8a0ae6346..a4beb401640 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_fairy.h" #include "dol2asm.h" @@ -376,24 +378,6 @@ SECTION_DEAD static char const* const stringBase_809B94CC = ""; SECTION_DEAD static char const* const stringBase_809B94CD = "fairy"; #pragma pop -/* 809B95D8-809B95E4 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809B95E4-809B95F8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809B95F8-809B9600 -00001 0008+00 7/8 0/0 0/0 .data l_resNameList */ SECTION_DATA static void* l_resNameList[2] = { (void*)&d_a_npc_fairy__stringBase0, diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index 78cf2298ff7..f3a5418292f 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -1,11 +1,11 @@ /** - * @file d_a_npc_fairy_seirei.cpp +* @file d_a_npc_fairy_seirei.cpp * */ -#include "d/actor/d_a_npc_fairy_seirei.h" +#include "d/dolzel_rel.h" -UNK_REL_DATA +#include "d/actor/d_a_npc_fairy_seirei.h" /* ############################################################################################## */ diff --git a/src/d/actor/d_a_npc_fguard.cpp b/src/d/actor/d_a_npc_fguard.cpp index 649f1af0c55..1cb7ae735db 100644 --- a/src/d/actor/d_a_npc_fguard.cpp +++ b/src/d/actor/d_a_npc_fguard.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_npc_fguard // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_fguard.h" int daNpcFgd_c::createHeap() { diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index efd72414cac..0c7228a5733 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -1,5 +1,7 @@ // Translation Unit: d_a_npc_fish +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_fish.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" @@ -43,24 +45,6 @@ static void fish_set(fopAc_ac_c* i_this, fish_data_s* data) { } } -/* 805424E4-805424F0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 805424F0-80542504 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80542504-805428D8 000020 03D4+00 0/1 0/0 0/0 .data fish_d127_S */ static fish_data_s fish_d127_S[49] = { {20, {0.f, 0.f, 0.f}, 0}, {22, {0.f, 0.f, 0.f}, 0}, diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index a4a92252500..e5d3a794c31 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_gnd.h" #include "dol2asm.h" @@ -251,24 +253,6 @@ extern "C" void __register_global_object(); // SECTION_DEAD static char const* const stringBase_809BE595 = "Gnd"; // #pragma pop -/* 809BE59C-809BE5A8 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809BE5A8-809BE5BC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809BE5BC-809BE5C4 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 2d5f68220c8..5aa9a8367d1 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_gra.h" #include "dol2asm.h" @@ -369,24 +371,6 @@ SECTION_DEAD static char const* const stringBase_809CA5DA = "GRDS_ROLL"; SECTION_DEAD static char const* const stringBase_809CA5E4 = "GRDS_GATE"; #pragma pop -/* 809CA614-809CA620 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809CA620-809CA634 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809CA634-809CA65C 000020 0028+00 1/1 0/0 0/0 .data l_bmdGetParamList */ SECTION_DATA static u8 l_bmdGetParamList[40] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -1696,99 +1680,6 @@ SECTION_RODATA static f32 const lit_5326 = 150.0f; COMPILER_STRIP_GATE(0x809C9E78, &lit_5326); #pragma pop -/* 809CB2F8-809CB2FC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 809CB2FC-809CB300 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 809CB300-809CB304 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 809CB304-809CB308 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 809CB308-809CB30C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 809CB30C-809CB310 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 809CB310-809CB314 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 809CB314-809CB318 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 809CB318-809CB31C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 809CB31C-809CB320 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 809CB320-809CB324 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 809CB324-809CB328 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 809CB328-809CB32C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 809CB32C-809CB330 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 809CB330-809CB334 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 809CB334-809CB338 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 809CB338-809CB344 000048 000C+00 1/1 0/0 0/0 .bss @4083 */ static u8 lit_4083[12]; diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 355555fc69c..acef43869f8 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_grc.h" #include "Z2AudioLib/Z2Instances.h" @@ -146,10 +148,6 @@ enum Type { /* 0x6 */ TYPE_6, }; -UNK_REL_DATA; - -UNK_REL_BSS; - /* 809CFBB4-809CFBB8 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpc_grC_Param_c l_HIO; @@ -1138,7 +1136,7 @@ BOOL daNpc_grC_c::doEvent() { mStaffID = staffId; int evtCutNo = eventManager.getMyActIdx(staffId, &mEvtCutNameList, 1, 0, 0); - JUT_ASSERT(1774, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e)); + JUT_ASSERT(1774, (0 <= evtCutNo) && (evtCutNo < dEvent_manager_c::NUM_EVT_CUTS_e)); JUT_ASSERT(1775, 0 != mEvtCutList[evtCutNo]); if ((this->*mEvtCutList[evtCutNo])(staffId)) { @@ -1597,11 +1595,6 @@ static int daNpc_grC_IsDelete(void* a_this) { return 1; } -/* 809CF4AC-809CF4B0 0040CC 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpc_grC_cFv */ -void daNpc_grC_c::adjustShapeAngle() { - /* empty function */ -} - AUDIO_INSTANCES; /* 809CFA34-809CFA54 -00001 0020+00 1/0 0/0 0/0 .data daNpc_grC_MethodTable */ diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index a550025ab2f..7a11ff42654 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_grd.h" #include "dol2asm.h" @@ -250,24 +252,6 @@ SECTION_DEAD static char const* const stringBase_809D3BFD = ""; SECTION_DEAD static char const* const stringBase_809D3BFE = "NOD_TO_GRZ"; #pragma pop -/* 809D3C14-809D3C20 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809D3C20-809D3C34 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809D3C34-809D3C3C 000020 0008+00 1/1 0/0 0/0 .data l_bmdGetParamList */ SECTION_DATA static u8 l_bmdGetParamList[8] = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, @@ -802,99 +786,6 @@ SECTION_RODATA static u8 const lit_4867[8] = { COMPILER_STRIP_GATE(0x809D3ABC, &lit_4867); #pragma pop -/* 809D3EB0-809D3EB4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 809D3EB4-809D3EB8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 809D3EB8-809D3EBC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 809D3EBC-809D3EC0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 809D3EC0-809D3EC4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 809D3EC4-809D3EC8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 809D3EC8-809D3ECC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 809D3ECC-809D3ED0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 809D3ED0-809D3ED4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 809D3ED4-809D3ED8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 809D3ED8-809D3EDC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 809D3EDC-809D3EE0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 809D3EE0-809D3EE4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 809D3EE4-809D3EE8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 809D3EE8-809D3EEC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 809D3EEC-809D3EF0 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 809D3EF0-809D3EFC 000048 000C+00 1/1 0/0 0/0 .bss @4017 */ static u8 lit_4017[12]; diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index 06453ce989a..b00c4095096 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_grm.h" #include "dol2asm.h" @@ -259,24 +261,6 @@ SECTION_DEAD static char const* const stringBase_809D6E7A = "grA_mdl"; SECTION_DEAD static char const* const stringBase_809D6E82 = "TALK_SPA"; #pragma pop -/* 809D6E94-809D6EA0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809D6EA0-809D6EB4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809D6EB4-809D6EBC 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index ab325112146..ee0de236c55 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_grmc.h" enum grC_RES_File_ID { @@ -71,8 +73,6 @@ enum Motion { /* 0x8 */ MOT_SAD_WAIT = 0x8, }; -UNK_REL_DATA; - /* 809D9EAC-809D9EB4 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[1][2] = { {BMDR_GRC_A, GRC_MDL}, diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index 3c5f1863f7f..656aec2dbef 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_gro.h" #include "dol2asm.h" @@ -269,24 +271,6 @@ SECTION_DEAD static char const* const stringBase_809DF2D4 = "PUSHOUT"; SECTION_DEAD static char const* const stringBase_809DF2DC = ""; #pragma pop -/* 809DF2F8-809DF304 000000 000C+00 7/7 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809DF304-809DF318 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809DF318-809DF324 -00001 000C+00 0/0 0/0 0/0 .data @4083 */ #pragma push #pragma force_active on @@ -958,99 +942,6 @@ SECTION_RODATA static f32 const lit_4953 = 60.0f; COMPILER_STRIP_GATE(0x809DF04C, &lit_4953); #pragma pop -/* 809DF700-809DF704 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 809DF704-809DF708 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 809DF708-809DF70C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 809DF70C-809DF710 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 809DF710-809DF714 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 809DF714-809DF718 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 809DF718-809DF71C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 809DF71C-809DF720 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 809DF720-809DF724 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 809DF724-809DF728 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 809DF728-809DF72C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 809DF72C-809DF730 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 809DF730-809DF734 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 809DF734-809DF738 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 809DF738-809DF73C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 809DF73C-809DF740 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 809DF740-809DF74C 000048 000C+00 1/1 0/0 0/0 .bss @4095 */ static u8 lit_4095[12]; diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index fe46bc45e5b..45dd9026d25 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_grr.h" #include "Z2AudioLib/Z2Instances.h" @@ -114,10 +116,6 @@ enum Type { /* 0x3 */ TYPE_3 }; -UNK_REL_DATA; - -UNK_REL_BSS; - /* 809E3F44-809E3F48 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpc_grR_Param_c l_HIO; @@ -1119,7 +1117,7 @@ BOOL daNpc_grR_c::doEvent() { mStaffID = staffId; int evtCutNo = eventManager.getMyActIdx(staffId, &mEvtCutNameList, 1, 0, 0); - JUT_ASSERT(1771, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e)); + JUT_ASSERT(1771, (0 <= evtCutNo) && (evtCutNo < dEvent_manager_c::NUM_EVT_CUTS_e)); JUT_ASSERT(1772, 0 != mEvtCutList[evtCutNo]); if ((this->*mEvtCutList[evtCutNo])(staffId)) { @@ -1479,11 +1477,6 @@ static int daNpc_grR_IsDelete(void* a_this) { return 1; } -/* 809E3868-809E386C 004088 0004+00 1/0 0/0 0/0 .text adjustShapeAngle__11daNpc_grR_cFv */ -void daNpc_grR_c::adjustShapeAngle() { - /* empty function */ -} - AUDIO_INSTANCES; /* 809E3DB8-809E3DD8 -00001 0020+00 1/0 0/0 0/0 .data daNpc_grR_MethodTable */ diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 3105e54c98d..35bdfe53835 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_grs.h" #include "dol2asm.h" @@ -263,24 +265,6 @@ SECTION_DEAD static char const* const stringBase_809E7FA0 = "PUSHOUT"; SECTION_DEAD static char const* const stringBase_809E7FA8 = ""; #pragma pop -/* 809E7FC4-809E7FD0 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809E7FD0-809E7FE4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809E7FE4-809E7FF4 000020 0010+00 1/1 0/0 0/0 .data l_bmdGetParamList */ SECTION_DATA static u8 l_bmdGetParamList[16] = { 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, @@ -802,99 +786,6 @@ SECTION_RODATA static u8 const lit_4886[8] = { COMPILER_STRIP_GATE(0x809E7E84, &lit_4886); #pragma pop -/* 809E8238-809E823C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 809E823C-809E8240 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 809E8240-809E8244 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 809E8244-809E8248 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 809E8248-809E824C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 809E824C-809E8250 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 809E8250-809E8254 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 809E8254-809E8258 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 809E8258-809E825C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 809E825C-809E8260 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 809E8260-809E8264 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 809E8264-809E8268 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 809E8268-809E826C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 809E826C-809E8270 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 809E8270-809E8274 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 809E8274-809E8278 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 809E8278-809E8284 000048 000C+00 1/1 0/0 0/0 .bss @4050 */ static u8 lit_4050[12]; diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 5edaee79cb7..42dd8f1e3ae 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_grz.h" #include "dol2asm.h" @@ -327,24 +329,6 @@ SECTION_DEAD static char const* const stringBase_809EF685 = "REBIRTH"; SECTION_DEAD static char const* const stringBase_809EF68D = "GO_OUT"; #pragma pop -/* 809EF6A0-809EF6AC 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809EF6AC-809EF6C0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809EF6C0-809EF6C8 000020 0008+00 1/1 0/0 0/0 .data l_bmdGetParamList */ SECTION_DATA static u8 l_bmdGetParamList[8] = { 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, @@ -1156,99 +1140,6 @@ SECTION_RODATA static f32 const lit_4852 = 35.0f; COMPILER_STRIP_GATE(0x809EF2F0, &lit_4852); #pragma pop -/* 809EFC08-809EFC0C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 809EFC0C-809EFC10 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC10-809EFC14 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC14-809EFC18 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC18-809EFC1C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC1C-809EFC20 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC20-809EFC24 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC24-809EFC28 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC28-809EFC2C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC2C-809EFC30 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC30-809EFC34 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC34-809EFC38 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC38-809EFC3C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC3C-809EFC40 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC40-809EFC44 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 809EFC44-809EFC48 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 809EFC48-809EFC54 000048 000C+00 1/1 0/0 0/0 .bss @3810 */ static u8 lit_3810[12]; diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index 4dc8b00ef99..13dfd2b6a53 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_guard.h" #include "dol2asm.h" @@ -190,25 +192,6 @@ static void createHeapCallBack(fopAc_ac_c* param_0) { // NONMATCHING } -/* ############################################################################################## */ -/* 809F2D50-809F2D5C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809F2D5C-809F2D70 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809F2D70-809F2D7C -00001 000C+00 0/1 0/0 0/0 .data @3824 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index 421d5ebca79..5828b38b575 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_gwolf.h" #include "dolphin/types.h" #include "dol2asm.h" @@ -305,24 +307,6 @@ SECTION_DEAD static char const* const stringBase_809F87E8 = "GWolf"; SECTION_DEAD static char const* const stringBase_809F87EE = ""; #pragma pop -/* 809F87F4-809F8800 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 809F8800-809F8814 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 809F8814-809F881C 000020 0008+00 1/1 0/0 0/0 .data l_bmdGetParamList */ SECTION_DATA static u8 l_bmdGetParamList[8] = { 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, @@ -1269,99 +1253,6 @@ SECTION_RODATA static u8 const lit_4949[8] = { COMPILER_STRIP_GATE(0x809F85D4, &lit_4949); #pragma pop -/* 809F8EC8-809F8ECC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 809F8ECC-809F8ED0 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 809F8ED0-809F8ED4 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 809F8ED4-809F8ED8 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 809F8ED8-809F8EDC 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 809F8EDC-809F8EE0 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 809F8EE0-809F8EE4 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 809F8EE4-809F8EE8 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 809F8EE8-809F8EEC 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 809F8EEC-809F8EF0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 809F8EF0-809F8EF4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 809F8EF4-809F8EF8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 809F8EF8-809F8EFC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 809F8EFC-809F8F00 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 809F8F00-809F8F04 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 809F8F04-809F8F08 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 809F8F08-809F8F14 000048 000C+00 1/1 0/0 0/0 .bss @4017 */ static u8 lit_4017[12]; diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index 444a93883ff..2ae6c310741 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_hanjo.h" #include "d/actor/d_a_npc_tk.h" #include "d/actor/d_a_player.h" @@ -18,8 +20,6 @@ // Declarations: // -UNK_REL_DATA; - /* 80A00960-80A00980 000020 0020+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[4][2] = { {14, 1}, {26, 2}, @@ -700,8 +700,6 @@ void daNpc_Hanjo_c::afterMoved() { } } -UNK_REL_BSS; - /* 80A012D4-80A012D8 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpc_Hanjo_Param_c l_HIO; diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 0a0b23b2401..a1bbf1d2547 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_npc_henna.cpp +* @file d_a_npc_henna.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_henna.h" #include "SSystem/SComponent/c_counter.h" @@ -24,13 +26,32 @@ #include "m_Do/m_Do_graphic.h" class dmg_rod_class; -UNK_REL_BSS - -// -// Declarations: -// -UNK_REL_DATA +class daNpc_Henna_HIO_c : public JORReflexible { +public: + /* 80542F0C */ daNpc_Henna_HIO_c(); + /* 80549E40 */ virtual ~daNpc_Henna_HIO_c() {} + void genMessage(JORMContext*); + + s8 field_0x4; + f32 field_0x8; + s16 field_0xc; + s16 mSeasonDefColorR; + s16 mSeasonDefColorG; + s16 mSeasonDefColorB; + s16 mSeason2ColorR; + s16 mSeason2ColorG; + s16 mSeason2ColorB; + s16 mSeason3ColorR; + s16 mSeason3ColorG; + s16 mSeason3ColorB; + f32 mSeasonDefLightDist; + s16 mSeasonDefLightAngle; + f32 mSeason2LightDist; + s16 mSeason2LightAngle; + f32 mSeason3LightDist; + s16 mSeason3LightAngle; +}; /* 8054ACA8-8054ACB0 000020 0008+00 1/1 0/0 0/0 .data check_kind */ static u16 check_kind[4] = { diff --git a/src/d/actor/d_a_npc_henna0.cpp b/src/d/actor/d_a_npc_henna0.cpp index 68a5dcef72c..37741ebe337 100644 --- a/src/d/actor/d_a_npc_henna0.cpp +++ b/src/d/actor/d_a_npc_henna0.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_henna0.h" #include "dol2asm.h" // diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index ee2eee708cb..815013b3033 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_hoz.h" #include "dol2asm.h" @@ -301,24 +303,6 @@ SECTION_DEAD static char const* const stringBase_80A067DC = "Hoz3"; SECTION_DEAD static char const* const stringBase_80A067E1 = "Hoz2_3"; #pragma pop -/* 80A06804-80A06810 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A06810-80A06824 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A06824-80A06834 000020 0010+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[16] = { 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 49cba750fc5..5246ded5d8d 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -1,11 +1,11 @@ /** - * @file d_a_npc_impal.cpp +* @file d_a_npc_impal.cpp * */ -#include "d/actor/d_a_npc_impal.h" +#include "d/dolzel_rel.h" -UNK_REL_DATA +#include "d/actor/d_a_npc_impal.h" static daNpcImpal_Param_c l_HIO; diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp index 308f05c2a46..6661c9600dc 100644 --- a/src/d/actor/d_a_npc_inko.cpp +++ b/src/d/actor/d_a_npc_inko.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_inko.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index ae9bf1f915f..bfd9025c6d9 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_ins.h" #include "dol2asm.h" @@ -258,24 +260,6 @@ SECTION_DEAD static char const* const stringBase_80A14171 = "Ins2"; SECTION_DEAD static char const* const stringBase_80A14176 = "ins"; #pragma pop -/* 80A1419C-80A141A8 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A141A8-80A141BC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A141BC-80A142DC 000020 0120+00 1/2 0/0 0/0 .data l_bckGetParamList */ SECTION_DATA static u8 l_bckGetParamList[288] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 09bbf2f60eb..26027f7baec 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -3,6 +3,8 @@ * NPC - Jaggle */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_jagar.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_npc_bou.h" @@ -10,8 +12,6 @@ #include "d/d_meter2_info.h" #include "d/actor/d_a_tag_push.h" -UNK_REL_DATA; - enum Jagar_RES_File_ID { /* BCK */ /* 0x06 */ BCK_JAGA_F_TALK_A = 6, @@ -775,8 +775,6 @@ void daNpc_Jagar_c::beforeMove() { } } -UNK_REL_BSS; - /* 80A1AE2C-80A1AE30 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpc_Jagar_Param_c l_HIO; diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index a4c94230336..479302011b2 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_kakashi.h" #include "dol2asm.h" @@ -292,24 +294,6 @@ SECTION_DEAD static char const* const stringBase_8054ED76 = "SWDTUTORIAL"; SECTION_DEAD static char const* const stringBase_8054ED82 = "GET_WOODSWD"; #pragma pop -/* 8054ED9C-8054EDA8 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8054EDA8-8054EDBC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8054EDBC-8054EDD4 000020 0018+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[24] = { 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, @@ -978,99 +962,6 @@ SECTION_RODATA static f32 const lit_4835 = -20.0f; COMPILER_STRIP_GATE(0x8054EBA8, &lit_4835); #pragma pop -/* 8054F1A0-8054F1A4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8054F1A4-8054F1A8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1A8-8054F1AC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1AC-8054F1B0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1B0-8054F1B4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1B4-8054F1B8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1B8-8054F1BC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1BC-8054F1C0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1C0-8054F1C4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1C4-8054F1C8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1C8-8054F1CC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1CC-8054F1D0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1D0-8054F1D4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1D4-8054F1D8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1D8-8054F1DC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 8054F1DC-8054F1E0 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 8054F1E0-8054F1EC 000048 000C+00 1/1 0/0 0/0 .bss @3835 */ static u8 lit_3835[12]; diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index c93fbb03d83..5fb330dbb11 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_kasi_hana.h" #include "dol2asm.h" @@ -512,24 +514,6 @@ SECTION_DEAD static char const* const stringBase_80A2139E = "KASIMASI_CHEER"; SECTION_DEAD static char const* const stringBase_80A213AD = "KASIMASI_CHEER2"; #pragma pop -/* 80A213D4-80A213E0 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A213E0-80A213F4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A213F4-80A214A8 000020 00B4+00 1/1 0/0 0/0 .data l_bckGetParamList */ SECTION_DATA static u8 l_bckGetParamList[180] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, @@ -1638,100 +1622,6 @@ void daNpcKasiHana_c::fear(int param_0) { // NONMATCHING } -/* ############################################################################################## */ -/* 80A21808-80A2180C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80A2180C-80A21810 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80A21810-80A21814 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80A21814-80A21818 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80A21818-80A2181C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80A2181C-80A21820 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80A21820-80A21824 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80A21824-80A21828 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80A21828-80A2182C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80A2182C-80A21830 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80A21830-80A21834 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80A21834-80A21838 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80A21838-80A2183C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80A2183C-80A21840 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80A21840-80A21844 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80A21844-80A21848 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80A21848-80A21854 000048 000C+00 1/1 0/0 0/0 .bss @4323 */ static u8 lit_4323[12]; diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 342ef7d29dc..35a257e1a80 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_kasi_kyu.h" #include "dol2asm.h" @@ -230,24 +232,6 @@ SECTION_DEAD static char const* const stringBase_80A25B15 = "girls"; SECTION_DEAD static char const* const stringBase_80A25B1B = "Wgeneral"; #pragma pop -/* 80A25B24-80A25B30 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A25B30-80A25B44 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A25B44-80A25C04 000020 00C0+00 1/1 0/0 0/0 .data l_bckGetParamList */ SECTION_DATA static u8 l_bckGetParamList[192] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, @@ -907,100 +891,6 @@ void daNpcKasiKyu_c::setParam() { // NONMATCHING } -/* ############################################################################################## */ -/* 80A26010-80A26014 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80A26014-80A26018 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80A26018-80A2601C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80A2601C-80A26020 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80A26020-80A26024 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80A26024-80A26028 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80A26028-80A2602C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80A2602C-80A26030 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80A26030-80A26034 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80A26034-80A26038 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80A26038-80A2603C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80A2603C-80A26040 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80A26040-80A26044 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80A26044-80A26048 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80A26048-80A2604C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80A2604C-80A26050 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80A26050-80A2605C 000048 000C+00 1/1 0/0 0/0 .bss @3807 */ static u8 lit_3807[12]; diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index 2e8f167550c..1f229bd7bdc 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_kasi_mich.h" #include "dol2asm.h" @@ -230,24 +232,6 @@ SECTION_DEAD static char const* const stringBase_80A2A2A2 = "girls"; SECTION_DEAD static char const* const stringBase_80A2A2A8 = "Wgeneral"; #pragma pop -/* 80A2A2B4-80A2A2C0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A2A2C0-80A2A2D4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A2A2D4-80A2A394 000020 00C0+00 1/1 0/0 0/0 .data l_bckGetParamList */ SECTION_DATA static u8 l_bckGetParamList[192] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, @@ -907,100 +891,6 @@ void daNpcKasiMich_c::setParam() { // NONMATCHING } -/* ############################################################################################## */ -/* 80A2A7A0-80A2A7A4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80A2A7A4-80A2A7A8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7A8-80A2A7AC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7AC-80A2A7B0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7B0-80A2A7B4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7B4-80A2A7B8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7B8-80A2A7BC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7BC-80A2A7C0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7C0-80A2A7C4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7C4-80A2A7C8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7C8-80A2A7CC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7CC-80A2A7D0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7D0-80A2A7D4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7D4-80A2A7D8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7D8-80A2A7DC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80A2A7DC-80A2A7E0 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80A2A7E0-80A2A7EC 000048 000C+00 1/1 0/0 0/0 .bss @3807 */ static u8 lit_3807[12]; diff --git a/src/d/actor/d_a_npc_kdk.cpp b/src/d/actor/d_a_npc_kdk.cpp index 06196346826..2d9704164ce 100644 --- a/src/d/actor/d_a_npc_kdk.cpp +++ b/src/d/actor/d_a_npc_kdk.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_kdk.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 9126fd6aa8b..359489b36cb 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_kkri.h" #include "dol2asm.h" @@ -281,24 +283,6 @@ SECTION_DEAD static char const* const stringBase_805535E1 = "Kkri"; SECTION_DEAD static char const* const stringBase_805535E6 = "Kkri_TW"; #pragma pop -/* 805535F8-80553604 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80553604-80553618 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80553618-80553628 000020 0010+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[16] = { 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x02, diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index 32eb70295a8..f6f5b97709b 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_kn.h" #include "d/actor/d_a_npc.h" #include "d/actor/d_a_npc_gwolf.h" @@ -10,9 +12,6 @@ #include "JSystem//J3DGraphBase/J3DMaterial.h" #include "Z2AudioLib/Z2Instances.h" -UNK_REL_DATA -UNK_REL_BSS - /* ############################################################################################## */ /* 80A408C8-80A408F8 000000 0030+00 50/50 0/0 0/0 .rodata mCcDObjData__10daNpc_Kn_c */ const u8 daNpc_Kn_c::mCcDObjData[48] = { diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index c86c86259a1..7827ef03bd7 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_knj.h" #include "dol2asm.h" @@ -206,24 +208,6 @@ SECTION_DEAD static char const* const stringBase_80A455BD = "NO_RESPONSE"; SECTION_DEAD static char const* const stringBase_80A455C9 = "Knj"; #pragma pop -/* 80A455D0-80A455DC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A455DC-80A455F0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A455F0-80A455F8 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index 3b9b779be99..9ddd756cf25 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_kolin.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_npc_len.h" @@ -164,8 +166,6 @@ enum Event { /* 0x8 */ EVENT_CLOTH_TRY, }; -UNK_REL_DATA; - /* 8055A8E8-8055A900 000020 0018+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[3][2] = { {BMDR_KOLIN, KOLIN}, @@ -992,8 +992,6 @@ void daNpc_Kolin_c::beforeMove() { } } -UNK_REL_BSS; - /* 8055B41C-8055B420 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpc_Kolin_Param_c l_HIO; diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index aeace80e79f..e3ffe020413 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_kolinb.h" enum Kolinb_RES_File_ID { @@ -95,8 +97,6 @@ enum TYPE { /* 0x3 */ TYPE_3, }; -UNK_REL_DATA; - /* 80A48874-80A48884 000020 0010+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[2][2] = { {BMDR_KOLINB, KOLINB}, diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 1c9f8951d82..02843ca6ca5 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_ks.h" #include "d/actor/d_a_obj_kago.h" #include "d/d_cc_d.h" @@ -27,7 +29,27 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/d_s_play.h" -UNK_REL_DATA; +class daNpc_Ks_HIO_c : public JORReflexible { +public: + /* 80A48F8C */ daNpc_Ks_HIO_c(); + /* 80A5DA90 */ virtual ~daNpc_Ks_HIO_c() {}; + + void genMessage(JORMContext*); + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ u8 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; +}; /* 80A5E478-80A5E498 000020 0020+00 13/13 0/0 0/0 .data saru_p */ static npc_ks_class* saru_p[8] = { @@ -247,9 +269,7 @@ static void* s_resq_sub(void* i_actor, void* i_data) { ((npc_ks_class*)i_actor)->field_0x94c = cM_rndF(50.0f) + 220.0f; } return NULL; -} - -UNK_REL_BSS; +}; /* 80A5FE94-80A5FEA0 000054 000C+00 1/5 0/0 0/0 .bss obj_pos */ static cXyz obj_pos; diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 3edcf13bb97..55f84487308 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_kyury.h" #include "dol2asm.h" @@ -266,24 +268,6 @@ SECTION_DEAD static char const* const stringBase_80A639EA = "Kyury1"; SECTION_DEAD static char const* const stringBase_80A639F1 = "CONVERSATION"; #pragma pop -/* 80A63A14-80A63A20 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A63A20-80A63A34 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A63A34-80A63A4C 000020 0018+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[24] = { 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2A, diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 26524a2a401..c3d18e1c5d4 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_len.h" #include "dol2asm.h" @@ -296,24 +298,6 @@ SECTION_DEAD static char const* const stringBase_80A69048 = "CONVERSATION_IN_HOT SECTION_DEAD static char const* const stringBase_80A6905E = "TAKE_WOODSTATUE"; #pragma pop -/* 80A69088-80A69094 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A69094-80A690A8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A690A8-80A690B8 000020 0010+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[16] = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x02, diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index edc8e61a7a3..e63f28e211d 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -6,6 +6,8 @@ * @details Group of several small fish spawned in a group. Used in Fishing Pond. */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_lf.h" /* 80A6AA1C-80A6AA28 000000 000C+00 1/1 0/0 0/0 .data wp$3976 */ diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index 0677c032881..d072e8da065 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_lud.h" #include "dol2asm.h" @@ -300,24 +302,6 @@ SECTION_DEAD static char const* const stringBase_80A6FF5D = "CLOTH_TRY"; SECTION_DEAD static char const* const stringBase_80A6FF67 = "THANK_YOU"; #pragma pop -/* 80A6FFCC-80A6FFD8 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A6FFD8-80A6FFEC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A6FFEC-80A70014 000020 0028+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[40] = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index a5ec3bb04b1..a32361f3473 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_maro.h" #include "d/actor/d_a_horse.h" #include "d/actor/d_a_npc_len.h" @@ -18,8 +20,6 @@ // Declarations: // -UNK_REL_DATA; - daNpc_Maro_c::actionFunc dummy_lit_4085() { return &daNpc_Maro_c::choccai; } diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index 8dd594f486e..e2f23feb41b 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -3,11 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_midp.h" #include "SSystem/SComponent/c_counter.h" -UNK_REL_DATA - /* 80A73AD4-80A73ADC 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[2][1] = { {9}, {1} diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index 9d71765c4b4..252b23dc55c 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_mk.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index 98074d62728..836f070f887 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -1,17 +1,16 @@ /** - * @file d_a_npc_moi.cpp +* @file d_a_npc_moi.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_moi.h" #include "SSystem/SComponent/c_counter.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_ep.h" #include "d/actor/d_a_npc_uri.h" -UNK_REL_DATA -UNK_REL_BSS - /* 80A7B17C-80A7B1BC 000020 0040+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[8][2] = { {11, 1}, {29, 3}, {30, 3}, {31, 3}, {13, 1}, {33, 3}, {12, 1}, {32, 3}, diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index 6de11530251..745b1b40a23 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_moir.h" #include "d/actor/d_a_ni.h" #include "d/actor/d_a_npc_tk.h" @@ -119,8 +121,6 @@ enum Joint { /* 0x19 */ JNT_FOOTR }; -UNK_REL_DATA; - /* 80A838D0-80A83AA4 000020 01D4+00 3/4 0/0 0/0 .data l_bckGetParamList */ static daNpc_GetParam2 l_bckGetParamList[39] = { {-1, J3DFrameCtrl::EMode_NONE, MoiR}, diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index e115841f5dd..6cf08a81546 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_myna2.h" #include "dol2asm.h" @@ -242,24 +244,6 @@ SECTION_DEAD static char const* const stringBase_80A886A1 = "myna2"; SECTION_DEAD static char const* const stringBase_80A886A7 = ""; #pragma pop -/* 80A886B4-80A886C0 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A886C0-80A886D4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A886D4-80A886DC 000020 0008+00 1/1 0/0 0/0 .data l_bmdGetParamList */ SECTION_DATA static u8 l_bmdGetParamList[8] = { 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, @@ -833,99 +817,6 @@ SECTION_RODATA static f32 const lit_4645 = 10.0f; COMPILER_STRIP_GATE(0x80A884E0, &lit_4645); #pragma pop -/* 80A88AF8-80A88AFC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80A88AFC-80A88B00 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B00-80A88B04 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B04-80A88B08 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B08-80A88B0C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B0C-80A88B10 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B10-80A88B14 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B14-80A88B18 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B18-80A88B1C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B1C-80A88B20 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B20-80A88B24 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B24-80A88B28 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B28-80A88B2C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B2C-80A88B30 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B30-80A88B34 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80A88B34-80A88B38 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80A88B38-80A88B44 000048 000C+00 1/1 0/0 0/0 .bss @4032 */ static u8 lit_4032[12]; diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index fde053eadb2..bd4677f3c36 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -3,6 +3,8 @@ * NPC - Cat */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_ne.h" #include "SSystem/SComponent/c_counter.h" #include "d/d_com_inf_game.h" @@ -309,97 +311,8 @@ static s16 climb_angle_get(npc_ne_class* i_this) { return 0; } -/* 80A92A88-80A92A8C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80A92A8C-80A92A90 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80A92A90-80A92A94 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80A92A94-80A92A98 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80A92A98-80A92A9C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80A92A9C-80A92AA0 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80A92AA0-80A92AA4 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80A92AA4-80A92AA8 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80A92AA8-80A92AAC 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80A92AAC-80A92AB0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80A92AB0-80A92AB4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80A92AB4-80A92AB8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80A92AB8-80A92ABC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80A92ABC-80A92AC0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80A92AC0-80A92AC4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - /* 80A92AC4-80A92AC8 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 80A92AC4 0001+00 data_80A92AC4 @1009 */ /* 80A92AC5 0003+00 data_80A92AC5 None */ -static u8 struct_80A92AC4; static bool l_hioInit; /* 80A92AD4-80A92AF0 000054 001C+00 11/11 0/0 0/0 .bss l_HIO */ diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index 08b53c170f2..cee11241b70 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_p2.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index 2626917580b..c6c70606e09 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_pachi_besu.h" #include "dol2asm.h" @@ -300,24 +302,6 @@ SECTION_DEAD static char const* const stringBase_80A96C0F = "TUTRIAL_CONTINUE"; SECTION_DEAD static char const* const stringBase_80A96C20 = "TUTRIAL_CAUTION"; #pragma pop -/* 80A96C40-80A96C4C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A96C4C-80A96C60 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A96C60-80A96C90 000020 0030+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[48] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x02, @@ -1167,99 +1151,6 @@ void daNpc_Pachi_Besu_c::setParam() { SECTION_RODATA static f32 const lit_4732 = -1.0f; COMPILER_STRIP_GATE(0x80A96B20, &lit_4732); -/* 80A97AC8-80A97ACC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80A97ACC-80A97AD0 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AD0-80A97AD4 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AD4-80A97AD8 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AD8-80A97ADC 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80A97ADC-80A97AE0 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AE0-80A97AE4 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AE4-80A97AE8 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AE8-80A97AEC 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AEC-80A97AF0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AF0-80A97AF4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AF4-80A97AF8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AF8-80A97AFC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80A97AFC-80A97B00 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80A97B00-80A97B04 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80A97B04-80A97B08 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80A97B08-80A97B14 000048 000C+00 1/1 0/0 0/0 .bss @3963 */ static u8 lit_3963[12]; diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index 76c611f0bbf..478e5587155 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_pachi_maro.h" #include "dol2asm.h" @@ -301,24 +303,6 @@ SECTION_DEAD static char const* const stringBase_80A9BA48 = "TUTRIAL_CONTINUE"; SECTION_DEAD static char const* const stringBase_80A9BA59 = "TUTRIAL_CAUTION"; #pragma pop -/* 80A9BA78-80A9BA84 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80A9BA84-80A9BA98 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80A9BA98-80A9BAA8 000020 0010+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[16] = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 1c73165679b..c0f41cc0ae0 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_pachi_taro.h" #include "dol2asm.h" @@ -342,24 +344,6 @@ SECTION_DEAD static char const* const stringBase_80AA18EC = "Len1"; SECTION_DEAD static char const* const stringBase_80AA18F1 = "evt_pachi"; #pragma pop -/* 80AA192C-80AA1938 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AA1938-80AA194C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AA194C-80AA1974 000020 0028+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[40] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, diff --git a/src/d/actor/d_a_npc_passer.cpp b/src/d/actor/d_a_npc_passer.cpp index bf341a97e49..16b8b8ca1eb 100644 --- a/src/d/actor/d_a_npc_passer.cpp +++ b/src/d/actor/d_a_npc_passer.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_passer.h" #include "dol2asm.h" @@ -299,24 +301,6 @@ extern "C" u8 m_seq26_funcTbl__13daNpcPasser_c[36]; /* 80AA7364-80AA7370 000960 000C+00 1/1 0/0 0/0 .data m_seq27_funcTbl__13daNpcPasser_c */ extern "C" u8 m_seq27_funcTbl__13daNpcPasser_c[12]; -/* 80AA6A04-80AA6A10 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AA6A10-80AA6A24 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AA6A24-80AA6A30 -00001 000C+00 0/1 0/0 0/0 .data @3829 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_npc_passer2.cpp b/src/d/actor/d_a_npc_passer2.cpp index bcc046fbf4a..50564d1fd4d 100644 --- a/src/d/actor/d_a_npc_passer2.cpp +++ b/src/d/actor/d_a_npc_passer2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_passer2.h" #include "dol2asm.h" @@ -133,25 +135,6 @@ static void createHeapCallBack(fopAc_ac_c* param_0) { // NONMATCHING } -/* ############################################################################################## */ -/* 80AA8A68-80AA8A74 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AA8A74-80AA8A88 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AA8A88-80AA8A94 -00001 000C+00 0/1 0/0 0/0 .data @3845 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index 3b2f0c6433f..09ca145abd1 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_post.h" #include "dol2asm.h" @@ -302,24 +304,6 @@ SECTION_DEAD static char const* const stringBase_80AAD38F = "post1"; SECTION_DEAD static char const* const stringBase_80AAD395 = "post2"; #pragma pop -/* 80AAD3AC-80AAD3B8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AAD3B8-80AAD3CC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AAD3CC-80AAD3EC 000020 0020+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[32] = { 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, @@ -1098,99 +1082,6 @@ SECTION_RODATA static u8 const lit_4845[8] = { }; COMPILER_STRIP_GATE(0x80AAD2EC, &lit_4845); -/* 80AADBF0-80AADBF4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80AADBF4-80AADBF8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80AADBF8-80AADBFC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80AADBFC-80AADC00 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC00-80AADC04 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC04-80AADC08 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC08-80AADC0C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC0C-80AADC10 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC10-80AADC14 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC14-80AADC18 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC18-80AADC1C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC1C-80AADC20 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC20-80AADC24 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC24-80AADC28 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC28-80AADC2C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80AADC2C-80AADC30 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80AADC30-80AADC3C 000048 000C+00 1/1 0/0 0/0 .bss @3839 */ static u8 lit_3839[12]; diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index 88fc1833ce6..5de4a97a1ec 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_pouya.h" #include "dol2asm.h" @@ -293,24 +295,6 @@ SECTION_DEAD static char const* const stringBase_80AB21B7 = "HAVE_FAVORTO_ASK"; SECTION_DEAD static char const* const stringBase_80AB21C8 = "RETURN_FAVOR"; #pragma pop -/* 80AB21F0-80AB21FC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AB21FC-80AB2210 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AB2210-80AB2228 000020 0018+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[24] = { 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x17, diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index b3e8cdd76d0..8b234e16729 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -3,11 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_prayer.h" #include "d/d_com_inf_game.h" -UNK_REL_DATA - /* 80AB5BB4-80AB5BB8 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpcPray_Param_c l_HIO; diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index 52a602f1d12..699b44383b8 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_raca.h" #include "dol2asm.h" @@ -264,24 +266,6 @@ SECTION_DEAD static char const* const stringBase_80AB8FA9 = "NO_RESPONSE"; SECTION_DEAD static char const* const stringBase_80AB8FB5 = "Raca"; #pragma pop -/* 80AB8FBC-80AB8FC8 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AB8FC8-80AB8FDC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AB8FDC-80AB8FE4 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index d1dda84c847..0b52ee1b181 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_rafrel.h" #include "dol2asm.h" @@ -265,24 +267,6 @@ SECTION_DEAD static char const* const stringBase_80ABFE1D = "RESIST_WIRETAP_SHAD SECTION_DEAD static char const* const stringBase_80ABFE31 = "RESIST_WIRETAP_RAFREL"; #pragma pop -/* 80ABFE80-80ABFE8C 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80ABFE8C-80ABFEA0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80ABFEA0-80ABFFFC 000020 015C+00 1/2 0/0 0/0 .data l_bckGetParamList */ SECTION_DATA static u8 l_bckGetParamList[348] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 5c958206c8f..99e8ace64ed 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_saru.h" #include "d/actor/d_a_npc_ks.h" #include "d/actor/d_a_obj_so.h" @@ -57,8 +59,6 @@ enum Material { /* 0x2 */ MAT_SARU_FACE_M, }; -UNK_REL_DATA; - /* 80AC46C4-80AC46E4 000020 0020+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[4][2] = { { npc_ks_class::BMDR_SARU, 1 }, { BMDR_SARU_TW, 2 }, { npc_ks_class::BMDR_SARU_BARA, 1 }, { BMDR_SARU_BARA_TW, 2 }, diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 845ada31e49..7b51e8b0295 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -1,11 +1,11 @@ /** - * @file d_a_npc_seib.cpp +* @file d_a_npc_seib.cpp * */ -#include "d/actor/d_a_npc_seib.h" +#include "d/dolzel_rel.h" -UNK_REL_DATA +#include "d/actor/d_a_npc_seib.h" /* 80AC7118-80AC7120 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ 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 79d31accd36..b9911cb1eed 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -3,11 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_seic.h" #include "SSystem/SComponent/c_counter.h" -UNK_REL_DATA - /* 80AC9310-80AC9318 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ 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 de660d723fe..a2f884e5a68 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -3,11 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_seid.h" #include "SSystem/SComponent/c_counter.h" -UNK_REL_DATA - /* 80ACB450-80ACB458 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ 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 00d49052dcf..fb99ade8936 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_seira.h" #include "dol2asm.h" @@ -307,24 +309,6 @@ SECTION_DEAD static char const* const stringBase_80ACFF5C = "Seira_p1"; SECTION_DEAD static char const* const stringBase_80ACFF65 = "CONVERSATION_ABOUT_SARU"; #pragma pop -/* 80ACFF90-80ACFF9C 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80ACFF9C-80ACFFB0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80ACFFB0-80ACFFC0 000020 0010+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[16] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x02, diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 181ec3782a8..2ed1766c8e0 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_seira2.h" #include "dol2asm.h" @@ -293,24 +295,6 @@ SECTION_DEAD static char const* const stringBase_80AD4B73 = "SeraBtl"; SECTION_DEAD static char const* const stringBase_80AD4B7B = "Sera"; #pragma pop -/* 80AD4B90-80AD4B9C 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AD4B9C-80AD4BB0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AD4BB0-80AD4BC0 000020 0010+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[16] = { 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x02, diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index 80dca3d3af5..e85c8bcf811 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_seirei.h" #include "dol2asm.h" @@ -229,24 +231,6 @@ SECTION_DEAD static char const* const stringBase_80AD7DC2 = "Seirei1"; SECTION_DEAD static char const* const stringBase_80AD7DCA = "CONVERSATION"; #pragma pop -/* 80AD7DE4-80AD7DF0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AD7DF0-80AD7E04 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AD7E04-80AD7E0C 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 72b781ce35c..e48974ec6f6 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -3,12 +3,30 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_shad.h" #include "d/actor/d_a_cstaF.h" #include "d/actor/d_a_npc.h" #include "d/actor/d_a_tag_evtarea.h" #include "d/d_msg_object.h" +struct daNpcShad_HIOParam { + /* 0x00 */ daNpcF_HIOParam common; + /* 0x6C */ f32 traveling_speed; // 走行速度 (Traveling Speed) +}; + +class daNpcShad_Param_c: public JORReflexible { +public: + /* 80AE1F70 */ virtual ~daNpcShad_Param_c() {} + +#ifdef DEBUG + void genMessage(JORMContext*); +#endif + + static const daNpcShad_HIOParam m; +}; + enum Shad_RES_File_ID { /* BCK */ /* 0x07 */ BCK_SHAD_F_DISCOURAGED = 0x7, @@ -136,8 +154,6 @@ enum Joint { /* 0x1E */ JNT_FOOTR, }; -UNK_REL_DATA - /* 80AE2640-80AE27F0 000020 01B0+00 1/2 0/0 0/0 .data l_bckGetParamList */ static daNpc_GetParam2 l_bckGetParamList[36] = { {-1, J3DFrameCtrl::EMode_LOOP, SHAD}, diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index 21a969d1063..6675f839074 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_shaman.h" #include "dol2asm.h" @@ -291,24 +293,6 @@ SECTION_DEAD static char const* const stringBase_80AE6CF6 = "RETURN"; SECTION_DEAD static char const* const stringBase_80AE6CFD = "Sha"; #pragma pop -/* 80AE6D18-80AE6D24 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AE6D24-80AE6D38 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AE6D38-80AE6D40 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index 4ff8a194cf1..a332579fcc5 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_shoe.h" #include "dol2asm.h" @@ -38,21 +40,6 @@ bool daNpcShoe_c::chkFindPlayer() { return ret; } -/* 80AEA538-80AEA544 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AEA544-80AEA558 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80AEA558-80AEA594 000020 003C+00 1/1 0/0 0/0 .data l_bckGetParamList */ static daNpc_GetParam2 l_bckGetParamList[5] = { { 17, 2, 1}, // m_sitwait_a diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 3491baa2201..38d830ab856 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_shop0.h" /* 80AEA7D8-80AEA7F8 000078 0020+00 1/1 0/0 0/0 .text createHeapCallBack__FP10fopAc_ac_c diff --git a/src/d/actor/d_a_npc_shop_maro.cpp b/src/d/actor/d_a_npc_shop_maro.cpp index b8aaf659fd7..bc9049d1820 100644 --- a/src/d/actor/d_a_npc_shop_maro.cpp +++ b/src/d/actor/d_a_npc_shop_maro.cpp @@ -3,8 +3,9 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_shop_maro.h" -#include "dol2asm.h" /* 80AEBE58-80AEBE78 000078 0020+00 1/0 0/0 0/0 .text daNpc_shopMaro_Create__FPv */ static int daNpc_shopMaro_Create(void* i_this) { @@ -50,24 +51,18 @@ static actor_method_class daNpc_shopMaro_MethodTable = { /* 80AEC958-80AEC988 -00001 0030+00 0/0 0/0 1/0 .data g_profile_NPC_SMARO */ extern actor_process_profile_definition g_profile_NPC_SMARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SMARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_shopMaro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 365, // mPriority - &daNpc_shopMaro_MethodTable, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType -}; - -/* 80AEBF04-80AEBF64 000124 0060+00 1/1 0/0 0/0 .text __ct__16daNpc_shopMaro_cFv */ -daNpc_shopMaro_c::daNpc_shopMaro_c() : dShopSystem_c(0,0,0,0,0,0,0,0) {} - -/* 80AEBF64-80AEBFC4 000184 0060+00 1/0 0/0 0/0 .text __dt__16daNpc_shopMaro_cFv */ -daNpc_shopMaro_c::~daNpc_shopMaro_c() {} + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_NPC_SMARO, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daNpc_shopMaro_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 365, // mPriority + &daNpc_shopMaro_MethodTable, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_0_e, // cullType + }; diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index 2fc5cb976c8..1fe32e02c91 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_sola.h" #include "dol2asm.h" @@ -224,24 +226,6 @@ SECTION_DEAD static char const* const stringBase_80AEF1E1 = "NO_RESPONSE"; SECTION_DEAD static char const* const stringBase_80AEF1ED = "solA"; #pragma pop -/* 80AEF1F4-80AEF200 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AEF200-80AEF214 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AEF214-80AEF21C 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index 460c1a632fa..16f15a4472a 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_soldierA.h" #include "dol2asm.h" @@ -225,24 +227,6 @@ SECTION_DEAD static char const* const stringBase_80AF2876 = ""; SECTION_DEAD static char const* const stringBase_80AF2877 = "LISTEN_LAKE"; #pragma pop -/* 80AF2888-80AF2894 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AF2894-80AF28A8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AF28A8-80AF28B8 000020 0010+00 1/1 0/0 0/0 .data l_bmdGetParamList */ SECTION_DATA static u8 l_bmdGetParamList[16] = { 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, @@ -695,99 +679,6 @@ SECTION_RODATA static u8 const lit_4794[8] = { COMPILER_STRIP_GATE(0x80AF2798, &lit_4794); #pragma pop -/* 80AF2AF0-80AF2AF4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80AF2AF4-80AF2AF8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2AF8-80AF2AFC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2AFC-80AF2B00 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B00-80AF2B04 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B04-80AF2B08 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B08-80AF2B0C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B0C-80AF2B10 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B10-80AF2B14 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B14-80AF2B18 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B18-80AF2B1C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B1C-80AF2B20 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B20-80AF2B24 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B24-80AF2B28 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B28-80AF2B2C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80AF2B2C-80AF2B30 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80AF2B30-80AF2B3C 000048 000C+00 1/1 0/0 0/0 .bss @4017 */ static u8 lit_4017[12]; diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index f5db99ec03c..7fd39335e88 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_soldierB.h" #include "dol2asm.h" @@ -223,24 +225,6 @@ SECTION_DEAD static char const* const stringBase_80AF5BFC = ""; SECTION_DEAD static char const* const stringBase_80AF5BFD = "LISTEN_LAKE"; #pragma pop -/* 80AF5C10-80AF5C1C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AF5C1C-80AF5C30 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80AF5C30-80AF5C40 000020 0010+00 1/1 0/0 0/0 .data l_bmdGetParamList */ SECTION_DATA static u8 l_bmdGetParamList[16] = { 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, @@ -673,99 +657,6 @@ SECTION_RODATA static u8 const lit_4795[8] = { COMPILER_STRIP_GATE(0x80AF5B84, &lit_4795); #pragma pop -/* 80AF5E30-80AF5E34 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80AF5E34-80AF5E38 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E38-80AF5E3C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E3C-80AF5E40 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E40-80AF5E44 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E44-80AF5E48 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E48-80AF5E4C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E4C-80AF5E50 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E50-80AF5E54 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E54-80AF5E58 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E58-80AF5E5C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E5C-80AF5E60 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E60-80AF5E64 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E64-80AF5E68 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E68-80AF5E6C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80AF5E6C-80AF5E70 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80AF5E70-80AF5E7C 000048 000C+00 1/1 0/0 0/0 .bss @4023 */ static u8 lit_4023[12]; diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index 00c9928d908..5b5cc952c63 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -3,6 +3,8 @@ * NPC - Squirrel */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_sq.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/JKernel/JKRHeap.h" diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 734de3af381..4e1f3fe6acc 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_taro.h" #include "JSystem/JUtility/JUTAssert.h" #include "d/actor/d_a_npc_len.h" @@ -25,10 +27,6 @@ enum TaroEvent { /* 0x18 */ EVENT_18 = 0x18, }; -UNK_REL_DATA - -UNK_REL_BSS - /* 805735AC-805735B0 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpc_Taro_HIO_c l_HIO; diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index ca1a7d50e16..bce6f592ff1 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -3,6 +3,8 @@ * NPC - Telma */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_the.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -241,21 +243,6 @@ extern "C" void __register_global_object(); // Declarations: // -/* 80AFC1D0-80AFC1DC 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80AFC1DC-80AFC1F0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80AFC67C-80AFC680 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpcThe_Param_c l_HIO; diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 15a5b05a167..9e6ce86880d 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -3,6 +3,8 @@ * Telma B */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_theB.h" #include "dol2asm.h" @@ -262,24 +264,6 @@ SECTION_DEAD static char const* const stringBase_80B01003 = "Coach"; SECTION_DEAD static char const* const stringBase_80B01009 = "TheB"; #pragma pop -/* 80B01028-80B01034 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B01034-80B01048 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80B01048-80B0104C 000020 0004+00 0/0 0/0 0/0 .data l_bmdGetParamList */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 8519aab5e20..13b27ffe7d3 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_npc_tk.cpp +* @file d_a_npc_tk.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_tk.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_ni.h" @@ -13,7 +15,30 @@ #include "d/d_camera.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" -#include "dol2asm.h" + +class daNPC_TK_HIO_c : public JORReflexible { +public: + daNPC_TK_HIO_c(); + virtual ~daNPC_TK_HIO_c() {} + + void genMessage(JORMContext*) {} + + s8 field_0x4; + f32 field_0x8; + f32 field_0xc; + f32 field_0x10; + f32 field_0x14; + f32 field_0x18; + f32 field_0x1c; + f32 field_0x20; + f32 field_0x24; + f32 field_0x28; + f32 mFlySpeed; + f32 field_0x30; + f32 field_0x34; + f32 field_0x38; + u8 field_0x3c; +}; // // Declarations: @@ -235,8 +260,6 @@ void daNPC_TK_c::setFlySE() { } } -UNK_REL_BSS - static s16 m_near_angle; static fopAc_ac_c* m_near_actor; diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index 03fb6484749..b004de46f9b 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_tkc.h" #include "dol2asm.h" #include "d/d_camera.h" @@ -246,24 +248,6 @@ SECTION_DEAD static char const* const stringBase_80B10A41 = "TKC_WARP"; SECTION_DEAD static char const* const stringBase_80B10A4A = "Tkc"; #pragma pop -/* 80B10A60-80B10A6C 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B10A6C-80B10A80 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80B10A80-80B10A98 000020 0018+00 1/2 0/0 0/0 .data l_bckGetParamList */ SECTION_DATA static u8 l_bckGetParamList[24] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x06, diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index a1f174f273e..090160b1a28 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_tkj.h" #include "dol2asm.h" @@ -253,24 +255,6 @@ SECTION_DEAD static char const* const stringBase_8057669D = "Tkj"; SECTION_DEAD static char const* const stringBase_805766A1 = "LV7_FIRST_START"; #pragma pop -/* 805766B4-805766C0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 805766C0-805766D4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 805766D4-805766DC 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 9a26f419104..9b49ec81a2c 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_tkj2.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index e9f0040a1e6..fd709d6aac9 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_tks.h" #include "dol2asm.h" @@ -306,24 +308,6 @@ SECTION_DEAD static char const* const stringBase_80B1E05F = "TKS_ENCOUNTER"; SECTION_DEAD static char const* const stringBase_80B1E06D = "Tks"; #pragma pop -/* 80B1E0E4-80B1E0F0 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B1E0F0-80B1E104 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80B1E104-80B1E1B4 000020 00B0+00 1/2 0/0 0/0 .data l_bckGetParamList */ SECTION_DATA static u8 l_bckGetParamList[176] = { 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index d1308bf1958..6f07a962fc6 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_toby.h" #include "dol2asm.h" @@ -336,24 +338,6 @@ SECTION_DEAD static char const* const stringBase_80B24C1C = "Toby5"; SECTION_DEAD static char const* const stringBase_80B24C22 = "TOBY_HOUSE_FIRE"; #pragma pop -/* 80B24C48-80B24C54 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B24C54-80B24C68 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80B24C68-80B24C80 000020 0018+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[24] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, @@ -1354,99 +1338,6 @@ SECTION_RODATA static u8 const lit_4992[8] = { }; COMPILER_STRIP_GATE(0x80B24AF4, &lit_4992); -/* 80B25840-80B25844 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80B25844-80B25848 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80B25848-80B2584C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80B2584C-80B25850 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80B25850-80B25854 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80B25854-80B25858 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80B25858-80B2585C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80B2585C-80B25860 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80B25860-80B25864 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80B25864-80B25868 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80B25868-80B2586C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80B2586C-80B25870 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80B25870-80B25874 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80B25874-80B25878 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80B25878-80B2587C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80B2587C-80B25880 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80B25880-80B2588C 000048 000C+00 1/1 0/0 0/0 .bss @3933 */ static u8 lit_3933[12]; diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp index 959df9162ef..3b7f022eb5a 100644 --- a/src/d/actor/d_a_npc_tr.cpp +++ b/src/d/actor/d_a_npc_tr.cpp @@ -3,6 +3,8 @@ // NPC - Trout // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_tr.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index 9ec7990b34c..b5b563b8546 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -1,14 +1,14 @@ /** - * @file d_a_npc_uri.cpp +* @file d_a_npc_uri.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_uri.h" #include "Z2AudioLib/Z2Instances.h" #include "m_Do/m_Do_graphic.h" -UNK_REL_DATA; - /* 80B2D068-80B2D078 000020 0010+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[2][2] = {{12, 1}, {33, 2}}; @@ -713,8 +713,6 @@ void daNpc_Uri_c::beforeMove() { } } -UNK_REL_BSS; - /* 80B2DD64-80B2DD68 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpc_Uri_Param_c l_HIO; diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index 3426de39267..188f6277a52 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_worm.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index db65e6df5f6..36565d754fa 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_wrestler.h" #include "d/d_timer.h" #include "dolphin/types.h" @@ -14,8 +16,6 @@ #include "m_Do/m_Do_graphic.h" #include "d/d_meter2_info.h" -UNK_REL_DATA; - enum Bou3_RES_File_ID { /* BCK */ /* 0x06 */ BCK_BOUS_DOWN = 6, diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index 0523bd04d46..85036e7f4e0 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_yamid.h" enum yamiD_RES_File_ID { @@ -39,8 +41,6 @@ enum Motion { /* 0x1 */ MOT_STEP, }; -UNK_REL_DATA - /* 80B46164-80B4616C 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[1][2] = { {BMDR_YAMID, YAMID}, diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index 64887bdaa38..d70862a7f4d 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_yamis.h" #include "dol2asm.h" @@ -261,24 +263,6 @@ SECTION_DEAD static char const* const stringBase_80B49791 = "STOPPER"; SECTION_DEAD static char const* const stringBase_80B49799 = "yamiS"; #pragma pop -/* 80B497A8-80B497B4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B497B4-80B497C8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80B497C8-80B497D0 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index 365745d5091..2b6ebaabf29 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_yamit.h" #include "dol2asm.h" @@ -263,24 +265,6 @@ SECTION_DEAD static char const* const stringBase_80B4CE85 = "STOPPER"; SECTION_DEAD static char const* const stringBase_80B4CE8D = "yamiT"; #pragma pop -/* 80B4CE9C-80B4CEA8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B4CEA8-80B4CEBC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80B4CEBC-80B4CEC4 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index a1ba70e1ed9..5076c02ef01 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -3,11 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_yelia.h" #include "d/actor/d_a_demo_item.h" -UNK_REL_DATA - /* 80B524FC-80B52514 000020 0018+00 1/1 0/0 0/0 .data l_bmdData */ 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 1e3a9e44322..97e1da82785 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_ykm.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_obj_gadget.h" @@ -167,8 +169,6 @@ enum RES_Name { /* 0x4 */ YKM3, }; -UNK_REL_DATA; - /* 80B5DB08-80B5DB38 000020 0030+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[6][2] = { {BMDR_YKM, YKM}, @@ -3612,8 +3612,6 @@ static int daNpc_ykM_IsDelete(void* a_this) { return 1; } -UNK_REL_BSS; - /* 80B5ED74-80B5ED80 000054 000C+00 0/1 0/0 0/0 .bss l_SBRaceStartPos */ static cXyz l_SBRaceStartPos; diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 987f7078767..6715d4ed77f 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_ykw.h" #include "dol2asm.h" @@ -382,24 +384,6 @@ SECTION_DEAD static char const* const stringBase_80B67F07 = "GO_INTO_BOSSROOM"; SECTION_DEAD static char const* const stringBase_80B67F18 = "HUG"; #pragma pop -/* 80B67F40-80B67F4C 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B67F4C-80B67F60 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80B67F60-80B67F68 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01, @@ -1586,99 +1570,6 @@ SECTION_RODATA static u8 const lit_5472[8] = { }; COMPILER_STRIP_GATE(0x80B67D90, &lit_5472); -/* 80B68D68-80B68D6C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80B68D6C-80B68D70 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D70-80B68D74 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D74-80B68D78 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D78-80B68D7C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D7C-80B68D80 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D80-80B68D84 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D84-80B68D88 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D88-80B68D8C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D8C-80B68D90 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D90-80B68D94 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D94-80B68D98 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D98-80B68D9C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80B68D9C-80B68DA0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80B68DA0-80B68DA4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80B68DA4-80B68DA8 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80B68DA8-80B68DB4 000048 000C+00 1/1 0/0 0/0 .bss @4126 */ static u8 lit_4126[12]; diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index 22fbca04728..0de3f31f430 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_zanb.h" #include "dol2asm.h" @@ -249,24 +251,6 @@ SECTION_DEAD static char const* const stringBase_80B6BDBD = "NO_RESPONSE"; SECTION_DEAD static char const* const stringBase_80B6BDC9 = "zanB"; #pragma pop -/* 80B6BDD0-80B6BDDC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B6BDDC-80B6BDF0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80B6BDF0-80B6BDF8 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index 8cb2bd6d7bc..ce4f4cbe112 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -3,13 +3,13 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_zant.h" #include "SSystem/SComponent/c_counter.h" #include "f_op/f_op_actor_mng.h" #include "SSystem/SComponent/c_counter.h" -UNK_REL_DATA - /* 80B6EAB4-80B6EABC 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ 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 84b5ad62420..eabcad85a85 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -3,11 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_zelR.h" #include "SSystem/SComponent/c_counter.h" -UNK_REL_DATA - /* 80B71BF8-80B71C00 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ static daNpc_GetParam1 l_bmdData[1] = { {10, 1} diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index 0f4713a062c..3f2023e2a2c 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_zelRo.h" #include "dol2asm.h" @@ -251,24 +253,6 @@ SECTION_DEAD static char const* const stringBase_80B74D3D = "NO_RESPONSE"; SECTION_DEAD static char const* const stringBase_80B74D49 = "zelRo"; #pragma pop -/* 80B74D58-80B74D64 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B74D64-80B74D78 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80B74D78-80B74D80 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 0a37e10e6dd..da11e876b2f 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -3,14 +3,14 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_zelda.h" #include "JSystem/JHostIO/JORFile.h" #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_hozelda.h" #include "d/d_debug_viewer.h" -UNK_REL_DATA - #if DEBUG #define HIO_PARAM(i_this) (i_this->mHIO->param) #else diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index e3fe783d98f..4d8054b14dd 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -3,6 +3,8 @@ * NPC - Zora */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_zra.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/JKernel/JKRHeap.h" @@ -20,99 +22,6 @@ // Declarations: // -/* 80B8DA48-80B8DA4C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80B8DA4C-80B8DA50 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA50-80B8DA54 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA54-80B8DA58 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA58-80B8DA5C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA5C-80B8DA60 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA60-80B8DA64 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA64-80B8DA68 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA68-80B8DA6C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA6C-80B8DA70 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA70-80B8DA74 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA74-80B8DA78 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA78-80B8DA7C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA7C-80B8DA80 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA80-80B8DA84 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80B8DA84-80B8DA88 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80B8DA94-80B8DA98 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpc_zrA_Param_c l_HIO; @@ -332,22 +241,6 @@ f32 daNpc_zrA_Path_c::chkPassDst(u16 i_idx, cXyz i_pos) { } } -/* 80B8CE90-80B8CE9C 000000 000C+00 10/10 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B8CE9C-80B8CEB4 00000C 0004+14 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 5 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, - 0x00000000, -}; - /* 80B8CEB4-80B8CEE4 000024 0030+00 0/1 0/0 0/0 .data l_bmdGetParamList */ static daNpc_GetParam1 l_bmdGetParamList[6] = { {3, 4}, // zra @@ -2063,93 +1956,93 @@ bool daNpc_zrA_c::setAction(ActionFn i_action) { bool daNpc_zrA_c::selectAction() { mpNextActionFn = NULL; if (daNpc_zrA_Param_c::m.mTest) { - mpNextActionFn = &test; + mpNextActionFn = &daNpc_zrA_c::test; } else { switch (mType) { case TYPE_SWIM: - mpNextActionFn = &swim; + mpNextActionFn = &daNpc_zrA_c::swim; break; case TYPE_WATERFALL: switch (mActionSelect) { case 0: - mpNextActionFn = &waitWaterfall; + mpNextActionFn = &daNpc_zrA_c::waitWaterfall; break; case 1: - mpNextActionFn = &swimWaterfall; + mpNextActionFn = &daNpc_zrA_c::swimWaterfall; break; case 2: break; case 3: - mpNextActionFn = &diveWaterfall; + mpNextActionFn = &daNpc_zrA_c::diveWaterfall; break; } break; case TYPE_RIVER: switch (mActionSelect) { case 0: - mpNextActionFn = &waitRiverDescend; + mpNextActionFn = &daNpc_zrA_c::waitRiverDescend; break; case 1: - mpNextActionFn = &swimRiverDescend; + mpNextActionFn = &daNpc_zrA_c::swimRiverDescend; break; case 6: - mpNextActionFn = &returnRiverDescend; + mpNextActionFn = &daNpc_zrA_c::swimRiverDescend2; break; case 3: - mpNextActionFn = &diveRiverDescend; + mpNextActionFn = &daNpc_zrA_c::diveRiverDescend; break; case 4: - mpNextActionFn = &swimGoalRiverDescend; + mpNextActionFn = &daNpc_zrA_c::swimGoalRiverDescend; break; default: - mpNextActionFn = &swimRiverDescend2; + mpNextActionFn = &daNpc_zrA_c::returnRiverDescend; break; } break; case TYPE_TOBIKOMI: switch (mActionSelect) { case 0: - mpNextActionFn = &tobiSearch; + mpNextActionFn = &daNpc_zrA_c::tobiSearch; break; case 1: - mpNextActionFn = &tobiWait; + mpNextActionFn = &daNpc_zrA_c::tobiWait; break; case 2: - mpNextActionFn = &tobikomi1; + mpNextActionFn = &daNpc_zrA_c::tobikomi1; break; case 3: - mpNextActionFn = &tobikomi2; + mpNextActionFn = &daNpc_zrA_c::tobikomi2; break; case 4: - mpNextActionFn = &tobikomi3; + mpNextActionFn = &daNpc_zrA_c::tobikomi3; break; case 5: - mpNextActionFn = &tobiJump; + mpNextActionFn = &daNpc_zrA_c::tobiJump; break; case 6: - mpNextActionFn = &tobiEnd; + mpNextActionFn = &daNpc_zrA_c::tobiEnd; break; } break; case TYPE_SEARCH: switch (mActionSelect) { case 0: - mpNextActionFn = &waitSearch; + mpNextActionFn = &daNpc_zrA_c::waitSearch; break; } break; case TYPE_SPA: - mpNextActionFn = &waitSpa; + mpNextActionFn = &daNpc_zrA_c::waitSpa; break; case TYPE_WAIT: if (mActionType == ACT_TYPE_6) { - mpNextActionFn = &waitLake; + mpNextActionFn = &daNpc_zrA_c::waitLake; } else { - mpNextActionFn = &wait; + mpNextActionFn = &daNpc_zrA_c::wait; } break; default: - mpNextActionFn = &waitLake; + mpNextActionFn = &daNpc_zrA_c::wait; break; } } diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index 35d003ccc5b..8840834f747 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -3,30 +3,13 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_zrc.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "Z2AudioLib/Z2Instances.h" -UNK_REL_DATA - -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) - /* 80B93C5C-80B93C60 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpc_zrC_Param_c l_HIO; diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index 1cb2eed1feb..3851d3dcbc1 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -3,120 +3,14 @@ * NPC - Rutela */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_npc_zrz.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/actor/d_a_obj_grave_stone.h" #include "d/actor/d_a_obj_zra_rock.h" -/* 80B9B284-80B9B290 000000 000C+00 9/9 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B9B290-80B9B2A4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - -/* 80B9B868-80B9B86C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80B9B86C-80B9B870 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B870-80B9B874 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B874-80B9B878 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B878-80B9B87C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B87C-80B9B880 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B880-80B9B884 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B884-80B9B888 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B888-80B9B88C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B88C-80B9B890 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B890-80B9B894 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B894-80B9B898 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B898-80B9B89C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B89C-80B9B8A0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B8A0-80B9B8A4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80B9B8A4-80B9B8A8 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80B9B8B4-80B9B8B8 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daNpc_zrZ_Param_c l_HIO; diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp index 5e13d97bde2..472951913a3 100644 --- a/src/d/actor/d_a_obj_Lv5Key.cpp +++ b/src/d/actor/d_a_obj_Lv5Key.cpp @@ -3,6 +3,8 @@ * Snowpeak Ruins Key Lock */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_Lv5Key.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index e1f6b203c61..978d83f3986 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -3,33 +3,35 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_Turara.h" #include "dol2asm.h" #include "SSystem/SComponent/c_math.h" +class daTurara_HIO_c : public fOpAcm_HIO_entry_c { +public: + /* 80B9CB8C */ daTurara_HIO_c(); + /* 80B9E5B4 */ virtual ~daTurara_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 mGravity; + /* 0x0c */ f32 mMaxGravity; + /* 0x10 */ u8 mWaitTime; + /* 0x11 */ u8 mShockStrength; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1c */ f32 field_0x1c; +}; + +STATIC_ASSERT(sizeof(daTurara_HIO_c) == 0x20); // // Declarations: // -/* 80B9E97C-80B9E988 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80B9E988-80B9E99C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80B9CB8C-80B9CBF8 0000EC 006C+00 1/1 0/0 0/0 .text __ct__14daTurara_HIO_cFv */ daTurara_HIO_c::daTurara_HIO_c() { field_0x04 = 450.f; @@ -461,11 +463,11 @@ static int daTurara_Create(fopAc_ac_c* i_this) { /* 80B9EA58-80B9EA78 -00001 0020+00 1/0 0/0 0/0 .data l_daTurara_Method */ static actor_method_class l_daTurara_Method = { - (process_method_func)daTurara_Draw, - (process_method_func)daTurara_Execute, + (process_method_func)daTurara_Create, (process_method_func)daTurara_Delete, + (process_method_func)daTurara_Execute, 0, - (process_method_func)daTurara_Create, + (process_method_func)daTurara_Draw, }; /* 80B9EA78-80B9EAA8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Turara */ diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index 2858ca96d19..be16e3fcc2e 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_TvCdlst.h" #include "dol2asm.h" #include "include/d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index 0bab2b39dc0..cbc4f1ab039 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_Y_taihou.h" #include "d/d_bg_w.h" #include "d/d_cc_d.h" @@ -170,23 +172,6 @@ void daObjYtaihou_c::setNextAngle() { current.angle.z = home.angle.y + l_offsetAngle[field_0x775]; } -UNK_BSS(1109); -UNK_BSS(1107); -UNK_BSS(1105); -UNK_BSS(1104); -UNK_BSS(1099); -UNK_BSS(1097); -UNK_BSS(1095); -UNK_BSS(1094); -UNK_BSS(1057); -UNK_BSS(1055); -UNK_BSS(1053); -UNK_BSS(1052); -UNK_BSS(1014); -UNK_BSS(1012); -UNK_BSS(1010); -UNK_BSS(1009); - /* 80BA1358-80BA135C 000048 0004+00 1/1 0/0 0/0 .bss l_wheelMinR$3836 */ static f32 l_wheelMinR; diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index 9e7dc7a1a82..ed736b26ec8 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -3,12 +3,25 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_amiShutter.h" #include "d/actor/d_a_player.h" #include "c/c_damagereaction.h" #include "d/d_bg_w.h" -UNK_REL_DATA +struct daAmiShutter_HIO_c : public mDoHIO_entry_c { + /* 0x04 */ f32 mRange; + /* 0x08 */ f32 mMaxOpenSpeed; + /* 0x0c */ f32 mMaxCloseSpeed; + /* 0x10 */ u8 mWaitTime; + /* 0x11 */ u8 field_0x11; + + /* 80BA14CC */ daAmiShutter_HIO_c(); + /* 80BA21E0 */ ~daAmiShutter_HIO_c() {} + + void genMessage(JORMContext*); +}; /* 80BA14CC-80BA1514 0000EC 0048+00 1/1 0/0 0/0 .text __ct__18daAmiShutter_HIO_cFv */ daAmiShutter_HIO_c::daAmiShutter_HIO_c() { diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index 2b96fbeb833..8e678c6d3c0 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -3,6 +3,8 @@ * Object - Golden Ant */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ari.h" #include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_lib.h" diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index 9843cbb2721..7ba271e40e3 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -3,29 +3,13 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_automata.h" #include "SSystem/SComponent/c_counter.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -/* 80BA6CB0-80BA6CBC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BA6CBC-80BA6CD0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BA6CD0-80BA6CD8 000020 0008+00 4/5 0/0 0/0 .data l_bmdData */ static int l_bmdData[1][2] = { 9, 1, diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index 26f5d746011..63ba5258d63 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_avalanche.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" @@ -39,24 +41,6 @@ void daObjAvalanche_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mMtx2); } -/* 80BA7D70-80BA7D7C 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BA7D7C-80BA7D90 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BA7D90-80BA7D94 -00001 0004+00 3/4 0/0 0/0 .data l_arcName */ static char* l_arcName = "V_Yuki"; diff --git a/src/d/actor/d_a_obj_balloon.cpp b/src/d/actor/d_a_obj_balloon.cpp index d60629f91d8..ef273a62ccf 100644 --- a/src/d/actor/d_a_obj_balloon.cpp +++ b/src/d/actor/d_a_obj_balloon.cpp @@ -3,6 +3,8 @@ * Plumm Minigame Balloon */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_balloon.h" #include "JSystem/JAudio2/JASAudioThread.h" #include "JSystem/JAudio2/JAUSoundTable.h" @@ -16,117 +18,6 @@ #include "f_op/f_op_actor_mng.h" #include "d/actor/d_a_balloon_2D.h" -/* 80BA8E5C-80BA8E68 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BA8E68-80BA8E7C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - -/* 80BA8FB0-80BA8FB4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80BA8FB4-80BA8FB8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FB8-80BA8FBC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FBC-80BA8FC0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FC0-80BA8FC4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FC4-80BA8FC8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FC8-80BA8FCC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FCC-80BA8FD0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FD0-80BA8FD4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FD4-80BA8FD8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FD8-80BA8FDC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FDC-80BA8FE0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FE0-80BA8FE4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FE4-80BA8FE8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FE8-80BA8FEC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80BA8FEC-80BA8FF0 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80BA7FAC-80BA7FF4 0000EC 0048+00 1/1 0/0 0/0 .text __ct__19daObj_Balloon_HIO_cFv */ daObj_Balloon_HIO_c::daObj_Balloon_HIO_c() { field_0x04 = -1; diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index c9db450729d..d0273df1f04 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -3,6 +3,8 @@ * Object - Table */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_barDesk.h" #include "d/d_procname.h" #include "d/d_bg_w.h" @@ -14,21 +16,6 @@ static daBarDesk_HIO_c l_HIO; /* 80BA9D2C-80BA9D30 00001C 0004+00 1/1 0/0 0/0 .bss None */ static u8 data_80BA9D2C[4]; -/* 80BA9BBC-80BA9BC8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BA9BC8-80BA9BDC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80BA9B70-80BA9BA0 000000 0030+00 2/2 0/0 0/0 .rodata mCcDObjInfo__11daBarDesk_c */ dCcD_SrcGObjInf const daBarDesk_c::mCcDObjInfo = { {0, {{0, 0, 0}, {0xD8FAFDBF, 0x11}, {0}}}, diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index e987fbd6f06..82659f12f92 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_batta.h" #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" @@ -11,7 +13,17 @@ #include "d/d_menu_insect.h" #include "f_pc/f_pc_name.h" -UNK_REL_DATA +class daObj_BattaHIO_c : public JORReflexible { +public: + /* 80BA9E2C */ daObj_BattaHIO_c(); + /* 80BAC874 */ virtual ~daObj_BattaHIO_c() {} + + void genMessage(JORMContext* ctx); + + /* 0x4 */ s8 mId; + /* 0x8 */ f32 mModelScaleFemale; + /* 0xC */ f32 mModelScaleMale; +}; /* 80BACA90-80BACAD0 000020 0040+00 0/1 0/0 0/0 .data cc_sph_src__27@unnamed@d_a_obj_batta_cpp@ */ namespace { diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp index 747d5d99f38..b02b6e237fb 100644 --- a/src/d/actor/d_a_obj_bbox.cpp +++ b/src/d/actor/d_a_obj_bbox.cpp @@ -3,6 +3,8 @@ * Object - Breakable Wooden Box */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bbox.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp index 2a0f6127a46..7ea773a3dcd 100644 --- a/src/d/actor/d_a_obj_bed.cpp +++ b/src/d/actor/d_a_obj_bed.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bed.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index e5b66b1d558..079a6ff52c6 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bemos.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -239,7 +241,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 BaseY__4cXyz[12]; extern "C" u8 sincosTable___5JMath[65536]; @@ -347,24 +348,6 @@ SECTION_DEAD static char const* const stringBase_80BB3A61 = "cogGreen"; SECTION_DEAD static char const* const stringBase_80BB3A6A = "cogYellow"; #pragma pop -/* 80BB3A74-80BB3A80 000000 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BB3A80-80BB3A94 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BB3A94-80BB3A98 -00001 0004+00 8/9 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_bemos__stringBase0; @@ -834,101 +817,6 @@ int daObjBm_c::Execute(f32 (**param_0)[3][4]) { // NONMATCHING } -/* ############################################################################################## */ -/* 80BB3EE8-80BB3EEC 000008 0001+03 2/2 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80BB3EEC-80BB3EF0 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3EF0-80BB3EF4 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3EF4-80BB3EF8 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3EF8-80BB3EFC 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3EFC-80BB3F00 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3F00-80BB3F04 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3F04-80BB3F08 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3F08-80BB3F0C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3F0C-80BB3F10 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3F10-80BB3F14 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3F14-80BB3F18 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3F18-80BB3F1C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3F1C-80BB3F20 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3F20-80BB3F24 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80BB3F24-80BB3F28 -00001 0004+00 3/3 0/0 0/0 .bss None */ -/* 80BB3F24 0001+00 data_80BB3F24 @1009 */ -/* 80BB3F25 0001+00 data_80BB3F25 None */ -/* 80BB3F26 0001+00 data_80BB3F26 None */ -/* 80BB3F27 0001+00 data_80BB3F27 None */ -static u8 struct_80BB3F24[4]; - /* 80BAF29C-80BAF328 00101C 008C+00 1/1 0/0 0/0 .text main_proc_call__9daObjBm_cFv */ void daObjBm_c::main_proc_call() { // NONMATCHING diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index ecea164be58..ac3a462b32f 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bhashi.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -121,7 +123,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index 7bb2e56df5c..3d87fd8c6b7 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bhbridge.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp index 26081f72cb8..79609603ad1 100644 --- a/src/d/actor/d_a_obj_bk_leaf.cpp +++ b/src/d/actor/d_a_obj_bk_leaf.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bk_leaf.h" #include "d/actor/d_a_obj_carry.h" #include "d/d_com_inf_game.h" @@ -50,20 +52,6 @@ int daBkLeaf_c::Create() { return 1; } -/* 80BB6738-80BB6744 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static Vec cNullVec__6Z2Calc = {0.0f, 0.0f, 0.0f}; - -/* 80BB6744-80BB6758 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -// Unused -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80BB6758-80BB675C -00001 0004+00 2/3 0/0 0/0 .data l_arcName */ static const char* l_arcName = "Obj_bkl"; diff --git a/src/d/actor/d_a_obj_bkdoor.cpp b/src/d/actor/d_a_obj_bkdoor.cpp index 50be98fae35..97ad0379261 100644 --- a/src/d/actor/d_a_obj_bkdoor.cpp +++ b/src/d/actor/d_a_obj_bkdoor.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bkdoor.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index 485189ca836..114c302be96 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bky_rock.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" @@ -15,24 +17,6 @@ static int daBkyRock_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); } -/* 80BB801C-80BB8028 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BB8028-80BB803C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BB803C-80BB8040 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "BYRock"; diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index edfc3c428c6..7f2bece7999 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -2,30 +2,14 @@ // Bm Window // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bmWindow.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_bg_w.h" #include "SSystem/SComponent/c_math.h" -/* 80BB980C-80BB9818 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BB9818-80BB982C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BB820C-80BB82AC 0000EC 00A0+00 1/1 0/0 0/0 .text __ct__16daBmWindow_HIO_cFv */ daBmWindow_HIO_c::daBmWindow_HIO_c() { field_0x04 = 10; diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp index a71c28ca490..67a2cf26770 100644 --- a/src/d/actor/d_a_obj_bmshutter.cpp +++ b/src/d/actor/d_a_obj_bmshutter.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_bmshutter.cpp +* @file d_a_obj_bmshutter.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bmshutter.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" @@ -12,8 +14,6 @@ // External References: // -UNK_REL_DATA; - static const char* l_arcName = "K_saku00"; static const f32 l_cull_box[6] = {-200.f, -100.f, -200.f, 200.f, 100.f, 200.f}; diff --git a/src/d/actor/d_a_obj_bombf.cpp b/src/d/actor/d_a_obj_bombf.cpp index 3f3138e62d8..317ed7abcb8 100644 --- a/src/d/actor/d_a_obj_bombf.cpp +++ b/src/d/actor/d_a_obj_bombf.cpp @@ -3,6 +3,8 @@ * Bomb Flower */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bombf.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index f208a504b95..d917c41675d 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -3,6 +3,8 @@ * Object - Boss Warp */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bosswarp.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_midna.h" @@ -136,24 +138,6 @@ extern "C" extern u8 data_8057B8D0[4]; // Declarations: // -/* 8057B658-8057B664 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8057B664-8057B678 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8057B678-8057B67C -00001 0004+00 3/4 0/0 0/0 .data l_arcName */ static char* l_arcName = "ef_Portal"; diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index 447a7f62d71..c122fec7cf3 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_boumato.h" #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_arrow.h" diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp index c1e23d53813..c5574e49f6e 100644 --- a/src/d/actor/d_a_obj_brakeeff.cpp +++ b/src/d/actor/d_a_obj_brakeeff.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_brakeeff.h" #include "dol2asm.h" #include "d/d_kankyo.h" diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index 6b0cd65a069..2e88d926168 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_brg.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -354,8 +356,6 @@ static int daObj_Brg_Draw(obj_brg_class* i_this) { return 1; } -UNK_REL_BSS; - /* 80BC2526 0002+00 data_80BC2526 wy */ static s16 wy; diff --git a/src/d/actor/d_a_obj_bsGate.cpp b/src/d/actor/d_a_obj_bsGate.cpp index 5443df3db68..ca0d00504a6 100644 --- a/src/d/actor/d_a_obj_bsGate.cpp +++ b/src/d/actor/d_a_obj_bsGate.cpp @@ -3,25 +3,12 @@ * Object - Lakebed Temple Gate */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bsGate.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -/* 80BC31CC-80BC31D8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BC31D8-80BC31EC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80BC288C-80BC28C8 0000EC 003C+00 1/1 0/0 0/0 .text __ct__14daBsGate_HIO_cFv */ daBsGate_HIO_c::daBsGate_HIO_c() { mOpenSpeed = 2.0f; diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index 13335175658..21eee08dd69 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -3,28 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_bubblePilar.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -/* 80BC40BC-80BC40C8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BC40C8-80BC40DC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BC4224-80BC422C 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */ static daBubbPilar_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp index 5fb05ff3e2a..60d39ee0356 100644 --- a/src/d/actor/d_a_obj_burnbox.cpp +++ b/src/d/actor/d_a_obj_burnbox.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_burnbox.cpp +* @file d_a_obj_burnbox.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_burnbox.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index d2b526e9256..1686a501f1b 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -3,6 +3,8 @@ * @brief Actor - Various carriable objects */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" #include @@ -716,8 +718,6 @@ const static dCcD_SrcCyl l_tg_cyl = { /* 8047A350-8047A354 000A44 0004+00 0/0 0/0 0/0 .rodata l_light_color */ static const GXColor l_light_color = {0xFF, 0xFF, 0xFF, 0xFF}; -UNK_REL_DATA; - /* 8047A670-8047A6A8 -00001 0038+00 1/1 0/0 0/0 .data l_arcName */ static char* l_arcName[] = { "J_tubo_00", "J_tubo_01", "Kkiba_00", "Y_ironbal", "J_taru00", "J_doku00", "Obj_bkl", diff --git a/src/d/actor/d_a_obj_catdoor.cpp b/src/d/actor/d_a_obj_catdoor.cpp index 0b6731b85dc..1c478f2eb6c 100644 --- a/src/d/actor/d_a_obj_catdoor.cpp +++ b/src/d/actor/d_a_obj_catdoor.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_catdoor.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index 5b54888ba07..5dbe56f78eb 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_cb.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index 691dfd80f85..3bdc8f7ff98 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_cblock.h" #include "d/d_cc_d.h" #include "Z2AudioLib/Z2Instances.h" @@ -32,8 +34,6 @@ static Vec const l_cull_box[2] = { {250.0f, 250.0f, 400.0f}, }; -UNK_REL_DATA - /* 80BC6AF4-80BC6AF8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "P_Cblock"; @@ -229,96 +229,6 @@ void daObjCBlk_c::modeWalk() { } } -/* 80BC6C54-80BC6C58 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C58-80BC6C5C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C5C-80BC6C60 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C60-80BC6C64 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C64-80BC6C68 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C68-80BC6C6C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C6C-80BC6C70 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C70-80BC6C74 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C74-80BC6C78 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C78-80BC6C7C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C7C-80BC6C80 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C80-80BC6C84 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C84-80BC6C88 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C88-80BC6C8C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80BC6C8C-80BC6C90 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80BC6C9C-80BC6CA8 000054 000C+00 1/2 0/0 0/0 .bss l_chainOffset */ static cXyz l_chainOffset(0.0f, 105.0f, 30.0f); @@ -340,86 +250,19 @@ void daObjCBlk_c::setPower(f32 power) { player->setOutPower(power, angle, 0); } -/* ############################################################################################## */ -/* 80BC6A78-80BC6A7C 000040 0004+00 0/0 0/0 0/0 .rodata @4103 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4103 = -6.0f; -COMPILER_STRIP_GATE(0x80BC6A78, &lit_4103); -#pragma pop - -/* 80BC6A7C-80BC6A80 000044 0004+00 0/0 0/0 0/0 .rodata @4104 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4104 = 3.0f / 40.0f; -COMPILER_STRIP_GATE(0x80BC6A7C, &lit_4104); -#pragma pop - -/* 80BC6A80-80BC6A84 000048 0004+00 0/0 0/0 0/0 .rodata @4105 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4105 = 100.0f; -COMPILER_STRIP_GATE(0x80BC6A80, &lit_4105); -#pragma pop - -/* 80BC6A84-80BC6A88 00004C 0004+00 0/0 0/0 0/0 .rodata @4106 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4106 = 15.0f; -COMPILER_STRIP_GATE(0x80BC6A84, &lit_4106); -#pragma pop - -/* 80BC6A88-80BC6A90 000050 0004+04 0/0 0/0 0/0 .rodata @4107 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4107[1 + 1 /* padding */] = { - 35.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80BC6A88, &lit_4107); -#pragma pop - -/* 80BC6A90-80BC6A98 000058 0008+00 0/0 0/0 0/0 .rodata @4310 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4310[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BC6A90, &lit_4310); -#pragma pop - -/* 80BC6A98-80BC6AA0 000060 0008+00 0/0 0/0 0/0 .rodata @4311 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4311[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BC6A98, &lit_4311); -#pragma pop - -/* 80BC6AA0-80BC6AA8 000068 0008+00 0/0 0/0 0/0 .rodata @4312 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4312[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80BC6AA0, &lit_4312); -#pragma pop - -/* 80BC6AA8-80BC6AAC 000070 0004+00 0/0 0/0 0/0 .rodata @4313 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4313 = 195.0f; -COMPILER_STRIP_GATE(0x80BC6AA8, &lit_4313); -#pragma pop - -/* 80BC6AAC-80BC6AB0 000074 0004+00 0/0 0/0 0/0 .rodata @4314 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4314 = 210.0f; -COMPILER_STRIP_GATE(0x80BC6AAC, &lit_4314); -#pragma pop +static f32 dummy() { + f32 f0 = -6.0f; + f32 f1 = 3.0f / 40.0f; + f32 f2 = 100.0f; + f32 f3 = 15.0f; + f32 f4 = 35.0f; + f64 f5 = 0.5; + f64 f6 = 3.0; + f64 f7 = 0.0; + f32 f8 = 195.0f; + f32 f9 = 210.0f; + return f0 + f1 * (f2 - f3 * (f4 - f5 * (f6 - f7 * f8 - (f7 - f9)))); +} /* 80BC66DC-80BC6868 000DBC 018C+00 1/1 0/0 0/0 .text checkWall__11daObjCBlk_cFv */ BOOL daObjCBlk_c::checkWall() { @@ -479,6 +322,8 @@ static int daObjCBlk_Create(fopAc_ac_c* i_this) { /* 80BC6CB4-80BC6CC4 00006C 000C+04 0/1 0/0 0/0 .bss l_smokeSetOffset */ static cXyz l_smokeSetOffset(0.0f, 0.0f, -200.0f); +static s32 unused_bss_70 = 0; + AUDIO_INSTANCES; /* 80BC6B9C-80BC6BBC -00001 0020+00 1/0 0/0 0/0 .data l_daObjCBlk_Method */ diff --git a/src/d/actor/d_a_obj_cboard.cpp b/src/d/actor/d_a_obj_cboard.cpp index 4b1a70fa9d2..be57c9560ad 100644 --- a/src/d/actor/d_a_obj_cboard.cpp +++ b/src/d/actor/d_a_obj_cboard.cpp @@ -3,6 +3,8 @@ * Clear (Invisible) Wall */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_cboard.h" #include "d/d_bg_w.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_cdoor.cpp b/src/d/actor/d_a_obj_cdoor.cpp index 3ef638d4d67..add989a1868 100644 --- a/src/d/actor/d_a_obj_cdoor.cpp +++ b/src/d/actor/d_a_obj_cdoor.cpp @@ -3,26 +3,13 @@ * Object - Sewer Gate / Sluice Gate */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_cdoor.h" #include "d/actor/d_a_obj_wchain.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -/* 80BC7D58-80BC7D64 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BC7D64-80BC7D78 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80BC7D78-80BC7D80 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName[2] = { "Cdoor", diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp index 4e27ba749a1..cd998ca702e 100644 --- a/src/d/actor/d_a_obj_chandelier.cpp +++ b/src/d/actor/d_a_obj_chandelier.cpp @@ -3,26 +3,13 @@ * Object - Chandelier (Hyrule Castle) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_chandelier.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -/* 80BC8D44-80BC8D50 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BC8D50-80BC8D64 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - static char* l_arcName = "L9Chand"; /* 80BC8DA4-80BC8DE0 000060 003C+00 1/2 0/0 0/0 .data s_exeProc__17daObjChandelier_c */ diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp index 812ffc03c91..1e59c64e787 100644 --- a/src/d/actor/d_a_obj_chest.cpp +++ b/src/d/actor/d_a_obj_chest.cpp @@ -4,6 +4,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_chest.h" #include "JSystem/JKernel/JKRHeap.h" #include "SSystem/SComponent/c_math.h" @@ -94,24 +96,6 @@ int daObjChest_c::Create() { return 1; } -/* 80BCA0B8-80BCA0C4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BCA0C4-80BCA0D8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BCA0D8-80BCA0DC -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "H_Tansu"; diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index 506afc35b03..347442a8938 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -3,6 +3,8 @@ * Object - Golden Butterfly */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_cho.h" #include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_lib.h" diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp index eb28a6315b2..eaa0ea3fd3f 100644 --- a/src/d/actor/d_a_obj_cowdoor.cpp +++ b/src/d/actor/d_a_obj_cowdoor.cpp @@ -3,6 +3,8 @@ * Cow Door */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_cowdoor.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp index 861c0868d6a..12093f95688 100644 --- a/src/d/actor/d_a_obj_crope.cpp +++ b/src/d/actor/d_a_obj_crope.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_crope.h" #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp index d1dd5416e5f..389eb582e55 100644 --- a/src/d/actor/d_a_obj_crvfence.cpp +++ b/src/d/actor/d_a_obj_crvfence.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_crvfence.h" #include "dol2asm.h" @@ -114,7 +116,6 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index 97c42c78d23..eb6a894149c 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_crvgate.cpp +* @file d_a_obj_crvgate.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_crvgate.h" #include "d/actor/d_a_obj_eff.h" diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index b3e650f458f..9bce08628c1 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_crvhahen.cpp +* @file d_a_obj_crvhahen.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_crvhahen.h" /* 80BD4064-80BD4068 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index 62f120b70ad..2af5048eae6 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_crvlh_down.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -93,7 +95,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void HahenSet__15daObjCRVHAHEN_cF4cXyz4cXyz4cXyz4cXyzf(); diff --git a/src/d/actor/d_a_obj_crvlh_up.cpp b/src/d/actor/d_a_obj_crvlh_up.cpp index 6a7ff5f744f..7bc1369068c 100644 --- a/src/d/actor/d_a_obj_crvlh_up.cpp +++ b/src/d/actor/d_a_obj_crvlh_up.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_crvlh_up.h" #include "dol2asm.h" @@ -84,7 +86,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void HahenSet__15daObjCRVHAHEN_cF4cXyz4cXyz4cXyz4cXyzf(); diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp index b1513b30b8d..441f22041ea 100644 --- a/src/d/actor/d_a_obj_crvsteel.cpp +++ b/src/d/actor/d_a_obj_crvsteel.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_crvsteel.h" #include "d/d_com_inf_game.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp index bc70ffe020a..19d5f87d108 100644 --- a/src/d/actor/d_a_obj_crystal.cpp +++ b/src/d/actor/d_a_obj_crystal.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_crystal.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 8214c4ce89b..d586544a6ca 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_cwall.h" #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_lib.h" @@ -78,8 +80,6 @@ static Vec const l_check_max_wolf = { 120.0f, 0.0f, 160.0f, }; -UNK_REL_DATA - /* 80BDA0E0-80BDA0E8 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName[2] = { "P_Cwall", @@ -346,100 +346,6 @@ void daObjCwall_c::calcSePos() { mDoMtx_stack_c::multVec(&field_0xf2c, &field_0xf2c); } -/* ############################################################################################## */ -/* 80BDA300-80BDA304 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80BDA304-80BDA308 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA308-80BDA30C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA30C-80BDA310 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA310-80BDA314 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA314-80BDA318 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA318-80BDA31C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA31C-80BDA320 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA320-80BDA324 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA324-80BDA328 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA328-80BDA32C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA32C-80BDA330 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA330-80BDA334 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA334-80BDA338 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA338-80BDA33C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80BDA33C-80BDA340 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80BDA34C-80BDA358 000054 000C+00 1/2 0/0 0/0 .bss l_chainOffset */ static cXyz l_chainOffset(0.0f, 105.0f, 30.0f); diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp index d5b6c83690a..a12162d285b 100644 --- a/src/d/actor/d_a_obj_damCps.cpp +++ b/src/d/actor/d_a_obj_damCps.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_damCps.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index f6acbbd10ff..562f9bce7af 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -3,6 +3,8 @@ * Insect - Pillbug */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_dan.h" #include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_lib.h" diff --git a/src/d/actor/d_a_obj_digholl.cpp b/src/d/actor/d_a_obj_digholl.cpp index 53a4d63c235..16196474ffb 100644 --- a/src/d/actor/d_a_obj_digholl.cpp +++ b/src/d/actor/d_a_obj_digholl.cpp @@ -3,6 +3,8 @@ * Object - Dig Hole */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_digholl.h" #include "d/actor/d_a_player.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_digplace.cpp b/src/d/actor/d_a_obj_digplace.cpp index e86ae42a951..404b12446d0 100644 --- a/src/d/actor/d_a_obj_digplace.cpp +++ b/src/d/actor/d_a_obj_digplace.cpp @@ -3,6 +3,8 @@ * Generic Wolf Digging Spots */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_digplace.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 6fb67a070fc..34eb5bfca97 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -3,6 +3,8 @@ // Object - Dig Snow // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_digsnow.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" @@ -35,24 +37,6 @@ int daObjDigSnow_c::Create() { return TRUE; } -/* 80BDD6E8-80BDD6F4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BDD6F4-80BDD708 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BDD708-80BDD70C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "Y_horiyuk"; diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index c9e725052d7..3122169c990 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -3,18 +3,14 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_dmelevator.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_player.h" #include "d/d_bg_w.h" #include "d/d_path.h" -/* 80BDFB38-80BDFB70 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -UNK_REL_BSS; - -/* 80BDF950-80BDF964 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -UNK_REL_DATA; - /* 80BDF870-80BDF87C 000000 000C+00 11/11 0/0 0/0 .rodata l_swOffset */ 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 9ebda7e50cb..fa0c8e812dc 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_drop.cpp +* @file d_a_obj_drop.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_drop.h" #include "SSystem/SComponent/c_math.h" #include "cmath.h" @@ -77,24 +79,6 @@ int daObjDrop_c::Create() { return 1; } -/* 80BE2060-80BE206C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BE206C-80BE2080 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BDFE58-80BE005C 0001F8 0204+00 1/1 0/0 0/0 .text create__11daObjDrop_cFv */ int daObjDrop_c::create() { fopAcM_SetupActor(this, daObjDrop_c); diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp index 50f84b1b2ed..c489f62ceda 100644 --- a/src/d/actor/d_a_obj_dust.cpp +++ b/src/d/actor/d_a_obj_dust.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_dust.h" /* 80BE3054-80BE3058 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index ba27be6f244..9532b5e21d6 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_eff.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp index 09f5e0fdbee..c29b49307a0 100644 --- a/src/d/actor/d_a_obj_enemy_create.cpp +++ b/src/d/actor/d_a_obj_enemy_create.cpp @@ -3,6 +3,8 @@ * Enemy spawner */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_enemy_create.h" #include "d/actor/d_a_player.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index 42ea65f1b0e..45a75ebe014 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_fallobj.h" #include "d/actor/d_a_player.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index 778f350e023..fbb29f4fdfc 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -2,6 +2,8 @@ // Fan // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_fan.h" #include "d/actor/d_a_obj_tornado2.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index 6e62ef52d95..e0b87e5ff88 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_fchain.h" #include "d/actor/d_a_player.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp index 1b4f937f188..5533d171225 100644 --- a/src/d/actor/d_a_obj_fireWood.cpp +++ b/src/d/actor/d_a_obj_fireWood.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_fireWood.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp index d6348c48467..3e376353585 100644 --- a/src/d/actor/d_a_obj_fireWood2.cpp +++ b/src/d/actor/d_a_obj_fireWood2.cpp @@ -3,6 +3,8 @@ * Firewood 2 (Flame) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_fireWood2.h" #include "m_Do/m_Do_hostIO.h" diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp index 5d0d5e523ba..1c4312b5f39 100644 --- a/src/d/actor/d_a_obj_firepillar.cpp +++ b/src/d/actor/d_a_obj_firepillar.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_firepillar.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" @@ -20,25 +22,6 @@ void daObjFPillar_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); } -/* ############################################################################################## */ -/* 80BE9ABC-80BE9AC8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BE9AC8-80BE9ADC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BE9ADC-80BE9AF4 000020 0018+00 1/1 0/0 0/0 .data l_cull_box */ static f32 l_cull_box[6] = { -30.0f, -10.0f, -30.0f, diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp index 0d4f4974829..3cfa5e354b1 100644 --- a/src/d/actor/d_a_obj_firepillar2.cpp +++ b/src/d/actor/d_a_obj_firepillar2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_firepillar2.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "SSystem/SComponent/c_xyz.h" @@ -40,24 +42,6 @@ void daObjFPillar2_c::setBaseMtx() { } } -/* 80BEB528-80BEB534 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BEB534-80BEB548 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BEB548-80BEB54C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "Obj_yogan"; diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp index 648b86d71c9..d763de8db7c 100644 --- a/src/d/actor/d_a_obj_flag.cpp +++ b/src/d/actor/d_a_obj_flag.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_flag.h" daObjFlag_c::M_attrs const daObjFlag_c::M_attr = { diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index 9b15aed901d..b9aaca58b22 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -1,8 +1,10 @@ /** * @file d_a_obj_flag2.cpp - * + * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_flag2.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index 3fdd64fdf31..56820b5154f 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_flag3.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "d/actor/d_a_set_bgobj.h" diff --git a/src/d/actor/d_a_obj_fmobj.cpp b/src/d/actor/d_a_obj_fmobj.cpp index 14406f72b29..3d1987634bf 100644 --- a/src/d/actor/d_a_obj_fmobj.cpp +++ b/src/d/actor/d_a_obj_fmobj.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_fmobj.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp index 4ce249cbec9..0692fae4496 100644 --- a/src/d/actor/d_a_obj_food.cpp +++ b/src/d/actor/d_a_obj_food.cpp @@ -3,6 +3,8 @@ * Object - Bone / Ball */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_food.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/JKernel/JKRHeap.h" diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp index 5d5092ca75f..6e56837335c 100644 --- a/src/d/actor/d_a_obj_fw.cpp +++ b/src/d/actor/d_a_obj_fw.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_fw.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 1e418afcb99..72138647d04 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_gadget.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -136,7 +138,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" void __register_global_object(); @@ -153,24 +154,6 @@ SECTION_DEAD static char const* const stringBase_80BF4A24 = ""; SECTION_DEAD static char const* const stringBase_80BF4A25 = "ykM1"; #pragma pop -/* 80BF4A2C-80BF4A38 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BF4A38-80BF4A4C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BF4A4C-80BF4A5C 000020 0010+00 2/3 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[16] = { 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x01, @@ -651,100 +634,6 @@ void daObj_Gadget_c::setSmokePrtcl() { // NONMATCHING } -/* ############################################################################################## */ -/* 80BF4B98-80BF4B9C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80BF4B9C-80BF4BA0 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BA0-80BF4BA4 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BA4-80BF4BA8 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BA8-80BF4BAC 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BAC-80BF4BB0 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BB0-80BF4BB4 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BB4-80BF4BB8 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BB8-80BF4BBC 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BBC-80BF4BC0 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BC0-80BF4BC4 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BC4-80BF4BC8 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BC8-80BF4BCC 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BCC-80BF4BD0 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BD0-80BF4BD4 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80BF4BD4-80BF4BD8 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80BF4BD8-80BF4BE4 000048 000C+00 1/1 0/0 0/0 .bss @3804 */ static u8 lit_3804[12]; diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index 33302d76c0f..5602e97c323 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ganonwall.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index 17d49859e4d..3b0fdc2af5f 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ganonwall2.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 417bb9e15da..b6257be8ae0 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_gb.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" @@ -111,25 +113,6 @@ static int daObj_Gb_Delete(obj_gb_class* i_this) { return 1; } -/* ############################################################################################## */ -/* 80BF6DFC-80BF6E08 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BF6E08-80BF6E1C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BF6E1C-80BF6E24 000020 0008+00 0/1 0/0 0/0 .data bmd$3914 */ static int bmd[2] = { 6, 7, diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp index 443f98edf5b..8a0e3c0e2b7 100644 --- a/src/d/actor/d_a_obj_geyser.cpp +++ b/src/d/actor/d_a_obj_geyser.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_geyser.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -120,7 +122,6 @@ extern "C" extern void* __vt__12cCcD_CpsAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80BF9240[4]; @@ -145,24 +146,6 @@ void daObjGeyser_c::setBaseMtx() { SECTION_DEAD static char const* const stringBase_80BF905C = "H_knktsn"; #pragma pop -/* 80BF9068-80BF9074 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BF9074-80BF9088 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BF9088-80BF908C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_geyser__stringBase0; diff --git a/src/d/actor/d_a_obj_glowSphere.cpp b/src/d/actor/d_a_obj_glowSphere.cpp index e118b938210..92ad51cc0af 100644 --- a/src/d/actor/d_a_obj_glowSphere.cpp +++ b/src/d/actor/d_a_obj_glowSphere.cpp @@ -1,38 +1,21 @@ /** - * @file d_a_obj_glowSphere.cpp +* @file d_a_obj_glowSphere.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_glowSphere.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -UNK_REL_DATA - /* 80BF934C-80BF938C 0000EC 0040+00 1/1 0/0 0/0 .text __ct__14daGlwSph_HIO_cFv */ daGlwSph_HIO_c::daGlwSph_HIO_c() { speed = 50.0f; speed2 = 4.0f; } -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) - /* 80BFABF4-80BFAC00 000054 000C+00 2/3 0/0 0/0 .bss l_HIO */ static daGlwSph_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp index fffe8272e26..ffa33e19caf 100644 --- a/src/d/actor/d_a_obj_gm.cpp +++ b/src/d/actor/d_a_obj_gm.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_gm.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -132,35 +134,14 @@ extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void __register_global_object(); // // Declarations: // -/* ############################################################################################## */ -/* 80BFD3C8-80BFD3D4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80BFD3D4-80BFD3E8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80BFD3E8-80BFD404 000020 001C+00 7/8 0/0 0/0 .data obj_size */ SECTION_DATA static u8 obj_size[28] = { 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x43, 0x0C, diff --git a/src/d/actor/d_a_obj_goGate.cpp b/src/d/actor/d_a_obj_goGate.cpp index cf214eea92c..83c679bbdac 100644 --- a/src/d/actor/d_a_obj_goGate.cpp +++ b/src/d/actor/d_a_obj_goGate.cpp @@ -1,13 +1,13 @@ /** - * @file d_a_obj_goGate.cpp +* @file d_a_obj_goGate.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_goGate.h" #include "d/d_com_inf_game.h" -UNK_REL_DATA - /* 80BFD6AC-80BFD6DC 0000EC 0030+00 1/1 0/0 0/0 .text __ct__14daGoGate_HIO_cFv */ daGoGate_HIO_c::daGoGate_HIO_c() { mSpeed = 2.0f; diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index d8447930d57..1adbff182fb 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_gomikabe.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 1e31ec7a1be..9e715f1b35f 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_gpTaru.h" #include "dol2asm.h" @@ -152,7 +154,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -192,24 +193,6 @@ COMPILER_STRIP_GATE(0x8057F57C, &lit_3659); SECTION_RODATA static f32 const lit_3660 = 1.0f; COMPILER_STRIP_GATE(0x8057F580, &lit_3660); -/* 8057F688-8057F694 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8057F694-8057F6A8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8057F6A8-8057F6EC 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__10daGpTaru_c */ SECTION_DATA u8 daGpTaru_c::mCcDCyl[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 54be9945f66..421e20fbb44 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_gra2.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_tag_gra.h" @@ -37,7 +39,6 @@ void daObj_GrA_c::rideCallBack(dBgW* param_1, fopAc_ac_c* aActor_p, fopAc_ac_c* } #if VERSION != VERSION_SHIELD_DEBUG -UNK_REL_DATA; #endif /* 80C0FE88-80C0FE98 -00001 0010+00 1/1 0/0 0/0 .data l_resFileNameList */ @@ -585,10 +586,6 @@ void daObj_GrA_c::restart() { field_0x209c = 0; } -#if VERSION != VERSION_SHIELD_DEBUG -UNK_REL_BSS; -#endif - /* 80C108EC-80C108F8 000054 000C+00 0/2 0/0 0/0 .bss l_centerOfst */ static cXyz l_centerOfst(0.0f, 67.0f, 26.0f); diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp index 1e97d5d6b18..1af81bb29a4 100644 --- a/src/d/actor/d_a_obj_graWall.cpp +++ b/src/d/actor/d_a_obj_graWall.cpp @@ -3,6 +3,8 @@ * Object - Goron Adult Wall (Deleted) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_graWall.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index 540d1cfe80a..570143f5c1c 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_gra_rock.h" #include "d/actor/d_a_npc.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp index 7374bea9115..61cd75d8809 100644 --- a/src/d/actor/d_a_obj_grave_stone.cpp +++ b/src/d/actor/d_a_obj_grave_stone.cpp @@ -3,6 +3,8 @@ * Object - Zora Gravestone */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_grave_stone.h" #include "d/d_procname.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp index fce149db80c..3e03ce1e907 100644 --- a/src/d/actor/d_a_obj_groundwater.cpp +++ b/src/d/actor/d_a_obj_groundwater.cpp @@ -3,28 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_groundwater.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_graphic.h" -/* 80C149FC-80C14A08 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C14A08-80C14A1C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C14B44-80C14B58 000014 0014+00 1/1 0/0 0/0 .bss l_HIO */ static daGrdWater_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_grz_rock.cpp b/src/d/actor/d_a_obj_grz_rock.cpp index e30ce0f9e65..04bc1e36d00 100644 --- a/src/d/actor/d_a_obj_grz_rock.cpp +++ b/src/d/actor/d_a_obj_grz_rock.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_grz_rock.h" #include "dol2asm.h" @@ -76,7 +78,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; // // Declarations: diff --git a/src/d/actor/d_a_obj_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp index f8d89d2ab4d..715741a8171 100644 --- a/src/d/actor/d_a_obj_h_saku.cpp +++ b/src/d/actor/d_a_obj_h_saku.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_h_saku.h" #include "dol2asm.h" @@ -89,7 +91,6 @@ extern "C" void _restgpr_29(); extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -415,100 +416,6 @@ void daObjH_Saku_c::Delete() { // NONMATCHING } -/* ############################################################################################## */ -/* 80C165E8-80C165EC 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80C165EC-80C165F0 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80C165F0-80C165F4 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80C165F4-80C165F8 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80C165F8-80C165FC 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80C165FC-80C16600 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80C16600-80C16604 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80C16604-80C16608 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80C16608-80C1660C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80C1660C-80C16610 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80C16610-80C16614 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80C16614-80C16618 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80C16618-80C1661C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80C1661C-80C16620 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80C16620-80C16624 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80C16624-80C16628 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80C16628-80C16634 000048 000C+00 0/1 0/0 0/0 .bss @3639 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index 554aed3d467..538855111c9 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_hakai_brl.cpp +* @file d_a_obj_hakai_brl.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_hakai_brl.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index 4ae2c5010b7..b7c85e999c6 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_hakai_ftr.cpp +* @file d_a_obj_hakai_ftr.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_hakai_ftr.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_hasu2.cpp b/src/d/actor/d_a_obj_hasu2.cpp index 5f86be3e32f..85cd0447fcb 100644 --- a/src/d/actor/d_a_obj_hasu2.cpp +++ b/src/d/actor/d_a_obj_hasu2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_hasu2.h" #include "dol2asm.h" @@ -60,7 +62,6 @@ extern "C" void __dl__FPv(); extern "C" void __cvt_fp2unsigned(); extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/src/d/actor/d_a_obj_hata.cpp b/src/d/actor/d_a_obj_hata.cpp index 8a69ad075c9..9270ab69a30 100644 --- a/src/d/actor/d_a_obj_hata.cpp +++ b/src/d/actor/d_a_obj_hata.cpp @@ -3,31 +3,12 @@ // Translation Unit: d_a_obj_hata // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_hata.h" +#include "f_op/f_op_actor.h" #include "dol2asm.h" -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct csXyz { - /* 80C18CCC */ ~csXyz(); - /* 80C18D64 */ csXyz(); -}; - -struct mDoMtx_stack_c { - /* 8000CF44 */ void ZXYrotM(csXyz const&); - - static u8 now[48]; -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - struct daObjHata_c { /* 80C18D08 */ daObjHata_c(); /* 80C18D68 */ ~daObjHata_c(); @@ -41,31 +22,6 @@ struct daObjHata_c { /* 80C1919C */ void moveSwing(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct cXyz {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DModel {}; - -struct J3DJoint {}; - // // Forward References: // @@ -111,20 +67,13 @@ extern "C" void cM_rndF__Ff(); extern "C" void cM_rndFX__Ff(); extern "C" void cLib_chaseF__FPfff(); extern "C" void __dl__FPv(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXTrans(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void _savegpr_21(); extern "C" void _savegpr_26(); extern "C" void _restgpr_21(); extern "C" void _restgpr_26(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; // @@ -141,11 +90,6 @@ static void nodeCallBack(J3DJoint* param_0, int param_1) { // NONMATCHING } -/* 80C18CCC-80C18D08 00018C 003C+00 2/2 0/0 0/0 .text __dt__5csXyzFv */ -csXyz::~csXyz() { - // NONMATCHING -} - /* ############################################################################################## */ /* 80C194C0-80C194C0 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ #pragma push @@ -190,11 +134,6 @@ daObjHata_c::daObjHata_c() { // NONMATCHING } -/* 80C18D64-80C18D68 000224 0004+00 1/1 0/0 0/0 .text __ct__5csXyzFv */ -csXyz::csXyz() { - /* empty function */ -} - /* 80C18D68-80C18E00 000228 0098+00 1/0 0/0 0/0 .text __dt__11daObjHata_cFv */ daObjHata_c::~daObjHata_c() { // NONMATCHING @@ -248,10 +187,14 @@ void daObjHata_c::init() { /* 80C19480-80C1948C 000008 000C+00 0/1 0/0 0/0 .rodata SING$3793 */ #pragma push #pragma force_active on +#define SING_BAK SING +#undef SING SECTION_RODATA static u8 const SING[12] = { 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, }; COMPILER_STRIP_GATE(0x80C19480, &SING); +#define SING SING_BAK +#undef SING_BAK #pragma pop /* 80C1948C-80C19498 000014 000C+00 0/1 0/0 0/0 .rodata AIM_ANGLE_X$3794 */ @@ -341,4 +284,4 @@ static void daObjHata_draw(daObjHata_c* param_0) { // NONMATCHING } -/* 80C194C0-80C194C0 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C194C0-80C194C0 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_hb.cpp b/src/d/actor/d_a_obj_hb.cpp index 6ab3d9e2c4d..c4676eb443a 100644 --- a/src/d/actor/d_a_obj_hb.cpp +++ b/src/d/actor/d_a_obj_hb.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_hb.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -128,10 +130,8 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u8 data_80C1B7E0[4]; // diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp index 9ab73cd0b40..afaf9fc78da 100644 --- a/src/d/actor/d_a_obj_hbombkoya.cpp +++ b/src/d/actor/d_a_obj_hbombkoya.cpp @@ -3,6 +3,8 @@ * Kakariko Exploding Bomb Warehouse */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_hbombkoya.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_heavySw.cpp b/src/d/actor/d_a_obj_heavySw.cpp index 764bd564091..8762ad02ac7 100644 --- a/src/d/actor/d_a_obj_heavySw.cpp +++ b/src/d/actor/d_a_obj_heavySw.cpp @@ -3,29 +3,13 @@ * Object - Heavy Switch (Triggered by Player wearing Iron Boots) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_heavySw.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_procname.h" -/* 80C1DAE8-80C1DAF4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C1DAF4-80C1DB08 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C1CAEC-80C1CB80 0000EC 0094+00 1/1 0/0 0/0 .text __ct__15daHeavySw_HIO_cFv */ daHeavySw_HIO_c::daHeavySw_HIO_c() { field_0x04 = 150.0f; diff --git a/src/d/actor/d_a_obj_hfuta.cpp b/src/d/actor/d_a_obj_hfuta.cpp index 6889fab886e..92cd067dec7 100644 --- a/src/d/actor/d_a_obj_hfuta.cpp +++ b/src/d/actor/d_a_obj_hfuta.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_hfuta.h" #include "d/d_com_inf_game.h" #include "Z2AudioLib/Z2Instances.h" @@ -41,8 +43,6 @@ int daObjFuta_c::Create() { return 1; } -UNK_REL_DATA - /* 80C1EEC4-80C1EEC8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "Obj_hfuta"; @@ -66,12 +66,6 @@ int daObjFuta_c::create1st() { return rv; } -// Required padding -#pragma push -#pragma force_active on -static u8 sbss_padding[0x40]; -#pragma pop - /* 80C1E020-80C1EAFC 000380 0ADC+00 1/0 0/0 0/0 .text Execute__11daObjFuta_cFPPA3_A4_f */ int daObjFuta_c::Execute(f32 (**mtx)[3][4]) { mode_proc_call(); diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index fc3a1830d71..acd0392c8a0 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_hhashi.h" #include "d/actor/d_a_e_fm.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp index d5d5ba5cae9..7f16bc72fdf 100644 --- a/src/d/actor/d_a_obj_hsTarget.cpp +++ b/src/d/actor/d_a_obj_hsTarget.cpp @@ -3,6 +3,8 @@ * Object - Hookshot Target */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_hsTarget.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 02c13a6c5ca..a724d414337 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ice_l.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index ebc59842ebe..337b44100a0 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ice_s.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index a87c456d70f..16f59b04bf9 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_iceblock.cpp +* @file d_a_obj_iceblock.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_iceblock.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" @@ -211,24 +213,6 @@ void daObjIceBlk_c::disablePushPull() { } } -/* 80C244D0-80C244DC 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C244DC-80C244F0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C244F0-80C244F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "Y_icecube"; diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index 5fbcda7452a..c9ced9427c1 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_iceleaf.cpp +* @file d_a_obj_iceleaf.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_iceleaf.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" @@ -20,8 +22,6 @@ void daObjIceLeaf_c::initBaseMtx() { setBaseMtx(); } -UNK_REL_DATA - /* 80C25DD0-80C25DD4 -00001 0004+00 7/7 0/0 0/0 .data l_arcName */ static char* l_arcName = "V_IceLeaf"; diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index 5f62a38ee32..eea026a3af9 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_ihasi.cpp +* @file d_a_obj_ihasi.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ihasi.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index ebcc9200597..9803b70ecb1 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ikada.h" #include "dol2asm.h" @@ -77,7 +79,6 @@ extern "C" void _restgpr_29(); extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index 4d41fb59910..5af5c014821 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_inobone.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -89,7 +91,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp index 37747cec613..58da39c5219 100644 --- a/src/d/actor/d_a_obj_ita.cpp +++ b/src/d/actor/d_a_obj_ita.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ita.h" #include "dol2asm.h" @@ -93,7 +95,6 @@ extern "C" void _restgpr_29(); extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index 060670c963e..e769d60892b 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_itamato.h" #include "d/d_cc_d.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index ac84cfb0322..7d4299487ea 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -3,6 +3,8 @@ * Item (Rupee, Arrow, Heart, etc) Object Actor */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_item.h" #include "SSystem/SComponent/c_math.h" #include "d/d_a_itembase_static.h" @@ -145,11 +147,6 @@ static void itemGetTgCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf, } } -/* 803B9DA0-803B9DAC 016EC0 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 8015B3D8-8015B7BC 155D18 03E4+00 1/1 0/0 0/0 .text CreateInit__8daItem_cFv */ void daItem_c::CreateInit() { mAcchCir.SetWall(30.0f, 30.0f); diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp index df459542191..054921bde25 100644 --- a/src/d/actor/d_a_obj_ito.cpp +++ b/src/d/actor/d_a_obj_ito.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ito.h" #include "d/actor/d_a_obj_gm.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 5401faf0af3..132c480f069 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -3,6 +3,8 @@ * Object - Golden Beetle */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kabuto.h" #include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_lib.h" diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index ad770beeb8a..b13578911b8 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kag.h" #include "dol2asm.h" @@ -137,7 +139,6 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" void __register_global_object(); @@ -151,24 +152,6 @@ extern "C" void __register_global_object(); SECTION_RODATA static f32 const lit_3774 = 4.0f / 5.0f; COMPILER_STRIP_GATE(0x80C3114C, &lit_3774); -/* 80C31270-80C3127C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C3127C-80C31290 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C31290-80C312D0 000020 0040+00 0/1 0/0 0/0 .data cc_sph_src__25@unnamed@d_a_obj_kag_cpp@ */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_obj_kage.cpp b/src/d/actor/d_a_obj_kage.cpp index f8e9100de4d..a41930a994a 100644 --- a/src/d/actor/d_a_obj_kage.cpp +++ b/src/d/actor/d_a_obj_kage.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kage.h" #include "dol2asm.h" @@ -48,7 +50,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; // diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index d349ee46c11..5223045918d 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kago.h" #include "SSystem/SComponent/c_counter.h" #include "Z2AudioLib/Z2Instances.h" @@ -12,8 +14,6 @@ #include "dol2asm.h" #include "f_op/f_op_actor_mng.h" -UNK_REL_DATA; - /* 80C33DC0-80C33DD0 000020 0010+00 2/3 0/0 0/0 .data l_bmdData */ static int l_bmdData[2][2] = { { 3, 1 }, { 4, 1 }, @@ -601,8 +601,6 @@ int daObj_Kago_c::getWallAngle(s16 param_1, s16* param_2) { return 1; } -UNK_REL_BSS; - /* 80C33F4C-80C33F50 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daObj_Kago_Param_c l_HIO; diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index f60c165bdd9..dcec8a7fb74 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kaisou.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -77,7 +79,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mGroundY__11fopAcM_gc_c; diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index a7ff3fc49b4..db5df602bf7 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_kamakiri.cpp +* @file d_a_obj_kamakiri.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kamakiri.h" #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 0798669a78d..b655fcd774c 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kanban2.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -724,8 +726,6 @@ void daObj_Kanban2_c::setSmokeEffect(cXyz i_pos) { fopAcM_effSmokeSet1(&field_0x9e0, &field_0x9e4, &i_pos, NULL, 0.02 * field_0x600, &tevStr, 1); } -UNK_REL_BSS - /* 80585CB4-80585CB8 -00001 0004+00 2/2 0/0 0/0 .bss None */ /* 80585CB5 0003+00 l_initHIO None */ static u8 l_initHIO; diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index e7aa87c7fdc..d3235b1085c 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kantera.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" @@ -28,8 +30,6 @@ const static dCcD_SrcCyl l_cyl_src = { } // mCyl }; -UNK_REL_DATA - /* 80C38678-80C38974 000078 02FC+00 1/1 0/0 0/0 .text Reflect__FP4cXyzRC13cBgS_PolyInfof */ static f32 Reflect(cXyz* i_xyz, cBgS_PolyInfo const& param_2, f32 param_3) { diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 7dc8c37e5c3..d6cd526c2df 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_katatsumuri.h" #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index 0ab06c269c8..451d56cd436 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kazeneko.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_npc_tk.h" diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 64319b73b25..9c2c61f2d54 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kbacket.h" #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_npc.h" @@ -15,8 +17,6 @@ // Declarations: // -UNK_REL_DATA - static s32 l_bmdData[4] = { 8, 0, 9, 0 }; static char* l_resNameList[1] = { "Kakashi" }; diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 40f5aed7658..7476314489c 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kbox.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -137,10 +139,8 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -282,98 +282,6 @@ SECTION_RODATA static f32 const lit_3670 = 20.0f; COMPILER_STRIP_GATE(0x80C3F064, &lit_3670); #pragma pop -/* 80C3F248-80C3F24C 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80C3F24C-80C3F250 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F250-80C3F254 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F254-80C3F258 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F258-80C3F25C 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F25C-80C3F260 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F260-80C3F264 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F264-80C3F268 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F268-80C3F26C 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F26C-80C3F270 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F270-80C3F274 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F274-80C3F278 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F278-80C3F27C 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F27C-80C3F280 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F280-80C3F284 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80C3F284-80C3F288 -00001 0004+00 2/2 0/0 0/0 .bss None */ -/* 80C3F284 0001+00 data_80C3F284 @1009 */ -/* 80C3F285 0003+00 data_80C3F285 None */ -static u8 struct_80C3F284[4]; - /* 80C3F288-80C3F294 000048 000C+00 1/1 0/0 0/0 .bss @3643 */ static u8 lit_3643[12]; diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index 4c5077106a3..684dae076ba 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_key.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -15,6 +17,18 @@ #include "d/actor/d_a_e_db.h" #include "SSystem/SComponent/c_counter.h" +class daObj_Key_HIO_c : public JORReflexible{ +public: + /* 80C3F40C */ daObj_Key_HIO_c(); + /* 80C40F28 */ virtual ~daObj_Key_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x4 */ s8 id; + /* 0x8 */ f32 size; + /* 0xC */ f32 chain_size; +}; + /* 80C3F40C-80C3F43C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__15daObj_Key_HIO_cFv */ daObj_Key_HIO_c::daObj_Key_HIO_c() { id = -1; diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index f22577523c7..d3d7ec90ab7 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -3,14 +3,14 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_keyhole.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" #include "Z2AudioLib/Z2Instances.h" -UNK_REL_DATA - /* 80C4124C-80C41270 0000EC 0024+00 1/1 0/0 0/0 .text __ct__19daObj_Keyhole_HIO_cFv */ daObj_Keyhole_HIO_c::daObj_Keyhole_HIO_c() { id = -1; @@ -264,8 +264,6 @@ static void chain_control3(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int } } -UNK_REL_BSS - /* 80C43CE5 0003+00 data_80C43CE5 None */ static u8 l_HIOInit; diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 80d8198e23b..6c2dffbb38c 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kgate.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" @@ -212,24 +214,6 @@ void daObjKGate_c::setBaseMtx() { } } -/* 8058AD24-8058AD30 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8058AD30-8058AD44 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8058AD44-8058AD50 -00001 000C+00 4/4 0/0 0/0 .data l_arcName */ static char* l_arcName[] = { "D_Kgate00", diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index 5f14a540645..b0a712fe4ed 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -3,6 +3,8 @@ * Object - Tree */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ki.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp index 5c61989bcd2..b5b11becd9a 100644 --- a/src/d/actor/d_a_obj_kiPot.cpp +++ b/src/d/actor/d_a_obj_kiPot.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_kiPot.cpp +* @file d_a_obj_kiPot.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kiPot.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index ae68d4a180c..42f309589ec 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kita.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_kjgjs.cpp b/src/d/actor/d_a_obj_kjgjs.cpp index bb29eab4371..9ed17ec2537 100644 --- a/src/d/actor/d_a_obj_kjgjs.cpp +++ b/src/d/actor/d_a_obj_kjgjs.cpp @@ -3,6 +3,8 @@ * Object - Kjgjs */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kjgjs.h" #include "d/d_bg_w.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp index ef7179f1a77..80d2203912a 100644 --- a/src/d/actor/d_a_obj_kkanban.cpp +++ b/src/d/actor/d_a_obj_kkanban.cpp @@ -3,6 +3,8 @@ * Object - Kakariko Sign */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kkanban.h" #include "SSystem/SComponent/c_math.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index f441cdae400..bfc1b8b60c8 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_klift00.h" #include "JSystem/JHostIO/JORMContext.h" #include "SSystem/SComponent/c_math.h" @@ -10,10 +12,20 @@ #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" -static int daObjKLift00_create1st(daObjKLift00_c*); -static int daObjKLift00_MoveBGDelete(daObjKLift00_c*); -static int daObjKLift00_MoveBGExecute(daObjKLift00_c*); -static int daObjKLift00_MoveBGDraw(daObjKLift00_c*); +struct daObjKLift00_HIO_c : public mDoHIO_entry_c { + daObjKLift00_HIO_c(); + ~daObjKLift00_HIO_c() {}; + + void genMessage(JORMContext*); + + /* 0x04 */ f32 mChainGravity; + /* 0x08 */ f32 mRideParameters; + /* 0x0C */ f32 mWindSwayOccuranceFactor; + /* 0x10 */ f32 mWindMagnitudeChain; + /* 0x14 */ f32 mWindMagnitudeFoundation; + /* 0x18 */ f32 mChainHitSpeed; + /* 0x1C */ f32 field_0x1C; +}; #ifdef DEBUG static daObjKLift00_HIO_c l_HIO; @@ -70,7 +82,7 @@ static const char* l_arcName = "K_lift00"; /* 8058C3F8-8058C438 000004 0040+00 1/1 0/0 0/0 .data l_cc_sph_src */ static dCcD_SrcSph l_cc_sph_src = { { - {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}}, // mObj + {0x0, {{0x0, 0x0, 0x0}, {(s32)0xd8fbfdff, 0x11}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo @@ -95,37 +107,16 @@ static dCcD_SrcCyl l_cc_cyl_src = { } // mCyl }; -/* 8058C47C-8058C49C -00001 0020+00 1/0 0/0 0/0 .data daObjKLift00_METHODS */ -static actor_method_class daObjKLift00_METHODS = { - (process_method_func)daObjKLift00_create1st, - (process_method_func)daObjKLift00_MoveBGDelete, - (process_method_func)daObjKLift00_MoveBGExecute, - 0, - (process_method_func)daObjKLift00_MoveBGDraw, -}; - -/* 8058C49C-8058C4CC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KLift00 */ -extern actor_process_profile_definition g_profile_Obj_KLift00 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KLift00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKLift00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 673, // mPriority - &daObjKLift00_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - #ifdef DEBUG static const int l_dzbidx[] = {9}; #endif +// force dCcD_Sph::~dCcD_Sph to be emitted earlier than it otherwise would +void dummy() { + delete (dCcD_Sph*)NULL; + delete (dCcD_Cyl*)NULL; +} + /* 8058B02C-8058B0D0 00016C 00A4+00 1/1 0/0 0/0 .text create1st__14daObjKLift00_cFv */ cPhs__Step daObjKLift00_c::create1st() { mNumChainModels = getArg0(); @@ -517,3 +508,30 @@ static int daObjKLift00_MoveBGExecute(daObjKLift00_c* i_this) { static int daObjKLift00_MoveBGDraw(daObjKLift00_c* i_this) { return i_this->MoveBGDraw(); } + +/* 8058C47C-8058C49C -00001 0020+00 1/0 0/0 0/0 .data daObjKLift00_METHODS */ +static actor_method_class daObjKLift00_METHODS = { + (process_method_func)daObjKLift00_create1st, + (process_method_func)daObjKLift00_MoveBGDelete, + (process_method_func)daObjKLift00_MoveBGExecute, + 0, + (process_method_func)daObjKLift00_MoveBGDraw, +}; + +/* 8058C49C-8058C4CC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_KLift00 */ +extern actor_process_profile_definition g_profile_Obj_KLift00 = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_KLift00, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daObjKLift00_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 673, // mPriority + &daObjKLift00_METHODS, // sub_method + 0x00040100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType + }; diff --git a/src/d/actor/d_a_obj_knBullet.cpp b/src/d/actor/d_a_obj_knBullet.cpp index 074e68c9635..6e1a503dd43 100644 --- a/src/d/actor/d_a_obj_knBullet.cpp +++ b/src/d/actor/d_a_obj_knBullet.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_knBullet.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -71,7 +73,6 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index 90604d49e25..e58bd6dc25b 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kshutter.h" #include "dol2asm.h" @@ -125,7 +127,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_meter2_info[248]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -229,24 +230,6 @@ SECTION_DEAD static char const* const stringBase_80C49DE4 = "KEY_JAIL_WOLF_01"; SECTION_DEAD static char const* const stringBase_80C49DF5 = "DEFAULT_BS_SHUTTER_L3_F"; #pragma pop -/* 80C49E60-80C49E6C 000000 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C49E6C-80C49E80 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C49E80-80C49E94 -00001 0014+00 3/4 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[5] = { (void*)&d_a_obj_kshutter__stringBase0, diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp index 65494ffc004..c157a788f2d 100644 --- a/src/d/actor/d_a_obj_ktOnFire.cpp +++ b/src/d/actor/d_a_obj_ktOnFire.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ktOnFire.h" #include "dol2asm.h" @@ -69,7 +71,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 614afc4dcc3..1eb8ed6ca7d 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kuwagata.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -148,7 +150,6 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" void __register_global_object(); diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp index 017ba43d815..ec03c2583a2 100644 --- a/src/d/actor/d_a_obj_kwheel00.cpp +++ b/src/d/actor/d_a_obj_kwheel00.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kwheel00.h" #include "JSystem/JHostIO/JORMContext.h" #include "d/actor/d_a_obj_lv3Water.h" diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index b4ae0207410..b3cc317dd9b 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kwheel01.h" #include "JSystem/JHostIO/JORMContext.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp index c4e805cf464..f6998dd0816 100644 --- a/src/d/actor/d_a_obj_kznkarm.cpp +++ b/src/d/actor/d_a_obj_kznkarm.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_kznkarm.h" #include "dol2asm.h" @@ -90,7 +92,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_24(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -107,24 +108,6 @@ extern "C" void getFirstVec__15daObjKazeNeko_cFP4cXyzi(); SECTION_DEAD static char const* const stringBase_80C50D90 = "J_Kazami"; #pragma pop -/* 80C50DA4-80C50DB0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C50DB0-80C50DC4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C50DC4-80C50DC8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_kznkarm__stringBase0; diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index 8069704e34e..80b4456a29c 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ladder.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "SSystem/SComponent/c_math.h" @@ -139,24 +141,6 @@ inline static const Attr& attr() { /* 8058DD74-8058DD7C 000024 0005+03 3/3 0/0 0/0 .rodata M_arcname__Q211daObjLadder5Act_c */ SECTION_RODATA char const daObjLadder::Act_c::M_arcname[5] = "Mhsg"; -/* 8058DDAC-8058DDB8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8058DDB8-8058DDCC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - struct AttrType { /* 0x0 */ s16 field_0x0; /* 0x2 */ s16 field_0x2; diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index 7f6c91c335f..57dbcc8b141 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_laundry.cpp +* @file d_a_obj_laundry.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_laundry.h" #include "SSystem/SComponent/c_math.h" #include "d/d_cc_d.h" @@ -278,9 +280,6 @@ static int daObjLdy_Delete(daObjLdy_c* i_this) { return 1; } -/* 80C51D2C-80C51D68 000E0C 003C+00 2/2 0/0 0/0 .text __dt__12LaundJoint_cFv */ -LaundJoint_c::~LaundJoint_c() {} - int daObjLdy_c::create() { fopAcM_SetupActor(this, daObjLdy_c); int phase = dComIfG_resLoad(&mPhase, l_arcName); @@ -301,11 +300,6 @@ static int daObjLdy_Create(fopAc_ac_c* i_this) { return ((daObjLdy_c*)i_this)->create(); } -/* 80C51EC0-80C51EC4 000FA0 0004+00 1/1 0/0 0/0 .text __ct__12LaundJoint_cFv */ -LaundJoint_c::LaundJoint_c() { - /* empty function */ -} - /* 80C520F4-80C52114 -00001 0020+00 1/0 0/0 0/0 .data l_daObjLdy_Method */ static actor_method_class l_daObjLdy_Method = { (process_method_func)daObjLdy_Create, (process_method_func)daObjLdy_Delete, diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp index f6674590acd..cb4c93a170b 100644 --- a/src/d/actor/d_a_obj_laundry_rope.cpp +++ b/src/d/actor/d_a_obj_laundry_rope.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_laundry_rope.cpp +* @file d_a_obj_laundry_rope.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_laundry_rope.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index a50bc99ab9d..bf733ff895b 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -3,6 +3,8 @@ * Object - Unused Block (HIO Label is "Block for boss battle") */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lbox.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 08cf9294860..e81e141513d 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_life_container.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -24,8 +26,6 @@ const static dCcD_SrcCyl l_cyl_src = { } // mCyl }; -UNK_REL_DATA - /* 804CC7D8-804CCAD4 000078 02FC+00 1/1 0/0 0/0 .text Reflect__FP4cXyzRC13cBgS_PolyInfof */ static f32 Reflect(cXyz* i_vec, cBgS_PolyInfo const& i_wallpoly, f32 i_scale) { diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index e2512563e6a..b95268f66e1 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lp.h" #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_mg_rod.h" @@ -10,8 +12,6 @@ #include "d/actor/d_a_player.h" #include "Z2AudioLib/Z2Instances.h" -UNK_REL_BSS - /* 80C54198-80C542FC 000078 0164+00 1/0 0/0 0/0 .text daObj_Lp_Draw__FP12obj_lp_class */ 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_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp index 36ddc2cf91d..1e1c5f6bad0 100644 --- a/src/d/actor/d_a_obj_lv1Candle00.cpp +++ b/src/d/actor/d_a_obj_lv1Candle00.cpp @@ -2,6 +2,8 @@ // Translation Unit: d_a_obj_lv1Candle00 // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv1Candle00.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index 69a5ee0f4da..f80415575ea 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -2,6 +2,8 @@ // Translation Unit: d_a_obj_lv1Candle01 // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv1Candle01.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp index 7da6dda01c7..5451aed1b79 100644 --- a/src/d/actor/d_a_obj_lv2Candle.cpp +++ b/src/d/actor/d_a_obj_lv2Candle.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv2Candle.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor.h" diff --git a/src/d/actor/d_a_obj_lv3Candle.cpp b/src/d/actor/d_a_obj_lv3Candle.cpp index 3648c0f6ef9..249736fda32 100644 --- a/src/d/actor/d_a_obj_lv3Candle.cpp +++ b/src/d/actor/d_a_obj_lv3Candle.cpp @@ -3,6 +3,8 @@ // Object - Level 3 Candle // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv3Candle.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv3Water.cpp b/src/d/actor/d_a_obj_lv3Water.cpp index 206786e9c90..82cabd7f87b 100644 --- a/src/d/actor/d_a_obj_lv3Water.cpp +++ b/src/d/actor/d_a_obj_lv3Water.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_lv3Water.cpp +* @file d_a_obj_lv3Water.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv3Water.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_bg_w.h" @@ -10,24 +12,20 @@ #include "d/d_procname.h" #include "f_op/f_op_msg_mng.h" -/* 80C5A314-80C5A31C 000014 0008+00 2/2 0/0 0/0 .bss l_HIO */ -static daLv3Water_HIO_c l_HIO; +class daLv3Water_HIO_c : public mDoHIO_entry_c { +public: + /* 80C587CC */ daLv3Water_HIO_c(); + /* 80C59C34 */ virtual ~daLv3Water_HIO_c() {} -/* 80C5A13C-80C5A148 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; + void genMessage(JORMContext*); -/* 80C5A148-80C5A15C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, + /* 0x00 */ /* vtable */ + /* 0x04 */ u8 field_0x04; }; +/* 80C5A314-80C5A31C 000014 0008+00 2/2 0/0 0/0 .bss l_HIO */ +static daLv3Water_HIO_c l_HIO; + /* 80C5A15C-80C5A1B0 -00001 0054+00 3/3 0/0 0/0 .data l_resNameIdx */ static char* l_resNameIdx[] = { "Kr10water", "Kr10wat01", "Kr02wat00", "Kr03wat00", "Kr03wat01", "Kr03wat02", "Kr03wat03", @@ -429,11 +427,6 @@ static int daLv3Water_Create(fopAc_ac_c* i_this) { } /* 80C59C34-80C59C90 001554 005C+00 2/1 0/0 0/0 .text __dt__16daLv3Water_HIO_cFv */ -daLv3Water_HIO_c::~daLv3Water_HIO_c() {} - -/* 80C59D80-80C59E5C 0016A0 00DC+00 2/1 0/0 0/0 .text __dt__12daLv3Water_cFv */ -daLv3Water_c::~daLv3Water_c() {} - /* 80C5A228-80C5A248 -00001 0020+00 1/0 0/0 0/0 .data l_daLv3Water_Method */ static actor_method_class l_daLv3Water_Method = { (process_method_func)daLv3Water_Create, (process_method_func)daLv3Water_Delete, diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp index b1e13472351..85fcade09fd 100644 --- a/src/d/actor/d_a_obj_lv3Water2.cpp +++ b/src/d/actor/d_a_obj_lv3Water2.cpp @@ -3,11 +3,22 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv3Water2.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_graphic.h" +struct daLv3Water2_HIO_c : public mDoHIO_entry_c { + /* 80C5A40C */ daLv3Water2_HIO_c(); + /* 80C5B14C */ ~daLv3Water2_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ u8 mLevelControlWaitFrames; +}; + typedef void (daLv3Water2_c::*actionFunc)(void); static int daLv3Water2_Draw(daLv3Water2_c* i_this); @@ -28,9 +39,6 @@ void daLv3Water2_HIO_c::genMessage(JORMContext* ctx) { } #endif -/* 80C5B3A4-80C5B3B0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -UNK_REL_DATA; - /* 80C5B3C4-80C5B3C8 -00001 0004+00 3/3 0/0 0/0 .data l_resNameIdx */ static char* l_resNameIdx[] = {"Kr03wat04"}; diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp index 887b4258b37..fcc29e65c58 100644 --- a/src/d/actor/d_a_obj_lv3WaterB.cpp +++ b/src/d/actor/d_a_obj_lv3WaterB.cpp @@ -3,6 +3,8 @@ * Morpheel Arena Water */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv3WaterB.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp index a8541a6a81c..e793320c044 100644 --- a/src/d/actor/d_a_obj_lv3saka00.cpp +++ b/src/d/actor/d_a_obj_lv3saka00.cpp @@ -3,6 +3,8 @@ // Object: lv3saka00 (Lakebed Temple) // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv3saka00.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv3waterEff.cpp b/src/d/actor/d_a_obj_lv3waterEff.cpp index 42de608a34e..15822454762 100644 --- a/src/d/actor/d_a_obj_lv3waterEff.cpp +++ b/src/d/actor/d_a_obj_lv3waterEff.cpp @@ -3,6 +3,8 @@ * Lakebed Temple Pre-Deku Toad Room Water Bubbles */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv3waterEff.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp index 14506c73d82..f4106a4e384 100644 --- a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp @@ -3,12 +3,22 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4CandleDemoTag.h" #include "d/d_com_inf_game.h" #include "d/d_path.h" #include "m_Do/m_Do_hostIO.h" -UNK_REL_DATA +class dalv4CandleDemoTag_HIO_c : public mDoHIO_entry_c { +public: + /* 80C5C9EC */ dalv4CandleDemoTag_HIO_c(); + /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x4 */ s16 mEnemyWaitTime; +}; /* 80C5C9EC-80C5CA10 0000EC 0024+00 1/1 0/0 0/0 .text __ct__24dalv4CandleDemoTag_HIO_cFv */ diff --git a/src/d/actor/d_a_obj_lv4CandleTag.cpp b/src/d/actor/d_a_obj_lv4CandleTag.cpp index dfcf1e73cbb..1f08b5da70d 100644 --- a/src/d/actor/d_a_obj_lv4CandleTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleTag.cpp @@ -3,18 +3,11 @@ // Translation Unit: d_a_obj_lv4CandleTag // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4CandleTag.h" #include "dol2asm.h" -// -// Types: -// - -struct dSv_info_c { - /* 800352B0 */ void offSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - // // Forward References: // @@ -66,7 +59,6 @@ extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -74,25 +66,6 @@ extern "C" void __register_global_object(); // Declarations: // -/* ############################################################################################## */ -/* 80C5DB64-80C5DB70 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C5DB70-80C5DB84 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C5DB84-80C5DB90 -00001 000C+00 0/1 0/0 0/0 .data @3686 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp index bf1d1c4f4a5..9e61467f3bb 100644 --- a/src/d/actor/d_a_obj_lv4EdShutter.cpp +++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4EdShutter.h" #include "dol2asm.h" @@ -79,7 +81,6 @@ extern "C" void __dl__FPv(); extern "C" void __ptmf_scall(); extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -96,24 +97,6 @@ COMPILER_STRIP_GATE(0x80C5E8DC, &lit_3634); SECTION_RODATA static f32 const lit_3635 = 40.0f; COMPILER_STRIP_GATE(0x80C5E8E0, &lit_3635); -/* 80C5E904-80C5E910 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C5E910-80C5E924 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C5E924-80C5E930 -00001 000C+00 0/1 0/0 0/0 .data @3721 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_obj_lv4Gate.cpp b/src/d/actor/d_a_obj_lv4Gate.cpp index 9604de76c88..8abfcf1c280 100644 --- a/src/d/actor/d_a_obj_lv4Gate.cpp +++ b/src/d/actor/d_a_obj_lv4Gate.cpp @@ -3,29 +3,12 @@ * Arbiter's Grounds Generic Gate */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4Gate.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -/* 80C5F41C-80C5F428 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C5F428-80C5F43C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -// unused data? -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C5F52C-80C5F538 000014 000C+00 3/3 0/0 0/0 .bss l_HIO */ static daLv4Gate_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_lv4HsTarget.cpp b/src/d/actor/d_a_obj_lv4HsTarget.cpp index 8450e10db43..fe741bc0d0a 100644 --- a/src/d/actor/d_a_obj_lv4HsTarget.cpp +++ b/src/d/actor/d_a_obj_lv4HsTarget.cpp @@ -3,6 +3,8 @@ * Arbiter's Grounds Clawshot Target */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4HsTarget.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_lv4PoGate.cpp b/src/d/actor/d_a_obj_lv4PoGate.cpp index 0b943741021..332d6e6b7e6 100644 --- a/src/d/actor/d_a_obj_lv4PoGate.cpp +++ b/src/d/actor/d_a_obj_lv4PoGate.cpp @@ -3,26 +3,12 @@ * Arbiter's Grounds Poe Gate */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4PoGate.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -/* 80C60854-80C60860 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C60860-80C60874 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -// unused data ? -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80C5FBEC-80C5FC5C 0000EC 0070+00 1/1 0/0 0/0 .text __ct__17daLv4PoGate_HIO_cFv */ daLv4PoGate_HIO_c::daLv4PoGate_HIO_c() { mOpenSpeed = 10.0f; diff --git a/src/d/actor/d_a_obj_lv4RailWall.cpp b/src/d/actor/d_a_obj_lv4RailWall.cpp index 196b83cce0e..c18f0ad6e6f 100644 --- a/src/d/actor/d_a_obj_lv4RailWall.cpp +++ b/src/d/actor/d_a_obj_lv4RailWall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4RailWall.h" #include "dol2asm.h" @@ -108,7 +110,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80C61D38[4]; @@ -161,24 +162,6 @@ void daObjLv4Wall_c::Create() { SECTION_DEAD static char const* const stringBase_80C61BB0 = "P_L4Rwall"; #pragma pop -/* 80C61BBC-80C61BC8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C61BC8-80C61BDC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C61BDC-80C61BE0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv4RailWall__stringBase0; diff --git a/src/d/actor/d_a_obj_lv4SlideWall.cpp b/src/d/actor/d_a_obj_lv4SlideWall.cpp index b521dd9c874..33e5aa6d4de 100644 --- a/src/d/actor/d_a_obj_lv4SlideWall.cpp +++ b/src/d/actor/d_a_obj_lv4SlideWall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4SlideWall.h" #include "dol2asm.h" @@ -71,7 +73,6 @@ extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -88,24 +89,6 @@ COMPILER_STRIP_GATE(0x80C626A8, &lit_3627); SECTION_RODATA static f32 const lit_3628 = 4.0f; COMPILER_STRIP_GATE(0x80C626AC, &lit_3628); -/* 80C626D0-80C626DC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C626DC-80C626F0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C626F0-80C626FC -00001 000C+00 0/1 0/0 0/0 .data @3720 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp index dfd22427886..0349de9f0e6 100644 --- a/src/d/actor/d_a_obj_lv4bridge.cpp +++ b/src/d/actor/d_a_obj_lv4bridge.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4bridge.h" #include "dol2asm.h" @@ -80,7 +82,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80C632B8[4]; @@ -139,24 +140,6 @@ void daObjLv4Brg_c::Create() { SECTION_DEAD static char const* const stringBase_80C63190 = "Obj_l4brg"; #pragma pop -/* 80C6319C-80C631A8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C631A8-80C631BC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C631BC-80C631C0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv4bridge__stringBase0; diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index 71dd7aef5cf..08dbb6f199f 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4chandelier.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_obj_swchain.h" @@ -12,6 +14,12 @@ #include "dol2asm.h" #ifdef DEBUG +class daObjLv4Chan_HIO_c : public mDoHIO_entry_c { +public: + daObjLv4Chan_HIO_c(); + void genMessage(JORMContext*); +}; + daObjLv4Chan_HIO_c::daObjLv4Chan_HIO_c() { } diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 304f2023213..32dc045be89 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -3,6 +3,8 @@ * Arbiter's Grounds Dig Sand */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4digsand.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -35,24 +37,6 @@ int daObjL4DigSand_c::Create() { return 1; } -/* 80C675EC-80C675F8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C675F8-80C6760C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C6760C-80C67610 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "P_DSand"; diff --git a/src/d/actor/d_a_obj_lv4floor.cpp b/src/d/actor/d_a_obj_lv4floor.cpp index 761a8ed73b5..6855d8de76c 100644 --- a/src/d/actor/d_a_obj_lv4floor.cpp +++ b/src/d/actor/d_a_obj_lv4floor.cpp @@ -3,6 +3,8 @@ * Moving sand-floor in Stallord Arena */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4floor.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" @@ -28,25 +30,6 @@ int daObjLv4Floor_c::Create() { return 1; } -/* 80C67D9C-80C67DA8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C67DA8-80C67DBC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -// unused data? -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C67DBC-80C67DC0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "P_L4Floor"; diff --git a/src/d/actor/d_a_obj_lv4gear.cpp b/src/d/actor/d_a_obj_lv4gear.cpp index 79aee6e8757..4beeb619d05 100644 --- a/src/d/actor/d_a_obj_lv4gear.cpp +++ b/src/d/actor/d_a_obj_lv4gear.cpp @@ -3,6 +3,8 @@ // Spinner gear (Arbiter's Grounds) // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4gear.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_lv4prelvtr.cpp b/src/d/actor/d_a_obj_lv4prelvtr.cpp index 3b96d937b98..f60ada5ef4d 100644 --- a/src/d/actor/d_a_obj_lv4prelvtr.cpp +++ b/src/d/actor/d_a_obj_lv4prelvtr.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_lv4prelvtr.cpp +* @file d_a_obj_lv4prelvtr.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4prelvtr.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp index 8c857eaaa1c..79f79abddb9 100644 --- a/src/d/actor/d_a_obj_lv4prwall.cpp +++ b/src/d/actor/d_a_obj_lv4prwall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4prwall.h" #include "dol2asm.h" @@ -65,7 +67,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp index b8557ec16af..1f3ad978856 100644 --- a/src/d/actor/d_a_obj_lv4sand.cpp +++ b/src/d/actor/d_a_obj_lv4sand.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv4sand.h" #include "dol2asm.h" @@ -83,7 +85,6 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80C6A508[4]; @@ -131,24 +132,6 @@ COMPILER_STRIP_GATE(0x80C6A3C0, &lit_3710); SECTION_DEAD static char const* const stringBase_80C6A3D4 = "P_L4Sand"; #pragma pop -/* 80C6A3E0-80C6A3EC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C6A3EC-80C6A400 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C6A400-80C6A404 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv4sand__stringBase0; diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index 965ebe1b10d..cbf985d68d3 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -3,28 +3,12 @@ * Snowpeak Ruins Destructable Floor */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv5FloorBoard.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -/* 80C6B198-80C6B1A4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C6B1A4-80C6B1B8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C6A60C-80C6A658 0000EC 004C+00 1/1 0/0 0/0 .text __ct__16daFlorBoad_HIO_cFv */ daFlorBoad_HIO_c::daFlorBoad_HIO_c() { field_0x10 = 3; diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index e59d82b9e50..e82315a48f2 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -3,28 +3,12 @@ * Snowpeak Ruins Ice Wall */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv5IceWall.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -/* 80C6C6C8-80C6C6D4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C6C6D4-80C6C6E8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C6B42C-80C6B478 0000EC 004C+00 1/1 0/0 0/0 .text __ct__15daIceWall_HIO_cFv */ daIceWall_HIO_c::daIceWall_HIO_c() { hitcount = 3; diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index b5acef7067d..bd486a55dde 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -3,28 +3,12 @@ * Snowpeak Ruins Ice Switch */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv5SwIce.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -/* 80C6D560-80C6D56C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C6D56C-80C6D580 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C6C94C-80C6C97C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__16daLv5SwIce_HIO_cFv */ daLv5SwIce_HIO_c::daLv5SwIce_HIO_c() { hitcount = 3; diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index 38fa292e2dc..05d6a7d7f89 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -3,6 +3,8 @@ * Snowpeak Ruins Chandelier (Swinging Platform) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv5ychndlr.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index 1fd2442be36..48bd062dbdf 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -3,6 +3,8 @@ * Snowpeak Ruins Cannon Ball Tray */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv5yiblltray.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index cbdee2f80c5..0d23e4a1df2 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6ChangeGate.h" #include "dol2asm.h" @@ -120,7 +122,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -137,24 +138,6 @@ COMPILER_STRIP_GATE(0x80C7214C, &lit_3639); SECTION_RODATA static f32 const lit_3640 = 562.5f; COMPILER_STRIP_GATE(0x80C72150, &lit_3640); -/* 80C721AC-80C721B8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C721B8-80C721CC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C721CC-80C72210 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__17daLv6ChangeGate_c */ SECTION_DATA u8 daLv6ChangeGate_c::mCcDCyl[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp index d3330d5cc18..81e3144710d 100644 --- a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp +++ b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6FurikoTrap.h" #include "dol2asm.h" @@ -90,7 +92,6 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp index 15feef76ccf..44e0a54b30b 100644 --- a/src/d/actor/d_a_obj_lv6Lblock.cpp +++ b/src/d/actor/d_a_obj_lv6Lblock.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6Lblock.h" #include "dol2asm.h" @@ -69,7 +71,6 @@ extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -82,24 +83,6 @@ extern "C" void __register_global_object(); SECTION_RODATA static f32 const lit_3627 = 15.0f; COMPILER_STRIP_GATE(0x80C73CBC, &lit_3627); -/* 80C73CE4-80C73CF0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C73CF0-80C73D04 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C73D04-80C73D0C 000020 0008+00 1/1 0/0 0/0 .data l_liftUpMax */ SECTION_DATA static u8 l_liftUpMax[8] = { 0x43, 0x96, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index 20552cb1bf8..837613d8b81 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6SwGate.h" #include "dol2asm.h" @@ -115,7 +117,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -142,24 +143,6 @@ SECTION_RODATA static f32 const lit_3635 = 275.0f; COMPILER_STRIP_GATE(0x80C7552C, &lit_3635); #pragma pop -/* 80C75598-80C755A4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C755A4-80C755B8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C755B8-80C755FC 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__13daLv6SwGate_c */ SECTION_DATA u8 daLv6SwGate_c::mCcDCyl[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp index f566064dd64..be34dc1c757 100644 --- a/src/d/actor/d_a_obj_lv6SzGate.cpp +++ b/src/d/actor/d_a_obj_lv6SzGate.cpp @@ -1,14 +1,14 @@ /** - * @file d_a_obj_lv6SzGate.cpp +* @file d_a_obj_lv6SzGate.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6SzGate.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -UNK_REL_DATA - /* 80C76688-80C766A0 000020 0018+00 1/1 0/0 0/0 .data l_cull_box */ static cull_box l_cull_box = {{-1200.0f, -300.0f, -100.0f}, {1200.0f, 300.0f, 100.0f}}; diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 23e00c58d79..d4f2c96c237 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6Tenbin.h" #include "dol2asm.h" @@ -77,7 +79,6 @@ extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/src/d/actor/d_a_obj_lv6TogeRoll.cpp b/src/d/actor/d_a_obj_lv6TogeRoll.cpp index 7517e3b590a..2ef6a1c6015 100644 --- a/src/d/actor/d_a_obj_lv6TogeRoll.cpp +++ b/src/d/actor/d_a_obj_lv6TogeRoll.cpp @@ -1,16 +1,16 @@ /** - * @file d_a_obj_lv6TogeRoll.cpp +* @file d_a_obj_lv6TogeRoll.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6TogeRoll.h" #include "d/d_path.h" /* 80C79D44-80C79D58 000014 0014+00 4/4 0/0 0/0 .bss l_HIO */ static daTogeRoll_HIO_c l_HIO; -UNK_REL_DATA; - /* 80C79B0C-80C79B4C 000020 0040+00 2/2 0/0 0/0 .data mCcDSph__12daTogeRoll_c */ dCcD_SrcSph daTogeRoll_c::mCcDSph = { daTogeRoll_c::mCcDObjInfo, // mObjInf diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index 643ea9ed1d1..3213daf0bc0 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6TogeTrap.h" #include "dol2asm.h" @@ -155,7 +157,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -208,24 +209,6 @@ SECTION_DEAD static char const* const stringBase_80C7C765 = "L4TogeTp"; SECTION_DEAD static char const* const stringBase_80C7C76E = "L9Toge"; #pragma pop -/* 80C7C778-80C7C784 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C7C784-80C7C798 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C7C798-80C7C7D8 000020 0040+00 1/2 0/0 0/0 .data mCcDSph__15daLv6TogeTrap_c */ SECTION_DATA u8 daLv6TogeTrap_c::mCcDSph[64] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index dc80fc37568..615a05bc84a 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6bemos.h" #include "SSystem/SComponent/c_lib.h" #include "d/actor/d_a_player.h" @@ -110,8 +112,6 @@ void daObjL6Bm_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -UNK_REL_DATA; - /* 80C7DF98-80C7DF9C -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ static char* l_arcName = "Obj_lv6bm"; diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index 1b8de32e263..9ead00b745f 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6bemos2.h" #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" @@ -108,8 +110,6 @@ void daObjLv6Bm_c::setBaseMtx() { mBeamEffectModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -UNK_REL_DATA; - /* 80C81D24-80C81D28 -00001 0004+00 9/10 0/0 0/0 .data l_arcName */ static char* l_arcName = "E_bm6"; diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index 862d3e02fcc..16693ec5318 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6egate.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -80,7 +82,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/src/d/actor/d_a_obj_lv6elevta.cpp b/src/d/actor/d_a_obj_lv6elevta.cpp index ef92bc57129..88df70ad5cf 100644 --- a/src/d/actor/d_a_obj_lv6elevta.cpp +++ b/src/d/actor/d_a_obj_lv6elevta.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6elevta.h" #include "dol2asm.h" @@ -69,7 +71,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index de1a9ecf314..04c0f07a51c 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv6swturn.h" #include "dol2asm.h" @@ -72,7 +74,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80C847A0[4]; @@ -121,24 +122,6 @@ void daObjLv6SwTurn_c::Create() { SECTION_DEAD static char const* const stringBase_80C846C4 = "Obj_l6tsw"; #pragma pop -/* 80C846D0-80C846DC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C846DC-80C846F0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C846F0-80C846F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv6swturn__stringBase0; diff --git a/src/d/actor/d_a_obj_lv7BsGate.cpp b/src/d/actor/d_a_obj_lv7BsGate.cpp index 1c36b0437fa..73ca228dd1c 100644 --- a/src/d/actor/d_a_obj_lv7BsGate.cpp +++ b/src/d/actor/d_a_obj_lv7BsGate.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv7BsGate.h" #include "dol2asm.h" @@ -70,7 +72,6 @@ extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -94,24 +95,6 @@ SECTION_DEAD static char const* const stringBase_80C85234 = "L7Gate"; SECTION_DEAD static char const* const stringBase_80C8523B = "L7GateL"; #pragma pop -/* 80C85244-80C85250 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C85250-80C85264 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C85264-80C8526C -00001 0008+00 3/3 0/0 0/0 .data l_type */ SECTION_DATA static void* l_type[2] = { (void*)&d_a_obj_lv7BsGate__stringBase0, diff --git a/src/d/actor/d_a_obj_lv7PropellerY.cpp b/src/d/actor/d_a_obj_lv7PropellerY.cpp index 4aecb55a33d..74f85c46523 100644 --- a/src/d/actor/d_a_obj_lv7PropellerY.cpp +++ b/src/d/actor/d_a_obj_lv7PropellerY.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv7PropellerY.h" #include "dol2asm.h" @@ -75,7 +77,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -128,24 +129,6 @@ SECTION_DEAD static char const* const stringBase_80C86160 = "stickwl00"; SECTION_DEAD static char const* const stringBase_80C8616A = "stickwl01"; #pragma pop -/* 80C86174-80C86180 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C86180-80C86194 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C86194-80C8619C -00001 0008+00 3/3 0/0 0/0 .data l_type */ SECTION_DATA static void* l_type[2] = { (void*)&d_a_obj_lv7PropellerY__stringBase0, diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 2d4c0d8b7ba..5a9b06cb6e2 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv7bridge.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -123,7 +125,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80C87BB8[4]; @@ -231,24 +232,6 @@ SECTION_DEAD static char const* const stringBase_80C87A20 = "Obj_l7brg"; SECTION_DEAD static char const* const stringBase_80C87A2A = "K_bridge"; #pragma pop -/* 80C87A34-80C87A40 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C87A40-80C87A54 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C87A54-80C87A5C -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[2] = { (void*)&d_a_obj_lv7bridge__stringBase0, diff --git a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp index ab36746a1f9..fd01e36d42a 100644 --- a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp +++ b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv8KekkaiTrap.h" #include "dol2asm.h" @@ -68,7 +70,6 @@ extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __register_global_object(); // @@ -95,24 +96,6 @@ COMPILER_STRIP_GATE(0x80C884E8, &lit_3652); SECTION_DEAD static char const* const stringBase_80C884F8 = "Lv8Kekkai"; #pragma pop -/* 80C88504-80C88510 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C88510-80C88524 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C88524-80C88528 -00001 0004+00 3/3 0/0 0/0 .data l_type */ SECTION_DATA static void* l_type = (void*)&d_a_obj_lv8KekkaiTrap__stringBase0; diff --git a/src/d/actor/d_a_obj_lv8Lift.cpp b/src/d/actor/d_a_obj_lv8Lift.cpp index 1d91eb3cc84..d68eca4cd6a 100644 --- a/src/d/actor/d_a_obj_lv8Lift.cpp +++ b/src/d/actor/d_a_obj_lv8Lift.cpp @@ -3,13 +3,13 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv8Lift.h" #include "d/d_com_inf_game.h" #include "d/d_path.h" #include "d/d_bg_w.h" -UNK_REL_DATA - /* 80C8872C-80C88790 0000EC 0064+00 1/1 0/0 0/0 .text __ct__14daL8Lift_HIO_cFv */ daL8Lift_HIO_c::daL8Lift_HIO_c() { mStopDisappearTime = 30; diff --git a/src/d/actor/d_a_obj_lv8OptiLift.cpp b/src/d/actor/d_a_obj_lv8OptiLift.cpp index e03161c42f1..b2d07776f17 100644 --- a/src/d/actor/d_a_obj_lv8OptiLift.cpp +++ b/src/d/actor/d_a_obj_lv8OptiLift.cpp @@ -1,32 +1,16 @@ /** - * @file d_a_obj_lv8OptiLift.cpp +* @file d_a_obj_lv8OptiLift.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv8OptiLift.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_path.h" -/* 80C8BA44-80C8BA50 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C8BA50-80C8BA64 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C8A30C-80C8A368 0000EC 005C+00 1/1 0/0 0/0 .text __ct__16daOptiLift_HIO_cFv */ daOptiLift_HIO_c::daOptiLift_HIO_c() { mStopDisappearTime = 30; diff --git a/src/d/actor/d_a_obj_lv8UdFloor.cpp b/src/d/actor/d_a_obj_lv8UdFloor.cpp index 489e5372312..33db258e84e 100644 --- a/src/d/actor/d_a_obj_lv8UdFloor.cpp +++ b/src/d/actor/d_a_obj_lv8UdFloor.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv8UdFloor.h" #include "dol2asm.h" @@ -75,7 +77,6 @@ extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -100,24 +101,6 @@ SECTION_DEAD static char const* const stringBase_80C8CC34 = "L8Step"; SECTION_DEAD static char const* const stringBase_80C8CC3B = "L8StepX"; #pragma pop -/* 80C8CC44-80C8CC50 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C8CC50-80C8CC64 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C8CC64-80C8CC6C -00001 0008+00 3/3 0/0 0/0 .data l_resNameIdx */ SECTION_DATA static void* l_resNameIdx[2] = { (void*)&d_a_obj_lv8UdFloor__stringBase0, diff --git a/src/d/actor/d_a_obj_lv9SwShutter.cpp b/src/d/actor/d_a_obj_lv9SwShutter.cpp index db3e3d574d9..0f74912e9fa 100644 --- a/src/d/actor/d_a_obj_lv9SwShutter.cpp +++ b/src/d/actor/d_a_obj_lv9SwShutter.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_lv9SwShutter.h" #include "dol2asm.h" @@ -71,7 +73,6 @@ extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -98,24 +99,6 @@ SECTION_RODATA static f32 const lit_3629 = 15.0f; COMPILER_STRIP_GATE(0x80C8D7E4, &lit_3629); #pragma pop -/* 80C8D80C-80C8D818 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C8D818-80C8D82C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C8D82C-80C8D838 -00001 000C+00 0/1 0/0 0/0 .data @3722 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_obj_magLift.cpp b/src/d/actor/d_a_obj_magLift.cpp index e5696abd236..27559044d05 100644 --- a/src/d/actor/d_a_obj_magLift.cpp +++ b/src/d/actor/d_a_obj_magLift.cpp @@ -3,28 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_magLift.h" #include "dol2asm.h" #include "d/d_path.h" -/* 80C8E6DC-80C8E6E8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C8E6E8-80C8E6FC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - static daMagLift_HIO_c l_HIO; /* 80C8DA2C-80C8DA58 0000EC 002C+00 1/1 0/0 0/0 .text __ct__15daMagLift_HIO_cFv */ diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp index 4f57a892235..90e4b831405 100644 --- a/src/d/actor/d_a_obj_magLiftRot.cpp +++ b/src/d/actor/d_a_obj_magLiftRot.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_magLiftRot.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" @@ -12,8 +14,6 @@ #include "d/d_bg_w.h" #include "SSystem/SComponent/c_math.h" -UNK_REL_DATA; - /* 80C8FBB0-80C8FBBC -00001 000C+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName[3] = {"MagLiftS", "MagLiftM", "MagLiftL"}; diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp index 0aa05bdd56b..39a8b8499bc 100644 --- a/src/d/actor/d_a_obj_magne_arm.cpp +++ b/src/d/actor/d_a_obj_magne_arm.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_magne_arm.cpp +* @file d_a_obj_magne_arm.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_magne_arm.h" #include "d/actor/d_a_obj_mhole.h" #include "d/d_bg_w.h" @@ -32,9 +34,6 @@ static u8 const l_stop_timer[4] = {60, 60, 60, 60}; /* 80592880-80592888 000038 0008+00 0/4 0/0 0/0 .rodata l_rot_speedY */ static s16 const l_rot_speedY[4] = {200, 200, 200, 200}; -UNK_REL_DATA -UNK_REL_BSS - /* 8058F358-8058F3D4 000078 007C+00 1/1 0/0 0/0 .text getBpartsOffset__11daObjMarm_cFP4cXyz */ void daObjMarm_c::getBpartsOffset(cXyz* i_BPartOffset) { static Vec const s_offsetB = {-150.0f, 1200.0f, 0.0f}; diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index eeb67f43c34..d3a94207511 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_maki.cpp +* @file d_a_obj_maki.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_maki.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 362db86751f..17d7a1f0692 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_master_sword.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" @@ -60,8 +62,6 @@ int daObjMasterSword_c::createHeapCallBack(fopAc_ac_c* i_this) { return static_cast(i_this)->CreateHeap(); } -UNK_REL_DATA - /* 80C9199C-80C919A0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "MstrSword"; diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp index 01189a44e08..7849ac668ca 100644 --- a/src/d/actor/d_a_obj_mato.cpp +++ b/src/d/actor/d_a_obj_mato.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_mato.h" #include "dol2asm.h" @@ -95,7 +97,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/src/d/actor/d_a_obj_metalbox.cpp b/src/d/actor/d_a_obj_metalbox.cpp index 27fdf12bbd1..3edf8473bfa 100644 --- a/src/d/actor/d_a_obj_metalbox.cpp +++ b/src/d/actor/d_a_obj_metalbox.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_metalbox.h" #include "dol2asm.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_mgate.cpp b/src/d/actor/d_a_obj_mgate.cpp index da995eacd7a..a51679bf010 100644 --- a/src/d/actor/d_a_obj_mgate.cpp +++ b/src/d/actor/d_a_obj_mgate.cpp @@ -3,6 +3,8 @@ * Ordon Spring / Bridge Gates */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_mgate.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" @@ -80,25 +82,6 @@ int daObjMGate_c::Create() { return 1; } -/* 80593F68-80593F74 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80593F74-80593F88 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -// unused but still left in? -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80593F88-80593F90 -00001 0008+00 1/3 0/0 0/0 .data l_arcName */ static char* l_arcName[] = { "M_IGate", diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index d959441ac9c..a0afdd5cfee 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_mhole.cpp +* @file d_a_obj_mhole.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_mhole.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index 4fe0c9a3cfe..2c7ece96be4 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_mie.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -134,7 +136,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" void getType__13daNpc_Pouya_cFv(); @@ -609,100 +610,6 @@ void daObj_Mie_c::setSmokePrtcl() { // NONMATCHING } -/* ############################################################################################## */ -/* 80C95CD0-80C95CD4 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 80C95CD4-80C95CD8 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 80C95CD8-80C95CDC 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 80C95CDC-80C95CE0 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 80C95CE0-80C95CE4 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 80C95CE4-80C95CE8 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 80C95CE8-80C95CEC 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 80C95CEC-80C95CF0 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 80C95CF0-80C95CF4 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 80C95CF4-80C95CF8 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 80C95CF8-80C95CFC 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 80C95CFC-80C95D00 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 80C95D00-80C95D04 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 80C95D04-80C95D08 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 80C95D08-80C95D0C 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 80C95D0C-80C95D10 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 80C95D10-80C95D1C 000048 000C+00 1/1 0/0 0/0 .bss @3822 */ static u8 lit_3822[12]; diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp index b06ad4e8321..63c1fee2628 100644 --- a/src/d/actor/d_a_obj_mirror_6pole.cpp +++ b/src/d/actor/d_a_obj_mirror_6pole.cpp @@ -3,6 +3,8 @@ * Mirror Chamber Sage Poles */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_mirror_6pole.h" #include "d/d_procname.h" @@ -11,25 +13,6 @@ void daObjMirror6Pole_c::initWait() { mpBck->setPlaySpeed(0.0f); } -/* 80C9652C-80C96538 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C96538-80C9654C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -// unused data? -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80C9654C-80C96550 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "MR-6Pole"; diff --git a/src/d/actor/d_a_obj_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp index f16224a49ba..c60c6e25394 100644 --- a/src/d/actor/d_a_obj_mirror_chain.cpp +++ b/src/d/actor/d_a_obj_mirror_chain.cpp @@ -3,6 +3,8 @@ * Mirror Chamber Chains */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_mirror_chain.h" #include "d/d_com_inf_game.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_mirror_sand.cpp b/src/d/actor/d_a_obj_mirror_sand.cpp index 3a5b2365b9d..5417e275a17 100644 --- a/src/d/actor/d_a_obj_mirror_sand.cpp +++ b/src/d/actor/d_a_obj_mirror_sand.cpp @@ -3,6 +3,8 @@ * Mirror Chamber Sand Floor */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_mirror_sand.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp index 1a9d36d9cc3..a949237277d 100644 --- a/src/d/actor/d_a_obj_mirror_screw.cpp +++ b/src/d/actor/d_a_obj_mirror_screw.cpp @@ -3,25 +3,12 @@ * Mirror Chamber Statue */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_mirror_screw.h" #include "d/actor/d_a_player.h" #include "d/d_procname.h" -/* 80C997A0-80C997AC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80C997AC-80C997C0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80C997C0-80C997C4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char const* l_arcName = "MR-Screw"; diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index da8d16cfc2b..d45d66b9b55 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -3,6 +3,8 @@ * Mirror Chamber Pedestal & Mirror */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_mirror_table.h" #include "d/actor/d_a_mirror.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 59b7e57bc8a..0ccadd29ae1 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_movebox.cpp +* @file d_a_obj_movebox.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_movebox.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" @@ -11,8 +13,6 @@ #include "d/actor/d_a_obj_burnbox.h" #include "d/actor/d_a_obj_eff.h" -UNK_REL_DATA - /* 80480F28-80480F78 000000 0050+00 14/14 0/0 0/0 .rodata M_lin5__Q212daObjMovebox5Bgc_c */ const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin5[] = { {0.0f, 0.0f, 0.0f, 0.0f}, {-0.5f, -0.5f, 1.0f, 1.0f}, {0.5f, -0.5f, -1.0f, 1.0f}, @@ -45,8 +45,6 @@ daObjMovebox::Bgc_c::Bgc_c() { mState = STATE_0_e; } -UNK_REL_BSS - /* 804818D4-80482060 000054 078C+00 7/8 0/0 0/0 .bss M_gnd_work__Q212daObjMovebox5Bgc_c */ dBgS_ObjGndChk daObjMovebox::Bgc_c::M_gnd_work[23]; diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index e34e87a11af..f3d62b0c539 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_msima.h" #include "Z2AudioLib/Z2Instances.h" #include "c/c_damagereaction.h" @@ -89,8 +91,6 @@ static void msima_start(obj_msima_class* i_this) { i_this->field_0x59a = 0x708; } -UNK_REL_BSS - /* 80C9CEA4-80C9CEA8 -00001 0004+00 2/2 0/0 0/0 .bss None */ /* 80C9CEA4 0001+00 data_80C9CEA4 @1009 */ /* 80C9CEA5 0003+00 data_80C9CEA5 None */ diff --git a/src/d/actor/d_a_obj_mvstair.cpp b/src/d/actor/d_a_obj_mvstair.cpp index 909bbc9b649..2b6d5095e4e 100644 --- a/src/d/actor/d_a_obj_mvstair.cpp +++ b/src/d/actor/d_a_obj_mvstair.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_mvstair.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -77,8 +79,6 @@ int daObjStair_c::Create() { return 1; } -UNK_REL_DATA - /* 80C9E940-80C9E948 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName[2] = { "K_mvkai00", diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp index fdcd2fb8583..8b3eb2c946d 100644 --- a/src/d/actor/d_a_obj_myogan.cpp +++ b/src/d/actor/d_a_obj_myogan.cpp @@ -3,6 +3,8 @@ * Dangoro Arena Lava */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_myogan.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index 13cab43fb8f..cc152a6943f 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_nagaisu.h" #include "dol2asm.h" @@ -99,7 +101,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index db93b900e53..21161135c88 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_nameplate.cpp +* @file d_a_obj_nameplate.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_nameplate.h" #include "d/actor/d_a_alink.h" #include "d/d_a_obj.h" diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index b9c74676fe6..ba8b1df35ac 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -3,13 +3,23 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_nan.h" #include "SSystem/SComponent/c_xyz.h" #include "d/d_menu_insect.h" #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" -UNK_REL_DATA +class daObj_NanHIO_c { +public: + /* 80CA05AC */ daObj_NanHIO_c(); + /* 80CA30D0 */ virtual ~daObj_NanHIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; +}; /* 80CA32D0-80CA3310 000020 0040+00 0/1 0/0 0/0 .data cc_sph_src__25@unnamed@d_a_obj_nan_cpp@ */ static dCcD_SrcSph cc_sph_src = { diff --git a/src/d/actor/d_a_obj_ndoor.cpp b/src/d/actor/d_a_obj_ndoor.cpp index fa49d999055..1d5ac692c10 100644 --- a/src/d/actor/d_a_obj_ndoor.cpp +++ b/src/d/actor/d_a_obj_ndoor.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ndoor.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -56,7 +58,6 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; // diff --git a/src/d/actor/d_a_obj_nougu.cpp b/src/d/actor/d_a_obj_nougu.cpp index c320b556c99..0cf716d8aad 100644 --- a/src/d/actor/d_a_obj_nougu.cpp +++ b/src/d/actor/d_a_obj_nougu.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_nougu.h" #include "dol2asm.h" @@ -97,7 +99,6 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" void __register_global_object(); diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index 19bbde4c7e3..a3bf99af5be 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_octhashi.h" #include "d/d_cc_d.h" #include "SSystem/SComponent/c_math.h" @@ -361,6 +363,10 @@ static int daObjOCTHASHI_IsDelete(daObjOCTHASHI_c* param_0) { return 1; } +static void dummy() { + delete (cCcD_GStts*)NULL; +} + /* 80CA62A4-80CA62F8 001764 0054+00 1/0 0/0 0/0 .text Create__15daObjOCTHASHI_cFv */ int daObjOCTHASHI_c::Create() { mpBgW->SetRideCallback(rideCallBack); diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index 5d7caeb240d..7ea9b19d94b 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -3,22 +3,9 @@ * Lantern Oil Pot */ -#include "d/actor/d_a_obj_oiltubo.h" - -/* 80CA7988-80CA7994 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +#include "d/dolzel_rel.h" -/* 80CA7994-80CA79A8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; +#include "d/actor/d_a_obj_oiltubo.h" /* 80CA79A8-80CA79AC -00001 0004+00 1/1 0/0 0/0 .data l_resFileName */ static char* l_resFileName = "Obj_otubo"; diff --git a/src/d/actor/d_a_obj_onsen.cpp b/src/d/actor/d_a_obj_onsen.cpp index fb5c1ba1f17..abe3053e2bb 100644 --- a/src/d/actor/d_a_obj_onsen.cpp +++ b/src/d/actor/d_a_obj_onsen.cpp @@ -3,6 +3,8 @@ * Object - Hot Spring */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_onsen.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_onsenFire.cpp b/src/d/actor/d_a_obj_onsenFire.cpp index 51a7c1b5d8a..8d68454703a 100644 --- a/src/d/actor/d_a_obj_onsenFire.cpp +++ b/src/d/actor/d_a_obj_onsenFire.cpp @@ -3,6 +3,8 @@ * Object - Hotspring Fire */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_onsenFire.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index 0698b1f850d..19b624c9dca 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -3,30 +3,14 @@ * Object - Hotspring Water Barrel */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_onsenTaru.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "f_op/f_op_kankyo_mng.h" -/* 80CA9C18-80CA9C24 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CA9C24-80CA9C38 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CA85CC-80CA861C 0000EC 0050+00 1/1 0/0 0/0 .text __ct__15daOnsTaru_HIO_cFv */ daOnsTaru_HIO_c::daOnsTaru_HIO_c() { mCoolTime = 120; diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index 4981da97d87..64f9a16804b 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ornament_cloth.h" #include "dol2asm.h" @@ -76,7 +78,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index fa823e0b6a5..ce3991bfb66 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_pdoor.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_lib.h" @@ -54,8 +56,6 @@ void daObjPDoor_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -UNK_REL_DATA - /* 80CAAB6C-80CAAB70 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "V_OsuDoor"; diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index 0c89cc331f5..50c9f5cf188 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_pdtile.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" @@ -17,8 +19,6 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 static_cast(param_2)->rideActor(param_3); } -UNK_REL_DATA - /* 80CAC5BC-80CAC5C0 -00001 0004+00 0/1 0/0 0/0 .data l_arcName4 */ static char* l_arcName4 = "P_Dtile"; diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index 376af3f241d..4664ed216be 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_pdwall.h" #include "dol2asm.h" @@ -70,7 +72,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index c4f783e601a..cff54cc827d 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_picture.h" #include "dol2asm.h" @@ -126,7 +128,6 @@ extern "C" extern void* __vt__12cCcD_CpsAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index e93bc0f2742..fe72aa3e40c 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_pillar.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" @@ -60,8 +62,6 @@ static const daPillar_c::sdata_t l_shake_data[] = { /* CRASH */ {5, 0, 800, 120, 7000, 30, 15}, }; -UNK_REL_DATA - /* 80CB0B08-80CB0B10 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName[] = { "K_mbhasi0", diff --git a/src/d/actor/d_a_obj_pleaf.cpp b/src/d/actor/d_a_obj_pleaf.cpp index 4652af37c68..0b868571fd7 100644 --- a/src/d/actor/d_a_obj_pleaf.cpp +++ b/src/d/actor/d_a_obj_pleaf.cpp @@ -3,6 +3,8 @@ * Object - Pumpkin Leaf */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_pleaf.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_poCandle.cpp b/src/d/actor/d_a_obj_poCandle.cpp index 52952001325..0bd1d75c882 100644 --- a/src/d/actor/d_a_obj_poCandle.cpp +++ b/src/d/actor/d_a_obj_poCandle.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_poCandle.h" #include "dol2asm.h" @@ -90,7 +92,6 @@ extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -103,24 +104,6 @@ extern "C" void __register_global_object(); SECTION_RODATA static f32 const lit_3635 = 3.0f; COMPILER_STRIP_GATE(0x80CB26B8, &lit_3635); -/* 80CB26F0-80CB26FC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CB26FC-80CB2710 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CB2710-80CB271C -00001 000C+00 0/1 0/0 0/0 .data @3774 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index 13697aa1779..bca94cff913 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -1,11 +1,32 @@ /** - * @file d_a_obj_poFire.cpp +* @file d_a_obj_poFire.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_poFire.h" -UNK_REL_DATA +class daPoFire_HIO_c : public mDoHIO_entry_c { +public: + /* 80CB294C */ daPoFire_HIO_c(); + /* 80CB3D24 */ virtual ~daPoFire_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x06 */ s8 unk6; + /* 0x08 */ f32 mWaitPeriod; // Wait oscillation period + /* 0x0C */ f32 mWaitVertRange; // Wait oscillation amplitude, vertical range + /* 0x10 */ f32 mWaitVertSpeed; // Wait oscillation speed, vertical speed + /* 0x14 */ f32 mMovePeriod1; // Move period + /* 0x18 */ f32 mMoveSwingSpeed1; // Move oscillation speed + /* 0x1C */ f32 mMoveSpeed; // Move speed + /* 0x20 */ f32 mMovePeriod2; // Move period ?? + /* 0x24 */ f32 mMoveSwingSpeed2; // Move oscillation speed + /* 0x28 */ f32 mMoveSwingRange; // Move oscillation range + /* 0x2C */ f32 mPickupRange; // Horizontal dist ? + /* 0x30 */ u8 mFireWaitTime; // Fire wait +}; /* ############################################################################################## */ @@ -458,27 +479,6 @@ static int daPoFire_Create(fopAc_ac_c* i_this) { return a_this->create(); } -/* 80CB3E3C-80CB3E58 0015DC 001C+00 1/1 0/0 0/0 .text getFirePos__12daPoCandle_cFv */ -cXyz daPoCandle_c::getFirePos() { - return static_cast(mFirePos); -} - -// Used to match data on debug, instead of UNK_REL_DATA -// #ifdef DEBUG -// const u8 cNullVec__6Z2Calc[12] = { \ -// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ -// }; -// const u32 lit_1787[1 + 6 /* padding */] = { \ -// 0x02000201, \ -// 0x00000000, \ -// 0x7FF7FFFF, \ -// 0xFFFFFFFF, \ -// 0x7FF7FFFF, \ -// 0xFFFFFFFF, \ -// 0x7FBFFFFF, \ -// }; -// #endif - /* 80CB4050-80CB4070 -00001 0020+00 1/0 0/0 0/0 .data l_daPoFire_Method */ static actor_method_class l_daPoFire_Method = { (process_method_func)daPoFire_Create, (process_method_func)daPoFire_Delete, diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp index 280afce12ed..f5e51fb48a4 100644 --- a/src/d/actor/d_a_obj_poTbox.cpp +++ b/src/d/actor/d_a_obj_poTbox.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_poTbox.h" #include "dol2asm.h" @@ -83,7 +85,6 @@ extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -107,24 +108,6 @@ SECTION_DEAD static char const* const stringBase_80CB4FDC = "pouBox0"; SECTION_DEAD static char const* const stringBase_80CB4FE4 = "pouBox1"; #pragma pop -/* 80CB4FEC-80CB4FF8 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CB4FF8-80CB500C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CB500C-80CB5014 -00001 0008+00 3/3 0/0 0/0 .data l_type */ SECTION_DATA static void* l_type[2] = { (void*)&d_a_obj_poTbox__stringBase0, diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp index b9de1a79439..6f3945b53be 100644 --- a/src/d/actor/d_a_obj_prop.cpp +++ b/src/d/actor/d_a_obj_prop.cpp @@ -3,6 +3,8 @@ * Object - Propeller */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_prop.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index 61f14f24d94..a384853fc96 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_pumpkin.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -155,7 +157,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -174,24 +175,6 @@ SECTION_DEAD static char const* const stringBase_80CB8460 = ""; SECTION_DEAD static char const* const stringBase_80CB8461 = "pumpkin"; #pragma pop -/* 80CB846C-80CB8478 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CB8478-80CB848C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CB848C-80CB8494 000020 0008+00 2/3 0/0 0/0 .data l_bmdData */ SECTION_DATA static u8 l_bmdData[8] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, diff --git a/src/d/actor/d_a_obj_rcircle.cpp b/src/d/actor/d_a_obj_rcircle.cpp index d52588cdaf4..fd37b44e33d 100644 --- a/src/d/actor/d_a_obj_rcircle.cpp +++ b/src/d/actor/d_a_obj_rcircle.cpp @@ -3,6 +3,8 @@ * Object - River Circle */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_rcircle.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp index a1b69a85dff..12777cdc72f 100644 --- a/src/d/actor/d_a_obj_rfHole.cpp +++ b/src/d/actor/d_a_obj_rfHole.cpp @@ -3,12 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_rfHole.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -UNK_REL_DATA - /* 80CB8E6C-80CB8EBC 0000EC 0050+00 1/1 0/0 0/0 .text __ct__14daRfHole_HIO_cFv */ daRfHole_HIO_c::daRfHole_HIO_c() { field_0x04 = 130.0f; diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 0b682a32090..47393e1b050 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -3,6 +3,8 @@ * Bulblin Gate */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_rgate.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" @@ -213,8 +215,6 @@ void daObjRgate_c::setBaseMtx() { } } -UNK_REL_DATA; - /* 80CBC4C0-80CBC4C4 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ static char* l_arcName = "M_RGate00"; diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index b95a88968fa..b7754158344 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_riverrock.h" #include "SSystem/SComponent/c_math.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp index fe32fb591db..1b54e45d78a 100644 --- a/src/d/actor/d_a_obj_rock.cpp +++ b/src/d/actor/d_a_obj_rock.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_rock.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index 468e320f172..8fc563220e4 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -3,12 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_rope_bridge.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -UNK_REL_DATA - /* 80597E84-80597E8C -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName[2] = {"L_RopeB_S", "L_RopeB_L"}; diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index 064c5d3811d..608bc642c27 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_rotBridge.h" #include "dol2asm.h" @@ -78,7 +80,6 @@ extern "C" void init__12J3DFrameCtrlFs(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index 87d997ae74c..285ecd03b63 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_rotTrap.h" #include "dol2asm.h" @@ -104,7 +106,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -117,24 +118,6 @@ extern "C" void __register_global_object(); SECTION_RODATA static f32 const lit_3649 = 4.5f; COMPILER_STRIP_GATE(0x80CC0808, &lit_3649); -/* 80CC0860-80CC086C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CC086C-80CC0880 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CC0880-80CC08C4 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__11daRotTrap_c */ SECTION_DATA u8 daRotTrap_c::mCcDCyl[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index c6c6ec98093..c8a2ffec960 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_roten.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp index 9a6d2e043a0..1c85f49610c 100644 --- a/src/d/actor/d_a_obj_rstair.cpp +++ b/src/d/actor/d_a_obj_rstair.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_rstair.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" @@ -74,8 +76,6 @@ int daObjRotStair_c::Create() { return 1; } -UNK_REL_DATA - /* 80CC275C-80CC2760 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "K_spkai00"; diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index d735beea851..dee64a0343e 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_rw.h" #include "dol2asm.h" @@ -104,11 +106,9 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void __register_global_object(); // diff --git a/src/d/actor/d_a_obj_sWallShutter.cpp b/src/d/actor/d_a_obj_sWallShutter.cpp index c3ef9d60e73..8d8692ba9ac 100644 --- a/src/d/actor/d_a_obj_sWallShutter.cpp +++ b/src/d/actor/d_a_obj_sWallShutter.cpp @@ -1,30 +1,14 @@ /** - * @file d_a_obj_sWallShutter.cpp +* @file d_a_obj_sWallShutter.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_sWallShutter.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -/* 80598FC8-80598FD4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80598FD4-80598FE8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80598FE8-80598FF0 -00001 0008+00 3/3 0/0 0/0 .data l_resNameIdx */ static char* l_resNameIdx[2] = { "P_Rgate", diff --git a/src/d/actor/d_a_obj_saidan.cpp b/src/d/actor/d_a_obj_saidan.cpp index 4780b40ca34..e77797216f1 100644 --- a/src/d/actor/d_a_obj_saidan.cpp +++ b/src/d/actor/d_a_obj_saidan.cpp @@ -3,6 +3,8 @@ // Object - Altar // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_saidan.h" #include "d/d_com_inf_game.h" @@ -13,24 +15,6 @@ static daSaidan_HIO_c l_HIO; -/* 80CC454C-80CC4558 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CC4558-80CC456C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CC3DAC-80CC3DE0 0000EC 0034+00 1/1 0/0 0/0 .text __ct__14daSaidan_HIO_cFv */ daSaidan_HIO_c::daSaidan_HIO_c() { mMaxStep = 2.0f; diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index b0802c51287..248584bfbcd 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_sakuita.h" #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index a77c1e20de0..c337ca6d623 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_sakuita_rope.h" #include "d/d_com_inf_game.h" #include "d/d_path.h" diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 66a35998d21..a083049203d 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_scannon.h" #include "dol2asm.h" @@ -162,7 +164,6 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -207,24 +208,6 @@ SECTION_DEAD static char const* const stringBase_80CC92F2 = "FIRE"; SECTION_DEAD static char const* const stringBase_80CC92F7 = "FINISH"; #pragma pop -/* 80CC9304-80CC9310 000000 000C+00 4/4 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CC9310-80CC9324 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CC9324-80CC9328 -00001 0004+00 0/3 0/0 0/0 .data l_arcName_Comp */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index 7c4d5785648..af0d286d4f2 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_scannon_crs.h" #include "dol2asm.h" @@ -160,24 +162,6 @@ SECTION_DEAD static char const* const stringBase_80CCB150 = "READY"; SECTION_DEAD static char const* const stringBase_80CCB156 = "UP"; #pragma pop -/* 80CCB15C-80CCB168 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CCB168-80CCB17C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CCB17C-80CCB180 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_scannon_crs__stringBase0; diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index 6700eb9302b..16762ffb8a4 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_scannon_ten.h" #include "dol2asm.h" @@ -138,7 +140,6 @@ extern "C" void _restgpr_25(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -172,24 +173,6 @@ SECTION_DEAD static char const* const stringBase_80CCCCB7 = "FIRE_END"; SECTION_DEAD static char const* const stringBase_80CCCCC0 = "FINISH"; #pragma pop -/* 80CCCCD0-80CCCCDC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CCCCDC-80CCCCF0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CCCCF0-80CCCCF4 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_scannon_ten__stringBase0; diff --git a/src/d/actor/d_a_obj_sekidoor.cpp b/src/d/actor/d_a_obj_sekidoor.cpp index 233dc3f6f69..c8205961a4b 100644 --- a/src/d/actor/d_a_obj_sekidoor.cpp +++ b/src/d/actor/d_a_obj_sekidoor.cpp @@ -3,12 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_sekidoor.h" /* ############################################################################################## */ -UNK_REL_DATA; - /* 80CCDA5C-80CCDA64 000020 0008+00 2/3 0/0 0/0 .data l_bmdData */ static struct { u32 bmdIdx; diff --git a/src/d/actor/d_a_obj_sekizo.cpp b/src/d/actor/d_a_obj_sekizo.cpp index 340b11a0a45..59be4258853 100644 --- a/src/d/actor/d_a_obj_sekizo.cpp +++ b/src/d/actor/d_a_obj_sekizo.cpp @@ -3,25 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_sekizo.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -/* 80CCE17C-80CCE188 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CCE188-80CCE19C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80CCE19C-80CCE1A4 000020 0008+00 2/3 0/0 0/0 .data l_bmdData */ static struct { u32 bmdIdx; diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index 31b72fc231f..38fc9395aa7 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_obj_sekizoa // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_sekizoa.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_obj_sekidoor.h" @@ -14,9 +16,6 @@ #include "f_op/f_op_msg.h" -UNK_REL_DATA -UNK_REL_BSS - /* 80CD5EF8-80CD5F40 000020 0048+00 1/1 0/0 0/0 .data l_bmdData */ static daNpc_GetParam1 l_bmdData[9] = { {36, 1}, {36, 1}, {35, 1}, {37, 1}, {38, 1}, {3, 2}, {3, 2}, {4, 2}, {5, 2}, @@ -1000,12 +999,12 @@ bool daObj_Sekizoa_c::afterSetMotionAnm(int i_frame, int i_mode, f32 i_morf, int case 20: mpMorf[0]->setStartFrame(36.0f); break; - case 23: + case 6: + case 17: mpMorf[0]->setStartFrame(29.0f); mpMorf[0]->setEndFrame(41.0f); break; - case 6: - case 17: + case 23: mpMorf[0]->setStartFrame(0.0f); mpMorf[0]->setEndFrame(0.0f); mpMorf[0]->setPlaySpeed(0.0f); @@ -2512,21 +2511,6 @@ static int daObj_Sekizoa_IsDelete(void* i_this) { /* 80CD695C-80CD6960 000084 0004+00 0/1 0/0 0/0 .bss l_HIO */ static daObj_Sekizoa_Param_c l_HIO; -/* 80CD5B84-80CD5C30 007924 00AC+00 1/1 0/0 0/0 .text chkGoal__15daObj_Sekizoa_cFv */ -BOOL daObj_Sekizoa_c::chkGoal() { - daTag_EvtArea_c* evt_area_A = (daTag_EvtArea_c*)mActorMngrs[5].getActorP(); - if (evt_area_A->chkPointInArea(current.pos)) { - return true; - } - - daTag_EvtArea_c* evt_area_B = (daTag_EvtArea_c*)mActorMngrs[6].getActorP(); - if (evt_area_B->chkPointInArea(current.pos)) { - mReverseStatues = (mType == TYPE_0); - return true; - } - return false; -} - /* 80CD671C-80CD673C -00001 0020+00 1/0 0/0 0/0 .data daObj_Sekizoa_MethodTable */ static actor_method_class daObj_Sekizoa_MethodTable = { daObj_Sekizoa_Create, daObj_Sekizoa_Delete, daObj_Sekizoa_Execute, diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 571b8607071..cde4d58cfd3 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_shield.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" @@ -26,8 +28,6 @@ const static dCcD_SrcCyl l_cyl_src = { } // mCyl }; -UNK_REL_DATA - /* 80CD6A58-80CD6D54 000078 02FC+00 1/1 0/0 0/0 .text Reflect__FP4cXyzRC13cBgS_PolyInfof */ static f32 Reflect(cXyz* pSpeed, cBgS_PolyInfo const& param_2, f32 param_3) { diff --git a/src/d/actor/d_a_obj_sm_door.cpp b/src/d/actor/d_a_obj_sm_door.cpp index 92e6e47b8db..3b7de290501 100644 --- a/src/d/actor/d_a_obj_sm_door.cpp +++ b/src/d/actor/d_a_obj_sm_door.cpp @@ -3,6 +3,8 @@ * Object - Sacred Meadow Door */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_sm_door.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index c78ee9a3ea0..a95d20a959d 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -3,14 +3,14 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_smallkey.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_item_data.h" #include "d/d_tresure.h" -UNK_REL_DATA - /* 80CDB7F4-80CDB838 000000 0044+00 6/6 0/0 0/0 .rodata l_cyl_src */ const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index 881af95c4d9..ce4b168bac1 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_smgdoor.h" #include "dol2asm.h" @@ -88,7 +90,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_meter2_info[248]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -152,24 +153,6 @@ SECTION_DEAD static char const* const stringBase_80CDCC70 = "NOW_DOOR_IN"; SECTION_DEAD static char const* const stringBase_80CDCC7C = "OLD_DOOR_IN"; #pragma pop -/* 80CDCCC4-80CDCCD0 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CDCCD0-80CDCCE4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CDCCE4-80CDCCEC -00001 0008+00 3/4 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName[2] = { (void*)&d_a_obj_smgdoor__stringBase0, diff --git a/src/d/actor/d_a_obj_smoke.cpp b/src/d/actor/d_a_obj_smoke.cpp index 71bc0173d8b..433b90ffea3 100644 --- a/src/d/actor/d_a_obj_smoke.cpp +++ b/src/d/actor/d_a_obj_smoke.cpp @@ -3,6 +3,8 @@ * Object - Smoke */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_smoke.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp index 0897622f58c..49b464ee228 100644 --- a/src/d/actor/d_a_obj_smtile.cpp +++ b/src/d/actor/d_a_obj_smtile.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_smtile.h" #include "d/d_com_inf_game.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_smw_stone.cpp b/src/d/actor/d_a_obj_smw_stone.cpp index 4d5756e4e5e..55dcc8edf7a 100644 --- a/src/d/actor/d_a_obj_smw_stone.cpp +++ b/src/d/actor/d_a_obj_smw_stone.cpp @@ -3,6 +3,8 @@ * Object - Sacred Meadow Howling Stone */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_smw_stone.h" #include "d/actor/d_a_alink.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_snowEffTag.cpp b/src/d/actor/d_a_obj_snowEffTag.cpp index 1b8894bc1fb..08ec343d02d 100644 --- a/src/d/actor/d_a_obj_snowEffTag.cpp +++ b/src/d/actor/d_a_obj_snowEffTag.cpp @@ -3,6 +3,8 @@ * Snow Effect Generator Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_snowEffTag.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp index 3e4e1c75ce9..683a3ccb711 100644 --- a/src/d/actor/d_a_obj_snow_soup.cpp +++ b/src/d/actor/d_a_obj_snow_soup.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_snow_soup.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 1b401a876ac..68d4fd1b9bf 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_so.h" #include "d/d_cc_d.h" #include "d/d_camera.h" diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index c8a2dc39234..4188ded5bea 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_spinLift.h" #include "dol2asm.h" @@ -74,7 +76,6 @@ extern "C" void __ptmf_scall(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -106,24 +107,6 @@ SECTION_DEAD static char const* const stringBase_80CE4D75 = "L4_Wal_ZW"; SECTION_DEAD static char const* const stringBase_80CE4D7F = "L4_Wal_X"; #pragma pop -/* 80CE4D88-80CE4D94 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CE4D94-80CE4DA8 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CE4DA8-80CE4DCC -00001 0024+00 3/3 0/0 0/0 .data l_resNameIdx */ SECTION_DATA static void* l_resNameIdx[9] = { (void*)&d_a_obj_spinLift__stringBase0, diff --git a/src/d/actor/d_a_obj_ss_base.cpp b/src/d/actor/d_a_obj_ss_base.cpp index 3f2918ac0c0..3b7071ee799 100644 --- a/src/d/actor/d_a_obj_ss_base.cpp +++ b/src/d/actor/d_a_obj_ss_base.cpp @@ -3,6 +3,8 @@ // Translation Unit: a/obj/d_a_obj_ss_base // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ss_base.h" #include "f_op/f_op_actor_mng.h" @@ -29,4 +31,4 @@ u32 daObj_SSBase_c::getProcessID() { /* 8015E4C8-8015E4CC 158E08 0004+00 1/0 0/0 0/0 .text setSoldOut__14daObj_SSBase_cFv */ void daObj_SSBase_c::setSoldOut() { /* empty function */ -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index 6699c659090..525ece81b6e 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ss_drink.h" #include "dol2asm.h" @@ -140,7 +142,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" void soldoutItem__8daMyna_cFUi(); @@ -156,24 +157,6 @@ SECTION_DEAD static char const* const stringBase_80CE6990 = "Obj_btl"; SECTION_DEAD static char const* const stringBase_80CE6998 = "al_bottle.bmd"; #pragma pop -/* 80CE69C4-80CE69D0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CE69D0-80CE69E4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CE69E4-80CE69E8 -00001 0004+00 2/2 0/0 0/0 .data l_resFileName */ SECTION_DATA static void* l_resFileName = (void*)&d_a_obj_ss_drink__stringBase0; diff --git a/src/d/actor/d_a_obj_ss_item.cpp b/src/d/actor/d_a_obj_ss_item.cpp index 5f52d595f50..0f3bac51129 100644 --- a/src/d/actor/d_a_obj_ss_item.cpp +++ b/src/d/actor/d_a_obj_ss_item.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ss_item.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_stairBlock.cpp b/src/d/actor/d_a_obj_stairBlock.cpp index 6209440b8e7..d19f27eeb86 100644 --- a/src/d/actor/d_a_obj_stairBlock.cpp +++ b/src/d/actor/d_a_obj_stairBlock.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_stairBlock.h" #include "dol2asm.h" @@ -87,7 +89,6 @@ extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/src/d/actor/d_a_obj_stick.cpp b/src/d/actor/d_a_obj_stick.cpp index 001f955c1f3..c1bac1d17be 100644 --- a/src/d/actor/d_a_obj_stick.cpp +++ b/src/d/actor/d_a_obj_stick.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_stick.h" #include "d/d_com_inf_game.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 827aae38b85..03147be91a9 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -6,6 +6,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_stone.h" #include "d/actor/d_a_player.h" #include "d/d_lib.h" @@ -135,8 +137,6 @@ const static s16 l_rot_angle[2] = {35, 18}; /* 80CECB94-80CECB98 0000E0 0004+00 0/1 0/0 0/0 .rodata l_walk_rot_angle */ const static s16 l_walk_rot_angle[2] = {40, 40}; -UNK_REL_DATA - /* 80CECC74-80CECC7C -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName[2] = { "D_Srock", // small rock diff --git a/src/d/actor/d_a_obj_stoneMark.cpp b/src/d/actor/d_a_obj_stoneMark.cpp index a72961b16e5..52d18a1829a 100644 --- a/src/d/actor/d_a_obj_stoneMark.cpp +++ b/src/d/actor/d_a_obj_stoneMark.cpp @@ -6,6 +6,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_stoneMark.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp index c54896762b2..a681e7bae74 100644 --- a/src/d/actor/d_a_obj_stopper.cpp +++ b/src/d/actor/d_a_obj_stopper.cpp @@ -1,15 +1,14 @@ /** - * @file d_a_obj_stopper.cpp +* @file d_a_obj_stopper.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_stopper.h" #include "Z2AudioLib/Z2Instances.h" #include "d/d_com_inf_game.h" -UNK_REL_BSS -UNK_REL_DATA - /* 80CECF0C-80CECF34 0000EC 0028+00 1/1 0/0 0/0 .text getStopModelData__Fv */ static J3DModelData* getStopModelData() { return (J3DModelData*)dComIfG_getStageRes("door-stop.bmd"); diff --git a/src/d/actor/d_a_obj_stopper2.cpp b/src/d/actor/d_a_obj_stopper2.cpp index 89bae15501d..a1cda649ede 100644 --- a/src/d/actor/d_a_obj_stopper2.cpp +++ b/src/d/actor/d_a_obj_stopper2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_stopper2.h" #include "dol2asm.h" @@ -138,24 +140,6 @@ COMPILER_STRIP_GATE(0x80CEFE90, &lit_3722); SECTION_RODATA static f32 const lit_3723 = 150.0f; COMPILER_STRIP_GATE(0x80CEFE94, &lit_3723); -/* 80CEFF04-80CEFF10 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CEFF10-80CEFF24 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CEFF24-80CEFF28 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_stopper2__stringBase0; diff --git a/src/d/actor/d_a_obj_suisya.cpp b/src/d/actor/d_a_obj_suisya.cpp index 8c88f61c9d8..57ae5bca4f8 100644 --- a/src/d/actor/d_a_obj_suisya.cpp +++ b/src/d/actor/d_a_obj_suisya.cpp @@ -3,6 +3,8 @@ * Ordon Village Water Wheel */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_suisya.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index a99fd7b0ad7..87d47d5a138 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_sw.cpp +* @file d_a_obj_sw.cpp * */ +#include "d/dolzel_rel.h" + // #define VIRTUAL_3DLINEMAT #include "d/actor/d_a_obj_sw.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp index dbd34053cd0..aeacd201c5b 100644 --- a/src/d/actor/d_a_obj_swBallA.cpp +++ b/src/d/actor/d_a_obj_swBallA.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swBallA.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_obj_carry.h" @@ -140,8 +142,6 @@ int daObjSwBallA_c::Create() { return 1; } -UNK_REL_DATA - /* 80CF4438-80CF443C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "P_LBswA"; diff --git a/src/d/actor/d_a_obj_swBallB.cpp b/src/d/actor/d_a_obj_swBallB.cpp index e9c8e15960f..02c1295c7f2 100644 --- a/src/d/actor/d_a_obj_swBallB.cpp +++ b/src/d/actor/d_a_obj_swBallB.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swBallB.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_obj_carry.h" @@ -169,8 +171,6 @@ int daObjSwBallB_c::Create() { return 1; } -UNK_REL_DATA - /* 80CF5A40-80CF5A44 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "P_LBswBC"; diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index 0966c5f5152..a2bf1759237 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -2,6 +2,8 @@ // d_a_obj_swBallC // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swBallC.h" #include "d/actor/d_a_obj_swBallB.h" #include "d/actor/d_a_obj_carry.h" @@ -64,24 +66,6 @@ void daObjSwBallC_c::setBaseMtx() { /* 80CF6CD4-80CF6CD8 000000 0004+00 3/3 0/0 0/0 .rodata l_color */ static GXColor const l_color = {0x03, 0x96, 0xFF, 0xFF}; -/* 80CF6D90-80CF6D9C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CF6D9C-80CF6DB0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CF6DB0-80CF6DB4 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */ static char* l_arcName = "P_LBswBC"; diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 59d232afa80..653af5f7152 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swLight.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -122,7 +124,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" extern void* __vt__16Z2SoundObjSimple[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80CF8630[4]; @@ -193,24 +194,6 @@ SECTION_DEAD static char const* const stringBase_80CF8454 = "Obj_l8sw0"; SECTION_DEAD static char const* const stringBase_80CF845E = "cc_LB_v"; #pragma pop -/* 80CF8468-80CF8474 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CF8474-80CF8488 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CF8488-80CF848C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_swLight__stringBase0; diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index 9fa28009548..6d11425ff59 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swchain.h" #include "d/d_cc_d.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index da6801968aa..20b35115251 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swhang.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" @@ -70,8 +72,6 @@ void daObjSwHang_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -UNK_REL_DATA - /* 80CFD2D8-80CFD2EC -00001 0014+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName[5] = { "S_bura_A", diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp index 877cfd59a26..be946dd91b8 100644 --- a/src/d/actor/d_a_obj_sword.cpp +++ b/src/d/actor/d_a_obj_sword.cpp @@ -1,15 +1,15 @@ /** - * @file d_a_obj_sword.cpp +* @file d_a_obj_sword.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_sword.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" -UNK_REL_DATA; - /* 80CFDEB4-80CFDECC 000020 0018+00 1/1 0/0 0/0 .data l_cull_box */ static Vec l_cull_box[2] = {{-200.0f, 0.0f, -200.0f}, {200.0f, 100.0f, 200.0f}}; diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index 56726b3cb1c..1d3da61d15d 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swpropeller.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index d4312f7169c..edc0f7bbdf6 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swpush.h" #include "d/actor/d_a_player.h" #include "d/d_s_play.h" @@ -60,8 +62,6 @@ s16 const daObjSwpush::Act_c::M_bmd[3] = {BMDR_KBOTA_00, BMDR_S_LV3BOTA, BMDR_S_ /* 80484D18-80484D20 000008 0006+02 1/1 0/0 0/0 .rodata M_dzb__Q211daObjSwpush5Act_c */ s16 const daObjSwpush::Act_c::M_dzb[3] = {DZB_KBOTA_00, DZB_KBOTA2_00, DZB_KBOTA3_00}; -UNK_REL_DATA; - /* 80484EA4-80484EB0 -00001 000C+00 3/3 0/0 0/0 .data M_arcname__Q211daObjSwpush5Act_c */ char* daObjSwpush::Act_c::M_arcname[3] = { "Kbota_00", @@ -347,8 +347,6 @@ void daObjSwpush::Act_c::set_btp_frame() { /* empty function */ } -UNK_REL_BSS; - /* 80483574-80483910 000914 039C+00 1/1 0/0 0/0 .text rideCB__Q211daObjSwpush5Act_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ void daObjSwpush::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) { Act_c* i_this = (Act_c*)i_ac; diff --git a/src/d/actor/d_a_obj_swpush2.cpp b/src/d/actor/d_a_obj_swpush2.cpp index 63ae471ee32..f5692e4bdaa 100644 --- a/src/d/actor/d_a_obj_swpush2.cpp +++ b/src/d/actor/d_a_obj_swpush2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swpush2.h" #include "dol2asm.h" @@ -123,7 +125,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80CFFEF8[4]; @@ -322,24 +323,6 @@ SECTION_RODATA static u8 const lit_3858[4] = { }; COMPILER_STRIP_GATE(0x80CFFCE4, &lit_3858); -/* 80CFFDA0-80CFFDAC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CFFDAC-80CFFDC0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80CFFDC0-80CFFDCC -00001 000C+00 0/1 0/0 0/0 .data @4336 */ #pragma push #pragma force_active on diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp index 781a522ae8c..2db572701fb 100644 --- a/src/d/actor/d_a_obj_swpush5.cpp +++ b/src/d/actor/d_a_obj_swpush5.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swpush5.h" #include "dol2asm.h" @@ -99,7 +101,6 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -138,99 +139,6 @@ SECTION_RODATA static f32 const lit_3720 = 50.0f; COMPILER_STRIP_GATE(0x8059C6B4, &lit_3720); #pragma pop -/* 8059C870-8059C874 000008 0001+03 1/1 0/0 0/0 .bss @1109 */ -static u8 lit_1109[1 + 3 /* padding */]; - -/* 8059C874-8059C878 00000C 0001+03 0/0 0/0 0/0 .bss @1107 */ -#pragma push -#pragma force_active on -static u8 lit_1107[1 + 3 /* padding */]; -#pragma pop - -/* 8059C878-8059C87C 000010 0001+03 0/0 0/0 0/0 .bss @1105 */ -#pragma push -#pragma force_active on -static u8 lit_1105[1 + 3 /* padding */]; -#pragma pop - -/* 8059C87C-8059C880 000014 0001+03 0/0 0/0 0/0 .bss @1104 */ -#pragma push -#pragma force_active on -static u8 lit_1104[1 + 3 /* padding */]; -#pragma pop - -/* 8059C880-8059C884 000018 0001+03 0/0 0/0 0/0 .bss @1099 */ -#pragma push -#pragma force_active on -static u8 lit_1099[1 + 3 /* padding */]; -#pragma pop - -/* 8059C884-8059C888 00001C 0001+03 0/0 0/0 0/0 .bss @1097 */ -#pragma push -#pragma force_active on -static u8 lit_1097[1 + 3 /* padding */]; -#pragma pop - -/* 8059C888-8059C88C 000020 0001+03 0/0 0/0 0/0 .bss @1095 */ -#pragma push -#pragma force_active on -static u8 lit_1095[1 + 3 /* padding */]; -#pragma pop - -/* 8059C88C-8059C890 000024 0001+03 0/0 0/0 0/0 .bss @1094 */ -#pragma push -#pragma force_active on -static u8 lit_1094[1 + 3 /* padding */]; -#pragma pop - -/* 8059C890-8059C894 000028 0001+03 0/0 0/0 0/0 .bss @1057 */ -#pragma push -#pragma force_active on -static u8 lit_1057[1 + 3 /* padding */]; -#pragma pop - -/* 8059C894-8059C898 00002C 0001+03 0/0 0/0 0/0 .bss @1055 */ -#pragma push -#pragma force_active on -static u8 lit_1055[1 + 3 /* padding */]; -#pragma pop - -/* 8059C898-8059C89C 000030 0001+03 0/0 0/0 0/0 .bss @1053 */ -#pragma push -#pragma force_active on -static u8 lit_1053[1 + 3 /* padding */]; -#pragma pop - -/* 8059C89C-8059C8A0 000034 0001+03 0/0 0/0 0/0 .bss @1052 */ -#pragma push -#pragma force_active on -static u8 lit_1052[1 + 3 /* padding */]; -#pragma pop - -/* 8059C8A0-8059C8A4 000038 0001+03 0/0 0/0 0/0 .bss @1014 */ -#pragma push -#pragma force_active on -static u8 lit_1014[1 + 3 /* padding */]; -#pragma pop - -/* 8059C8A4-8059C8A8 00003C 0001+03 0/0 0/0 0/0 .bss @1012 */ -#pragma push -#pragma force_active on -static u8 lit_1012[1 + 3 /* padding */]; -#pragma pop - -/* 8059C8A8-8059C8AC 000040 0001+03 0/0 0/0 0/0 .bss @1010 */ -#pragma push -#pragma force_active on -static u8 lit_1010[1 + 3 /* padding */]; -#pragma pop - -/* 8059C8AC-8059C8B0 000044 0001+03 0/0 0/0 0/0 .bss @1009 */ -#pragma push -#pragma force_active on -static u8 lit_1009[1 + 3 /* padding */]; -#pragma pop - /* 8059C8B0-8059C8C0 000048 000C+04 0/1 0/0 0/0 .bss @3654 */ #pragma push #pragma force_active on @@ -299,24 +207,6 @@ void daObjSw5_c::Create() { SECTION_DEAD static char const* const stringBase_8059C6D0 = "D_Hfsw00"; #pragma pop -/* 8059C6DC-8059C6E8 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8059C6E8-8059C6FC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8059C6FC-8059C700 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ SECTION_DATA static void* l_arcName = (void*)&d_a_obj_swpush5__stringBase0; diff --git a/src/d/actor/d_a_obj_swspinner.cpp b/src/d/actor/d_a_obj_swspinner.cpp index 97f16bafbed..5fd1edbbcfa 100644 --- a/src/d/actor/d_a_obj_swspinner.cpp +++ b/src/d/actor/d_a_obj_swspinner.cpp @@ -3,6 +3,8 @@ * Object - Spinner Switch */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swspinner.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 0fca73be7f5..00e142d553b 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_swturn.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" @@ -122,8 +124,6 @@ int daObjSwTurn_c::Create() { return 1; } -UNK_REL_DATA - /* 80D020EC-80D020F4 -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName[2] = { "P_Lv4tsw", diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp index 5c17bf490ab..3672b30e5e3 100644 --- a/src/d/actor/d_a_obj_syRock.cpp +++ b/src/d/actor/d_a_obj_syRock.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_syRock.h" #include "d/actor/d_a_obj_eff.h" #include "d/d_bg_w.h" @@ -10,10 +12,37 @@ #include "f_op/f_op_kankyo_mng.h" #include "SSystem/SComponent/c_math.h" -typedef void (daSyRock_c::*actionFunc)(); +class daSyRock_HIO_c : public mDoHIO_entry_c { +public: + /* 80D022AC */ daSyRock_HIO_c(); + /* 80D03C44 */ ~daSyRock_HIO_c() {} + + void genMessage(JORMContext*); + + /* 0x04 */ f32 mShakeAmplitude; // "揺れ強さ" "Shake strength" | Slider + /* 0x08 */ f32 mShakeXOscillationAngle; // "振幅Ｘ" "Amplitude X" | Slider + /* 0x0C */ f32 mShakeZOscillationAngle; // "振幅Ｚ" "Amplitude Z" | Slider + /* 0x10 */ f32 mShakeDamping; // "揺れ減衰" "Shake damping" | Slider + /* 0x14 */ f32 mShakeMaxDecay; // "最大減衰量" "Maximum decay" | Slider + /* 0x18 */ f32 mShakeMinDecay; // "最小減衰量" "Minimum decay" | Slider + /* 0x1C */ f32 mFallAcceleration; // "落下速度" "Fall speed" | Slider + /* 0x20 */ f32 mMaxFallSpeed; // "最大落下速度" "Maximum falling speed" | Slider + /* 0x24 */ u8 mWaitFrames; // "wait time" | Slider (unused) + /* 0x25 */ u8 mShockStrength; // "振動" "Vibration" | Combo Box + /* "強さ１" "Strength 1" + "強さ２" "Strength 2" + "強さ３" "Strength 3" + "強さ４" "Strength 4" + "強さ５" "Strength 5" + "強さ６" "Strength 6" + "強さ７" "Strength 7" + "強さ８" "Strength 8" */ + /* 0x28 */ f32 mEffectScale; // "eff scale" | Slider + /* 0x2C */ f32 mFallWaterBouyancy; // "sink speed" | Slider + /* 0x30 */ f32 mMaxWaterPillarRange; // "renge" | "Range" | Slider +}; -/* 80D0403C-80D04048 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -UNK_REL_DATA +typedef void (daSyRock_c::*actionFunc)(); /* 80D0426C-80D042A0 000014 0034+00 8/8 0/0 0/0 .bss l_HIO */ static daSyRock_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_szbridge.cpp b/src/d/actor/d_a_obj_szbridge.cpp index 3969371e4bb..35fa4dbb9b3 100644 --- a/src/d/actor/d_a_obj_szbridge.cpp +++ b/src/d/actor/d_a_obj_szbridge.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_szbridge.h" #include "dol2asm.h" @@ -75,7 +77,6 @@ extern "C" void _savegpr_26(); extern "C" void _restgpr_26(); extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; // // Declarations: diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index 97b78c93e44..2c9ab69ecc1 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_taFence.h" #include "dol2asm.h" @@ -107,7 +109,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); @@ -207,24 +208,6 @@ SECTION_RODATA static f32 const lit_3663 = 0.5f; COMPILER_STRIP_GATE(0x80D06110, &lit_3663); #pragma pop -/* 80D061A4-80D061B0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D061B0-80D061C4 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80D061C4-80D06208 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__11daTaFence_c */ SECTION_DATA u8 daTaFence_c::mCcDCyl[68] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index 46aebdc01d0..5d1cb50580b 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_table.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_obj_takaraDai.cpp b/src/d/actor/d_a_obj_takaraDai.cpp index cb31d982e09..1a70811a577 100644 --- a/src/d/actor/d_a_obj_takaraDai.cpp +++ b/src/d/actor/d_a_obj_takaraDai.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_takaraDai.cpp +* @file d_a_obj_takaraDai.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_takaraDai.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index 24eea77757d..cffc6526af4 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_tatigi.h" #include "d/d_cc_d.h" #include "d/d_cc_uty.h" diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 850c2ad6951..f35b1fc0619 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ten.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_testcube.cpp b/src/d/actor/d_a_obj_testcube.cpp index 3c4d1438270..8c384407146 100644 --- a/src/d/actor/d_a_obj_testcube.cpp +++ b/src/d/actor/d_a_obj_testcube.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_testcube.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_tgake.cpp b/src/d/actor/d_a_obj_tgake.cpp index 098c687b608..5ead5fa1bed 100644 --- a/src/d/actor/d_a_obj_tgake.cpp +++ b/src/d/actor/d_a_obj_tgake.cpp @@ -3,6 +3,8 @@ * Howling Cliff */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_tgake.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index 3a96768cf7c..3e19f4c94e8 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_thashi.h" #include "d/d_cc_d.h" #include "dol2asm.h" @@ -101,7 +103,6 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 m_set_func__16dBgS_MoveBgActor[4 + 4 /* padding */]; diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index df33ceba8b5..55f888c941f 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_thdoor.h" #include "d/d_bg_w.h" #include "d/d_cc_d.h" @@ -66,8 +68,6 @@ void daObjThDoor_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -UNK_REL_DATA - /* 80D0E678-80D0E67C -00001 0004+00 3/4 0/0 0/0 .data l_arcName */ static char* l_arcName = "V_CTDoor"; diff --git a/src/d/actor/d_a_obj_timeFire.cpp b/src/d/actor/d_a_obj_timeFire.cpp index 51ccec3f705..4b8120b87ca 100644 --- a/src/d/actor/d_a_obj_timeFire.cpp +++ b/src/d/actor/d_a_obj_timeFire.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_timeFire.h" #include "d/d_com_inf_game.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index 5a0b2ed53b5..7df30b01942 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -3,12 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_timer.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" -UNK_REL_DATA - /* 80485198-8048526C 000078 00D4+00 1/1 0/0 0/0 .text _create__Q210daObjTimer5Act_cFv */ int daObjTimer::Act_c::_create() { fopAcM_SetupActor(this, Act_c); diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index bdb339637da..274a4cf619a 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -3,11 +3,11 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_tks.h" #include "d/d_com_inf_game.h" -UNK_REL_DATA - /* 80D12910-80D12940 000020 0030+00 1/2 0/0 0/0 .data l_bckGetParamList */ static daNpc_GetParam1 l_bckGetParamList[] = { {-1, 2}, diff --git a/src/d/actor/d_a_obj_tmoon.cpp b/src/d/actor/d_a_obj_tmoon.cpp index c51ff446965..0d4ecba3249 100644 --- a/src/d/actor/d_a_obj_tmoon.cpp +++ b/src/d/actor/d_a_obj_tmoon.cpp @@ -3,6 +3,8 @@ * Moon in Hidden Skill Scene */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_tmoon.h" #include "f_op/f_op_draw_tag.h" diff --git a/src/d/actor/d_a_obj_toaru_maki.cpp b/src/d/actor/d_a_obj_toaru_maki.cpp index 98167522101..95f020bcf04 100644 --- a/src/d/actor/d_a_obj_toaru_maki.cpp +++ b/src/d/actor/d_a_obj_toaru_maki.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_toaru_maki.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 3efefcaceaa..ccc796cf34e 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_toby.h" #include "d/actor/d_a_e_hz.h" #include "d/actor/d_a_player.h" @@ -133,8 +135,6 @@ static void* shot_b_sub(void* param_1, void* param_2) { return NULL; } -UNK_REL_BSS - /* 80D158F4-80D158F8 -00001 0004+00 2/2 0/0 0/0 .bss None */ /* 80D158F4 0001+00 data_80D158F4 @1009 */ /* 80D158F5 0003+00 data_80D158F5 None */ diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index e94fbe25a90..a6c7d22c181 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_tobyhouse.h" #include "d/actor/d_a_obj_carry.h" #include "d/d_bg_w.h" @@ -135,8 +137,6 @@ void daObjTobyHouse_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -UNK_REL_DATA - /* 80D17878-80D17880 -00001 0008+00 4/4 0/0 0/0 .data l_arcName */ static char* l_arcName[2] = { "M_THouse", @@ -272,8 +272,6 @@ int daObjTobyHouse_c::Execute(Mtx** i_mtx) { return 1; } -UNK_REL_BSS - /* 80D16560-80D1661C 000BA0 00BC+00 1/1 0/0 0/0 .text action__16daObjTobyHouse_cFv */ void daObjTobyHouse_c::action() { static daObjTobyHouse_c::actionFunc l_func[4] = { diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index 546864d89e3..e0d9abc8f66 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -3,13 +3,13 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_togeTrap.h" #include "d/actor/d_a_player.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -UNK_REL_DATA - /* 80D17B6C-80D17BD0 0000EC 0064+00 1/1 0/0 0/0 .text __ct__16daTogeTrap_HIO_cFv */ daTogeTrap_HIO_c::daTogeTrap_HIO_c() { mInitialSpeed = 0.0f; diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 50bce244e06..1905d908d2d 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_tombo.h" #include "d/actor/d_a_player.h" #include "d/d_menu_insect.h" diff --git a/src/d/actor/d_a_obj_tornado.cpp b/src/d/actor/d_a_obj_tornado.cpp index 5334f28eb56..331ca919704 100644 --- a/src/d/actor/d_a_obj_tornado.cpp +++ b/src/d/actor/d_a_obj_tornado.cpp @@ -3,6 +3,8 @@ * Wind Column */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_tornado.h" #include "d/d_kankyo_rain.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_obj_tornado2.cpp b/src/d/actor/d_a_obj_tornado2.cpp index dbc0262da87..c2a44e19daa 100644 --- a/src/d/actor/d_a_obj_tornado2.cpp +++ b/src/d/actor/d_a_obj_tornado2.cpp @@ -3,6 +3,8 @@ * Strong Wind Column */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_tornado2.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index d3e51cf61ae..156b63405d1 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_tp.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" @@ -80,25 +82,6 @@ static void* s_tp_sub(void* param_1, void* param_2) { return NULL; } -/* ############################################################################################## */ -/* 80D1EEA0-80D1EEAC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D1EEAC-80D1EEC0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80D1D8C8-80D1E460 0003C8 0B98+00 3/1 0/0 0/0 .text daObj_Tp_Execute__FP12obj_tp_class */ static int daObj_Tp_Execute(obj_tp_class* i_this) { diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp index b1d17cda23e..999e6baff4f 100644 --- a/src/d/actor/d_a_obj_treesh.cpp +++ b/src/d/actor/d_a_obj_treesh.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_treesh.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index 52cd9f8318f..d9425e51755 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_twGate.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp index 3fe0057d3c7..0c01e0a8d62 100644 --- a/src/d/actor/d_a_obj_udoor.cpp +++ b/src/d/actor/d_a_obj_udoor.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_udoor.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_usaku.cpp b/src/d/actor/d_a_obj_usaku.cpp index 6a19d47258e..a45c2651c69 100644 --- a/src/d/actor/d_a_obj_usaku.cpp +++ b/src/d/actor/d_a_obj_usaku.cpp @@ -3,6 +3,8 @@ * Horse Fence */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_usaku.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp index 7922da4b3d1..13d524a3f5e 100644 --- a/src/d/actor/d_a_obj_vground.cpp +++ b/src/d/actor/d_a_obj_vground.cpp @@ -3,6 +3,8 @@ * Object - Volcano Ground */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_vground.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index bb4585ebf66..30756f81bcc 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -3,6 +3,8 @@ * Volcano Eruption Falling Rocks */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_volcball.h" #include "d/actor/d_a_obj_volcbom.h" #include "SSystem/SComponent/c_math.h" @@ -15,21 +17,6 @@ // Declarations: // -/* 80D23E8C-80D23E98 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D23E98-80D23EAC 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80D23EAC-80D23EB0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static const char* l_arcName = "M_Volcbal"; diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 61370626601..c75e5f2cd63 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_volcbom.h" #include "d/actor/d_a_midna.h" #include "d/actor/d_a_player.h" @@ -70,8 +72,6 @@ static u16 const l_bind_eff[4] = { 0x8B47, 0x8B48, 0x8B49, 0x8B4A, }; -UNK_REL_DATA - /* 80D26C74-80D26C78 -00001 0004+00 5/6 0/0 0/0 .data l_arcName */ static char* l_arcName = "M_VolcBom"; diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 920d70ca0fb..a5ecebad578 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_warp_kbrg.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" @@ -89,8 +91,6 @@ void daObjWarpKBrg_c::setBaseMtx() { } } -UNK_REL_DATA - /* 80D29730-80D29738 -00001 0008+00 5/5 0/0 0/0 .data l_arcName */ static char* l_arcName[2] = { "Obj_kbrgS", diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index e641a638b53..dc983ff125a 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_warp_obrg.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" @@ -10,8 +12,6 @@ #include "d/actor/d_a_midna.h" #include "d/d_bg_w.h" -UNK_REL_DATA - /* 80D2B934-80D2B938 -00001 0004+00 6/6 0/0 0/0 .data l_arcName */ static char* l_arcName = "Obj_obrg"; diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp index 20aa7ea6b53..748a3819b21 100644 --- a/src/d/actor/d_a_obj_waterGate.cpp +++ b/src/d/actor/d_a_obj_waterGate.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_waterGate.h" #include "d/d_com_inf_game.h" @@ -13,9 +15,6 @@ static int daWtGate_Execute(daWtGate_c*); static int daWtGate_Delete(daWtGate_c*); static int daWtGate_Create(fopAc_ac_c*); -/* 80D2C498-80D2C4A4 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -UNK_REL_DATA - /* 80D2C5BC-80D2C5C8 000014 000C+00 3/3 0/0 0/0 .bss l_HIO */ static daWtGate_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp index 86d817b774a..3003592cf73 100644 --- a/src/d/actor/d_a_obj_waterPillar.cpp +++ b/src/d/actor/d_a_obj_waterPillar.cpp @@ -3,10 +3,40 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_waterPillar.h" #include "d/d_com_inf_game.h" #include "SSystem/SComponent/c_math.h" +struct daWtPillar_HIO_c : public mDoHIO_entry_c { + /* 80D2C6CC */ daWtPillar_HIO_c(); + /* 80D2DF34 */ ~daWtPillar_HIO_c(); + + void genMessage(JORMContext*); + + /* 0x04 */ cXyz field_0x04; + /* 0x10 */ csXyz field_0x10; + /* 0x16 */ s8 mForTesting; // "----------- テスト用 ----------" "----------- For Testing ----------" | Checkbox + /* 0x17 */ s8 mDisableDrawing; // "モデル描画ＯＦＦ" "Model Drawing OFF" | Checkbox + /* 0x18 */ s8 mStopTime; // "停止時間" "Stop time" | Slider + /* 0x19 */ u8 mUpFirstWaitFrames; // "待ち時間" "Waiting time" | Slider + /* 0x1A */ u8 field_0x1A[6]; + /* 0x20 */ f32 field_0x20; // "速度" "Velocity" | Slider + /* 0x24 */ u8 field_0x24[4]; + /* 0x28 */ f32 field_0x28; // mColliderUpdateScaleFactor? + /* 0x2C */ u8 mUpWaitFrames; // "待ち時間" "Waiting time" | Slider + /* 0x2D */ u8 field_0x2D[4]; + /* 0x34 */ f32 field_0x34; // "速度" "Velocity" | Slider + /* 0x38 */ u8 field_0x38[8]; + /* 0x40 */ f32 mDownwardSpeedUnitsPerSecond; // "速度" "Velocity" | Slider + /* 0x44 */ f32 mEffectOscillationAngle; // "振幅Ｙ" "Y Amplitude" | Slider + /* 0x48 */ f32 mEffectOscillationAmplitude; // "移動強さ" "Moving strength" | Slider + /* 0x4C */ f32 mEffectOscillationDampingScale; // "揺れ減衰" "Sway damping" | Slider + /* 0x50 */ f32 mEffectOscillationMaxDecay; // "最大減衰量" "Maximum decay" | Slider + /* 0x54 */ f32 mEffectOscillationMinDecay; // "最小減衰量" "Minimum decay" | Slider +}; + typedef void (daWtPillar_c::*actionFunc)(); int daWtPillar_Draw(daWtPillar_c* i_this); @@ -67,9 +97,6 @@ int daWtPillar_c::CreateHeap() { return 1; } -/* 80D2E84C-80D2E858 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -UNK_REL_DATA - /* 80D2E86C-80D2E884 000020 0018+00 0/1 0/0 0/0 .data l_cull_box */ Vec l_cull_box[2] = { {-30.0f, -10.0f, -30.0f}, @@ -579,12 +606,18 @@ int daWtPillar_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } +daWtPillar_HIO_c::~daWtPillar_HIO_c() { +} + /* 80D2E054-80D2E21C 001A74 01C8+00 1/1 0/0 0/0 .text __ct__12daWtPillar_cFv */ daWtPillar_c::daWtPillar_c() : dEvLib_callback_c(this) { // Empty // Having this in the header file results in inlining... } +daWtPillar_c::~daWtPillar_c() { +} + /* 80D2EA14-80D2EA34 -00001 0020+00 1/0 0/0 0/0 .data l_daWtPillar_Method */ actor_method_class l_daWtPillar_Method = { (process_method_func)daWtPillar_Create, diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp index c9c58b2828b..6e8e7192d29 100644 --- a/src/d/actor/d_a_obj_waterfall.cpp +++ b/src/d/actor/d_a_obj_waterfall.cpp @@ -2,6 +2,8 @@ * @file d_a_obj_waterfall.cpp */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_waterfall.h" #include "d/actor/d_a_arrow.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp index e56855bbb55..27a09a11601 100644 --- a/src/d/actor/d_a_obj_wchain.cpp +++ b/src/d/actor/d_a_obj_wchain.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_wchain.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index f8b88d253e1..07dd6a64e10 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_wdStick.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" @@ -10,8 +12,6 @@ #include "f_op/f_op_kankyo_mng.h" #include -UNK_REL_DATA - /* 80D34424-80D34430 000014 000C+00 2/2 0/0 0/0 .bss l_HIO */ static daWdStick_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp index 3f3a77cfb30..e4590179f85 100644 --- a/src/d/actor/d_a_obj_web0.cpp +++ b/src/d/actor/d_a_obj_web0.cpp @@ -3,6 +3,8 @@ * Spider Web (Wall) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_web0.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index 5eb4d7e7b39..873eb02d14f 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -3,6 +3,8 @@ * Spider Web (Floor) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_web1.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_well_cover.cpp b/src/d/actor/d_a_obj_well_cover.cpp index e4355163697..d2a6c0c77d6 100644 --- a/src/d/actor/d_a_obj_well_cover.cpp +++ b/src/d/actor/d_a_obj_well_cover.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_well_cover.h" #include "d/d_procname.h" #include "d/actor/d_a_player.h" @@ -29,24 +31,6 @@ int daObjWCover_c::Create() { return 1; } -/* 80D36A4C-80D36A58 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D36A58-80D36A6C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80D36A6C-80D36A70 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "H_Idohuta"; diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index 539ee5814ae..ed0dfad87c1 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -2,6 +2,8 @@ // Object wflag // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_wflag.h" #include "d/d_com_inf_game.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index 5ff02c61372..76bd63b8e04 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -3,6 +3,8 @@ * Object - Wind Stone */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_wind_stone.h" #include "d/actor/d_a_alink.h" #include "d/d_meter2_info.h" diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index 50acb7843ae..f303a1ac789 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -3,6 +3,8 @@ * Object - Twilight Hyrule Castle Window Shutter */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_window.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_wood_pendulum.cpp b/src/d/actor/d_a_obj_wood_pendulum.cpp index 6fb4817dba9..13a37b1f162 100644 --- a/src/d/actor/d_a_obj_wood_pendulum.cpp +++ b/src/d/actor/d_a_obj_wood_pendulum.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_wood_pendulum.h" /* 80D393F8-80D39418 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */ diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index d57a51f1fa2..9a5b9fd9e06 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_wood_statue.h" #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" @@ -51,8 +53,6 @@ const static dCcD_SrcCyl l_cyl_src = { } // mCyl }; -UNK_REL_DATA - /* 80D3B73C-80D3B740 -00001 0004+00 1/1 0/0 0/0 .data l_arcName */ static char* l_arcName = "O_wood"; diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp index f95168ea3cf..419b2bc57f8 100644 --- a/src/d/actor/d_a_obj_wsword.cpp +++ b/src/d/actor/d_a_obj_wsword.cpp @@ -3,6 +3,8 @@ * Object - Wooden Sword */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_wsword.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index 3a4953bf428..0ef3449635a 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -3,14 +3,14 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_yel_bag.h" #include "d/actor/d_a_npc.h" #include "d/d_com_inf_game.h" #include "Z2AudioLib/Z2Instances.h" #include "SSystem/SComponent/c_lib.h" -UNK_REL_DATA - /* 80D3DD94-80D3DD9C 000020 0008+00 1/1 0/0 0/0 .data l_bmdGetParamList */ static int l_bmdGetParamList[2] = { 3, 0, @@ -494,23 +494,6 @@ void daObj_YBag_c::setSmokePrtcl() { dComIfGp_particle_levelEmitterOnEventMove(field_0xa14); } -UNK_BSS(1109); -UNK_BSS(1107); -UNK_BSS(1105); -UNK_BSS(1104); -UNK_BSS(1099); -UNK_BSS(1097); -UNK_BSS(1095); -UNK_BSS(1094); -UNK_BSS(1057); -UNK_BSS(1055); -UNK_BSS(1053); -UNK_BSS(1052); -UNK_BSS(1014); -UNK_BSS(1012); -UNK_BSS(1010); -UNK_BSS(1009); - /* 80D3DF1C-80D3DF20 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daObj_YBag_Param_c l_HIO; diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp index 4001812277b..46ff42616dc 100644 --- a/src/d/actor/d_a_obj_yobikusa.cpp +++ b/src/d/actor/d_a_obj_yobikusa.cpp @@ -3,6 +3,8 @@ // Obj - Call grass // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_yobikusa.h" #include "SSystem/SComponent/c_math.h" @@ -14,24 +16,6 @@ // Declarations: // -/* 8059DF68-8059DF74 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8059DF74-8059DF88 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8059DF88-8059DF8C -00001 0004+00 1/1 0/0 0/0 .data l_arcName1 */ static const char* l_arcName1 = "J_Tobi"; diff --git a/src/d/actor/d_a_obj_yousei.cpp b/src/d/actor/d_a_obj_yousei.cpp index 91ee9804833..397732b2cb1 100644 --- a/src/d/actor/d_a_obj_yousei.cpp +++ b/src/d/actor/d_a_obj_yousei.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_yousei.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" @@ -83,8 +85,6 @@ void daObjYOUSEI_c::SpeedSet() { current.pos.z += ato.z; } -UNK_REL_BSS - /* 804D1828-804D182C 000040 0004+00 0/0 0/0 0/0 .bss s_dis */ static f32 s_dis; diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index 0684e1fe45b..b9211d8c3dc 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -3,6 +3,8 @@ * Object - Dungeon Prize */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_ystone.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp index 75abbb00c1f..275b0982df6 100644 --- a/src/d/actor/d_a_obj_zcloth.cpp +++ b/src/d/actor/d_a_obj_zcloth.cpp @@ -3,6 +3,8 @@ * Object - Zora Armor */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_zcloth.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index 83d53a227d5..247df2b663f 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_zdoor.h" #include "dol2asm.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index cb56d4ede9b..474b0bdde15 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -3,14 +3,14 @@ * Object - Zora River Stalactite */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_zrTurara.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "SSystem/SComponent/c_math.h" -UNK_REL_DATA - /* 80D4056C-80D4059C 0000EC 0030+00 1/1 0/0 0/0 .text __ct__16daZrTurara_HIO_cFv */ daZrTurara_HIO_c::daZrTurara_HIO_c() { mDebrisNum = 5; diff --git a/src/d/actor/d_a_obj_zrTuraraRock.cpp b/src/d/actor/d_a_obj_zrTuraraRock.cpp index 3fd3afa3f01..b75b73da957 100644 --- a/src/d/actor/d_a_obj_zrTuraraRock.cpp +++ b/src/d/actor/d_a_obj_zrTuraraRock.cpp @@ -3,26 +3,13 @@ * Object - Zora River Stalactite Debris */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_zrTuraraRock.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -/* 80D42440-80D4244C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D4244C-80D42460 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 80D425AC-80D425CC 000014 0020+00 2/2 0/0 0/0 .bss l_HIO */ static daZrTuraRc_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp index 2750b92e36b..4827f001545 100644 --- a/src/d/actor/d_a_obj_zraMark.cpp +++ b/src/d/actor/d_a_obj_zraMark.cpp @@ -1,8 +1,10 @@ /** - * @file d_a_obj_zraMark.cpp +* @file d_a_obj_zraMark.cpp * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_zraMark.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" @@ -10,11 +12,6 @@ #include "d/actor/d_a_npc_hoz.h" #include "d/actor/d_a_npc_zra.h" -_ZraMark_Hahen_c::_ZraMark_Hahen_c() { - mpModel = NULL; - setColor(0); -} - /* 80D42658-80D42678 000078 0020+00 1/1 0/0 0/0 .text createSolidHeap__FP10fopAc_ac_c */ static int createSolidHeap(fopAc_ac_c* i_this) { return ((daObjZraMark_c*)i_this)->CreateHeap(); diff --git a/src/d/actor/d_a_obj_zra_freeze.cpp b/src/d/actor/d_a_obj_zra_freeze.cpp index c6c251b8327..0dea7a5071d 100644 --- a/src/d/actor/d_a_obj_zra_freeze.cpp +++ b/src/d/actor/d_a_obj_zra_freeze.cpp @@ -3,6 +3,8 @@ * Object - Frozen Zora */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_zra_freeze.h" #include "SSystem/SComponent/c_math.h" #include "m_Do/m_Do_lib.h" diff --git a/src/d/actor/d_a_obj_zra_rock.cpp b/src/d/actor/d_a_obj_zra_rock.cpp index b334ccf24fc..44ab719bff1 100644 --- a/src/d/actor/d_a_obj_zra_rock.cpp +++ b/src/d/actor/d_a_obj_zra_rock.cpp @@ -3,6 +3,8 @@ * Zora Rock (Graveyard) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_obj_zra_rock.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index 6621287d99f..afa1db6ed21 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_passer_mng.h" #include "d/d_com_inf_game.h" #include "d/d_path.h" diff --git a/src/d/actor/d_a_path_line.cpp b/src/d/actor/d_a_path_line.cpp index d93b0a29eb2..665ff34aa38 100644 --- a/src/d/actor/d_a_path_line.cpp +++ b/src/d/actor/d_a_path_line.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_path_line.h" #include "f_op/f_op_actor_mng.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index d2e489d23db..1b51fcf5155 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -3,12 +3,12 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_peru.h" #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_obj_catdoor.h" -UNK_REL_DATA - /* 80D4C1FC-80D4C204 000020 0008+00 1/1 0/0 0/0 .data l_bmdData */ static int l_bmdData[1][2] = { 24, 1, @@ -955,8 +955,6 @@ int daPeru_c::cutAppear(int param_1) { return _cutAppear_Main(*pCutId); } -UNK_REL_BSS - /* 80D4C83C-80D4C840 000054 0004+00 1/1 0/0 0/0 .bss l_HIO */ static daPeru_Param_c l_HIO; diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 2ab75d9119f..abed5f15249 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -3,6 +3,8 @@ * Base Player Actor functionality */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_player.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" #include "JSystem/JKernel/JKRSolidHeap.h" diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index 5ece0ad0360..2f21a3f29a4 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_ppolamp.h" #include "Z2AudioLib/Z2Instances.h" #include "d/d_com_inf_game.h" @@ -55,8 +57,6 @@ int daPPolamp_c::execute() { return 1; } -UNK_REL_BSS - /* 80D4CB84-80D4CCF0 0002C4 016C+00 1/1 0/0 0/0 .text draw__11daPPolamp_cFv */ int daPPolamp_c::draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); diff --git a/src/d/actor/d_a_scene_exit.cpp b/src/d/actor/d_a_scene_exit.cpp index e7f967dd7e0..a82b751f860 100644 --- a/src/d/actor/d_a_scene_exit.cpp +++ b/src/d/actor/d_a_scene_exit.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_scene_exit.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_scene_exit2.cpp b/src/d/actor/d_a_scene_exit2.cpp index e64936d34d3..db23b170b40 100644 --- a/src/d/actor/d_a_scene_exit2.cpp +++ b/src/d/actor/d_a_scene_exit2.cpp @@ -3,29 +3,12 @@ * Grotto Scene Exit trigger */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_scene_exit2.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -/* 8059E838-8059E844 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8059E844-8059E858 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -// unused data? -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8059E158-8059E178 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__10daScExit_cFv */ void daScExit_c::initBaseMtx() { setBaseMtx(); diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index d889a1956fb..7ffb36efb11 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_set_bgobj.h" #include "stdio.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 20d4edd4950..987dd2a55ab 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -3,6 +3,8 @@ * Shop Item Actor */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_shop_item.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_skip_2D.cpp b/src/d/actor/d_a_skip_2D.cpp index b2cac8a8490..9d94c36c0d4 100644 --- a/src/d/actor/d_a_skip_2D.cpp +++ b/src/d/actor/d_a_skip_2D.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_skip_2D.h" #include "d/d_meter_button.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index a2f219f29aa..b64fafd04bf 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_spinner.h" #include "d/actor/d_a_tag_sppath.h" #include "dol2asm.h" @@ -147,8 +149,6 @@ void daSpinner_c::setMatrix() { mpModel->calc(); } -UNK_REL_BSS - /* 804D2320-804D25F4 000A80 02D4+00 1/1 0/0 0/0 .text setEffect__11daSpinner_cFv */ void daSpinner_c::setEffect() { static JGeometry::TVec3 effDirection(0.0f, 1.0f, 0.0f); diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index 9dba3c86bbe..c1212afd454 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -3,6 +3,8 @@ * Squirrel */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_sq.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/JKernel/JKRHeap.h" diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp index a2c5ef5da0b..3d7cbf1beb2 100644 --- a/src/d/actor/d_a_startAndGoal.cpp +++ b/src/d/actor/d_a_startAndGoal.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_startAndGoal.h" #include "d/actor/d_a_npc.h" #include "d/d_timer.h" diff --git a/src/d/actor/d_a_suspend.cpp b/src/d/actor/d_a_suspend.cpp index c8fd9da6eb2..2a179c6892f 100644 --- a/src/d/actor/d_a_suspend.cpp +++ b/src/d/actor/d_a_suspend.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_suspend.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_swBall.cpp b/src/d/actor/d_a_swBall.cpp index 6a2218c229c..629b101561c 100644 --- a/src/d/actor/d_a_swBall.cpp +++ b/src/d/actor/d_a_swBall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_swBall.h" #include "d/actor/d_a_obj_carry.h" #include "d/d_com_inf_game.h" @@ -140,8 +142,6 @@ int daSwBall_c::create() { return cPhs_COMPLEATE_e; } -UNK_REL_DATA - /* 80D4E494-80D4E524 000534 0090+00 2/2 0/0 0/0 .text execute__10daSwBall_cFv */ int daSwBall_c::execute() { static void (daSwBall_c::*l_func[])() = { diff --git a/src/d/actor/d_a_swLBall.cpp b/src/d/actor/d_a_swLBall.cpp index 1bcb65c6d5b..caf5e6027e6 100644 --- a/src/d/actor/d_a_swLBall.cpp +++ b/src/d/actor/d_a_swLBall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_swLBall.h" #include "SSystem/SComponent/c_phase.h" #include "d/actor/d_a_obj_carry.h" @@ -121,25 +123,6 @@ int daSwLBall_c::create() { return cPhs_COMPLEATE_e; } -/* ############################################################################################## */ -/* 80D4F4E4-80D4F4F0 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D4F4F0-80D4F504 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80D4EF60-80D4F008 0004E0 00A8+00 2/2 0/0 0/0 .text execute__11daSwLBall_cFv */ int daSwLBall_c::execute() { static actionFunc funcs[3] = { diff --git a/src/d/actor/d_a_swTime.cpp b/src/d/actor/d_a_swTime.cpp index cb4719893c4..f50719da02f 100644 --- a/src/d/actor/d_a_swTime.cpp +++ b/src/d/actor/d_a_swTime.cpp @@ -3,6 +3,8 @@ * Switch Time */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_swTime.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index b08d207d37e..4718455646d 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_swc00.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_horse.h" @@ -86,10 +88,6 @@ static int daSwc00_Execute(daSwc00_c* i_this) { return i_this->execute(); } -#ifndef DEBUG -UNK_REL_DATA -#endif - inline static int daSwc00_getType(daSwc00_c *i_this) { return (i_this->shape_angle.x & 0xf00) >> 8; } diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 1b635b52ae4..4c39b67be9d 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_swhit0.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_CstaSw.cpp b/src/d/actor/d_a_tag_CstaSw.cpp index 4a24a15b013..c46676d22f9 100644 --- a/src/d/actor/d_a_tag_CstaSw.cpp +++ b/src/d/actor/d_a_tag_CstaSw.cpp @@ -3,6 +3,8 @@ * Overworld Statue switch trigger */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_CstaSw.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index 19c6c8f3a6d..c03c3ac0029 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -3,6 +3,8 @@ // Temple of Time Gate // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_Lv6Gate.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp index 45f59c71d76..3e9019f025e 100644 --- a/src/d/actor/d_a_tag_Lv7Gate.cpp +++ b/src/d/actor/d_a_tag_Lv7Gate.cpp @@ -3,6 +3,8 @@ // City in the Sky Gate // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_Lv7Gate.h" #include "d/actor/d_a_player.h" #include "d/d_path.h" diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index 0504a28c37f..caf2f530068 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tag_Lv8Gate // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_Lv8Gate.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index 2b793e3fd68..62bb8c092bd 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -2,6 +2,8 @@ // d_a_tag_TWgate // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_TWgate.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" @@ -78,24 +80,6 @@ static daTagTWGate_zevParam const l_zevParamTbl[4] = { }, }; -/* 80D55974-80D55980 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D55980-80D55994 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80D55994-80D55998 -00001 0004+00 12/12 0/0 0/0 .data l_myName */ static const char* l_myName = "Gate"; diff --git a/src/d/actor/d_a_tag_ajnot.cpp b/src/d/actor/d_a_tag_ajnot.cpp index eda53cea4aa..8714ac934dc 100644 --- a/src/d/actor/d_a_tag_ajnot.cpp +++ b/src/d/actor/d_a_tag_ajnot.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_ajnot.h" #include "d/actor/d_a_player.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index cb65f4e5028..ceca3bbab87 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_allmato.h" #include "d/actor/d_a_obj_itamato.h" #include "d/actor/d_a_obj_boumato.h" diff --git a/src/d/actor/d_a_tag_arena.cpp b/src/d/actor/d_a_tag_arena.cpp index 5964dc96d1e..8bad46b6d27 100644 --- a/src/d/actor/d_a_tag_arena.cpp +++ b/src/d/actor/d_a_tag_arena.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_arena.h" /* 80D55CD8-80D55D28 000078 0050+00 1/0 0/0 0/0 .text daTagArena_Create__FP10fopAc_ac_c diff --git a/src/d/actor/d_a_tag_assistance.cpp b/src/d/actor/d_a_tag_assistance.cpp index f7e162bed28..dc91e53fbf3 100644 --- a/src/d/actor/d_a_tag_assistance.cpp +++ b/src/d/actor/d_a_tag_assistance.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_assistance.h" /* 80D55E38-80D55E98 000078 0060+00 1/0 0/0 0/0 .text daTagAssist_Create__FP10fopAc_ac_c diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp index c7cdf82d587..1e8e8a71e37 100644 --- a/src/d/actor/d_a_tag_attack_item.cpp +++ b/src/d/actor/d_a_tag_attack_item.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tag_attack_item // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_attack_item.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index 6f7871865d8..892a134dd3e 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_attention.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp index be822812444..ea92d39bfc0 100644 --- a/src/d/actor/d_a_tag_bottle_item.cpp +++ b/src/d/actor/d_a_tag_bottle_item.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_bottle_item.h" #include "d/d_item.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index e8586034283..84ba237b344 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tag_camera // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_camera.h" #include "cmath.h" #include "d/actor/d_a_alink.h" diff --git a/src/d/actor/d_a_tag_chgrestart.cpp b/src/d/actor/d_a_tag_chgrestart.cpp index de0b73022c2..d1c9bb435b5 100644 --- a/src/d/actor/d_a_tag_chgrestart.cpp +++ b/src/d/actor/d_a_tag_chgrestart.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_chgrestart.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index fa149c5a292..0aa53e90f45 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_chkpoint.h" #include #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index 305829b35bf..477086f97d3 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -2,30 +2,14 @@ // d_a_tag_csw // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_csw.h" #include "d/actor/d_a_cstatue.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -/* 80D58628-80D58634 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D58634-80D58648 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80D58648-80D5864C -00001 0004+00 2/3 0/0 0/0 .data l_arcName */ static const char* l_arcName = "Lv6Warp"; diff --git a/src/d/actor/d_a_tag_escape.cpp b/src/d/actor/d_a_tag_escape.cpp index 473ce75ca1c..b8a4c79387a 100644 --- a/src/d/actor/d_a_tag_escape.cpp +++ b/src/d/actor/d_a_tag_escape.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_escape.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index 15e3adcf0ce..866c5c8fddc 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tag_event // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_event.h" #include "d/d_com_inf_game.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index c1262821daa..05fefcb44fc 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tag_evt // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_evt.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_evtarea.cpp b/src/d/actor/d_a_tag_evtarea.cpp index 687606adf0b..f4358c1764a 100644 --- a/src/d/actor/d_a_tag_evtarea.cpp +++ b/src/d/actor/d_a_tag_evtarea.cpp @@ -2,6 +2,8 @@ // Tag: Event Area // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_evtarea.h" #include "d/actor/d_a_npc.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_evtmsg.cpp b/src/d/actor/d_a_tag_evtmsg.cpp index ead7f1db514..3777793ba6b 100644 --- a/src/d/actor/d_a_tag_evtmsg.cpp +++ b/src/d/actor/d_a_tag_evtmsg.cpp @@ -3,29 +3,13 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_evtmsg.h" #include "d/actor/d_a_npc.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -/* 8048D818-8048D824 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 8048D824-8048D838 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8048D838-8048D844 -00001 000C+00 0/1 0/0 0/0 .data mEvtCutNameList__14daTag_EvtMsg_c */ char* daTag_EvtMsg_c::mEvtCutNameList[] = {"", "TALK", "WAIT"}; diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index 51c2a5ad802..15a2b8573e5 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_firewall.h" #include "cmath.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_gra.cpp b/src/d/actor/d_a_tag_gra.cpp index 819083af236..26caf4dfb4b 100644 --- a/src/d/actor/d_a_tag_gra.cpp +++ b/src/d/actor/d_a_tag_gra.cpp @@ -3,6 +3,8 @@ * Tag - Goron A */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_gra.h" /* 80D59658-80D596E8 000078 0090+00 1/0 0/0 0/0 .text daTagGra_Create__FP10fopAc_ac_c */ diff --git a/src/d/actor/d_a_tag_gstart.cpp b/src/d/actor/d_a_tag_gstart.cpp index b87e36cd071..0272b512ecd 100644 --- a/src/d/actor/d_a_tag_gstart.cpp +++ b/src/d/actor/d_a_tag_gstart.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_gstart.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_guard.cpp b/src/d/actor/d_a_tag_guard.cpp index 0bcb8979668..5ca0f5df421 100644 --- a/src/d/actor/d_a_tag_guard.cpp +++ b/src/d/actor/d_a_tag_guard.cpp @@ -3,6 +3,8 @@ * Tag - Guard */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_guard.h" #include "d/d_stage.h" diff --git a/src/d/actor/d_a_tag_hinit.cpp b/src/d/actor/d_a_tag_hinit.cpp index 0d84b18514f..14436a133ac 100644 --- a/src/d/actor/d_a_tag_hinit.cpp +++ b/src/d/actor/d_a_tag_hinit.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_hinit.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_tag_hjump.cpp b/src/d/actor/d_a_tag_hjump.cpp index ac6469d3d00..ecd7c5cf19e 100644 --- a/src/d/actor/d_a_tag_hjump.cpp +++ b/src/d/actor/d_a_tag_hjump.cpp @@ -3,6 +3,8 @@ * Epona fence jump trigger / object */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_hjump.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_tag_howl.cpp b/src/d/actor/d_a_tag_howl.cpp index fac811744ef..0abd8472525 100644 --- a/src/d/actor/d_a_tag_howl.cpp +++ b/src/d/actor/d_a_tag_howl.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_howl.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_hstop.cpp b/src/d/actor/d_a_tag_hstop.cpp index 6294635a600..e0b82f828a3 100644 --- a/src/d/actor/d_a_tag_hstop.cpp +++ b/src/d/actor/d_a_tag_hstop.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_hstop.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" diff --git a/src/d/actor/d_a_tag_instruction.cpp b/src/d/actor/d_a_tag_instruction.cpp index dedc5ad21fe..6be81633a13 100644 --- a/src/d/actor/d_a_tag_instruction.cpp +++ b/src/d/actor/d_a_tag_instruction.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_instruction.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp index 539d6eb8286..07ad74dd449 100644 --- a/src/d/actor/d_a_tag_kago_fall.cpp +++ b/src/d/actor/d_a_tag_kago_fall.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tag_kago_fall // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_kago_fall.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index 756816d10c0..ababb97e1cb 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tag_kmsg // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_kmsg.h" #include "d/actor/d_a_npc.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index c8b7225bf76..9754370c0b7 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -3,6 +3,8 @@ * Tag - Lantern */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_lantern.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_lightball.cpp b/src/d/actor/d_a_tag_lightball.cpp index d8673466770..baffd339ef2 100644 --- a/src/d/actor/d_a_tag_lightball.cpp +++ b/src/d/actor/d_a_tag_lightball.cpp @@ -1,5 +1,7 @@ // Translation Unit: d_a_tag_lightball +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_lightball.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_lv2prchk.cpp b/src/d/actor/d_a_tag_lv2prchk.cpp index 30c9e1ea088..8c5a9e6f72e 100644 --- a/src/d/actor/d_a_tag_lv2prchk.cpp +++ b/src/d/actor/d_a_tag_lv2prchk.cpp @@ -3,6 +3,8 @@ * Boomerang Switch Puzzle Tag */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_lv2prchk.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" @@ -40,25 +42,6 @@ int daTagLv2PrChk_c::execute() { return 1; } -/* ############################################################################################## */ -/* 805A536C-805A5378 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 805A5378-805A538C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 805A4D68-805A4DF4 000188 008C+00 1/1 0/0 0/0 .text action__15daTagLv2PrChk_cFv */ void daTagLv2PrChk_c::action() { typedef void (daTagLv2PrChk_c::*actionFunc)(); diff --git a/src/d/actor/d_a_tag_lv5soup.cpp b/src/d/actor/d_a_tag_lv5soup.cpp index 493a66410ea..59bb67fe903 100644 --- a/src/d/actor/d_a_tag_lv5soup.cpp +++ b/src/d/actor/d_a_tag_lv5soup.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_lv5soup.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_lv6CstaSw.cpp b/src/d/actor/d_a_tag_lv6CstaSw.cpp index cba54d5c977..bbed14c9939 100644 --- a/src/d/actor/d_a_tag_lv6CstaSw.cpp +++ b/src/d/actor/d_a_tag_lv6CstaSw.cpp @@ -3,6 +3,8 @@ * Temple of Time Statue switch trigger */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_lv6CstaSw.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_magne.cpp b/src/d/actor/d_a_tag_magne.cpp index e536abf8ccd..18adc3c556d 100644 --- a/src/d/actor/d_a_tag_magne.cpp +++ b/src/d/actor/d_a_tag_magne.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_magne.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp index 97ac7c4b9ac..e17545bbac6 100644 --- a/src/d/actor/d_a_tag_mhint.cpp +++ b/src/d/actor/d_a_tag_mhint.cpp @@ -3,6 +3,8 @@ * Tag - Midna Hint */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_mhint.h" #include "d/actor/d_a_midna.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_mist.cpp b/src/d/actor/d_a_tag_mist.cpp index 965884c50ec..f453771b26d 100644 --- a/src/d/actor/d_a_tag_mist.cpp +++ b/src/d/actor/d_a_tag_mist.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_mist.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_mmsg.cpp b/src/d/actor/d_a_tag_mmsg.cpp index f90bb0c8f9a..38db26b3859 100644 --- a/src/d/actor/d_a_tag_mmsg.cpp +++ b/src/d/actor/d_a_tag_mmsg.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tag_mmsg // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_mmsg.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 6dde5083c22..616ba495442 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_msg.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_mstop.cpp b/src/d/actor/d_a_tag_mstop.cpp index 8987e561477..9f8dfad528a 100644 --- a/src/d/actor/d_a_tag_mstop.cpp +++ b/src/d/actor/d_a_tag_mstop.cpp @@ -3,6 +3,8 @@ * Tag - Midna Stop */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_mstop.h" #include "d/actor/d_a_midna.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_mwait.cpp b/src/d/actor/d_a_tag_mwait.cpp index c403190ac9e..4151d7ed2a3 100644 --- a/src/d/actor/d_a_tag_mwait.cpp +++ b/src/d/actor/d_a_tag_mwait.cpp @@ -3,6 +3,8 @@ * Midna Wait Trigger */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_mwait.h" #include "d/actor/d_a_midna.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_myna2.cpp b/src/d/actor/d_a_tag_myna2.cpp index d7eee6f1f4c..4adf8e616ec 100644 --- a/src/d/actor/d_a_tag_myna2.cpp +++ b/src/d/actor/d_a_tag_myna2.cpp @@ -3,6 +3,8 @@ * @brief Tag - Creates Plumm's actor. */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_myna2.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_myna_light.cpp b/src/d/actor/d_a_tag_myna_light.cpp index 863f8a507ef..fcffb4ca5fe 100644 --- a/src/d/actor/d_a_tag_myna_light.cpp +++ b/src/d/actor/d_a_tag_myna_light.cpp @@ -1,5 +1,7 @@ // Translation Unit: d_a_tag_myna_light +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_myna_light.h" #include "d/d_com_inf_game.h" #include "d/d_stage.h" diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index 0b92617ff72..e664896c798 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tag_pachi // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_pachi.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_poFire.cpp b/src/d/actor/d_a_tag_poFire.cpp index 7323f381fef..51c334f7999 100644 --- a/src/d/actor/d_a_tag_poFire.cpp +++ b/src/d/actor/d_a_tag_poFire.cpp @@ -3,6 +3,8 @@ * Tag - Poe Fire */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_poFire.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_push.cpp b/src/d/actor/d_a_tag_push.cpp index e4990800b28..bec1b8ae4ec 100644 --- a/src/d/actor/d_a_tag_push.cpp +++ b/src/d/actor/d_a_tag_push.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tag_push // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_push.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp index 36c47b8acbc..5d48e6beffb 100644 --- a/src/d/actor/d_a_tag_qs.cpp +++ b/src/d/actor/d_a_tag_qs.cpp @@ -2,6 +2,8 @@ // d_a_tag_qs // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_qs.h" #include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_ret_room.cpp b/src/d/actor/d_a_tag_ret_room.cpp index 38e5ed2ff5d..0c5cc284e85 100644 --- a/src/d/actor/d_a_tag_ret_room.cpp +++ b/src/d/actor/d_a_tag_ret_room.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_ret_room.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp index a8d4a72f4a0..bd3a5ff4d66 100644 --- a/src/d/actor/d_a_tag_river_back.cpp +++ b/src/d/actor/d_a_tag_river_back.cpp @@ -3,6 +3,8 @@ * Tag - River Back */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_river_back.h" #include "d/d_procname.h" @@ -18,25 +20,6 @@ // Declarations: // -/* ############################################################################################## */ -/* 80D5F980-80D5F98C 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D5F98C-80D5F9A0 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 80D5F9A0-80D5F9A4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "RvBack"; diff --git a/src/d/actor/d_a_tag_rmbit_sw.cpp b/src/d/actor/d_a_tag_rmbit_sw.cpp index 8dfe001c432..4ae87dba40b 100644 --- a/src/d/actor/d_a_tag_rmbit_sw.cpp +++ b/src/d/actor/d_a_tag_rmbit_sw.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_rmbit_sw.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_schedule.cpp b/src/d/actor/d_a_tag_schedule.cpp index c90a29be3fc..89e4077857a 100644 --- a/src/d/actor/d_a_tag_schedule.cpp +++ b/src/d/actor/d_a_tag_schedule.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_schedule.h" /* 80D60098-80D600E8 000078 0050+00 1/0 0/0 0/0 .text daTagSchedule_Create__FP10fopAc_ac_c */ diff --git a/src/d/actor/d_a_tag_setBall.cpp b/src/d/actor/d_a_tag_setBall.cpp index 5df8da13dfe..a087409b17f 100644 --- a/src/d/actor/d_a_tag_setBall.cpp +++ b/src/d/actor/d_a_tag_setBall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_setBall.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_setrestart.cpp b/src/d/actor/d_a_tag_setrestart.cpp index b6ed9b09909..b9c8b52f647 100644 --- a/src/d/actor/d_a_tag_setrestart.cpp +++ b/src/d/actor/d_a_tag_setrestart.cpp @@ -4,6 +4,8 @@ * Sets player room restart info */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_setrestart.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_shop_camera.cpp b/src/d/actor/d_a_tag_shop_camera.cpp index a2f9330c1d8..3a7d9744446 100644 --- a/src/d/actor/d_a_tag_shop_camera.cpp +++ b/src/d/actor/d_a_tag_shop_camera.cpp @@ -3,6 +3,8 @@ * Tag - Shop Camera */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_shop_camera.h" #include "dol2asm.h" @@ -87,4 +89,4 @@ SECTION_DATA extern void* g_profile_TAG_SHOPCAM[12] = { (void*)NULL, (void*)&g_fopAc_Method, (void*)0x004A0000, (void*)&daTag_ShopCamera_MethodTable, (void*)0x00064100, (void*)0x050E0000, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index 87923e60291..69ed81ad301 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -3,6 +3,8 @@ * Tag - Shop Item */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_shop_item.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp index 07e3cc1261c..b444b0f6c9f 100644 --- a/src/d/actor/d_a_tag_smk_emt.cpp +++ b/src/d/actor/d_a_tag_smk_emt.cpp @@ -3,6 +3,8 @@ * Tag - Smoke Emit */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_smk_emt.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_spinner.cpp b/src/d/actor/d_a_tag_spinner.cpp index 8106a477e8e..d005b39fc1f 100644 --- a/src/d/actor/d_a_tag_spinner.cpp +++ b/src/d/actor/d_a_tag_spinner.cpp @@ -3,6 +3,8 @@ * Tag - Spinner */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_spinner.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 3fc6a30ba60..f0613450cd2 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -3,6 +3,8 @@ * Tag - Spinner Path */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_sppath.h" #include "d/actor/d_a_player.h" #include "math.h" diff --git a/src/d/actor/d_a_tag_spring.cpp b/src/d/actor/d_a_tag_spring.cpp index 240ddadf0e8..f2b13a51084 100644 --- a/src/d/actor/d_a_tag_spring.cpp +++ b/src/d/actor/d_a_tag_spring.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_spring.h" #include "d/actor/d_a_player.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp index 74c47a2cf12..07b986e1ffe 100644 --- a/src/d/actor/d_a_tag_ss_drink.cpp +++ b/src/d/actor/d_a_tag_ss_drink.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_ss_drink.h" #include "d/actor/d_a_player.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index 8d9be80cd24..3ba350aa734 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -3,6 +3,8 @@ /* Owl Statue Event Tag -- Awarding Sky Characters */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_statue_evt.h" #include "d/d_com_inf_game.h" @@ -49,19 +51,6 @@ void daTagStatue_c::setBaseMtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::now); } -/* 805A81FC-805A8208 000000 000C+00 3/3 0/0 0/0 .data cNullVec__6Z2Calc */ -static Vec cNullVec__6Z2Calc = {0.0f, 0.0f, 0.0f}; - -/* 805A8208-805A821C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; - /* 805A821C-805A8220 -00001 0004+00 3/4 0/0 0/0 .data l_arcName */ static char* l_arcName = "Obj_cs_f"; diff --git a/src/d/actor/d_a_tag_stream.cpp b/src/d/actor/d_a_tag_stream.cpp index 0f47e8a766b..75d92a460b9 100644 --- a/src/d/actor/d_a_tag_stream.cpp +++ b/src/d/actor/d_a_tag_stream.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_stream.h" #include "SSystem/SComponent/c_math.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_telop.cpp b/src/d/actor/d_a_tag_telop.cpp index b75bd82de0c..0249ed25fcb 100644 --- a/src/d/actor/d_a_tag_telop.cpp +++ b/src/d/actor/d_a_tag_telop.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_telop.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/actor/d_a_tag_theB_hint.cpp b/src/d/actor/d_a_tag_theB_hint.cpp index c882187f253..e84b9308587 100644 --- a/src/d/actor/d_a_tag_theB_hint.cpp +++ b/src/d/actor/d_a_tag_theB_hint.cpp @@ -3,6 +3,8 @@ * Tag - Telma B Hint */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_theB_hint.h" /* 80D63CD8-80D63D4C 000078 0074+00 1/0 0/0 0/0 .text daTagTheBHint_Create__FP10fopAc_ac_c */ diff --git a/src/d/actor/d_a_tag_wara_howl.cpp b/src/d/actor/d_a_tag_wara_howl.cpp index 6444a9922bb..89a6d945e13 100644 --- a/src/d/actor/d_a_tag_wara_howl.cpp +++ b/src/d/actor/d_a_tag_wara_howl.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_wara_howl.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp index 068e7d2e742..4779788e8a6 100644 --- a/src/d/actor/d_a_tag_watchge.cpp +++ b/src/d/actor/d_a_tag_watchge.cpp @@ -3,6 +3,8 @@ * Tag - Guay */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_watchge.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index daa1c62144f..d208d7983c5 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_waterfall.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_wljump.cpp b/src/d/actor/d_a_tag_wljump.cpp index 41473dc024b..ffdb2429251 100644 --- a/src/d/actor/d_a_tag_wljump.cpp +++ b/src/d/actor/d_a_tag_wljump.cpp @@ -1,10 +1,11 @@ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_wljump.h" #include "d/d_path.h" #include "d/d_procname.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_midna.h" - /* 80D64EB8-80D64FE4 000078 012C+00 1/1 0/0 0/0 .text create__13daTagWljump_cFv */ int daTagWljump_c::create() { fopAcM_SetupActor(this, daTagWljump_c); diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index d268ac7d664..f5f88d4994a 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -3,6 +3,8 @@ * Tag - Yami (Twili) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tag_yami.h" #include "d/d_com_inf_game.h" @@ -158,5 +160,3 @@ extern actor_process_profile_definition g_profile_TAG_YAMI = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -#pragma nosyminline on diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp index 97dd9612bd8..6568d41ad2f 100644 --- a/src/d/actor/d_a_talk.cpp +++ b/src/d/actor/d_a_talk.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_talk.h" #include "d/d_msg_object.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index e443abcc16e..6f74c97da30 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -3,6 +3,8 @@ // Translation Unit: d_a_tbox // +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tbox.h" #include "d/d_tresure.h" #include "d/d_item_data.h" @@ -13,25 +15,6 @@ #include "Z2AudioLib/Z2Instances.h" #include -UNK_REL_DATA - -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) - /* 804961D4-804961EC 000000 0018+00 16/16 0/0 0/0 .rodata l_cull_size_box */ 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 d14dc1bff54..f60aa227cc9 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -3,6 +3,8 @@ * Treasure Chest (Opened state not saved) */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tbox2.h" #include "d/d_bg_w.h" #include "d/actor/d_a_midna.h" @@ -47,24 +49,6 @@ static const cM3dGCylS l_cyl_info[] = { }, }; -/* 8049825C-80498268 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80498268-8049827C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop - /* 8049827C-80498280 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "Tbox2"; diff --git a/src/d/actor/d_a_tboxSw.cpp b/src/d/actor/d_a_tboxSw.cpp index 0005d98c7d0..d7d89612772 100644 --- a/src/d/actor/d_a_tboxSw.cpp +++ b/src/d/actor/d_a_tboxSw.cpp @@ -3,6 +3,8 @@ * Turns on a switch when a treasure chest is opened */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_tboxSw.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 727dffc93eb..960a32a02e8 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_title.h" #include "d/d_demo.h" #include "d/d_pane_class_alpha.h" @@ -14,6 +16,22 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "m_Do/m_Do_graphic.h" +class daTit_HIO_c { +public: + /* 80D66B0C */ daTit_HIO_c(); + + /* 80D67A08 */ virtual ~daTit_HIO_c() {} + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mPSScaleX; + /* 0x0C */ f32 mPSScaleY; + /* 0x10 */ f32 mPSPosX; + /* 0x14 */ f32 mPSPosY; + /* 0x18 */ u8 mAppear; + /* 0x19 */ u8 mArrow; + /* 0x1A */ u8 field_0x1a; +}; + /* 80D67D8C-80D67DA8 000014 001C+00 4/4 0/0 0/0 .bss g_daTitHIO */ static daTit_HIO_c g_daTitHIO; @@ -25,8 +43,6 @@ static u8 const lit_3772[12] = { /* 80D67BE0-80D67BE8 00000C 0006+02 3/3 0/0 0/0 .rodata l_arcName */ static char const l_arcName[6] = "Title"; -UNK_REL_DATA; - static procFunc daTitleProc[6] = { &daTitle_c::loadWait_proc, &daTitle_c::logoDispWait, &daTitle_c::logoDispAnm, &daTitle_c::keyWait, &daTitle_c::nextScene_proc, &daTitle_c::fastLogoDisp, diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index a11356d4039..af44150ce56 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_vrbox.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index d51ec5760bd..6b4d2bb6d5c 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_vrbox2.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index 932f9882d50..f691a603c55 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_warp_bug.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index f2f7ae92ce9..ef96d0508d1 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel_rel.h" + #include "d/actor/d_a_ykgr.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" @@ -60,23 +62,6 @@ void dPa_YkgrPcallBack::setParam(f32 param_1) { } } -UNK_BSS(1109) -UNK_BSS(1107) -UNK_BSS(1105) -UNK_BSS(1104) -UNK_BSS(1099) -UNK_BSS(1097) -UNK_BSS(1095) -UNK_BSS(1094) -UNK_BSS(1057) -UNK_BSS(1055) -UNK_BSS(1053) -UNK_BSS(1052) -UNK_BSS(1014) -UNK_BSS(1012) -UNK_BSS(1010) -UNK_BSS(1009) - /* 805A9104-805A912C 000054 0028+00 2/3 0/0 0/0 .bss l_HIO */ static daYkgr_HIO_c l_HIO; diff --git a/src/d/d_a_horse_static.cpp b/src/d/d_a_horse_static.cpp index 9d7b0f2fe34..305377c267c 100644 --- a/src/d/d_a_horse_static.cpp +++ b/src/d/d_a_horse_static.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/actor/d_a_horse_static // +#include "d/dolzel.h" + #include "d/d_a_horse_static.h" #include "d/actor/d_a_e_wb.h" #include "d/actor/d_a_tag_hstop.h" @@ -53,4 +55,4 @@ void e_wb_class::setRunRideMode() { } } -daTagHstop_c* daTagHstop_c::m_top; \ No newline at end of file +daTagHstop_c* daTagHstop_c::m_top; diff --git a/src/d/d_a_item_static.cpp b/src/d/d_a_item_static.cpp index cad0aec262e..1c70be47032 100644 --- a/src/d/d_a_item_static.cpp +++ b/src/d/d_a_item_static.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_a_item_static.h" u32 daItem_c::startCtrl() { @@ -18,4 +20,4 @@ u32 daItem_c::startControl() { u32 daItem_c::endControl() { mStatus = STATUS_NORMAL_e; return 1; -} \ No newline at end of file +} diff --git a/src/d/d_a_itembase_static.cpp b/src/d/d_a_itembase_static.cpp index cd0363351cf..fba2bab7463 100644 --- a/src/d/d_a_itembase_static.cpp +++ b/src/d/d_a_itembase_static.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_a_itembase_static.h" #include "SSystem/SComponent/c_lib.h" #include "d/actor/d_a_itembase.h" diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 6fedd5a11ae..61877bdd5b5 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_a_obj.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/d_a_shop_item_static.cpp b/src/d/d_a_shop_item_static.cpp index 6e3fcd7ba66..3bdbcadf955 100644 --- a/src/d/d_a_shop_item_static.cpp +++ b/src/d/d_a_shop_item_static.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_a_shop_item_static.h" /* 80037C14-80037C1C 032554 0008+00 0/0 1/1 0/0 .text getRotateP__12daShopItem_cFv */ @@ -55,4 +57,4 @@ int CheckShopItemCreateHeap(fopAc_ac_c* i_this) { daShopItem_c::mData[a_ShopItemID].get_bxa1Name(), daShopItem_c::mData[a_ShopItemID].get_brk1Name(), daShopItem_c::mData[a_ShopItemID].get_btp1Name()); -} \ No newline at end of file +} diff --git a/src/d/d_att_dist.cpp b/src/d/d_att_dist.cpp index 0b6a7b1e163..f8975ae237a 100644 --- a/src/d/d_att_dist.cpp +++ b/src/d/d_att_dist.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_att_dist.h" #include "d/d_attention.h" @@ -238,4 +240,4 @@ dist_entry dAttention_c::dist_table[234] = { {900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, {950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, {1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, -}; \ No newline at end of file +}; diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 227fc0fc166..1e992bf0168 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_attention // +#include "d/dolzel.h" + #include "d/d_attention.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "d/actor/d_a_player.h" diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp index 7fdf9dc65a5..43a5c1b2850 100644 --- a/src/d/d_bg_parts.cpp +++ b/src/d/d_bg_parts.cpp @@ -1,3 +1,4 @@ +#include "d/dolzel.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" diff --git a/src/d/d_bg_pc.cpp b/src/d/d_bg_pc.cpp index de47573e135..215779a1c47 100644 --- a/src/d/d_bg_pc.cpp +++ b/src/d/d_bg_pc.cpp @@ -3,8 +3,10 @@ * */ +#include "d/dolzel.h" + #include "d/d_bg_pc.h" void dBgPc::setCode(sBgPc& code) { m_code = code; -} \ No newline at end of file +} diff --git a/src/d/d_bg_plc.cpp b/src/d/d_bg_plc.cpp index eb8ebc83422..3ac719fe611 100644 --- a/src/d/d_bg_plc.cpp +++ b/src/d/d_bg_plc.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_bg_plc.h" #include "JSystem/JUtility/JUTAssert.h" diff --git a/src/d/d_bg_s.cpp b/src/d/d_bg_s.cpp index 6d574ba4882..d8376a2c5b5 100644 --- a/src/d/d_bg_s.cpp +++ b/src/d/d_bg_s.cpp @@ -3,6 +3,8 @@ * Background (Map) Collision main handler */ +#include "d/dolzel.h" + #include "d/d_bg_s.h" #include "d/d_bg_s_sph_chk.h" #include "d/d_bg_w.h" diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp index 83e93682e44..17faae6d6dc 100644 --- a/src/d/d_bg_s_acch.cpp +++ b/src/d/d_bg_s_acch.cpp @@ -3,9 +3,11 @@ * BG collision Actor Check */ -#include "d/d_bg_s_acch.h" +#include "d/dolzel.h" + #include "d/actor/d_a_player.h" #include "d/d_bg_s.h" +#include "d/d_bg_s_acch.h" #include "d/d_com_inf_game.h" #include "global.h" @@ -660,5 +662,3 @@ bool dBgS_Acch::ChkWallSort() { bool dBgS_Acch::ChkLineDown() { return m_flags & LINE_DOWN; } - -#pragma nosyminline on diff --git a/src/d/d_bg_s_chk.cpp b/src/d/d_bg_s_chk.cpp index 17451b61024..f953aa7f9ea 100644 --- a/src/d/d_bg_s_chk.cpp +++ b/src/d/d_bg_s_chk.cpp @@ -3,6 +3,8 @@ * BG Collision Check Base */ +#include "d/dolzel.h" + #include "d/d_bg_s_chk.h" /* 8007749C-800774E8 071DDC 004C+00 0/0 6/6 0/0 .text __ct__8dBgS_ChkFv */ @@ -19,4 +21,4 @@ cBgS_PolyPassChk* dBgS_Chk::GetPolyPassChkInfo() { /* 80077564-80077574 071EA4 0010+00 0/0 6/6 0/0 .text GetGrpPassChkInfo__8dBgS_ChkFv */ cBgS_GrpPassChk* dBgS_Chk::GetGrpPassChkInfo() { return this; -} \ No newline at end of file +} diff --git a/src/d/d_bg_s_gnd_chk.cpp b/src/d/d_bg_s_gnd_chk.cpp index 1db6e934b24..ad4456ad65d 100644 --- a/src/d/d_bg_s_gnd_chk.cpp +++ b/src/d/d_bg_s_gnd_chk.cpp @@ -3,6 +3,8 @@ * BG Collision Ground Check */ +#include "d/dolzel.h" + #include "d/d_bg_s_gnd_chk.h" /* 8007757C-800775F0 071EBC 0074+00 3/3 15/15 289/289 .text __ct__11dBgS_GndChkFv */ @@ -45,4 +47,4 @@ dBgS_CamGndChk_Wtr::dBgS_CamGndChk_Wtr() { } /* 80077A98-80077B10 0723D8 0078+00 4/3 5/5 1/1 .text __dt__18dBgS_CamGndChk_WtrFv */ -dBgS_CamGndChk_Wtr::~dBgS_CamGndChk_Wtr() {} \ No newline at end of file +dBgS_CamGndChk_Wtr::~dBgS_CamGndChk_Wtr() {} diff --git a/src/d/d_bg_s_grp_pass_chk.cpp b/src/d/d_bg_s_grp_pass_chk.cpp index 5b988fa1b22..96937bf69d9 100644 --- a/src/d/d_bg_s_grp_pass_chk.cpp +++ b/src/d/d_bg_s_grp_pass_chk.cpp @@ -11,4 +11,4 @@ dBgS_GrpPassChk::dBgS_GrpPassChk() { } /* 80077BC4-80077C20 072504 005C+00 1/0 1/1 0/0 .text __dt__15dBgS_GrpPassChkFv */ -dBgS_GrpPassChk::~dBgS_GrpPassChk() {} \ No newline at end of file +dBgS_GrpPassChk::~dBgS_GrpPassChk() {} diff --git a/src/d/d_bg_s_lin_chk.cpp b/src/d/d_bg_s_lin_chk.cpp index 4a612e94b2e..a86e80cec8f 100644 --- a/src/d/d_bg_s_lin_chk.cpp +++ b/src/d/d_bg_s_lin_chk.cpp @@ -3,6 +3,8 @@ * BG Collision Line Check */ +#include "d/dolzel.h" + #include "d/d_bg_s_lin_chk.h" #include "f_op/f_op_actor_mng.h" @@ -100,4 +102,4 @@ dBgS_HorseLinChk::dBgS_HorseLinChk() { } /* 800784BC-80078534 072DFC 0078+00 4/3 0/0 1/1 .text __dt__16dBgS_HorseLinChkFv */ -dBgS_HorseLinChk::~dBgS_HorseLinChk() {} \ No newline at end of file +dBgS_HorseLinChk::~dBgS_HorseLinChk() {} diff --git a/src/d/d_bg_s_movebg_actor.cpp b/src/d/d_bg_s_movebg_actor.cpp index 3b0609b457e..1f28f60ee96 100644 --- a/src/d/d_bg_s_movebg_actor.cpp +++ b/src/d/d_bg_s_movebg_actor.cpp @@ -3,6 +3,8 @@ * Non-static BG actor base */ +#include "d/dolzel.h" + #include "d/d_bg_s_movebg_actor.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" @@ -157,4 +159,4 @@ int dBgS_MoveBgActor::MoveBGExecute() { } return ret; -} \ No newline at end of file +} diff --git a/src/d/d_bg_s_poly_pass_chk.cpp b/src/d/d_bg_s_poly_pass_chk.cpp index 7b1015c6670..1433540464f 100644 --- a/src/d/d_bg_s_poly_pass_chk.cpp +++ b/src/d/d_bg_s_poly_pass_chk.cpp @@ -1,5 +1,5 @@ /** - * d_bg_s_poly_pass_chk.h + * d_bg_s_poly_pass_chk.cpp * BG Collision Poly Passthrough Check */ @@ -101,4 +101,4 @@ void dBgS_PolyPassChk::SetIronBall() { void dBgS_PolyPassChk::ClrIronBall() { mIronBall = false; -} \ No newline at end of file +} diff --git a/src/d/d_bg_s_roof_chk.cpp b/src/d/d_bg_s_roof_chk.cpp index 3e7cd1c98e7..f5e483e547b 100644 --- a/src/d/d_bg_s_roof_chk.cpp +++ b/src/d/d_bg_s_roof_chk.cpp @@ -3,6 +3,8 @@ * BG Collision Roof Check */ +#include "d/dolzel.h" + #include "d/d_bg_s_roof_chk.h" /* 80078FF4-80079090 073934 009C+00 0/0 10/10 1/1 .text __ct__12dBgS_RoofChkFv */ @@ -23,4 +25,4 @@ dBgS_RoofChk::~dBgS_RoofChk() {} void dBgS_RoofChk::Init() { SetNowY(1000000000.0f); ClearPi(); -} \ No newline at end of file +} diff --git a/src/d/d_bg_s_sph_chk.cpp b/src/d/d_bg_s_sph_chk.cpp index e9a3a5c0e49..aa747ba855a 100644 --- a/src/d/d_bg_s_sph_chk.cpp +++ b/src/d/d_bg_s_sph_chk.cpp @@ -3,6 +3,8 @@ * BG Collision Sphere Check */ +#include "d/dolzel.h" + #include "d/d_bg_s_sph_chk.h" /* 80078A14-80078AC0 073354 00AC+00 0/0 1/1 1/1 .text __ct__11dBgS_SphChkFv */ @@ -15,4 +17,4 @@ dBgS_SphChk::dBgS_SphChk() { } /* 80078AC0-80078B70 073400 00B0+00 5/4 2/2 0/0 .text __dt__11dBgS_SphChkFv */ -dBgS_SphChk::~dBgS_SphChk() {} \ No newline at end of file +dBgS_SphChk::~dBgS_SphChk() {} diff --git a/src/d/d_bg_s_spl_grp_chk.cpp b/src/d/d_bg_s_spl_grp_chk.cpp index f2b637c13aa..dab7a335083 100644 --- a/src/d/d_bg_s_spl_grp_chk.cpp +++ b/src/d/d_bg_s_spl_grp_chk.cpp @@ -3,6 +3,8 @@ * BG Collision Special Group Check */ +#include "d/dolzel.h" + #include "d/d_bg_s_spl_grp_chk.h" /* 80078B90-80078BB0 0734D0 0020+00 0/0 2/2 3/3 .text Set__14dBgS_SplGrpChkFR4cXyzf */ @@ -37,4 +39,4 @@ void dBgS_SplGrpChk::Init() { OffFind(); SetHeight(GetPosP().y); ClearPi(); -} \ No newline at end of file +} diff --git a/src/d/d_bg_s_wtr_chk.cpp b/src/d/d_bg_s_wtr_chk.cpp index 5d929be7c06..09c8d779f13 100644 --- a/src/d/d_bg_s_wtr_chk.cpp +++ b/src/d/d_bg_s_wtr_chk.cpp @@ -3,8 +3,10 @@ * BG Collision Water Check */ +#include "d/dolzel.h" + #include "d/d_bg_s_wtr_chk.h" dBgS_WtrChk::dBgS_WtrChk() { OnWaterGrp(); -} \ No newline at end of file +} diff --git a/src/d/d_bg_w.cpp b/src/d/d_bg_w.cpp index db495710a8e..bbcdff8e065 100644 --- a/src/d/d_bg_w.cpp +++ b/src/d/d_bg_w.cpp @@ -3,6 +3,8 @@ * DZB Collision handling */ +#include "d/dolzel.h" + #include "d/d_bg_w.h" #include "SSystem/SComponent/c_bg_s_shdw_draw.h" #include "SSystem/SComponent/c_m2d.h" diff --git a/src/d/d_bg_w_base.cpp b/src/d/d_bg_w_base.cpp index d1740bb1c66..edc54ab7d9a 100644 --- a/src/d/d_bg_w_base.cpp +++ b/src/d/d_bg_w_base.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_bg_w_base.h" /* 8007E5A8-8007E5F8 078EE8 0050+00 0/0 2/2 0/0 .text __ct__9dBgW_BaseFv */ @@ -43,4 +45,4 @@ void dBgW_Base::CallArrowStickCallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, void dBgW_Base::CalcDiffShapeAngleY(s16 param_0) { m_diff_ShapeAngleY = param_0 - m_old_ShapeAngleY; m_old_ShapeAngleY = param_0; -} \ No newline at end of file +} diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index ea83fc2e720..43c89d2dcda 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_bg_w_kcol.h" #include "d/d_com_inf_game.h" #include "dol2asm.h" diff --git a/src/d/d_bg_w_sv.cpp b/src/d/d_bg_w_sv.cpp index 8f9de2bd122..514dc6dbaf5 100644 --- a/src/d/d_bg_w_sv.cpp +++ b/src/d/d_bg_w_sv.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_bg_w_sv.h" #include "SSystem/SComponent/c_bg_s_chk.h" @@ -171,4 +173,4 @@ void dBgWSv::TransPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param /* 800835D8-800835DC 07DF18 0004+00 1/0 0/0 0/0 .text * MatrixCrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */ void dBgWSv::MatrixCrrPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2, cXyz* i_pos, - csXyz* i_angle, csXyz* i_shapeAngle) {} \ No newline at end of file + csXyz* i_angle, csXyz* i_shapeAngle) {} diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp index 9a1250d401d..1d6e4c997a8 100644 --- a/src/d/d_bomb.cpp +++ b/src/d/d_bomb.cpp @@ -3,6 +3,8 @@ * dolzel2 - Bomb */ +#include "d/dolzel.h" + #include "d/d_bomb.h" #include "d/actor/d_a_nbomb.h" @@ -22,4 +24,4 @@ bool dBomb_c::checkWaterBomb(fopAc_ac_c* i_actor) { bool dBomb_c::checkInsectBombMove(fopAc_ac_c* i_actor) { return (fopAcM_GetName(i_actor) == PROC_NBOMB && fopAcM_GetParam(i_actor) == PRM_INSECT_BOMB_MOVE); -} \ No newline at end of file +} diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index aca8c8690cb..7f65b3d7efd 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -3,7 +3,7 @@ * */ -#define NO_INLINE_DLSTBASE_DRAW +#include "d/dolzel.h" #include "d/d_bright_check.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -11,28 +11,6 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" -// Need 0x10 bytes of padding with no symbol between dBrightCheck_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. -// Not sure which abstract base class could go there though, so we simulate it with some dummy classes for now. -class dummy_abstract_class { -public: - virtual void virt_func_0() = 0; - virtual void virt_func_1() = 0; -}; -class dummy_child_class : dummy_abstract_class { - virtual void virt_func_0(); - virtual void virt_func_1(); -}; -static dummy_child_class dummy() { - dummy_child_class temp; - return temp; -} - -/* 803BB5B0-803BB5BC 0186D0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 80192F10-80192F98 18D850 0088+00 0/0 1/1 0/0 .text __ct__14dBrightCheck_cFP10JKRArchive */ dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) { mArchive = i_archive; diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp index 483d6041cc3..eab6a5d5f50 100644 --- a/src/d/d_cam_param.cpp +++ b/src/d/d_cam_param.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_cam_param.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 0f46a43a5ed..233c9a6ee7b 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -3,12 +3,19 @@ // Translation Unit: d/d_camera // -#include "d/d_camera.h" +#include "d/dolzel.h" + #include "SSystem/SComponent/c_math.h" -#include "math.h" #include "cmath.h" #include "d/actor/d_a_alink.h" +#include "d/actor/d_a_boomerang.h" +#include "d/actor/d_a_horse.h" +#include "d/actor/d_a_midna.h" +#include "d/actor/d_a_tag_mhint.h" +#include "d/actor/d_a_tag_mstop.h" +#include "d/actor/d_a_tag_mwait.h" #include "d/d_bg_s_sph_chk.h" +#include "d/d_camera.h" #include "d/d_com_inf_actor.h" #include "d/d_com_inf_game.h" #include "d/d_demo.h" @@ -17,12 +24,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#include "d/actor/d_a_boomerang.h" -#include "d/actor/d_a_horse.h" -#include "d/actor/d_a_midna.h" -#include "d/actor/d_a_tag_mhint.h" -#include "d/actor/d_a_tag_mstop.h" -#include "d/actor/d_a_tag_mwait.h" +#include "math.h" // // Forward References: @@ -695,11 +697,6 @@ SECTION_DEAD static char const* const stringBase_8039428E = "BSPTRANS"; SECTION_DEAD static char const* const stringBase_80394297 = "MAPTOOL"; #pragma pop -/* 803BA160-803BA16C 017280 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803BA25C-803BA34C 01737C 00F0+00 2/3 3/3 0/0 .data engine_tbl__9dCamera_c */ engine_fn dCamera_c::engine_tbl[] = { &dCamera_c::letCamera, &dCamera_c::chaseCamera, &dCamera_c::lockonCamera, @@ -997,7 +994,7 @@ void dCamera_c::initialize(camera_class* i_camera, fopAc_ac_c* i_player, u32 i_c mMapToolType = GetCameraTypeFromToolData(&field_0x7e8.field_0x0); } - dStage_stageDt_c* stage_dt = dComIfGp_getStage(); + dStage_dt_c* stage_dt = dComIfGp_getStage(); stage_stag_info_class* stag_info; if (stage_dt != NULL) { stag_info = stage_dt->getStagInfo(); @@ -1888,7 +1885,7 @@ void dCamera_c::setStageMapToolData() { field_0x7e8.Clr(); - dStage_stageDt_c* stage_dt = dComIfGp_getStage(); + dStage_dt_c* stage_dt = dComIfGp_getStage(); if (stage_dt != NULL) { stage_camera_class* camera = stage_dt->getCamera(); stage_arrow_class* arrow = stage_dt->getArrow(); @@ -2420,7 +2417,7 @@ fopAc_ac_c* dCamera_c::getParamTargetActor(s32 param_0) { /* 80164944-80164B64 15F284 0220+00 0/0 1/1 0/0 .text GetCameraTypeFromMapToolID__9dCamera_cFll */ int dCamera_c::GetCameraTypeFromMapToolID(s32 param_0, s32 i_roomNo) { - dStage_stageDt_c& stage_dt = g_dComIfG_gameInfo.play.getStage(); + dStage_dt_c& stage_dt = g_dComIfG_gameInfo.play.getStage(); int i; stage_camera_class* camera; @@ -8540,7 +8537,7 @@ static void store(camera_process_class* i_camera) { fopCamM_SetFovy(a_camera, fovy); } - dStage_stageDt_c* stage = dComIfGp_getStage(); + dStage_dt_c* stage = dComIfGp_getStage(); if (dComIfGp_getCameraAttentionStatus(camera_id) & 8) { fopCamM_SetNear(a_camera, 30.0f); } else { @@ -8712,7 +8709,7 @@ static int init_phase2(camera_class* i_this) { f32 var_f30 = 160000.0f; if (dComIfGp_getStage()->getStagInfo() != NULL) { - dStage_stageDt_c* stage_dt = dComIfGp_getStage(); + dStage_dt_c* stage_dt = dComIfGp_getStage(); stage_dt->getStagInfo(); var_f30 = stage_dt->getStagInfo()->mFar; diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index 87506ebee25..e566dd56ee1 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -3,9 +3,11 @@ // Translation Unit: d/d_cc_d // +#include "d/dolzel.h" + #include "d/d_cc_d.h" -#include "f_pc/f_pc_searcher.h" #include "f_op/f_op_actor_mng.h" +#include "f_pc/f_pc_searcher.h" /* 8008364C-80083660 07DF8C 0014+00 3/3 0/0 0/0 .text ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv */ void dCcD_GAtTgCoCommonBase::ClrActorInfo() { diff --git a/src/d/d_cc_mass_s.cpp b/src/d/d_cc_mass_s.cpp index 78274cefd84..1338c4b1fb4 100644 --- a/src/d/d_cc_mass_s.cpp +++ b/src/d/d_cc_mass_s.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_cc_mass_s.h" #include "SSystem/SComponent/c_math.h" #include "d/d_cc_d.h" @@ -275,4 +277,4 @@ u32 dCcMassS_Mng::GetResultCam() const { */ void dCcMassS_Mng::GetCamTopPos(Vec* p_out) { *p_out = mCamTopPos; -} \ No newline at end of file +} diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp index 0cf9975c566..be363a8e58f 100644 --- a/src/d/d_cc_s.cpp +++ b/src/d/d_cc_s.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_cc_s.h" #include "d/d_com_inf_game.h" #include "d/d_jnt_col.h" diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index 4d1ed1429e4..bf72621af4c 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -3,6 +3,8 @@ * Collider Utilties */ +#include "d/dolzel.h" + #include "d/d_cc_uty.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Creature.h" diff --git a/src/d/d_com_inf_actor.cpp b/src/d/d_com_inf_actor.cpp index e978dad95da..96056b36bd4 100644 --- a/src/d/d_com_inf_actor.cpp +++ b/src/d/d_com_inf_actor.cpp @@ -3,6 +3,8 @@ * dolzel2 - Common Information For Actor */ +#include "d/dolzel.h" + #include "d/d_com_inf_actor.h" #include "dolphin/types.h" diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 8d1f8f394f1..96038df9c4f 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -3,20 +3,22 @@ * Game Information */ -#include "d/d_com_inf_game.h" +#include "d/dolzel.h" + #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "d/actor/d_a_alink.h" +#include "d/d_com_inf_game.h" #include "d/d_item.h" -#include "d/d_simple_model.h" -#include "d/d_timer.h" #include "d/d_map_path_dmap.h" #include "d/d_menu_fmap.h" +#include "d/d_menu_window_HIO.h" #include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" -#include "d/d_menu_window_HIO.h" -#include "f_op/f_op_scene_mng.h" +#include "d/d_simple_model.h" +#include "d/d_timer.h" #include "f_op/f_op_msg_mng.h" +#include "f_op/f_op_scene_mng.h" #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_debug_viewer.cpp b/src/d/d_debug_viewer.cpp index 7cbbc18c32d..e269bd3b3f9 100644 --- a/src/d/d_debug_viewer.cpp +++ b/src/d/d_debug_viewer.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_debug_viewer.h" #include "d/d_com_inf_game.h" #include "f_ap/f_ap_game.h" diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 554616e44ec..503546c2ab6 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_demo.h" #include "d/d_msg_class.h" #include "d/d_msg_object.h" diff --git a/src/d/d_door_param2.cpp b/src/d/d_door_param2.cpp index 1f3452ee8d6..9d0735d279b 100644 --- a/src/d/d_door_param2.cpp +++ b/src/d/d_door_param2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_door_param2.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 4ed9d944957..516e04bdf15 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -3,7 +3,8 @@ // Translation Unit: d/d_drawlist // -#include "d/d_drawlist.h" +#include "d/dolzel.h" + #include "JSystem/J2DGraph/J2DAnimation.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -11,6 +12,7 @@ #include "SSystem/SComponent/c_bg_s_shdw_draw.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" +#include "d/d_drawlist.h" #include "d/d_s_play.h" #include "dol2asm.h" #include "m_Do/m_Do_graphic.h" @@ -547,11 +549,6 @@ void dDlst_2DT2_c::draw() { dComIfGp_getCurrentGrafPort()->setup2D(); } -/* 803A87A0-803A87C0 0058C0 000C+14 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803A87C0-803A8800 0058E0 003C+04 0/0 0/0 0/0 .data l_frontZMat */ static u8 l_frontZMat[] ALIGN_DECL(32) = { 0x61, 0x40, 0x00, 0x00, 0x07, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, @@ -941,13 +938,14 @@ void dDlst_blo_c::draw() { } // stand-in for a function that pulls in a bunch of inline functions but was presumably stripped -void dummy_misc() { +static void dummy_misc() { J2DScreen* screen; J2DPane* pane; J2DPicture* picture; J2DAnmBase* anmBase; J2DAnmColor* anmColor; delete anmBase; + delete anmColor; picture->setBlack(JUtility::TColor(0, 0, 0, 0)); picture->setWhite(JUtility::TColor(0, 0, 0, 0)); pane->getTypeID(); diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index 744edffac52..8b06df7e0fe 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -3,6 +3,8 @@ * Environment Sound Effects handler */ +#include "d/dolzel.h" + #include "d/d_envse.h" #include "d/d_com_inf_game.h" #include "d/d_path.h" diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 5051645c4d6..af55ac14297 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -3,15 +3,17 @@ * Disk Error Message screen handler */ +#include "d/dolzel.h" + #include -#include "d/d_error_msg.h" -#include "JSystem/J2DGraph/J2DTextBox.h" -#include "JSystem/J2DGraph/J2DPicture.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/J2DGraph/J2DPicture.h" +#include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JUtility/JUTResFont.h" -#include "m_Do/m_Do_graphic.h" #include "JSystem/JUtility/JUTTexture.h" +#include "d/d_error_msg.h" #include "m_Do/m_Do_Reset.h" +#include "m_Do/m_Do_graphic.h" #include "assets/black_tex.h" #include "assets/msg_data.h" diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 4b45afa96cb..ebf66312ad3 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_ev_camera // +#include "d/dolzel.h" + #include "d/d_ev_camera.h" #include "d/d_debug_viewer.h" #include "d/d_demo.h" diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 9683c4e6b8d..3ad89e2eee9 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_event // +#include "d/dolzel.h" + #include "d/d_event.h" #include "d/actor/d_a_alink.h" #include "d/d_demo.h" diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index b624640ff14..0f30f5eab2f 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -3,6 +3,8 @@ * Event Data Processor */ +#include "d/dolzel.h" + #include "d/d_event_data.h" #include "d/actor/d_a_player.h" #include "d/d_demo.h" diff --git a/src/d/d_event_debug.cpp b/src/d/d_event_debug.cpp index 1afc5c07553..7bf58be7f60 100644 --- a/src/d/d_event_debug.cpp +++ b/src/d/d_event_debug.cpp @@ -1,4 +1,6 @@ #ifdef DEBUG +#include "d/dolzel.h" + #include "d/d_event_debug.h" #include "JSystem/JHostIO/JORFile.h" #include "JSystem/JHostIO/JORMContext.h" diff --git a/src/d/d_event_lib.cpp b/src/d/d_event_lib.cpp index 191a828731f..19fbd67bd1a 100644 --- a/src/d/d_event_lib.cpp +++ b/src/d/d_event_lib.cpp @@ -3,15 +3,12 @@ * Event Callback Library */ +#include "d/dolzel.h" + #include "d/d_event_lib.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor.h" -/* 803A82B8-803A82C4 0053D8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 8004886C-800488A4 0431AC 0038+00 0/0 0/0 23/23 .text eventUpdate__17dEvLib_callback_cFv */ bool dEvLib_callback_c::eventUpdate() { if (mAction == NULL) { diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index ccb05b4fbff..6a7cb794c3b 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -3,6 +3,8 @@ * Event System Manager */ +#include "d/dolzel.h" + #include "d/d_event_manager.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index fa27364a192..e1da08769b4 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -3,6 +3,8 @@ * dolzel2 - Eye Highlight Management */ +#include "d/dolzel.h" + #include "d/d_eye_hl.h" #include "JSystem/J3DGraphBase/J3DTexture.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index 3295f392b38..5c5dbf57f89 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -3,7 +3,7 @@ * File Select Screen File Info */ -#define NO_INLINE_DLSTBASE_DRAW +#include "d/dolzel.h" #include "d/d_file_sel_info.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -13,26 +13,6 @@ #include "d/d_pane_class_alpha.h" #include "stdio.h" -// Need 0xC bytes of padding with no symbol between dFile_info_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. -// Not sure which abstract base class could go there though, so we simulate it with some dummy classes for now. -class dummy_abstract_class { -public: - virtual void virt_func_0() = 0; -}; -class dummy_child_class : dummy_abstract_class { - virtual void virt_func_0(); -}; -static dummy_child_class dummy() { - dummy_child_class temp; - return temp; -} - -/* 803BB498-803BB4A8 0185B8 000C+04 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 80192434-801924A0 18CD74 006C+00 0/0 3/3 0/0 .text __ct__12dFile_info_cFP10JKRArchiveUc */ dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { mArchive = i_archive; diff --git a/src/d/d_file_sel_warning.cpp b/src/d/d_file_sel_warning.cpp index 4d5541c1d85..b75b9bd374c 100644 --- a/src/d/d_file_sel_warning.cpp +++ b/src/d/d_file_sel_warning.cpp @@ -7,6 +7,8 @@ // Translation Unit: d/file/d_file_sel_warning // +#include "d/dolzel.h" + #include "d/d_file_sel_warning.h" #include "d/d_msg_string.h" #include "d/d_pane_class.h" @@ -68,12 +70,6 @@ extern "C" extern void* __vt__12dDlst_base_c[3]; // Declarations: // -/* ############################################################################################## */ -/* 803BB410-803BB41C 018530 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803BB434-803BB44C 018554 0018+00 1/2 0/0 0/0 .data fileWarningProc */ typedef void (dFile_warning_c::*procFunc)(); static procFunc fileWarningProc[] = {&dFile_warning_c::modeWait, &dFile_warning_c::modeMove}; diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 217ed580572..2a8d6363d01 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -3,27 +3,24 @@ * dolzel2 - Quest Log Management (File Select Menu) */ -#include "d/d_file_select.h" -#include "d/d_file_sel_info.h" +#include "d/dolzel.h" + #include "JSystem/J2DGraph/J2DAnmLoader.h" -#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/JKernel/JKRSolidHeap.h" +#include "d/d_file_sel_info.h" +#include "d/d_file_select.h" +#include "d/d_lib.h" #include "d/d_meter2_info.h" +#include "d/d_msg_string.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_MemCard.h" +#include "m_Do/m_Do_MemCardRWmng.h" +#include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "m_Do/m_Do_Reset.h" -#include "m_Do/m_Do_MemCardRWmng.h" -#include "JSystem/J2DGraph/J2DTextBox.h" -#include "d/d_lib.h" -#include "d/d_msg_string.h" -#include "JSystem/JKernel/JKRSolidHeap.h" - -/* 803BA848-803BA854 017968 000C+00 6/6 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; /* 803BA854-803BA860 017974 000C+00 3/3 0/0 0/0 .data SelStartFrameTbl */ static s32 SelStartFrameTbl[3] = { diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 5d07b5e5d01..947c8a74df9 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_gameover // +#include "d/dolzel.h" + #include "d/d_gameover.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "d/d_com_inf_game.h" @@ -93,11 +95,6 @@ void dDlst_Gameover_CAPTURE_c::draw() { GXEnd(); } -/* 803BBB50-803BBB5C 018C70 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803BBBC8-803BBC34 018CE8 006C+00 2/3 0/0 0/0 .data init_process */ typedef void (dGameover_c::*initFunc)(); static initFunc init_process[] = { diff --git a/src/d/d_home_button.cpp b/src/d/d_home_button.cpp index 837695a0f59..821afe9798c 100644 --- a/src/d/d_home_button.cpp +++ b/src/d/d_home_button.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_home_button.h" #include "JSystem/JFramework/JFWDisplay.h" #include "Z2AudioLib/Z2AudioCS.h" diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index 8986f9805b1..f2e6bfc8f71 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_insect.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 493a9bfcb20..4a2338e94ba 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -3,6 +3,8 @@ * Item Get Handling */ +#include "d/dolzel.h" + #include "d/d_item.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 9189e404c12..0508d7714b2 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_item_data.h" /* 803AC5A0-803ADD88 -00001 17E8+00 0/0 10/10 2/2 .data item_resource__10dItem_data */ @@ -571,4 +573,4 @@ dItem_itemInfo dItem_data::item_info[] = { {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 4}, {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 0}, {0, 0, 0, 4}, {0, 0, 0, 4}, {150, 50, 20, 21}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, -}; \ No newline at end of file +}; diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index 0a285e1fb7a..98493bd74b6 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -2,6 +2,8 @@ // d_jnt_col // +#include "d/dolzel.h" + #include "d/d_jnt_col.h" #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_m3d_g_sph.h" @@ -292,4 +294,4 @@ void dJntCol_c::setArrowPosAndAngle(cXyz const* param_0, cXyz const* i_srcPos, i i_arrowPosP->x = dst_pos.atan2sY_XZ(); i_arrowPosP->y = dst_pos.atan2sX_Z(); mDoMtx_multVec(mModel->getAnmMtx(i_anmMtxIdx), param_0, param_3); -} \ No newline at end of file +} diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index b35d0b2703a..432795e5ba5 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_k_wmark.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index 449bc72d511..5f84129c46d 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_k_wpillar // +#include "d/dolzel.h" + #include "d/d_k_wpillar.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 5f4cdd9de4b..bca8a408dfe 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_kankyo.h" #include #include @@ -220,11 +222,6 @@ int dKy_sense_pat_get() { return pat; } -/* 803BBDB8-803BBDC4 018ED8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803BBDC4-803BBEAC 018EE4 00E8+00 1/1 0/0 0/0 .data lightStatusBase */ static LightStatus lightStatusBase = { {-36384.5f, 29096.699f, 17422.199f}, diff --git a/src/d/d_kankyo_data.cpp b/src/d/d_kankyo_data.cpp index bc6e9e45224..2c26769514b 100644 --- a/src/d/d_kankyo_data.cpp +++ b/src/d/d_kankyo_data.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/kankyo/d_kankyo_data // +#include "d/dolzel.h" + #include "d/d_kankyo_data.h" #include "d/d_stage.h" diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 00e07da945c..a49485533b6 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -1,13 +1,15 @@ -#include "d/d_kankyo_rain.h" +#include "d/dolzel.h" + +#include "JSystem/JUtility/JUTTexture.h" #include "SSystem/SComponent/c_counter.h" +#include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "m_Do/m_Do_lib.h" -#include "JSystem/JUtility/JUTTexture.h" -#include "SSystem/SComponent/c_math.h" -#include "m_Do/m_Do_graphic.h" #include "d/d_demo.h" +#include "d/d_kankyo_rain.h" #include "f_op/f_op_kankyo_mng.h" +#include "m_Do/m_Do_graphic.h" +#include "m_Do/m_Do_lib.h" /* 8005B660-8005B708 055FA0 00A8+00 3/3 0/0 0/0 .text vectle_calc__FP10DOUBLE_POSP4cXyz */ diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index 11ea9423dc6..1bc4f40a0fe 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -3,6 +3,8 @@ * Weather Effects */ +#include "d/dolzel.h" + #include "d/d_kankyo_wether.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp index 59934d1de5b..c2d072feb5a 100644 --- a/src/d/d_kantera_icon_meter.cpp +++ b/src/d/d_kantera_icon_meter.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_kantera_icon_meter // +#include "d/dolzel.h" + #include "d/d_kantera_icon_meter.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -74,4 +76,4 @@ void dDlst_KanteraIcon_c::draw() { /* 801AED1C-801AED64 1A965C 0048+00 1/0 0/0 0/0 .text __dt__19dDlst_KanteraIcon_cFv */ dDlst_KanteraIcon_c::~dDlst_KanteraIcon_c() {} -/* 80394F50-80394F50 0215B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80394F50-80394F50 0215B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 63b7cb9d6e1..b099bc569b4 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -3,6 +3,8 @@ * Environment - Thunder */ +#include "d/dolzel.h" + #include "d/d_ky_thunder.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "SSystem/SComponent/c_counter.h" diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 2f2f9810b4c..7d64b730a97 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_kyeff.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index 1a1edef2a7f..317993e81e7 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "SSystem/SComponent/c_phase.h" #include "d/d_kyeff2.h" #include "d/d_kankyo_wether.h" diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index cdfff33fd74..ec7e54264b9 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -3,6 +3,8 @@ * Utility Functions */ +#include "d/dolzel.h" + #include "d/d_lib.h" #include "d/d_event.h" #include "d/d_stage.h" @@ -306,4 +308,4 @@ void dLib_time_c::startTime() { m_diffTime += OSGetTime() - m_stopTime; m_timeStopped = false; } -} \ No newline at end of file +} diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index c4e68f0a82a..3b5b96fcdaf 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -3,6 +3,9 @@ * */ +// not sure if this object is supposed to have a PCH - +// including it completely messes up weak function ordering + #define NO_INLINE_DLSTBASE_DRAW #include "d/d_map.h" diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp index 1f3e99b3f29..0492125a7e5 100644 --- a/src/d/d_map_path.cpp +++ b/src/d/d_map_path.cpp @@ -3,10 +3,12 @@ * */ -#include "d/d_map_path.h" +#include "d/dolzel.h" + #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/JUtility/JUTTexture.h" #include "d/d_com_inf_game.h" +#include "d/d_map_path.h" #include "m_Do/m_Do_lib.h" /* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */ diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp index 5c50990034b..ee783051ae8 100644 --- a/src/d/d_map_path_dmap.cpp +++ b/src/d/d_map_path_dmap.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_map_path_dmap.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_map_path_fmap.cpp b/src/d/d_map_path_fmap.cpp index ef683774dff..a3135e90a4e 100644 --- a/src/d/d_map_path_fmap.cpp +++ b/src/d/d_map_path_fmap.cpp @@ -3,8 +3,10 @@ // Translation Unit: d/d_map_path_fmap // -#include "d/d_map_path_fmap.h" +#include "d/dolzel.h" + #include "d/d_com_inf_game.h" +#include "d/d_map_path_fmap.h" /* 8003D790-8003D818 0380D0 0088+00 1/1 0/0 0/0 .text * addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s */ @@ -656,16 +658,3 @@ bool dMenuFmapIconDisp_c::isDrawDisp() { return ret; } - -/* 8003EB10-8003EB70 039450 0060+00 1/1 1/1 0/0 .text __dt__26fmpTresTypeGroupDataList_cFv */ -fmpTresTypeGroupDataList_c::~fmpTresTypeGroupDataList_c() { - if (mpTypeGroupDataHead != NULL) { - delete mpTypeGroupDataHead; - } -} - -/* 8003EC90-8003ECA0 0395D0 0010+00 1/1 0/0 0/0 .text __ct__26fmpTresTypeGroupDataList_cFv */ -fmpTresTypeGroupDataList_c::fmpTresTypeGroupDataList_c() { - mpTypeGroupDataHead = NULL; - mpNextData = NULL; -} diff --git a/src/d/d_menu_calibration.cpp b/src/d/d_menu_calibration.cpp index e6d9b2e40c2..39a3b904b45 100644 --- a/src/d/d_menu_calibration.cpp +++ b/src/d/d_menu_calibration.cpp @@ -3,6 +3,8 @@ * Wii Remote Calibration Option Menu */ +#include "d/dolzel.h" + #include "d/d_menu_calibration.h" #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" @@ -26,11 +28,6 @@ static dummy_child_class dummy() { return temp; } -/* 803BC238-803BC244 019358 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803BC28C-803BC2D4 0193AC 0048+00 1/2 0/0 0/0 .data map_init_process */ typedef void (dMenu_Calibration_c::*initFunc)(); static initFunc map_init_process[] = { diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index 924e9d1b838..f73b4e7fed6 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -3,6 +3,8 @@ * Collection Menu */ +#include "d/dolzel.h" + #include "d/d_menu_collect.h" #include "JSystem/J3DGraphLoader/J3DModelLoader.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" @@ -33,11 +35,6 @@ #include "d/d_menu_window.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" -/* 803BC380-803BC38C 0194A0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - typedef void (dMenu_Collect2D_c::*initFunc)(); static initFunc init[] = { &dMenu_Collect2D_c::wait_init, &dMenu_Collect2D_c::save_open_init, diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index 5cca869f060..32613cf645a 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_menu_dmap.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -28,11 +30,6 @@ #define POINTER_OPT 0 #endif -/* 803BC7E0-803BC7EC 019900 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - typedef void (dMenu_Dmap_c::*ProcFunc)(); static ProcFunc init_process[5] = { diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp index 79d48c6081e..e04e1acff8e 100644 --- a/src/d/d_menu_dmap_map.cpp +++ b/src/d/d_menu_dmap_map.cpp @@ -2,23 +2,20 @@ // Translation Unit: d/d_menu_dmap_map // -#include "d/d_menu_dmap_map.h" -#include "d/d_menu_dmap.h" -#include "d/d_map_path_dmap.h" +#include "d/dolzel.h" + +#include #include "d/d_com_inf_game.h" -#include "m_Do/m_Do_graphic.h" +#include "d/d_map_path_dmap.h" +#include "d/d_menu_dmap.h" +#include "d/d_menu_dmap_map.h" #include "f_op/f_op_msg_mng.h" -#include +#include "m_Do/m_Do_graphic.h" struct dMdm_HIO_prm_res_dst_s { static void* m_res; }; -/* 803BCB60-803BCB6C 019C80 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 801C084C-801C086C 1BB18C 0020+00 1/0 0/0 0/0 .text hasMap__15renderingDmap_cCFv */ bool renderingDmap_c::hasMap() const { return dMapInfo_n::chkGetMap(); diff --git a/src/d/d_menu_fishing.cpp b/src/d/d_menu_fishing.cpp index 134580fecc7..a5460cb8eca 100644 --- a/src/d/d_menu_fishing.cpp +++ b/src/d/d_menu_fishing.cpp @@ -3,6 +3,8 @@ * Menu - Fishing Journal */ +#include "d/dolzel.h" + #include "d/d_menu_fishing.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRMemArchive.h" @@ -13,11 +15,6 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -/* 803BD038-803BD044 01A158 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803BD050-803BD05C 01A170 000C+00 2/3 0/0 0/0 .data map_init_process */ 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 72d80bcdef0..84b7659ac5d 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_menu_fmap // +#include "d/dolzel.h" + #include "d/d_menu_fmap.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/JKernel/JKRAramArchive.h" @@ -25,11 +27,6 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_midna.h" -/* 803BD090-803BD09C 01A1B0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 8042E82C-8042E840 05B54C 0014+00 2/2 0/0 0/0 .bss g_fmHIO */ static dMf_HIO_c g_fmHIO; diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index 0ef70fce21d..c9e7c8481be 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_menu_fmap2D // +#include "d/dolzel.h" + #include "d/d_menu_fmap2D.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" diff --git a/src/d/d_menu_fmap_map.cpp b/src/d/d_menu_fmap_map.cpp index 2cfb6be1e2a..30b2b31f3d5 100644 --- a/src/d/d_menu_fmap_map.cpp +++ b/src/d/d_menu_fmap_map.cpp @@ -3,10 +3,12 @@ // Translation Unit: d/d_menu_fmap_map // -#include "d/d_menu_fmap_map.h" +#include "d/dolzel.h" + #include "JSystem/JUtility/JUTTexture.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" +#include "d/d_menu_fmap_map.h" #include "m_Do/m_Do_graphic.h" /* 801CE068-801CE0CC 1C89A8 0064+00 1/1 0/0 0/0 .text twoValueLineInterpolation__FUcUcf diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 92744217cba..d2a20a745a5 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -3,6 +3,8 @@ * Menu - Insect List */ +#include "d/dolzel.h" + #include "d/d_menu_insect.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRExpHeap.h" @@ -19,11 +21,6 @@ #include "m_Do/m_Do_graphic.h" #include "stdio.h" -/* 803BD780-803BD78C 01A8A0 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - typedef void (dMenu_Insect_c::*initFunc)(); static initFunc map_init_process[] = { &dMenu_Insect_c::wait_init, &dMenu_Insect_c::explain_open_init, diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index aa17ef3b446..47b22f08d66 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -3,6 +3,8 @@ * Menu - Item Explain */ +#include "d/dolzel.h" + #include "d/d_menu_item_explain.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRExpHeap.h" @@ -22,11 +24,6 @@ #include "d/d_msg_scrn_3select.h" #include "d/d_msg_scrn_arrow.h" -/* 803BD8C8-803BD8D4 01A9E8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - typedef void (dMenu_ItemExplain_c::*initFunc)(); static initFunc init_process[] = { &dMenu_ItemExplain_c::wait_init, &dMenu_ItemExplain_c::open_init, diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index 691ab171170..b3d6ebaa281 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_menu_letter // +#include "d/dolzel.h" + #include "d/d_menu_letter.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DTextBox.h" @@ -20,11 +22,6 @@ #include "d/d_msg_scrn_arrow.h" #include "d/d_lib.h" -/* 803BDA00-803BDA0C 01AB20 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - typedef void (dMenu_Letter_c::*initFunc)(); static initFunc map_init_process[] = { &dMenu_Letter_c::wait_init, diff --git a/src/d/d_menu_map_common.cpp b/src/d/d_menu_map_common.cpp index cefdf91b810..ee6ee512e59 100644 --- a/src/d/d_menu_map_common.cpp +++ b/src/d/d_menu_map_common.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_menu_map_common.h" #include "d/d_com_inf_game.h" #include "d/d_meter_HIO.h" diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index b3aa25eeff4..3796b2c17b6 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -2,31 +2,28 @@ // Option Menu // -#include "d/d_menu_option.h" -#include "JSystem/JKernel/JKRMemArchive.h" +#include "d/dolzel.h" + +#include #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "d/d_com_inf_game.h" -#include "d/d_lib.h" -#include "d/d_select_cursor.h" #include "d/d_file_sel_warning.h" +#include "d/d_lib.h" #include "d/d_menu_calibration.h" +#include "d/d_menu_option.h" #include "d/d_menu_window.h" #include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" #include "d/d_meter_haihai.h" #include "d/d_msg_string.h" -#include +#include "d/d_select_cursor.h" #include "dolphin/types.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "string.h" -/* 803BDBA8-803BDBB4 01ACC8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - typedef void (dMenu_Option_c::*initFunc)(); static initFunc init[] = { &dMenu_Option_c::atten_init, &dMenu_Option_c::vib_init, diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index 9d4793084ac..94997bf7e6a 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -4,6 +4,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_menu_ring.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DTextBox.h" @@ -27,11 +29,6 @@ #include "stdio.h" -/* 803BDE70-803BDE7C 01AF90 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803BDEAC-803BDEDC 01AFCC 0030+00 3/4 0/0 0/0 .data stick_init */ typedef void (dMenu_Ring_c::*initFunc)(); static initFunc stick_init[] = { diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index af264a821a8..cb9edffbcd0 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_menu_save // +#include "d/dolzel.h" + #include "d/d_menu_save.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" @@ -23,11 +25,6 @@ #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "f_op/f_op_msg_mng.h" -/* 803BDF78-803BDF84 01B098 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803BDF84-803BDF90 01B0A4 000C+00 3/3 0/0 0/0 .data SelStartFrameTbl */ static int SelStartFrameTbl[3] = { 59, @@ -83,6 +80,33 @@ dMs_HIO_c::dMs_HIO_c() { field_0xf = 0; } +// Need 0x24 bytes of padding with no symbol between dDlst_MenuSaveExplain_c::__vtable and dMs_HIO_c::__vtable +// This is likely caused by the vtable of an abstract base class getting put there and then stripped out. +// Not sure which abstract base class could go there though, so we simulate it with some dummy classes for now. +class dummy_abstract_class { +public: + virtual void virt_func_0() = 0; + virtual void virt_func_1() = 0; + virtual void virt_func_2() = 0; + virtual void virt_func_3() = 0; + virtual void virt_func_4() = 0; + virtual void virt_func_5() = 0; + virtual void virt_func_6() = 0; +}; +class dummy_child_class : dummy_abstract_class { + virtual void virt_func_0(); + virtual void virt_func_1(); + virtual void virt_func_2(); + virtual void virt_func_3(); + virtual void virt_func_4(); + virtual void virt_func_5(); + virtual void virt_func_6(); +}; +static dummy_child_class dummy() { + dummy_child_class temp; + return temp; +} + /* 801EF6A0-801EF7AC 1E9FE0 010C+00 0/0 3/3 0/0 .text __ct__12dMenu_save_cFv */ dMenu_save_c::dMenu_save_c() { mpScrnExplain = NULL; diff --git a/src/d/d_menu_skill.cpp b/src/d/d_menu_skill.cpp index 4581f400fc0..074c46a764d 100644 --- a/src/d/d_menu_skill.cpp +++ b/src/d/d_menu_skill.cpp @@ -3,6 +3,8 @@ * Menu - Hidden Skills */ +#include "d/dolzel.h" + #include "d/d_menu_skill.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRMemArchive.h" @@ -15,11 +17,6 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -/* 803BE7D8-803BE7E4 01B8F8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - typedef void (dMenu_Skill_c::*initFunc)(); static initFunc map_init_process[] = { &dMenu_Skill_c::wait_init, diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index 6fb7f2624a9..83637a079c3 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -1,4 +1,5 @@ -#include "d/d_menu_window.h" +#include "d/dolzel.h" + #include "JSystem/JKernel/JKRExpHeap.h" #include "d/actor/d_a_player.h" #include "d/d_lib.h" @@ -12,9 +13,10 @@ #include "d/d_menu_ring.h" #include "d/d_menu_save.h" #include "d/d_menu_skill.h" +#include "d/d_menu_window.h" #include "d/d_menu_window_HIO.h" -#include "d/d_meter2_info.h" #include "d/d_meter2.h" +#include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" #include "d/d_meter_map.h" #include "d/d_msg_object.h" @@ -179,11 +181,6 @@ static BOOL dMw_isMenuRing() { return false; } -/* 803BE8F8-803BE904 01BA18 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803BEAA8-803BEC4C 01BBC8 01A4+00 1/2 0/0 0/0 .data init_proc */ typedef void (dMw_c::*initFunc)(u8); initFunc init_proc[] = { diff --git a/src/d/d_menu_window_HIO.cpp b/src/d/d_menu_window_HIO.cpp index 6490dc9a7d0..d2185a22031 100644 --- a/src/d/d_menu_window_HIO.cpp +++ b/src/d/d_menu_window_HIO.cpp @@ -3,6 +3,8 @@ * Menu HostIO functionality */ +#include "d/dolzel.h" + #include "d/d_menu_window_HIO.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 688e0499223..a80a43ac3c7 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -3,6 +3,8 @@ * Main UI handler */ +#include "d/dolzel.h" + #include "d/d_meter2.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "d/d_demo.h" diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index d260b1efe06..6b26cfe8444 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -3,6 +3,8 @@ * Main HUD drawing */ +#include "d/dolzel.h" + #include "d/d_meter2_draw.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index f7c105c9a02..49ffc63258d 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -1,13 +1,15 @@ -#include "d/d_meter2_info.h" +#include "d/dolzel.h" + #include "JSystem/J2DGraph/J2DTextBox.h" -#include "JSystem/JUtility/JUTFont.h" #include "JSystem/JMessage/JMessage.h" +#include "JSystem/JUtility/JUTFont.h" #include "d/actor/d_a_npc.h" +#include "d/d_item_data.h" #include "d/d_meter2.h" +#include "d/d_meter2_info.h" #include "d/d_meter_map.h" -#include "d/d_msg_object.h" #include "d/d_msg_class.h" -#include "d/d_item_data.h" +#include "d/d_msg_object.h" 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 cbb0906c5a0..607bb15b1a8 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_meter_HIO // +#include "d/dolzel.h" + #include "d/d_meter_HIO.h" #include "d/d_save.h" #include "JSystem/JKernel/JKRAramArchive.h" diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index 6844c61ac5a..b2e3fdf26a6 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -3,6 +3,8 @@ * UI Button handling */ +#include "d/dolzel.h" + #include "d/d_meter_button.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "d/actor/d_a_player.h" diff --git a/src/d/d_meter_haihai.cpp b/src/d/d_meter_haihai.cpp index eb2d37cd987..cf41e8b98ce 100644 --- a/src/d/d_meter_haihai.cpp +++ b/src/d/d_meter_haihai.cpp @@ -3,6 +3,8 @@ * UI Arrows */ +#include "d/dolzel.h" + #include "d/d_meter_haihai.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/d_meter_hakusha.cpp b/src/d/d_meter_hakusha.cpp index c99522fece0..eec7942a2bb 100644 --- a/src/d/d_meter_hakusha.cpp +++ b/src/d/d_meter_hakusha.cpp @@ -3,6 +3,8 @@ * UI Epona Dash Spurs */ +#include "d/dolzel.h" + #include "d/d_meter_hakusha.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/d_meter_map.cpp b/src/d/d_meter_map.cpp index eb6a7b4e274..69dc1c7aa08 100644 --- a/src/d/d_meter_map.cpp +++ b/src/d/d_meter_map.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_meter_map.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "d/actor/d_a_player.h" diff --git a/src/d/d_meter_string.cpp b/src/d/d_meter_string.cpp index 29593123bc2..781d77bad8d 100644 --- a/src/d/d_meter_string.cpp +++ b/src/d/d_meter_string.cpp @@ -3,6 +3,8 @@ * UI Mini-Game Text */ +#include "d/dolzel.h" + #include "d/d_meter_string.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp index 34e1c775890..146eca84787 100644 --- a/src/d/d_model.cpp +++ b/src/d/d_model.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_model // +#include "d/dolzel.h" + #include "d/d_model.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index 8332a1f1a4c..e4b3fa819b8 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_msg_class.h" #include #include "d/d_meter2_info.h" diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index a5f8cb53822..9ea166d9d64 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_msg_flow.h" #include "d/actor/d_a_alink.h" #include "d/d_com_static.h" @@ -12,11 +14,6 @@ #include "d/actor/d_a_obj_ss_base.h" #include "SSystem/SComponent/c_math.h" -/* 803C14B8-803C14C4 01E5D8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 80249F00-80249F48 244840 0048+00 0/0 5/5 154/154 .text __ct__10dMsgFlow_cFv */ dMsgFlow_c::dMsgFlow_c() { mNonStopJunpFlowFlag = 0; diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index d09a28e72f6..a8ba59fbbbf 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_msg_object // +#include "d/dolzel.h" + #define DISABLE_MSG_OBJECT_EXTERN #include "d/d_msg_object.h" diff --git a/src/d/d_msg_out_font.cpp b/src/d/d_msg_out_font.cpp index 8760fc866c0..a29e8c0d3c4 100644 --- a/src/d/d_msg_out_font.cpp +++ b/src/d/d_msg_out_font.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_msg_out_font.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JUtility/JUTTexture.h" @@ -777,4 +779,4 @@ const char* COutFont_c::getBtiName(int i_nameIdx) { } return mpIconName[i_nameIdx]; -} \ No newline at end of file +} diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index 9b398d28aad..36b45af1022 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -3,6 +3,8 @@ * 3-way Select Message Screen */ +#include "d/dolzel.h" + #include "d/d_msg_scrn_3select.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -14,11 +16,6 @@ #include "d/d_msg_object.h" #include "d/d_pane_class.h" -/* 803C0C00-803C0C0C 01DD20 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803C0C54-803C0CA0 01DD74 0048+04 2/3 0/0 0/0 .data process */ typedef void (dMsgScrn3Select_c::*processFn)(); processFn process[] = { diff --git a/src/d/d_msg_scrn_arrow.cpp b/src/d/d_msg_scrn_arrow.cpp index 89a7e37e8cb..c6882e86465 100644 --- a/src/d/d_msg_scrn_arrow.cpp +++ b/src/d/d_msg_scrn_arrow.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_msg_scrn_arrow.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/d_msg_scrn_base.cpp b/src/d/d_msg_scrn_base.cpp index af5a3b7b058..ae2ab321e6b 100644 --- a/src/d/d_msg_scrn_base.cpp +++ b/src/d/d_msg_scrn_base.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_msg_scrn_base.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/d_msg_scrn_boss.cpp b/src/d/d_msg_scrn_boss.cpp index 6ef6bf15752..d6187465ad9 100644 --- a/src/d/d_msg_scrn_boss.cpp +++ b/src/d/d_msg_scrn_boss.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_msg_scrn_boss.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -115,4 +117,4 @@ void dMsgScrnBoss_c::fukiScale(f32) {} void dMsgScrnBoss_c::fukiTrans(f32, f32) {} /* 8023CC84-8023CC88 2375C4 0004+00 1/0 0/0 0/0 .text fontAlpha__14dMsgScrnBoss_cFf */ -void dMsgScrnBoss_c::fontAlpha(f32) {} \ No newline at end of file +void dMsgScrnBoss_c::fontAlpha(f32) {} diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index ea799fdadc0..18112673df8 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_msg_scrn_explain.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "d/d_lib.h" @@ -13,11 +15,6 @@ extern dMsgObject_HIO_c g_MsgObject_HIO_c; -/* 803C0E40-803C0E4C 01DF60 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - static dMsgScrnExplain_c::ProcFunc init_process[] = { &dMsgScrnExplain_c::wait_init, &dMsgScrnExplain_c::open_request_init, &dMsgScrnExplain_c::open_init, &dMsgScrnExplain_c::move_init, diff --git a/src/d/d_msg_scrn_howl.cpp b/src/d/d_msg_scrn_howl.cpp index cbc6986415c..d69d420df02 100644 --- a/src/d/d_msg_scrn_howl.cpp +++ b/src/d/d_msg_scrn_howl.cpp @@ -2,6 +2,8 @@ // Howl Screen // +#include "d/dolzel.h" + #include "d/d_msg_scrn_howl.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" @@ -17,11 +19,6 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "Z2AudioLib/Z2WolfHowlMgr.h" -/* 803C0FD0-803C0FDC 01E0F0 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - typedef void (dMsgScrnHowl_c::*dMsgScrnHowl_cFunc)(); static dMsgScrnHowl_cFunc init_proc[5] = { diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index 0a728eee445..23bb6d20ae4 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -2,6 +2,8 @@ // Item Message Screen // +#include "d/dolzel.h" + #include "d/d_msg_scrn_item.h" #include "d/d_msg_scrn_light.h" #include "d/d_msg_scrn_arrow.h" diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp index 8e4f4a0d392..efe2e9362cc 100644 --- a/src/d/d_msg_scrn_jimaku.cpp +++ b/src/d/d_msg_scrn_jimaku.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_msg_scrn_jimaku.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/d_msg_scrn_kanban.cpp b/src/d/d_msg_scrn_kanban.cpp index b1368d1bc16..e10b38ddd8e 100644 --- a/src/d/d_msg_scrn_kanban.cpp +++ b/src/d/d_msg_scrn_kanban.cpp @@ -2,6 +2,8 @@ // d_msg_scrn_kanban // +#include "d/dolzel.h" + #include "d/d_msg_scrn_kanban.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -172,4 +174,4 @@ void dMsgScrnKanban_c::fukiAlpha(f32 param_0) { void dMsgScrnKanban_c::fukiScale(f32 param_0) {} /* 80245758-8024575C 240098 0004+00 1/0 0/0 0/0 .text fukiTrans__16dMsgScrnKanban_cFff */ -void dMsgScrnKanban_c::fukiTrans(f32 param_0, f32 param_1) {} \ No newline at end of file +void dMsgScrnKanban_c::fukiTrans(f32 param_0, f32 param_1) {} diff --git a/src/d/d_msg_scrn_light.cpp b/src/d/d_msg_scrn_light.cpp index d841385af45..688f0190a8e 100644 --- a/src/d/d_msg_scrn_light.cpp +++ b/src/d/d_msg_scrn_light.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_msg_scrn_light.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_msg_scrn_place.cpp b/src/d/d_msg_scrn_place.cpp index 888918d490a..5ef624cb190 100644 --- a/src/d/d_msg_scrn_place.cpp +++ b/src/d/d_msg_scrn_place.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_msg_scrn_place.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -134,4 +136,4 @@ void dMsgScrnPlace_c::fukiScale(f32) {} void dMsgScrnPlace_c::fukiTrans(f32, f32) {} /* 80246B30-80246B34 241470 0004+00 1/0 0/0 0/0 .text fontAlpha__15dMsgScrnPlace_cFf */ -void dMsgScrnPlace_c::fontAlpha(f32) {} \ No newline at end of file +void dMsgScrnPlace_c::fontAlpha(f32) {} diff --git a/src/d/d_msg_scrn_staff.cpp b/src/d/d_msg_scrn_staff.cpp index 3100a84e00c..384cbb17c17 100644 --- a/src/d/d_msg_scrn_staff.cpp +++ b/src/d/d_msg_scrn_staff.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_msg_scrn_staff.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -96,4 +98,4 @@ void dMsgScrnStaff_c::fukiScale(f32 param_0) {} void dMsgScrnStaff_c::fukiTrans(f32 param_0, f32 param_1) {} /* 80246FEC-80246FF0 24192C 0004+00 1/0 0/0 0/0 .text fontAlpha__15dMsgScrnStaff_cFf */ -void dMsgScrnStaff_c::fontAlpha(f32 param_0) {} \ No newline at end of file +void dMsgScrnStaff_c::fontAlpha(f32 param_0) {} diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index 2f2eb3dc015..1e23d03fe94 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -2,6 +2,8 @@ // Translation Unit: msg/scrn/d_msg_scrn_talk // +#include "d/dolzel.h" + #include "d/d_msg_scrn_talk.h" #include "d/d_msg_scrn_light.h" #include "d/d_msg_scrn_arrow.h" diff --git a/src/d/d_msg_scrn_tree.cpp b/src/d/d_msg_scrn_tree.cpp index 0e9058de13b..88674b87e6b 100644 --- a/src/d/d_msg_scrn_tree.cpp +++ b/src/d/d_msg_scrn_tree.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_msg_scrn_tree.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -181,4 +183,4 @@ void dMsgScrnTree_c::fukiAlpha(f32 param_0) { void dMsgScrnTree_c::fukiScale(f32 param_0) {} /* 802493B0-802493B4 243CF0 0004+00 1/0 0/0 0/0 .text fukiTrans__14dMsgScrnTree_cFff */ -void dMsgScrnTree_c::fukiTrans(f32 param_0, f32 param_1) {} \ No newline at end of file +void dMsgScrnTree_c::fukiTrans(f32 param_0, f32 param_1) {} diff --git a/src/d/d_msg_string.cpp b/src/d/d_msg_string.cpp index 94a4de5a7c8..c07d97ad88a 100644 --- a/src/d/d_msg_string.cpp +++ b/src/d/d_msg_string.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_msg_string // +#include "d/dolzel.h" + #include "d/d_msg_string.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "d/d_msg_out_font.h" @@ -99,4 +101,4 @@ void dMsgString_c::drawOutFontLocal(J2DTextBox* p_textBox, f32 i_alpha) { void dMsgString_c::drawFontLocal(J2DTextBox* p_textBox, u8 type, f32 posX, f32 posY, f32 sizeX, f32 sizeY, u32 color, u8 alpha) { mpOutFont->drawFont(p_textBox, type, posX, posY, sizeX, sizeY, color, alpha); -} \ No newline at end of file +} diff --git a/src/d/d_msg_string_base.cpp b/src/d/d_msg_string_base.cpp index cc136b0ad6e..8b9c1a62b27 100644 --- a/src/d/d_msg_string_base.cpp +++ b/src/d/d_msg_string_base.cpp @@ -2,6 +2,8 @@ // d_msg_string_base // +#include "d/dolzel.h" + #include "d/d_msg_string_base.h" #include "d/d_msg_class.h" #include "d/d_com_inf_game.h" @@ -199,4 +201,4 @@ void dMsgStringBase_c::drawOutFontLocal(J2DTextBox* param_0, f32 param_1) { /* 80399CA3-80399CB0 026303 0008+05 0/0 0/0 0/0 .rodata None */ static char const* const stringBase_80399CA3 = "\x1B" "CR[%d]"; -/* 80399C98-80399C98 0262F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80399C98-80399C98 0262F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index 731bb4cdc18..f5075bad083 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_msg_unit // +#include "d/dolzel.h" + #include "d/d_msg_unit.h" #include "d/d_com_inf_game.h" #include "stdio.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index f856d7c9a95..06ec708f981 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_name // +#include "d/dolzel.h" + #include "d/d_name.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "d/d_com_inf_game.h" @@ -14,11 +16,6 @@ #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "f_op/f_op_msg_mng.h" -/* 803C1F50-803C1F5C 01F070 000C+00 5/5 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803C1F5C-803C2060 -00001 0104+00 0/3 0/0 0/0 .data l_mojiHira */ static const char* l_mojiHira[65] = { "あ", "い", "う", "え", "お", "か", "き", "く", "け", "こ", "さ", "し", "す", diff --git a/src/d/d_npc_lib.cpp b/src/d/d_npc_lib.cpp index 7c9fa3bb564..2ba5e7b816b 100644 --- a/src/d/d_npc_lib.cpp +++ b/src/d/d_npc_lib.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_npc_lib.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index e1244fd6055..824567942e4 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_ovlp_fade.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_overlap_mng.h" diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 07a0e8c4792..478c1aa7188 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_ovlp_fade2.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "d/d_s_play.h" diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index 564111a3ee1..e9d5f5bf24e 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -3,8 +3,10 @@ * */ -#include "d/d_ovlp_fade3.h" +#include "d/dolzel.h" + #include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "d/d_ovlp_fade3.h" #include "d/d_s_play.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_pane_class.cpp b/src/d/d_pane_class.cpp index 3fab5907503..a5beceefce5 100644 --- a/src/d/d_pane_class.cpp +++ b/src/d/d_pane_class.cpp @@ -3,7 +3,8 @@ // Translation Unit: d/d_pane_class // -#include "d/d_pane_class.h" +#include "d/dolzel.h" + #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPicture.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -13,6 +14,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JSupport/JSUMemoryStream.h" #include "d/d_lib.h" +#include "d/d_pane_class.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_graphic.h" @@ -503,4 +505,4 @@ bool dPaneClass_setPriority(void** i_data, JKRHeap* p_heap, J2DScreen* p_screen, } return false; -} \ No newline at end of file +} diff --git a/src/d/d_pane_class_alpha.cpp b/src/d/d_pane_class_alpha.cpp index 7b4b6d3bc22..0c44ae70c65 100644 --- a/src/d/d_pane_class_alpha.cpp +++ b/src/d/d_pane_class_alpha.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_pane_class_alpha // +#include "d/dolzel.h" + #include "d/d_pane_class_alpha.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JKernel/JKRExpHeap.h" @@ -302,4 +304,4 @@ void CPaneMgrAlphaMorf::childPaneSetAlphaMorf(J2DPane* p_pane, f32 morf) { childPaneSetAlphaMorf(p_pane->getFirstChildPane(), morf); childPaneSetAlphaMorf(p_pane->getNextChildPane(), morf); } -} \ No newline at end of file +} diff --git a/src/d/d_pane_class_ex.cpp b/src/d/d_pane_class_ex.cpp index 8d0839e60d7..f7612c3b696 100644 --- a/src/d/d_pane_class_ex.cpp +++ b/src/d/d_pane_class_ex.cpp @@ -2,6 +2,8 @@ // d_pane_class_ex // +#include "d/dolzel.h" + #include "d/d_pane_class_ex.h" #include "JSystem/J2DGraph/J2DPane.h" #include "JSystem/J2DGraph/J2DPictureEx.h" @@ -21,4 +23,4 @@ static void dummyVirtualFunctions(J2DPane* pane, J2DTextBoxEx* textBoxEx, J2DTex pane->setAnimation((J2DAnmTexPattern*)NULL); pane->setAnimation((J2DAnmVisibilityFull*)NULL); pane->setAnimation((J2DAnmVtxColor*)NULL); -} \ No newline at end of file +} diff --git a/src/d/d_particle_copoly.cpp b/src/d/d_particle_copoly.cpp index 9997f9f54c8..59afa87f6f9 100644 --- a/src/d/d_particle_copoly.cpp +++ b/src/d/d_particle_copoly.cpp @@ -3,6 +3,8 @@ * */ +#include "d/dolzel.h" + #include "d/d_particle_copoly.h" #include "f_op/f_op_kankyo_mng.h" @@ -227,12 +229,6 @@ void dPaPoF_c::clearFourAllID() { clearTwoAllID(); } -/* ############################################################################################## */ -/* 803A85F8-803A8604 005718 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803A8628-803A864C 005748 0024+00 0/1 0/0 0/0 .data m_typeTwoData__8dPaPoT_c */ dPaPoT_c::effTypeFunc dPaPoT_c::m_typeTwoData[] = { &dPaPoT_c::getCenterEffType, @@ -257,4 +253,4 @@ dPaPoF_c::effTypeFunc dPaPoF_c::m_typeFourData[] = { dPaPoF_c::emitterFunc dPaPoF_c::m_emitterFourData[] = { &dPaPoF_c::getCenterEmitter, &dPaPoF_c::getLeftEmitter, &dPaPoF_c::getRightEmitter, &dPaPoF_c::getBackLeftEmitter, &dPaPoF_c::getBackRightEmitter, -}; \ No newline at end of file +}; diff --git a/src/d/d_particle_name.cpp b/src/d/d_particle_name.cpp index 8330ff536b4..a0ee9ad4d9a 100644 --- a/src/d/d_particle_name.cpp +++ b/src/d/d_particle_name.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_particle_name.h" /* 803A85D0-803A85DC 0056F0 000A+02 0/0 1/1 0/0 .data j_o_id__8dPa_name */ @@ -9,4 +11,4 @@ u16 dPa_name::j_o_id[5] = { u16 dPa_name::s_o_id[14] = { 0x8110, 0x8111, 0x8112, 0x89D6, 0x89D7, 0x89D8, 0x83A6, 0x83A7, 0x8104, 0x8105, 0x8106, 0x8174, 0x8175, 0x8176, -}; \ No newline at end of file +}; diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp index ae3a847bb03..64df1ae4bbc 100644 --- a/src/d/d_path.cpp +++ b/src/d/d_path.cpp @@ -3,6 +3,8 @@ * dolzel2 - Room Path & Point Management */ +#include "d/dolzel.h" + #include "d/d_path.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index f56d824c096..004ce3858da 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_resorce.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 410247f4d05..c61aa91ca4b 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -3,6 +3,8 @@ * Game Boot Logo's Display */ +#include "d/dolzel.h" + #include "d/d_s_logo.h" #include "JSystem/JKernel/JKRAram.h" #include "JSystem/JKernel/JKRExpHeap.h" @@ -35,11 +37,6 @@ #define PROGRESSIVE_MODE_ON OS_PROGRESSIVE_MODE_ON #endif -/* 803C2E38-803C2E44 01FF58 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 804510E8-804510F0 0005E8 0008+00 1/1 0/0 0/0 .sbss g_LogHIO */ static dLog_HIO_c g_LogHIO; diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index d3bec25c296..066d98b1e58 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -3,6 +3,8 @@ * Debug Level Select Menu */ +#include "d/dolzel.h" + #include "d/d_s_menu.h" #include "d/d_com_inf_game.h" #include "d/d_com_static.h" diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 8d19ccbbc33..a955e5b2db4 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -3,6 +3,8 @@ * File Select Scene */ +#include "d/dolzel.h" + #include "d/d_s_name.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "d/d_com_inf_game.h" @@ -14,11 +16,6 @@ #include "m_Do/m_Do_mtx.h" #include "f_op/f_op_overlap_mng.h" -/* 803C3040-803C304C 020160 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 804510F0-804510F8 0005F0 0008+00 2/2 0/0 0/0 .sbss g_snHIO */ static dSn_HIO_c g_snHIO; diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 0b545fbcb07..d839ee5bd71 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -3,6 +3,8 @@ * Main Gameplay Scene */ +#include "d/dolzel.h" + #include "d/d_s_play.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTGamePad.h" diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index f043cdc88f0..53655146f24 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -3,10 +3,12 @@ * Gameplay Room Scene */ -#include "d/d_s_room.h" +#include "d/dolzel.h" + #include "JSystem/JKernel/JKRExpHeap.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include "d/d_s_room.h" #include "m_Do/m_Do_Reset.h" #include "stdio.h" diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 3b518b327f8..cc85f267899 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -3,6 +3,8 @@ * Title Screen Scene */ +#include "d/dolzel.h" + #include "d/d_s_title.h" #include "f_op/f_op_scene.h" #include "f_pc/f_pc_leaf.h" diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 64c7e425db7..3d493eac606 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -3,15 +3,17 @@ * Save File Manager */ -#include "d/d_save.h" -#include "d/d_save_init.h" +#include "d/dolzel.h" + +#include "JSystem/JHostIO/JORFile.h" #include "JSystem/JUtility/JUTGamePad.h" -#include "stdio.h" +#include "d/actor/d_a_obj_carry.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" -#include "d/actor/d_a_obj_carry.h" +#include "d/d_save.h" +#include "d/d_save_init.h" #include "f_op/f_op_scene_mng.h" -#include "JSystem/JHostIO/JORFile.h" +#include "stdio.h" /* 80032918-80032958 02D258 0040+00 4/4 0/0 0/0 .text dSv_item_rename__FUc */ static u8 dSv_item_rename(u8 i_itemNo) { diff --git a/src/d/d_save_HIO.cpp b/src/d/d_save_HIO.cpp index 389458ba099..98a8bb49233 100644 --- a/src/d/d_save_HIO.cpp +++ b/src/d/d_save_HIO.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_save_HIO // +#include "d/dolzel.h" + #include "d/d_save_HIO.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_save_init.cpp b/src/d/d_save_init.cpp index d1a96cd2d34..abf32fac901 100644 --- a/src/d/d_save_init.cpp +++ b/src/d/d_save_init.cpp @@ -3,7 +3,9 @@ * */ +#include "d/dolzel.h" + #include "d/d_save_init.h" /* 80035C88-80035C8C 0305C8 0004+00 0/0 1/1 0/0 .text setInitEventBit__Fv */ -void setInitEventBit() {} \ No newline at end of file +void setInitEventBit() {} diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index f0c8ece162d..90f566740ff 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_scope // +#include "d/dolzel.h" + #include "d/d_scope.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JUtility/JUTTexture.h" @@ -12,11 +14,6 @@ #include "m_Do/m_Do_graphic.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" -/* 803BB618-803BB624 018738 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 803BB648-803BB66C 018768 0024+00 2/3 0/0 0/0 .data init_process */ typedef void (dScope_c::*initFunc)(); initFunc init_process[] = { diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index 64670de2fd1..3571e029d89 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_select_cursor // -#define NO_INLINE_DLSTBASE_DRAW +#include "d/dolzel.h" #include "d/d_select_cursor.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -11,11 +11,6 @@ #include "JSystem/J2DGraph/J2DAnimation.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" -/* 803BB700-803BB70C 018820 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - /* 801941E4-80194220 18EB24 003C+00 1/1 0/0 0/0 .text __ct__19dSelect_cursorHIO_cFv */ dSelect_cursorHIO_c::dSelect_cursorHIO_c() { field_0x8 = 1.0f; @@ -573,8 +568,10 @@ void dSelect_cursor_c::moveCenter(J2DPane* i_pane, f32 i_x, f32 i_y) { } // Need 0x30 bytes of padding with no symbol between btk2_name$3688 and dSelect_cursor_c::__vtable -// This is likely caused by the vtables of abstract base classes getting put there and then stripped out. -// Not sure which abstract base classes could go there though, so we simulate it with some dummy classes for now. +// This is likely caused by the vtables of abstract base classes (likely from dolzel.pch) getting +// put there and then stripped out. +// Not sure which abstract base classes could go there though, so we simulate it with some dummy +// classes for now. class dummy_abstract_class { public: virtual void virt_func_0() = 0; diff --git a/src/d/d_select_icon.cpp b/src/d/d_select_icon.cpp index 7883ad1cf18..8a73e5d8c58 100644 --- a/src/d/d_select_icon.cpp +++ b/src/d/d_select_icon.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_select_icon.h" #include "JSystem/J2DGraph/J2DAnimation.h" diff --git a/src/d/d_shop_camera.cpp b/src/d/d_shop_camera.cpp index fef905b6acb..57f54e974c6 100644 --- a/src/d/d_shop_camera.cpp +++ b/src/d/d_shop_camera.cpp @@ -3,6 +3,8 @@ * Shop Camera Handling */ +#include "d/dolzel.h" + #include "d/d_shop_camera.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" diff --git a/src/d/d_shop_item_ctrl.cpp b/src/d/d_shop_item_ctrl.cpp index e29dda72dc2..21ae19697a0 100644 --- a/src/d/d_shop_item_ctrl.cpp +++ b/src/d/d_shop_item_ctrl.cpp @@ -2,6 +2,8 @@ // d/shop/d_shop_item_ctrl // +#include "d/dolzel.h" + #include "d/d_shop_item_ctrl.h" #include "SSystem/SComponent/c_lib.h" #include "d/d_a_shop_item_static.h" @@ -115,4 +117,4 @@ void dShopItemCtrl_c::setZoomAnime(int param_1, cXyz* param_2, s16 param_3, bool shopItem->setAngleY(y_angle); } } -} \ No newline at end of file +} diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index 4b30e4c68b8..6c7769c8b44 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -3,6 +3,8 @@ * Main Shop System */ +#include "d/dolzel.h" + #include "d/d_shop_system.h" #include "SSystem/SComponent/c_math.h" #include "d/d_a_shop_item_static.h" @@ -16,10 +18,6 @@ #include "m_Do/m_Do_lib.h" #include "d/actor/d_a_tag_shop_item.h" -/* 803BB898-803BB8A4 0189B8 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; /* 803BB8A4-803BB8C0 0189C4 001C+00 6/6 0/0 0/0 .data dShopSystem_itemActor */ static daTag_ShopItem_c* dShopSystem_itemActor[7] = { diff --git a/src/d/d_simple_model.cpp b/src/d/d_simple_model.cpp index 0085c29974d..a39b7507975 100644 --- a/src/d/d_simple_model.cpp +++ b/src/d/d_simple_model.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_simple_model // +#include "d/dolzel.h" + #include "d/d_simple_model.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_spline_path.cpp b/src/d/d_spline_path.cpp index 17b1df58cbc..1100428414e 100644 --- a/src/d/d_spline_path.cpp +++ b/src/d/d_spline_path.cpp @@ -3,6 +3,8 @@ * dolzel2 - Spline Path Management */ +#include "d/dolzel.h" + #include "d/d_spline_path.h" #include "d/d_path.h" #include "d/d_stage.h" @@ -147,4 +149,4 @@ cXyz dPathCurve::bSpline2(f32 param_0) { local_7c.z = point11->z * fVar7 + point10->z * fVar6 + point8->z * fVar5; return local_7c; } -} \ No newline at end of file +} diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 28a71382a3f..39ab1353a1e 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -3,24 +3,26 @@ // Translation Unit: d/d_stage // -#include "d/d_stage.h" +#include "d/dolzel.h" + #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" -#include "d/d_path.h" -#include "stdio.h" #include "SSystem/SComponent/c_malloc.h" -#include "d/d_com_inf_game.h" #include "d/actor/d_a_alink.h" +#include "d/actor/d_a_suspend.h" +#include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_map_path_dmap.h" #include "d/d_map_path_fmap.h" +#include "d/d_path.h" #include "d/d_save_HIO.h" -#include "d/actor/d_a_suspend.h" +#include "d/d_stage.h" #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_msg_mng.h" #include "f_op/f_op_scene_mng.h" #include "global.h" #include "m_Do/m_Do_Reset.h" +#include "stdio.h" void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe, u8 i_speed) { @@ -1283,6 +1285,10 @@ void dStage_roomControl_c::zoneCountCheck(int i_roomNo) const { setStayNo(i_roomNo); } +static void dummy1() { + ((dStage_stageDt_c*)dComIfGp_getStage())->getStagInfo(); +} + JKRExpHeap* dStage_roomControl_c::createMemoryBlock(int i_blockIdx, u32 i_heapSize) { if (mMemoryBlock[i_blockIdx] == NULL) { mMemoryBlock[i_blockIdx] = JKRCreateExpHeap(i_heapSize, mDoExt_getArchiveHeap(), false); @@ -1486,6 +1492,11 @@ static int dStage_roomInit(int i_roomNo) { return 1; } +static void dummy0() { + dComIfGp_roomControl_setTimePass(0); + ((dStage_stageDt_c*)dComIfGp_getStage())->getRoom(); +} + dStage_objectNameInf* dStage_searchName(char const* objName) { dStage_objectNameInf* obj = l_objectName; @@ -1601,11 +1612,11 @@ static int dStage_cameraCreate(stage_camera2_data_class* i_cameraData, int i_cam return 1; } -static void dummy() { +static void dummy2() { // Needed to fix weak function order. // This is likely caused by the dStage_chkPlayerId function from TWW using these functions. // dStage_chkPlayerId isn't used in TP, so it gets stripped out, but the effect it has on weak order remains. - dComIfGp_getStage()->getPlayer(); + ((dStage_stageDt_c*)dComIfGp_getStage())->getPlayer(); dComIfGp_roomControl_getStatusRoomDt(0)->getPlayer(); } @@ -1728,6 +1739,10 @@ stage_map_info_class* dStage_roomDt_c::getMapInfo2(int param_0) const { return NULL; } +static void dummy3() { + dComIfGp_roomControl_getStatusRoomDt(0)->getMapInfoBase(); +} + /* 80025404-80025490 01FD44 008C+00 1/0 0/0 0/0 .text getMapInfo2__16dStage_stageDt_cCFi */ stage_map_info_class* dStage_stageDt_c::getMapInfo2(int param_0) const { @@ -1750,6 +1765,10 @@ stage_map_info_class* dStage_stageDt_c::getMapInfo2(int param_0) const { return NULL; } +static void dummy4() { + ((dStage_stageDt_c*)dComIfGp_getStage())->getMapInfoBase(); +} + /* 80025498-800254CC 01FDD8 0034+00 1/0 0/0 0/0 .text dStage_paletteInfoInit__FP11dStage_dt_cPviPv */ static int dStage_paletteInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) { @@ -2482,6 +2501,8 @@ static void layerTableLoader(void* i_data, dStage_dt_c* i_stage, int roomNo) { } } +dStage_Elst_c* dStage_stageDt_c::getElst(void) { return mElst; } + /* 80026AF0-80026B58 021430 0068+00 2/2 0/0 0/0 .text layerActorLoader__FPvP11dStage_dt_ci */ static void layerActorLoader(void* i_data, dStage_dt_c* i_stage, int param_2) { static FuncTable l_layerFuncTable[] = { @@ -2742,6 +2763,11 @@ int dStage_changeScene(int i_exitId, f32 speed, u32 mode, s8 room_no, s16 angle, return 1; } +static void dummy5() { + dComIfGp_roomControl_getStatusRoomDt(0)->getSclsInfo(); + ((dStage_stageDt_c*)dComIfGp_getStage())->getSclsInfo(); +} + /* 800272F0-800274B0 021C30 01C0+00 0/0 1/1 0/0 .text dStage_changeScene4Event__FiScibfUlsi */ int dStage_changeScene4Event(int i_exitId, s8 room_no, int i_wipe, bool param_3, f32 speed, u32 mode, s16 angle, int param_7) { diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index abe62d594fc..16a1e6e8679 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -3,6 +3,8 @@ * Minigame HUD Timer / Counter */ +#include "d/dolzel.h" + #include "d/d_timer.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_tresure.cpp b/src/d/d_tresure.cpp index d8c7deb6633..c803de24b92 100644 --- a/src/d/d_tresure.cpp +++ b/src/d/d_tresure.cpp @@ -3,6 +3,8 @@ // Translation Unit: d/d_tresure // +#include "d/dolzel.h" + #include "d/d_tresure.h" #include "d/d_com_inf_game.h" #include "d/d_map_path_dmap.h" diff --git a/src/d/d_vib_pattern.cpp b/src/d/d_vib_pattern.cpp index 8b810585cb5..90a0d9b2eba 100644 --- a/src/d/d_vib_pattern.cpp +++ b/src/d/d_vib_pattern.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_vibration.h" // Motor Shock patterns diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index 7e31e5fc399..43a78272aa5 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -1,3 +1,5 @@ +#include "d/dolzel.h" + #include "d/d_vibration.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_controller_pad.h" diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 90afc2f2684..d12bec7bda5 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -1,14 +1,16 @@ /** * f_op_actor.cpp * Actor base process class - */ +*/ + +#include "d/dolzel.h" -#include "f_op/f_op_actor.h" #include "d/actor/d_a_alink.h" #include "d/d_com_inf_actor.h" #include "d/d_com_static.h" #include "d/d_demo.h" #include "d/d_s_play.h" +#include "f_op/f_op_actor.h" #include "f_op/f_op_actor_tag.h" #include "f_op/f_op_draw_tag.h" #include "f_pc/f_pc_manager.h" diff --git a/src/f_op/f_op_actor_iter.cpp b/src/f_op/f_op_actor_iter.cpp index 8dffef558cd..bf31c4e6e6f 100644 --- a/src/f_op/f_op_actor_iter.cpp +++ b/src/f_op/f_op_actor_iter.cpp @@ -31,4 +31,4 @@ void* fopAcIt_Judge(fopAcIt_JudgeFunc i_judgeFunc, void* i_data) { userData.data = i_data; return cLsIt_Judge(&g_fopAcTg_Queue, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &userData); -} \ No newline at end of file +} diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index cf038c951eb..8180fcb1b67 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -3,22 +3,27 @@ * Actor Manager */ -#pragma nosyminline on +#include "d/dolzel.h" -#include "f_op/f_op_actor_mng.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SComponent/c_math.h" +#include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_tag_stream.h" #include "d/d_item.h" #include "d/d_path.h" -#include "d/actor/d_a_obj_carry.h" +#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_scene_mng.h" #include "m_Do/m_Do_lib.h" +class l_HIO { +public: + /* 8001E098 */ ~l_HIO() {} +}; + #define MAKE_ITEM_PARAMS(itemNo, itemBitNo, param_2, param_3) \ ((itemNo & 0xFF) << 0 | (itemBitNo & 0xFF) << 0x8 | param_2 << 0x10 | (param_3 & 0xF) << 0x18) diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index bf2876d3619..b6264b08caf 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -3,13 +3,15 @@ // Translation Unit: f_op/f_op_msg_mng // -#include "f_op/f_op_msg_mng.h" +#include "d/dolzel.h" + #include "JSystem/JKernel/JKRExpHeap.h" #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SComponent/c_math.h" #include "d/d_meter2.h" #include "d/d_meter2_info.h" #include "d/d_msg_object.h" +#include "f_op/f_op_msg_mng.h" #include "f_op/f_op_scene_mng.h" /* 8001F9B4-8001FA24 01A2F4 0070+00 0/0 3/3 0/0 .text fopMsgM_setStageLayer__FPv */ diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index 8119efe0c9d..94dd707f626 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -169,4 +169,4 @@ u8 struct_80450C87; #pragma pop /* 80450C88-80450C90 000188 0008+00 0/0 2/2 0/0 .sbss None */ -bool mDoDvdErr_initialized; \ No newline at end of file +bool mDoDvdErr_initialized; diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index a7f09f999b7..981e264e6a3 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -3,29 +3,26 @@ * Graphics Management Functions */ -#include "m_Do/m_Do_graphic.h" -#include "dolphin/base/PPCArch.h" +#include "d/dolzel.h" + +#include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPrint.h" +#include "JSystem/JFramework/JFWSystem.h" +#include "JSystem/JParticle/JPADrawInfo.h" +#include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTProcBar.h" #include "JSystem/JUtility/JUTTexture.h" +#include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_menu_collect.h" +#include "dolphin/base/PPCArch.h" #include "f_ap/f_ap_game.h" #include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" #include "m_Do/m_Do_main.h" -#include "SSystem/SComponent/c_math.h" -// Possibly fakematch? -// Using `sym off` for this header fixes J2DOrthoGraph::~J2DOrthoGraph being -// incorrectly placed in a separate .text section. -#pragma sym off -#include "JSystem/J2DGraph/J2DOrthoGraph.h" -#pragma sym on -#include "JSystem/JParticle/JPADrawInfo.h" -#include "JSystem/JUtility/JUTConsole.h" -#include "JSystem/JFramework/JFWSystem.h" /* 80007D9C-80007E44 0026DC 00A8+00 1/1 0/0 0/0 .text createTimg__FUsUsUl */ static ResTIMG* createTimg(u16 width, u16 height, u32 format) { diff --git a/tools/project.py b/tools/project.py index 5ea39bbd340..2d00df4633a 100644 --- a/tools/project.py +++ b/tools/project.py @@ -45,6 +45,9 @@ Library = Dict[str, Any] +PrecompiledHeader = Dict[str, Any] + + class Object: def __init__(self, completed: bool, name: str, **options: Any) -> None: self.name = name @@ -54,10 +57,10 @@ def __init__(self, completed: bool, name: str, **options: Any) -> None: "asflags": None, "asm_dir": None, "cflags": None, + "extab_padding": None, "extra_asflags": [], "extra_cflags": [], "extra_clang_flags": [], - "host": None, "lib": None, "mw_version": None, "progress_category": None, @@ -73,7 +76,6 @@ def __init__(self, completed: bool, name: str, **options: Any) -> None: self.asm_path: Optional[Path] = None self.src_obj_path: Optional[Path] = None self.asm_obj_path: Optional[Path] = None - self.host_obj_path: Optional[Path] = None self.ctx_path: Optional[Path] = None def resolve(self, config: "ProjectConfig", lib: Library) -> "Object": @@ -91,7 +93,7 @@ def set_default(key: str, value: Any) -> None: set_default("add_to_all", True) set_default("asflags", config.asflags) set_default("asm_dir", config.asm_dir) - set_default("host", False) + set_default("extab_padding", None) set_default("mw_version", config.linker_version) set_default("scratch_preset_id", config.scratch_preset_id) set_default("shift_jis", config.shift_jis) @@ -121,7 +123,6 @@ def check_category(category: str): base_name = Path(self.name).with_suffix("") obj.src_obj_path = build_dir / "src" / f"{base_name}.o" obj.asm_obj_path = build_dir / "mod" / f"{base_name}.o" - obj.host_obj_path = build_dir / "host" / f"{base_name}.o" obj.ctx_path = build_dir / "src" / f"{base_name}.ctx" return obj @@ -153,6 +154,7 @@ def __init__(self) -> None: self.wrapper: Optional[Path] = None # If None, download wibo on Linux self.sjiswrap_tag: Optional[str] = None # Git tag self.sjiswrap_path: Optional[Path] = None # If None, download + self.ninja_path: Optional[Path] = None # If None, use system PATH self.objdiff_tag: Optional[str] = None # Git tag self.objdiff_path: Optional[Path] = None # If None, download @@ -165,6 +167,7 @@ def __init__(self) -> None: self.asflags: Optional[List[str]] = None # Assembler flags self.ldflags: Optional[List[str]] = None # Linker flags self.libs: Optional[List[Library]] = None # List of libraries + self.precompiled_headers: Optional[List[PrecompiledHeader]] = None # List of precompiled headers self.linker_version: Optional[str] = None # mwld version self.version: Optional[str] = None # Version name self.warn_missing_config: bool = False # Warn on missing unit configuration @@ -299,19 +302,62 @@ def file_is_c(path: Path) -> bool: def file_is_cpp(path: Path) -> bool: - return path.suffix.lower() in (".cc", ".cp", ".cpp", ".cxx") + return path.suffix.lower() in (".cc", ".cp", ".cpp", ".cxx", ".pch++") def file_is_c_cpp(path: Path) -> bool: return file_is_c(path) or file_is_cpp(path) +_listdir_cache = {} + + +def check_path_case(path: Path): + parts = path.parts + if path.is_absolute(): + curr = Path(parts[0]) + start = 1 + else: + curr = Path(".") + start = 0 + + for part in parts[start:]: + if curr in _listdir_cache: + entries = _listdir_cache[curr] + else: + try: + entries = os.listdir(curr) + except (FileNotFoundError, PermissionError): + sys.exit(f"Cannot access: {curr}") + _listdir_cache[curr] = entries + + for entry in entries: + if entry.lower() == part.lower(): + curr = curr / entry + break + else: + sys.exit(f"Cannot resolve: {path}") + + if path != curr: + print(f"⚠️ Case mismatch: expected={path} actual={curr}") + + def make_flags_str(flags: Optional[List[str]]) -> str: if flags is None: return "" return " ".join(flags) +def get_pch_out_name(config: ProjectConfig, pch: PrecompiledHeader) -> str: + pch_rel_path = Path(pch["source"]) + pch_out_name = pch_rel_path.with_suffix(".mch") + # Use absolute path as a workaround to allow this target to be matched with absolute paths in depfiles. + # + # Without this any object which includes the PCH would depend on the .mch filesystem entry but not the + # corresponding Ninja task, so the MCH would not be implicitly rebuilt when the PCH is modified. + return os.path.abspath(config.out_path() / "include" / pch_out_name) + + # Unit configuration class BuildConfigUnit(TypedDict): object: Optional[str] @@ -617,6 +663,20 @@ def write_cargo_rule(): mwcc_sjis_cmd = f"{wrapper_cmd}{sjiswrap} {mwcc} $cflags -MMD -c $in -o $basedir" mwcc_sjis_implicit: List[Optional[Path]] = [*mwcc_implicit, sjiswrap] + # MWCC for precompiled headers + mwcc_pch_cmd = f"{wrapper_cmd}{mwcc} $cflags -MMD -c $in -o $basedir -precompile $basefilestem.mch" + mwcc_pch_implicit: List[Optional[Path]] = [*mwcc_implicit] + + # MWCC for precompiled headers with UTF-8 to Shift JIS wrapper + mwcc_pch_sjis_cmd = f"{wrapper_cmd}{sjiswrap} {mwcc} $cflags -MMD -c $in -o $basedir -precompile $basefilestem.mch" + mwcc_pch_sjis_implicit: List[Optional[Path]] = [*mwcc_implicit, sjiswrap] + + # MWCC with extab post-processing + mwcc_extab_cmd = f"{CHAIN}{mwcc_cmd} && {dtk} extab clean --padding \"$extab_padding\" $out $out" + mwcc_extab_implicit: List[Optional[Path]] = [*mwcc_implicit, dtk] + mwcc_sjis_extab_cmd = f"{CHAIN}{mwcc_sjis_cmd} && {dtk} extab clean --padding \"$extab_padding\" $out $out" + mwcc_sjis_extab_implicit: List[Optional[Path]] = [*mwcc_sjis_implicit, dtk] + # MWLD mwld = compiler_path / "mwldeppc.exe" mwld_cmd = f"{wrapper_cmd}{mwld} $ldflags -o $out @$out.rsp" @@ -625,17 +685,27 @@ def write_cargo_rule(): # GNU as gnu_as = binutils / f"powerpc-eabi-as{EXE}" gnu_as_cmd = ( - f"{CHAIN}{gnu_as} $asflags -o $out $in -MD $out.d" - + f" && {dtk} elf fixup $out $out" + f"{CHAIN}{gnu_as} $asflags -o $out $in" + f" && {dtk} elf fixup $out $out" ) gnu_as_implicit = [binutils_implicit or gnu_as, dtk] + # As a workaround for https://github.com/encounter/dtk-template/issues/51 + # include macros.inc directly as an implicit dependency + gnu_as_implicit.append(build_path / "include" / "macros.inc") if os.name != "nt": transform_dep = config.tools_dir / "transform_dep.py" mwcc_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" mwcc_sjis_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" + mwcc_pch_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" + mwcc_pch_sjis_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" + mwcc_extab_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" + mwcc_sjis_extab_cmd += f" && $python {transform_dep} $basefile.d $basefile.d" mwcc_implicit.append(transform_dep) mwcc_sjis_implicit.append(transform_dep) + mwcc_pch_implicit.append(transform_dep) + mwcc_pch_sjis_implicit.append(transform_dep) + mwcc_extab_implicit.append(transform_dep) + mwcc_sjis_extab_implicit.append(transform_dep) n.comment("Link ELF file") n.rule( @@ -675,12 +745,52 @@ def write_cargo_rule(): ) n.newline() + n.comment("MWCC build (with extab post-processing)") + n.rule( + name="mwcc_extab", + command=mwcc_extab_cmd, + description="MWCC $out", + depfile="$basefile.d", + deps="gcc", + ) + n.newline() + + n.comment("MWCC build (with UTF-8 to Shift JIS wrapper and extab post-processing)") + n.rule( + name="mwcc_sjis_extab", + command=mwcc_sjis_extab_cmd, + description="MWCC $out", + depfile="$basefile.d", + deps="gcc", + ) + n.comment("Assemble asm") n.rule( name="as", command=gnu_as_cmd, description="AS $out", - depfile="$out.d", + # See https://github.com/encounter/dtk-template/issues/51 + # depfile="$out.d", + # deps="gcc", + ) + n.newline() + + n.comment("Build precompiled header") + n.rule( + name="mwcc_pch", + command=mwcc_pch_cmd, + description="PCH $out", + depfile="$basefile.d", + deps="gcc", + ) + n.newline() + + n.comment("Build precompiled header (with UTF-8 to Shift JIS wrapper)") + n.rule( + name="mwcc_pch_sjis", + command=mwcc_pch_sjis_cmd, + description="PCH $out", + depfile="$basefile.d", deps="gcc", ) n.newline() @@ -702,12 +812,12 @@ def write_cargo_rule(): ) n.newline() - def write_custom_step(step: str, prev_step: Optional[str] = None) -> None: - implicit: List[str | Path] = [] + def write_custom_step(step: str, prev_step: Optional[str] = None, extra_inputs: Optional[List[str]] = None) -> None: + implicit: List[Union[str, Path]] = [] if config.custom_build_steps and step in config.custom_build_steps: n.comment(f"Custom build steps ({step})") for custom_step in config.custom_build_steps[step]: - outputs = cast(List[str | Path], custom_step.get("outputs")) + outputs = cast(List[Union[str, Path]], custom_step.get("outputs")) if isinstance(outputs, list): implicit.extend(outputs) @@ -726,33 +836,18 @@ def write_custom_step(step: str, prev_step: Optional[str] = None) -> None: dyndep=custom_step.get("dyndep", None), ) n.newline() + n.build( outputs=step, rule="phony", inputs=implicit, order_only=prev_step, + implicit=extra_inputs, ) - n.comment("Host build") - n.variable("host_cflags", "-I include -Wno-trigraphs") - n.variable( - "host_cppflags", - "-std=c++98 -I include -fno-exceptions -fno-rtti -D_CRT_SECURE_NO_WARNINGS -Wno-trigraphs -Wno-c++11-extensions", - ) - n.rule( - name="host_cc", - command="clang $host_cflags -c -o $out $in", - description="CC $out", - ) - n.rule( - name="host_cpp", - command="clang++ $host_cppflags -c -o $out $in", - description="CXX $out", - ) - n.newline() - # Add all build steps needed before we compile (e.g. processing assets) - write_custom_step("pre-compile") + pch_out_names = [get_pch_out_name(config, pch) for pch in config.precompiled_headers or []] + write_custom_step("pre-compile", extra_inputs=pch_out_names) ### # Source files @@ -850,9 +945,40 @@ def write(self, n: ninja_syntax.Writer) -> None: link_steps: List[LinkStep] = [] used_compiler_versions: Set[str] = set() source_inputs: List[Path] = [] - host_source_inputs: List[Path] = [] source_added: Set[Path] = set() + if config.precompiled_headers: + for pch in config.precompiled_headers: + src_path_rel_str = Path(pch["source"]) + src_path_rel = Path(src_path_rel_str) + pch_out_name = src_path_rel.with_suffix(".mch") + pch_out_abs_path = Path(get_pch_out_name(config, pch)) + # Add appropriate language flag if it doesn't exist already + cflags = pch["cflags"] + if not any(flag.startswith("-lang") for flag in cflags): + if file_is_cpp(src_path_rel): + cflags.insert(0, "-lang=c++") + else: + cflags.insert(0, "-lang=c") + + cflags_str = make_flags_str(cflags) + + n.comment(f"Precompiled header {pch_out_name}") + n.build( + outputs=pch_out_abs_path, + rule="mwcc_pch_sjis" if pch.get("shift_jis", config.shift_jis) else "mwcc_pch", + inputs=f"include/{src_path_rel_str}", + variables={ + "mw_version": Path(pch["mw_version"]), + "cflags": cflags_str, + "basedir": os.path.dirname(pch_out_abs_path), + "basefile": pch_out_abs_path.with_suffix(""), + "basefilestem": pch_out_abs_path.stem, + }, + implicit=[*mwcc_implicit], + ) + n.newline() + def c_build(obj: Object, src_path: Path) -> Optional[Path]: # Avoid creating duplicate build rules if obj.src_obj_path is None or obj.src_obj_path in source_added: @@ -881,20 +1007,33 @@ def c_build(obj: Object, src_path: Path) -> Optional[Path]: # Add MWCC build rule lib_name = obj.options["lib"] + build_rule = "mwcc" + build_implcit = mwcc_implicit + variables = { + "mw_version": Path(obj.options["mw_version"]), + "cflags": cflags_str, + "basedir": os.path.dirname(obj.src_obj_path), + "basefile": obj.src_obj_path.with_suffix(""), + } + + if obj.options["shift_jis"] and obj.options["extab_padding"] is not None: + build_rule = "mwcc_sjis_extab" + build_implcit = mwcc_sjis_extab_implicit + variables["extab_padding"] = "".join(f"{i:02x}" for i in obj.options["extab_padding"]) + elif obj.options["shift_jis"]: + build_rule = "mwcc_sjis" + build_implcit = mwcc_sjis_implicit + elif obj.options["extab_padding"] is not None: + build_rule = "mwcc_extab" + build_implcit = mwcc_extab_implicit + variables["extab_padding"] = "".join(f"{i:02x}" for i in obj.options["extab_padding"]) n.comment(f"{obj.name}: {lib_name} (linked {obj.completed})") n.build( outputs=obj.src_obj_path, - rule="mwcc_sjis" if obj.options["shift_jis"] else "mwcc", + rule=build_rule, inputs=src_path, - variables={ - "mw_version": Path(obj.options["mw_version"]), - "cflags": cflags_str, - "basedir": os.path.dirname(obj.src_obj_path), - "basefile": obj.src_obj_path.with_suffix(""), - }, - implicit=( - mwcc_sjis_implicit if obj.options["shift_jis"] else mwcc_implicit - ), + variables=variables, + implicit=build_implcit, order_only="pre-compile", ) @@ -916,21 +1055,6 @@ def c_build(obj: Object, src_path: Path) -> Optional[Path]: implicit=decompctx, variables={"includes": includes}, ) - - # Add host build rule - if obj.options["host"] and obj.host_obj_path is not None: - n.build( - outputs=obj.host_obj_path, - rule="host_cc" if file_is_c(src_path) else "host_cpp", - inputs=src_path, - variables={ - "basedir": os.path.dirname(obj.host_obj_path), - "basefile": obj.host_obj_path.with_suffix(""), - }, - order_only="pre-compile", - ) - if obj.options["add_to_all"]: - host_source_inputs.append(obj.host_obj_path) n.newline() if obj.options["add_to_all"]: @@ -984,8 +1108,9 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): link_built_obj = obj.completed built_obj_path: Optional[Path] = None if obj.src_path is not None and obj.src_path.exists(): + check_path_case(obj.src_path) if file_is_c_cpp(obj.src_path): - # Add MWCC & host build rules + # Add C/C++ build rule built_obj_path = c_build(obj, obj.src_path) elif file_is_asm(obj.src_path): # Add assembler build rule @@ -998,7 +1123,12 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): link_built_obj = False # Assembly overrides - if obj.asm_path is not None and obj.asm_path.exists(): + if ( + not link_built_obj + and obj.asm_path is not None + and obj.asm_path.exists() + ): + check_path_case(obj.asm_path) link_built_obj = True built_obj_path = asm_build(obj, obj.asm_path, obj.asm_obj_path) @@ -1149,17 +1279,6 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): ) n.newline() - ### - # Helper rule for building all source files, with a host compiler - ### - n.comment("Build all source files with a host compiler") - n.build( - outputs="all_source_host", - rule="phony", - inputs=host_source_inputs, - ) - n.newline() - ### # Check hash ### @@ -1213,7 +1332,7 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): n.build( outputs=report_path, rule="report", - implicit=[objdiff, "all_source"], + implicit=[objdiff, "objdiff.json", "all_source"], order_only="post-build", ) @@ -1367,7 +1486,7 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): description=f"RUN {configure_script}", ) n.build( - outputs="build.ninja", + outputs=["build.ninja", "objdiff.json"], rule="configure", implicit=[ build_config_path, @@ -1415,9 +1534,14 @@ def generate_objdiff_config( existing_config = json.load(r) existing_units = {unit["name"]: unit for unit in existing_config["units"]} + if config.ninja_path: + ninja = str(config.ninja_path.absolute()) + else: + ninja = "ninja" + objdiff_config: Dict[str, Any] = { "min_version": "2.0.0-beta.5", - "custom_make": "ninja", + "custom_make": ninja, "build_target": False, "watch_patterns": [ "*.c", @@ -1426,6 +1550,8 @@ def generate_objdiff_config( "*.h", "*.hpp", "*.inc", + "*.pch", + "*.pch++", "*.py", "*.yml", "*.txt", @@ -1546,7 +1672,7 @@ def keep_flag(flag): "build_ctx": True, } ) - category_opt: List[str] | str = obj.options["progress_category"] + category_opt: Union[List[str], str] = obj.options["progress_category"] if isinstance(category_opt, list): progress_categories.extend(category_opt) elif category_opt is not None: