From 24b72a5302ed7a5a1300dd19b81c64c632e0d9de Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Fri, 29 Nov 2024 08:24:26 -0800 Subject: [PATCH] some cleanup of f_pc/f_op files (#2254) * cleanup f_pc files * cleanup f_op files * fix a couple f_op_actor_mng functions * minor JSystem work --- configure.py | 6 +- include/JSystem/J3DGraphBase/J3DTransform.h | 2 +- include/JSystem/JGadget/std-memory.h | 33 + include/JSystem/JGadget/std-vector.h | 172 ++ include/JSystem/JMessage/data.h | 7 + include/JSystem/JMessage/resource.h | 4 +- include/SSystem/SComponent/c_request.h | 201 +- include/c/c_dylink.h | 4 + include/d/actor/d_a_ykgr.h | 2 +- include/d/d_com_inf_game.h | 16 +- include/d/d_drawlist.h | 2 +- include/f_op/f_op_actor.h | 8 +- include/f_op/f_op_actor_mng.h | 511 ++-- include/f_op/f_op_actor_tag.h | 9 +- include/f_op/f_op_camera.h | 8 +- include/f_op/f_op_camera_mng.h | 54 +- include/f_op/f_op_draw_iter.h | 8 +- include/f_op/f_op_draw_tag.h | 8 +- include/f_op/f_op_kankyo.h | 8 +- include/f_op/f_op_kankyo_mng.h | 29 +- include/f_op/f_op_msg.h | 12 +- include/f_op/f_op_msg_mng.h | 53 +- include/f_op/f_op_overlap.h | 9 +- include/f_op/f_op_overlap_mng.h | 9 +- include/f_op/f_op_overlap_req.h | 46 +- include/f_op/f_op_scene.h | 12 +- include/f_op/f_op_scene_iter.h | 6 +- include/f_op/f_op_scene_mng.h | 32 +- include/f_op/f_op_scene_pause.h | 6 +- include/f_op/f_op_scene_req.h | 22 +- include/f_op/f_op_scene_tag.h | 8 +- include/f_op/f_op_view.h | 63 +- include/f_pc/f_pc_base.h | 54 +- include/f_pc/f_pc_create_iter.h | 22 +- include/f_pc/f_pc_create_req.h | 44 +- include/f_pc/f_pc_create_tag.h | 8 +- include/f_pc/f_pc_creator.h | 4 +- include/f_pc/f_pc_delete_tag.h | 16 +- include/f_pc/f_pc_deletor.h | 10 +- include/f_pc/f_pc_draw.h | 6 +- include/f_pc/f_pc_draw_priority.h | 8 +- include/f_pc/f_pc_executor.h | 16 +- include/f_pc/f_pc_fstcreate_req.h | 17 +- include/f_pc/f_pc_layer.h | 56 +- include/f_pc/f_pc_layer_iter.h | 12 +- include/f_pc/f_pc_layer_tag.h | 19 +- include/f_pc/f_pc_leaf.h | 32 +- include/f_pc/f_pc_line.h | 4 +- include/f_pc/f_pc_line_tag.h | 12 +- include/f_pc/f_pc_load.h | 8 +- include/f_pc/f_pc_manager.h | 90 +- include/f_pc/f_pc_method.h | 23 +- include/f_pc/f_pc_method_iter.h | 2 +- include/f_pc/f_pc_method_tag.h | 14 +- include/f_pc/f_pc_node.h | 18 +- include/f_pc/f_pc_node_req.h | 91 +- include/f_pc/f_pc_priority.h | 15 +- include/f_pc/f_pc_profile.h | 18 +- include/f_pc/f_pc_profile_lst.h | 801 ++++++ include/f_pc/f_pc_stdcreate_req.h | 32 +- src/JSystem/J3DGraphBase/J3DTransform.cpp | 413 ++- src/JSystem/JGadget/std-vector.cpp | 241 -- src/JSystem/JMessage/resource.cpp | 105 +- src/JSystem/JStudio/JStudio/ctb.cpp | 4 +- .../MSL_C++/MSL_Common/Include/algorithm.h | 68 +- .../MSL/MSL_C++/MSL_Common/Include/iterator.h | 84 +- .../MSL_C++/MSL_Common/Include/msl_memory.h | 43 +- src/SSystem/SComponent/c_request.cpp | 18 +- src/d/actor/d_a_L7demo_dr.cpp | 4 +- src/d/actor/d_a_L7low_dr.cpp | 4 +- src/d/actor/d_a_L7op_demo_dr.cpp | 4 +- src/d/actor/d_a_alink.cpp | 2 +- src/d/actor/d_a_alink_demo.inc | 8 +- src/d/actor/d_a_alink_kandelaar.inc | 4 +- src/d/actor/d_a_alldie.cpp | 2 +- src/d/actor/d_a_andsw.cpp | 4 +- src/d/actor/d_a_andsw2.cpp | 4 +- src/d/actor/d_a_arrow.cpp | 2 +- src/d/actor/d_a_b_bh.cpp | 4 +- src/d/actor/d_a_b_bq.cpp | 8 +- src/d/actor/d_a_b_dr.cpp | 4 +- src/d/actor/d_a_b_dre.cpp | 4 +- src/d/actor/d_a_b_ds.cpp | 14 +- src/d/actor/d_a_b_gg.cpp | 4 +- src/d/actor/d_a_b_gm.cpp | 4 +- src/d/actor/d_a_b_gnd.cpp | 4 +- src/d/actor/d_a_b_go.cpp | 4 +- src/d/actor/d_a_b_gos.cpp | 4 +- src/d/actor/d_a_b_mgn.cpp | 4 +- src/d/actor/d_a_b_ob.cpp | 12 +- src/d/actor/d_a_b_oh2.cpp | 2 +- src/d/actor/d_a_b_tn.cpp | 4 +- src/d/actor/d_a_b_yo.cpp | 10 +- src/d/actor/d_a_b_yo_ice.cpp | 2 +- src/d/actor/d_a_b_zant.cpp | 10 +- src/d/actor/d_a_b_zant_magic.cpp | 2 +- src/d/actor/d_a_b_zant_mobile.cpp | 2 +- src/d/actor/d_a_b_zant_sima.cpp | 4 +- src/d/actor/d_a_balloon_2D.cpp | 4 +- src/d/actor/d_a_bd.cpp | 4 +- src/d/actor/d_a_bg_obj.cpp | 4 +- src/d/actor/d_a_boomerang.cpp | 2 +- src/d/actor/d_a_bullet.cpp | 4 +- src/d/actor/d_a_canoe.cpp | 4 +- src/d/actor/d_a_coach_2D.cpp | 4 +- src/d/actor/d_a_coach_fire.cpp | 4 +- src/d/actor/d_a_cow.cpp | 4 +- src/d/actor/d_a_crod.cpp | 4 +- src/d/actor/d_a_cstaF.cpp | 4 +- src/d/actor/d_a_cstatue.cpp | 4 +- src/d/actor/d_a_demo00.cpp | 4 +- src/d/actor/d_a_demo_item.cpp | 2 +- src/d/actor/d_a_disappear.cpp | 4 +- src/d/actor/d_a_dmidna.cpp | 4 +- src/d/actor/d_a_do.cpp | 2 +- src/d/actor/d_a_door_boss.cpp | 2 +- src/d/actor/d_a_door_bossL1.cpp | 2 +- src/d/actor/d_a_door_bossL5.cpp | 2 +- src/d/actor/d_a_door_dbdoor00.cpp | 4 +- src/d/actor/d_a_door_knob00.cpp | 4 +- src/d/actor/d_a_door_mbossL1.cpp | 2 +- src/d/actor/d_a_door_push.cpp | 4 +- src/d/actor/d_a_door_shutter.cpp | 2 +- src/d/actor/d_a_door_spiral.cpp | 4 +- src/d/actor/d_a_dshutter.cpp | 2 +- src/d/actor/d_a_e_ai.cpp | 4 +- src/d/actor/d_a_e_arrow.cpp | 2 +- src/d/actor/d_a_e_ba.cpp | 2 +- src/d/actor/d_a_e_bee.cpp | 6 +- src/d/actor/d_a_e_bg.cpp | 4 +- src/d/actor/d_a_e_bi.cpp | 4 +- src/d/actor/d_a_e_bi_leaf.cpp | 4 +- src/d/actor/d_a_e_bs.cpp | 4 +- src/d/actor/d_a_e_bu.cpp | 4 +- src/d/actor/d_a_e_bug.cpp | 4 +- src/d/actor/d_a_e_cr.cpp | 4 +- src/d/actor/d_a_e_cr_egg.cpp | 4 +- src/d/actor/d_a_e_db.cpp | 4 +- src/d/actor/d_a_e_db_leaf.cpp | 4 +- src/d/actor/d_a_e_dd.cpp | 4 +- src/d/actor/d_a_e_df.cpp | 4 +- src/d/actor/d_a_e_dk.cpp | 4 +- src/d/actor/d_a_e_dn.cpp | 4 +- src/d/actor/d_a_e_dt.cpp | 4 +- src/d/actor/d_a_e_fb.cpp | 4 +- src/d/actor/d_a_e_fk.cpp | 4 +- src/d/actor/d_a_e_fm.cpp | 4 +- src/d/actor/d_a_e_fs.cpp | 2 +- src/d/actor/d_a_e_fz.cpp | 2 +- src/d/actor/d_a_e_ga.cpp | 4 +- src/d/actor/d_a_e_gb.cpp | 4 +- src/d/actor/d_a_e_ge.cpp | 4 +- src/d/actor/d_a_e_gi.cpp | 4 +- src/d/actor/d_a_e_gm.cpp | 4 +- src/d/actor/d_a_e_gob.cpp | 4 +- src/d/actor/d_a_e_gs.cpp | 4 +- src/d/actor/d_a_e_hb.cpp | 4 +- src/d/actor/d_a_e_hb_leaf.cpp | 4 +- src/d/actor/d_a_e_hm.cpp | 4 +- src/d/actor/d_a_e_hp.cpp | 4 +- src/d/actor/d_a_e_hz.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_e_kk.cpp | 4 +- src/d/actor/d_a_e_kr.cpp | 4 +- src/d/actor/d_a_e_mb.cpp | 4 +- src/d/actor/d_a_e_md.cpp | 4 +- src/d/actor/d_a_e_mf.cpp | 4 +- src/d/actor/d_a_e_mk.cpp | 4 +- src/d/actor/d_a_e_mk_bo.cpp | 4 +- src/d/actor/d_a_e_mm.cpp | 4 +- src/d/actor/d_a_e_mm_mt.cpp | 4 +- src/d/actor/d_a_e_ms.cpp | 4 +- src/d/actor/d_a_e_nest.cpp | 4 +- src/d/actor/d_a_e_nz.cpp | 4 +- src/d/actor/d_a_e_oc.cpp | 4 +- src/d/actor/d_a_e_oct_bg.cpp | 4 +- src/d/actor/d_a_e_ot.cpp | 4 +- src/d/actor/d_a_e_ph.cpp | 4 +- src/d/actor/d_a_e_pm.cpp | 4 +- src/d/actor/d_a_e_po.cpp | 4 +- src/d/actor/d_a_e_pz.cpp | 4 +- src/d/actor/d_a_e_rb.cpp | 4 +- src/d/actor/d_a_e_rd.cpp | 4 +- src/d/actor/d_a_e_rdb.cpp | 4 +- src/d/actor/d_a_e_rdy.cpp | 4 +- src/d/actor/d_a_e_s1.cpp | 2 +- src/d/actor/d_a_e_sb.cpp | 4 +- src/d/actor/d_a_e_sf.cpp | 4 +- src/d/actor/d_a_e_sg.cpp | 4 +- src/d/actor/d_a_e_sh.cpp | 4 +- src/d/actor/d_a_e_sm.cpp | 4 +- src/d/actor/d_a_e_sm2.cpp | 4 +- src/d/actor/d_a_e_st.cpp | 4 +- src/d/actor/d_a_e_st_line.cpp | 4 +- src/d/actor/d_a_e_sw.cpp | 4 +- src/d/actor/d_a_e_th.cpp | 4 +- src/d/actor/d_a_e_th_ball.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_e_vt.cpp | 2 +- src/d/actor/d_a_e_warpappear.cpp | 4 +- src/d/actor/d_a_e_wb.cpp | 4 +- src/d/actor/d_a_e_ws.cpp | 4 +- src/d/actor/d_a_e_ww.cpp | 4 +- src/d/actor/d_a_e_yc.cpp | 4 +- src/d/actor/d_a_e_yd.cpp | 4 +- src/d/actor/d_a_e_yd_leaf.cpp | 4 +- src/d/actor/d_a_e_yg.cpp | 4 +- src/d/actor/d_a_e_yh.cpp | 4 +- src/d/actor/d_a_e_yk.cpp | 2 +- src/d/actor/d_a_e_ym.cpp | 4 +- src/d/actor/d_a_e_ym_tag.cpp | 4 +- src/d/actor/d_a_e_ymb.cpp | 4 +- src/d/actor/d_a_e_yr.cpp | 4 +- src/d/actor/d_a_e_zh.cpp | 4 +- src/d/actor/d_a_e_zm.cpp | 4 +- src/d/actor/d_a_e_zs.cpp | 4 +- src/d/actor/d_a_econt.cpp | 4 +- src/d/actor/d_a_formation_mng.cpp | 4 +- src/d/actor/d_a_fr.cpp | 4 +- src/d/actor/d_a_grass.cpp | 2 +- src/d/actor/d_a_guard_mng.cpp | 4 +- src/d/actor/d_a_hitobj.cpp | 4 +- src/d/actor/d_a_horse.cpp | 2 +- src/d/actor/d_a_izumi_gate.cpp | 4 +- src/d/actor/d_a_kago.cpp | 4 +- src/d/actor/d_a_kytag00.cpp | 8 +- src/d/actor/d_a_kytag01.cpp | 18 +- src/d/actor/d_a_kytag02.cpp | 4 +- src/d/actor/d_a_kytag03.cpp | 10 +- src/d/actor/d_a_kytag04.cpp | 4 +- src/d/actor/d_a_kytag05.cpp | 4 +- src/d/actor/d_a_kytag06.cpp | 10 +- src/d/actor/d_a_kytag07.cpp | 4 +- src/d/actor/d_a_kytag08.cpp | 4 +- src/d/actor/d_a_kytag09.cpp | 4 +- src/d/actor/d_a_kytag10.cpp | 8 +- src/d/actor/d_a_kytag11.cpp | 4 +- src/d/actor/d_a_kytag12.cpp | 2 +- src/d/actor/d_a_kytag13.cpp | 14 +- src/d/actor/d_a_kytag14.cpp | 4 +- src/d/actor/d_a_kytag15.cpp | 4 +- src/d/actor/d_a_kytag16.cpp | 4 +- src/d/actor/d_a_kytag17.cpp | 4 +- src/d/actor/d_a_mant.cpp | 2 +- src/d/actor/d_a_mg_fish.cpp | 4 +- src/d/actor/d_a_mg_fshop.cpp | 8 +- src/d/actor/d_a_mg_rod.cpp | 4 +- src/d/actor/d_a_midna.cpp | 2 +- src/d/actor/d_a_mirror.cpp | 50 +- src/d/actor/d_a_movie_player.cpp | 2 +- src/d/actor/d_a_myna.cpp | 10 +- src/d/actor/d_a_nbomb.cpp | 4 +- src/d/actor/d_a_ni.cpp | 10 +- src/d/actor/d_a_no_chg_room.cpp | 6 +- src/d/actor/d_a_npc.cpp | 18 +- src/d/actor/d_a_npc_aru.cpp | 2 +- src/d/actor/d_a_npc_ash.cpp | 2 +- src/d/actor/d_a_npc_ashB.cpp | 2 +- src/d/actor/d_a_npc_bans.cpp | 4 +- src/d/actor/d_a_npc_besu.cpp | 4 +- src/d/actor/d_a_npc_blue_ns.cpp | 2 +- src/d/actor/d_a_npc_bou.cpp | 2 +- src/d/actor/d_a_npc_bouS.cpp | 2 +- src/d/actor/d_a_npc_cdn3.cpp | 4 +- src/d/actor/d_a_npc_chat.cpp | 2 +- src/d/actor/d_a_npc_chin.cpp | 2 +- src/d/actor/d_a_npc_clerka.cpp | 4 +- src/d/actor/d_a_npc_clerkb.cpp | 4 +- src/d/actor/d_a_npc_clerkt.cpp | 4 +- src/d/actor/d_a_npc_coach.cpp | 4 +- src/d/actor/d_a_npc_df.cpp | 4 +- src/d/actor/d_a_npc_doc.cpp | 4 +- src/d/actor/d_a_npc_doorboy.cpp | 2 +- src/d/actor/d_a_npc_drainSol.cpp | 2 +- src/d/actor/d_a_npc_du.cpp | 4 +- src/d/actor/d_a_npc_fairy.cpp | 2 +- src/d/actor/d_a_npc_fairy_seirei.cpp | 2 +- src/d/actor/d_a_npc_fish.cpp | 4 +- src/d/actor/d_a_npc_gnd.cpp | 2 +- src/d/actor/d_a_npc_gra.cpp | 2 +- src/d/actor/d_a_npc_grc.cpp | 2 +- src/d/actor/d_a_npc_grd.cpp | 2 +- src/d/actor/d_a_npc_grm.cpp | 2 +- src/d/actor/d_a_npc_grmc.cpp | 2 +- src/d/actor/d_a_npc_gro.cpp | 2 +- src/d/actor/d_a_npc_grr.cpp | 2 +- src/d/actor/d_a_npc_grs.cpp | 2 +- src/d/actor/d_a_npc_grz.cpp | 2 +- src/d/actor/d_a_npc_guard.cpp | 4 +- src/d/actor/d_a_npc_gwolf.cpp | 2 +- src/d/actor/d_a_npc_hanjo.cpp | 2 +- src/d/actor/d_a_npc_henna.cpp | 4 +- src/d/actor/d_a_npc_henna0.cpp | 4 +- src/d/actor/d_a_npc_hoz.cpp | 2 +- src/d/actor/d_a_npc_impal.cpp | 2 +- src/d/actor/d_a_npc_inko.cpp | 4 +- src/d/actor/d_a_npc_ins.cpp | 2 +- src/d/actor/d_a_npc_jagar.cpp | 2 +- src/d/actor/d_a_npc_kakashi.cpp | 2 +- src/d/actor/d_a_npc_kasi_hana.cpp | 2 +- src/d/actor/d_a_npc_kasi_kyu.cpp | 2 +- src/d/actor/d_a_npc_kasi_mich.cpp | 2 +- src/d/actor/d_a_npc_kdk.cpp | 4 +- src/d/actor/d_a_npc_kkri.cpp | 4 +- src/d/actor/d_a_npc_kn.cpp | 2 +- src/d/actor/d_a_npc_knj.cpp | 2 +- src/d/actor/d_a_npc_kolin.cpp | 2 +- src/d/actor/d_a_npc_kolinb.cpp | 2 +- src/d/actor/d_a_npc_ks.cpp | 4 +- src/d/actor/d_a_npc_kyury.cpp | 4 +- src/d/actor/d_a_npc_len.cpp | 2 +- src/d/actor/d_a_npc_lf.cpp | 6 +- src/d/actor/d_a_npc_lud.cpp | 2 +- src/d/actor/d_a_npc_maro.cpp | 2 +- src/d/actor/d_a_npc_midp.cpp | 2 +- src/d/actor/d_a_npc_mk.cpp | 4 +- src/d/actor/d_a_npc_moi.cpp | 4 +- src/d/actor/d_a_npc_moir.cpp | 2 +- src/d/actor/d_a_npc_myna2.cpp | 2 +- src/d/actor/d_a_npc_ne.cpp | 8 +- src/d/actor/d_a_npc_p2.cpp | 4 +- src/d/actor/d_a_npc_pachi_besu.cpp | 4 +- src/d/actor/d_a_npc_pachi_maro.cpp | 2 +- src/d/actor/d_a_npc_pachi_taro.cpp | 4 +- src/d/actor/d_a_npc_passer.cpp | 4 +- src/d/actor/d_a_npc_passer2.cpp | 4 +- src/d/actor/d_a_npc_post.cpp | 2 +- src/d/actor/d_a_npc_pouya.cpp | 2 +- src/d/actor/d_a_npc_prayer.cpp | 2 +- src/d/actor/d_a_npc_raca.cpp | 4 +- src/d/actor/d_a_npc_rafrel.cpp | 2 +- src/d/actor/d_a_npc_saru.cpp | 2 +- src/d/actor/d_a_npc_seib.cpp | 2 +- src/d/actor/d_a_npc_seic.cpp | 2 +- src/d/actor/d_a_npc_seid.cpp | 2 +- src/d/actor/d_a_npc_seira.cpp | 4 +- src/d/actor/d_a_npc_seira2.cpp | 4 +- src/d/actor/d_a_npc_seirei.cpp | 2 +- src/d/actor/d_a_npc_shad.cpp | 2 +- src/d/actor/d_a_npc_shaman.cpp | 2 +- src/d/actor/d_a_npc_shoe.cpp | 2 +- src/d/actor/d_a_npc_shop0.cpp | 4 +- src/d/actor/d_a_npc_shop_maro.cpp | 2 +- src/d/actor/d_a_npc_sola.cpp | 2 +- src/d/actor/d_a_npc_soldierA.cpp | 2 +- src/d/actor/d_a_npc_soldierB.cpp | 2 +- src/d/actor/d_a_npc_sq.cpp | 8 +- src/d/actor/d_a_npc_taro.cpp | 4 +- src/d/actor/d_a_npc_the.cpp | 2 +- src/d/actor/d_a_npc_theB.cpp | 2 +- src/d/actor/d_a_npc_tk.cpp | 4 +- src/d/actor/d_a_npc_tkc.cpp | 2 +- src/d/actor/d_a_npc_tkj.cpp | 4 +- src/d/actor/d_a_npc_tkj2.cpp | 4 +- src/d/actor/d_a_npc_tks.cpp | 2 +- src/d/actor/d_a_npc_toby.cpp | 4 +- src/d/actor/d_a_npc_tr.cpp | 4 +- src/d/actor/d_a_npc_uri.cpp | 4 +- src/d/actor/d_a_npc_worm.cpp | 4 +- src/d/actor/d_a_npc_wrestler.cpp | 2 +- src/d/actor/d_a_npc_yamid.cpp | 2 +- src/d/actor/d_a_npc_yamis.cpp | 2 +- src/d/actor/d_a_npc_yamit.cpp | 2 +- src/d/actor/d_a_npc_yelia.cpp | 2 +- src/d/actor/d_a_npc_ykm.cpp | 4 +- src/d/actor/d_a_npc_ykw.cpp | 4 +- src/d/actor/d_a_npc_zanb.cpp | 4 +- src/d/actor/d_a_npc_zant.cpp | 2 +- src/d/actor/d_a_npc_zelR.cpp | 2 +- src/d/actor/d_a_npc_zelRo.cpp | 2 +- src/d/actor/d_a_npc_zelda.cpp | 2 +- src/d/actor/d_a_npc_zra.cpp | 2 +- src/d/actor/d_a_npc_zrc.cpp | 2 +- src/d/actor/d_a_npc_zrz.cpp | 2 +- src/d/actor/d_a_obj_Lv5Key.cpp | 4 +- src/d/actor/d_a_obj_Turara.cpp | 4 +- src/d/actor/d_a_obj_TvCdlst.cpp | 4 +- src/d/actor/d_a_obj_Y_taihou.cpp | 4 +- src/d/actor/d_a_obj_amiShutter.cpp | 4 +- src/d/actor/d_a_obj_ari.cpp | 8 +- src/d/actor/d_a_obj_automata.cpp | 4 +- src/d/actor/d_a_obj_avalanche.cpp | 4 +- src/d/actor/d_a_obj_balloon.cpp | 4 +- src/d/actor/d_a_obj_barDesk.cpp | 4 +- src/d/actor/d_a_obj_batta.cpp | 4 +- src/d/actor/d_a_obj_bbox.cpp | 4 +- src/d/actor/d_a_obj_bed.cpp | 4 +- src/d/actor/d_a_obj_bemos.cpp | 4 +- src/d/actor/d_a_obj_bhashi.cpp | 4 +- src/d/actor/d_a_obj_bhbridge.cpp | 4 +- src/d/actor/d_a_obj_bk_leaf.cpp | 4 +- src/d/actor/d_a_obj_bkdoor.cpp | 4 +- src/d/actor/d_a_obj_bky_rock.cpp | 4 +- src/d/actor/d_a_obj_bmWindow.cpp | 4 +- src/d/actor/d_a_obj_bmshutter.cpp | 4 +- src/d/actor/d_a_obj_bombf.cpp | 4 +- src/d/actor/d_a_obj_bosswarp.cpp | 4 +- src/d/actor/d_a_obj_boumato.cpp | 4 +- src/d/actor/d_a_obj_brakeeff.cpp | 4 +- src/d/actor/d_a_obj_brg.cpp | 8 +- src/d/actor/d_a_obj_bsGate.cpp | 4 +- src/d/actor/d_a_obj_bubblePilar.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_cb.cpp | 4 +- src/d/actor/d_a_obj_cblock.cpp | 4 +- src/d/actor/d_a_obj_cboard.cpp | 4 +- src/d/actor/d_a_obj_cdoor.cpp | 4 +- src/d/actor/d_a_obj_chandelier.cpp | 4 +- src/d/actor/d_a_obj_chest.cpp | 4 +- src/d/actor/d_a_obj_cho.cpp | 8 +- src/d/actor/d_a_obj_cowdoor.cpp | 4 +- src/d/actor/d_a_obj_crope.cpp | 4 +- src/d/actor/d_a_obj_crvfence.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_crvlh_up.cpp | 4 +- src/d/actor/d_a_obj_crvsteel.cpp | 4 +- src/d/actor/d_a_obj_crystal.cpp | 4 +- src/d/actor/d_a_obj_cwall.cpp | 4 +- src/d/actor/d_a_obj_damCps.cpp | 4 +- src/d/actor/d_a_obj_dan.cpp | 8 +- src/d/actor/d_a_obj_digholl.cpp | 4 +- src/d/actor/d_a_obj_digplace.cpp | 4 +- src/d/actor/d_a_obj_digsnow.cpp | 4 +- src/d/actor/d_a_obj_dmelevator.cpp | 4 +- src/d/actor/d_a_obj_drop.cpp | 4 +- src/d/actor/d_a_obj_dust.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_fan.cpp | 4 +- src/d/actor/d_a_obj_fchain.cpp | 4 +- src/d/actor/d_a_obj_fireWood.cpp | 4 +- src/d/actor/d_a_obj_fireWood2.cpp | 4 +- src/d/actor/d_a_obj_firepillar.cpp | 2 +- src/d/actor/d_a_obj_firepillar2.cpp | 2 +- src/d/actor/d_a_obj_flag.cpp | 4 +- src/d/actor/d_a_obj_flag2.cpp | 4 +- src/d/actor/d_a_obj_flag3.cpp | 4 +- src/d/actor/d_a_obj_fmobj.cpp | 4 +- src/d/actor/d_a_obj_food.cpp | 4 +- src/d/actor/d_a_obj_fw.cpp | 4 +- src/d/actor/d_a_obj_gadget.cpp | 4 +- src/d/actor/d_a_obj_ganonwall.cpp | 4 +- src/d/actor/d_a_obj_ganonwall2.cpp | 4 +- src/d/actor/d_a_obj_gb.cpp | 4 +- src/d/actor/d_a_obj_geyser.cpp | 4 +- src/d/actor/d_a_obj_glowSphere.cpp | 4 +- src/d/actor/d_a_obj_gm.cpp | 4 +- src/d/actor/d_a_obj_goGate.cpp | 4 +- src/d/actor/d_a_obj_gomikabe.cpp | 4 +- src/d/actor/d_a_obj_gpTaru.cpp | 4 +- src/d/actor/d_a_obj_gra2.cpp | 4 +- src/d/actor/d_a_obj_graWall.cpp | 2 +- src/d/actor/d_a_obj_gra_rock.cpp | 4 +- src/d/actor/d_a_obj_grave_stone.cpp | 4 +- src/d/actor/d_a_obj_groundwater.cpp | 4 +- src/d/actor/d_a_obj_grz_rock.cpp | 4 +- src/d/actor/d_a_obj_h_saku.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_hb.cpp | 4 +- src/d/actor/d_a_obj_hbombkoya.cpp | 4 +- src/d/actor/d_a_obj_heavySw.cpp | 4 +- src/d/actor/d_a_obj_hfuta.cpp | 4 +- src/d/actor/d_a_obj_hhashi.cpp | 6 +- src/d/actor/d_a_obj_hsTarget.cpp | 4 +- src/d/actor/d_a_obj_ice_l.cpp | 4 +- src/d/actor/d_a_obj_ice_s.cpp | 2 +- src/d/actor/d_a_obj_iceblock.cpp | 10 +- src/d/actor/d_a_obj_iceleaf.cpp | 2 +- src/d/actor/d_a_obj_ihasi.cpp | 4 +- src/d/actor/d_a_obj_ikada.cpp | 4 +- src/d/actor/d_a_obj_inobone.cpp | 4 +- src/d/actor/d_a_obj_ita.cpp | 4 +- src/d/actor/d_a_obj_itamato.cpp | 4 +- src/d/actor/d_a_obj_item.cpp | 4 +- src/d/actor/d_a_obj_ito.cpp | 4 +- src/d/actor/d_a_obj_kabuto.cpp | 8 +- src/d/actor/d_a_obj_kag.cpp | 4 +- src/d/actor/d_a_obj_kage.cpp | 4 +- src/d/actor/d_a_obj_kago.cpp | 4 +- src/d/actor/d_a_obj_kaisou.cpp | 4 +- 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 | 2 +- src/d/actor/d_a_obj_katatsumuri.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_key.cpp | 4 +- src/d/actor/d_a_obj_keyhole.cpp | 4 +- src/d/actor/d_a_obj_kgate.cpp | 4 +- src/d/actor/d_a_obj_ki.cpp | 4 +- src/d/actor/d_a_obj_kiPot.cpp | 4 +- src/d/actor/d_a_obj_kita.cpp | 4 +- src/d/actor/d_a_obj_kjgjs.cpp | 4 +- src/d/actor/d_a_obj_kkanban.cpp | 4 +- src/d/actor/d_a_obj_klift00.cpp | 4 +- src/d/actor/d_a_obj_knBullet.cpp | 4 +- src/d/actor/d_a_obj_kshutter.cpp | 4 +- src/d/actor/d_a_obj_ktOnFire.cpp | 4 +- src/d/actor/d_a_obj_kuwagata.cpp | 4 +- src/d/actor/d_a_obj_kwheel00.cpp | 4 +- src/d/actor/d_a_obj_kwheel01.cpp | 4 +- src/d/actor/d_a_obj_kznkarm.cpp | 4 +- src/d/actor/d_a_obj_ladder.cpp | 4 +- src/d/actor/d_a_obj_laundry.cpp | 4 +- src/d/actor/d_a_obj_laundry_rope.cpp | 4 +- src/d/actor/d_a_obj_lbox.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_lv1Candle01.cpp | 4 +- src/d/actor/d_a_obj_lv2Candle.cpp | 4 +- src/d/actor/d_a_obj_lv3Candle.cpp | 4 +- src/d/actor/d_a_obj_lv3Water.cpp | 4 +- src/d/actor/d_a_obj_lv3Water2.cpp | 4 +- src/d/actor/d_a_obj_lv3WaterB.cpp | 6 +- src/d/actor/d_a_obj_lv3saka00.cpp | 4 +- src/d/actor/d_a_obj_lv3waterEff.cpp | 4 +- src/d/actor/d_a_obj_lv4CandleDemoTag.cpp | 4 +- src/d/actor/d_a_obj_lv4EdShutter.cpp | 4 +- src/d/actor/d_a_obj_lv4Gate.cpp | 4 +- src/d/actor/d_a_obj_lv4HsTarget.cpp | 4 +- src/d/actor/d_a_obj_lv4PoGate.cpp | 4 +- src/d/actor/d_a_obj_lv4RailWall.cpp | 4 +- src/d/actor/d_a_obj_lv4SlideWall.cpp | 4 +- src/d/actor/d_a_obj_lv4bridge.cpp | 4 +- src/d/actor/d_a_obj_lv4chandelier.cpp | 4 +- src/d/actor/d_a_obj_lv4digsand.cpp | 4 +- src/d/actor/d_a_obj_lv4floor.cpp | 4 +- src/d/actor/d_a_obj_lv4gear.cpp | 4 +- src/d/actor/d_a_obj_lv4prelvtr.cpp | 4 +- src/d/actor/d_a_obj_lv4prwall.cpp | 4 +- src/d/actor/d_a_obj_lv4sand.cpp | 4 +- src/d/actor/d_a_obj_lv5FloorBoard.cpp | 4 +- src/d/actor/d_a_obj_lv5IceWall.cpp | 4 +- src/d/actor/d_a_obj_lv5SwIce.cpp | 4 +- src/d/actor/d_a_obj_lv5ychndlr.cpp | 4 +- src/d/actor/d_a_obj_lv5yiblltray.cpp | 4 +- src/d/actor/d_a_obj_lv6ChangeGate.cpp | 4 +- src/d/actor/d_a_obj_lv6FurikoTrap.cpp | 4 +- src/d/actor/d_a_obj_lv6Lblock.cpp | 4 +- src/d/actor/d_a_obj_lv6SwGate.cpp | 4 +- src/d/actor/d_a_obj_lv6SzGate.cpp | 4 +- src/d/actor/d_a_obj_lv6Tenbin.cpp | 4 +- src/d/actor/d_a_obj_lv6TogeRoll.cpp | 4 +- src/d/actor/d_a_obj_lv6TogeTrap.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_lv6elevta.cpp | 4 +- src/d/actor/d_a_obj_lv6swturn.cpp | 4 +- src/d/actor/d_a_obj_lv7BsGate.cpp | 4 +- src/d/actor/d_a_obj_lv7PropellerY.cpp | 4 +- src/d/actor/d_a_obj_lv7bridge.cpp | 4 +- src/d/actor/d_a_obj_lv8KekkaiTrap.cpp | 4 +- src/d/actor/d_a_obj_lv8Lift.cpp | 4 +- src/d/actor/d_a_obj_lv8OptiLift.cpp | 4 +- src/d/actor/d_a_obj_lv8UdFloor.cpp | 4 +- src/d/actor/d_a_obj_lv9SwShutter.cpp | 4 +- src/d/actor/d_a_obj_magLift.cpp | 4 +- src/d/actor/d_a_obj_magLiftRot.cpp | 4 +- src/d/actor/d_a_obj_magne_arm.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_metalbox.cpp | 4 +- src/d/actor/d_a_obj_mgate.cpp | 4 +- src/d/actor/d_a_obj_mhole.cpp | 4 +- src/d/actor/d_a_obj_mie.cpp | 4 +- src/d/actor/d_a_obj_mirror_6pole.cpp | 4 +- src/d/actor/d_a_obj_mirror_chain.cpp | 4 +- src/d/actor/d_a_obj_mirror_sand.cpp | 4 +- src/d/actor/d_a_obj_mirror_screw.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_nagaisu.cpp | 4 +- src/d/actor/d_a_obj_nameplate.cpp | 4 +- src/d/actor/d_a_obj_nan.cpp | 4 +- src/d/actor/d_a_obj_ndoor.cpp | 4 +- src/d/actor/d_a_obj_nougu.cpp | 4 +- src/d/actor/d_a_obj_octhashi.cpp | 4 +- src/d/actor/d_a_obj_oiltubo.cpp | 4 +- src/d/actor/d_a_obj_onsen.cpp | 4 +- src/d/actor/d_a_obj_onsenFire.cpp | 4 +- src/d/actor/d_a_obj_onsenTaru.cpp | 2 +- src/d/actor/d_a_obj_ornament_cloth.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_picture.cpp | 4 +- src/d/actor/d_a_obj_pillar.cpp | 4 +- src/d/actor/d_a_obj_pleaf.cpp | 4 +- src/d/actor/d_a_obj_poCandle.cpp | 4 +- src/d/actor/d_a_obj_poFire.cpp | 4 +- src/d/actor/d_a_obj_poTbox.cpp | 4 +- src/d/actor/d_a_obj_prop.cpp | 4 +- src/d/actor/d_a_obj_pumpkin.cpp | 4 +- src/d/actor/d_a_obj_rcircle.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_rock.cpp | 4 +- src/d/actor/d_a_obj_rope_bridge.cpp | 4 +- src/d/actor/d_a_obj_rotBridge.cpp | 4 +- src/d/actor/d_a_obj_rotTrap.cpp | 4 +- src/d/actor/d_a_obj_roten.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_saidan.cpp | 4 +- src/d/actor/d_a_obj_sakuita.cpp | 4 +- src/d/actor/d_a_obj_sakuita_rope.cpp | 4 +- src/d/actor/d_a_obj_scannon.cpp | 4 +- src/d/actor/d_a_obj_scannon_crs.cpp | 4 +- src/d/actor/d_a_obj_scannon_ten.cpp | 4 +- src/d/actor/d_a_obj_sekidoor.cpp | 4 +- src/d/actor/d_a_obj_sekizo.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_smoke.cpp | 4 +- src/d/actor/d_a_obj_smtile.cpp | 4 +- src/d/actor/d_a_obj_smw_stone.cpp | 2 +- src/d/actor/d_a_obj_snowEffTag.cpp | 4 +- src/d/actor/d_a_obj_snow_soup.cpp | 4 +- src/d/actor/d_a_obj_so.cpp | 4 +- src/d/actor/d_a_obj_spinLift.cpp | 4 +- src/d/actor/d_a_obj_ss_drink.cpp | 4 +- src/d/actor/d_a_obj_ss_item.cpp | 4 +- src/d/actor/d_a_obj_stairBlock.cpp | 4 +- src/d/actor/d_a_obj_stick.cpp | 4 +- src/d/actor/d_a_obj_stone.cpp | 4 +- src/d/actor/d_a_obj_stoneMark.cpp | 4 +- src/d/actor/d_a_obj_stopper.cpp | 4 +- src/d/actor/d_a_obj_stopper2.cpp | 4 +- src/d/actor/d_a_obj_suisya.cpp | 4 +- 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 | 12 +- src/d/actor/d_a_obj_swLight.cpp | 4 +- src/d/actor/d_a_obj_swchain.cpp | 4 +- src/d/actor/d_a_obj_swhang.cpp | 4 +- src/d/actor/d_a_obj_sword.cpp | 4 +- src/d/actor/d_a_obj_swpropeller.cpp | 4 +- src/d/actor/d_a_obj_swpush.cpp | 4 +- src/d/actor/d_a_obj_swpush2.cpp | 4 +- src/d/actor/d_a_obj_swpush5.cpp | 4 +- src/d/actor/d_a_obj_swspinner.cpp | 4 +- src/d/actor/d_a_obj_swturn.cpp | 4 +- src/d/actor/d_a_obj_syRock.cpp | 4 +- src/d/actor/d_a_obj_szbridge.cpp | 4 +- src/d/actor/d_a_obj_taFence.cpp | 4 +- src/d/actor/d_a_obj_table.cpp | 4 +- src/d/actor/d_a_obj_takaraDai.cpp | 4 +- src/d/actor/d_a_obj_tatigi.cpp | 4 +- src/d/actor/d_a_obj_ten.cpp | 4 +- src/d/actor/d_a_obj_testcube.cpp | 4 +- src/d/actor/d_a_obj_tgake.cpp | 4 +- src/d/actor/d_a_obj_thashi.cpp | 4 +- src/d/actor/d_a_obj_thdoor.cpp | 4 +- src/d/actor/d_a_obj_timeFire.cpp | 4 +- src/d/actor/d_a_obj_timer.cpp | 4 +- src/d/actor/d_a_obj_tks.cpp | 2 +- src/d/actor/d_a_obj_tmoon.cpp | 4 +- src/d/actor/d_a_obj_toaru_maki.cpp | 4 +- src/d/actor/d_a_obj_toby.cpp | 4 +- src/d/actor/d_a_obj_tobyhouse.cpp | 4 +- src/d/actor/d_a_obj_togeTrap.cpp | 4 +- src/d/actor/d_a_obj_tombo.cpp | 4 +- src/d/actor/d_a_obj_tornado.cpp | 4 +- src/d/actor/d_a_obj_tornado2.cpp | 4 +- src/d/actor/d_a_obj_tp.cpp | 6 +- src/d/actor/d_a_obj_treesh.cpp | 4 +- src/d/actor/d_a_obj_twGate.cpp | 2 +- src/d/actor/d_a_obj_udoor.cpp | 4 +- src/d/actor/d_a_obj_usaku.cpp | 4 +- src/d/actor/d_a_obj_vground.cpp | 4 +- src/d/actor/d_a_obj_volcball.cpp | 2 +- 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 | 4 +- src/d/actor/d_a_obj_waterPillar.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_web1.cpp | 2 +- src/d/actor/d_a_obj_well_cover.cpp | 4 +- src/d/actor/d_a_obj_wflag.cpp | 4 +- src/d/actor/d_a_obj_wind_stone.cpp | 4 +- src/d/actor/d_a_obj_window.cpp | 4 +- src/d/actor/d_a_obj_wood_pendulum.cpp | 4 +- src/d/actor/d_a_obj_wood_statue.cpp | 4 +- src/d/actor/d_a_obj_wsword.cpp | 4 +- src/d/actor/d_a_obj_yel_bag.cpp | 4 +- src/d/actor/d_a_obj_yobikusa.cpp | 4 +- src/d/actor/d_a_obj_yousei.cpp | 4 +- src/d/actor/d_a_obj_ystone.cpp | 4 +- src/d/actor/d_a_obj_zcloth.cpp | 4 +- src/d/actor/d_a_obj_zdoor.cpp | 4 +- src/d/actor/d_a_obj_zrTurara.cpp | 4 +- src/d/actor/d_a_obj_zrTuraraRock.cpp | 4 +- src/d/actor/d_a_obj_zraMark.cpp | 2 +- src/d/actor/d_a_obj_zra_freeze.cpp | 2 +- src/d/actor/d_a_obj_zra_rock.cpp | 4 +- src/d/actor/d_a_passer_mng.cpp | 4 +- src/d/actor/d_a_path_line.cpp | 4 +- src/d/actor/d_a_peru.cpp | 2 +- src/d/actor/d_a_ppolamp.cpp | 4 +- src/d/actor/d_a_scene_exit.cpp | 4 +- src/d/actor/d_a_scene_exit2.cpp | 4 +- src/d/actor/d_a_set_bgobj.cpp | 4 +- src/d/actor/d_a_shop_item.cpp | 4 +- src/d/actor/d_a_skip_2D.cpp | 4 +- src/d/actor/d_a_spinner.cpp | 4 +- src/d/actor/d_a_sq.cpp | 4 +- src/d/actor/d_a_startAndGoal.cpp | 4 +- src/d/actor/d_a_suspend.cpp | 4 +- src/d/actor/d_a_swBall.cpp | 4 +- src/d/actor/d_a_swLBall.cpp | 2 +- src/d/actor/d_a_swTime.cpp | 4 +- src/d/actor/d_a_swc00.cpp | 4 +- src/d/actor/d_a_swhit0.cpp | 4 +- src/d/actor/d_a_tag_CstaSw.cpp | 4 +- src/d/actor/d_a_tag_Lv6Gate.cpp | 4 +- src/d/actor/d_a_tag_Lv7Gate.cpp | 4 +- src/d/actor/d_a_tag_Lv8Gate.cpp | 4 +- src/d/actor/d_a_tag_TWgate.cpp | 4 +- src/d/actor/d_a_tag_ajnot.cpp | 4 +- src/d/actor/d_a_tag_arena.cpp | 4 +- src/d/actor/d_a_tag_assistance.cpp | 4 +- src/d/actor/d_a_tag_attention.cpp | 4 +- src/d/actor/d_a_tag_bottle_item.cpp | 4 +- src/d/actor/d_a_tag_camera.cpp | 4 +- src/d/actor/d_a_tag_chgrestart.cpp | 2 +- src/d/actor/d_a_tag_chkpoint.cpp | 4 +- src/d/actor/d_a_tag_csw.cpp | 4 +- src/d/actor/d_a_tag_escape.cpp | 4 +- src/d/actor/d_a_tag_event.cpp | 4 +- src/d/actor/d_a_tag_evt.cpp | 4 +- src/d/actor/d_a_tag_evtarea.cpp | 4 +- src/d/actor/d_a_tag_evtmsg.cpp | 4 +- src/d/actor/d_a_tag_firewall.cpp | 4 +- src/d/actor/d_a_tag_gra.cpp | 4 +- src/d/actor/d_a_tag_gstart.cpp | 4 +- src/d/actor/d_a_tag_guard.cpp | 4 +- src/d/actor/d_a_tag_hinit.cpp | 4 +- src/d/actor/d_a_tag_hjump.cpp | 4 +- src/d/actor/d_a_tag_howl.cpp | 4 +- src/d/actor/d_a_tag_hstop.cpp | 4 +- src/d/actor/d_a_tag_instruction.cpp | 4 +- src/d/actor/d_a_tag_kago_fall.cpp | 4 +- src/d/actor/d_a_tag_lantern.cpp | 4 +- src/d/actor/d_a_tag_lightball.cpp | 4 +- src/d/actor/d_a_tag_lv2prchk.cpp | 4 +- src/d/actor/d_a_tag_lv5soup.cpp | 4 +- src/d/actor/d_a_tag_lv6CstaSw.cpp | 4 +- src/d/actor/d_a_tag_magne.cpp | 4 +- src/d/actor/d_a_tag_mhint.cpp | 4 +- src/d/actor/d_a_tag_mist.cpp | 4 +- src/d/actor/d_a_tag_mmsg.cpp | 4 +- src/d/actor/d_a_tag_msg.cpp | 4 +- src/d/actor/d_a_tag_mstop.cpp | 4 +- src/d/actor/d_a_tag_mwait.cpp | 4 +- src/d/actor/d_a_tag_myna2.cpp | 4 +- src/d/actor/d_a_tag_myna_light.cpp | 4 +- src/d/actor/d_a_tag_pachi.cpp | 4 +- src/d/actor/d_a_tag_poFire.cpp | 4 +- src/d/actor/d_a_tag_push.cpp | 20 +- src/d/actor/d_a_tag_qs.cpp | 2 +- src/d/actor/d_a_tag_ret_room.cpp | 4 +- src/d/actor/d_a_tag_river_back.cpp | 4 +- src/d/actor/d_a_tag_rmbit_sw.cpp | 4 +- src/d/actor/d_a_tag_schedule.cpp | 4 +- src/d/actor/d_a_tag_setBall.cpp | 4 +- src/d/actor/d_a_tag_setrestart.cpp | 2 +- src/d/actor/d_a_tag_shop_item.cpp | 4 +- src/d/actor/d_a_tag_smk_emt.cpp | 4 +- src/d/actor/d_a_tag_spinner.cpp | 4 +- src/d/actor/d_a_tag_sppath.cpp | 4 +- src/d/actor/d_a_tag_spring.cpp | 4 +- src/d/actor/d_a_tag_ss_drink.cpp | 4 +- src/d/actor/d_a_tag_statue_evt.cpp | 4 +- src/d/actor/d_a_tag_stream.cpp | 4 +- src/d/actor/d_a_tag_telop.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_tag_wljump.cpp | 4 +- src/d/actor/d_a_tag_yami.cpp | 2 +- src/d/actor/d_a_talk.cpp | 4 +- src/d/actor/d_a_tbox.cpp | 4 +- src/d/actor/d_a_tbox2.cpp | 4 +- src/d/actor/d_a_tboxSw.cpp | 4 +- src/d/actor/d_a_title.cpp | 2 +- src/d/actor/d_a_vrbox.cpp | 4 +- src/d/actor/d_a_vrbox2.cpp | 24 +- src/d/actor/d_a_warp_bug.cpp | 4 +- src/d/actor/d_a_ykgr.cpp | 2 +- src/d/d_attention.cpp | 2 +- src/d/d_camera.cpp | 42 +- src/d/d_demo.cpp | 16 +- src/d/d_drawlist.cpp | 20 +- src/d/d_envse.cpp | 24 +- src/d/d_event_data.cpp | 18 +- src/d/d_event_manager.cpp | 8 +- src/d/d_eye_hl.cpp | 2 +- src/d/d_insect.cpp | 6 +- src/d/d_k_wmark.cpp | 29 +- src/d/d_k_wpillar.cpp | 30 +- src/d/d_kankyo.cpp | 62 +- src/d/d_kankyo_rain.cpp | 136 +- src/d/d_kankyo_wether.cpp | 4 +- src/d/d_ky_thunder.cpp | 16 +- src/d/d_kyeff.cpp | 4 +- src/d/d_kyeff2.cpp | 4 +- src/d/d_msg_flow.cpp | 24 +- src/d/d_msg_object.cpp | 16 +- src/d/d_msg_scrn_item.cpp | 4 +- src/d/d_msg_scrn_talk.cpp | 6 +- src/d/d_ovlp_fade.cpp | 18 +- src/d/d_ovlp_fade2.cpp | 4 +- src/d/d_ovlp_fade3.cpp | 4 +- src/d/d_s_logo.cpp | 6 +- src/d/d_s_menu.cpp | 6 +- src/d/d_s_name.cpp | 46 +- src/d/d_s_play.cpp | 8 +- src/d/d_s_room.cpp | 15 +- src/d/d_s_title.cpp | 10 +- src/d/d_stage.cpp | 116 +- src/f_op/f_op_actor.cpp | 52 +- src/f_op/f_op_actor_mng.cpp | 764 +++--- src/f_op/f_op_actor_tag.cpp | 9 +- src/f_op/f_op_camera.cpp | 90 +- src/f_op/f_op_camera_mng.cpp | 11 +- src/f_op/f_op_draw_iter.cpp | 27 +- src/f_op/f_op_draw_tag.cpp | 9 +- src/f_op/f_op_kankyo.cpp | 49 +- src/f_op/f_op_kankyo_mng.cpp | 78 +- src/f_op/f_op_msg.cpp | 73 +- src/f_op/f_op_msg_mng.cpp | 331 ++- src/f_op/f_op_overlap.cpp | 34 +- src/f_op/f_op_overlap_mng.cpp | 71 +- src/f_op/f_op_overlap_req.cpp | 109 +- src/f_op/f_op_scene.cpp | 41 +- src/f_op/f_op_scene_iter.cpp | 16 +- src/f_op/f_op_scene_mng.cpp | 28 +- src/f_op/f_op_scene_pause.cpp | 16 +- src/f_op/f_op_scene_req.cpp | 86 +- src/f_op/f_op_scene_tag.cpp | 11 +- src/f_op/f_op_view.cpp | 22 +- src/f_pc/f_pc_base.cpp | 139 +- src/f_pc/f_pc_create_iter.cpp | 27 +- src/f_pc/f_pc_create_req.cpp | 94 +- src/f_pc/f_pc_create_tag.cpp | 10 +- src/f_pc/f_pc_creator.cpp | 10 +- src/f_pc/f_pc_delete_tag.cpp | 21 +- src/f_pc/f_pc_deletor.cpp | 115 +- src/f_pc/f_pc_draw.cpp | 26 +- src/f_pc/f_pc_draw_priority.cpp | 14 +- src/f_pc/f_pc_executor.cpp | 37 +- src/f_pc/f_pc_fstcreate_req.cpp | 60 +- src/f_pc/f_pc_layer.cpp | 72 +- src/f_pc/f_pc_layer_iter.cpp | 34 +- src/f_pc/f_pc_layer_tag.cpp | 76 +- src/f_pc/f_pc_leaf.cpp | 39 +- src/f_pc/f_pc_line.cpp | 8 +- src/f_pc/f_pc_line_iter.cpp | 10 +- src/f_pc/f_pc_line_tag.cpp | 16 +- src/f_pc/f_pc_load.cpp | 19 +- src/f_pc/f_pc_manager.cpp | 22 +- src/f_pc/f_pc_method.cpp | 24 +- src/f_pc/f_pc_method_iter.cpp | 6 +- src/f_pc/f_pc_method_tag.cpp | 18 +- src/f_pc/f_pc_node.cpp | 93 +- src/f_pc/f_pc_node_req.cpp | 257 +- src/f_pc/f_pc_pause.cpp | 18 +- src/f_pc/f_pc_priority.cpp | 124 +- src/f_pc/f_pc_profile.cpp | 7 +- src/f_pc/f_pc_profile_lst.cpp | 2390 ++++++----------- src/f_pc/f_pc_searcher.cpp | 14 +- src/f_pc/f_pc_stdcreate_req.cpp | 101 +- src/m_Do/m_Do_graphic.cpp | 90 +- src/m_Do/m_Do_lib.cpp | 20 +- 903 files changed, 6835 insertions(+), 6587 deletions(-) create mode 100644 include/JSystem/JGadget/std-memory.h create mode 100644 include/f_pc/f_pc_profile_lst.h diff --git a/configure.py b/configure.py index 3cfa7faecf..5df3bbb9f0 100644 --- a/configure.py +++ b/configure.py @@ -397,7 +397,7 @@ config.libs = [ Object(Matching, "f_op/f_op_kankyo.cpp"), Object(Matching, "f_op/f_op_msg.cpp"), Object(Matching, "f_op/f_op_kankyo_mng.cpp"), - Object(NonMatching, "f_op/f_op_msg_mng.cpp"), + Object(Matching, "f_op/f_op_msg_mng.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(Matching, "f_op/f_op_draw_iter.cpp"), Object(Matching, "f_op/f_op_draw_tag.cpp"), Object(Matching, "f_op/f_op_scene_pause.cpp"), @@ -927,7 +927,7 @@ config.libs = [ [ Object(NonMatching, "JSystem/JGadget/binary.cpp"), Object(NonMatching, "JSystem/JGadget/linklist.cpp"), - Object(NonMatching, "JSystem/JGadget/std-vector.cpp"), + Object(Equivalent, "JSystem/JGadget/std-vector.cpp"), # just weak order ], ), JSystemLib( @@ -984,7 +984,7 @@ config.libs = [ Object(Matching, "JSystem/J3DGraphBase/J3DGD.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DSys.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DVertex.cpp"), - Object(NonMatching, "JSystem/J3DGraphBase/J3DTransform.cpp"), + Object(Matching, "JSystem/J3DGraphBase/J3DTransform.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DTexture.cpp"), Object(Matching, "JSystem/J3DGraphBase/J3DPacket.cpp"), Object(NonMatching, "JSystem/J3DGraphBase/J3DShapeMtx.cpp"), diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h index 51a48234ee..9225c44605 100644 --- a/include/JSystem/J3DGraphBase/J3DTransform.h +++ b/include/JSystem/J3DGraphBase/J3DTransform.h @@ -53,7 +53,7 @@ struct J3DTransformInfo { extern J3DTransformInfo const j3dDefaultTransformInfo; extern Vec const j3dDefaultScale; extern Mtx const j3dDefaultMtx; -extern f32 PSMulUnit01[2]; +extern f32 PSMulUnit01[]; void J3DGQRSetup7(u32 param_0, u32 param_1, u32 param_2, u32 param_3); void J3DCalcBBoardMtx(f32 (*)[4]); diff --git a/include/JSystem/JGadget/std-memory.h b/include/JSystem/JGadget/std-memory.h new file mode 100644 index 0000000000..e80124dbdc --- /dev/null +++ b/include/JSystem/JGadget/std-memory.h @@ -0,0 +1,33 @@ +#ifndef STD_MEMORY_H +#define STD_MEMORY_H + +#include "JSystem/JUtility/JUTAssert.h" + +namespace JGadget { +template +struct TAllocator { + T* allocate(u32 count, void *param_2) { + return AllocateRaw(count * sizeof(T)); + } + + T* AllocateRaw(u32 size) { + return (T*)operator new(size); + } + + void deallocate(T* mem, u32 size) { + DeallocateRaw(mem); + } + + void DeallocateRaw(T* mem) { + delete mem; + } + + void destroy(T* p) { + JUT_ASSERT(68, p!=0); + } + + /* 0x0 */ u8 mAllocator; +}; +} + +#endif /* STD_MEMORY_H */ diff --git a/include/JSystem/JGadget/std-vector.h b/include/JSystem/JGadget/std-vector.h index cb966d8cfa..d8c765f941 100644 --- a/include/JSystem/JGadget/std-vector.h +++ b/include/JSystem/JGadget/std-vector.h @@ -1,4 +1,176 @@ #ifndef STD_VECTOR_H #define STD_VECTOR_H +#include "JSystem/JGadget/std-memory.h" +#include "algorithm.h" +#include "msl_memory.h" + +namespace JGadget { +namespace vector { +/* 802DCCC8 */ u32 extend_default(u32, u32, u32); +}; + +typedef u32 (*extendFunc)(u32, u32, u32); + +template > +struct TVector { + struct TDestructed_deallocate_ { + TDestructed_deallocate_(JGadget::TAllocator& allocator, T* ptr) { + mAllocator = &allocator; + mPtr = ptr; + } + + ~TDestructed_deallocate_() { mAllocator->deallocate(mPtr, 0); } + + void set(T* ptr) { mPtr = ptr; } + + Allocator* mAllocator; + T* mPtr; + }; + + TVector(Allocator const& allocator) { + mAllocator = allocator; + pBegin_ = NULL; + pEnd_ = pBegin_; + mCapacity = 0; + pfnExtend_ = JGadget::vector::extend_default; + } + + ~TVector() { + clear(); + mAllocator.deallocate(pBegin_, 0); + } + + T* insert(T* pos, const T& val) { + u32 diff = (int)((u32)pos - (u32)begin()) / 4; + insert(pos, 1, val); + return pBegin_ + diff; + } + + void insert(T* pos, u32 count, const T& val) { + if (count != 0) { + T* ptr = Insert_raw(pos, count); + if (ptr == end()) { + /* JGadget_outMessage sp120(JGadget_outMessage::warning, __FILE__, 0x141); + sp120 << "can't allocate memory"; */ + } else { + std::uninitialized_fill_n(ptr, count, val); + } + } + } + + T* Insert_raw(T* pIt, u32 pCount) { + JUT_ASSERT(446, (pBegin_ <= pIt) && (pIt <= pEnd_)); + + T* const pFirst = pIt; + + if (pCount == 0) { + return pIt; + } + + if (pCount + size() <= mCapacity) { + void** newEnd = pFirst + pCount; + + if (newEnd < pEnd_) { + void** pOverwrittenValues = pEnd_ - pCount; + std::uninitialized_copy(pOverwrittenValues, pEnd_, pEnd_); + std::copy_backward(pFirst, pOverwrittenValues, pEnd_); + DestroyElement_(pFirst, newEnd); + + pEnd_ += pCount; + return pIt; + } else { + std::uninitialized_copy(pFirst, pEnd_, newEnd); + DestroyElement_(pFirst, pEnd_); + + pEnd_ += pCount; + return pIt; + } + } + + u32 newSize = GetSize_extend_(pCount); + + void** newDataPointer = mAllocator.allocate(newSize, 0); + if (!newDataPointer) { + return end(); + } + + TDestructed_deallocate_ destructionDeallocator(mAllocator, newDataPointer); + + void** const endOfCopy = std::uninitialized_copy(pBegin_, pFirst, newDataPointer); + std::uninitialized_copy(pFirst, pEnd_, endOfCopy + pCount); + + DestroyElement_all_(); + destructionDeallocator.set(pBegin_); + + pEnd_ = newDataPointer + (pEnd_ - pBegin_ + pCount); + pBegin_ = newDataPointer; + mCapacity = newSize; + + return endOfCopy; + } + + T* begin() { return pBegin_; } + + T* end() { return pEnd_; } + + u32 size() { + if (pBegin_ == 0) { + return 0; + } + return (int)((u32)pEnd_ - (u32)pBegin_) / 4; + } + + u32 capacity() { return mCapacity; } + + u32 GetSize_extend_(u32 count) { + JUT_ASSERT(0x22B, pfnExtend_!=0); + + u32 oldSize = size(); + u32 neededNewSpace = oldSize + count; + u32 extendedSize = pfnExtend_(capacity(), oldSize, count); + + return neededNewSpace > extendedSize ? neededNewSpace : extendedSize; + } + + void DestroyElement_(T* start, T* end) { + for (; start != end; start++) { + mAllocator.destroy(start); + } + } + + void DestroyElement_all_() { DestroyElement_(pBegin_, pEnd_); } + + T* erase(T* start, T* end) { + T* vectorEnd = pEnd_; + T* ppvVar3 = std::copy(end, vectorEnd, start); + DestroyElement_(ppvVar3, pEnd_); + pEnd_ = ppvVar3; + return start; + } + + void clear() { erase(begin(), end()); } + + /* 0x00 */ Allocator mAllocator; + /* 0x04 */ T* pBegin_; + /* 0x08 */ T* pEnd_; + /* 0x0C */ u32 mCapacity; + /* 0x10 */ extendFunc pfnExtend_; +}; + +struct TVector_pointer_void : public TVector > { + TVector_pointer_void(const JGadget::TAllocator& allocator); + TVector_pointer_void(u32, void* const&, + const JGadget::TAllocator& allocator); + + ~TVector_pointer_void(); + + void insert(void**, void* const&); + void** erase(void**, void**); + + void clear() { erase(begin(), end()); } + void push_back(const void*& value) { insert(end(), (void* const&)value); } +}; +} // namespace JGadget + #endif /* STD_VECTOR_H */ diff --git a/include/JSystem/JMessage/data.h b/include/JSystem/JMessage/data.h index f14489c98e..a89f6e1d70 100644 --- a/include/JSystem/JMessage/data.h +++ b/include/JSystem/JMessage/data.h @@ -42,6 +42,13 @@ struct data { struct TParse_TBlock_messageID : public TParse_TBlock { TParse_TBlock_messageID(const void* data) : TParse_TBlock(data) {} + + char* get() const { return (char*)getRaw(); } + u8 get_formSupplement() const { return *(u8*)(get() + 0xB); } + u16 get_number() const { return *(u16*)(get() + 0x8); } + char* getContent() const { return (char*)get() + 0x10; } + u8 get_form() const { return *(u8*)(get() + 0xA) & 0xF; } + bool get_isOrdered() const { return *(u8*)(get() + 0xA) & 0xF0; } }; struct TParse_TBlock_color : public TParse_TBlock { diff --git a/include/JSystem/JMessage/resource.h b/include/JSystem/JMessage/resource.h index 8ccf715e61..a322c5b952 100644 --- a/include/JSystem/JMessage/resource.h +++ b/include/JSystem/JMessage/resource.h @@ -14,7 +14,7 @@ namespace JMessage { */ struct TResource { TResource() - : field_0x8(NULL), field_0xc(NULL), field_0x10(NULL), field_0x14(0), field_0x18(NULL) {} + : field_0x8(NULL), field_0xc(NULL), field_0x10(NULL), field_0x14(0), mMessageID(NULL) {} /* 802A8CDC */ u16 toMessageIndex_messageID(u32, u32, bool*) const; @@ -56,7 +56,7 @@ struct TResource { /* 0x0C */ data::TParse_TBlock_info field_0xc; /* 0x10 */ char* field_0x10; /* 0x14 */ int field_0x14; - /* 0x18 */ data::TParse_TBlock_messageID field_0x18; + /* 0x18 */ data::TParse_TBlock_messageID mMessageID; }; /** diff --git a/include/SSystem/SComponent/c_request.h b/include/SSystem/SComponent/c_request.h index 3133a50210..8b1b377303 100644 --- a/include/SSystem/SComponent/c_request.h +++ b/include/SSystem/SComponent/c_request.h @@ -4,204 +4,9 @@ #include "dolphin/types.h" struct request_base_class { - struct { - u8 flag0 : 1; - u8 flag1 : 1; - u8 flag2 : 6; - } field_0x0; - u8 field_0x1; - u8 field_0x2; - u8 field_0x3; - u16 field_0x4; - u8 field_0x6; - u8 field_0x7; - u32 field_0x8; - s8 field_0xc; - u8 field_0xd; - u8 field_0xe; - u8 field_0xf; - int* field_0x10; - // u8 field_0x11; - // u8 field_0x12; - // u8 field_0x13; - u8 field_0x14; - u8 field_0x15; - u8 field_0x16; - u8 field_0x17; - u8 field_0x18; - u8 field_0x19; - u8 field_0x1a; - u8 field_0x1b; - u8 field_0x1c; - u8 field_0x1d; - u8 field_0x1e; - u8 field_0x1f; - u32* field_0x20; - u8 field_0x24; - u8 field_0x25; - u8 field_0x26; - u8 field_0x27; - u8 field_0x28; - u8 field_0x29; - u8 field_0x2a; - u8 field_0x2b; - u8 field_0x2c; - u8 field_0x2d; - u8 field_0x2e; - u8 field_0x2f; - u8 field_0x30; - u8 field_0x31; - u8 field_0x32; - u8 field_0x33; - u8 field_0x34; - u8 field_0x35; - u8 field_0x36; - u8 field_0x37; - u8 field_0x38; - u8 field_0x39; - u8 field_0x3a; - u8 field_0x3b; - u8 field_0x3c; - u8 field_0x3d; - u8 field_0x3e; - u8 field_0x3f; - u8 field_0x40; - u8 field_0x41; - u8 field_0x42; - u8 field_0x43; - u8 field_0x44; - u8 field_0x45; - u8 field_0x46; - u8 field_0x47; - u8 field_0x48; - u8 field_0x49; - u8 field_0x4a; - u8 field_0x4b; - u8 field_0x4c; - u8 field_0x4d; - u8 field_0x4e; - u8 field_0x4f; - u8 field_0x50; - u8 field_0x51; - u8 field_0x52; - u8 field_0x53; - u8 field_0x54; - u8 field_0x55; - u8 field_0x56; - u8 field_0x57; - u8 field_0x58; - u8 field_0x59; - u8 field_0x5a; - u8 field_0x5b; - u8 field_0x5c; - u8 field_0x5d; - u8 field_0x5e; - u8 field_0x5f; - u8 field_0x60; - u8 field_0x61; - u8 field_0x62; - u8 field_0x63; - u8 field_0x64; - u8 field_0x65; - u8 field_0x66; - u8 field_0x67; - u8 field_0x68; - u8 field_0x69; - u8 field_0x6a; - u8 field_0x6b; - u8 field_0x6c; - u8 field_0x6d; - u8 field_0x6e; - u8 field_0x6f; - u8 field_0x70; - u8 field_0x71; - u8 field_0x72; - u8 field_0x73; - u8 field_0x74; - u8 field_0x75; - u8 field_0x76; - u8 field_0x77; - u8 field_0x78; - u8 field_0x79; - u8 field_0x7a; - u8 field_0x7b; - u8 field_0x7c; - u8 field_0x7d; - u8 field_0x7e; - u8 field_0x7f; - u8 field_0x80; - u8 field_0x81; - u8 field_0x82; - u8 field_0x83; - u8 field_0x84; - u8 field_0x85; - u8 field_0x86; - u8 field_0x87; - u8 field_0x88; - u8 field_0x89; - u8 field_0x8a; - u8 field_0x8b; - u8 field_0x8c; - u8 field_0x8d; - u8 field_0x8e; - u8 field_0x8f; - u8 field_0x90; - u8 field_0x91; - u8 field_0x92; - u8 field_0x93; - u8 field_0x94; - u8 field_0x95; - u8 field_0x96; - u8 field_0x97; - u8 field_0x98; - u8 field_0x99; - u8 field_0x9a; - u8 field_0x9b; - u8 field_0x9c; - u8 field_0x9d; - u8 field_0x9e; - u8 field_0x9f; - u8 field_0xa0; - u8 field_0xa1; - u8 field_0xa2; - u8 field_0xa3; - u8 field_0xa4; - u8 field_0xa5; - u8 field_0xa6; - u8 field_0xa7; - u8 field_0xa8; - u8 field_0xa9; - u8 field_0xaa; - u8 field_0xab; - u8 field_0xac; - u8 field_0xad; - u8 field_0xae; - u8 field_0xaf; - u8 field_0xb0; - u8 field_0xb1; - u8 field_0xb2; - u8 field_0xb3; - u8 field_0xb4; - u8 field_0xb5; - u8 field_0xb6; - u8 field_0xb7; - u8 field_0xb8; - u8 field_0xb9; - u8 field_0xba; - u8 field_0xbb; - u8 field_0xbc; - u8 field_0xbd; - u8 field_0xbe; - u8 field_0xbf; - u32 field_0xc0; - // u8 field_0xc1; - // u8 field_0xc2; - // u8 field_0xc3; - request_base_class* field_0xc4; - // u8 field_0xc5; - // u8 field_0xc6; - // u8 field_0xc7; - u32* field_0xc8; + u8 flag0 : 1; + u8 flag1 : 1; + u8 flag2 : 6; }; int cReq_Is_Done(request_base_class*); diff --git a/include/c/c_dylink.h b/include/c/c_dylink.h index 37cd12555a..e77ca3c2e1 100644 --- a/include/c/c_dylink.h +++ b/include/c/c_dylink.h @@ -19,4 +19,8 @@ struct DynamicNameTableEntry { int cDyl_InitAsyncIsDone(); void cDyl_InitAsync(); +BOOL cDyl_IsLinked(s16 i_ProfName); +BOOL cDyl_Unlink(s16 i_ProfName); +int cDyl_LinkASync(s16 i_ProfName); + #endif /* C_C_DYLINK_H */ diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h index 2f164c5bb9..62f2abc9c1 100644 --- a/include/d/actor/d_a_ykgr.h +++ b/include/d/actor/d_a_ykgr.h @@ -74,7 +74,7 @@ public: camera_class* iVar1 = dComIfGp_getCamera(0); cXyz local_28; current.pos = *fopCamM_GetEye_p(iVar1); - dKyr_get_vectle_calc(&iVar1->mLookat.mEye, &iVar1->mLookat.mCenter, &local_28); + dKyr_get_vectle_calc(&iVar1->lookat.eye, &iVar1->lookat.center, &local_28); current.angle.y = cM_atan2s(local_28.x, local_28.z); current.angle.x = -cM_atan2s( local_28.y, JMAFastSqrt((local_28.x * local_28.x + local_28.z * local_28.z))); diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 80cf91f6d6..6397000621 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -3393,19 +3393,19 @@ inline void dComIfGp_event_setTalkPartner(fopAc_ac_c* i_actor) { } inline fopAc_ac_c* dComIfGp_event_getTalkPartner() { - return g_dComIfG_gameInfo.play.getEvent().getPtT(); + return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtT(); } inline fopAc_ac_c* dComIfGp_event_getItemPartner() { - return g_dComIfG_gameInfo.play.getEvent().getPtI(); + return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPtI(); } inline fopAc_ac_c* dComIfGp_event_getPt1() { - return g_dComIfG_gameInfo.play.getEvent().getPt1(); + return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt1(); } inline fopAc_ac_c* dComIfGp_event_getPt2() { - return g_dComIfG_gameInfo.play.getEvent().getPt2(); + return (fopAc_ac_c*)g_dComIfG_gameInfo.play.getEvent().getPt2(); } inline BOOL dComIfGp_event_runCheck() { @@ -3897,11 +3897,11 @@ inline view_class* dComIfGd_getView() { } inline Mtx44* dComIfGd_getProjViewMtx() { - return &(g_dComIfG_gameInfo.drawlist.getView()->mProjViewMtx); + return &(g_dComIfG_gameInfo.drawlist.getView()->projViewMtx); } inline MtxP dComIfGd_getInvViewMtx() { - return g_dComIfG_gameInfo.drawlist.getView()->mInvViewMtx; + return g_dComIfG_gameInfo.drawlist.getView()->invViewMtx; } inline view_port_class* dComIfGd_getViewport() { @@ -3909,10 +3909,10 @@ inline view_port_class* dComIfGd_getViewport() { } inline MtxP dComIfGd_getViewRotMtx() { - return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->mViewMtxNoTrans; + return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->viewMtxNoTrans; } inline MtxP dComIfGd_getViewMtx() { - return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->mViewMtx; + return ((camera_process_class*)g_dComIfG_gameInfo.drawlist.getView())->viewMtx; } inline J3DDrawBuffer* dComIfGd_getListFilter() { diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 7310b55380..3ef7369e60 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -249,7 +249,7 @@ public: s8 getCameraID() { return mCameraID; } void setMode(int mode) { mMode = mode; } view_port_class* getViewPort() { return &mViewport; } - scissor_class* getScissor() { return &mViewport.mScissor; } + scissor_class* getScissor() { return &mViewport.scissor; } private: /* 0x00 */ view_port_class mViewport; diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index eff858ece6..9c5fecefad 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -11,16 +11,16 @@ struct actor_method_class { }; struct actor_process_profile_definition { - /* 0x00 */ leaf_process_profile_definition mBase; + /* 0x00 */ leaf_process_profile_definition base; /* 0x24 */ actor_method_class* sub_method; /* 0x28 */ u32 status; - /* 0x2C */ u8 mActorType; + /* 0x2C */ u8 group; /* 0x2D */ u8 cullType; }; // Unclear what this is. Only appears in 4 profiles (BG,DSHUTTER,PATH,SCENE_EXIT) struct actor_process_profile_definition2 { - /* 0x00 */ actor_process_profile_definition def; + /* 0x00 */ actor_process_profile_definition base; /* 0x30 */ u32 field_0x30; }; @@ -304,7 +304,7 @@ public: /* 0x5A8 */ u8 mMidnaBindMode; }; // Size: 0x5AC -s32 fopAc_IsActor(void* actor); +BOOL fopAc_IsActor(void* i_actor); extern actor_method_class g_fopAc_Method; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 562b97f663..041458e78d 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -1,27 +1,27 @@ #ifndef F_OP_ACTOR_MNG_H_ #define F_OP_ACTOR_MNG_H_ -#include "f_op/f_op_actor.h" -#include "f_op/f_op_actor_iter.h" -#include "f_pc/f_pc_manager.h" -#include "f_op/f_op_draw_tag.h" #include "d/d_bg_s.h" #include "d/d_bg_s_gnd_chk.h" #include "d/d_bg_s_lin_chk.h" -#include "d/d_bg_s_wtr_chk.h" #include "d/d_bg_s_roof_chk.h" +#include "d/d_bg_s_wtr_chk.h" +#include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_iter.h" +#include "f_op/f_op_draw_tag.h" +#include "f_pc/f_pc_manager.h" #include "m_Do/m_Do_hostIO.h" -#define fopAcM_SetupActor(ptr,ClassName) \ - if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \ - new (ptr) ClassName(); \ - fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \ +#define fopAcM_SetupActor(ptr, ClassName) \ + if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \ + new (ptr) ClassName(); \ + fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \ } -#define fopAcM_SetupActor2(ptr,ClassName, ...) \ - if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \ - new (ptr) ClassName(__VA_ARGS__); \ - fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \ +#define fopAcM_SetupActor2(ptr, ClassName, ...) \ + if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \ + new (ptr) ClassName(__VA_ARGS__); \ + fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \ } class J3DModelData; // placeholder @@ -36,47 +36,46 @@ struct fopAcM_prmBase_class { }; // Size = 0x18 struct fopAcM_prm_class { - /* 0x00 */ u32 mParameter; // single U32 Parameter - /* 0x04 */ cXyz mPos; - /* 0x10 */ csXyz mAngle; // rotation - /* 0x16 */ u16 mEnemyNo; - /* 0x18 */ u8 mScale[3]; - /* 0x1B */ u8 mGbaName; // from WW, maybe a different parameter here - /* 0x1C */ fpc_ProcID mParentPId; // parent process ID - /* 0x20 */ s8 mSubtype; - /* 0x21 */ s8 mRoomNo; + /* 0x00 */ u32 parameters; + /* 0x04 */ cXyz position; + /* 0x10 */ csXyz angle; + /* 0x16 */ u16 setId; + /* 0x18 */ u8 scale[3]; + /* 0x1C */ fpc_ProcID parent_id; + /* 0x20 */ s8 subtype; + /* 0x21 */ s8 room_no; }; struct fopAcM_search4ev_prm { fopAcM_search4ev_prm() { clear(); } void clear() { - mName[0] = 0; - mEventID = -1; - mProcName = 11; - mSubType = 0; + name[0] = 0; + event_id = -1; + procname = PROC_PLAY_SCENE; + subtype = 0; } - /* 0x00 */ char mName[30]; - /* 0x1E */ s16 mEventID; - /* 0x20 */ s16 mProcName; - /* 0x22 */ s8 mSubType; + /* 0x00 */ char name[30]; + /* 0x1E */ s16 event_id; + /* 0x20 */ s16 procname; + /* 0x22 */ s8 subtype; }; struct fopAcM_search_prm { - /* 0x00 */ u32 mParam0; - /* 0x04 */ u32 mParam1; - /* 0x08 */ s16 mProcName; - /* 0x0A */ s8 mSubType; + /* 0x00 */ u32 prm0; + /* 0x04 */ u32 prm1; + /* 0x08 */ s16 procname; + /* 0x0A */ s8 subtype; }; // define to avoid vtable mess in WIP TUs #ifndef HIO_entry_c_NO_VIRTUAL struct fOpAcm_HIO_entry_c : public mDoHIO_entry_c { - virtual ~fOpAcm_HIO_entry_c() {} + virtual ~fOpAcm_HIO_entry_c() {} }; #else struct fOpAcm_HIO_entry_c { - ~fOpAcm_HIO_entry_c(); + ~fOpAcm_HIO_entry_c(); }; #endif @@ -89,9 +88,7 @@ dBgS& dComIfG_Bgsp(); class fopAcM_lc_c { public: - fopAcM_lc_c() { - mLineCheck.ClrSttsRoofOff(); - } + fopAcM_lc_c() { mLineCheck.ClrSttsRoofOff(); } static dBgS_ObjLinChk* getLineCheck() { return &mLineCheck; } static bool checkMoveBG() { return dComIfG_Bgsp().ChkMoveBG(mLineCheck); } @@ -125,7 +122,9 @@ public: static dBgS_ObjGndChk mGndCheck; static f32 mGroundY; - static bool getTriPla(cM3dGPla* i_plane) { return dComIfG_Bgsp().GetTriPla(mGndCheck, i_plane); } + static bool getTriPla(cM3dGPla* i_plane) { + return dComIfG_Bgsp().GetTriPla(mGndCheck, i_plane); + } static int getRoomId() { return dComIfG_Bgsp().GetRoomId(mGndCheck); } static int getPolyColor() { return dComIfG_Bgsp().GetPolyColor(mGndCheck); } static int getPolyAtt0() { return dComIfG_Bgsp().GetPolyAtt0(mGndCheck); } @@ -168,37 +167,37 @@ enum fopAcM_STATUS { /* 0x000800 */ fopAcM_STATUS_UNK_000800 = 1 << 11, /* 0x001000 */ fopAcM_STATUS_UNK_001000 = 1 << 12, /* 0x002000 */ fopAcM_STATUS_CARRY_NOW = 1 << 13, - /* 0x004000 */ fopAcM_STATUS_UNK_004000 = 1 << 14, - /* 0x008000 */ fopAcM_STATUS_UNK_008000 = 1 << 15, - /* 0x010000 */ fopAcM_STATUS_UNK_010000 = 1 << 16, - /* 0x020000 */ fopAcM_STATUS_UNK_200000 = 1 << 17, - /* 0x040000 */ fopAcM_STATUS_UNK_400000 = 1 << 18, - /* 0x080000 */ fopAcM_STATUS_UNK_800000 = 1 << 19, + /* 0x004000 */ fopAcM_STATUS_UNK_004000 = 1 << 14, + /* 0x008000 */ fopAcM_STATUS_UNK_008000 = 1 << 15, + /* 0x010000 */ fopAcM_STATUS_UNK_010000 = 1 << 16, + /* 0x020000 */ fopAcM_STATUS_UNK_200000 = 1 << 17, + /* 0x040000 */ fopAcM_STATUS_UNK_400000 = 1 << 18, + /* 0x080000 */ fopAcM_STATUS_UNK_800000 = 1 << 19, /* 0x100000 */ fopAcM_STATUS_HOOK_CARRY_NOW = 1 << 20, }; -inline s8 fopAcM_GetRoomNo(const fopAc_ac_c* pActor) { - return pActor->current.roomNo; +inline s8 fopAcM_GetRoomNo(const fopAc_ac_c* i_actor) { + return i_actor->current.roomNo; } -inline fpc_ProcID fopAcM_GetID(const void* pActor) { - return fpcM_GetID(pActor); +inline fpc_ProcID fopAcM_GetID(const void* i_actor) { + return fpcM_GetID(i_actor); } -inline s16 fopAcM_GetName(void* pActor) { - return fpcM_GetName(pActor); +inline s16 fopAcM_GetName(void* i_actor) { + return fpcM_GetName(i_actor); } -inline MtxP fopAcM_GetMtx(const fopAc_ac_c* pActor) { - return pActor->cullMtx; +inline MtxP fopAcM_GetMtx(const fopAc_ac_c* i_actor) { + return i_actor->cullMtx; } -inline u32 fopAcM_checkStatus(fopAc_ac_c* pActor, u32 actor_status) { - return pActor->actor_status & actor_status; +inline u32 fopAcM_checkStatus(fopAc_ac_c* i_actor, u32 actor_status) { + return i_actor->actor_status & actor_status; } -inline u32 fopAcM_checkCarryNow(fopAc_ac_c* pActor) { - return pActor->actor_status & fopAcM_STATUS_CARRY_NOW; +inline u32 fopAcM_checkCarryNow(fopAc_ac_c* i_actor) { + return i_actor->actor_status & fopAcM_STATUS_CARRY_NOW; } enum fopAcM_CARRY { @@ -206,7 +205,7 @@ enum fopAcM_CARRY { /* 0x02 */ fopAcM_CARRY_HEAVY = 2, /* 0x04 */ fopAcM_CARRY_SIDE = 4, /* 0x08 */ fopAcM_CARRY_TYPE_8 = 8, - /* 0x10 */ fopAcM_CARRY_LIGHT = 16, // guess based on context + /* 0x10 */ fopAcM_CARRY_LIGHT = 16, // guess based on context /* 0x20 */ fopAcM_CARRY_ITEM = 32, /* 0x30 */ fopAcM_CARRY_UNK_30 = 0x30, /* 0x40 */ fopAcM_CARRY_UNK_40 = 0x40, @@ -217,88 +216,88 @@ inline u32 fopAcM_CheckCarryType(fopAc_ac_c* actor, fopAcM_CARRY type) { return actor->carryType & type; } -inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) { - return fopAcM_checkStatus(pActor, fopAcM_STATUS_HOOK_CARRY_NOW); +inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* i_actor) { + return fopAcM_checkStatus(i_actor, fopAcM_STATUS_HOOK_CARRY_NOW); } -inline u32 fopAcM_GetParam(const void* pActor) { - return fpcM_GetParam(pActor); +inline u32 fopAcM_GetParam(const void* i_actor) { + return fpcM_GetParam(i_actor); } inline u32 fopAcM_GetParamBit(void* ac, u8 shift, u8 bit) { return (fopAcM_GetParam(ac) >> shift) & ((1 << bit) - 1); } -inline void fopAcM_SetParam(void* p_actor, u32 param) { - fpcM_SetParam(p_actor, param); +inline void fopAcM_SetParam(void* i_actor, u32 param) { + fpcM_SetParam(i_actor, param); } inline void fopAcM_SetJntCol(fopAc_ac_c* i_actorP, dJntCol_c* i_jntColP) { i_actorP->jntCol = i_jntColP; } -inline s16 fopAcM_GetProfName(const void* pActor) { - return fpcM_GetProfName(pActor); +inline s16 fopAcM_GetProfName(const void* i_actor) { + return fpcM_GetProfName(i_actor); } -inline u8 fopAcM_GetGroup(const fopAc_ac_c* p_actor) { - return p_actor->group; +inline u8 fopAcM_GetGroup(const fopAc_ac_c* i_actor) { + return i_actor->group; } -inline void fopAcM_OnStatus(fopAc_ac_c* pActor, u32 flag) { - pActor->actor_status |= flag; +inline void fopAcM_OnStatus(fopAc_ac_c* i_actor, u32 flag) { + i_actor->actor_status |= flag; } -inline void fopAcM_OffStatus(fopAc_ac_c* pActor, u32 flag) { - pActor->actor_status &= ~flag; +inline void fopAcM_OffStatus(fopAc_ac_c* i_actor, u32 flag) { + i_actor->actor_status &= ~flag; } -inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc func, void* param) { - return (fopAc_ac_c*)fopAcIt_Judge(func, param); +inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc i_judgeFunc, void* i_process) { + return (fopAc_ac_c*)fopAcIt_Judge(i_judgeFunc, i_process); } inline fopAc_ac_c* fopAcM_SearchByID(fpc_ProcID id) { return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id); } -inline fpc_ProcID fopAcM_GetLinkId(const fopAc_ac_c* pActor) { - return pActor->parentActorID; +inline fpc_ProcID fopAcM_GetLinkId(const fopAc_ac_c* i_actor) { + return i_actor->parentActorID; } -inline cXyz* fopAcM_GetPosition_p(fopAc_ac_c* pActor) { - return &pActor->current.pos; +inline cXyz* fopAcM_GetPosition_p(fopAc_ac_c* i_actor) { + return &i_actor->current.pos; } -inline cXyz& fopAcM_GetPosition(fopAc_ac_c* pActor) { - return pActor->current.pos; +inline cXyz& fopAcM_GetPosition(fopAc_ac_c* i_actor) { + return i_actor->current.pos; } -inline cXyz* fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) { - return &pActor->old.pos; +inline cXyz* fopAcM_GetOldPosition_p(fopAc_ac_c* i_actor) { + return &i_actor->old.pos; } -inline cXyz* fopAcM_GetSpeed_p(fopAc_ac_c* pActor) { - return &pActor->speed; +inline cXyz* fopAcM_GetSpeed_p(fopAc_ac_c* i_actor) { + return &i_actor->speed; } -inline csXyz* fopAcM_GetAngle_p(fopAc_ac_c* pActor) { - return &pActor->current.angle; +inline csXyz* fopAcM_GetAngle_p(fopAc_ac_c* i_actor) { + return &i_actor->current.angle; } -inline csXyz* fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) { - return &pActor->shape_angle; +inline csXyz* fopAcM_GetShapeAngle_p(fopAc_ac_c* i_actor) { + return &i_actor->shape_angle; } -inline u32 fopAcM_CheckCondition(fopAc_ac_c* p_actor, u32 flag) { - return p_actor->actor_condition & flag; +inline u32 fopAcM_CheckCondition(fopAc_ac_c* i_actor, u32 flag) { + return i_actor->actor_condition & flag; } -inline void fopAcM_OnCondition(fopAc_ac_c* p_actor, u32 flag) { - p_actor->actor_condition |= flag; +inline void fopAcM_OnCondition(fopAc_ac_c* i_actor, u32 flag) { + i_actor->actor_condition |= flag; } -inline void fopAcM_OffCondition(fopAc_ac_c* p_actor, u32 flag) { - p_actor->actor_condition &= ~flag; +inline void fopAcM_OffCondition(fopAc_ac_c* i_actor, u32 flag) { + i_actor->actor_condition &= ~flag; } inline BOOL fopAcM_IsActor(void* actor) { @@ -317,8 +316,8 @@ inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) { fopAcM_OffStatus(actor, fopAcM_STATUS_HOOK_CARRY_NOW); } -inline s8 fopAcM_GetHomeRoomNo(const fopAc_ac_c* pActor) { - return pActor->home.roomNo; +inline s8 fopAcM_GetHomeRoomNo(const fopAc_ac_c* i_actor) { + return i_actor->home.roomNo; } inline void fopAcM_SetGravity(fopAc_ac_c* actor, f32 gravity) { @@ -361,28 +360,28 @@ inline BOOL fopAcM_IsExecuting(fpc_ProcID id) { return fpcM_IsExecuting(id); } -inline f32 fopAcM_GetSpeedF(const fopAc_ac_c* p_actor) { - return p_actor->speedF; +inline f32 fopAcM_GetSpeedF(const fopAc_ac_c* i_actor) { + return i_actor->speedF; } -inline f32 fopAcM_GetGravity(const fopAc_ac_c* p_actor) { - return p_actor->gravity; +inline f32 fopAcM_GetGravity(const fopAc_ac_c* i_actor) { + return i_actor->gravity; } -inline f32 fopAcM_GetMaxFallSpeed(const fopAc_ac_c* p_actor) { - return p_actor->maxFallSpeed; +inline f32 fopAcM_GetMaxFallSpeed(const fopAc_ac_c* i_actor) { + return i_actor->maxFallSpeed; } -inline const cXyz* fopAcM_GetSpeed_p(const fopAc_ac_c* p_actor) { - return &p_actor->speed; +inline const cXyz* fopAcM_GetSpeed_p(const fopAc_ac_c* i_actor) { + return &i_actor->speed; } -inline cXyz& fopAcM_GetSpeed(fopAc_ac_c* p_actor) { - return p_actor->speed; +inline cXyz& fopAcM_GetSpeed(fopAc_ac_c* i_actor) { + return i_actor->speed; } -inline const cXyz* fopAcM_GetPosition_p(const fopAc_ac_c* p_actor) { - return &p_actor->current.pos; +inline const cXyz* fopAcM_GetPosition_p(const fopAc_ac_c* i_actor) { + return &i_actor->current.pos; } inline dJntCol_c* fopAcM_GetJntCol(fopAc_ac_c* i_actor) { @@ -422,16 +421,16 @@ inline void dComIfGs_offSwitch(int i_no, int i_roomNo); inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo); inline void dComIfGs_offActor(int i_no, int i_roomNo); -inline void fopAcM_onSwitch(const fopAc_ac_c* pActor, int sw) { - return dComIfGs_onSwitch(sw, fopAcM_GetHomeRoomNo(pActor)); +inline void fopAcM_onSwitch(const fopAc_ac_c* i_actor, int sw) { + return dComIfGs_onSwitch(sw, fopAcM_GetHomeRoomNo(i_actor)); } -inline void fopAcM_offSwitch(const fopAc_ac_c* pActor, int sw) { - return dComIfGs_offSwitch(sw, fopAcM_GetHomeRoomNo(pActor)); +inline void fopAcM_offSwitch(const fopAc_ac_c* i_actor, int sw) { + return dComIfGs_offSwitch(sw, fopAcM_GetHomeRoomNo(i_actor)); } -inline BOOL fopAcM_isSwitch(const fopAc_ac_c* pActor, int sw) { - return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(pActor)); +inline BOOL fopAcM_isSwitch(const fopAc_ac_c* i_actor, int sw) { + return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(i_actor)); } inline fopAc_ac_c* fopAcM_SearchByName(s16 proc_id) { @@ -452,15 +451,15 @@ inline f32 fopAcM_searchActorDistanceY(const fopAc_ac_c* actorA, const fopAc_ac_ return actorB->current.pos.y - actorA->current.pos.y; } -inline u16 fopAcM_GetSetId(const fopAc_ac_c* p_actor) { - return p_actor->setID; +inline u16 fopAcM_GetSetId(const fopAc_ac_c* i_actor) { + return i_actor->setID; } inline void dComIfGs_onActor(int bitNo, int roomNo); -inline void fopAcM_onActor(const fopAc_ac_c* p_actor) { - int setId = fopAcM_GetSetId(p_actor); - dComIfGs_onActor(setId, fopAcM_GetHomeRoomNo(p_actor)); +inline void fopAcM_onActor(const fopAc_ac_c* i_actor) { + int setId = fopAcM_GetSetId(i_actor); + dComIfGs_onActor(setId, fopAcM_GetHomeRoomNo(i_actor)); } inline void fopAcM_onDraw(fopAc_ac_c* i_actor) { @@ -473,204 +472,219 @@ inline void fopAcM_offDraw(fopAc_ac_c* i_actor) { void fopAcM_initManager(); -void* fopAcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData); +fopAc_ac_c* fopAcM_FastCreate(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_createData, + void* i_append); -void fopAcM_setStageLayer(void* p_proc); +void fopAcM_setStageLayer(void* i_proc); -void fopAcM_setRoomLayer(void* p_proc, int roomNo); +void fopAcM_setRoomLayer(void* i_proc, int i_roomNo); -s32 fopAcM_SearchByID(fpc_ProcID id, fopAc_ac_c** p_actor); +s32 fopAcM_SearchByID(fpc_ProcID i_actorID, fopAc_ac_c** i_outActor); -s32 fopAcM_SearchByName(s16 procName, fopAc_ac_c** p_actor); +s32 fopAcM_SearchByName(s16 i_procName, fopAc_ac_c** i_outActor); fopAcM_prm_class* fopAcM_CreateAppend(); -fopAcM_prm_class* createAppend(u16 enemyNo, u32 parameters, const cXyz* p_pos, int roomNo, - const csXyz* p_angle, const cXyz* p_scale, s8 subType, - fpc_ProcID parentPId); +fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + fpc_ProcID i_parentId); -void fopAcM_Log(fopAc_ac_c const* p_actor, char const* str); +void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message); -void fopAcM_delete(fopAc_ac_c* p_actor); +void fopAcM_delete(fopAc_ac_c* i_actor); -s32 fopAcM_delete(fpc_ProcID actorID); +s32 fopAcM_delete(fpc_ProcID i_actorID); -s32 fopAcM_create(s16 procName, u16 enemyNo, u32 parameter, const cXyz* p_pos, int roomNo, - const csXyz* p_angle, const cXyz* p_scale, s8 subType, createFunc p_createFunc); +fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cXyz* i_pos, + int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + createFunc i_createFunc); -s32 fopAcM_create(s16 procName, u32 parameter, const cXyz* p_pos, int roomNo, const csXyz* p_angle, - const cXyz* p_scale, s8 subType); +fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype); -void* fopAcM_fastCreate(s16 procName, u32 parameter, const cXyz* p_pos, int roomNo, - const csXyz* p_angle, const cXyz* p_scale, s8 subType, - createFunc p_createFunc, void* p_createFuncData); +fopAc_ac_c* fopAcM_fastCreate(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + createFunc i_createFunc, void* i_createFuncData); -void* fopAcM_fastCreate(const char* p_actorName, u32 parameter, const cXyz* pActorPos, int roomNo, - const csXyz* p_angle, const cXyz* p_scale, createFunc p_createFunc, - void* p_createFuncData); +fopAc_ac_c* fopAcM_fastCreate(const char* i_actorname, u32 i_parameters, const cXyz* i_pos, + int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, + createFunc i_createFunc, void* i_createFuncData); -s32 fopAcM_createChild(s16 procName, fpc_ProcID parentPId, u32 parameters, const cXyz* p_pos, - int roomNo, const csXyz* p_angle, const cXyz* p_scale, s8 subType, - createFunc p_createFunc); +fpc_ProcID fopAcM_createChild(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters, + const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, + const cXyz* i_scale, s8 i_subtype, createFunc i_createFunc); -s32 fopAcM_createChildFromOffset(s16 procName, fpc_ProcID parentProcID, u32 actorParams, - const cXyz* p_pos, int roomNo, const csXyz* p_angle, - const cXyz* p_scale, s8 subType, createFunc p_createFunc); +fpc_ProcID fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters, + const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, + const cXyz* i_scale, s8 i_subtype, createFunc i_createFunc); -void fopAcM_DeleteHeap(fopAc_ac_c* p_actor); +void fopAcM_DeleteHeap(fopAc_ac_c* i_actor); -s32 fopAcM_callCallback(fopAc_ac_c* p_actor, heapCallbackFunc p_callbackFunc, JKRHeap* p_heap); +s32 fopAcM_callCallback(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, JKRHeap* i_heap); -bool fopAcM_entrySolidHeap_(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback, u32 size); +bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, u32 i_size); -bool fopAcM_entrySolidHeap(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback, u32 size); +bool fopAcM_entrySolidHeap(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, u32 i_size); -void fopAcM_SetMin(fopAc_ac_c* p_actor, f32 minX, f32 minY, f32 minZ); +void fopAcM_SetMin(fopAc_ac_c* i_actor, f32 minX, f32 minY, f32 minZ); -void fopAcM_SetMax(fopAc_ac_c* p_actor, f32 maxX, f32 maxY, f32 maxZ); +void fopAcM_SetMax(fopAc_ac_c* i_actor, f32 maxX, f32 maxY, f32 maxZ); -void fopAcM_setCullSizeBox(fopAc_ac_c* p_actor, f32 minX, f32 minY, f32 minZ, f32 maxX, f32 maxY, +void fopAcM_setCullSizeBox(fopAc_ac_c* i_actor, f32 minX, f32 minY, f32 minZ, f32 maxX, f32 maxY, f32 maxZ); -void fopAcM_setCullSizeSphere(fopAc_ac_c* p_actor, f32 minX, f32 minY, f32 minZ, f32 radius); +void fopAcM_setCullSizeSphere(fopAc_ac_c* i_actor, f32 minX, f32 minY, f32 minZ, f32 radius); -void fopAcM_setCullSizeBox2(fopAc_ac_c* p_actor, J3DModelData* p_modelData); +void fopAcM_setCullSizeBox2(fopAc_ac_c* i_actor, J3DModelData* i_modelData); -bool fopAcM_addAngleY(fopAc_ac_c* p_actor, s16 target, s16 step); +bool fopAcM_addAngleY(fopAc_ac_c* i_actor, s16 i_target, s16 i_step); -void fopAcM_calcSpeed(fopAc_ac_c* p_actor); +void fopAcM_calcSpeed(fopAc_ac_c* i_actor); -void fopAcM_posMove(fopAc_ac_c* p_actor, const cXyz* p_movePos); +void fopAcM_posMove(fopAc_ac_c* i_actor, const cXyz* i_movePos); -void fopAcM_posMoveF(fopAc_ac_c* p_actor, const cXyz* p_movePos); +void fopAcM_posMoveF(fopAc_ac_c* i_actor, const cXyz* i_movePos); -s16 fopAcM_searchActorAngleY(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB); +s16 fopAcM_searchActorAngleY(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB); -s16 fopAcM_searchActorAngleX(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB); +s16 fopAcM_searchActorAngleX(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB); -s32 fopAcM_seenActorAngleY(const fopAc_ac_c*, const fopAc_ac_c*); +s32 fopAcM_seenActorAngleY(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB); -f32 fopAcM_searchActorDistance(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB); +f32 fopAcM_searchActorDistance(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB); -f32 fopAcM_searchActorDistance2(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB); +f32 fopAcM_searchActorDistance2(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB); -f32 fopAcM_searchActorDistanceXZ(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB); +f32 fopAcM_searchActorDistanceXZ(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB); -f32 fopAcM_searchActorDistanceXZ2(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB); +f32 fopAcM_searchActorDistanceXZ2(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB); -s32 fopAcM_rollPlayerCrash(const fopAc_ac_c*, f32, u32, f32, f32, int, f32); +BOOL fopAcM_rollPlayerCrash(fopAc_ac_c const* i_crashActor, f32 i_range, u32 i_flag, f32 i_max_y, + f32 i_min_y, BOOL param_5, f32 param_6); s32 fopAcM_checkCullingBox(f32[3][4], f32, f32, f32, f32, f32, f32); -s32 fopAcM_cullingCheck(const fopAc_ac_c*); -void* event_second_actor(u16); -s32 fopAcM_orderTalkEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16); -s32 fopAcM_orderTalkItemBtnEvent(u16, fopAc_ac_c*, fopAc_ac_c*, u16, u16); +s32 fopAcM_cullingCheck(const fopAc_ac_c* i_actor); +s32 fopAcM_orderTalkEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag); +s32 fopAcM_orderTalkItemBtnEvent(u16 i_eventType, fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, + u16 i_priority, u16 i_flag); s32 fopAcM_orderSpeakEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag); -s32 fopAcM_orderDoorEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16); -s32 fopAcM_orderCatchEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16); -s32 fopAcM_orderOtherEvent(fopAc_ac_c*, const char*, u16, u16, u16); -s32 fopAcM_orderOtherEvent(fopAc_ac_c*, fopAc_ac_c*, const char*, u16, u16, u16); -s32 fopAcM_orderChangeEventId(fopAc_ac_c*, s16, u16, u16); -s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 param_3, - u16 priority, u16 flag); -s32 fopAcM_orderMapToolEvent(fopAc_ac_c*, u8, s16, u16, u16, u16); -s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c*, u8, s16, u16, u16, u16); -s32 fopAcM_orderPotentialEvent(fopAc_ac_c*, u16, u16, u16); -s32 fopAcM_orderItemEvent(fopAc_ac_c*, u16, u16); -s32 fopAcM_orderTreasureEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16); +s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag); +s32 fopAcM_orderCatchEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag); +s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actor, char const* i_eventName, u16 param_2, u16 i_flag, + u16 i_priority); +s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, char const* i_eventName, + u16 param_3, u16 i_flag, u16 i_priority); +s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_actor, s16 i_eventID, u16 i_flag, u16 param_3); +s32 fopAcM_orderOtherEventId(fopAc_ac_c* i_actor, s16 i_eventID, u8 i_mapToolID, u16 param_3, + u16 i_priority, u16 i_flag); +s32 fopAcM_orderMapToolEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 param_3, + u16 i_flag, u16 param_5); +s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 param_3, + u16 i_flag, u16 param_5); +s32 fopAcM_orderPotentialEvent(fopAc_ac_c* i_actor, u16 i_flag, u16 param_2, u16 i_priority); +s32 fopAcM_orderItemEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag); +s32 fopAcM_orderTreasureEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, + u16 i_flag); fopAc_ac_c* fopAcM_getTalkEventPartner(const fopAc_ac_c*); fopAc_ac_c* fopAcM_getItemEventPartner(const fopAc_ac_c*); fopAc_ac_c* fopAcM_getEventPartner(const fopAc_ac_c*); -s32 fopAcM_createItemForPresentDemo(cXyz const* p_pos, int i_itemNo, u8 param_2, int i_itemBitNo, - int i_roomNo, csXyz const* p_angle, cXyz const* p_scale); +fpc_ProcID fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 param_2, + int i_itemBitNo, int i_roomNo, csXyz const* i_angle, + cXyz const* i_scale); -s32 fopAcM_createItemForTrBoxDemo(cXyz const* p_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, - csXyz const* p_angle, cXyz const* p_scale); +fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz const* i_pos, int i_itemNo, int i_itemBitNo, + int i_roomNo, csXyz const* i_angle, cXyz const* i_scale); u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo); -s32 fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* p_pos, int i_itemBitNo, int i_roomNo, - csXyz const* p_angle, cXyz const* p_scale, f32* speedF, - f32* speedY); +fpc_ProcID fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* i_pos, int i_itemBitNo, + int i_roomNo, csXyz const* i_angle, cXyz const* i_scale, + f32* i_speedF, f32* i_speedY); -s32 fopAcM_createItemFromTable(cXyz const* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo, - csXyz const* p_angle, int param_5, cXyz const* p_scale, f32* speedF, - f32* speedY, bool createDirect); +fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_tableNo, int i_itemBitNo, + int i_roomNo, csXyz const* i_angle, int param_5, + cXyz const* i_scale, f32* i_speedF, f32* i_speedY, + bool i_createDirect); -s32 fopAcM_createDemoItem(const cXyz* p_pos, int itemNo, int itemBitNo, const csXyz* p_angle, - int roomNo, const cXyz* scale, u8 param_7); +fpc_ProcID fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, + const csXyz* i_angle, int i_roomNo, const cXyz* scale, + u8 param_7); -s32 fopAcM_createItemForBoss(const cXyz* p_pos, int i_itemNo, int roomNo, const csXyz* p_angle, - const cXyz* p_scale, f32 speedF, f32 speedY, int param_8); +fpc_ProcID fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF, + f32 i_speedY, int param_8); -s32 fopAcM_createItemForMidBoss(const cXyz* p_pos, int i_itemNo, int i_roomNo, const csXyz* p_angle, - const cXyz* p_scale, int param_6, int param_7); +fpc_ProcID fopAcM_createItemForMidBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, int param_6, + int param_7); -void* fopAcM_createItemForDirectGet(const cXyz* p_pos, int i_itemNo, int i_roomNo, - const csXyz* p_angle, const cXyz* p_scale, f32 speedF, - f32 speedY); +fopAc_ac_c* fopAcM_createItemForDirectGet(const cXyz* i_pos, int i_itemNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF, + f32 i_speedY); -void* fopAcM_createItemForSimpleDemo(const cXyz* p_pos, int i_itemNo, int i_roomNo, - const csXyz* p_angle, const cXyz* p_scale, f32 speedF, - f32 speedY); +fopAc_ac_c* fopAcM_createItemForSimpleDemo(const cXyz* i_pos, int i_itemNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF, + f32 i_speedY); -s32 fopAcM_createItem(const cXyz* p_pos, int itemNo, int param_3, int roomNo, const csXyz* p_angle, - const cXyz* p_scale, int param_7); +fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, int param_7); -void* fopAcM_fastCreateItem2(const cXyz* p_pos, int itemNo, int param_3, int roomNo, int param_5, - const csXyz* p_angle, const cXyz* p_scale); +fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, + int param_5, const csXyz* i_angle, const cXyz* i_scale); -void* fopAcM_fastCreateItem(const cXyz* p_pos, int i_itemNo, int i_roomNo, const csXyz* p_angle, - const cXyz* p_scale, f32* p_speedF, f32* p_speedY, int param_8, - int param_9, createFunc p_createFunc); +fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, f32* i_speedF, + f32* i_speedY, int i_itemBitNo, int param_9, + createFunc i_createFunc); -s32 fopAcM_createBokkuri(u16, const cXyz*, int, int, int, const cXyz*, int, int); -s32 fopAcM_createWarpHole(const cXyz*, const csXyz*, int, u8, u8, u8); +fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int param_3, int param_4, + int i_roomNo, const cXyz* param_6, int param_7, int param_8); +fpc_ProcID fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_roomNo, u8 param_4, + u8 param_5, u8 param_6); fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo); -s32 fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 i_size, u8 i_type, u8 i_enemyID); -void fopAcM_setCarryNow(fopAc_ac_c*, int); -void fopAcM_cancelCarryNow(fopAc_ac_c*); -s32 fopAcM_otoCheck(const fopAc_ac_c*, f32); -s32 fopAcM_otherBgCheck(const fopAc_ac_c*, const fopAc_ac_c*); -s32 fopAcM_wayBgCheck(const fopAc_ac_c*, f32, f32); -s32 fopAcM_plAngleCheck(const fopAc_ac_c*, s16); +fpc_ProcID fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 i_size, + u8 i_type, u8 i_enemyID); +void fopAcM_setCarryNow(fopAc_ac_c* i_actor, int); +void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor); +BOOL fopAcM_otoCheck(const fopAc_ac_c* i_actor, f32); +BOOL fopAcM_otherBgCheck(const fopAc_ac_c*, const fopAc_ac_c*); +BOOL fopAcM_wayBgCheck(const fopAc_ac_c*, f32, f32); +BOOL fopAcM_plAngleCheck(const fopAc_ac_c* i_actor, s16 i_angle); void fopAcM_effSmokeSet1(u32*, u32*, const cXyz*, const csXyz*, f32, const dKy_tevstr_c*, int); void fopAcM_effHamonSet(u32*, const cXyz*, f32, f32); s32 fopAcM_riverStream(cXyz*, s16*, f32*, f32); s32 fopAcM_carryOffRevise(fopAc_ac_c*); -// void vectle_calc(const DOUBLE_POS*, cXyz*); -// void get_vectle_calc(const cXyz*, const cXyz*, cXyz*); void fopAcM_setEffectMtx(const fopAc_ac_c*, const J3DModelData*); -static const char* fopAcM_getProcNameString(const fopAc_ac_c* p_actor); +static const char* fopAcM_getProcNameString(const fopAc_ac_c* i_actor); -static const fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c const* p_actor, void* p_data); +static const fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c const* i_actor, void* i_data); fopAc_ac_c* fopAcM_searchFromName(char const* name, u32 param0, u32 param1); -fopAc_ac_c* fopAcM_findObject4EventCB(fopAc_ac_c* p_actor, void* p_data); +fopAc_ac_c* fopAcM_findObject4EventCB(fopAc_ac_c* i_actor, void* i_data); -fopAc_ac_c* fopAcM_searchFromName4Event(char const* name, s16 eventID); +fopAc_ac_c* fopAcM_searchFromName4Event(char const* i_name, s16 i_eventID); -s32 fopAcM_getWaterY(const cXyz*, f32*); -void fpoAcM_relativePos(fopAc_ac_c const* actor, cXyz const* p_inPos, cXyz* p_outPos); +s32 fopAcM_getWaterY(const cXyz*, f32* o_waterY); +void fpoAcM_relativePos(fopAc_ac_c const* i_actor, cXyz const* i_pos, cXyz* o_pos); s32 fopAcM_getWaterStream(const cXyz*, const cBgS_PolyInfo&, cXyz*, int*, int); s16 fopAcM_getPolygonAngle(const cBgS_PolyInfo&, s16); s16 fopAcM_getPolygonAngle(cM3dGPla const* param_0, s16 param_1); -inline void make_prm_warp_hole(u32* actorParams, u8 p1, u8 p2, u8 p3) { - u32 pp1 = (p3 << 0x8); - u32 pp2 = (p2 << 0x10); - u32 pp3 = (p1 << 0x1B) | 0x170000FF; - *actorParams = pp2 | pp3 | pp1; +inline void make_prm_warp_hole(u32* o_params, u8 prm1, u8 prm2, u8 prm3) { + u32 pprm1 = (prm3 << 0x8); + u32 pprm2 = (prm2 << 0x10); + u32 pprm3 = (prm1 << 0x1B) | 0x170000FF; + *o_params = pprm2 | pprm3 | pprm1; } -inline void make_prm_bokkuri(u32* pActorParams, csXyz* p_angle, u8 param_2, u8 param_3, u8 param_4, +inline void make_prm_bokkuri(u32* i_params, csXyz* i_angle, u8 param_2, u8 param_3, u8 param_4, u8 param_5, u8 param_6) { - p_angle->x = (param_4 << 0x8) | (param_3 & 0xFF); - p_angle->z = (param_6 << 0xD) | (param_2 << 0x1) | param_5; + i_angle->x = (param_4 << 0x8) | (param_3 & 0xFF); + i_angle->z = (param_6 << 0xD) | (param_2 << 0x1) | param_5; } inline fopAc_ac_c* dComIfGp_getPlayer(int); @@ -706,7 +720,8 @@ inline s32 fopAcM_seenPlayerAngleY(const fopAc_ac_c* i_actor) { s8 dComIfGp_getReverb(int roomNo); inline void fopAcM_seStartCurrent(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { - mDoAud_seStart(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); + mDoAud_seStart(sfxID, &actor->current.pos, param_2, + dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { @@ -714,19 +729,21 @@ inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { } inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { - mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); + mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, + dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } inline void fopAcM_seStartCurrentLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { - mDoAud_seStartLevel(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); + mDoAud_seStartLevel(sfxID, &actor->current.pos, param_2, + dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } -inline void fopAcM_offActor(fopAc_ac_c* pActor, u32 flag) { - dComIfGs_offActor(flag,fopAcM_GetHomeRoomNo(pActor)); +inline void fopAcM_offActor(fopAc_ac_c* i_actor, u32 flag) { + dComIfGs_offActor(flag, fopAcM_GetHomeRoomNo(i_actor)); } -inline void fopAcM_OnCarryType(fopAc_ac_c* pActor, fopAcM_CARRY param_2) { - pActor->carryType |= param_2; +inline void fopAcM_OnCarryType(fopAc_ac_c* i_actor, fopAcM_CARRY param_2) { + i_actor->carryType |= param_2; } enum fopAcM_FOOD { @@ -746,8 +763,8 @@ inline bool fopAcM_CheckFoodStatus(const fopAc_ac_c* actor, fopAcM_FOOD status) return actor->field_0x567 == status; } -inline void fopAcM_effSmokeSet2(u32* param_0, u32* param_1, cXyz const* param_2, csXyz const* param_3, - f32 param_4, dKy_tevstr_c const* param_5) { +inline void fopAcM_effSmokeSet2(u32* param_0, u32* param_1, cXyz const* param_2, + csXyz const* param_3, f32 param_4, dKy_tevstr_c const* param_5) { fopAcM_effSmokeSet1(param_0, param_1, param_2, param_3, param_4, param_5, 0); } diff --git a/include/f_op/f_op_actor_tag.h b/include/f_op/f_op_actor_tag.h index b4fd81bd06..dbda5276a0 100644 --- a/include/f_op/f_op_actor_tag.h +++ b/include/f_op/f_op_actor_tag.h @@ -3,11 +3,10 @@ #include "SSystem/SComponent/c_tag.h" -u32 fopAcTg_ActorQTo(create_tag_class* pTag); -u32 fopAcTg_Init(create_tag_class* pTag, void* data); -u32 fopAcTg_ToActorQ(create_tag_class* c); +int fopAcTg_ActorQTo(create_tag_class* i_createTag); +int fopAcTg_Init(create_tag_class* i_createTag, void* i_data); +int fopAcTg_ToActorQ(create_tag_class* i_createTag); -// f_op_actor_tag::g_fopAcTg_Queue extern node_list_class g_fopAcTg_Queue; -#endif \ No newline at end of file +#endif diff --git a/include/f_op/f_op_camera.h b/include/f_op/f_op_camera.h index 43e4cba6f7..da55182179 100644 --- a/include/f_op/f_op_camera.h +++ b/include/f_op/f_op_camera.h @@ -6,13 +6,13 @@ class camera_class; struct camera_process_profile_definition { - /* 0x00 */ view_process_profile_definition mBase; + /* 0x00 */ view_process_profile_definition base; /* 0x3C */ leafdraw_method_class* sub_method; // Subclass methods }; -static s32 fopCam_Draw(camera_class* param_1); -static int fopCam_Execute(camera_class* pCamera); -int fopCam_IsDelete(camera_class* pCamera); +static s32 fopCam_Draw(camera_class* i_this); +static int fopCam_Execute(camera_class* i_this); +int fopCam_IsDelete(camera_class* i_this); extern leafdraw_method_class g_fopCam_Method; diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index 87c005cac0..54033648df 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -9,91 +9,91 @@ typedef struct leafdraw_method_class leafdraw_method_class; class camera_process_class : public view_class { public: - /* 0x210 */ create_tag_class mCreateTag; - /* 0x224 */ leafdraw_method_class* mpMtd; + /* 0x210 */ create_tag_class create_tag; + /* 0x224 */ leafdraw_method_class* submethod; /* 0x228 */ u8 field_0x228[4]; - /* 0x22C */ s8 mPrm1; - /* 0x22D */ s8 mPrm2; - /* 0x22E */ s8 mPrm3; + /* 0x22C */ s8 prm1; + /* 0x22D */ s8 prm2; + /* 0x22E */ s8 prm3; /* 0x22F */ s8 field_0x22f; - /* 0x230 */ csXyz mAngle; + /* 0x230 */ csXyz angle; /* 0x238 */ int field_0x238; }; class camera_class : public camera_process_class { public: /* 0x23C */ int field_0x23c; - /* 0x240 */ request_of_phase_process_class mPhaseReq; + /* 0x240 */ request_of_phase_process_class phase_request; /* 0x248 */ dCamera_c mCamera; }; inline void fopCamM_SetNear(camera_class* i_this, f32 near) { - i_this->mNear = near; + i_this->near = near; } inline void fopCamM_SetFar(camera_class* i_this, f32 far) { - i_this->mFar = far; + i_this->far = far; } inline void fopCamM_SetFovy(camera_class* i_this, f32 fovy) { - i_this->mFovy = fovy; + i_this->fovy = fovy; } inline void fopCamM_SetAspect(camera_class* i_this, f32 aspect) { - i_this->mAspect = aspect; + i_this->aspect = aspect; } inline void fopCamM_SetEye(camera_class* i_this, f32 x, f32 y, f32 z) { - i_this->mLookat.mEye.set(x, y, z); + i_this->lookat.eye.set(x, y, z); } inline void fopCamM_SetCenter(camera_class* i_this, f32 x, f32 y, f32 z) { - i_this->mLookat.mCenter.set(x, y, z); + i_this->lookat.center.set(x, y, z); } inline void fopCamM_SetBank(camera_class* i_this, s16 bank) { - i_this->mBank = bank; + i_this->bank = bank; } inline void fopCamM_SetPrm1(camera_class* i_this, int prm1) { - i_this->mPrm1 = prm1; + i_this->prm1 = prm1; } inline void fopCamM_SetPrm2(camera_class* i_this, int prm2) { - i_this->mPrm2 = prm2; + i_this->prm2 = prm2; } inline void fopCamM_SetPrm3(camera_class* i_this, int prm3) { - i_this->mPrm3 = prm3; + i_this->prm3 = prm3; } inline s16 fopCamM_GetAngleX(camera_class* i_camera) { - return i_camera->mAngle.x; + return i_camera->angle.x; } inline s16 fopCamM_GetAngleY(camera_class* i_camera) { - return i_camera->mAngle.y; + return i_camera->angle.y; } inline s16 fopCamM_GetAngleZ(camera_class* i_camera) { - return i_camera->mAngle.z; + return i_camera->angle.z; } inline f32 fopCamM_GetFovy(camera_class* i_camera) { - return i_camera->mFovy; + return i_camera->fovy; } inline cXyz* fopCamM_GetEye_p(camera_class* i_camera) { - return &i_camera->mLookat.mEye; + return &i_camera->lookat.eye; } inline cXyz* fopCamM_GetCenter_p(camera_class* i_camera) { - return &i_camera->mLookat.mCenter; + return &i_camera->lookat.center; } -u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3); -void fopCamM_Management(void); -u32 fopCamM_GetParam(camera_class* pCamera); -void fopCamM_Init(void); +fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* i_append); +void fopCamM_Management(); +u32 fopCamM_GetParam(camera_class* i_this); +void fopCamM_Init(); #endif diff --git a/include/f_op/f_op_draw_iter.h b/include/f_op/f_op_draw_iter.h index 1455b65aeb..d7f8ba934c 100644 --- a/include/f_op/f_op_draw_iter.h +++ b/include/f_op/f_op_draw_iter.h @@ -3,8 +3,8 @@ typedef struct create_tag_class create_tag_class; -static create_tag_class* fopDwIt_GetTag(void); -create_tag_class* fopDwIt_Begin(void); -create_tag_class* fopDwIt_Next(create_tag_class* pCreateTag); +create_tag_class* fopDwIt_GetTag(); +create_tag_class* fopDwIt_Begin(); +create_tag_class* fopDwIt_Next(create_tag_class* i_createTag); -#endif \ No newline at end of file +#endif diff --git a/include/f_op/f_op_draw_tag.h b/include/f_op/f_op_draw_tag.h index 281f9795ba..317cad1baf 100644 --- a/include/f_op/f_op_draw_tag.h +++ b/include/f_op/f_op_draw_tag.h @@ -7,9 +7,9 @@ typedef struct create_tag_class create_tag_class; extern node_lists_tree_class g_fopDwTg_Queue; -void fopDwTg_DrawQTo(create_tag_class* pTag); +void fopDwTg_DrawQTo(create_tag_class* i_createTag); void fopDwTg_CreateQueue(); -bool fopDwTg_Init(create_tag_class* pCreateTagClass, void* pActor); -void fopDwTg_ToDrawQ(create_tag_class* pCreateTagClass, int priority); +bool fopDwTg_Init(create_tag_class* i_createTag, void* i_process); +void fopDwTg_ToDrawQ(create_tag_class* i_createTag, int priority); -#endif \ No newline at end of file +#endif diff --git a/include/f_op/f_op_kankyo.h b/include/f_op/f_op_kankyo.h index fd58c54f88..6870fbc64e 100644 --- a/include/f_op/f_op_kankyo.h +++ b/include/f_op/f_op_kankyo.h @@ -6,12 +6,12 @@ class kankyo_class : public leafdraw_class { public: - /* 0xC0 */ int mBsType; + /* 0xC0 */ int type; /* 0xC4 */ create_tag_class draw_tag; /* 0xD8 */ leafdraw_method_class* sub_method; - /* 0xDC */ cXyz mPos; - /* 0xE8 */ cXyz mScale; - /* 0xF4 */ u32 mParam; + /* 0xDC */ cXyz pos; + /* 0xE8 */ cXyz scale; + /* 0xF4 */ u32 parameters; }; struct kankyo_process_profile_definition { diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h index 947489bcbf..fbb0928796 100644 --- a/include/f_op/f_op_kankyo_mng.h +++ b/include/f_op/f_op_kankyo_mng.h @@ -5,25 +5,24 @@ #include "f_pc/f_pc_manager.h" struct fopKyM_prm_class { - /* 0x00 */ cXyz mPos; - /* 0x0C */ cXyz mScale; - /* 0x18 */ int mParam; + /* 0x00 */ cXyz pos; + /* 0x0C */ cXyz scale; + /* 0x18 */ int parameters; }; // Size: 0x1C typedef int (*fopKyM_CreateFunc)(void*); -static fopKyM_prm_class* fopKyM_CreateAppend(void); -static fopKyM_prm_class* createAppend(int param_1, cXyz* param_2, cXyz* param_3); -void fopKyM_Delete(void* param_1); -int fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, - fopKyM_CreateFunc i_createFunc); -static int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2, void* param_3); -base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, - fopKyM_CreateFunc); -int fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param); +fopKyM_prm_class* fopKyM_CreateAppend(); +void fopKyM_Delete(void* i_process); +fpc_ProcID fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, + fopKyM_CreateFunc i_createFunc); +fpc_ProcID fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_append); +base_process_class* fopKyM_fastCreate(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, + fopKyM_CreateFunc i_createFunc); +fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param); -inline void* fopKyM_GetAppend(void* param_0) { - return fpcM_GetAppend(param_0); +inline fopKyM_prm_class* fopKyM_GetAppend(void* i_process) { + return (fopKyM_prm_class*)fpcM_GetAppend(i_process); } -#endif \ No newline at end of file +#endif diff --git a/include/f_op/f_op_msg.h b/include/f_op/f_op_msg.h index 64274bb09a..56c3733b08 100644 --- a/include/f_op/f_op_msg.h +++ b/include/f_op/f_op_msg.h @@ -8,16 +8,16 @@ class fopAc_ac_c; class msg_class : public leafdraw_class { public: - /* 0xC0 */ int mMsgType; + /* 0xC0 */ int type; /* 0xC4 */ create_tag_class draw_tag; /* 0xD8 */ leafdraw_method_class* sub_method; - /* 0xDC */ fopAc_ac_c* mpActor; - /* 0xE0 */ cXyz mPos; - /* 0xEC */ u32 mMsgID; + /* 0xDC */ fopAc_ac_c* talk_actor; + /* 0xE0 */ cXyz pos; + /* 0xEC */ u32 msg_idx; /* 0xF0 */ u32 field_0xf0; /* 0xF4 */ u32 field_0xf4; - /* 0xF8 */ u16 mMode; - /* 0xFA */ u8 mSelectedChoiceIdx; + /* 0xF8 */ u16 mode; + /* 0xFA */ u8 select_idx; }; // Size: 0xFC extern leafdraw_method_class g_fopMsg_Method; diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index 05faa5a12d..8a02551996 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -2,8 +2,8 @@ #define F_F_OP_MSG_MNG_H_ #include "SSystem/SComponent/c_xyz.h" -#include "f_pc/f_pc_leaf.h" #include "f_op/f_op_msg.h" +#include "f_pc/f_pc_leaf.h" class JKRExpHeap; class JKRHeap; @@ -11,16 +11,16 @@ class fopAc_ac_c; class msg_class; struct msg_process_profile_definition { - /* 0x00 */ leaf_process_profile_definition mBase; + /* 0x00 */ leaf_process_profile_definition base; /* 0x24 */ leafdraw_method_class* sub_method; // Subclass methods }; struct fopMsg_prm_class { - /* 0x00 */ fopAc_ac_c* mpActor; - /* 0x04 */ cXyz mPos; - /* 0x10 */ u32 mMsgID; + /* 0x00 */ fopAc_ac_c* talk_actor; + /* 0x04 */ cXyz pos; + /* 0x10 */ u32 msg_idx; /* 0x14 */ u32 field_0x14; - /* 0x18 */ int field_0x18; + /* 0x18 */ fpc_ProcID field_0x18; }; // Size: 0x1C struct fopMsg_prm_timer : public fopMsg_prm_class { @@ -36,27 +36,28 @@ struct fopMsg_prm_timer : public fopMsg_prm_class { typedef int (*fopMsgCreateFunc)(void*); -JKRExpHeap* fopMsgM_createExpHeap(u32, JKRHeap*); -u32 fopMsgM_Create(s16, fopMsgCreateFunc, void*); -s32 fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* param_3, u32* param_4, - fopMsgCreateFunc createFunc); -void fopMsgM_Delete(void* process); -fopMsg_prm_class* fopMsgM_GetAppend(void* msg); -void fopMsgM_setMessageID(fpc_ProcID); -void fopMsgM_destroyExpHeap(JKRExpHeap*); -f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 param_2); -s32 fopMsgM_setStageLayer(void*); -int fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_actorP, u32 param_2); -int fopMsgM_messageSet(u32 param_0, u32 param_1); -int fopMsgM_messageSetDemo(u32 param_0); -msg_class* fopMsgM_SearchByID(fpc_ProcID param_0); -char* fopMsgM_messageGet(char* msg, u32 string_id); -s32 fop_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5, - f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc); +JKRExpHeap* fopMsgM_createExpHeap(u32 i_heapSize, JKRHeap* i_heap); +fpc_ProcID fopMsgM_Create(s16 i_procName, fopMsgCreateFunc i_createFunc, void* i_append); +fpc_ProcID fopMsgM_create(s16 i_procName, fopAc_ac_c* i_talkActor, cXyz* i_pos, u32* i_msgIdx, + u32* param_4, fopMsgCreateFunc createFunc); +void fopMsgM_Delete(void* i_this); +fopMsg_prm_class* fopMsgM_GetAppend(void* i_msg); +void fopMsgM_setMessageID(fpc_ProcID msg_id); +void fopMsgM_destroyExpHeap(JKRExpHeap* i_heap); +f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 i_type); +s32 fopMsgM_setStageLayer(void* i_process); +fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_talkActor, u32 param_2); +fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, u32 param_1); +fpc_ProcID fopMsgM_messageSetDemo(u32 i_msgidx); +msg_class* fopMsgM_SearchByID(fpc_ProcID i_id); +char* fopMsgM_messageGet(char* i_stringBuf, u32 i_msgId); +fpc_ProcID fop_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, u8 param_4, + f32 param_5, f32 param_6, f32 param_7, f32 param_8, + fopMsgCreateFunc i_createFunc); -inline s32 fopMsgM_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, u8 param_4, - f32 param_5, f32 param_6, f32 param_7, f32 param_8, - fopMsgCreateFunc i_createFunc) { +inline fpc_ProcID fopMsgM_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, + u8 param_4, f32 param_5, f32 param_6, f32 param_7, + f32 param_8, fopMsgCreateFunc i_createFunc) { return fop_Timer_create(i_procName, i_mode, i_limitMs, i_type, param_4, param_5, param_6, param_7, param_8, i_createFunc); } diff --git a/include/f_op/f_op_overlap.h b/include/f_op/f_op_overlap.h index 2f5bf7253f..fedd794867 100644 --- a/include/f_op/f_op_overlap.h +++ b/include/f_op/f_op_overlap.h @@ -2,12 +2,13 @@ #define F_F_OP_OVERLAP_H_ #include "f_pc/f_pc_leaf.h" +#include "SSystem/SComponent/c_request.h" class overlap_task_class : public leafdraw_class { public: - /* 0xC0 */ leafdraw_method_class* field_0xc0; - /* 0xC4 */ u8 field_0xc4; // used as both u8 and request_base_class* ?? - /* 0xC8 */ int field_0xc8; + /* 0xC0 */ leafdraw_method_class* submethod; + /* 0xC4 */ request_base_class request; + /* 0xC8 */ fpc_ProcID scene_id; }; // Size: 0xCC struct overlap_process_profile_definition { @@ -19,4 +20,4 @@ static s32 fopOvlp_Draw(void* param_1); extern leafdraw_method_class g_fopOvlp_Method; -#endif \ No newline at end of file +#endif diff --git a/include/f_op/f_op_overlap_mng.h b/include/f_op/f_op_overlap_mng.h index 12c2503190..54d8a3be04 100644 --- a/include/f_op/f_op_overlap_mng.h +++ b/include/f_op/f_op_overlap_mng.h @@ -2,20 +2,21 @@ #define F_F_OP_OVERLAP_MNG_H_ #include "f_op/f_op_overlap.h" +#include "f_op/f_op_overlap_req.h" struct request_base_class; int fopOvlpM_SceneIsStop(); int fopOvlpM_SceneIsStart(); void fopOvlpM_Management(); -int fopOvlpM_IsOutReq(overlap_task_class* i_this); -void fopOvlpM_Done(overlap_task_class* i_this); -void fopOvlpM_ToldAboutID(fpc_ProcID param_1); +int fopOvlpM_IsOutReq(overlap_task_class* i_overlap_task); +void fopOvlpM_Done(overlap_task_class* i_overlap_task); +void fopOvlpM_ToldAboutID(fpc_ProcID i_sceneId); int fopOvlpM_IsPeek(); int fopOvlpM_IsDone(); int fopOvlpM_IsDoingReq(); int fopOvlpM_ClearOfReq(); -request_base_class* fopOvlpM_Request(s16 param_1, u16 param_2); +overlap_request_class* fopOvlpM_Request(s16 i_procname, u16 i_peektime); int fopOvlpM_Cancel(); void fopOvlpM_Init(); diff --git a/include/f_op/f_op_overlap_req.h b/include/f_op/f_op_overlap_req.h index 0a25641b59..631934c0b6 100644 --- a/include/f_op/f_op_overlap_req.h +++ b/include/f_op/f_op_overlap_req.h @@ -2,32 +2,36 @@ #define F_F_OP_OVERLAP_REQ_H_ #include "SSystem/SComponent/c_phase.h" +#include "f_pc/f_pc_manager.h" +#include "f_op/f_op_overlap.h" +#include "SSystem/SComponent/c_request.h" typedef struct layer_class layer_class; struct request_base_class; class overlap_request_class { public: - s8 field_0x0; - u8 field_0x1; - s16 field_0x2; - u16 field_0x4; - u16 mPeektime; - u32 field_0x8; - u32 field_0xc; - s16 field_0x10; - u8 field_0x12; - u8 field_0x13; - int field_0x14; - request_of_phase_process_class field_0x18; - u8* field_0x20; - layer_class* pCurrentLayer; + /* 0x00 */ request_base_class base; + /* 0x01 */ u8 field_0x1; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ u16 field_0x4; + /* 0x06 */ u16 peektime; + /* 0x08 */ u32 field_0x8; + /* 0x0C */ u32 field_0xc; + /* 0x10 */ s16 procname; + /* 0x12 */ u8 field_0x12; + /* 0x13 */ u8 field_0x13; + /* 0x14 */ fpc_ProcID request_id; + /* 0x18 */ request_of_phase_process_class phase_req; + /* 0x20 */ overlap_task_class* overlap_task; + /* 0x24 */ layer_class* layer; }; -int fopOvlpReq_OverlapClr(overlap_request_class* param_1); -request_base_class* fopOvlpReq_Request(overlap_request_class*, s16, u16); -int fopOvlpReq_Handler(overlap_request_class*); -int fopOvlpReq_Cancel(overlap_request_class*); -static int fopOvlpReq_phase_Done(overlap_request_class* param_1); -int fopOvlpReq_Is_PeektimeLimit(overlap_request_class*); -#endif \ No newline at end of file +int fopOvlpReq_OverlapClr(overlap_request_class* i_overlapReq); +overlap_request_class* fopOvlpReq_Request(overlap_request_class* i_overlapReq, s16 i_procname, u16 i_peektime); +int fopOvlpReq_Handler(overlap_request_class* i_overlapReq); +int fopOvlpReq_Cancel(overlap_request_class* i_overlapReq); +static int fopOvlpReq_phase_Done(overlap_request_class* i_overlapReq); +int fopOvlpReq_Is_PeektimeLimit(overlap_request_class* i_overlapReq); + +#endif diff --git a/include/f_op/f_op_scene.h b/include/f_op/f_op_scene.h index 65d1a4f234..2da8e5e9ba 100644 --- a/include/f_op/f_op_scene.h +++ b/include/f_op/f_op_scene.h @@ -7,16 +7,16 @@ struct request_of_phase_process_class; class mDoDvdThd_command_c; typedef struct scene_process_profile_definition { - /* 0x00 */ node_process_profile_definition mBase; - /* 0x20 */ process_method_class* mpMtd; // Subclass methods - /* 0x24 */ u32 field_0x24; // padding? + /* 0x00 */ node_process_profile_definition nase; + /* 0x20 */ process_method_class* submethod; // Subclass methods + /* 0x24 */ u32 unk_0x24; // padding? } scene_process_profile_definition; class scene_class { public: - /* 0x000 */ process_node_class mBase; - /* 0x1AC */ process_method_class * mpMtd; - /* 0x1B0 */ scene_tag_class mScnTg; + /* 0x000 */ process_node_class base; + /* 0x1AC */ process_method_class* submethod; + /* 0x1B0 */ scene_tag_class scene_tag; }; extern leafdraw_method_class g_fopScn_Method; diff --git a/include/f_op/f_op_scene_iter.h b/include/f_op/f_op_scene_iter.h index 76166b18c2..9a36eddf1b 100644 --- a/include/f_op/f_op_scene_iter.h +++ b/include/f_op/f_op_scene_iter.h @@ -1,7 +1,7 @@ #ifndef F_F_OP_SCENE_ITER_H_ #define F_F_OP_SCENE_ITER_H_ -typedef void* (*fop_ScnItFunc)(void* pProc, void* pUserData); -void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pUserData); +typedef void* (*fop_ScnItFunc)(void* i_scene, void* i_data); +void* fopScnIt_Judge(fop_ScnItFunc i_judgeFunc, void* i_data); -#endif \ No newline at end of file +#endif diff --git a/include/f_op/f_op_scene_mng.h b/include/f_op/f_op_scene_mng.h index 55cb5579a5..c4ada01812 100644 --- a/include/f_op/f_op_scene_mng.h +++ b/include/f_op/f_op_scene_mng.h @@ -7,29 +7,29 @@ typedef struct base_process_class base_process_class; scene_class* fopScnM_SearchByID(fpc_ProcID id); -int fopScnM_ChangeReq(scene_class*, s16, s16, u16); -fpc_ProcID fopScnM_DeleteReq(scene_class*); -int fopScnM_CreateReq(s16, s16, u16, u32); -u32 fopScnM_ReRequest(s16, u32); -void fopScnM_Management(void); -void fopScnM_Init(void); +int fopScnM_ChangeReq(scene_class* i_scene, s16 i_procName, s16 param_3, u16 param_4); +fpc_ProcID fopScnM_DeleteReq(scene_class* i_scene); +int fopScnM_CreateReq(s16 i_procName, s16 param_2, u16 param_3, u32 i_data); +u32 fopScnM_ReRequest(s16 i_procName, u32 i_data); +void fopScnM_Management(); +void fopScnM_Init(); -inline u32 fpcM_LayerID(const void* pProc) { - return fpcBs_Is_JustOfType(g_fpcNd_type, ((base_process_class*)pProc)->mSubType) != FALSE ? - ((scene_class*)pProc)->mBase.mLayer.mLayerID : - 0xFFFFFFFF; +inline fpc_ProcID fpcM_LayerID(const void* i_process) { + return fpcBs_Is_JustOfType(g_fpcNd_type, ((base_process_class*)i_process)->subtype) != FALSE ? + ((scene_class*)i_process)->base.layer.layer_id : + fpcM_ERROR_PROCESS_ID_e; } -inline u32 fopScnM_GetID(void* proc) { - return fpcM_GetID(proc); +inline fpc_ProcID fopScnM_GetID(void* i_scene) { + return fpcM_GetID(i_scene); } -inline int fopScnM_LayerID(void* proc) { - return fpcM_LayerID(proc); +inline fpc_ProcID fopScnM_LayerID(void* i_scene) { + return fpcM_LayerID(i_scene); } -inline u32 fopScnM_GetParam(void* proc) { - return fpcM_GetParam(proc); +inline u32 fopScnM_GetParam(void* i_scene) { + return fpcM_GetParam(i_scene); } #endif diff --git a/include/f_op/f_op_scene_pause.h b/include/f_op/f_op_scene_pause.h index da01d4779e..ec9d47103d 100644 --- a/include/f_op/f_op_scene_pause.h +++ b/include/f_op/f_op_scene_pause.h @@ -3,7 +3,7 @@ class scene_class; -int fopScnPause_Enable(scene_class* pScene); -int fopScnPause_Disable(scene_class* pScene); +int fopScnPause_Enable(scene_class* i_scene); +int fopScnPause_Disable(scene_class* i_scene); -#endif \ No newline at end of file +#endif diff --git a/include/f_op/f_op_scene_req.h b/include/f_op/f_op_scene_req.h index a3c35934f9..283e000eae 100644 --- a/include/f_op/f_op_scene_req.h +++ b/include/f_op/f_op_scene_req.h @@ -4,23 +4,17 @@ #include "f_pc/f_pc_node_req.h" class scene_class; - -extern "C" { -void fopScnRq_Handler__Fv(void); -void fopScnRq_ReRequest(void); -} - class scene_request_class { public: - node_create_request mCrtReq; - u32 mFadeRequest; // TODO: type is wrong - request_of_phase_process_class mReqPhsProcCls; - u8 field_0x70[4]; + /* 0x00 */ node_create_request create_request; + /* 0x64 */ scene_request_class* fade_request; + /* 0x68 */ request_of_phase_process_class phase_request; + /* 0x00 */ u8 field_0x70[4]; }; -// cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* param_1); -s32 fopScnRq_Request(int, scene_class*, s16, void*, s16, u16); -s32 fopScnRq_ReRequest(fpc_ProcID, s16, void*); -void fopScnRq_Handler(void); +fpc_ProcID fopScnRq_Request(int i_reqType, scene_class* i_scene, s16 i_procName, void* i_data, s16 param_5, + u16 param_6); +s32 fopScnRq_ReRequest(fpc_ProcID i_requestId, s16 i_procName, void* i_data); +void fopScnRq_Handler(); #endif diff --git a/include/f_op/f_op_scene_tag.h b/include/f_op/f_op_scene_tag.h index 394441473f..f96ab41f48 100644 --- a/include/f_op/f_op_scene_tag.h +++ b/include/f_op/f_op_scene_tag.h @@ -6,12 +6,12 @@ class scene_tag_class { public: - u8 field_0x00[0x14]; + create_tag_class base; }; -void fopScnTg_QueueTo(scene_tag_class* pSceneTag); -void fopScnTg_ToQueue(scene_tag_class* pSceneTag); -void fopScnTg_Init(scene_tag_class* pSceneTag, void* pData); +void fopScnTg_QueueTo(scene_tag_class* i_sceneTag); +void fopScnTg_ToQueue(scene_tag_class* i_sceneTag); +void fopScnTg_Init(scene_tag_class* i_sceneTag, void* i_data); extern node_list_class g_fopScnTg_SceneList; diff --git a/include/f_op/f_op_view.h b/include/f_op/f_op_view.h index e7a0077852..8a12ac2e06 100644 --- a/include/f_op/f_op_view.h +++ b/include/f_op/f_op_view.h @@ -6,54 +6,53 @@ #include "f_pc/f_pc_leaf.h" struct view_process_profile_definition { - /* 0x00 */ leaf_process_profile_definition mBase; + /* 0x00 */ leaf_process_profile_definition base; /* 0x24 */ leafdraw_method_class* sub_method; // Subclass methods - /* 0x28 */ u8 unk28; - /* 0x29 */ u8 unk29[3]; // pad - /* 0x2C */ u32 unk2C; - /* 0x30 */ u32 unk30; - /* 0x34 */ u32 unk34; - /* 0x38 */ u32 unk38; + /* 0x28 */ u8 unk_0x28; + /* 0x2C */ u32 unk_0x2C; + /* 0x30 */ u32 unk_0x30; + /* 0x34 */ u32 unk_0x34; + /* 0x38 */ u32 unk_0x38; }; class lookat_class { public: - /* 0x00 */ cXyz mEye; - /* 0x0C */ cXyz mCenter; - /* 0x18 */ cXyz mUp; + /* 0x00 */ cXyz eye; + /* 0x0C */ cXyz center; + /* 0x18 */ cXyz up; }; struct scissor_class { - /* 0x0 */ f32 mXOrig; - /* 0x4 */ f32 mYOrig; - /* 0x8 */ f32 mWidth; - /* 0xC */ f32 mHeight; + /* 0x0 */ f32 x_orig; + /* 0x4 */ f32 y_orig; + /* 0x8 */ f32 width; + /* 0xC */ f32 height; }; struct view_port_class { - /* 0x00 */ f32 mXOrig; - /* 0x04 */ f32 mYOrig; - /* 0x08 */ f32 mWidth; - /* 0x0C */ f32 mHeight; - /* 0x10 */ f32 mNearZ; - /* 0x14 */ f32 mFarZ; - /* 0x18 */ scissor_class mScissor; + /* 0x00 */ f32 x_orig; + /* 0x04 */ f32 y_orig; + /* 0x08 */ f32 width; + /* 0x0C */ f32 height; + /* 0x10 */ f32 near_z; + /* 0x14 */ f32 far_z; + /* 0x18 */ scissor_class scissor; }; struct view_class : public leafdraw_class { /* 0x0C0 */ leafdraw_method_class* sub_method; /* 0x0C4 */ u8 field_0xc4; - /* 0x0C8 */ f32 mNear; - /* 0x0CC */ f32 mFar; - /* 0x0D0 */ f32 mFovy; - /* 0x0D4 */ f32 mAspect; - /* 0x0D8 */ lookat_class mLookat; - /* 0x0FC */ s16 mBank; - /* 0x100 */ Mtx44 mProjMtx; - /* 0x140 */ Mtx mViewMtx; - /* 0x170 */ Mtx mInvViewMtx; - /* 0x1A0 */ Mtx44 mProjViewMtx; - /* 0x1E0 */ Mtx mViewMtxNoTrans; + /* 0x0C8 */ f32 near; + /* 0x0CC */ f32 far; + /* 0x0D0 */ f32 fovy; + /* 0x0D4 */ f32 aspect; + /* 0x0D8 */ lookat_class lookat; + /* 0x0FC */ s16 bank; + /* 0x100 */ Mtx44 projMtx; + /* 0x140 */ Mtx viewMtx; + /* 0x170 */ Mtx invViewMtx; + /* 0x1A0 */ Mtx44 projViewMtx; + /* 0x1E0 */ Mtx viewMtxNoTrans; }; extern leafdraw_method_class g_fopVw_Method; diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index d75a61dec7..78710be046 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -15,34 +15,34 @@ typedef struct process_profile_definition process_profile_definition; typedef struct profile_method_class profile_method_class; typedef struct base_process_class { - /* 0x00 */ u32 mBsType; - /* 0x04 */ fpc_ProcID mBsPcId; - /* 0x08 */ s16 mProcName; - /* 0x0A */ s8 mUnk0; - /* 0x0B */ u8 mPauseFlag; - /* 0x0C */ s8 mInitState; - /* 0x0D */ u8 mUnk2; - /* 0x0E */ s16 mBsTypeId; - /* 0x10 */ process_profile_definition* mpProf; - /* 0x14 */ struct create_request* mpCtRq; - /* 0x18 */ layer_management_tag_class mLyTg; - /* 0x34 */ line_tag mLnTg; - /* 0x4C */ delete_tag_class mDtTg; - /* 0x68 */ process_priority_class mPi; - /* 0xA8 */ process_method_class* mpPcMtd; - /* 0xAC */ void* mpUserData; - /* 0xB0 */ u32 mParameters; - /* 0xB4 */ u32 mSubType; + /* 0x00 */ int type; + /* 0x04 */ fpc_ProcID id; + /* 0x08 */ s16 name; + /* 0x0A */ s8 unk_0xA; + /* 0x0B */ u8 pause_flag; + /* 0x0C */ s8 init_state; // maybe inaccurate name + /* 0x0D */ u8 create_phase; + /* 0x0E */ s16 profname; + /* 0x10 */ process_profile_definition* profile; + /* 0x14 */ struct create_request* create_req; + /* 0x18 */ layer_management_tag_class layer_tag; + /* 0x34 */ line_tag line_tag_; + /* 0x4C */ delete_tag_class delete_tag; + /* 0x68 */ process_priority_class priority; + /* 0xA8 */ process_method_class* methods; + /* 0xAC */ void* append; + /* 0xB0 */ u32 parameters; + /* 0xB4 */ int subtype; } base_process_class; // Size: 0xB8 -s32 fpcBs_Is_JustOfType(int pType1, int pType2); -s32 fpcBs_MakeOfType(int* pType); -s32 fpcBs_MakeOfId(void); -s32 fpcBs_Execute(base_process_class* pProc); -void fpcBs_DeleteAppend(base_process_class* pProc); -s32 fpcBs_IsDelete(base_process_class* pProc); -s32 fpcBs_Delete(base_process_class* pProc); -base_process_class* fpcBs_Create(s16 pProcTypeID, fpc_ProcID pProcID, void* pData); -s32 fpcBs_SubCreate(base_process_class* pProc); +BOOL fpcBs_Is_JustOfType(int i_typeA, int i_typeB); +int fpcBs_MakeOfType(int* i_type); +int fpcBs_MakeOfId(); +int fpcBs_Execute(base_process_class* i_proc); +void fpcBs_DeleteAppend(base_process_class* i_proc); +int fpcBs_IsDelete(base_process_class* i_proc); +int fpcBs_Delete(base_process_class* i_proc); +base_process_class* fpcBs_Create(s16 i_profname, fpc_ProcID i_procID, void* i_append); +int fpcBs_SubCreate(base_process_class* i_proc); #endif diff --git a/include/f_pc/f_pc_create_iter.h b/include/f_pc/f_pc_create_iter.h index cbe1ab3a74..73b68c64f7 100644 --- a/include/f_pc/f_pc_create_iter.h +++ b/include/f_pc/f_pc_create_iter.h @@ -10,24 +10,24 @@ typedef int (*fpcCtIt_MethodFunc)(void*, void*); typedef void* (*fpcCtIt_JudgeFunc)(void*, void*); typedef struct node_method_data { - fpcCtIt_MethodFunc mFunc; - void* mpUserData; + /* 0x0 */ fpcCtIt_MethodFunc method; + /* 0x4 */ void* data; } node_method_data; typedef struct node_judge_data { - fpcCtIt_JudgeFunc mFunc; - void* mpUserData; + /* 0x0 */ fpcCtIt_JudgeFunc method; + /* 0x4 */ void* data; } node_judge_data; typedef struct fpcCtIt_jilprm_c { - u32 mLayerID; - fpcCtIt_JudgeFunc mFunc; - void* mpUserData; + /* 0x0 */ unsigned int layer_id; + /* 0x4 */ fpcCtIt_JudgeFunc method; + /* 0x8 */ void* data; } fpcCtIt_jilprm_c; -s32 fpcCtIt_Method(fpcCtIt_MethodFunc pJudge, void* pUserData); -void* fpcCtIt_Judge(fpcCtIt_JudgeFunc pJudge, void* pUserData); -void* fpcCtIt_filter_JudgeInLayer(create_tag*, fpcCtIt_jilprm_c*); -void* fpcCtIt_JudgeInLayer(unsigned int pUnk0, fpcCtIt_JudgeFunc pFunc, void* pUserData); +int fpcCtIt_Method(fpcCtIt_MethodFunc i_method, void* i_data); +void* fpcCtIt_Judge(fpcCtIt_JudgeFunc i_judge, void* i_data); +void* fpcCtIt_filter_JudgeInLayer(create_tag* i_createTag, fpcCtIt_jilprm_c* i_iterData); +void* fpcCtIt_JudgeInLayer(unsigned int i_layerID, fpcCtIt_JudgeFunc i_method, void* i_data); #endif diff --git a/include/f_pc/f_pc_create_req.h b/include/f_pc/f_pc_create_req.h index 743bf91252..294f30862c 100644 --- a/include/f_pc/f_pc_create_req.h +++ b/include/f_pc/f_pc_create_req.h @@ -12,32 +12,32 @@ typedef struct base_process_class base_process_class; typedef struct layer_class layer_class; typedef struct create_request_method_class { - cPhs__Handler mpHandler; - process_method_func mpCancel; - process_method_func mpDelete; + /* 0x0 */ cPhs__Handler phase_handler; + /* 0x4 */ process_method_func cancel_method; + /* 0x8 */ process_method_func delete_method; } create_request_method_class; typedef struct create_request { - create_tag mBase; - s8 mbIsCreating; - s8 mbIsCancelling; - process_method_tag_class mMtdTg; - create_request_method_class* mpCtRqMtd; - void* mpUnk1; - s32 mBsPcId; - struct base_process_class* mpRes; - layer_class* mpLayer; + /* 0x00 */ create_tag base; + /* 0x14 */ s8 is_doing; + /* 0x15 */ s8 is_cancel; + /* 0x18 */ process_method_tag_class method_tag; + /* 0x34 */ create_request_method_class* methods; + /* 0x38 */ void* unk_0x38; + /* 0x3C */ fpc_ProcID id; + /* 0x40 */ struct base_process_class* process; + /* 0x44 */ layer_class* layer; } create_request; // Size: 0x48 -bool fpcCtRq_isCreatingByID(create_tag* pTag, fpc_ProcID* pId); -BOOL fpcCtRq_IsCreatingByID(fpc_ProcID id); -void fpcCtRq_CreateQTo(create_request* pReq); -void fpcCtRq_ToCreateQ(create_request* pReq); -BOOL fpcCtRq_Delete(create_request* pReq); -BOOL fpcCtRq_Cancel(create_request* pReq); -s32 fpcCtRq_IsDoing(create_request* pReq); -void fpcCtRq_Handler(void); -create_request* fpcCtRq_Create(layer_class* pLayer, u32 size, - create_request_method_class* pCtRqMtd); +bool fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_id); +BOOL fpcCtRq_IsCreatingByID(fpc_ProcID i_id); +void fpcCtRq_CreateQTo(create_request* i_request); +void fpcCtRq_ToCreateQ(create_request* i_request); +BOOL fpcCtRq_Delete(create_request* i_request); +BOOL fpcCtRq_Cancel(create_request* i_request); +BOOL fpcCtRq_IsDoing(create_request* i_request); +void fpcCtRq_Handler(); +create_request* fpcCtRq_Create(layer_class* i_layer, u32 i_size, + create_request_method_class* i_methods); #endif diff --git a/include/f_pc/f_pc_create_tag.h b/include/f_pc/f_pc_create_tag.h index 35365179dc..117235b0d4 100644 --- a/include/f_pc/f_pc_create_tag.h +++ b/include/f_pc/f_pc_create_tag.h @@ -6,12 +6,12 @@ #include "SSystem/SComponent/c_tag.h" typedef struct create_tag { - create_tag_class mBase; + create_tag_class base; } create_tag; -void fpcCtTg_ToCreateQ(create_tag* pTag); -void fpcCtTg_CreateQTo(create_tag* pTag); -s32 fpcCtTg_Init(create_tag* pTag, void* pUserData); +void fpcCtTg_ToCreateQ(create_tag* i_createTag); +void fpcCtTg_CreateQTo(create_tag* i_createTag); +s32 fpcCtTg_Init(create_tag* i_createTag, void* i_data); extern node_list_class g_fpcCtTg_Queue; diff --git a/include/f_pc/f_pc_creator.h b/include/f_pc/f_pc_creator.h index b37a2ce88a..8a81bd59e0 100644 --- a/include/f_pc/f_pc_creator.h +++ b/include/f_pc/f_pc_creator.h @@ -7,8 +7,8 @@ typedef struct base_process_class base_process_class; BOOL fpcCt_IsCreatingByID(fpc_ProcID id); -s32 fpcCt_IsDoing(base_process_class* pProc); +BOOL fpcCt_IsDoing(base_process_class* pProc); BOOL fpcCt_Abort(base_process_class* pProc); -void fpcCt_Handler(void); +void fpcCt_Handler(); #endif diff --git a/include/f_pc/f_pc_delete_tag.h b/include/f_pc/f_pc_delete_tag.h index 1c90e6f1d5..a70c86f2e8 100644 --- a/include/f_pc/f_pc_delete_tag.h +++ b/include/f_pc/f_pc_delete_tag.h @@ -9,16 +9,16 @@ typedef struct layer_class layer_class; typedef int (*delete_tag_func)(void*); typedef struct delete_tag_class { - create_tag_class mBase; - layer_class* mpLayer; - s16 mTimer; + /* 0x00 */ create_tag_class base; + /* 0x14 */ layer_class* layer; + /* 0x18 */ s16 timer; } delete_tag_class; -BOOL fpcDtTg_IsEmpty(void); -void fpcDtTg_ToDeleteQ(delete_tag_class* pTag); -void fpcDtTg_DeleteQTo(delete_tag_class* pTag); -s32 fpcDtTg_Do(delete_tag_class* pTag, delete_tag_func pFunc); -s32 fpcDtTg_Init(delete_tag_class* pTag, void* pUserData); +BOOL fpcDtTg_IsEmpty(); +void fpcDtTg_ToDeleteQ(delete_tag_class* i_deleteTag); +void fpcDtTg_DeleteQTo(delete_tag_class* i_deleteTag); +s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func); +s32 fpcDtTg_Init(delete_tag_class* i_deleteTag, void* i_data); extern node_list_class g_fpcDtTg_Queue; diff --git a/include/f_pc/f_pc_deletor.h b/include/f_pc/f_pc_deletor.h index ebe81a41a9..3b5a512b22 100644 --- a/include/f_pc/f_pc_deletor.h +++ b/include/f_pc/f_pc_deletor.h @@ -6,10 +6,10 @@ typedef struct base_process_class base_process_class; -BOOL fpcDt_IsComplete(void); -s32 fpcDt_ToDeleteQ(base_process_class* pProc); -s32 fpcDt_ToQueue(base_process_class* pProc); -void fpcDt_Handler(void); -s32 fpcDt_Delete(void* pProc); +BOOL fpcDt_IsComplete(); +s32 fpcDt_ToDeleteQ(base_process_class* i_proc); +s32 fpcDt_ToQueue(base_process_class* i_proc); +void fpcDt_Handler(); +s32 fpcDt_Delete(void* i_proc); #endif diff --git a/include/f_pc/f_pc_draw.h b/include/f_pc/f_pc_draw.h index b62024269f..1d02d47b15 100644 --- a/include/f_pc/f_pc_draw.h +++ b/include/f_pc/f_pc_draw.h @@ -8,7 +8,7 @@ typedef struct base_process_class base_process_class; typedef int (*fpcDw_HandlerFunc)(void*, void*); typedef int (*fpcDw_HandlerFuncFunc)(fpcDw_HandlerFunc); -s32 fpcDw_Execute(base_process_class* pProc); -s32 fpcDw_Handler(fpcDw_HandlerFuncFunc param_1, fpcDw_HandlerFunc param_2); +s32 fpcDw_Execute(base_process_class* i_proc); +s32 fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func); -#endif \ No newline at end of file +#endif diff --git a/include/f_pc/f_pc_draw_priority.h b/include/f_pc/f_pc_draw_priority.h index 9608bd25d5..e6a48f5638 100644 --- a/include/f_pc/f_pc_draw_priority.h +++ b/include/f_pc/f_pc_draw_priority.h @@ -5,11 +5,11 @@ #include "dolphin/types.h" typedef struct draw_priority_class { - s16 mPriority; + s16 priority; } draw_priority_class; -s16 fpcDwPi_Get(const draw_priority_class* pDwPi); -void fpcDwPi_Set(draw_priority_class* pDwPi, s16 p); -void fpcDwPi_Init(draw_priority_class* pDwPi, s16 p); +s16 fpcDwPi_Get(const draw_priority_class* i_drawpriority); +void fpcDwPi_Set(draw_priority_class* i_drawpriority, s16 i_priority); +void fpcDwPi_Init(draw_priority_class* i_drawpriority, s16 i_priority); #endif diff --git a/include/f_pc/f_pc_executor.h b/include/f_pc/f_pc_executor.h index 53a19b986f..1ccaa2acc4 100644 --- a/include/f_pc/f_pc_executor.h +++ b/include/f_pc/f_pc_executor.h @@ -8,13 +8,13 @@ typedef struct base_process_class base_process_class; -base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData); -base_process_class* fpcEx_SearchByID(fpc_ProcID id); -BOOL fpcEx_IsExist(fpc_ProcID id); -s32 fpcEx_ToLineQ(base_process_class* pProc); -s32 fpcEx_ExecuteQTo(base_process_class* pProc); -s32 fpcEx_Execute(base_process_class* pProc); -s32 fpcEx_ToExecuteQ(base_process_class* pProc); -void fpcEx_Handler(fpcLnIt_QueueFunc pFunc); +base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc i_judgeFunc, void* i_data); +base_process_class* fpcEx_SearchByID(fpc_ProcID i_id); +BOOL fpcEx_IsExist(fpc_ProcID i_id); +s32 fpcEx_ToLineQ(base_process_class* i_proc); +s32 fpcEx_ExecuteQTo(base_process_class* i_proc); +s32 fpcEx_Execute(base_process_class* i_proc); +s32 fpcEx_ToExecuteQ(base_process_class* i_proc); +void fpcEx_Handler(fpcLnIt_QueueFunc i_queueFunc); #endif diff --git a/include/f_pc/f_pc_fstcreate_req.h b/include/f_pc/f_pc_fstcreate_req.h index 2aef06892a..fed7550c86 100644 --- a/include/f_pc/f_pc_fstcreate_req.h +++ b/include/f_pc/f_pc_fstcreate_req.h @@ -9,15 +9,14 @@ typedef struct layer_class layer_class; typedef int (*fstCreateFunc)(void*, void*); typedef struct fast_create_request { - /* 0x00 */ create_request mBase; - /* 0x48 */ fstCreateFunc mpFastCreateFunc; - /* 0x4C */ void* mpFastCreateData; + /* 0x00 */ create_request base; + /* 0x48 */ fstCreateFunc create_func; + /* 0x4C */ void* data; } fast_create_request; // Size: 0x50 -s32 fpcFCtRq_Do(fast_create_request* pFstCreateReq); -s32 fpcFCtRq_Delete(fast_create_request*); -base_process_class* fpcFCtRq_Request(layer_class* pLayer, s16 pProcTypeID, - fstCreateFunc pFastCreateFunc, void* pFastCreateData, - void* pData); +s32 fpcFCtRq_Do(fast_create_request* i_createReq); +s32 fpcFCtRq_Delete(fast_create_request* i_createReq); +base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procname, + fstCreateFunc i_createFunc, void* i_createData, void* i_append); -#endif \ No newline at end of file +#endif diff --git a/include/f_pc/f_pc_layer.h b/include/f_pc/f_pc_layer.h index 3930dfb49f..dfbef03b64 100644 --- a/include/f_pc/f_pc_layer.h +++ b/include/f_pc/f_pc_layer.h @@ -12,43 +12,43 @@ typedef struct process_method_tag_class process_method_tag_class; typedef struct process_node_class process_node_class; typedef struct layer_class { - /* 0x00 */ node_class mNode; - /* 0x0C */ u32 mLayerID; - /* 0x10 */ node_lists_tree_class mNodeListTree; - /* 0x18 */ process_node_class* mpPcNode; - /* 0x1C */ node_list_class mCancelList; + /* 0x00 */ node_class node; + /* 0x0C */ fpc_ProcID layer_id; + /* 0x10 */ node_lists_tree_class node_tree; + /* 0x18 */ process_node_class* process_node; + /* 0x1C */ node_list_class cancel_list; struct { - /* 0x28 */ s16 mCreatingCount; - /* 0x2A */ s16 mDeletingCount; + /* 0x28 */ s16 create_count; + /* 0x2A */ s16 delete_count; } counts; } layer_class; -void fpcLy_SetCurrentLayer(layer_class* pLayer); -layer_class* fpcLy_CurrentLayer(void); -layer_class* fpcLy_RootLayer(void); -layer_class* fpcLy_Layer(fpc_ProcID id); -layer_class* fpcLy_Search(fpc_ProcID id); -void fpcLy_Regist(layer_class* pLayer); +void fpcLy_SetCurrentLayer(layer_class* i_layer); +layer_class* fpcLy_CurrentLayer(); +layer_class* fpcLy_RootLayer(); +layer_class* fpcLy_Layer(fpc_ProcID i_id); +layer_class* fpcLy_Search(fpc_ProcID i_id); +void fpcLy_Regist(layer_class* i_layer); -void fpcLy_CreatedMesg(layer_class* pLayer); -void fpcLy_CreatingMesg(layer_class* pLayer); -void fpcLy_DeletedMesg(layer_class* pLayer); -void fpcLy_DeletingMesg(layer_class* pLayer); -BOOL fpcLy_IsCreatingMesg(layer_class* pLayer); -BOOL fpcLy_IsDeletingMesg(layer_class* pLayer); +void fpcLy_CreatedMesg(layer_class* i_layer); +void fpcLy_CreatingMesg(layer_class* i_layer); +void fpcLy_DeletedMesg(layer_class* i_layer); +void fpcLy_DeletingMesg(layer_class* i_layer); +BOOL fpcLy_IsCreatingMesg(layer_class* i_layer); +BOOL fpcLy_IsDeletingMesg(layer_class* i_layer); -s32 fpcLy_IntoQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag, int idx); -s32 fpcLy_ToQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag); -s32 fpcLy_QueueTo(layer_class* pLayer, create_tag_class* pTag); +s32 fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no); +s32 fpcLy_ToQueue(layer_class* i_layer, int treeListIdx, create_tag_class* i_createTag); +s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag); -void fpcLy_Cancel(layer_class* pLayer); -bool fpcLy_CancelMethod(process_method_tag_class* pLayer); +int fpcLy_Cancel(layer_class* i_layer); +bool fpcLy_CancelMethod(process_method_tag_class* i_layer); -void fpcLy_CancelQTo(process_method_tag_class* pMthd); -s32 fpcLy_ToCancelQ(layer_class* pLayer, process_method_tag_class* pMthd); +void fpcLy_CancelQTo(process_method_tag_class* i_methods); +s32 fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods); -void fpcLy_Create(layer_class* pLayer, void* pPcNode, node_list_class* pLists, int listNum); +void fpcLy_Create(layer_class* i_layer, void* i_node, node_list_class* i_nodeList, int i_numLists); -s32 fpcLy_Delete(layer_class* pLayer); +s32 fpcLy_Delete(layer_class* i_layer); #endif diff --git a/include/f_pc/f_pc_layer_iter.h b/include/f_pc/f_pc_layer_iter.h index 25f75a0348..2fb33ad90e 100644 --- a/include/f_pc/f_pc_layer_iter.h +++ b/include/f_pc/f_pc_layer_iter.h @@ -6,16 +6,16 @@ typedef struct layer_class layer_class; typedef struct layer_iter { - void* mpFunc; - void* mpUserData; + /* 0x0 */ void* func; + /* 0x4 */ void* data; } layer_iter; typedef int (*fpcLyIt_OnlyHereFunc)(void*, void*); typedef void* (*fpcLyIt_JudgeFunc)(void*, void*); -s32 fpcLyIt_OnlyHere(layer_class* pLayer, fpcLyIt_OnlyHereFunc pFunc, void* pUserData); -s32 fpcLyIt_OnlyHereLY(layer_class* pLayer, fpcLyIt_OnlyHereFunc pFunc, void* pUserData); -void* fpcLyIt_Judge(layer_class* pLayer, fpcLyIt_JudgeFunc pFunc, void* pUserData); -void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc pFunc, void* pUserData); +s32 fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data); +s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data); +void* fpcLyIt_Judge(layer_class* i_layer, fpcLyIt_JudgeFunc i_func, void* i_data); +void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc i_func, void* i_data); #endif diff --git a/include/f_pc/f_pc_layer_tag.h b/include/f_pc/f_pc_layer_tag.h index 4818deba99..9d72545ab3 100644 --- a/include/f_pc/f_pc_layer_tag.h +++ b/include/f_pc/f_pc_layer_tag.h @@ -15,16 +15,17 @@ typedef struct layer_class layer_class; typedef struct layer_management_tag_class { - create_tag_class mCreateTag; - layer_class* mpLayer; - u16 mNodeListID; - u16 mNodeListIdx; + /* 0x00 */ create_tag_class create_tag; + /* 0x14 */ layer_class* layer; + /* 0x18 */ u16 node_list_id; + /* 0x1A */ u16 node_list_priority; } layer_management_tag_class; -s32 fpcLyTg_QueueTo(layer_management_tag_class* pTag); -s32 fpcLyTg_ToQueue(layer_management_tag_class* pTag, unsigned int layerID, u16 listID, - u16 listPrio); -s32 fpcLyTg_Move(layer_management_tag_class*, unsigned int, u16, u16); -s32 fpcLyTg_Init(layer_management_tag_class*, unsigned int, void*); +s32 fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag); +s32 fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, unsigned int i_layerID, u16 i_listID, + u16 i_listPriority); +s32 fpcLyTg_Move(layer_management_tag_class* i_layer_tag, unsigned int i_layerID, u16 i_listID, + u16 i_listPriority); +s32 fpcLyTg_Init(layer_management_tag_class* i_layer_tag, unsigned int i_id, void* i_data); #endif diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h index a348a7e008..c2cfb1090e 100644 --- a/include/f_pc/f_pc_leaf.h +++ b/include/f_pc/f_pc_leaf.h @@ -9,31 +9,31 @@ #include "d/d_procname.h" typedef struct leafdraw_method_class { - /* 0x00 */ process_method_class mBase; - /* 0x10 */ process_method_func mpDrawFunc; + /* 0x00 */ process_method_class base; + /* 0x10 */ process_method_func draw_method; } leafdraw_method_class; typedef struct leafdraw_class { - /* 0x00 */ base_process_class mBase; - /* 0xB8 */ leafdraw_method_class* mpDrawMtd; - /* 0xBC */ s8 mbUnk0; - /* 0xBD */ u8 mbUnk1; - /* 0xBE */ draw_priority_class mDwPi; + /* 0x00 */ base_process_class base; + /* 0xB8 */ leafdraw_method_class* leaf_methods; + /* 0xBC */ s8 unk_0xBC; + /* 0xBD */ u8 unk_0xBD; + /* 0xBE */ draw_priority_class draw_priority; } leafdraw_class; typedef struct leaf_process_profile_definition { - /* 0x00 */ process_profile_definition mBase; + /* 0x00 */ process_profile_definition base; /* 0x1C */ leafdraw_method_class* sub_method; // Subclass methods - /* 0x20 */ s16 mPriority; // mDrawPriority + /* 0x20 */ s16 priority; // mDrawPriority } leaf_process_profile_definition; -s16 fpcLf_GetPriority(const leafdraw_class* pLeaf); -s32 fpcLf_DrawMethod(leafdraw_method_class* pMthd, void* pUserData); -s32 fpcLf_Draw(leafdraw_class* pMthd); -s32 fpcLf_Execute(leafdraw_class* pLeaf); -s32 fpcLf_IsDelete(leafdraw_class* pLeaf); -s32 fpcLf_Delete(leafdraw_class* pLeaf); -s32 fpcLf_Create(leafdraw_class* pLeaf); +s16 fpcLf_GetPriority(const leafdraw_class* i_leaf); +s32 fpcLf_DrawMethod(leafdraw_method_class* i_method, void* i_process); +s32 fpcLf_Draw(leafdraw_class* i_method); +s32 fpcLf_Execute(leafdraw_class* i_leaf); +s32 fpcLf_IsDelete(leafdraw_class* i_leaf); +s32 fpcLf_Delete(leafdraw_class* i_leaf); +s32 fpcLf_Create(leafdraw_class* i_leaf); extern int g_fpcLf_type; extern leafdraw_method_class g_fpcLf_Method; diff --git a/include/f_pc/f_pc_line.h b/include/f_pc/f_pc_line.h index 82a45f3804..47a8018792 100644 --- a/include/f_pc/f_pc_line.h +++ b/include/f_pc/f_pc_line.h @@ -3,8 +3,8 @@ #include "SSystem/SComponent/c_tree.h" -void fpcLn_Create(void); +void fpcLn_Create(); extern node_lists_tree_class g_fpcLn_Queue; -#endif \ No newline at end of file +#endif diff --git a/include/f_pc/f_pc_line_tag.h b/include/f_pc/f_pc_line_tag.h index 299c6145e9..86eccf0011 100644 --- a/include/f_pc/f_pc_line_tag.h +++ b/include/f_pc/f_pc_line_tag.h @@ -5,13 +5,13 @@ #include "SSystem/SComponent/c_tag.h" typedef struct line_tag { - create_tag_class mBase; - s32 mLineListID; + /* 0x00 */ create_tag_class base; + /* 0x14 */ int list_id; } line_tag; -s32 fpcLnTg_Move(line_tag* pLineTag, int newLineListID); -void fpcLnTg_QueueTo(line_tag* pLineTag); -s32 fpcLnTg_ToQueue(line_tag* pLineTag, int lineListID); -void fpcLnTg_Init(line_tag* pLineTag, void* pData); +s32 fpcLnTg_Move(line_tag* i_lineTag, int i_newListID); +void fpcLnTg_QueueTo(line_tag* i_lineTag); +s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID); +void fpcLnTg_Init(line_tag* i_lineTag, void* i_data); #endif diff --git a/include/f_pc/f_pc_load.h b/include/f_pc/f_pc_load.h index 3fdbdf56a3..e36bfcf60b 100644 --- a/include/f_pc/f_pc_load.h +++ b/include/f_pc/f_pc_load.h @@ -4,9 +4,9 @@ #include "dolphin/types.h" -BOOL fpcLd_Use(s16 procName); -s32 fpcLd_IsLoaded(s16 procName); -void fpcLd_Free(s16 procName); -s32 fpcLd_Load(s16 procName); +BOOL fpcLd_Use(s16 i_procName); +BOOL fpcLd_IsLoaded(s16 i_procName); +void fpcLd_Free(s16 i_procName); +s32 fpcLd_Load(s16 i_procName); #endif diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 8570b61378..a9ac53dff6 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -16,51 +16,53 @@ typedef int (*FastCreateReqFunc)(void*); typedef void (*fpcM_ManagementFunc)(void); typedef int (*fpcM_DrawIteraterFunc)(void*, void*); -inline fpc_ProcID fpcM_GetID(const void* pProc) { - return pProc != NULL ? ((base_process_class*)pProc)->mBsPcId : fpcM_ERROR_PROCESS_ID_e; -} -inline s16 fpcM_GetName(const void* pActor) { - return ((base_process_class*)pActor)->mProcName; -} -inline u32 fpcM_GetParam(const void* pActor) { - return ((base_process_class*)pActor)->mParameters; +inline fpc_ProcID fpcM_GetID(const void* i_process) { + return i_process != NULL ? ((base_process_class*)i_process)->id : fpcM_ERROR_PROCESS_ID_e; } -inline void fpcM_SetParam(void* p_actor, u32 param) { - ((base_process_class*)p_actor)->mParameters = param; +inline s16 fpcM_GetName(const void* i_process) { + return ((base_process_class*)i_process)->name; } -inline s16 fpcM_GetProfName(const void* pActor) { - return ((base_process_class*)pActor)->mBsTypeId; +inline u32 fpcM_GetParam(const void* i_process) { + return ((base_process_class*)i_process)->parameters; } -inline int fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process) { - return fpcSCtRq_Request(fpcLy_CurrentLayer(), procName, (stdCreateFunc)createFunc, NULL, - process); +inline void fpcM_SetParam(void* i_process, u32 param) { + ((base_process_class*)i_process)->parameters = param; } -inline s16 fpcM_DrawPriority(const void* param_0) { - return (s16)fpcLf_GetPriority((const leafdraw_class*)param_0); +inline s16 fpcM_GetProfName(const void* i_process) { + return ((base_process_class*)i_process)->profname; } -inline s32 fpcM_ChangeLayerID(void* proc, int layerID) { - return fpcPi_Change(&((base_process_class*)proc)->mPi, layerID, 0xFFFD, 0xFFFD); +inline fpc_ProcID fpcM_Create(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_append) { + return fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, (stdCreateFunc)i_createFunc, NULL, + i_append); } -inline s32 fpcM_IsJustType(int type1, int type2) { - return fpcBs_Is_JustOfType(type1, type2); +inline s16 fpcM_DrawPriority(const void* i_process) { + return (s16)fpcLf_GetPriority((const leafdraw_class*)i_process); } -inline bool fpcM_IsFirstCreating(void* proc) { - return ((base_process_class*)proc)->mInitState == 0; +inline s32 fpcM_ChangeLayerID(void* i_process, int i_layerID) { + return fpcPi_Change(&((base_process_class*)i_process)->priority, i_layerID, 0xFFFD, 0xFFFD); } -inline process_profile_definition* fpcM_GetProfile(void* proc) { - return (process_profile_definition*)((base_process_class*)proc)->mpProf; +inline BOOL fpcM_IsJustType(int i_typeA, int i_typeB) { + return fpcBs_Is_JustOfType(i_typeA, i_typeB); } -inline void* fpcM_GetAppend(const void* proc) { - return ((base_process_class*)proc)->mpUserData; +inline bool fpcM_IsFirstCreating(void* i_process) { + return ((base_process_class*)i_process)->init_state == 0; +} + +inline process_profile_definition* fpcM_GetProfile(void* i_process) { + return ((base_process_class*)i_process)->profile; +} + +inline void* fpcM_GetAppend(const void* i_process) { + return ((base_process_class*)i_process)->append; } inline BOOL fpcM_IsExecuting(fpc_ProcID id) { @@ -68,29 +70,33 @@ inline BOOL fpcM_IsExecuting(fpc_ProcID id) { } inline void* fpcM_LyJudge(process_node_class* i_node, fpcLyIt_JudgeFunc i_func, void* i_data) { - return fpcLyIt_Judge(&i_node->mLayer, i_func, i_data); + return fpcLyIt_Judge(&i_node->layer, i_func, i_data); } -inline base_process_class* fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) { - return fpcEx_Search(pFunc, pUserData); +inline base_process_class* fpcM_Search(fpcLyIt_JudgeFunc i_func, void* i_data) { + return fpcEx_Search(i_func, i_data); } inline base_process_class* fpcM_SearchByName(s16 name) { return (base_process_class*)fpcLyIt_AllJudge(fpcSch_JudgeForPName, &name); } -void fpcM_Draw(void* pProc); -s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc); -s32 fpcM_Execute(void* pProc); -s32 fpcM_Delete(void* pProc); -BOOL fpcM_IsCreating(fpc_ProcID pID); -void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2); +inline base_process_class* fpcM_SearchByID(fpc_ProcID i_id) { + return fpcEx_SearchByID(i_id); +} + +void fpcM_Draw(void* i_process); +s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc); +s32 fpcM_Execute(void* i_process); +s32 fpcM_Delete(void* i_process); +BOOL fpcM_IsCreating(fpc_ProcID i_id); +void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_postExecuteFn); void fpcM_Init(); -base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, - void* pData); -s32 fpcM_IsPause(void* pProc, u8 param_2); -void fpcM_PauseEnable(void* pProc, u8 param_2); -void fpcM_PauseDisable(void* pProc, u8 param_2); -void* fpcM_JudgeInLayer(fpc_ProcID pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData); +base_process_class* fpcM_FastCreate(s16 i_procname, FastCreateReqFunc i_createReqFunc, + void* i_createData, void* i_append); +s32 fpcM_IsPause(void* i_process, u8 i_flag); +void fpcM_PauseEnable(void* i_process, u8 i_flag); +void fpcM_PauseDisable(void* i_process, u8 i_flag); +void* fpcM_JudgeInLayer(fpc_ProcID i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data); #endif diff --git a/include/f_pc/f_pc_method.h b/include/f_pc/f_pc_method.h index aa7e98dda7..1a9dfa9d33 100644 --- a/include/f_pc/f_pc_method.h +++ b/include/f_pc/f_pc_method.h @@ -7,21 +7,16 @@ typedef int (*process_method_func)(void*); typedef struct process_method_class { - process_method_func mpCreateFunc; - process_method_func mpDeleteFunc; - process_method_func mpExecuteFunc; - process_method_func mpIsDeleteFunc; + /* 0x0 */ process_method_func create_method; + /* 0x4 */ process_method_func delete_method; + /* 0x8 */ process_method_func execute_method; + /* 0xC */ process_method_func is_delete_method; } process_method_class; -s32 fpcMtd_Method(process_method_func pFunc, void* pUserData); -s32 fpcMtd_Execute(process_method_class* pMthd, void* pUserData); -s32 fpcMtd_IsDelete(process_method_class* pMthd, void* pUserData); -s32 fpcMtd_Delete(process_method_class* pMthd, void* pUserData); -s32 fpcMtd_Create(process_method_class* pMthd, void* pUserData); - -extern "C" { -void fpcMtd_Execute__FP20process_method_classPv(void); -void fpcMtd_Create__FP20process_method_classPv(void); -} +s32 fpcMtd_Method(process_method_func i_method, void* i_process); +s32 fpcMtd_Execute(process_method_class* i_methods, void* i_process); +s32 fpcMtd_IsDelete(process_method_class* i_methods, void* i_process); +s32 fpcMtd_Delete(process_method_class* i_methods, void* i_process); +s32 fpcMtd_Create(process_method_class* i_methods, void* i_process); #endif diff --git a/include/f_pc/f_pc_method_iter.h b/include/f_pc/f_pc_method_iter.h index 633aaced54..c858382546 100644 --- a/include/f_pc/f_pc_method_iter.h +++ b/include/f_pc/f_pc_method_iter.h @@ -8,6 +8,6 @@ typedef struct node_list_class node_list_class; typedef int (*fpcMtdIt_MethodFunc)(void*); -void fpcMtdIt_Method(node_list_class* pList, fpcMtdIt_MethodFunc pMethod); +int fpcMtdIt_Method(node_list_class* pList, fpcMtdIt_MethodFunc pMethod); #endif diff --git a/include/f_pc/f_pc_method_tag.h b/include/f_pc/f_pc_method_tag.h index 54fd6c7d5a..9f2e7918dc 100644 --- a/include/f_pc/f_pc_method_tag.h +++ b/include/f_pc/f_pc_method_tag.h @@ -7,14 +7,14 @@ typedef int (*process_method_tag_func)(void*); typedef struct process_method_tag_class { - create_tag_class mCreateTag; - process_method_tag_func mpFunc; - void* mpMthdData; + /* 0x00 */ create_tag_class create_tag; + /* 0x14 */ process_method_tag_func method; + /* 0x18 */ void* data; } process_method_tag_class; -s32 fpcMtdTg_Do(process_method_tag_class* pMthd); -s32 fpcMtdTg_ToMethodQ(node_list_class* pList, process_method_tag_class* pMthd); -void fpcMtdTg_MethodQTo(process_method_tag_class* pMthd); -s32 fpcMtdTg_Init(process_method_tag_class* pMthd, process_method_tag_func pFunc, void* pMthdData); +s32 fpcMtdTg_Do(process_method_tag_class* i_methodTag); +s32 fpcMtdTg_ToMethodQ(node_list_class* i_nodelist, process_method_tag_class* i_methodTag); +void fpcMtdTg_MethodQTo(process_method_tag_class* i_methodTag); +s32 fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_method, void* i_data); #endif diff --git a/include/f_pc/f_pc_node.h b/include/f_pc/f_pc_node.h index 4360156bf9..840c1cd0aa 100644 --- a/include/f_pc/f_pc_node.h +++ b/include/f_pc/f_pc_node.h @@ -8,21 +8,21 @@ #include "f_pc/f_pc_profile.h" typedef struct nodedraw_method_class { - process_method_class mBase; - process_method_func mpDrawFunc; + /* 0x00 */ process_method_class base; + /* 0x10 */ process_method_func draw_method; } nodedraw_method_class; typedef struct process_node_class { - /* 0x00 */ base_process_class mBase; - /* 0xB8 */ nodedraw_method_class* mpNodeMtd; - /* 0xBC */ layer_class mLayer; - /* 0xE8 */ node_list_class mLayerNodeLists[16]; - /* 0x1A8 */ s8 mUnk0; + /* 0x000 */ base_process_class base; + /* 0x0B8 */ nodedraw_method_class* nodedraw_method; + /* 0x0BC */ layer_class layer; + /* 0x0E8 */ node_list_class layer_nodelist[16]; + /* 0x1A8 */ s8 unk_0x1A8; } process_node_class; typedef struct node_process_profile_definition { - /* 0x00 */ process_profile_definition mBase; - /* 0x1C */ process_method_class* sub_method; // Subclass methods + /* 0x00 */ process_profile_definition base; + /* 0x1C */ process_method_class* sub_methods; } node_process_profile_definition; s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData); diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h index bc8f13327f..4491bc6850 100644 --- a/include/f_pc/f_pc_node_req.h +++ b/include/f_pc/f_pc_node_req.h @@ -10,62 +10,63 @@ typedef struct layer_class layer_class; typedef struct process_node_class process_node_class; typedef struct node_create_request_method_class { - process_method_func mpExecuteFunc; - process_method_func mpCancelFunc; - process_method_func mpUnkFunc; - process_method_func mpPostMethodFunc; + /* 0x0 */ process_method_func execute_method; + /* 0x4 */ process_method_func cancel_method; + /* 0x8 */ process_method_func delete_method; + /* 0xC */ process_method_func post_method; } node_create_request_method_class; + // needed to match struct copy typedef struct unk_process_node_class { - process_node_class* mpNodeProc; - u32 mProcId; + /* 0x0 */ process_node_class* node; + /* 0x4 */ fpc_ProcID id; } unk_process_node_class; typedef struct node_create_request { - create_tag_class mCreateTag; - process_method_tag_class mProcMthCls; - request_of_phase_process_class mReqPhsProc; - cPhs__Handler* mpPhsHandler; - node_create_request_method_class* mpNodeCrReqMthCls; - s32 mParameter; - s32 mRequestId; - unk_process_node_class mNodeProc; - layer_class* mpLayerClass; - u32 mCreatingID; - s16 mProcName; - void* mpUserData; - s16 unk_0x60; - + /* 0x00 */ create_tag_class create_tag; + /* 0x14 */ process_method_tag_class method_tag; + /* 0x30 */ request_of_phase_process_class phase_request; + /* 0x38 */ cPhs__Handler* phase_handler; + /* 0x3C */ node_create_request_method_class* create_req_methods; + /* 0x40 */ s32 parameters; + /* 0x44 */ fpc_ProcID request_id; + /* 0x48 */ unk_process_node_class node_proc; + /* 0x50 */ layer_class* layer; + /* 0x54 */ fpc_ProcID creating_id; + /* 0x58 */ s16 name; + /* 0x5C */ void* data; + /* 0x60 */ s16 unk_0x60; } node_create_request; // Size: 0x64 typedef struct request_node_class { - node_class mBase; - node_create_request* mNodeCrReq; + /* 0x0 */ node_class node; + /* 0x4 */ node_create_request* node_create_req; } request_node_class; -void fpcNdRq_RequestQTo(node_create_request* pNodeCreateReq); -void fpcNdRq_ToRequestQ(node_create_request* pNodeCreateReq); -s32 fpcNdRq_phase_IsCreated(node_create_request* pNodeCreateReq); -s32 fpcNdRq_phase_Create(node_create_request* pNodeCreateReq); -s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* pNodeCreateReq); -s32 fpcNdRq_phase_IsDeleted(node_create_request* pNodeCreateReq); -s32 fpcNdRq_phase_Delete(node_create_request* pNodeCreateReq); -s32 fpcNdRq_DoPhase(node_create_request* pNodeCreateReq); -s32 fpcNdRq_Execute(node_create_request* pNodeCreateReq); -s32 fpcNdRq_Delete(node_create_request* pNodeCreateReq); -s32 fpcNdRq_Cancel(node_create_request* pNodeCreateReq); -s32 fpcNdRq_Handler(void); -s32 fpcNdRq_IsPossibleTarget(process_node_class* pProcNode); -s32 fpcNdRq_IsIng(process_node_class* pProcNode); -node_create_request* fpcNdRq_Create(u32 pRequestSize); -node_create_request* fpcNdRq_ChangeNode(u32 pRequestSize, process_node_class* pProcNode, - s16 param_3, void* param_4); -node_create_request* fpcNdRq_DeleteNode(u32 pRequestSize, process_node_class* pProcNode); -node_create_request* fpcNdRq_CreateNode(u32 pRequestSize, s16 param_2, void* param_3); +void fpcNdRq_RequestQTo(node_create_request* i_request); +void fpcNdRq_ToRequestQ(node_create_request* i_request); +s32 fpcNdRq_phase_IsCreated(node_create_request* i_request); +s32 fpcNdRq_phase_Create(node_create_request* i_request); +s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request); +s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request); +s32 fpcNdRq_phase_Delete(node_create_request* i_request); +s32 fpcNdRq_DoPhase(node_create_request* i_request); +s32 fpcNdRq_Execute(node_create_request* i_request); +s32 fpcNdRq_Delete(node_create_request* i_request); +s32 fpcNdRq_Cancel(node_create_request* i_request); +s32 fpcNdRq_Handler(); +s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode); +s32 fpcNdRq_IsIng(process_node_class* i_procNode); +node_create_request* fpcNdRq_Create(u32 i_requestSize); +node_create_request* fpcNdRq_ChangeNode(u32 i_requestSize, process_node_class* i_procNode, + s16 i_procName, void* i_data); +node_create_request* fpcNdRq_DeleteNode(u32 i_requestSize, process_node_class* i_procNode); +node_create_request* fpcNdRq_CreateNode(u32 i_requestSize, s16 i_procName, void* i_data); node_create_request* -fpcNdRq_Request(u32 param_1, int param_2, process_node_class* param_3, s16 param_4, - void* param_5, node_create_request_method_class* pNodeCreateRequestMethodClass); -s32 fpcNdRq_ReChangeNode(fpc_ProcID pRequestId, s16 param_2, void* param_3); -s32 fpcNdRq_ReRequest(fpc_ProcID pRequestId, s16 param_2, void* param_3); +fpcNdRq_Request(u32 i_requestSize, int i_reqType, + process_node_class* i_procNode, s16 i_procName, void* i_data, + node_create_request_method_class* i_create_req_methods); +s32 fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data); +s32 fpcNdRq_ReRequest(fpc_ProcID i_requestID, s16 i_procName, void* i_data); #endif diff --git a/include/f_pc/f_pc_priority.h b/include/f_pc/f_pc_priority.h index d319d2420c..bbb0f469be 100644 --- a/include/f_pc/f_pc_priority.h +++ b/include/f_pc/f_pc_priority.h @@ -7,19 +7,20 @@ enum { fpcPi_CURRENT_e = 0xFFFD, fpcPi_SPECIAL_e = 0xFFFE, + fpcPi_NONE_e = 0xFFFF, }; typedef struct process_priority_queue_info { - u32 mLayer; - u16 mListID; - u16 mListPrio; + /* 0x0 */ unsigned int layer_id; + /* 0x4 */ u16 list_id; + /* 0x6 */ u16 list_priority; } process_priority_queue_info; typedef struct process_priority_class { - /* 0x00 */ create_tag_class mBase; - /* 0x14 */ process_method_tag_class mMtdTag; - /* 0x30 */ process_priority_queue_info mInfoQ; - /* 0x38 */ process_priority_queue_info mInfoCurr; + /* 0x00 */ create_tag_class base; + /* 0x14 */ process_method_tag_class method_tag; + /* 0x30 */ process_priority_queue_info queue_info; + /* 0x38 */ process_priority_queue_info current_info; } process_priority_class; s32 fpcPi_IsInQueue(process_priority_class* pPi); diff --git a/include/f_pc/f_pc_profile.h b/include/f_pc/f_pc_profile.h index 9418d9f645..399e11460f 100644 --- a/include/f_pc/f_pc_profile.h +++ b/include/f_pc/f_pc_profile.h @@ -9,20 +9,20 @@ typedef struct leafdraw_method_class leafdraw_method_class; typedef struct process_method_class process_method_class; typedef struct process_profile_definition { - /* 0x00 */ s32 mLayerID; - /* 0x04 */ u16 mListID; - /* 0x06 */ u16 mListPrio; - /* 0x08 */ s16 mProcName; - /* 0x0C */ process_method_class* sub_method; // Subclass methods - /* 0x10 */ s32 mSize; - /* 0x14 */ s32 mSizeOther; - /* 0x18 */ s32 mParameters; + /* 0x00 */ unsigned int layer_id; + /* 0x04 */ u16 list_id; + /* 0x06 */ u16 list_priority; + /* 0x08 */ s16 name; + /* 0x0C */ process_method_class* methods; + /* 0x10 */ u32 process_size; + /* 0x14 */ u32 unk_size; + /* 0x18 */ u32 parameters; } process_profile_definition; #define LAYER_DEFAULT (-2) struct leaf_process_profile_definition; -process_profile_definition* fpcPf_Get(s16 profileID); +process_profile_definition* fpcPf_Get(s16 i_profname); extern process_profile_definition** g_fpcPf_ProfileList_p; #endif diff --git a/include/f_pc/f_pc_profile_lst.h b/include/f_pc/f_pc_profile_lst.h new file mode 100644 index 0000000000..f768d3e118 --- /dev/null +++ b/include/f_pc/f_pc_profile_lst.h @@ -0,0 +1,801 @@ +#ifndef F_PC_PROFILE_LST_H_ +#define F_PC_PROFILE_LST_H_ + +#include "f_pc/f_pc_profile.h" + +extern process_profile_definition g_profile_ALINK; +extern process_profile_definition g_profile_NO_CHG_ROOM; +extern process_profile_definition g_profile_ITEM; +extern process_profile_definition g_profile_CAMERA; +extern process_profile_definition g_profile_CAMERA2; +extern process_profile_definition g_profile_ENVSE; +extern process_profile_definition g_profile_GAMEOVER; +extern process_profile_definition g_profile_KANKYO; +extern process_profile_definition g_profile_KYEFF; +extern process_profile_definition g_profile_KYEFF2; +extern process_profile_definition g_profile_KY_THUNDER; +extern process_profile_definition g_profile_MENUWINDOW; +extern process_profile_definition g_profile_METER2; +extern process_profile_definition g_profile_MSG_OBJECT; +extern process_profile_definition g_profile_OVERLAP0; +extern process_profile_definition g_profile_OVERLAP1; +extern process_profile_definition g_profile_OVERLAP6; +extern process_profile_definition g_profile_OVERLAP7; +extern process_profile_definition g_profile_OVERLAP8; +extern process_profile_definition g_profile_OVERLAP9; +extern process_profile_definition g_profile_OVERLAP10; +extern process_profile_definition g_profile_OVERLAP11; +extern process_profile_definition g_profile_OVERLAP2; +extern process_profile_definition g_profile_OVERLAP3; +extern process_profile_definition g_profile_LOGO_SCENE; +extern process_profile_definition g_profile_MENU_SCENE; +extern process_profile_definition g_profile_NAME_SCENE; +extern process_profile_definition g_profile_NAMEEX_SCENE; +extern process_profile_definition g_profile_PLAY_SCENE; +extern process_profile_definition g_profile_OPENING_SCENE; +extern process_profile_definition g_profile_ROOM_SCENE; +extern process_profile_definition g_profile_WARNING_SCENE; +extern process_profile_definition g_profile_WARNING2_SCENE; +extern process_profile_definition g_profile_TIMER; +extern process_profile_definition g_profile_WMARK; +extern process_profile_definition g_profile_WPILLAR; +extern process_profile_definition g_profile_ANDSW; +extern process_profile_definition g_profile_BG; +extern process_profile_definition g_profile_BG_OBJ; +extern process_profile_definition g_profile_DMIDNA; +extern process_profile_definition g_profile_DBDOOR; +extern process_profile_definition g_profile_KNOB20; +extern process_profile_definition g_profile_DOOR20; +extern process_profile_definition g_profile_SPIRAL_DOOR; +extern process_profile_definition g_profile_DSHUTTER; +extern process_profile_definition g_profile_EP; +extern process_profile_definition g_profile_HITOBJ; +extern process_profile_definition g_profile_KYTAG00; +extern process_profile_definition g_profile_KYTAG04; +extern process_profile_definition g_profile_KYTAG17; +extern process_profile_definition g_profile_OBJ_BEF; +extern process_profile_definition g_profile_Obj_BurnBox; +extern process_profile_definition g_profile_Obj_Carry; +extern process_profile_definition g_profile_OBJ_ITO; +extern process_profile_definition g_profile_Obj_Movebox; +extern process_profile_definition g_profile_Obj_Swpush; +extern process_profile_definition g_profile_Obj_Timer; +extern process_profile_definition g_profile_PATH_LINE; +extern process_profile_definition g_profile_SCENE_EXIT; +extern process_profile_definition g_profile_SET_BG_OBJ; +extern process_profile_definition g_profile_SWHIT0; +extern process_profile_definition g_profile_TAG_ALLMATO; +extern process_profile_definition g_profile_TAG_CAMERA; +extern process_profile_definition g_profile_TAG_CHKPOINT; +extern process_profile_definition g_profile_TAG_EVENT; +extern process_profile_definition g_profile_TAG_EVT; +extern process_profile_definition g_profile_TAG_EVTAREA; +extern process_profile_definition g_profile_TAG_EVTMSG; +extern process_profile_definition g_profile_TAG_HOWL; +extern process_profile_definition g_profile_TAG_KMSG; +extern process_profile_definition g_profile_TAG_LANTERN; +extern process_profile_definition g_profile_Tag_Mist; +extern process_profile_definition g_profile_TAG_MSG; +extern process_profile_definition g_profile_TAG_PUSH; +extern process_profile_definition g_profile_TAG_TELOP; +extern process_profile_definition g_profile_TBOX; +extern process_profile_definition g_profile_TBOX2; +extern process_profile_definition g_profile_VRBOX; +extern process_profile_definition g_profile_VRBOX2; +extern process_profile_definition g_profile_ARROW; +extern process_profile_definition g_profile_BOOMERANG; +extern process_profile_definition g_profile_CROD; +extern process_profile_definition g_profile_DEMO00; +extern process_profile_definition g_profile_DISAPPEAR; +extern process_profile_definition g_profile_MG_ROD; +extern process_profile_definition g_profile_MIDNA; +extern process_profile_definition g_profile_NBOMB; +extern process_profile_definition g_profile_Obj_LifeContainer; +extern process_profile_definition g_profile_Obj_Yousei; +extern process_profile_definition g_profile_SPINNER; +extern process_profile_definition g_profile_SUSPEND; +extern process_profile_definition g_profile_Tag_Attp; +extern process_profile_definition g_profile_ALLDIE; +extern process_profile_definition g_profile_ANDSW2; +extern process_profile_definition g_profile_BD; +extern process_profile_definition g_profile_CANOE; +extern process_profile_definition g_profile_CSTAF; +extern process_profile_definition g_profile_Demo_Item; +extern process_profile_definition g_profile_L1BOSS_DOOR; +extern process_profile_definition g_profile_E_DN; +extern process_profile_definition g_profile_E_FM; +extern process_profile_definition g_profile_E_GA; +extern process_profile_definition g_profile_E_HB; +extern process_profile_definition g_profile_E_NEST; +extern process_profile_definition g_profile_E_RD; +extern process_profile_definition g_profile_ECONT; +extern process_profile_definition g_profile_FR; +extern process_profile_definition g_profile_GRASS; +extern process_profile_definition g_profile_KYTAG05; +extern process_profile_definition g_profile_KYTAG10; +extern process_profile_definition g_profile_KYTAG11; +extern process_profile_definition g_profile_KYTAG14; +extern process_profile_definition g_profile_MG_FISH; +extern process_profile_definition g_profile_NPC_BESU; +extern process_profile_definition g_profile_NPC_FAIRY_SEIREI; +extern process_profile_definition g_profile_NPC_FISH; +extern process_profile_definition g_profile_NPC_HENNA; +extern process_profile_definition g_profile_NPC_KAKASHI; +extern process_profile_definition g_profile_NPC_KKRI; +extern process_profile_definition g_profile_NPC_KOLIN; +extern process_profile_definition g_profile_NPC_MARO; +extern process_profile_definition g_profile_NPC_TARO; +extern process_profile_definition g_profile_NPC_TKJ; +extern process_profile_definition g_profile_Obj_BHASHI; +extern process_profile_definition g_profile_Obj_BkDoor; +extern process_profile_definition g_profile_Obj_BossWarp; +extern process_profile_definition g_profile_Obj_Cboard; +extern process_profile_definition g_profile_Obj_Digpl; +extern process_profile_definition g_profile_Obj_Eff; +extern process_profile_definition g_profile_OBJ_FMOBJ; +extern process_profile_definition g_profile_Obj_GpTaru; +extern process_profile_definition g_profile_Obj_HHASHI; +extern process_profile_definition g_profile_OBJ_KANBAN2; +extern process_profile_definition g_profile_OBJ_KBACKET; +extern process_profile_definition g_profile_Obj_KkrGate; +extern process_profile_definition g_profile_Obj_KLift00; +extern process_profile_definition g_profile_Tag_KtOnFire; +extern process_profile_definition g_profile_Obj_Ladder; +extern process_profile_definition g_profile_Obj_Lv2Candle; +extern process_profile_definition g_profile_Obj_MagneArm; +extern process_profile_definition g_profile_Obj_MetalBox; +extern process_profile_definition g_profile_Obj_MGate; +extern process_profile_definition g_profile_Obj_NamePlate; +extern process_profile_definition g_profile_Obj_OnCloth; +extern process_profile_definition g_profile_Obj_RopeBridge; +extern process_profile_definition g_profile_Obj_SwallShutter; +extern process_profile_definition g_profile_OBJ_STICK; +extern process_profile_definition g_profile_Obj_StoneMark; +extern process_profile_definition g_profile_Obj_Swpropeller; +extern process_profile_definition g_profile_Obj_Swpush5; +extern process_profile_definition g_profile_Obj_Yobikusa; +extern process_profile_definition g_profile_SCENE_EXIT2; +extern process_profile_definition g_profile_ShopItem; +extern process_profile_definition g_profile_SQ; +extern process_profile_definition g_profile_SWC00; +extern process_profile_definition g_profile_Tag_CstaSw; +extern process_profile_definition g_profile_Tag_AJnot; +extern process_profile_definition g_profile_Tag_AttackItem; +extern process_profile_definition g_profile_Tag_Gstart; +extern process_profile_definition g_profile_Tag_Hinit; +extern process_profile_definition g_profile_Tag_Hjump; +extern process_profile_definition g_profile_Tag_Hstop; +extern process_profile_definition g_profile_Tag_Lv2PrChk; +extern process_profile_definition g_profile_Tag_Magne; +extern process_profile_definition g_profile_Tag_Mhint; +extern process_profile_definition g_profile_Tag_Mstop; +extern process_profile_definition g_profile_Tag_Spring; +extern process_profile_definition g_profile_Tag_Statue; +extern process_profile_definition g_profile_Ykgr; +extern process_profile_definition g_profile_DR; +extern process_profile_definition g_profile_L7lowDr; +extern process_profile_definition g_profile_L7ODR; +extern process_profile_definition g_profile_B_BH; +extern process_profile_definition g_profile_B_BQ; +extern process_profile_definition g_profile_B_DR; +extern process_profile_definition g_profile_B_DRE; +extern process_profile_definition g_profile_B_DS; +extern process_profile_definition g_profile_B_GG; +extern process_profile_definition g_profile_B_GM; +extern process_profile_definition g_profile_B_GND; +extern process_profile_definition g_profile_B_GO; +extern process_profile_definition g_profile_B_GOS; +extern process_profile_definition g_profile_B_MGN; +extern process_profile_definition g_profile_B_OB; +extern process_profile_definition g_profile_B_OH; +extern process_profile_definition g_profile_B_OH2; +extern process_profile_definition g_profile_B_TN; +extern process_profile_definition g_profile_B_YO; +extern process_profile_definition g_profile_B_YOI; +extern process_profile_definition g_profile_B_ZANT; +extern process_profile_definition g_profile_B_ZANTM; +extern process_profile_definition g_profile_B_ZANTZ; +extern process_profile_definition g_profile_B_ZANTS; +extern process_profile_definition g_profile_BALLOON2D; +extern process_profile_definition g_profile_BULLET; +extern process_profile_definition g_profile_COACH2D; +extern process_profile_definition g_profile_COACH_FIRE; +extern process_profile_definition g_profile_COW; +extern process_profile_definition g_profile_CSTATUE; +extern process_profile_definition g_profile_DO; +extern process_profile_definition g_profile_BOSS_DOOR; +extern process_profile_definition g_profile_L5BOSS_DOOR; +extern process_profile_definition g_profile_L1MBOSS_DOOR; +extern process_profile_definition g_profile_PushDoor; +extern process_profile_definition g_profile_E_AI; +extern process_profile_definition g_profile_E_ARROW; +extern process_profile_definition g_profile_E_BA; +extern process_profile_definition g_profile_E_BEE; +extern process_profile_definition g_profile_E_BG; +extern process_profile_definition g_profile_E_BI; +extern process_profile_definition g_profile_E_BI_LEAF; +extern process_profile_definition g_profile_E_BS; +extern process_profile_definition g_profile_E_BU; +extern process_profile_definition g_profile_E_BUG; +extern process_profile_definition g_profile_E_CR; +extern process_profile_definition g_profile_E_CR_EGG; +extern process_profile_definition g_profile_E_DB; +extern process_profile_definition g_profile_E_DB_LEAF; +extern process_profile_definition g_profile_E_DD; +extern process_profile_definition g_profile_E_DF; +extern process_profile_definition g_profile_E_DK; +extern process_profile_definition g_profile_E_DT; +extern process_profile_definition g_profile_E_FB; +extern process_profile_definition g_profile_E_FK; +extern process_profile_definition g_profile_E_FS; +extern process_profile_definition g_profile_E_FZ; +extern process_profile_definition g_profile_E_GB; +extern process_profile_definition g_profile_E_GE; +extern process_profile_definition g_profile_E_GI; +extern process_profile_definition g_profile_E_GM; +extern process_profile_definition g_profile_E_GOB; +extern process_profile_definition g_profile_E_GS; +extern process_profile_definition g_profile_E_HB_LEAF; +extern process_profile_definition g_profile_E_HM; +extern process_profile_definition g_profile_E_HP; +extern process_profile_definition g_profile_E_HZ; +extern process_profile_definition g_profile_E_HZELDA; +extern process_profile_definition g_profile_E_IS; +extern process_profile_definition g_profile_E_KG; +extern process_profile_definition g_profile_E_KK; +extern process_profile_definition g_profile_E_KR; +extern process_profile_definition g_profile_E_MB; +extern process_profile_definition g_profile_E_MD; +extern process_profile_definition g_profile_E_MF; +extern process_profile_definition g_profile_E_MK; +extern process_profile_definition g_profile_E_MK_BO; +extern process_profile_definition g_profile_E_MM; +extern process_profile_definition g_profile_E_MM_MT; +extern process_profile_definition g_profile_E_MS; +extern process_profile_definition g_profile_E_NZ; +extern process_profile_definition g_profile_E_OC; +extern process_profile_definition g_profile_E_OctBg; +extern process_profile_definition g_profile_E_OT; +extern process_profile_definition g_profile_E_PH; +extern process_profile_definition g_profile_E_PM; +extern process_profile_definition g_profile_E_PO; +extern process_profile_definition g_profile_E_PZ; +extern process_profile_definition g_profile_E_RB; +extern process_profile_definition g_profile_E_RDB; +extern process_profile_definition g_profile_E_RDY; +extern process_profile_definition g_profile_E_S1; +extern process_profile_definition g_profile_E_SB; +extern process_profile_definition g_profile_E_SF; +extern process_profile_definition g_profile_E_SG; +extern process_profile_definition g_profile_E_SH; +extern process_profile_definition g_profile_E_SM; +extern process_profile_definition g_profile_E_SM2; +extern process_profile_definition g_profile_E_ST; +extern process_profile_definition g_profile_E_ST_LINE; +extern process_profile_definition g_profile_E_SW; +extern process_profile_definition g_profile_E_TH; +extern process_profile_definition g_profile_E_TH_BALL; +extern process_profile_definition g_profile_E_TK; +extern process_profile_definition g_profile_E_TK2; +extern process_profile_definition g_profile_E_TK_BALL; +extern process_profile_definition g_profile_E_TT; +extern process_profile_definition g_profile_E_VT; +extern process_profile_definition g_profile_E_WAP; +extern process_profile_definition g_profile_E_WB; +extern process_profile_definition g_profile_E_WS; +extern process_profile_definition g_profile_E_WW; +extern process_profile_definition g_profile_E_YC; +extern process_profile_definition g_profile_E_YD; +extern process_profile_definition g_profile_E_YD_LEAF; +extern process_profile_definition g_profile_E_YG; +extern process_profile_definition g_profile_E_YH; +extern process_profile_definition g_profile_E_YK; +extern process_profile_definition g_profile_E_YM; +extern process_profile_definition g_profile_E_YM_TAG; +extern process_profile_definition g_profile_E_YMB; +extern process_profile_definition g_profile_E_YR; +extern process_profile_definition g_profile_E_ZH; +extern process_profile_definition g_profile_E_ZM; +extern process_profile_definition g_profile_E_ZS; +extern process_profile_definition g_profile_FORMATION_MNG; +extern process_profile_definition g_profile_GUARD_MNG; +extern process_profile_definition g_profile_HORSE; +extern process_profile_definition g_profile_HOZELDA; +extern process_profile_definition g_profile_Izumi_Gate; +extern process_profile_definition g_profile_KAGO; +extern process_profile_definition g_profile_KYTAG01; +extern process_profile_definition g_profile_KYTAG02; +extern process_profile_definition g_profile_KYTAG03; +extern process_profile_definition g_profile_KYTAG06; +extern process_profile_definition g_profile_KYTAG07; +extern process_profile_definition g_profile_KYTAG08; +extern process_profile_definition g_profile_KYTAG09; +extern process_profile_definition g_profile_KYTAG12; +extern process_profile_definition g_profile_KYTAG13; +extern process_profile_definition g_profile_KYTAG15; +extern process_profile_definition g_profile_KYTAG16; +extern process_profile_definition g_profile_MANT; +extern process_profile_definition g_profile_FSHOP; +extern process_profile_definition g_profile_MIRROR; +extern process_profile_definition g_profile_MOVIE_PLAYER; +extern process_profile_definition g_profile_MYNA; +extern process_profile_definition g_profile_NI; +extern process_profile_definition g_profile_NPC_ARU; +extern process_profile_definition g_profile_NPC_ASH; +extern process_profile_definition g_profile_NPC_ASHB; +extern process_profile_definition g_profile_NPC_BANS; +extern process_profile_definition g_profile_NPC_BLUENS; +extern process_profile_definition g_profile_NPC_BOU; +extern process_profile_definition g_profile_NPC_BOU_S; +extern process_profile_definition g_profile_NPC_CD3; +extern process_profile_definition g_profile_NPC_CHAT; +extern process_profile_definition g_profile_NPC_CHIN; +extern process_profile_definition g_profile_NPC_CLERKA; +extern process_profile_definition g_profile_NPC_CLERKB; +extern process_profile_definition g_profile_NPC_CLERKT; +extern process_profile_definition g_profile_NPC_COACH; +extern process_profile_definition g_profile_NPC_DF; +extern process_profile_definition g_profile_NPC_DOC; +extern process_profile_definition g_profile_NPC_DOORBOY; +extern process_profile_definition g_profile_NPC_DRSOL; +extern process_profile_definition g_profile_NPC_DU; +extern process_profile_definition g_profile_NPC_FAIRY; +extern process_profile_definition g_profile_NPC_FGUARD; +extern process_profile_definition g_profile_NPC_GND; +extern process_profile_definition g_profile_NPC_GRA; +extern process_profile_definition g_profile_NPC_GRC; +extern process_profile_definition g_profile_NPC_GRD; +extern process_profile_definition g_profile_NPC_GRM; +extern process_profile_definition g_profile_NPC_GRMC; +extern process_profile_definition g_profile_NPC_GRO; +extern process_profile_definition g_profile_NPC_GRR; +extern process_profile_definition g_profile_NPC_GRS; +extern process_profile_definition g_profile_NPC_GRZ; +extern process_profile_definition g_profile_NPC_GUARD; +extern process_profile_definition g_profile_NPC_GWOLF; +extern process_profile_definition g_profile_NPC_HANJO; +extern process_profile_definition g_profile_NPC_HENNA0; +extern process_profile_definition g_profile_NPC_HOZ; +extern process_profile_definition g_profile_NPC_IMPAL; +extern process_profile_definition g_profile_NPC_INKO; +extern process_profile_definition g_profile_NPC_INS; +extern process_profile_definition g_profile_NPC_JAGAR; +extern process_profile_definition g_profile_NPC_KASIHANA; +extern process_profile_definition g_profile_NPC_KASIKYU; +extern process_profile_definition g_profile_NPC_KASIMICH; +extern process_profile_definition g_profile_NPC_KDK; +extern process_profile_definition g_profile_NPC_KN; +extern process_profile_definition g_profile_NPC_KNJ; +extern process_profile_definition g_profile_NPC_KOLINB; +extern process_profile_definition g_profile_NPC_KS; +extern process_profile_definition g_profile_NPC_KYURY; +extern process_profile_definition g_profile_NPC_LEN; +extern process_profile_definition g_profile_NPC_LF; +extern process_profile_definition g_profile_NPC_LUD; +extern process_profile_definition g_profile_NPC_MIDP; +extern process_profile_definition g_profile_NPC_MK; +extern process_profile_definition g_profile_NPC_MOI; +extern process_profile_definition g_profile_NPC_MOIR; +extern process_profile_definition g_profile_MYNA2; +extern process_profile_definition g_profile_NPC_NE; +extern process_profile_definition g_profile_NPC_P2; +extern process_profile_definition g_profile_NPC_PACHI_BESU; +extern process_profile_definition g_profile_NPC_PACHI_MARO; +extern process_profile_definition g_profile_NPC_PACHI_TARO; +extern process_profile_definition g_profile_NPC_PASSER; +extern process_profile_definition g_profile_NPC_PASSER2; +extern process_profile_definition g_profile_NPC_POST; +extern process_profile_definition g_profile_NPC_POUYA; +extern process_profile_definition g_profile_NPC_PRAYER; +extern process_profile_definition g_profile_NPC_RACA; +extern process_profile_definition g_profile_NPC_RAFREL; +extern process_profile_definition g_profile_NPC_SARU; +extern process_profile_definition g_profile_NPC_SEIB; +extern process_profile_definition g_profile_NPC_SEIC; +extern process_profile_definition g_profile_NPC_SEID; +extern process_profile_definition g_profile_NPC_SEIRA; +extern process_profile_definition g_profile_NPC_SERA2; +extern process_profile_definition g_profile_NPC_SEIREI; +extern process_profile_definition g_profile_NPC_SHAD; +extern process_profile_definition g_profile_NPC_SHAMAN; +extern process_profile_definition g_profile_NPC_SHOE; +extern process_profile_definition g_profile_NPC_SHOP0; +extern process_profile_definition g_profile_NPC_SMARO; +extern process_profile_definition g_profile_NPC_SOLA; +extern process_profile_definition g_profile_NPC_SOLDIERa; +extern process_profile_definition g_profile_NPC_SOLDIERb; +extern process_profile_definition g_profile_NPC_SQ; +extern process_profile_definition g_profile_NPC_THE; +extern process_profile_definition g_profile_NPC_THEB; +extern process_profile_definition g_profile_NPC_TK; +extern process_profile_definition g_profile_NPC_TKC; +extern process_profile_definition g_profile_NPC_TKJ2; +extern process_profile_definition g_profile_NPC_TKS; +extern process_profile_definition g_profile_NPC_TOBY; +extern process_profile_definition g_profile_NPC_TR; +extern process_profile_definition g_profile_NPC_URI; +extern process_profile_definition g_profile_NPC_WORM; +extern process_profile_definition g_profile_NPC_WRESTLER; +extern process_profile_definition g_profile_NPC_YAMID; +extern process_profile_definition g_profile_NPC_YAMIS; +extern process_profile_definition g_profile_NPC_YAMIT; +extern process_profile_definition g_profile_NPC_YELIA; +extern process_profile_definition g_profile_NPC_YKM; +extern process_profile_definition g_profile_NPC_YKW; +extern process_profile_definition g_profile_NPC_ZANB; +extern process_profile_definition g_profile_NPC_ZANT; +extern process_profile_definition g_profile_NPC_ZELR; +extern process_profile_definition g_profile_NPC_ZELRO; +extern process_profile_definition g_profile_NPC_ZELDA; +extern process_profile_definition g_profile_NPC_ZRA; +extern process_profile_definition g_profile_NPC_ZRC; +extern process_profile_definition g_profile_NPC_ZRZ; +extern process_profile_definition g_profile_Obj_Lv5Key; +extern process_profile_definition g_profile_Obj_Turara; +extern process_profile_definition g_profile_Obj_TvCdlst; +extern process_profile_definition g_profile_Obj_Ytaihou; +extern process_profile_definition g_profile_Obj_AmiShutter; +extern process_profile_definition g_profile_Obj_Ari; +extern process_profile_definition g_profile_OBJ_AUTOMATA; +extern process_profile_definition g_profile_Obj_Avalanche; +extern process_profile_definition g_profile_OBJ_BALLOON; +extern process_profile_definition g_profile_Obj_BarDesk; +extern process_profile_definition g_profile_Obj_Batta; +extern process_profile_definition g_profile_Obj_BBox; +extern process_profile_definition g_profile_OBJ_BED; +extern process_profile_definition g_profile_Obj_Bemos; +extern process_profile_definition g_profile_Obj_Bhbridge; +extern process_profile_definition g_profile_Obj_BkLeaf; +extern process_profile_definition g_profile_BkyRock; +extern process_profile_definition g_profile_Obj_BmWindow; +extern process_profile_definition g_profile_Obj_BoomShutter; +extern process_profile_definition g_profile_Obj_Bombf; +extern process_profile_definition g_profile_OBJ_BOUMATO; +extern process_profile_definition g_profile_OBJ_BRG; +extern process_profile_definition g_profile_Obj_BsGate; +extern process_profile_definition g_profile_Obj_awaPlar; +extern process_profile_definition g_profile_Obj_CatDoor; +extern process_profile_definition g_profile_OBJ_CB; +extern process_profile_definition g_profile_Obj_ChainBlock; +extern process_profile_definition g_profile_Obj_Cdoor; +extern process_profile_definition g_profile_Obj_Chandelier; +extern process_profile_definition g_profile_Obj_Chest; +extern process_profile_definition g_profile_Obj_Cho; +extern process_profile_definition g_profile_Obj_Cowdoor; +extern process_profile_definition g_profile_Obj_Crope; +extern process_profile_definition g_profile_Obj_CRVFENCE; +extern process_profile_definition g_profile_Obj_CRVGATE; +extern process_profile_definition g_profile_Obj_CRVHAHEN; +extern process_profile_definition g_profile_Obj_CRVLH_DW; +extern process_profile_definition g_profile_Obj_CRVLH_UP; +extern process_profile_definition g_profile_Obj_CRVSTEEL; +extern process_profile_definition g_profile_Obj_Crystal; +extern process_profile_definition g_profile_Obj_ChainWall; +extern process_profile_definition g_profile_Obj_DamCps; +extern process_profile_definition g_profile_Obj_Dan; +extern process_profile_definition g_profile_Obj_Digholl; +extern process_profile_definition g_profile_Obj_DigSnow; +extern process_profile_definition g_profile_Obj_Elevator; +extern process_profile_definition g_profile_Obj_Drop; +extern process_profile_definition g_profile_Obj_DUST; +extern process_profile_definition g_profile_Obj_E_CREATE; +extern process_profile_definition g_profile_Obj_FallObj; +extern process_profile_definition g_profile_Obj_Fan; +extern process_profile_definition g_profile_Obj_Fchain; +extern process_profile_definition g_profile_Obj_FireWood; +extern process_profile_definition g_profile_Obj_FireWood2; +extern process_profile_definition g_profile_Obj_FirePillar; +extern process_profile_definition g_profile_Obj_FirePillar2; +extern process_profile_definition g_profile_Obj_Flag; +extern process_profile_definition g_profile_Obj_Flag2; +extern process_profile_definition g_profile_Obj_Flag3; +extern process_profile_definition g_profile_OBJ_FOOD; +extern process_profile_definition g_profile_OBJ_FW; +extern process_profile_definition g_profile_OBJ_GADGET; +extern process_profile_definition g_profile_Obj_GanonWall; +extern process_profile_definition g_profile_Obj_GanonWall2; +extern process_profile_definition g_profile_OBJ_GB; +extern process_profile_definition g_profile_Obj_Geyser; +extern process_profile_definition g_profile_Obj_glowSphere; +extern process_profile_definition g_profile_OBJ_GM; +extern process_profile_definition g_profile_Obj_GoGate; +extern process_profile_definition g_profile_Obj_GOMIKABE; +extern process_profile_definition g_profile_OBJ_GRA; +extern process_profile_definition g_profile_GRA_WALL; +extern process_profile_definition g_profile_Obj_GraRock; +extern process_profile_definition g_profile_Obj_GraveStone; +extern process_profile_definition g_profile_GRDWATER; +extern process_profile_definition g_profile_Obj_GrzRock; +extern process_profile_definition g_profile_Obj_H_Saku; +extern process_profile_definition g_profile_Obj_HBarrel; +extern process_profile_definition g_profile_Obj_HFtr; +extern process_profile_definition g_profile_Obj_MHasu; +extern process_profile_definition g_profile_Obj_Hata; +extern process_profile_definition g_profile_OBJ_HB; +extern process_profile_definition g_profile_Obj_HBombkoya; +extern process_profile_definition g_profile_Obj_HeavySw; +extern process_profile_definition g_profile_Obj_Hfuta; +extern process_profile_definition g_profile_Obj_HsTarget; +extern process_profile_definition g_profile_Obj_Ice_l; +extern process_profile_definition g_profile_Obj_Ice_s; +extern process_profile_definition g_profile_Obj_IceBlock; +extern process_profile_definition g_profile_Obj_IceLeaf; +extern process_profile_definition g_profile_OBJ_IHASI; +extern process_profile_definition g_profile_Obj_Ikada; +extern process_profile_definition g_profile_Obj_InoBone; +extern process_profile_definition g_profile_Obj_ITA; +extern process_profile_definition g_profile_OBJ_ITAMATO; +extern process_profile_definition g_profile_Obj_Kabuto; +extern process_profile_definition g_profile_Obj_Kag; +extern process_profile_definition g_profile_OBJ_KAGE; +extern process_profile_definition g_profile_OBJ_KAGO; +extern process_profile_definition g_profile_Obj_Kaisou; +extern process_profile_definition g_profile_Obj_Kam; +extern process_profile_definition g_profile_Obj_Kantera; +extern process_profile_definition g_profile_Obj_Kat; +extern process_profile_definition g_profile_Obj_KazeNeko; +extern process_profile_definition g_profile_OBJ_KBOX; +extern process_profile_definition g_profile_OBJ_KEY; +extern process_profile_definition g_profile_OBJ_KEYHOLE; +extern process_profile_definition g_profile_OBJ_KI; +extern process_profile_definition g_profile_Obj_KiPot; +extern process_profile_definition g_profile_OBJ_KITA; +extern process_profile_definition g_profile_Obj_KJgjs; +extern process_profile_definition g_profile_Obj_KKanban; +extern process_profile_definition g_profile_KN_BULLET; +extern process_profile_definition g_profile_Obj_Kshutter; +extern process_profile_definition g_profile_Obj_Kuw; +extern process_profile_definition g_profile_Obj_KWheel00; +extern process_profile_definition g_profile_Obj_KWheel01; +extern process_profile_definition g_profile_Obj_KznkArm; +extern process_profile_definition g_profile_Obj_Laundry; +extern process_profile_definition g_profile_Obj_LndRope; +extern process_profile_definition g_profile_OBJ_LBOX; +extern process_profile_definition g_profile_OBJ_LP; +extern process_profile_definition g_profile_Obj_Lv1Cdl00; +extern process_profile_definition g_profile_Obj_Lv1Cdl01; +extern process_profile_definition g_profile_Obj_Lv3Candle; +extern process_profile_definition g_profile_Obj_Lv3Water; +extern process_profile_definition g_profile_Obj_Lv3Water2; +extern process_profile_definition g_profile_OBJ_LV3WATERB; +extern process_profile_definition g_profile_Obj_Lv3R10Saka; +extern process_profile_definition g_profile_Obj_WaterEff; +extern process_profile_definition g_profile_Tag_Lv4CandleDm; +extern process_profile_definition g_profile_Tag_Lv4Candle; +extern process_profile_definition g_profile_Obj_Lv4EdShutter; +extern process_profile_definition g_profile_Obj_Lv4Gate; +extern process_profile_definition g_profile_Obj_Lv4HsTarget; +extern process_profile_definition g_profile_Obj_Lv4PoGate; +extern process_profile_definition g_profile_Obj_Lv4RailWall; +extern process_profile_definition g_profile_Obj_Lv4SlideWall; +extern process_profile_definition g_profile_Obj_Lv4Bridge; +extern process_profile_definition g_profile_Obj_Lv4Chan; +extern process_profile_definition g_profile_Obj_Lv4DigSand; +extern process_profile_definition g_profile_Obj_Lv4Floor; +extern process_profile_definition g_profile_Obj_Lv4Gear; +extern process_profile_definition g_profile_Obj_PRElvtr; +extern process_profile_definition g_profile_Obj_Lv4PRwall; +extern process_profile_definition g_profile_Obj_Lv4Sand; +extern process_profile_definition g_profile_Obj_Lv5FBoard; +extern process_profile_definition g_profile_Obj_IceWall; +extern process_profile_definition g_profile_Obj_Lv5SwIce; +extern process_profile_definition g_profile_Obj_Ychndlr; +extern process_profile_definition g_profile_Obj_YIblltray; +extern process_profile_definition g_profile_Obj_Lv6ChgGate; +extern process_profile_definition g_profile_Obj_Lv6FuriTrap; +extern process_profile_definition g_profile_Obj_Lv6Lblock; +extern process_profile_definition g_profile_Obj_Lv6SwGate; +extern process_profile_definition g_profile_Obj_Lv6SzGate; +extern process_profile_definition g_profile_Obj_Lv6Tenbin; +extern process_profile_definition g_profile_Obj_Lv6TogeRoll; +extern process_profile_definition g_profile_Obj_Lv6TogeTrap; +extern process_profile_definition g_profile_Obj_Lv6bemos; +extern process_profile_definition g_profile_Obj_Lv6bemos2; +extern process_profile_definition g_profile_Obj_Lv6EGate; +extern process_profile_definition g_profile_Obj_Lv6ElevtA; +extern process_profile_definition g_profile_Obj_Lv6SwTurn; +extern process_profile_definition g_profile_Obj_Lv7BsGate; +extern process_profile_definition g_profile_Obj_Lv7PropY; +extern process_profile_definition g_profile_Obj_Lv7Bridge; +extern process_profile_definition g_profile_Obj_Lv8KekkaiTrap; +extern process_profile_definition g_profile_Obj_Lv8Lift; +extern process_profile_definition g_profile_Obj_Lv8OptiLift; +extern process_profile_definition g_profile_Obj_Lv8UdFloor; +extern process_profile_definition g_profile_Obj_Lv9SwShutter; +extern process_profile_definition g_profile_Obj_MagLift; +extern process_profile_definition g_profile_Obj_MagLiftRot; +extern process_profile_definition g_profile_OBJ_MAKI; +extern process_profile_definition g_profile_Obj_MasterSword; +extern process_profile_definition g_profile_Obj_Mato; +extern process_profile_definition g_profile_Obj_MHole; +extern process_profile_definition g_profile_OBJ_MIE; +extern process_profile_definition g_profile_Obj_Mirror6Pole; +extern process_profile_definition g_profile_Obj_MirrorChain; +extern process_profile_definition g_profile_Obj_MirrorSand; +extern process_profile_definition g_profile_Obj_MirrorScrew; +extern process_profile_definition g_profile_Obj_MirrorTable; +extern process_profile_definition g_profile_OBJ_MSIMA; +extern process_profile_definition g_profile_Obj_MvStair; +extern process_profile_definition g_profile_OBJ_MYOGAN; +extern process_profile_definition g_profile_Obj_Nagaisu; +extern process_profile_definition g_profile_Obj_Nan; +extern process_profile_definition g_profile_OBJ_NDOOR; +extern process_profile_definition g_profile_OBJ_NOUGU; +extern process_profile_definition g_profile_OCTHASHI; +extern process_profile_definition g_profile_OBJ_OILTUBO; +extern process_profile_definition g_profile_Obj_Onsen; +extern process_profile_definition g_profile_OBJ_ONSEN_FIRE; +extern process_profile_definition g_profile_Obj_OnsenTaru; +extern process_profile_definition g_profile_Obj_PushDoor; +extern process_profile_definition g_profile_Obj_PDtile; +extern process_profile_definition g_profile_Obj_PDwall; +extern process_profile_definition g_profile_Obj_Picture; +extern process_profile_definition g_profile_Obj_Pillar; +extern process_profile_definition g_profile_OBJ_PLEAF; +extern process_profile_definition g_profile_Obj_poCandle; +extern process_profile_definition g_profile_Obj_poFire; +extern process_profile_definition g_profile_Obj_poTbox; +extern process_profile_definition g_profile_Obj_Prop; +extern process_profile_definition g_profile_OBJ_PUMPKIN; +extern process_profile_definition g_profile_Obj_RCircle; +extern process_profile_definition g_profile_Obj_RfHole; +extern process_profile_definition g_profile_Obj_RiderGate; +extern process_profile_definition g_profile_Obj_RIVERROCK; +extern process_profile_definition g_profile_OBJ_ROCK; +extern process_profile_definition g_profile_Obj_RotBridge; +extern process_profile_definition g_profile_Obj_RotTrap; +extern process_profile_definition g_profile_OBJ_ROTEN; +extern process_profile_definition g_profile_Obj_RotStair; +extern process_profile_definition g_profile_OBJ_RW; +extern process_profile_definition g_profile_Obj_Saidan; +extern process_profile_definition g_profile_Obj_Sakuita; +extern process_profile_definition g_profile_Obj_ItaRope; +extern process_profile_definition g_profile_Obj_SCannon; +extern process_profile_definition g_profile_Obj_SCannonCrs; +extern process_profile_definition g_profile_Obj_SCannonTen; +extern process_profile_definition g_profile_OBJ_SEKIDOOR; +extern process_profile_definition g_profile_OBJ_SEKIZO; +extern process_profile_definition g_profile_OBJ_SEKIZOA; +extern process_profile_definition g_profile_Obj_Shield; +extern process_profile_definition g_profile_Obj_SM_DOOR; +extern process_profile_definition g_profile_Obj_SmallKey; +extern process_profile_definition g_profile_Obj_SmgDoor; +extern process_profile_definition g_profile_Obj_Smoke; +extern process_profile_definition g_profile_OBJ_SMTILE; +extern process_profile_definition g_profile_Obj_SmWStone; +extern process_profile_definition g_profile_Tag_SnowEff; +extern process_profile_definition g_profile_Obj_SnowSoup; +extern process_profile_definition g_profile_OBJ_SO; +extern process_profile_definition g_profile_Obj_SpinLift; +extern process_profile_definition g_profile_OBJ_SSDRINK; +extern process_profile_definition g_profile_OBJ_SSITEM; +extern process_profile_definition g_profile_Obj_StairBlock; +extern process_profile_definition g_profile_Obj_Stone; +extern process_profile_definition g_profile_Obj_Stopper; +extern process_profile_definition g_profile_Obj_Stopper2; +extern process_profile_definition g_profile_OBJ_SUISYA; +extern process_profile_definition g_profile_OBJ_SW; +extern process_profile_definition g_profile_Obj_SwBallA; +extern process_profile_definition g_profile_Obj_SwBallB; +extern process_profile_definition g_profile_Obj_SwBallC; +extern process_profile_definition g_profile_Obj_SwLight; +extern process_profile_definition g_profile_Obj_SwChain; +extern process_profile_definition g_profile_Obj_SwHang; +extern process_profile_definition g_profile_Obj_Sword; +extern process_profile_definition g_profile_Obj_Swpush2; +extern process_profile_definition g_profile_Obj_SwSpinner; +extern process_profile_definition g_profile_Obj_SwTurn; +extern process_profile_definition g_profile_Obj_SyRock; +extern process_profile_definition g_profile_Obj_SZbridge; +extern process_profile_definition g_profile_Obj_TaFence; +extern process_profile_definition g_profile_Obj_Table; +extern process_profile_definition g_profile_Obj_TakaraDai; +extern process_profile_definition g_profile_OBJ_TATIGI; +extern process_profile_definition g_profile_Obj_Ten; +extern process_profile_definition g_profile_Obj_TestCube; +extern process_profile_definition g_profile_Obj_Gake; +extern process_profile_definition g_profile_Obj_THASHI; +extern process_profile_definition g_profile_Obj_TDoor; +extern process_profile_definition g_profile_Obj_TimeFire; +extern process_profile_definition g_profile_OBJ_TKS; +extern process_profile_definition g_profile_Obj_TMoon; +extern process_profile_definition g_profile_Obj_ToaruMaki; +extern process_profile_definition g_profile_OBJ_TOBY; +extern process_profile_definition g_profile_Obj_TobyHouse; +extern process_profile_definition g_profile_Obj_TogeTrap; +extern process_profile_definition g_profile_Obj_Tombo; +extern process_profile_definition g_profile_Obj_Tornado; +extern process_profile_definition g_profile_Obj_Tornado2; +extern process_profile_definition g_profile_OBJ_TP; +extern process_profile_definition g_profile_TREESH; +extern process_profile_definition g_profile_Obj_TwGate; +extern process_profile_definition g_profile_OBJ_UDOOR; +extern process_profile_definition g_profile_OBJ_USAKU; +extern process_profile_definition g_profile_Obj_VolcGnd; +extern process_profile_definition g_profile_Obj_VolcanicBall; +extern process_profile_definition g_profile_Obj_VolcanicBomb; +extern process_profile_definition g_profile_Obj_KakarikoBrg; +extern process_profile_definition g_profile_Obj_OrdinBrg; +extern process_profile_definition g_profile_Obj_WtGate; +extern process_profile_definition g_profile_Obj_WaterPillar; +extern process_profile_definition g_profile_Obj_WaterFall; +extern process_profile_definition g_profile_Obj_Wchain; +extern process_profile_definition g_profile_Obj_WdStick; +extern process_profile_definition g_profile_OBJ_WEB0; +extern process_profile_definition g_profile_OBJ_WEB1; +extern process_profile_definition g_profile_Obj_WellCover; +extern process_profile_definition g_profile_OBJ_WFLAG; +extern process_profile_definition g_profile_Obj_WindStone; +extern process_profile_definition g_profile_Obj_Window; +extern process_profile_definition g_profile_Obj_WoodPendulum; +extern process_profile_definition g_profile_Obj_WoodStatue; +extern process_profile_definition g_profile_Obj_WoodenSword; +extern process_profile_definition g_profile_OBJ_YBAG; +extern process_profile_definition g_profile_OBJ_YSTONE; +extern process_profile_definition g_profile_Obj_ZoraCloth; +extern process_profile_definition g_profile_Obj_ZDoor; +extern process_profile_definition g_profile_Obj_zrTurara; +extern process_profile_definition g_profile_Obj_zrTuraraRc; +extern process_profile_definition g_profile_ZRA_MARK; +extern process_profile_definition g_profile_OBJ_ZRAFREEZE; +extern process_profile_definition g_profile_Obj_ZraRock; +extern process_profile_definition g_profile_PASSER_MNG; +extern process_profile_definition g_profile_PERU; +extern process_profile_definition g_profile_PPolamp; +extern process_profile_definition g_profile_SKIP2D; +extern process_profile_definition g_profile_START_AND_GOAL; +extern process_profile_definition g_profile_SwBall; +extern process_profile_definition g_profile_SwLBall; +extern process_profile_definition g_profile_SwTime; +extern process_profile_definition g_profile_Tag_Lv6Gate; +extern process_profile_definition g_profile_Tag_Lv7Gate; +extern process_profile_definition g_profile_Tag_Lv8Gate; +extern process_profile_definition g_profile_Tag_TWGate; +extern process_profile_definition g_profile_Tag_Arena; +extern process_profile_definition g_profile_Tag_Assist; +extern process_profile_definition g_profile_TAG_BTLITM; +extern process_profile_definition g_profile_Tag_ChgRestart; +extern process_profile_definition g_profile_TAG_CSW; +extern process_profile_definition g_profile_Tag_Escape; +extern process_profile_definition g_profile_Tag_FWall; +extern process_profile_definition g_profile_TAG_GRA; +extern process_profile_definition g_profile_TAG_GUARD; +extern process_profile_definition g_profile_Tag_Instruction; +extern process_profile_definition g_profile_Tag_KagoFall; +extern process_profile_definition g_profile_Tag_LightBall; +extern process_profile_definition g_profile_TAG_LV5SOUP; +extern process_profile_definition g_profile_Tag_Lv6CstaSw; +extern process_profile_definition g_profile_Tag_Mmsg; +extern process_profile_definition g_profile_Tag_Mwait; +extern process_profile_definition g_profile_TAG_MYNA2; +extern process_profile_definition g_profile_TAG_MNLIGHT; +extern process_profile_definition g_profile_TAG_PATI; +extern process_profile_definition g_profile_Tag_poFire; +extern process_profile_definition g_profile_TAG_QS; +extern process_profile_definition g_profile_Tag_RetRoom; +extern process_profile_definition g_profile_Tag_RiverBack; +extern process_profile_definition g_profile_Tag_RmbitSw; +extern process_profile_definition g_profile_Tag_Schedule; +extern process_profile_definition g_profile_Tag_SetBall; +extern process_profile_definition g_profile_Tag_Restart; +extern process_profile_definition g_profile_TAG_SHOPCAM; +extern process_profile_definition g_profile_TAG_SHOPITM; +extern process_profile_definition g_profile_Tag_SmkEmt; +extern process_profile_definition g_profile_Tag_Spinner; +extern process_profile_definition g_profile_Tag_Sppath; +extern process_profile_definition g_profile_TAG_SSDRINK; +extern process_profile_definition g_profile_Tag_Stream; +extern process_profile_definition g_profile_Tag_TheBHint; +extern process_profile_definition g_profile_Tag_WaraHowl; +extern process_profile_definition g_profile_Tag_WatchGe; +extern process_profile_definition g_profile_Tag_WaterFall; +extern process_profile_definition g_profile_Tag_Wljump; +extern process_profile_definition g_profile_TAG_YAMI; +extern process_profile_definition g_profile_TALK; +extern process_profile_definition g_profile_TBOX_SW; +extern process_profile_definition g_profile_TITLE; +extern process_profile_definition g_profile_WarpBug; + +extern process_profile_definition* g_fpcPfLst_ProfileList[]; + +#endif /* F_PC_PROFILE_LST_H_ */ diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index 0753650c74..a5a239e209 100644 --- a/include/f_pc/f_pc_stdcreate_req.h +++ b/include/f_pc/f_pc_stdcreate_req.h @@ -8,23 +8,23 @@ typedef struct layer_class layer_class; typedef int (*stdCreateFunc)(void*, void*); typedef struct standard_create_request_class { - /* 0x00 */ create_request mBase; - /* 0x48 */ request_of_phase_process_class unk_0x48; - /* 0x50 */ s16 mLoadID; - /* 0x54 */ void* unk_0x54; - /* 0x58 */ stdCreateFunc unk_0x58; + /* 0x00 */ create_request base; + /* 0x48 */ request_of_phase_process_class phase_request; + /* 0x50 */ s16 process_name; + /* 0x54 */ void* process_append; + /* 0x58 */ stdCreateFunc create_post_method; /* 0x5C */ void* unk_0x5C; } standard_create_request_class; -s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* pStdCreateReq); -s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* pStdCreateReq); -s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* pStdCreateReq); -s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* pStdCreateReq); -s32 fpcSCtRq_phase_Done(standard_create_request_class*); -s32 fpcSCtRq_Handler(standard_create_request_class* pStdCreateReq); -s32 fpcSCtRq_Delete(standard_create_request_class*); -s32 fpcSCtRq_Cancel(standard_create_request_class*); -s32 fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, - void* param_5); +s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request); +s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request); +s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request); +s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request); +s32 fpcSCtRq_phase_Done(standard_create_request_class* i_request); +s32 fpcSCtRq_Handler(standard_create_request_class* i_request); +s32 fpcSCtRq_Delete(standard_create_request_class* i_request); +s32 fpcSCtRq_Cancel(standard_create_request_class* i_request); +fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, + void* param_4, void* i_append); -#endif \ No newline at end of file +#endif diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/src/JSystem/J3DGraphBase/J3DTransform.cpp index 1391184769..127cfde23f 100644 --- a/src/JSystem/J3DGraphBase/J3DTransform.cpp +++ b/src/JSystem/J3DGraphBase/J3DTransform.cpp @@ -25,40 +25,48 @@ void J3DGQRSetup7(u32 r0, u32 r1, u32 r2, u32 r3) { /* 80311670-80311760 30BFB0 00F0+00 0/0 2/2 0/0 .text J3DCalcBBoardMtx__FPA4_f */ // this uses a non-standard sqrtf, not sure why or how its supposed to be setup -static inline f32 sqrtf2(f32 x) { - if (x > 0.0f) { - f32 guess = (f32)__frsqrte(x); - return (f32)(x * guess); - } - return x; +inline f32 J3D_sqrtf(register f32 x) { + register f32 recip; + + if (x > 0.0f) { +#ifdef __MWERKS__ // clang-format off + asm { frsqrte recip, x } +#endif // clang-format on + return recip * x; + } + return x; } -void J3DCalcBBoardMtx(Mtx mtx) { +void J3DCalcBBoardMtx(register Mtx mtx) { f32 x = (mtx[0][0] * mtx[0][0]) + (mtx[1][0] * mtx[1][0]) + (mtx[2][0] * mtx[2][0]); f32 y = (mtx[0][1] * mtx[0][1]) + (mtx[1][1] * mtx[1][1]) + (mtx[2][1] * mtx[2][1]); f32 z = (mtx[0][2] * mtx[0][2]) + (mtx[1][2] * mtx[1][2]) + (mtx[2][2] * mtx[2][2]); if (x > 0.0f) { - x *= sqrtf2(x); + x = J3D_sqrtf(x); } if (y > 0.0f) { - y *= sqrtf2(y); + y = J3D_sqrtf(y); } if (z > 0.0f) { - z *= sqrtf2(z); + z = J3D_sqrtf(z); } + register f32 zero = 0.0f; +// zero out gaps of zeroes +#ifdef __MWERKS__ // clang-format off + asm { + psq_st zero, 0x04(mtx), 0, 0 + + psq_st zero, 0x20(mtx), 0, 0 + } +#endif // clang-format on + mtx[0][0] = x; - mtx[0][1] = 0.0f; - mtx[0][2] = 0.0f; - - mtx[1][0] = 0.0f; - mtx[1][1] = y; - mtx[1][2] = 0.0f; - - mtx[2][0] = 0.0f; - mtx[2][1] = 0.0f; - mtx[2][2] = z; + mtx[1][0] = zero; + mtx[1][1] = y; + mtx[1][2] = zero; + mtx[2][2] = z; } /* 803A1E30-803A1E50 02E490 0020+00 0/0 1/1 0/0 .rodata j3dDefaultTransformInfo */ @@ -73,13 +81,85 @@ extern Mtx const j3dDefaultMtx = { {1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}}; /* 80311760-8031189C 30C0A0 013C+00 0/0 2/2 0/0 .text J3DCalcYBBoardMtx__FPA4_f */ -void J3DCalcYBBoardMtx(f32 (*param_0)[4]) { - // NONMATCHING +void J3DCalcYBBoardMtx(Mtx mtx) { + f32 x = (mtx[0][0] * mtx[0][0]) + (mtx[1][0] * mtx[1][0]) + (mtx[2][0] * mtx[2][0]); + f32 z = (mtx[0][2] * mtx[0][2]) + (mtx[1][2] * mtx[1][2]) + (mtx[2][2] * mtx[2][2]); + + if (x > 0.0f) { + x = J3D_sqrtf(x); + } + if (z > 0.0f) { + z = J3D_sqrtf(z); + } + + Vec vec = { 0.0f, -mtx[2][1], mtx[1][1] }; + VECNormalize(&vec, &vec); + + mtx[0][0] = x; + mtx[0][2] = 0.0f; + mtx[1][0] = 0.0f; + + mtx[1][2] = vec.y * z; + mtx[2][0] = 0.0f; + mtx[2][2] = vec.z * z; } /* 8031189C-80311964 30C1DC 00C8+00 0/0 6/6 0/0 .text J3DPSCalcInverseTranspose__FPA4_fPA3_f */ -void J3DPSCalcInverseTranspose(f32 (*param_0)[4], f32 (*param_1)[3]) { - // NONMATCHING +asm void J3DPSCalcInverseTranspose(register Mtx src, register Mtx33 dst) { +#ifdef __MWERKS__ // clang-format off + psq_l f0, 0(src), 1, 0 + psq_l f1, 4(src), 0, 0 + psq_l f2, 16(src), 1, 0 + ps_merge10 f6, f1, f0 + psq_l f3, 20(src), 0, 0 + psq_l f4, 32(src), 1, 0 + ps_merge10 f7, f3, f2 + psq_l f5, 36(src), 0, 0 + ps_mul f11, f3, f6 + ps_merge10 f8, f5, f4 + ps_mul f13, f5, f7 + ps_msub f11, f1, f7, f11 + ps_mul f12, f1, f8 + ps_msub f13, f3, f8, f13 + ps_msub f12, f5, f6, f12 + ps_mul f10, f3, f4 + ps_mul f9, f0, f5 + ps_mul f8, f1, f2 + ps_msub f10, f2, f5, f10 + ps_msub f9, f1, f4, f9 + ps_msub f8, f0, f3, f8 + ps_mul f7, f0, f13 + ps_sub f1, f1, f1 + ps_madd f7, f2, f12, f7 + ps_madd f7, f4, f11, f7 + ps_cmpo0 cr0, f7, f1 + bne lbl_8005F118 + li r3, 0 + blr + +lbl_8005F118: + fres f0, f7 + ps_add f6, f0, f0 + ps_mul f5, f0, f0 + ps_nmsub f0, f7, f5, f6 + ps_add f6, f0, f0 + ps_mul f5, f0, f0 + ps_nmsub f0, f7, f5, f6 + ps_muls0 f13, f13, f0 + ps_muls0 f12, f12, f0 + psq_st f13, 0(dst), 0, 0 + ps_muls0 f11, f11, f0 + psq_st f12, 12(dst), 0, 0 + ps_muls0 f10, f10, f0 + psq_st f11, 24(dst), 0, 0 + ps_muls0 f9, f9, f0 + psq_st f10, 8(dst), 1, 0 + ps_muls0 f8, f8, f0 + psq_st f9, 20(r4), 1, 0 + li r3, 1 + psq_st f8, 32(r4), 1, 0 + blr +#endif // clang-format on } /* 80311964-80311A24 30C2A4 00C0+00 0/0 2/2 2/2 .text @@ -239,73 +319,264 @@ void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo& srt, Mtx dst) { /* 80311D94-80311DF8 30C6D4 0064+00 0/0 2/2 0/0 .text J3DScaleNrmMtx__FPA4_fRC3Vec */ -#ifdef NONMATCHING -void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) { - register f32 mtx_xy, mtx_z_, scl_xy, scl_z_; +asm void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) { +#ifdef __MWERKS__ // clang-format off + nofralloc; - asm { - /* Row 0 */ - psq_l scl_xy, 0(scl), 0, 0 - psq_l mtx_xy, 0(mtx), 0, 0 - lfs scl_z_, 8(scl) - lfs mtx_z_, 8(mtx) - ps_mul f4, mtx_xy, scl_xy - psq_st f4, 0(mtx), 0, 0 - fmuls f4, mtx_z_, scl_z_ - stfs f4, 8(mtx) + psq_l fp2, 0(scl), 0, 0 + psq_l fp0, 0(mtx), 0, 0 + lfs fp3, 8(scl) + lfs fp1, 8(mtx) + ps_mul f4, fp0, fp2 + psq_st f4, 0(mtx), 0, 0 + fmuls f4, fp1, fp3 + stfs f4, 8(mtx) - /* Row 1 */ - psq_l scl_xy, 0(scl), 0, 0 - psq_l mtx_xy, 16(mtx), 0, 0 - lfs scl_z_, 8(scl) - lfs mtx_z_, 24(mtx) - ps_mul f4, mtx_xy, scl_xy - psq_st f4, 16(mtx), 0, 0 - fmuls f4, mtx_z_, scl_z_ - stfs f4, 24(mtx) + /* Row 1 */ + psq_l fp2, 0(scl), 0, 0 + psq_l fp0, 16(mtx), 0, 0 + lfs fp3, 8(scl) + lfs fp1, 24(mtx) + ps_mul f4, fp0, fp2 + psq_st f4, 16(mtx), 0, 0 + fmuls f4, fp1, fp3 + stfs f4, 24(mtx) - /* Row 2 */ - psq_l scl_xy, 0(scl), 0, 0 - psq_l mtx_xy, 32(mtx), 0, 0 - lfs scl_z_, 8(scl) - lfs mtx_z_, 40(mtx) - ps_mul f4, mtx_xy, scl_xy - psq_st f4, 32(mtx), 0, 0 - fmuls f4, mtx_z_, scl_z_ - stfs f4, 40(mtx) - } + /* Row 2 */ + psq_l fp2, 0(scl), 0, 0 + psq_l fp0, 32(mtx), 0, 0 + lfs fp3, 8(scl) + lfs fp1, 40(mtx) + ps_mul f4, fp0, fp2 + psq_st f4, 32(mtx), 0, 0 + fmuls f4, fp1, fp3 + stfs f4, 40(mtx) + blr +#endif // clang-format on } -#else -void J3DScaleNrmMtx(f32 (*param_0)[4], Vec const& param_1) { - // NONMATCHING -} -#endif /* 80311DF8-80311E4C 30C738 0054+00 0/0 5/5 0/0 .text J3DScaleNrmMtx33__FPA3_fRC3Vec */ -void J3DScaleNrmMtx33(f32 (*param_0)[3], Vec const& param_1) { - // NONMATCHING +asm void J3DScaleNrmMtx33(register Mtx33 mtx, const register Vec& scale) { +#ifdef __MWERKS__ // clang-format off + psq_l f0, 0(mtx), 0, 0 + psq_l f6, 0(scale), 0, 0 + lfs f1, 8(mtx) + lfs f7, 8(scale) + ps_mul f0, f0, f6 + psq_l f2, 12(mtx), 0, 0 + fmuls f1, f1, f7 + lfs f3, 0x14(mtx) + ps_mul f2, f2, f6 + psq_l f4, 24(mtx), 0, 0 + fmuls f3, f3, f7 + lfs f5, 0x20(mtx) + ps_mul f4, f4, f6 + psq_st f0, 0(mtx), 0, 0 + fmuls f5, f5, f7 + stfs f1, 8(mtx) + psq_st f2, 12(mtx), 0, 0 + stfs f3, 0x14(mtx) + psq_st f4, 24(mtx), 0, 0 + stfs f5, 0x20(mtx) + blr +#endif // clang-format on } /* 80311E4C-80311F70 30C78C 0124+00 0/0 3/3 0/0 .text J3DMtxProjConcat__FPA4_fPA4_fPA4_f */ -void J3DMtxProjConcat(f32 (*param_0)[4], f32 (*param_1)[4], f32 (*param_2)[4]) { - // NONMATCHING +asm void J3DMtxProjConcat(register Mtx mtx1, register Mtx mtx2, register Mtx dst) { +#ifdef __MWERKS__ // clang-format off + psq_l f2, 0(mtx1), 0, 0 + psq_l f3, 8(mtx1), 0, 0 + ps_merge00 f6, f2, f2 + ps_merge11 f7, f2, f2 + ps_merge00 f8, f3, f3 + ps_merge11 f9, f3, f3 + psq_l f10, 0(mtx2), 0, 0 + psq_l f11, 16(mtx2), 0, 0 + psq_l f12, 32(mtx2), 0, 0 + psq_l f13, 48(mtx2), 0, 0 + ps_mul f0, f6, f10 + ps_madd f0, f7, f11, f0 + ps_madd f0, f8, f12, f0 + ps_madd f0, f9, f13, f0 + psq_st f0, 0(dst), 0, 0 + psq_l f10, 8(mtx2), 0, 0 + psq_l f11, 24(mtx2), 0, 0 + psq_l f12, 40(mtx2), 0, 0 + psq_l f13, 56(mtx2), 0, 0 + ps_mul f0, f6, f10 + ps_madd f0, f7, f11, f0 + ps_madd f0, f8, f12, f0 + ps_madd f0, f9, f13, f0 + psq_st f0, 8(dst), 0, 0 + psq_l f2, 16(mtx1), 0, 0 + psq_l f3, 24(mtx1), 0, 0 + ps_merge00 f6, f2, f2 + ps_merge11 f7, f2, f2 + ps_merge00 f8, f3, f3 + ps_merge11 f9, f3, f3 + psq_l f10, 0(mtx2), 0, 0 + psq_l f11, 16(mtx2), 0, 0 + psq_l f12, 32(mtx2), 0, 0 + psq_l f13, 48(mtx2), 0, 0 + ps_mul f0, f6, f10 + ps_madd f0, f7, f11, f0 + ps_madd f0, f8, f12, f0 + ps_madd f0, f9, f13, f0 + psq_st f0, 16(dst), 0, 0 + psq_l f10, 8(mtx2), 0, 0 + psq_l f11, 24(mtx2), 0, 0 + psq_l f12, 40(mtx2), 0, 0 + psq_l f13, 56(mtx2), 0, 0 + ps_mul f0, f6, f10 + ps_madd f0, f7, f11, f0 + ps_madd f0, f8, f12, f0 + ps_madd f0, f9, f13, f0 + psq_st f0, 24(dst), 0, 0 + psq_l f2, 32(mtx1), 0, 0 + psq_l f3, 40(mtx1), 0, 0 + ps_merge00 f6, f2, f2 + ps_merge11 f7, f2, f2 + ps_merge00 f8, f3, f3 + ps_merge11 f9, f3, f3 + psq_l f10, 0(mtx2), 0, 0 + psq_l f11, 16(mtx2), 0, 0 + psq_l f12, 32(mtx2), 0, 0 + psq_l f13, 48(mtx2), 0, 0 + ps_mul f0, f6, f10 + ps_madd f0, f7, f11, f0 + ps_madd f0, f8, f12, f0 + ps_madd f0, f9, f13, f0 + psq_st f0, 32(dst), 0, 0 + psq_l f10, 8(mtx2), 0, 0 + psq_l f11, 24(mtx2), 0, 0 + psq_l f12, 40(mtx2), 0, 0 + psq_l f13, 56(mtx2), 0, 0 + ps_mul f0, f6, f10 + ps_madd f0, f7, f11, f0 + ps_madd f0, f8, f12, f0 + ps_madd f0, f9, f13, f0 + psq_st f0, 40(dst), 0, 0 + blr +#endif // clang-format on } -/* ############################################################################################## */ /* 80450958-80450960 0003D8 0008+00 1/1 0/0 0/0 .sdata Unit01 */ static f32 Unit01[2] = { 0.0f, 1.0f }; /* 80311F70-8031204C 30C8B0 00DC+00 0/0 1/1 0/0 .text J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl */ -void J3DPSMtxArrayConcat(f32 (*param_0)[4], f32 (*param_1)[4], f32 (*param_2)[4], u32 param_3) { - // NONMATCHING -} +#ifdef __MWERKS__ // clang-format off +asm void J3DPSMtxArrayConcat(register Mtx mA, register Mtx mB, register Mtx mAB, register u32 count) { +#define FP0 fp0 +#define FP1 fp1 +#define FP2 fp2 +#define FP3 fp3 +#define FP4 fp4 +#define FP5 fp5 +#define FP6 fp6 +#define FP7 fp7 +#define FP8 fp8 +#define FP9 fp9 +#define FP10 fp10 +#define FP11 fp11 +#define FP12 fp12 +#define FP13 fp13 +#define FP14 fp14 +#define FP15 fp15 +#define FP31 fp31 +#define UNIT_R r7 + + // this is just PSMtxConcat??? + nofralloc + + stwu sp, -0x40(sp) + stfd FP14, 0x08(sp) + addis UNIT_R, 0, Unit01@ha + stfd FP15, 0x10(sp) + addi UNIT_R, UNIT_R, Unit01@l + stfd FP31, 0x28(sp) + subi mB, mB, 0x08 + subi mAB, mAB, 0x08 + mtctr count +loop: + psq_l FP0, 0x00(mA), 0, 0 + psq_l FP6, 0x08(mB), 0, 0 + psq_l FP7, 0x10(mB), 0, 0 + psq_l FP8, 0x18(mB), 0, 0 + ps_muls0 FP12, FP6, FP0 + psq_l FP2, 0x10(mA), 0, 0 + ps_muls0 FP13, FP7, FP0 + psq_l FP31, 0x00(UNIT_R), 0, 0 + ps_muls0 FP14, FP6, FP2 + psq_l FP9, 0x20(mB), 0, 0 + ps_muls0 FP15, FP7, FP2 + psq_l FP1, 0x08(mA), 0, 0 + ps_madds1 FP12, FP8, FP0, FP12 + psq_l FP3, 0x18(mA), 0, 0 + ps_madds1 FP14, FP8, FP2, FP14 + psq_l FP10, 0x28(mB), 0, 0 + ps_madds1 FP13, FP9, FP0, FP13 + psq_lu FP11, 0x30(mB), 0, 0 + ps_madds1 FP15, FP9, FP2, FP15 + psq_l FP4, 0x20(mA), 0, 0 + psq_l FP5, 0x28(mA), 0, 0 + ps_madds0 FP12, FP10, FP1, FP12 + ps_madds0 FP13, FP11, FP1, FP13 + ps_madds0 FP14, FP10, FP3, FP14 + ps_madds0 FP15, FP11, FP3, FP15 + psq_st FP12, 0x08(mAB), 0, 0 + + ps_muls0 FP2, FP6, FP4 + ps_madds1 FP13, FP31, FP1, FP13 + ps_muls0 FP0, FP7, FP4 + psq_st FP14, 0x18(mAB), 0, 0 + ps_madds1 FP15, FP31, FP3, FP15 + + psq_st FP13, 0x10(mAB), 0, 0 + + ps_madds1 FP2, FP8, FP4, FP2 + ps_madds1 FP0, FP9, FP4, FP0 + ps_madds0 FP2, FP10, FP5, FP2 + psq_st FP15, 0x20(mAB), 0, 0 + ps_madds0 FP0, FP11, FP5, FP0 + psq_st FP2, 0x28(mAB), 0, 0 + ps_madds1 FP0, FP31, FP5, FP0 + psq_stu FP0, 0x30(mAB), 0, 0 + + bdnz loop + + lfd FP14, 0x08(sp) + lfd FP15, 0x10(sp) + lfd FP31, 0x28(sp) + addi sp, sp, 0x40 + blr + +#undef FP0 +#undef FP1 +#undef FP2 +#undef FP3 +#undef FP4 +#undef FP5 +#undef FP6 +#undef FP7 +#undef FP8 +#undef FP9 +#undef FP10 +#undef FP11 +#undef FP12 +#undef FP13 +#undef FP14 +#undef FP15 +#undef FP31 +#undef UNIT_R +} +#endif // clang-format on -/* ############################################################################################## */ /* 803CD8F8-803CD900 02AA18 0008+00 0/0 2/2 0/0 .data PSMulUnit01 */ -extern f32 PSMulUnit01[2] = { +extern f32 PSMulUnit01[] = { 0.0f, -1.0f, }; diff --git a/src/JSystem/JGadget/std-vector.cpp b/src/JSystem/JGadget/std-vector.cpp index fcb4acd48d..4c03e7d164 100644 --- a/src/JSystem/JGadget/std-vector.cpp +++ b/src/JSystem/JGadget/std-vector.cpp @@ -4,222 +4,6 @@ // #include "JSystem/JGadget/std-vector.h" -#include "dolphin/types.h" -#include "algorithm.h" - -// -// Types: -// - -namespace JGadget { -struct vector { - /* 802DCCC8 */ static u32 extend_default(u32, u32, u32); -}; - -template -struct TAllocator { - void destroy(T* item) {} - void deallocate(T* mem, u32 size) { - DeallocateRaw(mem); - } - void DeallocateRaw(T* mem) { - delete mem; - } - T* allocate(u32 count, void *param_2) { - return AllocateRaw(count * sizeof(T)); - } - T* AllocateRaw(u32 size) { - return (T*)new char[size]; - } - - u8 field_0x0; -}; -/* TAllocator */ -struct TAllocator__template0 {}; - -typedef u32 (*extendFunc)(u32, u32, u32); - -template > -struct TVector { - struct TDestructed_deallocate_ { - TDestructed_deallocate_(Allocator* allocator, T* addr) { - mAllocator = allocator; - mAddr = addr; - } - void set(T* addr) { - mAddr = addr; - } - inline ~TDestructed_deallocate_() { - mAllocator->deallocate(mAddr, 0); - } - Allocator* mAllocator; - T* mAddr; - }; - - TVector(Allocator const& param_0) { - field_0x0 = param_0; - pBegin_ = NULL; - pEnd_ = pBegin_; - mCapacity = 0; - pfnExtend_ = JGadget::vector::extend_default; - } - - ~TVector() { - clear(); - field_0x0.deallocate(pBegin_, 0); - } - - T* insert(T* pos, const T& val) { - u32 diff = (u32)pos - (u32)begin(); - insert(pos, 1, val); - return pBegin_ + diff; - } - - void insert(T* pos, u32 count, const T& val) { - if (count != 0) { - T* this_00 = Insert_raw(pos, count); - if (this_00 != end()) { - std::uninitialized_fill_n(this_00, count, val); - } - } - } - - T* Insert_raw(T* pos, u32 count) { - if (count == 0) { - return pos; - } - if (mCapacity < count + size()) { - u32 uVar4 = GetSize_extend_(count); - T* ppvVar5 = field_0x0.allocate(uVar4, NULL); - if (ppvVar5 == NULL) { - pos = end(); - } else { - TDestructed_deallocate_ aTStack_30(&field_0x0, ppvVar5); - T* ppvVar6 = std::uninitialized_copy(pBegin_, pos, ppvVar5); - std::uninitialized_copy(pos, pEnd_, ppvVar6 + count); - DestroyElement_all_(); - aTStack_30.set(pBegin_); - u32 uVar2 = (u32)pEnd_ - (u32)pBegin_; - pEnd_ = ppvVar5 + count + (uVar2 / 4); - pBegin_ = ppvVar5; - mCapacity = uVar4; - pos = ppvVar6; - } - } else { - T* ppvVar5 = pos + count; - if (ppvVar5 < pEnd_) { - T* ppvVar6 = pEnd_ - count; - std::uninitialized_copy(ppvVar6, pEnd_, pEnd_); - std::copy_backward(pos, ppvVar6, pEnd_); - DestroyElement_(pos, ppvVar5); - pEnd_ += count; - } else { - std::uninitialized_copy(pos, pEnd_, ppvVar5); - DestroyElement_(pos, pEnd_); - pEnd_ += count; - } - } - return pos; - } - - T* begin() { - return pBegin_; - } - - T* end() { - return pEnd_; - } - - u32 size() { - if (pBegin_ == 0) { - return 0; - } - return ((u32)pEnd_ - (u32)pBegin_) / 4; - } - - u32 capacity() { return mCapacity; } - - u32 GetSize_extend_(u32 count) { - u32 iVar2 = size(); - u32 uVar3 = capacity(); - u32 uVar4 = pfnExtend_(uVar3, iVar2, count); - if (uVar4 < iVar2 + count) { - uVar4 = iVar2 + count; - } - return uVar4; - } - - void DestroyElement_(T* start, T* end) { - for (; start != end; start++) { - field_0x0.destroy(start); - } - } - - void DestroyElement_all_() { - DestroyElement_(pBegin_, pEnd_); - } - - T* erase(T* start, T* end) { - T* vectorEnd = pEnd_; - T* ppvVar3 = std::copy(end, vectorEnd, start); - DestroyElement_(ppvVar3, pEnd_); - pEnd_ = ppvVar3; - return start; - } - - void clear() { - erase(begin(), end()); - } - - Allocator field_0x0; - T* pBegin_; - T* pEnd_; - u32 mCapacity; - extendFunc pfnExtend_; -}; -/* TVector> */ -struct TVector__template0 { - /* 802DD130 */ void func_802DD130(void* _this, void**, void* const&); - /* 802DCE1C */ void func_802DCE1C(void* _this, void**, u32, void* const&); - /* 802DCE8C */ void func_802DCE8C(void* _this, void**, u32); -}; - -struct TVector_pointer_void : public TVector { - /* 802DCCD0 */ TVector_pointer_void(JGadget::TAllocator const&); - /* 802DCCFC */ ~TVector_pointer_void(); - /* 802DCDA4 */ void insert(void**, void* const&); - /* 802DCDC4 */ void** erase(void**, void**); -}; - -}; // namespace JGadget - -// -// Forward References: -// - -extern "C" void extend_default__Q27JGadget6vectorFUlUlUl(); -extern "C" void func_802DCCD0(); -extern "C" void __dt__Q27JGadget20TVector_pointer_voidFv(); -extern "C" void insert__Q27JGadget20TVector_pointer_voidFPPvRCPv(); -extern "C" void erase__Q27JGadget20TVector_pointer_voidFPPvPPv(); -extern "C" void func_802DCE1C(void* _this, void**, u32, void* const&); -extern "C" void func_802DCE8C(void* _this, void**, u32); -extern "C" void func_802DD130(void* _this, void**, void* const&); - -// -// External References: -// - -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// /* 802DCCC8-802DCCD0 2D7608 0008+00 1/1 0/0 0/0 .text extend_default__Q27JGadget6vectorFUlUlUl */ u32 JGadget::vector::extend_default(u32 param_0, u32 param_1, u32 param_2) { @@ -237,37 +21,12 @@ JGadget::TVector_pointer_void::~TVector_pointer_void() { /* 802DCDA4-802DCDC4 2D76E4 0020+00 0/0 1/1 0/0 .text * insert__Q27JGadget20TVector_pointer_voidFPPvRCPv */ -// the entire function chain needs work -#ifdef NONMATCHING void JGadget::TVector_pointer_void::insert(void** param_0, void* const& param_1) { TVector::insert(param_0, param_1); } -#else -void JGadget::TVector_pointer_void::insert(void** param_0, void* const& param_1) { - // NONMATCHING -} -#endif /* 802DCDC4-802DCE1C 2D7704 0058+00 0/0 1/1 0/0 .text * erase__Q27JGadget20TVector_pointer_voidFPPvPPv */ void** JGadget::TVector_pointer_void::erase(void** param_0, void** param_1) { return TVector::erase(param_0, param_1); } - -/* 802DCE1C-802DCE8C 2D775C 0070+00 1/1 0/0 0/0 .text - * insert__Q27JGadget38TVector>FPPvUlRCPv */ -extern "C" void func_802DCE1C(void* _this, void** param_0, u32 param_1, void* const& param_2) { - // NONMATCHING -} - -/* 802DCE8C-802DD130 2D77CC 02A4+00 1/1 0/0 0/0 .text - * Insert_raw__Q27JGadget38TVector>FPPvUl */ -extern "C" void func_802DCE8C(void* _this, void** param_0, u32 param_1) { - // NONMATCHING -} - -/* 802DD130-802DD188 2D7A70 0058+00 1/1 0/0 0/0 .text - * insert__Q27JGadget38TVector>FPPvRCPv */ -extern "C" void func_802DD130(void* _this, void** param_0, void* const& param_1) { - // NONMATCHING -} \ No newline at end of file diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp index 97c7073256..aaf809ba81 100644 --- a/src/JSystem/JMessage/resource.cpp +++ b/src/JSystem/JMessage/resource.cpp @@ -4,8 +4,9 @@ // #include "JSystem/JMessage/resource.h" -#include "string.h" +#include #include "dol2asm.h" +#include "string.h" // // Types: @@ -64,12 +65,81 @@ extern "C" f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */]; /* 802A8CDC-802A8EC0 2A361C 01E4+00 0/0 1/1 0/0 .text * toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb */ -u16 JMessage::TResource::toMessageIndex_messageID(u32 param_0, u32 param_1, - bool* param_2) const { - // NONMATCHING +// NONMATCHING - instruction order +u16 JMessage::TResource::toMessageIndex_messageID(u32 lowerHalf, u32 upperHalf, + bool* isMsgValid) const { + if (!mMessageID.get()) { + return 0xFFFF; + } + + u32 val = -1; + bool check = true; + + switch (mMessageID.get_formSupplement()) { + case 0: + if (upperHalf) { + check = false; + } + val = lowerHalf; + break; + case 1: + if (lowerHalf > 0xFFFFFF || upperHalf > 0xFF) { + check = false; + } + val = ((lowerHalf << 8) & 0xFFFFFF00) | (upperHalf & 0xFF); + break; + case 2: + if (lowerHalf > 0xFFFF || upperHalf > 0xFFFF) { + check = false; + } + val = ((lowerHalf << 16) & 0xFFFF0000) | (upperHalf & 0xFFFF); + break; + case 3: + if (lowerHalf > 0xFF || upperHalf > 0xFFFFFF) { + check = false; + } + val = ((lowerHalf << 24) & 0xFF000000) | (upperHalf & 0x00FFFFFF); + break; + case 4: + if (lowerHalf) { + check = false; + } + val = upperHalf; + break; + default: + return 0xFFFF; + } + + if (isMsgValid) { + *isMsgValid = check; + } + + if (val == 0xFFFFFFFF) { + return 0xFFFF; + } + + const u32* first = (u32*)mMessageID.getContent(); + const u32* last = (u32*)(first + mMessageID.get_number()); + + const u32* lower; + if (mMessageID.get_isOrdered()) { + lower = std::lower_bound(first, last, val); + + if (lower == last || *lower != val) { + return 0xFFFF; + } + } else { + lower = first; + while (lower != last && *lower != val) { + lower++; + } + if (lower == last) { + return 0xFFFF; + } + } + return (lower - first); } -/* ############################################################################################## */ /* 803C9C80-803C9C94 -00001 0014+00 1/1 0/0 0/0 .data * sapfnParseCharacter___Q28JMessage18TResourceContainer */ JMessage::locale::parseCharacter_function JMessage::TResourceContainer::sapfnParseCharacter_[5] = { @@ -115,15 +185,19 @@ JMessage::TResourceContainer::TCResource::TCResource() { /* 802A8EF8-802A8F6C 2A3838 0074+00 1/0 2/2 0/0 .text * __dt__Q38JMessage18TResourceContainer10TCResourceFv */ // need to fix TLinkList_factory vtable stuff -// JMessage::TResourceContainer::TCResource::~TCResource() { -extern "C" void __dt__Q38JMessage18TResourceContainer10TCResourceFv() { - // NONMATCHING -} +JMessage::TResourceContainer::TCResource::~TCResource() {} /* 802A8F6C-802A8FFC 2A38AC 0090+00 0/0 1/1 0/0 .text * Get_groupID__Q38JMessage18TResourceContainer10TCResourceFUs */ -JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 param_0) { - // NONMATCHING +// NONMATCHING +JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 groupID) { + JGadget::TContainerEnumerator enumerator(this); + while (enumerator) { + const TResource* res = &(*enumerator); + if (res->field_0xc.get_groupID() == groupID) + return (TResource*)res; + } + return NULL; } /* 802A8FFC-802A9048 2A393C 004C+00 1/0 0/0 0/0 .text @@ -169,10 +243,7 @@ JMessage::TParse::TParse(JMessage::TResourceContainer* pContainer) { } /* 802A9158-802A91B8 2A3A98 0060+00 1/0 0/0 0/0 .text __dt__Q28JMessage6TParseFv */ -// JMessage::TParse::~TParse() { -extern "C" void __dt__Q28JMessage6TParseFv() { - // NONMATCHING -} +JMessage::TParse::~TParse() {} /* 802A91B8-802A92F4 2A3AF8 013C+00 1/0 0/0 0/0 .text * parseHeader_next__Q28JMessage6TParseFPPCvPUlUl */ @@ -253,7 +324,7 @@ int JMessage::locale::parseCharacter_2Byte(char const** string) { } /* 802A94D4-802A9528 2A3E14 0054+00 1/1 0/0 0/0 .text lower_bound__3stdFPCUlPCUlRCUl */ -extern "C" void func_802A94D4(void* _this, u32 const* param_0, u32 const* param_1, +/* extern "C" void func_802A94D4(void* _this, u32 const* param_0, u32 const* param_1, u32 const& param_2) { // NONMATCHING -} \ No newline at end of file +} */ diff --git a/src/JSystem/JStudio/JStudio/ctb.cpp b/src/JSystem/JStudio/JStudio/ctb.cpp index 548e944bab..9644dc978a 100644 --- a/src/JSystem/JStudio/JStudio/ctb.cpp +++ b/src/JSystem/JStudio/JStudio/ctb.cpp @@ -190,7 +190,7 @@ JStudio::ctb::TObject* JStudio::ctb::TControl::getObject_index(u32 param_0) { return 0; } JGadget::TLinkList::iterator aiStack_14 = mList.begin(); - std::advance(aiStack_14, param_0); + std::advance_fake(aiStack_14, param_0); return &*aiStack_14; } @@ -302,4 +302,4 @@ extern "C" void func_802815B4(void* _this, JGadget::TLinkList::iterator param_1, JStudio::object::TPRObject_ID_equal param_2) { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h index 5062fdd6df..adde83897c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h @@ -1,9 +1,30 @@ #ifndef MSL_ALGORITHM_H_ #define MSL_ALGORITHM_H_ +#include +#include + namespace std { template -ForwardIterator lower_bound(ForwardIterator first, ForwardIterator last, const T& val); +ForwardIterator lower_bound(ForwardIterator first, ForwardIterator last, const T& val) { + typedef typename iterator_traits::difference_type difference_type; + difference_type len = std::distance(first, last); + + while (len > 0) { + ForwardIterator i = first; + difference_type step = len / 2; + std::advance(i, step); + + if (*i < val) { + first = ++i; + len -= step + 1; + } else { + len = step; + } + } + + return first; +} template ForwardIterator upper_bound(ForwardIterator first, ForwardIterator last, const T& val); @@ -53,12 +74,45 @@ inline OutputIt copy(InputIt first, InputIt last, return d_first; } -template -inline BidirIt2 copy_backward(BidirIt1 first, BidirIt1 last, BidirIt2 d_last) { - while (first != last) { - *(--d_last) = *(--last); - } - return d_last; +template +inline BidirectionalIterator2 copy_backward(BidirectionalIterator1 first, BidirectionalIterator1 last, BidirectionalIterator2 result) { + while (last != first) + *--result = *--last; + return result; +} + +template +struct __copy_backward +{ + static T* copy_backward(T* first, T* last, T* result) + { + while (last > first) + *--result = *--last; + return result; + } +}; + +template +struct __copy_backward +{ + static T* copy_backward(T* first, T* last, T* result) + { +#ifdef DEBUG + size_t n = static_cast(last - first); + result -= n; + memmove(result, first, n*sizeof(T)); + return result; +#else + while (last > first) + *--result = *--last; + return result; +#endif + } +}; + +template +inline T* copy_backward(T* first, T* last, T* result) { + return __copy_backward::copy_backward(first, last, result); } } // namespace std diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h index f7d86e3789..231e437fa1 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h @@ -2,20 +2,92 @@ #define MSL_ITERATOR_H_ namespace std { -template< class InputIt, class Distance > -inline void advance( InputIt& it, Distance n) { +struct input_iterator_tag {}; +struct output_iterator_tag {}; +struct forward_iterator_tag : public input_iterator_tag {}; +struct bidirectional_iterator_tag : public forward_iterator_tag {}; +struct random_access_iterator_tag : public bidirectional_iterator_tag {}; + +template +struct iterator_traits { + typedef typename Iterator::difference_type difference_type; + typedef typename Iterator::value_type value_type; + typedef typename Iterator::pointer pointer; + typedef typename Iterator::reference reference; + typedef typename Iterator::iterator_category iterator_category; +}; + +template +struct iterator_traits { + typedef ptrdiff_t difference_type; + typedef T value_type; + typedef T* pointer; + typedef T& reference; + typedef random_access_iterator_tag iterator_category; +}; + +template +inline void __advance(InputIterator& i, Distance n, input_iterator_tag) { + for (; n > 0; --n) + ++i; +} + +template +inline void __advance(BidirectionalIterator& i, Distance n, bidirectional_iterator_tag) { + if (n >= 0) + for (; n > 0; --n) + ++i; + else + for (; n < 0; ++n) + --i; +} + +template +inline void __advance(RandomAccessIterator& i, Distance n, random_access_iterator_tag) { + i += n; +} + +template +inline void advance(InputIterator& i, Distance n) { + __advance(i, n, typename iterator_traits::iterator_category()); +} + +// TODO: combine this with above later +template +inline void advance_fake(InputIt& it, Distance n) { while (n > 0) { --n; ++it; } } +template +inline typename iterator_traits::difference_type +__distance(InputIterator first, InputIterator last, input_iterator_tag) { + typename iterator_traits::difference_type result = 0; + for (; first != last; ++first) + ++result; + return result; +} + +template +inline typename iterator_traits::difference_type +__distance(RandomAccessIterator first, RandomAccessIterator last, random_access_iterator_tag) { + return last - first; +} + +template +inline typename iterator_traits::difference_type distance(InputIterator first, + InputIterator last) { + return __distance(first, last, typename iterator_traits::iterator_category()); +} + // This needs to be defined with gcc concepts or something similar. Workaround. -template< class InputIt, class Distance > -inline void advance_pointer( InputIt& it, Distance n) { +template +inline void advance_pointer(InputIt& it, Distance n) { it += n; } -} +} // namespace std -#endif \ No newline at end of file +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h index 9a29cd9092..bdd83684d7 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h @@ -5,20 +5,47 @@ namespace std { template inline ForwardIt uninitialized_fill_n(ForwardIt first, Size count, const T& value) { - for (; count > 0; ++first, (void) --count) { - *first = value; + for (; count--; ++first) { + if (first != NULL) { + *first = value; + } } return first; } -template -inline NoThrowForwardIt uninitialized_copy(InputIt first, InputIt last, NoThrowForwardIt d_first) { - for (; first != last; ++first, ++d_first) { - *d_first = *first; +template +inline ForwardIterator __uninitialized_copy(InputIterator first, InputIterator last, ForwardIterator result) { + ForwardIterator __save = result; + + for (; first != last; ++first, ++result) { + *result = *first; } - return d_first; + return result; +} + +template +struct __uninitialized_copy_helper { + static T* uninitialized_copy(T* first, T* last, T* result) { + return __uninitialized_copy(first, last, result); + } +}; + +template +struct __uninitialized_copy_helper +{ + static T* uninitialized_copy(T* first, T* last, T* result) + { + for (; first < last; ++result, ++first) + *result = *first; + return result; + } +}; + +template +inline T* uninitialized_copy(T* first, T* last, T* result) { + return __uninitialized_copy_helper::uninitialized_copy(first, last, result); } } -#endif \ No newline at end of file +#endif diff --git a/src/SSystem/SComponent/c_request.cpp b/src/SSystem/SComponent/c_request.cpp index caa58197cd..1bc3814b06 100644 --- a/src/SSystem/SComponent/c_request.cpp +++ b/src/SSystem/SComponent/c_request.cpp @@ -7,8 +7,8 @@ /* 802667D4-80266800 261114 002C+00 0/0 3/3 0/0 .text cReq_Is_Done__FP18request_base_class */ int cReq_Is_Done(request_base_class* i_this) { - if (i_this->field_0x0.flag1 == 1) { - i_this->field_0x0.flag1 = 0; + if (i_this->flag1 == 1) { + i_this->flag1 = 0; return 1; } return 0; @@ -17,9 +17,9 @@ int cReq_Is_Done(request_base_class* i_this) { /* 80266800-80266830 261140 0030+00 0/0 3/3 0/0 .text cReq_Done__FP18request_base_class */ void cReq_Done(request_base_class* i_this) { - i_this->field_0x0.flag0 = 0; - i_this->field_0x0.flag1 = 1; - i_this->field_0x0.flag2 = 0; + i_this->flag0 = 0; + i_this->flag1 = 1; + i_this->flag2 = 0; } /* 80266830-80266850 261170 0020+00 0/0 2/2 0/0 .text cReq_Command__FP18request_base_classUc */ @@ -29,7 +29,7 @@ void cReq_Command(request_base_class* i_this, u8 param_1) { /* 80266850-80266880 261190 0030+00 1/1 2/2 0/0 .text cReq_Create__FP18request_base_classUc */ void cReq_Create(request_base_class* i_this, u8 param_1) { - i_this->field_0x0.flag0 = 1; - i_this->field_0x0.flag1 = 0; - i_this->field_0x0.flag2 = param_1; -} \ No newline at end of file + i_this->flag0 = 1; + i_this->flag1 = 0; + i_this->flag2 = param_1; +} diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index 99849e9483..11591d5ced 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -462,7 +462,7 @@ extern actor_process_profile_definition g_profile_DR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_DR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daDr_c), // mSize 0, // mSizeOther 0, // mParameters @@ -474,4 +474,4 @@ extern actor_process_profile_definition g_profile_DR = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 805AA4C8-805AA4C8 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805AA4C8-805AA4C8 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp index 7aff1f1e30..22960205e6 100644 --- a/src/d/actor/d_a_L7low_dr.cpp +++ b/src/d/actor/d_a_L7low_dr.cpp @@ -288,7 +288,7 @@ extern actor_process_profile_definition g_profile_L7lowDr = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_L7lowDr, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daL7lowDr_c), // mSize 0, // mSizeOther 0, // mParameters @@ -300,4 +300,4 @@ extern actor_process_profile_definition g_profile_L7lowDr = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 805AAFB0-805AAFB0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805AAFB0-805AAFB0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index 9cf14d62c1..f4c5e6d83d 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -887,7 +887,7 @@ extern actor_process_profile_definition g_profile_L7ODR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_L7ODR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daL7ODR_c), // mSize 0, // mSizeOther 0, // mParameters @@ -982,4 +982,4 @@ extern "C" void __as__4cXyzFRC4cXyz() { // NONMATCHING } -/* 805AE0AC-805AE0AC 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805AE0AC-805AE0AC 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 35351699f1..9b6304a5a4 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -5339,7 +5339,7 @@ extern actor_process_profile_definition g_profile_ALINK = { 5, fpcPi_CURRENT_e, PROC_ALINK, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daAlink_c), 0, 0, diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index 49c30f673f..51c08ef892 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -1129,10 +1129,10 @@ BOOL daAlink_c::checkEndMessage(u32 param_0) { msg_class* msg = fopMsgM_SearchByID(mMsgClassID); if (msg != NULL) { - if (msg->mMode == 14) { - msg->mMode = 16; - } else if (msg->mMode == 0x12) { - msg->mMode = 0x13; + if (msg->mode == 14) { + msg->mode = 16; + } else if (msg->mode == 0x12) { + msg->mode = 0x13; return 1; } } diff --git a/src/d/actor/d_a_alink_kandelaar.inc b/src/d/actor/d_a_alink_kandelaar.inc index 6591fcd0d0..fd030629e8 100644 --- a/src/d/actor/d_a_alink_kandelaar.inc +++ b/src/d/actor/d_a_alink_kandelaar.inc @@ -212,8 +212,8 @@ void daAlink_c::preKandelaarDraw() { field_0x32c8 = 0; } - f32 near = dComIfGd_getView()->mNear; - f32 far = dComIfGd_getView()->mFar; + f32 near = dComIfGd_getView()->near; + f32 far = dComIfGd_getView()->far; mDoLib_pos2camera(&mKandelaarFlamePos, &proj); proj.z += 30.0f; diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 7eae783b2c..3f4df493bb 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -208,7 +208,7 @@ extern actor_process_profile_definition g_profile_ALLDIE = { 2, fpcPi_CURRENT_e, PROC_ALLDIE, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daAlldie_c), 0, 0, diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 85744442f0..51d8883d5e 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -79,7 +79,7 @@ extern actor_process_profile_definition g_profile_ANDSW = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_ANDSW, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daAndsw_c), // mSize 0, // mSizeOther 0, // mParameters @@ -89,4 +89,4 @@ extern actor_process_profile_definition g_profile_ANDSW = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 6afb4b1ad5..ed1d144852 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -368,7 +368,7 @@ extern actor_process_profile_definition g_profile_ANDSW2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_ANDSW2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daAndsw2_c), // mSize 0, // mSizeOther 0, // mParameters @@ -378,4 +378,4 @@ extern actor_process_profile_definition g_profile_ANDSW2 = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_6_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 15588073ef..df0524a768 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -1292,7 +1292,7 @@ extern actor_process_profile_definition g_profile_ARROW = { 9, // mListID fpcPi_CURRENT_e, // mListPrio PROC_ARROW, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daArrow_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index 878064c0bc..c47936692e 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -294,7 +294,7 @@ extern actor_process_profile_definition g_profile_B_BH = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_BH, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(b_bh_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1202,4 +1202,4 @@ static u8 data_805B3478[4]; static u8 data_805B347C[4]; #pragma pop -/* 805B322C-805B322C 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805B322C-805B322C 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index c907658551..4b4bd995e7 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -1434,8 +1434,8 @@ static void demo_camera(b_bq_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); - i_this->mDemoCamEye = camera0->mLookat.mEye; - i_this->mDemoCamCenter = camera0->mLookat.mCenter; + i_this->mDemoCamEye = camera0->lookat.eye; + i_this->mDemoCamCenter = camera0->lookat.center; dComIfGp_getEvent().startCheckSkipEdge(i_this); // fallthrough @@ -2693,7 +2693,7 @@ extern actor_process_profile_definition g_profile_B_BQ = { 7, fpcPi_CURRENT_e, PROC_B_BQ, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(b_bq_class), 0, 0, @@ -2703,4 +2703,4 @@ extern actor_process_profile_definition g_profile_B_BQ = { 0x44000, fopAc_ENEMY_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index 2154e91e2a..e32592f89a 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -724,7 +724,7 @@ extern actor_process_profile_definition g_profile_B_DR = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_DR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daB_DR_c), // mSize 0, // mSizeOther 0, // mParameters @@ -3088,4 +3088,4 @@ static u8 data_805C7A38[4]; static u8 data_805C7A3C[4]; #pragma pop -/* 805C7240-805C7240 0005CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805C7240-805C7240 0005CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index 482c02bf8a..c17c23f4a7 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -245,7 +245,7 @@ extern actor_process_profile_definition g_profile_B_DRE = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_DRE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daB_DRE_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1397,4 +1397,4 @@ static u8 data_805CB134[4]; static u8 data_805CB138[4]; #pragma pop -/* 805CAECC-805CAECC 000170 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805CAECC-805CAECC 000170 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 2895694e25..6231a3c17c 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -1345,10 +1345,10 @@ void daB_DS_c::setYoMessage(int i_msgIdx) { /* 805CDA44-805CDAC0 002904 007C+00 1/1 0/0 0/0 .text doYoMessage__8daB_DS_cFv */ bool daB_DS_c::doYoMessage() { if (mpMsg != NULL) { - if (mpMsg->mMode == 0xE) { - mpMsg->mMode = 0x10; - } else if (mpMsg->mMode == 0x12) { - mpMsg->mMode = 0x13; + if (mpMsg->mode == 0xE) { + mpMsg->mode = 0x10; + } else if (mpMsg->mode == 0x12) { + mpMsg->mode = 0x13; mMsgPcID = 0xFFFFFFFF; return true; } @@ -3182,8 +3182,8 @@ bool daB_DS_c::mChkScreenIn() { camera_class* camera = dComIfGp_getCamera(0); cXyz vec1, vec2; - vec2 = camera->mLookat.mEye - camera->mLookat.mCenter; - vec1 = camera->mLookat.mEye - current.pos; + vec2 = camera->lookat.eye - camera->lookat.center; + vec1 = camera->lookat.eye - current.pos; return abs((s16)(vec1.atan2sX_Z() - vec2.atan2sX_Z())) < 0x3000; } @@ -6119,7 +6119,7 @@ extern actor_process_profile_definition g_profile_B_DS = { 4, fpcPi_CURRENT_e, PROC_B_DS, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daB_DS_c), 0, 0, diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index 3c9bc7ce18..8a1bd16bf6 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -557,7 +557,7 @@ extern actor_process_profile_definition g_profile_B_GG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_GG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daB_GG_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2571,4 +2571,4 @@ static u8 data_805ED83C[4]; static u8 data_805ED840[4]; #pragma pop -/* 805ED3D4-805ED3D4 000374 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805ED3D4-805ED3D4 000374 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index cdefc9dabd..7a484227af 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -522,7 +522,7 @@ extern actor_process_profile_definition g_profile_B_GM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_GM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(b_gm_class), // mSize 0, // mSizeOther 0, // mParameters @@ -2047,4 +2047,4 @@ static u8 data_805F4948[4]; static u8 data_805F494C[4]; #pragma pop -/* 805F4388-805F4388 000200 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805F4388-805F4388 000200 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index b30b386c5f..66c5b7f94a 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -772,7 +772,7 @@ extern actor_process_profile_definition g_profile_B_GND = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_GND, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(b_gnd_class), // mSize 0, // mSizeOther 0, // mParameters @@ -3101,4 +3101,4 @@ static u8 data_806030B8[4]; static u8 data_806030BC[4]; #pragma pop -/* 806029AC-806029AC 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806029AC-806029AC 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_b_go.cpp b/src/d/actor/d_a_b_go.cpp index f98e6d82e5..7bec072e2d 100644 --- a/src/d/actor/d_a_b_go.cpp +++ b/src/d/actor/d_a_b_go.cpp @@ -312,7 +312,7 @@ extern actor_process_profile_definition g_profile_B_GO = { 7, fpcPi_CURRENT_e, PROC_B_GO, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(b_go_class), 0, 0, @@ -322,4 +322,4 @@ extern actor_process_profile_definition g_profile_B_GO = { 0x40100, fopAc_ENEMY_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index 7fa4f55ae7..1bf427e35d 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -425,7 +425,7 @@ extern actor_process_profile_definition g_profile_B_GOS = { 8, fpcPi_CURRENT_e, PROC_B_GOS, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(b_gos_class), 0, 0, @@ -435,4 +435,4 @@ extern actor_process_profile_definition g_profile_B_GOS = { 0x40100, fopAc_ENEMY_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index 745572f442..7789fa7983 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -619,7 +619,7 @@ extern actor_process_profile_definition g_profile_B_MGN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_MGN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daB_MGN_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2024,4 +2024,4 @@ extern "C" void checkNowWolf__9daPy_py_cFv() { // NONMATCHING } -/* 80610084-80610084 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80610084-80610084 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 4250a861ee..2203e2be5f 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -635,7 +635,7 @@ static int daB_OB_Draw(b_ob_class* i_this) { for (int i = 0; i < 19; i++) { if (!i_this->mBodyParts[i].mHide) { - if ((i_this->mBodyParts[i].mPos - camera->mLookat.mEye).abs() > + if ((i_this->mBodyParts[i].mPos - camera->lookat.eye).abs() > i_this->mBodyParts[i].mSize * (JREG_F(17) + 500.0f)) { g_env_light.setLightTevColorType_MAJI(i_this->mBodyParts[i].mpMorf->getModel(), @@ -2315,7 +2315,7 @@ static void fish_move(b_ob_class* i_this) { a_this->attention_info.position.y += 50.0f; if (i_this->mDemoAction == 21 || i_this->mDemoAction == 22) { - sp84 = dComIfGp_getCamera(0)->mLookat.mEye - sp90; + sp84 = dComIfGp_getCamera(0)->lookat.eye - sp90; } else { sp84 = player->eyePos - sp90; } @@ -2399,8 +2399,8 @@ static void demo_camera(b_ob_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(46, 0, 0, 0); - i_this->mDemoCamEye = camera0->mLookat.mEye; - i_this->mDemoCamCenter = camera0->mLookat.mCenter; + i_this->mDemoCamEye = camera0->lookat.eye; + i_this->mDemoCamCenter = camera0->lookat.center; sp58 = i_this->mDemoCamEye - tentacle->current.pos; i_this->field_0x5ce0 = cM_atan2s(sp58.x, sp58.z); @@ -4201,7 +4201,7 @@ extern actor_process_profile_definition g_profile_B_OB = { 4, fpcPi_CURRENT_e, PROC_B_OB, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(b_ob_class), 0, 0, @@ -4211,4 +4211,4 @@ extern actor_process_profile_definition g_profile_B_OB = { 0xC4000, fopAc_ENEMY_e, fopAc_CULLBOX_CUSTOM_e, -}; \ 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 ec2ab9238f..348e982726 100644 --- a/src/d/actor/d_a_b_oh2.cpp +++ b/src/d/actor/d_a_b_oh2.cpp @@ -315,7 +315,7 @@ extern actor_process_profile_definition g_profile_B_OH2 = { 7, fpcPi_CURRENT_e, PROC_B_OH2, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(b_oh2_class), 0, 0, diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index d5c292eadd..bf2683bbfc 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -805,7 +805,7 @@ extern actor_process_profile_definition g_profile_B_TN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_TN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daB_TN_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2934,4 +2934,4 @@ static u8 data_8062F360[4]; static u8 data_8062F364[4]; #pragma pop -/* 8062E8E8-8062E8E8 0002B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8062E8E8-8062E8E8 0002B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index ed3813446d..bb0ebb2ada 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -776,10 +776,10 @@ void daB_YO_c::setYoMessage(int i_msgIdx) { /* 80630EAC-80630F28 001B2C 007C+00 1/1 0/0 0/0 .text doYoMessage__8daB_YO_cFv */ int daB_YO_c::doYoMessage() { if (mpMsg != NULL) { - if (mpMsg->mMode == 0xE) { - mpMsg->mMode = 0x10; - } else if (mpMsg->mMode == 0x12) { - mpMsg->mMode = 0x13; + if (mpMsg->mode == 0xE) { + mpMsg->mode = 0x10; + } else if (mpMsg->mode == 0x12) { + mpMsg->mode = 0x13; mMsgPcID = 0xFFFFFFFF; return 1; } @@ -3686,7 +3686,7 @@ extern actor_process_profile_definition g_profile_B_YO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_YO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daB_YO_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index b60fa1444e..cdb37bb9fb 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -1145,7 +1145,7 @@ extern actor_process_profile_definition g_profile_B_YOI = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_YOI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daB_YOI_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index 40b3cde428..280e35d581 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -993,10 +993,10 @@ void daB_ZANT_c::setZantMessage(int i_msgNo) { /* 80640104-80640180 0020E4 007C+00 1/1 0/0 0/0 .text doZantMessage__10daB_ZANT_cFv */ int daB_ZANT_c::doZantMessage() { if (mpMsg != NULL) { - if (mpMsg->mMode == 14) { - mpMsg->mMode = 16; - } else if (mpMsg->mMode == 18) { - mpMsg->mMode = 19; + if (mpMsg->mode == 14) { + mpMsg->mode = 16; + } else if (mpMsg->mode == 18) { + mpMsg->mode = 19; mMsgID = fpcM_ERROR_PROCESS_ID_e; return 1; } @@ -5798,7 +5798,7 @@ extern actor_process_profile_definition g_profile_B_ZANT = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_ZANT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daB_ZANT_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index 656276bec1..1908571872 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -305,7 +305,7 @@ extern actor_process_profile_definition g_profile_B_ZANTM = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_ZANTM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daB_ZANTM_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 623b3ca55c..965a7f4649 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -539,7 +539,7 @@ extern actor_process_profile_definition g_profile_B_ZANTZ = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_B_ZANTZ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daB_ZANTZ_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_b_zant_sima.cpp b/src/d/actor/d_a_b_zant_sima.cpp index fb82e2dbfa..f6b84b1edb 100644 --- a/src/d/actor/d_a_b_zant_sima.cpp +++ b/src/d/actor/d_a_b_zant_sima.cpp @@ -245,7 +245,7 @@ extern actor_process_profile_definition g_profile_B_ZANTS = { 3, fpcPi_CURRENT_e, PROC_B_ZANTS, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daB_ZANTS_c), 0, 0, @@ -255,4 +255,4 @@ extern actor_process_profile_definition g_profile_B_ZANTS = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index 47d058a048..5b7e5e4821 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -689,7 +689,7 @@ extern actor_process_profile_definition g_profile_BALLOON2D = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_BALLOON2D, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(JMSMesgEntry_c), // mSize 0, // mSizeOther 0, // mParameters @@ -810,4 +810,4 @@ void __sinit_d_a_balloon_2D_cpp() { REGISTER_CTORS(0x80655524, __sinit_d_a_balloon_2D_cpp); #pragma pop -/* 806555EC-806555EC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806555EC-806555EC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 495571f0da..090103c3ee 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -252,7 +252,7 @@ extern actor_process_profile_definition g_profile_BD = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_BD, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(bd_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1222,4 +1222,4 @@ static u8 data_804DA44C[4]; static u8 data_804DA450[4]; #pragma pop -/* 804D9F6C-804D9F6C 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 804D9F6C-804D9F6C 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index d9ff1f4802..16ffe35ad7 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -1368,7 +1368,7 @@ extern actor_process_profile_definition g_profile_BG_OBJ = { 7, fpcPi_CURRENT_e, PROC_BG_OBJ, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daBgObj_c), 0, 0, @@ -1378,4 +1378,4 @@ extern actor_process_profile_definition g_profile_BG_OBJ = { 0x10044100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 41dbb175f4..57ca99d939 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -1360,7 +1360,7 @@ extern actor_process_profile_definition g_profile_BOOMERANG = { 6, // mListID fpcPi_CURRENT_e, // mListPrio PROC_BOOMERANG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000DE4, // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_bullet.cpp b/src/d/actor/d_a_bullet.cpp index 4d64280140..ba13c10409 100644 --- a/src/d/actor/d_a_bullet.cpp +++ b/src/d/actor/d_a_bullet.cpp @@ -155,7 +155,7 @@ extern actor_process_profile_definition g_profile_BULLET = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_BULLET, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daBullet_c), // mSize 0, // mSizeOther 0, // mParameters @@ -460,4 +460,4 @@ static void func_806566F8() { // NONMATCHING } -/* 80656774-80656774 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80656774-80656774 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index acc4f45ed8..53913a57cb 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -367,7 +367,7 @@ extern actor_process_profile_definition g_profile_CANOE = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_CANOE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daCanoe_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1183,4 +1183,4 @@ static u8 data_804DD8D0[4]; static u8 data_804DD8D4[4]; #pragma pop -/* 804DD6E8-804DD6E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 804DD6E8-804DD6E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index c0d774e4ef..9e70df7b66 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -241,7 +241,7 @@ extern actor_process_profile_definition g_profile_COACH2D = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_COACH2D, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daCoach2D_c), // mSize 0, // mSizeOther 0, // mParameters @@ -350,4 +350,4 @@ void __sinit_d_a_coach_2D_cpp() { REGISTER_CTORS(0x8065789C, __sinit_d_a_coach_2D_cpp); #pragma pop -/* 80657954-80657954 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80657954-80657954 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp index 17c774c5c8..b11cd94c03 100644 --- a/src/d/actor/d_a_coach_fire.cpp +++ b/src/d/actor/d_a_coach_fire.cpp @@ -197,7 +197,7 @@ extern actor_process_profile_definition g_profile_COACH_FIRE = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_COACH_FIRE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daCoachFire_c), // mSize 0, // mSizeOther 0, // mParameters @@ -279,4 +279,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { SECTION_DEAD static char const* const stringBase_80658454 = "Coach"; #pragma pop -/* 80658454-80658454 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80658454-80658454 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index ee763070f7..a2bb0bd723 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -1342,7 +1342,7 @@ extern actor_process_profile_definition g_profile_COW = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_COW, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daCow_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2586,4 +2586,4 @@ static u8 data_806635B4[4]; static u8 data_806635B8[4]; #pragma pop -/* 80662F18-80662F18 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80662F18-80662F18 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_crod.cpp b/src/d/actor/d_a_crod.cpp index beae518c29..4ca4f64984 100644 --- a/src/d/actor/d_a_crod.cpp +++ b/src/d/actor/d_a_crod.cpp @@ -411,7 +411,7 @@ extern actor_process_profile_definition g_profile_CROD = { 8, fpcPi_CURRENT_e, PROC_CROD, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daCrod_c), 0, 0, @@ -421,4 +421,4 @@ extern actor_process_profile_definition g_profile_CROD = { 0x60000, 5, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 7168c9cba9..acea4fcff2 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -378,7 +378,7 @@ extern actor_process_profile_definition g_profile_CSTAF = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_CSTAF, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000B38, // mSize 0, // mSizeOther 0, // mParameters @@ -769,4 +769,4 @@ static void func_804DF89C() { /* 804DF8A4-804DF8AC 001FC4 0008+00 1/0 0/0 0/0 .text @20@__dt__15dBgS_StatueAcchFv */ static void func_804DF8A4() { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 6a1a74d2fa..13223c57de 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -437,7 +437,7 @@ extern actor_process_profile_definition g_profile_CSTATUE = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_CSTATUE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000B2C, // mSize 0, // mSizeOther 0, // mParameters @@ -1637,4 +1637,4 @@ static u8 data_80667C3C[4]; #pragma push #pragma force_active on static u8 data_80667C40[4]; -#pragma pop \ No newline at end of file +#pragma pop diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index b9ea9f2a53..f0481a9404 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -464,7 +464,7 @@ extern actor_process_profile_definition g_profile_DEMO00 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_DEMO00, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daDemo00_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1505,4 +1505,4 @@ static u8 data_804A8E80[4]; static u8 data_804A8E84[4]; #pragma pop -/* 804A8998-804A8998 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 804A8998-804A8998 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index a2028ea677..5a95005290 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -573,7 +573,7 @@ extern actor_process_profile_definition g_profile_Demo_Item = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Demo_Item, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daDitem_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 5b0bc1db69..c32dab1cb2 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -139,7 +139,7 @@ extern actor_process_profile_definition g_profile_DISAPPEAR = { 7, fpcPi_CURRENT_e, PROC_DISAPPEAR, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(disappear_class), 0, 0, @@ -149,4 +149,4 @@ extern actor_process_profile_definition g_profile_DISAPPEAR = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_dmidna.cpp b/src/d/actor/d_a_dmidna.cpp index 217fbac67b..022091ae74 100644 --- a/src/d/actor/d_a_dmidna.cpp +++ b/src/d/actor/d_a_dmidna.cpp @@ -107,7 +107,7 @@ extern actor_process_profile_definition g_profile_DMIDNA = { 7, fpcPi_CURRENT_e, PROC_DMIDNA, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daDmidna_c), 0, 0, @@ -117,4 +117,4 @@ extern actor_process_profile_definition g_profile_DMIDNA = { 0x60000, fopAc_ENV_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index e214300a77..590a591465 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -2814,7 +2814,7 @@ extern actor_process_profile_definition g_profile_DO = { 7, fpcPi_CURRENT_e, PROC_DO, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(do_class), 0, 0, diff --git a/src/d/actor/d_a_door_boss.cpp b/src/d/actor/d_a_door_boss.cpp index 6a5858da60..026f772eb3 100644 --- a/src/d/actor/d_a_door_boss.cpp +++ b/src/d/actor/d_a_door_boss.cpp @@ -467,7 +467,7 @@ extern actor_process_profile_definition g_profile_BOSS_DOOR = { 7, fpcPi_CURRENT_e, PROC_BOSS_DOOR, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daBdoor_c), 0, 0, diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index 2d644caaa9..a213d3f3ff 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -1055,7 +1055,7 @@ extern actor_process_profile_definition g_profile_L1BOSS_DOOR = { 7, fpcPi_CURRENT_e, PROC_L1BOSS_DOOR, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daBdoorL1_c), 0, 0, diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp index 6ad2b32b0c..397e3cfdf6 100644 --- a/src/d/actor/d_a_door_bossL5.cpp +++ b/src/d/actor/d_a_door_bossL5.cpp @@ -570,7 +570,7 @@ extern actor_process_profile_definition g_profile_L5BOSS_DOOR = { 7, fpcPi_CURRENT_e, PROC_L5BOSS_DOOR, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daBdoorL5_c), 0, 0, diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index df351481e8..3af2db98f7 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -476,7 +476,7 @@ extern actor_process_profile_definition g_profile_DBDOOR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_DBDOOR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daDbDoor00_c), // mSize 0, // mSizeOther 0, // mParameters @@ -486,4 +486,4 @@ extern actor_process_profile_definition g_profile_DBDOOR = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_6_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index be7ac80ffe..8b62427b0f 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -774,7 +774,7 @@ extern actor_process_profile_definition g_profile_KNOB20 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_KNOB20, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daKnob20_c), // mSize 0, // mSizeOther 0, // mParameters @@ -784,4 +784,4 @@ extern actor_process_profile_definition g_profile_KNOB20 = { 0x44100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_6_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index ae810eadd6..d6e494042c 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -1842,7 +1842,7 @@ extern actor_process_profile_definition g_profile_L1MBOSS_DOOR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_L1MBOSS_DOOR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daMBdoorL1_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index aa4ce51d53..ddd716006a 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -422,7 +422,7 @@ extern actor_process_profile_definition g_profile_PushDoor = { 3, fpcPi_CURRENT_e, PROC_PushDoor, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daDoorPush_c), 0, 0, @@ -432,4 +432,4 @@ extern actor_process_profile_definition g_profile_PushDoor = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index c615328901..7ada4c7a00 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -2270,7 +2270,7 @@ extern actor_process_profile_definition g_profile_DOOR20 = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_DOOR20, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daDoor20_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp index d9374d017b..33ad41ea96 100644 --- a/src/d/actor/d_a_door_spiral.cpp +++ b/src/d/actor/d_a_door_spiral.cpp @@ -10,7 +10,7 @@ extern actor_process_profile_definition g_profile_SPIRAL_DOOR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_SPIRAL_DOOR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x6b0, // mSize 0, // mSizeOther 0, // mParameters @@ -20,4 +20,4 @@ extern actor_process_profile_definition g_profile_SPIRAL_DOOR = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_6_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp index ffc3ad07f6..f49590b698 100644 --- a/src/d/actor/d_a_dshutter.cpp +++ b/src/d/actor/d_a_dshutter.cpp @@ -300,7 +300,7 @@ extern actor_process_profile_definition2 g_profile_DSHUTTER = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_DSHUTTER, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daDsh_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index 2511e7b2d2..9dab8f3d8b 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -338,7 +338,7 @@ extern actor_process_profile_definition g_profile_E_AI = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_AI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_ai_class), // mSize 0, // mSizeOther 0, // mParameters @@ -908,4 +908,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 8067C538-8067C538 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8067C538-8067C538 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index e213faaf86..0217a3af0a 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -889,7 +889,7 @@ extern actor_process_profile_definition g_profile_E_ARROW = { 8, fpcPi_CURRENT_e, PROC_E_ARROW, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(e_arrow_class), 0, 0, diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index b977d9d01e..66ad44c836 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -1105,7 +1105,7 @@ extern actor_process_profile_definition g_profile_E_BA = { 7, fpcPi_CURRENT_e, PROC_E_BA, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(e_ba_class), 0, 0, diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index d1010098a8..48e228fdcd 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -629,8 +629,8 @@ static void bee_control(e_bee_class* i_this) { cXyz vec3; if (dComIfGp_checkPlayerStatus0(0, 0x200000)) { - vec3.x = bee->mPos.x - camera->mLookat.mEye.x; - vec3.z = bee->mPos.z - camera->mLookat.mEye.z; + vec3.x = bee->mPos.x - camera->lookat.eye.x; + vec3.z = bee->mPos.z - camera->lookat.eye.z; if (JMAFastSqrt(vec3.x * vec3.x + vec3.z * vec3.z) > 2500.0f) { bee->mNoDraw = true; } @@ -1083,7 +1083,7 @@ extern actor_process_profile_definition g_profile_E_BEE = { 7, fpcPi_CURRENT_e, PROC_E_BEE, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(e_bee_class), 0, 0, diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index 5ec9a0c2e7..ffce9db6d1 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -287,7 +287,7 @@ extern actor_process_profile_definition g_profile_E_BG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_BG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_BG_c), // mSize 0, // mSizeOther 0, // mParameters @@ -856,4 +856,4 @@ static void func_8068A228() { // NONMATCHING } -/* 8068A308-8068A308 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8068A308-8068A308 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index 0521f24349..7cbc7c7336 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -385,7 +385,7 @@ extern actor_process_profile_definition g_profile_E_BI = { 9, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_BI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_bi_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1281,4 +1281,4 @@ static u8 data_8068DBC0[4]; static u8 data_8068DBC4[4]; #pragma pop -/* 8068D8D8-8068D8D8 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8068D8D8-8068D8D8 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp index 5bc8a8146a..3ab7abf13c 100644 --- a/src/d/actor/d_a_e_bi_leaf.cpp +++ b/src/d/actor/d_a_e_bi_leaf.cpp @@ -135,7 +135,7 @@ extern actor_process_profile_definition g_profile_E_BI_LEAF = { 9, fpcPi_CURRENT_e, PROC_E_BI_LEAF, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(e_bi_leaf_class), 0, 0, @@ -145,4 +145,4 @@ extern actor_process_profile_definition g_profile_E_BI_LEAF = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index 29e3438c36..91b0ec7b5d 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -391,7 +391,7 @@ extern actor_process_profile_definition g_profile_E_BS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_BS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_bs_class), // mSize 0, // mSizeOther 0, // mParameters @@ -958,4 +958,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 80690EB8-80690EB8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80690EB8-80690EB8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index 31a9ca6730..746cedbafc 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -385,7 +385,7 @@ extern actor_process_profile_definition g_profile_E_BU = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_BU, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_bu_class), // mSize 0, // mSizeOther 0, // mParameters @@ -952,4 +952,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 80694770-80694770 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80694770-80694770 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index 747e1f2b60..8e8b237bae 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -152,7 +152,7 @@ extern actor_process_profile_definition g_profile_E_BUG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_BUG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_bug_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1017,4 +1017,4 @@ static u8 data_80697F0C[4]; static u8 data_80697F10[4]; #pragma pop -/* 80697D98-80697D98 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80697D98-80697D98 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index ab7dc401d6..cb12622b8a 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -292,7 +292,7 @@ extern actor_process_profile_definition g_profile_E_CR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_CR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_cr_class), // mSize 0, // mSizeOther 0, // mParameters @@ -689,4 +689,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 80699D40-80699D40 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80699D40-80699D40 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp index 29e6baa229..062e28cb8c 100644 --- a/src/d/actor/d_a_e_cr_egg.cpp +++ b/src/d/actor/d_a_e_cr_egg.cpp @@ -270,7 +270,7 @@ extern actor_process_profile_definition g_profile_E_CR_EGG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_CR_EGG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_cr_egg_class), // mSize 0, // mSizeOther 0, // mParameters @@ -343,4 +343,4 @@ static void func_8069A8BC() { // NONMATCHING } -/* 8069A90C-8069A90C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8069A90C-8069A90C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index 98b644f7f6..76c5bb74e9 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -537,7 +537,7 @@ extern actor_process_profile_definition g_profile_E_DB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_DB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_db_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1403,4 +1403,4 @@ extern "C" void __dt__4cXyzFv() { // NONMATCHING } -/* 806A1A6C-806A1A6C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806A1A6C-806A1A6C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_db_leaf.cpp b/src/d/actor/d_a_e_db_leaf.cpp index 6b1afb4beb..6b3f5c1c98 100644 --- a/src/d/actor/d_a_e_db_leaf.cpp +++ b/src/d/actor/d_a_e_db_leaf.cpp @@ -79,7 +79,7 @@ extern actor_process_profile_definition g_profile_E_DB_LEAF = { 7, fpcPi_CURRENT_e, PROC_E_DB_LEAF, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(e_db_leaf_class), 0, 0, @@ -89,4 +89,4 @@ extern actor_process_profile_definition g_profile_E_DB_LEAF = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index fe1f0cb4de..f42f209ca1 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -466,7 +466,7 @@ extern actor_process_profile_definition g_profile_E_DD = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_DD, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_dd_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1105,4 +1105,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 806A72B4-806A72B4 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806A72B4-806A72B4 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index 20fc3bef9f..3016308f02 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -239,7 +239,7 @@ extern actor_process_profile_definition g_profile_E_DF = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_DF, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_DF_c), // mSize 0, // mSizeOther 0, // mParameters @@ -735,4 +735,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 806A9FFC-806A9FFC 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806A9FFC-806A9FFC 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index b2463a09fc..2c3d71e539 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -278,7 +278,7 @@ extern actor_process_profile_definition g_profile_E_DK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_DK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_DK_c), // mSize 0, // mSizeOther 0, // mParameters @@ -973,4 +973,4 @@ static void func_806AD51C() { // NONMATCHING } -/* 806AD628-806AD628 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806AD628-806AD628 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index d55dfff811..1556d431fb 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -646,7 +646,7 @@ extern actor_process_profile_definition g_profile_E_DN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_DN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_dn_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1975,4 +1975,4 @@ static u8 data_804EEFF4[4]; static u8 data_804EEFF8[4]; #pragma pop -/* 804EEA34-804EEA34 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 804EEA34-804EEA34 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 27605a6a62..dd3b6d0bdb 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -602,7 +602,7 @@ extern actor_process_profile_definition g_profile_E_DT = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_DT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_DT_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2185,4 +2185,4 @@ static u8 data_806B63A8[4]; static u8 data_806B63AC[4]; #pragma pop -/* 806B5ED0-806B5ED0 0001FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806B5ED0-806B5ED0 0001FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index ec17517c0a..a810329c2d 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -271,7 +271,7 @@ extern actor_process_profile_definition g_profile_E_FB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_FB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_FB_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1055,4 +1055,4 @@ static u8 data_806B9284[4]; static u8 data_806B9288[4]; #pragma pop -/* 806B9028-806B9028 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806B9028-806B9028 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index 6a9b0149fd..abaa0b3d62 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -234,7 +234,7 @@ extern actor_process_profile_definition g_profile_E_FK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_FK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_FK_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1177,4 +1177,4 @@ static u8 data_806BB9D4[4]; static u8 data_806BB9D8[4]; #pragma pop -/* 806BB81C-806BB81C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806BB81C-806BB81C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index a83d293257..7e6a07c65e 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -863,7 +863,7 @@ extern actor_process_profile_definition g_profile_E_FM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_FM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_fm_class), // mSize 0, // mSizeOther 0, // mParameters @@ -2589,4 +2589,4 @@ static u8 data_804FAFE0[4]; static u8 data_804FAFE4[4]; #pragma pop -/* 804FA948-804FA948 00028C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 804FA948-804FA948 00028C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 6a80a2d208..59ecda6ee1 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -866,7 +866,7 @@ extern actor_process_profile_definition g_profile_E_FS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_FS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_fs_class), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp index e45c0c9e99..f82f004d99 100644 --- a/src/d/actor/d_a_e_fz.cpp +++ b/src/d/actor/d_a_e_fz.cpp @@ -1055,7 +1055,7 @@ extern actor_process_profile_definition g_profile_E_FZ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_FZ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_FZ_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp index f23045af9c..f53858b6f6 100644 --- a/src/d/actor/d_a_e_ga.cpp +++ b/src/d/actor/d_a_e_ga.cpp @@ -94,7 +94,7 @@ extern actor_process_profile_definition g_profile_E_GA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_GA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_ga_class), // mSize 0, // mSizeOther 0, // mParameters @@ -330,4 +330,4 @@ void __sinit_d_a_e_ga_cpp() { REGISTER_CTORS(0x804FBB40, __sinit_d_a_e_ga_cpp); #pragma pop -/* 804FBBD4-804FBBD4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 804FBBD4-804FBBD4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index 6b9611b2b0..db7a7fdf42 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -517,7 +517,7 @@ extern actor_process_profile_definition g_profile_E_GB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_GB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_gb_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1609,4 +1609,4 @@ extern "C" void setPos__7daKey_cF4cXyz() { // NONMATCHING } -/* 806C76B8-806C76B8 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806C76B8-806C76B8 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index 3bd3b32124..97366bceea 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -496,7 +496,7 @@ extern actor_process_profile_definition g_profile_E_GE = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_GE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_GE_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1199,4 +1199,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 806CD10C-806CD10C 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806CD10C-806CD10C 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index 7e0fa18e0a..9d76d0c926 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -417,7 +417,7 @@ extern actor_process_profile_definition g_profile_E_GI = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_GI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_GI_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1107,4 +1107,4 @@ extern "C" void checkNowWolf__9daPy_py_cFv() { // NONMATCHING } -/* 806D0F78-806D0F78 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806D0F78-806D0F78 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index edb454222c..bf702adf9e 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -797,7 +797,7 @@ extern actor_process_profile_definition g_profile_E_GM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_GM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_GM_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1892,4 +1892,4 @@ static u8 data_806D7F7C[4]; static u8 data_806D7F80[4]; #pragma pop -/* 806D7AF0-806D7AF0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806D7AF0-806D7AF0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index 469cc2fbec..bca7f2d64a 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -348,7 +348,7 @@ extern actor_process_profile_definition g_profile_E_GOB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_GOB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_gob_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1792,4 +1792,4 @@ static u8 data_806DF370[4]; static u8 data_806DF374[4]; #pragma pop -/* 806DF054-806DF054 00021C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806DF054-806DF054 00021C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index 90bb731b20..b57c64ba5d 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -118,7 +118,7 @@ extern actor_process_profile_definition g_profile_E_GS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_GS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_gs_class), // mSize 0, // mSizeOther 0, // mParameters @@ -282,4 +282,4 @@ void __sinit_d_a_e_gs_cpp() { REGISTER_CTORS(0x806DFDA4, __sinit_d_a_e_gs_cpp); #pragma pop -/* 806DFE2C-806DFE2C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806DFE2C-806DFE2C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index c2c890eb08..ebc28f2879 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -438,7 +438,7 @@ extern actor_process_profile_definition g_profile_E_HB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_HB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_hb_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1196,4 +1196,4 @@ extern "C" void __dt__4cXyzFv() { // NONMATCHING } -/* 80500C34-80500C34 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80500C34-80500C34 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_hb_leaf.cpp b/src/d/actor/d_a_e_hb_leaf.cpp index b0f7334131..a882e9ec6f 100644 --- a/src/d/actor/d_a_e_hb_leaf.cpp +++ b/src/d/actor/d_a_e_hb_leaf.cpp @@ -98,7 +98,7 @@ extern actor_process_profile_definition g_profile_E_HB_LEAF = { 7, fpcPi_CURRENT_e, PROC_E_HB_LEAF, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(e_hb_leaf_class), 0, 0, @@ -108,4 +108,4 @@ extern actor_process_profile_definition g_profile_E_HB_LEAF = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index 554701875f..c2caf683b9 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -395,7 +395,7 @@ extern actor_process_profile_definition g_profile_E_HM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_HM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_HM_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1551,4 +1551,4 @@ static u8 data_806E5CE0[4]; static u8 data_806E5CE4[4]; #pragma pop -/* 806E5A74-806E5A74 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806E5A74-806E5A74 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 0c0959e101..8a4cdba4d4 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -389,7 +389,7 @@ extern actor_process_profile_definition g_profile_E_HP = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_HP, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_HP_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1018,4 +1018,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 806EA2CC-806EA2CC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806EA2CC-806EA2CC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index 90dfc8d6be..490027fe7e 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -469,7 +469,7 @@ extern actor_process_profile_definition g_profile_E_HZ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_HZ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_HZ_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1489,4 +1489,4 @@ static u8 data_806F0C3C[4]; static u8 data_806F0C40[4]; #pragma pop -/* 806F095C-806F095C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806F095C-806F095C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index 332a437d2a..b73406fe34 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -403,7 +403,7 @@ extern actor_process_profile_definition g_profile_E_HZELDA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_HZELDA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_hzelda_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1221,4 +1221,4 @@ static void func_806F54F8() { // NONMATCHING } -/* 806F5654-806F5654 000140 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806F5654-806F5654 000140 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index 748e6d48f9..617911f401 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -266,7 +266,7 @@ extern actor_process_profile_definition g_profile_E_IS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_IS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_is_class), // mSize 0, // mSizeOther 0, // mParameters @@ -795,4 +795,4 @@ static void func_806F7B50() { // NONMATCHING } -/* 806F7C14-806F7C14 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806F7C14-806F7C14 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_kg.cpp b/src/d/actor/d_a_e_kg.cpp index 9c61eb3dcd..533a791219 100644 --- a/src/d/actor/d_a_e_kg.cpp +++ b/src/d/actor/d_a_e_kg.cpp @@ -320,7 +320,7 @@ extern actor_process_profile_definition g_profile_E_KG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_KG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_kg_class), // mSize 0, // mSizeOther 0, // mParameters @@ -832,4 +832,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 806FA46C-806FA46C 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806FA46C-806FA46C 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index b64601d110..fb6502bdd3 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -370,7 +370,7 @@ extern actor_process_profile_definition g_profile_E_KK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_KK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_KK_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1006,4 +1006,4 @@ extern "C" void __dt__4cXyzFv() { // NONMATCHING } -/* 806FF6B8-806FF6B8 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 806FF6B8-806FF6B8 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index cb18b4a3f6..529b014a83 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -1098,7 +1098,7 @@ extern actor_process_profile_definition g_profile_E_KR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_KR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_kr_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1319,4 +1319,4 @@ extern "C" void __dt__4cXyzFv() { // NONMATCHING } -/* 80705C4C-80705C4C 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80705C4C-80705C4C 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index 083381b884..8113de5e25 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -206,7 +206,7 @@ extern actor_process_profile_definition g_profile_E_MB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_MB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_mb_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1044,4 +1044,4 @@ static u8 data_80708D5C[4]; static u8 data_80708D60[4]; #pragma pop -/* 80708AE8-80708AE8 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80708AE8-80708AE8 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index 79c5aec764..69bb3c1331 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -352,7 +352,7 @@ extern actor_process_profile_definition g_profile_E_MD = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_MD, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_MD_c), // mSize 0, // mSizeOther 0, // mParameters @@ -429,4 +429,4 @@ static void func_8070A4DC() { // NONMATCHING } -/* 8070A570-8070A570 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8070A570-8070A570 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index ad5485e57e..7d628fdbee 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -613,7 +613,7 @@ extern actor_process_profile_definition g_profile_E_MF = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_MF, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_mf_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1921,4 +1921,4 @@ static u8 data_80714024[4]; static u8 data_80714028[4]; #pragma pop -/* 80713AF4-80713AF4 000180 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80713AF4-80713AF4 000180 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 1f4d7f7817..9e67ae07c3 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -387,7 +387,7 @@ extern actor_process_profile_definition g_profile_E_MK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_MK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_mk_class), // mSize 0, // mSizeOther 0, // mParameters @@ -2170,4 +2170,4 @@ static u8 data_8071CBF0[4]; static u8 data_8071CBF4[4]; #pragma pop -/* 8071C7E8-8071C7E8 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8071C7E8-8071C7E8 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_mk_bo.cpp b/src/d/actor/d_a_e_mk_bo.cpp index 96ac0e7959..1defd8b377 100644 --- a/src/d/actor/d_a_e_mk_bo.cpp +++ b/src/d/actor/d_a_e_mk_bo.cpp @@ -624,7 +624,7 @@ extern actor_process_profile_definition g_profile_E_MK_BO = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_MK_BO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_mk_bo_class), // mSize 0, // mSizeOther 0, // mParameters @@ -946,4 +946,4 @@ static u8 data_8071F8D8[4]; static u8 data_8071F8DC[4]; #pragma pop -/* 8071F6D8-8071F6D8 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8071F6D8-8071F6D8 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index 8bd8c0a79b..4b286b7384 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -382,7 +382,7 @@ extern actor_process_profile_definition g_profile_E_MM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_MM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_mm_class), // mSize 0, // mSizeOther 0, // mParameters @@ -812,4 +812,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 80722CE8-80722CE8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80722CE8-80722CE8 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_mm_mt.cpp b/src/d/actor/d_a_e_mm_mt.cpp index d0b6e8114f..c64959f015 100644 --- a/src/d/actor/d_a_e_mm_mt.cpp +++ b/src/d/actor/d_a_e_mm_mt.cpp @@ -664,7 +664,7 @@ extern actor_process_profile_definition g_profile_E_MM_MT = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_MM_MT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_mm_mt_class), // mSize 0, // mSizeOther 0, // mParameters @@ -782,4 +782,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 8072592C-8072592C 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8072592C-8072592C 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index 1296971c98..f7c4eb4ede 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -373,7 +373,7 @@ extern actor_process_profile_definition g_profile_E_MS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_MS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_ms_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1286,4 +1286,4 @@ static u8 data_807298F4[4]; static u8 data_807298F8[4]; #pragma pop -/* 807295FC-807295FC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807295FC-807295FC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 33559d4a42..287f9cc30c 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -1101,7 +1101,7 @@ extern actor_process_profile_definition g_profile_E_NEST = { 7, fpcPi_CURRENT_e, PROC_E_NEST, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(e_nest_class), 0, 0, @@ -1111,4 +1111,4 @@ extern actor_process_profile_definition g_profile_E_NEST = { 0xD4100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index ba7072459f..d2e89b282b 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -344,7 +344,7 @@ extern actor_process_profile_definition g_profile_E_NZ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_NZ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_nz_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1081,4 +1081,4 @@ static u8 data_8072C4D0[4]; static u8 data_8072C4D4[4]; #pragma pop -/* 8072C240-8072C240 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8072C240-8072C240 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 6646b89657..ec221df3bb 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -560,7 +560,7 @@ extern actor_process_profile_definition g_profile_E_OC = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_OC, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_OC_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1985,4 +1985,4 @@ static u8 data_80736100[4]; static u8 data_80736104[4]; #pragma pop -/* 80735D0C-80735D0C 0001E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80735D0C-80735D0C 0001E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index 41f0869b08..b01598248c 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -1223,7 +1223,7 @@ extern actor_process_profile_definition g_profile_E_OctBg = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_OctBg, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_OctBg_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1233,4 +1233,4 @@ extern actor_process_profile_definition g_profile_E_OctBg = { 0xC4100, // mStatus fopAc_ENEMY_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index fa50463286..f43e9edacf 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -424,7 +424,7 @@ extern actor_process_profile_definition g_profile_E_OT = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_OT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_OT_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1253,4 +1253,4 @@ static u8 data_8073D358[4]; static u8 data_8073D35C[4]; #pragma pop -/* 8073CF6C-8073CF6C 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8073CF6C-8073CF6C 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index da910ed7b5..9b93975ae4 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -1351,7 +1351,7 @@ extern actor_process_profile_definition g_profile_E_PH = { 3, fpcPi_CURRENT_e, PROC_E_PH, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daE_PH_c), 0, 0, @@ -1361,4 +1361,4 @@ extern actor_process_profile_definition g_profile_E_PH = { 0x244100, fopAc_ENEMY_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 393d880a37..1fe5e67368 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -2621,7 +2621,7 @@ void daE_PM_c::setLampBaseMtx() { } mDoMtx_stack_c::transS(vec2.x, vec2.y, vec2.z); - vec1 = dComIfGp_getCamera(0)->mLookat.mEye - vec2; + vec1 = dComIfGp_getCamera(0)->lookat.eye - vec2; mDoMtx_stack_c::YrotM(cM_atan2s(vec1.x, vec1.z)); mDoMtx_stack_c::XrotM(-cM_atan2s(vec1.y, JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z))); mDoMtx_stack_c::scaleM(l_HIO.mGlowEffectScale, l_HIO.mGlowEffectScale, l_HIO.mGlowEffectScale); @@ -2833,7 +2833,7 @@ extern actor_process_profile_definition g_profile_E_PM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_PM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_PM_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index ff98f8abef..4fce1d8d87 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -662,7 +662,7 @@ extern actor_process_profile_definition g_profile_E_PO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_PO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_po_class), // mSize 0, // mSizeOther 0, // mParameters @@ -3381,4 +3381,4 @@ static u8 data_80758478[4]; static u8 data_8075847C[4]; #pragma pop -/* 80757A88-80757A88 00038C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80757A88-80757A88 00038C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index c3c27d8085..fb3bef902f 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -760,7 +760,7 @@ extern actor_process_profile_definition g_profile_E_PZ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_PZ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_PZ_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2691,4 +2691,4 @@ static u8 data_80762288[4]; static u8 data_8076228C[4]; #pragma pop -/* 807617B4-807617B4 0002B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807617B4-807617B4 0002B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index 6632301fbf..eb888c283d 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -320,7 +320,7 @@ extern actor_process_profile_definition g_profile_E_RB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_RB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_rb_class), // mSize 0, // mSizeOther 0, // mParameters @@ -870,4 +870,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 80764DD4-80764DD4 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80764DD4-80764DD4 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index c93069a1e4..0ca728b968 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -1061,7 +1061,7 @@ extern actor_process_profile_definition g_profile_E_RD = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_RD, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_rd_class), // mSize 0, // mSizeOther 0, // mParameters @@ -3785,4 +3785,4 @@ static u8 data_80519480[4]; static u8 data_80519484[4]; #pragma pop -/* 80518968-80518968 0003E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80518968-80518968 0003E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index 25e2ba7231..ce08790090 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -504,7 +504,7 @@ extern actor_process_profile_definition g_profile_E_RDB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_RDB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_rdb_class), // mSize 0, // mSizeOther 0, // mParameters @@ -2257,4 +2257,4 @@ static u8 data_8076BCC4[4]; static u8 data_8076BCC8[4]; #pragma pop -/* 8076B6C4-8076B6C4 000268 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8076B6C4-8076B6C4 000268 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 10ac74581b..529ebc112a 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -936,7 +936,7 @@ extern actor_process_profile_definition g_profile_E_RDY = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_RDY, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x0000142C, // mSize 0, // mSizeOther 0, // mParameters @@ -2857,4 +2857,4 @@ static u8 data_8077AA80[4]; static u8 data_8077AA84[4]; #pragma pop -/* 8077A0BC-8077A0BC 0002C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8077A0BC-8077A0BC 0002C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index 1f92b24fe3..9a85255788 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -2300,7 +2300,7 @@ extern actor_process_profile_definition g_profile_E_S1 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_S1, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_s1_class), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index 2a11db7459..174e629b07 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -277,7 +277,7 @@ extern actor_process_profile_definition g_profile_E_SB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_SB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_SB_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1161,4 +1161,4 @@ static u8 data_8078502C[4]; static u8 data_80785030[4]; #pragma pop -/* 80784E64-80784E64 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80784E64-80784E64 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index b0f0b9e563..fc444c69e9 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -509,7 +509,7 @@ extern actor_process_profile_definition g_profile_E_SF = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_SF, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_sf_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1560,4 +1560,4 @@ static u8 data_8078A130[4]; static u8 data_8078A134[4]; #pragma pop -/* 80789D84-80789D84 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80789D84-80789D84 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp index b9d13870f2..8ac3a5bbcb 100644 --- a/src/d/actor/d_a_e_sg.cpp +++ b/src/d/actor/d_a_e_sg.cpp @@ -322,7 +322,7 @@ extern actor_process_profile_definition g_profile_E_SG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_SG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_sg_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1253,4 +1253,4 @@ static u8 data_8078E23C[4]; static u8 data_8078E240[4]; #pragma pop -/* 8078DEAC-8078DEAC 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8078DEAC-8078DEAC 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index eeaaee723c..f9af94b73f 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -437,7 +437,7 @@ extern actor_process_profile_definition g_profile_E_SH = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_SH, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_sh_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1145,4 +1145,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 80791EC0-80791EC0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80791EC0-80791EC0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index 71e70d20da..06335b3094 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -408,7 +408,7 @@ extern actor_process_profile_definition g_profile_E_SM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_SM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_SM_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1736,4 +1736,4 @@ static u8 data_80798A44[4]; static u8 data_80798A48[4]; #pragma pop -/* 80798780-80798780 0001A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80798780-80798780 0001A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index 8e89ab6720..65db9980a7 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -600,7 +600,7 @@ extern actor_process_profile_definition g_profile_E_SM2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_SM2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_sm2_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1917,4 +1917,4 @@ static u8 data_8079DCEC[4]; static u8 data_8079DCF0[4]; #pragma pop -/* 8079D718-8079D718 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8079D718-8079D718 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index 643725048f..9e8b759c96 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -563,7 +563,7 @@ extern actor_process_profile_definition g_profile_E_ST = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_ST, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_st_class), // mSize 0, // mSizeOther 0, // mParameters @@ -2034,4 +2034,4 @@ static u8 data_807A6ED4[4]; static u8 data_807A6ED8[4]; #pragma pop -/* 807A69E0-807A69E0 0001BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807A69E0-807A69E0 0001BC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_st_line.cpp b/src/d/actor/d_a_e_st_line.cpp index eb7acea86d..744e3ffbfd 100644 --- a/src/d/actor/d_a_e_st_line.cpp +++ b/src/d/actor/d_a_e_st_line.cpp @@ -134,7 +134,7 @@ extern actor_process_profile_definition g_profile_E_ST_LINE = { 7, fpcPi_CURRENT_e, PROC_E_ST_LINE, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(e_st_line_class), 0, 0, @@ -144,4 +144,4 @@ extern actor_process_profile_definition g_profile_E_ST_LINE = { 0x44000, fopAc_ENEMY_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 23560aa9ab..50bf05262e 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -429,7 +429,7 @@ extern actor_process_profile_definition g_profile_E_SW = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_SW, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_SW_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1935,4 +1935,4 @@ static u8 data_807B0290[4]; static u8 data_807B0294[4]; #pragma pop -/* 807AFE70-807AFE70 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807AFE70-807AFE70 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index 40a046ba0c..bdde5ff0a5 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -422,7 +422,7 @@ extern actor_process_profile_definition g_profile_E_TH = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_TH, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_th_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1399,4 +1399,4 @@ extern "C" void __dt__4cXyzFv() { // NONMATCHING } -/* 807B4644-807B4644 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807B4644-807B4644 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp index 97b359f7b6..5aceed3a9f 100644 --- a/src/d/actor/d_a_e_th_ball.cpp +++ b/src/d/actor/d_a_e_th_ball.cpp @@ -782,7 +782,7 @@ extern actor_process_profile_definition g_profile_E_TH_BALL = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_TH_BALL, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_th_ball_class), // mSize 0, // mSizeOther 0, // mParameters @@ -872,4 +872,4 @@ static void func_807B7EA8() { // NONMATCHING } -/* 807B7FC0-807B7FC0 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807B7FC0-807B7FC0 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index 835bc148d2..e1cee24c62 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -233,7 +233,7 @@ extern actor_process_profile_definition g_profile_E_TK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_TK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_tk_class), // mSize 0, // mSizeOther 0, // mParameters @@ -633,4 +633,4 @@ static void func_807BA250() { // NONMATCHING } -/* 807BA2F0-807BA2F0 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807BA2F0-807BA2F0 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index 6b5b81c15d..119fbbea30 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -208,7 +208,7 @@ extern actor_process_profile_definition g_profile_E_TK2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_TK2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_tk2_class), // mSize 0, // mSizeOther 0, // mParameters @@ -574,4 +574,4 @@ static void func_807BBD8C() { // NONMATCHING } -/* 807BBE20-807BBE20 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807BBE20-807BBE20 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp index bb2f661756..559059e629 100644 --- a/src/d/actor/d_a_e_tk_ball.cpp +++ b/src/d/actor/d_a_e_tk_ball.cpp @@ -353,7 +353,7 @@ extern actor_process_profile_definition g_profile_E_TK_BALL = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_TK_BALL, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_tk_ball_class), // mSize 0, // mSizeOther 0, // mParameters @@ -397,4 +397,4 @@ extern "C" void __dt__8cM3dGAabFv() { // NONMATCHING } -/* 807BD5C4-807BD5C4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807BD5C4-807BD5C4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index cb6040a90e..c90ca16485 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -473,7 +473,7 @@ extern actor_process_profile_definition g_profile_E_TT = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_TT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_TT_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1503,4 +1503,4 @@ static u8 data_807C24F0[4]; static u8 data_807C24F4[4]; #pragma pop -/* 807C20B0-807C20B0 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807C20B0-807C20B0 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index afb71659db..1231398edb 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -4260,7 +4260,7 @@ extern actor_process_profile_definition g_profile_E_VT = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_VT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_VA_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index 7e84247ef4..e54fe92ef0 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -1132,7 +1132,7 @@ extern actor_process_profile_definition g_profile_E_WAP = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_WAP, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_warpappear_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1173,4 +1173,4 @@ extern "C" void changeDemoMode__9daPy_py_cFUliis() { // NONMATCHING } -/* 807D2280-807D2280 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807D2280-807D2280 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 54ddf2a512..0c9c809063 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -947,7 +947,7 @@ extern actor_process_profile_definition g_profile_E_WB = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_WB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_wb_class), // mSize 0, // mSizeOther 0, // mParameters @@ -4548,4 +4548,4 @@ static u8 data_807E3900[4]; static u8 data_807E3904[4]; #pragma pop -/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index e2666d5690..bc55a2bdc6 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -371,7 +371,7 @@ extern actor_process_profile_definition g_profile_E_WS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_WS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_WS_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1023,4 +1023,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1, // NONMATCHING } -/* 807E7404-807E7404 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807E7404-807E7404 000104 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index d5558d3f45..0f68955325 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -459,7 +459,7 @@ extern actor_process_profile_definition g_profile_E_WW = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_WW, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_WW_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1753,4 +1753,4 @@ static u8 data_807EFDBC[4]; static u8 data_807EFDC0[4]; #pragma pop -/* 807EF8B8-807EF8B8 000148 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807EF8B8-807EF8B8 000148 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index 7f0cd301d5..44df072381 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -856,7 +856,7 @@ extern actor_process_profile_definition g_profile_E_YC = { 4, fpcPi_CURRENT_e, PROC_E_YC, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(e_yc_class), 0, 0, @@ -866,4 +866,4 @@ extern actor_process_profile_definition g_profile_E_YC = { 0x40100, fopAc_ENEMY_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index bf32347e71..ac53b2dc20 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -443,7 +443,7 @@ extern actor_process_profile_definition g_profile_E_YD = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_YD, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_yd_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1223,4 +1223,4 @@ extern "C" void __dt__4cXyzFv() { // NONMATCHING } -/* 807F7B30-807F7B30 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807F7B30-807F7B30 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_yd_leaf.cpp b/src/d/actor/d_a_e_yd_leaf.cpp index 08fb1d7919..3653445ae2 100644 --- a/src/d/actor/d_a_e_yd_leaf.cpp +++ b/src/d/actor/d_a_e_yd_leaf.cpp @@ -106,7 +106,7 @@ extern actor_process_profile_definition g_profile_E_YD_LEAF = { 7, fpcPi_CURRENT_e, PROC_E_YD_LEAF, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(e_yd_leaf_class), 0, 0, @@ -116,4 +116,4 @@ extern actor_process_profile_definition g_profile_E_YD_LEAF = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp index 4a68fa9261..0a80ccb33e 100644 --- a/src/d/actor/d_a_e_yg.cpp +++ b/src/d/actor/d_a_e_yg.cpp @@ -427,7 +427,7 @@ extern actor_process_profile_definition g_profile_E_YG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_YG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_yg_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1679,4 +1679,4 @@ static u8 data_807FD3C4[4]; static u8 data_807FD3C8[4]; #pragma pop -/* 807FCDF0-807FCDF0 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 807FCDF0-807FCDF0 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index fe867d1365..cc6d6aa6d2 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -542,7 +542,7 @@ extern actor_process_profile_definition g_profile_E_YH = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_YH, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_yh_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1433,4 +1433,4 @@ extern "C" void __dt__4cXyzFv() { // NONMATCHING } -/* 808043DC-808043DC 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 808043DC-808043DC 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index d2a35dfdac..580bf47208 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -1103,7 +1103,7 @@ extern actor_process_profile_definition g_profile_E_YK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_YK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_yk_class), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index f3a3f37c54..74d60e72ac 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -505,7 +505,7 @@ extern actor_process_profile_definition g_profile_E_YM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_YM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_YM_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2119,4 +2119,4 @@ extern "C" void getPos__13daTag_FWall_cFUc() { // NONMATCHING } -/* 80815AEC-80815AEC 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80815AEC-80815AEC 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_ym_tag.cpp b/src/d/actor/d_a_e_ym_tag.cpp index 32d74041a3..956ed93741 100644 --- a/src/d/actor/d_a_e_ym_tag.cpp +++ b/src/d/actor/d_a_e_ym_tag.cpp @@ -85,7 +85,7 @@ extern actor_process_profile_definition g_profile_E_YM_TAG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_YM_TAG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_YM_TAG_c), // mSize 0, // mSizeOther 0, // mParameters @@ -95,4 +95,4 @@ extern actor_process_profile_definition g_profile_E_YM_TAG = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index db3e3942d8..25e2f9abb0 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -605,7 +605,7 @@ extern actor_process_profile_definition g_profile_E_YMB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_YMB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_YMB_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2563,4 +2563,4 @@ static u8 data_8082210C[4]; static u8 data_80822110[4]; #pragma pop -/* 80821B04-80821B04 000258 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80821B04-80821B04 000258 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index e7cb9c87f1..ebbc2550f1 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -1180,7 +1180,7 @@ extern actor_process_profile_definition g_profile_E_YR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_YR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(e_yr_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1394,4 +1394,4 @@ extern "C" void __dt__4cXyzFv() { // NONMATCHING } -/* 808289A8-808289A8 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 808289A8-808289A8 000158 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index cde84ca1d5..ca5faf5894 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -389,7 +389,7 @@ extern actor_process_profile_definition g_profile_E_ZH = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_ZH, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_ZH_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1843,4 +1843,4 @@ static u8 data_8082F844[4]; static u8 data_8082F848[4]; #pragma pop -/* 8082F410-8082F410 000208 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8082F410-8082F410 000208 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index 7e176201ff..89510d88d6 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -371,7 +371,7 @@ extern actor_process_profile_definition g_profile_E_ZM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_ZM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_ZM_c), // mSize 0, // mSizeOther 0, // mParameters @@ -916,4 +916,4 @@ extern "C" void __dt__4cXyzFv() { // NONMATCHING } -/* 80832DB8-80832DB8 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80832DB8-80832DB8 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index 619d1c2824..e9f8447816 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -308,7 +308,7 @@ extern actor_process_profile_definition g_profile_E_ZS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_ZS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daE_ZS_c), // mSize 0, // mSizeOther 0, // mParameters @@ -712,4 +712,4 @@ extern "C" void getHandPosL__8daB_DS_cFv() { // NONMATCHING } -/* 80835344-80835344 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80835344-80835344 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_econt.cpp b/src/d/actor/d_a_econt.cpp index 52f4a62612..a2ef0f1cfa 100644 --- a/src/d/actor/d_a_econt.cpp +++ b/src/d/actor/d_a_econt.cpp @@ -93,7 +93,7 @@ extern actor_process_profile_definition g_profile_ECONT = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_ECONT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(econt_class), // mSize 0, // mSizeOther 0, // mParameters @@ -103,4 +103,4 @@ extern actor_process_profile_definition g_profile_ECONT = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp index 40a9f18854..0d3319c8f4 100644 --- a/src/d/actor/d_a_formation_mng.cpp +++ b/src/d/actor/d_a_formation_mng.cpp @@ -443,7 +443,7 @@ extern actor_process_profile_definition g_profile_FORMATION_MNG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_FORMATION_MNG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daFmtMng_c), // mSize 0, // mSizeOther 0, // mParameters @@ -453,4 +453,4 @@ extern actor_process_profile_definition g_profile_FORMATION_MNG = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index f4da08208e..7fbf03c1e8 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -226,7 +226,7 @@ extern actor_process_profile_definition g_profile_FR = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_FR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(fr_class), // mSize 0, // mSizeOther 0, // mParameters @@ -735,4 +735,4 @@ static void func_8051B9AC() { // NONMATCHING } -/* 8051BA88-8051BA88 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8051BA88-8051BA88 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 3e4392cc58..a1f09f8b76 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -1403,7 +1403,7 @@ extern actor_process_profile_definition g_profile_GRASS = { 11, // mListID fpcPi_CURRENT_e, // mListPrio PROC_GRASS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000570, // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_guard_mng.cpp b/src/d/actor/d_a_guard_mng.cpp index 54e581662f..8f640e8e21 100644 --- a/src/d/actor/d_a_guard_mng.cpp +++ b/src/d/actor/d_a_guard_mng.cpp @@ -83,7 +83,7 @@ extern actor_process_profile_definition g_profile_GUARD_MNG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_GUARD_MNG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daGuardMng_c), // mSize 0, // mSizeOther 0, // mParameters @@ -93,4 +93,4 @@ extern actor_process_profile_definition g_profile_GUARD_MNG = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index 2466cb07d4..bc95f97df5 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -88,7 +88,7 @@ extern actor_process_profile_definition g_profile_HITOBJ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_HITOBJ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(hitobj_class), // mSize 0, // mSizeOther 0, // mParameters @@ -98,4 +98,4 @@ extern actor_process_profile_definition g_profile_HITOBJ = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index e13b9d8c7a..6feb755a8a 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -775,7 +775,7 @@ extern actor_process_profile_definition g_profile_HORSE = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_HORSE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daHorse_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_izumi_gate.cpp b/src/d/actor/d_a_izumi_gate.cpp index 8e72706e16..e8d642a025 100644 --- a/src/d/actor/d_a_izumi_gate.cpp +++ b/src/d/actor/d_a_izumi_gate.cpp @@ -113,7 +113,7 @@ extern actor_process_profile_definition g_profile_Izumi_Gate = { 7, fpcPi_CURRENT_e, PROC_Izumi_Gate, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daIzumiGate_c), 0, 0, @@ -123,4 +123,4 @@ extern actor_process_profile_definition g_profile_Izumi_Gate = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 9e52cb7d50..d42dff0b07 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -507,7 +507,7 @@ extern actor_process_profile_definition g_profile_KAGO = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_KAGO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daKago_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1862,4 +1862,4 @@ extern "C" void getMidnaActor__9daPy_py_cFv() { // NONMATCHING } -/* 80854D14-80854D14 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80854D14-80854D14 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index e8bf41da92..b5112bd847 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -14,12 +14,12 @@ static cXyz get_check_pos(kytag00_class* i_this) { cXyz pos; if (player_p != NULL) { - f32 dist_to_cameye = a_this->current.pos.abs(camera_p->mLookat.mEye); + f32 dist_to_cameye = a_this->current.pos.abs(camera_p->lookat.eye); f32 dist_to_player = a_this->current.pos.abs(player_p->current.pos); pos = player_p->current.pos; if (dComIfGp_event_runCheck() && dist_to_cameye < dist_to_player) { - pos = camera_p->mLookat.mEye; + pos = camera_p->lookat.eye; } } else { pos.set(0.0f, 0.0f, 0.0f); @@ -505,7 +505,7 @@ extern actor_process_profile_definition g_profile_KYTAG00 = { 7, fpcPi_CURRENT_e, PROC_KYTAG00, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag00_class), 0, 0, @@ -515,4 +515,4 @@ extern actor_process_profile_definition g_profile_KYTAG00 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index b0a023de40..610a9d45fd 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -16,12 +16,12 @@ static cXyz get_check_pos(kytag01_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz pos; - f32 dist_to_cameye = a_this->current.pos.abs(camera->mLookat.mEye); + f32 dist_to_cameye = a_this->current.pos.abs(camera->lookat.eye); f32 dist_to_player = a_this->current.pos.abs(player->current.pos); if (dComIfGp_event_runCheck()) { if (dist_to_cameye < dist_to_player) { - pos = camera->mLookat.mEye; + pos = camera->lookat.eye; } else { pos = player->current.pos; } @@ -69,13 +69,13 @@ static void mist_tag_move(kytag01_class* i_this) { var_f31 *= i_this->field_0x594; - spBC = camera->mLookat.mCenter; - spBC.y = camera->mLookat.mEye.y; + spBC = camera->lookat.center; + spBC.y = camera->lookat.eye.y; - dKyr_get_vectle_calc(&camera->mLookat.mEye, &spBC, &sp98); - sp80.y = camera->mLookat.mEye.y; + dKyr_get_vectle_calc(&camera->lookat.eye, &spBC, &sp98); + sp80.y = camera->lookat.eye.y; - dKyr_get_vectle_calc(&camera->mLookat.mEye, &sp80, &spA4); + dKyr_get_vectle_calc(&camera->lookat.eye, &sp80, &spA4); s16 var_r29_2 = cM_atan2s(sp98.x, sp98.z); s16 var_r26 = cM_atan2s(spA4.x, spA4.z); @@ -234,7 +234,7 @@ extern actor_process_profile_definition g_profile_KYTAG01 = { 7, fpcPi_CURRENT_e, PROC_KYTAG01, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag01_class), 0, 0, @@ -244,4 +244,4 @@ extern actor_process_profile_definition g_profile_KYTAG01 = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index 9e41c32e42..67f21dd9ef 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -146,7 +146,7 @@ extern actor_process_profile_definition g_profile_KYTAG02 = { 7, fpcPi_CURRENT_e, PROC_KYTAG02, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag02_class), 0, 0, @@ -156,4 +156,4 @@ extern actor_process_profile_definition g_profile_KYTAG02 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index 07755fc3ec..e301b27f14 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -169,8 +169,8 @@ static void odour_move(kytag03_class* i_this) { if (path != NULL) { int sp40; int sp38; - var_r27 = get_Extent_pos_start_get(i_this, path, &camera->mLookat.mEye, 1000.0f, &sp40); - var_r25 = get_Extent_pos_end_get(i_this, path, &camera->mLookat.mEye, 1000.0f, &sp38); + var_r27 = get_Extent_pos_start_get(i_this, path, &camera->lookat.eye, 1000.0f, &sp40); + var_r25 = get_Extent_pos_end_get(i_this, path, &camera->lookat.eye, 1000.0f, &sp38); s16 spA; s16 sp8; @@ -222,7 +222,7 @@ static void odour_move(kytag03_class* i_this) { temp_f22 *= temp_f22; var_f23 *= i_this->field_0x57c; - f32 var_f1_4 = camera->mLookat.mEye.abs(sp94); + f32 var_f1_4 = camera->lookat.eye.abs(sp94); if (var_f23 > 0.0f && var_f1_4 < 4000.0f) { csXyz spFC; cXyz spB8; @@ -478,7 +478,7 @@ extern actor_process_profile_definition g_profile_KYTAG03 = { 7, fpcPi_CURRENT_e, PROC_KYTAG03, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag03_class), 0, 0, @@ -488,4 +488,4 @@ extern actor_process_profile_definition g_profile_KYTAG03 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 6b3ffb6769..57a974284d 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -376,7 +376,7 @@ extern actor_process_profile_definition g_profile_KYTAG04 = { 7, fpcPi_CURRENT_e, PROC_KYTAG04, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag04_class), 0, 0, @@ -386,4 +386,4 @@ extern actor_process_profile_definition g_profile_KYTAG04 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 909dcb918a..e9813ab5e1 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -58,7 +58,7 @@ extern actor_process_profile_definition g_profile_KYTAG05 = { 7, fpcPi_CURRENT_e, PROC_KYTAG05, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag05_class), 0, 0, @@ -68,4 +68,4 @@ extern actor_process_profile_definition g_profile_KYTAG05 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index f57daf3913..4c4552ac9c 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -606,7 +606,7 @@ static void daKytag06_type_07_Execute(kytag06_class* i_this) { daKytag06_type_07_wether_Execute(i_this); if (camera != NULL) { - if (camera->mLookat.mEye.y > 0.0f) { + if (camera->lookat.eye.y > 0.0f) { dKy_BossLight_set(&spX, &color, i_this->mWindPower * 2.0f, 0); g_env_light.mTerrainAmbienceBG[3].r = (u8)(i_this->mWindPower * 230.0f + 25.0f); g_env_light.mTerrainAmbienceBG[3].g = (u8)(i_this->mWindPower * 215.0f + 30.0f); @@ -848,7 +848,7 @@ static void daKytag06_type_10_Execute(kytag06_class* i_this) { dKyw_evt_wind_set_go(); camera_class* camera = dComIfGp_getCamera(0); - cXyz eye(camera->mLookat.mEye); + cXyz eye(camera->lookat.eye); if (camera != NULL) { if (((eye.x > 2079.0f && eye.x < 3013.0f && eye.y < 864.0f && eye.z > -6000.0f && @@ -1012,7 +1012,7 @@ static int daKytag06_Execute(kytag06_class* i_this) { if (i_this->mpPath != NULL) { int target1 = 0; int target2 = 0; - dStage_dPnt_c* pnt = near_rail_get(i_this, &camera->mLookat.mEye); + dStage_dPnt_c* pnt = near_rail_get(i_this, &camera->lookat.eye); if (pnt != NULL && pnt->mArg0 != 0xFF) { dKy_change_colpat(pnt->mArg0); @@ -1353,7 +1353,7 @@ extern actor_process_profile_definition g_profile_KYTAG06 = { 7, fpcPi_CURRENT_e, PROC_KYTAG06, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag06_class), 0, 0, @@ -1536,4 +1536,4 @@ static u8 data_8085A1E8[4]; static u8 data_8085A1EC[4]; #pragma pop -/* 80859F90-80859F90 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80859F90-80859F90 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index 2b1e151d98..50f906d12d 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -79,7 +79,7 @@ extern actor_process_profile_definition g_profile_KYTAG07 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_KYTAG07, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(kytag07_class), // mSize 0, // mSizeOther 0, // mParameters @@ -89,4 +89,4 @@ extern actor_process_profile_definition g_profile_KYTAG07 = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp index b28f896f54..80fb97e4a1 100644 --- a/src/d/actor/d_a_kytag08.cpp +++ b/src/d/actor/d_a_kytag08.cpp @@ -286,7 +286,7 @@ extern actor_process_profile_definition g_profile_KYTAG08 = { 7, fpcPi_CURRENT_e, PROC_KYTAG08, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag08_class), 0, 0, @@ -296,4 +296,4 @@ extern actor_process_profile_definition g_profile_KYTAG08 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag09.cpp b/src/d/actor/d_a_kytag09.cpp index 72ec987465..60ac6a6066 100644 --- a/src/d/actor/d_a_kytag09.cpp +++ b/src/d/actor/d_a_kytag09.cpp @@ -158,7 +158,7 @@ extern actor_process_profile_definition g_profile_KYTAG09 = { 7, fpcPi_CURRENT_e, PROC_KYTAG09, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag09_class), 0, 0, @@ -168,4 +168,4 @@ extern actor_process_profile_definition g_profile_KYTAG09 = { 0x60000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp index a0179f5f62..22548c8ecc 100644 --- a/src/d/actor/d_a_kytag10.cpp +++ b/src/d/actor/d_a_kytag10.cpp @@ -81,11 +81,11 @@ static void sparks_move(kytag10_class* i_this) { if (path_p != NULL) { int start_point_idx; - dPath* path_start = get_Extent_pos_start_get(i_this, path_p, &camera_p->mLookat.mEye, + dPath* path_start = get_Extent_pos_start_get(i_this, path_p, &camera_p->lookat.eye, 1000.0f, &start_point_idx); int end_point_idx; - dPath* path_end = get_Extent_pos_end_get(i_this, path_p, &camera_p->mLookat.mEye, 1000.0f, + dPath* path_end = get_Extent_pos_end_get(i_this, path_p, &camera_p->lookat.eye, 1000.0f, &end_point_idx); s16 spD6; @@ -225,7 +225,7 @@ extern actor_process_profile_definition g_profile_KYTAG10 = { 7, fpcPi_CURRENT_e, PROC_KYTAG10, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag10_class), 0, 0, @@ -235,4 +235,4 @@ extern actor_process_profile_definition g_profile_KYTAG10 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag11.cpp b/src/d/actor/d_a_kytag11.cpp index 9bcc5c6db5..80bde2223b 100644 --- a/src/d/actor/d_a_kytag11.cpp +++ b/src/d/actor/d_a_kytag11.cpp @@ -127,7 +127,7 @@ extern actor_process_profile_definition g_profile_KYTAG11 = { 7, fpcPi_CURRENT_e, PROC_KYTAG11, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag11_class), 0, 0, @@ -137,4 +137,4 @@ extern actor_process_profile_definition g_profile_KYTAG11 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index dd198cd478..ae2099e64f 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -1052,7 +1052,7 @@ extern actor_process_profile_definition g_profile_KYTAG12 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_KYTAG12, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(kytag12_class), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index 731c411155..15530c56a4 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -416,7 +416,7 @@ extern actor_process_profile_definition g_profile_KYTAG13 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_KYTAG13, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(kytag13_class), // mSize 0, // mSizeOther 0, // mParameters @@ -488,7 +488,7 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) { } } - snow_packet->field_0x6d74 = camera->mLookat.mEye; + snow_packet->field_0x6d74 = camera->lookat.eye; sp7C.z = 0.0f; sp7C.y = 0.0f; sp7C.x = 0.0f; @@ -510,9 +510,9 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) { dKyr_get_vectle_calc(&sp40, &a_this->current.pos, &sp64); - sp88.x = camera->mLookat.mCenter.x - camera->mLookat.mEye.x; + sp88.x = camera->lookat.center.x - camera->lookat.eye.x; sp88.y = 0.0; - sp88.z = camera->mLookat.mCenter.z - camera->mLookat.mEye.z; + sp88.z = camera->lookat.center.z - camera->lookat.eye.z; cXyz sp28; vectle_calc(&sp88, &sp28); @@ -605,11 +605,11 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) { var_f29 = 0.0f; } - if (camera->mLookat.mEye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f) { + if (camera->lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f) { var_f28 = temp_f30; } - if (camera->mLookat.mEye.abs(snow_packet->mSnowEff[i].mBasePos) < 500.0f) { + if (camera->lookat.eye.abs(snow_packet->mSnowEff[i].mBasePos) < 500.0f) { var_f29 = temp_f30; } @@ -866,4 +866,4 @@ static void func_80860458() { /* 80860460-80860468 0012E0 0008+00 1/0 0/0 0/0 .text @60@__dt__14dBgS_ObjGndChkFv */ static void func_80860460() { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp index bc8879e8ad..2e2099d91a 100644 --- a/src/d/actor/d_a_kytag14.cpp +++ b/src/d/actor/d_a_kytag14.cpp @@ -111,7 +111,7 @@ extern actor_process_profile_definition g_profile_KYTAG14 = { 7, fpcPi_CURRENT_e, PROC_KYTAG14, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag14_class), 0, 0, @@ -121,4 +121,4 @@ extern actor_process_profile_definition g_profile_KYTAG14 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp index e96fb8cccb..a94cb2aba9 100644 --- a/src/d/actor/d_a_kytag15.cpp +++ b/src/d/actor/d_a_kytag15.cpp @@ -141,7 +141,7 @@ extern actor_process_profile_definition g_profile_KYTAG15 = { 7, fpcPi_CURRENT_e, PROC_KYTAG15, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag15_class), 0, 0, @@ -151,4 +151,4 @@ extern actor_process_profile_definition g_profile_KYTAG15 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp index 6755dc28da..4b5f4f5b19 100644 --- a/src/d/actor/d_a_kytag16.cpp +++ b/src/d/actor/d_a_kytag16.cpp @@ -179,7 +179,7 @@ extern actor_process_profile_definition g_profile_KYTAG16 = { 7, fpcPi_CURRENT_e, PROC_KYTAG16, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(kytag16_class), 0, 0, @@ -189,4 +189,4 @@ extern actor_process_profile_definition g_profile_KYTAG16 = { 0x60000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag17.cpp b/src/d/actor/d_a_kytag17.cpp index 65d681946a..8e2432b179 100644 --- a/src/d/actor/d_a_kytag17.cpp +++ b/src/d/actor/d_a_kytag17.cpp @@ -51,7 +51,7 @@ extern actor_process_profile_definition g_profile_KYTAG17 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_KYTAG17, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(kytag17_class), // mSize 0, // mSizeOther 0, // mParameters @@ -61,4 +61,4 @@ extern actor_process_profile_definition g_profile_KYTAG17 = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 346c6884ba..f8f12226b7 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -801,7 +801,7 @@ extern actor_process_profile_definition g_profile_MANT = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_MANT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(mant_class), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index 5a1794e907..a741244164 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -593,7 +593,7 @@ extern actor_process_profile_definition g_profile_MG_FISH = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_MG_FISH, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000C50, // mSize 0, // mSizeOther 0, // mParameters @@ -2636,4 +2636,4 @@ static u8 data_80536D54[4]; static u8 data_80536D58[4]; #pragma pop -/* 80536438-80536438 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80536438-80536438 0002D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index b05d1fe91c..d3d7ac00bd 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -1295,8 +1295,8 @@ static int daFshop_Draw(fshop_class* param_0) { camera_class* camera = dComIfGp_getCamera(0); for (int iVar12 = 0; iVar12 < 48; iVar12++) { - f32 fVar4 = param_0->mLure[iVar12].field_0x00.x - camera->mLookat.mEye.x; - f32 fVar5 = param_0->mLure[iVar12].field_0x00.z - camera->mLookat.mEye.z; + f32 fVar4 = param_0->mLure[iVar12].field_0x00.x - camera->lookat.eye.x; + f32 fVar5 = param_0->mLure[iVar12].field_0x00.z - camera->lookat.eye.z; if (fVar4 * fVar4 + fVar5 * fVar5 > 1200.0f) { g_env_light.setLightTevColorType_MAJI(param_0->mLure[iVar12].field_0x14, ¶m_0->tevStr); mDoExt_modelUpdateDL(param_0->mLure[iVar12].field_0x14); @@ -1946,7 +1946,7 @@ static int daFshop_Execute(fshop_class* param_1) { mDoMtx_stack_c::scaleM(param_1->scale.x, param_1->scale.x, param_1->scale.x); mDoMtx_stack_c::transM(0.0f, 190.0f * param_1->scale.x, 0.0f); - local_cc = pmVar11->mLookat.mEye - param_1->current.pos; + local_cc = pmVar11->lookat.eye - param_1->current.pos; mDoMtx_stack_c::YrotM(cM_atan2s(local_cc.x, local_cc.z)); mDoMtx_stack_c::XrotM(-cM_atan2s(local_cc.y, JMAFastSqrt((local_cc.x * local_cc.x + local_cc.z * local_cc.z)))); param_1->field_0x4070->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -2486,7 +2486,7 @@ extern actor_process_profile_definition g_profile_FSHOP = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_FSHOP, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00006B80, // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index d6429c3e1a..f8cca31f6f 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -702,7 +702,7 @@ extern actor_process_profile_definition g_profile_MG_ROD = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_MG_ROD, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(dmg_rod_class), // mSize 0, // mSizeOther 0, // mParameters @@ -2951,4 +2951,4 @@ static u8 data_804BC188[4]; static u8 data_804BC18C[4]; #pragma pop -/* 804BB830-804BB830 0002FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 804BB830-804BB830 0002FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 15b26a356b..a850c90891 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -3421,7 +3421,7 @@ extern actor_process_profile_definition g_profile_MIDNA = { 6, fpcPi_CURRENT_e, PROC_MIDNA, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daMidna_c), 0, 0, diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 64f4882722..469f7ba448 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -276,13 +276,13 @@ void dMirror_packet_c::mainDraw() { int prjPosNum = 4; view_class* view = dComIfGd_getView(); - f32 temp_f22 = -view->mNear; + f32 temp_f22 = -view->near; cXyz* var_r21 = mQuad; cXyz* var_r22 = sp19C; int var_r23 = 0; int var_r28 = 0; for (int i = 0; i < 4; i++) { - cMtx_multVec(view->mViewMtx, var_r21, var_r22); + cMtx_multVec(view->viewMtx, var_r21, var_r22); if (var_r22->z >= temp_f22) { var_r23++; } else { @@ -331,28 +331,28 @@ void dMirror_packet_c::mainDraw() { } } - f32 aspect = view->mAspect; - f32 temp_f0_2 = i_tanf(MTXDegToRad(view->mFovy * 0.5f)); + f32 aspect = view->aspect; + f32 temp_f0_2 = i_tanf(MTXDegToRad(view->fovy * 0.5f)); view_port_class* view_port = dComIfGd_getViewport(); f32 var_f3; f32 var_f4; f32 var_f5; f32 var_f6; - if (view_port->mXOrig != 0.0f) { - var_f3 = (((view_port->mXOrig * 2.0f) + view_port->mWidth) * 0.5f) - (608.0f / 2); + if (view_port->x_orig != 0.0f) { + var_f3 = (((view_port->x_orig * 2.0f) + view_port->width) * 0.5f) - (608.0f / 2); var_f5 = 608.0f; } else { - var_f3 = view_port->mXOrig; - var_f5 = view_port->mWidth; + var_f3 = view_port->x_orig; + var_f5 = view_port->width; } - if (view_port->mYOrig != 0.0f) { - var_f4 = (((view_port->mYOrig * 2.0f) + view_port->mHeight) * 0.5f) - (448.0f / 2); + if (view_port->y_orig != 0.0f) { + var_f4 = (((view_port->y_orig * 2.0f) + view_port->height) * 0.5f) - (448.0f / 2); var_f6 = 448.0f; } else { - var_f4 = view_port->mYOrig; - var_f6 = view_port->mHeight; + var_f4 = view_port->y_orig; + var_f6 = view_port->height; } Vec* var_r3 = sp19C; @@ -402,27 +402,27 @@ void dMirror_packet_c::mainDraw() { f32 temp_f7 = (spF8.x * mQuad[0].x) + (spF8.y * mQuad[0].y) + (spF8.z * mQuad[0].z); f32 temp_f22_4 = - ((spF8.z * view->mLookat.mCenter.z) + - ((spF8.x * view->mLookat.mCenter.x) + (spF8.y * view->mLookat.mCenter.y))) - + ((spF8.z * view->lookat.center.z) + + ((spF8.x * view->lookat.center.x) + (spF8.y * view->lookat.center.y))) - temp_f7; cXyz spEC = - view->mLookat.mEye - - (spF8 * (2.0f * (((spF8.z * view->mLookat.mEye.z) + - ((spF8.x * view->mLookat.mEye.x) + (spF8.y * view->mLookat.mEye.y))) - + view->lookat.eye - + (spF8 * (2.0f * (((spF8.z * view->lookat.eye.z) + + ((spF8.x * view->lookat.eye.x) + (spF8.y * view->lookat.eye.y))) - temp_f7))); - cXyz spE0 = view->mLookat.mCenter - (spF8 * (2.0f * temp_f22_4)); + cXyz spE0 = view->lookat.center - (spF8 * (2.0f * temp_f22_4)); cXyz spD4(0.0f, 1.0f, 0.0f); if (mViewScale.y > 0.0f) { - sp110 = spEC - view->mLookat.mEye; - sp104 = sp110.outprod(view->mLookat.mUp); + sp110 = spEC - view->lookat.eye; + sp104 = sp110.outprod(view->lookat.up); spD4 = sp110.outprod(sp104); spD4.normalizeZP(); spD4 *= cXyz(-1.0f, -1.0f, -1.0f); } - mDoMtx_lookAt(sp16C, &spEC, &spE0, &spD4, view->mBank); + mDoMtx_lookAt(sp16C, &spEC, &spE0, &spD4, view->bank); mDoMtx_stack_c::scaleS(mViewScale); mDoMtx_stack_c::concat(sp16C); J3DShape::resetVcdVatCache(); @@ -433,13 +433,13 @@ void dMirror_packet_c::mainDraw() { j3dSys.reinitGX(); GXSetScissor(scissor[0], scissor[1], scissor[2], scissor[3]); - mirrorZdraw(sp150, sp138, view->mFar, var_f31, var_f30, var_f29, var_f28, var_f27); + mirrorZdraw(sp150, sp138, view->far, var_f31, var_f30, var_f29, var_f28, var_f27); } } /* 80871D84-80871E24 001244 00A0+00 1/0 0/0 0/0 .text draw__16dMirror_packet_cFv */ void dMirror_packet_c::draw() { - mDoLib_clipper::changeFar(dComIfGd_getView()->mFar); + mDoLib_clipper::changeFar(dComIfGd_getView()->far); if (!mDoLib_clipper::clip(j3dSys.getViewMtx(), &mMaxVal, &mMinVal)) { mainDraw(); } @@ -647,7 +647,7 @@ extern actor_process_profile_definition g_profile_MIRROR = { 7, fpcPi_CURRENT_e, PROC_MIRROR, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daMirror_c), 0, 0, @@ -657,4 +657,4 @@ extern actor_process_profile_definition g_profile_MIRROR = { 0x60000, fopAc_UNK_GROUP_5_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 61edf10f45..11a6e27058 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -3764,7 +3764,7 @@ extern actor_process_profile_definition g_profile_MOVIE_PLAYER = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_MOVIE_PLAYER, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daMP_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index d01f64e9e7..3468c2b790 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -1283,20 +1283,20 @@ void daMyna_c::fly_body_wave() { void daMyna_c::talkAnime(msg_class* param_0) { u32 uVar4 = 0; if (param_0 != NULL && this == dComIfGp_event_getTalkPartner()) { - switch (param_0->mMode) { + switch (param_0->mode) { case 2: field_0x81C = 1; break; default: - if (param_0->mMsgID != field_0x824) { + if (param_0->msg_idx != field_0x824) { field_0x81C = 1; } } - if (param_0->mMode == 6 && field_0x81C != 0) { + if (param_0->mode == 6 && field_0x81C != 0) { field_0x81C = 0; field_0x820 = dComIfGp_getMesgAnimeAttrInfo(); - field_0x824 = param_0->mMsgID; + field_0x824 = param_0->msg_idx; uVar4 = 1; } } @@ -1918,7 +1918,7 @@ extern actor_process_profile_definition g_profile_MYNA = { 7, fpcPi_CURRENT_e, PROC_MYNA, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daMyna_c), 0, 0, diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index d10afa5648..2b3b39e1a6 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -767,7 +767,7 @@ BOOL daNbomb_c::procExplode() { mLightInfluence.mPow = mExplosionStrength * 1500.0f; mWindInfluence.mStrength = mExplosionStrength; - f32 dist_to_cam = current.pos.abs(camera->mLookat.mEye); + f32 dist_to_cam = current.pos.abs(camera->lookat.eye); if (dist_to_cam < 1500.0f) { dist_scale = dist_to_cam / 1500.0f; dist_scale *= dist_scale * dist_scale; @@ -1757,7 +1757,7 @@ extern actor_process_profile_definition g_profile_NBOMB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NBOMB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNbomb_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index 164f4758ab..1d26b29190 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -1368,7 +1368,7 @@ static int ni_play(ni_class* i_this) { sp78.z = -i_this->mPadMainStickY; camera_class* camera = dComIfGp_getCamera(0); - sp84 = camera->mLookat.mCenter - camera->mLookat.mEye; + sp84 = camera->lookat.center - camera->lookat.eye; cMtx_YrotS(*calc_mtx, cM_atan2s(-sp84.x, -sp84.z)); MtxPosition(&sp78, &sp84); @@ -1521,9 +1521,9 @@ static void play_camera(ni_class* i_this) { camera->mCamera.Stop(); i_this->field_0xafc = 500.0f; - i_this->field_0xac8 = camera0->mLookat.mEye; - i_this->field_0xad4 = camera0->mLookat.mCenter; - i_this->field_0xaec = dComIfGd_getView()->mFovy; + i_this->field_0xac8 = camera0->lookat.eye; + i_this->field_0xad4 = camera0->lookat.center; + i_this->field_0xaec = dComIfGd_getView()->fovy; player->changeOriginalDemo(); player->changeDemoMode(1, 1, 0, 0); @@ -2505,4 +2505,4 @@ SECTION_DATA extern void* g_profile_NI[12] = { (void*)0xFFFFFFFD, (void*)0x0007FFFD, (void*)0x01080000, (void*)&g_fpcLf_Method, (void*)0x00000B0C, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method, (void*)0x02B70000, (void*)&l_daNi_Method, (void*)0x080C4000, (void*)0x04000000, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp index 17ac50d651..b8b2f9419c 100644 --- a/src/d/actor/d_a_no_chg_room.cpp +++ b/src/d/actor/d_a_no_chg_room.cpp @@ -33,7 +33,7 @@ static bool isLoadRoom(int i_roomNo) { dStage_roomControl_c::getStatusProcID(load_room_index)); JUT_ASSERT(roomScene != 0); - if (roomScene->field_0x1d4 >= 0 || !fpcNd_IsDeleteTiming(&roomScene->mBase)) { + if (roomScene->field_0x1d4 >= 0 || !fpcNd_IsDeleteTiming(&roomScene->base)) { // "Room <%d> objects loading!\n" OS_REPORT("部屋<%d>オブジェクト読み込み中！\n", load_room_index); return false; @@ -168,7 +168,7 @@ extern actor_process_profile_definition g_profile_NO_CHG_ROOM = { 2, fpcPi_CURRENT_e, PROC_NO_CHG_ROOM, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daNocrm_c), 0, 0, @@ -178,4 +178,4 @@ extern actor_process_profile_definition g_profile_NO_CHG_ROOM = { 0x60000, fopAc_UNK_GROUP_5_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 479b51a638..1a0b583424 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -1803,15 +1803,15 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa if (talk_partner == param_2) { msg_class* conv_actor = talk_partner_conv->getActor(); - u16 actor_command = conv_actor->mMode; + u16 actor_command = conv_actor->mode; if (actor_command == 2 || actor_command == 3) { mMsgId = -1; } else if (actor_command == 6) { - if (conv_actor->mMsgID != mMsgId) { + if (conv_actor->msg_idx != mMsgId) { *param_0 = dComIfGp_getMesgFaceAnimeAttrInfo(); *param_1 = dComIfGp_getMesgAnimeAttrInfo(); - mMsgId = conv_actor->mMsgID; + mMsgId = conv_actor->msg_idx; } if (dMsgObject_c::isMouthCheck()) { @@ -4287,15 +4287,15 @@ int daNpcF_c::ctrlMsgAnm(int& o_expression, int& o_motion, fopAc_ac_c* param_2, fopAc_ac_c* talkPartner = dComIfGp_event_getTalkPartner(); if (talkPartner == param_2) { msg_class* actor = dMsgObject_c::getActor(); - if (actor->mMode == dEvtCmd_INDEMO_e - || actor->mMode == dEvtCmd_INDOOR_e) + if (actor->mode == dEvtCmd_INDEMO_e + || actor->mode == dEvtCmd_INDOOR_e) { field_0x9a4 = -1; - } else if (actor->mMode == dEvtCmd_INCATCH_e) { - if (actor->mMsgID != field_0x9a4) { + } else if (actor->mode == dEvtCmd_INCATCH_e) { + if (actor->msg_idx != field_0x9a4) { o_expression = dComIfGp_getMesgFaceAnimeAttrInfo(); o_motion = dComIfGp_getMesgAnimeAttrInfo(); - field_0x9a4 = actor->mMsgID; + field_0x9a4 = actor->msg_idx; } if (dMsgObject_c::isMouthCheck()) { mAnmFlags &= ~ANM_PAUSE_EXPRESSION; @@ -4442,7 +4442,7 @@ BOOL daNpcF_c::talkProc(int* param_0, BOOL param_1, fopAc_ac_c** i_actorP) { } else if (mFlow.doFlow(this, i_actorP, 0)) { ret = true; } else { - if (mFlow.getMsg() != NULL && (mFlow.getMsg()->mMode == 2 || mFlow.getMsg()->mMode == 6) + if (mFlow.getMsg() != NULL && (mFlow.getMsg()->mode == 2 || mFlow.getMsg()->mode == 6) && param_0 != NULL) { for (int i = 0; param_0[i] > 0; i++) { if (param_0[i] == mFlow.getMsgNo()) { diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index 343bce61f3..d5b2c1367b 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -729,7 +729,7 @@ extern actor_process_profile_definition g_profile_NPC_ARU = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_ARU, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Aru_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index 22a3b98508..433cd1d1b5 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -1647,7 +1647,7 @@ extern actor_process_profile_definition g_profile_NPC_ASH = { 7, fpcPi_CURRENT_e, PROC_NPC_ASH, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daNpcAsh_c), 0, 0, diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index e1e51b71f2..22406edc9e 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -1427,7 +1427,7 @@ extern actor_process_profile_definition g_profile_NPC_ASHB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_ASHB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcAshB_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 5c2ef0262e..2fb987d3b6 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -676,7 +676,7 @@ extern actor_process_profile_definition g_profile_NPC_BANS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_BANS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Bans_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1762,4 +1762,4 @@ extern "C" void chkPointInArea__15daTag_EvtArea_cF4cXyz() { // NONMATCHING } -/* 80967F6C-80967F6C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80967F6C-80967F6C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 127c2d3f40..1a24a07640 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -1169,7 +1169,7 @@ extern actor_process_profile_definition g_profile_NPC_BESU = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_BESU, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Besu_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2359,4 +2359,4 @@ SECTION_RODATA static u8 const lit_6105[8] = { COMPILER_STRIP_GATE(0x8053E900, &lit_6105); #pragma pop -/* 8053E908-8053E908 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8053E908-8053E908 0001B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index 9f3e8c704b..994ec038aa 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -464,7 +464,7 @@ extern actor_process_profile_definition g_profile_NPC_BLUENS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_BLUENS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcBlueNS_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index 40d64a5929..8acb2ab570 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -721,7 +721,7 @@ extern actor_process_profile_definition g_profile_NPC_BOU = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_BOU, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Bou_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index 21ef7ceb94..a985ee7165 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -501,7 +501,7 @@ extern actor_process_profile_definition g_profile_NPC_BOU_S = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_BOU_S, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcBouS_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index aabe44eff6..fd253e80ee 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -2270,7 +2270,7 @@ extern actor_process_profile_definition g_profile_NPC_CD3 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_CD3, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcCdn3_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2943,4 +2943,4 @@ extern "C" void __dt__12dBgS_ObjAcchFv() { // NONMATCHING } -/* 8097F5AC-8097F5AC 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8097F5AC-8097F5AC 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 722fe1bf13..0097c9abf5 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -2166,7 +2166,7 @@ extern actor_process_profile_definition g_profile_NPC_CHAT = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_CHAT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcChat_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 8d0c847f85..8ca8cd5b22 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -761,7 +761,7 @@ extern actor_process_profile_definition g_profile_NPC_CHIN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_CHIN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcChin_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index 85757d1e29..326f51c08f 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -468,7 +468,7 @@ extern actor_process_profile_definition g_profile_NPC_CLERKA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_CLERKA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_clerkA_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1401,4 +1401,4 @@ extern "C" bool beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci() { return true; } -/* 80995970-80995970 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80995970-80995970 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index 796728669c..08b1c03699 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -492,7 +492,7 @@ extern actor_process_profile_definition g_profile_NPC_CLERKB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_CLERKB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_clerkB_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1452,4 +1452,4 @@ extern "C" bool getResName2__13dShopSystem_cFi() { return false; } -/* 80999A8C-80999A8C 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80999A8C-80999A8C 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index 1958101884..dc0a747b24 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -434,7 +434,7 @@ extern actor_process_profile_definition g_profile_NPC_CLERKT = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_CLERKT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcClerkT_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1353,4 +1353,4 @@ extern "C" bool beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci() { return true; } -/* 8099D33C-8099D33C 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8099D33C-8099D33C 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 9a7352c2bc..79e61ff573 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -479,7 +479,7 @@ extern actor_process_profile_definition g_profile_NPC_COACH = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_COACH, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcCoach_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1243,4 +1243,4 @@ static void func_809A4EC0() { // NONMATCHING } -/* 809A5120-809A5120 000250 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 809A5120-809A5120 000250 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index 940dd5b98b..fd5f0c5b7a 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -652,7 +652,7 @@ extern actor_process_profile_definition g_profile_NPC_DF = { 9, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_DF, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(npc_df_class), // mSize 0, // mSizeOther 0, // mParameters @@ -883,4 +883,4 @@ static u8 data_809A6B8C[4]; static u8 data_809A6B90[4]; #pragma pop -/* 809A697C-809A697C 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 809A697C-809A697C 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index b3ac0b0337..d6411be4b4 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -489,7 +489,7 @@ extern actor_process_profile_definition g_profile_NPC_DOC = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_DOC, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Doc_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1669,4 +1669,4 @@ static u8 data_809AAB98[4]; static u8 data_809AAB9C[4]; #pragma pop -/* 809AA428-809AA428 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 809AA428-809AA428 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index 3808af589e..c3e9fa891e 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -365,7 +365,7 @@ extern actor_process_profile_definition g_profile_NPC_DOORBOY = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_DOORBOY, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcDoorBoy_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp index e11c2b468c..4b9edb3c55 100644 --- a/src/d/actor/d_a_npc_drainSol.cpp +++ b/src/d/actor/d_a_npc_drainSol.cpp @@ -218,7 +218,7 @@ extern actor_process_profile_definition g_profile_NPC_DRSOL = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_DRSOL, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcDrSol_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index 7178aa3f41..9e8de00f03 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -169,7 +169,7 @@ extern actor_process_profile_definition g_profile_NPC_DU = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_DU, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(npc_du_class), // mSize 0, // mSizeOther 0, // mParameters @@ -626,4 +626,4 @@ static void func_809B182C() { // NONMATCHING } -/* 809B18DC-809B18DC 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 809B18DC-809B18DC 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index e629aad34b..19307bf85e 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -1365,7 +1365,7 @@ extern actor_process_profile_definition g_profile_NPC_FAIRY = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_FAIRY, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Fairy_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index edfd9bd76a..3bcc427b9e 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -337,7 +337,7 @@ extern actor_process_profile_definition g_profile_NPC_FAIRY_SEIREI = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_FAIRY_SEIREI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_FairySeirei_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index 804252e6cd..ac8bdf0a00 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -183,7 +183,7 @@ extern actor_process_profile_definition g_profile_NPC_FISH = { 7, fpcPi_CURRENT_e, PROC_NPC_FISH, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(npc_fish_class), 0, 0, @@ -195,4 +195,4 @@ extern actor_process_profile_definition g_profile_NPC_FISH = { fopAc_CULLBOX_6_e, }; -/* 805424DC-805424DC 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805424DC-805424DC 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index b7bb214205..bef34b4904 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -398,7 +398,7 @@ extern actor_process_profile_definition g_profile_NPC_GND = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GND, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Gnd_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 43b3238761..63455baa38 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -1282,7 +1282,7 @@ extern actor_process_profile_definition g_profile_NPC_GRA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GRA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_grA_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 52d74d02e7..e66db0b254 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -475,7 +475,7 @@ extern actor_process_profile_definition g_profile_NPC_GRC = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GRC, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_grC_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index 7e092c11ff..a550025ab2 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -425,7 +425,7 @@ extern actor_process_profile_definition g_profile_NPC_GRD = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GRD, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Grd_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index 92244bda2c..65e6d00af0 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -460,7 +460,7 @@ extern actor_process_profile_definition g_profile_NPC_GRM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GRM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_grM_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index 1bb1e7ff20..eaee673db7 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -461,7 +461,7 @@ extern actor_process_profile_definition g_profile_NPC_GRMC = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GRMC, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_grMC_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index 8311d689f5..3c5f1863f7 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -565,7 +565,7 @@ extern actor_process_profile_definition g_profile_NPC_GRO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GRO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_grO_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index 2d21b865c7..e3753fc190 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -450,7 +450,7 @@ extern actor_process_profile_definition g_profile_NPC_GRR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GRR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_grR_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 488f5f73c5..3105e54c98 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -425,7 +425,7 @@ extern actor_process_profile_definition g_profile_NPC_GRS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GRS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_grS_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index a6c14a3029..5edaee79cb 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -674,7 +674,7 @@ extern actor_process_profile_definition g_profile_NPC_GRZ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GRZ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Grz_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index 2cf8770731..4dc8b00ef9 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -422,7 +422,7 @@ extern actor_process_profile_definition g_profile_NPC_GUARD = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GUARD, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcGuard_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1059,4 +1059,4 @@ extern "C" void __dt__12dBgS_ObjAcchFv() { // NONMATCHING } -/* 809F2D48-809F2D48 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 809F2D48-809F2D48 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index f0a4760aee..421d5ebca7 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -861,7 +861,7 @@ extern actor_process_profile_definition g_profile_NPC_GWOLF = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_GWOLF, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_GWolf_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index 4e4e3eed14..fab3e41950 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -2693,7 +2693,7 @@ extern actor_process_profile_definition g_profile_NPC_HANJO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_HANJO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Hanjo_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 518a392a1a..d732bdce0c 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -436,7 +436,7 @@ extern actor_process_profile_definition g_profile_NPC_HENNA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_HENNA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(npc_henna_class), // mSize 0, // mSizeOther 0, // mParameters @@ -2638,4 +2638,4 @@ static u8 data_8054B260[4]; static u8 data_8054B264[4]; #pragma pop -/* 8054AC70-8054AC70 00030C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8054AC70-8054AC70 00030C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_henna0.cpp b/src/d/actor/d_a_npc_henna0.cpp index 625e470264..68a5dcef72 100644 --- a/src/d/actor/d_a_npc_henna0.cpp +++ b/src/d/actor/d_a_npc_henna0.cpp @@ -16,7 +16,7 @@ extern actor_process_profile_definition g_profile_NPC_HENNA0 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_HENNA0, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(d_a_npc_henna0), // mSize 0, // mSizeOther 0, // mParameters @@ -26,4 +26,4 @@ extern actor_process_profile_definition g_profile_NPC_HENNA0 = { 0x00044100, // mStatus fopAc_NPC_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index ecf62803f3..2f480a8859 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -836,7 +836,7 @@ extern actor_process_profile_definition g_profile_NPC_HOZ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_HOZ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Hoz_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 8ccba05d55..01aa8fa736 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -459,7 +459,7 @@ extern actor_process_profile_definition g_profile_NPC_IMPAL = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_IMPAL, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcImpal_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp index 8d6baf277a..308f05c2a4 100644 --- a/src/d/actor/d_a_npc_inko.cpp +++ b/src/d/actor/d_a_npc_inko.cpp @@ -461,7 +461,7 @@ extern actor_process_profile_definition g_profile_NPC_INKO = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_INKO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(npc_inko_class), // mSize 0, // mSizeOther 0, // mParameters @@ -473,4 +473,4 @@ extern actor_process_profile_definition g_profile_NPC_INKO = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80A0E0CC-80A0E0CC 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80A0E0CC-80A0E0CC 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index b12152ef31..ae9bf1f915 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -517,7 +517,7 @@ extern actor_process_profile_definition g_profile_NPC_INS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_INS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcIns_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 5fcb41ada5..b3a340ccc7 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -663,7 +663,7 @@ extern actor_process_profile_definition g_profile_NPC_JAGAR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_JAGAR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Jagar_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index cca293bf21..c3c39d4cff 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -558,7 +558,7 @@ extern actor_process_profile_definition g_profile_NPC_KAKASHI = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KAKASHI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Kakashi_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 6320a87fc1..c93fbb03d8 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -917,7 +917,7 @@ extern actor_process_profile_definition g_profile_NPC_KASIHANA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KASIHANA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcKasiHana_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 88faf6c77d..342ef7d29d 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -655,7 +655,7 @@ extern actor_process_profile_definition g_profile_NPC_KASIKYU = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KASIKYU, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcKasiKyu_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index 4cf1943abd..2e8f167550 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -655,7 +655,7 @@ extern actor_process_profile_definition g_profile_NPC_KASIMICH = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KASIMICH, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcKasiMich_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_kdk.cpp b/src/d/actor/d_a_npc_kdk.cpp index c5bcfda923..0619634682 100644 --- a/src/d/actor/d_a_npc_kdk.cpp +++ b/src/d/actor/d_a_npc_kdk.cpp @@ -13,7 +13,7 @@ extern actor_process_profile_definition g_profile_NPC_KDK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KDK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcKdk_c), // mSize 0, // mSizeOther 0, // mParameters @@ -23,4 +23,4 @@ extern actor_process_profile_definition g_profile_NPC_KDK = { 0x00044107, // mStatus fopAc_NPC_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 7f21fdd2d3..4408c289be 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -577,7 +577,7 @@ extern actor_process_profile_definition g_profile_NPC_KKRI = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KKRI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Kkri_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1556,4 +1556,4 @@ static void func_80553474() { // NONMATCHING } -/* 805535A4-805535A4 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805535A4-805535A4 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index 1fbd557bb7..77d871a87c 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -3112,7 +3112,7 @@ extern actor_process_profile_definition g_profile_NPC_KN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Kn_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index b504dd4c48..0c3f070513 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -355,7 +355,7 @@ extern actor_process_profile_definition g_profile_NPC_KNJ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KNJ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Knj_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index a3533ecf02..12627f8db4 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -874,7 +874,7 @@ extern actor_process_profile_definition g_profile_NPC_KOLIN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KOLIN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Kolin_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index e1c0d7d1dd..75711f67c6 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -503,7 +503,7 @@ extern actor_process_profile_definition g_profile_NPC_KOLINB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KOLINB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Kolinb_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index c7f0a71661..e4f90f35da 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -1128,7 +1128,7 @@ extern actor_process_profile_definition g_profile_NPC_KS = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(npc_ks_class), // mSize 0, // mSizeOther 0, // mParameters @@ -4495,4 +4495,4 @@ static u8 data_80A5FFC4[4]; static u8 data_80A5FFC8[4]; #pragma pop -/* 80A5E438-80A5E438 00053C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80A5E438-80A5E438 00053C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 6b379a9ffa..4d03f9f0da 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -514,7 +514,7 @@ extern actor_process_profile_definition g_profile_NPC_KYURY = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_KYURY, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Kyury_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1454,4 +1454,4 @@ static void func_80A63890() { // NONMATCHING } -/* 80A639C4-80A639C4 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80A639C4-80A639C4 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 6139f1e452..38c9dcb4f5 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -631,7 +631,7 @@ extern actor_process_profile_definition g_profile_NPC_LEN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_LEN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Len_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index 7048a5daf2..c683741fea 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -217,8 +217,8 @@ static int daNPC_LF_Execute(npc_lf_class* i_this) { for (int i = 0; i < i_this->mIter; i++, fish++) { cXyz pos; - pos.x = fish->field_0x04.x - camera->mLookat.mEye.x; - pos.z = fish->field_0x04.z - camera->mLookat.mEye.z; + pos.x = fish->field_0x04.x - camera->lookat.eye.x; + pos.z = fish->field_0x04.z - camera->lookat.eye.z; f32 res = JMAFastSqrt((pos.x * pos.x) + (pos.z * pos.z)); if (res < 1500.0f) { @@ -358,7 +358,7 @@ extern actor_process_profile_definition g_profile_NPC_LF = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_LF, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(npc_lf_class), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index b6b20ee94e..35680edeb4 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -747,7 +747,7 @@ extern actor_process_profile_definition g_profile_NPC_LUD = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_LUD, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Lud_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index a635645830..594f6ecf3e 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -1316,7 +1316,7 @@ extern actor_process_profile_definition g_profile_NPC_MARO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_MARO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Maro_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index b9383cbc29..2067f12e93 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -378,7 +378,7 @@ extern actor_process_profile_definition g_profile_NPC_MIDP = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_MIDP, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_midP_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index 730ea53e42..9d71765c4b 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -66,7 +66,7 @@ extern actor_process_profile_definition g_profile_NPC_MK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_MK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000001, // mSize 0, // mSizeOther 0, // mParameters @@ -76,4 +76,4 @@ extern actor_process_profile_definition g_profile_NPC_MK = { 0x020C4407, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index 4d90e1ca7b..480ef32d02 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -814,7 +814,7 @@ extern actor_process_profile_definition g_profile_NPC_MOI = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_MOI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Moi_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2359,4 +2359,4 @@ static u8 data_80A7C070[4]; static u8 data_80A7C074[4]; #pragma pop -/* 80A7B0D8-80A7B0D8 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80A7B0D8-80A7B0D8 0001E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index 4c02081ca9..f872e92db7 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -565,7 +565,7 @@ extern actor_process_profile_definition g_profile_NPC_MOIR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_MOIR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcMoiR_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index fa644ddedc..e115841f5d 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -571,7 +571,7 @@ extern actor_process_profile_definition g_profile_MYNA2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_MYNA2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_myna2_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index c0fecff7fb..9992661a37 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -2480,12 +2480,12 @@ static void action(npc_ne_class* i_this) { if (i_this->mDistToTarget > 700.0f && fopAcM_CheckCondition(_this, 4) && player->speedF > 2.0f) { camera_class* camera = dComIfGp_getCamera(0); - vec1.x = camera->mLookat.mEye.x - camera->mLookat.mCenter.x; - vec1.z = camera->mLookat.mEye.z - camera->mLookat.mCenter.z; + vec1.x = camera->lookat.eye.x - camera->lookat.center.x; + vec1.z = camera->lookat.eye.z - camera->lookat.center.z; mDoMtx_YrotS(*calc_mtx, cM_atan2s(vec1.x, vec1.z)); vec1.set(0.0f, -50.0f, 100.0f); MtxPosition(&vec1, &vec2); - vec2 += camera->mLookat.mEye; + vec2 += camera->lookat.eye; dBgS_ObjGndChk_Spl gnd_chk_spl; gnd_chk_spl.SetPos(&vec2); f32 cross = dComIfG_Bgsp().GroundCross(&gnd_chk_spl); @@ -3574,7 +3574,7 @@ extern actor_process_profile_definition g_profile_NPC_NE = { 7, fpcPi_CURRENT_e, PROC_NPC_NE, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(npc_ne_class), 0, 0, diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index b4c6cb504d..08b53c170f 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -66,7 +66,7 @@ extern actor_process_profile_definition g_profile_NPC_P2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_P2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000001, // mSize 0, // mSizeOther 0, // mParameters @@ -76,4 +76,4 @@ extern actor_process_profile_definition g_profile_NPC_P2 = { 0x020C4407, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index fbcd732d93..9defe06ccb 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -802,7 +802,7 @@ extern actor_process_profile_definition g_profile_NPC_PACHI_BESU = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_PACHI_BESU, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Pachi_Besu_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2159,4 +2159,4 @@ static u8 data_80A97B90[4]; static u8 data_80A97B94[4]; #pragma pop -/* 80A96B60-80A96B60 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80A96B60-80A96B60 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index 8956eb5992..61c65a449e 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -661,7 +661,7 @@ extern actor_process_profile_definition g_profile_NPC_PACHI_MARO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_PACHI_MARO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Pachi_Maro_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 7aa4885bd3..dde3799d95 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -987,7 +987,7 @@ extern actor_process_profile_definition g_profile_NPC_PACHI_TARO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_PACHI_TARO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Pachi_Taro_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2413,4 +2413,4 @@ static void func_80AA15E8() { // NONMATCHING } -/* 80AA1814-80AA1814 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80AA1814-80AA1814 000210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_passer.cpp b/src/d/actor/d_a_npc_passer.cpp index b002765e15..bf341a97e4 100644 --- a/src/d/actor/d_a_npc_passer.cpp +++ b/src/d/actor/d_a_npc_passer.cpp @@ -1371,7 +1371,7 @@ extern actor_process_profile_definition g_profile_NPC_PASSER = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_PASSER, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcPasser_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2026,4 +2026,4 @@ extern "C" void __dt__12dBgS_AcchCirFv() { // dBgS_ObjAcch::~dBgS_ObjAcch() { extern "C" void __dt__12dBgS_ObjAcchFv() { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_npc_passer2.cpp b/src/d/actor/d_a_npc_passer2.cpp index ccf3561604..bcc046fbf4 100644 --- a/src/d/actor/d_a_npc_passer2.cpp +++ b/src/d/actor/d_a_npc_passer2.cpp @@ -224,7 +224,7 @@ extern actor_process_profile_definition g_profile_NPC_PASSER2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_PASSER2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcPasser2_c), // mSize 0, // mSizeOther 0, // mParameters @@ -549,4 +549,4 @@ extern "C" void __dt__12dBgS_AcchCirFv() { // dBgS_ObjAcch::~dBgS_ObjAcch() { extern "C" void __dt__12dBgS_ObjAcchFv() { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index 5fdcdad3bc..b3455b78f2 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -588,7 +588,7 @@ extern actor_process_profile_definition g_profile_NPC_POST = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_POST, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Post_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index cd783d957a..981fd22254 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -699,7 +699,7 @@ extern actor_process_profile_definition g_profile_NPC_POUYA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_POUYA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Pouya_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index fa396b258e..0da24a8eb9 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -355,7 +355,7 @@ extern actor_process_profile_definition g_profile_NPC_PRAYER = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_PRAYER, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcPray_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index 11bc46cb62..bf148bf00f 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -461,7 +461,7 @@ extern actor_process_profile_definition g_profile_NPC_RACA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_RACA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Raca_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1337,4 +1337,4 @@ extern "C" void chkPointInArea__15daTag_EvtArea_cF4cXyz() { // NONMATCHING } -/* 80AB8FA8-80AB8FA8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80AB8FA8-80AB8FA8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index 6176bf0a95..d1dda84c84 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -541,7 +541,7 @@ extern actor_process_profile_definition g_profile_NPC_RAFREL = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_RAFREL, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcRafrel_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index ae6a5a0a71..b15a01e09b 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -546,7 +546,7 @@ extern actor_process_profile_definition g_profile_NPC_SARU = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SARU, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Saru_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 2dd3e2c80b..9d0b9ae8a9 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -361,7 +361,7 @@ extern actor_process_profile_definition g_profile_NPC_SEIB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SEIB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_seiB_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index deec2f241f..0cbb05d2c9 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -350,7 +350,7 @@ extern actor_process_profile_definition g_profile_NPC_SEIC = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SEIC, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_seiC_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index 6593baa7eb..ac31151c73 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -350,7 +350,7 @@ extern actor_process_profile_definition g_profile_NPC_SEID = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SEID, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_seiD_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index a0f2274727..876a1785ae 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -753,7 +753,7 @@ extern actor_process_profile_definition g_profile_NPC_SEIRA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SEIRA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Seira_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1786,4 +1786,4 @@ extern "C" bool beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci() { return true; } -/* 80ACFF04-80ACFF04 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80ACFF04-80ACFF04 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 734ddd1b3a..62b61266b7 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -661,7 +661,7 @@ extern actor_process_profile_definition g_profile_NPC_SERA2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SERA2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Seira2_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1664,4 +1664,4 @@ extern "C" bool beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci() { return true; } -/* 80AD4B5C-80AD4B5C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80AD4B5C-80AD4B5C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index e1ae8c7298..4f86b8f207 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -405,7 +405,7 @@ extern actor_process_profile_definition g_profile_NPC_SEIREI = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SEIREI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Seirei_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 1cd07c8234..83e15a16f0 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -714,7 +714,7 @@ extern actor_process_profile_definition g_profile_NPC_SHAD = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SHAD, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcShad_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index 79964c3b5f..1fc535ccd5 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -1056,7 +1056,7 @@ extern actor_process_profile_definition g_profile_NPC_SHAMAN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SHAMAN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Sha_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index 1b61b14ef1..12586fd1cc 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -339,7 +339,7 @@ extern actor_process_profile_definition g_profile_NPC_SHOE = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SHOE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcShoe_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index a45839efc8..58b733d8ca 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -196,7 +196,7 @@ extern actor_process_profile_definition g_profile_NPC_SHOP0 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SHOP0, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Shop0_c), // mSize 0, // mSizeOther 0, // mParameters @@ -617,4 +617,4 @@ static void func_80AEBBC4() { // NONMATCHING } -/* 80AEBC54-80AEBC54 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80AEBC54-80AEBC54 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_shop_maro.cpp b/src/d/actor/d_a_npc_shop_maro.cpp index 5755cd13cd..b8aaf659fd 100644 --- a/src/d/actor/d_a_npc_shop_maro.cpp +++ b/src/d/actor/d_a_npc_shop_maro.cpp @@ -54,7 +54,7 @@ extern actor_process_profile_definition g_profile_NPC_SMARO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SMARO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_shopMaro_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index 31195b8367..052921782e 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -352,7 +352,7 @@ extern actor_process_profile_definition g_profile_NPC_SOLA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SOLA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_solA_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index 6eb65137ff..460c1a632f 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -397,7 +397,7 @@ extern actor_process_profile_definition g_profile_NPC_SOLDIERa = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SOLDIERa, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_SoldierA_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index 4787de7b62..f5db99ec03 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -375,7 +375,7 @@ extern actor_process_profile_definition g_profile_NPC_SOLDIERb = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_SOLDIERb, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_SoldierB_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index 2e9bff4a89..0c37ad9278 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -150,8 +150,8 @@ static void demo_camera(npc_sq_class* i_this) { i_this->mCameraFovY = 55.0f; player_camera->mCamera.SetTrimSize(3); i_this->mMsgFlow.init(_this, i_this->mFlowID, 0, NULL); - i_this->mCameraEye = camera->mLookat.mEye; - i_this->mCameraCenter = camera->mLookat.mCenter; + i_this->mCameraEye = camera->lookat.eye; + i_this->mCameraCenter = camera->lookat.center; daPy_getPlayerActorClass()->changeOriginalDemo(); // no break @@ -409,7 +409,7 @@ extern actor_process_profile_definition g_profile_NPC_SQ = { 7, fpcPi_CURRENT_e, PROC_NPC_SQ, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(npc_sq_class), 0, 0, @@ -419,4 +419,4 @@ extern actor_process_profile_definition g_profile_NPC_SQ = { 0xC0000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 54261a2e18..64d86abd46 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -1668,7 +1668,7 @@ extern actor_process_profile_definition g_profile_NPC_TARO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_TARO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Taro_c), // mSize 0, // mSizeOther 0, // mParameters @@ -3316,4 +3316,4 @@ static u8 data_80573628[4]; static u8 data_8057362C[4]; #pragma pop -/* 80571908-80571908 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80571908-80571908 000240 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 423ade9ac1..a90a41af2b 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -1663,7 +1663,7 @@ extern actor_process_profile_definition g_profile_NPC_THE = { 7, fpcPi_CURRENT_e, PROC_NPC_THE, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daNpcThe_c), 0, 0, diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 9cd1625e7a..6950d4707d 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -454,7 +454,7 @@ extern actor_process_profile_definition g_profile_NPC_THEB = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_THEB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcTheB_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 64b9a18b43..e75a712b4f 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -443,7 +443,7 @@ extern actor_process_profile_definition g_profile_NPC_TK = { 6, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_TK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNPC_TK_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1928,4 +1928,4 @@ static u8 data_80B0C6C4[4]; static u8 data_80B0C6C8[4]; #pragma pop -/* 80B0C3A0-80B0C3A0 0001DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80B0C3A0-80B0C3A0 0001DC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index 7fbca62e89..03fb648474 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -474,7 +474,7 @@ extern actor_process_profile_definition g_profile_NPC_TKC = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_TKC, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcTkc_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index cc05732399..73cd93cb2e 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -401,7 +401,7 @@ extern actor_process_profile_definition g_profile_NPC_TKJ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_TKJ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcTkj_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1274,4 +1274,4 @@ static void func_8057657C() { // NONMATCHING } -/* 8057668C-8057668C 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8057668C-8057668C 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index d16a20777c..1ea80442f6 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -206,7 +206,7 @@ extern actor_process_profile_definition g_profile_NPC_TKJ2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_TKJ2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(npc_tkj2_class), // mSize 0, // mSizeOther 0, // mParameters @@ -844,4 +844,4 @@ static void func_80B142C0() { // NONMATCHING } -/* 80B143AC-80B143AC 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80B143AC-80B143AC 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index f95cc2b6e7..e9f0040a1e 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -789,7 +789,7 @@ extern actor_process_profile_definition g_profile_NPC_TKS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_TKS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpcTks_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index e975433a8e..324af15b5d 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -843,7 +843,7 @@ extern actor_process_profile_definition g_profile_NPC_TOBY = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_TOBY, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Toby_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2302,4 +2302,4 @@ static u8 data_80B25908[4]; static u8 data_80B2590C[4]; #pragma pop -/* 80B24B8C-80B24B8C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80B24B8C-80B24B8C 0001A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp index d3d65b2d4f..959df9162e 100644 --- a/src/d/actor/d_a_npc_tr.cpp +++ b/src/d/actor/d_a_npc_tr.cpp @@ -278,7 +278,7 @@ extern actor_process_profile_definition g_profile_NPC_TR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_TR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(npc_tr_class), // mSize 0, // mSizeOther 0, // mParameters @@ -288,4 +288,4 @@ extern actor_process_profile_definition g_profile_NPC_TR = { 0x40100, // mStatus fopAc_ENEMY_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index 8ba7f3c0a8..af0f9ad150 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -814,7 +814,7 @@ extern actor_process_profile_definition g_profile_NPC_URI = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_URI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Uri_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2143,4 +2143,4 @@ static u8 data_80B2DDE0[4]; static u8 data_80B2DDE4[4]; #pragma pop -/* 80B2CF74-80B2CF74 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80B2CF74-80B2CF74 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index b380f9ebdd..2dc6c8af0a 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -443,7 +443,7 @@ extern actor_process_profile_definition g_profile_NPC_WORM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_WORM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(npc_worm_class), // mSize 0, // mSizeOther 0, // mParameters @@ -480,4 +480,4 @@ extern "C" void Insect_Release__9dInsect_cFv() { // NONMATCHING } -/* 80B2F124-80B2F124 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80B2F124-80B2F124 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 308ee14464..11756c9930 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -1766,7 +1766,7 @@ extern actor_process_profile_definition g_profile_NPC_WRESTLER = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_WRESTLER, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0xEA0, // mSize (fix this) 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index 0a2618858f..eeced50756 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -417,7 +417,7 @@ extern actor_process_profile_definition g_profile_NPC_YAMID = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_YAMID, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_yamiD_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index eba2de6269..93113049db 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -417,7 +417,7 @@ extern actor_process_profile_definition g_profile_NPC_YAMIS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_YAMIS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_yamiS_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index 228d93a35c..358e2a51a0 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -422,7 +422,7 @@ extern actor_process_profile_definition g_profile_NPC_YAMIT = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_YAMIT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_yamiT_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index f2e008d42c..bb93225f13 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -829,7 +829,7 @@ extern actor_process_profile_definition g_profile_NPC_YELIA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_YELIA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Yelia_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index d392e5d0e4..4c4fd758ff 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -1058,7 +1058,7 @@ extern actor_process_profile_definition g_profile_NPC_YKM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_YKM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_ykM_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2918,4 +2918,4 @@ static u8 data_80B5EE00[4]; static u8 data_80B5EE04[4]; #pragma pop -/* 80B5DA40-80B5DA40 0002AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80B5DA40-80B5DA40 0002AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index be82e35c34..4d438979df 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -999,7 +999,7 @@ extern actor_process_profile_definition g_profile_NPC_YKW = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_YKW, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_ykW_c), // mSize 0, // mSizeOther 0, // mParameters @@ -2718,4 +2718,4 @@ static u8 data_80B68E30[4]; static u8 data_80B68E34[4]; #pragma pop -/* 80B67E68-80B67E68 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80B67E68-80B67E68 000230 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index d0e9fab25d..afafed4163 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -390,7 +390,7 @@ extern actor_process_profile_definition g_profile_NPC_ZANB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_ZANB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_zanB_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1262,4 +1262,4 @@ static void func_80B6BCA8() { // NONMATCHING } -/* 80B6BDBC-80B6BDBC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80B6BDBC-80B6BDBC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index 21e7ad007d..6b62c7d894 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -360,7 +360,7 @@ extern actor_process_profile_definition g_profile_NPC_ZANT = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_ZANT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Zant_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index a1a192f2a6..8ff3b0236c 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -385,7 +385,7 @@ extern actor_process_profile_definition g_profile_NPC_ZELR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_ZELR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_ZelR_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index 5921a05c81..fddce1ce04 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -385,7 +385,7 @@ extern actor_process_profile_definition g_profile_NPC_ZELRO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_ZELRO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_ZelRo_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 6af471e50f..3fef742bd3 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -394,7 +394,7 @@ extern actor_process_profile_definition g_profile_NPC_ZELDA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_ZELDA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_Zelda_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index fc3299d368..c25febc358 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -2682,7 +2682,7 @@ extern actor_process_profile_definition g_profile_NPC_ZRA = { 3, fpcPi_CURRENT_e, PROC_NPC_ZRA, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daNpc_zrA_c), 0, 0, diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index 27ba0562e6..9956e33e7e 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -1857,7 +1857,7 @@ extern actor_process_profile_definition g_profile_NPC_ZRC = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_ZRC, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_zrC_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index e7623c7619..81f79a43d4 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -2794,7 +2794,7 @@ extern actor_process_profile_definition g_profile_NPC_ZRZ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_NPC_ZRZ, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daNpc_zrZ_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp index c6ed36f09a..a88eeb2978 100644 --- a/src/d/actor/d_a_obj_Lv5Key.cpp +++ b/src/d/actor/d_a_obj_Lv5Key.cpp @@ -371,7 +371,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv5Key = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv5Key, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv5Key_c), // mSize 0, // mSizeOther 0, // mParameters @@ -381,4 +381,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv5Key = { 0x00044180, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index bd23754b57..07fbfb2ac6 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -289,7 +289,7 @@ extern actor_process_profile_definition g_profile_Obj_Turara = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Turara, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTurara_c), // mSize 0, // mSizeOther 0, // mParameters @@ -756,4 +756,4 @@ daTurara_c::~daTurara_c() { // NONMATCHING } -/* 80B9E970-80B9E970 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80B9E970-80B9E970 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index c7b03bda86..6cd928758f 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -119,7 +119,7 @@ extern actor_process_profile_definition g_profile_Obj_TvCdlst = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TvCdlst, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTvCdlst_c), // mSize 0, // mSizeOther 0, // mParameters @@ -394,4 +394,4 @@ void __sinit_d_a_obj_TvCdlst_cpp() { REGISTER_CTORS(0x80B9F80C, __sinit_d_a_obj_TvCdlst_cpp); #pragma pop -/* 80B9F8F4-80B9F8F4 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80B9F8F4-80B9F8F4 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index cd1a1ecdae..288b87f19e 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -551,7 +551,7 @@ extern actor_process_profile_definition g_profile_Obj_Ytaihou = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Ytaihou, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjYtaihou_c), // mSize 0, // mSizeOther 0, // mParameters @@ -888,4 +888,4 @@ static u8 data_80BA13D8[4]; static u8 data_80BA13DC[4]; #pragma pop -/* 80BA11D4-80BA11D4 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BA11D4-80BA11D4 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index 36f3904d93..ff57330976 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -210,7 +210,7 @@ extern actor_process_profile_definition g_profile_Obj_AmiShutter = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_AmiShutter, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daAmiShutter_c), // mSize 0, // mSizeOther 0, // mParameters @@ -570,4 +570,4 @@ daAmiShutter_c::~daAmiShutter_c() { // NONMATCHING } -/* 80BA23D4-80BA23D4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BA23D4-80BA23D4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index c7c43c1b41..e4d60f3366 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -532,8 +532,8 @@ void daObjARI_c::Z_BufferChk() { dComIfGd_peekZ(vec2.x, vec2.y, &mBufferZ); } - f32 near = dComIfGd_getView()->mNear; - f32 far = dComIfGd_getView()->mFar; + f32 near = dComIfGd_getView()->near; + f32 far = dComIfGd_getView()->far; mDoLib_pos2camera(&vec1, &vec2); vec2.z += 50.0f; if (vec2.z > 0.0f) { @@ -772,7 +772,7 @@ extern actor_process_profile_definition g_profile_Obj_Ari = { 7, fpcPi_CURRENT_e, PROC_Obj_Ari, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjARI_c), 0, 0, @@ -782,4 +782,4 @@ extern actor_process_profile_definition g_profile_Obj_Ari = { 0xC0100, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index 1794625981..8c73168836 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -217,7 +217,7 @@ extern actor_process_profile_definition g_profile_OBJ_AUTOMATA = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_AUTOMATA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_AutoMata_c), // mSize 0, // mSizeOther 0, // mParameters @@ -638,4 +638,4 @@ static void func_80BA6BF4() { // NONMATCHING } -/* 80BA6CA4-80BA6CA4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BA6CA4-80BA6CA4 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index 4d8b29b36f..24bfe75745 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -355,7 +355,7 @@ extern actor_process_profile_definition g_profile_Obj_Avalanche = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Avalanche, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjAvalanche_c), // mSize 0, // mSizeOther 0, // mParameters @@ -367,4 +367,4 @@ extern actor_process_profile_definition g_profile_Obj_Avalanche = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BA7D3C-80BA7D3C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_balloon.cpp b/src/d/actor/d_a_obj_balloon.cpp index ab82eb34e7..d60629f91d 100644 --- a/src/d/actor/d_a_obj_balloon.cpp +++ b/src/d/actor/d_a_obj_balloon.cpp @@ -440,7 +440,7 @@ extern actor_process_profile_definition g_profile_OBJ_BALLOON = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_BALLOON, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Balloon_c), // mSize 0, // mSizeOther 0, // mParameters @@ -452,4 +452,4 @@ extern actor_process_profile_definition g_profile_OBJ_BALLOON = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -AUDIO_INSTANCES; \ No newline at end of file +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index 3724712076..c9db450729 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -203,7 +203,7 @@ extern actor_process_profile_definition g_profile_Obj_BarDesk = { 3, fpcPi_CURRENT_e, PROC_Obj_BarDesk, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daBarDesk_c), 0, 0, @@ -213,4 +213,4 @@ extern actor_process_profile_definition g_profile_Obj_BarDesk = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 49dc195eb8..10aa9e55ed 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -328,7 +328,7 @@ extern actor_process_profile_definition g_profile_Obj_Batta = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Batta, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjBATTA_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1006,4 +1006,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80BACA64-80BACA64 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BACA64-80BACA64 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp index b3d5d04bc5..747d5d99f3 100644 --- a/src/d/actor/d_a_obj_bbox.cpp +++ b/src/d/actor/d_a_obj_bbox.cpp @@ -152,7 +152,7 @@ extern actor_process_profile_definition g_profile_Obj_BBox = { 3, fpcPi_CURRENT_e, PROC_Obj_BBox, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjBBox_c), 0, 0, @@ -162,4 +162,4 @@ extern actor_process_profile_definition g_profile_Obj_BBox = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp index 95cc25a024..6935166361 100644 --- a/src/d/actor/d_a_obj_bed.cpp +++ b/src/d/actor/d_a_obj_bed.cpp @@ -207,7 +207,7 @@ extern actor_process_profile_definition g_profile_OBJ_BED = { 7, fpcPi_CURRENT_e, PROC_OBJ_BED, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObj_Bed_c), 0, 0, @@ -217,4 +217,4 @@ extern actor_process_profile_definition g_profile_OBJ_BED = { 0x44100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 0f0d747151..e5b66b1d55 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -713,7 +713,7 @@ extern actor_process_profile_definition g_profile_Obj_Bemos = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Bemos, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjBm_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1894,4 +1894,4 @@ static u8 data_80BB5280[4]; static u8 data_80BB5284[4]; #pragma pop -/* 80BB3A40-80BB3A40 000288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BB3A40-80BB3A40 000288 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index 91b002ad57..ecea164be5 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -620,7 +620,7 @@ extern actor_process_profile_definition g_profile_Obj_BHASHI = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_BHASHI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjBHASHI_c), // mSize 0, // mSizeOther 0, // mParameters @@ -725,4 +725,4 @@ void daObjBHASHI_c::Delete() { // NONMATCHING } -/* 80578BA8-80578BA8 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80578BA8-80578BA8 000120 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index deb3b18699..b5133d0506 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -259,7 +259,7 @@ extern actor_process_profile_definition g_profile_Obj_Bhbridge = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Bhbridge, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjBhbridge_c), // mSize 0, // mSizeOther 0, // mParameters @@ -465,4 +465,4 @@ static void func_80BB5EF0() { // NONMATCHING } -/* 80BB5F84-80BB5F84 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BB5F84-80BB5F84 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp index 58aebd38e4..c98080d600 100644 --- a/src/d/actor/d_a_obj_bk_leaf.cpp +++ b/src/d/actor/d_a_obj_bk_leaf.cpp @@ -193,7 +193,7 @@ extern actor_process_profile_definition g_profile_Obj_BkLeaf = {fpcLy_CURRENT_e, 7, fpcLy_CURRENT_e, PROC_Obj_BkLeaf, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daBkLeaf_c), 0, 0, @@ -202,4 +202,4 @@ extern actor_process_profile_definition g_profile_Obj_BkLeaf = {fpcLy_CURRENT_e, &l_daBkLeaf_Method, 0x40100, 0, - fopAc_CULLBOX_CUSTOM_e}; \ No newline at end of file + fopAc_CULLBOX_CUSTOM_e}; diff --git a/src/d/actor/d_a_obj_bkdoor.cpp b/src/d/actor/d_a_obj_bkdoor.cpp index a77f2a281b..9a73bb0eef 100644 --- a/src/d/actor/d_a_obj_bkdoor.cpp +++ b/src/d/actor/d_a_obj_bkdoor.cpp @@ -232,7 +232,7 @@ extern actor_process_profile_definition g_profile_Obj_BkDoor = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_BkDoor, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjBkDoor_c), // mSize 0, // mSizeOther 0, // mParameters @@ -242,4 +242,4 @@ extern actor_process_profile_definition g_profile_Obj_BkDoor = { 0x40100, // mStatus 0, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index 0f0b60eb69..ca89f3602b 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -213,7 +213,7 @@ extern actor_process_profile_definition g_profile_BkyRock = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_BkyRock, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daBkyRock_c), // mSize 0, // mSizeOther 0, // mParameters @@ -738,4 +738,4 @@ void __sinit_d_a_obj_bky_rock_cpp() { REGISTER_CTORS(0x80BB7E4C, __sinit_d_a_obj_bky_rock_cpp); #pragma pop -/* 80BB8014-80BB8014 000164 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BB8014-80BB8014 000164 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index 74b8f2a4c2..069d668b92 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -386,7 +386,7 @@ extern actor_process_profile_definition g_profile_Obj_BmWindow = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_BmWindow, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daBmWindow_c), // mSize 0, // mSizeOther 0, // mParameters @@ -398,4 +398,4 @@ extern actor_process_profile_definition g_profile_Obj_BmWindow = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80BB9800-80BB9800 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BB9800-80BB9800 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp index abc368b850..f63b2fa52f 100644 --- a/src/d/actor/d_a_obj_bmshutter.cpp +++ b/src/d/actor/d_a_obj_bmshutter.cpp @@ -273,7 +273,7 @@ extern actor_process_profile_definition g_profile_Obj_BoomShutter = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_BoomShutter, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjBmSh_c), // mSize 0, // mSizeOther 0, // mParameters @@ -456,4 +456,4 @@ static void daObjBmSh_Create(fopAc_ac_c* param_0) { // NONMATCHING } -/* 80BBA820-80BBA820 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BBA820-80BBA820 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_bombf.cpp b/src/d/actor/d_a_obj_bombf.cpp index a4da62eba1..37c8e51964 100644 --- a/src/d/actor/d_a_obj_bombf.cpp +++ b/src/d/actor/d_a_obj_bombf.cpp @@ -131,7 +131,7 @@ extern actor_process_profile_definition g_profile_Obj_Bombf = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Bombf, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjBombf_c), // mSize 0, // mSizeOther 0, // mParameters @@ -141,4 +141,4 @@ extern actor_process_profile_definition g_profile_Obj_Bombf = { 0x40100, // mStatus fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index 0bc65ec6ee..37fa429a93 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -1041,7 +1041,7 @@ extern actor_process_profile_definition g_profile_Obj_BossWarp = { 7, fpcPi_CURRENT_e, PROC_Obj_BossWarp, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjBossWarp_c), 0, 0, @@ -1051,4 +1051,4 @@ extern actor_process_profile_definition g_profile_Obj_BossWarp = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index bd6daa03d5..9b26da992f 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -198,7 +198,7 @@ extern actor_process_profile_definition g_profile_OBJ_BOUMATO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_BOUMATO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_BouMato_c), // mSize 0, // mSizeOther 0, // mParameters @@ -649,4 +649,4 @@ static void func_80BBC454() { // NONMATCHING } -/* 80BBC518-80BBC518 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BBC518-80BBC518 0000A8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp index fb41264b58..55b62ab48e 100644 --- a/src/d/actor/d_a_obj_brakeeff.cpp +++ b/src/d/actor/d_a_obj_brakeeff.cpp @@ -208,7 +208,7 @@ extern actor_process_profile_definition g_profile_OBJ_BEF = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_BEF, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_brakeeff_class), // mSize 0, // mSizeOther 0, // mParameters @@ -269,4 +269,4 @@ extern "C" void __dt__8cM3dGAabFv() { // NONMATCHING } -/* 8046E538-8046E538 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8046E538-8046E538 000010 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index e9129f8266..94729dcb10 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -1142,7 +1142,7 @@ static int daObj_Brg_Execute(obj_brg_class* i_this) { cXyz spE8; camera_class* camera = dComIfGp_getCamera(0); - spC4 = a_this->current.pos - camera->mLookat.mEye; + spC4 = a_this->current.pos - camera->lookat.eye; if (i_this->field_0xb1ef != 0) { i_this->field_0xb1ef--; @@ -1158,7 +1158,7 @@ static int daObj_Brg_Execute(obj_brg_class* i_this) { } if (spC4.abs() > sp1BC) { - spD0 = camera->mLookat.mCenter - camera->mLookat.mEye; + spD0 = camera->lookat.center - camera->lookat.eye; cMtx_YrotS(*calc_mtx, -cM_atan2s(spD0.x, spD0.z)); MtxPosition(&spC4, &spD0); @@ -2344,7 +2344,7 @@ extern actor_process_profile_definition g_profile_OBJ_BRG = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_BRG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_brg_class), // mSize 0, // mSizeOther 0, // mParameters @@ -2354,4 +2354,4 @@ extern actor_process_profile_definition g_profile_OBJ_BRG = { 0x00044000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_bsGate.cpp b/src/d/actor/d_a_obj_bsGate.cpp index 57c09a56ca..5443df3db6 100644 --- a/src/d/actor/d_a_obj_bsGate.cpp +++ b/src/d/actor/d_a_obj_bsGate.cpp @@ -209,7 +209,7 @@ extern actor_process_profile_definition g_profile_Obj_BsGate = { 3, fpcPi_CURRENT_e, PROC_Obj_BsGate, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daBsGate_c), 0, 0, @@ -219,4 +219,4 @@ extern actor_process_profile_definition g_profile_Obj_BsGate = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index 58fbdbd070..6ac330aa5b 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -176,7 +176,7 @@ extern actor_process_profile_definition g_profile_Obj_awaPlar = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_awaPlar, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daBubbPilar_c), // mSize 0, // mSizeOther 0, // mParameters @@ -430,4 +430,4 @@ void __sinit_d_a_obj_bubblePilar_cpp() { REGISTER_CTORS(0x80BC3FEC, __sinit_d_a_obj_bubblePilar_cpp); #pragma pop -/* 80BC40B4-80BC40B4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BC40B4-80BC40B4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp index 7e2783d618..d6a1cec1c2 100644 --- a/src/d/actor/d_a_obj_burnbox.cpp +++ b/src/d/actor/d_a_obj_burnbox.cpp @@ -229,7 +229,7 @@ extern actor_process_profile_definition g_profile_Obj_BurnBox = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_BurnBox, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjBurnBox_c), // mSize 0, // mSizeOther 0, // mParameters @@ -305,4 +305,4 @@ static void daObjBurnBox_MoveBGDraw(daObjBurnBox_c* param_0) { // NONMATCHING } -/* 8046EEC0-8046EEC0 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8046EEC0-8046EEC0 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index 28f5978e04..e213177079 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -1955,7 +1955,7 @@ extern actor_process_profile_definition g_profile_Obj_Carry = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Carry, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjCarry_c), // mSize 0, // mSizeOther 0, // mParameters @@ -3886,4 +3886,4 @@ SECTION_RODATA static f32 const lit_8553 = 1.0f / 25.0f; COMPILER_STRIP_GATE(0x8047A4B8, &lit_8553); #pragma pop -/* 8047A4BC-8047A4BC 000BB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8047A4BC-8047A4BC 000BB0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_catdoor.cpp b/src/d/actor/d_a_obj_catdoor.cpp index 34736a2a86..0b6731b85d 100644 --- a/src/d/actor/d_a_obj_catdoor.cpp +++ b/src/d/actor/d_a_obj_catdoor.cpp @@ -202,7 +202,7 @@ extern actor_process_profile_definition g_profile_Obj_CatDoor = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_CatDoor, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.base, // mSubMtd sizeof(daObjCatDoor_c), // mSize 0, // mSizeOther 0, // mParameters @@ -212,4 +212,4 @@ extern actor_process_profile_definition g_profile_Obj_CatDoor = { 0x44100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // mCullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index e64062eeb8..202bfdf537 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -111,7 +111,7 @@ extern actor_process_profile_definition g_profile_OBJ_CB = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_CB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_cb_class), // mSize 0, // mSizeOther 0, // mParameters @@ -431,4 +431,4 @@ static void func_80BC57C8() { // NONMATCHING } -/* 80BC584C-80BC584C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BC584C-80BC584C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index 97e9fa0b0e..a04ecc37b7 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -271,7 +271,7 @@ extern actor_process_profile_definition g_profile_Obj_ChainBlock = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_ChainBlock, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjCBlk_c), // mSize 0, // mSizeOther 0, // mParameters @@ -923,4 +923,4 @@ static u8 data_80BC6D20[4]; static u8 data_80BC6D24[4]; #pragma pop -/* 80BC6AC8-80BC6AC8 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BC6AC8-80BC6AC8 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_cboard.cpp b/src/d/actor/d_a_obj_cboard.cpp index 9418ac5a32..4b1a70fa9d 100644 --- a/src/d/actor/d_a_obj_cboard.cpp +++ b/src/d/actor/d_a_obj_cboard.cpp @@ -179,7 +179,7 @@ extern actor_process_profile_definition g_profile_Obj_Cboard = { 3, fpcPi_CURRENT_e, PROC_Obj_Cboard, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjBoard_c), 0, 0, @@ -189,4 +189,4 @@ extern actor_process_profile_definition g_profile_Obj_Cboard = { 0x40000, fopAc_CULLBOX_0_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_cdoor.cpp b/src/d/actor/d_a_obj_cdoor.cpp index 707c35be47..7cb3bf051b 100644 --- a/src/d/actor/d_a_obj_cdoor.cpp +++ b/src/d/actor/d_a_obj_cdoor.cpp @@ -350,7 +350,7 @@ extern actor_process_profile_definition g_profile_Obj_Cdoor = { 3, fpcPi_CURRENT_e, PROC_Obj_Cdoor, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjCdoor_c), 0, 0, @@ -360,4 +360,4 @@ extern actor_process_profile_definition g_profile_Obj_Cdoor = { 0x40100, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp index 7c1902a612..4e27ba749a 100644 --- a/src/d/actor/d_a_obj_chandelier.cpp +++ b/src/d/actor/d_a_obj_chandelier.cpp @@ -307,7 +307,7 @@ extern actor_process_profile_definition g_profile_Obj_Chandelier = { 3, fpcPi_CURRENT_e, PROC_Obj_Chandelier, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjChandelier_c), 0, 0, @@ -317,4 +317,4 @@ extern actor_process_profile_definition g_profile_Obj_Chandelier = { 0x40080, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp index 566769df40..bc7bb1bcc1 100644 --- a/src/d/actor/d_a_obj_chest.cpp +++ b/src/d/actor/d_a_obj_chest.cpp @@ -292,7 +292,7 @@ extern actor_process_profile_definition g_profile_Obj_Chest = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Chest, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjChest_c), // mSize 0, // mSizeOther 0, // mParameters @@ -302,4 +302,4 @@ extern actor_process_profile_definition g_profile_Obj_Chest = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index 012f9638a7..191c50b3ed 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -317,8 +317,8 @@ void daObjCHO_c::Z_BufferChk() { dComIfGd_peekZ(vec2.x, vec2.y, &mBufferZ); } - f32 near = dComIfGd_getView()->mNear; - f32 far = dComIfGd_getView()->mFar; + f32 near = dComIfGd_getView()->near; + f32 far = dComIfGd_getView()->far; mDoLib_pos2camera(&vec1, &vec2); vec2.z += 50.0f; if (vec2.z > 0.0f) { @@ -639,7 +639,7 @@ extern actor_process_profile_definition g_profile_Obj_Cho = { 7, fpcPi_CURRENT_e, PROC_Obj_Cho, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjCHO_c), 0, 0, @@ -649,4 +649,4 @@ extern actor_process_profile_definition g_profile_Obj_Cho = { 0xC0120, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp index a718b14300..eb28a6315b 100644 --- a/src/d/actor/d_a_obj_cowdoor.cpp +++ b/src/d/actor/d_a_obj_cowdoor.cpp @@ -112,7 +112,7 @@ extern actor_process_profile_definition g_profile_Obj_Cowdoor = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Cowdoor, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daCowdoor_c), // mSize 0, // mSizeOther 0, // mParameters @@ -122,4 +122,4 @@ extern actor_process_profile_definition g_profile_Obj_Cowdoor = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp index c75e619726..330cee9623 100644 --- a/src/d/actor/d_a_obj_crope.cpp +++ b/src/d/actor/d_a_obj_crope.cpp @@ -244,7 +244,7 @@ extern actor_process_profile_definition g_profile_Obj_Crope = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Crope, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjCrope_c), // mSize 0, // mSizeOther 0, // mParameters @@ -589,4 +589,4 @@ static int daObjCrope_Draw(daObjCrope_c* i_this) { // cCcD_GStts::~cCcD_GStts() { extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp index 8cc81c81f9..b8b93093fa 100644 --- a/src/d/actor/d_a_obj_crvfence.cpp +++ b/src/d/actor/d_a_obj_crvfence.cpp @@ -478,7 +478,7 @@ extern actor_process_profile_definition g_profile_Obj_CRVFENCE = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_CRVFENCE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjCRVFENCE_c), // mSize 0, // mSizeOther 0, // mParameters @@ -616,4 +616,4 @@ static void func_80BD0178() { // NONMATCHING } -/* 80BD020C-80BD020C 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BD020C-80BD020C 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index 901f33450d..0332f29a6c 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -627,7 +627,7 @@ extern actor_process_profile_definition g_profile_Obj_CRVGATE = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_CRVGATE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjCRVGATE_c), // mSize 0, // mSizeOther 0, // mParameters @@ -796,4 +796,4 @@ static void func_80BD30B0() { // NONMATCHING } -/* 80BD31BC-80BD31BC 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BD31BC-80BD31BC 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index 795e32070b..4ce657fe52 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -354,7 +354,7 @@ extern actor_process_profile_definition g_profile_Obj_CRVHAHEN = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_CRVHAHEN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjCRVHAHEN_c), // mSize 0, // mSizeOther 0, // mParameters @@ -366,4 +366,4 @@ extern actor_process_profile_definition g_profile_Obj_CRVHAHEN = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80BD4048-80BD4048 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BD4048-80BD4048 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index 2647fe32e6..62f120b70a 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -280,7 +280,7 @@ extern actor_process_profile_definition g_profile_Obj_CRVLH_DW = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_CRVLH_DW, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjCRVLH_DW_c), // mSize 0, // mSizeOther 0, // mParameters @@ -414,4 +414,4 @@ void daObjCRVLH_DW_c::Delete() { // NONMATCHING } -/* 80BD4D88-80BD4D88 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BD4D88-80BD4D88 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_crvlh_up.cpp b/src/d/actor/d_a_obj_crvlh_up.cpp index 70654bb0ba..6a7ff5f744 100644 --- a/src/d/actor/d_a_obj_crvlh_up.cpp +++ b/src/d/actor/d_a_obj_crvlh_up.cpp @@ -295,7 +295,7 @@ extern actor_process_profile_definition g_profile_Obj_CRVLH_UP = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_CRVLH_UP, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjCRVLH_UP_c), // mSize 0, // mSizeOther 0, // mParameters @@ -448,4 +448,4 @@ void daObjCRVLH_UP_c::Delete() { // NONMATCHING } -/* 80BD5A64-80BD5A64 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BD5A64-80BD5A64 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp index 64084f3d4e..1512e2d711 100644 --- a/src/d/actor/d_a_obj_crvsteel.cpp +++ b/src/d/actor/d_a_obj_crvsteel.cpp @@ -234,7 +234,7 @@ extern actor_process_profile_definition g_profile_Obj_CRVSTEEL = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_CRVSTEEL, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjCRVSTEEL_c), // mSize 0, // mSizeOther 0, // mParameters @@ -349,4 +349,4 @@ static void func_80BD61F8() { // NONMATCHING } -/* 80BD623C-80BD623C 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BD623C-80BD623C 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp index 904354f915..bc70ffe020 100644 --- a/src/d/actor/d_a_obj_crystal.cpp +++ b/src/d/actor/d_a_obj_crystal.cpp @@ -156,7 +156,7 @@ extern actor_process_profile_definition g_profile_Obj_Crystal = { 7, fpcPi_CURRENT_e, PROC_Obj_Crystal, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjCrystal_c), 0, 0, @@ -166,4 +166,4 @@ extern actor_process_profile_definition g_profile_Obj_Crystal = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index ae416132e1..26dec0b3f8 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -887,7 +887,7 @@ extern actor_process_profile_definition g_profile_Obj_ChainWall = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_ChainWall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjCwall_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1237,4 +1237,4 @@ static u8 data_80BDA3D0[4]; static u8 data_80BDA3D4[4]; #pragma pop -/* 80BDA0AC-80BDA0AC 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BDA0AC-80BDA0AC 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp index f882ebd11c..d5b6c83690 100644 --- a/src/d/actor/d_a_obj_damCps.cpp +++ b/src/d/actor/d_a_obj_damCps.cpp @@ -13,7 +13,7 @@ extern actor_process_profile_definition g_profile_Obj_DamCps = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_DamCps, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(fopAc_ac_c), // mSize 0, // mSizeOther 0, // mParameters @@ -23,4 +23,4 @@ extern actor_process_profile_definition g_profile_Obj_DamCps = { 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 83c881eb8e..e1dabda6bb 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -293,8 +293,8 @@ void daObjDAN_c::Z_BufferChk() { dComIfGd_peekZ(vec2.x, vec2.y, &mBufferZ); } - f32 near = dComIfGd_getView()->mNear; - f32 far = dComIfGd_getView()->mFar; + f32 near = dComIfGd_getView()->near; + f32 far = dComIfGd_getView()->far; mDoLib_pos2camera(&vec1, &vec2); vec2.z += 50.0f; if (vec2.z > 0.0f) { @@ -633,7 +633,7 @@ extern actor_process_profile_definition g_profile_Obj_Dan = { 7, fpcPi_CURRENT_e, PROC_Obj_Dan, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjDAN_c), 0, 0, @@ -643,4 +643,4 @@ extern actor_process_profile_definition g_profile_Obj_Dan = { 0xC0120, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_digholl.cpp b/src/d/actor/d_a_obj_digholl.cpp index 359d8a0fec..34ac188819 100644 --- a/src/d/actor/d_a_obj_digholl.cpp +++ b/src/d/actor/d_a_obj_digholl.cpp @@ -114,7 +114,7 @@ extern actor_process_profile_definition g_profile_Obj_Digholl = { 3, fpcPi_CURRENT_e, PROC_Obj_Digholl, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjDigholl_c), 0, 0, @@ -124,4 +124,4 @@ extern actor_process_profile_definition g_profile_Obj_Digholl = { 0x44100, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_digplace.cpp b/src/d/actor/d_a_obj_digplace.cpp index 466a1a3a47..7cdfa7d1d1 100644 --- a/src/d/actor/d_a_obj_digplace.cpp +++ b/src/d/actor/d_a_obj_digplace.cpp @@ -190,7 +190,7 @@ extern actor_process_profile_definition g_profile_Obj_Digpl = { 3, fpcPi_CURRENT_e, PROC_Obj_Digpl, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjDigpl_c), 0, 0, @@ -200,4 +200,4 @@ extern actor_process_profile_definition g_profile_Obj_Digpl = { 0x44080, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 6d69dd2eb9..4b49446d56 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -133,7 +133,7 @@ void daObjDigSnow_c::mode_wait() { void daObjDigSnow_c::mode_init_dig() { dBgS_ObjGndChk obj_gnd_chk; - obj_gnd_chk.SetActorPid(mBase.mBsPcId); + obj_gnd_chk.SetActorPid(base.id); obj_gnd_chk.SetPos(¤t.pos); f32 gnd_height = dComIfG_Bgsp().GroundCross(&obj_gnd_chk); @@ -229,7 +229,7 @@ extern actor_process_profile_definition g_profile_Obj_DigSnow = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_DigSnow, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjDigSnow_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index 4927464f05..d14e45c636 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -914,7 +914,7 @@ extern actor_process_profile_definition g_profile_Obj_Elevator = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Elevator, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjDmElevator_c),// mSize 0, // mSizeOther 0, // mParameters @@ -1141,4 +1141,4 @@ static u8 data_80BDFC3C[4]; static u8 data_80BDFC40[4]; #pragma pop -/* 80BDF8EC-80BDF8EC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BDF8EC-80BDF8EC 00007C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 6f22c16c9a..8f234e7070 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -636,7 +636,7 @@ extern actor_process_profile_definition g_profile_Obj_Drop = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Drop, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjDrop_c), // mSize 0, // mSizeOther 0, // mParameters @@ -646,4 +646,4 @@ extern actor_process_profile_definition g_profile_Obj_Drop = { 0x00040000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp index 17db22bca9..e4b63106be 100644 --- a/src/d/actor/d_a_obj_dust.cpp +++ b/src/d/actor/d_a_obj_dust.cpp @@ -354,7 +354,7 @@ extern actor_process_profile_definition g_profile_Obj_DUST = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_DUST, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjDust_c), // mSize 0, // mSizeOther 0, // mParameters @@ -508,4 +508,4 @@ static void func_80BE2F88() { // NONMATCHING } -/* 80BE3020-80BE3020 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BE3020-80BE3020 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index dd24c13781..ba27be6f24 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -73,7 +73,7 @@ extern actor_process_profile_definition g_profile_Obj_Eff = { 9, fpcPi_CURRENT_e, PROC_Obj_Eff, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjEff::Act_c), 0, 0, diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp index fe0582a2b0..09f5e0fdbe 100644 --- a/src/d/actor/d_a_obj_enemy_create.cpp +++ b/src/d/actor/d_a_obj_enemy_create.cpp @@ -275,7 +275,7 @@ extern actor_process_profile_definition g_profile_Obj_E_CREATE = { 3, fpcPi_CURRENT_e, PROC_Obj_E_CREATE, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjE_CREATE_c), 0, 0, diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index 3a27afe9f5..a4ccd0696a 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -359,7 +359,7 @@ extern actor_process_profile_definition g_profile_Obj_FallObj = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_FallObj, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjFallObj_c), // mSize 0, // mSizeOther 0, // mParameters @@ -419,4 +419,4 @@ extern "C" void func_80BE4A8C(void* _this, u8* param_0) { // NONMATCHING } -/* 80BE4B14-80BE4B14 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BE4B14-80BE4B14 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index 4a646ad805..778f350e02 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -370,7 +370,7 @@ extern actor_process_profile_definition g_profile_Obj_Fan = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Fan, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjFan_c), // mSize 0, // mSizeOther 0, // mParameters @@ -382,4 +382,4 @@ extern actor_process_profile_definition g_profile_Obj_Fan = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80BE5E58-80BE5E58 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BE5E58-80BE5E58 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index a3db1d4944..4bdf53cb1f 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -206,7 +206,7 @@ extern actor_process_profile_definition g_profile_Obj_Fchain = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Fchain, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjFchain_c), // mSize 0, // mSizeOther 0, // mParameters @@ -446,4 +446,4 @@ daObjFchain_shape_c::~daObjFchain_shape_c() { // NONMATCHING } -/* 80BE74CC-80BE74CC 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BE74CC-80BE74CC 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp index 3592621ecc..1b4f937f18 100644 --- a/src/d/actor/d_a_obj_fireWood.cpp +++ b/src/d/actor/d_a_obj_fireWood.cpp @@ -212,7 +212,7 @@ extern actor_process_profile_definition g_profile_Obj_FireWood = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_FireWood, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daFireWood_c), // mSize 0, // mSizeOther 0, // mParameters @@ -222,4 +222,4 @@ extern actor_process_profile_definition g_profile_Obj_FireWood = { 0x00060000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp index 3083b904d6..d6348c4846 100644 --- a/src/d/actor/d_a_obj_fireWood2.cpp +++ b/src/d/actor/d_a_obj_fireWood2.cpp @@ -298,7 +298,7 @@ extern actor_process_profile_definition g_profile_Obj_FireWood2 = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv1Cdl00, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daFireWood2_c), // mSize 0, // mSizeOther 0, // mParameters @@ -308,4 +308,4 @@ extern actor_process_profile_definition g_profile_Obj_FireWood2 = { 0x00060000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp index 6b8f28ee82..d2f1de48d2 100644 --- a/src/d/actor/d_a_obj_firepillar.cpp +++ b/src/d/actor/d_a_obj_firepillar.cpp @@ -268,7 +268,7 @@ extern actor_process_profile_definition g_profile_Obj_FirePillar = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_FirePillar, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjFPillar_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp index bb75c27337..0d4f497482 100644 --- a/src/d/actor/d_a_obj_firepillar2.cpp +++ b/src/d/actor/d_a_obj_firepillar2.cpp @@ -560,7 +560,7 @@ extern actor_process_profile_definition g_profile_Obj_FirePillar2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_FirePillar2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjFPillar2_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp index 838111f1e7..7e7b960802 100644 --- a/src/d/actor/d_a_obj_flag.cpp +++ b/src/d/actor/d_a_obj_flag.cpp @@ -281,7 +281,7 @@ extern actor_process_profile_definition g_profile_Obj_Flag = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Flag, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjFlag_c), // mSize 0, // mSizeOther 0, // mParameters @@ -293,4 +293,4 @@ extern actor_process_profile_definition g_profile_Obj_Flag = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80BEC554-80BEC554 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BEC554-80BEC554 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index d6c1884d95..0df16e7c0c 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -753,7 +753,7 @@ extern actor_process_profile_definition g_profile_Obj_Flag2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Flag2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjFlag2_c), // mSize 0, // mSizeOther 0, // mParameters @@ -926,4 +926,4 @@ void FlagCloth_c::getTargetPos() { // NONMATCHING } -/* 80BEE1E8-80BEE1E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BEE1E8-80BEE1E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index 9bcda9ccd7..5eaa3518e7 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -309,7 +309,7 @@ extern actor_process_profile_definition g_profile_Obj_Flag3 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Flag3, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjFlag3_c), // mSize 0, // mSizeOther 0, // mParameters @@ -501,4 +501,4 @@ void FlagCloth2_c::getTargetPos() { // NONMATCHING } -/* 80BF0554-80BF0554 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BF0554-80BF0554 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_fmobj.cpp b/src/d/actor/d_a_obj_fmobj.cpp index 7c2067cefa..957775053b 100644 --- a/src/d/actor/d_a_obj_fmobj.cpp +++ b/src/d/actor/d_a_obj_fmobj.cpp @@ -195,7 +195,7 @@ extern actor_process_profile_definition g_profile_OBJ_FMOBJ = { 3, fpcPi_CURRENT_e, PROC_OBJ_FMOBJ, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(obj_fmobj_class), 0, 0, @@ -205,4 +205,4 @@ extern actor_process_profile_definition g_profile_OBJ_FMOBJ = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_7_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp index 6880ed2c53..10df59017d 100644 --- a/src/d/actor/d_a_obj_food.cpp +++ b/src/d/actor/d_a_obj_food.cpp @@ -526,7 +526,7 @@ extern actor_process_profile_definition g_profile_OBJ_FOOD = { 7, fpcPi_CURRENT_e, PROC_OBJ_FOOD, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(obj_food_class), 0, 0, @@ -536,4 +536,4 @@ extern actor_process_profile_definition g_profile_OBJ_FOOD = { 0x44100, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp index 7606760db7..22714a25d3 100644 --- a/src/d/actor/d_a_obj_fw.cpp +++ b/src/d/actor/d_a_obj_fw.cpp @@ -109,7 +109,7 @@ extern actor_process_profile_definition g_profile_OBJ_FW = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_FW, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_fw_class), // mSize 0, // mSizeOther 0, // mParameters @@ -379,4 +379,4 @@ void __sinit_d_a_obj_fw_cpp() { REGISTER_CTORS(0x80BF2AF8, __sinit_d_a_obj_fw_cpp); #pragma pop -/* 80BF2BA4-80BF2BA4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BF2BA4-80BF2BA4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 90054e24f9..1e418afcb9 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -217,7 +217,7 @@ extern actor_process_profile_definition g_profile_OBJ_GADGET = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_GADGET, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Gadget_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1021,4 +1021,4 @@ static u8 data_80BF4C60[4]; static u8 data_80BF4C64[4]; #pragma pop -/* 80BF4A24-80BF4A24 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BF4A24-80BF4A24 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index 3fe9b01fec..c5b02bd3ee 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -140,7 +140,7 @@ extern actor_process_profile_definition g_profile_Obj_GanonWall = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_GanonWall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjGWall_c), // mSize 0, // mSizeOther 0, // mParameters @@ -260,4 +260,4 @@ static int daObjGWall_Delete(daObjGWall_c* i_this) { */ static int daObjGWall_Create(daObjGWall_c* i_this) { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index ffe27bb2e1..5c6bbc0193 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -173,7 +173,7 @@ extern actor_process_profile_definition g_profile_Obj_GanonWall2 = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_GanonWall2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjGWall2_c), // mSize 0, // mSizeOther 0, // mParameters @@ -306,4 +306,4 @@ static void daObjGWall2_MoveBGDraw(daObjGWall2_c* param_0) { // NONMATCHING } -/* 80BF61FC-80BF61FC 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BF61FC-80BF61FC 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 0bf0f46bdb..3de9012eea 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -224,7 +224,7 @@ extern actor_process_profile_definition g_profile_OBJ_GB = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_GB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_gb_class), // mSize 0, // mSizeOther 0, // mParameters @@ -303,4 +303,4 @@ extern "C" void __ct__4cXyzFv() { /* empty function */ } -/* 80BF6DEC-80BF6DEC 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BF6DEC-80BF6DEC 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp index 5cfeab7321..443f98edf5 100644 --- a/src/d/actor/d_a_obj_geyser.cpp +++ b/src/d/actor/d_a_obj_geyser.cpp @@ -428,7 +428,7 @@ extern actor_process_profile_definition g_profile_Obj_Geyser = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Geyser, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjGeyser_c), // mSize 0, // mSizeOther 0, // mParameters @@ -732,4 +732,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80BF905C-80BF905C 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BF905C-80BF905C 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_glowSphere.cpp b/src/d/actor/d_a_obj_glowSphere.cpp index 9145c82fd0..4af9c5f1a5 100644 --- a/src/d/actor/d_a_obj_glowSphere.cpp +++ b/src/d/actor/d_a_obj_glowSphere.cpp @@ -330,7 +330,7 @@ extern actor_process_profile_definition g_profile_Obj_glowSphere = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_glowSphere, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daGlwSph_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1029,4 +1029,4 @@ static u8 data_80BFB048[4]; static u8 data_80BFB04C[4]; #pragma pop -/* 80BFA9C4-80BFA9C4 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BFA9C4-80BFA9C4 000054 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp index d1a04b9351..fffe8272e2 100644 --- a/src/d/actor/d_a_obj_gm.cpp +++ b/src/d/actor/d_a_obj_gm.cpp @@ -267,7 +267,7 @@ extern actor_process_profile_definition g_profile_OBJ_GM = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_GM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_gm_class), // mSize 0, // mSizeOther 0, // mParameters @@ -742,4 +742,4 @@ static void func_80BFD310() { // NONMATCHING } -/* 80BFD3C0-80BFD3C0 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BFD3C0-80BFD3C0 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_goGate.cpp b/src/d/actor/d_a_obj_goGate.cpp index c3c1a28584..cdcd3babba 100644 --- a/src/d/actor/d_a_obj_goGate.cpp +++ b/src/d/actor/d_a_obj_goGate.cpp @@ -158,7 +158,7 @@ extern actor_process_profile_definition g_profile_Obj_GoGate = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_GoGate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daGoGate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -387,4 +387,4 @@ void __sinit_d_a_obj_goGate_cpp() { REGISTER_CTORS(0x80BFDF98, __sinit_d_a_obj_goGate_cpp); #pragma pop -/* 80BFE008-80BFE008 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BFE008-80BFE008 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 1f633a534e..80d9751eae 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -173,7 +173,7 @@ extern actor_process_profile_definition g_profile_Obj_GOMIKABE = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_GOMIKABE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjGOMIKABE_c), // mSize 0, // mSizeOther 0, // mParameters @@ -732,4 +732,4 @@ static void func_80BFFC00() { // NONMATCHING } -/* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80BFFCF4-80BFFCF4 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 2273870fa2..1e31ec7a1b 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -322,7 +322,7 @@ extern actor_process_profile_definition g_profile_Obj_GpTaru = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_GpTaru, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daGpTaru_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1029,4 +1029,4 @@ static void func_8057F554() { // NONMATCHING } -/* 8057F664-8057F664 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8057F664-8057F664 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 458bfe5c12..5c72216101 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -1491,7 +1491,7 @@ extern actor_process_profile_definition g_profile_OBJ_GRA = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_GRA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_GrA_c), // mSize 0, // mSizeOther 0, // mParameters @@ -3988,4 +3988,4 @@ static u8 data_80C10B6C[4]; static u8 data_80C10B70[4]; #pragma pop -/* 80C0FE14-80C0FE14 000398 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C0FE14-80C0FE14 000398 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp index 43b835f9ef..51ec567096 100644 --- a/src/d/actor/d_a_obj_graWall.cpp +++ b/src/d/actor/d_a_obj_graWall.cpp @@ -118,7 +118,7 @@ extern actor_process_profile_definition g_profile_GRA_WALL = { 3, fpcPi_CURRENT_e, PROC_GRA_WALL, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjGraWall_c), 0, 0, diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index cb470a561c..b52d2fb15b 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -340,7 +340,7 @@ extern actor_process_profile_definition g_profile_Obj_GraRock = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_GraRock, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjGraRock_c), // mSize 0, // mSizeOther 0, // mParameters @@ -496,4 +496,4 @@ static void func_80C123AC() { // NONMATCHING } -/* 80C12440-80C12440 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C12440-80C12440 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp index f256591b6b..90d294ba86 100644 --- a/src/d/actor/d_a_obj_grave_stone.cpp +++ b/src/d/actor/d_a_obj_grave_stone.cpp @@ -248,7 +248,7 @@ extern actor_process_profile_definition g_profile_Obj_GraveStone = { 3, fpcPi_CURRENT_e, PROC_Obj_GraveStone, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daGraveStone_c), 0, 0, @@ -258,4 +258,4 @@ extern actor_process_profile_definition g_profile_Obj_GraveStone = { 0x44100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp index 465e085d1b..7119dfc9a0 100644 --- a/src/d/actor/d_a_obj_groundwater.cpp +++ b/src/d/actor/d_a_obj_groundwater.cpp @@ -194,7 +194,7 @@ extern actor_process_profile_definition g_profile_GRDWATER = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_GRDWATER, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daGrdWater_c), // mSize 0, // mSizeOther 0, // mParameters @@ -417,4 +417,4 @@ void __sinit_d_a_obj_groundwater_cpp() { REGISTER_CTORS(0x80C14904, __sinit_d_a_obj_groundwater_cpp); #pragma pop -/* 80C149F4-80C149F4 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C149F4-80C149F4 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_grz_rock.cpp b/src/d/actor/d_a_obj_grz_rock.cpp index 4918fbf28a..e30ce0f9e6 100644 --- a/src/d/actor/d_a_obj_grz_rock.cpp +++ b/src/d/actor/d_a_obj_grz_rock.cpp @@ -176,7 +176,7 @@ extern actor_process_profile_definition g_profile_Obj_GrzRock = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_GrzRock, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjGrzRock_c), // mSize 0, // mSizeOther 0, // mParameters @@ -278,4 +278,4 @@ static void func_80C15350() { // NONMATCHING } -/* 80C15378-80C15378 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C15378-80C15378 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp index b6220c7f8d..f8d89d2ab4 100644 --- a/src/d/actor/d_a_obj_h_saku.cpp +++ b/src/d/actor/d_a_obj_h_saku.cpp @@ -309,7 +309,7 @@ extern actor_process_profile_definition g_profile_Obj_H_Saku = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_H_Saku, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjH_Saku_c), // mSize 0, // mSizeOther 0, // mParameters @@ -725,4 +725,4 @@ static u8 data_80C166B4[4]; static u8 data_80C166B8[4]; #pragma pop -/* 80C16520-80C16520 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C16520-80C16520 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index 8c3acb1493..f1d7e9fbe7 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -125,7 +125,7 @@ extern actor_process_profile_definition g_profile_Obj_HBarrel = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_HBarrel, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjHBarrel_c), // mSize 0, // mSizeOther 0, // mParameters @@ -337,4 +337,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80C1735C-80C1735C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C1735C-80C1735C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index be63cfe017..62865e061f 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -133,7 +133,7 @@ extern actor_process_profile_definition g_profile_Obj_HFtr = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_HFtr, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjHFtr_c), // mSize 0, // mSizeOther 0, // mParameters @@ -382,4 +382,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80C18168-80C18168 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C18168-80C18168 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_hasu2.cpp b/src/d/actor/d_a_obj_hasu2.cpp index da2b756ec0..5f86be3e32 100644 --- a/src/d/actor/d_a_obj_hasu2.cpp +++ b/src/d/actor/d_a_obj_hasu2.cpp @@ -126,7 +126,7 @@ extern actor_process_profile_definition g_profile_Obj_MHasu = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_MHasu, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(nObjMHasu::daObjMHasu_c), // mSize 0, // mSizeOther 0, // mParameters @@ -314,4 +314,4 @@ nObjMHasu::daObjMHasu_c::~daObjMHasu_c() { // NONMATCHING } -/* 80C18AA0-80C18AA0 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C18AA0-80C18AA0 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 0a97b53478..6ab3d9e2c4 100644 --- a/src/d/actor/d_a_obj_hb.cpp +++ b/src/d/actor/d_a_obj_hb.cpp @@ -674,7 +674,7 @@ extern actor_process_profile_definition g_profile_OBJ_HB = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_HB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_hb_class), // mSize 0, // mSizeOther 0, // mParameters @@ -746,4 +746,4 @@ static void func_80C1B5F0() { // NONMATCHING } -/* 80C1B700-80C1B700 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C1B700-80C1B700 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp index 4d3aa9f9eb..1ed5cb6c8e 100644 --- a/src/d/actor/d_a_obj_hbombkoya.cpp +++ b/src/d/actor/d_a_obj_hbombkoya.cpp @@ -465,7 +465,7 @@ extern actor_process_profile_definition g_profile_Obj_HBombkoya = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_HBombkoya, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x000007C0, // mSize 0, // mSizeOther 0, // mParameters @@ -534,4 +534,4 @@ SECTION_DATA extern void* __vt__16daObjHBombkoya_c[17] = { (void*)eventRun__17dEvLib_callback_cFv, (void*)eventEnd__17dEvLib_callback_cFv, (void*)__dt__16daObjHBombkoya_cFv, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_heavySw.cpp b/src/d/actor/d_a_obj_heavySw.cpp index 944dd796dc..764bd56409 100644 --- a/src/d/actor/d_a_obj_heavySw.cpp +++ b/src/d/actor/d_a_obj_heavySw.cpp @@ -341,7 +341,7 @@ extern actor_process_profile_definition g_profile_Obj_HeavySw = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_HeavySw, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daHeavySw_c), // mSize 0, // mSizeOther 0, // mParameters @@ -351,4 +351,4 @@ extern actor_process_profile_definition g_profile_Obj_HeavySw = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_hfuta.cpp b/src/d/actor/d_a_obj_hfuta.cpp index ecbb12846e..4b64a37b82 100644 --- a/src/d/actor/d_a_obj_hfuta.cpp +++ b/src/d/actor/d_a_obj_hfuta.cpp @@ -246,7 +246,7 @@ extern actor_process_profile_definition g_profile_Obj_Hfuta = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Hfuta, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjFuta_c), // mSize 0, // mSizeOther 0, // mParameters @@ -258,4 +258,4 @@ extern actor_process_profile_definition g_profile_Obj_Hfuta = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -AUDIO_INSTANCES; \ No newline at end of file +AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 1449453751..9c3b05fe61 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -368,8 +368,8 @@ int daObjHHASHI_c::Execute(f32 (**param_1)[3][4]) { int daObjHHASHI_c::Draw() { if (dComIfGp_event_runCheck()) { camera_class* pCamera = dComIfGp_getCamera(0); - f32 xdiff = current.pos.x - pCamera->mLookat.mEye.x; - f32 zdiff = current.pos.z - pCamera->mLookat.mEye.z; + f32 xdiff = current.pos.x - pCamera->lookat.eye.x; + f32 zdiff = current.pos.z - pCamera->lookat.eye.z; if (JMAFastSqrt(xdiff * xdiff + zdiff * zdiff) < 200.0f) { return 1; } @@ -415,7 +415,7 @@ extern actor_process_profile_definition g_profile_Obj_HHASHI = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_HHASHI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjHHASHI_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp index f4d351fbaf..d5d5ba5cae 100644 --- a/src/d/actor/d_a_obj_hsTarget.cpp +++ b/src/d/actor/d_a_obj_hsTarget.cpp @@ -118,7 +118,7 @@ extern actor_process_profile_definition g_profile_Obj_HsTarget = { 3, fpcPi_CURRENT_e, PROC_Obj_HsTarget, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daHsTarget_c), 0, 0, @@ -128,4 +128,4 @@ extern actor_process_profile_definition g_profile_Obj_HsTarget = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 13cae546d5..97340326c3 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -394,7 +394,7 @@ extern actor_process_profile_definition g_profile_Obj_Ice_l = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Ice_l, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000640, // mSize 0, // mSizeOther 0, // mParameters @@ -618,4 +618,4 @@ int daObjIce_l_c::Draw() { int daObjIce_l_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName); return 1; -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index 71c4e75896..e37b61886e 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -120,7 +120,7 @@ extern actor_process_profile_definition g_profile_Obj_Ice_s = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Ice_s, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjIce_s_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 19306f5edb..4c8ce4405b 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -655,7 +655,7 @@ int daObjIceBlk_c::checkWallPre(s16 i_angle) { int var_r29 = -1; - linchk.SetActorPid(mBase.mBsPcId); + linchk.SetActorPid(base.id); mDoMtx_stack_c::YrotS(i_angle); mDoMtx_stack_c::multVec(&cXyz::BaseZ, &spBC); @@ -691,7 +691,7 @@ int daObjIceBlk_c::checkBgHit() { int var_r29 = -1; - mGndChk.SetActorPid(mBase.mBsPcId); + mGndChk.SetActorPid(base.id); for (int i = 0; i < 5; i++) { static const Vec l_check_offsetXZ[] = { @@ -758,7 +758,7 @@ BOOL daObjIceBlk_c::checkFall() { cXyz end; dBgS_ObjLinChk linchk; - linchk.SetActorPid(mBase.mBsPcId); + linchk.SetActorPid(base.id); for (int i = 0; i < 5; i++) { static const Vec l_check_offsetXZ[] = { @@ -912,7 +912,7 @@ extern actor_process_profile_definition g_profile_Obj_IceBlock = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_IceBlock, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjIceBlk_c), // mSize 0, // mSizeOther 0, // mParameters @@ -922,4 +922,4 @@ extern actor_process_profile_definition g_profile_Obj_IceBlock = { 0x00040500, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index 3132a07892..3e10f601ec 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -461,7 +461,7 @@ extern actor_process_profile_definition g_profile_Obj_IceLeaf = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_IceLeaf, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjIceLeaf_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index e4b945da0b..c1676f0f4e 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -147,7 +147,7 @@ extern actor_process_profile_definition g_profile_OBJ_IHASI = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_IHASI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_ihasi_class), // mSize 0, // mSizeOther 0, // mParameters @@ -267,4 +267,4 @@ static void daObj_Ihasi_Create(fopAc_ac_c* param_0) { // NONMATCHING } -/* 80C268C4-80C268C4 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C268C4-80C268C4 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index ea85b9e2aa..ebcc920059 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -288,7 +288,7 @@ extern actor_process_profile_definition g_profile_Obj_Ikada = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Ikada, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjIkada_c), // mSize 0, // mSizeOther 0, // mParameters @@ -432,4 +432,4 @@ static void func_80C274E0() { // NONMATCHING } -/* 80C27564-80C27564 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C27564-80C27564 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index ec0ba1b02d..4d41fb5991 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -221,7 +221,7 @@ extern actor_process_profile_definition g_profile_Obj_InoBone = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_InoBone, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjIBone_c), // mSize 0, // mSizeOther 0, // mParameters @@ -355,4 +355,4 @@ static void daObjIBone_Create(fopAc_ac_c* param_0) { // NONMATCHING } -/* 80C281C4-80C281C4 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C281C4-80C281C4 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp index ee2bc60ad9..37747cec61 100644 --- a/src/d/actor/d_a_obj_ita.cpp +++ b/src/d/actor/d_a_obj_ita.cpp @@ -154,7 +154,7 @@ extern actor_process_profile_definition g_profile_Obj_ITA = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_ITA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjIta_c), // mSize 0, // mSizeOther 0, // mParameters @@ -629,4 +629,4 @@ static void func_80C2921C() { // NONMATCHING } -/* 80C292E8-80C292E8 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C292E8-80C292E8 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index 297096df83..0669616539 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -180,7 +180,7 @@ extern actor_process_profile_definition g_profile_OBJ_ITAMATO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_ITAMATO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_ItaMato_c), // mSize 0, // mSizeOther 0, // mParameters @@ -647,4 +647,4 @@ static void func_80C2AB54() { // NONMATCHING } -/* 80C2AC20-80C2AC20 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C2AC20-80C2AC20 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index c06a2a61b3..8030b1ef85 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -1352,7 +1352,7 @@ extern actor_process_profile_definition g_profile_ITEM = { 7, fpcPi_CURRENT_e, PROC_ITEM, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daItem_c), 0, 0, @@ -1362,4 +1362,4 @@ extern actor_process_profile_definition g_profile_ITEM = { 0xC0100, fopAc_ACTOR_e, fopAc_CULLSPHERE_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp index bccb8cfd09..8ead95c186 100644 --- a/src/d/actor/d_a_obj_ito.cpp +++ b/src/d/actor/d_a_obj_ito.cpp @@ -174,7 +174,7 @@ extern actor_process_profile_definition g_profile_OBJ_ITO = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_ITO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_ito_class), // mSize 0, // mSizeOther 0, // mParameters @@ -647,4 +647,4 @@ void __sinit_d_a_obj_ito_cpp() { REGISTER_CTORS(0x8047D7C0, __sinit_d_a_obj_ito_cpp); #pragma pop -/* 8047D8D4-8047D8D4 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8047D8D4-8047D8D4 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 696c4143bf..15b929e0ad 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -458,8 +458,8 @@ void daObjKABUTO_c::Z_BufferChk() { dComIfGd_peekZ(vec2.x, vec2.y, &mBufferZ); } - f32 near = dComIfGd_getView()->mNear; - f32 far = dComIfGd_getView()->mFar; + f32 near = dComIfGd_getView()->near; + f32 far = dComIfGd_getView()->far; mDoLib_pos2camera(&vec1, &vec2); vec2.z += 50.0f; if (vec2.z > 0.0f) { @@ -897,7 +897,7 @@ extern actor_process_profile_definition g_profile_Obj_Kabuto = { 7, fpcPi_CURRENT_e, PROC_Obj_Kabuto, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjKABUTO_c), 0, 0, @@ -907,4 +907,4 @@ extern actor_process_profile_definition g_profile_Obj_Kabuto = { 0xC0120, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index e718291cd3..ad770beeb8 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -292,7 +292,7 @@ extern actor_process_profile_definition g_profile_Obj_Kag = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Kag, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKAG_c), // mSize 0, // mSizeOther 0, // mParameters @@ -995,4 +995,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80C31260-80C31260 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C31260-80C31260 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kage.cpp b/src/d/actor/d_a_obj_kage.cpp index d1913c9852..f8e9100de4 100644 --- a/src/d/actor/d_a_obj_kage.cpp +++ b/src/d/actor/d_a_obj_kage.cpp @@ -205,7 +205,7 @@ extern actor_process_profile_definition g_profile_OBJ_KAGE = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_KAGE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_kage_class), // mSize 0, // mSizeOther 0, // mParameters @@ -217,4 +217,4 @@ extern actor_process_profile_definition g_profile_OBJ_KAGE = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80C31990-80C31990 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C31990-80C31990 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index d5af2fdb6e..20cee6a486 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -225,7 +225,7 @@ extern actor_process_profile_definition g_profile_OBJ_KAGO = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_KAGO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Kago_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1106,4 +1106,4 @@ static u8 data_80C33FCC[4]; static u8 data_80C33FD0[4]; #pragma pop -/* 80C33D94-80C33D94 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C33D94-80C33D94 000114 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index 3e0c254ae0..f60c165bdd 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -402,7 +402,7 @@ extern actor_process_profile_definition g_profile_Obj_Kaisou = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Kaisou, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKaisou_c), // mSize 0, // mSizeOther 0, // mParameters @@ -450,4 +450,4 @@ static bool daObjKaisou_IsDelete(daObjKaisou_c* param_0) { return true; } -/* 80C34FA0-80C34FA0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C34FA0-80C34FA0 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index 177e282719..d1847bc3f9 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -179,7 +179,7 @@ extern actor_process_profile_definition g_profile_Obj_Kam = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Kam, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKAM_c), // mSize 0, // mSizeOther 0, // mParameters @@ -763,4 +763,4 @@ static void func_80C383EC() { // NONMATCHING } -/* 80C384FC-80C384FC 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C384FC-80C384FC 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 518dda357c..5b32d9d39a 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -407,7 +407,7 @@ extern actor_process_profile_definition g_profile_OBJ_KANBAN2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_KANBAN2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Kanban2_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1389,4 +1389,4 @@ static u8 data_80585D48[4]; static u8 data_80585D4C[4]; #pragma pop -/* 80585710-80585710 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80585710-80585710 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index f42dd002d9..b7c4e57ead 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -259,7 +259,7 @@ extern actor_process_profile_definition g_profile_Obj_Kantera = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Kantera, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daItemKantera_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 5fd91df3fd..86794898cc 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -177,7 +177,7 @@ extern actor_process_profile_definition g_profile_Obj_Kat = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Kat, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKAT_c), // mSize 0, // mSizeOther 0, // mParameters @@ -742,4 +742,4 @@ static void func_80C3C658() { // NONMATCHING } -/* 80C3C764-80C3C764 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C3C764-80C3C764 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index 39ce5fab01..0ab06c269c 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -251,7 +251,7 @@ extern actor_process_profile_definition g_profile_Obj_KazeNeko = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_KazeNeko, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKazeNeko_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 98a04e7306..cef86193af 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -218,7 +218,7 @@ extern actor_process_profile_definition g_profile_OBJ_KBACKET = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_KBACKET, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_KBacket_c), // mSize 0, // mSizeOther 0, // mParameters @@ -754,4 +754,4 @@ static void func_80587D68() { // NONMATCHING } -/* 80587E70-80587E70 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80587E70-80587E70 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 10eeaf135e..40f5aed765 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -188,7 +188,7 @@ extern actor_process_profile_definition g_profile_OBJ_KBOX = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_KBOX, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_kbox_class), // mSize 0, // mSizeOther 0, // mParameters @@ -998,4 +998,4 @@ static u8 data_80C3F318[4]; static u8 data_80C3F31C[4]; #pragma pop -/* 80C3F108-80C3F108 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C3F108-80C3F108 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index 2b008bf5c2..34bc1d6111 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -161,7 +161,7 @@ extern actor_process_profile_definition g_profile_OBJ_KEY = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_KEY, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_key_class), // mSize 0, // mSizeOther 0, // mParameters @@ -608,4 +608,4 @@ extern "C" void setPos__7daKey_cF4cXyz() { // NONMATCHING } -/* 80C4107C-80C4107C 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C4107C-80C4107C 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index a63cccaae6..885e0987a7 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -261,7 +261,7 @@ extern actor_process_profile_definition g_profile_OBJ_KEYHOLE = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_KEYHOLE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00002CB8, // mSize 0, // mSizeOther 0, // mParameters @@ -1138,4 +1138,4 @@ static u8 data_80C43DF0[4]; static u8 data_80C43DF4[4]; #pragma pop -/* 80C43ABC-80C43ABC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C43ABC-80C43ABC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 3b69ddf192..5d81cbc4d2 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -1053,7 +1053,7 @@ extern actor_process_profile_definition g_profile_Obj_KkrGate = { 3, fpcPi_CURRENT_e, PROC_Obj_KkrGate, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjKGate_c), 0, 0, @@ -1063,4 +1063,4 @@ extern actor_process_profile_definition g_profile_Obj_KkrGate = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index de8edbd271..5f14a54064 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -244,7 +244,7 @@ extern actor_process_profile_definition g_profile_OBJ_KI = { 7, fpcPi_CURRENT_e, PROC_OBJ_KI, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(obj_ki_class), 0, 0, @@ -254,4 +254,4 @@ extern actor_process_profile_definition g_profile_OBJ_KI = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_7_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp index 7b5e024646..fbb0a66a61 100644 --- a/src/d/actor/d_a_obj_kiPot.cpp +++ b/src/d/actor/d_a_obj_kiPot.cpp @@ -82,7 +82,7 @@ extern actor_process_profile_definition g_profile_Obj_KiPot = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_KiPot, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daKiPot_c), // mSize 0, // mSizeOther 0, // mParameters @@ -234,4 +234,4 @@ void __sinit_d_a_obj_kiPot_cpp() { #pragma push #pragma force_active on REGISTER_CTORS(0x80C45144, __sinit_d_a_obj_kiPot_cpp); -#pragma pop \ No newline at end of file +#pragma pop diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 2f7141e92c..6c0d5df9aa 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -129,7 +129,7 @@ extern actor_process_profile_definition g_profile_OBJ_KITA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_KITA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_kita_class), // mSize 0, // mSizeOther 0, // mParameters @@ -392,4 +392,4 @@ void __sinit_d_a_obj_kita_cpp() { REGISTER_CTORS(0x80C45ECC, __sinit_d_a_obj_kita_cpp); #pragma pop -/* 80C45F80-80C45F80 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C45F80-80C45F80 000064 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kjgjs.cpp b/src/d/actor/d_a_obj_kjgjs.cpp index 3262a86752..0547318a16 100644 --- a/src/d/actor/d_a_obj_kjgjs.cpp +++ b/src/d/actor/d_a_obj_kjgjs.cpp @@ -131,7 +131,7 @@ extern actor_process_profile_definition g_profile_Obj_KJgjs = { 3, fpcPi_CURRENT_e, PROC_Obj_KJgjs, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjKJgjs_c), 0, 0, @@ -141,4 +141,4 @@ extern actor_process_profile_definition g_profile_Obj_KJgjs = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp index 686fe9619b..ef7179f1a7 100644 --- a/src/d/actor/d_a_obj_kkanban.cpp +++ b/src/d/actor/d_a_obj_kkanban.cpp @@ -180,7 +180,7 @@ extern actor_process_profile_definition g_profile_Obj_KKanban = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_KKanban, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKKanban_c), // mSize 0, // mSizeOther 0, // mParameters @@ -190,4 +190,4 @@ extern actor_process_profile_definition g_profile_Obj_KKanban = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index 75f0d3bc2b..cb009ec198 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -171,7 +171,7 @@ extern actor_process_profile_definition g_profile_Obj_KLift00 = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_KLift00, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKLift00_c), // mSize 0, // mSizeOther 0, // mParameters @@ -488,4 +488,4 @@ daObjKLift00_c::ChainPos::ChainPos() { /* empty function */ } -/* 8058C3E8-8058C3E8 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8058C3E8-8058C3E8 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_knBullet.cpp b/src/d/actor/d_a_obj_knBullet.cpp index 22d413c54f..074e68c963 100644 --- a/src/d/actor/d_a_obj_knBullet.cpp +++ b/src/d/actor/d_a_obj_knBullet.cpp @@ -141,7 +141,7 @@ extern actor_process_profile_definition g_profile_KN_BULLET = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_KN_BULLET, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKnBullet_c), // mSize 0, // mSizeOther 0, // mParameters @@ -305,4 +305,4 @@ static void daObjKnBullet_create(fopAc_ac_c* param_0) { /* 80C4792C-80C47948 00088C 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPs */ extern "C" void func_80C4792C(void* _this, s16* param_0) { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index ad7574d8db..90604d49e2 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -534,7 +534,7 @@ extern actor_process_profile_definition g_profile_Obj_Kshutter = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Kshutter, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKshtr_c), // mSize 0, // mSizeOther 0, // mParameters @@ -877,4 +877,4 @@ extern "C" void func_80C49C84(void* _this, u8* param_0) { // NONMATCHING } -/* 80C49D44-80C49D44 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C49D44-80C49D44 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp index 676a4578e3..4b17cb6074 100644 --- a/src/d/actor/d_a_obj_ktOnFire.cpp +++ b/src/d/actor/d_a_obj_ktOnFire.cpp @@ -108,7 +108,7 @@ extern actor_process_profile_definition g_profile_Tag_KtOnFire = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_KtOnFire, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daKtOnFire_c), // mSize 0, // mSizeOther 0, // mParameters @@ -313,4 +313,4 @@ void __sinit_d_a_obj_ktOnFire_cpp() { #pragma push #pragma force_active on REGISTER_CTORS(0x8058CF04, __sinit_d_a_obj_ktOnFire_cpp); -#pragma pop \ No newline at end of file +#pragma pop diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index ab97cfe08b..9f391cec6b 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -179,7 +179,7 @@ extern actor_process_profile_definition g_profile_Obj_Kuw = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Kuw, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKUW_c), // mSize 0, // mSizeOther 0, // mParameters @@ -774,4 +774,4 @@ static void func_80C4D474() { // NONMATCHING } -/* 80C4D58C-80C4D58C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C4D58C-80C4D58C 0000FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp index 92b3c11080..52efd64072 100644 --- a/src/d/actor/d_a_obj_kwheel00.cpp +++ b/src/d/actor/d_a_obj_kwheel00.cpp @@ -272,7 +272,7 @@ extern actor_process_profile_definition g_profile_Obj_KWheel00 = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_KWheel00, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKWheel00_c), // mSize 0, // mSizeOther 0, // mParameters @@ -444,4 +444,4 @@ static void func_80C4E7F0() { // NONMATCHING } -/* 80C4E85C-80C4E85C 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C4E85C-80C4E85C 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index 836fb583fe..937c9a0787 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -199,7 +199,7 @@ extern actor_process_profile_definition g_profile_Obj_KWheel01 = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_KWheel01, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKWheel01_c), // mSize 0, // mSizeOther 0, // mParameters @@ -307,4 +307,4 @@ static void func_80C4F6A8() { // NONMATCHING } -/* 80C4F6EC-80C4F6EC 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C4F6EC-80C4F6EC 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp index 74fa3aecd9..c4e805cf46 100644 --- a/src/d/actor/d_a_obj_kznkarm.cpp +++ b/src/d/actor/d_a_obj_kznkarm.cpp @@ -359,7 +359,7 @@ extern actor_process_profile_definition g_profile_Obj_KznkArm = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_KznkArm, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjKznkarm_c), // mSize 0, // mSizeOther 0, // mParameters @@ -566,4 +566,4 @@ static void func_80C50CF4() { // NONMATCHING } -/* 80C50D90-80C50D90 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C50D90-80C50D90 000088 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index 838606eb42..1b4d4e4008 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -202,7 +202,7 @@ int daObjLadder::Act_c::Create() { mDoMtx_stack_c::multVecZero(&gndVec); mDoMtx_stack_c::pop(); mGndChk.SetPos(&gndVec); - mGndChk.SetActorPid(mBase.mBsPcId); + mGndChk.SetActorPid(base.id); mHeight = dComIfG_Bgsp().GroundCross(&mGndChk); mInDemo = false; mEventIdx = dComIfGp_getEventManager().getEventIdx(this, prm_get_evId()); @@ -458,7 +458,7 @@ extern actor_process_profile_definition g_profile_Obj_Ladder = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Ladder, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLadder::Act_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index 589800c814..59ed14acb5 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -316,7 +316,7 @@ extern actor_process_profile_definition g_profile_Obj_Laundry = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Laundry, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLdy_c), // mSize 0, // mSizeOther 0, // mParameters @@ -434,4 +434,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80C520C8-80C520C8 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C520C8-80C520C8 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp index e5e3483e41..951f737913 100644 --- a/src/d/actor/d_a_obj_laundry_rope.cpp +++ b/src/d/actor/d_a_obj_laundry_rope.cpp @@ -330,7 +330,7 @@ extern actor_process_profile_definition g_profile_Obj_LndRope = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_LndRope, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLndRope_c), // mSize 0, // mSizeOther 0, // mParameters @@ -428,4 +428,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80C533B0-80C533B0 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C533B0-80C533B0 0000AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index a5ef12b049..a50bc99ab9 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -213,7 +213,7 @@ extern actor_process_profile_definition g_profile_OBJ_LBOX = { 3, fpcPi_CURRENT_e, PROC_OBJ_LBOX, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(obj_lbox_class), 0, 0, @@ -239,4 +239,4 @@ extern actor_process_profile_definition g_profile_OBJ_LBOX = { /* 80C53FA0-80C53FA8 000B20 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -/* 80C53FFC-80C53FFC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C53FFC-80C53FFC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 7107d55162..89e9a200b2 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -326,7 +326,7 @@ extern actor_process_profile_definition g_profile_Obj_LifeContainer = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_LifeContainer, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLife_c), // mSize 0, // mSizeOther 0, // mParameters @@ -829,4 +829,4 @@ static void func_804CE3E4() { // NONMATCHING } -/* 804CE4A4-804CE4A4 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 804CE4A4-804CE4A4 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index ef94431cce..888b0718a1 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -589,7 +589,7 @@ extern actor_process_profile_definition g_profile_OBJ_LP = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_LP, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_lp_class), // mSize 0, // mSizeOther 0, // mParameters @@ -793,4 +793,4 @@ static u8 data_80C55C10[4]; static u8 data_80C55C14[4]; #pragma pop -/* 80C55AC0-80C55AC0 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C55AC0-80C55AC0 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp index a4fd0db02a..4636e66a00 100644 --- a/src/d/actor/d_a_obj_lv1Candle00.cpp +++ b/src/d/actor/d_a_obj_lv1Candle00.cpp @@ -298,7 +298,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = { 3, fpcPi_CURRENT_e, PROC_Obj_Lv1Cdl00, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daLv1Cdl00_c), 0, 0, @@ -308,4 +308,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = { 0x60000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index d4a2259634..550250085a 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -251,7 +251,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = { 3, fpcPi_CURRENT_e, PROC_Obj_Lv1Cdl01, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daLv1Cdl01_c), 0, 0, @@ -261,4 +261,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = { 0x60000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp index c7da242d17..66b14d7494 100644 --- a/src/d/actor/d_a_obj_lv2Candle.cpp +++ b/src/d/actor/d_a_obj_lv2Candle.cpp @@ -421,7 +421,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv2Candle = { 3, fpcPi_CURRENT_e, PROC_Obj_Lv2Candle, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daLv2Candle_c), 0, 0, @@ -431,4 +431,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv2Candle = { 0x60000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv3Candle.cpp b/src/d/actor/d_a_obj_lv3Candle.cpp index 00a839df1d..c64b556ae0 100644 --- a/src/d/actor/d_a_obj_lv3Candle.cpp +++ b/src/d/actor/d_a_obj_lv3Candle.cpp @@ -248,7 +248,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv3Candle = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv3Candle, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv3Candle_c), // mSize 0, // mSizeOther 0, // mParameters @@ -258,4 +258,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv3Candle = { 0x60000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv3Water.cpp b/src/d/actor/d_a_obj_lv3Water.cpp index 4ce01230fa..33a528a0cb 100644 --- a/src/d/actor/d_a_obj_lv3Water.cpp +++ b/src/d/actor/d_a_obj_lv3Water.cpp @@ -230,7 +230,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv3Water = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv3Water, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv3Water_c), // mSize 0, // mSizeOther 0, // mParameters @@ -619,4 +619,4 @@ daLv3Water_c::~daLv3Water_c() { // NONMATCHING } -/* 80C5A068-80C5A068 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C5A068-80C5A068 0001F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp index 0c4c048b20..456429e1d6 100644 --- a/src/d/actor/d_a_obj_lv3Water2.cpp +++ b/src/d/actor/d_a_obj_lv3Water2.cpp @@ -163,7 +163,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv3Water2 = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv3Water2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv3Water2_c), // mSize 0, // mSizeOther 0, // mParameters @@ -452,4 +452,4 @@ daLv3Water2_c::~daLv3Water2_c() { // NONMATCHING } -/* 80C5B398-80C5B398 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C5B398-80C5B398 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp index 37ec95b746..ec5db25e27 100644 --- a/src/d/actor/d_a_obj_lv3WaterB.cpp +++ b/src/d/actor/d_a_obj_lv3WaterB.cpp @@ -22,7 +22,7 @@ static int daObj_Lv3waterB_Draw(obj_lv3WaterB_class* i_this) { J3DTexMtxInfo* tex_mtx_info = &material_p->getTexGenBlock()->getTexMtx(0)->getTexMtxInfo(); if (tex_mtx_info != NULL) { Mtx m; - C_MTXLightPerspective(m, dComIfGd_getView()->mFovy, dComIfGd_getView()->mAspect, 1.0f, + C_MTXLightPerspective(m, dComIfGd_getView()->fovy, dComIfGd_getView()->aspect, 1.0f, 1.0f, -0.015f, 0.0f); tex_mtx_info->setEffectMtx(m); i_this->mpBWaterModel->getModelData()->simpleCalcMaterial(0, (MtxP)j3dDefaultMtx); @@ -220,7 +220,7 @@ extern actor_process_profile_definition g_profile_OBJ_LV3WATERB = { 3, fpcPi_CURRENT_e, PROC_OBJ_LV3WATERB, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(obj_lv3WaterB_class), 0, 0, @@ -230,4 +230,4 @@ extern actor_process_profile_definition g_profile_OBJ_LV3WATERB = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp index 10242aa69e..a8541a6a81 100644 --- a/src/d/actor/d_a_obj_lv3saka00.cpp +++ b/src/d/actor/d_a_obj_lv3saka00.cpp @@ -169,7 +169,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv3R10Saka, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv3saka_c), // mSize 0, // mSizeOther 0, // mParameters @@ -181,4 +181,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80C5C3DC-80C5C3DC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C5C3DC-80C5C3DC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv3waterEff.cpp b/src/d/actor/d_a_obj_lv3waterEff.cpp index ba1b894f72..42de608a34 100644 --- a/src/d/actor/d_a_obj_lv3waterEff.cpp +++ b/src/d/actor/d_a_obj_lv3waterEff.cpp @@ -106,7 +106,7 @@ extern actor_process_profile_definition g_profile_Obj_WaterEff = { 7, fpcPi_CURRENT_e, PROC_Obj_WaterEff, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjWaterEff_c), 0, 0, @@ -116,4 +116,4 @@ extern actor_process_profile_definition g_profile_Obj_WaterEff = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp index 1f8e3821d8..d36617e383 100644 --- a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp @@ -157,7 +157,7 @@ extern actor_process_profile_definition g_profile_Tag_Lv4CandleDm = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Lv4CandleDm, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(dalv4CandleDemoTag_c), // mSize 0, // mSizeOther 0, // mParameters @@ -458,4 +458,4 @@ extern "C" bool eventStart__17dEvLib_callback_cFv() { // dalv4CandleDemoTag_c::~dalv4CandleDemoTag_c() { extern "C" void __dt__20dalv4CandleDemoTag_cFv() { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp index a8d5ce15cd..bf1d1c4f4a 100644 --- a/src/d/actor/d_a_obj_lv4EdShutter.cpp +++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp @@ -179,7 +179,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4EdShutter = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4EdShutter, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv4EdShutter_c), // mSize 0, // mSizeOther 0, // mParameters @@ -466,4 +466,4 @@ daLv4EdShutter_c::~daLv4EdShutter_c() { // NONMATCHING } -/* 80C5E8FC-80C5E8FC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C5E8FC-80C5E8FC 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv4Gate.cpp b/src/d/actor/d_a_obj_lv4Gate.cpp index e1772d320c..9604de76c8 100644 --- a/src/d/actor/d_a_obj_lv4Gate.cpp +++ b/src/d/actor/d_a_obj_lv4Gate.cpp @@ -225,7 +225,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Gate = { 3, fpcPi_CURRENT_e, PROC_Obj_Lv4Gate, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daLv4Gate_c), 0, 0, @@ -235,4 +235,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Gate = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv4HsTarget.cpp b/src/d/actor/d_a_obj_lv4HsTarget.cpp index fbee88787e..8450e10db4 100644 --- a/src/d/actor/d_a_obj_lv4HsTarget.cpp +++ b/src/d/actor/d_a_obj_lv4HsTarget.cpp @@ -109,7 +109,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { 3, fpcPi_CURRENT_e, PROC_Obj_Lv4HsTarget, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daLv4HsTarget_c), 0, 0, @@ -119,4 +119,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv4PoGate.cpp b/src/d/actor/d_a_obj_lv4PoGate.cpp index 01bd4fe331..0b94374102 100644 --- a/src/d/actor/d_a_obj_lv4PoGate.cpp +++ b/src/d/actor/d_a_obj_lv4PoGate.cpp @@ -315,7 +315,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4PoGate = { 3, fpcPi_CURRENT_e, PROC_Obj_Lv4PoGate, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daLv4PoGate_c), 0, 0, @@ -325,4 +325,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv4PoGate = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv4RailWall.cpp b/src/d/actor/d_a_obj_lv4RailWall.cpp index 6cf08182c5..196b83cce0 100644 --- a/src/d/actor/d_a_obj_lv4RailWall.cpp +++ b/src/d/actor/d_a_obj_lv4RailWall.cpp @@ -373,7 +373,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4RailWall = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4RailWall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv4Wall_c), // mSize 0, // mSizeOther 0, // mParameters @@ -575,4 +575,4 @@ static void func_80C61B28() { // NONMATCHING } -/* 80C61BB0-80C61BB0 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C61BB0-80C61BB0 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv4SlideWall.cpp b/src/d/actor/d_a_obj_lv4SlideWall.cpp index 5ec33ac2eb..b521dd9c87 100644 --- a/src/d/actor/d_a_obj_lv4SlideWall.cpp +++ b/src/d/actor/d_a_obj_lv4SlideWall.cpp @@ -161,7 +161,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4SlideWall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSldWall_c), // mSize 0, // mSizeOther 0, // mParameters @@ -378,4 +378,4 @@ void __sinit_d_a_obj_lv4SlideWall_cpp() { REGISTER_CTORS(0x80C62658, __sinit_d_a_obj_lv4SlideWall_cpp); #pragma pop -/* 80C626C4-80C626C4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C626C4-80C626C4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp index 12c8d508fd..dfd2242788 100644 --- a/src/d/actor/d_a_obj_lv4bridge.cpp +++ b/src/d/actor/d_a_obj_lv4bridge.cpp @@ -313,7 +313,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Bridge = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4Bridge, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv4Brg_c), // mSize 0, // mSizeOther 0, // mParameters @@ -420,4 +420,4 @@ static void func_80C63160() { // NONMATCHING } -/* 80C63190-80C63190 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C63190-80C63190 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index 18ee7b0661..03c5121b25 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -659,7 +659,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Chan = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4Chan, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv4Chan_c), // mSize 0, // mSizeOther 0, // mParameters @@ -807,4 +807,4 @@ void daObjSwChain_c::checkTight() { // NONMATCHING } -/* 80C66984-80C66984 000124 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C66984-80C66984 000124 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 72f47e9f42..8efde07eb7 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -129,7 +129,7 @@ void daObjL4DigSand_c::mode_wait() { */ void daObjL4DigSand_c::mode_init_dig() { dBgS_ObjGndChk gndchk; - gndchk.SetActorPid(mBase.mBsPcId); + gndchk.SetActorPid(base.id); gndchk.SetPos(¤t.pos); f32 gnd_y = dComIfG_Bgsp().GroundCross(&gndchk); @@ -229,7 +229,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4DigSand = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4DigSand, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjL4DigSand_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_lv4floor.cpp b/src/d/actor/d_a_obj_lv4floor.cpp index b35c80d2a9..761a8ed73b 100644 --- a/src/d/actor/d_a_obj_lv4floor.cpp +++ b/src/d/actor/d_a_obj_lv4floor.cpp @@ -190,7 +190,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Floor = { 3, fpcPi_CURRENT_e, PROC_Obj_Lv4Floor, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjLv4Floor_c), 0, 0, @@ -200,4 +200,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Floor = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv4gear.cpp b/src/d/actor/d_a_obj_lv4gear.cpp index 63cc7c913b..79aee6e875 100644 --- a/src/d/actor/d_a_obj_lv4gear.cpp +++ b/src/d/actor/d_a_obj_lv4gear.cpp @@ -184,7 +184,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Gear = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4Gear, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv4Gear_c), // mSize 0, // mSizeOther 0, // mParameters @@ -194,4 +194,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Gear = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv4prelvtr.cpp b/src/d/actor/d_a_obj_lv4prelvtr.cpp index 127a528416..259d3cf97a 100644 --- a/src/d/actor/d_a_obj_lv4prelvtr.cpp +++ b/src/d/actor/d_a_obj_lv4prelvtr.cpp @@ -150,7 +150,7 @@ extern actor_process_profile_definition g_profile_Obj_PRElvtr = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_PRElvtr, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjPRElvtr_c), // mSize 0, // mSizeOther 0, // mParameters @@ -206,4 +206,4 @@ daObjPRElvtr_c::~daObjPRElvtr_c() { // NONMATCHING } -/* 80C68B90-80C68B90 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C68B90-80C68B90 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp index 0ee698778d..8c857eaaa1 100644 --- a/src/d/actor/d_a_obj_lv4prwall.cpp +++ b/src/d/actor/d_a_obj_lv4prwall.cpp @@ -235,7 +235,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4PRwall = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4PRwall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv4PRwall_c), // mSize 0, // mSizeOther 0, // mParameters @@ -291,4 +291,4 @@ daObjLv4PRwall_c::~daObjLv4PRwall_c() { // NONMATCHING } -/* 80C69974-80C69974 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C69974-80C69974 00008C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp index 665ea347c3..b8557ec16a 100644 --- a/src/d/actor/d_a_obj_lv4sand.cpp +++ b/src/d/actor/d_a_obj_lv4sand.cpp @@ -207,7 +207,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Sand = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4Sand, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv4Sand_c), // mSize 0, // mSizeOther 0, // mParameters @@ -428,4 +428,4 @@ static void func_80C6A3A8() { // NONMATCHING } -/* 80C6A3D4-80C6A3D4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C6A3D4-80C6A3D4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index f301225c3a..5f39823ef3 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -233,7 +233,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv5FBoard = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv5FBoard, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daFlorBoad_c), // mSize 0, // mSizeOther 0, // mParameters @@ -243,4 +243,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv5FBoard = { 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index fd514f8ce6..37f6d21b08 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -338,7 +338,7 @@ extern actor_process_profile_definition g_profile_Obj_IceWall = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_IceWall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daIceWall_c), // mSize 0, // mSizeOther 0, // mParameters @@ -348,4 +348,4 @@ extern actor_process_profile_definition g_profile_Obj_IceWall = { 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index 48be1986f9..8a9fa4dcfe 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -243,7 +243,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv5SwIce = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv5SwIce, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv5SwIce_c), // mSize 0, // mSizeOther 0, // mParameters @@ -253,4 +253,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv5SwIce = { 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index 0ed6c3d6b1..d08ccac399 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -387,7 +387,7 @@ extern actor_process_profile_definition g_profile_Obj_Ychndlr = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Ychndlr, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjYchndlr_c), // mSize 0, // mSizeOther 0, // mParameters @@ -397,4 +397,4 @@ extern actor_process_profile_definition g_profile_Obj_Ychndlr = { 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index 31d4ea4d0c..94f65051b1 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -618,7 +618,7 @@ extern actor_process_profile_definition g_profile_Obj_YIblltray = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_YIblltray, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjYIblltray_c), // mSize 0, // mSizeOther 0, // mParameters @@ -628,4 +628,4 @@ extern actor_process_profile_definition g_profile_Obj_YIblltray = { 0x00044100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index f8a401fc83..cbdee2f80c 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -229,7 +229,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6ChgGate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv6ChangeGate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -626,4 +626,4 @@ daLv6ChangeGate_c::~daLv6ChangeGate_c() { // NONMATCHING } -/* 80C721A4-80C721A4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C721A4-80C721A4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp index 88e838b2c1..d3330d5cc1 100644 --- a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp +++ b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp @@ -153,7 +153,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6FuriTrap = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6FuriTrap, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv6FurikoTrap_c), // mSize 0, // mSizeOther 0, // mParameters @@ -439,4 +439,4 @@ void __sinit_d_a_obj_lv6FurikoTrap_cpp() { REGISTER_CTORS(0x80C730AC, __sinit_d_a_obj_lv6FurikoTrap_cpp); #pragma pop -/* 80C73198-80C73198 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C73198-80C73198 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp index 365a746e82..15feef76cc 100644 --- a/src/d/actor/d_a_obj_lv6Lblock.cpp +++ b/src/d/actor/d_a_obj_lv6Lblock.cpp @@ -160,7 +160,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6Lblock = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6Lblock, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv6Lblock_c), // mSize 0, // mSizeOther 0, // mParameters @@ -383,4 +383,4 @@ void __sinit_d_a_obj_lv6Lblock_cpp() { REGISTER_CTORS(0x80C73C6C, __sinit_d_a_obj_lv6Lblock_cpp); #pragma pop -/* 80C73CD8-80C73CD8 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C73CD8-80C73CD8 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index aead09f983..20552cb1bf 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -240,7 +240,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6SwGate = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6SwGate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv6SwGate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -582,4 +582,4 @@ void __sinit_d_a_obj_lv6SwGate_cpp() { REGISTER_CTORS(0x80C754A0, __sinit_d_a_obj_lv6SwGate_cpp); #pragma pop -/* 80C7558C-80C7558C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C7558C-80C7558C 000068 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp index 5d4327b27a..d5d1416d0e 100644 --- a/src/d/actor/d_a_obj_lv6SzGate.cpp +++ b/src/d/actor/d_a_obj_lv6SzGate.cpp @@ -235,7 +235,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6SzGate = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6SzGate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv6SzGate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -491,4 +491,4 @@ void __sinit_d_a_obj_lv6SzGate_cpp() { REGISTER_CTORS(0x80C765E0, __sinit_d_a_obj_lv6SzGate_cpp); #pragma pop -/* 80C7665C-80C7665C 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C7665C-80C7665C 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 4886efeef4..23e00c58d7 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -210,7 +210,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6Tenbin = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6Tenbin, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTenbin_c), // mSize 0, // mSizeOther 0, // mParameters @@ -414,4 +414,4 @@ void __sinit_d_a_obj_lv6Tenbin_cpp() { REGISTER_CTORS(0x80C77960, __sinit_d_a_obj_lv6Tenbin_cpp); #pragma pop -/* 80C779FC-80C779FC 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C779FC-80C779FC 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6TogeRoll.cpp b/src/d/actor/d_a_obj_lv6TogeRoll.cpp index 308dd17b29..b06ef875f1 100644 --- a/src/d/actor/d_a_obj_lv6TogeRoll.cpp +++ b/src/d/actor/d_a_obj_lv6TogeRoll.cpp @@ -318,7 +318,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6TogeRoll = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6TogeRoll, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTogeRoll_c), // mSize 0, // mSizeOther 0, // mParameters @@ -769,4 +769,4 @@ void __sinit_d_a_obj_lv6TogeRoll_cpp() { REGISTER_CTORS(0x80C7992C, __sinit_d_a_obj_lv6TogeRoll_cpp); #pragma pop -/* 80C79AE4-80C79AE4 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C79AE4-80C79AE4 000100 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index 6a279262ef..643ea9ed1d 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -423,7 +423,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6TogeTrap = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6TogeTrap, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv6TogeTrap_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1032,4 +1032,4 @@ void __sinit_d_a_obj_lv6TogeTrap_cpp() { REGISTER_CTORS(0x80C7C560, __sinit_d_a_obj_lv6TogeTrap_cpp); #pragma pop -/* 80C7C75C-80C7C75C 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C7C75C-80C7C75C 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index 399b721931..c928a93269 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -344,7 +344,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6bemos = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6bemos, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjL6Bm_c), // mSize 0, // mSizeOther 0, // mParameters @@ -607,4 +607,4 @@ static void func_80C7DEBC() { // NONMATCHING } -/* 80C7DF6C-80C7DF6C 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C7DF6C-80C7DF6C 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index f5d44ccc2f..0044e18e2a 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -500,7 +500,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6bemos2 = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6bemos2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv6Bm_c), // mSize 0, // mSizeOther 0, // mParameters @@ -993,4 +993,4 @@ SECTION_RODATA static f32 const lit_5280 = 6.0f; COMPILER_STRIP_GATE(0x80C81CC8, &lit_5280); #pragma pop -/* 80C81CCC-80C81CCC 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C81CCC-80C81CCC 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index c079553bbf..862d3e02fc 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -236,7 +236,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6EGate = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6EGate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv6EGate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -356,4 +356,4 @@ daObjLv6EGate_c::~daObjLv6EGate_c() { // NONMATCHING } -/* 80C82BA4-80C82BA4 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C82BA4-80C82BA4 000034 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6elevta.cpp b/src/d/actor/d_a_obj_lv6elevta.cpp index 7d2ac6c49c..ef92bc5712 100644 --- a/src/d/actor/d_a_obj_lv6elevta.cpp +++ b/src/d/actor/d_a_obj_lv6elevta.cpp @@ -203,7 +203,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6ElevtA = { 2, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6ElevtA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv6ElevtA_c), // mSize 0, // mSizeOther 0, // mParameters @@ -311,4 +311,4 @@ static void func_80C83800() { // NONMATCHING } -/* 80C83848-80C83848 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C83848-80C83848 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index d41119077c..de1a9ecf31 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -285,7 +285,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv6SwTurn = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv6SwTurn, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv6SwTurn_c), // mSize 0, // mSizeOther 0, // mParameters @@ -335,4 +335,4 @@ static void daObjLv6SwTurn_MoveBGDraw(daObjLv6SwTurn_c* param_0) { // NONMATCHING } -/* 80C846C4-80C846C4 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C846C4-80C846C4 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv7BsGate.cpp b/src/d/actor/d_a_obj_lv7BsGate.cpp index 4633a1a773..1c36b0437f 100644 --- a/src/d/actor/d_a_obj_lv7BsGate.cpp +++ b/src/d/actor/d_a_obj_lv7BsGate.cpp @@ -183,7 +183,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv7BsGate = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv7BsGate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv7BsGate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -400,4 +400,4 @@ void __sinit_d_a_obj_lv7BsGate_cpp() { REGISTER_CTORS(0x80C851C0, __sinit_d_a_obj_lv7BsGate_cpp); #pragma pop -/* 80C85234-80C85234 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C85234-80C85234 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv7PropellerY.cpp b/src/d/actor/d_a_obj_lv7PropellerY.cpp index a6c640c005..4aecb55a33 100644 --- a/src/d/actor/d_a_obj_lv7PropellerY.cpp +++ b/src/d/actor/d_a_obj_lv7PropellerY.cpp @@ -238,7 +238,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv7PropY = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv7PropY, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daPropY_c), // mSize 0, // mSizeOther 0, // mParameters @@ -467,4 +467,4 @@ void __sinit_d_a_obj_lv7PropellerY_cpp() { REGISTER_CTORS(0x80C860E0, __sinit_d_a_obj_lv7PropellerY_cpp); #pragma pop -/* 80C86160-80C86160 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C86160-80C86160 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 7d39248b56..2d4c0d8b7b 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -336,7 +336,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv7Bridge = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv7Bridge, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjLv7Brg_c), // mSize 0, // mSizeOther 0, // mParameters @@ -644,4 +644,4 @@ static void func_80C87990() { // NONMATCHING } -/* 80C87A20-80C87A20 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C87A20-80C87A20 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp index e948dbe5d2..ab36746a1f 100644 --- a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp +++ b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp @@ -177,7 +177,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv8KekkaiTrap, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daKekaiTrap_c), // mSize 0, // mSizeOther 0, // mParameters @@ -365,4 +365,4 @@ void __sinit_d_a_obj_lv8KekkaiTrap_cpp() { REGISTER_CTORS(0x80C88494, __sinit_d_a_obj_lv8KekkaiTrap_cpp); #pragma pop -/* 80C884F8-80C884F8 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C884F8-80C884F8 000014 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv8Lift.cpp b/src/d/actor/d_a_obj_lv8Lift.cpp index 525fe1728b..44e1ea1b5a 100644 --- a/src/d/actor/d_a_obj_lv8Lift.cpp +++ b/src/d/actor/d_a_obj_lv8Lift.cpp @@ -281,7 +281,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv8Lift = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv8Lift, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daL8Lift_c), // mSize 0, // mSizeOther 0, // mParameters @@ -733,4 +733,4 @@ static void func_80C89F44() { // NONMATCHING } -/* 80C89FFC-80C89FFC 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C89FFC-80C89FFC 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv8OptiLift.cpp b/src/d/actor/d_a_obj_lv8OptiLift.cpp index 2008c24831..59f663dd54 100644 --- a/src/d/actor/d_a_obj_lv8OptiLift.cpp +++ b/src/d/actor/d_a_obj_lv8OptiLift.cpp @@ -544,7 +544,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv8OptiLift = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv8OptiLift, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daOptiLift_c), // mSize 0, // mSizeOther 0, // mParameters @@ -554,4 +554,4 @@ extern actor_process_profile_definition g_profile_Obj_Lv8OptiLift = { 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_lv8UdFloor.cpp b/src/d/actor/d_a_obj_lv8UdFloor.cpp index 22941898a9..489e537231 100644 --- a/src/d/actor/d_a_obj_lv8UdFloor.cpp +++ b/src/d/actor/d_a_obj_lv8UdFloor.cpp @@ -200,7 +200,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv8UdFloor = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv8UdFloor, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daUdFloor_c), // mSize 0, // mSizeOther 0, // mParameters @@ -470,4 +470,4 @@ void __sinit_d_a_obj_lv8UdFloor_cpp() { REGISTER_CTORS(0x80C8CBA0, __sinit_d_a_obj_lv8UdFloor_cpp); #pragma pop -/* 80C8CC34-80C8CC34 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C8CC34-80C8CC34 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv9SwShutter.cpp b/src/d/actor/d_a_obj_lv9SwShutter.cpp index f252dd7515..db3e3d574d 100644 --- a/src/d/actor/d_a_obj_lv9SwShutter.cpp +++ b/src/d/actor/d_a_obj_lv9SwShutter.cpp @@ -171,7 +171,7 @@ extern actor_process_profile_definition g_profile_Obj_Lv9SwShutter = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv9SwShutter, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daLv9SwShutter_c), // mSize 0, // mSizeOther 0, // mParameters @@ -388,4 +388,4 @@ void __sinit_d_a_obj_lv9SwShutter_cpp() { REGISTER_CTORS(0x80C8D78C, __sinit_d_a_obj_lv9SwShutter_cpp); #pragma pop -/* 80C8D800-80C8D800 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C8D800-80C8D800 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_magLift.cpp b/src/d/actor/d_a_obj_magLift.cpp index 8af6cc5865..8bc3e861a7 100644 --- a/src/d/actor/d_a_obj_magLift.cpp +++ b/src/d/actor/d_a_obj_magLift.cpp @@ -199,7 +199,7 @@ extern actor_process_profile_definition g_profile_Obj_MagLift = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_MagLift, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daMagLift_c), // mSize 0, // mSizeOther 0, // mParameters @@ -497,4 +497,4 @@ void __sinit_d_a_obj_magLift_cpp() { REGISTER_CTORS(0x80C8E60C, __sinit_d_a_obj_magLift_cpp); #pragma pop -/* 80C8E6D0-80C8E6D0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C8E6D0-80C8E6D0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp index 4c5faecb3e..91d0b65816 100644 --- a/src/d/actor/d_a_obj_magLiftRot.cpp +++ b/src/d/actor/d_a_obj_magLiftRot.cpp @@ -269,7 +269,7 @@ extern actor_process_profile_definition g_profile_Obj_MagLiftRot = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_MagLiftRot, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000634, // mSize 0, // mSizeOther 0, // mParameters @@ -758,4 +758,4 @@ static int daMagLiftRot_Create(fopAc_ac_c* i_this) { // daMagLiftRot_HIO_c::~daMagLiftRot_HIO_c() { extern "C" void __dt__18daMagLiftRot_HIO_cFv() { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp index 490349c0de..b2bbbceb4a 100644 --- a/src/d/actor/d_a_obj_magne_arm.cpp +++ b/src/d/actor/d_a_obj_magne_arm.cpp @@ -817,7 +817,7 @@ extern actor_process_profile_definition g_profile_Obj_MagneArm = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_MagneArm, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjMarm_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1736,4 +1736,4 @@ static u8 data_80592E08[4]; static u8 data_80592E0C[4]; #pragma pop -/* 80592970-80592970 000128 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80592970-80592970 000128 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index dc175c1479..981d30f338 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -144,7 +144,7 @@ extern actor_process_profile_definition g_profile_OBJ_MAKI = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_MAKI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_maki_class), // mSize 0, // mSizeOther 0, // mParameters @@ -354,4 +354,4 @@ void __sinit_d_a_obj_maki_cpp() { REGISTER_CTORS(0x80C908E4, __sinit_d_a_obj_maki_cpp); #pragma pop -/* 80C90960-80C90960 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C90960-80C90960 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 56d9417bef..81b859b6c1 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -283,7 +283,7 @@ extern actor_process_profile_definition g_profile_Obj_MasterSword = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_MasterSword, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjMasterSword_c), // mSize 0, // mSizeOther 0, // mParameters @@ -646,4 +646,4 @@ static void func_80C9192C() { // NONMATCHING } -/* 80C91970-80C91970 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C91970-80C91970 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp index 85c675e8a5..01189a44e0 100644 --- a/src/d/actor/d_a_obj_mato.cpp +++ b/src/d/actor/d_a_obj_mato.cpp @@ -374,7 +374,7 @@ extern actor_process_profile_definition g_profile_Obj_Mato = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Mato, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjMATO_c), // mSize 0, // mSizeOther 0, // mParameters @@ -454,4 +454,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80C92CD4-80C92CD4 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C92CD4-80C92CD4 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_metalbox.cpp b/src/d/actor/d_a_obj_metalbox.cpp index e120d83635..c046576088 100644 --- a/src/d/actor/d_a_obj_metalbox.cpp +++ b/src/d/actor/d_a_obj_metalbox.cpp @@ -126,7 +126,7 @@ extern actor_process_profile_definition g_profile_Obj_MetalBox = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_MetalBox, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjMBox_c), // mSize 0, // mSizeOther 0, // mParameters @@ -249,4 +249,4 @@ static void func_8059345C() { // NONMATCHING } -/* 80593470-80593470 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80593470-80593470 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_mgate.cpp b/src/d/actor/d_a_obj_mgate.cpp index e0498b3165..da995eacd7 100644 --- a/src/d/actor/d_a_obj_mgate.cpp +++ b/src/d/actor/d_a_obj_mgate.cpp @@ -292,7 +292,7 @@ extern actor_process_profile_definition g_profile_Obj_MGate = { 3, fpcPi_CURRENT_e, PROC_Obj_MGate, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjMGate_c), 0, 0, @@ -302,4 +302,4 @@ extern actor_process_profile_definition g_profile_Obj_MGate = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index 5b6d81a99d..3ed1013611 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -292,7 +292,7 @@ extern actor_process_profile_definition g_profile_Obj_MHole = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_MHole, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjMHole_c), // mSize 0, // mSizeOther 0, // mParameters @@ -415,4 +415,4 @@ static void daObjMHole_Create(fopAc_ac_c* param_0) { // NONMATCHING } -/* 80C93E00-80C93E00 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C93E00-80C93E00 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index 70231a3bfc..4fe0c9a3cf 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -198,7 +198,7 @@ extern actor_process_profile_definition g_profile_OBJ_MIE = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_MIE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Mie_c), // mSize 0, // mSizeOther 0, // mParameters @@ -977,4 +977,4 @@ static u8 data_80C95D98[4]; static u8 data_80C95D9C[4]; #pragma pop -/* 80C95B80-80C95B80 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C95B80-80C95B80 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp index 3055ec706c..a552ccf0b1 100644 --- a/src/d/actor/d_a_obj_mirror_6pole.cpp +++ b/src/d/actor/d_a_obj_mirror_6pole.cpp @@ -199,7 +199,7 @@ extern actor_process_profile_definition g_profile_Obj_Mirror6Pole = { 3, fpcPi_CURRENT_e, PROC_Obj_Mirror6Pole, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjMirror6Pole_c), 0, 0, @@ -209,4 +209,4 @@ extern actor_process_profile_definition g_profile_Obj_Mirror6Pole = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp index 99a280f292..c7dd01b346 100644 --- a/src/d/actor/d_a_obj_mirror_chain.cpp +++ b/src/d/actor/d_a_obj_mirror_chain.cpp @@ -574,7 +574,7 @@ extern actor_process_profile_definition g_profile_Obj_MirrorChain = { 3, fpcPi_CURRENT_e, PROC_Obj_MirrorChain, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjMirrorChain_c), 0, 0, @@ -591,4 +591,4 @@ SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { (void*)NULL /* RTTI */, (void*)NULL, (void*)__dt__12J3DFrameCtrlFv, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_mirror_sand.cpp b/src/d/actor/d_a_obj_mirror_sand.cpp index 6b2c2b2cc3..964584cc35 100644 --- a/src/d/actor/d_a_obj_mirror_sand.cpp +++ b/src/d/actor/d_a_obj_mirror_sand.cpp @@ -189,7 +189,7 @@ extern actor_process_profile_definition g_profile_Obj_MirrorSand = { 3, fpcPi_CURRENT_e, PROC_Obj_MirrorSand, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjMirrorSand_c), 0, 0, @@ -199,4 +199,4 @@ extern actor_process_profile_definition g_profile_Obj_MirrorSand = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp index e2bab16481..50adcbdb44 100644 --- a/src/d/actor/d_a_obj_mirror_screw.cpp +++ b/src/d/actor/d_a_obj_mirror_screw.cpp @@ -302,7 +302,7 @@ extern actor_process_profile_definition g_profile_Obj_MirrorScrew = { 3, fpcPi_CURRENT_e, PROC_Obj_MirrorScrew, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjMirrorScrew_c), 0, 0, @@ -312,4 +312,4 @@ extern actor_process_profile_definition g_profile_Obj_MirrorScrew = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index aa9716e940..86b980c6b1 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -469,7 +469,7 @@ extern actor_process_profile_definition g_profile_Obj_MirrorTable = { 3, fpcPi_CURRENT_e, PROC_Obj_MirrorTable, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjMirrorTable_c), 0, 0, diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index bb6a1a2f6f..37fc1b4233 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -85,7 +85,7 @@ void daObjMovebox::Bgc_c::gnd_pos(const daObjMovebox::Act_c* i_actor, mDoMtx_stack_c::multVec(&sp50, &sp5C); M_gnd_work[i].SetPos(&sp5C); - M_gnd_work[i].SetActorPid(i_actor->mBase.mBsPcId); + M_gnd_work[i].SetActorPid(i_actor->base.id); field_0x0[i] = dComIfG_Bgsp().GroundCross(&M_gnd_work[i]); if (field_0x0[i] > var_f31) { @@ -166,7 +166,7 @@ void daObjMovebox::Bgc_c::wall_pos(daObjMovebox::Act_c const* i_actor, sp54 = sp48 + sp6C; M_wall_work[i].Set(&sp48, &sp54, i_actor); - M_wall_work[i].SetActorPid(i_actor->mBase.mBsPcId); + M_wall_work[i].SetActorPid(i_actor->base.id); if (dComIfG_Bgsp().LineCross(&M_wall_work[i])) { field_0x64[i] = M_wall_work[i].i_GetCross(); @@ -269,7 +269,7 @@ bool daObjMovebox::Bgc_c::chk_wall_touch(daObjMovebox::Act_c const* i_actor, sp38 += i_actor->current.pos; sp44 = sp38 + sp68; - touch_work.SetActorPid(i_actor->mBase.mBsPcId); + touch_work.SetActorPid(i_actor->base.id); touch_work.Set(&sp38, &sp44, i_actor); return dComIfG_Bgsp().LineCross(&touch_work); } @@ -1323,7 +1323,7 @@ extern actor_process_profile_definition g_profile_Obj_Movebox = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Movebox, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjMovebox::Act_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index eb534d2996..e22da5e116 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -141,7 +141,7 @@ extern actor_process_profile_definition g_profile_OBJ_MSIMA = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_MSIMA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_msima_class), // mSize 0, // mSizeOther 0, // mParameters @@ -889,4 +889,4 @@ static u8 data_80C9CFFC[4]; static u8 data_80C9D000[4]; #pragma pop -/* 80C9CDEC-80C9CDEC 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C9CDEC-80C9CDEC 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_mvstair.cpp b/src/d/actor/d_a_obj_mvstair.cpp index 7cbd54aedd..72e80b76f9 100644 --- a/src/d/actor/d_a_obj_mvstair.cpp +++ b/src/d/actor/d_a_obj_mvstair.cpp @@ -493,7 +493,7 @@ extern actor_process_profile_definition g_profile_Obj_MvStair = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_MvStair, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjStair_c), // mSize 0, // mSizeOther 0, // mParameters @@ -612,4 +612,4 @@ extern "C" void drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } -/* 80C9E90C-80C9E90C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80C9E90C-80C9E90C 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp index ef4c5ca463..137c069188 100644 --- a/src/d/actor/d_a_obj_myogan.cpp +++ b/src/d/actor/d_a_obj_myogan.cpp @@ -185,7 +185,7 @@ extern actor_process_profile_definition g_profile_OBJ_MYOGAN = { 3, fpcPi_CURRENT_e, PROC_OBJ_MYOGAN, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(obj_myogan_class), 0, 0, @@ -195,4 +195,4 @@ extern actor_process_profile_definition g_profile_OBJ_MYOGAN = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index 9e68ae4e90..13cab43fb8 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -136,7 +136,7 @@ extern actor_process_profile_definition g_profile_Obj_Nagaisu = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Nagaisu, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjNagaisu_c), // mSize 0, // mSizeOther 0, // mParameters @@ -458,4 +458,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80CA0400-80CA0400 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CA0400-80CA0400 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index d104eda9ed..da44645831 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -300,7 +300,7 @@ extern actor_process_profile_definition g_profile_Obj_NamePlate = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_NamePlate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjNameplate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -375,4 +375,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80594F0C-80594F0C 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80594F0C-80594F0C 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index 224207f058..6e0fe5183f 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -328,7 +328,7 @@ extern actor_process_profile_definition g_profile_Obj_Nan = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Nan, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjNAN_c), // mSize 0, // mSizeOther 0, // mParameters @@ -962,4 +962,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80CA32A0-80CA32A0 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CA32A0-80CA32A0 0000E4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ndoor.cpp b/src/d/actor/d_a_obj_ndoor.cpp index 9bd1deb497..fa49d99905 100644 --- a/src/d/actor/d_a_obj_ndoor.cpp +++ b/src/d/actor/d_a_obj_ndoor.cpp @@ -184,7 +184,7 @@ extern actor_process_profile_definition g_profile_OBJ_NDOOR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_NDOOR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_ndoor_class), // mSize 0, // mSizeOther 0, // mParameters @@ -228,4 +228,4 @@ extern "C" void __dt__8cM3dGAabFv() { // NONMATCHING } -/* 80CA3A6C-80CA3A6C 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CA3A6C-80CA3A6C 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_nougu.cpp b/src/d/actor/d_a_obj_nougu.cpp index 37f861dc85..c320b556c9 100644 --- a/src/d/actor/d_a_obj_nougu.cpp +++ b/src/d/actor/d_a_obj_nougu.cpp @@ -138,7 +138,7 @@ extern actor_process_profile_definition g_profile_OBJ_NOUGU = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_NOUGU, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Nougu_c), // mSize 0, // mSizeOther 0, // mParameters @@ -477,4 +477,4 @@ static void func_80CA499C() { // NONMATCHING } -/* 80CA49F8-80CA49F8 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CA49F8-80CA49F8 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index adcdd044a0..32b0011f5d 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -527,7 +527,7 @@ extern actor_process_profile_definition g_profile_OCTHASHI = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OCTHASHI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjOCTHASHI_c), // mSize 0, // mSizeOther 0, // mParameters @@ -685,4 +685,4 @@ void daObjOCTHASHI_c::Delete() { // NONMATCHING } -/* 80CA6550-80CA6550 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CA6550-80CA6550 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index 25fd50d0b0..991f33e1a8 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -339,7 +339,7 @@ extern actor_process_profile_definition g_profile_OBJ_OILTUBO = { 7, fpcPi_CURRENT_e, PROC_OBJ_OILTUBO, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObj_Oiltubo_c), 0, 0, @@ -349,4 +349,4 @@ extern actor_process_profile_definition g_profile_OBJ_OILTUBO = { 0x44100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_onsen.cpp b/src/d/actor/d_a_obj_onsen.cpp index 021a169db0..fb5c1ba1f1 100644 --- a/src/d/actor/d_a_obj_onsen.cpp +++ b/src/d/actor/d_a_obj_onsen.cpp @@ -152,7 +152,7 @@ extern actor_process_profile_definition g_profile_Obj_Onsen = { 3, fpcPi_CURRENT_e, PROC_Obj_Onsen, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjOnsen_c), 0, 0, @@ -162,4 +162,4 @@ extern actor_process_profile_definition g_profile_Obj_Onsen = { 0x44100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_onsenFire.cpp b/src/d/actor/d_a_obj_onsenFire.cpp index 9fe898a48a..0d11daa732 100644 --- a/src/d/actor/d_a_obj_onsenFire.cpp +++ b/src/d/actor/d_a_obj_onsenFire.cpp @@ -56,7 +56,7 @@ extern actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_ONSEN_FIRE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjOnsenFire_c), // mSize 0, // mSizeOther 0, // mParameters @@ -66,4 +66,4 @@ extern actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index de99180aaa..0698b1f850 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -439,7 +439,7 @@ extern actor_process_profile_definition g_profile_Obj_OnsenTaru = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_OnsenTaru, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daOnsTaru_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index da3ea7c939..4981da97d8 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -274,7 +274,7 @@ extern actor_process_profile_definition g_profile_Obj_OnCloth = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_OnCloth, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjOnCloth_c), // mSize 0, // mSizeOther 0, // mParameters @@ -340,4 +340,4 @@ ClothJoint_c::ClothJoint_c() { /* empty function */ } -/* 80595D38-80595D38 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80595D38-80595D38 000084 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index f82d37b0b1..2bcee457cf 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -284,7 +284,7 @@ extern actor_process_profile_definition g_profile_Obj_PushDoor = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_PushDoor, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjPDoor_c), // mSize 0, // mSizeOther 0, // mParameters @@ -331,4 +331,4 @@ static void daObjPDoor_MoveBGDraw(daObjPDoor_c* param_0) { // NONMATCHING } -/* 80CAAB40-80CAAB40 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CAAB40-80CAAB40 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index 2a727db6a8..649de27466 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -467,7 +467,7 @@ extern actor_process_profile_definition g_profile_Obj_PDtile = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_PDtile, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjPDtile_c), // mSize 0, // mSizeOther 0, // mParameters @@ -632,4 +632,4 @@ static void func_80CAC4FC() { // NONMATCHING } -/* 80CAC580-80CAC580 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CAC580-80CAC580 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index f6079d9f5e..376af3f241 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -203,7 +203,7 @@ extern actor_process_profile_definition g_profile_Obj_PDwall = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_PDwall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjPDwall_c), // mSize 0, // mSizeOther 0, // mParameters @@ -257,4 +257,4 @@ daObjPDwall_c::~daObjPDwall_c() { // NONMATCHING } -/* 80CAD1F4-80CAD1F4 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CAD1F4-80CAD1F4 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 813435c981..c4f783e601 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -195,7 +195,7 @@ extern actor_process_profile_definition g_profile_Obj_Picture = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Picture, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjPicture_c), // mSize 0, // mSizeOther 0, // mParameters @@ -680,4 +680,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80CAF0DC-80CAF0DC 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CAF0DC-80CAF0DC 0000C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index 08d3593767..8edb619e11 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -266,7 +266,7 @@ extern actor_process_profile_definition g_profile_Obj_Pillar = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Pillar, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daPillar_c), // mSize 0, // mSizeOther 0, // mParameters @@ -648,4 +648,4 @@ void __sinit_d_a_obj_pillar_cpp() { REGISTER_CTORS(0x80CB0984, __sinit_d_a_obj_pillar_cpp); #pragma pop -/* 80CB0ACC-80CB0ACC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CB0ACC-80CB0ACC 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_pleaf.cpp b/src/d/actor/d_a_obj_pleaf.cpp index 577d2aaa1c..33a09c5e7e 100644 --- a/src/d/actor/d_a_obj_pleaf.cpp +++ b/src/d/actor/d_a_obj_pleaf.cpp @@ -177,7 +177,7 @@ extern actor_process_profile_definition g_profile_OBJ_PLEAF = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_PLEAF, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Pleaf_c), // mSize 0, // mSizeOther 0, // mParameters @@ -190,4 +190,4 @@ extern actor_process_profile_definition g_profile_OBJ_PLEAF = { }; /* 80CB197C-80CB1980 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ -static daObj_Pleaf_Param_c l_HIO; \ No newline at end of file +static daObj_Pleaf_Param_c l_HIO; diff --git a/src/d/actor/d_a_obj_poCandle.cpp b/src/d/actor/d_a_obj_poCandle.cpp index 99d4ec1c6a..5295200132 100644 --- a/src/d/actor/d_a_obj_poCandle.cpp +++ b/src/d/actor/d_a_obj_poCandle.cpp @@ -186,7 +186,7 @@ extern actor_process_profile_definition g_profile_Obj_poCandle = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_poCandle, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daPoCandle_c), // mSize 0, // mSizeOther 0, // mParameters @@ -519,4 +519,4 @@ daPoCandle_c::~daPoCandle_c() { // NONMATCHING } -/* 80CB26E8-80CB26E8 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CB26E8-80CB26E8 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index 389510f885..1d738bc726 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -307,7 +307,7 @@ extern actor_process_profile_definition g_profile_Obj_poFire = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Lv4Candle, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daPoFire_c), // mSize 0, // mSizeOther 0, // mParameters @@ -704,4 +704,4 @@ daPoFire_c::~daPoFire_c() { // NONMATCHING } -/* 80CB3F3C-80CB3F3C 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CB3F3C-80CB3F3C 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp index 788407109f..280afce12e 100644 --- a/src/d/actor/d_a_obj_poTbox.cpp +++ b/src/d/actor/d_a_obj_poTbox.cpp @@ -206,7 +206,7 @@ extern actor_process_profile_definition g_profile_Obj_poTbox = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_poTbox, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daPoTbox_c), // mSize 0, // mSizeOther 0, // mParameters @@ -406,4 +406,4 @@ void __sinit_d_a_obj_poTbox_cpp() { REGISTER_CTORS(0x80CB4F70, __sinit_d_a_obj_poTbox_cpp); #pragma pop -/* 80CB4FDC-80CB4FDC 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CB4FDC-80CB4FDC 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp index 7d5f37f224..b9de1a7943 100644 --- a/src/d/actor/d_a_obj_prop.cpp +++ b/src/d/actor/d_a_obj_prop.cpp @@ -121,7 +121,7 @@ extern actor_process_profile_definition g_profile_Obj_Prop = { 7, fpcPi_CURRENT_e, PROC_Obj_Prop, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjProp_c), 0, 0, @@ -131,4 +131,4 @@ extern actor_process_profile_definition g_profile_Obj_Prop = { 0x40000, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index e80b1d78bf..61f14f24d9 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -238,7 +238,7 @@ extern actor_process_profile_definition g_profile_OBJ_PUMPKIN = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_PUMPKIN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Pumpkin_c), // mSize 0, // mSizeOther 0, // mParameters @@ -785,4 +785,4 @@ static void func_80CB8354() { // NONMATCHING } -/* 80CB8460-80CB8460 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CB8460-80CB8460 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_rcircle.cpp b/src/d/actor/d_a_obj_rcircle.cpp index dc3674918a..d52588cdaf 100644 --- a/src/d/actor/d_a_obj_rcircle.cpp +++ b/src/d/actor/d_a_obj_rcircle.cpp @@ -142,7 +142,7 @@ extern actor_process_profile_definition g_profile_Obj_RCircle = { 7, fpcPi_CURRENT_e, PROC_Obj_RCircle, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjRCircle_c), 0, 0, @@ -152,4 +152,4 @@ extern actor_process_profile_definition g_profile_Obj_RCircle = { 0x44180, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp index 3f2486a626..a35515c0b1 100644 --- a/src/d/actor/d_a_obj_rfHole.cpp +++ b/src/d/actor/d_a_obj_rfHole.cpp @@ -250,7 +250,7 @@ extern actor_process_profile_definition g_profile_Obj_RfHole = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_RfHole, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daRfHole_c), // mSize 0, // mSizeOther 0, // mParameters @@ -262,4 +262,4 @@ extern actor_process_profile_definition g_profile_Obj_RfHole = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80CB9AC0-80CB9AC0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CB9AC0-80CB9AC0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 4ec283c84c..573f271af3 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -938,7 +938,7 @@ extern actor_process_profile_definition g_profile_Obj_RiderGate = { 3, fpcPi_CURRENT_e, PROC_Obj_RiderGate, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjRgate_c), 0, 0, @@ -948,4 +948,4 @@ extern actor_process_profile_definition g_profile_Obj_RiderGate = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index ae7a04de4d..7e946e3122 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -144,7 +144,7 @@ extern actor_process_profile_definition g_profile_Obj_RIVERROCK = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_RIVERROCK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjRIVERROCK_c), // mSize 0, // mSizeOther 0, // mParameters @@ -558,4 +558,4 @@ void __sinit_d_a_obj_riverrock_cpp() { REGISTER_CTORS(0x80CBDA0C, __sinit_d_a_obj_riverrock_cpp); #pragma pop -/* 80CBDB14-80CBDB14 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CBDB14-80CBDB14 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp index b217607d8d..fe32fb591d 100644 --- a/src/d/actor/d_a_obj_rock.cpp +++ b/src/d/actor/d_a_obj_rock.cpp @@ -221,7 +221,7 @@ extern actor_process_profile_definition g_profile_OBJ_ROCK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_ROCK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_rock_class), // mSize 0, // mSizeOther 0, // mParameters @@ -231,4 +231,4 @@ extern actor_process_profile_definition g_profile_OBJ_ROCK = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index 0df9cc276b..d843c30b66 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -580,7 +580,7 @@ extern actor_process_profile_definition g_profile_Obj_RopeBridge = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_RopeBridge, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjRBridge_c), // mSize 0, // mSizeOther 0, // mParameters @@ -833,4 +833,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80597E40-80597E40 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80597E40-80597E40 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index 8c85781ca6..064c5d3811 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -120,7 +120,7 @@ extern actor_process_profile_definition g_profile_Obj_RotBridge = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_RotBridge, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daRotBridge_c), // mSize 0, // mSizeOther 0, // mParameters @@ -368,4 +368,4 @@ void __sinit_d_a_obj_rotBridge_cpp() { REGISTER_CTORS(0x80CBF618, __sinit_d_a_obj_rotBridge_cpp); #pragma pop -/* 80CBF6C4-80CBF6C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CBF6C4-80CBF6C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index b2402a4c9d..87d997ae74 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -228,7 +228,7 @@ extern actor_process_profile_definition g_profile_Obj_RotTrap = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_RotTrap, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daRotTrap_c), // mSize 0, // mSizeOther 0, // mParameters @@ -522,4 +522,4 @@ void __sinit_d_a_obj_rotTrap_cpp() { REGISTER_CTORS(0x80CC0784, __sinit_d_a_obj_rotTrap_cpp); #pragma pop -/* 80CC0858-80CC0858 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CC0858-80CC0858 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index ac114cbeca..8b9903ed4d 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -194,7 +194,7 @@ extern actor_process_profile_definition g_profile_OBJ_ROTEN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_ROTEN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Roten_c), // mSize 0, // mSizeOther 0, // mParameters @@ -318,4 +318,4 @@ daObj_Roten_c::~daObj_Roten_c() { // NONMATCHING } -/* 80CC1440-80CC1440 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CC1440-80CC1440 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp index e33cdfbb3b..668cc5d16b 100644 --- a/src/d/actor/d_a_obj_rstair.cpp +++ b/src/d/actor/d_a_obj_rstair.cpp @@ -280,7 +280,7 @@ extern actor_process_profile_definition g_profile_Obj_RotStair = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_RotStair, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjRotStair_c), // mSize 0, // mSizeOther 0, // mParameters @@ -472,4 +472,4 @@ static void daObjRotStair_MoveBGDraw(daObjRotStair_c* param_0) { // NONMATCHING } -/* 80CC2730-80CC2730 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CC2730-80CC2730 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index 37e989ebab..d735beea85 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -173,7 +173,7 @@ extern actor_process_profile_definition g_profile_OBJ_RW = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_RW, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_rw_class), // mSize 0, // mSizeOther 0, // mParameters @@ -496,4 +496,4 @@ void __sinit_d_a_obj_rw_cpp() { REGISTER_CTORS(0x80CC3AA4, __sinit_d_a_obj_rw_cpp); #pragma pop -/* 80CC3B4C-80CC3B4C 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CC3B4C-80CC3B4C 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_sWallShutter.cpp b/src/d/actor/d_a_obj_sWallShutter.cpp index 0d646f17ba..c3ef9d60e7 100644 --- a/src/d/actor/d_a_obj_sWallShutter.cpp +++ b/src/d/actor/d_a_obj_sWallShutter.cpp @@ -289,7 +289,7 @@ extern actor_process_profile_definition g_profile_Obj_SwallShutter = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SwallShutter, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSwShutter_c), // mSize 0, // mSizeOther 0, // mParameters @@ -299,4 +299,4 @@ extern actor_process_profile_definition g_profile_Obj_SwallShutter = { 0x00044000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_saidan.cpp b/src/d/actor/d_a_obj_saidan.cpp index de0225e8a2..4780b40ca3 100644 --- a/src/d/actor/d_a_obj_saidan.cpp +++ b/src/d/actor/d_a_obj_saidan.cpp @@ -199,7 +199,7 @@ extern actor_process_profile_definition g_profile_Obj_Saidan = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Saidan, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSaidan_c), // mSize 0, // mSizeOther 0, // mParameters @@ -209,4 +209,4 @@ extern actor_process_profile_definition g_profile_Obj_Saidan = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index 8514656e1e..79502a52a2 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -249,7 +249,7 @@ extern actor_process_profile_definition g_profile_Obj_Sakuita = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Sakuita, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSakuita_c), // mSize 0, // mSizeOther 0, // mParameters @@ -324,4 +324,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80CC5114-80CC5114 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CC5114-80CC5114 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index 0ce32cc7c8..e46763af36 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -407,7 +407,7 @@ extern actor_process_profile_definition g_profile_Obj_ItaRope = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_ItaRope, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjItaRope_c), // mSize 0, // mSizeOther 0, // mParameters @@ -461,4 +461,4 @@ extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING } -/* 80CC6970-80CC6970 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CC6970-80CC6970 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 74d3ea3b8b..66a35998d2 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -516,7 +516,7 @@ extern actor_process_profile_definition g_profile_Obj_SCannon = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SCannon, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSCannon_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1057,4 +1057,4 @@ static void func_80CC9174() { // NONMATCHING } -/* 80CC9224-80CC9224 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CC9224-80CC9224 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index 6b59f055ae..7c4d578564 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -279,7 +279,7 @@ extern actor_process_profile_definition g_profile_Obj_SCannonCrs = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SCannonCrs, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSCannonCrs_c), // mSize 0, // mSizeOther 0, // mParameters @@ -658,4 +658,4 @@ void __sinit_d_a_obj_scannon_crs_cpp() { REGISTER_CTORS(0x80CCAFD4, __sinit_d_a_obj_scannon_crs_cpp); #pragma pop -/* 80CCB114-80CCB114 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CCB114-80CCB114 000094 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index c1bd32f77f..6700eb9302 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -405,7 +405,7 @@ extern actor_process_profile_definition g_profile_Obj_SCannonTen = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SCannonTen, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSCannonTen_c), // mSize 0, // mSizeOther 0, // mParameters @@ -837,4 +837,4 @@ static void func_80CCCC24() { // NONMATCHING } -/* 80CCCC80-80CCCC80 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CCCC80-80CCCC80 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_sekidoor.cpp b/src/d/actor/d_a_obj_sekidoor.cpp index d0b459cc1a..6432e970c7 100644 --- a/src/d/actor/d_a_obj_sekidoor.cpp +++ b/src/d/actor/d_a_obj_sekidoor.cpp @@ -140,7 +140,7 @@ extern actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_SEKIDOOR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_SekiDoor_c), // mSize 0, // mSizeOther 0, // mParameters @@ -343,4 +343,4 @@ daObj_SekiDoor_Param_c::~daObj_SekiDoor_Param_c() { // NONMATCHING } -/* 80CCDA30-80CCDA30 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CCDA30-80CCDA30 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_sekizo.cpp b/src/d/actor/d_a_obj_sekizo.cpp index aaa8ac2d7f..340b11a0a4 100644 --- a/src/d/actor/d_a_obj_sekizo.cpp +++ b/src/d/actor/d_a_obj_sekizo.cpp @@ -171,7 +171,7 @@ extern actor_process_profile_definition g_profile_OBJ_SEKIZO = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_SEKIZO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Sekizo_c), // mSize 0, // mSizeOther 0, // mParameters @@ -181,4 +181,4 @@ extern actor_process_profile_definition g_profile_OBJ_SEKIZO = { 0x44000, // status fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 79197df6f8..05f1738d1e 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -330,7 +330,7 @@ extern actor_process_profile_definition g_profile_Obj_Shield = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Shield, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daItemShield_c), // mSize 0, // mSizeOther 0, // mParameters @@ -756,4 +756,4 @@ static void func_80CD8264() { // NONMATCHING } -/* 80CD832C-80CD832C 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CD832C-80CD832C 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_sm_door.cpp b/src/d/actor/d_a_obj_sm_door.cpp index b64078c093..92e6e47b8d 100644 --- a/src/d/actor/d_a_obj_sm_door.cpp +++ b/src/d/actor/d_a_obj_sm_door.cpp @@ -319,7 +319,7 @@ extern actor_process_profile_definition g_profile_Obj_SM_DOOR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SM_DOOR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSM_DOOR_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index 976fdd3e49..8d2d484111 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -375,7 +375,7 @@ extern actor_process_profile_definition g_profile_Obj_SmallKey = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SmallKey, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daKey_c), // mSize 0, // mSizeOther 0, // mParameters @@ -855,4 +855,4 @@ static void func_80CDB7E4() { // NONMATCHING } -/* 80CDB890-80CDB890 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CDB890-80CDB890 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index 248e43217a..881af95c4d 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -442,7 +442,7 @@ extern actor_process_profile_definition g_profile_Obj_SmgDoor = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SmgDoor, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSmgDoor_c), // mSize 0, // mSizeOther 0, // mParameters @@ -497,4 +497,4 @@ extern "C" void func_80CDCBD0(void* _this, u8* param_0) { // NONMATCHING } -/* 80CDCC24-80CDCC24 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CDCC24-80CDCC24 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_smoke.cpp b/src/d/actor/d_a_obj_smoke.cpp index 1cfdfc3337..71bc0173d8 100644 --- a/src/d/actor/d_a_obj_smoke.cpp +++ b/src/d/actor/d_a_obj_smoke.cpp @@ -89,7 +89,7 @@ extern actor_process_profile_definition g_profile_Obj_Smoke = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Smoke, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSmoke_c), // mSize 0, // mSizeOther 0, // mParameters @@ -99,4 +99,4 @@ extern actor_process_profile_definition g_profile_Obj_Smoke = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp index e3c061d198..a214fded4a 100644 --- a/src/d/actor/d_a_obj_smtile.cpp +++ b/src/d/actor/d_a_obj_smtile.cpp @@ -135,7 +135,7 @@ extern actor_process_profile_definition g_profile_OBJ_SMTILE = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_SMTILE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_SMTile_c), // mSize 0, // mSizeOther 0, // mParameters @@ -358,4 +358,4 @@ daObj_SMTile_Param_c::~daObj_SMTile_Param_c() { // NONMATCHING } -/* 80CDE388-80CDE388 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CDE388-80CDE388 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_smw_stone.cpp b/src/d/actor/d_a_obj_smw_stone.cpp index d5c00ed7c1..ee3ff5b57c 100644 --- a/src/d/actor/d_a_obj_smw_stone.cpp +++ b/src/d/actor/d_a_obj_smw_stone.cpp @@ -221,7 +221,7 @@ extern actor_process_profile_definition g_profile_Obj_SmWStone = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SmWStone, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSmWStone_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_snowEffTag.cpp b/src/d/actor/d_a_obj_snowEffTag.cpp index 091a58efde..1b8894bc1f 100644 --- a/src/d/actor/d_a_obj_snowEffTag.cpp +++ b/src/d/actor/d_a_obj_snowEffTag.cpp @@ -151,7 +151,7 @@ extern actor_process_profile_definition g_profile_Tag_SnowEff = { 7, fpcPi_CURRENT_e, PROC_Tag_SnowEff, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daSnowEffTag_c), 0, 0, @@ -161,4 +161,4 @@ extern actor_process_profile_definition g_profile_Tag_SnowEff = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp index f779e03dad..062665958d 100644 --- a/src/d/actor/d_a_obj_snow_soup.cpp +++ b/src/d/actor/d_a_obj_snow_soup.cpp @@ -215,7 +215,7 @@ extern actor_process_profile_definition g_profile_Obj_SnowSoup = { 7, fpcPi_CURRENT_e, PROC_Obj_SnowSoup, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjSnowSoup_c), 0, 0, @@ -225,4 +225,4 @@ extern actor_process_profile_definition g_profile_Obj_SnowSoup = { 0x44100, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index cb04a545c5..7f49ac6b17 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -215,7 +215,7 @@ extern actor_process_profile_definition g_profile_OBJ_SO = { 2, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_SO, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_so_class), // mSize 0, // mSizeOther 0, // mParameters @@ -1130,4 +1130,4 @@ static void func_80CE39CC() { // NONMATCHING } -/* 80CE3B60-80CE3B60 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CE3B60-80CE3B60 000178 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index 99c4004a3f..c8a2dc3923 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -202,7 +202,7 @@ extern actor_process_profile_definition g_profile_Obj_SpinLift = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SpinLift, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSpinLift_c), // mSize 0, // mSizeOther 0, // mParameters @@ -451,4 +451,4 @@ void __sinit_d_a_obj_spinLift_cpp() { REGISTER_CTORS(0x80CE4C6C, __sinit_d_a_obj_spinLift_cpp); #pragma pop -/* 80CE4D30-80CE4D30 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CE4D30-80CE4D30 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index bc926d22e7..6699c65909 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -283,7 +283,7 @@ extern actor_process_profile_definition g_profile_OBJ_SSDRINK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_SSDRINK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_SSDrink_c), // mSize 0, // mSizeOther 0, // mParameters @@ -713,4 +713,4 @@ extern "C" void __dt__12dBgS_ObjAcchFv() { // NONMATCHING } -/* 80CE6990-80CE6990 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CE6990-80CE6990 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ss_item.cpp b/src/d/actor/d_a_obj_ss_item.cpp index 58d48e7541..f1cb2cbabe 100644 --- a/src/d/actor/d_a_obj_ss_item.cpp +++ b/src/d/actor/d_a_obj_ss_item.cpp @@ -370,7 +370,7 @@ extern actor_process_profile_definition g_profile_OBJ_SSITEM = { 7, fpcLy_CURRENT_e, PROC_OBJ_SSITEM, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObj_SSItem_c), 0, 0, @@ -380,4 +380,4 @@ extern actor_process_profile_definition g_profile_OBJ_SSITEM = { 0x44100, 0, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_stairBlock.cpp b/src/d/actor/d_a_obj_stairBlock.cpp index cbc3c98c6b..6209440b8e 100644 --- a/src/d/actor/d_a_obj_stairBlock.cpp +++ b/src/d/actor/d_a_obj_stairBlock.cpp @@ -128,7 +128,7 @@ extern actor_process_profile_definition g_profile_Obj_StairBlock = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_StairBlock, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daStairBlock_c), // mSize 0, // mSizeOther 0, // mParameters @@ -400,4 +400,4 @@ void __sinit_d_a_obj_stairBlock_cpp() { REGISTER_CTORS(0x80CE8D38, __sinit_d_a_obj_stairBlock_cpp); #pragma pop -/* 80CE8ECC-80CE8ECC 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CE8ECC-80CE8ECC 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_stick.cpp b/src/d/actor/d_a_obj_stick.cpp index 8e0c2c4aac..12882bb8d1 100644 --- a/src/d/actor/d_a_obj_stick.cpp +++ b/src/d/actor/d_a_obj_stick.cpp @@ -130,7 +130,7 @@ extern actor_process_profile_definition g_profile_OBJ_STICK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_STICK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_Stick_c), // mSize 0, // mSizeOther 0, // mParameters @@ -413,4 +413,4 @@ static void func_80599E20() { // NONMATCHING } -/* 80599E68-80599E68 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80599E68-80599E68 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index e19beca739..8e7f24b3f1 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -537,7 +537,7 @@ extern actor_process_profile_definition g_profile_Obj_Stone = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Stone, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjStone_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1510,4 +1510,4 @@ static void func_80CECAA4() { // NONMATCHING } -/* 80CECC3C-80CECC3C 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CECC3C-80CECC3C 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_stoneMark.cpp b/src/d/actor/d_a_obj_stoneMark.cpp index 6503c1d524..a72961b16e 100644 --- a/src/d/actor/d_a_obj_stoneMark.cpp +++ b/src/d/actor/d_a_obj_stoneMark.cpp @@ -104,7 +104,7 @@ extern actor_process_profile_definition g_profile_Obj_StoneMark = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_StoneMark, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSMark_c), // mSize 0, // mSizeOther 0, // mParameters @@ -114,4 +114,4 @@ extern actor_process_profile_definition g_profile_Obj_StoneMark = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLSPHERE_8_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp index e699451f91..67d4577a2a 100644 --- a/src/d/actor/d_a_obj_stopper.cpp +++ b/src/d/actor/d_a_obj_stopper.cpp @@ -430,7 +430,7 @@ extern actor_process_profile_definition g_profile_Obj_Stopper = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Stopper, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjStopper_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1002,4 +1002,4 @@ static u8 data_80CEF2A4[4]; static u8 data_80CEF2A8[4]; #pragma pop -/* 80CEEFF0-80CEEFF0 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CEEFF0-80CEEFF0 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_stopper2.cpp b/src/d/actor/d_a_obj_stopper2.cpp index d13652c7b6..89bae15501 100644 --- a/src/d/actor/d_a_obj_stopper2.cpp +++ b/src/d/actor/d_a_obj_stopper2.cpp @@ -380,7 +380,7 @@ extern actor_process_profile_definition g_profile_Obj_Stopper2 = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Stopper2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjStopper2_c), // mSize 0, // mSizeOther 0, // mParameters @@ -390,4 +390,4 @@ extern actor_process_profile_definition g_profile_Obj_Stopper2 = { 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_suisya.cpp b/src/d/actor/d_a_obj_suisya.cpp index b993ca1244..8c88f61c9d 100644 --- a/src/d/actor/d_a_obj_suisya.cpp +++ b/src/d/actor/d_a_obj_suisya.cpp @@ -120,7 +120,7 @@ extern actor_process_profile_definition g_profile_OBJ_SUISYA = { 7, fpcPi_CURRENT_e, PROC_OBJ_SUISYA, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObj_Suisya_c), 0, 0, @@ -130,4 +130,4 @@ extern actor_process_profile_definition g_profile_OBJ_SUISYA = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index 974dcf2539..1449894ddc 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -659,7 +659,7 @@ extern actor_process_profile_definition g_profile_OBJ_SW = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_SW, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_sw_class), // mSize 0, // mSizeOther 0, // mParameters @@ -703,4 +703,4 @@ extern "C" void getLeftHandPos__9daPy_py_cCFv() { // NONMATCHING } -/* 80CF30EC-80CF30EC 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CF30EC-80CF30EC 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp index 9d58f344ff..b25c82d9b9 100644 --- a/src/d/actor/d_a_obj_swBallA.cpp +++ b/src/d/actor/d_a_obj_swBallA.cpp @@ -344,7 +344,7 @@ extern actor_process_profile_definition g_profile_Obj_SwBallA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SwBallA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSwBallA_c), // mSize 0, // mSizeOther 0, // mParameters @@ -669,4 +669,4 @@ static void func_80CF43D4() { // NONMATCHING } -/* 80CF4410-80CF4410 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CF4410-80CF4410 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swBallB.cpp b/src/d/actor/d_a_obj_swBallB.cpp index 0418276749..0d65f5d356 100644 --- a/src/d/actor/d_a_obj_swBallB.cpp +++ b/src/d/actor/d_a_obj_swBallB.cpp @@ -360,7 +360,7 @@ extern actor_process_profile_definition g_profile_Obj_SwBallB = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SwBallB, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSwBallB_c), // mSize 0, // mSizeOther 0, // mParameters @@ -726,4 +726,4 @@ static void func_80CF59C0() { // NONMATCHING } -/* 80CF5A14-80CF5A14 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CF5A14-80CF5A14 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index 0ca15250c0..a086736671 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -309,10 +309,10 @@ int daObjSwBallC_c::demoProc() { } else { msg_class* msg = fopMsgM_SearchByID(field_0x588); if (msg != NULL) { - if (msg->mMode == 0xe) { - msg->mMode = 0x10; - } else if (msg->mMode == 0x12) { - msg->mMode = 0x13; + if (msg->mode == 0xe) { + msg->mode = 0x10; + } else if (msg->mode == 0x12) { + msg->mode = 0x13; dComIfGp_evmng_cutEnd(field_0x578); } } @@ -469,7 +469,7 @@ extern actor_process_profile_definition g_profile_Obj_SwBallC = { 7, fpcPi_CURRENT_e, PROC_Obj_SwBallC, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjSwBallC_c), 0, 0, @@ -479,4 +479,4 @@ extern actor_process_profile_definition g_profile_Obj_SwBallC = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 091694c39d..59d232afa8 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -449,7 +449,7 @@ extern actor_process_profile_definition g_profile_Obj_SwLight = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SwLight, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSwLight_c), // mSize 0, // mSizeOther 0, // mParameters @@ -638,4 +638,4 @@ static void func_80CF8390() { // NONMATCHING } -/* 80CF8454-80CF8454 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CF8454-80CF8454 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index cb85b05e59..f903711af0 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -255,7 +255,7 @@ extern actor_process_profile_definition g_profile_Obj_SwChain = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SwChain, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSwChain_c), // mSize 0, // mSizeOther 0, // mParameters @@ -656,4 +656,4 @@ extern "C" void getRightHandPos__9daPy_py_cCFv() { // NONMATCHING } -/* 80CFB790-80CFB790 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CFB790-80CFB790 0000A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index 2586e7dbba..282e273d86 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -330,7 +330,7 @@ extern actor_process_profile_definition g_profile_Obj_SwHang = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SwHang, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSwHang_c), // mSize 0, // mSizeOther 0, // mParameters @@ -655,4 +655,4 @@ static void func_80CFD1CC() { // NONMATCHING } -/* 80CFD274-80CFD274 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CFD274-80CFD274 000098 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp index 838257542a..a337f9921f 100644 --- a/src/d/actor/d_a_obj_sword.cpp +++ b/src/d/actor/d_a_obj_sword.cpp @@ -198,7 +198,7 @@ extern actor_process_profile_definition g_profile_Obj_Sword = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Sword, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSword_c), // mSize 0, // mSizeOther 0, // mParameters @@ -395,4 +395,4 @@ static void func_80CFDE74() { // NONMATCHING } -/* 80CFDE84-80CFDE84 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CFDE84-80CFDE84 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index fd8da29497..56726b3cb1 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -361,7 +361,7 @@ extern actor_process_profile_definition g_profile_Obj_Swpropeller = { 3, fpcPi_CURRENT_e, PROC_Obj_Swpropeller, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjSwPr_c), 0, 0, @@ -371,4 +371,4 @@ extern actor_process_profile_definition g_profile_Obj_Swpropeller = { 0x44100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index 5d283b522a..b49154dfff 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -517,7 +517,7 @@ extern actor_process_profile_definition g_profile_Obj_Swpush = { 2, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Swpush, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSwpush), // mSize 0, // mSizeOther 0, // mParameters @@ -1079,4 +1079,4 @@ static u8 data_804850FC[4]; static u8 data_80485100[4]; #pragma pop -/* 80484E4C-80484E4C 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80484E4C-80484E4C 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swpush2.cpp b/src/d/actor/d_a_obj_swpush2.cpp index ddc352b640..63ae471ee3 100644 --- a/src/d/actor/d_a_obj_swpush2.cpp +++ b/src/d/actor/d_a_obj_swpush2.cpp @@ -467,7 +467,7 @@ extern actor_process_profile_definition g_profile_Obj_Swpush2 = { 2, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Swpush2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSwpush2), // mSize 0, // mSizeOther 0, // mParameters @@ -772,4 +772,4 @@ extern "C" void func_80CFFBD0(void* _this, fopAc_ac_c const* param_0, // NONMATCHING } -/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80CFFD24-80CFFD24 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp index 26f81c020f..781a522ae8 100644 --- a/src/d/actor/d_a_obj_swpush5.cpp +++ b/src/d/actor/d_a_obj_swpush5.cpp @@ -463,7 +463,7 @@ extern actor_process_profile_definition g_profile_Obj_Swpush5 = { 2, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Swpush5, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSw5_c), // mSize 0, // mSizeOther 0, // mParameters @@ -858,4 +858,4 @@ static u8 data_8059C974[4]; static u8 data_8059C978[4]; #pragma pop -/* 8059C6D0-8059C6D0 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 8059C6D0-8059C6D0 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_swspinner.cpp b/src/d/actor/d_a_obj_swspinner.cpp index f2d24ba8f7..97f16bafbe 100644 --- a/src/d/actor/d_a_obj_swspinner.cpp +++ b/src/d/actor/d_a_obj_swspinner.cpp @@ -248,7 +248,7 @@ extern actor_process_profile_definition g_profile_Obj_SwSpinner = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SwSpinner, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSwSpinner_c), // mSize 0, // mSizeOther 0, // mParameters @@ -258,4 +258,4 @@ extern actor_process_profile_definition g_profile_Obj_SwSpinner = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index d87284f81d..15bb8dd003 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -356,7 +356,7 @@ extern actor_process_profile_definition g_profile_Obj_SwTurn = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SwTurn, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSwTurn_c), // mSize 0, // mSizeOther 0, // mParameters @@ -404,4 +404,4 @@ static void daObjSwTurn_MoveBGDraw(daObjSwTurn_c* param_0) { // NONMATCHING } -/* 80D020B8-80D020B8 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D020B8-80D020B8 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp index 91e712c3e6..2a2110b132 100644 --- a/src/d/actor/d_a_obj_syRock.cpp +++ b/src/d/actor/d_a_obj_syRock.cpp @@ -338,7 +338,7 @@ extern actor_process_profile_definition g_profile_Obj_SyRock = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SyRock, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSyRock_c), // mSize 0, // mSizeOther 0, // mParameters @@ -829,4 +829,4 @@ daSyRock_c::~daSyRock_c() { // NONMATCHING } -/* 80D04030-80D04030 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D04030-80D04030 0000A0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_szbridge.cpp b/src/d/actor/d_a_obj_szbridge.cpp index 02b2bd6b81..3969371e4b 100644 --- a/src/d/actor/d_a_obj_szbridge.cpp +++ b/src/d/actor/d_a_obj_szbridge.cpp @@ -219,7 +219,7 @@ extern actor_process_profile_definition g_profile_Obj_SZbridge = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SZbridge, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjSZbridge_c), // mSize 0, // mSizeOther 0, // mParameters @@ -385,4 +385,4 @@ static void func_80D04C28() { // NONMATCHING } -/* 80D04C80-80D04C80 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D04C80-80D04C80 000048 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index 3873ef2915..97b78c93e4 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -299,7 +299,7 @@ extern actor_process_profile_definition g_profile_Obj_TaFence = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TaFence, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTaFence_c), // mSize 0, // mSizeOther 0, // mParameters @@ -616,4 +616,4 @@ void __sinit_d_a_obj_taFence_cpp() { REGISTER_CTORS(0x80D0605C, __sinit_d_a_obj_taFence_cpp); #pragma pop -/* 80D06198-80D06198 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D06198-80D06198 0000B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index 68d10b8e27..e90c055c89 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -202,7 +202,7 @@ extern actor_process_profile_definition g_profile_Obj_Table = { 3, fpcPi_CURRENT_e, PROC_Obj_Table, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjTable_c), 0, 0, @@ -212,4 +212,4 @@ extern actor_process_profile_definition g_profile_Obj_Table = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_takaraDai.cpp b/src/d/actor/d_a_obj_takaraDai.cpp index ce42aa6735..b57109122b 100644 --- a/src/d/actor/d_a_obj_takaraDai.cpp +++ b/src/d/actor/d_a_obj_takaraDai.cpp @@ -186,7 +186,7 @@ extern actor_process_profile_definition g_profile_Obj_TakaraDai = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TakaraDai, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTkraDai_c), // mSize 0, // mSizeOther 0, // mParameters @@ -384,4 +384,4 @@ void __sinit_d_a_obj_takaraDai_cpp() { REGISTER_CTORS(0x80D077B8, __sinit_d_a_obj_takaraDai_cpp); #pragma pop -/* 80D07854-80D07854 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D07854-80D07854 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index 4c2cfb5ac2..238b1263c6 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -310,7 +310,7 @@ extern actor_process_profile_definition g_profile_OBJ_TATIGI = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_TATIGI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_tatigi_class), // mSize 0, // mSizeOther 0, // mParameters @@ -358,4 +358,4 @@ extern "C" void __dt__8cM3dGAabFv() { // NONMATCHING } -/* 80D08620-80D08620 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D08620-80D08620 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 57f102f0a6..a137e9794e 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -177,7 +177,7 @@ extern actor_process_profile_definition g_profile_Obj_Ten = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Ten, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjTEN_c), // mSize 0, // mSizeOther 0, // mParameters @@ -762,4 +762,4 @@ static void func_80D0B8D4() { // NONMATCHING } -/* 80D0B9E4-80D0B9E4 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D0B9E4-80D0B9E4 0000F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_testcube.cpp b/src/d/actor/d_a_obj_testcube.cpp index 01607a540c..3c4d143827 100644 --- a/src/d/actor/d_a_obj_testcube.cpp +++ b/src/d/actor/d_a_obj_testcube.cpp @@ -13,7 +13,7 @@ extern actor_process_profile_definition g_profile_Obj_TestCube = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TestCube, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x000005A0, // mSize 0, // mSizeOther 0, // mParameters @@ -23,4 +23,4 @@ extern actor_process_profile_definition g_profile_Obj_TestCube = { 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_tgake.cpp b/src/d/actor/d_a_obj_tgake.cpp index 92778353cf..098c687b60 100644 --- a/src/d/actor/d_a_obj_tgake.cpp +++ b/src/d/actor/d_a_obj_tgake.cpp @@ -149,7 +149,7 @@ extern actor_process_profile_definition g_profile_Obj_Gake = { 3, fpcPi_CURRENT_e, PROC_Obj_Gake, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjGake_c), 0, 0, @@ -159,4 +159,4 @@ extern actor_process_profile_definition g_profile_Obj_Gake = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index 99e2b436ad..3a96768cf7 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -521,7 +521,7 @@ extern actor_process_profile_definition g_profile_Obj_THASHI = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_THASHI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjTHASHI_c), // mSize 0, // mSizeOther 0, // mParameters @@ -726,4 +726,4 @@ static void func_80D0D17C() { // NONMATCHING } -/* 80D0D2D0-80D0D2D0 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D0D2D0-80D0D2D0 000144 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 1310338820..41bac4dc75 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -430,7 +430,7 @@ extern actor_process_profile_definition g_profile_Obj_TDoor = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TDoor, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjThDoor_c), // mSize 0, // mSizeOther 0, // mParameters @@ -547,4 +547,4 @@ extern "C" void func_80D0E5D4(void* _this, u8* param_0) { // NONMATCHING } -/* 80D0E620-80D0E620 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D0E620-80D0E620 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_timeFire.cpp b/src/d/actor/d_a_obj_timeFire.cpp index cd0fd46fec..93de7a0a7d 100644 --- a/src/d/actor/d_a_obj_timeFire.cpp +++ b/src/d/actor/d_a_obj_timeFire.cpp @@ -74,7 +74,7 @@ extern actor_process_profile_definition g_profile_Obj_TimeFire = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TimeFire, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTimeFire_c), // mSize 0, // mSizeOther 0, // mParameters @@ -231,4 +231,4 @@ void __sinit_d_a_obj_timeFire_cpp() { #pragma push #pragma force_active on REGISTER_CTORS(0x80D0F094, __sinit_d_a_obj_timeFire_cpp); -#pragma pop \ No newline at end of file +#pragma pop diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index 935887219e..554949b0e8 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -194,7 +194,7 @@ extern actor_process_profile_definition g_profile_Obj_Timer = { 10, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Timer, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjTimer), // mSize 0, // mSizeOther 0, // mParameters @@ -204,4 +204,4 @@ extern actor_process_profile_definition g_profile_Obj_Timer = { 0x00040000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index 0fa93c2c73..b56cf1cf66 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -369,7 +369,7 @@ extern actor_process_profile_definition g_profile_OBJ_TKS = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_TKS, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjTks_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_tmoon.cpp b/src/d/actor/d_a_obj_tmoon.cpp index b48d40968f..b0e1da7a9d 100644 --- a/src/d/actor/d_a_obj_tmoon.cpp +++ b/src/d/actor/d_a_obj_tmoon.cpp @@ -123,7 +123,7 @@ extern actor_process_profile_definition g_profile_Obj_TMoon = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TMoon, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjTMoon_c), // mSize 0, // mSizeOther 0, // mParameters @@ -133,4 +133,4 @@ extern actor_process_profile_definition g_profile_Obj_TMoon = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_toaru_maki.cpp b/src/d/actor/d_a_obj_toaru_maki.cpp index 07e4130175..ba7bfdc033 100644 --- a/src/d/actor/d_a_obj_toaru_maki.cpp +++ b/src/d/actor/d_a_obj_toaru_maki.cpp @@ -83,7 +83,7 @@ extern actor_process_profile_definition g_profile_Obj_ToaruMaki = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_ToaruMaki, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjToaruMaki_c),// mSize 0, // mSizeOther 0, // mParameters @@ -173,4 +173,4 @@ static int daObjToaruMaki_execute(daObjToaruMaki_c* i_this) { /* 80D135DC-80D135FC 0005DC 0020+00 1/0 0/0 0/0 .text daObjToaruMaki_draw__FP16daObjToaruMaki_c */ static int daObjToaruMaki_draw(daObjToaruMaki_c* i_this) { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index b2bcfa378f..82401084ea 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -162,7 +162,7 @@ extern actor_process_profile_definition g_profile_OBJ_TOBY = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_TOBY, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_toby_class), // mSize 0, // mSizeOther 0, // mParameters @@ -936,4 +936,4 @@ static u8 data_80D159AC[4]; static u8 data_80D159B0[4]; #pragma pop -/* 80D156B8-80D156B8 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D156B8-80D156B8 0000D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index 4fab1350a5..8a21e2b4f3 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -406,7 +406,7 @@ extern actor_process_profile_definition g_profile_Obj_TobyHouse = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TobyHouse, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjTobyHouse_c), // mSize 0, // mSizeOther 0, // mParameters @@ -890,4 +890,4 @@ static u8 data_80D17A78[4]; static u8 data_80D17A7C[4]; #pragma pop -/* 80D177C0-80D177C0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D177C0-80D177C0 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index 2a170c15d5..335452c6a7 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -250,7 +250,7 @@ extern actor_process_profile_definition g_profile_Obj_TogeTrap = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TogeTrap, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTogeTrap_c), // mSize 0, // mSizeOther 0, // mParameters @@ -595,4 +595,4 @@ void __sinit_d_a_obj_togeTrap_cpp() { REGISTER_CTORS(0x80D18E14, __sinit_d_a_obj_togeTrap_cpp); #pragma pop -/* 80D18F08-80D18F08 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D18F08-80D18F08 000070 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index ac094f7283..f9f7672e98 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -189,7 +189,7 @@ extern actor_process_profile_definition g_profile_Obj_Tombo = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Tombo, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjTOMBO_c), // mSize 0, // mSizeOther 0, // mParameters @@ -859,4 +859,4 @@ static void func_80D1B6BC() { // NONMATCHING } -/* 80D1B7E8-80D1B7E8 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D1B7E8-80D1B7E8 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_tornado.cpp b/src/d/actor/d_a_obj_tornado.cpp index 9417594063..d6c0316b0d 100644 --- a/src/d/actor/d_a_obj_tornado.cpp +++ b/src/d/actor/d_a_obj_tornado.cpp @@ -251,7 +251,7 @@ extern actor_process_profile_definition g_profile_Obj_Tornado = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Tornado, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000770, // mSize 0, // mSizeOther 0, // mParameters @@ -261,4 +261,4 @@ extern actor_process_profile_definition g_profile_Obj_Tornado = { 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_tornado2.cpp b/src/d/actor/d_a_obj_tornado2.cpp index d4cb4a8434..2c322d8949 100644 --- a/src/d/actor/d_a_obj_tornado2.cpp +++ b/src/d/actor/d_a_obj_tornado2.cpp @@ -431,7 +431,7 @@ extern actor_process_profile_definition g_profile_Obj_Tornado2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Tornado2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjTrnd2_c), // mDefaultRadius 0, // mDefaultRadiusOther 0, // mParameters @@ -441,4 +441,4 @@ extern actor_process_profile_definition g_profile_Obj_Tornado2 = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index 9f8db476fe..86c6c3c625 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -35,8 +35,8 @@ static int daObj_Tp_Draw(obj_tp_class* i_this) { &material->getTexGenBlock()->getTexMtx(0)->getTexMtxInfo(); if (texMtxInfo != NULL) { Mtx lightProjMtx; - C_MTXLightPerspective(lightProjMtx, dComIfGd_getView()->mFovy, - dComIfGd_getView()->mAspect, 1.0f, 1.0f, -0.01f, 0); + C_MTXLightPerspective(lightProjMtx, dComIfGd_getView()->fovy, + dComIfGd_getView()->aspect, 1.0f, 1.0f, -0.01f, 0); mDoGph_gInf_c::setWideZoomLightProjection(lightProjMtx); texMtxInfo->setEffectMtx(lightProjMtx); modelData->simpleCalcMaterial(0, (MtxP)j3dDefaultMtx); @@ -528,7 +528,7 @@ extern actor_process_profile_definition g_profile_OBJ_TP = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_TP, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_tp_class), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp index 8ceeb7c78f..9b2d5f3a61 100644 --- a/src/d/actor/d_a_obj_treesh.cpp +++ b/src/d/actor/d_a_obj_treesh.cpp @@ -99,7 +99,7 @@ extern actor_process_profile_definition g_profile_TREESH = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TREESH, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTreeSh_c), // mSize 0, // mSizeOther 0, // mParameters @@ -296,4 +296,4 @@ void __sinit_d_a_obj_treesh_cpp() { REGISTER_CTORS(0x80D1F878, __sinit_d_a_obj_treesh_cpp); #pragma pop -/* 80D1F8E8-80D1F8E8 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D1F8E8-80D1F8E8 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index f56e02eef0..a3742dd898 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -130,7 +130,7 @@ extern actor_process_profile_definition g_profile_Obj_TwGate = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TwGate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTwGate_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp index 95550417c0..68e71a7be2 100644 --- a/src/d/actor/d_a_obj_udoor.cpp +++ b/src/d/actor/d_a_obj_udoor.cpp @@ -226,7 +226,7 @@ extern actor_process_profile_definition g_profile_OBJ_UDOOR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_UDOOR, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_udoor_class), // mSize 0, // mSizeOther 0, // mParameters @@ -270,4 +270,4 @@ extern "C" void __dt__8cM3dGAabFv() { // NONMATCHING } -/* 80D20E10-80D20E10 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D20E10-80D20E10 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_usaku.cpp b/src/d/actor/d_a_obj_usaku.cpp index 76e17a23f8..6a19d47258 100644 --- a/src/d/actor/d_a_obj_usaku.cpp +++ b/src/d/actor/d_a_obj_usaku.cpp @@ -114,7 +114,7 @@ extern actor_process_profile_definition g_profile_OBJ_USAKU = { 7, fpcPi_CURRENT_e, PROC_OBJ_USAKU, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(obj_usaku_class), 0, 0, @@ -124,4 +124,4 @@ extern actor_process_profile_definition g_profile_OBJ_USAKU = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp index 0f53ee65e4..3d645fc9d4 100644 --- a/src/d/actor/d_a_obj_vground.cpp +++ b/src/d/actor/d_a_obj_vground.cpp @@ -146,7 +146,7 @@ extern actor_process_profile_definition g_profile_Obj_VolcGnd = { 3, fpcPi_CURRENT_e, PROC_Obj_VolcGnd, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjVGnd_c), 0, 0, @@ -156,4 +156,4 @@ extern actor_process_profile_definition g_profile_Obj_VolcGnd = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index 4621120198..e4f6215aad 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -689,7 +689,7 @@ extern actor_process_profile_definition g_profile_Obj_VolcanicBall = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_VolcanicBall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00002928, // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 52fc9efb29..14adf2043f 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -494,7 +494,7 @@ extern actor_process_profile_definition g_profile_Obj_VolcanicBomb = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_VolcanicBomb, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjVolcBom_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1047,4 +1047,4 @@ static void func_80D26B4C() { // NONMATCHING } -/* 80D26C0C-80D26C0C 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D26C0C-80D26C0C 0000B0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 58e6736b65..ce937b8c75 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -559,7 +559,7 @@ extern actor_process_profile_definition g_profile_Obj_KakarikoBrg = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_KakarikoBrg, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjWarpKBrg_c), // mSize 0, // mSizeOther 0, // mParameters @@ -897,4 +897,4 @@ extern "C" void func_80D29590(void* _this, u8* param_0) { // NONMATCHING } -/* 80D29688-80D29688 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D29688-80D29688 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index d93d70778c..80e38f0423 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -425,7 +425,7 @@ extern actor_process_profile_definition g_profile_Obj_OrdinBrg = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_OrdinBrg, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjWarpOBrg_c), // mSize 0, // mSizeOther 0, // mParameters @@ -722,4 +722,4 @@ extern "C" void func_80D2B7D4(void* _this, u8* param_0) { // NONMATCHING } -/* 80D2B8AC-80D2B8AC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D2B8AC-80D2B8AC 0000B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp index 36ac7bdb32..3326b93043 100644 --- a/src/d/actor/d_a_obj_waterGate.cpp +++ b/src/d/actor/d_a_obj_waterGate.cpp @@ -164,7 +164,7 @@ extern actor_process_profile_definition g_profile_Obj_WtGate = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_WtGate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daWtGate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -387,4 +387,4 @@ void __sinit_d_a_obj_waterGate_cpp() { REGISTER_CTORS(0x80D2C41C, __sinit_d_a_obj_waterGate_cpp); #pragma pop -/* 80D2C48C-80D2C48C 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D2C48C-80D2C48C 000020 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp index daab5aa7d0..62fe182adc 100644 --- a/src/d/actor/d_a_obj_waterPillar.cpp +++ b/src/d/actor/d_a_obj_waterPillar.cpp @@ -407,7 +407,7 @@ extern actor_process_profile_definition g_profile_Obj_WaterPillar = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_WaterPillar, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daWtPillar_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1006,4 +1006,4 @@ extern "C" bool eventStart__17dEvLib_callback_cFv() { return true; } -/* 80D2E844-80D2E844 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D2E844-80D2E844 0000D4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp index faba1c4320..c9c58b2828 100644 --- a/src/d/actor/d_a_obj_waterfall.cpp +++ b/src/d/actor/d_a_obj_waterfall.cpp @@ -246,7 +246,7 @@ extern actor_process_profile_definition g_profile_Obj_WaterFall = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_WaterFall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjWaterFall_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp index ee3d7987c7..ba0d62f934 100644 --- a/src/d/actor/d_a_obj_wchain.cpp +++ b/src/d/actor/d_a_obj_wchain.cpp @@ -391,7 +391,7 @@ extern actor_process_profile_definition g_profile_Obj_Wchain = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Wchain, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x000007BC, // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index 2ee105bdbb..76e8e80157 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -249,7 +249,7 @@ extern actor_process_profile_definition g_profile_Obj_WdStick = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_WdStick, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daWdStick_c), // mSize 0, // mSizeOther 0, // mParameters @@ -906,4 +906,4 @@ static void func_80D3411C() { // NONMATCHING } -/* 80D34210-80D34210 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D34210-80D34210 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp index 949d4f65a0..c52768eaeb 100644 --- a/src/d/actor/d_a_obj_web0.cpp +++ b/src/d/actor/d_a_obj_web0.cpp @@ -429,7 +429,7 @@ extern actor_process_profile_definition g_profile_OBJ_WEB0 = { 3, fpcPi_CURRENT_e, PROC_OBJ_WEB0, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(obj_web0_class), 0, 0, @@ -439,4 +439,4 @@ extern actor_process_profile_definition g_profile_OBJ_WEB0 = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index 916e2e43fb..5eb4d7e7b3 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -332,7 +332,7 @@ extern actor_process_profile_definition g_profile_OBJ_WEB1 = { 3, fpcPi_CURRENT_e, PROC_OBJ_WEB1, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(obj_web1_class), 0, 0, diff --git a/src/d/actor/d_a_obj_well_cover.cpp b/src/d/actor/d_a_obj_well_cover.cpp index 6d621b653c..e435516369 100644 --- a/src/d/actor/d_a_obj_well_cover.cpp +++ b/src/d/actor/d_a_obj_well_cover.cpp @@ -190,7 +190,7 @@ extern actor_process_profile_definition g_profile_Obj_WellCover = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_WellCover, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjWCover_c), // mSize 0, // mSizeOther 0, // mParameters @@ -200,4 +200,4 @@ extern actor_process_profile_definition g_profile_Obj_WellCover = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index 0b2e3a67ba..af4f48f902 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -229,7 +229,7 @@ extern actor_process_profile_definition g_profile_OBJ_WFLAG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_WFLAG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(obj_wflag_class), // mSize 0, // mSizeOther 0, // mParameters @@ -239,4 +239,4 @@ extern actor_process_profile_definition g_profile_OBJ_WFLAG = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index 64ad9ec861..09fa0a292e 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -285,7 +285,7 @@ extern actor_process_profile_definition g_profile_Obj_WindStone = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_WindStone, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daWindStone_c), // mSize 0, // mSizeOther 0, // mParameters @@ -295,4 +295,4 @@ extern actor_process_profile_definition g_profile_Obj_WindStone = { 0x40100, // mStatus fopAc_ENV_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index f9b023a3a5..359bf7cd91 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -193,7 +193,7 @@ extern actor_process_profile_definition g_profile_Obj_Window = { 3, fpcPi_CURRENT_e, PROC_Obj_Window, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjWindow_c), 0, 0, @@ -203,4 +203,4 @@ extern actor_process_profile_definition g_profile_Obj_Window = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_wood_pendulum.cpp b/src/d/actor/d_a_obj_wood_pendulum.cpp index e6f272508a..f4eee97bfe 100644 --- a/src/d/actor/d_a_obj_wood_pendulum.cpp +++ b/src/d/actor/d_a_obj_wood_pendulum.cpp @@ -166,7 +166,7 @@ extern actor_process_profile_definition g_profile_Obj_WoodPendulum = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_WoodPendulum, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjWPndlm_c), // mSize 0, // mSizeOther 0, // mParameters @@ -286,4 +286,4 @@ static int daObjWPndlm_Delete(daObjWPndlm_c* i_this) { */ static int daObjWPndlm_Create(fopAc_ac_c* i_this) { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index c705171b69..40a6989266 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -342,7 +342,7 @@ extern actor_process_profile_definition g_profile_Obj_WoodStatue = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_WoodStatue, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjWStatue_c), // mSize 0, // mSizeOther 0, // mParameters @@ -816,4 +816,4 @@ static void func_80D3B628() { // NONMATCHING } -/* 80D3B6D4-80D3B6D4 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D3B6D4-80D3B6D4 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp index 7bbbbc0fb1..f95168ea3c 100644 --- a/src/d/actor/d_a_obj_wsword.cpp +++ b/src/d/actor/d_a_obj_wsword.cpp @@ -134,7 +134,7 @@ extern actor_process_profile_definition g_profile_Obj_WoodenSword = { 7, fpcPi_CURRENT_e, PROC_Obj_WoodenSword, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjWSword_c), 0, 0, @@ -144,4 +144,4 @@ extern actor_process_profile_definition g_profile_Obj_WoodenSword = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index b9c6850c49..7539fa4c83 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -223,7 +223,7 @@ extern actor_process_profile_definition g_profile_OBJ_YBAG = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OBJ_YBAG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObj_YBag_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1014,4 +1014,4 @@ static u8 data_80D3DF98[4]; static u8 data_80D3DF9C[4]; #pragma pop -/* 80D3DD6C-80D3DD6C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D3DD6C-80D3DD6C 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp index dace51195f..e921044914 100644 --- a/src/d/actor/d_a_obj_yobikusa.cpp +++ b/src/d/actor/d_a_obj_yobikusa.cpp @@ -481,7 +481,7 @@ extern actor_process_profile_definition g_profile_Obj_Yobikusa = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Yobikusa, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjYobikusa_c), // mSize 0, // mSizeOther 0, // mParameters @@ -491,4 +491,4 @@ extern actor_process_profile_definition g_profile_Obj_Yobikusa = { 0x40180, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_yousei.cpp b/src/d/actor/d_a_obj_yousei.cpp index b3dfffae27..e60c5c4edc 100644 --- a/src/d/actor/d_a_obj_yousei.cpp +++ b/src/d/actor/d_a_obj_yousei.cpp @@ -734,7 +734,7 @@ extern actor_process_profile_definition g_profile_Obj_Yousei = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Yousei, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjYOUSEI_c), // mSize 0, // mSizeOther 0, // mParameters @@ -1088,4 +1088,4 @@ static u8 data_804D1890[4]; static u8 data_804D1894[4]; #pragma pop -/* 804D1720-804D1720 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 804D1720-804D1720 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index fe8d749f05..0684e1fe45 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -315,7 +315,7 @@ extern actor_process_profile_definition g_profile_OBJ_YSTONE = { 8, fpcPi_CURRENT_e, PROC_OBJ_YSTONE, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(obj_ystone_class), 0, 0, @@ -325,4 +325,4 @@ extern actor_process_profile_definition g_profile_OBJ_YSTONE = { 0x44100, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp index 507d8fa276..75abbb00c1 100644 --- a/src/d/actor/d_a_obj_zcloth.cpp +++ b/src/d/actor/d_a_obj_zcloth.cpp @@ -99,7 +99,7 @@ extern actor_process_profile_definition g_profile_Obj_ZoraCloth = { 7, fpcPi_CURRENT_e, PROC_Obj_ZoraCloth, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjZCloth_c), 0, 0, @@ -109,4 +109,4 @@ extern actor_process_profile_definition g_profile_Obj_ZoraCloth = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index 985da0408a..dac9f075b6 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -384,7 +384,7 @@ extern actor_process_profile_definition g_profile_Obj_ZDoor = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_ZDoor, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daZdoor_c), // mSize 0, // mSizeOther 0, // mParameters @@ -497,4 +497,4 @@ static void func_80D401D4() { /* 80D401DC-80D401E4 000E1C 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ static void func_80D401DC() { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index 4c5620f5b2..39c0e63c91 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -216,7 +216,7 @@ extern actor_process_profile_definition g_profile_Obj_zrTurara = { 3, fpcPi_CURRENT_e, PROC_Obj_zrTurara, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daZrTurara_c), 0, 0, @@ -591,4 +591,4 @@ static cPhs__Step daZrTurara_Create(fopAc_ac_c* i_this) { // cCcD_GStts::~cCcD_GStts() { extern "C" void __dt__10cCcD_GSttsFv() { // NONMATCHING -} \ No newline at end of file +} diff --git a/src/d/actor/d_a_obj_zrTuraraRock.cpp b/src/d/actor/d_a_obj_zrTuraraRock.cpp index c779792735..3fd3afa3f0 100644 --- a/src/d/actor/d_a_obj_zrTuraraRock.cpp +++ b/src/d/actor/d_a_obj_zrTuraraRock.cpp @@ -223,7 +223,7 @@ extern actor_process_profile_definition g_profile_Obj_zrTuraraRc = { 7, fpcPi_CURRENT_e, PROC_Obj_zrTuraraRc, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daZrTuraRc_c), 0, 0, @@ -233,4 +233,4 @@ extern actor_process_profile_definition g_profile_Obj_zrTuraraRc = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp index 2f757869f5..2750b92e36 100644 --- a/src/d/actor/d_a_obj_zraMark.cpp +++ b/src/d/actor/d_a_obj_zraMark.cpp @@ -580,7 +580,7 @@ extern actor_process_profile_definition g_profile_ZRA_MARK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_ZRA_MARK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daObjZraMark_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_obj_zra_freeze.cpp b/src/d/actor/d_a_obj_zra_freeze.cpp index 91774a93b3..5d6c178fba 100644 --- a/src/d/actor/d_a_obj_zra_freeze.cpp +++ b/src/d/actor/d_a_obj_zra_freeze.cpp @@ -225,7 +225,7 @@ extern actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = { 7, fpcPi_CURRENT_e, PROC_OBJ_ZRAFREEZE, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daZraFreeze_c), 0, 0, diff --git a/src/d/actor/d_a_obj_zra_rock.cpp b/src/d/actor/d_a_obj_zra_rock.cpp index d0c712b378..fab692c1e1 100644 --- a/src/d/actor/d_a_obj_zra_rock.cpp +++ b/src/d/actor/d_a_obj_zra_rock.cpp @@ -173,7 +173,7 @@ extern actor_process_profile_definition g_profile_Obj_ZraRock = { 3, fpcPi_CURRENT_e, PROC_Obj_ZraRock, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daObjZraRock_c), 0, 0, @@ -183,4 +183,4 @@ extern actor_process_profile_definition g_profile_Obj_ZraRock = { 0x44100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index 80c43c1c74..7292fa1a03 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -241,7 +241,7 @@ extern actor_process_profile_definition g_profile_PASSER_MNG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_PASSER_MNG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daPasserMng_c), // mSize 0, // mSizeOther 0, // mParameters @@ -251,4 +251,4 @@ extern actor_process_profile_definition g_profile_PASSER_MNG = { 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_path_line.cpp b/src/d/actor/d_a_path_line.cpp index 4e1934bbc0..d93b0a29eb 100644 --- a/src/d/actor/d_a_path_line.cpp +++ b/src/d/actor/d_a_path_line.cpp @@ -14,7 +14,7 @@ extern actor_process_profile_definition2 g_profile_PATH_LINE = { 9, // mListID fpcPi_CURRENT_e, // mListPrio PROC_PATH_LINE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000574, // mSize 0, // mSizeOther 0, // mParameters @@ -25,4 +25,4 @@ extern actor_process_profile_definition2 g_profile_PATH_LINE = { fopAc_UNK_GROUP_5_e, // mActorType fopAc_CULLBOX_0_e, // cullType 0 // field_0x30 -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index 4e18503904..20dd9e6995 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -621,7 +621,7 @@ extern actor_process_profile_definition g_profile_PERU = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_PERU, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daPeru_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index eb63b63886..3541e0266a 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -96,7 +96,7 @@ extern actor_process_profile_definition g_profile_PPolamp = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_PPolamp, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daPPolamp_c), // mSize 0, // mSizeOther 0, // mParameters @@ -560,4 +560,4 @@ static u8 data_80D4D3F0[4]; static u8 data_80D4D3F4[4]; #pragma pop -/* 80D4D2C8-80D4D2C8 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D4D2C8-80D4D2C8 00004C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_scene_exit.cpp b/src/d/actor/d_a_scene_exit.cpp index 2374054ed1..2c43627b80 100644 --- a/src/d/actor/d_a_scene_exit.cpp +++ b/src/d/actor/d_a_scene_exit.cpp @@ -184,7 +184,7 @@ extern actor_process_profile_definition2 g_profile_SCENE_EXIT = { 10, // mListID fpcPi_CURRENT_e, // mListPrio PROC_SCENE_EXIT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x0000059C, // mSize 0, // mSizeOther 0, // mParameters @@ -195,4 +195,4 @@ extern actor_process_profile_definition2 g_profile_SCENE_EXIT = { fopAc_UNK_GROUP_5_e, // mActorType fopAc_CULLBOX_0_e, // cullType 0 // field_0x30 -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_scene_exit2.cpp b/src/d/actor/d_a_scene_exit2.cpp index aa54322ed3..a44dbc10c9 100644 --- a/src/d/actor/d_a_scene_exit2.cpp +++ b/src/d/actor/d_a_scene_exit2.cpp @@ -215,7 +215,7 @@ extern actor_process_profile_definition g_profile_SCENE_EXIT2 = { 7, fpcPi_CURRENT_e, PROC_SCENE_EXIT2, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daScExit_c), 0, 0, @@ -225,4 +225,4 @@ extern actor_process_profile_definition g_profile_SCENE_EXIT2 = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index 03afd85a8b..d889a1956f 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -69,7 +69,7 @@ extern actor_process_profile_definition g_profile_SET_BG_OBJ = { 7, fpcPi_CURRENT_e, PROC_SET_BG_OBJ, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daSetBgObj_c), 0, 0, @@ -79,4 +79,4 @@ extern actor_process_profile_definition g_profile_SET_BG_OBJ = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 463fb8f80d..dfeba958c4 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -298,7 +298,7 @@ extern actor_process_profile_definition g_profile_ShopItem = { 7, fpcPi_CURRENT_e, PROC_ShopItem, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daShopItem_c), 0, 0, @@ -308,4 +308,4 @@ extern actor_process_profile_definition g_profile_ShopItem = { 0x60100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_skip_2D.cpp b/src/d/actor/d_a_skip_2D.cpp index 1babe805e8..b2cac8a849 100644 --- a/src/d/actor/d_a_skip_2D.cpp +++ b/src/d/actor/d_a_skip_2D.cpp @@ -97,7 +97,7 @@ extern actor_process_profile_definition g_profile_SKIP2D = { 3, fpcPi_CURRENT_e, PROC_SKIP2D, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daSkip2D_c), 0, 0, @@ -107,4 +107,4 @@ extern actor_process_profile_definition g_profile_SKIP2D = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index 80098dadcf..7412c4c10e 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -312,7 +312,7 @@ extern actor_process_profile_definition g_profile_SPINNER = { 4, // mListID fpcPi_CURRENT_e, // mListPrio PROC_SPINNER, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method 0x00000ABC, // mSize 0, // mSizeOther 0, // mParameters @@ -1216,4 +1216,4 @@ static u8 data_804D5090[4]; static u8 data_804D5094[4]; #pragma pop -/* 804D4EA0-804D4EA0 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 804D4EA0-804D4EA0 000110 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index 374ce1e579..9a7867acda 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -609,7 +609,7 @@ extern actor_process_profile_definition g_profile_SQ = { 7, fpcPi_CURRENT_e, PROC_SQ, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(sq_class), 0, 0, @@ -619,4 +619,4 @@ extern actor_process_profile_definition g_profile_SQ = { 0xC0000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp index 26e76fb541..51d1e0bfbb 100644 --- a/src/d/actor/d_a_startAndGoal.cpp +++ b/src/d/actor/d_a_startAndGoal.cpp @@ -244,7 +244,7 @@ extern actor_process_profile_definition g_profile_START_AND_GOAL = { 9, fpcPi_CURRENT_e, PROC_START_AND_GOAL, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daStartAndGoal_c), 0, 0, @@ -254,4 +254,4 @@ extern actor_process_profile_definition g_profile_START_AND_GOAL = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_suspend.cpp b/src/d/actor/d_a_suspend.cpp index 1a1df3f539..c8fd9da6eb 100644 --- a/src/d/actor/d_a_suspend.cpp +++ b/src/d/actor/d_a_suspend.cpp @@ -50,7 +50,7 @@ extern actor_process_profile_definition g_profile_SUSPEND = { 11, fpcPi_CURRENT_e, PROC_SUSPEND, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daSus_c), 0, 0, @@ -60,4 +60,4 @@ extern actor_process_profile_definition g_profile_SUSPEND = { 0x60000, 5, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_swBall.cpp b/src/d/actor/d_a_swBall.cpp index 197484e38f..12d864bb84 100644 --- a/src/d/actor/d_a_swBall.cpp +++ b/src/d/actor/d_a_swBall.cpp @@ -239,7 +239,7 @@ extern actor_process_profile_definition g_profile_SwBall = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_SwBall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSwBall_c), // mSize 0, // mSizeOther 0, // mParameters @@ -249,4 +249,4 @@ extern actor_process_profile_definition g_profile_SwBall = { 0x00040000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_swLBall.cpp b/src/d/actor/d_a_swLBall.cpp index 1bda985f0c..4e3e6fa6d7 100644 --- a/src/d/actor/d_a_swLBall.cpp +++ b/src/d/actor/d_a_swLBall.cpp @@ -299,7 +299,7 @@ extern actor_process_profile_definition g_profile_SwLBall = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_SwLBall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSwLBall_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_swTime.cpp b/src/d/actor/d_a_swTime.cpp index aadc76a033..cb4719893c 100644 --- a/src/d/actor/d_a_swTime.cpp +++ b/src/d/actor/d_a_swTime.cpp @@ -71,7 +71,7 @@ extern actor_process_profile_definition g_profile_SwTime = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_SwTime, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSwTime_c), // mSize 0, // mSizeOther 0, // mParameters @@ -81,4 +81,4 @@ extern actor_process_profile_definition g_profile_SwTime = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 6554216b63..63fdc40bb5 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -330,7 +330,7 @@ extern actor_process_profile_definition g_profile_SWC00 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_SWC00, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSwc00_c), // mSize 0, // mSizeOther 0, // mParameters @@ -342,4 +342,4 @@ extern actor_process_profile_definition g_profile_SWC00 = { fopAc_CULLBOX_0_e, // cullType }; -/* 805A1DAC-805A1DAC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 805A1DAC-805A1DAC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 82e3d3cb56..a972f31c32 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -235,7 +235,7 @@ extern actor_process_profile_definition g_profile_SWHIT0 = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_SWHIT0, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daSwhit0_c), // mSize 0, // mSizeOther 0, // mParameters @@ -421,4 +421,4 @@ extern "C" void func_8048734C(void* _this, u8* param_0) { // NONMATCHING } -/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80487388-80487388 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_tag_CstaSw.cpp b/src/d/actor/d_a_tag_CstaSw.cpp index 1eb1914a7a..4a24a15b01 100644 --- a/src/d/actor/d_a_tag_CstaSw.cpp +++ b/src/d/actor/d_a_tag_CstaSw.cpp @@ -116,7 +116,7 @@ extern actor_process_profile_definition g_profile_Tag_CstaSw = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_CstaSw, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagCstaSw_c), // mSize 0, // mSizeOther 0, // mParameters @@ -126,4 +126,4 @@ extern actor_process_profile_definition g_profile_Tag_CstaSw = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index 0828a8dee0..dccb0df370 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -527,7 +527,7 @@ extern actor_process_profile_definition g_profile_Tag_Lv6Gate = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Lv6Gate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagLv6Gate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -537,4 +537,4 @@ extern actor_process_profile_definition g_profile_Tag_Lv6Gate = { 0x40000, // mStatus 0, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp index bface6a8ee..7b343899cc 100644 --- a/src/d/actor/d_a_tag_Lv7Gate.cpp +++ b/src/d/actor/d_a_tag_Lv7Gate.cpp @@ -384,7 +384,7 @@ extern actor_process_profile_definition g_profile_Tag_Lv7Gate = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Lv7Gate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagLv7Gate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -394,4 +394,4 @@ extern actor_process_profile_definition g_profile_Tag_Lv7Gate = { 0x40000, // mStatus 0, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index dd907607e2..acceeacb0d 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -237,7 +237,7 @@ extern actor_process_profile_definition g_profile_Tag_Lv8Gate = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Lv8Gate, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagLv8Gate_c), // mSize 0, // mSizeOther 0, // mParameters @@ -247,4 +247,4 @@ extern actor_process_profile_definition g_profile_Tag_Lv8Gate = { 0x40000, // mStatus 0, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index 4493134370..bed234c7d6 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -1008,7 +1008,7 @@ bool daTagTWGate_c::talkProc(int* param_1, int param_2, fopAc_ac_c** param_3) { rv = true; } else { if (mMsgFlow.getMsg() != NULL && - (mMsgFlow.getMsg()->mMode == 2 || mMsgFlow.getMsg()->mMode == 6) && param_1 != NULL) + (mMsgFlow.getMsg()->mode == 2 || mMsgFlow.getMsg()->mode == 6) && param_1 != NULL) { for (int i = 0; param_1[i] > 0; i++) { if (param_1[i] == mMsgFlow.getMsgNo()) { @@ -1120,7 +1120,7 @@ extern actor_process_profile_definition g_profile_Tag_TWGate = { 7, fpcPi_CURRENT_e, PROC_Tag_TWGate, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagTWGate_c), 0, 0, diff --git a/src/d/actor/d_a_tag_ajnot.cpp b/src/d/actor/d_a_tag_ajnot.cpp index 4106a39bcd..eda53cea4a 100644 --- a/src/d/actor/d_a_tag_ajnot.cpp +++ b/src/d/actor/d_a_tag_ajnot.cpp @@ -78,7 +78,7 @@ extern actor_process_profile_definition g_profile_Tag_AJnot = { 3, fpcPi_CURRENT_e, PROC_Tag_AJnot, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagAJnot_c), 0, 0, @@ -88,4 +88,4 @@ extern actor_process_profile_definition g_profile_Tag_AJnot = { 0x44000, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_arena.cpp b/src/d/actor/d_a_tag_arena.cpp index 8474ee520d..5964dc96d1 100644 --- a/src/d/actor/d_a_tag_arena.cpp +++ b/src/d/actor/d_a_tag_arena.cpp @@ -32,7 +32,7 @@ extern actor_process_profile_definition g_profile_Tag_Arena = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Arena, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagArena_c), // mSize 0, // mSizeOther 0, // mParameters @@ -42,4 +42,4 @@ extern actor_process_profile_definition g_profile_Tag_Arena = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_assistance.cpp b/src/d/actor/d_a_tag_assistance.cpp index 4a85d0f8b9..f7e162bed2 100644 --- a/src/d/actor/d_a_tag_assistance.cpp +++ b/src/d/actor/d_a_tag_assistance.cpp @@ -43,7 +43,7 @@ extern actor_process_profile_definition g_profile_Tag_Assist = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Assist, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagAssist_c), // mSize 0, // mSizeOther 0, // mParameters @@ -53,4 +53,4 @@ extern actor_process_profile_definition g_profile_Tag_Assist = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index e3df8fbe81..e4be21f673 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -165,7 +165,7 @@ extern actor_process_profile_definition g_profile_Tag_Attp = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Attp, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daAttp_c), // mSize 0, // mSizeOther 0, // mParameter @@ -175,4 +175,4 @@ extern actor_process_profile_definition g_profile_Tag_Attp = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp index bc0455b7d1..8b4ae84d5f 100644 --- a/src/d/actor/d_a_tag_bottle_item.cpp +++ b/src/d/actor/d_a_tag_bottle_item.cpp @@ -217,7 +217,7 @@ extern actor_process_profile_definition g_profile_TAG_BTLITM = { 7, // mListID fpcPi_CURRENT_e, // mListPri PROC_TAG_SSDRINK, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTag_BottleItem_c), // mSize 0, // mSizeOther 0, // mParameters @@ -227,4 +227,4 @@ extern actor_process_profile_definition g_profile_TAG_BTLITM = { 0x64100, // mStatus 5, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index 8c2aff0af2..f9dc8ed10a 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -370,7 +370,7 @@ extern actor_process_profile_definition g_profile_TAG_CAMERA = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_CAMERA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTag_Cam_c), // mSize 0, // mSizeOther 0, // mParameters @@ -380,4 +380,4 @@ extern actor_process_profile_definition g_profile_TAG_CAMERA = { 0x00044000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_6_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_chgrestart.cpp b/src/d/actor/d_a_tag_chgrestart.cpp index 14e7432c46..2c268b0870 100644 --- a/src/d/actor/d_a_tag_chgrestart.cpp +++ b/src/d/actor/d_a_tag_chgrestart.cpp @@ -120,7 +120,7 @@ extern actor_process_profile_definition g_profile_Tag_ChgRestart = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_ChgRestart, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagChgRestart_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index 54784097a7..986dfe93e7 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -115,7 +115,7 @@ extern actor_process_profile_definition g_profile_TAG_CHKPOINT = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_CHKPOINT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTag_Chk_c), // mSize 0, // mSizeOther 0, // mParameters @@ -125,4 +125,4 @@ extern actor_process_profile_definition g_profile_TAG_CHKPOINT = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_6_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index b545c17d22..305829b35b 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -554,7 +554,7 @@ extern actor_process_profile_definition g_profile_TAG_CSW = { 7, fpcPi_CURRENT_e, PROC_TAG_CSW, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagCsw_c), 0, 0, @@ -564,4 +564,4 @@ extern actor_process_profile_definition g_profile_TAG_CSW = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_escape.cpp b/src/d/actor/d_a_tag_escape.cpp index e408988f4c..473ce75ca1 100644 --- a/src/d/actor/d_a_tag_escape.cpp +++ b/src/d/actor/d_a_tag_escape.cpp @@ -35,7 +35,7 @@ extern actor_process_profile_definition g_profile_Tag_Escape = { 7, fpcPi_CURRENT_e, PROC_Tag_Escape, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagEscape_c), 0, 0, @@ -45,4 +45,4 @@ extern actor_process_profile_definition g_profile_Tag_Escape = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index 0ed9a0ce82..de867a0e10 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -371,7 +371,7 @@ extern actor_process_profile_definition g_profile_TAG_EVENT = { 7, fpcPi_CURRENT_e, PROC_TAG_EVENT, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTag_Event_c), 0, 0, @@ -381,4 +381,4 @@ extern actor_process_profile_definition g_profile_TAG_EVENT = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_6_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index 7b4837a179..14da15ee26 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -260,7 +260,7 @@ extern actor_process_profile_definition g_profile_TAG_EVT = { 7, fpcLy_CURRENT_e, PROC_TAG_EVT, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTag_Evt_c), 0, 0, @@ -270,4 +270,4 @@ extern actor_process_profile_definition g_profile_TAG_EVT = { 0x40000, 0, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_evtarea.cpp b/src/d/actor/d_a_tag_evtarea.cpp index caa7d6570a..687606adf0 100644 --- a/src/d/actor/d_a_tag_evtarea.cpp +++ b/src/d/actor/d_a_tag_evtarea.cpp @@ -247,7 +247,7 @@ extern actor_process_profile_definition g_profile_TAG_EVTAREA = { 8, fpcPi_CURRENT_e, PROC_TAG_EVTAREA, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTag_EvtArea_c), 0, 0, @@ -257,4 +257,4 @@ extern actor_process_profile_definition g_profile_TAG_EVTAREA = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_evtmsg.cpp b/src/d/actor/d_a_tag_evtmsg.cpp index deb1231446..95a858e8d6 100644 --- a/src/d/actor/d_a_tag_evtmsg.cpp +++ b/src/d/actor/d_a_tag_evtmsg.cpp @@ -280,7 +280,7 @@ extern actor_process_profile_definition g_profile_TAG_EVTMSG = { 7, fpcPi_CURRENT_e, PROC_TAG_MSG, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTag_EvtMsg_c), 0, 0, @@ -290,4 +290,4 @@ extern actor_process_profile_definition g_profile_TAG_EVTMSG = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index 49df6e900a..51c2a5ad80 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -231,7 +231,7 @@ extern actor_process_profile_definition g_profile_Tag_FWall = { 7, fpcPi_CURRENT_e, PROC_Tag_FWall, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTag_FWall_c), 0, 0, @@ -241,4 +241,4 @@ extern actor_process_profile_definition g_profile_Tag_FWall = { 0x60100, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_gra.cpp b/src/d/actor/d_a_tag_gra.cpp index 80f901cf68..819083af23 100644 --- a/src/d/actor/d_a_tag_gra.cpp +++ b/src/d/actor/d_a_tag_gra.cpp @@ -30,7 +30,7 @@ extern actor_process_profile_definition g_profile_TAG_GRA = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_GRA, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagGra_c), // mSize 0, // mSizeOther 0, // mParameters @@ -40,4 +40,4 @@ extern actor_process_profile_definition g_profile_TAG_GRA = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_gstart.cpp b/src/d/actor/d_a_tag_gstart.cpp index 2a519bd00d..b87e36cd07 100644 --- a/src/d/actor/d_a_tag_gstart.cpp +++ b/src/d/actor/d_a_tag_gstart.cpp @@ -73,7 +73,7 @@ extern actor_process_profile_definition g_profile_Tag_Gstart = { 2, fpcPi_CURRENT_e, PROC_Tag_Gstart, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagGstart_c), 0, 0, @@ -83,4 +83,4 @@ extern actor_process_profile_definition g_profile_Tag_Gstart = { 0x60000, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_guard.cpp b/src/d/actor/d_a_tag_guard.cpp index a074ad5d0b..3856fda35e 100644 --- a/src/d/actor/d_a_tag_guard.cpp +++ b/src/d/actor/d_a_tag_guard.cpp @@ -73,7 +73,7 @@ extern actor_process_profile_definition g_profile_TAG_GUARD = { 7, fpcPi_CURRENT_e, PROC_TAG_GUARD, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagGuard_c), 0, 0, @@ -83,4 +83,4 @@ extern actor_process_profile_definition g_profile_TAG_GUARD = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_hinit.cpp b/src/d/actor/d_a_tag_hinit.cpp index 5673f43536..e05288b3d7 100644 --- a/src/d/actor/d_a_tag_hinit.cpp +++ b/src/d/actor/d_a_tag_hinit.cpp @@ -86,7 +86,7 @@ extern actor_process_profile_definition g_profile_Tag_Hinit = { 3, fpcPi_CURRENT_e, PROC_Tag_Hinit, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagHinit_c), 0, 0, @@ -96,4 +96,4 @@ extern actor_process_profile_definition g_profile_Tag_Hinit = { 0x60000, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_hjump.cpp b/src/d/actor/d_a_tag_hjump.cpp index 911f564052..73b63b4840 100644 --- a/src/d/actor/d_a_tag_hjump.cpp +++ b/src/d/actor/d_a_tag_hjump.cpp @@ -204,7 +204,7 @@ extern actor_process_profile_definition g_profile_Tag_Hjump = { 3, fpcPi_CURRENT_e, PROC_Tag_Hjump, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagHjump_c), 0, 0, @@ -214,4 +214,4 @@ extern actor_process_profile_definition g_profile_Tag_Hjump = { 0x44100, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_howl.cpp b/src/d/actor/d_a_tag_howl.cpp index 41b4a83918..9ac64899ac 100644 --- a/src/d/actor/d_a_tag_howl.cpp +++ b/src/d/actor/d_a_tag_howl.cpp @@ -113,7 +113,7 @@ extern actor_process_profile_definition g_profile_TAG_HOWL = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_HOWL, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTag_Howl_c), // mSize 0, // mSizeOther 0, // mParameters @@ -123,4 +123,4 @@ extern actor_process_profile_definition g_profile_TAG_HOWL = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_hstop.cpp b/src/d/actor/d_a_tag_hstop.cpp index d1ce700d0d..bdb6754ff9 100644 --- a/src/d/actor/d_a_tag_hstop.cpp +++ b/src/d/actor/d_a_tag_hstop.cpp @@ -195,7 +195,7 @@ extern actor_process_profile_definition g_profile_Tag_Hstop = { 3, fpcPi_CURRENT_e, PROC_Tag_Hstop, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagHstop_c), 0, 0, @@ -205,4 +205,4 @@ extern actor_process_profile_definition g_profile_Tag_Hstop = { 0x40000, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_instruction.cpp b/src/d/actor/d_a_tag_instruction.cpp index 280218e11d..dedc5ad21f 100644 --- a/src/d/actor/d_a_tag_instruction.cpp +++ b/src/d/actor/d_a_tag_instruction.cpp @@ -35,7 +35,7 @@ extern actor_process_profile_definition g_profile_Tag_Instruction = { 7, fpcPi_CURRENT_e, PROC_Tag_Instruction, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagInst_c), 0, 0, @@ -45,4 +45,4 @@ extern actor_process_profile_definition g_profile_Tag_Instruction = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp index 1e3b740c20..1ce4209ee7 100644 --- a/src/d/actor/d_a_tag_kago_fall.cpp +++ b/src/d/actor/d_a_tag_kago_fall.cpp @@ -301,7 +301,7 @@ extern actor_process_profile_definition g_profile_Tag_KagoFall = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_KagoFall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagKagoFall_c), // mSize 0, // mSizeOther 0, // mParameters @@ -311,4 +311,4 @@ extern actor_process_profile_definition g_profile_Tag_KagoFall = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index 7c5d9ad50b..e57659700b 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -127,7 +127,7 @@ extern actor_process_profile_definition g_profile_TAG_LANTERN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_LANTERN, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTag_Lantern_c), // mSize 0, // mSizeOther 0, // mParameters @@ -137,4 +137,4 @@ extern actor_process_profile_definition g_profile_TAG_LANTERN = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_lightball.cpp b/src/d/actor/d_a_tag_lightball.cpp index b29a2b5b7a..d867346677 100644 --- a/src/d/actor/d_a_tag_lightball.cpp +++ b/src/d/actor/d_a_tag_lightball.cpp @@ -134,7 +134,7 @@ extern actor_process_profile_definition g_profile_Tag_LightBall = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_LightBall, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagLightBall_c), // mSize 0, // mSizeOther 0, // mParameters @@ -144,4 +144,4 @@ extern actor_process_profile_definition g_profile_Tag_LightBall = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_lv2prchk.cpp b/src/d/actor/d_a_tag_lv2prchk.cpp index ef0a1e9bfe..30c9e1ea08 100644 --- a/src/d/actor/d_a_tag_lv2prchk.cpp +++ b/src/d/actor/d_a_tag_lv2prchk.cpp @@ -215,7 +215,7 @@ extern actor_process_profile_definition g_profile_Tag_Lv2PrChk = { 7, fpcPi_CURRENT_e, PROC_Tag_Lv2PrChk, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagLv2PrChk_c), 0, 0, @@ -225,4 +225,4 @@ extern actor_process_profile_definition g_profile_Tag_Lv2PrChk = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_lv5soup.cpp b/src/d/actor/d_a_tag_lv5soup.cpp index ccd9f3c4c9..493a66410e 100644 --- a/src/d/actor/d_a_tag_lv5soup.cpp +++ b/src/d/actor/d_a_tag_lv5soup.cpp @@ -97,7 +97,7 @@ extern actor_process_profile_definition g_profile_TAG_LV5SOUP = { 7, fpcPi_CURRENT_e, 0x122, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTag_Lv5Soup_c), 0, 0, @@ -107,4 +107,4 @@ extern actor_process_profile_definition g_profile_TAG_LV5SOUP = { 0x64100, 5, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_lv6CstaSw.cpp b/src/d/actor/d_a_tag_lv6CstaSw.cpp index b1da59a179..cba54d5c97 100644 --- a/src/d/actor/d_a_tag_lv6CstaSw.cpp +++ b/src/d/actor/d_a_tag_lv6CstaSw.cpp @@ -118,7 +118,7 @@ extern actor_process_profile_definition g_profile_Tag_Lv6CstaSw = { 7, fpcPi_CURRENT_e, PROC_Tag_Lv6CstaSw, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daLv6CstaSw_c), 0, 0, @@ -128,4 +128,4 @@ extern actor_process_profile_definition g_profile_Tag_Lv6CstaSw = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_magne.cpp b/src/d/actor/d_a_tag_magne.cpp index fba726a9a2..e536abf8cc 100644 --- a/src/d/actor/d_a_tag_magne.cpp +++ b/src/d/actor/d_a_tag_magne.cpp @@ -69,7 +69,7 @@ extern actor_process_profile_definition g_profile_Tag_Magne = { 7, fpcPi_CURRENT_e, PROC_Tag_Magne, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagMagne_c), 0, 0, @@ -79,4 +79,4 @@ extern actor_process_profile_definition g_profile_Tag_Magne = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp index ee5f7da6f4..6dd9388de3 100644 --- a/src/d/actor/d_a_tag_mhint.cpp +++ b/src/d/actor/d_a_tag_mhint.cpp @@ -251,7 +251,7 @@ extern actor_process_profile_definition g_profile_Tag_Mhint = { 7, fpcPi_CURRENT_e, PROC_Tag_Mhint, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagMhint_c), 0, 0, @@ -261,4 +261,4 @@ extern actor_process_profile_definition g_profile_Tag_Mhint = { 0x44000, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_mist.cpp b/src/d/actor/d_a_tag_mist.cpp index 9f462396d3..965884c50e 100644 --- a/src/d/actor/d_a_tag_mist.cpp +++ b/src/d/actor/d_a_tag_mist.cpp @@ -164,7 +164,7 @@ extern actor_process_profile_definition g_profile_Tag_Mist = { 7, fpcPi_CURRENT_e, PROC_Tag_Mist, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagMist_c), 0, 0, @@ -174,4 +174,4 @@ extern actor_process_profile_definition g_profile_Tag_Mist = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_mmsg.cpp b/src/d/actor/d_a_tag_mmsg.cpp index 3ca8bbde29..1d7f14e5a8 100644 --- a/src/d/actor/d_a_tag_mmsg.cpp +++ b/src/d/actor/d_a_tag_mmsg.cpp @@ -117,7 +117,7 @@ extern actor_process_profile_definition g_profile_Tag_Mmsg = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Mmsg, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagMmsg_c), // mSize 0, // mSizeOther 0, // mParameters @@ -127,4 +127,4 @@ extern actor_process_profile_definition g_profile_Tag_Mmsg = { 0x44000, // mStatus fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 7c2ddbd7a4..62a85db593 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -266,7 +266,7 @@ extern actor_process_profile_definition g_profile_TAG_MSG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_MSG, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTag_Msg_c), // mSize 0, // mSizeOther 0, // mParameters @@ -276,4 +276,4 @@ extern actor_process_profile_definition g_profile_TAG_MSG = { 0x00044000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_mstop.cpp b/src/d/actor/d_a_tag_mstop.cpp index ac2859a74f..f24e58fe23 100644 --- a/src/d/actor/d_a_tag_mstop.cpp +++ b/src/d/actor/d_a_tag_mstop.cpp @@ -193,7 +193,7 @@ extern actor_process_profile_definition g_profile_Tag_Mstop = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Mstop, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagMstop_c), // mSize 0, // mSizeOther 0, // mParameters @@ -203,4 +203,4 @@ extern actor_process_profile_definition g_profile_Tag_Mstop = { 0x44000, // mStatus fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_mwait.cpp b/src/d/actor/d_a_tag_mwait.cpp index 3da8c8b2b1..78375523cc 100644 --- a/src/d/actor/d_a_tag_mwait.cpp +++ b/src/d/actor/d_a_tag_mwait.cpp @@ -171,7 +171,7 @@ extern actor_process_profile_definition g_profile_Tag_Mwait = { 7, fpcPi_CURRENT_e, PROC_Tag_Mwait, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagMwait_c), 0, 0, @@ -181,4 +181,4 @@ extern actor_process_profile_definition g_profile_Tag_Mwait = { 0x44000, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_myna2.cpp b/src/d/actor/d_a_tag_myna2.cpp index c4ce6858d0..d7eee6f1f4 100644 --- a/src/d/actor/d_a_tag_myna2.cpp +++ b/src/d/actor/d_a_tag_myna2.cpp @@ -83,7 +83,7 @@ extern actor_process_profile_definition g_profile_TAG_MYNA2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_MYNA2, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagMyna2_c), // mSize 0, // mSizeOther 0, // mParameters @@ -93,4 +93,4 @@ extern actor_process_profile_definition g_profile_TAG_MYNA2 = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_myna_light.cpp b/src/d/actor/d_a_tag_myna_light.cpp index 49860c51a7..863f8a507e 100644 --- a/src/d/actor/d_a_tag_myna_light.cpp +++ b/src/d/actor/d_a_tag_myna_light.cpp @@ -180,7 +180,7 @@ extern actor_process_profile_definition g_profile_TAG_MNLIGHT = { 7, fpcLy_CURRENT_e, PROC_TAG_MNLIGHT, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTag_MynaLight_c), 0, 0, @@ -190,4 +190,4 @@ extern actor_process_profile_definition g_profile_TAG_MNLIGHT = { 0x64100, 0x05, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index 9f07a9ba27..0b92617ff7 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -90,7 +90,7 @@ extern actor_process_profile_definition g_profile_TAG_PATI = { 7, fpcLy_CURRENT_e, PROC_TAG_PATI, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagPati_c), 0, 0, @@ -100,4 +100,4 @@ extern actor_process_profile_definition g_profile_TAG_PATI = { 0x40000, 0, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_poFire.cpp b/src/d/actor/d_a_tag_poFire.cpp index 168f06e1c4..7323f381fe 100644 --- a/src/d/actor/d_a_tag_poFire.cpp +++ b/src/d/actor/d_a_tag_poFire.cpp @@ -87,7 +87,7 @@ extern actor_process_profile_definition g_profile_Tag_poFire = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_poFire, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagPoFire_c), // mSize 0, // mSizeOther 0, // mParameters @@ -97,4 +97,4 @@ extern actor_process_profile_definition g_profile_Tag_poFire = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_push.cpp b/src/d/actor/d_a_tag_push.cpp index 3d6fbb08cd..e4990800b2 100644 --- a/src/d/actor/d_a_tag_push.cpp +++ b/src/d/actor/d_a_tag_push.cpp @@ -13,31 +13,31 @@ void* daTag_Push_c::srchActor(void* param_0, void* param_1) { if (fopAcM_IsExecuting(fopAcM_GetID(param_0))) { switch (((daTag_Push_c*)param_1)->getId()) { case 1: - bVar1 = ((daTag_Push_c*)param_0)->mBase.mProcName == PROC_NPC_TARO; + bVar1 = ((daTag_Push_c*)param_0)->base.name == PROC_NPC_TARO; break; case 2: - bVar1 = ((daTag_Push_c*)param_0)->mBase.mProcName == PROC_NPC_JAGAR; + bVar1 = ((daTag_Push_c*)param_0)->base.name == PROC_NPC_JAGAR; break; case 3: - bVar1 = ((daTag_Push_c*)param_0)->mBase.mProcName == PROC_NPC_LEN; + bVar1 = ((daTag_Push_c*)param_0)->base.name == PROC_NPC_LEN; break; case 4: - bVar1 = ((daTag_Push_c*)param_0)->mBase.mProcName == PROC_NPC_TARO; + bVar1 = ((daTag_Push_c*)param_0)->base.name == PROC_NPC_TARO; break; case 5: - bVar1 = ((daTag_Push_c*)param_0)->mBase.mProcName == PROC_NPC_MARO; + bVar1 = ((daTag_Push_c*)param_0)->base.name == PROC_NPC_MARO; break; case 6: - bVar1 = ((daTag_Push_c*)param_0)->mBase.mProcName == PROC_NPC_BESU; + bVar1 = ((daTag_Push_c*)param_0)->base.name == PROC_NPC_BESU; break; case 7: - bVar1 = ((daTag_Push_c*)param_0)->mBase.mProcName == PROC_NPC_BOU; + bVar1 = ((daTag_Push_c*)param_0)->base.name == PROC_NPC_BOU; break; case 8: - bVar1 = ((daTag_Push_c*)param_0)->mBase.mProcName == PROC_NPC_GRS; + bVar1 = ((daTag_Push_c*)param_0)->base.name == PROC_NPC_GRS; break; case 9: - bVar1 = ((daTag_Push_c*)param_0)->mBase.mProcName == PROC_NPC_GRO; + bVar1 = ((daTag_Push_c*)param_0)->base.name == PROC_NPC_GRO; break; } } @@ -178,7 +178,7 @@ extern actor_process_profile_definition g_profile_TAG_PUSH = { 8, fpcLy_CURRENT_e, PROC_TAG_PUSH, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTag_Push_c), 0, 0, diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp index 0b7416bc72..36c47b8acb 100644 --- a/src/d/actor/d_a_tag_qs.cpp +++ b/src/d/actor/d_a_tag_qs.cpp @@ -257,7 +257,7 @@ extern actor_process_profile_definition g_profile_TAG_QS = { 7, fpcPi_CURRENT_e, PROC_TAG_QS, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagQs_c), 0, 0, diff --git a/src/d/actor/d_a_tag_ret_room.cpp b/src/d/actor/d_a_tag_ret_room.cpp index 1014a1966a..38e5ed2ff5 100644 --- a/src/d/actor/d_a_tag_ret_room.cpp +++ b/src/d/actor/d_a_tag_ret_room.cpp @@ -108,7 +108,7 @@ extern actor_process_profile_definition g_profile_Tag_RetRoom = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_RetRoom, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagRetRm_c), // mSize 0, // mSizeOther 0, // mParameters @@ -118,4 +118,4 @@ extern actor_process_profile_definition g_profile_Tag_RetRoom = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp index 346a50afb6..fc9f0a9abe 100644 --- a/src/d/actor/d_a_tag_river_back.cpp +++ b/src/d/actor/d_a_tag_river_back.cpp @@ -213,7 +213,7 @@ extern actor_process_profile_definition g_profile_Tag_RiverBack = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_RiverBack, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagRiverBack_c), // mSize 0, // mSizeOther 0, // mParameters @@ -225,4 +225,4 @@ extern actor_process_profile_definition g_profile_Tag_RiverBack = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80D5F950-80D5F950 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D5F950-80D5F950 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_tag_rmbit_sw.cpp b/src/d/actor/d_a_tag_rmbit_sw.cpp index 4175727601..8dfe001c43 100644 --- a/src/d/actor/d_a_tag_rmbit_sw.cpp +++ b/src/d/actor/d_a_tag_rmbit_sw.cpp @@ -139,7 +139,7 @@ extern actor_process_profile_definition g_profile_Tag_RmbitSw = { 7, fpcPi_CURRENT_e, PROC_Tag_RmbitSw, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagRmbitSw_c), 0, 0, @@ -149,4 +149,4 @@ extern actor_process_profile_definition g_profile_Tag_RmbitSw = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_schedule.cpp b/src/d/actor/d_a_tag_schedule.cpp index 52b7ae5fb0..c90a29be3f 100644 --- a/src/d/actor/d_a_tag_schedule.cpp +++ b/src/d/actor/d_a_tag_schedule.cpp @@ -30,7 +30,7 @@ extern actor_process_profile_definition g_profile_Tag_Schedule = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Schedule, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagSchedule_c), // mSize 0, // mSizeOther 0, // mParameters @@ -40,4 +40,4 @@ extern actor_process_profile_definition g_profile_Tag_Schedule = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_setBall.cpp b/src/d/actor/d_a_tag_setBall.cpp index 84a9b1ebf4..5df8da13df 100644 --- a/src/d/actor/d_a_tag_setBall.cpp +++ b/src/d/actor/d_a_tag_setBall.cpp @@ -73,7 +73,7 @@ extern actor_process_profile_definition g_profile_Tag_SetBall = { 7, fpcPi_CURRENT_e, PROC_Tag_SetBall, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagSetBall_c), 0, 0, @@ -83,4 +83,4 @@ extern actor_process_profile_definition g_profile_Tag_SetBall = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_setrestart.cpp b/src/d/actor/d_a_tag_setrestart.cpp index e9ac281fb4..b6ed9b0990 100644 --- a/src/d/actor/d_a_tag_setrestart.cpp +++ b/src/d/actor/d_a_tag_setrestart.cpp @@ -120,7 +120,7 @@ extern actor_process_profile_definition g_profile_Tag_Restart = { 7, fpcPi_CURRENT_e, PROC_Tag_Restart, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagRestart_c), 0, 0, diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index fffdd8d3e5..3e85202a84 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -209,7 +209,7 @@ extern actor_process_profile_definition g_profile_TAG_SHOPITM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_SHOPITM, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTag_ShopItem_c), // mSize 0, // mSizeOther 0, // mParameters @@ -219,4 +219,4 @@ extern actor_process_profile_definition g_profile_TAG_SHOPITM = { 0x64100, // mStatus 5, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp index 41909fd692..07e3cc1261 100644 --- a/src/d/actor/d_a_tag_smk_emt.cpp +++ b/src/d/actor/d_a_tag_smk_emt.cpp @@ -104,7 +104,7 @@ extern actor_process_profile_definition g_profile_Tag_SmkEmt = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_SmkEmt, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagSmkEmt_c), // mSize 0, // mSizeOther 0, // mParameters @@ -114,4 +114,4 @@ extern actor_process_profile_definition g_profile_Tag_SmkEmt = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_spinner.cpp b/src/d/actor/d_a_tag_spinner.cpp index 05fb5abea2..8106a477e8 100644 --- a/src/d/actor/d_a_tag_spinner.cpp +++ b/src/d/actor/d_a_tag_spinner.cpp @@ -117,7 +117,7 @@ extern actor_process_profile_definition g_profile_Tag_Spinner = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Spinner, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagSpinner_c), // mSize 0, // mSizeOther 0, // mParameters @@ -127,4 +127,4 @@ extern actor_process_profile_definition g_profile_Tag_Spinner = { 0x40100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index c3eb5ac96a..a5000dae56 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -218,7 +218,7 @@ extern actor_process_profile_definition g_profile_Tag_Sppath = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Sppath, // mProcName, - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagSppath_c), // mSize 0, // mSizeOther 0, // mParameters @@ -228,4 +228,4 @@ extern actor_process_profile_definition g_profile_Tag_Sppath = { 0x44000, // mStatus fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_spring.cpp b/src/d/actor/d_a_tag_spring.cpp index 247b5d9e61..240ddadf0e 100644 --- a/src/d/actor/d_a_tag_spring.cpp +++ b/src/d/actor/d_a_tag_spring.cpp @@ -109,7 +109,7 @@ extern actor_process_profile_definition g_profile_Tag_Spring = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Spring, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagSpring_c), // mSize 0, // mSizeOther 0, // mParameters @@ -119,4 +119,4 @@ extern actor_process_profile_definition g_profile_Tag_Spring = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp index 83c20feafb..0de6badc25 100644 --- a/src/d/actor/d_a_tag_ss_drink.cpp +++ b/src/d/actor/d_a_tag_ss_drink.cpp @@ -298,7 +298,7 @@ extern actor_process_profile_definition g_profile_TAG_SSDRINK = { 7, fpcLy_CURRENT_e, PROC_TAG_SSDRINK, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTag_SSDrink_c), 0, 0, @@ -308,4 +308,4 @@ extern actor_process_profile_definition g_profile_TAG_SSDRINK = { 0x64100, 5, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index 7e6e8221d8..17bdca9fc8 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -514,7 +514,7 @@ extern actor_process_profile_definition g_profile_Tag_Statue = { 7, fpcPi_CURRENT_e, PROC_Tag_Statue, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagStatue_c), 0, 0, @@ -524,4 +524,4 @@ extern actor_process_profile_definition g_profile_Tag_Statue = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_stream.cpp b/src/d/actor/d_a_tag_stream.cpp index 07900b0d5e..0f47e8a766 100644 --- a/src/d/actor/d_a_tag_stream.cpp +++ b/src/d/actor/d_a_tag_stream.cpp @@ -123,7 +123,7 @@ extern actor_process_profile_definition g_profile_Tag_Stream = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Stream, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagStream_c), // mSize 0, // mSizeOther 0, // mParameters @@ -133,4 +133,4 @@ extern actor_process_profile_definition g_profile_Tag_Stream = { 0x44000, // mStatus fopAc_ENV_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_telop.cpp b/src/d/actor/d_a_tag_telop.cpp index 4c9b46325f..b75bd82de0 100644 --- a/src/d/actor/d_a_tag_telop.cpp +++ b/src/d/actor/d_a_tag_telop.cpp @@ -81,7 +81,7 @@ extern actor_process_profile_definition g_profile_TAG_TELOP = { 7, fpcPi_CURRENT_e, PROC_TAG_TELOP, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTag_Telop_c), 0, 0, @@ -91,4 +91,4 @@ extern actor_process_profile_definition g_profile_TAG_TELOP = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_6_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_theB_hint.cpp b/src/d/actor/d_a_tag_theB_hint.cpp index 888044f828..c882187f25 100644 --- a/src/d/actor/d_a_tag_theB_hint.cpp +++ b/src/d/actor/d_a_tag_theB_hint.cpp @@ -36,7 +36,7 @@ extern actor_process_profile_definition g_profile_Tag_TheBHint = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_TheBHint, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagTheBHint_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_tag_wara_howl.cpp b/src/d/actor/d_a_tag_wara_howl.cpp index 4cc21eaa4c..a4be9a2718 100644 --- a/src/d/actor/d_a_tag_wara_howl.cpp +++ b/src/d/actor/d_a_tag_wara_howl.cpp @@ -101,7 +101,7 @@ extern actor_process_profile_definition g_profile_Tag_WaraHowl = { 7, fpcPi_CURRENT_e, PROC_Tag_WaraHowl, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagWrHowl_c), 0, 0, diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp index 210a60aa84..068e7d2e74 100644 --- a/src/d/actor/d_a_tag_watchge.cpp +++ b/src/d/actor/d_a_tag_watchge.cpp @@ -107,7 +107,7 @@ extern actor_process_profile_definition g_profile_Tag_WatchGe = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_WatchGe, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagWatchGe_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index 49c04b2824..daa1c62144 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -102,7 +102,7 @@ bool daTagWaterFall_c::checkHitWaterFall(cXyz objPos) { * checkHitWaterFallCamera__16daTagWaterFall_cFv */ bool daTagWaterFall_c::checkHitWaterFallCamera() { const camera_class* camera = dComIfGp_getCamera(0); - return checkHitWaterFall(camera->mLookat.mEye); + return checkHitWaterFall(camera->lookat.eye); } /* ############################################################################################## */ @@ -269,7 +269,7 @@ extern actor_process_profile_definition g_profile_Tag_WaterFall = { 7, fpcPi_CURRENT_e, PROC_Tag_WaterFall, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagWaterFall_c), 0, 0, diff --git a/src/d/actor/d_a_tag_wljump.cpp b/src/d/actor/d_a_tag_wljump.cpp index 3df14061b0..dce6934810 100644 --- a/src/d/actor/d_a_tag_wljump.cpp +++ b/src/d/actor/d_a_tag_wljump.cpp @@ -396,7 +396,7 @@ extern actor_process_profile_definition g_profile_Tag_Wljump = { 7, fpcPi_CURRENT_e, PROC_Tag_Wljump, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTagWljump_c), 0, 0, @@ -406,4 +406,4 @@ extern actor_process_profile_definition g_profile_Tag_Wljump = { 0x44000, fopAc_ENV_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index 0927973783..dc14d6d1ac 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -146,7 +146,7 @@ extern actor_process_profile_definition g_profile_TAG_YAMI = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_YAMI, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTagYami_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp index 71c0de2960..55960a7f12 100644 --- a/src/d/actor/d_a_talk.cpp +++ b/src/d/actor/d_a_talk.cpp @@ -136,7 +136,7 @@ extern actor_process_profile_definition g_profile_TALK = { 7, fpcPi_CURRENT_e, PROC_TALK, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTalk_c), 0, 0, @@ -146,4 +146,4 @@ extern actor_process_profile_definition g_profile_TALK = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_6_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index e4b67011f1..96061299d7 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -727,7 +727,7 @@ void daTbox_c::dropProc() { vec2.y += 10.0f; dBgS_ObjGndChk gnd_chk; gnd_chk.SetPos(&vec2); - gnd_chk.SetActorPid(mBase.mBsPcId); + gnd_chk.SetActorPid(base.id); dComIfG_Bgsp().GroundCross(&gnd_chk); int bg_index = gnd_chk.GetBgIndex(); if (bg_index >= 0 && bg_index < 0x100) { @@ -1710,7 +1710,7 @@ extern actor_process_profile_definition g_profile_TBOX = { 4, fpcPi_CURRENT_e, PROC_TBOX, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTbox_c), 0, 0, diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index 67c55c60cd..6e840b153d 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -512,7 +512,7 @@ extern actor_process_profile_definition g_profile_TBOX2 = { 4, fpcPi_CURRENT_e, PROC_TBOX2, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTbox2_c), 0, 0, @@ -522,4 +522,4 @@ extern actor_process_profile_definition g_profile_TBOX2 = { 0x44100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tboxSw.cpp b/src/d/actor/d_a_tboxSw.cpp index 9a797609ef..0005d98c7d 100644 --- a/src/d/actor/d_a_tboxSw.cpp +++ b/src/d/actor/d_a_tboxSw.cpp @@ -77,7 +77,7 @@ extern actor_process_profile_definition g_profile_TBOX_SW = { 7, fpcPi_CURRENT_e, PROC_TBOX_SW, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daTboxSw_c), 0, 0, @@ -87,4 +87,4 @@ extern actor_process_profile_definition g_profile_TBOX_SW = { 0x40100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 34c7470e0d..3f41bd59df 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -394,7 +394,7 @@ extern actor_process_profile_definition g_profile_TITLE = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TITLE, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(daTitle_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index 6117359273..6a39ec2c0a 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -164,7 +164,7 @@ extern actor_process_profile_definition g_profile_VRBOX = { 7, fpcPi_CURRENT_e, PROC_VRBOX, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(vrbox_class), 0, 0, @@ -174,4 +174,4 @@ extern actor_process_profile_definition g_profile_VRBOX = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 9493b5e315..bad20117af 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -283,14 +283,14 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { sp14 = sun_p->mPos[0]; if (strcmp(dComIfGp_getStartStageName(), "F_SP102") == 0) { - dKyr_get_vectle_calc(&camera_p->mLookat.mEye, &g_env_light.mSunPos, &sp8); - sp14.x = camera_p->mLookat.mEye.x + (8000.0f * sp8.x); - sp14.y = camera_p->mLookat.mEye.y + (8000.0f * sp8.y); - sp14.z = camera_p->mLookat.mEye.z + (8000.0f * sp8.z); + dKyr_get_vectle_calc(&camera_p->lookat.eye, &g_env_light.mSunPos, &sp8); + sp14.x = camera_p->lookat.eye.x + (8000.0f * sp8.x); + sp14.y = camera_p->lookat.eye.y + (8000.0f * sp8.y); + sp14.z = camera_p->lookat.eye.z + (8000.0f * sp8.z); } - s16 temp_r19 = cLib_targetAngleX(&camera_p->mLookat.mEye, &sp14); - s16 temp_r18 = cLib_targetAngleY(&camera_p->mLookat.mEye, &sp14); + s16 temp_r19 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14); + s16 temp_r18 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14); mDoMtx_stack_c::transS(sp14.x, sp14.y, sp14.z); mDoMtx_stack_c::YrotM((s16)temp_r18); mDoMtx_stack_c::XrotM(0x7FFF - temp_r19); @@ -322,8 +322,8 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { sp14 = sun_p->mPos[0]; sp14.y = 300.0f - (sp14.y * 0.85f); - s16 temp_r19_2 = cLib_targetAngleX(&camera_p->mLookat.mEye, &sp14); - s16 temp_r18_2 = cLib_targetAngleY(&camera_p->mLookat.mEye, &sp14); + s16 temp_r19_2 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14); + s16 temp_r18_2 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14); mDoMtx_stack_c::transS(sp14.x, sp14.y, sp14.z); mDoMtx_stack_c::YrotM((s16)temp_r18_2); mDoMtx_stack_c::XrotM(0x7FFF - temp_r19_2); @@ -442,8 +442,8 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); - cam_eye = camera_p->mLookat.mEye; - cam_center = camera_p->mLookat.mCenter; + cam_eye = camera_p->lookat.eye; + cam_center = camera_p->lookat.center; cam_eye.y = 0.0f; cam_center.y = 0.0f; @@ -671,7 +671,7 @@ extern actor_process_profile_definition g_profile_VRBOX2 = { 7, fpcPi_CURRENT_e, PROC_VRBOX2, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(vrbox2_class), 0, 0, @@ -681,4 +681,4 @@ extern actor_process_profile_definition g_profile_VRBOX2 = { 0x44000, fopAc_ACTOR_e, fopAc_CULLBOX_0_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index 8b95bc4db3..85d5c5b97a 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -176,7 +176,7 @@ extern actor_process_profile_definition g_profile_WarpBug = { 7, fpcPi_CURRENT_e, PROC_WarpBug, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daWarpBug_c), 0, 0, @@ -186,4 +186,4 @@ extern actor_process_profile_definition g_profile_WarpBug = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 9ec2e53702..c1251ee1ea 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -249,7 +249,7 @@ extern actor_process_profile_definition g_profile_Ykgr = { 7, fpcPi_CURRENT_e, PROC_Ykgr, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(daYkgr_c), 0, 0, diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index e2efbab95b..2cf5691d43 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -1385,7 +1385,7 @@ void dAttDraw_c::draw(cXyz& param_0, Mtx param_1) { mModel[field_0x170]->setBaseTRMtx(mDoMtx_stack_c::get()); view_class* view = dComIfGd_getView(); - f32 temp_f31 = tan(0.01745329238474369f * (0.5f * view->mFovy)); + f32 temp_f31 = tan(0.01745329238474369f * (0.5f * view->fovy)); f32 temp_f30 = (-100.0f - g_AttDwHIO.mCursorDistance) / temp_f31; cXyz tmp; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index ae7f2a1b55..2a459b4599 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -3000,8 +3000,8 @@ bool dCamera_c::pointInSight(cXyz* i_point) { cXyz proj; dDlst_window_c* window = get_window(field_0x0); scissor_class* scissor = window->getScissor(); - f32 scissor_width = scissor->mWidth; - f32 scissor_height = scissor->mHeight; + f32 scissor_width = scissor->width; + f32 scissor_height = scissor->height; mDoLib_project(i_point, &proj); return (proj.x > 0.0f && proj.x < scissor_width) && (proj.y > 0.0f && proj.y < scissor_height); } @@ -3013,10 +3013,10 @@ f32 dCamera_c::radiusActorInSight(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cX dDlst_window_c* window = get_window(field_0x0); scissor_class* scissor = window->getScissor(); f32 dVar3 = cAngle::d2r(param_4) * 0.5f; - f32 tmp = (scissor->mHeight - mTrimHeight * 2.0f) / 448.0f * dVar3; + f32 tmp = (scissor->height - mTrimHeight * 2.0f) / 448.0f * dVar3; f32 fVar8 = tmp * (mTrimHeight < 0.01f ? 0.95f : 1.0f); dVar3 *= field_0x92c; - f32 fVar7 = dVar3 * (scissor->mWidth / 608.0f) * 0.85f; + f32 fVar7 = dVar3 * (scissor->width / 608.0f) * 0.85f; cXyz pos1 = attentionPos(i_actor1); pos1.y += (positionOf(i_actor1).y - attentionPos(i_actor1).y) * 0.5f; @@ -3292,7 +3292,7 @@ int dCamera_c::defaultTriming() { void dCamera_c::setView(f32 i_xOrig, f32 i_yOrig, f32 i_width, f32 i_height) { dDlst_window_c* window = get_window(field_0x0); view_port_class* view_port = window->getViewPort(); - window->setViewPort(i_xOrig, i_yOrig, i_width, i_height, view_port->mNearZ, view_port->mFarZ); + window->setViewPort(i_xOrig, i_yOrig, i_width, i_height, view_port->near_z, view_port->far_z); window->setScissor(i_xOrig, i_yOrig, i_width, i_height); } @@ -4750,20 +4750,20 @@ static int camera_draw(camera_process_class* i_this) { int trim_height = body->TrimHeight(); window->setScissor(0.0f, trim_height, 608.0f, 448.0f - trim_height * 2.0f); - C_MTXPerspective(i_this->mProjMtx, i_this->mFovy, i_this->mAspect, i_this->mNear, i_this->mFar); - mDoMtx_lookAt(i_this->mViewMtx, &i_this->mLookat.mEye, &i_this->mLookat.mCenter, - &i_this->mLookat.mUp, i_this->mBank); + C_MTXPerspective(i_this->projMtx, i_this->fovy, i_this->aspect, i_this->near, i_this->far); + mDoMtx_lookAt(i_this->viewMtx, &i_this->lookat.eye, &i_this->lookat.center, + &i_this->lookat.up, i_this->bank); - j3dSys.setViewMtx(i_this->mViewMtx); - cMtx_inverse(i_this->mViewMtx, i_this->mInvViewMtx); + j3dSys.setViewMtx(i_this->viewMtx); + cMtx_inverse(i_this->viewMtx, i_this->invViewMtx); - Z2GetAudience()->setAudioCamera(i_this->mViewMtx, i_this->mLookat.mEye, i_this->mLookat.mCenter, - i_this->mFovy, i_this->mAspect, getComStat(0x80), camera_id, + Z2GetAudience()->setAudioCamera(i_this->viewMtx, i_this->lookat.eye, i_this->lookat.center, + i_this->fovy, i_this->aspect, getComStat(0x80), camera_id, false); dBgS_GndChk gndchk; gndchk.OnWaterGrp(); - gndchk.SetPos(&i_this->mLookat.mEye); + gndchk.SetPos(&i_this->lookat.eye); f32 cross = dComIfG_Bgsp().GroundCross(&gndchk); if (cross != -1000000000.0f) { @@ -4775,20 +4775,20 @@ static int camera_draw(camera_process_class* i_this) { mDoAud_setCameraGroupInfo(dComIfG_Bgsp().GetGrpSoundId(gndchk)); Vec spDC; - spDC.x = i_this->mLookat.mEye.x; + spDC.x = i_this->lookat.eye.x; spDC.y = cross; - spDC.z = i_this->mLookat.mEye.z; + spDC.z = i_this->lookat.eye.z; Z2AudioMgr::getInterface()->setCameraPolygonPos(&spDC); } else { Z2AudioMgr::getInterface()->setCameraPolygonPos(NULL); } - MTXCopy(i_this->mViewMtx, i_this->mViewMtxNoTrans); - i_this->mViewMtxNoTrans[0][3] = 0.0f; - i_this->mViewMtxNoTrans[1][3] = 0.0f; - i_this->mViewMtxNoTrans[2][3] = 0.0f; - cMtx_concatProjView(i_this->mProjMtx, i_this->mViewMtx, i_this->mProjViewMtx); + MTXCopy(i_this->viewMtx, i_this->viewMtxNoTrans); + i_this->viewMtxNoTrans[0][3] = 0.0f; + i_this->viewMtxNoTrans[1][3] = 0.0f; + i_this->viewMtxNoTrans[2][3] = 0.0f; + cMtx_concatProjView(i_this->projMtx, i_this->viewMtx, i_this->projViewMtx); body->Draw(); return 1; @@ -4882,7 +4882,7 @@ static int init_phase2(camera_class* i_this) { /* 80182454-80182484 17CD94 0030+00 1/0 0/0 0/0 .text camera_create__FP12camera_class */ static int camera_create(camera_class* i_this) { - return dComLbG_PhaseHandler(&i_this->mPhaseReq, l_method, i_this); + return dComLbG_PhaseHandler(&i_this->phase_request, l_method, i_this); } /* 80182484-801824C0 17CDC4 003C+00 1/0 0/0 0/0 .text camera_delete__FP20camera_process_class */ diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index a792f7c0c0..5b43cb6996 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -491,7 +491,7 @@ f32 dDemo_camera_c::JSGGetProjectionNear() const { return 0.0f; } - return view->mNear; + return view->near; } /* 80038AF8-80038B0C 033438 0014+00 1/0 0/0 0/0 .text JSGSetProjectionNear__14dDemo_camera_cFf */ @@ -508,7 +508,7 @@ f32 dDemo_camera_c::JSGGetProjectionFar() const { return 1.0f; } - return view->mFar; + return view->far; } /* 80038B40-80038B54 033480 0014+00 1/0 0/0 0/0 .text JSGSetProjectionFar__14dDemo_camera_cFf */ @@ -525,7 +525,7 @@ f32 dDemo_camera_c::JSGGetProjectionFovy() const { return 60.0f; } - return view->mFovy; + return view->fovy; } /* 80038B88-80038B9C 0334C8 0014+00 1/0 0/0 0/0 .text JSGSetProjectionFovy__14dDemo_camera_cFf */ @@ -543,7 +543,7 @@ f32 dDemo_camera_c::JSGGetProjectionAspect() const { return 1.3571428f; } - return view->mAspect; + return view->aspect; } /* 80038BD0-80038BE4 033510 0014+00 1/0 0/0 0/0 .text JSGSetProjectionAspect__14dDemo_camera_cFf @@ -563,7 +563,7 @@ void dDemo_camera_c::JSGGetViewPosition(Vec* o_position) const { o_position->y = 0.0f; o_position->z = 0.0f; } else { - *o_position = view->mLookat.mEye; + *o_position = view->lookat.eye; } } @@ -584,7 +584,7 @@ void dDemo_camera_c::JSGGetViewUpVector(Vec* o_upVec) const { o_upVec->y = 1.0f; o_upVec->z = 0.0f; } else { - *o_upVec = view->mLookat.mUp; + *o_upVec = view->lookat.up; } } @@ -605,7 +605,7 @@ void dDemo_camera_c::JSGGetViewTargetPosition(Vec* o_targetPos) const { o_targetPos->y = 0.0f; o_targetPos->z = 1.0f; } else { - *o_targetPos = view->mLookat.mCenter; + *o_targetPos = view->lookat.center; } } @@ -625,7 +625,7 @@ f32 dDemo_camera_c::JSGGetViewRoll() const { return 0.0f; } - return view->mBank * 0.0054931640625f; + return view->bank * 0.0054931640625f; } /* 80038DDC-80038DF0 03371C 0014+00 1/0 0/0 0/0 .text JSGSetViewRoll__14dDemo_camera_cFf diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 398d5555b3..7c0fedc879 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -183,21 +183,21 @@ public: /* 80051AC0-80051ADC 04C400 001C+00 0/0 3/3 0/0 .text setViewPort__14dDlst_window_cFffffff */ void dDlst_window_c::setViewPort(f32 xOrig, f32 yOrig, f32 width, f32 height, f32 nearZ, f32 farZ) { - mViewport.mXOrig = xOrig; - mViewport.mYOrig = yOrig; - mViewport.mWidth = width; - mViewport.mHeight = height; - mViewport.mNearZ = nearZ; - mViewport.mFarZ = farZ; + mViewport.x_orig = xOrig; + mViewport.y_orig = yOrig; + mViewport.width = width; + mViewport.height = height; + mViewport.near_z = nearZ; + mViewport.far_z = farZ; } /* 80051ADC-80051AF0 04C41C 0014+00 0/0 4/4 0/0 .text setScissor__14dDlst_window_cFffff */ void dDlst_window_c::setScissor(f32 xOrig, f32 yOrig, f32 width, f32 height) { - mViewport.mScissor.mXOrig = xOrig; - mViewport.mScissor.mYOrig = yOrig; - mViewport.mScissor.mWidth = width; - mViewport.mScissor.mHeight = height; + mViewport.scissor.x_orig = xOrig; + mViewport.scissor.y_orig = yOrig; + mViewport.scissor.width = width; + mViewport.scissor.height = height; } /* 80051AF0-80051CF0 04C430 0200+00 1/0 0/0 0/0 .text draw__13dDlst_2DTri_cFv */ diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index e98a5c3142..8dda1ab5be 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -111,8 +111,8 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par for (dPath* path_p = dPath_GetRoomPath(data_p->field_0x18, path_roomNo); path_p != NULL; path_p = dPath_GetNextRoomPath(path_p, path_roomNo)) { - dEnvSe_getNearPathPos(&mPos, &cam_eye, path_p); - mDoAud_mEnvse_registRiverSePos(&mPos); + dEnvSe_getNearPathPos(&pos, &cam_eye, path_p); + mDoAud_mEnvse_registRiverSePos(&pos); } mDoAud_mEnvse_startRiverSe(dComIfGp_getReverb(roomNo)); @@ -126,7 +126,7 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par *param_1 |= 4; } - mPos = cam_eye; + pos = cam_eye; for (dPath* path_p = dPath_GetRoomPath(data_p->field_0x18, path_roomNo); path_p != NULL; path_p = dPath_GetNextRoomPath(path_p, path_roomNo)) @@ -136,7 +136,7 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par f32 fvar11 = cM3d_LenSq(&sp14, &cam_eye); if (fvar11 < fvar12) { fvar12 = fvar11; - mPos = sp14; + pos = sp14; } mDoAud_mEnvse_registFallSePos(&sp14); @@ -153,8 +153,8 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par for (dPath* path_p = dPath_GetRoomPath(data_p->field_0x18, path_roomNo); path_p != NULL; path_p = dPath_GetNextRoomPath(path_p, path_roomNo)) { - dEnvSe_getNearPathPos(&mPos, &cam_eye, path_p); - mDoAud_mEnvse_registSmellSePos(&mPos); + dEnvSe_getNearPathPos(&pos, &cam_eye, path_p); + mDoAud_mEnvse_registSmellSePos(&pos); } mDoAud_mEnvse_startSmellSe(dComIfGp_getReverb(roomNo)); @@ -162,8 +162,8 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par for (dPath* path_p = dPath_GetRoomPath(data_p->field_0x18, path_roomNo); path_p != NULL; path_p = dPath_GetNextRoomPath(path_p, path_roomNo)) { - dEnvSe_getNearPathPos(&mPos, &cam_eye, path_p); - mDoAud_mEnvse_registWindowPos(&mPos); + dEnvSe_getNearPathPos(&pos, &cam_eye, path_p); + mDoAud_mEnvse_registWindowPos(&pos); } } else if (data_p->field_0x17 >= 100) { if (!((field_0x108 >> i) & 1)) { @@ -175,8 +175,8 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par for (dPath* path_p = dPath_GetRoomPath(data_p->field_0x18, path_roomNo); path_p != NULL; path_p = dPath_GetNextRoomPath(path_p, path_roomNo)) { - dEnvSe_getNearPathPos(&mPos, &cam_eye, path_p); - mDoAud_registLv3WaterSePos(data_p->field_0x17, &mPos); + dEnvSe_getNearPathPos(&pos, &cam_eye, path_p); + mDoAud_registLv3WaterSePos(data_p->field_0x17, &pos); } mDoAud_startLv3WaterSe(dComIfGp_getReverb(roomNo)); @@ -250,11 +250,11 @@ extern kankyo_process_profile_definition g_profile_ENVSE = { 2, fpcPi_CURRENT_e, PROC_ENVSE, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(dEnvSe_c), 0, 0, &g_fopKy_Method, 689, &l_dEnvSe_Method, -}; \ No newline at end of file +}; diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index e3dc2a1c15..03d405c293 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -447,10 +447,10 @@ void dEvDtStaff_c::specialProcMessage() { break; case 'END\0': case 'FINI': - work->mLMsg->mMode = 0x10; + work->mLMsg->mode = 0x10; break; case 'CONT': - work->mLMsg->mMode = 0xF; + work->mLMsg->mode = 0xF; int* ptr = dComIfGp_evmng_getMyIntegerP(staffId, "msgNo"); if (ptr == NULL) { ptr = dComIfGp_evmng_getMyIntegerP(staffId, "No"); @@ -514,7 +514,7 @@ void dEvDtStaff_c::specialProcMessage() { } break; case 'PUSH': - if (work->mLMsg->mMode == 0xE) { + if (work->mLMsg->mode == 0xE) { dComIfGp_evmng_cutEnd(staffId); } break; @@ -536,14 +536,14 @@ void dEvDtStaff_c::specialProcMessage() { break; } - switch (work->mLMsg->mMode) { + switch (work->mLMsg->mode) { case 0xE: - work->mLMsg->mMode = 0x10; + work->mLMsg->mode = 0x10; break; case 0x11: break; case 0x12: - work->mLMsg->mMode = 0x13; + work->mLMsg->mode = 0x13; work->_0 = UINT32_MAX; work->mLMsg = NULL; work->mMsgSubstanceNum--; @@ -569,8 +569,8 @@ void dEvDtStaff_c::specialProcMessage() { case 'FINI': if (work->mLMsg == NULL) { dComIfGp_evmng_cutEnd(staffId); - } else if (work->mLMsg->mMode == 0x12) { - work->mLMsg->mMode = 0x13; + } else if (work->mLMsg->mode == 0x12) { + work->mLMsg->mode = 0x13; work->_0 = UINT32_MAX; work->mLMsg = NULL; dComIfGp_evmng_cutEnd(staffId); @@ -580,7 +580,7 @@ void dEvDtStaff_c::specialProcMessage() { dComIfGp_evmng_cutEnd(staffId); break; case 'END\0': - switch (work->mLMsg->mMode) { + switch (work->mLMsg->mode) { case 0x11: case 0x12: dComIfGp_evmng_cutEnd(staffId); diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index be38d40634..dff3765027 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -989,14 +989,14 @@ const char* dEvent_manager_c::getRunEventName() { } struct FindShtrCbPrms { - s16 mBsTypeId; + s16 profname; fopAc_ac_c* mActor; }; /* 8004846C-80048520 042DAC 00B4+00 1/1 0/0 0/0 .text findShutterCallBack__FP10fopAc_ac_cPv */ static fopAc_ac_c* findShutterCallBack(fopAc_ac_c* pActor, void* param_1) { FindShtrCbPrms* prms = (FindShtrCbPrms*)param_1; - if (prms->mBsTypeId != fopAcM_GetProfName(pActor)) { + if (prms->profname != fopAcM_GetProfName(pActor)) { return NULL; } @@ -1011,7 +1011,7 @@ static fopAc_ac_c* findShutterCallBack(fopAc_ac_c* pActor, void* param_1) { */ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 bsTypeId, int param_1) { FindShtrCbPrms prms; - prms.mBsTypeId = bsTypeId; + prms.profname = bsTypeId; prms.mActor = dComIfGp_getPlayer(0); fopAc_ac_c* shutterActor = (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)findShutterCallBack, &prms); @@ -1104,4 +1104,4 @@ int dEvent_manager_c::checkStartDemo() { return 0; } return 1; -} \ No newline at end of file +} diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index 4d5cec696e..fa27364a19 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -48,7 +48,7 @@ void dEyeHL_mng_c::update() { obj->m_timg->LODBias = obj->m_lodBias; } } else { - s16 tmp = 2.0f * (dComIfGd_getView()->mFovy - 45.0f); + s16 tmp = 2.0f * (dComIfGd_getView()->fovy - 45.0f); for (; obj != NULL; obj = obj->m_next) { ResTIMG* timg = obj->m_timg; timg->LODBias = obj->m_lodBias + tmp; diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index 90e8d8fdb4..201d9ec2cd 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -116,8 +116,8 @@ void dInsect_c::CalcZBuffer(f32 param_0) { field_0x578 = 0; } - f32 view_near = dComIfGd_getView()->mNear; - f32 view_far = dComIfGd_getView()->mFar; + f32 view_near = dComIfGd_getView()->near; + f32 view_far = dComIfGd_getView()->far; mDoLib_pos2camera(&pos, &pos_projected); pos_projected.z += param_0; @@ -129,4 +129,4 @@ void dInsect_c::CalcZBuffer(f32 param_0) { (((view_near + ((view_far * view_near) / pos_projected.z)) / (view_far - view_near)) + 1.0f) * 16777215.0f; -} \ No newline at end of file +} diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index bd5ea23db8..9033c0de69 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -19,17 +19,17 @@ int dkWmark_c::create() { new (this) dkWmark_c(); - field_0x48a = mParam >> 0x10; - mParam &= 0xFFFF; + field_0x48a = this->parameters >> 0x10; + this->parameters &= 0xFFFF; - if ((int)mParam >= 4) { + if ((int)this->parameters >= 4) { return cPhs_ERROR_e; } - if ((int)mParam == 3) { + if ((int)this->parameters == 3) { mColorType = 2; } else { - mColorType = mParam; + mColorType = this->parameters; } mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x880, 0x20); @@ -48,7 +48,7 @@ int dkWmark_c::create() { return cPhs_ERROR_e; } - if ((int)mParam != 3 && daPy_py_c::i_checkNowWolf()) { + if ((int)this->parameters != 3 && daPy_py_c::i_checkNowWolf()) { mpModel->setBaseScale(wolfFootScale); } @@ -56,7 +56,7 @@ int dkWmark_c::create() { return cPhs_ERROR_e; } - if ((int)mParam == 1 || (int)mParam == 3 || (int)mParam == 2) { + if ((int)this->parameters == 1 || (int)this->parameters == 3 || (int)this->parameters == 2) { field_0x494 = m_nowID; m_nowID++; } else { @@ -88,10 +88,10 @@ static int dkWmark_Delete(dkWmark_c* i_this) { /* 802616C4-80261964 25C004 02A0+00 2/2 0/0 0/0 .text setMatrix__9dkWmark_cFv */ BOOL dkWmark_c::setMatrix() { - cXyz chk_pos(mPos.x, mPos.y + 100.0f, mPos.z); + cXyz chk_pos(pos.x, pos.y + 100.0f, pos.z); if (fopAcM_gc_c::gndCheck(&chk_pos)) { - mPos.y = fopAcM_gc_c::getGroundY(); + pos.y = fopAcM_gc_c::getGroundY(); cM3dGPla poly; fopAcM_gc_c::getTriPla(&poly); @@ -99,7 +99,7 @@ BOOL dkWmark_c::setMatrix() { s16 temp_r26 = poly.mNormal.atan2sX_Z() - field_0x48a; f32 var_f31 = poly.mNormal.absXZ(); - mDoMtx_stack_c::transS(mPos.x, mPos.y + 1.0f, mPos.z); + mDoMtx_stack_c::transS(pos.x, pos.y + 1.0f, pos.z); mDoMtx_stack_c::ZXYrotM(cM_atan2s(var_f31 * cM_scos(temp_r26), poly.mNormal.y), field_0x48a, cM_atan2s(var_f31 * -cM_ssin(temp_r26), poly.mNormal.y)); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -141,11 +141,11 @@ static int dkWmark_Execute(dkWmark_c* i_this) { int dkWmark_c::draw() { J3DGXColor color; - if (mDoLib_clipper::clip(j3dSys.getViewMtx(), mPos, mScale.x * 50.0f)) { + if (mDoLib_clipper::clip(j3dSys.getViewMtx(), pos, scale.x * 50.0f)) { return 1; } - g_env_light.settingTevStruct(0, &mPos, &mTevstr); + g_env_light.settingTevStruct(0, &pos, &mTevstr); g_env_light.setLightTevColorType_MAJI(mpModel, &mTevstr); static const GXColor kColor[] = {{0, 0, 0, 130}, {95, 75, 50, 60}, {100, 110, 120, 40}}; @@ -167,7 +167,6 @@ static int dkWmark_Draw(dkWmark_c* i_this) { return i_this->draw(); } -/* ############################################################################################## */ /* 803C3430-803C3444 -00001 0014+00 1/0 0/0 0/0 .data l_dkWmark_Method */ static leafdraw_method_class l_dkWmark_Method = { (process_method_func)dkWmark_Create, (process_method_func)dkWmark_Delete, @@ -181,11 +180,11 @@ extern kankyo_process_profile_definition g_profile_WMARK = { 9, fpcPi_CURRENT_e, PROC_WMARK, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(dkWmark_c), 0, 0, &g_fopKy_Method, 760, &l_dkWmark_Method, -}; \ No newline at end of file +}; diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index bccd71c171..74f5414e54 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -17,7 +17,7 @@ int dkWpillar_c::create() { int roomNo; u8 envrOverride; - if (fopAcM_gc_c::gndCheck(&mPos)) { + if (fopAcM_gc_c::gndCheck(&pos)) { roomNo = fopAcM_gc_c::getRoomId(); envrOverride = fopAcM_gc_c::getPolyColor(); } else { @@ -26,16 +26,16 @@ int dkWpillar_c::create() { } dKy_tevstr_init(&mTevstr, roomNo, envrOverride); - g_env_light.settingTevStruct(0x10, &mPos, &mTevstr); + g_env_light.settingTevStruct(0x10, &pos, &mTevstr); - dComIfGp_particle_set(0x1BD, &mPos, &mTevstr, NULL, &mScale, 255, NULL, roomNo, NULL, NULL, + dComIfGp_particle_set(0x1BD, &pos, &mTevstr, NULL, &scale, 255, NULL, roomNo, NULL, NULL, NULL); - if ((int)mParam != 3) { - dComIfGp_particle_set(0x1BE, &mPos, &mTevstr, NULL, &mScale, 255, NULL, roomNo, NULL, NULL, + if ((int)parameters != 3) { + dComIfGp_particle_set(0x1BE, &pos, &mTevstr, NULL, &scale, 255, NULL, roomNo, NULL, NULL, NULL); } - if ((int)mParam == 1) { + if ((int)parameters == 1) { return cPhs_ERROR_e; } @@ -69,12 +69,12 @@ int dkWpillar_c::create() { return cPhs_ERROR_e; } - if ((int)mParam == 2) { - mScale.set(0.5f, 0.25f, 0.5f); + if ((int)parameters == 2) { + scale.set(0.5f, 0.25f, 0.5f); } - mpModel->setBaseScale(mScale); - mDoMtx_stack_c::transS(mPos.x, mPos.y, mPos.z); + mpModel->setBaseScale(scale); + mDoMtx_stack_c::transS(pos.x, pos.y, pos.z); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); return cPhs_COMPLEATE_e; } @@ -107,9 +107,9 @@ int dkWpillar_c::execute() { fopKyM_Delete(this); } else { f32 sp8; - if (fopAcM_getWaterY(&mPos, &sp8) != 0) { + if (fopAcM_getWaterY(&pos, &sp8) != 0) { mpModel->getBaseTRMtx()[1][3] = sp8; - mPos.y = sp8; + pos.y = sp8; } } @@ -124,7 +124,7 @@ static int dkWpillar_Execute(dkWpillar_c* i_this) { /* 802620C8-802621AC 25CA08 00E4+00 1/1 0/0 0/0 .text draw__11dkWpillar_cFv */ int dkWpillar_c::draw() { - g_env_light.settingTevStruct(0x10, &mPos, &mTevstr); + g_env_light.settingTevStruct(0x10, &pos, &mTevstr); g_env_light.setLightTevColorType_MAJI(mpModel, &mTevstr); dComIfGd_setListIndScreen(); @@ -155,11 +155,11 @@ extern kankyo_process_profile_definition g_profile_WPILLAR = { 9, fpcPi_CURRENT_e, PROC_WPILLAR, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(dkWpillar_c), 0, 0, &g_fopKy_Method, 759, &l_dkWpillar_Method, -}; \ No newline at end of file +}; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 0a096c8f7a..47b9a003bb 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -419,12 +419,12 @@ static void dKy_twi_wolflight_set(int i_lightIdx) { s16 spA; s16 sp8; - dKy_pos2_get_angle(&camera_p->mLookat.mCenter, &camera_p->mLookat.mEye, &spA, &sp8); - dKyr_get_vectle_calc(&camera_p->mLookat.mCenter, &camera_p->mLookat.mEye, &vectle); + dKy_pos2_get_angle(&camera_p->lookat.center, &camera_p->lookat.eye, &spA, &sp8); + dKyr_get_vectle_calc(&camera_p->lookat.center, &camera_p->lookat.eye, &vectle); - env_light->field_0x0c18[i_lightIdx].mPos.x = camera_p->mLookat.mEye.x + vectle.x * 300.0f; - env_light->field_0x0c18[i_lightIdx].mPos.y = camera_p->mLookat.mEye.y + vectle.y * 300.0f; - env_light->field_0x0c18[i_lightIdx].mPos.z = camera_p->mLookat.mEye.z + vectle.z * 300.0f; + env_light->field_0x0c18[i_lightIdx].mPos.x = camera_p->lookat.eye.x + vectle.x * 300.0f; + env_light->field_0x0c18[i_lightIdx].mPos.y = camera_p->lookat.eye.y + vectle.y * 300.0f; + env_light->field_0x0c18[i_lightIdx].mPos.z = camera_p->lookat.eye.z + vectle.z * 300.0f; switch (g_env_light.field_0x1309) { case 0: @@ -1325,7 +1325,7 @@ void dScnKy_env_light_c::setDaytime() { msg_class* ac = dMsgObject_c::getActor(); bool tmp = true; - if (ac != NULL && ac->mMode >= 2) { + if (ac != NULL && ac->mode >= 2) { tmp = false; } @@ -1425,9 +1425,9 @@ void dScnKy_env_light_c::setSunpos() { sp8.y = cosf(var_f31 * 0.01745329238474369f) * 80000.0f; sp8.z = cosf(var_f31 * 0.01745329238474369f) * -48000.0f; - mSunPos.x = camera_p->mLookat.mEye.x + sp8.x; - mSunPos.y = camera_p->mLookat.mEye.y - sp8.y; - mSunPos.z = camera_p->mLookat.mEye.z + sp8.z; + mSunPos.x = camera_p->lookat.eye.x + sp8.x; + mSunPos.y = camera_p->lookat.eye.y - sp8.y; + mSunPos.z = camera_p->lookat.eye.z + sp8.z; sp8.x = sinf(var_f30 * 0.01745329238474369f) * 80000.0f; sp8.y = cosf(var_f30 * 0.01745329238474369f) * 80000.0f; @@ -1569,7 +1569,7 @@ void dScnKy_env_light_c::setLight_palno_get(u8* i_envrSel0, u8* i_envrSel1, u8* } else if (strcmp(dComIfGp_getStartStageName(), "R_SP127") == 0) { camera_class* camera_p = dComIfGp_getCamera(0); - if (camera_p != NULL && camera_p->mLookat.mEye.y < 0.0f) { + if (camera_p != NULL && camera_p->lookat.eye.y < 0.0f) { psel_idx = envr_p->m_pselectID[10]; } } @@ -1694,7 +1694,7 @@ void dScnKy_env_light_c::setLight_palno_get(u8* i_envrSel0, u8* i_envrSel1, u8* } else if (strcmp(dComIfGp_getStartStageName(), "R_SP127") == 0) { camera_class* camera_p = dComIfGp_getCamera(0); - if (camera_p != NULL && camera_p->mLookat.mEye.y < 0.0f) { + if (camera_p != NULL && camera_p->lookat.eye.y < 0.0f) { pselect_p = &g_env_light.mpDmPselect[envr_p->m_pselectID[10]]; } } @@ -1799,7 +1799,7 @@ void dScnKy_env_light_c::setLight() { dKy_WaterIn_Light_set(); } - chkpos = camera_p->mLookat.mEye; + chkpos = camera_p->lookat.eye; chkpos.y += 100000.0f; camchk.SetPos(&chkpos); @@ -2675,7 +2675,7 @@ void dScnKy_env_light_c::settingTevStruct(int i_tevstrType, cXyz* param_1, dKy_t fog_z_start = 30000.0f; fog_z_end = 30000.0f; - dKyr_get_vectle_calc(&spA4, &temp_r30->mLookat.mEye, &sp98); + dKyr_get_vectle_calc(&spA4, &temp_r30->lookat.eye, &sp98); for (int i = 0; i < 6; i++) { J3DLightInfo& light_info = i_tevstr->mLights[i].getLightInfo(); @@ -2734,9 +2734,9 @@ void dScnKy_env_light_c::settingTevStruct(int i_tevstrType, cXyz* param_1, dKy_t Vec sp8C; Vec sp80; - sp80.x = temp_r30->mLookat.mEye.x; - sp80.y = temp_r30->mLookat.mEye.y; - sp80.z = temp_r30->mLookat.mEye.z; + sp80.x = temp_r30->lookat.eye.x; + sp80.y = temp_r30->lookat.eye.y; + sp80.z = temp_r30->lookat.eye.z; cMtx_multVec(view_mtx, &sp80, &sp8C); J3DLightInfo& light_info = i_tevstr->mLightObj.getLightInfo(); @@ -2849,9 +2849,9 @@ void dScnKy_env_light_c::settingTevStruct(int i_tevstrType, cXyz* param_1, dKy_t Vec sp74; Vec sp68; - sp68.x = temp_r30_2->mLookat.mEye.x; - sp68.y = temp_r30_2->mLookat.mEye.y; - sp68.z = temp_r30_2->mLookat.mEye.z; + sp68.x = temp_r30_2->lookat.eye.x; + sp68.y = temp_r30_2->lookat.eye.y; + sp68.z = temp_r30_2->lookat.eye.z; J3DLightInfo& light_info = i_tevstr->mLightObj.getLightInfo(); cMtx_multVec(view_mtx, &sp68, &sp74); @@ -4692,11 +4692,11 @@ static void dKy_murky_set(J3DMaterial* material_p) { sp54.b = (var_f31 * 29.0f) + 15; f32 var_f0; - if (camera_p != NULL && camera_p->mLookat.mEye.z < 1800.0f) { - if (camera_p->mLookat.mEye.z < 1550.0f) { + if (camera_p != NULL && camera_p->lookat.eye.z < 1800.0f) { + if (camera_p->lookat.eye.z < 1550.0f) { var_f0 = 1.0f; } else { - var_f0 = 1.0f - ((camera_p->mLookat.mEye.z - 1550.0f) / 250.0f); + var_f0 = 1.0f - ((camera_p->lookat.eye.z - 1550.0f) / 250.0f); } sp54.a = 255.0f * var_f0; } else { @@ -4917,11 +4917,11 @@ void dKy_bg_MAxx_proc(void* param_0) { Mtx sp170; if (mat_name[6] == '2') { - C_MTXLightPerspective(sp170, dComIfGd_getView()->mFovy, - camera_p->mAspect, 1.0f, 1.0f, -0.01f, 0.0f); + C_MTXLightPerspective(sp170, dComIfGd_getView()->fovy, + camera_p->aspect, 1.0f, 1.0f, -0.01f, 0.0f); } else { - C_MTXLightPerspective(sp170, dComIfGd_getView()->mFovy, - camera_p->mAspect, 0.49f, -0.49f, 0.5f, 0.5f); + C_MTXLightPerspective(sp170, dComIfGd_getView()->fovy, + camera_p->aspect, 0.49f, -0.49f, 0.5f, 0.5f); } tex_mtx_inf->setEffectMtx(sp170); modelData->simpleCalcMaterial(0, (MtxP)j3dDefaultMtx); @@ -5104,10 +5104,10 @@ void dKy_bg_MAxx_proc(void* param_0) { cXyz sp5C; sp5C.x = -5853.0f; - sp5C.y = temp_r16_2->mLookat.mEye.y; + sp5C.y = temp_r16_2->lookat.eye.y; sp5C.z = -879.0f; - f32 var_f1 = sp5C.abs(temp_r16_2->mLookat.mEye); + f32 var_f1 = sp5C.abs(temp_r16_2->lookat.eye); f32 var_f29_2 = -0.2f + (var_f1 / 4500.0f); if (var_f29_2 > 1.0f) { var_f29_2 = 1.0f; @@ -5141,9 +5141,9 @@ void dKy_bg_MAxx_proc(void* param_0) { color.g = 255; color.r = 255; - sp5C = temp_r16_2->mLookat.mCenter; - sp5C.y = temp_r16_2->mLookat.mEye.y; - dKyr_get_vectle_calc(&temp_r16_2->mLookat.mEye, &sp5C, &sp68); + sp5C = temp_r16_2->lookat.center; + sp5C.y = temp_r16_2->lookat.eye.y; + dKyr_get_vectle_calc(&temp_r16_2->lookat.eye, &sp5C, &sp68); f32 temp_f1_2 = cM3d_VectorProduct2d(0.0f, 0.0f, -0.81f, 0.583f, sp68.x, sp68.z); f32 var_f0; diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 5cb984b02a..12500f17b1 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -223,10 +223,10 @@ void dKyr_get_vectle_calc(cXyz* param_0, cXyz* param_1, cXyz* param_2) { * dKy_set_eyevect_calc__FP12camera_classP3Vecff */ static void dKy_set_eyevect_calc(camera_class* i_camera, Vec* param_1, f32 param_2, f32 param_3) { cXyz tmp; - get_vectle_calc(&i_camera->mLookat.mEye, &i_camera->mLookat.mCenter, &tmp); - param_1->x = i_camera->mLookat.mEye.x + tmp.x * param_2; - param_1->y = (i_camera->mLookat.mEye.y + tmp.y * param_3) - 200.0f; - param_1->z = i_camera->mLookat.mEye.z + tmp.z * param_2; + get_vectle_calc(&i_camera->lookat.eye, &i_camera->lookat.center, &tmp); + param_1->x = i_camera->lookat.eye.x + tmp.x * param_2; + param_1->y = (i_camera->lookat.eye.y + tmp.y * param_3) - 200.0f; + param_1->z = i_camera->lookat.eye.z + tmp.z * param_2; } /* 8005B830-8005B92C 056170 00FC+00 6/6 0/0 0/0 .text @@ -235,19 +235,19 @@ static void dKy_set_eyevect_calc2(camera_class* i_camera, Vec* param_1, f32 para cXyz tmp; DOUBLE_POS pos; - pos.x = i_camera->mLookat.mCenter.x - i_camera->mLookat.mEye.x; + pos.x = i_camera->lookat.center.x - i_camera->lookat.eye.x; if (param_3 != 0.0f) { - pos.y = i_camera->mLookat.mCenter.y - i_camera->mLookat.mEye.y; + pos.y = i_camera->lookat.center.y - i_camera->lookat.eye.y; } else { pos.y = 0.0f; } - pos.z = i_camera->mLookat.mCenter.z - i_camera->mLookat.mEye.z; + pos.z = i_camera->lookat.center.z - i_camera->lookat.eye.z; vectle_calc(&pos, &tmp); - param_1->x = i_camera->mLookat.mEye.x + tmp.x * param_2; - param_1->y = i_camera->mLookat.mEye.y + tmp.y * param_3; - param_1->z = i_camera->mLookat.mEye.z + tmp.z * param_2; + param_1->x = i_camera->lookat.eye.x + tmp.x * param_2; + param_1->y = i_camera->lookat.eye.y + tmp.y * param_3; + param_1->z = i_camera->lookat.eye.z + tmp.z * param_2; if (param_3 == 0.0f) { param_1->y = 0.0f; @@ -302,7 +302,7 @@ void dKyr_lenzflare_move() { lenz_p->field_0x94 = cM_atan2s(local_78.x, local_78.y); lenz_p->field_0x94 *= 0.0054931640625f; // Maybe 45 / 8192 lenz_p->field_0x94 += 180.0f; - dKyr_get_vectle_calc(&iVar6->mLookat.mEye, &iVar6->mLookat.mCenter, &cStack_6c); + dKyr_get_vectle_calc(&iVar6->lookat.eye, &iVar6->lookat.center, &cStack_6c); for (int i = 2; i < 8; i++) { if (i == 2) { @@ -353,17 +353,17 @@ void dKyr_sun_move() { u32 st_type = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); if (g_env_light.mBaseLightInfluence.mColor.r == 0 && st_type != ST_ROOM) { - dKyr_get_vectle_calc(&camera_p2->mLookat.mEye, &g_env_light.mBaseLightInfluence.mPosition, + dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.mBaseLightInfluence.mPosition, &sp54); } else { - dKyr_get_vectle_calc(&camera_p2->mLookat.mEye, &g_env_light.mSunPos2, &sp54); + dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.mSunPos2, &sp54); } - sun_p->mPos[0].x = camera_p2->mLookat.mEye.x + 8000.0f * sp54.x; - sun_p->mPos[0].y = camera_p2->mLookat.mEye.y + 8000.0f * sp54.y; - sun_p->mPos[0].z = camera_p2->mLookat.mEye.z + 8000.0f * sp54.z; + sun_p->mPos[0].x = camera_p2->lookat.eye.x + 8000.0f * sp54.x; + sun_p->mPos[0].y = camera_p2->lookat.eye.y + 8000.0f * sp54.y; + sun_p->mPos[0].z = camera_p2->lookat.eye.z + 8000.0f * sp54.z; - f32 var_f1 = (sun_p->mPos[0].y - camera_p2->mLookat.mEye.y) / 8000.0f; + f32 var_f1 = (sun_p->mPos[0].y - camera_p2->lookat.eye.y) / 8000.0f; if (var_f1 < 0.0f) { var_f1 = 0.0f; } @@ -570,7 +570,7 @@ void dKyr_sun_move() { } if (dKyr_moon_arrival_check()) { - f32 var_f1_6 = (sun_p->mPos[0].y - camera_p2->mLookat.mEye.y) / -8000.0f; + f32 var_f1_6 = (sun_p->mPos[0].y - camera_p2->lookat.eye.y) / -8000.0f; var_f1_6 *= var_f1_6; var_f1_6 *= 6.0f; @@ -587,10 +587,10 @@ void dKyr_sun_move() { sun_p->mSunAlpha >= 0.2f) { cXyz sp24; - dKyr_get_vectle_calc(&camera_p2->mLookat.mEye, &g_env_light.mSunPos2, &sp54); - sp24.x = camera_p2->mLookat.mEye.x + 30160.0f * sp54.x; - sp24.y = camera_p2->mLookat.mEye.y + 30160.0f * sp54.y; - sp24.z = camera_p2->mLookat.mEye.z + 30160.0f * sp54.z; + dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.mSunPos2, &sp54); + sp24.x = camera_p2->lookat.eye.x + 30160.0f * sp54.x; + sp24.y = camera_p2->lookat.eye.y + 30160.0f * sp54.y; + sp24.z = camera_p2->lookat.eye.z + 30160.0f * sp54.z; sp24.y -= 21678.0f; sun_p->field_0x58 = dComIfGp_particle_set(sun_p->field_0x58, 0x11C, &sp24, 0, 0); } @@ -601,8 +601,8 @@ void dKyr_rain_init() { camera_class* camera_p = g_dComIfG_gameInfo.play.mCameraInfo[0].mCamera; g_env_light.mpRainPacket->mpTex = (u8*)dComIfG_getObjectRes("Always", 0x4a); g_env_light.mpRainPacket->mpTex2 = (u8*)dComIfG_getObjectRes("Always", 0x57); - g_env_light.mpRainPacket->mCamEyePos = camera_p->mLookat.mEye; - g_env_light.mpRainPacket->mCamCenterPos = camera_p->mLookat.mCenter; + g_env_light.mpRainPacket->mCamEyePos = camera_p->lookat.eye; + g_env_light.mpRainPacket->mCamCenterPos = camera_p->lookat.center; g_env_light.mpRainPacket->mCenterDeltaMul = 0.0f; g_env_light.mpRainPacket->field_0x3700 = 0.0f; g_env_light.mpRainPacket->mSibukiAlpha = 0.0f; @@ -622,7 +622,7 @@ void dKyr_rain_init() { /* 8005CDA8-8005CDD0 0576E8 0028+00 1/1 0/0 0/0 .text rain_bg_chk__FP19dKankyo_rain_Packeti */ static void rain_bg_chk(dKankyo_rain_Packet* i_packet, int i_idx) { - i_packet->mRainEff[i_idx].field_0x30 = dComIfGp_getCamera(0)->mLookat.mCenter.y + -800.0f; + i_packet->mRainEff[i_idx].field_0x30 = dComIfGp_getCamera(0)->lookat.center.y + -800.0f; } /* 8005CDD0-8005CF78 057710 01A8+00 1/1 0/0 0/0 .text overhead_bg_chk__Fv */ @@ -633,7 +633,7 @@ static BOOL overhead_bg_chk() { dBgS_ObjGndChk_All gndchk; dBgS_RoofChk roofchk; - cXyz chkPos = camera->mLookat.mEye; + cXyz chkPos = camera->lookat.eye; chkPos.y += 50.0f; roofchk.i_SetPos(chkPos); @@ -649,7 +649,7 @@ static BOOL overhead_bg_chk() { chkPos.y += 10000.0f; gndchk.SetPos(&chkPos); - if (dComIfG_Bgsp().GroundCross(&gndchk) > camera->mLookat.mEye.y + 50.0f) { + if (dComIfG_Bgsp().GroundCross(&gndchk) > camera->lookat.eye.y + 50.0f) { chk = true; } @@ -667,11 +667,11 @@ static int forward_overhead_bg_chk(cXyz* param_0, f32 param_1) { cXyz chk_pos; cXyz vectle; - dKyr_get_vectle_calc(&camera_p->mLookat.mEye, &camera_p->mLookat.mCenter, &vectle); - chk_pos.x = camera_p->mLookat.mEye.x + vectle.x * param_1; - chk_pos.y = camera_p->mLookat.mEye.y + vectle.y * param_1; - chk_pos.z = camera_p->mLookat.mEye.z + vectle.z * param_1; - chk_pos.y = 50.0f + camera_p->mLookat.mEye.y; + dKyr_get_vectle_calc(&camera_p->lookat.eye, &camera_p->lookat.center, &vectle); + chk_pos.x = camera_p->lookat.eye.x + vectle.x * param_1; + chk_pos.y = camera_p->lookat.eye.y + vectle.y * param_1; + chk_pos.z = camera_p->lookat.eye.z + vectle.z * param_1; + chk_pos.y = 50.0f + camera_p->lookat.eye.y; *param_0 = chk_pos; roofChk.i_SetPos(chk_pos); @@ -687,7 +687,7 @@ static int forward_overhead_bg_chk(cXyz* param_0, f32 param_1) { chk_pos.y += 10000.0f; gncChk.SetPos(&chk_pos); - if (dComIfG_Bgsp().GroundCross(&gncChk) > 50.0f + camera_p->mLookat.mEye.y) { + if (dComIfG_Bgsp().GroundCross(&gncChk) > 50.0f + camera_p->lookat.eye.y) { chk = 1; } return chk; @@ -732,9 +732,9 @@ void dKyr_rain_move() { } if (rain_p->mRainCount != 0) { - dKyr_get_vectle_calc(&camera_p->mLookat.mCenter, &rain_p->mCamCenterPos, &spB0); + dKyr_get_vectle_calc(&camera_p->lookat.center, &rain_p->mCamCenterPos, &spB0); - f32 var_f1 = rain_p->mCamEyePos.abs(camera_p->mLookat.mEye); + f32 var_f1 = rain_p->mCamEyePos.abs(camera_p->lookat.eye); f32 var_f30; if (var_f1 > 10.0f) { @@ -746,19 +746,19 @@ void dKyr_rain_move() { var_f30 = 0.0f; } - rain_p->mCamEyePos.x = camera_p->mLookat.mEye.x; - rain_p->mCamEyePos.z = camera_p->mLookat.mEye.z; + rain_p->mCamEyePos.x = camera_p->lookat.eye.x; + rain_p->mCamEyePos.z = camera_p->lookat.eye.z; - f32 var_f1_2 = rain_p->mCamEyePos.abs(camera_p->mLookat.mEye); + f32 var_f1_2 = rain_p->mCamEyePos.abs(camera_p->lookat.eye); f32 var_f2 = var_f1_2 / 20.0f; if (var_f2 > 1.0f) { var_f2 = 1.0f; } spA4.y -= var_f2 * 15.0f; - rain_p->mCamEyePos = camera_p->mLookat.mEye; + rain_p->mCamEyePos = camera_p->lookat.eye; - f32 var_f1_3 = rain_p->mCamCenterPos.abs(camera_p->mLookat.mCenter); + f32 var_f1_3 = rain_p->mCamCenterPos.abs(camera_p->lookat.center); f32 var_f1_4; if (var_f1_3 > 10.0f) { @@ -778,7 +778,7 @@ void dKyr_rain_move() { cLib_addCalc(&rain_p->mCenterDelta.x, spB0.x, 0.2f, 0.1f, 0.01f); cLib_addCalc(&rain_p->mCenterDelta.y, spB0.y, 0.2f, 0.1f, 0.01f); cLib_addCalc(&rain_p->mCenterDelta.z, spB0.z, 0.2f, 0.1f, 0.01f); - rain_p->mCamCenterPos = camera_p->mLookat.mCenter; + rain_p->mCamCenterPos = camera_p->lookat.center; dKy_set_eyevect_calc2(camera_p, &spE0, 700.0f, 600.0f); spD4.z = 0.0f; @@ -947,9 +947,9 @@ void dKyr_rain_move() { if (var_r24 || rain_p->mOverheadFade < 1.0f) { cXyz sp80; sp80 = spBC; - sp80.y = camera_p->mLookat.mEye.y; + sp80.y = camera_p->lookat.eye.y; - if (camera_p->mLookat.mEye.abs(sp80) < 800.0f) { + if (camera_p->lookat.eye.abs(sp80) < 800.0f) { var_f31 *= rain_p->mOverheadFade * 1.0f; } } @@ -1009,7 +1009,7 @@ void dKyr_rain_move() { var_f31 = 0.0f; } - if (camera_p->mLookat.mEye.y < 0.0f) { + if (camera_p->lookat.eye.y < 0.0f) { var_f31 = 0.0f; } } else { @@ -1092,7 +1092,7 @@ void dKyr_housi_move() { } if (g_env_light.field_0xea9 == 2) { - sp54 = camera_p->mLookat.mEye; + sp54 = camera_p->lookat.eye; sp54.y += 100000.0f; spE4.SetPos(&sp54); @@ -1144,13 +1144,13 @@ void dKyr_housi_move() { cXyz sp48; camera_class* cam_p = dComIfGp_getCamera(0); - sp48 = cam_p->mLookat.mEye; + sp48 = cam_p->lookat.eye; sp48.y += 100000.0f; sp90.SetPos(&sp48); f32 gnd_cross = dComIfG_Bgsp().GroundCross(&sp90); - if (gnd_cross > cam_p->mLookat.mEye.y) { - var_f31 = (gnd_cross - cam_p->mLookat.mEye.y) / 700.0f; + if (gnd_cross > cam_p->lookat.eye.y) { + var_f31 = (gnd_cross - cam_p->lookat.eye.y) / 700.0f; if (var_f31 < 0.0f) { var_f31 = 0.0f; } @@ -1393,7 +1393,7 @@ void dKyr_housi_move() { } if (dKy_darkworld_check() == 1 || var_r24 == 1) { - f32 var_f1_6 = sp6C.abs(camera_p->mLookat.mEye); + f32 var_f1_6 = sp6C.abs(camera_p->lookat.eye); effect_p->field_0x48 = var_f1_6; f32 var_f1_7; @@ -1409,7 +1409,7 @@ void dKyr_housi_move() { effect_p->mAlpha = var_f1_7; } - f32 var_f1_8 = sp6C.abs(camera_p->mLookat.mEye); + f32 var_f1_8 = sp6C.abs(camera_p->lookat.eye); f32 temp_f25 = var_f1_8 / 2000.0f; effect_p->field_0x48 = 1.0f - (temp_f25 * temp_f25); } @@ -1431,7 +1431,7 @@ void dKyr_snow_init() { } g_env_light.mpSnowPacket->field_0x6d88 = 0; - g_env_light.mpSnowPacket->field_0x6d74 = camera_p->mLookat.mEye; + g_env_light.mpSnowPacket->field_0x6d74 = camera_p->lookat.eye; g_env_light.mpSnowPacket->field_0x6d80 = 0.0f; g_env_light.mpSnowPacket->field_0x6d84 = 0.0f; g_env_light.mpSnowPacket->field_0x6d8a = 0; @@ -1480,11 +1480,11 @@ void dKyr_snow_move() { dKy_set_eyevect_calc2(camera_p, &spB8, 500.0f, 500.0f); dKy_set_eyevect_calc2(camera_p, &spAC, 1000.0f, 1000.0f); - if (snow_p->field_0x6d74.abs(camera_p->mLookat.mEye) > 1500.0f) { + if (snow_p->field_0x6d74.abs(camera_p->lookat.eye) > 1500.0f) { snow_p->field_0x6d88 = 0; } - snow_p->field_0x6d74 = camera_p->mLookat.mEye; + snow_p->field_0x6d74 = camera_p->lookat.eye; spA0.z = 0.0f; spA0.y = 0.0f; spA0.x = 0.0f; @@ -1503,9 +1503,9 @@ void dKyr_snow_move() { } cXyz sp58; - spC8.x = camera_p->mLookat.mCenter.x - camera_p->mLookat.mEye.x; + spC8.x = camera_p->lookat.center.x - camera_p->lookat.eye.x; spC8.y = 0.0f; - spC8.z = camera_p->mLookat.mCenter.z - camera_p->mLookat.mEye.z; + spC8.z = camera_p->lookat.center.z - camera_p->lookat.eye.z; vectle_calc(&spC8, &sp58); snow_p->field_0x6d84 = @@ -1546,7 +1546,7 @@ void dKyr_snow_move() { cXyz sp4C; sp88 = sp94; temp_r25 = &effect_p->mPosition; - if (camera_p->mLookat.mEye.abs(*temp_r25) < 500.0f && + if (camera_p->lookat.eye.abs(*temp_r25) < 500.0f && effect_p->mPosition.y < temp_f19 + 250.0f) { f32 var_f1_3 = ((temp_f19 + 250.0f) - effect_p->mPosition.y) / 250.0f; @@ -1573,7 +1573,7 @@ void dKyr_snow_move() { effect_p->mPosition.z += sp4C.z * 5.3f; sp88 = sp94; - if (camera_p->mLookat.mEye.abs(*temp_r25) < 500.0f && + if (camera_p->lookat.eye.abs(*temp_r25) < 500.0f && effect_p->mBasePos.y < temp_f19 + 250.0f) { f32 var_f1_5 = ((temp_f19 + 250.0f) - effect_p->mBasePos.y) / 250.0f; @@ -1643,7 +1643,7 @@ void dKyr_snow_move() { sp7C = effect_p->mPosition; - f32 var_f26 = sp7C.abs(camera_p->mLookat.mEye) / 100.0f; + f32 var_f26 = sp7C.abs(camera_p->lookat.eye) / 100.0f; if (var_f26 > 1.0) { var_f26 = 1.0; } @@ -1684,7 +1684,7 @@ void dKyr_snow_move() { sp7C = effect_p->mBasePos; - f32 var_f26_3 = sp7C.abs(camera_p->mLookat.mEye) / 100.0f; + f32 var_f26_3 = sp7C.abs(camera_p->lookat.eye) / 100.0f; if (var_f26_3 > 1.0) { var_f26_3 = 1.0; } @@ -2092,13 +2092,13 @@ void dKyr_drawSibuki(Mtx param_0, u8** param_1) { if (g_env_light.mSnowCount == 0 && g_env_light.mCameraInWater == 0 && dComIfGd_getView() != NULL) { - MTXInverse(dComIfGd_getView()->mViewMtxNoTrans, sp88); + MTXInverse(dComIfGd_getView()->viewMtxNoTrans, sp88); if (strcmp(dComIfGp_getStartStageName(), "F_SP113") == 0 && dComIfGp_roomControl_getStayNo() == 1) { - if ((temp_r30->mLookat.mEye.z < 5100.0f || - (temp_r30->mLookat.mEye.x < -3250.0f && temp_r30->mLookat.mEye.y < -50.0f)) || - (temp_r30->mLookat.mEye.x < -2700.0f && temp_r30->mLookat.mEye.z > 15750.0f)) + if ((temp_r30->lookat.eye.z < 5100.0f || + (temp_r30->lookat.eye.x < -3250.0f && temp_r30->lookat.eye.y < -50.0f)) || + (temp_r30->lookat.eye.x < -2700.0f && temp_r30->lookat.eye.z > 15750.0f)) { return; } @@ -2113,7 +2113,7 @@ void dKyr_drawSibuki(Mtx param_0, u8** param_1) { cLib_addCalc(&temp_r29->mSibukiAlpha, var_f1, 0.2f, 30.0f, 0.001f); dKy_set_eyevect_calc(temp_r30, &sp2C, 7000.0f, 4000.0f); - dKyr_get_vectle_calc(&temp_r30->mLookat.mEye, &temp_r30->mLookat.mCenter, &sp20); + dKyr_get_vectle_calc(&temp_r30->lookat.eye, &temp_r30->lookat.center, &sp20); f32 var_f1_2 = 0.0f; if (sp20.y > var_f1_2) { @@ -2153,7 +2153,7 @@ void dKyr_drawSibuki(Mtx param_0, u8** param_1) { f32 var_f30; if (dComIfGd_getView() != NULL) { - var_f30 = dComIfGd_getView()->mFovy / 45.0f; + var_f30 = dComIfGd_getView()->fovy / 45.0f; var_f30 *= var_f30; if (var_f30 >= 1.0f) { var_f30 = 1.0f; @@ -2286,7 +2286,7 @@ void dKyr_drawHousi(Mtx param_0, u8** param_1) { sp18.b = 0x00; } - dKy_ParticleColor_get_bg(&cam_p->mLookat.mEye, NULL, &sp20, &sp24, &sp1C, &sp18, + dKy_ParticleColor_get_bg(&cam_p->lookat.eye, NULL, &sp20, &sp24, &sp1C, &sp18, 0.0f); var_f25 = 255.0f; } @@ -2295,9 +2295,9 @@ void dKyr_drawHousi(Mtx param_0, u8** param_1) { f32 temp_f26 = 1.2f; f32 temp_f24 = 6.5f; - // MTXInverse(dComIfGd_getView()->mViewMtxNoTrans, sp1BC); + // MTXInverse(dComIfGd_getView()->viewMtxNoTrans, sp1BC); // wtf is going on here - switch (MTXInverse(dComIfGd_getView()->mViewMtxNoTrans, sp1BC)) { + switch (MTXInverse(dComIfGd_getView()->viewMtxNoTrans, sp1BC)) { case 0: return; } diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index 65f0ed5e2e..ee1898b2c0 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -610,7 +610,7 @@ static void wether_move_rain() { if (g_env_light.mSnowCount == 0 && cam != NULL) { // Stage is not Fishing Pond - if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->mLookat.mEye.y > 0.0f) { + if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->lookat.eye.y > 0.0f) { if (g_env_light.mRainCount < 125.0f) { mDoAud_rainPlay(FALSE); } else { @@ -1654,4 +1654,4 @@ void dKyw_evt_wind_set_go() { void dKyw_rain_set(int count) { g_env_light.mRainCount = count; g_env_light.mRainCountOrig = count; -} \ No newline at end of file +} diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 676949cbee..dfc3958d59 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -81,7 +81,7 @@ int dThunder_c::execute(dThunder_c* i_thunder) { f32 fvar7; if (dComIfGd_getView() != NULL) { - fvar7 = dComIfGd_getView()->mFovy / 60.0f; + fvar7 = dComIfGd_getView()->fovy / 60.0f; if (fvar7 >= 1.0f) { fvar7 = 1.0f; } @@ -186,7 +186,7 @@ int dThunder_c::create() { var_f29 = 0.25f; } - field_0x168 = cLib_targetAngleY(&camera_p->mLookat.mEye, &camera_p->mLookat.mCenter); + field_0x168 = cLib_targetAngleY(&camera_p->lookat.eye, &camera_p->lookat.center); if (!(g_Counter.mCounter0 & 1)) { field_0x168 += 0x7FFF; @@ -223,7 +223,7 @@ int dThunder_c::create() { field_0x138.y = var_f29 * (var_f31 + cM_rndF(var_f30 - var_f31)); field_0x138.z = 1.0f; - dKyr_get_vectle_calc(&camera_p->mLookat.mEye, &camera_p->mLookat.mCenter, &spB8); + dKyr_get_vectle_calc(&camera_p->lookat.eye, &camera_p->lookat.center, &spB8); // JMAFastSqrt doesn't match here when it should, probably needs to be fixed // var_f29_2 = JMAFastSqrt(spB8.x * spB8.x + spB8.z * spB8.z); @@ -247,9 +247,9 @@ int dThunder_c::create() { spD0.z = cM_scos(temp_r31) * cM_scos(temp_r28); f32 temp_f1_3 = cM_rndF(spC4.x); - mThunderPos.x = camera_p->mLookat.mEye.x + (spB8.x * 100000.0f) + (spD0.x * temp_f1_3); - mThunderPos.y = camera_p->mLookat.mEye.y + 2000.0f + cM_rndF(spC4.y); - mThunderPos.z = camera_p->mLookat.mEye.z + (spB8.z * 100000.0f) + (spD0.z * temp_f1_3); + mThunderPos.x = camera_p->lookat.eye.x + (spB8.x * 100000.0f) + (spD0.x * temp_f1_3); + mThunderPos.y = camera_p->lookat.eye.y + 2000.0f + cM_rndF(spC4.y); + mThunderPos.z = camera_p->lookat.eye.z + (spB8.z * 100000.0f) + (spD0.z * temp_f1_3); if (!strcmp(dComIfGp_getStartStageName(), "R_SP30") && dComIfGp_roomControl_getStayNo() == 4) { mThunderPos.x = cM_rndFX(260.0f) + 19635.0f; @@ -281,11 +281,11 @@ extern kankyo_process_profile_definition g_profile_KY_THUNDER = { 7, fpcPi_CURRENT_e, PROC_KY_THUNDER, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(dThunder_c), 0, 0, &g_fopKy_Method, 6, &l_dThunder_Method, -}; \ No newline at end of file +}; diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index bea0c46f12..af2c32d834 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -79,11 +79,11 @@ extern kankyo_process_profile_definition g_profile_KYEFF = { 12, fpcPi_CURRENT_e, PROC_KYEFF, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(dKyeff_c), 0, 0, &g_fopKy_Method, 5, &l_dKyeff_Method, -}; \ No newline at end of file +}; diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index 6e436e602d..1a1edef2a7 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -49,11 +49,11 @@ extern kankyo_process_profile_definition g_profile_KYEFF2 = { 12, fpcPi_CURRENT_e, PROC_KYEFF2, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(dKyeff2_c), 0, 0, &g_fopKy_Method, 3, &l_dKyeff2_Method, -}; \ No newline at end of file +}; diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index 0151f7cfc8..18daf67568 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -165,11 +165,11 @@ int dMsgFlow_c::doFlow(fopAc_ac_c* param_0, fopAc_ac_c** param_1, int i_flow) { if (field_0x26 != 0 || field_0x27 != 0) { msg_class* msg = fopMsgM_SearchByID(mMsg); if (msg != NULL) { - if (msg->mMode != 0x12) { + if (msg->mode != 0x12) { return 0; } - msg->mMode = 0x13; + msg->mode = 0x13; mMsg = -1; } field_0x27 = 0; @@ -375,7 +375,7 @@ void dMsgFlow_c::setNodeIndex(u16 param_1, fopAc_ac_c** param_2) { if (param_1 == 0xffff) { if (msg != NULL) { - msg->mMode = 0x10; + msg->mode = 0x10; } dMsgObject_endFlowGroup(); field_0x26 = 0x1; @@ -400,7 +400,7 @@ void dMsgFlow_c::setNodeIndex(u16 param_1, fopAc_ac_c** param_2) { field_0x3c = local_22[1] + 1; } if (msg != NULL) { - msg->mMode = 0x10; + msg->mode = 0x10; dMsgObject_endFlowGroup(); } field_0x27 = 1; @@ -435,7 +435,7 @@ int dMsgFlow_c::setSelectMsg(mesg_flow_node* param_1, mesg_flow_node* param_2, if (mMsg != -1) { msg_class* iVar3 = fopMsgM_SearchByID(mMsg); - iVar3->mMode = 0xf; + iVar3->mode = 0xf; fopMsgM_messageSet(uVar2, uVar1); } else { if (dMeter2Info_getFloatingFlowID() == 0xffff) { @@ -462,7 +462,7 @@ int dMsgFlow_c::setNormalMsg(mesg_flow_node* param_1, fopAc_ac_c* param_2) { if (mMsg != -1) { msg_class* iVar3 = fopMsgM_SearchByID(mMsg); - iVar3->mMode = 0xf; + iVar3->mode = 0xf; fopMsgM_messageSet(uVar2, 1000); } else { if (dMeter2Info_getFloatingFlowID() == 0xffff) { @@ -517,10 +517,10 @@ int dMsgFlow_c::messageNodeProc(fopAc_ac_c* param_1, fopAc_ac_c** param_2) { if (mesgCamInfo != field_0x34) { field_0x34 = mesgCamInfo; } - switch (msg->mMode) { + switch (msg->mode) { case 2: field_0x41 = 1; - mNowMsgNo = msg->mMsgID; + mNowMsgNo = msg->msg_idx; break; case 6: field_0x40 = field_0x41; @@ -537,7 +537,7 @@ int dMsgFlow_c::messageNodeProc(fopAc_ac_c* param_1, fopAc_ac_c** param_2) { daPy_py_c::setMidnaFaceNum(mesgFaceAnimeAttrInfo); } field_0x41 = 0; - mNowMsgNo = msg->mMsgID; + mNowMsgNo = msg->msg_idx; break; case 0xe: case 0x12: @@ -758,7 +758,7 @@ int dMsgFlow_c::query004(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, /* 8024B2C0-8024B2F8 245C00 0038+00 2/1 1/1 1/1 .text * query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ int dMsgFlow_c::query005(mesg_flow_node_branch*, fopAc_ac_c*, int) { - return mChoiceNo = fopMsgM_SearchByID(mMsg)->mSelectedChoiceIdx; + return mChoiceNo = fopMsgM_SearchByID(mMsg)->select_idx; } /* 8024B2F8-8024B32C 245C38 0034+00 1/0 0/0 0/0 .text @@ -1028,7 +1028,7 @@ int dMsgFlow_c::query035(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { /* 8024BC3C-8024BC80 24657C 0044+00 1/0 0/0 0/0 .text * query036__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ int dMsgFlow_c::query036(mesg_flow_node_branch*, fopAc_ac_c*, int) { - int tmp = fopMsgM_SearchByID(mMsg)->mSelectedChoiceIdx; + int tmp = fopMsgM_SearchByID(mMsg)->select_idx; if (dMsgObject_getMsgObjectClass()->getSelectPushFlag() == 2) { tmp = 2; @@ -1040,7 +1040,7 @@ int dMsgFlow_c::query036(mesg_flow_node_branch*, fopAc_ac_c*, int) { /* 8024BC80-8024BCC4 2465C0 0044+00 1/0 0/0 0/0 .text * query037__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ int dMsgFlow_c::query037(mesg_flow_node_branch*, fopAc_ac_c*, int) { - int tmp = fopMsgM_SearchByID(mMsg)->mSelectedChoiceIdx; + int tmp = fopMsgM_SearchByID(mMsg)->select_idx; if (dMsgObject_getMsgObjectClass()->getSelectPushFlag() == 2) { tmp = 3; diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 0440e16563..32e34e243f 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -362,7 +362,7 @@ int dMsgObject_c::_create(msg_class* param_1) { JUT_ASSERT(1302, mpCtrl != 0); mpRefer = new jmessage_tReference(); JUT_ASSERT(1305, mpRefer != 0); - mpRefer->setpStatus(¶m_1->mMode); + mpRefer->setpStatus(¶m_1->mode); mpSeqProc = new jmessage_tSequenceProcessor(mpRefer, mpCtrl); JUT_ASSERT(1310, mpSeqProc != 0); mpRenProc = new jmessage_tRenderingProcessor(mpRefer); @@ -1028,7 +1028,7 @@ void dMsgObject_c::continueProc() { field_0x199 = 0; updateEquipBombInfoLocal(); offAutoMessageFlagLocal(); - setMessageIndex(field_0x100->mMsgID, field_0x100->field_0xf0, true); + setMessageIndex(field_0x100->msg_idx, field_0x100->field_0xf0, true); mpScrnDraw->fukiPosCalc(pRef->getFukiPosType()); strcpy(pRef->getTextPtr(), ""); strcpy(pRef->getTextSPtr(), ""); @@ -1130,7 +1130,7 @@ void dMsgObject_c::selectProc() { iVar8 = true; } } - field_0x100->mSelectedChoiceIdx = pRef->getSelectPos(); + field_0x100->select_idx = pRef->getSelectPos(); if (isSend() && field_0x1a3 != 0 && iVar8) { field_0x1a3 = 0; if (mDoCPd_c::getTrigB(0)) { @@ -1449,7 +1449,7 @@ void dMsgObject_c::talkStartInit() { mpScrnDraw->setMsgID( mpRefer->getMsgID()); mpScrnDraw->setOutFont(mpOutFont); mpRefer->setFont(local_30); - mpRefer->setActorPos(field_0x100->mPos); + mpRefer->setActorPos(field_0x100->pos); mpRefer->setFontSizeX(mpScrnDraw->getFontSizeX()); mpRefer->setFontSizeY(mpScrnDraw->getFontSizeY()); mpRefer->setRubySize(mpScrnDraw->getRubySize()); @@ -1496,10 +1496,10 @@ void dMsgObject_c::fukiPosCalc(bool param_1) { cXyz cStack_48; mDoLib_project(&player->eyePos, &cStack_48); f32 temp; - if ((field_0x100->mPos == cXyz(0.0f, 0.0f, 0.0f))) { + if ((field_0x100->pos == cXyz(0.0f, 0.0f, 0.0f))) { temp = cStack_48.y; } else { - mDoLib_project(&field_0x100->mPos, &local_3c); + mDoLib_project(&field_0x100->pos, &local_3c); if (local_3c.x >= 0.0f && local_3c.x <= 608.0f && local_3c.y >= 0.0f && local_3c.y <= 448.0f) { @@ -2293,7 +2293,7 @@ int dMsgObject_Create(msg_class* param_1) { JKRHeap* prevHeap = mDoExt_setCurrentHeap(dComIfGp_getMsgExpHeap()); dComIfGp_getMsgExpHeap()->getTotalFreeSize(); fopMsgM_setStageLayer(param_1); - param_1->mMode = 0; + param_1->mode = 0; int rv = obj->_create(param_1); g_MsgObject_HIO_c.field_0x4 = -1; OS_REPORT("### msg object size =====> %d\n", dComIfGp_getMsgExpHeap()->getTotalFreeSize()); @@ -2645,7 +2645,7 @@ extern msg_process_profile_definition g_profile_MSG_OBJECT = { 12, // mListID fpcPi_CURRENT_e, // mListPrio PROC_MSG_OBJECT, // mProcName - &g_fpcLf_Method.mBase, // sub_method + &g_fpcLf_Method.base, // sub_method sizeof(dMsgObject_c), // mSize 0, // mSizeOther 0, // mParameters diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index a62a42f9bd..4fa887840f 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -515,10 +515,10 @@ void dMsgScrnItem_c::fukiPosCalc(u8 param_1) { cXyz cStack_7c; f32 f3; mDoLib_project(&player->eyePos, &cStack_7c); - if (iVar6->mPos == cXyz(0.0f, 0.0f, 0.0f)) { + if (iVar6->pos == cXyz(0.0f, 0.0f, 0.0f)) { f3 = cStack_7c.y; } else { - mDoLib_project(&iVar6->mPos, &local_70); + mDoLib_project(&iVar6->pos, &local_70); if (local_70.x >= 0.0f && local_70.x <= 608.0f && local_70.y >= 0.0f && local_70.y <= 448.0f) { diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index 2d5f8ede5b..2df137b0e6 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -624,10 +624,10 @@ void dMsgScrnTalk_c::fukiPosCalc(u8 param_1) { cXyz cStack_7c; f32 f3y; mDoLib_project(&player->eyePos, &cStack_7c); - if (msgActor->mPos == cXyz(0.0f, 0.0f, 0.0f)) { + if (msgActor->pos == cXyz(0.0f, 0.0f, 0.0f)) { f3y = cStack_7c.y; } else { - mDoLib_project(&msgActor->mPos, &local_70); + mDoLib_project(&msgActor->pos, &local_70); if (local_70.x >= 0.0f && local_70.x <= 608.0f && local_70.y >= 0.0f && local_70.y <= 448.0f) { @@ -714,4 +714,4 @@ void dMsgScrnTalk_c::fukiPosCalc(u8 param_1) { } -/* 80399BB0-80399BB0 026210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80399BB0-80399BB0 026210 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index a8e6602a22..970d59dc21 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -152,7 +152,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP0 = { 0, fpcPi_CURRENT_e, PROC_OVERLAP0, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(overlap1_class), 0, 0, @@ -167,7 +167,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP1 = { 0, fpcPi_CURRENT_e, PROC_OVERLAP1, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(overlap1_class), 0, 0, @@ -182,7 +182,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP6 = { 0, fpcPi_CURRENT_e, PROC_OVERLAP6, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(overlap1_class), 0, 0, @@ -197,7 +197,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP7 = { 0, fpcPi_CURRENT_e, PROC_OVERLAP7, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(overlap1_class), 0, 0, @@ -212,7 +212,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP8 = { 0, fpcPi_CURRENT_e, PROC_OVERLAP8, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(overlap1_class), 0, 0, @@ -227,7 +227,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP9 = { 0, fpcPi_CURRENT_e, PROC_OVERLAP9, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(overlap1_class), 0, 0, @@ -242,7 +242,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP10 = { 0, fpcPi_CURRENT_e, PROC_OVERLAP10, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(overlap1_class), 0, 0, @@ -257,11 +257,11 @@ extern overlap_process_profile_definition g_profile_OVERLAP11 = { 0, fpcPi_CURRENT_e, PROC_OVERLAP11, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(overlap1_class), 0, 0, &g_fopOvlp_Method, 782, &l_dOvlpFd_Method, -}; \ No newline at end of file +}; diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 5363825421..a4f9928472 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -253,11 +253,11 @@ extern overlap_process_profile_definition g_profile_OVERLAP2 = { 2, fpcPi_CURRENT_e, PROC_OVERLAP2, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(dOvlpFd2_c), 0, 0, &g_fopOvlp_Method, 775, &l_dOvlpFd2_Method, -}; \ No newline at end of file +}; diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index eaf24787f3..7151ff5e80 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -254,11 +254,11 @@ extern overlap_process_profile_definition g_profile_OVERLAP3 = { 0, fpcPi_CURRENT_e, PROC_OVERLAP3, - &g_fpcLf_Method.mBase, + &g_fpcLf_Method.base, sizeof(dOvlpFd3_c), 0, 0, &g_fopOvlp_Method, 776, &l_dOvlpFd3_Method, -}; \ No newline at end of file +}; diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index e766950c1f..687d0f5243 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -741,11 +741,11 @@ extern scene_process_profile_definition g_profile_LOGO_SCENE = { 1, fpcPi_CURRENT_e, PROC_LOGO_SCENE, - &g_fpcNd_Method.mBase, + &g_fpcNd_Method.base, sizeof(dScnLogo_c), 0, 0, - &g_fopScn_Method.mBase, + &g_fopScn_Method.base, (process_method_class*)&l_dScnLogo_Method, NULL, -}; \ No newline at end of file +}; diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 696d710c71..fe3dc3d19c 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -13,10 +13,10 @@ extern scene_process_profile_definition g_profile_MENU_SCENE = { 1, // mListID fpcPi_CURRENT_e, // mListPrio PROC_MENU_SCENE, // mProcName - &g_fpcNd_Method.mBase, // sub_method + &g_fpcNd_Method.base, // sub_method 0, // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // sub_method + &g_fopScn_Method.base, // sub_method NULL, // mpMtd -}; \ No newline at end of file +}; diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 4c0330897b..2ae035c5fa 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -97,13 +97,13 @@ s32 dScnName_c::create() { dDlst_window_c* window = dComIfGp_getWindow(0); dComIfGp_setCamera(0, (camera_class*)&mCamera); - mCamera.mNear = 1.0f; - mCamera.mFar = 100000.0f; - mCamera.mFovy = 45.0f; - mCamera.mAspect = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(); - mCamera.mLookat.mEye.set(0.0f, 0.0f, -1000.0f); - mCamera.mLookat.mCenter.set(0.0f, 0.0f, 0.0f); - mCamera.mBank = 0; + mCamera.near = 1.0f; + mCamera.far = 100000.0f; + mCamera.fovy = 45.0f; + mCamera.aspect = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(); + mCamera.lookat.eye.set(0.0f, 0.0f, -1000.0f); + mCamera.lookat.center.set(0.0f, 0.0f, 0.0f); + mCamera.bank = 0; dComIfGp_setPlayer(0, NULL); dComIfGd_setWindow(window); @@ -124,17 +124,17 @@ s32 dScnName_c::create() { /* 80258B2C-80258BC8 25346C 009C+00 1/1 0/0 0/0 .text setView__10dScnName_cFv */ void dScnName_c::setView() { - C_MTXPerspective(mCamera.mProjMtx, mCamera.mFovy, mCamera.mAspect, mCamera.mNear, - mCamera.mFar); - mDoMtx_lookAt(mCamera.mViewMtx, &mCamera.mLookat.mEye, &mCamera.mLookat.mCenter, - mCamera.mBank); - MTXInverse(mCamera.mViewMtx, mCamera.mInvViewMtx); - MTXCopy(mCamera.mViewMtx, mCamera.mViewMtxNoTrans); - mCamera.mViewMtxNoTrans[0][3] = 0.0f; - mCamera.mViewMtxNoTrans[1][3] = 0.0f; - mCamera.mViewMtxNoTrans[2][3] = 0.0f; - MTXCopy(mCamera.mViewMtx, j3dSys.mViewMtx); - mDoMtx_concatProjView(mCamera.mProjMtx, mCamera.mViewMtx, mCamera.mProjViewMtx); + C_MTXPerspective(mCamera.projMtx, mCamera.fovy, mCamera.aspect, mCamera.near, + mCamera.far); + mDoMtx_lookAt(mCamera.viewMtx, &mCamera.lookat.eye, &mCamera.lookat.center, + mCamera.bank); + MTXInverse(mCamera.viewMtx, mCamera.invViewMtx); + MTXCopy(mCamera.viewMtx, mCamera.viewMtxNoTrans); + mCamera.viewMtxNoTrans[0][3] = 0.0f; + mCamera.viewMtxNoTrans[1][3] = 0.0f; + mCamera.viewMtxNoTrans[2][3] = 0.0f; + MTXCopy(mCamera.viewMtx, j3dSys.mViewMtx); + mDoMtx_concatProjView(mCamera.projMtx, mCamera.viewMtx, mCamera.projViewMtx); } /* 80258BC8-80258C5C 253508 0094+00 1/1 0/0 0/0 .text execute__10dScnName_cFv */ @@ -320,11 +320,11 @@ extern scene_process_profile_definition g_profile_NAME_SCENE = { 1, fpcPi_CURRENT_e, PROC_NAME_SCENE, - &g_fpcNd_Method.mBase, + &g_fpcNd_Method.base, sizeof(dScnName_c), 0, 0, - &g_fopScn_Method.mBase, + &g_fopScn_Method.base, (process_method_class*)&l_dScnName_Method, NULL, }; @@ -335,11 +335,11 @@ extern scene_process_profile_definition g_profile_NAMEEX_SCENE = { 1, fpcPi_CURRENT_e, PROC_NAMEEX_SCENE, - &g_fpcNd_Method.mBase, + &g_fpcNd_Method.base, sizeof(dScnName_c), 0, 0, - &g_fopScn_Method.mBase, + &g_fopScn_Method.base, (process_method_class*)&l_dScnName_Method, NULL, -}; \ No newline at end of file +}; diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 87b3b61816..72faf7937f 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -754,11 +754,11 @@ scene_process_profile_definition g_profile_PLAY_SCENE = { 1, // mListID fpcPi_CURRENT_e, // mListPrio PROC_PLAY_SCENE, // mProcName - &g_fpcNd_Method.mBase, // sub_method + &g_fpcNd_Method.base, // sub_method sizeof(dScnPly_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // sub_method + &g_fopScn_Method.base, // sub_method (process_method_class*)&l_dScnPly_Method, // mpMtd }; @@ -768,10 +768,10 @@ scene_process_profile_definition g_profile_OPENING_SCENE = { 1, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OPENING_SCENE, // mProcName - &g_fpcNd_Method.mBase, // sub_method + &g_fpcNd_Method.base, // sub_method sizeof(dScnPly_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // sub_method + &g_fopScn_Method.base, // sub_method (process_method_class*)&l_dScnPly_Method, // mpMtd }; diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 82186dc92f..c558715abe 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -122,10 +122,11 @@ static int deleteJugge(void* i_obj, void*) { /* 8025B174-8025B194 255AB4 0020+00 1/1 0/0 0/0 .text isCreatingCallback__FP10create_tagPUi */ static void* isCreatingCallback(create_tag* param_1, fpc_ProcID* param_2) { - void* tagData = param_1->mBase.mpTagData; - if (*(*((int**)tagData + 0x11) + 3) == *param_2) { - return tagData; + create_request* create_req = (create_request*)param_1->base.mpTagData; + if (create_req->layer->layer_id == *param_2) { + return create_req; } + return NULL; } @@ -211,14 +212,14 @@ static bool objectSetCheck(room_of_scene_class* i_this) { return 0; } - fpcM_LyJudge(&i_this->mBase, (fpcLyIt_JudgeFunc)deleteJugge, NULL); + fpcM_LyJudge(&i_this->base, (fpcLyIt_JudgeFunc)deleteJugge, NULL); g_dComIfG_gameInfo.play.getParticle()->levelAllForceOnEventMove(); dComIfGs_clearRoomSwitch(dComIfGp_roomControl_getZoneNo(roomNo)); dComIfGs_clearRoomItem(dComIfGp_roomControl_getZoneNo(roomNo)); dComIfGp_roomControl_offStatusFlag(roomNo, 0x20); i_this->field_0x1d4 = 0; } else if (status_flag_20) { - fpcM_LyJudge(&i_this->mBase, (fpcLyIt_JudgeFunc)objectDeleteJugge, NULL); + fpcM_LyJudge(&i_this->base, (fpcLyIt_JudgeFunc)objectDeleteJugge, NULL); g_dComIfG_gameInfo.play.getParticle()->levelAllForceOnEventMove(); } @@ -439,10 +440,10 @@ scene_process_profile_definition g_profile_ROOM_SCENE = { 0, // mListID fpcPi_CURRENT_e, // mListPrio PROC_ROOM_SCENE, // mProcName - &g_fpcNd_Method.mBase, // sub_method + &g_fpcNd_Method.base, // sub_method sizeof(room_of_scene_class), // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // sub_method + &g_fopScn_Method.base, // sub_method (process_method_class*)&l_dScnRoom_Method, // mpMtd }; diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 4a5347d3c2..3b518b327f 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -13,11 +13,11 @@ extern scene_process_profile_definition g_profile_WARNING_SCENE = { 1, // mListID fpcPi_CURRENT_e, // mListPrio PROC_WARNING_SCENE, // mProcName - &g_fpcNd_Method.mBase, // sub_method + &g_fpcNd_Method.base, // sub_method 0x204, // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // sub_method + &g_fopScn_Method.base, // sub_method NULL, // mpMtd }; @@ -27,10 +27,10 @@ extern scene_process_profile_definition g_profile_WARNING2_SCENE = { 1, // mListID fpcPi_CURRENT_e, // mListPrio PROC_WARNING2_SCENE, // mProcName - &g_fpcNd_Method.mBase, // sub_method + &g_fpcNd_Method.base, // sub_method 0x204, // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // sub_method + &g_fopScn_Method.base, // sub_method NULL, // mpMtd -}; \ No newline at end of file +}; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 8cf34935b7..2bc4f5ff1b 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1547,7 +1547,7 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c if (actorInf == NULL) { JKRHeap::free(i_actorPrm, NULL); } else { - i_actorPrm->mSubtype = actorInf->mSubtype; + i_actorPrm->subtype = actorInf->mSubtype; s16 actor_name = actorInf->mProcName; if (actor_name == PROC_SUSPEND) { @@ -1604,13 +1604,13 @@ static int dStage_playerInit(dStage_dt_c* stageDt, void* i_data, int num, void* int point = dComIfGp_getStartStagePoint(); u32 roomParam = dComIfGs_getRestartRoomParam(); if (point == -2 || point == -3) { - appen->mParameter = dComIfGs_getTurnRestartParam(); - appen->mPos = dComIfGs_getTurnRestartPos(); - appen->mAngle.set(0, dComIfGs_getTurnRestartAngleY(), -0x100); + appen->parameters = dComIfGs_getTurnRestartParam(); + appen->position = dComIfGs_getTurnRestartPos(); + appen->angle.set(0, dComIfGs_getTurnRestartAngleY(), -0x100); } else if (point == -1) { - appen->mParameter = roomParam; - appen->mPos = dComIfGs_getRestartRoomPos(); - appen->mAngle.set(0, dComIfGs_getRestartRoomAngleY(), -0x100); + appen->parameters = roomParam; + appen->position = dComIfGs_getRestartRoomPos(); + appen->angle.set(0, dComIfGs_getRestartRoomAngleY(), -0x100); } else { int unk; if (point == -4) { @@ -1626,32 +1626,32 @@ static int dStage_playerInit(dStage_dt_c* stageDt, void* i_data, int num, void* player_data++; } - appen->mParameter = player_data->mParameter; - appen->mPos = player_data->mSpawnPos; - appen->mAngle = player_data->mAngle; - appen->mEnemyNo = player_data->mEnemyNo; + appen->parameters = player_data->mParameter; + appen->position = player_data->mSpawnPos; + appen->angle = player_data->mAngle; + appen->setId = player_data->mEnemyNo; if (point == -4) { - appen->mParameter = dComIfGs_getTurnRestartParam(); + appen->parameters = dComIfGs_getTurnRestartParam(); } else if (roomParam != 0) { - appen->mParameter = (roomParam & 0xFFFFFFC0) | (dComIfGp_getStartStageRoomNo() & 0x3F); + appen->parameters = (roomParam & 0xFFFFFFC0) | (dComIfGp_getStartStageRoomNo() & 0x3F); } else if (roomParam == 0) { - appen->mParameter = - (appen->mParameter & 0xFFFFFFC0) | (dComIfGp_getStartStageRoomNo() & 0x3F); + appen->parameters = + (appen->parameters & 0xFFFFFFC0) | (dComIfGp_getStartStageRoomNo() & 0x3F); } } dComIfGs_setRestartRoomParam(0); - appen->mEnemyNo = 0xFFFF; - appen->mRoomNo = -1; + appen->setId = 0xFFFF; + appen->room_no = -1; - dComIfGp_getStartStage()->set(dComIfGp_getStartStageName(), appen->mParameter & 0x3F, + dComIfGp_getStartStage()->set(dComIfGp_getStartStageName(), appen->parameters & 0x3F, dComIfGp_getStartStagePoint(), dComIfGp_getStartStageLayer()); dStage_actorCreate(player_data, appen); base_process_class* ac = (base_process_class*)fopScnM_SearchByID(dStage_roomControl_c::getProcID()); - if (ac->mProcName == PROC_PLAY_SCENE) { + if (ac->name == PROC_PLAY_SCENE) { if (strcmp(dComIfGp_getStartStageName(), "S_MV000")) { fopMsgM_Create(PROC_METER2, NULL, NULL); } @@ -1885,11 +1885,11 @@ static int dStage_actorCommonLayerInit(dStage_dt_c* stageDt, void* i_data, int e fopAcM_prm_class* appen = fopAcM_CreateAppend(); if (appen != NULL) { - appen->mParameter = actor_data->mParameter; - appen->mPos = actor_data->mSpawnPos; - appen->mAngle = actor_data->mAngle; - appen->mEnemyNo = actor_data->mEnemyNo; - appen->mRoomNo = stageDt->getRoomNo(); + appen->parameters = actor_data->mParameter; + appen->position = actor_data->mSpawnPos; + appen->angle = actor_data->mAngle; + appen->setId = actor_data->mEnemyNo; + appen->room_no = stageDt->getRoomNo(); dStage_actorCreate(actor_data, appen); } } @@ -1912,14 +1912,14 @@ static int dStage_tgscCommonLayerInit(dStage_dt_c* stageDt, void* i_data, int en fopAcM_prm_class* appen = fopAcM_CreateAppend(); if (appen != NULL) { - appen->mParameter = actor_data->mParameter; - appen->mPos = actor_data->mSpawnPos; - appen->mAngle = actor_data->mAngle; - appen->mEnemyNo = actor_data->mEnemyNo; - appen->mRoomNo = stageDt->getRoomNo(); - appen->mScale[0] = actor_data->field_0x20[0]; - appen->mScale[1] = actor_data->field_0x20[1]; - appen->mScale[2] = actor_data->field_0x22; + appen->parameters = actor_data->mParameter; + appen->position = actor_data->mSpawnPos; + appen->angle = actor_data->mAngle; + appen->setId = actor_data->mEnemyNo; + appen->room_no = stageDt->getRoomNo(); + appen->scale[0] = actor_data->field_0x20[0]; + appen->scale[1] = actor_data->field_0x20[1]; + appen->scale[2] = actor_data->field_0x22; dStage_actorCreate(actor_data, appen); } } @@ -1940,11 +1940,11 @@ static int dStage_actorInit(dStage_dt_c* stageDt, void* i_data, int entryNum, vo fopAcM_prm_class* appen = fopAcM_CreateAppend(); if (appen != NULL) { - appen->mParameter = actor_data->mParameter; - appen->mPos = actor_data->mSpawnPos; - appen->mAngle = actor_data->mAngle; - appen->mEnemyNo = actor_data->mEnemyNo; - appen->mRoomNo = stageDt->getRoomNo(); + appen->parameters = actor_data->mParameter; + appen->position = actor_data->mSpawnPos; + appen->angle = actor_data->mAngle; + appen->setId = actor_data->mEnemyNo; + appen->room_no = stageDt->getRoomNo(); dStage_actorCreate(actor_data, appen); } } @@ -1967,11 +1967,11 @@ static int dStage_actorInit_always(dStage_dt_c* stageDt, void* i_data, int entry fopAcM_prm_class* appen = fopAcM_CreateAppend(); if (appen != NULL) { - appen->mParameter = actor_data->mParameter; - appen->mPos = actor_data->mSpawnPos; - appen->mAngle = actor_data->mAngle; - appen->mEnemyNo = actor_data->mEnemyNo; - appen->mRoomNo = stageDt->getRoomNo(); + appen->parameters = actor_data->mParameter; + appen->position = actor_data->mSpawnPos; + appen->angle = actor_data->mAngle; + appen->setId = actor_data->mEnemyNo; + appen->room_no = stageDt->getRoomNo(); dStage_actorCreate(actor_data, appen); } } @@ -1991,14 +1991,14 @@ static int dStage_tgscInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, fopAcM_prm_class* appen = fopAcM_CreateAppend(); if (appen != NULL) { - appen->mParameter = actor_data->mParameter; - appen->mPos = actor_data->mSpawnPos; - appen->mAngle = actor_data->mAngle; - appen->mEnemyNo = actor_data->mEnemyNo; - appen->mRoomNo = stageDt->getRoomNo(); - appen->mScale[0] = actor_data->field_0x20[0]; - appen->mScale[1] = actor_data->field_0x20[1]; - appen->mScale[2] = actor_data->field_0x22; + appen->parameters = actor_data->mParameter; + appen->position = actor_data->mSpawnPos; + appen->angle = actor_data->mAngle; + appen->setId = actor_data->mEnemyNo; + appen->room_no = stageDt->getRoomNo(); + appen->scale[0] = actor_data->field_0x20[0]; + appen->scale[1] = actor_data->field_0x20[1]; + appen->scale[2] = actor_data->field_0x22; dStage_actorCreate(actor_data, appen); } } @@ -2017,14 +2017,14 @@ static int dStage_doorInfoInit(dStage_dt_c* stageDt, void* i_data, int entryNum, fopAcM_prm_class* appen = fopAcM_CreateAppend(); if (appen != NULL) { - appen->mParameter = actor_data->mParameter; - appen->mPos = actor_data->mSpawnPos; - appen->mAngle = actor_data->mAngle; - appen->mEnemyNo = actor_data->mEnemyNo; - appen->mRoomNo = stageDt->getRoomNo(); - appen->mScale[0] = actor_data->field_0x20[0]; - appen->mScale[1] = actor_data->field_0x20[1]; - appen->mScale[2] = actor_data->field_0x22; + appen->parameters = actor_data->mParameter; + appen->position = actor_data->mSpawnPos; + appen->angle = actor_data->mAngle; + appen->setId = actor_data->mEnemyNo; + appen->room_no = stageDt->getRoomNo(); + appen->scale[0] = actor_data->field_0x20[0]; + appen->scale[1] = actor_data->field_0x20[1]; + appen->scale[2] = actor_data->field_0x22; dStage_actorCreate(actor_data, appen); } actor_data++; diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 89dfcd4809..5c6b3e1735 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -19,16 +19,14 @@ fopAc_ac_c::fopAc_ac_c() {} /* 80018C8C-80018CE0 0135CC 0054+00 0/0 5/5 270/270 .text __dt__10fopAc_ac_cFv */ fopAc_ac_c::~fopAc_ac_c() {} -/* ############################################################################################## */ /* 80450CB8-80450CBC 0001B8 0004+00 2/2 0/0 0/0 .sbss g_fopAc_type */ -static int g_fopAc_type; +int g_fopAc_type; /* 80018CE0-80018D0C 013620 002C+00 0/0 12/12 391/391 .text fopAc_IsActor__FPv */ -s32 fopAc_IsActor(void* i_this) { - return fpcM_IsJustType(g_fopAc_type, ((fopAc_ac_c*)i_this)->actor_type); +BOOL fopAc_IsActor(void* i_actor) { + return fpcM_IsJustType(g_fopAc_type, ((fopAc_ac_c*)i_actor)->actor_type); } -/* ############################################################################################## */ /* 80450CBC-80450CC0 0001BC 0004+00 2/2 1/1 0/0 .sbss stopStatus__10fopAc_ac_c */ u32 fopAc_ac_c::stopStatus; @@ -70,7 +68,7 @@ static int fopAc_Execute(void* i_this) { if (!fopAcM_checkStatus(a_this, 0x20000000) && (move == 2 || (move != 0 && !fopAcM_checkStatus(a_this, fopAc_ac_c::stopStatus) && - (!fopAcM_checkStatus(a_this, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(a_this, 4))))) + (!fopAcM_checkStatus(a_this, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(a_this, fopAcCnd_NODRAW_e))))) { fopAcM_OffCondition(a_this, fopAcCnd_NOEXEC_e); a_this->old = a_this->current; @@ -101,20 +99,20 @@ static int fopAc_Execute(void* i_this) { static int fopAc_IsDelete(void* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - int isDelete = fpcMtd_IsDelete((process_method_class*)a_this->sub_method, a_this); - if (isDelete == true) { + int ret = fpcMtd_IsDelete((process_method_class*)a_this->sub_method, a_this); + if (ret == TRUE) { fopDwTg_DrawQTo(&a_this->draw_tag); } - return isDelete; + return ret; } /* 80018FCC-8001904C 01390C 0080+00 1/0 0/0 0/0 .text fopAc_Delete__FPv */ static int fopAc_Delete(void* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - int deleted = fpcMtd_Delete((process_method_class*)a_this->sub_method, a_this); - if (deleted == true) { + int ret = fpcMtd_Delete((process_method_class*)a_this->sub_method, a_this); + if (ret == TRUE) { fopAcTg_ActorQTo(&a_this->actor_tag); fopDwTg_DrawQTo(&a_this->draw_tag); fopAcM_DeleteHeap(a_this); @@ -125,7 +123,7 @@ static int fopAc_Delete(void* i_this) { } } - return deleted; + return ret; } /* 8001904C-800193FC 01398C 03B0+00 1/0 0/0 0/0 .text fopAc_Create__FPv */ @@ -143,21 +141,21 @@ static int fopAc_Create(void* i_this) { fopDwTg_Init(&a_this->draw_tag, a_this); a_this->actor_status = profile->status; - a_this->group = profile->mActorType; + a_this->group = profile->group; a_this->cullType = profile->cullType; fopAcM_prm_class* append = fopAcM_GetAppend(a_this); if (append != NULL) { - fopAcM_SetParam(a_this, append->mParameter); - a_this->home.pos = append->mPos; - a_this->home.angle = append->mAngle; - a_this->shape_angle = append->mAngle; - a_this->parentActorID = append->mParentPId; - a_this->subtype = append->mSubtype; - a_this->scale.set(append->mScale[0] * 0.1f, append->mScale[1] * 0.1f, - append->mScale[2] * 0.1f); - a_this->setID = append->mEnemyNo; - a_this->home.roomNo = append->mRoomNo; + fopAcM_SetParam(a_this, append->parameters); + a_this->home.pos = append->position; + a_this->home.angle = append->angle; + a_this->shape_angle = append->angle; + a_this->parentActorID = append->parent_id; + a_this->subtype = append->subtype; + a_this->scale.set(append->scale[0] * 0.1f, append->scale[1] * 0.1f, + append->scale[2] * 0.1f); + a_this->setID = append->setId; + a_this->home.roomNo = append->room_no; } a_this->old = a_this->home; @@ -192,14 +190,14 @@ static int fopAc_Create(void* i_this) { if (!dStage_FileList_dt_GetEnemyAppear1Flag(filelist)) { u32 sw = dStage_FileList_dt_GetBitSw(filelist); if (sw != 0xFF && dComIfGs_isSwitch(sw, a_this->home.roomNo) && - profile->mActorType == fopAc_ENEMY_e) + profile->group == fopAc_ENEMY_e) { return cPhs_ERROR_e; } } else { u32 sw = dStage_FileList_dt_GetBitSw(filelist); if (sw != 0xFF && !dComIfGs_isSwitch(sw, a_this->home.roomNo) && - profile->mActorType == fopAc_ENEMY_e) + profile->group == fopAc_ENEMY_e) { return cPhs_ERROR_e; } @@ -306,7 +304,6 @@ void fopEn_enemy_c::drawBallModel(dKy_tevstr_c* i_tevstr) { } } -/* ############################################################################################## */ /* 803A35B0-803A35D0 -00001 0020+00 0/0 3/0 756/0 .data g_fopAc_Method */ extern actor_method_class g_fopAc_Method = { (process_method_func)fopAc_Create, (process_method_func)fopAc_Delete, @@ -314,8 +311,7 @@ extern actor_method_class g_fopAc_Method = { (process_method_func)fopAc_Draw, }; -/* ############################################################################################## */ /* 80450CC0-80450CC8 0001C0 0004+04 0/0 9/9 0/0 .sbss * sInstance__35JASGlobalInstance<14JAUSectionHeap> */ class JAUSectionHeap; -JAUSectionHeap* JASGlobalInstance::sInstance; \ No newline at end of file +JAUSectionHeap* JASGlobalInstance::sInstance; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 09b851e441..d363aec839 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -6,25 +6,25 @@ #pragma nosyminline on #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_player.h" +#include "d/actor/d_a_tag_stream.h" #include "d/d_item.h" #include "d/d_path.h" #include "f_op/f_op_scene_mng.h" #include "m_Do/m_Do_lib.h" -#include "d/actor/d_a_tag_stream.h" -#include "JSystem/J3DGraphBase/J3DMaterial.h" #define MAKE_ITEM_PARAMS(itemNo, itemBitNo, param_2, param_3) \ ((itemNo & 0xFF) << 0 | (itemBitNo & 0xFF) << 0x8 | param_2 << 0x10 | (param_3 & 0xF) << 0x18) /* 800198A4-800198C4 0141E4 0020+00 0/0 1/1 0/0 .text fopAcM_FastCreate__FsPFPv_iPvPv */ -void* fopAcM_FastCreate(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_createData, - void* i_data) { - return fpcM_FastCreate(i_procName, i_createFunc, i_createData, i_data); +fopAc_ac_c* fopAcM_FastCreate(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_createData, + void* i_append) { + return (fopAc_ac_c*)fpcM_FastCreate(i_procName, i_createFunc, i_createData, i_append); } /* 800198C4-80019934 014204 0070+00 1/1 5/5 18/18 .text fopAcM_setStageLayer__FPv */ @@ -73,62 +73,61 @@ s32 fopAcM_SearchByName(s16 i_procName, fopAc_ac_c** i_outActor) { /* 80019AA8-80019B1C 0143E8 0074+00 1/1 7/7 0/0 .text fopAcM_CreateAppend__Fv */ fopAcM_prm_class* fopAcM_CreateAppend() { - fopAcM_prm_class* params = - static_cast(cMl::memalignB(-4, sizeof(fopAcM_prm_class))); - if (params != NULL) { - cLib_memSet(params, 0, sizeof(fopAcM_prm_class)); - params->mEnemyNo = 0xFFFF; - params->mRoomNo = -1; - params->mScale[0] = 10; - params->mScale[1] = 10; - params->mScale[2] = 10; - params->mParentPId = -1; - params->mSubtype = -1; + fopAcM_prm_class* append = (fopAcM_prm_class*)cMl::memalignB(-4, sizeof(fopAcM_prm_class)); + if (append != NULL) { + cLib_memSet(append, 0, sizeof(fopAcM_prm_class)); + append->setId = 0xFFFF; + append->room_no = -1; + append->scale[0] = 10; + append->scale[1] = 10; + append->scale[2] = 10; + append->parent_id = fpcM_ERROR_PROCESS_ID_e; + append->subtype = -1; } - return params; + return append; } /* 80019B1C-80019C78 01445C 015C+00 4/4 0/0 0/0 .text * createAppend__FUsUlPC4cXyziPC5csXyzPC4cXyzScUi */ -fopAcM_prm_class* createAppend(u16 i_enemyNo, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, s8 i_subType, - fpc_ProcID i_parentProcID) { - fopAcM_prm_class* params = fopAcM_CreateAppend(); - if (params == NULL) { +fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + fpc_ProcID i_parentId) { + fopAcM_prm_class* append = fopAcM_CreateAppend(); + if (append == NULL) { return NULL; - } else { - params->mEnemyNo = i_enemyNo; - - if (i_pos != NULL) { - params->mPos = *i_pos; - } else { - params->mPos = cXyz::Zero; - } - - params->mRoomNo = i_roomNo; - - if (i_angle != NULL) { - params->mAngle = *i_angle; - } else { - params->mAngle = csXyz::Zero; - } - - if (i_scale != NULL) { - params->mScale[0] = 10.0f * i_scale->x; - params->mScale[1] = 10.0f * i_scale->y; - params->mScale[2] = 10.0f * i_scale->z; - } else { - params->mScale[0] = 10; - params->mScale[1] = 10; - params->mScale[2] = 10; - } - - params->mParameter = i_parameters; - params->mParentPId = i_parentProcID; - params->mSubtype = i_subType; - - return params; } + + append->setId = i_setId; + + if (i_pos != NULL) { + append->position = *i_pos; + } else { + append->position = cXyz::Zero; + } + + append->room_no = i_roomNo; + + if (i_angle != NULL) { + append->angle = *i_angle; + } else { + append->angle = csXyz::Zero; + } + + if (i_scale != NULL) { + append->scale[0] = 10.0f * i_scale->x; + append->scale[1] = 10.0f * i_scale->y; + append->scale[2] = 10.0f * i_scale->z; + } else { + append->scale[0] = 10; + append->scale[1] = 10; + append->scale[2] = 10; + } + + append->parameters = i_parameters; + append->parent_id = i_parentId; + append->subtype = i_subtype; + + return append; } /* 80019C78-80019C7C 0145B8 0004+00 3/3 0/0 0/0 .text fopAcM_Log__FPC10fopAc_ac_cPCc */ @@ -157,74 +156,75 @@ s32 fopAcM_delete(fpc_ProcID i_actorID) { /* 80019D18-80019D98 014658 0080+00 2/2 0/0 0/0 .text * fopAcM_create__FsUsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */ -s32 fopAcM_create(s16 i_procName, u16 i_enemyNo, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, s8 i_subType, - createFunc i_createFunc) { - fopAcM_prm_class* params = createAppend(i_enemyNo, i_parameters, i_pos, i_roomNo, i_angle, - i_scale, i_subType, 0xFFFFFFFF); - if (params == NULL) { - return -1; - } else { - return fpcM_Create(i_procName, i_createFunc, params); +fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cXyz* i_pos, + int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + createFunc i_createFunc) { + fopAcM_prm_class* append = createAppend(i_setId, i_parameters, i_pos, i_roomNo, i_angle, + i_scale, i_subtype, fpcM_ERROR_PROCESS_ID_e); + if (append == NULL) { + return fpcM_ERROR_PROCESS_ID_e; } + + return fpcM_Create(i_procName, i_createFunc, append); } /* 80019D98-80019E04 0146D8 006C+00 3/3 11/11 70/70 .text * fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc */ -s32 fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, s8 i_subType) { +fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype) { return fopAcM_create(i_procName, 0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale, - i_subType, NULL); + i_subtype, NULL); } /* 80019E04-80019E6C 014744 0068+00 5/5 6/6 18/18 .text * fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv */ -void* fopAcM_fastCreate(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, s8 i_subType, - createFunc i_createFunc, void* i_createFuncData) { - fopAcM_prm_class* prm = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale, - i_subType, 0xFFFFFFFF); - if (prm == NULL) { +fopAc_ac_c* fopAcM_fastCreate(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, s8 i_subtype, + createFunc i_createFunc, void* i_createFuncData) { + fopAcM_prm_class* append = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale, + i_subtype, fpcM_ERROR_PROCESS_ID_e); + if (append == NULL) { return NULL; - } else { - return fpcM_FastCreate(i_procName, i_createFunc, i_createFuncData, prm); } + + return (fopAc_ac_c*)fpcM_FastCreate(i_procName, i_createFunc, i_createFuncData, append); } /* 80019E6C-80019EF0 0147AC 0084+00 0/0 1/1 0/0 .text * fopAcM_fastCreate__FPCcUlPC4cXyziPC5csXyzPC4cXyzPFPv_iPv */ -void* fopAcM_fastCreate(const char* p_actorName, u32 i_parameters, const cXyz* i_pos, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, createFunc i_createFunc, - void* i_createFuncData) { - dStage_objectNameInf* nameInfo = dStage_searchName(p_actorName); +fopAc_ac_c* fopAcM_fastCreate(const char* i_actorname, u32 i_parameters, const cXyz* i_pos, + int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, + createFunc i_createFunc, void* i_createFuncData) { + dStage_objectNameInf* nameInfo = dStage_searchName(i_actorname); if (nameInfo == NULL) { return NULL; - } else { - return fopAcM_fastCreate(nameInfo->mProcName, i_parameters, i_pos, i_roomNo, i_angle, - i_scale, nameInfo->mSubtype, i_createFunc, i_createFuncData); } + + return fopAcM_fastCreate(nameInfo->mProcName, i_parameters, i_pos, i_roomNo, i_angle, i_scale, + nameInfo->mSubtype, i_createFunc, i_createFuncData); } /* 80019EF0-80019F78 014830 0088+00 0/0 1/1 105/105 .text * fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */ -s32 fopAcM_createChild(s16 i_procName, fpc_ProcID i_parentProcID, u32 i_parameters, - const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, - s8 i_subType, createFunc i_createFunc) { - fopAcM_prm_class* prm = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale, - i_subType, i_parentProcID); - if (prm == NULL) { - return -1; - } else { - return fpcM_Create(i_procName, i_createFunc, prm); +fpc_ProcID fopAcM_createChild(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters, + const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, + const cXyz* i_scale, s8 i_subtype, createFunc i_createFunc) { + fopAcM_prm_class* append = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale, + i_subtype, i_parentID); + if (append == NULL) { + return fpcM_ERROR_PROCESS_ID_e; } + + return fpcM_Create(i_procName, i_createFunc, append); } /* 80019F78-8001A138 0148B8 01C0+00 0/0 0/0 6/6 .text * fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */ -s32 fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentProcID, u32 i_parameters, - const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, - const cXyz* i_scale, s8 i_subType, createFunc i_createFunc) { - fopAc_ac_c* parent_actor = fopAcM_SearchByID(i_parentProcID); +fpc_ProcID fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters, + const cXyz* i_pos, int i_roomNo, const csXyz* i_angle, + const cXyz* i_scale, s8 i_subtype, + createFunc i_createFunc) { + fopAc_ac_c* parent_actor = fopAcM_SearchByID(i_parentID); s16 parent_angleY = parent_actor->current.angle.y; cXyz offset_pos; @@ -240,21 +240,21 @@ s32 fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentProcID, u32 } else { offset_angle = *i_angle; } - cXyz parentPos = parent_actor->current.pos; + cXyz pos = parent_actor->current.pos; csXyz angle(offset_angle); angle.y += parent_angleY; - parentPos.x += offset_pos.z * cM_ssin(parent_angleY) + offset_pos.x * cM_scos(parent_angleY); - parentPos.y += offset_pos.y; - parentPos.z += offset_pos.z * cM_scos(parent_angleY) - offset_pos.x * cM_ssin(parent_angleY); + pos.x += offset_pos.z * cM_ssin(parent_angleY) + offset_pos.x * cM_scos(parent_angleY); + pos.y += offset_pos.y; + pos.z += offset_pos.z * cM_scos(parent_angleY) - offset_pos.x * cM_ssin(parent_angleY); - fopAcM_prm_class* prm = createAppend(0xFFFF, i_parameters, &parentPos, i_roomNo, &angle, - i_scale, i_subType, i_parentProcID); - if (prm == NULL) { - return -1; - } else { - return fpcM_Create(i_procName, i_createFunc, prm); + fopAcM_prm_class* append = + createAppend(0xFFFF, i_parameters, &pos, i_roomNo, &angle, i_scale, i_subtype, i_parentID); + if (append == NULL) { + return fpcM_ERROR_PROCESS_ID_e; } + + return fpcM_Create(i_procName, i_createFunc, append); } BOOL fopAcM_createHeap(fopAc_ac_c* i_this, u32 size, u32 align) { @@ -555,7 +555,6 @@ s16 fopAcM_searchActorAngleX(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_act return cM_atan2s(posB->y - posA->y, JMAFastSqrt(x_dist * x_dist + z_dist * z_dist)); } - /* 8001A79C-8001A7E0 0150DC 0044+00 0/0 3/3 15/15 .text * fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c */ s32 fopAcM_seenActorAngleY(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) { @@ -564,26 +563,11 @@ s32 fopAcM_seenActorAngleY(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actor return abs((s16)(target_angle - i_actorA->shape_angle.y)); } -inline f32 local_sqrtf(f32 mag) { - if (mag > 0.0f) { - f64 tmpd = __frsqrte(mag); - tmpd = 0.5 * tmpd * (3.0 - tmpd * tmpd * mag); - tmpd = 0.5 * tmpd * (3.0 - tmpd * tmpd * mag); - return 0.5 * tmpd * (3.0 - tmpd * tmpd * mag) * mag; - } else if (mag < 0.0) { - return NAN; - } else if (fpclassify(mag) == 1) { - return NAN; - } else { - return mag; - } -} - /* 8001A7E0-8001A914 015120 0134+00 0/0 5/5 188/188 .text * fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c */ f32 fopAcM_searchActorDistance(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) { cXyz dist = (*fopAcM_GetPosition_p(i_actorB) - *fopAcM_GetPosition_p(i_actorA)); - return local_sqrtf(dist.abs2()); + return dist.abs(); } /* 8001A914-8001A964 015254 0050+00 0/0 0/0 2/2 .text @@ -598,10 +582,9 @@ f32 fopAcM_searchActorDistance2(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_ f32 fopAcM_searchActorDistanceXZ(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) { const cXyz* posA = fopAcM_GetPosition_p(i_actorA); const cXyz* posB = fopAcM_GetPosition_p(i_actorB); - return sqrtf((*posB - *posA).abs2XZ()); + return (*posB - *posA).absXZ(); } - /* 8001AA94-8001AAE0 0153D4 004C+00 1/1 4/4 30/30 .text * fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c */ f32 fopAcM_searchActorDistanceXZ2(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) { @@ -610,47 +593,44 @@ f32 fopAcM_searchActorDistanceXZ2(const fopAc_ac_c* i_actorA, const fopAc_ac_c* return (*posB - *posA).abs2XZ(); } - BOOL daPy_py_c::checkNowWolf() { return dComIfGp_getLinkPlayer()->checkWolf(); } /* 8001AAE0-8001AC40 015420 0160+00 0/0 0/0 2/2 .text * fopAcM_rollPlayerCrash__FPC10fopAc_ac_cfUlffif */ -s32 fopAcM_rollPlayerCrash(fopAc_ac_c const* actor, f32 param_1, u32 param_2, f32 param_3, - f32 param_4, int param_5, f32 param_6) { +BOOL fopAcM_rollPlayerCrash(fopAc_ac_c const* i_crashActor, f32 i_range, u32 i_flag, f32 i_max_y, + f32 i_min_y, BOOL param_5, f32 param_6) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - if (player != dComIfGp_getLinkPlayer()) { - return 0; + return FALSE; } - f32 tmp = param_1 + 40.0f; - + f32 range = i_range + 40.0f; if (daPy_py_c::checkNowWolf()) { - tmp += 55.0f; + range += 55.0f; } - f32 y_dist = fopAcM_searchPlayerDistanceY(actor); - if (y_dist > param_4 && y_dist < param_3 && + f32 y_dist = fopAcM_searchPlayerDistanceY(i_crashActor); + if (y_dist > i_min_y && y_dist < i_max_y && (player->checkFrontRoll() || player->checkWolfDash()) && - fopAcM_searchPlayerDistanceXZ2(actor) < (tmp * tmp)) + fopAcM_searchPlayerDistanceXZ2(i_crashActor) < (range * range)) { - if (cM_scos(player->current.angle.y - fopAcM_searchPlayerAngleY(actor)) < param_6) { - player->onFrollCrashFlg(param_2, param_5); - return 1; + if (cM_scos(player->current.angle.y - fopAcM_searchPlayerAngleY(i_crashActor)) < param_6) { + player->onFrollCrashFlg(i_flag, param_5); + return TRUE; } } - return 0; + return FALSE; } /* 8001AC40-8001ACEC 015580 00AC+00 0/0 0/0 2/2 .text fopAcM_checkCullingBox__FPA4_fffffff */ -s32 fopAcM_checkCullingBox(Mtx pMtx, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z2) { +s32 fopAcM_checkCullingBox(Mtx m, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z2) { Vec tmp1 = {x1, y1, z1}; Vec tmp2 = {x2, y2, z2}; Mtx tmpMtx; - MTXConcat(j3dSys.getViewMtx(), pMtx, tmpMtx); + MTXConcat(j3dSys.getViewMtx(), m, tmpMtx); return mDoLib_clipper::clip(tmpMtx, &tmp2, &tmp1) != 0; } @@ -773,13 +753,12 @@ s32 fopAcM_cullingCheck(fopAc_ac_c const* i_actor) { if (fopAcM_GetCullSize(i_actor) == 14) { if (fopAcM_getCullSizeFar(i_actor) > 0.0f) { mDoLib_clipper::changeFar(cullsize_far * mDoLib_clipper::getFar()); - u32 ret = mDoLib_clipper::clip(mtx_p, &i_actor->cull.box.max, - &i_actor->cull.box.min); + u32 ret = + mDoLib_clipper::clip(mtx_p, &i_actor->cull.box.max, &i_actor->cull.box.min); mDoLib_clipper::resetFar(); return ret; } else { - return mDoLib_clipper::clip(mtx_p, &i_actor->cull.box.max, - &i_actor->cull.box.min); + return mDoLib_clipper::clip(mtx_p, &i_actor->cull.box.max, &i_actor->cull.box.min); } } else { cull_box* box = &l_cullSizeBox[cullsize]; @@ -839,186 +818,188 @@ void* event_second_actor(u16) { /* 8001B068-8001B0FC 0159A8 0094+00 0/0 3/3 0/0 .text * fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs */ -s32 fopAcM_orderTalkEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, u16 flag) { +s32 fopAcM_orderTalkEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) { return 0; } - if (priority == 0) { - priority = 0x1FF; + if (i_priority == 0) { + i_priority = 0x1FF; } - return dComIfGp_event_order(EVT_TYPE_TALK, priority, flag, 0x14F, actorA, actorB, -1, -1); + return dComIfGp_event_order(EVT_TYPE_TALK, i_priority, i_flag, 0x14F, i_actorA, i_actorB, -1, + -1); } /* 8001B0FC-8001B19C 015A3C 00A0+00 0/0 1/1 0/0 .text * fopAcM_orderTalkItemBtnEvent__FUsP10fopAc_ac_cP10fopAc_ac_cUsUs */ -s32 fopAcM_orderTalkItemBtnEvent(u16 eventType, fopAc_ac_c* actorA, fopAc_ac_c* actorB, - u16 priority, u16 flag) { +s32 fopAcM_orderTalkItemBtnEvent(u16 i_eventType, fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, + u16 i_priority, u16 i_flag) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) { return 0; } - if (priority == 0) { - priority = 500; + if (i_priority == 0) { + i_priority = 500; } - return dComIfGp_event_order(eventType, priority, flag, 0x14F, actorA, actorB, -1, -1); + return dComIfGp_event_order(i_eventType, i_priority, i_flag, 0x14F, i_actorA, i_actorB, -1, -1); } /* 8001B19C-8001B244 015ADC 00A8+00 0/0 3/3 16/16 .text fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs */ -s32 fopAcM_orderSpeakEvent(fopAc_ac_c* actor, u16 priority, u16 flag) { +s32 fopAcM_orderSpeakEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) { return 0; } - if (priority == 0) { - priority = 0x1EA; + if (i_priority == 0) { + i_priority = 0x1EA; } - return dComIfGp_event_order(EVT_TYPE_TALK, priority, flag, 0x14F, dComIfGp_getPlayer(0), actor, - -1, -1); + return dComIfGp_event_order(EVT_TYPE_TALK, i_priority, i_flag, 0x14F, dComIfGp_getPlayer(0), + i_actor, -1, -1); } /* 8001B244-8001B334 015B84 00F0+00 0/0 2/2 0/0 .text * fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs */ -s32 fopAcM_orderDoorEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, u16 flag) { +s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) { return 0; } - if (priority == 0) { - priority = 0xFF; + if (i_priority == 0) { + i_priority = 0xFF; } - s16 eventID = actorB->eventInfo.getEventId(); - u8 toolID = actorB->eventInfo.getMapToolId(); + s16 eventID = i_actorB->eventInfo.getEventId(); + u8 toolID = i_actorB->eventInfo.getMapToolId(); - if (fopAcM_GetProfName(actorB) == 0x55 && toolID != 0xFF) { - eventID = dComIfGp_getEventManager().getEventIdx(actorA, NULL, toolID); + if (fopAcM_GetProfName(i_actorB) == 0x55 && toolID != 0xFF) { + eventID = dComIfGp_getEventManager().getEventIdx(i_actorA, NULL, toolID); } - return dComIfGp_event_order(EVT_TYPE_DOOR, priority, flag, -1, actorA, actorB, eventID, toolID); + return dComIfGp_event_order(EVT_TYPE_DOOR, i_priority, i_flag, -1, i_actorA, i_actorB, eventID, + toolID); } /* 8001B334-8001B3CC 015C74 0098+00 0/0 1/1 0/0 .text * fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs */ -s32 fopAcM_orderCatchEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, u16 flag) { +s32 fopAcM_orderCatchEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) { return 0; } - if (priority == 0) { - priority = 2; + if (i_priority == 0) { + i_priority = 2; } - return dComIfGp_event_order(EVT_TYPE_CATCH, priority, flag, -1, actorA, actorB, -1, -1); + return dComIfGp_event_order(EVT_TYPE_CATCH, i_priority, i_flag, -1, i_actorA, i_actorB, -1, -1); } /* 8001B3CC-8001B4E0 015D0C 0114+00 0/0 2/2 6/6 .text * fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs */ -s32 fopAcM_orderOtherEvent(fopAc_ac_c* actor, char const* param_1, u16 param_2, u16 flag, - u16 priority) { +s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actor, char const* i_eventName, u16 param_2, u16 i_flag, + u16 i_priority) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) { return 0; } - s16 eventIdx = dComIfGp_getEventManager().getEventIdx(actor, param_1, -1); + s16 eventIdx = dComIfGp_getEventManager().getEventIdx(i_actor, i_eventName, -1); if (eventIdx < 0) { return 0; } - u16 eventPrio = dComIfGp_getEventManager().getEventPrio(actor, eventIdx); + u16 eventPrio = dComIfGp_getEventManager().getEventPrio(i_actor, eventIdx); if (eventPrio == 0) { eventPrio = 0xFF; } - if (priority != 0) { - eventPrio = priority; + if (i_priority != 0) { + eventPrio = i_priority; } - return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, flag, param_2, actor, - event_second_actor(flag), eventIdx, -1); + return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, i_flag, param_2, i_actor, + event_second_actor(i_flag), eventIdx, -1); } /* 8001B4E0-8001B5E4 015E20 0104+00 0/0 1/1 2/2 .text * fopAcM_orderOtherEvent__FP10fopAc_ac_cP10fopAc_ac_cPCcUsUsUs */ -s32 fopAcM_orderOtherEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, char const* param_2, u16 param_3, - u16 flag, u16 priority) { +s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, char const* i_eventName, + u16 param_3, u16 i_flag, u16 i_priority) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) { return 0; } - s16 eventIdx = dComIfGp_getEventManager().getEventIdx(actorA, param_2, -1); + s16 eventIdx = dComIfGp_getEventManager().getEventIdx(i_actorA, i_eventName, -1); if (eventIdx < 0) { return 0; } - u16 eventPrio = dComIfGp_getEventManager().getEventPrio(actorA, eventIdx); + u16 eventPrio = dComIfGp_getEventManager().getEventPrio(i_actorA, eventIdx); if (eventPrio == 0) { eventPrio = 0xFF; } - if (priority != 0) { - eventPrio = priority; + if (i_priority != 0) { + eventPrio = i_priority; } - return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, flag, param_3, actorA, actorB, eventIdx, - -1); + return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, i_flag, param_3, i_actorA, i_actorB, + eventIdx, -1); } /* 8001B5E4-8001B67C 015F24 0098+00 0/0 2/2 41/41 .text * fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs */ -s32 fopAcM_orderChangeEventId(fopAc_ac_c* actor, s16 eventID, u16 flag, u16 param_3) { - u16 eventPrio = dComIfGp_getEventManager().getEventPrio(actor, eventID); +s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_actor, s16 i_eventID, u16 i_flag, u16 param_3) { + u16 eventPrio = dComIfGp_getEventManager().getEventPrio(i_actor, i_eventID); if (eventPrio == 0) { eventPrio = 0xFF; } - return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, flag | 0x400, param_3, actor, - event_second_actor(flag), eventID, -1); + return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, i_flag | 0x400, param_3, i_actor, + event_second_actor(i_flag), i_eventID, -1); } /* 8001B67C-8001B7B4 015FBC 0138+00 0/0 10/10 101/101 .text * fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs */ -s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 param_3, - u16 priority, u16 flag) { +s32 fopAcM_orderOtherEventId(fopAc_ac_c* i_actor, s16 i_eventID, u8 i_mapToolID, u16 param_3, + u16 i_priority, u16 i_flag) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) { return 0; } u16 newPriority = 50; s32 roomNo = dComIfGp_roomControl_getStayNo(); - if (actor != NULL) { - roomNo = fopAcM_GetRoomNo(actor); + if (i_actor != NULL) { + roomNo = fopAcM_GetRoomNo(i_actor); } - if (priority != 0) { - newPriority = priority; - } else if (actor != NULL) { - u16 eventPrio = dComIfGp_getEventManager().getEventPrio(actor, eventID); + if (i_priority != 0) { + newPriority = i_priority; + } else if (i_actor != NULL) { + u16 eventPrio = dComIfGp_getEventManager().getEventPrio(i_actor, i_eventID); if (eventPrio != 0) { newPriority = eventPrio; - } else if (mapToolID != 0xFF) { - dStage_MapEvent_dt_c* dt = dEvt_control_c::searchMapEventData(mapToolID, roomNo); + } else if (i_mapToolID != 0xFF) { + dStage_MapEvent_dt_c* dt = dEvt_control_c::searchMapEventData(i_mapToolID, roomNo); if (dt != NULL) { newPriority = dt->mPriority; @@ -1026,36 +1007,36 @@ s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 p } } - return dComIfGp_event_order(EVT_TYPE_OTHER, newPriority, flag, param_3, actor, - event_second_actor(flag), eventID, mapToolID); + return dComIfGp_event_order(EVT_TYPE_OTHER, newPriority, i_flag, param_3, i_actor, + event_second_actor(i_flag), i_eventID, i_mapToolID); } /* 8001B7B4-8001B8E0 0160F4 012C+00 1/1 1/1 4/4 .text * fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs */ -s32 fopAcM_orderMapToolEvent(fopAc_ac_c* actor, u8 param_1, s16 eventID, u16 param_3, u16 flag, - u16 param_5) { +s32 fopAcM_orderMapToolEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 param_3, + u16 i_flag, u16 param_5) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) { return 0; } u16 newPriority = 100; s32 roomNo = dComIfGp_roomControl_getStayNo(); - if (actor != NULL) { - roomNo = fopAcM_GetRoomNo(actor); + if (i_actor != NULL) { + roomNo = fopAcM_GetRoomNo(i_actor); } dStage_MapEvent_dt_c* dt = dEvt_control_c::searchMapEventData(param_1, roomNo); if (dt != NULL) { newPriority = dt->mPriority; - if (eventID == 0xFF) { - eventID = dComIfGp_getEventManager().getEventIdx(actor, param_1); + if (i_eventID == 0xFF) { + i_eventID = dComIfGp_getEventManager().getEventIdx(i_actor, param_1); } } - if (flag & 0x100) { + if (i_flag & 0x100) { newPriority = 3; } @@ -1063,65 +1044,67 @@ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* actor, u8 param_1, s16 eventID, u16 par newPriority = param_5; } - return dComIfGp_event_order(EVT_TYPE_OTHER, newPriority, flag, param_3, actor, - event_second_actor(flag), eventID, param_1); + return dComIfGp_event_order(EVT_TYPE_OTHER, newPriority, i_flag, param_3, i_actor, + event_second_actor(i_flag), i_eventID, param_1); } /* 8001B8E0-8001B908 016220 0028+00 0/0 1/1 1/1 .text * fopAcM_orderMapToolAutoNextEvent__FP10fopAc_ac_cUcsUsUsUs */ -s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c* actor, u8 param_1, s16 eventID, u16 param_3, - u16 flag, u16 param_5) { - return fopAcM_orderMapToolEvent(actor, param_1, eventID, param_3, flag | 0x100, param_5); +s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 param_3, + u16 i_flag, u16 param_5) { + return fopAcM_orderMapToolEvent(i_actor, param_1, i_eventID, param_3, i_flag | 0x100, param_5); } /* 8001B908-8001B9D0 016248 00C8+00 0/0 0/0 106/106 .text * fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs */ -s32 fopAcM_orderPotentialEvent(fopAc_ac_c* actor, u16 flag, u16 param_2, u16 priority) { +s32 fopAcM_orderPotentialEvent(fopAc_ac_c* i_actor, u16 i_flag, u16 param_2, u16 i_priority) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) { return 0; } - if (priority == 0) { - priority = 0xFF; + if (i_priority == 0) { + i_priority = 0xFF; } - return dComIfGp_event_order(EVT_TYPE_POTENTIAL, priority, flag, param_2, actor, - event_second_actor(flag), -1, -1); + return dComIfGp_event_order(EVT_TYPE_POTENTIAL, i_priority, i_flag, param_2, i_actor, + event_second_actor(i_flag), -1, -1); } /* 8001B9D0-8001BA7C 016310 00AC+00 0/0 3/3 12/12 .text fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs */ -s32 fopAcM_orderItemEvent(fopAc_ac_c* actor, u16 priority, u16 flag) { +s32 fopAcM_orderItemEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) { return 0; } - if (priority == 0) { - priority = 0xFF; + if (i_priority == 0) { + i_priority = 0xFF; } - return dComIfGp_event_order(EVT_TYPE_ITEM, priority, flag, -1, dComIfGp_getPlayer(0), actor, -1, - -1); + return dComIfGp_event_order(EVT_TYPE_ITEM, i_priority, i_flag, -1, dComIfGp_getPlayer(0), + i_actor, -1, -1); } /* 8001BA7C-8001BB14 0163BC 0098+00 0/0 1/1 0/0 .text * fopAcM_orderTreasureEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs */ -s32 fopAcM_orderTreasureEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, u16 flag) { +s32 fopAcM_orderTreasureEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, + u16 i_flag) { if (!dComIfGp_getEvent().isOrderOK() && - (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) + (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) { return 0; } - if (priority == 0) { - priority = 0xFF; + if (i_priority == 0) { + i_priority = 0xFF; } - return dComIfGp_event_order(EVT_TYPE_TREASURE, priority, flag, -1, actorA, actorB, -1, -1); + return dComIfGp_event_order(EVT_TYPE_TREASURE, i_priority, i_flag, -1, i_actorA, i_actorB, -1, + -1); } /* 8001BB14-8001BB44 016454 0030+00 0/0 11/11 10/10 .text @@ -1137,8 +1120,8 @@ fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c const*) { } /* 8001BB74-8001BBE8 0164B4 0074+00 0/0 1/1 0/0 .text fopAcM_getEventPartner__FPC10fopAc_ac_c */ -fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c const* actor) { - if (dComIfGp_event_getPt1() != actor) { +fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c const* i_actor) { + if (dComIfGp_event_getPt1() != i_actor) { return dComIfGp_event_getPt1(); } @@ -1147,29 +1130,29 @@ fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c const* actor) { /* 8001BBE8-8001BC74 016528 008C+00 0/0 5/5 43/43 .text * fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz */ -s32 fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 param_2, int i_itemBitNo, - int i_roomNo, csXyz const* i_angle, cXyz const* i_scale) { +fpc_ProcID fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 param_2, + int i_itemBitNo, int i_roomNo, csXyz const* i_angle, + cXyz const* i_scale) { dComIfGp_event_setGtItm(i_itemNo); if (i_itemNo == NO_ITEM) { - return -1; - } else { - return fopAcM_createDemoItem(i_pos, i_itemNo, i_itemBitNo, i_angle, i_roomNo, i_scale, - param_2); + return fpcM_ERROR_PROCESS_ID_e; } + + return fopAcM_createDemoItem(i_pos, i_itemNo, i_itemBitNo, i_angle, i_roomNo, i_scale, param_2); } /* 8001BC74-8001BCFC 0165B4 0088+00 0/0 2/2 10/10 .text * fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz */ -s32 fopAcM_createItemForTrBoxDemo(cXyz const* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, - csXyz const* i_angle, cXyz const* i_scale) { +fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz const* i_pos, int i_itemNo, int i_itemBitNo, + int i_roomNo, csXyz const* i_angle, cXyz const* i_scale) { dComIfGp_event_setGtItm(i_itemNo); if (i_itemNo == NO_ITEM) { - return -1; - } else { - return fopAcM_createDemoItem(i_pos, i_itemNo, i_itemBitNo, i_angle, i_roomNo, i_scale, 0); + return fpcM_ERROR_PROCESS_ID_e; } + + return fopAcM_createDemoItem(i_pos, i_itemNo, i_itemBitNo, i_angle, i_roomNo, i_scale, 0); } struct ItemTableList { @@ -1236,9 +1219,9 @@ struct EnemyTable { /* 8001BE14-8001BF64 016754 0150+00 0/0 0/0 9/9 .text * fopAcM_createItemFromEnemyID__FUcPC4cXyziiPC5csXyzPC4cXyzPfPf */ -s32 fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* i_pos, int i_itemBitNo, int i_roomNo, - csXyz const* i_angle, cXyz const* i_scale, f32* speedF, - f32* speedY) { +fpc_ProcID fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* i_pos, int i_itemBitNo, + int i_roomNo, csXyz const* i_angle, cXyz const* i_scale, + f32* i_speedF, f32* i_speedY) { int tableNo = 0xFF; EnemyTableList* tblList = (EnemyTableList*)dEnemyItem_c::mData; int tableNum = tblList->field_0x4; @@ -1258,19 +1241,21 @@ s32 fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* i_pos, int i_itemBitN if (daPy_getPlayerActorClass()->checkHorseRide()) { int itemNo = fopAcM_getItemNoFromTableNo(tableNo); - void* ac = fopAcM_createItemForDirectGet(i_pos, itemNo, i_roomNo, NULL, NULL, 0.0f, 0.0f); - return fopAcM_GetID(ac); + void* actor = + fopAcM_createItemForDirectGet(i_pos, itemNo, i_roomNo, NULL, NULL, 0.0f, 0.0f); + return fopAcM_GetID(actor); } return fopAcM_createItemFromTable(i_pos, tableNo, i_itemBitNo, i_roomNo, i_angle, 0, i_scale, - speedF, speedY, false); + i_speedF, i_speedY, false); } /* 8001BF64-8001C078 0168A4 0114+00 1/1 0/0 11/11 .text * fopAcM_createItemFromTable__FPC4cXyziiiPC5csXyziPC4cXyzPfPfb */ -s32 fopAcM_createItemFromTable(cXyz const* i_pos, int i_tableNo, int i_itemBitNo, int i_roomNo, - csXyz const* i_angle, int param_5, cXyz const* i_scale, f32* speedF, - f32* speedY, bool createDirect) { +fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_tableNo, int i_itemBitNo, + int i_roomNo, csXyz const* i_angle, int param_5, + cXyz const* i_scale, f32* i_speedF, f32* i_speedY, + bool i_createDirect) { // clang-format off JUT_ASSERT(0 <= i_itemNo && i_itemNo <= 255 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on @@ -1278,7 +1263,7 @@ s32 fopAcM_createItemFromTable(cXyz const* i_pos, int i_tableNo, int i_itemBitNo ItemTableList* tableList = (ItemTableList*)dComIfGp_getItemTable(); if (i_tableNo == 0xFF) { - return -1; + return fpcM_ERROR_PROCESS_ID_e; } #ifdef DEBUG @@ -1290,91 +1275,97 @@ s32 fopAcM_createItemFromTable(cXyz const* i_pos, int i_tableNo, int i_itemBitNo } #endif - s32 itemNo = fopAcM_getItemNoFromTableNo(i_tableNo); + int itemNo = fopAcM_getItemNoFromTableNo(i_tableNo); if (itemNo == NO_ITEM) { - return -1; + return fpcM_ERROR_PROCESS_ID_e; } - void* ac; - if (createDirect) { - ac = fopAcM_createItemForDirectGet(i_pos, itemNo, i_roomNo, NULL, NULL, 0.0f, 0.0f); - } else if (speedF == NULL && speedY == NULL) { - ac = + void* create_actor; + if (i_createDirect) { + create_actor = + fopAcM_createItemForDirectGet(i_pos, itemNo, i_roomNo, NULL, NULL, 0.0f, 0.0f); + } else if (i_speedF == NULL && i_speedY == NULL) { + create_actor = fopAcM_fastCreateItem2(i_pos, itemNo, i_itemBitNo, i_roomNo, param_5, i_angle, i_scale); } else { - ac = fopAcM_fastCreateItem(i_pos, itemNo, i_roomNo, i_angle, i_scale, speedF, speedY, - i_itemBitNo, param_5, NULL); + create_actor = fopAcM_fastCreateItem(i_pos, itemNo, i_roomNo, i_angle, i_scale, i_speedF, + i_speedY, i_itemBitNo, param_5, NULL); } - return fopAcM_GetID(ac); + return fopAcM_GetID(create_actor); } /* 8001C078-8001C0D4 0169B8 005C+00 2/2 0/0 0/0 .text * fopAcM_createDemoItem__FPC4cXyziiPC5csXyziPC4cXyzUc */ -s32 fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, const csXyz* i_angle, - int i_roomNo, const cXyz* scale, u8 param_7) { +fpc_ProcID fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, + const csXyz* i_angle, int i_roomNo, const cXyz* scale, + u8 param_7) { // clang-format off JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on if (i_itemNo == NO_ITEM) { - return -1; - } else { - return fopAcM_create(PROC_Demo_Item, - (i_itemNo & 0xFF) | (i_itemBitNo & 0x7F) << 0x8 | (param_7 << 0x10), - i_pos, i_roomNo, i_angle, scale, -1); + return fpcM_ERROR_PROCESS_ID_e; } + + return fopAcM_create(PROC_Demo_Item, + (i_itemNo & 0xFF) | (i_itemBitNo & 0x7F) << 0x8 | (param_7 << 0x10), i_pos, + i_roomNo, i_angle, scale, -1); } /* 8001C0D4-8001C174 016A14 00A0+00 0/0 0/0 18/18 .text * fopAcM_createItemForBoss__FPC4cXyziiPC5csXyzPC4cXyzffi */ -s32 fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo, const csXyz* i_angle, - const cXyz* i_scale, f32 speedF, f32 speedY, int param_8) { - fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate( - PROC_Obj_LifeContainer, 0xFFFF0000 | param_8 << 0x8 | (i_itemNo & 0xFF), i_pos, i_roomNo, - i_angle, i_scale, -1, NULL, NULL); +fpc_ProcID fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF, + f32 i_speedY, int param_8) { + fopAc_ac_c* actor = + fopAcM_fastCreate(PROC_Obj_LifeContainer, 0xFFFF0000 | param_8 << 0x8 | (i_itemNo & 0xFF), + i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); if (actor != NULL) { - actor->speedF = speedF; - actor->speed.y = speedY; + actor->speedF = i_speedF; + actor->speed.y = i_speedY; } + return fopAcM_GetID(actor); } /* 8001C174-8001C1B8 016AB4 0044+00 0/0 0/0 2/2 .text * fopAcM_createItemForMidBoss__FPC4cXyziiPC5csXyzPC4cXyzii */ -s32 fopAcM_createItemForMidBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo, const csXyz* i_angle, - const cXyz* i_scale, int param_6, int param_7) { - return fopAcM_createItem(i_pos, i_itemNo, param_7, i_roomNo, &csXyz(csXyz::Zero), i_scale, 0x6); +fpc_ProcID fopAcM_createItemForMidBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, int param_6, + int param_7) { + csXyz angle(csXyz::Zero); + return fopAcM_createItem(i_pos, i_itemNo, param_7, i_roomNo, &angle, i_scale, 0x6); } /* 8001C1B8-8001C1FC 016AF8 0044+00 2/2 0/0 1/1 .text * fopAcM_createItemForDirectGet__FPC4cXyziiPC5csXyzPC4cXyzff */ -void* fopAcM_createItemForDirectGet(const cXyz* i_pos, int i_itemNo, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, f32 speedF, - f32 speedY) { - return fopAcM_fastCreateItem(i_pos, i_itemNo, i_roomNo, i_angle, i_scale, &speedF, &speedY, -1, +fopAc_ac_c* fopAcM_createItemForDirectGet(const cXyz* i_pos, int i_itemNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF, + f32 i_speedY) { + return fopAcM_fastCreateItem(i_pos, i_itemNo, i_roomNo, i_angle, i_scale, &i_speedF, &i_speedY, -1, 0x7, NULL); } /* 8001C1FC-8001C240 016B3C 0044+00 0/0 2/2 3/3 .text * fopAcM_createItemForSimpleDemo__FPC4cXyziiPC5csXyzPC4cXyzff */ -void* fopAcM_createItemForSimpleDemo(const cXyz* i_pos, int i_itemNo, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, f32 speedF, - f32 speedY) { - return fopAcM_fastCreateItem(i_pos, i_itemNo, i_roomNo, i_angle, i_scale, &speedF, &speedY, -1, +fopAc_ac_c* fopAcM_createItemForSimpleDemo(const cXyz* i_pos, int i_itemNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF, + f32 i_speedY) { + return fopAcM_fastCreateItem(i_pos, i_itemNo, i_roomNo, i_angle, i_scale, &i_speedF, &i_speedY, -1, 0x4, NULL); } /* 8001C240-8001C3E0 016B80 01A0+00 1/1 1/1 17/17 .text * fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi */ -s32 fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, - const csXyz* i_angle, const cXyz* i_scale, int param_7) { +fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, int param_7) { // clang-format off JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on if (i_itemNo == NO_ITEM) { - return -1; + return fpcM_ERROR_PROCESS_ID_e; } csXyz item_angle(csXyz::Zero); @@ -1423,8 +1414,8 @@ s32 fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_ro /* 8001C3E0-8001C5B0 016D20 01D0+00 1/1 0/0 0/0 .text * fopAcM_fastCreateItem2__FPC4cXyziiiiPC5csXyzPC4cXyz */ -void* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, - int param_5, const csXyz* i_angle, const cXyz* i_scale) { +fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, + int param_5, const csXyz* i_angle, const cXyz* i_scale) { // clang-format off JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on @@ -1484,9 +1475,10 @@ void* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i /* 8001C5B0-8001C870 016EF0 02C0+00 3/3 0/0 4/4 .text * fopAcM_fastCreateItem__FPC4cXyziiPC5csXyzPC4cXyzPfPfiiPFPv_i */ -void* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, const csXyz* i_angle, - const cXyz* i_scale, f32* p_speedF, f32* p_speedY, int i_itemBitNo, - int param_9, createFunc i_createFunc) { +fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, + const csXyz* i_angle, const cXyz* i_scale, f32* i_speedF, + f32* i_speedY, int i_itemBitNo, int param_9, + createFunc i_createFunc) { JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256); csXyz angle; @@ -1500,8 +1492,8 @@ void* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, const u8 item_bit_no = i_itemBitNo; u32 params = MAKE_ITEM_PARAMS(item_no, item_bit_no, 0xFF, param_9); - if (p_speedF != NULL && isHeart(i_itemNo)) { - *p_speedF = 2.0f * *p_speedF; + if (i_speedF != NULL && isHeart(i_itemNo)) { + *i_speedF = 2.0f * *i_speedF; } switch (i_itemNo) { @@ -1543,12 +1535,12 @@ void* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, const PROC_ITEM, params, i_pos, i_roomNo, &angle, i_scale, -1, i_createFunc, NULL); if (actor != NULL) { - if (p_speedF != NULL) { - actor->speedF = *p_speedF * (1.0f + cM_rndFX(0.3f)); + if (i_speedF != NULL) { + actor->speedF = *i_speedF * (1.0f + cM_rndFX(0.3f)); } - if (p_speedY != NULL) { - actor->speed.y = *p_speedY * (1.0f + cM_rndFX(0.2f)); + if (i_speedY != NULL) { + actor->speed.y = *i_speedY * (1.0f + cM_rndFX(0.2f)); } } } @@ -1564,12 +1556,12 @@ void* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, const &angle, i_scale, -1, i_createFunc, NULL); if (actor != NULL) { - if (p_speedF != NULL) { - actor->speedF = *p_speedF; + if (i_speedF != NULL) { + actor->speedF = *i_speedF; } - if (p_speedY != NULL) { - actor->speed.y = *p_speedY; + if (i_speedY != NULL) { + actor->speed.y = *i_speedY; } } @@ -1579,24 +1571,24 @@ void* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, const /* 8001C870-8001C95C 0171B0 00EC+00 0/0 0/0 1/1 .text fopAcM_createBokkuri__FUsPC4cXyziiiPC4cXyzii */ -s32 fopAcM_createBokkuri(u16 i_enemyNo, const cXyz* i_pos, int param_3, int param_4, int i_roomNo, - const cXyz* param_6, int param_7, int param_8) { +fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int param_3, int param_4, + int i_roomNo, const cXyz* param_6, int param_7, int param_8) { csXyz angle(0, 0, 0); if (param_6 != NULL) { angle.y = param_6->atan2sX_Z(); - angle.y += static_cast(2048.0f * cM_rndFX(1.0f)); + angle.y += (s16)(2048.0f * cM_rndFX(1.0f)); param_8 = 1; } u32 actorParams = 0; make_prm_bokkuri(&actorParams, &angle, 6, param_3, param_4, param_7, param_8); - return fopAcM_create(PROC_Obj_Carry, i_enemyNo, actorParams, i_pos, i_roomNo, &angle, NULL, -1, + return fopAcM_create(PROC_Obj_Carry, i_setId, actorParams, i_pos, i_roomNo, &angle, NULL, -1, NULL); } /* 8001C95C-8001C9CC 01729C 0070+00 0/0 0/0 12/12 .text * fopAcM_createWarpHole__FPC4cXyzPC5csXyziUcUcUc */ -s32 fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_roomNo, u8 param_4, - u8 param_5, u8 param_6) { +fpc_ProcID fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_roomNo, u8 param_4, + u8 param_5, u8 param_6) { if (param_6 == 0xFF) { param_6 = param_4; } @@ -1605,12 +1597,9 @@ s32 fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_roomNo, return fopAcM_create(PROC_Obj_BossWarp, actorParams, i_pos, i_roomNo, i_angle, NULL, -1); } -s32 fopAc_IsActor(void*); - /* 8001C9CC-8001CA1C 01730C 0050+00 1/1 0/0 0/0 .text enemySearchJugge__FPvPv */ void* enemySearchJugge(void* i_actor, void* i_data) { - if (i_actor != NULL && fopAc_IsActor(i_actor) && - static_cast(i_actor)->group == fopAc_ENEMY_e) + if (i_actor != NULL && fopAc_IsActor(i_actor) && ((fopAc_ac_c*)i_actor)->group == fopAc_ENEMY_e) { return i_actor; } else { @@ -1638,12 +1627,11 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { /* 8001CAD8-8001CB48 017418 0070+00 0/0 0/0 81/81 .text * fopAcM_createDisappear__FPC10fopAc_ac_cPC4cXyzUcUcUc */ -s32 fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 i_size, u8 i_type, - u8 i_enemyID) { - return fopAcM_GetID(fopAcM_fastCreate(PROC_DISAPPEAR, - (i_enemyID << 0x10) | (i_size << 0x8) | i_type, i_pos, - fopAcM_GetRoomNo(i_actor), &i_actor->current.angle, - NULL, 0xFF, NULL, NULL)); +fpc_ProcID fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 i_size, + u8 i_type, u8 i_enemyID) { + return fopAcM_GetID(fopAcM_fastCreate( + PROC_DISAPPEAR, (i_enemyID << 0x10) | (i_size << 0x8) | i_type, i_pos, + fopAcM_GetRoomNo(i_actor), &i_actor->current.angle, NULL, 0xFF, NULL, NULL)); } /* 8001CB48-8001CBA0 017488 0058+00 0/0 6/6 7/7 .text fopAcM_setCarryNow__FP10fopAc_ac_ci @@ -1683,7 +1671,7 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) { /* 8001CC5C-8001CDFC 01759C 01A0+00 0/0 0/0 9/9 .text fopAcM_otoCheck__FPC10fopAc_ac_cf */ -s32 fopAcM_otoCheck(fopAc_ac_c const* i_actor, f32 param_1) { +BOOL fopAcM_otoCheck(fopAc_ac_c const* i_actor, f32 param_1) { SND_INFLUENCE* sound = dKy_Sound_get(); if (sound->field_0x14 != -1 && fopAcM_GetID(i_actor) != sound->field_0x14) { @@ -1694,12 +1682,12 @@ s32 fopAcM_otoCheck(fopAc_ac_c const* i_actor, f32 param_1) { } } - return 0; + return FALSE; } /* 8001CDFC-8001CED0 01773C 00D4+00 0/0 0/0 49/49 .text * fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c */ -s32 fopAcM_otherBgCheck(fopAc_ac_c const* param_0, fopAc_ac_c const* param_1) { +BOOL fopAcM_otherBgCheck(fopAc_ac_c const* param_0, fopAc_ac_c const* param_1) { dBgS_LinChk linChk; cXyz start; cXyz end; @@ -1720,7 +1708,7 @@ s32 fopAcM_otherBgCheck(fopAc_ac_c const* param_0, fopAc_ac_c const* param_1) { } /* 8001CED0-8001CFD8 017810 0108+00 0/0 0/0 18/18 .text fopAcM_wayBgCheck__FPC10fopAc_ac_cff */ -s32 fopAcM_wayBgCheck(fopAc_ac_c const* param_0, f32 param_1, f32 param_2) { +BOOL fopAcM_wayBgCheck(fopAc_ac_c const* param_0, f32 param_1, f32 param_2) { dBgS_LinChk linChk; cXyz offset; cXyz start; @@ -1740,20 +1728,20 @@ s32 fopAcM_wayBgCheck(fopAc_ac_c const* param_0, f32 param_1, f32 param_2) { linChk.Set(&start, &end, param_0); if (dComIfG_Bgsp().LineCross(&linChk)) { - return 1; + return TRUE; } - return 0; + return FALSE; } /* 8001CFD8-8001D020 017918 0048+00 0/0 0/0 2/2 .text fopAcM_plAngleCheck__FPC10fopAc_ac_cs */ -s32 fopAcM_plAngleCheck(fopAc_ac_c const* i_actor, s16 i_angle) { +BOOL fopAcM_plAngleCheck(fopAc_ac_c const* i_actor, s16 i_angle) { s16 angle = i_actor->shape_angle.y - dComIfGp_getPlayer(0)->shape_angle.y; if (angle <= i_angle && angle >= (s16)-i_angle) { - return 0; + return FALSE; } - return 1; + return TRUE; } /* 80450CCC-80450CD0 0001CC 0001+03 1/1 0/0 0/0 .sbss l_hio */ @@ -1761,29 +1749,15 @@ static l_HIO l_hio; static fopAcM_lc_c l_actorLC; -/* 803F1C0C-803F1C18 01E92C 000C+00 0/0 0/0 0/0 .bss @5078 */ -#pragma push -#pragma force_active on -static u8 lit_5078[12]; -#pragma pop +// stripped function +void fopAcM_GetRealMin(const fopAc_ac_c*) { + static cXyz min; +} -/* 803F1C18-803F1C24 01E938 000C+00 0/0 0/0 0/0 .bss min$5077 */ -#pragma push -#pragma force_active on -static u8 min[12]; -#pragma pop - -/* 803F1C24-803F1C30 01E944 000C+00 0/0 0/0 0/0 .bss @5115 */ -#pragma push -#pragma force_active on -static u8 lit_5115[12]; -#pragma pop - -/* 803F1C30-803F1C3C 01E950 000C+00 0/0 0/0 0/0 .bss max$5114 */ -#pragma push -#pragma force_active on -static u8 max[12]; -#pragma pop +// stripped function +void fopAcM_GetRealMax(const fopAc_ac_c*) { + static cXyz max; +} /* 803F1C48-803F1CB8 01E968 0070+00 1/2 4/4 9/9 .bss mLineCheck__11fopAcM_lc_c */ dBgS_ObjLinChk fopAcM_lc_c::mLineCheck; @@ -1891,7 +1865,7 @@ static void get_vectle_calc(const cXyz* pXyzA, const cXyz* pXyzB, cXyz* pOut) { void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelData) { const cXyz* pEyePos = &i_actor->eyePos; camera_class* camera = dCam_getCamera(); - cXyz v1 = *pEyePos - camera->mLookat.mEye; + cXyz v1 = *pEyePos - camera->lookat.eye; cXyz v2; get_vectle_calc(&i_actor->tevStr.field_0x32c, pEyePos, &v2); Vec half; @@ -1903,7 +1877,7 @@ void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelDat {0.5f, 0.0f, 0.0f, 0.5f}, {0.0f, -0.5f, 0.0f, 0.5f}, {0.0f, 0.0f, 1.0f, 0.0f}, - }; + }; mDoMtx_stack_c::concat(mtx_adj); mDoMtx_stack_c::concat(mtx); MtxP currentMtx = mDoMtx_stack_c::get(); @@ -1930,7 +1904,7 @@ void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelDat /* 8001D5A4-8001D5EC 017EE4 0048+00 1/1 0/0 0/0 .text fopAcM_getProcNameString__FPC10fopAc_ac_c */ static const char* fopAcM_getProcNameString(const fopAc_ac_c* i_actor) { - const char* name = dStage_getName2(i_actor->mBase.mBsTypeId, i_actor->subtype); + const char* name = dStage_getName2(i_actor->base.profname, i_actor->subtype); return name != NULL ? name : "UNKOWN"; } @@ -1942,8 +1916,8 @@ static const fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c const* i_actor, void* i_ return NULL; } - if (prm->mProcName == fopAcM_GetProfName(i_actor) && prm->mSubType == i_actor->subtype) { - if (prm->mParam0 == 0 || prm->mParam1 == (prm->mParam0 & fopAcM_GetParam(i_actor))) { + if (prm->procname == fopAcM_GetProfName(i_actor) && prm->subtype == i_actor->subtype) { + if (prm->prm0 == 0 || prm->prm1 == (prm->prm0 & fopAcM_GetParam(i_actor))) { return i_actor; } } @@ -1954,16 +1928,16 @@ static const fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c const* i_actor, void* i_ /* 8001D698-8001D6F0 017FD8 0058+00 0/0 1/1 1/1 .text fopAcM_searchFromName__FPCcUlUl */ fopAc_ac_c* fopAcM_searchFromName(char const* name, u32 param0, u32 param1) { fopAcM_search_prm prm; - prm.mParam0 = param0; - prm.mParam1 = param1; + prm.prm0 = param0; + prm.prm1 = param1; dStage_objectNameInf* objInf = dStage_searchName(name); if (objInf == NULL) { return NULL; } - prm.mProcName = objInf->mProcName; - prm.mSubType = objInf->mSubtype; + prm.procname = objInf->mProcName; + prm.subtype = objInf->mSubtype; return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObjectCB, &prm); } @@ -1976,8 +1950,8 @@ fopAc_ac_c* fopAcM_findObject4EventCB(fopAc_ac_c* i_actor, void* i_data) { return NULL; } - if (prm->mProcName == fopAcM_GetProfName(i_actor) && prm->mSubType == i_actor->subtype) { - if (prm->mEventID < 0 || prm->mEventID == i_actor->eventInfo.getIdx()) { + if (prm->procname == fopAcM_GetProfName(i_actor) && prm->subtype == i_actor->subtype) { + if (prm->event_id < 0 || prm->event_id == i_actor->eventInfo.getIdx()) { return i_actor; } } @@ -1987,33 +1961,33 @@ fopAc_ac_c* fopAcM_findObject4EventCB(fopAc_ac_c* i_actor, void* i_data) { /* 8001D7A0-8001D890 0180E0 00F0+00 0/0 7/7 0/0 .text fopAcM_searchFromName4Event__FPCcs */ -fopAc_ac_c* fopAcM_searchFromName4Event(char const* name, s16 eventID) { +fopAc_ac_c* fopAcM_searchFromName4Event(char const* i_name, s16 i_eventID) { fopAcM_search4ev_prm prm; - prm.mEventID = eventID; - strcpy(prm.mName, name); + prm.event_id = i_eventID; + strcpy(prm.name, i_name); - char* chr = strchr(prm.mName, ':'); + char* chr = strchr(prm.name, ':'); if (chr != NULL) { chr[0] = 0; - prm.mEventID = 0; + prm.event_id = 0; chr++; for (; *chr != 0; chr++) { if (*chr < '0' || *chr > '9') { - prm.mEventID = 0xFFFF; + prm.event_id = 0xFFFF; break; } - prm.mEventID = prm.mEventID * 10 + (chr[0] - 0x30); + prm.event_id = prm.event_id * 10 + (chr[0] - 0x30); } } - dStage_objectNameInf* objInf = dStage_searchName(prm.mName); + dStage_objectNameInf* objInf = dStage_searchName(prm.name); if (objInf == NULL) { return 0; } - prm.mProcName = objInf->mProcName; - prm.mSubType = objInf->mSubtype; + prm.procname = objInf->mProcName; + prm.subtype = objInf->mSubtype; return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObject4EventCB, &prm); } @@ -2030,25 +2004,25 @@ f32 fopAcM_rc_c::mRoofY; f32 fopAcM_wt_c::mWaterY; /* 8001D890-8001D900 0181D0 0070+00 0/0 2/2 19/19 .text fopAcM_getWaterY__FPC4cXyzPf */ -s32 fopAcM_getWaterY(cXyz const* param_0, f32* param_1) { +s32 fopAcM_getWaterY(cXyz const* param_0, f32* o_waterY) { if (fopAcM_wt_c::waterCheck(param_0) && fopAcM_wt_c::getPolyAtt0() != 6) { - *param_1 = fopAcM_wt_c::getWaterY(); + *o_waterY = fopAcM_wt_c::getWaterY(); return 1; } else { - *param_1 = -1000000000.0f; + *o_waterY = -1000000000.0f; return 0; } } /* 8001D900-8001D9A8 018240 00A8+00 0/0 2/2 2/2 .text * fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz */ -void fpoAcM_relativePos(fopAc_ac_c const* actor, cXyz const* p_inPos, cXyz* p_outPos) { - s16 angle = -actor->shape_angle.y; - cXyz pos = *p_inPos - actor->current.pos; +void fpoAcM_relativePos(fopAc_ac_c const* i_actor, cXyz const* i_pos, cXyz* o_pos) { + s16 angle = -i_actor->shape_angle.y; + cXyz pos = *i_pos - i_actor->current.pos; - p_outPos->x = (pos.z * cM_ssin(angle)) + (pos.x * cM_scos(angle)); - p_outPos->y = pos.y; - p_outPos->z = (pos.z * cM_scos(angle)) - (pos.x * cM_ssin(angle)); + o_pos->x = (pos.z * cM_ssin(angle)) + (pos.x * cM_scos(angle)); + o_pos->y = pos.y; + o_pos->z = (pos.z * cM_scos(angle)) - (pos.x * cM_ssin(angle)); } /* 8001D9A8-8001DAE4 0182E8 013C+00 0/0 1/1 9/9 .text @@ -2101,14 +2075,14 @@ s16 fopAcM_getPolygonAngle(cBgS_PolyInfo const& poly, s16 param_1) { } /* 8001DBD8-8001DC68 018518 0090+00 1/1 5/5 18/18 .text fopAcM_getPolygonAngle__FPC8cM3dGPlas */ -// NONMATCHING multiplication order s16 fopAcM_getPolygonAngle(cM3dGPla const* p_plane, s16 param_1) { if (p_plane == NULL) { return 0; } f32 cos = cM_scos(p_plane->mNormal.atan2sX_Z() - param_1); - f32 xz = JMAFastSqrt(p_plane->mNormal.x * p_plane->mNormal.x + p_plane->mNormal.z * p_plane->mNormal.z); + f32 xz = JMAFastSqrt(p_plane->mNormal.x * p_plane->mNormal.x + + p_plane->mNormal.z * p_plane->mNormal.z); xz *= cos; return cM_atan2s(xz, p_plane->mNormal.y); } diff --git a/src/f_op/f_op_actor_tag.cpp b/src/f_op/f_op_actor_tag.cpp index f0bfff7734..5c7ebd895e 100644 --- a/src/f_op/f_op_actor_tag.cpp +++ b/src/f_op/f_op_actor_tag.cpp @@ -6,22 +6,21 @@ #include "f_op/f_op_actor_tag.h" #include "SSystem/SComponent/c_list.h" -/* ############################################################################################## */ /* 803A35E0-803A35F0 000700 000C+04 1/1 2/2 0/0 .data g_fopAcTg_Queue */ node_list_class g_fopAcTg_Queue = {NULL, NULL, 0}; /* 80019834-80019860 014174 002C+00 0/0 1/1 0/0 .text fopAcTg_ToActorQ__FP16create_tag_class */ -u32 fopAcTg_ToActorQ(create_tag_class* i_createTag) { +int fopAcTg_ToActorQ(create_tag_class* i_createTag) { return cTg_Addition(&g_fopAcTg_Queue, i_createTag); } /* 80019860-80019880 0141A0 0020+00 0/0 1/1 0/0 .text fopAcTg_ActorQTo__FP16create_tag_class */ -u32 fopAcTg_ActorQTo(create_tag_class* i_createTag) { +int fopAcTg_ActorQTo(create_tag_class* i_createTag) { return cTg_SingleCutFromTree(i_createTag); } /* 80019880-800198A4 0141C0 0024+00 0/0 1/1 0/0 .text fopAcTg_Init__FP16create_tag_classPv */ -u32 fopAcTg_Init(create_tag_class* i_createTag, void* i_data) { +int fopAcTg_Init(create_tag_class* i_createTag, void* i_data) { cTg_Create(i_createTag, i_data); return 1; -} \ No newline at end of file +} diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index b5b4ab3f6f..549d95f2b1 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -43,12 +43,12 @@ extern "C" s32 getGrabActorID__9daPy_py_cCFv() { /* 8001E140-8001E180 018A80 0040+00 1/0 0/0 0/0 .text fopCam_Draw__FP12camera_class */ static s32 fopCam_Draw(camera_class* i_this) { - s32 cam_proc = 1; - + s32 ret = 1; if (!dComIfGp_isPauseFlag()) { - cam_proc = fpcLf_DrawMethod(i_this->mpMtd, i_this); + ret = fpcLf_DrawMethod(i_this->submethod, i_this); } - return cam_proc; + + return ret; } /* 8001E180-8001E1C8 018AC0 0048+00 1/0 0/0 0/0 .text fopCam_Execute__FP12camera_class */ @@ -56,7 +56,7 @@ static int fopCam_Execute(camera_class* i_this) { int ret; if (!dComIfGp_isPauseFlag() && dScnPly_c::isPause()) { - ret = fpcMtd_Execute((process_method_class*)i_this->mpMtd, i_this); + ret = fpcMtd_Execute((process_method_class*)i_this->submethod, i_this); } return ret; @@ -65,54 +65,52 @@ static int fopCam_Execute(camera_class* i_this) { /* 8001E1C8-8001E21C 018B08 0054+00 1/0 0/0 0/0 .text fopCam_IsDelete__FP12camera_class */ int fopCam_IsDelete(camera_class* i_this) { - int delete_stat = fpcMtd_IsDelete((process_method_class*)i_this->mpMtd, i_this); - if (delete_stat == 1) { - fopDwTg_DrawQTo(&i_this->mCreateTag); - } - - return delete_stat; -} - -/* 8001E21C-8001E270 018B5C 0054+00 1/0 0/0 0/0 .text fopCam_Delete__FP12camera_class */ -int fopCam_Delete(camera_class* i_this) { - int delete_stat = fpcMtd_Delete((process_method_class*)i_this->mpMtd, i_this); - if (delete_stat == 1) { - fopDwTg_DrawQTo(&i_this->mCreateTag); - } - - return delete_stat; -} - -/* 8001E270-8001E308 018BB0 0098+00 1/0 0/0 0/0 .text fopCam_Create__FPv */ -static int fopCam_Create(void* i_this) { - camera_class* _this = (camera_class*)i_this; - - if (fpcM_IsFirstCreating(i_this)) { - camera_process_profile_definition* profile = - (camera_process_profile_definition*)fpcM_GetProfile(i_this); - _this->mpMtd = profile->sub_method; - - fopDwTg_Init(&_this->mCreateTag, _this); - u32* append = (u32*)fpcM_GetAppend(_this); - - if (append) { - fpcM_SetParam(_this, *append); - } - } - - int ret = fpcMtd_Create(&_this->mpMtd->mBase, _this); - if (ret == cPhs_COMPLEATE_e) { - s32 priority = fpcLf_GetPriority(_this); - fopDwTg_ToDrawQ(&_this->mCreateTag, priority); + int ret = fpcMtd_IsDelete((process_method_class*)i_this->submethod, i_this); + if (ret == 1) { + fopDwTg_DrawQTo(&i_this->create_tag); + } + + return ret; +} + +/* 8001E21C-8001E270 018B5C 0054+00 1/0 0/0 0/0 .text fopCam_Delete__FP12camera_class */ +int fopCam_Delete(camera_class* i_this) { + int ret = fpcMtd_Delete((process_method_class*)i_this->submethod, i_this); + if (ret == 1) { + fopDwTg_DrawQTo(&i_this->create_tag); + } + + return ret; +} + +/* 8001E270-8001E308 018BB0 0098+00 1/0 0/0 0/0 .text fopCam_Create__FPv */ +static int fopCam_Create(void* i_this) { + camera_class* a_this = (camera_class*)i_this; + + if (fpcM_IsFirstCreating(i_this)) { + camera_process_profile_definition* profile = (camera_process_profile_definition*)fpcM_GetProfile(i_this); + a_this->submethod = profile->sub_method; + + fopDwTg_Init(&a_this->create_tag, a_this); + u32* append = (u32*)fpcM_GetAppend(a_this); + + if (append != NULL) { + fpcM_SetParam(a_this, *append); + } + } + + int ret = fpcMtd_Create(&a_this->submethod->base, a_this); + if (ret == cPhs_COMPLEATE_e) { + s32 priority = fpcLf_GetPriority(a_this); + fopDwTg_ToDrawQ(&a_this->create_tag, priority); } return ret; } -/* ############################################################################################## */ /* 803A3860-803A3878 -00001 0014+04 0/0 2/0 0/0 .data g_fopCam_Method */ leafdraw_method_class g_fopCam_Method = { (process_method_func)fopCam_Create, (process_method_func)fopCam_Delete, (process_method_func)fopCam_Execute, (process_method_func)fopCam_IsDelete, (process_method_func)fopCam_Draw, -}; \ No newline at end of file +}; diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp index bee58b85df..3e7ccd1168 100644 --- a/src/f_op/f_op_camera_mng.cpp +++ b/src/f_op/f_op_camera_mng.cpp @@ -7,18 +7,17 @@ #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_stdcreate_req.h" -/* ############################################################################################## */ /* 803F1DD8-803F1DE8 01EAF8 0010+00 1/1 0/0 0/0 .bss l_fopCamM_id */ -static u32 l_fopCamM_id[4]; +static fpc_ProcID l_fopCamM_id[4]; /* 8001E308-8001E310 018C48 0008+00 0/0 12/12 2/2 .text fopCamM_GetParam__FP12camera_class */ u32 fopCamM_GetParam(camera_class* i_this) { - return i_this->mBase.mParameters; + return i_this->base.parameters; } /* 8001E310-8001E374 018C50 0064+00 0/0 1/1 0/0 .text fopCamM_Create__FisPv */ -u32 fopCamM_Create(int i_cameraIdx, s16 i_procName, void* param_3) { - l_fopCamM_id[i_cameraIdx] = fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, 0, 0, param_3); +fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* i_append) { + l_fopCamM_id[i_cameraIdx] = fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, NULL, NULL, i_append); return l_fopCamM_id[i_cameraIdx]; } @@ -26,4 +25,4 @@ u32 fopCamM_Create(int i_cameraIdx, s16 i_procName, void* param_3) { void fopCamM_Management() {} /* 8001E378-8001E37C 018CB8 0004+00 0/0 1/1 0/0 .text fopCamM_Init__Fv */ -void fopCamM_Init() {} \ No newline at end of file +void fopCamM_Init() {} diff --git a/src/f_op/f_op_draw_iter.cpp b/src/f_op/f_op_draw_iter.cpp index 09c77998fe..6b113257fa 100644 --- a/src/f_op/f_op_draw_iter.cpp +++ b/src/f_op/f_op_draw_iter.cpp @@ -8,18 +8,17 @@ #include "SSystem/SComponent/c_tag.h" #include "f_op/f_op_draw_tag.h" -/* ############################################################################################## */ /* 80450CF8-80450D00 0001F8 0004+04 2/2 0/0 0/0 .sbss l_fopDwTg_id */ -static s32 l_fopDwTg_id; +static int l_fopDwTg_id; /* 80020400-80020444 01AD40 0044+00 2/2 0/0 0/0 .text fopDwIt_GetTag__Fv */ create_tag_class* fopDwIt_GetTag() { while (l_fopDwTg_id + 1 < g_fopDwTg_Queue.mNumLists) { l_fopDwTg_id++; - node_class* tmp = g_fopDwTg_Queue.mpLists[l_fopDwTg_id].mpHead; + node_class* node = g_fopDwTg_Queue.mpLists[l_fopDwTg_id].mpHead; - if (tmp != NULL) { - return (create_tag_class*)tmp; + if (node != NULL) { + return (create_tag_class*)node; } } @@ -28,21 +27,21 @@ create_tag_class* fopDwIt_GetTag() { /* 80020444-80020480 01AD84 003C+00 0/0 1/1 0/0 .text fopDwIt_Begin__Fv */ create_tag_class* fopDwIt_Begin() { - create_tag_class* createTagClass = (create_tag_class*)g_fopDwTg_Queue.mpLists->mpHead; + create_tag_class* tag = (create_tag_class*)g_fopDwTg_Queue.mpLists->mpHead; l_fopDwTg_id = 0; - if (createTagClass) { - return createTagClass; + if (tag != NULL) { + return tag; } - return createTagClass = fopDwIt_GetTag(); + return tag = fopDwIt_GetTag(); } /* 80020480-800204AC 01ADC0 002C+00 0/0 1/1 0/0 .text fopDwIt_Next__FP16create_tag_class */ create_tag_class* fopDwIt_Next(create_tag_class* i_createTag) { - create_tag_class* createTagClass = (create_tag_class*)i_createTag->mpNode.mpNextNode; - if (!createTagClass) { - createTagClass = fopDwIt_GetTag(); + create_tag_class* tag = (create_tag_class*)i_createTag->mpNode.mpNextNode; + if (tag == NULL) { + tag = fopDwIt_GetTag(); } - return createTagClass; -} \ No newline at end of file + return tag; +} diff --git a/src/f_op/f_op_draw_tag.cpp b/src/f_op/f_op_draw_tag.cpp index 0c59719422..d6d423aae3 100644 --- a/src/f_op/f_op_draw_tag.cpp +++ b/src/f_op/f_op_draw_tag.cpp @@ -8,7 +8,6 @@ #include "SSystem/SComponent/c_tag.h" #include "global.h" -/* ############################################################################################## */ /* 804505D0-804505D8 000050 0008+00 2/2 2/2 0/0 .sdata g_fopDwTg_Queue */ node_lists_tree_class g_fopDwTg_Queue = {NULL, 0}; @@ -28,11 +27,9 @@ bool fopDwTg_Init(create_tag_class* i_createTag, void* i_process) { return true; } -/* ############################################################################################## */ -/* 803F1E10-803F4CF0 01EB30 2EE0+00 1/1 0/0 0/0 .bss lists$2216 */ -static node_list_class lists[1000]; - /* 80020518-80020548 01AE58 0030+00 0/0 1/1 0/0 .text fopDwTg_CreateQueue__Fv */ void fopDwTg_CreateQueue() { + static node_list_class lists[1000]; + cTr_Create(&g_fopDwTg_Queue, lists, ARRAY_SIZE(lists)); -} \ No newline at end of file +} diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index 38adf11b22..70da2903a4 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -12,10 +12,10 @@ /* 8001F284-8001F2C0 019BC4 003C+00 1/0 0/0 0/0 .text fopKy_Draw__FPv */ static int fopKy_Draw(void* i_this) { int ret; - kankyo_class* _this = (kankyo_class*)i_this; + kankyo_class* a_this = (kankyo_class*)i_this; if (!dComIfGp_isPauseFlag()) { - ret = fpcLf_DrawMethod(_this->sub_method, i_this); + ret = fpcLf_DrawMethod(a_this->sub_method, i_this); } return ret; @@ -24,10 +24,10 @@ static int fopKy_Draw(void* i_this) { /* 8001F2C0-8001F314 019C00 0054+00 1/0 0/0 0/0 .text fopKy_Execute__FPv */ static int fopKy_Execute(void* i_this) { int ret; - kankyo_class* _this = (kankyo_class*)i_this; + kankyo_class* a_this = (kankyo_class*)i_this; if (dScnPly_c::isPause() && (!dComIfGp_isPauseFlag() || fpcM_GetName(i_this) == PROC_ENVSE)) { - ret = fpcMtd_Execute(&_this->sub_method->mBase, i_this); + ret = fpcMtd_Execute(&a_this->sub_method->base, i_this); } return ret; @@ -36,11 +36,11 @@ static int fopKy_Execute(void* i_this) { /* 8001F314-8001F368 019C54 0054+00 1/0 0/0 0/0 .text fopKy_IsDelete__FPv */ static int fopKy_IsDelete(void* i_this) { int ret; - kankyo_class* _this = (kankyo_class*)i_this; + kankyo_class* a_this = (kankyo_class*)i_this; - ret = fpcMtd_IsDelete(&_this->sub_method->mBase, _this); + ret = fpcMtd_IsDelete(&a_this->sub_method->base, a_this); if (ret == 1) { - fopDwTg_DrawQTo(&_this->draw_tag); + fopDwTg_DrawQTo(&a_this->draw_tag); } return ret; @@ -48,52 +48,49 @@ static int fopKy_IsDelete(void* i_this) { /* 8001F368-8001F3B4 019CA8 004C+00 1/0 0/0 0/0 .text fopKy_Delete__FPv */ static int fopKy_Delete(void* i_this) { - kankyo_class* _this = (kankyo_class*)i_this; + kankyo_class* a_this = (kankyo_class*)i_this; - int ret = fpcMtd_Delete(&_this->sub_method->mBase, _this); - fopDwTg_DrawQTo(&_this->draw_tag); + int ret = fpcMtd_Delete(&a_this->sub_method->base, a_this); + fopDwTg_DrawQTo(&a_this->draw_tag); return ret; } -/* ############################################################################################## */ /* 80450CE8-80450CF0 0001E8 0004+04 1/1 0/0 0/0 .sbss fopKy_KANKYO_TYPE */ static int fopKy_KANKYO_TYPE; /* 8001F3B4-8001F488 019CF4 00D4+00 1/0 0/0 0/0 .text fopKy_Create__FPv */ static int fopKy_Create(void* i_this) { - kankyo_class* _this = (kankyo_class*)i_this; + kankyo_class* a_this = (kankyo_class*)i_this; if (fpcM_IsFirstCreating(i_this)) { - kankyo_process_profile_definition* profile = - (kankyo_process_profile_definition*)fpcM_GetProfile(i_this); + kankyo_process_profile_definition* profile = (kankyo_process_profile_definition*)fpcM_GetProfile(i_this); - _this->mBsType = fpcBs_MakeOfType(&fopKy_KANKYO_TYPE); - _this->sub_method = profile->sub_method; + a_this->type = fpcBs_MakeOfType(&fopKy_KANKYO_TYPE); + a_this->sub_method = profile->sub_method; - fopDwTg_Init(&_this->draw_tag, _this); - fopKyM_prm_class* append = (fopKyM_prm_class*)fopKyM_GetAppend(_this); + fopDwTg_Init(&a_this->draw_tag, a_this); + fopKyM_prm_class* append = fopKyM_GetAppend(a_this); if (append != NULL) { - _this->mPos = append->mPos; - _this->mScale = append->mScale; - _this->mParam = append->mParam; + a_this->pos = append->pos; + a_this->scale = append->scale; + a_this->parameters = append->parameters; } } - int ret = fpcMtd_Create(&_this->sub_method->mBase, _this); + int ret = fpcMtd_Create(&a_this->sub_method->base, a_this); if (ret == cPhs_COMPLEATE_e) { - s32 priority = fpcLf_GetPriority(_this); - fopDwTg_ToDrawQ(&_this->draw_tag, priority); + s32 priority = fpcLf_GetPriority(a_this); + fopDwTg_ToDrawQ(&a_this->draw_tag, priority); } return ret; } -/* ############################################################################################## */ /* 803A3940-803A3958 -00001 0014+04 0/0 7/0 0/0 .data g_fopKy_Method */ leafdraw_method_class g_fopKy_Method = { (process_method_func)fopKy_Create, (process_method_func)fopKy_Delete, (process_method_func)fopKy_Execute, (process_method_func)fopKy_IsDelete, (process_method_func)fopKy_Draw, -}; \ No newline at end of file +}; diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index 70a9b3df07..89f328965d 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -8,35 +8,34 @@ #include "d/d_com_inf_game.h" /* 8001F660-8001F6B8 019FA0 0058+00 2/2 0/0 0/0 .text fopKyM_CreateAppend__Fv */ -static fopKyM_prm_class* fopKyM_CreateAppend() { - fopKyM_prm_class* params = - static_cast(cMl::memalignB(-4, sizeof(fopKyM_prm_class))); +fopKyM_prm_class* fopKyM_CreateAppend() { + fopKyM_prm_class* append = (fopKyM_prm_class*)cMl::memalignB(-4, sizeof(fopKyM_prm_class)); - if (params != NULL) { - cLib_memSet(params, 0, sizeof(fopKyM_prm_class)); - params->mScale.set(1.0f, 1.0f, 1.0f); + if (append != NULL) { + cLib_memSet(append, 0, sizeof(fopKyM_prm_class)); + append->scale.set(1.0f, 1.0f, 1.0f); } - return params; + return append; } /* 8001F6B8-8001F748 019FF8 0090+00 2/2 0/0 0/0 .text createAppend__FiP4cXyzP4cXyz */ static fopKyM_prm_class* createAppend(int i_param, cXyz* i_pos, cXyz* i_scale) { - fopKyM_prm_class* params = fopKyM_CreateAppend(); - - if (params == NULL) { + fopKyM_prm_class* append = fopKyM_CreateAppend(); + if (append == NULL) { return NULL; } if (i_pos != NULL) { - params->mPos = *i_pos; + append->pos = *i_pos; } if (i_scale != NULL) { - params->mScale = *i_scale; + append->scale = *i_scale; } - params->mParam = i_param; - return params; + append->parameters = i_param; + + return append; } /* 8001F748-8001F768 01A088 0020+00 0/0 3/3 1/1 .text fopKyM_Delete__FPv */ @@ -45,54 +44,51 @@ void fopKyM_Delete(void* i_process) { } /* 8001F768-8001F7B8 01A0A8 0050+00 2/2 0/0 0/0 .text fopKyM_Create__FsPFPv_iPv */ -static int fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_process) { - return fpcM_Create(i_procName, i_createFunc, i_process); +fpc_ProcID fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_append) { + return fpcM_Create(i_procName, i_createFunc, i_append); } /* 8001F7B8-8001F818 01A0F8 0060+00 0/0 3/3 1/1 .text fopKyM_create__FsiP4cXyzP4cXyzPFPv_i */ -int fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, - fopKyM_CreateFunc i_createFunc) { - fopKyM_prm_class* params = createAppend(i_param, i_pos, i_scale); - - if (params == NULL) { - return -1; +fpc_ProcID fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, + fopKyM_CreateFunc i_createFunc) { + fopKyM_prm_class* append = createAppend(i_param, i_pos, i_scale); + if (append == NULL) { + return fpcM_ERROR_PROCESS_ID_e; } - return fopKyM_Create(i_procName, i_createFunc, params); + return fopKyM_Create(i_procName, i_createFunc, append); } /* 8001F818-8001F87C 01A158 0064+00 0/0 1/1 0/0 .text fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i */ base_process_class* fopKyM_fastCreate(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, fopKyM_CreateFunc i_createFunc) { - fopKyM_prm_class* params = createAppend(i_param, i_pos, i_scale); - - if (params == NULL) { + fopKyM_prm_class* append = createAppend(i_param, i_pos, i_scale); + if (append == NULL) { return NULL; } - return fpcM_FastCreate(i_procName, i_createFunc, NULL, params); + return fpcM_FastCreate(i_procName, i_createFunc, NULL, append); } /* 8001F87C-8001F90C 01A1BC 0090+00 0/0 6/6 37/37 .text fopKyM_createWpillar__FPC4cXyzfi */ -int fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param) { - fopKyM_prm_class* params = fopKyM_CreateAppend(); - - if (params == NULL) { - return -1; +fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param) { + fopKyM_prm_class* append = fopKyM_CreateAppend(); + if (append == NULL) { + return fpcM_ERROR_PROCESS_ID_e; } - params->mPos = *i_pos; - params->mScale.x = scale; - params->mScale.y = scale; - params->mScale.z = scale; - params->mParam = i_param; + append->pos = *i_pos; + append->scale.x = scale; + append->scale.y = scale; + append->scale.z = scale; + append->parameters = i_param; - return fopKyM_Create(PROC_WPILLAR, NULL, params); + return fopKyM_Create(PROC_WPILLAR, NULL, append); } /* 8001F90C-8001F9B4 01A24C 00A8+00 0/0 0/0 3/3 .text fopKyM_createMpillar__FPC4cXyzf */ -int fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) { +fpc_ProcID fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) { static u16 m_name[2] = { 0x8757, 0x8758, @@ -107,5 +103,5 @@ int fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) { dComIfGp_particle_set(m_name[i], i_pos, NULL, &scale); } - return -1; -} \ No newline at end of file + return fpcM_ERROR_PROCESS_ID_e; +} diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp index cb7742576d..d82bb6cce9 100644 --- a/src/f_op/f_op_msg.cpp +++ b/src/f_op/f_op_msg.cpp @@ -11,81 +11,80 @@ /* 8001F488-8001F4B0 019DC8 0028+00 1/0 0/0 0/0 .text fopMsg_Draw__FPv */ static int fopMsg_Draw(void* i_this) { - msg_class* _this = static_cast(i_this); - return fpcLf_DrawMethod(_this->sub_method, i_this); + msg_class* a_this = (msg_class*)i_this; + return fpcLf_DrawMethod(a_this->sub_method, i_this); } /* 8001F4B0-8001F4E8 019DF0 0038+00 1/0 0/0 0/0 .text fopMsg_Execute__FPv */ static int fopMsg_Execute(void* i_this) { - msg_class* _this = static_cast(i_this); + msg_class* a_this = (msg_class*)i_this; - int stat = 1; + int ret = 1; if (dScnPly_c::isPause()) { - stat = fpcMtd_Execute(&_this->sub_method->mBase, i_this); + ret = fpcMtd_Execute(&a_this->sub_method->base, i_this); } - return stat; + return ret; } /* 8001F4E8-8001F53C 019E28 0054+00 1/0 0/0 0/0 .text fopMsg_IsDelete__FPv */ static int fopMsg_IsDelete(void* i_this) { - msg_class* _this = static_cast(i_this); + msg_class* a_this = (msg_class*)i_this; - int stat = fpcMtd_IsDelete(&_this->sub_method->mBase, i_this); - if (stat == 1) { - fopDwTg_DrawQTo(&_this->draw_tag); + int ret = fpcMtd_IsDelete(&a_this->sub_method->base, i_this); + if (ret == 1) { + fopDwTg_DrawQTo(&a_this->draw_tag); } - return stat; + return ret; } /* 8001F53C-8001F588 019E7C 004C+00 1/0 0/0 0/0 .text fopMsg_Delete__FPv */ static int fopMsg_Delete(void* i_this) { - msg_class* _this = static_cast(i_this); + msg_class* a_this = (msg_class*)i_this; - int stat = fpcMtd_Delete(&_this->sub_method->mBase, i_this); - fopDwTg_DrawQTo(&_this->draw_tag); + int ret = fpcMtd_Delete(&a_this->sub_method->base, i_this); + fopDwTg_DrawQTo(&a_this->draw_tag); - return stat; + return ret; } -/* ############################################################################################## */ /* 80450CF0-80450CF8 0001F0 0004+04 1/1 0/0 0/0 .sbss fopMsg_MSG_TYPE */ static int fopMsg_MSG_TYPE; /* 8001F588-8001F660 019EC8 00D8+00 1/0 0/0 0/0 .text fopMsg_Create__FPv */ int fopMsg_Create(void* i_this) { - msg_class* _this = (msg_class*)i_this; + msg_class* a_this = (msg_class*)i_this; - if (fpcM_IsFirstCreating(_this)) { - msg_process_profile_definition* profile = - (msg_process_profile_definition*)fpcM_GetProfile(i_this); - _this->mMsgType = fpcBs_MakeOfType(&fopMsg_MSG_TYPE); - _this->sub_method = profile->sub_method; - fopDwTg_Init(&_this->draw_tag, _this); - fopMsg_prm_class* prm = fopMsgM_GetAppend(_this); - if (prm != NULL) { - _this->mpActor = prm->mpActor; - _this->mPos = prm->mPos; - _this->mMsgID = prm->mMsgID; - _this->field_0xf0 = prm->field_0x14; - _this->field_0xf4 = prm->field_0x18; + if (fpcM_IsFirstCreating(a_this)) { + msg_process_profile_definition* profile = (msg_process_profile_definition*)fpcM_GetProfile(i_this); + a_this->type = fpcBs_MakeOfType(&fopMsg_MSG_TYPE); + a_this->sub_method = profile->sub_method; + + fopDwTg_Init(&a_this->draw_tag, a_this); + + fopMsg_prm_class* append = fopMsgM_GetAppend(a_this); + if (append != NULL) { + a_this->talk_actor = append->talk_actor; + a_this->pos = append->pos; + a_this->msg_idx = append->msg_idx; + a_this->field_0xf0 = append->field_0x14; + a_this->field_0xf4 = append->field_0x18; } } - int status = fpcMtd_Create(&_this->sub_method->mBase, _this); - if (status == cPhs_COMPLEATE_e) { - s32 priority = fpcLf_GetPriority(_this); - fopDwTg_ToDrawQ(&_this->draw_tag, priority); + int ret = fpcMtd_Create(&a_this->sub_method->base, a_this); + if (ret == cPhs_COMPLEATE_e) { + s32 priority = fpcLf_GetPriority(a_this); + fopDwTg_ToDrawQ(&a_this->draw_tag, priority); } - return status; + return ret; } -/* ############################################################################################## */ /* 803A3958-803A3970 -00001 0014+04 0/0 5/0 0/0 .data g_fopMsg_Method */ leafdraw_method_class g_fopMsg_Method = { (process_method_func)fopMsg_Create, (process_method_func)fopMsg_Delete, (process_method_func)fopMsg_Execute, (process_method_func)fopMsg_IsDelete, (process_method_func)fopMsg_Draw, -}; \ No newline at end of file +}; diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 6777e6b91f..e54585b6bb 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -11,14 +11,13 @@ #include "d/d_meter2_info.h" #include "d/d_msg_object.h" #include "f_op/f_op_scene_mng.h" -#include "global.h" /* 8001F9B4-8001FA24 01A2F4 0070+00 0/0 3/3 0/0 .text fopMsgM_setStageLayer__FPv */ -s32 fopMsgM_setStageLayer(void* param_0) { +s32 fopMsgM_setStageLayer(void* i_process) { scene_class* scn = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); int id = fopScnM_LayerID(scn); - return fpcM_ChangeLayerID(param_0, id); + return fpcM_ChangeLayerID(i_process, id); } /* 8001FA24-8001FA44 01A364 0020+00 3/3 14/14 4/4 .text fopMsgM_SearchByID__FUi */ @@ -28,8 +27,8 @@ msg_class* fopMsgM_SearchByID(fpc_ProcID i_id) { /* 8001FA44-8001FA4C 01A384 0008+00 0/0 2/2 0/0 .text fopMsgM_GetAppend__FPv */ fopMsg_prm_class* fopMsgM_GetAppend(void* i_msg) { - msg_class* msg = static_cast(i_msg); - return (fopMsg_prm_class*)msg->mBase.mpUserData; + msg_class* msg = (msg_class*)i_msg; + return (fopMsg_prm_class*)msg->base.append; } /* 8001FA4C-8001FA6C 01A38C 0020+00 0/0 2/2 0/0 .text fopMsgM_Delete__FPv */ @@ -39,35 +38,33 @@ void fopMsgM_Delete(void* i_this) { /* 8001FA6C-8001FB50 01A3AC 00E4+00 1/1 0/0 0/0 .text createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi */ -static fopMsg_prm_class* createAppend(fopAc_ac_c* i_actor, cXyz* i_pos, u32* i_msgID, u32* param_3, +static fopMsg_prm_class* createAppend(fopAc_ac_c* i_talkActor, cXyz* i_pos, u32* i_msgIdx, u32* param_3, fpc_ProcID param_4) { - fopMsg_prm_class* params = - static_cast(cMl::memalignB(-4, sizeof(fopMsg_prm_class))); - - if (params == NULL) { + fopMsg_prm_class* append = (fopMsg_prm_class*)cMl::memalignB(-4, sizeof(fopMsg_prm_class)); + if (append == NULL) { return NULL; } - params->mpActor = i_actor; - dMsgObject_setTalkActor(i_actor); + append->talk_actor = i_talkActor; + dMsgObject_setTalkActor(i_talkActor); - if (i_msgID != NULL) { - params->mMsgID = *i_msgID; + if (i_msgIdx != NULL) { + append->msg_idx = *i_msgIdx; } if (param_3 != NULL) { - params->field_0x14 = *param_3; + append->field_0x14 = *param_3; } if (i_pos != NULL) { - params->mPos = *i_pos; + append->pos = *i_pos; } else { - params->mPos = cXyz(0.0f, 0.0f, 0.0f); + append->pos = cXyz(0.0f, 0.0f, 0.0f); } - params->field_0x18 = param_4; + append->field_0x18 = param_4; - return params; + return append; } /* 8001FB50-8001FC4C 01A490 00FC+00 1/1 0/0 0/0 .text createTimerAppend__FiUlUcUcffffUi @@ -76,60 +73,56 @@ static fopMsg_prm_timer* createTimerAppend(int i_mode, u32 i_limitMs, u8 i_type, f32 param_4, f32 param_5, f32 param_6, f32 param_7, fpc_ProcID param_8) { fopMsg_prm_timer* appen = (fopMsg_prm_timer*)cMl::memalignB(-4, sizeof(fopMsg_prm_timer)); - if (appen == NULL) { - appen = NULL; - } else { - appen->mpActor = 0; - appen->mMsgID = 0; - appen->field_0x14 = 0; - appen->mPos = cXyz(0.0f, 0.0f, 0.0f); - appen->field_0x18 = param_8; - appen->timer_mode = i_mode; - appen->limit_ms = i_limitMs; - appen->type = i_type; - appen->field_0x25 = param_3; - appen->field_0x28 = param_4; - appen->field_0x2c = param_5; - appen->field_0x30 = param_6; - appen->field_0x34 = param_7; + return NULL; } + appen->talk_actor = NULL; + appen->msg_idx = 0; + appen->field_0x14 = 0; + appen->pos = cXyz(0.0f, 0.0f, 0.0f); + appen->field_0x18 = param_8; + appen->timer_mode = i_mode; + appen->limit_ms = i_limitMs; + appen->type = i_type; + appen->field_0x25 = param_3; + appen->field_0x28 = param_4; + appen->field_0x2c = param_5; + appen->field_0x30 = param_6; + appen->field_0x34 = param_7; return appen; } /* 8001FC4C-8001FCC0 01A58C 0074+00 0/0 1/1 0/0 .text * fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i */ -s32 fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* param_3, u32* param_4, +fpc_ProcID fopMsgM_create(s16 i_procName, fopAc_ac_c* i_talkActor, cXyz* i_pos, u32* i_msgIdx, u32* param_4, fopMsgCreateFunc createFunc) { - fopMsg_prm_class* params = createAppend(param_1, param_2, param_3, param_4, -1); - - if (params == NULL) { - return -1; + fopMsg_prm_class* append = createAppend(i_talkActor, i_pos, i_msgIdx, param_4, fpcM_ERROR_PROCESS_ID_e); + if (append == NULL) { + return fpcM_ERROR_PROCESS_ID_e; } - return fpcSCtRq_Request(fpcLy_CurrentLayer(), param_0, (stdCreateFunc)createFunc, NULL, params); + return fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, (stdCreateFunc)createFunc, NULL, append); } /* 8001FCC0-8001FD34 01A600 0074+00 0/0 2/2 0/0 .text fop_Timer_create__FsUcUlUcUcffffPFPv_i */ -s32 fop_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, u8 param_4, f32 param_5, +fpc_ProcID fop_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, u8 param_4, f32 param_5, f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc i_createFunc) { - fopMsg_prm_timer* timer_prm = createTimerAppend(i_mode, i_limitMs, i_type, param_4, param_5, - param_6, param_7, param_8, -1); - - if (timer_prm == NULL) { - return -1; + fopMsg_prm_timer* append = createTimerAppend(i_mode, i_limitMs, i_type, param_4, param_5, + param_6, param_7, param_8, fpcM_ERROR_PROCESS_ID_e); + if (append == NULL) { + return fpcM_ERROR_PROCESS_ID_e; } return fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, (stdCreateFunc)i_createFunc, NULL, - timer_prm); + append); } /* 804505C8-804505D0 000048 0004+04 4/4 0/0 0/0 .sdata i_msgID */ -static u32 i_msgID = 0xFFFFFFFF; +static fpc_ProcID i_msgID = fpcM_ERROR_PROCESS_ID_e; /* 8001FD34-8001FE84 01A674 0150+00 0/0 2/2 1/1 .text fopMsgM_messageSet__FUlP10fopAc_ac_cUl */ -int fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_actorP, u32 param_2) { +fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_talkActor, u32 param_2) { if (dComIfGp_isHeapLockFlag() == 8) { dMeter2Info_getMeterClass()->emphasisButtonDelete(); } @@ -138,40 +131,40 @@ int fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_actorP, u32 param_2) { dComIfGp_isHeapLockFlag() != 2 && dComIfGp_isHeapLockFlag() != 3 && dComIfGp_isHeapLockFlag() != 1) { - return -1; + return fpcM_ERROR_PROCESS_ID_e; - } else { - dComIfGp_clearMesgAnimeTagInfo(); - dComIfGp_clearMesgCameraTagInfo(); - - cXyz pos; - if (i_actorP) { - pos = i_actorP->eyePos; - } else { - pos.set(0.0f, 0.0f, 0.0f); - } - - if (g_MsgObject_HIO_c.mMsgDebug == true) { - i_msgIdx = g_MsgObject_HIO_c.mMsgIndex; - } - - dMsgObject_c* msg = (dMsgObject_c*)fopMsgM_SearchByID(i_msgID); - - if (msg && msg->mMode == 1) { - msg->mPos.set(pos); - msg->mMsgID = i_msgIdx; - msg->field_0xf0 = param_2; - msg->mpActor = i_actorP; - msg->setMessageIndex(i_msgIdx, param_2, false); - return i_msgID; - } else { - return 0; - } } + + dComIfGp_clearMesgAnimeTagInfo(); + dComIfGp_clearMesgCameraTagInfo(); + + cXyz pos; + if (i_talkActor != NULL) { + pos = i_talkActor->eyePos; + } else { + pos.set(0.0f, 0.0f, 0.0f); + } + + if (g_MsgObject_HIO_c.mMsgDebug == true) { + i_msgIdx = g_MsgObject_HIO_c.mMsgIndex; + } + + dMsgObject_c* msg = (dMsgObject_c*)fopMsgM_SearchByID(i_msgID); + + if (msg != NULL && msg->mode == 1) { + msg->pos.set(pos); + msg->msg_idx = i_msgIdx; + msg->field_0xf0 = param_2; + msg->talk_actor = i_talkActor; + msg->setMessageIndex(i_msgIdx, param_2, false); + return i_msgID; + } + + return 0; } /* 8001FE84-8001FFC4 01A7C4 0140+00 0/0 6/6 4/4 .text fopMsgM_messageSet__FUlUl */ -int fopMsgM_messageSet(u32 msgIdx, u32 param_1) { +fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, u32 param_1) { if (dComIfGp_isHeapLockFlag() == 8) { dMeter2Info_getMeterClass()->emphasisButtonDelete(); } @@ -180,40 +173,38 @@ int fopMsgM_messageSet(u32 msgIdx, u32 param_1) { dComIfGp_isHeapLockFlag() != 2 && dComIfGp_isHeapLockFlag() != 3 && dComIfGp_isHeapLockFlag() != 1) { - return -1; + return fpcM_ERROR_PROCESS_ID_e; - } else { - cXyz pos; - pos.x = pos.y = pos.z = 0.0f; - - dMsgObject_c* msg = (dMsgObject_c*)fopMsgM_SearchByID(i_msgID); - - if (msg) { - if (msg->mMode == 1) { - msg->mPos.set(pos); - msg->mMsgID = msgIdx; - msg->field_0xf0 = param_1; - msg->mpActor = NULL; - msg->setTalkPartner(NULL); - msg->setMessageIndex(msgIdx, param_1, false); - return i_msgID; - } - - if (msg->mMode == 15) { - msg->mPos.set(pos); - msg->mMsgID = msgIdx; - msg->field_0xf0 = param_1; - msg->mpActor = NULL; - return i_msgID; - } - } - - return 0; } + + cXyz pos; + pos.x = pos.y = pos.z = 0.0f; + + dMsgObject_c* msg = (dMsgObject_c*)fopMsgM_SearchByID(i_msgID); + + if (msg != NULL) { + if (msg->mode == 1) { + msg->pos.set(pos); + msg->msg_idx = i_msgIdx; + msg->field_0xf0 = param_1; + msg->talk_actor = NULL; + msg->setTalkPartner(NULL); + msg->setMessageIndex(i_msgIdx, param_1, false); + return i_msgID; + } else if (msg->mode == 15) { + msg->pos.set(pos); + msg->msg_idx = i_msgIdx; + msg->field_0xf0 = param_1; + msg->talk_actor = NULL; + return i_msgID; + } + } + + return 0; } /* 8001FFC4-800200C0 01A904 00FC+00 0/0 1/1 13/13 .text fopMsgM_messageSetDemo__FUl */ -int fopMsgM_messageSetDemo(u32 param_0) { +fpc_ProcID fopMsgM_messageSetDemo(u32 i_msgidx) { dMsgObject_endFlowGroup(); if (dComIfGp_isHeapLockFlag() == 8) { dMeter2Info_getMeterClass()->emphasisButtonDelete(); @@ -223,25 +214,25 @@ int fopMsgM_messageSetDemo(u32 param_0) { dComIfGp_isHeapLockFlag() != 2 && dComIfGp_isHeapLockFlag() != 3 && dComIfGp_isHeapLockFlag() != 1) { - return -1; + return fpcM_ERROR_PROCESS_ID_e; - } else { - cXyz pos; - pos.x = pos.y = pos.z = 0.0f; - - dMsgObject_c* msg = (dMsgObject_c*)fopMsgM_SearchByID(i_msgID); - - if (msg && msg->mMode == 1) { - msg->mPos.set(pos); - msg->mMsgID = param_0; - msg->field_0xf0 = 1000; - msg->mpActor = NULL; - msg->setMessageIndexDemo(param_0, false); - return i_msgID; - } else { - return 0; - } } + + cXyz pos; + pos.x = pos.y = pos.z = 0.0f; + + dMsgObject_c* msg = (dMsgObject_c*)fopMsgM_SearchByID(i_msgID); + + if (msg != NULL && msg->mode == 1) { + msg->pos.set(pos); + msg->msg_idx = i_msgidx; + msg->field_0xf0 = 1000; + msg->talk_actor = NULL; + msg->setMessageIndexDemo(i_msgidx, false); + return i_msgID; + } + + return 0; } /* 800200C0-80020100 01AA00 0040+00 0/0 7/7 1/1 .text fopMsgM_messageGet__FPcUl */ @@ -256,8 +247,8 @@ void fopMsgM_setMessageID(fpc_ProcID msg_id) { } /* 80020108-80020158 01AA48 0050+00 0/0 2/2 0/0 .text fopMsgM_Create__FsPFPv_iPv */ -u32 fopMsgM_Create(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_process) { - return fpcM_Create(i_procName, i_createFunc, i_process); +fpc_ProcID fopMsgM_Create(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_append) { + return fpcM_Create(i_procName, i_createFunc, i_append); } /* 80020158-80020160 -00001 0008+00 0/0 0/0 0/0 .text setAlpha__7J2DPaneFUc */ @@ -270,56 +261,48 @@ f32 dummy() { } /* 80020160-800202CC 01AAA0 016C+00 1/0 4/4 2/2 .text fopMsgM_valueIncrease__FiiUc */ -// NONMATCHING regalloc -f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 param_2) { +f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 i_type) { if (param_0 <= 0) { return 1.0f; - } else { - if (param_1 < 0) { - param_1 = 0; - } else if (param_1 > param_0) { - param_1 = param_0; - } - - f32 ret; - f32 tmp1 = (f32)param_1 / param_0; - - switch (param_2) { - case 0: { - ret = tmp1 * tmp1; - break; - } - case 1: { - ret = JMAFastSqrt(tmp1); - break; - } - case 2: - default: { - ret = tmp1; - break; - } - case 3: { - ret = tmp1 * ((2.0f * tmp1) - 1.0f) - 1.0f; - break; - } - case 4: { - f32 tmp = cM_ssin(0.5f * ((f32)0x8000 * tmp1)); - ret = tmp * tmp; - break; - } - case 5: { - f32 tmp = cM_ssin(0.5f * ((f32)0xFFFF * tmp1)); - ret = tmp * tmp; - break; - } - case 6: { - ret = cM_ssin((f32)0x8000 * tmp1); - break; - } - } - - return ret; } + + if (param_1 < 0) { + param_1 = 0; + } else if (param_1 > param_0) { + param_1 = param_0; + } + + f32 var_f31 = (f32)param_1 / param_0; + f32 var_f30; + + switch (i_type) { + case 0: + var_f30 = var_f31 * var_f31; + break; + case 1: + var_f30 = JMAFastSqrt(var_f31); + break; + case 2: + default: + var_f30 = var_f31; + break; + case 3: + var_f30 = (2.0f * ((2.0f * var_f31) - 1.0f)) - 1.0f; + break; + case 4: + var_f31 = cM_ssin(0.5f * ((f32)0x8000 * var_f31)); + var_f30 = var_f31 * var_f31; + break; + case 5: + var_f31 = cM_ssin(0.5f * ((f32)0xFFFF * var_f31)); + var_f30 = var_f31 * var_f31; + break; + case 6: + var_f30 = cM_ssin((f32)0x8000 * var_f31); + break; + } + + return var_f30; } // Here to generate J2DPicture virtual inlines diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp index 23b1564b43..7653d3e95b 100644 --- a/src/f_op/f_op_overlap.cpp +++ b/src/f_op/f_op_overlap.cpp @@ -3,54 +3,52 @@ * Overlap Process Framework */ -#include "SSystem/SComponent/c_request.h" #include "f_op/f_op_overlap.h" #include "f_pc/f_pc_manager.h" /* 8001E37C-8001E3A4 018CBC 0028+00 1/0 0/0 0/0 .text fopOvlp_Draw__FPv */ static s32 fopOvlp_Draw(void* i_this) { - overlap_task_class* _this = (overlap_task_class*)i_this; - return fpcLf_DrawMethod(_this->field_0xc0, i_this); + overlap_task_class* a_this = (overlap_task_class*)i_this; + return fpcLf_DrawMethod(a_this->submethod, i_this); } /* 8001E3A4-8001E3CC 018CE4 0028+00 1/0 0/0 0/0 .text fopOvlp_Execute__FPv */ static s32 fopOvlp_Execute(void* i_this) { - overlap_task_class* _this = (overlap_task_class*)i_this; - return fpcMtd_Execute(&_this->field_0xc0->mBase, i_this); + overlap_task_class* a_this = (overlap_task_class*)i_this; + return fpcMtd_Execute(&a_this->submethod->base, i_this); } /* 8001E3CC-8001E3F4 018D0C 0028+00 1/0 0/0 0/0 .text fopOvlp_IsDelete__FPv */ static s32 fopOvlp_IsDelete(void* i_this) { - overlap_task_class* _this = (overlap_task_class*)i_this; - return fpcMtd_IsDelete(&_this->field_0xc0->mBase, i_this); + overlap_task_class* a_this = (overlap_task_class*)i_this; + return fpcMtd_IsDelete(&a_this->submethod->base, i_this); } /* 8001E3F4-8001E41C 018D34 0028+00 1/0 0/0 0/0 .text fopOvlp_Delete__FPv */ static s32 fopOvlp_Delete(void* i_this) { - overlap_task_class* _this = (overlap_task_class*)i_this; - return fpcMtd_Delete(&_this->field_0xc0->mBase, i_this); + overlap_task_class* a_this = (overlap_task_class*)i_this; + return fpcMtd_Delete(&a_this->submethod->base, i_this); } /* 8001E41C-8001E484 018D5C 0068+00 1/0 0/0 0/0 .text fopOvlp_Create__FPv */ static s32 fopOvlp_Create(void* i_this) { - overlap_task_class* _this = (overlap_task_class*)i_this; + overlap_task_class* a_this = (overlap_task_class*)i_this; - if (fpcM_IsFirstCreating(_this)) { + if (fpcM_IsFirstCreating(a_this)) { overlap_process_profile_definition* profile = - (overlap_process_profile_definition*)fpcM_GetProfile(_this); + (overlap_process_profile_definition*)fpcM_GetProfile(a_this); - cReq_Create((request_base_class*)&_this->field_0xc4, 1); - _this->field_0xc0 = profile->sub_method; - _this->field_0xc8 = -1; + cReq_Create(&a_this->request, 1); + a_this->submethod = profile->sub_method; + a_this->scene_id = fpcM_ERROR_PROCESS_ID_e; } - return fpcMtd_Create(&_this->field_0xc0->mBase, _this); + return fpcMtd_Create(&a_this->submethod->base, a_this); } -/* ############################################################################################## */ /* 803A3878-803A3890 -00001 0014+04 0/0 10/0 0/0 .data g_fopOvlp_Method */ leafdraw_method_class g_fopOvlp_Method = { (process_method_func)fopOvlp_Create, (process_method_func)fopOvlp_Delete, (process_method_func)fopOvlp_Execute, (process_method_func)fopOvlp_IsDelete, (process_method_func)fopOvlp_Draw, -}; \ No newline at end of file +}; diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp index a725442c33..e174378246 100644 --- a/src/f_op/f_op_overlap_mng.cpp +++ b/src/f_op/f_op_overlap_mng.cpp @@ -9,59 +9,60 @@ #include "f_op/f_op_scene_pause.h" #include "f_pc/f_pc_executor.h" -/* ############################################################################################## */ /* 804505B0-804505B8 000030 0004+04 10/10 0/0 0/0 .sdata l_fopOvlpM_overlap */ // making it not an array put it in .bss -static request_base_class* l_fopOvlpM_overlap[1] = {NULL}; +static overlap_request_class* l_fopOvlpM_overlap[1] = {NULL}; /* 8001E484-8001E4C4 018DC4 0040+00 0/0 1/1 0/0 .text fopOvlpM_SceneIsStop__Fv */ int fopOvlpM_SceneIsStop() { - if (l_fopOvlpM_overlap[0]) { + if (l_fopOvlpM_overlap[0] != NULL) { return fopScnPause_Enable( - (scene_class*)fpcEx_SearchByID(l_fopOvlpM_overlap[0]->field_0x20[0x32])); - } else { - return 0; + (scene_class*)fpcEx_SearchByID(l_fopOvlpM_overlap[0]->overlap_task->scene_id)); } + + return 0; } /* 8001E4C4-8001E504 018E04 0040+00 0/0 5/5 0/0 .text fopOvlpM_SceneIsStart__Fv */ int fopOvlpM_SceneIsStart() { - if (l_fopOvlpM_overlap[0]) { + if (l_fopOvlpM_overlap[0] != NULL) { return fopScnPause_Disable( - (scene_class*)fpcEx_SearchByID(l_fopOvlpM_overlap[0]->field_0x20[0x32])); - } else { - return 0; + (scene_class*)fpcEx_SearchByID(l_fopOvlpM_overlap[0]->overlap_task->scene_id)); } + + return 0; } /* 8001E504-8001E51C 018E44 0018+00 0/0 3/3 0/0 .text fopOvlpM_IsOutReq__FP18overlap_task_class */ -int fopOvlpM_IsOutReq(overlap_task_class* pTaskClass) { - return (pTaskClass->field_0xc4 & 0x3F) == 2; +int fopOvlpM_IsOutReq(overlap_task_class* i_overlap_task) { + return i_overlap_task->request.flag2 == 2; } /* 8001E51C-8001E540 018E5C 0024+00 0/0 6/6 0/0 .text fopOvlpM_Done__FP18overlap_task_class */ -void fopOvlpM_Done(overlap_task_class* pTaskClass) { - cReq_Done((request_base_class*)&pTaskClass->field_0xc4); +void fopOvlpM_Done(overlap_task_class* i_overlap_task) { + cReq_Done(&i_overlap_task->request); } /* 8001E540-8001E558 018E80 0018+00 0/0 1/1 0/0 .text fopOvlpM_ToldAboutID__FUi */ -void fopOvlpM_ToldAboutID(fpc_ProcID param_1) { - l_fopOvlpM_overlap[0] ? l_fopOvlpM_overlap[0]->field_0x20[0x32] = param_1 : 0; +void fopOvlpM_ToldAboutID(fpc_ProcID i_sceneId) { + if (l_fopOvlpM_overlap[0] != NULL) { + l_fopOvlpM_overlap[0]->overlap_task->scene_id = i_sceneId; + } } /* 8001E558-8001E574 018E98 001C+00 0/0 6/6 7/7 .text fopOvlpM_IsPeek__Fv */ int fopOvlpM_IsPeek() { - return l_fopOvlpM_overlap[0] ? l_fopOvlpM_overlap[0]->field_0x8 : 0; + return l_fopOvlpM_overlap[0] != NULL ? l_fopOvlpM_overlap[0]->field_0x8 : FALSE; } /* 8001E574-8001E5A8 018EB4 0034+00 0/0 1/1 0/0 .text fopOvlpM_IsDone__Fv */ int fopOvlpM_IsDone() { - return l_fopOvlpM_overlap[0] ? cReq_Is_Done(l_fopOvlpM_overlap[0]) : 0; + return l_fopOvlpM_overlap[0] != NULL ? cReq_Is_Done(&l_fopOvlpM_overlap[0]->base) : FALSE; } /* 8001E5A8-8001E5D0 018EE8 0028+00 0/0 3/3 1/1 .text fopOvlpM_IsDoingReq__Fv */ int fopOvlpM_IsDoingReq() { - if (l_fopOvlpM_overlap[0] && l_fopOvlpM_overlap[0]->field_0x4 == 1) { + if (l_fopOvlpM_overlap[0] != NULL && l_fopOvlpM_overlap[0]->field_0x4 == 1) { return 1; } @@ -70,44 +71,42 @@ int fopOvlpM_IsDoingReq() { /* 8001E5D0-8001E604 018F10 0034+00 0/0 1/1 0/0 .text fopOvlpM_ClearOfReq__Fv */ int fopOvlpM_ClearOfReq() { - return l_fopOvlpM_overlap[0] ? - fopOvlpReq_OverlapClr((overlap_request_class*)l_fopOvlpM_overlap[0]) : - 0; + return l_fopOvlpM_overlap[0] != NULL ? fopOvlpReq_OverlapClr(l_fopOvlpM_overlap[0]) : 0; } -/* ############################################################################################## */ /* 803F1DE8-803F1E10 01EB08 0028+00 1/1 0/0 0/0 .bss l_fopOvlpM_Request */ static overlap_request_class l_fopOvlpM_Request; /* 8001E604-8001E650 018F44 004C+00 0/0 1/1 0/0 .text fopOvlpM_Request__FsUs */ -request_base_class* fopOvlpM_Request(s16 param_1, u16 param_2) { - if (!l_fopOvlpM_overlap[0]) { - request_base_class* tmp = fopOvlpReq_Request(&l_fopOvlpM_Request, param_1, param_2); - l_fopOvlpM_overlap[0] = tmp; - return tmp; +overlap_request_class* fopOvlpM_Request(s16 i_procname, u16 i_peektime) { + if (l_fopOvlpM_overlap[0] == NULL) { + l_fopOvlpM_overlap[0] = fopOvlpReq_Request(&l_fopOvlpM_Request, i_procname, i_peektime); + return l_fopOvlpM_overlap[0]; } - return 0; + return NULL; } /* 8001E650-8001E698 018F90 0048+00 0/0 1/1 0/0 .text fopOvlpM_Management__Fv */ void fopOvlpM_Management() { - if (l_fopOvlpM_overlap[0]) { - int tmp = fopOvlpReq_Handler((overlap_request_class*)l_fopOvlpM_overlap[0]); - if (6 <= tmp || 3 > tmp) { - return; + if (l_fopOvlpM_overlap[0] != NULL) { + switch (fopOvlpReq_Handler(l_fopOvlpM_overlap[0])) { + case cPhs_UNK3_e: + case cPhs_COMPLEATE_e: + case cPhs_ERROR_e: + l_fopOvlpM_overlap[0] = NULL; + break; } - l_fopOvlpM_overlap[0] = NULL; } } /* 8001E698-8001E6E8 018FD8 0050+00 0/0 1/1 0/0 .text fopOvlpM_Cancel__Fv */ int fopOvlpM_Cancel() { - if (!l_fopOvlpM_overlap[0]) { + if (l_fopOvlpM_overlap[0] == NULL) { return 1; } - if (fopOvlpReq_Cancel((overlap_request_class*)l_fopOvlpM_overlap[0]) == true) { + if (fopOvlpReq_Cancel(l_fopOvlpM_overlap[0]) == true) { l_fopOvlpM_overlap[0] = NULL; return 1; } diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp index 7b2935b502..414b9f0abf 100644 --- a/src/f_op/f_op_overlap_req.cpp +++ b/src/f_op/f_op_overlap_req.cpp @@ -12,93 +12,96 @@ void fopOvlpReq_SetPeektime(overlap_request_class*, u16); /* 8001E6EC-8001E748 01902C 005C+00 2/1 0/0 0/0 .text * fopOvlpReq_phase_Done__FP21overlap_request_class */ static int fopOvlpReq_phase_Done(overlap_request_class* i_overlapReq) { - if (fpcM_Delete(i_overlapReq->field_0x20) == 1) { - i_overlapReq->field_0x20 = 0; + if (fpcM_Delete(i_overlapReq->overlap_task) == 1) { + i_overlapReq->overlap_task = NULL; i_overlapReq->field_0x4 = 0; - i_overlapReq->mPeektime = 0; + i_overlapReq->peektime = 0; i_overlapReq->field_0x8 = 0; i_overlapReq->field_0xc = 0; - return 2; + return cPhs_NEXT_e; } - return 0; + return cPhs_INIT_e; } /* 8001E748-8001E794 019088 004C+00 1/0 0/0 0/0 .text * fopOvlpReq_phase_IsDone__FP21overlap_request_class */ -static s32 fopOvlpReq_phase_IsDone(overlap_request_class* param_1) { - cReq_Done((request_base_class*)param_1); - return param_1->field_0x2-- <= 0 ? 2 : 0; +static s32 fopOvlpReq_phase_IsDone(overlap_request_class* i_overlapReq) { + cReq_Done(&i_overlapReq->base); + if (i_overlapReq->field_0x2-- <= 0) { + return cPhs_NEXT_e; + } + + return cPhs_INIT_e; } /* 8001E794-8001E7E4 0190D4 0050+00 1/0 0/0 0/0 .text * fopOvlpReq_phase_IsWaitOfFadeout__FP21overlap_request_class */ static int fopOvlpReq_phase_IsWaitOfFadeout(overlap_request_class* i_overlapReq) { - if (cReq_Is_Done((request_base_class*)(i_overlapReq->field_0x20 + 0xC4))) { + if (cReq_Is_Done(&i_overlapReq->overlap_task->request)) { i_overlapReq->field_0x8 = 0; - return 2; + return cPhs_NEXT_e; } - return 0; + return cPhs_INIT_e; } /* 8001E7E4-8001E854 019124 0070+00 1/0 0/0 0/0 .text * fopOvlpReq_phase_WaitOfFadeout__FP21overlap_request_class */ static int fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* i_overlapReq) { - if (i_overlapReq->mPeektime) { - i_overlapReq->mPeektime--; + if (i_overlapReq->peektime) { + i_overlapReq->peektime--; } - if (((u8)(i_overlapReq->field_0x0 & 0x3F)) == 2 && !i_overlapReq->mPeektime) { - cReq_Command((request_base_class*)(i_overlapReq->field_0x20 + 0xC4), 2); - return 2; + if (i_overlapReq->base.flag2 == 2 && !i_overlapReq->peektime) { + cReq_Command(&i_overlapReq->overlap_task->request, 2); + return cPhs_NEXT_e; } i_overlapReq->field_0x8 = 1; - return 0; + return cPhs_INIT_e; } /* 8001E854-8001E8A4 019194 0050+00 1/0 0/0 0/0 .text * fopOvlpReq_phase_IsComplete__FP21overlap_request_class */ static int fopOvlpReq_phase_IsComplete(overlap_request_class* i_overlapReq) { - if (cReq_Is_Done((request_base_class*)(i_overlapReq->field_0x20 + 0xC4))) { - cReq_Done((request_base_class*)i_overlapReq); - return 2; + if (cReq_Is_Done(&i_overlapReq->overlap_task->request)) { + cReq_Done(&i_overlapReq->base); + return cPhs_NEXT_e; } - return 0; + return cPhs_INIT_e; } /* 8001E8A4-8001E904 0191E4 0060+00 1/0 0/0 0/0 .text * fopOvlpReq_phase_IsCreated__FP21overlap_request_class */ static int fopOvlpReq_phase_IsCreated(overlap_request_class* i_overlapReq) { - if (fpcM_IsCreating(i_overlapReq->field_0x14) == 0) { - base_process_class* pBaseProc = fpcEx_SearchByID(i_overlapReq->field_0x14); - - if (pBaseProc == NULL) { + if (fpcM_IsCreating(i_overlapReq->request_id) == 0) { + overlap_task_class* process = (overlap_task_class*)fpcM_SearchByID(i_overlapReq->request_id); + if (process == NULL) { return cPhs_ERROR_e; } - i_overlapReq->field_0x20 = (u8*)pBaseProc; - return 2; + i_overlapReq->overlap_task = process; + return cPhs_NEXT_e; } - return 0; + return cPhs_INIT_e; } /* 8001E904-8001E954 019244 0050+00 1/0 0/0 0/0 .text * fopOvlpReq_phase_Create__FP21overlap_request_class */ static int fopOvlpReq_phase_Create(overlap_request_class* i_overlapReq) { - fpcLy_SetCurrentLayer(i_overlapReq->pCurrentLayer); - i_overlapReq->field_0x14 = - fpcSCtRq_Request(fpcLy_CurrentLayer(), i_overlapReq->field_0x10, 0, 0, 0); - return 2; + fpcLy_SetCurrentLayer(i_overlapReq->layer); + i_overlapReq->request_id = + fpcSCtRq_Request(fpcLy_CurrentLayer(), i_overlapReq->procname, NULL, NULL, NULL); + return cPhs_NEXT_e; } /* 8001E954-8001E9F0 019294 009C+00 0/0 1/1 0/0 .text * fopOvlpReq_Request__FP21overlap_request_classsUs */ -request_base_class* fopOvlpReq_Request(overlap_request_class* i_overlapReq, s16 param_2, - u16 param_3) { +overlap_request_class* fopOvlpReq_Request(overlap_request_class* i_overlapReq, s16 i_procname, + u16 i_peektime) { static cPhs__Handler phaseMethod[8] = { (cPhs__Handler)fopOvlpReq_phase_Create, (cPhs__Handler)fopOvlpReq_phase_IsCreated, @@ -111,27 +114,27 @@ request_base_class* fopOvlpReq_Request(overlap_request_class* i_overlapReq, s16 }; if (i_overlapReq->field_0x4 == 1) { - i_overlapReq = 0; - return (request_base_class*)i_overlapReq; + i_overlapReq = NULL; + return i_overlapReq; } - cReq_Command((request_base_class*)i_overlapReq, 1); - i_overlapReq->field_0x10 = param_2; - cPhs_Set(&i_overlapReq->field_0x18, phaseMethod); - fopOvlpReq_SetPeektime(i_overlapReq, param_3); + cReq_Command(&i_overlapReq->base, 1); + i_overlapReq->procname = i_procname; + cPhs_Set(&i_overlapReq->phase_req, phaseMethod); + fopOvlpReq_SetPeektime(i_overlapReq, i_peektime); i_overlapReq->field_0x4 = 1; i_overlapReq->field_0x2 = 1; - i_overlapReq->field_0x20 = 0; + i_overlapReq->overlap_task = NULL; i_overlapReq->field_0x8 = 0; i_overlapReq->field_0xc = 0; - i_overlapReq->pCurrentLayer = fpcLy_RootLayer(); - return (request_base_class*)i_overlapReq; + i_overlapReq->layer = fpcLy_RootLayer(); + return i_overlapReq; } /* 8001E9F0-8001EA88 019330 0098+00 0/0 1/1 0/0 .text * fopOvlpReq_Handler__FP21overlap_request_class */ int fopOvlpReq_Handler(overlap_request_class* i_overlapReq) { - int phase_state = cPhs_Do(&i_overlapReq->field_0x18, i_overlapReq); + int phase_state = cPhs_Do(&i_overlapReq->phase_req, i_overlapReq); switch (phase_state) { case cPhs_NEXT_e: @@ -153,33 +156,31 @@ int fopOvlpReq_Handler(overlap_request_class* i_overlapReq) { /* 8001EA88-8001EAB4 0193C8 002C+00 0/0 1/1 0/0 .text fopOvlpReq_Cancel__FP21overlap_request_class */ int fopOvlpReq_Cancel(overlap_request_class* i_overlapReq) { - return fopOvlpReq_phase_Done(i_overlapReq) == 2 ? 1 : 0; + return fopOvlpReq_phase_Done(i_overlapReq) == cPhs_NEXT_e ? TRUE : FALSE; } /* 8001EAB4-8001EAC4 0193F4 0010+00 1/1 0/0 0/0 .text * fopOvlpReq_Is_PeektimeLimit__FP21overlap_request_class */ int fopOvlpReq_Is_PeektimeLimit(overlap_request_class* i_overlapReq) { - return i_overlapReq->mPeektime == 0 ? 1 : 0; + return i_overlapReq->peektime == 0 ? TRUE : FALSE; } /* 8001EAC4-8001EAD8 019404 0014+00 1/1 0/0 0/0 .text * fopOvlpReq_SetPeektime__FP21overlap_request_classUs */ -void fopOvlpReq_SetPeektime(overlap_request_class* i_overlapReq, u16 param_2) { - if (0x7fff < param_2) { - return; +void fopOvlpReq_SetPeektime(overlap_request_class* i_overlapReq, u16 i_peektime) { + if (i_peektime <= 0x7FFF) { + i_overlapReq->peektime = i_peektime; } - - i_overlapReq->mPeektime = param_2; } /* 8001EAD8-8001EB34 019418 005C+00 0/0 1/1 0/0 .text * fopOvlpReq_OverlapClr__FP21overlap_request_class */ int fopOvlpReq_OverlapClr(overlap_request_class* i_overlapReq) { - if ((u8)((i_overlapReq->field_0x0 >> 7) & 1) == 1 || !fopOvlpReq_Is_PeektimeLimit(i_overlapReq)) + if (i_overlapReq->base.flag0 == 1 || !fopOvlpReq_Is_PeektimeLimit(i_overlapReq)) { return 0; } - cReq_Create((request_base_class*)i_overlapReq, 2); + cReq_Create(&i_overlapReq->base, 2); return 1; -} \ No newline at end of file +} diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp index 09caebbd68..27f35c2b41 100644 --- a/src/f_op/f_op_scene.cpp +++ b/src/f_op/f_op_scene.cpp @@ -7,50 +7,49 @@ #include "f_pc/f_pc_manager.h" /* 8001EB34-8001EB5C 019474 0028+00 1/0 0/0 0/0 .text fopScn_Draw__FP11scene_class */ -static void fopScn_Draw(scene_class* i_this) { - fpcNd_DrawMethod((nodedraw_method_class*)i_this->mpMtd, i_this); +static int fopScn_Draw(scene_class* i_this) { + return fpcNd_DrawMethod((nodedraw_method_class*)i_this->submethod, i_this); } /* 8001EB5C-8001EB84 01949C 0028+00 1/0 0/0 0/0 .text fopScn_Execute__FP11scene_class */ -static void fopScn_Execute(scene_class* i_this) { - fpcMtd_Execute(i_this->mpMtd, i_this); +static int fopScn_Execute(scene_class* i_this) { + return fpcMtd_Execute(i_this->submethod, i_this); } /* 8001EB84-8001EBAC 0194C4 0028+00 1/0 0/0 0/0 .text fopScn_IsDelete__FPv */ -static s32 fopScn_IsDelete(void* i_this) { - return fpcMtd_IsDelete(static_cast(i_this)->mpMtd, i_this); +static int fopScn_IsDelete(void* i_this) { + return fpcMtd_IsDelete(static_cast(i_this)->submethod, i_this); } /* 8001EBAC-8001EC00 0194EC 0054+00 1/0 0/0 0/0 .text fopScn_Delete__FPv */ -static s32 fopScn_Delete(void* i_this) { - scene_class* scene = static_cast(i_this); - s32 ret = fpcMtd_Delete(scene->mpMtd, scene); +static int fopScn_Delete(void* i_this) { + scene_class* scene = (scene_class*)i_this; + int ret = fpcMtd_Delete(scene->submethod, scene); if (ret == 1) { - fopScnTg_QueueTo(&scene->mScnTg); + fopScnTg_QueueTo(&scene->scene_tag); } return ret; } /* 8001EC00-8001EC74 019540 0074+00 1/0 0/0 0/0 .text fopScn_Create__FPv */ -static s32 fopScn_Create(void* i_this) { - scene_class* scene = static_cast(i_this); +static int fopScn_Create(void* i_this) { + scene_class* scene = (scene_class*)i_this; if (fpcM_IsFirstCreating(i_this)) { - scene_process_profile_definition* profile = - (scene_process_profile_definition*)fpcM_GetProfile(i_this); - scene->mpMtd = profile->mpMtd; - fopScnTg_Init(&scene->mScnTg, i_this); - fopScnTg_ToQueue(&scene->mScnTg); + scene_process_profile_definition* profile = (scene_process_profile_definition*)fpcM_GetProfile(i_this); + scene->submethod = profile->submethod; + + fopScnTg_Init(&scene->scene_tag, i_this); + fopScnTg_ToQueue(&scene->scene_tag); u32* append = (u32*)fpcM_GetAppend(i_this); if (append != NULL) { - scene->mBase.mBase.mParameters = *append; + scene->base.base.parameters = *append; } } - return fpcMtd_Create(scene->mpMtd, i_this); + return fpcMtd_Create(scene->submethod, i_this); } -/* ############################################################################################## */ /* 803A38B0-803A38C8 -00001 0014+04 0/0 9/0 0/0 .data g_fopScn_Method */ leafdraw_method_class g_fopScn_Method = { (process_method_func)fopScn_Create, @@ -58,4 +57,4 @@ leafdraw_method_class g_fopScn_Method = { (process_method_func)fopScn_Execute, (process_method_func)fopScn_IsDelete, (process_method_func)fopScn_Draw -}; \ No newline at end of file +}; diff --git a/src/f_op/f_op_scene_iter.cpp b/src/f_op/f_op_scene_iter.cpp index 2bd5d04493..62c4728a9e 100644 --- a/src/f_op/f_op_scene_iter.cpp +++ b/src/f_op/f_op_scene_iter.cpp @@ -9,13 +9,13 @@ #include "f_op/f_op_scene_tag.h" /* 8001EC74-8001ECB0 0195B4 003C+00 0/0 1/1 0/0 .text fopScnIt_Judge__FPFPvPv_PvPv */ -void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pData) { +void* fopScnIt_Judge(fop_ScnItFunc i_judgeFunc, void* i_data) { struct { - fop_ScnItFunc mFunc; - void* mpData; - } iterParams; + fop_ScnItFunc func; + void* data; + } userdata; - iterParams.mFunc = pFunc1; - iterParams.mpData = pData; - return cLsIt_Judge(&g_fopScnTg_SceneList, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &iterParams); -} \ No newline at end of file + userdata.func = i_judgeFunc; + userdata.data = i_data; + return cLsIt_Judge(&g_fopScnTg_SceneList, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &userdata); +} diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index 2e93330f8f..9ff8b8a5f4 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -12,42 +12,40 @@ scene_class* fopScnM_SearchByID(fpc_ProcID id) { return (scene_class*)fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, &id); } -/* ############################################################################################## */ /* 804505B8-804505C0 000038 0004+04 2/2 0/0 0/0 .sdata l_scnRqID */ -static u32 l_scnRqID = 0xFFFFFFFF; +static fpc_ProcID l_scnRqID = fpcM_ERROR_PROCESS_ID_e; /* 8001ECE0-8001ED3C 019620 005C+00 0/0 4/4 1/1 .text fopScnM_ChangeReq__FP11scene_classssUs */ -int fopScnM_ChangeReq(scene_class* i_scene, s16 param_2, s16 param_3, u16 param_4) { - u32 sceneRequestID = fopScnRq_Request(2, i_scene, param_2, 0, param_3, param_4); - - if (sceneRequestID == 0xFFFFFFFF) { +int fopScnM_ChangeReq(scene_class* i_scene, s16 i_procName, s16 param_3, u16 param_4) { + fpc_ProcID request_id = fopScnRq_Request(2, i_scene, i_procName, NULL, param_3, param_4); + if (request_id == fpcM_ERROR_PROCESS_ID_e) { return 0; } - l_scnRqID = sceneRequestID; + l_scnRqID = request_id; return 1; } /* 8001ED3C-8001ED84 01967C 0048+00 0/0 1/1 0/0 .text fopScnM_DeleteReq__FP11scene_class */ fpc_ProcID fopScnM_DeleteReq(scene_class* i_scene) { - u32 sceneRequestID = fopScnRq_Request(1, i_scene, 0x7FFF, 0, 0x7FFF, 0); - return sceneRequestID != 0xFFFFFFFF; + fpc_ProcID request_id = fopScnRq_Request(1, i_scene, 0x7FFF, NULL, 0x7FFF, 0); + return request_id != fpcM_ERROR_PROCESS_ID_e; } /* 8001ED84-8001EDCC 0196C4 0048+00 0/0 2/2 0/0 .text fopScnM_CreateReq__FssUsUl */ -int fopScnM_CreateReq(s16 param_1, s16 param_2, u16 param_3, u32 param_4) { - u32 sceneRequestID = fopScnRq_Request(0, 0, param_1, (void*)param_4, param_2, param_3); - return sceneRequestID != 0xFFFFFFFF; +int fopScnM_CreateReq(s16 i_procName, s16 param_2, u16 param_3, u32 i_data) { + fpc_ProcID request_id = fopScnRq_Request(0, 0, i_procName, (void*)i_data, param_2, param_3); + return request_id != fpcM_ERROR_PROCESS_ID_e; } /* 8001EDCC-8001EE10 01970C 0044+00 0/0 1/1 0/0 .text fopScnM_ReRequest__FsUl */ -u32 fopScnM_ReRequest(s16 param_1, u32 param_2) { - if (l_scnRqID == 0xFFFFFFFF) { +u32 fopScnM_ReRequest(s16 i_procName, u32 i_data) { + if (l_scnRqID == fpcM_ERROR_PROCESS_ID_e) { return 0; } - return fopScnRq_ReRequest(l_scnRqID, param_1, (void*)param_2); + return fopScnRq_ReRequest(l_scnRqID, i_procName, (void*)i_data); } /* 8001EE10-8001EE30 019750 0020+00 0/0 1/1 0/0 .text fopScnM_Management__Fv */ diff --git a/src/f_op/f_op_scene_pause.cpp b/src/f_op/f_op_scene_pause.cpp index 95d24a5d01..ae589b2c2d 100644 --- a/src/f_op/f_op_scene_pause.cpp +++ b/src/f_op/f_op_scene_pause.cpp @@ -10,7 +10,7 @@ /* 80020548-80020594 01AE88 004C+00 0/0 2/2 0/0 .text fopScnPause_Enable__FP11scene_class */ int fopScnPause_Enable(scene_class* i_scene) { - if (i_scene) { + if (i_scene != NULL) { fpcM_PauseEnable(i_scene, 1); fpcM_PauseEnable(i_scene, 2); return 1; @@ -21,18 +21,18 @@ int fopScnPause_Enable(scene_class* i_scene) { /* 80020594-8002064C 01AED4 00B8+00 0/0 2/2 0/0 .text fopScnPause_Disable__FP11scene_class */ int fopScnPause_Disable(scene_class* i_scene) { - if (i_scene) { - void* tmp = (void*)i_scene->mBase.mBase.mLyTg.mpLayer->mpPcNode; + if (i_scene != NULL) { + process_node_class* process_node = i_scene->base.base.layer_tag.layer->process_node; - if (!tmp) { + if (process_node == NULL) { fpcM_PauseDisable(i_scene, 1); fpcM_PauseDisable(i_scene, 2); - } else if (fpcEx_IsExist((s32)((int*)tmp)[1]) == 1) { - if (!fpcM_IsPause(tmp, 1)) { + } else if (fpcEx_IsExist(process_node->base.id) == TRUE) { + if (!fpcM_IsPause(process_node, 1)) { fpcM_PauseDisable(i_scene, 1); } - if (!fpcM_IsPause(tmp, 2)) { + if (!fpcM_IsPause(process_node, 2)) { fpcM_PauseDisable(i_scene, 2); } } @@ -41,4 +41,4 @@ int fopScnPause_Disable(scene_class* i_scene) { } return 0; -} \ No newline at end of file +} diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp index 939acafe3d..931c406e7d 100644 --- a/src/f_op/f_op_scene_req.cpp +++ b/src/f_op/f_op_scene_req.cpp @@ -8,6 +8,7 @@ #include "f_op/f_op_scene.h" #include "f_op/f_op_scene_pause.h" #include "f_pc/f_pc_executor.h" +#include "f_pc/f_pc_manager.h" /* 8001EE34-8001EE64 019774 0030+00 1/0 0/0 0/0 .text * fopScnRq_phase_ClearOverlap__FP19scene_request_class */ @@ -22,7 +23,7 @@ static cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* i_sceneReq) { /* 8001EE64-8001EE84 0197A4 0020+00 2/0 0/0 0/0 .text * fopScnRq_phase_Execute__FP19scene_request_class */ static cPhs__Step fopScnRq_phase_Execute(scene_request_class* i_sceneReq) { - return (cPhs__Step)fpcNdRq_Execute(&i_sceneReq->mCrtReq); + return (cPhs__Step)fpcNdRq_Execute(&i_sceneReq->create_request); } /* 8001EE84-8001EEB4 0197C4 0030+00 1/0 0/0 0/0 .text @@ -45,42 +46,43 @@ static cPhs__Step fopScnRq_phase_IsDoneOverlap(scene_request_class* i_sceneReq) } } -/* ############################################################################################## */ /* 80450CE0-80450CE8 0001E0 0004+04 2/2 0/0 0/0 .sbss l_fopScnRq_IsUsingOfOverlap */ -static s32 l_fopScnRq_IsUsingOfOverlap; +static BOOL l_fopScnRq_IsUsingOfOverlap; /* 8001EEE4-8001EF24 019824 0040+00 2/0 0/0 0/0 .text fopScnRq_phase_Done__FP19scene_request_class */ static cPhs__Step fopScnRq_phase_Done(scene_request_class* i_sceneReq) { - if (i_sceneReq->mCrtReq.mParameter != 1) { - fopScnPause_Disable((scene_class*)fpcEx_SearchByID(i_sceneReq->mCrtReq.mCreatingID)); + if (i_sceneReq->create_request.parameters != 1) { + fopScnPause_Disable((scene_class*)fpcEx_SearchByID(i_sceneReq->create_request.creating_id)); } - l_fopScnRq_IsUsingOfOverlap = 0; + + l_fopScnRq_IsUsingOfOverlap = FALSE; return cPhs_NEXT_e; } /* 8001EF24-8001EF6C 019864 0048+00 1/0 0/0 0/0 .text fopScnRq_Execute__FP19scene_request_class */ static void fopScnRq_Execute(scene_request_class* i_sceneReq) { - int tmp = cPhs_Do(&i_sceneReq->mReqPhsProcCls, i_sceneReq); - switch (tmp) { - case 2: + int phase_state = cPhs_Do(&i_sceneReq->phase_request, i_sceneReq); + + switch (phase_state) { + case cPhs_NEXT_e: fopScnRq_Execute(i_sceneReq); } } /* 8001EF6C-8001EFB0 0198AC 0044+00 1/0 0/0 0/0 .text * fopScnRq_PostMethod__FPvP19scene_request_class */ -static int fopScnRq_PostMethod(void* param_1, scene_request_class* i_sceneReq) { - if (i_sceneReq->mFadeRequest) { - fopScnPause_Enable((scene_class*)param_1); - fopOvlpM_ToldAboutID(((scene_class*)param_1)->mBase.mBase.mBsPcId); +static int fopScnRq_PostMethod(void* i_scene, scene_request_class* i_sceneReq) { + if (i_sceneReq->fade_request != NULL) { + fopScnPause_Enable((scene_class*)i_scene); + fopOvlpM_ToldAboutID(((scene_class*)i_scene)->base.base.id); } return 1; } /* 8001EFB0-8001EFF0 0198F0 0040+00 1/0 0/0 0/0 .text fopScnRq_Cancel__FP19scene_request_class */ static int fopScnRq_Cancel(scene_request_class* i_sceneReq) { - if (i_sceneReq->mFadeRequest && !fopOvlpM_Cancel()) { + if (i_sceneReq->fade_request != NULL && !fopOvlpM_Cancel()) { return 0; } else { return 1; @@ -88,20 +90,20 @@ static int fopScnRq_Cancel(scene_request_class* i_sceneReq) { } /* 8001EFF0-8001F034 019930 0044+00 1/1 0/0 0/0 .text fopScnRq_FadeRequest__FsUs */ -static scene_request_class* fopScnRq_FadeRequest(s16 param_1, u16 param_2) { - request_base_class* req = NULL; +static scene_request_class* fopScnRq_FadeRequest(s16 i_procname, u16 i_peektime) { + overlap_request_class* req = NULL; - if (l_fopScnRq_IsUsingOfOverlap == 0 && (req = fopOvlpM_Request(param_1, param_2), req != NULL)) + if (!l_fopScnRq_IsUsingOfOverlap && (req = fopOvlpM_Request(i_procname, i_peektime), req != NULL)) { - l_fopScnRq_IsUsingOfOverlap = 1; + l_fopScnRq_IsUsingOfOverlap = TRUE; } return (scene_request_class*)req; } /* 8001F034-8001F0FC 019974 00C8+00 0/0 3/3 0/0 .text fopScnRq_Request__FiP11scene_classsPvsUs */ -s32 fopScnRq_Request(int param_1, scene_class* i_scene, s16 param_3, void* param_4, s16 param_5, - u16 param_6) { +fpc_ProcID fopScnRq_Request(int i_reqType, scene_class* i_scene, s16 i_procName, void* i_data, s16 i_fadename, + u16 i_peektime) { static node_create_request_method_class submethod = { (process_method_func)fopScnRq_Execute, (process_method_func)fopScnRq_Cancel, @@ -131,36 +133,34 @@ s32 fopScnRq_Request(int param_1, scene_class* i_scene, s16 param_3, void* param NULL, }; - s32 ret; - int tmp = 0; - cPhs__Handler* phase_handler_table; - phase_handler_table = noFadeFase; - scene_request_class* pScnReq = (scene_request_class*)fpcNdRq_Request( - sizeof(scene_request_class), param_1, (process_node_class*)i_scene, param_3, param_4, + scene_request_class* fade_req = NULL; + cPhs__Handler* phase_handler = noFadeFase; + + scene_request_class* req = (scene_request_class*)fpcNdRq_Request( + sizeof(scene_request_class), i_reqType, (process_node_class*)i_scene, i_procName, i_data, &submethod); - if (!pScnReq) { - ret = -1; - } else { - if (param_5 != 0x7fff) { - phase_handler_table = fadeFase; - tmp = (int)fopScnRq_FadeRequest(param_5, param_6); - if (!tmp) { - fpcNdRq_Delete(&pScnReq->mCrtReq); - return -1; - } - } - pScnReq->mFadeRequest = tmp; - cPhs_Set(&pScnReq->mReqPhsProcCls, phase_handler_table); - ret = pScnReq->mCrtReq.mRequestId; + if (req == NULL) { + return fpcM_ERROR_PROCESS_ID_e; } - return ret; + if (i_fadename != 0x7FFF) { + phase_handler = fadeFase; + fade_req = fopScnRq_FadeRequest(i_fadename, i_peektime); + if (fade_req == NULL) { + fpcNdRq_Delete(&req->create_request); + return fpcM_ERROR_PROCESS_ID_e; + } + } + + req->fade_request = fade_req; + cPhs_Set(&req->phase_request, phase_handler); + return req->create_request.request_id; } /* 8001F0FC-8001F11C 019A3C 0020+00 0/0 1/1 0/0 .text fopScnRq_ReRequest__FUisPv */ -s32 fopScnRq_ReRequest(fpc_ProcID param_1, s16 param_2, void* param_3) { - return fpcNdRq_ReRequest(param_1, param_2, param_3); +s32 fopScnRq_ReRequest(fpc_ProcID i_requestId, s16 i_procName, void* i_data) { + return fpcNdRq_ReRequest(i_requestId, i_procName, i_data); } /* 8001F11C-8001F13C 019A5C 0020+00 0/0 1/1 0/0 .text fopScnRq_Handler__Fv */ diff --git a/src/f_op/f_op_scene_tag.cpp b/src/f_op/f_op_scene_tag.cpp index ab9ec70c57..c55ecd8465 100644 --- a/src/f_op/f_op_scene_tag.cpp +++ b/src/f_op/f_op_scene_tag.cpp @@ -7,19 +7,18 @@ /* 8001F13C-8001F15C 019A7C 0020+00 0/0 1/1 0/0 .text fopScnTg_QueueTo__FP15scene_tag_class */ void fopScnTg_QueueTo(scene_tag_class* i_sceneTag) { - cTg_SingleCut((create_tag_class*)i_sceneTag); + cTg_SingleCut(&i_sceneTag->base); } -/* ############################################################################################## */ /* 803A3918-803A3928 000A38 000C+04 1/1 1/1 0/0 .data g_fopScnTg_SceneList */ node_list_class g_fopScnTg_SceneList = {NULL, NULL, 0}; /* 8001F15C-8001F188 019A9C 002C+00 0/0 1/1 0/0 .text fopScnTg_ToQueue__FP15scene_tag_class */ void fopScnTg_ToQueue(scene_tag_class* i_sceneTag) { - cTg_Addition(&g_fopScnTg_SceneList, (create_tag_class*)i_sceneTag); + cTg_Addition(&g_fopScnTg_SceneList, &i_sceneTag->base); } /* 8001F188-8001F1A8 019AC8 0020+00 0/0 1/1 0/0 .text fopScnTg_Init__FP15scene_tag_classPv */ -void fopScnTg_Init(scene_tag_class* i_sceneTag, void* pData) { - cTg_Create((create_tag_class*)i_sceneTag, pData); -} \ No newline at end of file +void fopScnTg_Init(scene_tag_class* i_sceneTag, void* i_data) { + cTg_Create(&i_sceneTag->base, i_data); +} diff --git a/src/f_op/f_op_view.cpp b/src/f_op/f_op_view.cpp index 0f87fca3e8..bb16d92e63 100644 --- a/src/f_op/f_op_view.cpp +++ b/src/f_op/f_op_view.cpp @@ -13,36 +13,34 @@ void fopVw_Draw(view_class* i_this) { /* 8001F1D0-8001F1F8 019B10 0028+00 1/0 0/0 0/0 .text fopVw_Execute__FP10view_class */ void fopVw_Execute(view_class* i_this) { - fpcMtd_Execute(&i_this->sub_method->mBase, i_this); + fpcMtd_Execute(&i_this->sub_method->base, i_this); } /* 8001F1F8-8001F220 019B38 0028+00 1/0 0/0 0/0 .text fopVw_IsDelete__FPv */ s32 fopVw_IsDelete(void* i_this) { - view_class* _this = (view_class*)i_this; - return fpcMtd_IsDelete(&_this->sub_method->mBase, _this); + view_class* a_this = (view_class*)i_this; + return fpcMtd_IsDelete(&a_this->sub_method->base, a_this); } /* 8001F220-8001F248 019B60 0028+00 1/0 0/0 0/0 .text fopVw_Delete__FP10view_class */ s32 fopVw_Delete(view_class* i_this) { - return fpcMtd_Delete(&i_this->sub_method->mBase, i_this); + return fpcMtd_Delete(&i_this->sub_method->base, i_this); } /* 8001F248-8001F284 019B88 003C+00 1/0 0/0 0/0 .text fopVw_Create__FPv */ s32 fopVw_Create(void* i_this) { - view_class* _this = (view_class*)i_this; + view_class* a_this = (view_class*)i_this; - view_process_profile_definition* pProf = - (view_process_profile_definition*)fpcM_GetProfile(_this); - _this->sub_method = pProf->sub_method; - _this->field_0xc4 = pProf->unk28; + view_process_profile_definition* profile = (view_process_profile_definition*)fpcM_GetProfile(a_this); + a_this->sub_method = profile->sub_method; + a_this->field_0xc4 = profile->unk_0x28; - return fpcMtd_Create(&_this->sub_method->mBase, _this); + return fpcMtd_Create(&a_this->sub_method->base, a_this); } -/* ############################################################################################## */ /* 803A3928-803A3940 -00001 0014+04 0/0 2/0 0/0 .data g_fopVw_Method */ leafdraw_method_class g_fopVw_Method = { (process_method_func)fopVw_Create, (process_method_func)fopVw_Delete, (process_method_func)fopVw_Execute, (process_method_func)fopVw_IsDelete, (process_method_func)fopVw_Draw, -}; \ No newline at end of file +}; diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index b79d0a65de..68fba36923 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -11,20 +11,18 @@ #include "f_pc/f_pc_method.h" #include "f_pc/f_pc_pause.h" #include "f_pc/f_pc_profile.h" -#include "global.h" /* 8002064C-8002065C 0010+00 s=0 e=14 z=0 None .text fpcBs_Is_JustOfType__Fii */ -s32 fpcBs_Is_JustOfType(int i_typeA, int i_typeB) { - return checkEqual(i_typeA, i_typeB); // return pType2 == pType1 matches when return type is bool +BOOL fpcBs_Is_JustOfType(int i_typeA, int i_typeB) { + return i_typeB == i_typeA ? TRUE : FALSE; } -/* ############################################################################################## */ /* 80450D00-80450D04 0004+00 s=1 e=0 z=0 None .sbss g_fpcBs_type */ -static int g_fpcBs_type; +int g_fpcBs_type; /* 8002065C-8002069C 0040+00 s=1 e=5 z=0 None .text fpcBs_MakeOfType__FPi */ -s32 fpcBs_MakeOfType(int* i_type) { - static s32 t_type = 0x9130000; +int fpcBs_MakeOfType(int* i_type) { + static int t_type = 0x9130000; if (*i_type == 0) { *i_type = ++t_type; } @@ -32,102 +30,109 @@ s32 fpcBs_MakeOfType(int* i_type) { } /* 8002069C-800206C4 0028+00 s=0 e=2 z=0 None .text fpcBs_MakeOfId__Fv */ -s32 fpcBs_MakeOfId() { - static s32 process_id = 1; +int fpcBs_MakeOfId() { + static int process_id = 1; return process_id++; } /* 800206C4-80020720 005C+00 s=0 e=1 z=0 None .text fpcBs_Execute__FP18base_process_class */ -s32 fpcBs_Execute(base_process_class* i_proc) { - s32 result; - layer_class* savedLayer = fpcLy_CurrentLayer(); - fpcLy_SetCurrentLayer(i_proc->mLyTg.mpLayer); - result = fpcMtd_Execute(i_proc->mpPcMtd, i_proc); - fpcLy_SetCurrentLayer(savedLayer); +int fpcBs_Execute(base_process_class* i_proc) { + int result; + layer_class* save_layer = fpcLy_CurrentLayer(); + + fpcLy_SetCurrentLayer(i_proc->layer_tag.layer); + result = fpcMtd_Execute(i_proc->methods, i_proc); + + fpcLy_SetCurrentLayer(save_layer); return result; } /* 80020720-80020760 0040+00 s=2 e=0 z=0 None .text fpcBs_DeleteAppend__FP18base_process_class */ void fpcBs_DeleteAppend(base_process_class* i_proc) { - if (i_proc->mpUserData != NULL) { - cMl::free(i_proc->mpUserData); - i_proc->mpUserData = NULL; + if (i_proc->append != NULL) { + cMl::free(i_proc->append); + i_proc->append = NULL; } } /* 80020760-800207BC 005C+00 s=0 e=1 z=0 None .text fpcBs_IsDelete__FP18base_process_class */ -s32 fpcBs_IsDelete(base_process_class* i_proc) { - s32 result; - layer_class* savedLayer = fpcLy_CurrentLayer(); - fpcLy_SetCurrentLayer(i_proc->mLyTg.mpLayer); - result = fpcMtd_IsDelete(i_proc->mpPcMtd, i_proc); - fpcLy_SetCurrentLayer(savedLayer); +int fpcBs_IsDelete(base_process_class* i_proc) { + int result; + layer_class* save_layer = fpcLy_CurrentLayer(); + + fpcLy_SetCurrentLayer(i_proc->layer_tag.layer); + result = fpcMtd_IsDelete(i_proc->methods, i_proc); + + fpcLy_SetCurrentLayer(save_layer); return result; } /* 800207BC-80020820 0064+00 s=0 e=2 z=0 None .text fpcBs_Delete__FP18base_process_class */ -s32 fpcBs_Delete(base_process_class* i_proc) { - s32 deleteResult = fpcMtd_Delete(i_proc->mpPcMtd, i_proc); - if (deleteResult == 1) { +int fpcBs_Delete(base_process_class* i_proc) { + int result = fpcMtd_Delete(i_proc->methods, i_proc); + if (result == 1) { fpcBs_DeleteAppend(i_proc); - i_proc->mBsType = 0; + i_proc->type = 0; cMl::free(i_proc); } - return deleteResult; + + return result; } /* 80020820-8002091C 00FC+00 s=0 e=2 z=0 None .text fpcBs_Create__FsUiPv */ -base_process_class* fpcBs_Create(s16 i_procTypeID, fpc_ProcID i_procID, void* i_data) { - process_profile_definition* procProfDef; - base_process_class* procClass; +base_process_class* fpcBs_Create(s16 i_profname, fpc_ProcID i_procID, void* i_append) { + process_profile_definition* pprofile; + base_process_class* pprocess; u32 size; - procProfDef = (process_profile_definition*)fpcPf_Get(i_procTypeID); - size = procProfDef->mSize + procProfDef->mSizeOther; - procClass = (base_process_class*)cMl::memalignB(-4, size); - if (procClass == NULL) { + pprofile = (process_profile_definition*)fpcPf_Get(i_profname); + size = pprofile->process_size + pprofile->unk_size; + + pprocess = (base_process_class*)cMl::memalignB(-4, size); + if (pprocess == NULL) { return NULL; - } else { - sBs_ClearArea(procClass, size); - fpcLyTg_Init(&procClass->mLyTg, procProfDef->mLayerID, procClass); - fpcLnTg_Init(&procClass->mLnTg, procClass); - fpcDtTg_Init(&procClass->mDtTg, procClass); - fpcPi_Init(&procClass->mPi, procClass, procProfDef->mLayerID, procProfDef->mListID, - procProfDef->mListPrio); - procClass->mInitState = 0; - procClass->mUnk0 = 0; - procClass->mBsPcId = i_procID; - procClass->mBsTypeId = i_procTypeID; - procClass->mBsType = fpcBs_MakeOfType(&g_fpcBs_type); - procClass->mProcName = procProfDef->mProcName; - fpcPause_Init(procClass); - procClass->mpPcMtd = procProfDef->sub_method; - procClass->mpProf = procProfDef; - procClass->mpUserData = i_data; - procClass->mParameters = procProfDef->mParameters; - return procClass; } + + sBs_ClearArea(pprocess, size); + fpcLyTg_Init(&pprocess->layer_tag, pprofile->layer_id, pprocess); + fpcLnTg_Init(&pprocess->line_tag_, pprocess); + fpcDtTg_Init(&pprocess->delete_tag, pprocess); + fpcPi_Init(&pprocess->priority, pprocess, pprofile->layer_id, pprofile->list_id, + pprofile->list_priority); + + pprocess->init_state = 0; + pprocess->unk_0xA = 0; + pprocess->id = i_procID; + pprocess->profname = i_profname; + pprocess->type = fpcBs_MakeOfType(&g_fpcBs_type); + pprocess->name = pprofile->name; + fpcPause_Init(pprocess); + pprocess->methods = pprofile->methods; + pprocess->profile = pprofile; + pprocess->append = i_append; + pprocess->parameters = pprofile->parameters; + return pprocess; } -s32 fpcBs_SubCreate(base_process_class* i_proc) { - switch (fpcMtd_Create(i_proc->mpPcMtd, i_proc)) { - case 2: +int fpcBs_SubCreate(base_process_class* i_proc) { + switch (fpcMtd_Create(i_proc->methods, i_proc)) { + case cPhs_NEXT_e: case cPhs_COMPLEATE_e: fpcBs_DeleteAppend(i_proc); - i_proc->mUnk2 = 2; - return 2; + i_proc->create_phase = cPhs_NEXT_e; + return cPhs_NEXT_e; case cPhs_INIT_e: - case 1: - i_proc->mInitState = 1; - i_proc->mUnk2 = 0; + case cPhs_LOADING_e: + i_proc->init_state = 1; + i_proc->create_phase = cPhs_INIT_e; return cPhs_INIT_e; - case 3: - i_proc->mUnk2 = 3; - return 3; + case cPhs_UNK3_e: + i_proc->create_phase = cPhs_UNK3_e; + return cPhs_UNK3_e; case cPhs_ERROR_e: default: - i_proc->mUnk2 = 5; + i_proc->create_phase = cPhs_ERROR_e; return cPhs_ERROR_e; } } diff --git a/src/f_pc/f_pc_create_iter.cpp b/src/f_pc/f_pc_create_iter.cpp index cb1cc2961e..2c0e6bdb21 100644 --- a/src/f_pc/f_pc_create_iter.cpp +++ b/src/f_pc/f_pc_create_iter.cpp @@ -10,37 +10,38 @@ #include "f_pc/f_pc_layer.h" /* 800209C8-80020A04 003C+00 s=0 e=1 z=0 None .text fpcCtIt_Method__FPFPvPv_iPv */ -s32 fpcCtIt_Method(fpcCtIt_MethodFunc i_judgeFunc, void* i_data) { +int fpcCtIt_Method(fpcCtIt_MethodFunc i_method, void* i_data) { node_method_data iter; - iter.mFunc = i_judgeFunc; - iter.mpUserData = i_data; + iter.method = i_method; + iter.data = i_data; return cLsIt_Method(&g_fpcCtTg_Queue, (cNdIt_MethodFunc)cTgIt_MethodCall, &iter); } /* 80020A04-80020A40 003C+00 s=1 e=2 z=0 None .text fpcCtIt_Judge__FPFPvPv_PvPv */ -void* fpcCtIt_Judge(fpcCtIt_JudgeFunc i_judgeFunc, void* i_data) { +void* fpcCtIt_Judge(fpcCtIt_JudgeFunc i_judge, void* i_data) { node_judge_data iter; - iter.mFunc = i_judgeFunc; - iter.mpUserData = i_data; + iter.method = i_judge; + iter.data = i_data; return cLsIt_Judge(&g_fpcCtTg_Queue, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &iter); } /* 80020A40-80020A94 0054+00 s=1 e=0 z=0 None .text * fpcCtIt_filter_JudgeInLayer__FP10create_tagP16fpcCtIt_jilprm_c */ void* fpcCtIt_filter_JudgeInLayer(create_tag* i_createTag, fpcCtIt_jilprm_c* i_iterData) { - create_request* create_req = static_cast(i_createTag->mBase.mpTagData); - if (create_req->mpLayer->mLayerID == i_iterData->mLayerID) { - return i_iterData->mFunc((node_class*)create_req->mpRes, i_iterData->mpUserData); + create_request* create_req = (create_request*)i_createTag->base.mpTagData; + + if (create_req->layer->layer_id == i_iterData->layer_id) { + return i_iterData->method((node_class*)create_req->process, i_iterData->data); } else { return NULL; } } /* 80020A94-80020ACC 0038+00 s=0 e=1 z=0 None .text fpcCtIt_JudgeInLayer__FUiPFPvPv_PvPv */ -void* fpcCtIt_JudgeInLayer(fpc_ProcID i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data) { +void* fpcCtIt_JudgeInLayer(fpc_ProcID i_layerID, fpcCtIt_JudgeFunc i_method, void* i_data) { fpcCtIt_jilprm_c data; - data.mLayerID = i_layerID; - data.mFunc = i_judgeFunc; - data.mpUserData = i_data; + data.layer_id = i_layerID; + data.method = i_method; + data.data = i_data; return fpcCtIt_Judge((fpcCtIt_JudgeFunc)fpcCtIt_filter_JudgeInLayer, &data); } diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp index 07a01a84b8..f434511f3e 100644 --- a/src/f_pc/f_pc_create_req.cpp +++ b/src/f_pc/f_pc_create_req.cpp @@ -13,9 +13,9 @@ /* 80020ACC-80020AE8 001C+00 s=1 e=0 z=0 None .text fpcCtRq_isCreatingByID__FP10create_tagPUi */ -bool fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_procID) { - create_request* pReq = static_cast(i_createTag->mBase.mpTagData); - return pReq->mBsPcId == *i_procID; +bool fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_id) { + create_request* req = (create_request*)i_createTag->base.mpTagData; + return req->id == *i_id; } /* 80020AE8-80020B20 0038+00 s=0 e=2 z=0 None .text fpcCtRq_IsCreatingByID__FUi */ @@ -25,81 +25,82 @@ BOOL fpcCtRq_IsCreatingByID(fpc_ProcID i_id) { /* 80020B20-80020B5C 003C+00 s=1 e=0 z=0 None .text fpcCtRq_CreateQTo__FP14create_request */ void fpcCtRq_CreateQTo(create_request* i_request) { - fpcCtTg_CreateQTo(&i_request->mBase); - fpcLy_CreatedMesg(i_request->mpLayer); - fpcLy_CancelQTo(&i_request->mMtdTg); + fpcCtTg_CreateQTo(&i_request->base); + fpcLy_CreatedMesg(i_request->layer); + fpcLy_CancelQTo(&i_request->method_tag); } /* 80020B5C-80020BA0 0044+00 s=1 e=0 z=0 None .text fpcCtRq_ToCreateQ__FP14create_request */ void fpcCtRq_ToCreateQ(create_request* i_request) { - fpcLy_CreatingMesg(i_request->mpLayer); - fpcLy_ToCancelQ(i_request->mpLayer, &i_request->mMtdTg); - fpcCtTg_ToCreateQ(&i_request->mBase); + fpcLy_CreatingMesg(i_request->layer); + fpcLy_ToCancelQ(i_request->layer, &i_request->method_tag); + fpcCtTg_ToCreateQ(&i_request->base); } /* 80020BA0-80020C14 0074+00 s=2 e=0 z=0 None .text fpcCtRq_Delete__FP14create_request */ BOOL fpcCtRq_Delete(create_request* i_request) { fpcCtRq_CreateQTo(i_request); - if (i_request->mpCtRqMtd != NULL && fpcMtd_Method(i_request->mpCtRqMtd->mpDelete, i_request) == 0) { - return 0; - } else { - if (i_request->mpRes) { - i_request->mpRes->mpCtRq = NULL; - } - cMl::free(i_request); - return 1; + if (i_request->methods != NULL && fpcMtd_Method(i_request->methods->delete_method, i_request) == 0) { + return FALSE; } + + if (i_request->process != NULL) { + i_request->process->create_req = NULL; + } + + cMl::free(i_request); + return TRUE; } /* 80020C14-80020CAC 0098+00 s=2 e=2 z=0 None .text fpcCtRq_Cancel__FP14create_request */ BOOL fpcCtRq_Cancel(create_request* i_request) { - base_process_class* pProc; - if (i_request != NULL && !i_request->mbIsCancelling) { - i_request->mbIsCancelling = TRUE; - pProc = i_request->mpRes; + base_process_class* pproc; + if (i_request != NULL && !i_request->is_cancel) { + i_request->is_cancel = TRUE; + pproc = i_request->process; - if (pProc != NULL && !fpcDt_Delete(pProc)) + if (pproc != NULL && !fpcDt_Delete(pproc)) return FALSE; - if (i_request->mpCtRqMtd != NULL && !fpcMtd_Method(i_request->mpCtRqMtd->mpCancel, i_request)) + if (i_request->methods != NULL && !fpcMtd_Method(i_request->methods->cancel_method, i_request)) return FALSE; return fpcCtRq_Delete(i_request); - } else { - return TRUE; } + + return TRUE; } /* 80020CAC-80020CC8 001C+00 s=0 e=1 z=0 None .text fpcCtRq_IsDoing__FP14create_request */ -s32 fpcCtRq_IsDoing(create_request* i_request) { +BOOL fpcCtRq_IsDoing(create_request* i_request) { if (i_request != NULL) - return i_request->mbIsCreating; + return i_request->is_doing; else return FALSE; } /* 80020CC8-80020D84 00BC+00 s=1 e=0 z=0 None .text fpcCtRq_Do__FP14create_request */ BOOL fpcCtRq_Do(create_request* i_request) { - s32 phase = cPhs_COMPLEATE_e; + int phase = cPhs_COMPLEATE_e; - if (i_request->mpCtRqMtd != NULL) { - cPhs__Handler pHandler = i_request->mpCtRqMtd->mpHandler; + if (i_request->methods != NULL) { + cPhs__Handler pHandler = i_request->methods->phase_handler; if (pHandler != NULL) { - i_request->mbIsCreating = TRUE; + i_request->is_doing = TRUE; phase = pHandler(i_request); - i_request->mbIsCreating = FALSE; + i_request->is_doing = FALSE; } } switch (phase) { case cPhs_COMPLEATE_e: { - s32 success = fpcEx_ToExecuteQ(i_request->mpRes); + int success = fpcEx_ToExecuteQ(i_request->process); if (success == 0) return fpcCtRq_Cancel(i_request); else return fpcCtRq_Delete(i_request); } - case 3: + case cPhs_UNK3_e: case cPhs_ERROR_e: return fpcCtRq_Cancel(i_request); } @@ -108,26 +109,25 @@ BOOL fpcCtRq_Do(create_request* i_request) { } /* 80020D84-80020DB0 002C+00 s=0 e=1 z=0 None .text fpcCtRq_Handler__Fv */ - void fpcCtRq_Handler() { fpcCtIt_Method((fpcCtIt_MethodFunc)fpcCtRq_Do, NULL); } /* 80020DB0-80020E38 0088+00 s=0 e=2 z=0 None .text * fpcCtRq_Create__FP11layer_classUlP27create_request_method_class */ -create_request* fpcCtRq_Create(layer_class* i_layer, u32 i_size, create_request_method_class* i_CtRqMethods) { - create_request* pReq = (create_request*)cMl::memalignB(-4, i_size); +create_request* fpcCtRq_Create(layer_class* i_layer, u32 i_size, create_request_method_class* i_methods) { + create_request* req = (create_request*)cMl::memalignB(-4, i_size); - if (pReq != NULL) { - fpcCtTg_Init(&pReq->mBase, pReq); - fpcMtdTg_Init(&pReq->mMtdTg, (process_method_tag_func)fpcCtRq_Cancel, pReq); - pReq->mpLayer = i_layer; - pReq->mpCtRqMtd = i_CtRqMethods; - pReq->mBsPcId = fpcBs_MakeOfId(); - pReq->mpRes = NULL; - pReq->mbIsCancelling = FALSE; - fpcCtRq_ToCreateQ(pReq); + if (req != NULL) { + fpcCtTg_Init(&req->base, req); + fpcMtdTg_Init(&req->method_tag, (process_method_tag_func)fpcCtRq_Cancel, req); + req->layer = i_layer; + req->methods = i_methods; + req->id = fpcBs_MakeOfId(); + req->process = NULL; + req->is_cancel = FALSE; + fpcCtRq_ToCreateQ(req); } - return pReq; + return req; } diff --git a/src/f_pc/f_pc_create_tag.cpp b/src/f_pc/f_pc_create_tag.cpp index ae1d01ee09..5b09ece6f2 100644 --- a/src/f_pc/f_pc_create_tag.cpp +++ b/src/f_pc/f_pc_create_tag.cpp @@ -5,23 +5,21 @@ #include "f_pc/f_pc_create_tag.h" - -/* ############################################################################################## */ /* 803A3990-803A39A0 000C+04 s=1 e=2 z=0 None .data g_fpcCtTg_Queue */ node_list_class g_fpcCtTg_Queue = {NULL, NULL, 0}; /* 80020E38-80020E64 002C+00 s=0 e=1 z=0 None .text fpcCtTg_ToCreateQ__FP10create_tag */ void fpcCtTg_ToCreateQ(create_tag* i_createTag) { - cTg_Addition(&g_fpcCtTg_Queue, &i_createTag->mBase); + cTg_Addition(&g_fpcCtTg_Queue, &i_createTag->base); } /* 80020E64-80020E84 0020+00 s=0 e=1 z=0 None .text fpcCtTg_CreateQTo__FP10create_tag */ void fpcCtTg_CreateQTo(create_tag* i_createTag) { - cTg_SingleCut(&i_createTag->mBase); + cTg_SingleCut(&i_createTag->base); } /* 80020E84-80020EA8 0024+00 s=0 e=1 z=0 None .text fpcCtTg_Init__FP10create_tagPv */ s32 fpcCtTg_Init(create_tag* i_createTag, void* i_data) { - cTg_Create(&i_createTag->mBase, i_data); + cTg_Create(&i_createTag->base, i_data); return 1; -} \ No newline at end of file +} diff --git a/src/f_pc/f_pc_creator.cpp b/src/f_pc/f_pc_creator.cpp index 62f002044e..c8508d3bd8 100644 --- a/src/f_pc/f_pc_creator.cpp +++ b/src/f_pc/f_pc_creator.cpp @@ -7,23 +7,19 @@ #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_create_req.h" -// -// Declarations: -// - /* 80020EA8-80020EC8 0020+00 s=0 e=1 z=0 None .text fpcCt_IsCreatingByID__FUi */ BOOL fpcCt_IsCreatingByID(fpc_ProcID i_id) { return fpcCtRq_IsCreatingByID(i_id); } /* 80020EC8-80020EEC 0024+00 s=0 e=1 z=0 None .text fpcCt_IsDoing__FP18base_process_class */ -s32 fpcCt_IsDoing(base_process_class* i_proc) { - return fpcCtRq_IsDoing(i_proc->mpCtRq); +BOOL fpcCt_IsDoing(base_process_class* i_proc) { + return fpcCtRq_IsDoing(i_proc->create_req); } /* 80020EEC-80020F10 0024+00 s=0 e=1 z=0 None .text fpcCt_Abort__FP18base_process_class */ BOOL fpcCt_Abort(base_process_class* i_proc) { - return fpcCtRq_Cancel(i_proc->mpCtRq); + return fpcCtRq_Cancel(i_proc->create_req); } /* 80020F10-80020F30 0020+00 s=0 e=1 z=0 None .text fpcCt_Handler__Fv */ diff --git a/src/f_pc/f_pc_delete_tag.cpp b/src/f_pc/f_pc_delete_tag.cpp index 63beb3e5dd..6e4b91f584 100644 --- a/src/f_pc/f_pc_delete_tag.cpp +++ b/src/f_pc/f_pc_delete_tag.cpp @@ -5,34 +5,33 @@ #include "SSystem/SComponent/c_list.h" #include "f_pc/f_pc_delete_tag.h" -#include "global.h" -/* ############################################################################################## */ /* 803A39A0-803A39B0 000C+04 s=2 e=1 z=0 None .data g_fpcDtTg_Queue */ node_list_class g_fpcDtTg_Queue = {NULL, NULL, 0}; /* 80020F30-80020F48 0018+00 s=0 e=1 z=0 None .text fpcDtTg_IsEmpty__Fv */ BOOL fpcDtTg_IsEmpty() { - return checkEqual(g_fpcDtTg_Queue.mSize, 0); + return g_fpcDtTg_Queue.mSize == 0 ? TRUE : FALSE; } /* 80020F48-80020F7C 0034+00 s=1 e=1 z=0 None .text fpcDtTg_ToDeleteQ__FP16delete_tag_class */ void fpcDtTg_ToDeleteQ(delete_tag_class* i_deleteTag) { - i_deleteTag->mTimer = 1; - cTg_Addition(&g_fpcDtTg_Queue, &i_deleteTag->mBase); + i_deleteTag->timer = 1; + cTg_Addition(&g_fpcDtTg_Queue, &i_deleteTag->base); } /* 80020F7C-80020F9C 0020+00 s=1 e=0 z=0 None .text fpcDtTg_DeleteQTo__FP16delete_tag_class */ void fpcDtTg_DeleteQTo(delete_tag_class* i_deleteTag) { - cTg_SingleCut(&i_deleteTag->mBase); + cTg_SingleCut(&i_deleteTag->base); } /* 80020F9C-8002101C 0080+00 s=0 e=1 z=0 None .text fpcDtTg_Do__FP16delete_tag_classPFPv_i */ s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) { - if (i_deleteTag->mTimer <= 0) { + if (i_deleteTag->timer <= 0) { s32 ret; fpcDtTg_DeleteQTo(i_deleteTag); - ret = i_func(i_deleteTag->mBase.mpTagData); + + ret = i_func(i_deleteTag->base.mpTagData); if (ret == 0) { fpcDtTg_ToDeleteQ(i_deleteTag); return 0; @@ -40,13 +39,13 @@ s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) { return 1; } } else { - i_deleteTag->mTimer--; + i_deleteTag->timer--; return 0; } } /* 8002101C-80021040 0024+00 s=0 e=1 z=0 None .text fpcDtTg_Init__FP16delete_tag_classPv */ s32 fpcDtTg_Init(delete_tag_class* i_deleteTag, void* i_data) { - cTg_Create(&i_deleteTag->mBase, i_data); + cTg_Create(&i_deleteTag->base, i_data); return 1; -} \ No newline at end of file +} diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp index b0eac423ea..1f66d6abb0 100644 --- a/src/f_pc/f_pc_deletor.cpp +++ b/src/f_pc/f_pc_deletor.cpp @@ -9,6 +9,7 @@ #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_load.h" #include "f_pc/f_pc_node.h" +#include "JSystem/JUtility/JUTAssert.h" /* 80021040-80021060 0020+00 s=0 e=1 z=0 None .text fpcDt_IsComplete__Fv */ BOOL fpcDt_IsComplete() { @@ -18,95 +19,101 @@ BOOL fpcDt_IsComplete() { /* 80021060-800210D4 0074+00 s=1 e=0 z=0 None .text fpcDt_deleteMethod__FP18base_process_class */ s32 fpcDt_deleteMethod(base_process_class* i_proc) { - layer_class* layer = i_proc->mDtTg.mpLayer; - s16 typeID = i_proc->mBsTypeId; + layer_class* layer = i_proc->delete_tag.layer; + s16 profname = i_proc->profname; fpcLy_SetCurrentLayer(layer); - fpcLnTg_QueueTo(&i_proc->mLnTg); + fpcLnTg_QueueTo(&i_proc->line_tag_); + if (fpcBs_Delete(i_proc) == 1) { fpcLy_DeletedMesg(layer); - fpcLd_Free(typeID); + fpcLd_Free(profname); return 1; - } else { - return 0; } + + return 0; } /* 800210D4-8002110C 0038+00 s=0 e=1 z=0 None .text fpcDt_Handler__Fv */ -void fpcDt_Handler(void) { +void fpcDt_Handler() { cLsIt_Method(&g_fpcDtTg_Queue, (cNdIt_MethodFunc)fpcDtTg_Do, fpcDt_deleteMethod); } /* 8002110C-80021188 007C+00 s=1 e=0 z=0 None .text fpcDt_ToQueue__FP18base_process_class */ s32 fpcDt_ToQueue(base_process_class* i_proc) { - if (i_proc->mUnk0 != 1 && fpcBs_IsDelete(i_proc) == 1) { - if (fpcPi_IsInQueue(&i_proc->mPi) == 1) { - fpcPi_Delete(&i_proc->mPi); + if (i_proc->unk_0xA != 1 && fpcBs_IsDelete(i_proc) == 1) { + if (fpcPi_IsInQueue(&i_proc->priority) == 1) { + fpcPi_Delete(&i_proc->priority); } - i_proc->mDtTg.mpLayer = i_proc->mLyTg.mpLayer; - fpcDtTg_ToDeleteQ(&i_proc->mDtTg); - fpcLy_DeletingMesg(i_proc->mLyTg.mpLayer); + + i_proc->delete_tag.layer = i_proc->layer_tag.layer; + fpcDtTg_ToDeleteQ(&i_proc->delete_tag); + fpcLy_DeletingMesg(i_proc->layer_tag.layer); return 1; - } else { - return 0; } + + return 0; } /* 80021188-800212A4 011C+00 s=1 e=0 z=0 None .text fpcDt_ToDeleteQ__FP18base_process_class */ s32 fpcDt_ToDeleteQ(base_process_class* i_proc) { - if (i_proc->mUnk0 == 1) { + if (i_proc->unk_0xA == 1) { return 0; - } else { - if (cTg_IsUse(&i_proc->mDtTg.mBase) != 0) { - return 1; - } else { - if (fpcBs_Is_JustOfType(g_fpcNd_type, i_proc->mSubType)) { - process_node_class* procNode = (process_node_class*)i_proc; - if (fpcNd_IsDeleteTiming(procNode) == 0) { - return 0; - } else { - layer_class* layer = &procNode->mLayer; - fpcLy_Cancel(layer); - if (fpcLyIt_OnlyHereLY(layer, (fpcLyIt_OnlyHereFunc)fpcDt_ToDeleteQ, NULL) == 0) - { - return 0; - } - } - } + } - if (fpcDt_ToQueue(i_proc) == 1) { - // return type has to be BOOL - if (fpcEx_IsExist(i_proc->mBsPcId) == 1) { - if (fpcEx_ExecuteQTo(i_proc) == 0) { - return 0; - } - } else { - // return type is wrong, has to be BOOL - if (fpcCt_Abort(i_proc) == 0) { - return 0; - } - } - i_proc->mInitState = 3; - return 1; - } else { + if (cTg_IsUse(&i_proc->delete_tag.base)) { + return 1; + } + + if (fpcBs_Is_JustOfType(g_fpcNd_type, i_proc->subtype)) { + process_node_class* node = (process_node_class*)i_proc; + if (fpcNd_IsDeleteTiming(node) == 0) { + return 0; + } + + layer_class* layer = &node->layer; + + if (fpcLy_Cancel(layer) == 0) { + JUT_ASSERT(0); + } + + + if (fpcLyIt_OnlyHereLY(layer, (fpcLyIt_OnlyHereFunc)fpcDt_ToDeleteQ, NULL) == 0) + { + return 0; + } + } + + if (fpcDt_ToQueue(i_proc) == 1) { + if (fpcEx_IsExist(i_proc->id) == 1) { + if (fpcEx_ExecuteQTo(i_proc) == 0) { + return 0; + } + } else { + if (fpcCt_Abort(i_proc) == 0) { return 0; } } + + i_proc->init_state = 3; + return 1; } + + return 0; } /* 800212A4-80021308 0064+00 s=0 e=3 z=0 None .text fpcDt_Delete__FPv */ s32 fpcDt_Delete(void* i_proc) { - base_process_class* proc = static_cast(i_proc); + base_process_class* proc = (base_process_class*)i_proc; if (proc != NULL) { - if (fpcCt_IsDoing(proc) == 1) + if (fpcCt_IsDoing(proc) == TRUE) return 0; - if (proc->mInitState == 3) + if (proc->init_state == 3) return 0; return fpcDt_ToDeleteQ(proc); - } else { - return 1; } -} \ No newline at end of file + + return 1; +} diff --git a/src/f_pc/f_pc_draw.cpp b/src/f_pc/f_pc_draw.cpp index 5deaed5c03..04d2826e6b 100644 --- a/src/f_pc/f_pc_draw.cpp +++ b/src/f_pc/f_pc_draw.cpp @@ -12,29 +12,31 @@ /* 80023954-800239F4 00A0+00 s=0 e=1 z=0 None .text fpcDw_Execute__FP18base_process_class */ s32 fpcDw_Execute(base_process_class* i_proc) { if (!fpcPause_IsEnable(i_proc, 2)) { - layer_class* curLay; + layer_class* save_layer; s32 ret; process_method_func draw_func; - curLay = fpcLy_CurrentLayer(); - if (fpcBs_Is_JustOfType(g_fpcLf_type, i_proc->mSubType)) { - draw_func = ((leafdraw_method_class*)i_proc->mpPcMtd)->mpDrawFunc; + + save_layer = fpcLy_CurrentLayer(); + if (fpcBs_Is_JustOfType(g_fpcLf_type, i_proc->subtype)) { + draw_func = ((leafdraw_method_class*)i_proc->methods)->draw_method; } else { - draw_func = ((nodedraw_method_class*)i_proc->mpPcMtd)->mpDrawFunc; + draw_func = ((nodedraw_method_class*)i_proc->methods)->draw_method; } - fpcLy_SetCurrentLayer(i_proc->mLyTg.mpLayer); + + fpcLy_SetCurrentLayer(i_proc->layer_tag.layer); ret = draw_func(i_proc); - fpcLy_SetCurrentLayer(curLay); + fpcLy_SetCurrentLayer(save_layer); return ret; - } else { - return 0; } + + return 0; } /* 800239F4-80023A48 0054+00 s=0 e=2 z=10 None .text fpcDw_Handler__FPFPFPvPv_i_iPFPvPv_i */ -s32 fpcDw_Handler(fpcDw_HandlerFuncFunc param_1, fpcDw_HandlerFunc param_2) { +s32 fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func) { s32 ret; cAPIGph_BeforeOfDraw(); - ret = param_1(param_2); + ret = i_iterHandler(i_func); cAPIGph_AfterOfDraw(); return ret; -} \ No newline at end of file +} diff --git a/src/f_pc/f_pc_draw_priority.cpp b/src/f_pc/f_pc_draw_priority.cpp index 698bb5ea94..73f96690bd 100644 --- a/src/f_pc/f_pc_draw_priority.cpp +++ b/src/f_pc/f_pc_draw_priority.cpp @@ -6,16 +6,16 @@ #include "f_pc/f_pc_draw_priority.h" /* 80021308-80021310 0008+00 s=0 e=1 z=0 None .text fpcDwPi_Get__FPC19draw_priority_class */ -s16 fpcDwPi_Get(const draw_priority_class* i_drawPrioClass) { - return i_drawPrioClass->mPriority; +s16 fpcDwPi_Get(const draw_priority_class* i_drawpriority) { + return i_drawpriority->priority; } /* 80021310-80021318 0008+00 s=1 e=0 z=0 None .text fpcDwPi_Set__FP19draw_priority_classs */ -void fpcDwPi_Set(draw_priority_class* i_drawPrioClass, s16 i_priority) { - i_drawPrioClass->mPriority = i_priority; +void fpcDwPi_Set(draw_priority_class* i_drawpriority, s16 i_priority) { + i_drawpriority->priority = i_priority; } /* 80021318-80021338 0020+00 s=0 e=1 z=0 None .text fpcDwPi_Init__FP19draw_priority_classs */ -void fpcDwPi_Init(draw_priority_class* i_drawPrioClass, s16 i_priority) { - fpcDwPi_Set(i_drawPrioClass, i_priority); -} \ No newline at end of file +void fpcDwPi_Init(draw_priority_class* i_drawpriority, s16 i_priority) { + fpcDwPi_Set(i_drawpriority, i_priority); +} diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp index 0327d6e729..c0e0c53239 100644 --- a/src/f_pc/f_pc_executor.cpp +++ b/src/f_pc/f_pc_executor.cpp @@ -28,27 +28,28 @@ BOOL fpcEx_IsExist(fpc_ProcID i_id) { /* 800213C4-80021418 0054+00 s=0 e=1 z=0 None .text fpcEx_Execute__FP18base_process_class */ s32 fpcEx_Execute(base_process_class* i_proc) { - if (i_proc->mInitState != 2 || fpcPause_IsEnable(i_proc, 1) == 1) + if (i_proc->init_state != 2 || fpcPause_IsEnable(i_proc, 1) == TRUE) return 0; + return fpcBs_Execute(i_proc); } /* 80021418-800214C4 00AC+00 s=1 e=0 z=0 None .text fpcEx_ToLineQ__FP18base_process_class */ s32 fpcEx_ToLineQ(base_process_class* i_proc) { - layer_class* pLayer = i_proc->mLyTg.mpLayer; - base_process_class* pLayerPcNode = &pLayer->mpPcNode->mBase; + layer_class* layer = i_proc->layer_tag.layer; + base_process_class* process = &layer->process_node->base; - if (pLayer->mLayerID == 0 || cTg_IsUse(&pLayerPcNode->mLnTg.mBase) == TRUE) { - s32 ret = fpcLnTg_ToQueue(&i_proc->mLnTg, i_proc->mPi.mInfoCurr.mListID); + if (layer->layer_id == fpcLy_ROOT_e || cTg_IsUse(&process->line_tag_.base) == TRUE) { + s32 ret = fpcLnTg_ToQueue(&i_proc->line_tag_, i_proc->priority.current_info.list_id); if (ret == 0) { - fpcLyTg_QueueTo(&i_proc->mLyTg); + fpcLyTg_QueueTo(&i_proc->layer_tag); return 0; } - i_proc->mInitState = 2; - if (fpcBs_Is_JustOfType(g_fpcNd_type, i_proc->mSubType)) { - process_node_class* pNode = (process_node_class*)i_proc; - fpcLyIt_OnlyHere(&pNode->mLayer, (fpcLyIt_OnlyHereFunc)fpcEx_ToLineQ, pNode); + i_proc->init_state = 2; + if (fpcBs_Is_JustOfType(g_fpcNd_type, i_proc->subtype)) { + process_node_class* node = (process_node_class*)i_proc; + fpcLyIt_OnlyHere(&node->layer, (fpcLyIt_OnlyHereFunc)fpcEx_ToLineQ, node); } return 1; @@ -60,26 +61,26 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) { /* 800214C4-80021510 004C+00 s=0 e=1 z=0 None .text fpcEx_ExecuteQTo__FP18base_process_class */ s32 fpcEx_ExecuteQTo(base_process_class* i_proc) { - s32 ret = fpcLyTg_QueueTo(&i_proc->mLyTg); + s32 ret = fpcLyTg_QueueTo(&i_proc->layer_tag); if (ret == 1) { - i_proc->mInitState = 3; + i_proc->init_state = 3; return 1; - } else { - return 0; } + + return 0; } /* 80021510-80021568 0058+00 s=0 e=1 z=0 None .text fpcEx_ToExecuteQ__FP18base_process_class */ s32 fpcEx_ToExecuteQ(base_process_class* i_proc) { - s32 ret = fpcLyTg_ToQueue(&i_proc->mLyTg, i_proc->mPi.mInfoCurr.mLayer, - i_proc->mPi.mInfoCurr.mListID, i_proc->mPi.mInfoCurr.mListPrio); + s32 ret = fpcLyTg_ToQueue(&i_proc->layer_tag, i_proc->priority.current_info.layer_id, + i_proc->priority.current_info.list_id, i_proc->priority.current_info.list_priority); if (ret == 1) { fpcEx_ToLineQ(i_proc); return 1; - } else { - return 0; } + + return 0; } /* 80021568-80021588 0020+00 s=0 e=1 z=0 None .text fpcEx_Handler__FPFPvPv_i */ diff --git a/src/f_pc/f_pc_fstcreate_req.cpp b/src/f_pc/f_pc_fstcreate_req.cpp index 13f8982a9a..3d0703d218 100644 --- a/src/f_pc/f_pc_fstcreate_req.cpp +++ b/src/f_pc/f_pc_fstcreate_req.cpp @@ -10,12 +10,12 @@ /* 80023A48-80023A98 0050+00 s=1 e=3 z=52 None .text fpcFCtRq_Do__FP19fast_create_request */ s32 fpcFCtRq_Do(fast_create_request* i_createReq) { - if (i_createReq->mpFastCreateFunc != NULL && - i_createReq->mpFastCreateFunc(i_createReq->mBase.mpRes, i_createReq->mpFastCreateData) == 0) + if (i_createReq->create_func != NULL && + i_createReq->create_func(i_createReq->base.process, i_createReq->data) == 0) { - return 3; + return cPhs_UNK3_e; } else { - return 4; + return cPhs_COMPLEATE_e; } } @@ -27,32 +27,36 @@ s32 fpcFCtRq_Delete(fast_create_request* i_createReq) { /* 80023AA0-80023B70 00D0+00 s=0 e=3 z=43 None .text * fpcFCtRq_Request__FP11layer_classsPFPvPv_iPvPv */ -base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procTypeID, - fstCreateFunc i_createFunc, void* i_createData, void* pData) { +base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procname, + fstCreateFunc i_createFunc, void* i_createData, void* i_append) { static create_request_method_class submethod = {(cPhs__Handler)fpcFCtRq_Do, NULL, (process_method_func)fpcFCtRq_Delete}; - if (!fpcLd_Use(i_procTypeID)) { - return NULL; - } else { - fast_create_request* request = - (fast_create_request*)fpcCtRq_Create(i_layer, 0x50, &submethod); - if (request != NULL) { - base_process_class* proc; - fpcLy_SetCurrentLayer(i_layer); - proc = fpcBs_Create(i_procTypeID, fpcBs_MakeOfId(), pData); - if (proc != NULL) { - proc->mpCtRq = (struct create_request*)request; - request->mBase.mpRes = proc; - request->mBase.mBsPcId = proc->mBsPcId; - if (fpcBs_SubCreate(proc) == 2) { - request->mpFastCreateFunc = i_createFunc; - request->mpFastCreateData = i_createData; - return proc; - } - } - fpcCtRq_Cancel(&request->mBase); - } + if (!fpcLd_Use(i_procname)) { return NULL; } -} \ No newline at end of file + + fast_create_request* request = + (fast_create_request*)fpcCtRq_Create(i_layer, sizeof(fast_create_request), &submethod); + if (request != NULL) { + base_process_class* proc; + fpcLy_SetCurrentLayer(i_layer); + + proc = fpcBs_Create(i_procname, fpcBs_MakeOfId(), i_append); + if (proc != NULL) { + proc->create_req = &request->base; + request->base.process = proc; + request->base.id = proc->id; + + if (fpcBs_SubCreate(proc) == 2) { + request->create_func = i_createFunc; + request->data = i_createData; + return proc; + } + } + + fpcCtRq_Cancel(&request->base); + } + + return NULL; +} diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp index 291d5cc26b..92b24cd021 100644 --- a/src/f_pc/f_pc_layer.cpp +++ b/src/f_pc/f_pc_layer.cpp @@ -3,7 +3,6 @@ * Framework - Process Layer */ -#include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_method_iter.h" #include "f_pc/f_pc_method_tag.h" @@ -17,7 +16,7 @@ void fpcLy_CancelQTo(process_method_tag_class* i_methods) { /* 800215A8-800215CC 0024+00 s=0 e=3 z=0 None .text * fpcLy_ToCancelQ__FP11layer_classP24process_method_tag_class */ s32 fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods) { - return fpcMtdTg_ToMethodQ(&i_layer->mCancelList, i_methods); + return fpcMtdTg_ToMethodQ(&i_layer->cancel_list, i_methods); } /* 800215CC-800215F8 002C+00 s=1 e=0 z=0 None .text @@ -29,13 +28,13 @@ bool fpcLy_CancelMethod(process_method_tag_class* i_layer) { /* 800215F8-8002161C 0024+00 s=0 e=1 z=0 None .text * fpcLy_IntoQueue__FP11layer_classiP16create_tag_classi */ s32 fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no) { - return cTg_InsertToTree(&i_layer->mNodeListTree, i_treeListNo, i_createTag, i_no); + return cTg_InsertToTree(&i_layer->node_tree, i_treeListNo, i_createTag, i_no); } /* 8002161C-80021640 0024+00 s=0 e=1 z=0 None .text * fpcLy_ToQueue__FP11layer_classiP16create_tag_class */ s32 fpcLy_ToQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag) { - return cTg_AdditionToTree(&i_layer->mNodeListTree, i_treeListNo, i_createTag); + return cTg_AdditionToTree(&i_layer->node_tree, i_treeListNo, i_createTag); } /* 80021640-80021664 0024+00 s=0 e=1 z=0 None .text @@ -46,57 +45,55 @@ s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) { /* 80021664-80021678 0014+00 s=0 e=1 z=0 None .text fpcLy_IsDeletingMesg__FP11layer_class */ BOOL fpcLy_IsDeletingMesg(layer_class* i_layer) { - return i_layer->counts.mDeletingCount > 0; + return i_layer->counts.delete_count > 0; } /* 80021678-80021688 0010+00 s=0 e=1 z=0 None .text fpcLy_DeletingMesg__FP11layer_class */ void fpcLy_DeletingMesg(layer_class* i_layer) { - i_layer->counts.mDeletingCount++; + i_layer->counts.delete_count++; } /* 80021688-800216A0 0018+00 s=0 e=1 z=0 None .text fpcLy_DeletedMesg__FP11layer_class */ void fpcLy_DeletedMesg(layer_class* i_layer) { - if (i_layer->counts.mDeletingCount > 0) { - i_layer->counts.mDeletingCount--; + if (i_layer->counts.delete_count > 0) { + i_layer->counts.delete_count--; } } /* 800216A0-800216B4 0014+00 s=0 e=2 z=0 None .text fpcLy_IsCreatingMesg__FP11layer_class */ BOOL fpcLy_IsCreatingMesg(layer_class* i_layer) { - return i_layer->counts.mCreatingCount > 0; + return i_layer->counts.create_count > 0; } /* 800216B4-800216C4 0010+00 s=0 e=2 z=0 None .text fpcLy_CreatingMesg__FP11layer_class */ void fpcLy_CreatingMesg(layer_class* i_layer) { - i_layer->counts.mCreatingCount++; + i_layer->counts.create_count++; } /* 800216C4-800216DC 0018+00 s=0 e=2 z=0 None .text fpcLy_CreatedMesg__FP11layer_class */ void fpcLy_CreatedMesg(layer_class* i_layer) { - if (i_layer->counts.mCreatingCount > 0) { - i_layer->counts.mCreatingCount--; + if (i_layer->counts.create_count > 0) { + i_layer->counts.create_count--; } } -/* ############################################################################################## */ /* 803A39B0-803A39DC 002C+00 s=2 e=0 z=0 None .data l_fpcLy_Crear */ layer_class l_fpcLy_Crear = { NULL, NULL, 0, 0xFFFFFFFF, NULL, 0, NULL, NULL, NULL, 0, 0, 0, }; /* 803A39DC-803A39E8 000C+00 s=3 e=0 z=0 None .data l_fpcLy_LayerList */ -node_list_class l_fpcLy_LayerList = { +static node_list_class l_fpcLy_LayerList = { NULL, NULL, 0, }; /* 800216DC-800216EC 0010+00 s=2 e=3 z=0 None .text fpcLy_RootLayer__Fv */ -layer_class* fpcLy_RootLayer(void) { +layer_class* fpcLy_RootLayer() { return (layer_class*)l_fpcLy_LayerList.mpHead; } -/* ############################################################################################## */ /* 80450D18-80450D1C 0004+00 s=2 e=0 z=0 None .sbss l_fpcLy_CurrLayer_p */ static layer_class* l_fpcLy_CurrLayer_p; @@ -114,19 +111,20 @@ layer_class* fpcLy_CurrentLayer() { layer_class* fpcLy_Search(fpc_ProcID i_id) { layer_class* layer_p = fpcLy_RootLayer(); while (layer_p != NULL) { - if (layer_p->mLayerID == i_id) { + if (layer_p->layer_id == i_id) { return layer_p; } - layer_p = (layer_class*)layer_p->mNode.mpNextNode; + layer_p = (layer_class*)layer_p->node.mpNextNode; } + return NULL; } /* 8002174C-800217BC 0070+00 s=0 e=5 z=0 None .text fpcLy_Layer__FUi */ layer_class* fpcLy_Layer(fpc_ProcID i_id) { - if (i_id == 0 || fpcLy_RootLayer()->mLayerID == i_id) { + if (i_id == 0 || fpcLy_RootLayer()->layer_id == i_id) { return fpcLy_RootLayer(); - } else if (i_id == ~2 || fpcLy_CurrentLayer()->mLayerID == i_id) { + } else if (i_id == fpcLy_CURRENT_e || fpcLy_CurrentLayer()->layer_id == i_id) { return fpcLy_CurrentLayer(); } else { return fpcLy_Search(i_id); @@ -140,40 +138,40 @@ void fpcLy_Regist(layer_class* i_layer) { /* 800217E8-8002189C 00B4+00 s=0 e=1 z=0 None .text fpcLy_Delete__FP11layer_class */ s32 fpcLy_Delete(layer_class* i_layer) { - if (i_layer->mNodeListTree.mpLists->mSize == 0 && i_layer->mCancelList.mSize == 0) { + if (i_layer->node_tree.mpLists->mSize == 0 && i_layer->cancel_list.mSize == 0) { cLs_SingleCut((node_class*)i_layer); *i_layer = l_fpcLy_Crear; return 1; - } else { - return 0; } + + return 0; } /* 8002189C-800218C8 002C+00 s=0 e=1 z=0 None .text fpcLy_Cancel__FP11layer_class */ -void fpcLy_Cancel(layer_class* i_layer) { - fpcMtdIt_Method(&i_layer->mCancelList, (fpcMtdIt_MethodFunc)fpcLy_CancelMethod); +int fpcLy_Cancel(layer_class* i_layer) { + return fpcMtdIt_Method(&i_layer->cancel_list, (fpcMtdIt_MethodFunc)fpcLy_CancelMethod); } /* 800218C8-80021A00 0138+00 s=0 e=2 z=0 None .text * fpcLy_Create__FP11layer_classPvP15node_list_classi */ void fpcLy_Create(layer_class* i_layer, void* i_node, node_list_class* i_nodeList, int i_numLists) { - void* pvVar1; - s32 iVar2; + static BOOL IsInitOfLayerList = TRUE; + static fpc_ProcID layer_id = 0; - static int IsInitOfLayerList = 1; - static int layer_id = 0; *i_layer = l_fpcLy_Crear; cNd_Create((node_class*)i_layer, NULL); - i_layer->mLayerID = layer_id++; - i_layer->mpPcNode = static_cast(i_node); - if (IsInitOfLayerList == 1) { - IsInitOfLayerList = 0; + + i_layer->layer_id = layer_id++; + i_layer->process_node = (process_node_class*)i_node; + + if (IsInitOfLayerList == TRUE) { + IsInitOfLayerList = FALSE; cLs_Create(&l_fpcLy_LayerList); fpcLy_SetCurrentLayer(i_layer); } - (i_layer->mNodeListTree).mpLists = i_nodeList; - (i_layer->mNodeListTree).mNumLists = i_numLists; - cTr_Create(&i_layer->mNodeListTree, (i_layer->mNodeListTree).mpLists, - (i_layer->mNodeListTree).mNumLists); + + i_layer->node_tree.mpLists = i_nodeList; + i_layer->node_tree.mNumLists = i_numLists; + cTr_Create(&i_layer->node_tree, i_layer->node_tree.mpLists, i_layer->node_tree.mNumLists); fpcLy_Regist(i_layer); } diff --git a/src/f_pc/f_pc_layer_iter.cpp b/src/f_pc/f_pc_layer_iter.cpp index 28d522ae25..9ffd197f0e 100644 --- a/src/f_pc/f_pc_layer_iter.cpp +++ b/src/f_pc/f_pc_layer_iter.cpp @@ -11,47 +11,49 @@ /* 80021B88-80021BC0 0038+00 s=1 e=4 z=0 None .text fpcLyIt_OnlyHere__FP11layer_classPFPvPv_iPv */ s32 fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) { - layer_iter lIter; - lIter.mpFunc = i_func; - lIter.mpUserData = i_data; - return cTrIt_Method(&i_layer->mNodeListTree, (cNdIt_MethodFunc)cTgIt_MethodCall, &lIter); + layer_iter iter; + iter.func = i_func; + iter.data = i_data; + return cTrIt_Method(&i_layer->node_tree, (cNdIt_MethodFunc)cTgIt_MethodCall, &iter); } /* 80021BC0-80021C28 0068+00 s=0 e=1 z=0 None .text fpcLyIt_OnlyHereLY__FP11layer_classPFPvPv_iPv */ s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) { s32 result; - layer_class* currentLayer = fpcLy_CurrentLayer(); + layer_class* save_layer = fpcLy_CurrentLayer(); + fpcLy_SetCurrentLayer(i_layer); result = fpcLyIt_OnlyHere(i_layer, i_func, i_data); - fpcLy_SetCurrentLayer(currentLayer); + + fpcLy_SetCurrentLayer(save_layer); return result; } /* 80021C28-80021C60 0038+00 s=0 e=3 z=0 None .text fpcLyIt_Judge__FP11layer_classPFPvPv_PvPv */ void* fpcLyIt_Judge(layer_class* i_layer, fpcLyIt_JudgeFunc i_func, void* i_data) { - layer_iter lIter; - lIter.mpFunc = i_func; - lIter.mpUserData = i_data; - return cTrIt_Judge(&i_layer->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &lIter); + layer_iter iter; + iter.func = i_func; + iter.data = i_data; + return cTrIt_Judge(&i_layer->node_tree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &iter); } /* 80021C60-80021CD4 0074+00 s=0 e=1 z=4 None .text fpcLyIt_AllJudge__FPFPvPv_PvPv */ void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc i_func, void* i_data) { - layer_iter lIter; + layer_iter iter; layer_class* current; - lIter.mpFunc = i_func; - lIter.mpUserData = i_data; + iter.func = i_func; + iter.data = i_data; current = fpcLy_RootLayer(); while (current != NULL) { void* result = - cTrIt_Judge(¤t->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &lIter); + cTrIt_Judge(¤t->node_tree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &iter); if (result != NULL) { return result; } - current = (layer_class*)current->mNode.mpNextNode; + current = (layer_class*)current->node.mpNextNode; } return NULL; -} \ No newline at end of file +} diff --git a/src/f_pc/f_pc_layer_tag.cpp b/src/f_pc/f_pc_layer_tag.cpp index d0b96f21eb..1bf427a03f 100644 --- a/src/f_pc/f_pc_layer_tag.cpp +++ b/src/f_pc/f_pc_layer_tag.cpp @@ -8,54 +8,55 @@ /* 80021CD4-80021DCC 00F8+00 s=1 e=1 z=0 None .text * fpcLyTg_ToQueue__FP26layer_management_tag_classUiUsUs */ -s32 fpcLyTg_ToQueue(layer_management_tag_class* i_LyTag, fpc_ProcID i_layerID, u16 i_listID, +s32 fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID, u16 i_listPriority) { - if (i_LyTag->mpLayer == NULL && i_layerID == -1) { + if (i_layer_tag->layer == NULL && i_layerID == fpcLy_NONE_e) { return 0; - } else { - // ghidra says i_layerID is unsigned? - if (i_layerID != -1 && i_layerID != -3 && i_LyTag->mpLayer->mLayerID != i_layerID) { - i_LyTag->mpLayer = fpcLy_Layer(i_layerID); - } - if (i_layerID == -1 || i_layerID == -3) { - s32 tmp = fpcLy_ToQueue(i_LyTag->mpLayer, i_listID, &i_LyTag->mCreateTag); - if (tmp != 0) { - i_LyTag->mNodeListID = i_listID; - i_LyTag->mNodeListIdx = tmp - 1; - return 1; - } - } else if (fpcLy_IntoQueue(i_LyTag->mpLayer, i_listID, &i_LyTag->mCreateTag, - i_listPriority) != 0) - { - i_LyTag->mNodeListID = i_listID; - i_LyTag->mNodeListIdx = i_listPriority; + } + + if (i_layerID != fpcLy_NONE_e && i_layerID != fpcLy_CURRENT_e && i_layer_tag->layer->layer_id != i_layerID) { + i_layer_tag->layer = fpcLy_Layer(i_layerID); + } + + if (i_layerID == fpcLy_NONE_e || i_layerID == fpcLy_CURRENT_e) { + s32 result = fpcLy_ToQueue(i_layer_tag->layer, i_listID, &i_layer_tag->create_tag); + if (result != 0) { + i_layer_tag->node_list_id = i_listID; + i_layer_tag->node_list_priority = result - 1; return 1; } - return 0; + } else if (fpcLy_IntoQueue(i_layer_tag->layer, i_listID, &i_layer_tag->create_tag, + i_listPriority) != 0) + { + i_layer_tag->node_list_id = i_listID; + i_layer_tag->node_list_priority = i_listPriority; + return 1; } + + return 0; } -s32 fpcLyTg_QueueTo(layer_management_tag_class* i_LyTag) { - if (fpcLy_QueueTo(i_LyTag->mpLayer, &i_LyTag->mCreateTag) == 1) { - i_LyTag->mpLayer = NULL; - i_LyTag->mNodeListID = 0xFFFF; - i_LyTag->mNodeListIdx = 0xFFFF; +s32 fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag) { + if (fpcLy_QueueTo(i_layer_tag->layer, &i_layer_tag->create_tag) == 1) { + i_layer_tag->layer = NULL; + i_layer_tag->node_list_id = 0xFFFF; + i_layer_tag->node_list_priority = 0xFFFF; return 1; - } else { - return 0; } + + return 0; } /* 80021E2C-80021EB0 0084+00 s=0 e=1 z=0 None .text * fpcLyTg_Move__FP26layer_management_tag_classUiUsUs */ -s32 fpcLyTg_Move(layer_management_tag_class* i_LyTag, fpc_ProcID i_layerID, u16 i_listID, +s32 fpcLyTg_Move(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID, u16 i_listPriority) { layer_class* layer = fpcLy_Layer(i_layerID); if (layer == NULL) { return 0; - } else if (fpcLyTg_QueueTo(i_LyTag) == 0x1) { - i_LyTag->mpLayer = layer; - return fpcLyTg_ToQueue(i_LyTag, i_layerID, i_listID, i_listPriority); + } else if (fpcLyTg_QueueTo(i_layer_tag) == 1) { + i_layer_tag->layer = layer; + return fpcLyTg_ToQueue(i_layer_tag, i_layerID, i_listID, i_listPriority); } else { return 0; } @@ -63,19 +64,20 @@ s32 fpcLyTg_Move(layer_management_tag_class* i_LyTag, fpc_ProcID i_layerID, u16 /* 80021EB0-80021F64 00B4+00 s=0 e=1 z=0 None .text * fpcLyTg_Init__FP26layer_management_tag_classUiPv */ -s32 fpcLyTg_Init(layer_management_tag_class* i_LyTag, fpc_ProcID i_id, void* i_data) { +s32 fpcLyTg_Init(layer_management_tag_class* i_layer_tag, fpc_ProcID i_id, void* i_data) { static layer_management_tag_class crear = { NULL, NULL, NULL, NULL, 0, NULL, 0xFFFF, 0xFFFF, }; layer_class* layer; - *i_LyTag = crear; - cTg_Create(&i_LyTag->mCreateTag, i_data); + *i_layer_tag = crear; + cTg_Create(&i_layer_tag->create_tag, i_data); + layer = fpcLy_Layer(i_id); if (layer != NULL) { - i_LyTag->mpLayer = layer; + i_layer_tag->layer = layer; return 1; - } else { - return 0; } + + return 0; } diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index 36356bc03b..52cebcc4bc 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -7,63 +7,62 @@ /* 80021A00-80021A24 0024+00 s=0 e=4 z=2 None .text fpcLf_GetPriority__FPC14leafdraw_class */ s16 fpcLf_GetPriority(const leafdraw_class* i_leaf) { - return fpcDwPi_Get(&i_leaf->mDwPi); + return fpcDwPi_Get(&i_leaf->draw_priority); } /* 80021A24-80021A48 0024+00 s=1 e=6 z=0 None .text fpcLf_DrawMethod__FP21leafdraw_method_classPv */ -s32 fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_data) { - return fpcMtd_Method(i_methods->mpDrawFunc, i_data); +s32 fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_process) { + return fpcMtd_Method(i_methods->draw_method, i_process); } /* 80021A48-80021A80 0038+00 s=1 e=0 z=0 None .text fpcLf_Draw__FP14leafdraw_class */ s32 fpcLf_Draw(leafdraw_class* i_leaf) { s32 ret = 0; - if (i_leaf->mbUnk0 == 0) - ret = fpcLf_DrawMethod(i_leaf->mpDrawMtd, i_leaf); + if (i_leaf->unk_0xBC == 0) + ret = fpcLf_DrawMethod(i_leaf->leaf_methods, i_leaf); return ret; } /* 80021A80-80021AA8 0028+00 s=1 e=0 z=0 None .text fpcLf_Execute__FP14leafdraw_class */ s32 fpcLf_Execute(leafdraw_class* i_leaf) { - return fpcMtd_Execute(&i_leaf->mpDrawMtd->mBase, i_leaf); + return fpcMtd_Execute(&i_leaf->leaf_methods->base, i_leaf); } /* 80021AA8-80021AD0 0028+00 s=1 e=0 z=0 None .text fpcLf_IsDelete__FP14leafdraw_class */ s32 fpcLf_IsDelete(leafdraw_class* i_leaf) { - return fpcMtd_IsDelete(&i_leaf->mpDrawMtd->mBase, i_leaf); + return fpcMtd_IsDelete(&i_leaf->leaf_methods->base, i_leaf); } /* 80021AD0-80021B14 0044+00 s=1 e=0 z=0 None .text fpcLf_Delete__FP14leafdraw_class */ s32 fpcLf_Delete(leafdraw_class* i_leaf) { - s32 ret = fpcMtd_Delete(&i_leaf->mpDrawMtd->mBase, i_leaf); + s32 ret = fpcMtd_Delete(&i_leaf->leaf_methods->base, i_leaf); if (ret == 1) { - i_leaf->mBase.mSubType = 0; + i_leaf->base.subtype = 0; } return ret; } -/* ############################################################################################## */ /* 80450D30-80450D38 0004+04 s=1 e=1 z=0 None .sbss g_fpcLf_type */ int g_fpcLf_type; /* 80021B14-80021B88 0074+00 s=1 e=0 z=0 None .text fpcLf_Create__FP14leafdraw_class */ s32 fpcLf_Create(leafdraw_class* i_leaf) { - leaf_process_profile_definition* profDef; - if (i_leaf->mBase.mInitState == 0) { - profDef = (leaf_process_profile_definition*)i_leaf->mBase.mpProf; - i_leaf->mpDrawMtd = profDef->sub_method; - i_leaf->mBase.mSubType = fpcBs_MakeOfType(&g_fpcLf_type); - fpcDwPi_Init(&i_leaf->mDwPi, profDef->mPriority); - i_leaf->mbUnk0 = 0; + leaf_process_profile_definition* pprofile; + if (i_leaf->base.init_state == 0) { + pprofile = (leaf_process_profile_definition*)i_leaf->base.profile; + i_leaf->leaf_methods = pprofile->sub_method; + i_leaf->base.subtype = fpcBs_MakeOfType(&g_fpcLf_type); + fpcDwPi_Init(&i_leaf->draw_priority, pprofile->priority); + i_leaf->unk_0xBC = 0; } - return fpcMtd_Create(&i_leaf->mpDrawMtd->mBase, i_leaf); + + return fpcMtd_Create(&i_leaf->leaf_methods->base, i_leaf); } -/* ############################################################################################## */ /* 803A39E8-803A3A00 0014+04 s=0 e=27 z=756 None .data g_fpcLf_Method */ leafdraw_method_class g_fpcLf_Method = { (process_method_func)fpcLf_Create, (process_method_func)fpcLf_Delete, (process_method_func)fpcLf_Execute, (process_method_func)fpcLf_IsDelete, (process_method_func)fpcLf_Draw, -}; \ No newline at end of file +}; diff --git a/src/f_pc/f_pc_line.cpp b/src/f_pc/f_pc_line.cpp index 89f9dc77fe..c4a336ccb9 100644 --- a/src/f_pc/f_pc_line.cpp +++ b/src/f_pc/f_pc_line.cpp @@ -7,21 +7,19 @@ #include "f_pc/f_pc_node.h" #include "global.h" -/* ############################################################################################## */ /* 803F4CF0-803F4DB0 00C0+00 s=2 e=0 z=0 None .bss l_fpcLn_Line */ static node_list_class l_fpcLn_Line[16]; /* 80021F64-80021FB8 0054+00 s=0 e=1 z=0 None .text fpcLn_Create__Fv */ void fpcLn_Create() { s32 i = ARRAY_SIZE(l_fpcLn_Line); - node_list_class* pLine = l_fpcLn_Line; + node_list_class* line_node = l_fpcLn_Line; while (i-- > 0) - cLs_Create(pLine++); + cLs_Create(line_node++); } -/* ############################################################################################## */ /* 804505D8-804505E0 0008+00 s=0 e=2 z=0 None .sdata g_fpcLn_Queue */ node_lists_tree_class g_fpcLn_Queue = { l_fpcLn_Line, ARRAY_SIZE(l_fpcLn_Line), -}; \ No newline at end of file +}; diff --git a/src/f_pc/f_pc_line_iter.cpp b/src/f_pc/f_pc_line_iter.cpp index cd992557be..660d3dec1b 100644 --- a/src/f_pc/f_pc_line_iter.cpp +++ b/src/f_pc/f_pc_line_iter.cpp @@ -14,13 +14,13 @@ /* 800236C0-80023728 0068+00 s=1 e=0 z=0 None .text * fpcLnIt_MethodCall__FP16create_tag_classP13method_filter */ static s32 fpcLnIt_MethodCall(create_tag_class* i_createTag, method_filter* i_filter) { - layer_class* pLayer = static_cast(i_createTag->mpTagData)->mLyTg.mpLayer; - layer_class* pCurLayer = fpcLy_CurrentLayer(); + layer_class* layer = static_cast(i_createTag->mpTagData)->layer_tag.layer; + layer_class* save_layer = fpcLy_CurrentLayer(); s32 ret; - fpcLy_SetCurrentLayer(pLayer); + fpcLy_SetCurrentLayer(layer); ret = cTgIt_MethodCall(i_createTag, i_filter); - fpcLy_SetCurrentLayer(pCurLayer); + fpcLy_SetCurrentLayer(save_layer); return ret; } @@ -31,4 +31,4 @@ void fpcLnIt_Queue(fpcLnIt_QueueFunc i_queueFunc) { filter.mpMethodFunc = (cNdIt_MethodFunc)i_queueFunc; filter.mpUserData = NULL; cTrIt_Method(&g_fpcLn_Queue, (cNdIt_MethodFunc)fpcLnIt_MethodCall, &filter); -} \ No newline at end of file +} diff --git a/src/f_pc/f_pc_line_tag.cpp b/src/f_pc/f_pc_line_tag.cpp index 51b89f575d..8f8e59f26d 100644 --- a/src/f_pc/f_pc_line_tag.cpp +++ b/src/f_pc/f_pc_line_tag.cpp @@ -9,7 +9,7 @@ /* 800235A8-80023600 0058+00 s=0 e=1 z=0 None .text fpcLnTg_Move__FP8line_tagi */ s32 fpcLnTg_Move(line_tag* i_lineTag, int i_newListID) { - if (i_lineTag->mLineListID != i_newListID) { + if (i_lineTag->list_id != i_newListID) { fpcLnTg_QueueTo(i_lineTag); return fpcLnTg_ToQueue(i_lineTag, i_newListID); } @@ -19,16 +19,16 @@ s32 fpcLnTg_Move(line_tag* i_lineTag, int i_newListID) { /* 80023600-80023634 0034+00 s=1 e=1 z=1 None .text fpcLnTg_QueueTo__FP8line_tag */ void fpcLnTg_QueueTo(line_tag* i_lineTag) { - cTg_SingleCutFromTree(&i_lineTag->mBase); - i_lineTag->mLineListID = -1; + cTg_SingleCutFromTree(&i_lineTag->base); + i_lineTag->list_id = -1; } /* 80023634-8002368C 0058+00 s=1 e=1 z=1 None .text fpcLnTg_ToQueue__FP8line_tagi */ s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) { - s32 ret = cTg_AdditionToTree(&g_fpcLn_Queue, lineListID, &i_lineTag->mBase); + s32 ret = cTg_AdditionToTree(&g_fpcLn_Queue, lineListID, &i_lineTag->base); if (ret) { - i_lineTag->mLineListID = lineListID; + i_lineTag->list_id = lineListID; return 1; } else { return 0; @@ -37,6 +37,6 @@ s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) { /* 8002368C-800236C0 0034+00 s=0 e=1 z=0 None .text fpcLnTg_Init__FP8line_tagPv */ void fpcLnTg_Init(line_tag* i_lineTag, void* i_data) { - cTg_Create(&i_lineTag->mBase, i_data); - i_lineTag->mLineListID = -1; -} \ No newline at end of file + cTg_Create(&i_lineTag->base, i_data); + i_lineTag->list_id = -1; +} diff --git a/src/f_pc/f_pc_load.cpp b/src/f_pc/f_pc_load.cpp index cc207600b1..a45944f2bf 100644 --- a/src/f_pc/f_pc_load.cpp +++ b/src/f_pc/f_pc_load.cpp @@ -4,12 +4,9 @@ */ #include "f_pc/f_pc_load.h" +#include "c/c_dylink.h" #include "SSystem/SComponent/c_phase.h" -extern s32 cDyl_IsLinked(s16 i_procName); -extern s32 cDyl_Unlink(s16 i_procName); -extern s32 cDyl_LinkASync(s16 i_procName); - /* 80021FB8-80022008 0050+00 s=0 e=1 z=0 None .text fpcLd_Use__Fs */ BOOL fpcLd_Use(s16 i_procName) { if (fpcLd_IsLoaded(i_procName) == TRUE && fpcLd_Load(i_procName) == cPhs_COMPLEATE_e) @@ -18,25 +15,25 @@ BOOL fpcLd_Use(s16 i_procName) { } /* 80022008-8002202C 0024+00 s=1 e=0 z=0 None .text fpcLd_IsLoaded__Fs */ -s32 fpcLd_IsLoaded(s16 i_procName) { - return cDyl_IsLinked((int)i_procName); +BOOL fpcLd_IsLoaded(s16 i_procName) { + return cDyl_IsLinked((s16)i_procName); } /* 8002202C-80022050 0024+00 s=0 e=2 z=0 None .text fpcLd_Free__Fs */ void fpcLd_Free(s16 i_procName) { - cDyl_Unlink((int)i_procName); + cDyl_Unlink((s16)i_procName); } /* 80022050-800220A0 0050+00 s=1 e=1 z=0 None .text fpcLd_Load__Fs */ s32 fpcLd_Load(s16 i_procName) { - s32 phase = cDyl_LinkASync((int)i_procName); + s32 phase = cDyl_LinkASync((s16)i_procName); switch (phase) { case cPhs_COMPLEATE_e: return cPhs_COMPLEATE_e; - case 0: - return 0; + case cPhs_INIT_e: + return cPhs_INIT_e; default: return cPhs_ERROR_e; } -} \ No newline at end of file +} diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index 3c433790db..6b17d0f9b1 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -38,12 +38,12 @@ s32 fpcM_Delete(void* i_proc) { } /* 80022138-80022158 0020+00 s=0 e=6 z=43 None .text fpcM_IsCreating__FUi */ -BOOL fpcM_IsCreating(fpc_ProcID pID) { - return fpcCt_IsCreatingByID(pID); +BOOL fpcM_IsCreating(fpc_ProcID i_id) { + return fpcCt_IsCreatingByID(i_id); } /* 80022158-800222B8 0160+00 s=0 e=1 z=0 None .text fpcM_Management__FPFv_vPFv_v */ -void fpcM_Management(fpcM_ManagementFunc i_mngFunc1, fpcM_ManagementFunc i_mngFunc2) { +void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_postExecuteFn) { MtxInit(); dComIfGd_peekZdata(); @@ -68,15 +68,15 @@ void fpcM_Management(fpcM_ManagementFunc i_mngFunc1, fpcM_ManagementFunc i_mngFu fpcPi_Handler(); fpcCt_Handler(); - if (i_mngFunc1 != NULL) { - i_mngFunc1(); + if (i_preExecuteFn != NULL) { + i_preExecuteFn(); } fpcEx_Handler((fpcLnIt_QueueFunc)fpcM_Execute); fpcDw_Handler((fpcDw_HandlerFuncFunc)fpcM_DrawIterater, (fpcDw_HandlerFunc)fpcM_Draw); - if (i_mngFunc2 != NULL) { - i_mngFunc2(); + if (i_postExecuteFn != NULL) { + i_postExecuteFn(); } dComIfGp_drawSimpleModel(); @@ -99,10 +99,10 @@ void fpcM_Init() { } /* 800222F4-80022348 0054+00 s=0 e=3 z=0 None .text fpcM_FastCreate__FsPFPv_iPvPv */ -base_process_class* fpcM_FastCreate(s16 i_procTypeID, FastCreateReqFunc i_createReqFunc, - void* i_createData, void* i_data) { - return fpcFCtRq_Request(fpcLy_CurrentLayer(), i_procTypeID, (fstCreateFunc)i_createReqFunc, - i_createData, i_data); +base_process_class* fpcM_FastCreate(s16 i_procname, FastCreateReqFunc i_createReqFunc, + void* i_createData, void* i_append) { + return fpcFCtRq_Request(fpcLy_CurrentLayer(), i_procname, (fstCreateFunc)i_createReqFunc, + i_createData, i_append); } /* 80022348-8002236C 0024+00 s=0 e=1 z=0 None .text fpcM_IsPause__FPvUc */ diff --git a/src/f_pc/f_pc_method.cpp b/src/f_pc/f_pc_method.cpp index 7ff07d35d3..54c5c5e0f6 100644 --- a/src/f_pc/f_pc_method.cpp +++ b/src/f_pc/f_pc_method.cpp @@ -6,33 +6,33 @@ #include "f_pc/f_pc_method.h" /* 80022428-80022460 0038+00 s=4 e=6 z=0 None .text fpcMtd_Method__FPFPv_iPv */ -s32 fpcMtd_Method(process_method_func i_methodFunc, void* i_data) { - if (i_methodFunc != NULL) - return i_methodFunc(i_data); +s32 fpcMtd_Method(process_method_func i_method, void* i_process) { + if (i_method != NULL) + return i_method(i_process); else return 1; } /* 80022460-80022484 0024+00 s=0 e=10 z=0 None .text fpcMtd_Execute__FP20process_method_classPv */ -s32 fpcMtd_Execute(process_method_class* i_methods, void* i_data) { - return fpcMtd_Method(i_methods->mpExecuteFunc, i_data); +s32 fpcMtd_Execute(process_method_class* i_methods, void* i_process) { + return fpcMtd_Method(i_methods->execute_method, i_process); } /* 80022484-800224A8 0024+00 s=0 e=10 z=0 None .text fpcMtd_IsDelete__FP20process_method_classPv */ -s32 fpcMtd_IsDelete(process_method_class* i_methods, void* i_data) { - return fpcMtd_Method(i_methods->mpIsDeleteFunc, i_data); +s32 fpcMtd_IsDelete(process_method_class* i_methods, void* i_process) { + return fpcMtd_Method(i_methods->is_delete_method, i_process); } /* 800224A8-800224CC 0024+00 s=0 e=10 z=0 None .text fpcMtd_Delete__FP20process_method_classPv */ -s32 fpcMtd_Delete(process_method_class* i_methods, void* i_data) { - return fpcMtd_Method(i_methods->mpDeleteFunc, i_data); +s32 fpcMtd_Delete(process_method_class* i_methods, void* i_process) { + return fpcMtd_Method(i_methods->delete_method, i_process); } /* 800224CC-800224F0 0024+00 s=0 e=10 z=0 None .text fpcMtd_Create__FP20process_method_classPv */ -s32 fpcMtd_Create(process_method_class* i_methods, void* i_data) { - return fpcMtd_Method(i_methods->mpCreateFunc, i_data); -} \ No newline at end of file +s32 fpcMtd_Create(process_method_class* i_methods, void* i_process) { + return fpcMtd_Method(i_methods->create_method, i_process); +} diff --git a/src/f_pc/f_pc_method_iter.cpp b/src/f_pc/f_pc_method_iter.cpp index 045026c8b6..5f21b50e5c 100644 --- a/src/f_pc/f_pc_method_iter.cpp +++ b/src/f_pc/f_pc_method_iter.cpp @@ -8,6 +8,6 @@ /* 80023764-80023788 0024+00 s=0 e=1 z=0 None .text fpcMtdIt_Method__FP15node_list_classPFPv_i */ -void fpcMtdIt_Method(node_list_class* i_nodeList, fpcMtdIt_MethodFunc i_methods) { - cLsIt_Method(i_nodeList, (cNdIt_MethodFunc)i_methods, NULL); -} \ No newline at end of file +int fpcMtdIt_Method(node_list_class* i_nodeList, fpcMtdIt_MethodFunc i_methods) { + return cLsIt_Method(i_nodeList, (cNdIt_MethodFunc)i_methods, NULL); +} diff --git a/src/f_pc/f_pc_method_tag.cpp b/src/f_pc/f_pc_method_tag.cpp index 95728e2704..6bd58d5c89 100644 --- a/src/f_pc/f_pc_method_tag.cpp +++ b/src/f_pc/f_pc_method_tag.cpp @@ -8,26 +8,26 @@ /* 80023788-800237B8 0030+00 s=0 e=1 z=0 None .text fpcMtdTg_Do__FP24process_method_tag_class */ s32 fpcMtdTg_Do(process_method_tag_class* i_methodTag) { - return i_methodTag->mpFunc(i_methodTag->mpMthdData); + return i_methodTag->method(i_methodTag->data); } /* 800237B8-800237D8 0020+00 s=0 e=1 z=0 None .text * fpcMtdTg_ToMethodQ__FP15node_list_classP24process_method_tag_class */ -s32 fpcMtdTg_ToMethodQ(node_list_class* pList, process_method_tag_class* i_methodTag) { - return cTg_Addition(pList, &i_methodTag->mCreateTag); +s32 fpcMtdTg_ToMethodQ(node_list_class* i_nodelist, process_method_tag_class* i_methodTag) { + return cTg_Addition(i_nodelist, &i_methodTag->create_tag); } /* 800237D8-800237F8 0020+00 s=0 e=1 z=0 None .text * fpcMtdTg_MethodQTo__FP24process_method_tag_class */ void fpcMtdTg_MethodQTo(process_method_tag_class* i_methodTag) { - cTg_SingleCut(&i_methodTag->mCreateTag); + cTg_SingleCut(&i_methodTag->create_tag); } /* 800237F8-80023844 004C+00 s=0 e=3 z=0 None .text * fpcMtdTg_Init__FP24process_method_tag_classPFPv_iPv */ -s32 fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_mtdTgFunc, void* i_data) { - cTg_Create(&i_methodTag->mCreateTag, i_methodTag); - i_methodTag->mpFunc = i_mtdTgFunc; - i_methodTag->mpMthdData = i_data; +s32 fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_method, void* i_data) { + cTg_Create(&i_methodTag->create_tag, i_methodTag); + i_methodTag->method = i_method; + i_methodTag->data = i_data; return 1; -} \ No newline at end of file +} diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp index fa103b45ad..0a0156eb06 100644 --- a/src/f_pc/f_pc_node.cpp +++ b/src/f_pc/f_pc_node.cpp @@ -8,110 +8,107 @@ /* 800224F0-80022514 0024+00 s=1 e=1 z=0 None .text fpcNd_DrawMethod__FP21nodedraw_method_classPv */ -s32 fpcNd_DrawMethod(nodedraw_method_class* i_nodeMethods, void* i_data) { - return fpcMtd_Method(i_nodeMethods->mpDrawFunc, i_data); +s32 fpcNd_DrawMethod(nodedraw_method_class* i_method_class, void* i_data) { + return fpcMtd_Method(i_method_class->draw_method, i_data); } /* 80022514-80022580 006C+00 s=1 e=0 z=0 None .text fpcNd_Draw__FP18process_node_class */ s32 fpcNd_Draw(process_node_class* i_procNode) { s32 ret = 0; - if (i_procNode->mUnk0 == 0) { - layer_class* curLayer_p = fpcLy_CurrentLayer(); - fpcLy_SetCurrentLayer(&i_procNode->mLayer); - ret = fpcNd_DrawMethod(i_procNode->mpNodeMtd, i_procNode); - fpcLy_SetCurrentLayer(curLayer_p); + if (i_procNode->unk_0x1A8 == 0) { + layer_class* save_layer = fpcLy_CurrentLayer(); + fpcLy_SetCurrentLayer(&i_procNode->layer); + ret = fpcNd_DrawMethod(i_procNode->nodedraw_method, i_procNode); + fpcLy_SetCurrentLayer(save_layer); } + return ret; } /* 80022580-800225DC 005C+00 s=1 e=0 z=0 None .text fpcNd_Execute__FP18process_node_class */ s32 fpcNd_Execute(process_node_class* i_procNode) { s32 ret; - layer_class* curLayer_p = fpcLy_CurrentLayer(); - fpcLy_SetCurrentLayer(&i_procNode->mLayer); - ret = fpcMtd_Execute(&i_procNode->mpNodeMtd->mBase, i_procNode); - fpcLy_SetCurrentLayer(curLayer_p); + layer_class* save_layer = fpcLy_CurrentLayer(); + fpcLy_SetCurrentLayer(&i_procNode->layer); + ret = fpcMtd_Execute(&i_procNode->nodedraw_method->base, i_procNode); + fpcLy_SetCurrentLayer(save_layer); return ret; } -/* ############################################################################################## */ /* 80450D40-80450D48 0004+04 s=2 e=11 z=0 None .sbss g_fpcNd_type */ int g_fpcNd_type; /* 800225DC-8002265C 0080+00 s=1 e=0 z=0 None .text fpcNd_IsCreatingFromUnder__FPv */ void* fpcNd_IsCreatingFromUnder(void* i_procNode) { layer_class* layer; - process_node_class* pProcNode = static_cast(i_procNode); - if (pProcNode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, pProcNode->mBase.mSubType) != FALSE) + process_node_class* procnode = (process_node_class*)i_procNode; + if (procnode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, procnode->base.subtype) != FALSE) { - layer = &pProcNode->mLayer; - if (fpcLy_IsCreatingMesg(layer) == 0) { + layer = &procnode->layer; + if (fpcLy_IsCreatingMesg(layer) == FALSE) { return (process_node_class*)fpcLyIt_Judge( layer, (fpcLyIt_JudgeFunc)fpcNd_IsCreatingFromUnder, NULL); } else { - return pProcNode; + return procnode; } - } else { - return NULL; } + + return NULL; } -/* ############################################################################################## */ /* 804505E0-804505E8 0004+04 s=1 e=0 z=0 None .sdata g_fpcNd_IsCheckOfDeleteTiming */ -static s32 g_fpcNd_IsCheckOfDeleteTiming = 1; +BOOL g_fpcNd_IsCheckOfDeleteTiming = TRUE; /* 8002265C-8002269C 0040+00 s=0 e=2 z=0 None .text fpcNd_IsDeleteTiming__FP18process_node_class */ s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) { - if (g_fpcNd_IsCheckOfDeleteTiming == 1 && fpcNd_IsCreatingFromUnder(i_procNode) != NULL) { + if (g_fpcNd_IsCheckOfDeleteTiming == TRUE && fpcNd_IsCreatingFromUnder(i_procNode) != NULL) { return 0; - } else { - return 1; } + + return 1; } /* 8002269C-800226C4 0028+00 s=1 e=0 z=0 None .text fpcNd_IsDelete__FP18process_node_class */ s32 fpcNd_IsDelete(process_node_class* i_procNode) { - return fpcMtd_IsDelete(&i_procNode->mpNodeMtd->mBase, i_procNode); + return fpcMtd_IsDelete(&i_procNode->nodedraw_method->base, i_procNode); } /* 800226C4-80022728 0064+00 s=1 e=0 z=0 None .text fpcNd_Delete__FP18process_node_class */ s32 fpcNd_Delete(process_node_class* i_procNode) { - if ((fpcLy_IsDeletingMesg(&i_procNode->mLayer) == 0) && - fpcMtd_Delete(&i_procNode->mpNodeMtd->mBase, i_procNode) == 1) + if (!fpcLy_IsDeletingMesg(&i_procNode->layer) && + fpcMtd_Delete(&i_procNode->nodedraw_method->base, i_procNode) == 1) { - i_procNode->mBase.mSubType = 0; - return fpcLy_Delete(&i_procNode->mLayer); - } else { - return 0; + i_procNode->base.subtype = 0; + return fpcLy_Delete(&i_procNode->layer); } + + return 0; } /* 80022728-800227C4 009C+00 s=1 e=0 z=0 None .text fpcNd_Create__FP18process_node_class */ s32 fpcNd_Create(process_node_class* i_procNode) { - // this cast looks like a fake match, but it doesn't match without the cast, naive approach - // swaps r31 and r30 most likely it gets casted to another unknown struct - process_node_class* pProcNode = (process_node_class*)i_procNode; - layer_class* curLayer_p; + process_node_class* procnode = (process_node_class*)i_procNode; + layer_class* save_layer; s32 ret; - if (pProcNode->mBase.mInitState == 0) { - node_process_profile_definition* pProcProfileDef = - (node_process_profile_definition*)pProcNode->mBase.mpProf; - pProcNode->mBase.mSubType = fpcBs_MakeOfType(&g_fpcNd_type); - pProcNode->mpNodeMtd = (nodedraw_method_class*)pProcProfileDef->sub_method; - fpcLy_Create(&pProcNode->mLayer, pProcNode, pProcNode->mLayerNodeLists, 0x10); - pProcNode->mUnk0 = 0; + + if (procnode->base.init_state == 0) { + node_process_profile_definition* pprofile = (node_process_profile_definition*)procnode->base.profile; + procnode->base.subtype = fpcBs_MakeOfType(&g_fpcNd_type); + procnode->nodedraw_method = (nodedraw_method_class*)pprofile->sub_methods; + fpcLy_Create(&procnode->layer, procnode, procnode->layer_nodelist, 16); + procnode->unk_0x1A8 = 0; } - curLayer_p = fpcLy_CurrentLayer(); - fpcLy_SetCurrentLayer(&pProcNode->mLayer); - ret = fpcMtd_Create(&pProcNode->mpNodeMtd->mBase, pProcNode); - fpcLy_SetCurrentLayer(curLayer_p); + + save_layer = fpcLy_CurrentLayer(); + fpcLy_SetCurrentLayer(&procnode->layer); + ret = fpcMtd_Create(&procnode->nodedraw_method->base, procnode); + fpcLy_SetCurrentLayer(save_layer); return ret; } -/* ############################################################################################## */ /* 803A3A20-803A3A38 0014+04 s=0 e=9 z=0 None .data g_fpcNd_Method */ nodedraw_method_class g_fpcNd_Method = { (process_method_func)fpcNd_Create, (process_method_func)fpcNd_Delete, (process_method_func)fpcNd_Execute, (process_method_func)fpcNd_IsDelete, - (process_method_func)fpcNd_Draw}; \ No newline at end of file + (process_method_func)fpcNd_Draw}; diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 81d8b8fd2b..7ca99d7d84 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -10,143 +10,157 @@ #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_node.h" #include "f_pc/f_pc_stdcreate_req.h" +#include "f_pc/f_pc_manager.h" /* 800227C4-80022804 0040+00 s=1 e=0 z=0 None .text fpcNdRq_RequestQTo__FP19node_create_request */ -void fpcNdRq_RequestQTo(node_create_request* i_NdCtReq) { - fpcLy_CreatedMesg(i_NdCtReq->mpLayerClass); - fpcLy_CancelQTo(&i_NdCtReq->mProcMthCls); - cTg_SingleCut(&i_NdCtReq->mCreateTag); +void fpcNdRq_RequestQTo(node_create_request* i_request) { + fpcLy_CreatedMesg(i_request->layer); + fpcLy_CancelQTo(&i_request->method_tag); + cTg_SingleCut(&i_request->create_tag); } -/* ############################################################################################## */ /* 803A3A38-803A3A44 000C+00 s=5 e=0 z=0 None .data l_fpcNdRq_Queue */ static node_list_class l_fpcNdRq_Queue = {NULL, NULL, 0}; /* 80022804-80022850 004C+00 s=1 e=0 z=0 None .text fpcNdRq_ToRequestQ__FP19node_create_request */ -void fpcNdRq_ToRequestQ(node_create_request* i_NdCtReq) { - cTg_Addition(&l_fpcNdRq_Queue, &i_NdCtReq->mCreateTag); - fpcLy_ToCancelQ(i_NdCtReq->mpLayerClass, &i_NdCtReq->mProcMthCls); - fpcLy_CreatingMesg(i_NdCtReq->mpLayerClass); +void fpcNdRq_ToRequestQ(node_create_request* i_request) { + cTg_Addition(&l_fpcNdRq_Queue, &i_request->create_tag); + fpcLy_ToCancelQ(i_request->layer, &i_request->method_tag); + fpcLy_CreatingMesg(i_request->layer); } /* 80022850-800228A8 0058+00 s=2 e=0 z=0 None .text * fpcNdRq_phase_IsCreated__FP19node_create_request */ -s32 fpcNdRq_phase_IsCreated(node_create_request* i_NdCtReq) { - if (fpcCtRq_IsCreatingByID(i_NdCtReq->mCreatingID) == TRUE) { +s32 fpcNdRq_phase_IsCreated(node_create_request* i_request) { + if (fpcCtRq_IsCreatingByID(i_request->creating_id) == TRUE) { return cPhs_INIT_e; + } else if (fpcEx_IsExist(i_request->creating_id) == TRUE) { + return cPhs_NEXT_e; } else { - return fpcEx_IsExist(i_NdCtReq->mCreatingID) == TRUE ? 2 : 3; + return cPhs_UNK3_e; } } /* 800228A8-80022904 005C+00 s=2 e=0 z=0 None .text fpcNdRq_phase_Create__FP19node_create_request */ -s32 fpcNdRq_phase_Create(node_create_request* i_NdCtReq) { - i_NdCtReq->mCreatingID = - fpcSCtRq_Request(i_NdCtReq->mpLayerClass, i_NdCtReq->mProcName, - (stdCreateFunc)i_NdCtReq->mpNodeCrReqMthCls->mpPostMethodFunc, i_NdCtReq, - i_NdCtReq->mpUserData); - return i_NdCtReq->mCreatingID == -1 ? 3 : 2; +s32 fpcNdRq_phase_Create(node_create_request* i_request) { + i_request->creating_id = + fpcSCtRq_Request(i_request->layer, i_request->name, + (stdCreateFunc)i_request->create_req_methods->post_method, i_request, + i_request->data); + if (i_request->creating_id == fpcM_ERROR_PROCESS_ID_e) { + return cPhs_UNK3_e; + } + + return cPhs_NEXT_e; } /* 80022904-8002290C 0008+00 s=2 e=0 z=0 None .text * fpcNdRq_phase_IsDeleteTiming__FP19node_create_request */ -s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_NdCtReq) { - return 2; +s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request) { + return cPhs_NEXT_e; } /* 8002290C-8002293C 0030+00 s=2 e=0 z=0 None .text * fpcNdRq_phase_IsDeleted__FP19node_create_request */ -s32 fpcNdRq_phase_IsDeleted(node_create_request* i_NdCtReq) { - return fpcDt_IsComplete() == 0 ? cPhs_INIT_e : 2; +s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request) { + if (fpcDt_IsComplete() == FALSE) { + return cPhs_INIT_e; + } + + return cPhs_NEXT_e; } /* 8002293C-80022990 0054+00 s=2 e=0 z=0 None .text fpcNdRq_phase_Delete__FP19node_create_request */ -s32 fpcNdRq_phase_Delete(node_create_request* i_NdCtReq) { - if (i_NdCtReq->mNodeProc.mpNodeProc != NULL) { - if (fpcDt_Delete(&i_NdCtReq->mNodeProc.mpNodeProc->mBase) == 0) { +s32 fpcNdRq_phase_Delete(node_create_request* i_request) { + if (i_request->node_proc.node != NULL) { + if (fpcDt_Delete(&i_request->node_proc.node->base) == 0) { return cPhs_INIT_e; } - i_NdCtReq->mNodeProc.mpNodeProc = NULL; + i_request->node_proc.node = NULL; } - return 2; + + return cPhs_NEXT_e; } /* 80022990-800229D8 0048+00 s=1 e=0 z=0 None .text fpcNdRq_DoPhase__FP19node_create_request */ -s32 fpcNdRq_DoPhase(node_create_request* i_NdCtReq) { - s32 result = cPhs_Handler(&i_NdCtReq->mReqPhsProc, i_NdCtReq->mpPhsHandler, i_NdCtReq); - if (result == 2) { - return fpcNdRq_DoPhase(i_NdCtReq); +s32 fpcNdRq_DoPhase(node_create_request* i_request) { + s32 result = cPhs_Handler(&i_request->phase_request, i_request->phase_handler, i_request); + if (result == cPhs_NEXT_e) { + return fpcNdRq_DoPhase(i_request); } return result; } /* 800229D8-80022A3C 0064+00 s=0 e=1 z=0 None .text fpcNdRq_Execute__FP19node_create_request */ -s32 fpcNdRq_Execute(node_create_request* i_NdCtReq) { - s32 result = fpcNdRq_DoPhase(i_NdCtReq); +s32 fpcNdRq_Execute(node_create_request* i_request) { + s32 result = fpcNdRq_DoPhase(i_request); switch (result) { - case 0: - case 1: - return 0; - case 4: - return 2; - case 5: - case 3: - return 3; + case cPhs_INIT_e: + case cPhs_LOADING_e: + return cPhs_INIT_e; + case cPhs_COMPLEATE_e: + return cPhs_NEXT_e; + case cPhs_ERROR_e: + case cPhs_UNK3_e: + return cPhs_UNK3_e; default: return result; } } /* 80022A3C-80022AA4 0068+00 s=2 e=1 z=0 None .text fpcNdRq_Delete__FP19node_create_request */ -s32 fpcNdRq_Delete(node_create_request* i_NdCtReq) { - fpcNdRq_RequestQTo(i_NdCtReq); - if (i_NdCtReq->mpNodeCrReqMthCls != NULL && i_NdCtReq->mpNodeCrReqMthCls->mpUnkFunc != NULL && - fpcMtd_Method(i_NdCtReq->mpNodeCrReqMthCls->mpUnkFunc, i_NdCtReq) == 0) +s32 fpcNdRq_Delete(node_create_request* i_request) { + fpcNdRq_RequestQTo(i_request); + if (i_request->create_req_methods != NULL && i_request->create_req_methods->delete_method != NULL && + fpcMtd_Method(i_request->create_req_methods->delete_method, i_request) == 0) { return 0; } - cMl::free(i_NdCtReq); + + cMl::free(i_request); return 1; } /* 80022AA4-80022AFC 0058+00 s=2 e=0 z=0 None .text fpcNdRq_Cancel__FP19node_create_request */ -s32 fpcNdRq_Cancel(node_create_request* i_NdCtReq) { - if (i_NdCtReq->mpNodeCrReqMthCls != NULL && - fpcMtd_Method(i_NdCtReq->mpNodeCrReqMthCls->mpCancelFunc, i_NdCtReq) == 0) +s32 fpcNdRq_Cancel(node_create_request* i_request) { + if (i_request->create_req_methods != NULL && + fpcMtd_Method(i_request->create_req_methods->cancel_method, i_request) == 0) { return 0; } - return fpcNdRq_Delete(i_NdCtReq); + + return fpcNdRq_Delete(i_request); } -/* 80022AFC-80022BE4 00E8+00 s=0 e=1 z=0 None .text fpcNdRq_Handler__Fv */ #define NODE_GET_NEXT(pNode) (pNode ? pNode->mpNextNode : NULL) + +/* 80022AFC-80022BE4 00E8+00 s=0 e=1 z=0 None .text fpcNdRq_Handler__Fv */ s32 fpcNdRq_Handler() { - node_class* currentNode = l_fpcNdRq_Queue.mpHead; - while (currentNode != NULL) { - node_create_request* req = ((request_node_class*)currentNode)->mNodeCrReq; - switch (req->mpNodeCrReqMthCls->mpExecuteFunc(req)) { - case 3: - case 5: - currentNode = NODE_GET_NEXT(currentNode); + node_class* node = l_fpcNdRq_Queue.mpHead; + while (node != NULL) { + node_create_request* req = ((request_node_class*)node)->node_create_req; + switch (req->create_req_methods->execute_method(req)) { + case cPhs_UNK3_e: + case cPhs_ERROR_e: + node = NODE_GET_NEXT(node); if (fpcNdRq_Cancel(req) == 0) { return 0; } break; - case 4: - currentNode = NODE_GET_NEXT(currentNode); + case cPhs_COMPLEATE_e: + node = NODE_GET_NEXT(node); if (fpcNdRq_Delete(req) == 0) { return 0; } break; default: - currentNode = NODE_GET_NEXT(currentNode); + node = NODE_GET_NEXT(node); break; } } @@ -156,35 +170,37 @@ s32 fpcNdRq_Handler() { /* 80022BE4-80022C50 006C+00 s=3 e=0 z=0 None .text * fpcNdRq_IsPossibleTarget__FP18process_node_class */ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) { - s32 bsPcId = i_procNode->mBase.mBsPcId; - request_node_class* currentNode; - node_create_request* currentNdCr; - currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead; - while (currentNode != NULL) { - currentNdCr = currentNode->mNodeCrReq; - if ((currentNdCr->mParameter == 2 || currentNdCr->mParameter == 4 || - currentNdCr->mParameter == 1) && - currentNdCr->mNodeProc.mProcId == bsPcId) + fpc_ProcID id = i_procNode->base.id; + request_node_class* req_node; + node_create_request* create_req; + + req_node = (request_node_class*)l_fpcNdRq_Queue.mpHead; + while (req_node != NULL) { + create_req = req_node->node_create_req; + if ((create_req->parameters == 2 || create_req->parameters == 4 || + create_req->parameters == 1) && + create_req->node_proc.id == id) { return 0; } - currentNode = (request_node_class*)NODE_GET_NEXT((¤tNode->mBase)); + req_node = (request_node_class*)NODE_GET_NEXT((&req_node->node)); } return 1; } /* 80022C50-80022C9C 004C+00 s=2 e=0 z=0 None .text fpcNdRq_IsIng__FP18process_node_class */ s32 fpcNdRq_IsIng(process_node_class* i_procNode) { - request_node_class* currentNode; - node_create_request* currentNodeReq; - s32 bsPcId = i_procNode->mBase.mBsPcId; - currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead; - while (currentNode != NULL) { - currentNodeReq = currentNode->mNodeCrReq; - if (currentNodeReq->mCreatingID == bsPcId) { + request_node_class* req_node; + node_create_request* create_req; + fpc_ProcID id = i_procNode->base.id; + + req_node = (request_node_class*)l_fpcNdRq_Queue.mpHead; + while (req_node != NULL) { + create_req = req_node->node_create_req; + if (create_req->creating_id == id) { return 1; } - currentNode = (request_node_class*)NODE_GET_NEXT((¤tNode->mBase)); + req_node = (request_node_class*)NODE_GET_NEXT((&req_node->node)); } return 0; } @@ -199,12 +215,12 @@ node_create_request* fpcNdRq_Create(u32 i_requestSize) { node_create_request* req = (node_create_request*)cMl::memalignB(-4, i_requestSize); if (req != NULL) { - static int request_id = 0; + static fpc_ProcID request_id = 0; sBs_ClearArea(req, i_requestSize); *req = clear; - cTg_Create(&req->mCreateTag, req); - fpcMtdTg_Init(&req->mProcMthCls, (process_method_tag_func)fpcNdRq_Cancel, req); - req->mRequestId = request_id++; + cTg_Create(&req->create_tag, req); + fpcMtdTg_Init(&req->method_tag, (process_method_tag_func)fpcNdRq_Cancel, req); + req->request_id = request_id++; } return req; } @@ -222,12 +238,12 @@ node_create_request* fpcNdRq_ChangeNode(u32 i_requestSize, process_node_class* i if (fpcNdRq_IsPossibleTarget(i_procNode) == 1 && fpcNdRq_IsIng(i_procNode) == 0) { node_create_request* req = fpcNdRq_Create(i_requestSize); if (req != NULL) { - req->mpPhsHandler = methods; - req->mNodeProc.mpNodeProc = i_procNode; - req->mNodeProc.mProcId = i_procNode->mBase.mBsPcId; - req->mpLayerClass = i_procNode->mBase.mLyTg.mpLayer; - req->mProcName = i_procName; - req->mpUserData = i_data; + req->phase_handler = methods; + req->node_proc.node = i_procNode; + req->node_proc.id = i_procNode->base.id; + req->layer = i_procNode->base.layer_tag.layer; + req->name = i_procName; + req->data = i_data; } return req; } else { @@ -248,10 +264,10 @@ node_create_request* fpcNdRq_DeleteNode(u32 i_requestSize, process_node_class* i if (fpcNdRq_IsPossibleTarget(i_procNode) == 1 && fpcNdRq_IsIng(i_procNode) == 0) { node_create_request* req = fpcNdRq_Create(i_requestSize); if (req != NULL) { - req->mpPhsHandler = methods; - req->mNodeProc.mpNodeProc = i_procNode; - req->mNodeProc.mProcId = i_procNode->mBase.mBsPcId; - req->mpLayerClass = i_procNode->mBase.mLyTg.mpLayer; + req->phase_handler = methods; + req->node_proc.node = i_procNode; + req->node_proc.id = i_procNode->base.id; + req->layer = i_procNode->base.layer_tag.layer; } return req; } else { @@ -268,29 +284,30 @@ node_create_request* fpcNdRq_CreateNode(u32 i_requestSize, s16 i_procName, void* }; layer_class* layer = fpcLy_CurrentLayer(); - if (layer->mLayerID != 0 && fpcNdRq_IsPossibleTarget(layer->mpPcNode) == 0) { + if (layer->layer_id != fpcLy_ROOT_e && fpcNdRq_IsPossibleTarget(layer->process_node) == 0) { return NULL; - } else { - node_create_request* req = fpcNdRq_Create(i_requestSize); - if (req != NULL) { - req->mpPhsHandler = methods; - if (layer->mLayerID != 0) { - req->mNodeProc.mpNodeProc = layer->mpPcNode; - req->mNodeProc.mProcId = layer->mpPcNode->mBase.mBsPcId; - } - req->mpLayerClass = layer; - req->mProcName = i_procName; - req->mpUserData = i_data; - } - return req; } + + node_create_request* req = fpcNdRq_Create(i_requestSize); + if (req != NULL) { + req->phase_handler = methods; + if (layer->layer_id != fpcLy_ROOT_e) { + req->node_proc.node = layer->process_node; + req->node_proc.id = layer->process_node->base.id; + } + req->layer = layer; + req->name = i_procName; + req->data = i_data; + } + + return req; } /* 80022FE8-80023098 00B0+00 s=0 e=1 z=0 None .text * fpcNdRq_Request__FUliP18process_node_classsPvP32node_create_request_method_class */ node_create_request* fpcNdRq_Request(u32 i_requestSize, int i_reqType, process_node_class* i_procNode, s16 i_procName, void* i_data, - node_create_request_method_class* i_nodeCtRqMtd) { + node_create_request_method_class* i_create_req_methods) { node_create_request* req; switch (i_reqType) { case 0: @@ -307,8 +324,8 @@ node_create_request* fpcNdRq_Request(u32 i_requestSize, int i_reqType, } if (req != NULL) { - req->mParameter = i_reqType; - req->mpNodeCrReqMthCls = i_nodeCtRqMtd; + req->parameters = i_reqType; + req->create_req_methods = i_create_req_methods; fpcNdRq_ToRequestQ(req); } @@ -317,21 +334,23 @@ node_create_request* fpcNdRq_Request(u32 i_requestSize, int i_reqType, /* 80023098-80023110 0078+00 s=1 e=0 z=0 None .text fpcNdRq_ReChangeNode__FUisPv */ s32 fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data) { - request_node_class* currentNode; + request_node_class* req_node; node_create_request* found; - currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead; - while (currentNode != NULL) { - found = currentNode->mNodeCrReq; - if (found->mParameter == 2 && found->mRequestId == i_requestID) { - if (found->mCreatingID == -2) { - found->mProcName = i_procName; - found->mpUserData = i_data; + + req_node = (request_node_class*)l_fpcNdRq_Queue.mpHead; + while (req_node != NULL) { + found = req_node->node_create_req; + if (found->parameters == 2 && found->request_id == i_requestID) { + if (found->creating_id == -2) { + found->name = i_procName; + found->data = i_data; return 1; } return 0; } - currentNode = (request_node_class*)NODE_GET_NEXT((¤tNode->mBase)); + req_node = (request_node_class*)NODE_GET_NEXT((&req_node->node)); } + return 0; } diff --git a/src/f_pc/f_pc_pause.cpp b/src/f_pc/f_pc_pause.cpp index dbf32375c1..f39a3097d8 100644 --- a/src/f_pc/f_pc_pause.cpp +++ b/src/f_pc/f_pc_pause.cpp @@ -10,7 +10,7 @@ /* 80023844-80023868 0024+00 s=0 e=3 z=0 None .text fpcPause_IsEnable__FPvUc */ s32 fpcPause_IsEnable(void* i_proc, u8 i_flag) { base_process_class* pProc = (base_process_class*)i_proc; - if ((pProc->mPauseFlag & i_flag) == i_flag) { + if ((pProc->pause_flag & i_flag) == i_flag) { return 1; } else { return 0; @@ -20,11 +20,11 @@ s32 fpcPause_IsEnable(void* i_proc, u8 i_flag) { /* 80023868-800238D4 006C+00 s=0 e=1 z=0 None .text fpcPause_Enable__FPvUc */ s32 fpcPause_Enable(void* i_proc, u8 i_flag) { base_process_class* pProc = (base_process_class*)i_proc; - pProc->mPauseFlag |= i_flag; + pProc->pause_flag |= i_flag; - if (fpcBs_Is_JustOfType(g_fpcNd_type, pProc->mSubType)) { + if (fpcBs_Is_JustOfType(g_fpcNd_type, pProc->subtype)) { process_node_class* pNode = (process_node_class*)pProc; - fpcLyIt_OnlyHere(&pNode->mLayer, (fpcLyIt_OnlyHereFunc)fpcPause_Enable, + fpcLyIt_OnlyHere(&pNode->layer, (fpcLyIt_OnlyHereFunc)fpcPause_Enable, (void*)(i_flag & 0xFF)); } return 1; @@ -33,11 +33,11 @@ s32 fpcPause_Enable(void* i_proc, u8 i_flag) { /* 800238D4-80023948 0074+00 s=0 e=1 z=0 None .text fpcPause_Disable__FPvUc */ s32 fpcPause_Disable(void* i_proc, u8 i_flag) { base_process_class* pProc = (base_process_class*)i_proc; - pProc->mPauseFlag &= (0xFF - i_flag) & 0xFF; + pProc->pause_flag &= (0xFF - i_flag) & 0xFF; - if (fpcBs_Is_JustOfType(g_fpcNd_type, pProc->mSubType)) { + if (fpcBs_Is_JustOfType(g_fpcNd_type, pProc->subtype)) { process_node_class* pNode = (process_node_class*)pProc; - fpcLyIt_OnlyHere(&pNode->mLayer, (fpcLyIt_OnlyHereFunc)fpcPause_Disable, (void*)i_flag); + fpcLyIt_OnlyHere(&pNode->layer, (fpcLyIt_OnlyHereFunc)fpcPause_Disable, (void*)i_flag); } return 1; @@ -46,5 +46,5 @@ s32 fpcPause_Disable(void* i_proc, u8 i_flag) { /* 80023948-80023954 000C+00 s=0 e=1 z=0 None .text fpcPause_Init__FPv */ void fpcPause_Init(void* i_proc) { base_process_class* pProc = (base_process_class*)i_proc; - pProc->mPauseFlag = 0; -} \ No newline at end of file + pProc->pause_flag = 0; +} diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp index 9f9713faa2..f6ba909558 100644 --- a/src/f_pc/f_pc_priority.cpp +++ b/src/f_pc/f_pc_priority.cpp @@ -10,36 +10,34 @@ /* 80023130-80023150 0020+00 s=0 e=1 z=0 None .text fpcPi_IsInQueue__FP22process_priority_class */ s32 fpcPi_IsInQueue(process_priority_class* i_procPriority) { - return cTg_IsUse(&i_procPriority->mBase); + return cTg_IsUse(&i_procPriority->base); } /* 80023150-80023188 0038+00 s=1 e=0 z=0 None .text fpcPi_QueueTo__FP22process_priority_class */ s32 fpcPi_QueueTo(process_priority_class* i_procPriority) { - cTg_SingleCut(&i_procPriority->mBase); - fpcLy_CancelQTo(&i_procPriority->mMtdTag); + cTg_SingleCut(&i_procPriority->base); + fpcLy_CancelQTo(&i_procPriority->method_tag); return 1; } -/* ############################################################################################## */ /* 803F4E58-803F4E68 000C+04 s=2 e=0 z=0 None .bss l_fpcPi_Queue */ static node_list_class l_fpcPi_Queue; /* 80023188-80023214 008C+00 s=1 e=0 z=0 None .text fpcPi_ToQueue__FP22process_priority_class */ s32 fpcPi_ToQueue(process_priority_class* i_procPriority) { - u32 layer = i_procPriority->mInfoQ.mLayer; + fpc_ProcID layer = i_procPriority->queue_info.layer_id; - if (cTg_Addition(&l_fpcPi_Queue, &i_procPriority->mBase)) { - if (layer != 0xFFFFFFFD) { + if (cTg_Addition(&l_fpcPi_Queue, &i_procPriority->base)) { + if (layer != fpcLy_CURRENT_e) { layer_class* pLayer = fpcLy_Layer(layer); - if (!fpcLy_ToCancelQ(pLayer, &i_procPriority->mMtdTag)) { - cTg_SingleCut(&i_procPriority->mBase); + if (!fpcLy_ToCancelQ(pLayer, &i_procPriority->method_tag)) { + cTg_SingleCut(&i_procPriority->base); return 0; } } - return 1; } @@ -51,10 +49,10 @@ process_priority_class* fpcPi_GetFromQueue() { process_priority_class* i_procPriority = (process_priority_class*)cTg_GetFirst(&l_fpcPi_Queue); if (i_procPriority != NULL) { - base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData; - process_priority_class* pProcPi = &pProc->mPi; - fpcLy_CancelQTo(&pProcPi->mMtdTag); - return pProcPi; + base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData; + process_priority_class* ppriority = &process->priority; + fpcLy_CancelQTo(&ppriority->method_tag); + return ppriority; } return NULL; @@ -64,21 +62,21 @@ process_priority_class* fpcPi_GetFromQueue() { */ s32 fpcPi_Delete(process_priority_class* i_procPriority) { static process_priority_queue_info crear = { - 0xFFFFFFFF, - 0xFFFF, + fpcLy_NONE_e, 0xFFFF, + fpcPi_NONE_e, }; fpcPi_QueueTo(i_procPriority); - i_procPriority->mInfoQ.mLayer = crear.mLayer; - i_procPriority->mInfoQ.mListID = crear.mListID; - i_procPriority->mInfoQ.mListPrio = crear.mListPrio; + i_procPriority->queue_info.layer_id = crear.layer_id; + i_procPriority->queue_info.list_id = crear.list_id; + i_procPriority->queue_info.list_priority = crear.list_priority; return 1; } /* 800232B4-800232E8 0034+00 s=2 e=0 z=0 None .text fpcPi_IsNormal__FUiUsUs */ -s32 fpcPi_IsNormal(fpc_ProcID i_layer, u16 i_listID, u16 i_priority) { - if ((i_layer < 0xFFFFFFFE) && (i_listID < 0xFFFE) && (i_priority < 0xFFFE)) +s32 fpcPi_IsNormal(fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) { + if ((i_layerID < fpcLy_SPECIAL_e) && (i_listID < 0xFFFE) && (i_priority < fpcPi_SPECIAL_e)) return 1; return 0; @@ -86,43 +84,43 @@ s32 fpcPi_IsNormal(fpc_ProcID i_layer, u16 i_listID, u16 i_priority) { /* 800232E8-80023428 0140+00 s=0 e=3 z=0 None .text * fpcPi_Change__FP22process_priority_classUiUsUs */ -s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layer, u16 i_listID, u16 i_priority) { - base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData; - BOOL changed = 0; +s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) { + base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData; + BOOL changed = FALSE; - if (pProc->mInitState == 3) + if (process->init_state == 3) return 0; - if (!fpcPi_IsNormal(i_layer, i_listID, i_priority)) + if (!fpcPi_IsNormal(i_layerID, i_listID, i_priority)) return 0; - i_procPriority->mInfoQ.mLayer = i_procPriority->mInfoCurr.mLayer; - i_procPriority->mInfoQ.mListID = i_procPriority->mInfoCurr.mListID; - i_procPriority->mInfoQ.mListPrio = i_procPriority->mInfoCurr.mListPrio; + i_procPriority->queue_info.layer_id = i_procPriority->current_info.layer_id; + i_procPriority->queue_info.list_id = i_procPriority->current_info.list_id; + i_procPriority->queue_info.list_priority = i_procPriority->current_info.list_priority; - if (i_layer != 0xFFFFFFFD && i_procPriority->mInfoCurr.mLayer != i_layer) { - i_procPriority->mInfoQ.mLayer = i_layer; - changed = 1; + if (i_layerID != fpcLy_CURRENT_e && i_procPriority->current_info.layer_id != i_layerID) { + i_procPriority->queue_info.layer_id = i_layerID; + changed = TRUE; } - if (i_listID != 0xFFFD && i_procPriority->mInfoCurr.mListID != i_listID) { - i_procPriority->mInfoQ.mListID = i_listID; - changed = 1; + if (i_listID != 0xFFFD && i_procPriority->current_info.list_id != i_listID) { + i_procPriority->queue_info.list_id = i_listID; + changed = TRUE; } - if (i_priority != 0xFFFD && i_procPriority->mInfoCurr.mListPrio != i_priority) { - i_procPriority->mInfoQ.mListPrio = i_priority; - changed = 1; + if (i_priority != fpcPi_CURRENT_e && i_procPriority->current_info.list_priority != i_priority) { + i_procPriority->queue_info.list_priority = i_priority; + changed = TRUE; } - if (pProc->mInitState == 0 || pProc->mInitState == 1) { - i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer; - i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID; - i_procPriority->mInfoCurr.mListPrio = i_procPriority->mInfoQ.mListPrio; + if (process->init_state == 0 || process->init_state == 1) { + i_procPriority->current_info.layer_id = i_procPriority->queue_info.layer_id; + i_procPriority->current_info.list_id = i_procPriority->queue_info.list_id; + i_procPriority->current_info.list_priority = i_procPriority->queue_info.list_priority; return 1; } - if (changed == 1) + if (changed == TRUE) return fpcPi_ToQueue(i_procPriority); else return 0; @@ -132,15 +130,16 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layer, u16 s32 fpcPi_Handler() { process_priority_class* i_procPriority; while (i_procPriority = fpcPi_GetFromQueue()) { - base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData; - layer_management_tag_class* pLayerTag = &pProc->mLyTg; - line_tag* pLineTag = &pProc->mLnTg; - if (fpcLyTg_Move(pLayerTag, i_procPriority->mInfoQ.mLayer, i_procPriority->mInfoQ.mListID, - i_procPriority->mInfoQ.mListPrio) == 1) { - fpcLnTg_Move(pLineTag, i_procPriority->mInfoCurr.mListID); - i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer; - i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID; - i_procPriority->mInfoCurr.mListPrio = i_procPriority->mInfoQ.mListPrio; + base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData; + layer_management_tag_class* pLayerTag = &process->layer_tag; + line_tag* pLineTag = &process->line_tag_; + + if (fpcLyTg_Move(pLayerTag, i_procPriority->queue_info.layer_id, i_procPriority->queue_info.list_id, + i_procPriority->queue_info.list_priority) == 1) { + fpcLnTg_Move(pLineTag, i_procPriority->current_info.list_id); + i_procPriority->current_info.layer_id = i_procPriority->queue_info.layer_id; + i_procPriority->current_info.list_id = i_procPriority->queue_info.list_id; + i_procPriority->current_info.list_priority = i_procPriority->queue_info.list_priority; } else { return 0; } @@ -151,23 +150,22 @@ s32 fpcPi_Handler() { /* 800234BC-80023564 00A8+00 s=0 e=1 z=0 None .text * fpcPi_Init__FP22process_priority_classPvUiUsUs */ -s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, fpc_ProcID i_layer, u16 i_listID, +s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) { - if (!fpcPi_IsNormal(i_layer, i_listID, i_priority)) + if (!fpcPi_IsNormal(i_layerID, i_listID, i_priority)) return 0; - i_procPriority->mInfoQ.mLayer = i_layer; - i_procPriority->mInfoQ.mListID = i_listID; - i_procPriority->mInfoQ.mListPrio = i_priority; + i_procPriority->queue_info.layer_id = i_layerID; + i_procPriority->queue_info.list_id = i_listID; + i_procPriority->queue_info.list_priority = i_priority; - i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer; - i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID; - i_procPriority->mInfoCurr.mListPrio = i_procPriority->mInfoQ.mListPrio; - cTg_Create(&i_procPriority->mBase, i_data); - fpcMtdTg_Init(&i_procPriority->mMtdTag, (process_method_tag_func)fpcPi_Delete, i_procPriority); + i_procPriority->current_info.layer_id = i_procPriority->queue_info.layer_id; + i_procPriority->current_info.list_id = i_procPriority->queue_info.list_id; + i_procPriority->current_info.list_priority = i_procPriority->queue_info.list_priority; + cTg_Create(&i_procPriority->base, i_data); + fpcMtdTg_Init(&i_procPriority->method_tag, (process_method_tag_func)fpcPi_Delete, i_procPriority); return 1; } -/* ############################################################################################## */ /* 804505F0-804505F8 0008+00 s=0 e=5 z=1 None .sdata None */ s8 data_804505F0 = 0xFF; diff --git a/src/f_pc/f_pc_profile.cpp b/src/f_pc/f_pc_profile.cpp index 0c3a079734..fb3445b02e 100644 --- a/src/f_pc/f_pc_profile.cpp +++ b/src/f_pc/f_pc_profile.cpp @@ -5,11 +5,10 @@ #include "f_pc/f_pc_profile.h" -/* ############################################################################################## */ /* 80450D50-80450D58 0004+04 s=1 e=0 z=2 None .sbss g_fpcPf_ProfileList_p */ process_profile_definition** g_fpcPf_ProfileList_p; /* 80023564-80023578 0014+00 s=0 e=1 z=0 None .text fpcPf_Get__Fs */ -process_profile_definition* fpcPf_Get(s16 i_profName) { - return g_fpcPf_ProfileList_p[i_profName]; -} \ No newline at end of file +process_profile_definition* fpcPf_Get(s16 i_profname) { + return g_fpcPf_ProfileList_p[i_profname]; +} diff --git a/src/f_pc/f_pc_profile_lst.cpp b/src/f_pc/f_pc_profile_lst.cpp index 9eeb38e3ed..5d23481728 100644 --- a/src/f_pc/f_pc_profile_lst.cpp +++ b/src/f_pc/f_pc_profile_lst.cpp @@ -3,1601 +3,803 @@ * Global Profile List */ -#include "dol2asm.h" -#include "f_pc/f_pc_leaf.h" +#include "f_pc/f_pc_profile_lst.h" -extern "C" extern void* g_profile_ALINK[12 + 9 /* padding */]; -extern "C" extern void* g_profile_NO_CHG_ROOM[12]; -extern "C" extern void* g_profile_ITEM[12]; -extern "C" extern void* g_profile_CAMERA[17]; -extern "C" extern void* g_profile_CAMERA2[17 + 6 /* padding */]; -extern "C" extern void* g_profile_ENVSE[10 + 1 /* padding */]; -extern "C" extern void* g_profile_GAMEOVER[10]; -extern "C" extern void* g_profile_KANKYO[10]; -extern "C" extern void* g_profile_KYEFF[10 + 1 /* padding */]; -extern "C" extern void* g_profile_KYEFF2[10 + 1 /* padding */]; -extern "C" extern void* g_profile_KY_THUNDER[10 + 1 /* padding */]; -extern "C" extern void* g_profile_MENUWINDOW[10 + 6 /* padding */]; -extern "C" extern void* g_profile_METER2[10]; -extern "C" extern void* g_profile_MSG_OBJECT[10]; -extern "C" extern void* g_profile_OVERLAP0[10]; -extern "C" extern void* g_profile_OVERLAP1[10]; -extern "C" extern void* g_profile_OVERLAP6[10]; -extern "C" extern void* g_profile_OVERLAP7[10]; -extern "C" extern void* g_profile_OVERLAP8[10]; -extern "C" extern void* g_profile_OVERLAP9[10]; -extern "C" extern void* g_profile_OVERLAP10[10]; -extern "C" extern void* g_profile_OVERLAP11[10 + 1 /* padding */]; -extern "C" extern void* g_profile_OVERLAP2[10]; -extern "C" extern void* g_profile_OVERLAP3[10]; -extern "C" extern void* g_profile_LOGO_SCENE[10]; -extern "C" extern void* g_profile_MENU_SCENE[10]; -extern "C" extern void* g_profile_NAME_SCENE[10]; -extern "C" extern void* g_profile_NAMEEX_SCENE[10]; -extern "C" extern void* g_profile_PLAY_SCENE[10]; -extern "C" extern void* g_profile_OPENING_SCENE[10]; -extern "C" extern void* g_profile_ROOM_SCENE[10]; -extern "C" extern void* g_profile_WARNING_SCENE[10]; -extern "C" extern void* g_profile_WARNING2_SCENE[10]; -extern "C" extern void* g_profile_TIMER[10]; -extern "C" extern void* g_profile_WMARK[10 + 1 /* padding */]; -extern "C" extern void* g_profile_WPILLAR[10 + 1 /* padding */]; -extern "C" extern void* g_profile_ANDSW[12]; -extern "C" extern void* g_profile_BG[13]; -extern "C" extern void* g_profile_BG_OBJ[12]; -extern "C" extern void* g_profile_DMIDNA[12]; -extern "C" extern void* g_profile_DBDOOR[12]; -extern "C" extern void* g_profile_KNOB20[12]; -extern "C" extern void* g_profile_DOOR20[12]; -extern "C" extern void* g_profile_SPIRAL_DOOR[12]; -extern "C" extern void* g_profile_DSHUTTER[13]; -extern "C" extern void* g_profile_EP[12]; -extern "C" extern void* g_profile_HITOBJ[12]; -extern "C" extern void* g_profile_KYTAG00[12]; -extern "C" extern void* g_profile_KYTAG04[12]; -extern "C" extern void* g_profile_KYTAG17[12]; -extern "C" extern void* g_profile_OBJ_BEF[12]; -extern "C" extern void* g_profile_Obj_BurnBox[12]; -extern "C" extern void* g_profile_Obj_Carry[12]; -extern "C" extern void* g_profile_OBJ_ITO[12]; -extern "C" extern void* g_profile_Obj_Movebox[12]; -extern "C" extern void* g_profile_Obj_Swpush[12]; -extern "C" extern void* g_profile_Obj_Timer[12]; -extern "C" extern void* g_profile_PATH_LINE[13]; -extern "C" extern void* g_profile_SCENE_EXIT[13]; -extern "C" extern void* g_profile_SET_BG_OBJ[12]; -extern "C" extern void* g_profile_SWHIT0[12]; -extern "C" extern void* g_profile_TAG_ALLMATO[12]; -extern "C" extern void* g_profile_TAG_CAMERA[12]; -extern "C" extern void* g_profile_TAG_CHKPOINT[12]; -extern "C" extern void* g_profile_TAG_EVENT[12]; -extern "C" extern void* g_profile_TAG_EVT[12]; -extern "C" extern void* g_profile_TAG_EVTAREA[12]; -extern "C" extern void* g_profile_TAG_EVTMSG[12]; -extern "C" extern void* g_profile_TAG_HOWL[12]; -extern "C" extern void* g_profile_TAG_KMSG[12]; -extern "C" extern void* g_profile_TAG_LANTERN[12]; -extern "C" extern void* g_profile_Tag_Mist[12]; -extern "C" extern void* g_profile_TAG_MSG[12]; -extern "C" extern void* g_profile_TAG_PUSH[12]; -extern "C" extern void* g_profile_TAG_TELOP[12]; -extern "C" extern void* g_profile_TBOX[12]; -extern "C" extern void* g_profile_TBOX2[12]; -extern "C" extern void* g_profile_VRBOX[12]; -extern "C" extern void* g_profile_VRBOX2[12]; -extern "C" extern void* g_profile_ARROW[12]; -extern "C" extern void* g_profile_BOOMERANG[12]; -extern "C" extern void* g_profile_CROD[12]; -extern "C" extern void* g_profile_DEMO00[12]; -extern "C" extern void* g_profile_DISAPPEAR[12]; -extern "C" extern void* g_profile_MG_ROD[12]; -extern "C" extern void* g_profile_MIDNA[12]; -extern "C" extern void* g_profile_NBOMB[12]; -extern "C" extern void* g_profile_Obj_LifeContainer[12]; -extern "C" extern void* g_profile_Obj_Yousei[12]; -extern "C" extern void* g_profile_SPINNER[12]; -extern "C" extern void* g_profile_SUSPEND[12]; -extern "C" extern void* g_profile_Tag_Attp[12]; -extern "C" extern void* g_profile_ALLDIE[12]; -extern "C" extern void* g_profile_ANDSW2[12]; -extern "C" extern void* g_profile_BD[12]; -extern "C" extern void* g_profile_CANOE[12]; -extern "C" extern void* g_profile_CSTAF[12]; -extern "C" extern void* g_profile_Demo_Item[12]; -extern "C" extern void* g_profile_L1BOSS_DOOR[12]; -extern "C" extern void* g_profile_E_DN[12]; -extern "C" extern void* g_profile_E_FM[12]; -extern "C" extern void* g_profile_E_GA[12]; -extern "C" extern void* g_profile_E_HB[12]; -extern "C" extern void* g_profile_E_NEST[12]; -extern "C" extern void* g_profile_E_RD[12]; -extern "C" extern void* g_profile_ECONT[12]; -extern "C" extern void* g_profile_FR[12]; -extern "C" extern void* g_profile_GRASS[12]; -extern "C" extern void* g_profile_KYTAG05[12]; -extern "C" extern void* g_profile_KYTAG10[12]; -extern "C" extern void* g_profile_KYTAG11[12]; -extern "C" extern void* g_profile_KYTAG14[12]; -extern "C" extern void* g_profile_MG_FISH[12]; -extern "C" extern void* g_profile_NPC_BESU[12]; -extern "C" extern void* g_profile_NPC_FAIRY_SEIREI[12]; -extern "C" extern void* g_profile_NPC_FISH[12]; -extern "C" extern void* g_profile_NPC_HENNA[12]; -extern "C" extern void* g_profile_NPC_KAKASHI[12]; -extern "C" extern void* g_profile_NPC_KKRI[12]; -extern "C" extern void* g_profile_NPC_KOLIN[12]; -extern "C" extern void* g_profile_NPC_MARO[12]; -extern "C" extern void* g_profile_NPC_TARO[12]; -extern "C" extern void* g_profile_NPC_TKJ[12]; -extern "C" extern void* g_profile_Obj_BHASHI[12]; -extern "C" extern void* g_profile_Obj_BkDoor[12]; -extern "C" extern void* g_profile_Obj_BossWarp[12]; -extern "C" extern void* g_profile_Obj_Cboard[12]; -extern "C" extern void* g_profile_Obj_Digpl[12]; -extern "C" extern void* g_profile_Obj_Eff[12]; -extern "C" extern void* g_profile_OBJ_FMOBJ[12]; -extern "C" extern void* g_profile_Obj_GpTaru[12]; -extern "C" extern void* g_profile_Obj_HHASHI[12]; -extern "C" extern void* g_profile_OBJ_KANBAN2[12]; -extern "C" extern void* g_profile_OBJ_KBACKET[12]; -extern "C" extern void* g_profile_Obj_KkrGate[12]; -extern "C" extern void* g_profile_Obj_KLift00[12]; -extern "C" extern void* g_profile_Tag_KtOnFire[12]; -extern "C" extern void* g_profile_Obj_Ladder[12]; -extern "C" extern void* g_profile_Obj_Lv2Candle[12]; -extern "C" extern void* g_profile_Obj_MagneArm[12]; -extern "C" extern void* g_profile_Obj_MetalBox[12]; -extern "C" extern void* g_profile_Obj_MGate[12]; -extern "C" extern void* g_profile_Obj_NamePlate[12]; -extern "C" extern void* g_profile_Obj_OnCloth[12]; -extern "C" extern void* g_profile_Obj_RopeBridge[12]; -extern "C" extern void* g_profile_Obj_SwallShutter[12]; -extern "C" extern void* g_profile_OBJ_STICK[12]; -extern "C" extern void* g_profile_Obj_StoneMark[12]; -extern "C" extern void* g_profile_Obj_Swpropeller[12]; -extern "C" extern void* g_profile_Obj_Swpush5[12]; -extern "C" extern void* g_profile_Obj_Yobikusa[12]; -extern "C" extern void* g_profile_SCENE_EXIT2[12]; -extern "C" extern void* g_profile_ShopItem[12]; -extern "C" extern void* g_profile_SQ[12]; -extern "C" extern void* g_profile_SWC00[12]; -extern "C" extern void* g_profile_Tag_CstaSw[12]; -extern "C" extern void* g_profile_Tag_AJnot[12]; -extern "C" extern void* g_profile_Tag_AttackItem[12]; -extern "C" extern void* g_profile_Tag_Gstart[12]; -extern "C" extern void* g_profile_Tag_Hinit[12]; -extern "C" extern void* g_profile_Tag_Hjump[12]; -extern "C" extern void* g_profile_Tag_Hstop[12]; -extern "C" extern void* g_profile_Tag_Lv2PrChk[12]; -extern "C" extern void* g_profile_Tag_Magne[12]; -extern "C" extern void* g_profile_Tag_Mhint[12]; -extern "C" extern void* g_profile_Tag_Mstop[12]; -extern "C" extern void* g_profile_Tag_Spring[12]; -extern "C" extern void* g_profile_Tag_Statue[12]; -extern "C" extern void* g_profile_Ykgr[12]; -extern "C" extern void* g_profile_DR[12]; -extern "C" extern void* g_profile_L7lowDr[12]; -extern "C" extern void* g_profile_L7ODR[12]; -extern "C" extern void* g_profile_B_BH[12]; -extern "C" extern void* g_profile_B_BQ[12]; -extern "C" extern void* g_profile_B_DR[12]; -extern "C" extern void* g_profile_B_DRE[12]; -extern "C" extern void* g_profile_B_DS[12]; -extern "C" extern void* g_profile_B_GG[12]; -extern "C" extern void* g_profile_B_GM[12]; -extern "C" extern void* g_profile_B_GND[12]; -extern "C" extern void* g_profile_B_GO[12]; -extern "C" extern void* g_profile_B_GOS[12]; -extern "C" extern void* g_profile_B_MGN[12]; -extern "C" extern void* g_profile_B_OB[12]; -extern "C" extern void* g_profile_B_OH[12]; -extern "C" extern void* g_profile_B_OH2[12]; -extern "C" extern void* g_profile_B_TN[12]; -extern "C" extern void* g_profile_B_YO[12]; -extern "C" extern void* g_profile_B_YOI[12]; -extern "C" extern void* g_profile_B_ZANT[12]; -extern "C" extern void* g_profile_B_ZANTM[12]; -extern "C" extern void* g_profile_B_ZANTZ[12]; -extern "C" extern void* g_profile_B_ZANTS[12]; -extern "C" extern void* g_profile_BALLOON2D[12]; -extern "C" extern void* g_profile_BULLET[12]; -extern "C" extern void* g_profile_COACH2D[12]; -extern "C" extern void* g_profile_COACH_FIRE[12]; -extern "C" extern void* g_profile_COW[12]; -extern "C" extern void* g_profile_CSTATUE[12]; -extern "C" extern void* g_profile_DO[12]; -extern "C" extern void* g_profile_BOSS_DOOR[12]; -extern "C" extern void* g_profile_L5BOSS_DOOR[12]; -extern "C" extern void* g_profile_L1MBOSS_DOOR[12]; -extern "C" extern void* g_profile_PushDoor[12]; -extern "C" extern void* g_profile_E_AI[12]; -extern "C" extern void* g_profile_E_ARROW[12]; -extern "C" extern void* g_profile_E_BA[12]; -extern "C" extern void* g_profile_E_BEE[12]; -extern "C" extern void* g_profile_E_BG[12]; -extern "C" extern void* g_profile_E_BI[12]; -extern "C" extern void* g_profile_E_BI_LEAF[12]; -extern "C" extern void* g_profile_E_BS[12]; -extern "C" extern void* g_profile_E_BU[12]; -extern "C" extern void* g_profile_E_BUG[12]; -extern "C" extern void* g_profile_E_CR[12]; -extern "C" extern void* g_profile_E_CR_EGG[12]; -extern "C" extern void* g_profile_E_DB[12]; -extern "C" extern void* g_profile_E_DB_LEAF[12]; -extern "C" extern void* g_profile_E_DD[12]; -extern "C" extern void* g_profile_E_DF[12]; -extern "C" extern void* g_profile_E_DK[12]; -extern "C" extern void* g_profile_E_DT[12]; -extern "C" extern void* g_profile_E_FB[12]; -extern "C" extern void* g_profile_E_FK[12]; -extern "C" extern void* g_profile_E_FS[12]; -extern "C" extern void* g_profile_E_FZ[12]; -extern "C" extern void* g_profile_E_GB[12]; -extern "C" extern void* g_profile_E_GE[12]; -extern "C" extern void* g_profile_E_GI[12]; -extern "C" extern void* g_profile_E_GM[12]; -extern "C" extern void* g_profile_E_GOB[12]; -extern "C" extern void* g_profile_E_GS[12]; -extern "C" extern void* g_profile_E_HB_LEAF[12]; -extern "C" extern void* g_profile_E_HM[12]; -extern "C" extern void* g_profile_E_HP[12]; -extern "C" extern void* g_profile_E_HZ[12]; -extern "C" extern void* g_profile_E_HZELDA[12]; -extern "C" extern void* g_profile_E_IS[12]; -extern "C" extern void* g_profile_E_KG[12]; -extern "C" extern void* g_profile_E_KK[12]; -extern "C" extern void* g_profile_E_KR[12]; -extern "C" extern void* g_profile_E_MB[12]; -extern "C" extern void* g_profile_E_MD[12]; -extern "C" extern void* g_profile_E_MF[12]; -extern "C" extern void* g_profile_E_MK[12]; -extern "C" extern void* g_profile_E_MK_BO[12]; -extern "C" extern void* g_profile_E_MM[12]; -extern "C" extern void* g_profile_E_MM_MT[12]; -extern "C" extern void* g_profile_E_MS[12]; -extern "C" extern void* g_profile_E_NZ[12]; -extern "C" extern void* g_profile_E_OC[12]; -extern "C" extern void* g_profile_E_OctBg[12]; -extern "C" extern void* g_profile_E_OT[12]; -extern "C" extern void* g_profile_E_PH[12]; -extern "C" extern void* g_profile_E_PM[12]; -extern "C" extern void* g_profile_E_PO[12]; -extern "C" extern void* g_profile_E_PZ[12]; -extern "C" extern void* g_profile_E_RB[12]; -extern "C" extern void* g_profile_E_RDB[12]; -extern "C" extern void* g_profile_E_RDY[12]; -extern "C" extern void* g_profile_E_S1[12]; -extern "C" extern void* g_profile_E_SB[12]; -extern "C" extern void* g_profile_E_SF[12]; -extern "C" extern void* g_profile_E_SG[12]; -extern "C" extern void* g_profile_E_SH[12]; -extern "C" extern void* g_profile_E_SM[12]; -extern "C" extern void* g_profile_E_SM2[12]; -extern "C" extern void* g_profile_E_ST[12]; -extern "C" extern void* g_profile_E_ST_LINE[12]; -extern "C" extern void* g_profile_E_SW[12]; -extern "C" extern void* g_profile_E_TH[12]; -extern "C" extern void* g_profile_E_TH_BALL[12]; -extern "C" extern void* g_profile_E_TK[12]; -extern "C" extern void* g_profile_E_TK2[12]; -extern "C" extern void* g_profile_E_TK_BALL[12]; -extern "C" extern void* g_profile_E_TT[12]; -extern "C" extern void* g_profile_E_VT[12]; -extern "C" extern void* g_profile_E_WAP[12]; -extern "C" extern void* g_profile_E_WB[12]; -extern "C" extern void* g_profile_E_WS[12]; -extern "C" extern void* g_profile_E_WW[12]; -extern "C" extern void* g_profile_E_YC[12]; -extern "C" extern void* g_profile_E_YD[12]; -extern "C" extern void* g_profile_E_YD_LEAF[12]; -extern "C" extern void* g_profile_E_YG[12]; -extern "C" extern void* g_profile_E_YH[12]; -extern "C" extern void* g_profile_E_YK[12]; -extern "C" extern void* g_profile_E_YM[12]; -extern "C" extern void* g_profile_E_YM_TAG[12]; -extern "C" extern void* g_profile_E_YMB[12]; -extern "C" extern void* g_profile_E_YR[12]; -extern "C" extern void* g_profile_E_ZH[12]; -extern "C" extern void* g_profile_E_ZM[12]; -extern "C" extern void* g_profile_E_ZS[12]; -extern "C" extern void* g_profile_FORMATION_MNG[12]; -extern "C" extern void* g_profile_GUARD_MNG[12]; -extern "C" extern void* g_profile_HORSE[12]; -extern "C" extern void* g_profile_HOZELDA[12]; -extern "C" extern void* g_profile_Izumi_Gate[12]; -extern "C" extern void* g_profile_KAGO[12]; -extern "C" extern void* g_profile_KYTAG01[12]; -extern "C" extern void* g_profile_KYTAG02[12]; -extern "C" extern void* g_profile_KYTAG03[12]; -extern "C" extern void* g_profile_KYTAG06[12]; -extern "C" extern void* g_profile_KYTAG07[12]; -extern "C" extern void* g_profile_KYTAG08[12]; -extern "C" extern void* g_profile_KYTAG09[12]; -extern "C" extern void* g_profile_KYTAG12[12]; -extern "C" extern void* g_profile_KYTAG13[12]; -extern "C" extern void* g_profile_KYTAG15[12]; -extern "C" extern void* g_profile_KYTAG16[12]; -extern "C" extern void* g_profile_MANT[12]; -extern "C" extern void* g_profile_FSHOP[12]; -extern "C" extern void* g_profile_MIRROR[12]; -extern "C" extern void* g_profile_MOVIE_PLAYER[12]; -extern "C" extern void* g_profile_MYNA[12]; -extern "C" extern void* g_profile_NI[12]; -extern "C" extern void* g_profile_NPC_ARU[12]; -extern "C" extern void* g_profile_NPC_ASH[12]; -extern "C" extern void* g_profile_NPC_ASHB[12]; -extern "C" extern void* g_profile_NPC_BANS[12]; -extern "C" extern void* g_profile_NPC_BLUENS[12]; -extern "C" extern void* g_profile_NPC_BOU[12]; -extern "C" extern void* g_profile_NPC_BOU_S[12]; -extern "C" extern void* g_profile_NPC_CD3[12]; -extern "C" extern void* g_profile_NPC_CHAT[12]; -extern "C" extern void* g_profile_NPC_CHIN[12]; -extern "C" extern void* g_profile_NPC_CLERKA[12]; -extern "C" extern void* g_profile_NPC_CLERKB[12]; -extern "C" extern void* g_profile_NPC_CLERKT[12]; -extern "C" extern void* g_profile_NPC_COACH[12]; -extern "C" extern void* g_profile_NPC_DF[12]; -extern "C" extern void* g_profile_NPC_DOC[12]; -extern "C" extern void* g_profile_NPC_DOORBOY[12]; -extern "C" extern void* g_profile_NPC_DRSOL[12]; -extern "C" extern void* g_profile_NPC_DU[12]; -extern "C" extern void* g_profile_NPC_FAIRY[12]; -extern "C" extern void* g_profile_NPC_FGUARD[12]; -extern "C" extern void* g_profile_NPC_GND[12]; -extern "C" extern void* g_profile_NPC_GRA[12]; -extern "C" extern void* g_profile_NPC_GRC[12]; -extern "C" extern void* g_profile_NPC_GRD[12]; -extern "C" extern void* g_profile_NPC_GRM[12]; -extern "C" extern void* g_profile_NPC_GRMC[12]; -extern "C" extern void* g_profile_NPC_GRO[12]; -extern "C" extern void* g_profile_NPC_GRR[12]; -extern "C" extern void* g_profile_NPC_GRS[12]; -extern "C" extern void* g_profile_NPC_GRZ[12]; -extern "C" extern void* g_profile_NPC_GUARD[12]; -extern "C" extern void* g_profile_NPC_GWOLF[12]; -extern "C" extern void* g_profile_NPC_HANJO[12]; -extern "C" extern void* g_profile_NPC_HENNA0[12]; -extern "C" extern void* g_profile_NPC_HOZ[12]; -extern "C" extern void* g_profile_NPC_IMPAL[12]; -extern "C" extern void* g_profile_NPC_INKO[12]; -extern "C" extern void* g_profile_NPC_INS[12]; -extern "C" extern void* g_profile_NPC_JAGAR[12]; -extern "C" extern void* g_profile_NPC_KASIHANA[12]; -extern "C" extern void* g_profile_NPC_KASIKYU[12]; -extern "C" extern void* g_profile_NPC_KASIMICH[12]; -extern "C" extern void* g_profile_NPC_KDK[12]; -extern "C" extern void* g_profile_NPC_KN[12]; -extern "C" extern void* g_profile_NPC_KNJ[12]; -extern "C" extern void* g_profile_NPC_KOLINB[12]; -extern "C" extern void* g_profile_NPC_KS[12]; -extern "C" extern void* g_profile_NPC_KYURY[12]; -extern "C" extern void* g_profile_NPC_LEN[12]; -extern "C" extern void* g_profile_NPC_LF[12]; -extern "C" extern void* g_profile_NPC_LUD[12]; -extern "C" extern void* g_profile_NPC_MIDP[12]; -extern "C" extern void* g_profile_NPC_MK[12]; -extern "C" extern void* g_profile_NPC_MOI[12]; -extern "C" extern void* g_profile_NPC_MOIR[12]; -extern "C" extern void* g_profile_MYNA2[12]; -extern "C" extern void* g_profile_NPC_NE[12]; -extern "C" extern void* g_profile_NPC_P2[12]; -extern "C" extern void* g_profile_NPC_PACHI_BESU[12]; -extern "C" extern void* g_profile_NPC_PACHI_MARO[12]; -extern "C" extern void* g_profile_NPC_PACHI_TARO[12]; -extern "C" extern void* g_profile_NPC_PASSER[12]; -extern "C" extern void* g_profile_NPC_PASSER2[12]; -extern "C" extern void* g_profile_NPC_POST[12]; -extern "C" extern void* g_profile_NPC_POUYA[12]; -extern "C" extern void* g_profile_NPC_PRAYER[12]; -extern "C" extern void* g_profile_NPC_RACA[12]; -extern "C" extern void* g_profile_NPC_RAFREL[12]; -extern "C" extern void* g_profile_NPC_SARU[12]; -extern "C" extern void* g_profile_NPC_SEIB[12]; -extern "C" extern void* g_profile_NPC_SEIC[12]; -extern "C" extern void* g_profile_NPC_SEID[12]; -extern "C" extern void* g_profile_NPC_SEIRA[12]; -extern "C" extern void* g_profile_NPC_SERA2[12]; -extern "C" extern void* g_profile_NPC_SEIREI[12]; -extern "C" extern void* g_profile_NPC_SHAD[12]; -extern "C" extern void* g_profile_NPC_SHAMAN[12]; -extern "C" extern void* g_profile_NPC_SHOE[12]; -extern "C" extern void* g_profile_NPC_SHOP0[12]; -extern "C" extern void* g_profile_NPC_SMARO[12]; -extern "C" extern void* g_profile_NPC_SOLA[12]; -extern "C" extern void* g_profile_NPC_SOLDIERa[12]; -extern "C" extern void* g_profile_NPC_SOLDIERb[12]; -extern "C" extern void* g_profile_NPC_SQ[12]; -extern "C" extern void* g_profile_NPC_THE[12]; -extern "C" extern void* g_profile_NPC_THEB[12]; -extern "C" extern void* g_profile_NPC_TK[12]; -extern "C" extern void* g_profile_NPC_TKC[12]; -extern "C" extern void* g_profile_NPC_TKJ2[12]; -extern "C" extern void* g_profile_NPC_TKS[12]; -extern "C" extern void* g_profile_NPC_TOBY[12]; -extern "C" extern void* g_profile_NPC_TR[12]; -extern "C" extern void* g_profile_NPC_URI[12]; -extern "C" extern void* g_profile_NPC_WORM[12]; -extern "C" extern void* g_profile_NPC_WRESTLER[12]; -extern "C" extern void* g_profile_NPC_YAMID[12]; -extern "C" extern void* g_profile_NPC_YAMIS[12]; -extern "C" extern void* g_profile_NPC_YAMIT[12]; -extern "C" extern void* g_profile_NPC_YELIA[12]; -extern "C" extern void* g_profile_NPC_YKM[12]; -extern "C" extern void* g_profile_NPC_YKW[12]; -extern "C" extern void* g_profile_NPC_ZANB[12]; -extern "C" extern void* g_profile_NPC_ZANT[12]; -extern "C" extern void* g_profile_NPC_ZELR[12]; -extern "C" extern void* g_profile_NPC_ZELRO[12]; -extern "C" extern void* g_profile_NPC_ZELDA[12]; -extern "C" extern void* g_profile_NPC_ZRA[12]; -extern "C" extern void* g_profile_NPC_ZRC[12]; -extern "C" extern void* g_profile_NPC_ZRZ[12]; -extern "C" extern void* g_profile_Obj_Lv5Key[12]; -extern "C" extern void* g_profile_Obj_Turara[12]; -extern "C" extern void* g_profile_Obj_TvCdlst[12]; -extern "C" extern void* g_profile_Obj_Ytaihou[12]; -extern "C" extern void* g_profile_Obj_AmiShutter[12]; -extern "C" extern void* g_profile_Obj_Ari[12]; -extern "C" extern void* g_profile_OBJ_AUTOMATA[12]; -extern "C" extern void* g_profile_Obj_Avalanche[12]; -extern "C" extern void* g_profile_OBJ_BALLOON[12]; -extern "C" extern void* g_profile_Obj_BarDesk[12]; -extern "C" extern void* g_profile_Obj_Batta[12]; -extern "C" extern void* g_profile_Obj_BBox[12]; -extern "C" extern void* g_profile_OBJ_BED[12]; -extern "C" extern void* g_profile_Obj_Bemos[12]; -extern "C" extern void* g_profile_Obj_Bhbridge[12]; -extern "C" extern void* g_profile_Obj_BkLeaf[12]; -extern "C" extern void* g_profile_BkyRock[12]; -extern "C" extern void* g_profile_Obj_BmWindow[12]; -extern "C" extern void* g_profile_Obj_BoomShutter[12]; -extern "C" extern void* g_profile_Obj_Bombf[12]; -extern "C" extern void* g_profile_OBJ_BOUMATO[12]; -extern "C" extern void* g_profile_OBJ_BRG[12]; -extern "C" extern void* g_profile_Obj_BsGate[12]; -extern "C" extern void* g_profile_Obj_awaPlar[12]; -extern "C" extern void* g_profile_Obj_CatDoor[12]; -extern "C" extern void* g_profile_OBJ_CB[12]; -extern "C" extern void* g_profile_Obj_ChainBlock[12]; -extern "C" extern void* g_profile_Obj_Cdoor[12]; -extern "C" extern void* g_profile_Obj_Chandelier[12]; -extern "C" extern void* g_profile_Obj_Chest[12]; -extern "C" extern void* g_profile_Obj_Cho[12]; -extern "C" extern void* g_profile_Obj_Cowdoor[12]; -extern "C" extern void* g_profile_Obj_Crope[12]; -extern "C" extern void* g_profile_Obj_CRVFENCE[12]; -extern "C" extern void* g_profile_Obj_CRVGATE[12]; -extern "C" extern void* g_profile_Obj_CRVHAHEN[12]; -extern "C" extern void* g_profile_Obj_CRVLH_DW[12]; -extern "C" extern void* g_profile_Obj_CRVLH_UP[12]; -extern "C" extern void* g_profile_Obj_CRVSTEEL[12]; -extern "C" extern void* g_profile_Obj_Crystal[12]; -extern "C" extern void* g_profile_Obj_ChainWall[12]; -extern "C" extern void* g_profile_Obj_DamCps[12]; -extern "C" extern void* g_profile_Obj_Dan[12]; -extern "C" extern void* g_profile_Obj_Digholl[12]; -extern "C" extern void* g_profile_Obj_DigSnow[12]; -extern "C" extern void* g_profile_Obj_Elevator[12]; -extern "C" extern void* g_profile_Obj_Drop[12]; -extern "C" extern void* g_profile_Obj_DUST[12]; -extern "C" extern void* g_profile_Obj_E_CREATE[12]; -extern "C" extern void* g_profile_Obj_FallObj[12]; -extern "C" extern void* g_profile_Obj_Fan[12]; -extern "C" extern void* g_profile_Obj_Fchain[12]; -extern "C" extern void* g_profile_Obj_FireWood[12]; -extern "C" extern void* g_profile_Obj_FireWood2[12]; -extern "C" extern void* g_profile_Obj_FirePillar[12]; -extern "C" extern void* g_profile_Obj_FirePillar2[12]; -extern "C" extern void* g_profile_Obj_Flag[12]; -extern "C" extern void* g_profile_Obj_Flag2[12]; -extern "C" extern void* g_profile_Obj_Flag3[12]; -extern "C" extern void* g_profile_OBJ_FOOD[12]; -extern "C" extern void* g_profile_OBJ_FW[12]; -extern "C" extern void* g_profile_OBJ_GADGET[12]; -extern "C" extern void* g_profile_Obj_GanonWall[12]; -extern "C" extern void* g_profile_Obj_GanonWall2[12]; -extern "C" extern void* g_profile_OBJ_GB[12]; -extern "C" extern void* g_profile_Obj_Geyser[12]; -extern "C" extern void* g_profile_Obj_glowSphere[12]; -extern "C" extern void* g_profile_OBJ_GM[12]; -extern "C" extern void* g_profile_Obj_GoGate[12]; -extern "C" extern void* g_profile_Obj_GOMIKABE[12]; -extern "C" extern void* g_profile_OBJ_GRA[12]; -extern "C" extern void* g_profile_GRA_WALL[12]; -extern "C" extern void* g_profile_Obj_GraRock[12]; -extern "C" extern void* g_profile_Obj_GraveStone[12]; -extern "C" extern void* g_profile_GRDWATER[12]; -extern "C" extern void* g_profile_Obj_GrzRock[12]; -extern "C" extern void* g_profile_Obj_H_Saku[12]; -extern "C" extern void* g_profile_Obj_HBarrel[12]; -extern "C" extern void* g_profile_Obj_HFtr[12]; -extern "C" extern void* g_profile_Obj_MHasu[12]; -extern "C" extern void* g_profile_Obj_Hata[12]; -extern "C" extern void* g_profile_OBJ_HB[12]; -extern "C" extern void* g_profile_Obj_HBombkoya[12]; -extern "C" extern void* g_profile_Obj_HeavySw[12]; -extern "C" extern void* g_profile_Obj_Hfuta[12]; -extern "C" extern void* g_profile_Obj_HsTarget[12]; -extern "C" extern void* g_profile_Obj_Ice_l[12]; -extern "C" extern void* g_profile_Obj_Ice_s[12]; -extern "C" extern void* g_profile_Obj_IceBlock[12]; -extern "C" extern void* g_profile_Obj_IceLeaf[12]; -extern "C" extern void* g_profile_OBJ_IHASI[12]; -extern "C" extern void* g_profile_Obj_Ikada[12]; -extern "C" extern void* g_profile_Obj_InoBone[12]; -extern "C" extern void* g_profile_Obj_ITA[12]; -extern "C" extern void* g_profile_OBJ_ITAMATO[12]; -extern "C" extern void* g_profile_Obj_Kabuto[12]; -extern "C" extern void* g_profile_Obj_Kag[12]; -extern "C" extern void* g_profile_OBJ_KAGE[12]; -extern "C" extern void* g_profile_OBJ_KAGO[12]; -extern "C" extern void* g_profile_Obj_Kaisou[12]; -extern "C" extern void* g_profile_Obj_Kam[12]; -extern "C" extern void* g_profile_Obj_Kantera[12]; -extern "C" extern void* g_profile_Obj_Kat[12]; -extern "C" extern void* g_profile_Obj_KazeNeko[12]; -extern "C" extern void* g_profile_OBJ_KBOX[12]; -extern "C" extern void* g_profile_OBJ_KEY[12]; -extern "C" extern void* g_profile_OBJ_KEYHOLE[12]; -extern "C" extern void* g_profile_OBJ_KI[12]; -extern "C" extern void* g_profile_Obj_KiPot[12]; -extern "C" extern void* g_profile_OBJ_KITA[12]; -extern "C" extern void* g_profile_Obj_KJgjs[12]; -extern "C" extern void* g_profile_Obj_KKanban[12]; -extern "C" extern void* g_profile_KN_BULLET[12]; -extern "C" extern void* g_profile_Obj_Kshutter[12]; -extern "C" extern void* g_profile_Obj_Kuw[12]; -extern "C" extern void* g_profile_Obj_KWheel00[12]; -extern "C" extern void* g_profile_Obj_KWheel01[12]; -extern "C" extern void* g_profile_Obj_KznkArm[12]; -extern "C" extern void* g_profile_Obj_Laundry[12]; -extern "C" extern void* g_profile_Obj_LndRope[12]; -extern "C" extern void* g_profile_OBJ_LBOX[12]; -extern "C" extern void* g_profile_OBJ_LP[12]; -extern "C" extern void* g_profile_Obj_Lv1Cdl00[12]; -extern "C" extern void* g_profile_Obj_Lv1Cdl01[12]; -extern "C" extern void* g_profile_Obj_Lv3Candle[12]; -extern "C" extern void* g_profile_Obj_Lv3Water[12]; -extern "C" extern void* g_profile_Obj_Lv3Water2[12]; -extern "C" extern void* g_profile_OBJ_LV3WATERB[12]; -extern "C" extern void* g_profile_Obj_Lv3R10Saka[12]; -extern "C" extern void* g_profile_Obj_WaterEff[12]; -extern "C" extern void* g_profile_Tag_Lv4CandleDm[12]; -extern "C" extern void* g_profile_Tag_Lv4Candle[12]; -extern "C" extern void* g_profile_Obj_Lv4EdShutter[12]; -extern "C" extern void* g_profile_Obj_Lv4Gate[12]; -extern "C" extern void* g_profile_Obj_Lv4HsTarget[12]; -extern "C" extern void* g_profile_Obj_Lv4PoGate[12]; -extern "C" extern void* g_profile_Obj_Lv4RailWall[12]; -extern "C" extern void* g_profile_Obj_Lv4SlideWall[12]; -extern "C" extern void* g_profile_Obj_Lv4Bridge[12]; -extern "C" extern void* g_profile_Obj_Lv4Chan[12]; -extern "C" extern void* g_profile_Obj_Lv4DigSand[12]; -extern "C" extern void* g_profile_Obj_Lv4Floor[12]; -extern "C" extern void* g_profile_Obj_Lv4Gear[12]; -extern "C" extern void* g_profile_Obj_PRElvtr[12]; -extern "C" extern void* g_profile_Obj_Lv4PRwall[12]; -extern "C" extern void* g_profile_Obj_Lv4Sand[12]; -extern "C" extern void* g_profile_Obj_Lv5FBoard[12]; -extern "C" extern void* g_profile_Obj_IceWall[12]; -extern "C" extern void* g_profile_Obj_Lv5SwIce[12]; -extern "C" extern void* g_profile_Obj_Ychndlr[12]; -extern "C" extern void* g_profile_Obj_YIblltray[12]; -extern "C" extern void* g_profile_Obj_Lv6ChgGate[12]; -extern "C" extern void* g_profile_Obj_Lv6FuriTrap[12]; -extern "C" extern void* g_profile_Obj_Lv6Lblock[12]; -extern "C" extern void* g_profile_Obj_Lv6SwGate[12]; -extern "C" extern void* g_profile_Obj_Lv6SzGate[12]; -extern "C" extern void* g_profile_Obj_Lv6Tenbin[12]; -extern "C" extern void* g_profile_Obj_Lv6TogeRoll[12]; -extern "C" extern void* g_profile_Obj_Lv6TogeTrap[12]; -extern "C" extern void* g_profile_Obj_Lv6bemos[12]; -extern "C" extern void* g_profile_Obj_Lv6bemos2[12]; -extern "C" extern void* g_profile_Obj_Lv6EGate[12]; -extern "C" extern void* g_profile_Obj_Lv6ElevtA[12]; -extern "C" extern void* g_profile_Obj_Lv6SwTurn[12]; -extern "C" extern void* g_profile_Obj_Lv7BsGate[12]; -extern "C" extern void* g_profile_Obj_Lv7PropY[12]; -extern "C" extern void* g_profile_Obj_Lv7Bridge[12]; -extern "C" extern void* g_profile_Obj_Lv8KekkaiTrap[12]; -extern "C" extern void* g_profile_Obj_Lv8Lift[12]; -extern "C" extern void* g_profile_Obj_Lv8OptiLift[12]; -extern "C" extern void* g_profile_Obj_Lv8UdFloor[12]; -extern "C" extern void* g_profile_Obj_Lv9SwShutter[12]; -extern "C" extern void* g_profile_Obj_MagLift[12]; -extern "C" extern void* g_profile_Obj_MagLiftRot[12]; -extern "C" extern void* g_profile_OBJ_MAKI[12]; -extern "C" extern void* g_profile_Obj_MasterSword[12]; -extern "C" extern void* g_profile_Obj_Mato[12]; -extern "C" extern void* g_profile_Obj_MHole[12]; -extern "C" extern void* g_profile_OBJ_MIE[12]; -extern "C" extern void* g_profile_Obj_Mirror6Pole[12]; -extern "C" extern void* g_profile_Obj_MirrorChain[12]; -extern "C" extern void* g_profile_Obj_MirrorSand[12]; -extern "C" extern void* g_profile_Obj_MirrorScrew[12]; -extern "C" extern void* g_profile_Obj_MirrorTable[12]; -extern "C" extern void* g_profile_OBJ_MSIMA[12]; -extern "C" extern void* g_profile_Obj_MvStair[12]; -extern "C" extern void* g_profile_OBJ_MYOGAN[12]; -extern "C" extern void* g_profile_Obj_Nagaisu[12]; -extern "C" extern void* g_profile_Obj_Nan[12]; -extern "C" extern void* g_profile_OBJ_NDOOR[12]; -extern "C" extern void* g_profile_OBJ_NOUGU[12]; -extern "C" extern void* g_profile_OCTHASHI[12]; -extern "C" extern void* g_profile_OBJ_OILTUBO[12]; -extern "C" extern void* g_profile_Obj_Onsen[12]; -extern "C" extern void* g_profile_OBJ_ONSEN_FIRE[12]; -extern "C" extern void* g_profile_Obj_OnsenTaru[12]; -extern "C" extern void* g_profile_Obj_PushDoor[12]; -extern "C" extern void* g_profile_Obj_PDtile[12]; -extern "C" extern void* g_profile_Obj_PDwall[12]; -extern "C" extern void* g_profile_Obj_Picture[12]; -extern "C" extern void* g_profile_Obj_Pillar[12]; -extern "C" extern void* g_profile_OBJ_PLEAF[12]; -extern "C" extern void* g_profile_Obj_poCandle[12]; -extern "C" extern void* g_profile_Obj_poFire[12]; -extern "C" extern void* g_profile_Obj_poTbox[12]; -extern "C" extern void* g_profile_Obj_Prop[12]; -extern "C" extern void* g_profile_OBJ_PUMPKIN[12]; -extern "C" extern void* g_profile_Obj_RCircle[12]; -extern "C" extern void* g_profile_Obj_RfHole[12]; -extern "C" extern void* g_profile_Obj_RiderGate[12]; -extern "C" extern void* g_profile_Obj_RIVERROCK[12]; -extern "C" extern void* g_profile_OBJ_ROCK[12]; -extern "C" extern void* g_profile_Obj_RotBridge[12]; -extern "C" extern void* g_profile_Obj_RotTrap[12]; -extern "C" extern void* g_profile_OBJ_ROTEN[12]; -extern "C" extern void* g_profile_Obj_RotStair[12]; -extern "C" extern void* g_profile_OBJ_RW[12]; -extern "C" extern void* g_profile_Obj_Saidan[12]; -extern "C" extern void* g_profile_Obj_Sakuita[12]; -extern "C" extern void* g_profile_Obj_ItaRope[12]; -extern "C" extern void* g_profile_Obj_SCannon[12]; -extern "C" extern void* g_profile_Obj_SCannonCrs[12]; -extern "C" extern void* g_profile_Obj_SCannonTen[12]; -extern "C" extern void* g_profile_OBJ_SEKIDOOR[12]; -extern "C" extern void* g_profile_OBJ_SEKIZO[12]; -extern "C" extern void* g_profile_OBJ_SEKIZOA[12]; -extern "C" extern void* g_profile_Obj_Shield[12]; -extern "C" extern void* g_profile_Obj_SM_DOOR[12]; -extern "C" extern void* g_profile_Obj_SmallKey[12]; -extern "C" extern void* g_profile_Obj_SmgDoor[12]; -extern "C" extern void* g_profile_Obj_Smoke[12]; -extern "C" extern void* g_profile_OBJ_SMTILE[12]; -extern "C" extern void* g_profile_Obj_SmWStone[12]; -extern "C" extern void* g_profile_Tag_SnowEff[12]; -extern "C" extern void* g_profile_Obj_SnowSoup[12]; -extern "C" extern void* g_profile_OBJ_SO[12]; -extern "C" extern void* g_profile_Obj_SpinLift[12]; -extern "C" extern void* g_profile_OBJ_SSDRINK[12]; -extern "C" extern void* g_profile_OBJ_SSITEM[12]; -extern "C" extern void* g_profile_Obj_StairBlock[12]; -extern "C" extern void* g_profile_Obj_Stone[12]; -extern "C" extern void* g_profile_Obj_Stopper[12]; -extern "C" extern void* g_profile_Obj_Stopper2[12]; -extern "C" extern void* g_profile_OBJ_SUISYA[12]; -extern "C" extern void* g_profile_OBJ_SW[12]; -extern "C" extern void* g_profile_Obj_SwBallA[12]; -extern "C" extern void* g_profile_Obj_SwBallB[12]; -extern "C" extern void* g_profile_Obj_SwBallC[12]; -extern "C" extern void* g_profile_Obj_SwLight[12]; -extern "C" extern void* g_profile_Obj_SwChain[12]; -extern "C" extern void* g_profile_Obj_SwHang[12]; -extern "C" extern void* g_profile_Obj_Sword[12]; -extern "C" extern void* g_profile_Obj_Swpush2[12]; -extern "C" extern void* g_profile_Obj_SwSpinner[12]; -extern "C" extern void* g_profile_Obj_SwTurn[12]; -extern "C" extern void* g_profile_Obj_SyRock[12]; -extern "C" extern void* g_profile_Obj_SZbridge[12]; -extern "C" extern void* g_profile_Obj_TaFence[12]; -extern "C" extern void* g_profile_Obj_Table[12]; -extern "C" extern void* g_profile_Obj_TakaraDai[12]; -extern "C" extern void* g_profile_OBJ_TATIGI[12]; -extern "C" extern void* g_profile_Obj_Ten[12]; -extern "C" extern void* g_profile_Obj_TestCube[12]; -extern "C" extern void* g_profile_Obj_Gake[12]; -extern "C" extern void* g_profile_Obj_THASHI[12]; -extern "C" extern void* g_profile_Obj_TDoor[12]; -extern "C" extern void* g_profile_Obj_TimeFire[12]; -extern "C" extern void* g_profile_OBJ_TKS[12]; -extern "C" extern void* g_profile_Obj_TMoon[12]; -extern "C" extern void* g_profile_Obj_ToaruMaki[12]; -extern "C" extern void* g_profile_OBJ_TOBY[12]; -extern "C" extern void* g_profile_Obj_TobyHouse[12]; -extern "C" extern void* g_profile_Obj_TogeTrap[12]; -extern "C" extern void* g_profile_Obj_Tombo[12]; -extern "C" extern void* g_profile_Obj_Tornado[12]; -extern "C" extern void* g_profile_Obj_Tornado2[12]; -extern "C" extern void* g_profile_OBJ_TP[12]; -extern "C" extern void* g_profile_TREESH[12]; -extern "C" extern void* g_profile_Obj_TwGate[12]; -extern "C" extern void* g_profile_OBJ_UDOOR[12]; -extern "C" extern void* g_profile_OBJ_USAKU[12]; -extern "C" extern void* g_profile_Obj_VolcGnd[12]; -extern "C" extern void* g_profile_Obj_VolcanicBall[12]; -extern "C" extern void* g_profile_Obj_VolcanicBomb[12]; -extern "C" extern void* g_profile_Obj_KakarikoBrg[12]; -extern "C" extern void* g_profile_Obj_OrdinBrg[12]; -extern "C" extern void* g_profile_Obj_WtGate[12]; -extern "C" extern void* g_profile_Obj_WaterPillar[12]; -extern "C" extern void* g_profile_Obj_WaterFall[12]; -extern "C" extern void* g_profile_Obj_Wchain[12]; -extern "C" extern void* g_profile_Obj_WdStick[12]; -extern "C" extern void* g_profile_OBJ_WEB0[12]; -extern "C" extern void* g_profile_OBJ_WEB1[12]; -extern "C" extern void* g_profile_Obj_WellCover[12]; -extern "C" extern void* g_profile_OBJ_WFLAG[12]; -extern "C" extern void* g_profile_Obj_WindStone[12]; -extern "C" extern void* g_profile_Obj_Window[12]; -extern "C" extern void* g_profile_Obj_WoodPendulum[12]; -extern "C" extern void* g_profile_Obj_WoodStatue[12]; -extern "C" extern void* g_profile_Obj_WoodenSword[12]; -extern "C" extern void* g_profile_OBJ_YBAG[12]; -extern "C" extern void* g_profile_OBJ_YSTONE[12]; -extern "C" extern void* g_profile_Obj_ZoraCloth[12]; -extern "C" extern void* g_profile_Obj_ZDoor[12]; -extern "C" extern void* g_profile_Obj_zrTurara[12]; -extern "C" extern void* g_profile_Obj_zrTuraraRc[12]; -extern "C" extern void* g_profile_ZRA_MARK[12]; -extern "C" extern void* g_profile_OBJ_ZRAFREEZE[12]; -extern "C" extern void* g_profile_Obj_ZraRock[12]; -extern "C" extern void* g_profile_PASSER_MNG[12]; -extern "C" extern void* g_profile_PERU[12]; -extern "C" extern void* g_profile_PPolamp[12]; -extern "C" extern void* g_profile_SKIP2D[12]; -extern "C" extern void* g_profile_START_AND_GOAL[12]; -extern "C" extern void* g_profile_SwBall[12]; -extern "C" extern void* g_profile_SwLBall[12]; -extern "C" extern void* g_profile_SwTime[12]; -extern "C" extern void* g_profile_Tag_Lv6Gate[12]; -extern "C" extern void* g_profile_Tag_Lv7Gate[12]; -extern "C" extern void* g_profile_Tag_Lv8Gate[12]; -extern "C" extern void* g_profile_Tag_TWGate[12]; -extern "C" extern void* g_profile_Tag_Arena[12]; -extern "C" extern void* g_profile_Tag_Assist[12]; -extern "C" extern void* g_profile_TAG_BTLITM[12]; -extern "C" extern void* g_profile_Tag_ChgRestart[12]; -extern "C" extern void* g_profile_TAG_CSW[12]; -extern "C" extern void* g_profile_Tag_Escape[12]; -extern "C" extern void* g_profile_Tag_FWall[12]; -extern "C" extern void* g_profile_TAG_GRA[12]; -extern "C" extern void* g_profile_TAG_GUARD[12]; -extern "C" extern void* g_profile_Tag_Instruction[12]; -extern "C" extern void* g_profile_Tag_KagoFall[12]; -extern "C" extern void* g_profile_Tag_LightBall[12]; -extern "C" extern void* g_profile_TAG_LV5SOUP[12]; -extern "C" extern void* g_profile_Tag_Lv6CstaSw[12]; -extern "C" extern void* g_profile_Tag_Mmsg[12]; -extern "C" extern void* g_profile_Tag_Mwait[12]; -extern "C" extern void* g_profile_TAG_MYNA2[12]; -extern "C" extern void* g_profile_TAG_MNLIGHT[12]; -extern "C" extern void* g_profile_TAG_PATI[12]; -extern "C" extern void* g_profile_Tag_poFire[12]; -extern "C" extern void* g_profile_TAG_QS[12]; -extern "C" extern void* g_profile_Tag_RetRoom[12]; -extern "C" extern void* g_profile_Tag_RiverBack[12]; -extern "C" extern void* g_profile_Tag_RmbitSw[12]; -extern "C" extern void* g_profile_Tag_Schedule[12]; -extern "C" extern void* g_profile_Tag_SetBall[12]; -extern "C" extern void* g_profile_Tag_Restart[12]; -extern "C" extern void* g_profile_TAG_SHOPCAM[12]; -extern "C" extern void* g_profile_TAG_SHOPITM[12]; -extern "C" extern void* g_profile_Tag_SmkEmt[12]; -extern "C" extern void* g_profile_Tag_Spinner[12]; -extern "C" extern void* g_profile_Tag_Sppath[12]; -extern "C" extern void* g_profile_TAG_SSDRINK[12]; -extern "C" extern void* g_profile_Tag_Stream[12]; -extern "C" extern void* g_profile_Tag_TheBHint[12]; -extern "C" extern void* g_profile_Tag_WaraHowl[12]; -extern "C" extern void* g_profile_Tag_WatchGe[12]; -extern "C" extern void* g_profile_Tag_WaterFall[12]; -extern "C" extern void* g_profile_Tag_Wljump[12]; -extern "C" extern void* g_profile_TAG_YAMI[12]; -extern "C" extern void* g_profile_TALK[12]; -extern "C" extern void* g_profile_TBOX_SW[12]; -extern "C" extern void* g_profile_TITLE[12]; -extern "C" extern void* g_profile_WarpBug[12]; - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80456C84-804578E8 -00001 0C64+00 1/1 0/0 0/0 .data g_fpcPfLst_ProfileList */ -SECTION_DATA static process_profile_definition* g_fpcPfLst_ProfileList[793] = { - (process_profile_definition*)&g_profile_OVERLAP0, - (process_profile_definition*)&g_profile_OVERLAP1, - (process_profile_definition*)&g_profile_OVERLAP3, - (process_profile_definition*)&g_profile_OVERLAP6, - (process_profile_definition*)&g_profile_OVERLAP7, - (process_profile_definition*)&g_profile_OVERLAP8, - (process_profile_definition*)&g_profile_OVERLAP9, - (process_profile_definition*)&g_profile_OVERLAP10, - (process_profile_definition*)&g_profile_OVERLAP11, - (process_profile_definition*)&g_profile_LOGO_SCENE, - (process_profile_definition*)&g_profile_MENU_SCENE, - (process_profile_definition*)&g_profile_PLAY_SCENE, - (process_profile_definition*)&g_profile_OPENING_SCENE, - (process_profile_definition*)&g_profile_NAME_SCENE, - (process_profile_definition*)&g_profile_NAMEEX_SCENE, - (process_profile_definition*)&g_profile_WARNING_SCENE, - (process_profile_definition*)&g_profile_WARNING2_SCENE, - (process_profile_definition*)&g_profile_OVERLAP2, - (process_profile_definition*)&g_profile_ROOM_SCENE, - (process_profile_definition*)&g_profile_KANKYO, - (process_profile_definition*)&g_profile_ALLDIE, - (process_profile_definition*)&g_profile_ENVSE, - (process_profile_definition*)&g_profile_Obj_Swpush, - (process_profile_definition*)&g_profile_Obj_Swpush2, - (process_profile_definition*)&g_profile_Obj_Swpush5, - (process_profile_definition*)&g_profile_Tag_Gstart, - (process_profile_definition*)&g_profile_NO_CHG_ROOM, - (process_profile_definition*)&g_profile_Obj_Lv6ElevtA, - (process_profile_definition*)&g_profile_OBJ_SO, - (process_profile_definition*)&g_profile_Obj_Movebox, - (process_profile_definition*)&g_profile_Obj_SwTurn, - (process_profile_definition*)&g_profile_Obj_Lv6SwTurn, - (process_profile_definition*)&g_profile_OBJ_SEKIZOA, - (process_profile_definition*)&g_profile_OBJ_GRA, - (process_profile_definition*)&g_profile_TAG_GRA, - (process_profile_definition*)&g_profile_TAG_YAMI, - (process_profile_definition*)&g_profile_Obj_Ladder, - (process_profile_definition*)&g_profile_OBJ_BEF, - (process_profile_definition*)&g_profile_OBJ_FMOBJ, - (process_profile_definition*)&g_profile_OBJ_LBOX, - (process_profile_definition*)&g_profile_OBJ_WEB0, - (process_profile_definition*)&g_profile_OBJ_WEB1, - (process_profile_definition*)&g_profile_OBJ_CB, - (process_profile_definition*)&g_profile_OBJ_MAKI, - (process_profile_definition*)&g_profile_OBJ_BRG, - (process_profile_definition*)&g_profile_OBJ_GB, - (process_profile_definition*)&g_profile_OBJ_GM, - (process_profile_definition*)&g_profile_OBJ_TOBY, - (process_profile_definition*)&g_profile_OBJ_TP, - (process_profile_definition*)&g_profile_TREESH, - (process_profile_definition*)&g_profile_Obj_ZDoor, - (process_profile_definition*)&g_profile_Obj_Pillar, - (process_profile_definition*)&g_profile_Obj_Cdoor, - (process_profile_definition*)&g_profile_GRDWATER, - (process_profile_definition*)&g_profile_Obj_RotBridge, - (process_profile_definition*)&g_profile_Obj_MagLift, - (process_profile_definition*)&g_profile_Obj_MagLiftRot, - (process_profile_definition*)&g_profile_Obj_Lv1Cdl00, - (process_profile_definition*)&g_profile_Obj_Lv1Cdl01, - (process_profile_definition*)&g_profile_Obj_TvCdlst, - (process_profile_definition*)&g_profile_Obj_HsTarget, - (process_profile_definition*)&g_profile_Obj_HeavySw, - (process_profile_definition*)&g_profile_Obj_GoGate, - (process_profile_definition*)&g_profile_Obj_TaFence, - (process_profile_definition*)&g_profile_Obj_Saidan, - (process_profile_definition*)&g_profile_Obj_SpinLift, - (process_profile_definition*)&g_profile_Obj_BmWindow, - (process_profile_definition*)&g_profile_Obj_RfHole, - (process_profile_definition*)&g_profile_Obj_WaterPillar, - (process_profile_definition*)&g_profile_Obj_SyRock, - (process_profile_definition*)&g_profile_Obj_BsGate, - (process_profile_definition*)&g_profile_Obj_AmiShutter, - (process_profile_definition*)&g_profile_Obj_WtGate, - (process_profile_definition*)&g_profile_Obj_Lv2Candle, - (process_profile_definition*)&g_profile_Obj_TogeTrap, - (process_profile_definition*)&g_profile_Obj_RotTrap, - (process_profile_definition*)&g_profile_Obj_SwallShutter, - (process_profile_definition*)&g_profile_Obj_IceWall, - (process_profile_definition*)&g_profile_Obj_Lv5SwIce, - (process_profile_definition*)&g_profile_Obj_Lv5FBoard, - (process_profile_definition*)&g_profile_Obj_Turara, - (process_profile_definition*)&g_profile_Obj_TwGate, - (process_profile_definition*)&g_profile_Obj_Digholl, - (process_profile_definition*)&g_profile_Obj_Digpl, - (process_profile_definition*)&g_profile_Obj_TestCube, - (process_profile_definition*)&g_profile_Obj_Kshutter, - (process_profile_definition*)&g_profile_NPC_COACH, - (process_profile_definition*)&g_profile_NPC_THEB, - (process_profile_definition*)&g_profile_COACH_FIRE, - (process_profile_definition*)&g_profile_COACH2D, - (process_profile_definition*)&g_profile_BALLOON2D, - (process_profile_definition*)&g_profile_SKIP2D, - (process_profile_definition*)&g_profile_Obj_MvStair, - (process_profile_definition*)&g_profile_Obj_Cowdoor, - (process_profile_definition*)&g_profile_Obj_Swpropeller, - (process_profile_definition*)&g_profile_Obj_BoomShutter, - (process_profile_definition*)&g_profile_NPC_KS, - (process_profile_definition*)&g_profile_Obj_Hfuta, - (process_profile_definition*)&g_profile_Obj_BkDoor, - (process_profile_definition*)&g_profile_Obj_Cboard, - (process_profile_definition*)&g_profile_Obj_MGate, - (process_profile_definition*)&g_profile_Obj_Ikada, - (process_profile_definition*)&g_profile_Obj_Ice_l, - (process_profile_definition*)&g_profile_Obj_Ice_s, - (process_profile_definition*)&g_profile_Obj_E_CREATE, - (process_profile_definition*)&g_profile_Obj_Bhbridge, - (process_profile_definition*)&g_profile_Obj_Kaisou, - (process_profile_definition*)&g_profile_Obj_HHASHI, - (process_profile_definition*)&g_profile_Obj_BHASHI, - (process_profile_definition*)&g_profile_OCTHASHI, - (process_profile_definition*)&g_profile_Obj_THASHI, - (process_profile_definition*)&g_profile_Obj_CRVGATE, - (process_profile_definition*)&g_profile_Obj_CRVFENCE, - (process_profile_definition*)&g_profile_Obj_CRVHAHEN, - (process_profile_definition*)&g_profile_Obj_CRVSTEEL, - (process_profile_definition*)&g_profile_Obj_CRVLH_UP, - (process_profile_definition*)&g_profile_Obj_CRVLH_DW, - (process_profile_definition*)&g_profile_Obj_RIVERROCK, - (process_profile_definition*)&g_profile_Obj_DUST, - (process_profile_definition*)&g_profile_Obj_ITA, - (process_profile_definition*)&g_profile_Obj_Window, - (process_profile_definition*)&g_profile_Obj_MetalBox, - (process_profile_definition*)&g_profile_Obj_BBox, - (process_profile_definition*)&g_profile_OBJ_MSIMA, - (process_profile_definition*)&g_profile_OBJ_MYOGAN, - (process_profile_definition*)&g_profile_B_ZANTS, - (process_profile_definition*)&g_profile_Obj_ChainBlock, - (process_profile_definition*)&g_profile_Obj_ChainWall, - (process_profile_definition*)&g_profile_Obj_KkrGate, - (process_profile_definition*)&g_profile_Obj_RiderGate, - (process_profile_definition*)&g_profile_Obj_Onsen, - (process_profile_definition*)&g_profile_Obj_Chest, - (process_profile_definition*)&g_profile_Obj_Bemos, - (process_profile_definition*)&g_profile_Obj_RopeBridge, - (process_profile_definition*)&g_profile_Obj_WellCover, - (process_profile_definition*)&g_profile_Obj_GraveStone, - (process_profile_definition*)&g_profile_Obj_ZraRock, - (process_profile_definition*)&g_profile_Obj_GraRock, - (process_profile_definition*)&g_profile_Obj_GrzRock, - (process_profile_definition*)&g_profile_GRA_WALL, - (process_profile_definition*)&g_profile_OBJ_ONSEN_FIRE, - (process_profile_definition*)&g_profile_Obj_Lv6bemos, - (process_profile_definition*)&g_profile_Obj_Lv6bemos2, - (process_profile_definition*)&g_profile_Obj_BarDesk, - (process_profile_definition*)&g_profile_Obj_DigSnow, - (process_profile_definition*)&g_profile_Obj_Ytaihou, - (process_profile_definition*)&g_profile_Obj_Elevator, - (process_profile_definition*)&g_profile_Obj_Lv6TogeRoll, - (process_profile_definition*)&g_profile_Obj_Lv6TogeTrap, - (process_profile_definition*)&g_profile_Obj_Lv6Tenbin, - (process_profile_definition*)&g_profile_Obj_Lv6SwGate, - (process_profile_definition*)&g_profile_Obj_Lv6Lblock, - (process_profile_definition*)&g_profile_Obj_Lv6ChgGate, - (process_profile_definition*)&g_profile_Obj_Lv6FuriTrap, - (process_profile_definition*)&g_profile_Obj_Lv6SzGate, - (process_profile_definition*)&g_profile_Obj_Lv4EdShutter, - (process_profile_definition*)&g_profile_Obj_Lv4Gate, - (process_profile_definition*)&g_profile_Obj_Lv4PoGate, - (process_profile_definition*)&g_profile_Obj_Lv4SlideWall, - (process_profile_definition*)&g_profile_Obj_Lv4HsTarget, - (process_profile_definition*)&g_profile_Obj_Lv7PropY, - (process_profile_definition*)&g_profile_Obj_Lv7BsGate, - (process_profile_definition*)&g_profile_Obj_Lv8OptiLift, - (process_profile_definition*)&g_profile_Obj_Lv8KekkaiTrap, - (process_profile_definition*)&g_profile_Obj_Lv8Lift, - (process_profile_definition*)&g_profile_Obj_Lv8UdFloor, - (process_profile_definition*)&g_profile_Obj_Lv9SwShutter, - (process_profile_definition*)&g_profile_Obj_TobyHouse, - (process_profile_definition*)&g_profile_Obj_poCandle, - (process_profile_definition*)&g_profile_Obj_Lv4DigSand, - (process_profile_definition*)&g_profile_Obj_FallObj, - (process_profile_definition*)&g_profile_Obj_SmgDoor, - (process_profile_definition*)&g_profile_Obj_SwLight, - (process_profile_definition*)&g_profile_Obj_Avalanche, - (process_profile_definition*)&g_profile_Obj_MirrorScrew, - (process_profile_definition*)&g_profile_Obj_MirrorSand, - (process_profile_definition*)&g_profile_Obj_MirrorTable, - (process_profile_definition*)&g_profile_Obj_MirrorChain, - (process_profile_definition*)&g_profile_Obj_Mirror6Pole, - (process_profile_definition*)&g_profile_Obj_SwSpinner, - (process_profile_definition*)&g_profile_Obj_TDoor, - (process_profile_definition*)&g_profile_Obj_Lv7Bridge, - (process_profile_definition*)&g_profile_Obj_zrTurara, - (process_profile_definition*)&g_profile_Obj_TakaraDai, - (process_profile_definition*)&g_profile_Obj_Table, - (process_profile_definition*)&g_profile_Obj_CatDoor, - (process_profile_definition*)&g_profile_Obj_Gake, - (process_profile_definition*)&g_profile_CSTAF, - (process_profile_definition*)&g_profile_Obj_Lv4RailWall, - (process_profile_definition*)&g_profile_Obj_Lv4Sand, - (process_profile_definition*)&g_profile_Obj_PushDoor, - (process_profile_definition*)&g_profile_PushDoor, - (process_profile_definition*)&g_profile_Obj_GanonWall2, - (process_profile_definition*)&g_profile_Obj_Lv4Bridge, - (process_profile_definition*)&g_profile_Obj_Lv4Floor, - (process_profile_definition*)&g_profile_Tag_Spinner, - (process_profile_definition*)&g_profile_Obj_SwHang, - (process_profile_definition*)&g_profile_Obj_RotStair, - (process_profile_definition*)&g_profile_Obj_MagneArm, - (process_profile_definition*)&g_profile_Obj_KWheel00, - (process_profile_definition*)&g_profile_Obj_KWheel01, - (process_profile_definition*)&g_profile_Obj_Ychndlr, - (process_profile_definition*)&g_profile_Obj_PRElvtr, - (process_profile_definition*)&g_profile_Obj_MHasu, - (process_profile_definition*)&g_profile_Obj_YIblltray, - (process_profile_definition*)&g_profile_Obj_Lv6EGate, - (process_profile_definition*)&g_profile_Obj_PDtile, - (process_profile_definition*)&g_profile_Obj_PDwall, - (process_profile_definition*)&g_profile_Obj_Lv4PRwall, - (process_profile_definition*)&g_profile_Obj_KLift00, - (process_profile_definition*)&g_profile_B_OH, - (process_profile_definition*)&g_profile_Obj_Lv4Chan, - (process_profile_definition*)&g_profile_Obj_Lv3R10Saka, - (process_profile_definition*)&g_profile_Obj_Lv3Water, - (process_profile_definition*)&g_profile_Obj_Lv3Water2, - (process_profile_definition*)&g_profile_OBJ_LV3WATERB, - (process_profile_definition*)&g_profile_Obj_HBombkoya, - (process_profile_definition*)&g_profile_Obj_SZbridge, - (process_profile_definition*)&g_profile_Obj_KakarikoBrg, - (process_profile_definition*)&g_profile_Obj_OrdinBrg, - (process_profile_definition*)&g_profile_Obj_BurnBox, - (process_profile_definition*)&g_profile_Obj_KJgjs, - (process_profile_definition*)&g_profile_OBJ_IHASI, - (process_profile_definition*)&g_profile_Obj_IceBlock, - (process_profile_definition*)&g_profile_Obj_VolcanicBall, - (process_profile_definition*)&g_profile_Obj_VolcanicBomb, - (process_profile_definition*)&g_profile_Obj_VolcGnd, - (process_profile_definition*)&g_profile_Obj_KKanban, - (process_profile_definition*)&g_profile_E_PH, - (process_profile_definition*)&g_profile_NPC_ZRA, - (process_profile_definition*)&g_profile_Obj_Chandelier, - (process_profile_definition*)&g_profile_Obj_Stopper2, - (process_profile_definition*)&g_profile_DOOR20, - (process_profile_definition*)&g_profile_Tag_Hinit, - (process_profile_definition*)&g_profile_Tag_Hjump, - (process_profile_definition*)&g_profile_Tag_AJnot, - (process_profile_definition*)&g_profile_Tag_Hstop, - (process_profile_definition*)&g_profile_CANOE, - (process_profile_definition*)&g_profile_HORSE, - (process_profile_definition*)&g_profile_E_WB, - (process_profile_definition*)&g_profile_OBJ_ITO, - (process_profile_definition*)&g_profile_OBJ_SW, - (process_profile_definition*)&g_profile_SPINNER, - (process_profile_definition*)&g_profile_B_OB, - (process_profile_definition*)&g_profile_KAGO, - (process_profile_definition*)&g_profile_E_YC, - (process_profile_definition*)&g_profile_B_DS, - (process_profile_definition*)&g_profile_B_DR, - (process_profile_definition*)&g_profile_B_ZANTZ, - (process_profile_definition*)&g_profile_B_ZANT, - (process_profile_definition*)&g_profile_B_ZANTM, - (process_profile_definition*)&g_profile_TBOX, - (process_profile_definition*)&g_profile_TBOX2, - (process_profile_definition*)&g_profile_ALINK, - (process_profile_definition*)&g_profile_BOOMERANG, - (process_profile_definition*)&g_profile_MIDNA, - (process_profile_definition*)&g_profile_NPC_TK, - (process_profile_definition*)&g_profile_NPC_WORM, - (process_profile_definition*)&g_profile_PPolamp, - (process_profile_definition*)&g_profile_BkyRock, - (process_profile_definition*)&g_profile_HITOBJ, - (process_profile_definition*)&g_profile_EP, - (process_profile_definition*)&g_profile_COW, - (process_profile_definition*)&g_profile_PERU, - (process_profile_definition*)&g_profile_NI, - (process_profile_definition*)&g_profile_NPC_TKJ2, - (process_profile_definition*)&g_profile_SQ, - (process_profile_definition*)&g_profile_NPC_SQ, - (process_profile_definition*)&g_profile_DO, - (process_profile_definition*)&g_profile_NPC_NE, - (process_profile_definition*)&g_profile_NPC_TR, - (process_profile_definition*)&g_profile_NPC_LF, - (process_profile_definition*)&g_profile_OBJ_FOOD, - (process_profile_definition*)&g_profile_OBJ_KI, - (process_profile_definition*)&g_profile_OBJ_KITA, - (process_profile_definition*)&g_profile_OBJ_KEY, - (process_profile_definition*)&g_profile_OBJ_KEYHOLE, - (process_profile_definition*)&g_profile_Obj_Lv5Key, - (process_profile_definition*)&g_profile_OBJ_LP, - (process_profile_definition*)&g_profile_OBJ_TATIGI, - (process_profile_definition*)&g_profile_OBJ_ROCK, - (process_profile_definition*)&g_profile_OBJ_WFLAG, - (process_profile_definition*)&g_profile_OBJ_KAGE, - (process_profile_definition*)&g_profile_OBJ_KANBAN2, - (process_profile_definition*)&g_profile_OBJ_BALLOON, - (process_profile_definition*)&g_profile_OBJ_SUISYA, - (process_profile_definition*)&g_profile_OBJ_OILTUBO, - (process_profile_definition*)&g_profile_OBJ_ROTEN, - (process_profile_definition*)&g_profile_OBJ_SSDRINK, - (process_profile_definition*)&g_profile_OBJ_SSITEM, - (process_profile_definition*)&g_profile_TAG_SSDRINK, - (process_profile_definition*)&g_profile_TAG_BTLITM, - (process_profile_definition*)&g_profile_TAG_LV5SOUP, - (process_profile_definition*)&g_profile_TAG_MNLIGHT, - (process_profile_definition*)&g_profile_TAG_SHOPCAM, - (process_profile_definition*)&g_profile_TAG_SHOPITM, - (process_profile_definition*)&g_profile_OBJ_NDOOR, - (process_profile_definition*)&g_profile_OBJ_UDOOR, - (process_profile_definition*)&g_profile_OBJ_USAKU, - (process_profile_definition*)&g_profile_Obj_SM_DOOR, - (process_profile_definition*)&g_profile_OBJ_BED, - (process_profile_definition*)&g_profile_OBJ_BOUMATO, - (process_profile_definition*)&g_profile_OBJ_ITAMATO, - (process_profile_definition*)&g_profile_OBJ_NOUGU, - (process_profile_definition*)&g_profile_OBJ_STICK, - (process_profile_definition*)&g_profile_OBJ_MIE, - (process_profile_definition*)&g_profile_OBJ_SEKIDOOR, - (process_profile_definition*)&g_profile_OBJ_SEKIZO, - (process_profile_definition*)&g_profile_OBJ_SMTILE, - (process_profile_definition*)&g_profile_NPC_FISH, - (process_profile_definition*)&g_profile_MG_FISH, - (process_profile_definition*)&g_profile_FSHOP, - (process_profile_definition*)&g_profile_NPC_DU, - (process_profile_definition*)&g_profile_DISAPPEAR, - (process_profile_definition*)&g_profile_Obj_Mato, - (process_profile_definition*)&g_profile_Obj_Flag, - (process_profile_definition*)&g_profile_Obj_Flag2, - (process_profile_definition*)&g_profile_Obj_Flag3, - (process_profile_definition*)&g_profile_Obj_GOMIKABE, - (process_profile_definition*)&g_profile_Obj_Yousei, - (process_profile_definition*)&g_profile_Obj_Kabuto, - (process_profile_definition*)&g_profile_Obj_Cho, - (process_profile_definition*)&g_profile_Obj_Kuw, - (process_profile_definition*)&g_profile_Obj_Nan, - (process_profile_definition*)&g_profile_Obj_Dan, - (process_profile_definition*)&g_profile_Obj_Kam, - (process_profile_definition*)&g_profile_Obj_Ten, - (process_profile_definition*)&g_profile_Obj_Ari, - (process_profile_definition*)&g_profile_Obj_Kag, - (process_profile_definition*)&g_profile_Obj_Batta, - (process_profile_definition*)&g_profile_Obj_Tombo, - (process_profile_definition*)&g_profile_Obj_Kat, - (process_profile_definition*)&g_profile_Obj_H_Saku, - (process_profile_definition*)&g_profile_Obj_Yobikusa, - (process_profile_definition*)&g_profile_Obj_KazeNeko, - (process_profile_definition*)&g_profile_Obj_KznkArm, - (process_profile_definition*)&g_profile_Obj_NamePlate, - (process_profile_definition*)&g_profile_Obj_OnCloth, - (process_profile_definition*)&g_profile_Obj_LndRope, - (process_profile_definition*)&g_profile_Obj_ItaRope, - (process_profile_definition*)&g_profile_Obj_Sakuita, - (process_profile_definition*)&g_profile_Obj_Laundry, - (process_profile_definition*)&g_profile_WarpBug, - (process_profile_definition*)&g_profile_Izumi_Gate, - (process_profile_definition*)&g_profile_Obj_Fchain, - (process_profile_definition*)&g_profile_Obj_Wchain, - (process_profile_definition*)&g_profile_Tag_Attp, - (process_profile_definition*)&g_profile_Obj_Tornado, - (process_profile_definition*)&g_profile_Obj_Tornado2, - (process_profile_definition*)&g_profile_Obj_FirePillar, - (process_profile_definition*)&g_profile_Obj_FirePillar2, - (process_profile_definition*)&g_profile_Obj_InoBone, - (process_profile_definition*)&g_profile_Obj_Stopper, - (process_profile_definition*)&g_profile_Obj_MHole, - (process_profile_definition*)&g_profile_Tag_Magne, - (process_profile_definition*)&g_profile_Obj_BossWarp, - (process_profile_definition*)&g_profile_Obj_WoodPendulum, - (process_profile_definition*)&g_profile_Obj_WdStick, - (process_profile_definition*)&g_profile_Obj_StairBlock, - (process_profile_definition*)&g_profile_Obj_Geyser, - (process_profile_definition*)&g_profile_Tag_KtOnFire, - (process_profile_definition*)&g_profile_Obj_FireWood, - (process_profile_definition*)&g_profile_Obj_FireWood2, - (process_profile_definition*)&g_profile_Obj_GpTaru, - (process_profile_definition*)&g_profile_Obj_OnsenTaru, - (process_profile_definition*)&g_profile_Obj_KiPot, - (process_profile_definition*)&g_profile_TBOX_SW, - (process_profile_definition*)&g_profile_Obj_SwChain, - (process_profile_definition*)&g_profile_Obj_WoodenSword, - (process_profile_definition*)&g_profile_Obj_StoneMark, - (process_profile_definition*)&g_profile_Obj_Lv3Candle, - (process_profile_definition*)&g_profile_Tag_Lv4Candle, - (process_profile_definition*)&g_profile_Tag_Lv4CandleDm, - (process_profile_definition*)&g_profile_Obj_DamCps, - (process_profile_definition*)&g_profile_Obj_Smoke, - (process_profile_definition*)&g_profile_Obj_WaterFall, - (process_profile_definition*)&g_profile_Obj_ZoraCloth, - (process_profile_definition*)&g_profile_Obj_poFire, - (process_profile_definition*)&g_profile_Tag_poFire, - (process_profile_definition*)&g_profile_Obj_glowSphere, - (process_profile_definition*)&g_profile_Tag_LightBall, - (process_profile_definition*)&g_profile_SwLBall, - (process_profile_definition*)&g_profile_SwBall, - (process_profile_definition*)&g_profile_Obj_WaterEff, - (process_profile_definition*)&g_profile_Tag_RiverBack, - (process_profile_definition*)&g_profile_Tag_KagoFall, - (process_profile_definition*)&g_profile_Tag_Lv2PrChk, - (process_profile_definition*)&g_profile_Obj_Lv4Gear, - (process_profile_definition*)&g_profile_Obj_MasterSword, - (process_profile_definition*)&g_profile_Obj_WoodStatue, - (process_profile_definition*)&g_profile_Obj_Fan, - (process_profile_definition*)&g_profile_Obj_IceLeaf, - (process_profile_definition*)&g_profile_Obj_zrTuraraRc, - (process_profile_definition*)&g_profile_Tag_RetRoom, - (process_profile_definition*)&g_profile_Obj_WindStone, - (process_profile_definition*)&g_profile_Tag_WaraHowl, - (process_profile_definition*)&g_profile_Obj_SCannon, - (process_profile_definition*)&g_profile_Obj_SmWStone, - (process_profile_definition*)&g_profile_Obj_SCannonCrs, - (process_profile_definition*)&g_profile_Tag_SnowEff, - (process_profile_definition*)&g_profile_Tag_CstaSw, - (process_profile_definition*)&g_profile_Tag_Lv6CstaSw, - (process_profile_definition*)&g_profile_Obj_awaPlar, - (process_profile_definition*)&g_profile_Obj_poTbox, - (process_profile_definition*)&g_profile_Obj_TimeFire, - (process_profile_definition*)&g_profile_Obj_TMoon, - (process_profile_definition*)&g_profile_Obj_GanonWall, - (process_profile_definition*)&g_profile_Obj_Prop, - (process_profile_definition*)&g_profile_CSTATUE, - (process_profile_definition*)&g_profile_Obj_SwBallA, - (process_profile_definition*)&g_profile_Obj_SwBallB, - (process_profile_definition*)&g_profile_Obj_SnowSoup, - (process_profile_definition*)&g_profile_Obj_Nagaisu, - (process_profile_definition*)&g_profile_Obj_RCircle, - (process_profile_definition*)&g_profile_Obj_Picture, - (process_profile_definition*)&g_profile_Tag_SetBall, - (process_profile_definition*)&g_profile_Tag_SmkEmt, - (process_profile_definition*)&g_profile_SwTime, - (process_profile_definition*)&g_profile_Obj_HFtr, - (process_profile_definition*)&g_profile_Obj_HBarrel, - (process_profile_definition*)&g_profile_Obj_Crystal, - (process_profile_definition*)&g_profile_Obj_SCannonTen, - (process_profile_definition*)&g_profile_Obj_SwBallC, - (process_profile_definition*)&g_profile_SCENE_EXIT2, - (process_profile_definition*)&g_profile_Obj_Hata, - (process_profile_definition*)&g_profile_Obj_ToaruMaki, - (process_profile_definition*)&g_profile_Tag_AttackItem, - (process_profile_definition*)&g_profile_Tag_RmbitSw, - (process_profile_definition*)&g_profile_Obj_Sword, - (process_profile_definition*)&g_profile_Tag_Spring, - (process_profile_definition*)&g_profile_Tag_Statue, - (process_profile_definition*)&g_profile_E_AI, - (process_profile_definition*)&g_profile_E_GS, - (process_profile_definition*)&g_profile_E_GOB, - (process_profile_definition*)&g_profile_E_DD, - (process_profile_definition*)&g_profile_E_DN, - (process_profile_definition*)&g_profile_E_S1, - (process_profile_definition*)&g_profile_E_MF, - (process_profile_definition*)&g_profile_E_SG, - (process_profile_definition*)&g_profile_E_BS, - (process_profile_definition*)&g_profile_E_SF, - (process_profile_definition*)&g_profile_E_SH, - (process_profile_definition*)&g_profile_E_DF, - (process_profile_definition*)&g_profile_E_GM, - (process_profile_definition*)&g_profile_E_MD, - (process_profile_definition*)&g_profile_E_SM, - (process_profile_definition*)&g_profile_E_SM2, - (process_profile_definition*)&g_profile_E_ST, - (process_profile_definition*)&g_profile_E_ST_LINE, - (process_profile_definition*)&g_profile_E_SB, - (process_profile_definition*)&g_profile_E_TH, - (process_profile_definition*)&g_profile_E_CR, - (process_profile_definition*)&g_profile_E_CR_EGG, - (process_profile_definition*)&g_profile_E_DB, - (process_profile_definition*)&g_profile_E_DB_LEAF, - (process_profile_definition*)&g_profile_E_GA, - (process_profile_definition*)&g_profile_E_GB, - (process_profile_definition*)&g_profile_E_HB, - (process_profile_definition*)&g_profile_E_HB_LEAF, - (process_profile_definition*)&g_profile_E_HZELDA, - (process_profile_definition*)&g_profile_E_YD, - (process_profile_definition*)&g_profile_E_YH, - (process_profile_definition*)&g_profile_E_YD_LEAF, - (process_profile_definition*)&g_profile_E_HM, - (process_profile_definition*)&g_profile_E_TK, - (process_profile_definition*)&g_profile_E_TK2, - (process_profile_definition*)&g_profile_E_TK_BALL, - (process_profile_definition*)&g_profile_E_RB, - (process_profile_definition*)&g_profile_E_RD, - (process_profile_definition*)&g_profile_E_RDB, - (process_profile_definition*)&g_profile_E_RDY, - (process_profile_definition*)&g_profile_E_FM, - (process_profile_definition*)&g_profile_E_FS, - (process_profile_definition*)&g_profile_E_PM, - (process_profile_definition*)&g_profile_E_PO, - (process_profile_definition*)&g_profile_E_MB, - (process_profile_definition*)&g_profile_E_MK, - (process_profile_definition*)&g_profile_E_MM, - (process_profile_definition*)&g_profile_E_FZ, - (process_profile_definition*)&g_profile_E_ZS, - (process_profile_definition*)&g_profile_E_KK, - (process_profile_definition*)&g_profile_E_HP, - (process_profile_definition*)&g_profile_E_ZH, - (process_profile_definition*)&g_profile_E_ZM, - (process_profile_definition*)&g_profile_E_PZ, - (process_profile_definition*)&g_profile_E_FB, - (process_profile_definition*)&g_profile_E_FK, - (process_profile_definition*)&g_profile_E_MS, - (process_profile_definition*)&g_profile_E_NEST, - (process_profile_definition*)&g_profile_E_NZ, - (process_profile_definition*)&g_profile_E_BA, - (process_profile_definition*)&g_profile_E_BU, - (process_profile_definition*)&g_profile_E_BUG, - (process_profile_definition*)&g_profile_E_BEE, - (process_profile_definition*)&g_profile_E_IS, - (process_profile_definition*)&g_profile_E_KG, - (process_profile_definition*)&g_profile_E_KR, - (process_profile_definition*)&g_profile_E_SW, - (process_profile_definition*)&g_profile_E_GE, - (process_profile_definition*)&g_profile_Tag_WatchGe, - (process_profile_definition*)&g_profile_E_YM, - (process_profile_definition*)&g_profile_E_YM_TAG, - (process_profile_definition*)&g_profile_E_YMB, - (process_profile_definition*)&g_profile_Tag_FWall, - (process_profile_definition*)&g_profile_Tag_WaterFall, - (process_profile_definition*)&g_profile_E_YK, - (process_profile_definition*)&g_profile_E_YR, - (process_profile_definition*)&g_profile_E_YG, - (process_profile_definition*)&g_profile_E_HZ, - (process_profile_definition*)&g_profile_E_WS, - (process_profile_definition*)&g_profile_E_OC, - (process_profile_definition*)&g_profile_E_OT, - (process_profile_definition*)&g_profile_E_DT, - (process_profile_definition*)&g_profile_E_BG, - (process_profile_definition*)&g_profile_E_OctBg, - (process_profile_definition*)&g_profile_DR, - (process_profile_definition*)&g_profile_L7lowDr, - (process_profile_definition*)&g_profile_L7ODR, - (process_profile_definition*)&g_profile_E_TT, - (process_profile_definition*)&g_profile_E_DK, - (process_profile_definition*)&g_profile_E_VT, - (process_profile_definition*)&g_profile_E_WW, - (process_profile_definition*)&g_profile_E_GI, - (process_profile_definition*)&g_profile_B_BH, - (process_profile_definition*)&g_profile_B_BQ, - (process_profile_definition*)&g_profile_B_GM, - (process_profile_definition*)&g_profile_B_GND, - (process_profile_definition*)&g_profile_B_GO, - (process_profile_definition*)&g_profile_B_OH2, - (process_profile_definition*)&g_profile_B_YO, - (process_profile_definition*)&g_profile_B_YOI, - (process_profile_definition*)&g_profile_B_TN, - (process_profile_definition*)&g_profile_B_GG, - (process_profile_definition*)&g_profile_B_DRE, - (process_profile_definition*)&g_profile_B_MGN, - (process_profile_definition*)&g_profile_E_WAP, - (process_profile_definition*)&g_profile_ITEM, - (process_profile_definition*)&g_profile_Obj_SmallKey, - (process_profile_definition*)&g_profile_Obj_Kantera, - (process_profile_definition*)&g_profile_Obj_LifeContainer, - (process_profile_definition*)&g_profile_Obj_Shield, - (process_profile_definition*)&g_profile_Demo_Item, - (process_profile_definition*)&g_profile_ShopItem, - (process_profile_definition*)&g_profile_Obj_Drop, - (process_profile_definition*)&g_profile_OBJ_RW, - (process_profile_definition*)&g_profile_NBOMB, - (process_profile_definition*)&g_profile_TAG_CSW, - (process_profile_definition*)&g_profile_TAG_QS, - (process_profile_definition*)&g_profile_HOZELDA, - (process_profile_definition*)&g_profile_SWC00, - (process_profile_definition*)&g_profile_KNOB20, - (process_profile_definition*)&g_profile_DBDOOR, - (process_profile_definition*)&g_profile_BOSS_DOOR, - (process_profile_definition*)&g_profile_L1BOSS_DOOR, - (process_profile_definition*)&g_profile_L1MBOSS_DOOR, - (process_profile_definition*)&g_profile_L5BOSS_DOOR, - (process_profile_definition*)&g_profile_DSHUTTER, - (process_profile_definition*)&g_profile_SPIRAL_DOOR, - (process_profile_definition*)&g_profile_Tag_ChgRestart, - (process_profile_definition*)&g_profile_Tag_Restart, - (process_profile_definition*)&g_profile_ANDSW, - (process_profile_definition*)&g_profile_ANDSW2, - (process_profile_definition*)&g_profile_MYNA, - (process_profile_definition*)&g_profile_NPC_GND, - (process_profile_definition*)&g_profile_NPC_GRA, - (process_profile_definition*)&g_profile_NPC_GRC, - (process_profile_definition*)&g_profile_NPC_GRD, - (process_profile_definition*)&g_profile_NPC_GRM, - (process_profile_definition*)&g_profile_NPC_GRMC, - (process_profile_definition*)&g_profile_NPC_GRO, - (process_profile_definition*)&g_profile_NPC_GRR, - (process_profile_definition*)&g_profile_NPC_GRS, - (process_profile_definition*)&g_profile_NPC_GRZ, - (process_profile_definition*)&g_profile_NPC_YAMID, - (process_profile_definition*)&g_profile_NPC_YAMIT, - (process_profile_definition*)&g_profile_NPC_YAMIS, - (process_profile_definition*)&g_profile_NPC_BLUENS, - (process_profile_definition*)&g_profile_NPC_KAKASHI, - (process_profile_definition*)&g_profile_NPC_KDK, - (process_profile_definition*)&g_profile_NPC_ARU, - (process_profile_definition*)&g_profile_NPC_BANS, - (process_profile_definition*)&g_profile_NPC_BESU, - (process_profile_definition*)&g_profile_NPC_BOU, - (process_profile_definition*)&g_profile_NPC_BOU_S, - (process_profile_definition*)&g_profile_NPC_CLERKA, - (process_profile_definition*)&g_profile_NPC_CLERKB, - (process_profile_definition*)&g_profile_NPC_CLERKT, - (process_profile_definition*)&g_profile_NPC_WRESTLER, - (process_profile_definition*)&g_profile_Tag_Arena, - (process_profile_definition*)&g_profile_Tag_Instruction, - (process_profile_definition*)&g_profile_NPC_DOC, - (process_profile_definition*)&g_profile_NPC_GWOLF, - (process_profile_definition*)&g_profile_NPC_LEN, - (process_profile_definition*)&g_profile_NPC_LUD, - (process_profile_definition*)&g_profile_NPC_FAIRY_SEIREI, - (process_profile_definition*)&g_profile_NPC_FAIRY, - (process_profile_definition*)&g_profile_NPC_HANJO, - (process_profile_definition*)&g_profile_NPC_HENNA, - (process_profile_definition*)&g_profile_NPC_HENNA0, - (process_profile_definition*)&g_profile_NPC_HOZ, - (process_profile_definition*)&g_profile_NPC_JAGAR, - (process_profile_definition*)&g_profile_NPC_KKRI, - (process_profile_definition*)&g_profile_NPC_KN, - (process_profile_definition*)&g_profile_KN_BULLET, - (process_profile_definition*)&g_profile_NPC_KNJ, - (process_profile_definition*)&g_profile_NPC_KOLIN, - (process_profile_definition*)&g_profile_NPC_KOLINB, - (process_profile_definition*)&g_profile_NPC_KYURY, - (process_profile_definition*)&g_profile_NPC_MARO, - (process_profile_definition*)&g_profile_NPC_MIDP, - (process_profile_definition*)&g_profile_NPC_MOI, - (process_profile_definition*)&g_profile_NPC_RACA, - (process_profile_definition*)&g_profile_NPC_SARU, - (process_profile_definition*)&g_profile_NPC_SEIB, - (process_profile_definition*)&g_profile_NPC_SEIC, - (process_profile_definition*)&g_profile_NPC_SEID, - (process_profile_definition*)&g_profile_NPC_SEIRA, - (process_profile_definition*)&g_profile_NPC_SERA2, - (process_profile_definition*)&g_profile_NPC_SEIREI, - (process_profile_definition*)&g_profile_NPC_SHAMAN, - (process_profile_definition*)&g_profile_NPC_SMARO, - (process_profile_definition*)&g_profile_NPC_SOLA, - (process_profile_definition*)&g_profile_NPC_TARO, - (process_profile_definition*)&g_profile_NPC_PACHI_BESU, - (process_profile_definition*)&g_profile_NPC_PACHI_TARO, - (process_profile_definition*)&g_profile_NPC_PACHI_MARO, - (process_profile_definition*)&g_profile_TAG_PATI, - (process_profile_definition*)&g_profile_NPC_THE, - (process_profile_definition*)&g_profile_NPC_TKJ, - (process_profile_definition*)&g_profile_NPC_TKS, - (process_profile_definition*)&g_profile_NPC_TKC, - (process_profile_definition*)&g_profile_OBJ_TKS, - (process_profile_definition*)&g_profile_NPC_TOBY, - (process_profile_definition*)&g_profile_NPC_URI, - (process_profile_definition*)&g_profile_NPC_YELIA, - (process_profile_definition*)&g_profile_NPC_YKM, - (process_profile_definition*)&g_profile_NPC_YKW, - (process_profile_definition*)&g_profile_NPC_ZANB, - (process_profile_definition*)&g_profile_NPC_ZANT, - (process_profile_definition*)&g_profile_NPC_ZELDA, - (process_profile_definition*)&g_profile_NPC_ZELR, - (process_profile_definition*)&g_profile_NPC_ZELRO, - (process_profile_definition*)&g_profile_OBJ_ZRAFREEZE, - (process_profile_definition*)&g_profile_NPC_ZRC, - (process_profile_definition*)&g_profile_NPC_ZRZ, - (process_profile_definition*)&g_profile_ZRA_MARK, - (process_profile_definition*)&g_profile_MYNA2, - (process_profile_definition*)&g_profile_TAG_MYNA2, - (process_profile_definition*)&g_profile_NPC_CD3, - (process_profile_definition*)&g_profile_Tag_Schedule, - (process_profile_definition*)&g_profile_Tag_Escape, - (process_profile_definition*)&g_profile_NPC_CHAT, - (process_profile_definition*)&g_profile_NPC_SOLDIERa, - (process_profile_definition*)&g_profile_NPC_SOLDIERb, - (process_profile_definition*)&g_profile_PASSER_MNG, - (process_profile_definition*)&g_profile_NPC_PASSER, - (process_profile_definition*)&g_profile_NPC_PASSER2, - (process_profile_definition*)&g_profile_NPC_POST, - (process_profile_definition*)&g_profile_NPC_POUYA, - (process_profile_definition*)&g_profile_FORMATION_MNG, - (process_profile_definition*)&g_profile_NPC_FGUARD, - (process_profile_definition*)&g_profile_GUARD_MNG, - (process_profile_definition*)&g_profile_TAG_GUARD, - (process_profile_definition*)&g_profile_NPC_GUARD, - (process_profile_definition*)&g_profile_NPC_ASH, - (process_profile_definition*)&g_profile_NPC_ASHB, - (process_profile_definition*)&g_profile_NPC_SHAD, - (process_profile_definition*)&g_profile_NPC_RAFREL, - (process_profile_definition*)&g_profile_NPC_MOIR, - (process_profile_definition*)&g_profile_NPC_IMPAL, - (process_profile_definition*)&g_profile_NPC_SHOE, - (process_profile_definition*)&g_profile_NPC_DOORBOY, - (process_profile_definition*)&g_profile_NPC_PRAYER, - (process_profile_definition*)&g_profile_NPC_KASIHANA, - (process_profile_definition*)&g_profile_NPC_KASIKYU, - (process_profile_definition*)&g_profile_NPC_KASIMICH, - (process_profile_definition*)&g_profile_NPC_DRSOL, - (process_profile_definition*)&g_profile_NPC_CHIN, - (process_profile_definition*)&g_profile_NPC_INS, - (process_profile_definition*)&g_profile_NPC_SHOP0, - (process_profile_definition*)&g_profile_NPC_MK, - (process_profile_definition*)&g_profile_NPC_P2, - (process_profile_definition*)&g_profile_KYTAG00, - (process_profile_definition*)&g_profile_KYTAG01, - (process_profile_definition*)&g_profile_KYTAG02, - (process_profile_definition*)&g_profile_KYTAG03, - (process_profile_definition*)&g_profile_KYTAG04, - (process_profile_definition*)&g_profile_KYTAG05, - (process_profile_definition*)&g_profile_KYTAG06, - (process_profile_definition*)&g_profile_KYTAG07, - (process_profile_definition*)&g_profile_KYTAG08, - (process_profile_definition*)&g_profile_KYTAG09, - (process_profile_definition*)&g_profile_KYTAG10, - (process_profile_definition*)&g_profile_KYTAG11, - (process_profile_definition*)&g_profile_KYTAG12, - (process_profile_definition*)&g_profile_KYTAG13, - (process_profile_definition*)&g_profile_KYTAG14, - (process_profile_definition*)&g_profile_KYTAG15, - (process_profile_definition*)&g_profile_KYTAG16, - (process_profile_definition*)&g_profile_KYTAG17, - (process_profile_definition*)&g_profile_Ykgr, - (process_profile_definition*)&g_profile_TALK, - (process_profile_definition*)&g_profile_Obj_Crope, - (process_profile_definition*)&g_profile_Obj_Bombf, - (process_profile_definition*)&g_profile_Obj_BkLeaf, - (process_profile_definition*)&g_profile_Tag_Mhint, - (process_profile_definition*)&g_profile_Tag_Mmsg, - (process_profile_definition*)&g_profile_Tag_Mwait, - (process_profile_definition*)&g_profile_Tag_Mstop, - (process_profile_definition*)&g_profile_Tag_Stream, - (process_profile_definition*)&g_profile_Tag_Sppath, - (process_profile_definition*)&g_profile_Tag_Wljump, - (process_profile_definition*)&g_profile_Tag_TWGate, - (process_profile_definition*)&g_profile_Tag_Lv6Gate, - (process_profile_definition*)&g_profile_Tag_Lv7Gate, - (process_profile_definition*)&g_profile_Tag_Lv8Gate, - (process_profile_definition*)&g_profile_Tag_TheBHint, - (process_profile_definition*)&g_profile_Tag_Assist, - (process_profile_definition*)&g_profile_DEMO00, - (process_profile_definition*)&g_profile_TAG_CAMERA, - (process_profile_definition*)&g_profile_TAG_CHKPOINT, - (process_profile_definition*)&g_profile_TAG_EVENT, - (process_profile_definition*)&g_profile_TAG_EVT, - (process_profile_definition*)&g_profile_TAG_TELOP, - (process_profile_definition*)&g_profile_TAG_HOWL, - (process_profile_definition*)&g_profile_TAG_MSG, - (process_profile_definition*)&g_profile_TAG_LANTERN, - (process_profile_definition*)&g_profile_Tag_Mist, - (process_profile_definition*)&g_profile_DMIDNA, - (process_profile_definition*)&g_profile_KY_THUNDER, - (process_profile_definition*)&g_profile_VRBOX, - (process_profile_definition*)&g_profile_VRBOX2, - (process_profile_definition*)&g_profile_BG, - (process_profile_definition*)&g_profile_SET_BG_OBJ, - (process_profile_definition*)&g_profile_BG_OBJ, - (process_profile_definition*)&g_profile_MIRROR, - (process_profile_definition*)&g_profile_MOVIE_PLAYER, - (process_profile_definition*)&g_profile_TITLE, - (process_profile_definition*)&g_profile_FR, - (process_profile_definition*)&g_profile_ECONT, - (process_profile_definition*)&g_profile_MG_ROD, - (process_profile_definition*)&g_profile_E_ARROW, - (process_profile_definition*)&g_profile_BULLET, - (process_profile_definition*)&g_profile_SWHIT0, - (process_profile_definition*)&g_profile_E_TH_BALL, - (process_profile_definition*)&g_profile_TAG_EVTAREA, - (process_profile_definition*)&g_profile_TAG_EVTMSG, - (process_profile_definition*)&g_profile_TAG_KMSG, - (process_profile_definition*)&g_profile_TAG_PUSH, - (process_profile_definition*)&g_profile_E_MK_BO, - (process_profile_definition*)&g_profile_E_MM_MT, - (process_profile_definition*)&g_profile_OBJ_KBOX, - (process_profile_definition*)&g_profile_OBJ_FW, - (process_profile_definition*)&g_profile_B_GOS, - (process_profile_definition*)&g_profile_OBJ_YSTONE, - (process_profile_definition*)&g_profile_MANT, - (process_profile_definition*)&g_profile_CROD, - (process_profile_definition*)&g_profile_OBJ_PLEAF, - (process_profile_definition*)&g_profile_OBJ_KBACKET, - (process_profile_definition*)&g_profile_OBJ_YBAG, - (process_profile_definition*)&g_profile_OBJ_PUMPKIN, - (process_profile_definition*)&g_profile_OBJ_AUTOMATA, - (process_profile_definition*)&g_profile_OBJ_GADGET, - (process_profile_definition*)&g_profile_OBJ_KAGO, - (process_profile_definition*)&g_profile_Obj_Carry, - (process_profile_definition*)&g_profile_Obj_Stone, - (process_profile_definition*)&g_profile_OBJ_HB, - (process_profile_definition*)&g_profile_NPC_INKO, - (process_profile_definition*)&g_profile_BD, - (process_profile_definition*)&g_profile_Obj_Eff, - (process_profile_definition*)&g_profile_WPILLAR, - (process_profile_definition*)&g_profile_WMARK, - (process_profile_definition*)&g_profile_E_BI, - (process_profile_definition*)&g_profile_E_BI_LEAF, - (process_profile_definition*)&g_profile_START_AND_GOAL, - (process_profile_definition*)&g_profile_NPC_DF, - (process_profile_definition*)&g_profile_ARROW, - (process_profile_definition*)&g_profile_PATH_LINE, - (process_profile_definition*)&g_profile_TAG_ALLMATO, - (process_profile_definition*)&g_profile_Obj_Timer, - (process_profile_definition*)&g_profile_SCENE_EXIT, - (process_profile_definition*)&g_profile_CAMERA, - (process_profile_definition*)&g_profile_CAMERA2, - (process_profile_definition*)&g_profile_SUSPEND, - (process_profile_definition*)&g_profile_GRASS, - (process_profile_definition*)&g_profile_KYEFF, - (process_profile_definition*)&g_profile_KYEFF2, - (process_profile_definition*)&g_profile_MSG_OBJECT, - (process_profile_definition*)&g_profile_MENUWINDOW, - (process_profile_definition*)&g_profile_TIMER, - (process_profile_definition*)&g_profile_METER2, - (process_profile_definition*)&g_profile_GAMEOVER, +process_profile_definition* g_fpcPfLst_ProfileList[] = { + &g_profile_OVERLAP0, + &g_profile_OVERLAP1, + &g_profile_OVERLAP3, + &g_profile_OVERLAP6, + &g_profile_OVERLAP7, + &g_profile_OVERLAP8, + &g_profile_OVERLAP9, + &g_profile_OVERLAP10, + &g_profile_OVERLAP11, + &g_profile_LOGO_SCENE, + &g_profile_MENU_SCENE, + &g_profile_PLAY_SCENE, + &g_profile_OPENING_SCENE, + &g_profile_NAME_SCENE, + &g_profile_NAMEEX_SCENE, + &g_profile_WARNING_SCENE, + &g_profile_WARNING2_SCENE, + &g_profile_OVERLAP2, + &g_profile_ROOM_SCENE, + &g_profile_KANKYO, + &g_profile_ALLDIE, + &g_profile_ENVSE, + &g_profile_Obj_Swpush, + &g_profile_Obj_Swpush2, + &g_profile_Obj_Swpush5, + &g_profile_Tag_Gstart, + &g_profile_NO_CHG_ROOM, + &g_profile_Obj_Lv6ElevtA, + &g_profile_OBJ_SO, + &g_profile_Obj_Movebox, + &g_profile_Obj_SwTurn, + &g_profile_Obj_Lv6SwTurn, + &g_profile_OBJ_SEKIZOA, + &g_profile_OBJ_GRA, + &g_profile_TAG_GRA, + &g_profile_TAG_YAMI, + &g_profile_Obj_Ladder, + &g_profile_OBJ_BEF, + &g_profile_OBJ_FMOBJ, + &g_profile_OBJ_LBOX, + &g_profile_OBJ_WEB0, + &g_profile_OBJ_WEB1, + &g_profile_OBJ_CB, + &g_profile_OBJ_MAKI, + &g_profile_OBJ_BRG, + &g_profile_OBJ_GB, + &g_profile_OBJ_GM, + &g_profile_OBJ_TOBY, + &g_profile_OBJ_TP, + &g_profile_TREESH, + &g_profile_Obj_ZDoor, + &g_profile_Obj_Pillar, + &g_profile_Obj_Cdoor, + &g_profile_GRDWATER, + &g_profile_Obj_RotBridge, + &g_profile_Obj_MagLift, + &g_profile_Obj_MagLiftRot, + &g_profile_Obj_Lv1Cdl00, + &g_profile_Obj_Lv1Cdl01, + &g_profile_Obj_TvCdlst, + &g_profile_Obj_HsTarget, + &g_profile_Obj_HeavySw, + &g_profile_Obj_GoGate, + &g_profile_Obj_TaFence, + &g_profile_Obj_Saidan, + &g_profile_Obj_SpinLift, + &g_profile_Obj_BmWindow, + &g_profile_Obj_RfHole, + &g_profile_Obj_WaterPillar, + &g_profile_Obj_SyRock, + &g_profile_Obj_BsGate, + &g_profile_Obj_AmiShutter, + &g_profile_Obj_WtGate, + &g_profile_Obj_Lv2Candle, + &g_profile_Obj_TogeTrap, + &g_profile_Obj_RotTrap, + &g_profile_Obj_SwallShutter, + &g_profile_Obj_IceWall, + &g_profile_Obj_Lv5SwIce, + &g_profile_Obj_Lv5FBoard, + &g_profile_Obj_Turara, + &g_profile_Obj_TwGate, + &g_profile_Obj_Digholl, + &g_profile_Obj_Digpl, + &g_profile_Obj_TestCube, + &g_profile_Obj_Kshutter, + &g_profile_NPC_COACH, + &g_profile_NPC_THEB, + &g_profile_COACH_FIRE, + &g_profile_COACH2D, + &g_profile_BALLOON2D, + &g_profile_SKIP2D, + &g_profile_Obj_MvStair, + &g_profile_Obj_Cowdoor, + &g_profile_Obj_Swpropeller, + &g_profile_Obj_BoomShutter, + &g_profile_NPC_KS, + &g_profile_Obj_Hfuta, + &g_profile_Obj_BkDoor, + &g_profile_Obj_Cboard, + &g_profile_Obj_MGate, + &g_profile_Obj_Ikada, + &g_profile_Obj_Ice_l, + &g_profile_Obj_Ice_s, + &g_profile_Obj_E_CREATE, + &g_profile_Obj_Bhbridge, + &g_profile_Obj_Kaisou, + &g_profile_Obj_HHASHI, + &g_profile_Obj_BHASHI, + &g_profile_OCTHASHI, + &g_profile_Obj_THASHI, + &g_profile_Obj_CRVGATE, + &g_profile_Obj_CRVFENCE, + &g_profile_Obj_CRVHAHEN, + &g_profile_Obj_CRVSTEEL, + &g_profile_Obj_CRVLH_UP, + &g_profile_Obj_CRVLH_DW, + &g_profile_Obj_RIVERROCK, + &g_profile_Obj_DUST, + &g_profile_Obj_ITA, + &g_profile_Obj_Window, + &g_profile_Obj_MetalBox, + &g_profile_Obj_BBox, + &g_profile_OBJ_MSIMA, + &g_profile_OBJ_MYOGAN, + &g_profile_B_ZANTS, + &g_profile_Obj_ChainBlock, + &g_profile_Obj_ChainWall, + &g_profile_Obj_KkrGate, + &g_profile_Obj_RiderGate, + &g_profile_Obj_Onsen, + &g_profile_Obj_Chest, + &g_profile_Obj_Bemos, + &g_profile_Obj_RopeBridge, + &g_profile_Obj_WellCover, + &g_profile_Obj_GraveStone, + &g_profile_Obj_ZraRock, + &g_profile_Obj_GraRock, + &g_profile_Obj_GrzRock, + &g_profile_GRA_WALL, + &g_profile_OBJ_ONSEN_FIRE, + &g_profile_Obj_Lv6bemos, + &g_profile_Obj_Lv6bemos2, + &g_profile_Obj_BarDesk, + &g_profile_Obj_DigSnow, + &g_profile_Obj_Ytaihou, + &g_profile_Obj_Elevator, + &g_profile_Obj_Lv6TogeRoll, + &g_profile_Obj_Lv6TogeTrap, + &g_profile_Obj_Lv6Tenbin, + &g_profile_Obj_Lv6SwGate, + &g_profile_Obj_Lv6Lblock, + &g_profile_Obj_Lv6ChgGate, + &g_profile_Obj_Lv6FuriTrap, + &g_profile_Obj_Lv6SzGate, + &g_profile_Obj_Lv4EdShutter, + &g_profile_Obj_Lv4Gate, + &g_profile_Obj_Lv4PoGate, + &g_profile_Obj_Lv4SlideWall, + &g_profile_Obj_Lv4HsTarget, + &g_profile_Obj_Lv7PropY, + &g_profile_Obj_Lv7BsGate, + &g_profile_Obj_Lv8OptiLift, + &g_profile_Obj_Lv8KekkaiTrap, + &g_profile_Obj_Lv8Lift, + &g_profile_Obj_Lv8UdFloor, + &g_profile_Obj_Lv9SwShutter, + &g_profile_Obj_TobyHouse, + &g_profile_Obj_poCandle, + &g_profile_Obj_Lv4DigSand, + &g_profile_Obj_FallObj, + &g_profile_Obj_SmgDoor, + &g_profile_Obj_SwLight, + &g_profile_Obj_Avalanche, + &g_profile_Obj_MirrorScrew, + &g_profile_Obj_MirrorSand, + &g_profile_Obj_MirrorTable, + &g_profile_Obj_MirrorChain, + &g_profile_Obj_Mirror6Pole, + &g_profile_Obj_SwSpinner, + &g_profile_Obj_TDoor, + &g_profile_Obj_Lv7Bridge, + &g_profile_Obj_zrTurara, + &g_profile_Obj_TakaraDai, + &g_profile_Obj_Table, + &g_profile_Obj_CatDoor, + &g_profile_Obj_Gake, + &g_profile_CSTAF, + &g_profile_Obj_Lv4RailWall, + &g_profile_Obj_Lv4Sand, + &g_profile_Obj_PushDoor, + &g_profile_PushDoor, + &g_profile_Obj_GanonWall2, + &g_profile_Obj_Lv4Bridge, + &g_profile_Obj_Lv4Floor, + &g_profile_Tag_Spinner, + &g_profile_Obj_SwHang, + &g_profile_Obj_RotStair, + &g_profile_Obj_MagneArm, + &g_profile_Obj_KWheel00, + &g_profile_Obj_KWheel01, + &g_profile_Obj_Ychndlr, + &g_profile_Obj_PRElvtr, + &g_profile_Obj_MHasu, + &g_profile_Obj_YIblltray, + &g_profile_Obj_Lv6EGate, + &g_profile_Obj_PDtile, + &g_profile_Obj_PDwall, + &g_profile_Obj_Lv4PRwall, + &g_profile_Obj_KLift00, + &g_profile_B_OH, + &g_profile_Obj_Lv4Chan, + &g_profile_Obj_Lv3R10Saka, + &g_profile_Obj_Lv3Water, + &g_profile_Obj_Lv3Water2, + &g_profile_OBJ_LV3WATERB, + &g_profile_Obj_HBombkoya, + &g_profile_Obj_SZbridge, + &g_profile_Obj_KakarikoBrg, + &g_profile_Obj_OrdinBrg, + &g_profile_Obj_BurnBox, + &g_profile_Obj_KJgjs, + &g_profile_OBJ_IHASI, + &g_profile_Obj_IceBlock, + &g_profile_Obj_VolcanicBall, + &g_profile_Obj_VolcanicBomb, + &g_profile_Obj_VolcGnd, + &g_profile_Obj_KKanban, + &g_profile_E_PH, + &g_profile_NPC_ZRA, + &g_profile_Obj_Chandelier, + &g_profile_Obj_Stopper2, + &g_profile_DOOR20, + &g_profile_Tag_Hinit, + &g_profile_Tag_Hjump, + &g_profile_Tag_AJnot, + &g_profile_Tag_Hstop, + &g_profile_CANOE, + &g_profile_HORSE, + &g_profile_E_WB, + &g_profile_OBJ_ITO, + &g_profile_OBJ_SW, + &g_profile_SPINNER, + &g_profile_B_OB, + &g_profile_KAGO, + &g_profile_E_YC, + &g_profile_B_DS, + &g_profile_B_DR, + &g_profile_B_ZANTZ, + &g_profile_B_ZANT, + &g_profile_B_ZANTM, + &g_profile_TBOX, + &g_profile_TBOX2, + &g_profile_ALINK, + &g_profile_BOOMERANG, + &g_profile_MIDNA, + &g_profile_NPC_TK, + &g_profile_NPC_WORM, + &g_profile_PPolamp, + &g_profile_BkyRock, + &g_profile_HITOBJ, + &g_profile_EP, + &g_profile_COW, + &g_profile_PERU, + &g_profile_NI, + &g_profile_NPC_TKJ2, + &g_profile_SQ, + &g_profile_NPC_SQ, + &g_profile_DO, + &g_profile_NPC_NE, + &g_profile_NPC_TR, + &g_profile_NPC_LF, + &g_profile_OBJ_FOOD, + &g_profile_OBJ_KI, + &g_profile_OBJ_KITA, + &g_profile_OBJ_KEY, + &g_profile_OBJ_KEYHOLE, + &g_profile_Obj_Lv5Key, + &g_profile_OBJ_LP, + &g_profile_OBJ_TATIGI, + &g_profile_OBJ_ROCK, + &g_profile_OBJ_WFLAG, + &g_profile_OBJ_KAGE, + &g_profile_OBJ_KANBAN2, + &g_profile_OBJ_BALLOON, + &g_profile_OBJ_SUISYA, + &g_profile_OBJ_OILTUBO, + &g_profile_OBJ_ROTEN, + &g_profile_OBJ_SSDRINK, + &g_profile_OBJ_SSITEM, + &g_profile_TAG_SSDRINK, + &g_profile_TAG_BTLITM, + &g_profile_TAG_LV5SOUP, + &g_profile_TAG_MNLIGHT, + &g_profile_TAG_SHOPCAM, + &g_profile_TAG_SHOPITM, + &g_profile_OBJ_NDOOR, + &g_profile_OBJ_UDOOR, + &g_profile_OBJ_USAKU, + &g_profile_Obj_SM_DOOR, + &g_profile_OBJ_BED, + &g_profile_OBJ_BOUMATO, + &g_profile_OBJ_ITAMATO, + &g_profile_OBJ_NOUGU, + &g_profile_OBJ_STICK, + &g_profile_OBJ_MIE, + &g_profile_OBJ_SEKIDOOR, + &g_profile_OBJ_SEKIZO, + &g_profile_OBJ_SMTILE, + &g_profile_NPC_FISH, + &g_profile_MG_FISH, + &g_profile_FSHOP, + &g_profile_NPC_DU, + &g_profile_DISAPPEAR, + &g_profile_Obj_Mato, + &g_profile_Obj_Flag, + &g_profile_Obj_Flag2, + &g_profile_Obj_Flag3, + &g_profile_Obj_GOMIKABE, + &g_profile_Obj_Yousei, + &g_profile_Obj_Kabuto, + &g_profile_Obj_Cho, + &g_profile_Obj_Kuw, + &g_profile_Obj_Nan, + &g_profile_Obj_Dan, + &g_profile_Obj_Kam, + &g_profile_Obj_Ten, + &g_profile_Obj_Ari, + &g_profile_Obj_Kag, + &g_profile_Obj_Batta, + &g_profile_Obj_Tombo, + &g_profile_Obj_Kat, + &g_profile_Obj_H_Saku, + &g_profile_Obj_Yobikusa, + &g_profile_Obj_KazeNeko, + &g_profile_Obj_KznkArm, + &g_profile_Obj_NamePlate, + &g_profile_Obj_OnCloth, + &g_profile_Obj_LndRope, + &g_profile_Obj_ItaRope, + &g_profile_Obj_Sakuita, + &g_profile_Obj_Laundry, + &g_profile_WarpBug, + &g_profile_Izumi_Gate, + &g_profile_Obj_Fchain, + &g_profile_Obj_Wchain, + &g_profile_Tag_Attp, + &g_profile_Obj_Tornado, + &g_profile_Obj_Tornado2, + &g_profile_Obj_FirePillar, + &g_profile_Obj_FirePillar2, + &g_profile_Obj_InoBone, + &g_profile_Obj_Stopper, + &g_profile_Obj_MHole, + &g_profile_Tag_Magne, + &g_profile_Obj_BossWarp, + &g_profile_Obj_WoodPendulum, + &g_profile_Obj_WdStick, + &g_profile_Obj_StairBlock, + &g_profile_Obj_Geyser, + &g_profile_Tag_KtOnFire, + &g_profile_Obj_FireWood, + &g_profile_Obj_FireWood2, + &g_profile_Obj_GpTaru, + &g_profile_Obj_OnsenTaru, + &g_profile_Obj_KiPot, + &g_profile_TBOX_SW, + &g_profile_Obj_SwChain, + &g_profile_Obj_WoodenSword, + &g_profile_Obj_StoneMark, + &g_profile_Obj_Lv3Candle, + &g_profile_Tag_Lv4Candle, + &g_profile_Tag_Lv4CandleDm, + &g_profile_Obj_DamCps, + &g_profile_Obj_Smoke, + &g_profile_Obj_WaterFall, + &g_profile_Obj_ZoraCloth, + &g_profile_Obj_poFire, + &g_profile_Tag_poFire, + &g_profile_Obj_glowSphere, + &g_profile_Tag_LightBall, + &g_profile_SwLBall, + &g_profile_SwBall, + &g_profile_Obj_WaterEff, + &g_profile_Tag_RiverBack, + &g_profile_Tag_KagoFall, + &g_profile_Tag_Lv2PrChk, + &g_profile_Obj_Lv4Gear, + &g_profile_Obj_MasterSword, + &g_profile_Obj_WoodStatue, + &g_profile_Obj_Fan, + &g_profile_Obj_IceLeaf, + &g_profile_Obj_zrTuraraRc, + &g_profile_Tag_RetRoom, + &g_profile_Obj_WindStone, + &g_profile_Tag_WaraHowl, + &g_profile_Obj_SCannon, + &g_profile_Obj_SmWStone, + &g_profile_Obj_SCannonCrs, + &g_profile_Tag_SnowEff, + &g_profile_Tag_CstaSw, + &g_profile_Tag_Lv6CstaSw, + &g_profile_Obj_awaPlar, + &g_profile_Obj_poTbox, + &g_profile_Obj_TimeFire, + &g_profile_Obj_TMoon, + &g_profile_Obj_GanonWall, + &g_profile_Obj_Prop, + &g_profile_CSTATUE, + &g_profile_Obj_SwBallA, + &g_profile_Obj_SwBallB, + &g_profile_Obj_SnowSoup, + &g_profile_Obj_Nagaisu, + &g_profile_Obj_RCircle, + &g_profile_Obj_Picture, + &g_profile_Tag_SetBall, + &g_profile_Tag_SmkEmt, + &g_profile_SwTime, + &g_profile_Obj_HFtr, + &g_profile_Obj_HBarrel, + &g_profile_Obj_Crystal, + &g_profile_Obj_SCannonTen, + &g_profile_Obj_SwBallC, + &g_profile_SCENE_EXIT2, + &g_profile_Obj_Hata, + &g_profile_Obj_ToaruMaki, + &g_profile_Tag_AttackItem, + &g_profile_Tag_RmbitSw, + &g_profile_Obj_Sword, + &g_profile_Tag_Spring, + &g_profile_Tag_Statue, + &g_profile_E_AI, + &g_profile_E_GS, + &g_profile_E_GOB, + &g_profile_E_DD, + &g_profile_E_DN, + &g_profile_E_S1, + &g_profile_E_MF, + &g_profile_E_SG, + &g_profile_E_BS, + &g_profile_E_SF, + &g_profile_E_SH, + &g_profile_E_DF, + &g_profile_E_GM, + &g_profile_E_MD, + &g_profile_E_SM, + &g_profile_E_SM2, + &g_profile_E_ST, + &g_profile_E_ST_LINE, + &g_profile_E_SB, + &g_profile_E_TH, + &g_profile_E_CR, + &g_profile_E_CR_EGG, + &g_profile_E_DB, + &g_profile_E_DB_LEAF, + &g_profile_E_GA, + &g_profile_E_GB, + &g_profile_E_HB, + &g_profile_E_HB_LEAF, + &g_profile_E_HZELDA, + &g_profile_E_YD, + &g_profile_E_YH, + &g_profile_E_YD_LEAF, + &g_profile_E_HM, + &g_profile_E_TK, + &g_profile_E_TK2, + &g_profile_E_TK_BALL, + &g_profile_E_RB, + &g_profile_E_RD, + &g_profile_E_RDB, + &g_profile_E_RDY, + &g_profile_E_FM, + &g_profile_E_FS, + &g_profile_E_PM, + &g_profile_E_PO, + &g_profile_E_MB, + &g_profile_E_MK, + &g_profile_E_MM, + &g_profile_E_FZ, + &g_profile_E_ZS, + &g_profile_E_KK, + &g_profile_E_HP, + &g_profile_E_ZH, + &g_profile_E_ZM, + &g_profile_E_PZ, + &g_profile_E_FB, + &g_profile_E_FK, + &g_profile_E_MS, + &g_profile_E_NEST, + &g_profile_E_NZ, + &g_profile_E_BA, + &g_profile_E_BU, + &g_profile_E_BUG, + &g_profile_E_BEE, + &g_profile_E_IS, + &g_profile_E_KG, + &g_profile_E_KR, + &g_profile_E_SW, + &g_profile_E_GE, + &g_profile_Tag_WatchGe, + &g_profile_E_YM, + &g_profile_E_YM_TAG, + &g_profile_E_YMB, + &g_profile_Tag_FWall, + &g_profile_Tag_WaterFall, + &g_profile_E_YK, + &g_profile_E_YR, + &g_profile_E_YG, + &g_profile_E_HZ, + &g_profile_E_WS, + &g_profile_E_OC, + &g_profile_E_OT, + &g_profile_E_DT, + &g_profile_E_BG, + &g_profile_E_OctBg, + &g_profile_DR, + &g_profile_L7lowDr, + &g_profile_L7ODR, + &g_profile_E_TT, + &g_profile_E_DK, + &g_profile_E_VT, + &g_profile_E_WW, + &g_profile_E_GI, + &g_profile_B_BH, + &g_profile_B_BQ, + &g_profile_B_GM, + &g_profile_B_GND, + &g_profile_B_GO, + &g_profile_B_OH2, + &g_profile_B_YO, + &g_profile_B_YOI, + &g_profile_B_TN, + &g_profile_B_GG, + &g_profile_B_DRE, + &g_profile_B_MGN, + &g_profile_E_WAP, + &g_profile_ITEM, + &g_profile_Obj_SmallKey, + &g_profile_Obj_Kantera, + &g_profile_Obj_LifeContainer, + &g_profile_Obj_Shield, + &g_profile_Demo_Item, + &g_profile_ShopItem, + &g_profile_Obj_Drop, + &g_profile_OBJ_RW, + &g_profile_NBOMB, + &g_profile_TAG_CSW, + &g_profile_TAG_QS, + &g_profile_HOZELDA, + &g_profile_SWC00, + &g_profile_KNOB20, + &g_profile_DBDOOR, + &g_profile_BOSS_DOOR, + &g_profile_L1BOSS_DOOR, + &g_profile_L1MBOSS_DOOR, + &g_profile_L5BOSS_DOOR, + &g_profile_DSHUTTER, + &g_profile_SPIRAL_DOOR, + &g_profile_Tag_ChgRestart, + &g_profile_Tag_Restart, + &g_profile_ANDSW, + &g_profile_ANDSW2, + &g_profile_MYNA, + &g_profile_NPC_GND, + &g_profile_NPC_GRA, + &g_profile_NPC_GRC, + &g_profile_NPC_GRD, + &g_profile_NPC_GRM, + &g_profile_NPC_GRMC, + &g_profile_NPC_GRO, + &g_profile_NPC_GRR, + &g_profile_NPC_GRS, + &g_profile_NPC_GRZ, + &g_profile_NPC_YAMID, + &g_profile_NPC_YAMIT, + &g_profile_NPC_YAMIS, + &g_profile_NPC_BLUENS, + &g_profile_NPC_KAKASHI, + &g_profile_NPC_KDK, + &g_profile_NPC_ARU, + &g_profile_NPC_BANS, + &g_profile_NPC_BESU, + &g_profile_NPC_BOU, + &g_profile_NPC_BOU_S, + &g_profile_NPC_CLERKA, + &g_profile_NPC_CLERKB, + &g_profile_NPC_CLERKT, + &g_profile_NPC_WRESTLER, + &g_profile_Tag_Arena, + &g_profile_Tag_Instruction, + &g_profile_NPC_DOC, + &g_profile_NPC_GWOLF, + &g_profile_NPC_LEN, + &g_profile_NPC_LUD, + &g_profile_NPC_FAIRY_SEIREI, + &g_profile_NPC_FAIRY, + &g_profile_NPC_HANJO, + &g_profile_NPC_HENNA, + &g_profile_NPC_HENNA0, + &g_profile_NPC_HOZ, + &g_profile_NPC_JAGAR, + &g_profile_NPC_KKRI, + &g_profile_NPC_KN, + &g_profile_KN_BULLET, + &g_profile_NPC_KNJ, + &g_profile_NPC_KOLIN, + &g_profile_NPC_KOLINB, + &g_profile_NPC_KYURY, + &g_profile_NPC_MARO, + &g_profile_NPC_MIDP, + &g_profile_NPC_MOI, + &g_profile_NPC_RACA, + &g_profile_NPC_SARU, + &g_profile_NPC_SEIB, + &g_profile_NPC_SEIC, + &g_profile_NPC_SEID, + &g_profile_NPC_SEIRA, + &g_profile_NPC_SERA2, + &g_profile_NPC_SEIREI, + &g_profile_NPC_SHAMAN, + &g_profile_NPC_SMARO, + &g_profile_NPC_SOLA, + &g_profile_NPC_TARO, + &g_profile_NPC_PACHI_BESU, + &g_profile_NPC_PACHI_TARO, + &g_profile_NPC_PACHI_MARO, + &g_profile_TAG_PATI, + &g_profile_NPC_THE, + &g_profile_NPC_TKJ, + &g_profile_NPC_TKS, + &g_profile_NPC_TKC, + &g_profile_OBJ_TKS, + &g_profile_NPC_TOBY, + &g_profile_NPC_URI, + &g_profile_NPC_YELIA, + &g_profile_NPC_YKM, + &g_profile_NPC_YKW, + &g_profile_NPC_ZANB, + &g_profile_NPC_ZANT, + &g_profile_NPC_ZELDA, + &g_profile_NPC_ZELR, + &g_profile_NPC_ZELRO, + &g_profile_OBJ_ZRAFREEZE, + &g_profile_NPC_ZRC, + &g_profile_NPC_ZRZ, + &g_profile_ZRA_MARK, + &g_profile_MYNA2, + &g_profile_TAG_MYNA2, + &g_profile_NPC_CD3, + &g_profile_Tag_Schedule, + &g_profile_Tag_Escape, + &g_profile_NPC_CHAT, + &g_profile_NPC_SOLDIERa, + &g_profile_NPC_SOLDIERb, + &g_profile_PASSER_MNG, + &g_profile_NPC_PASSER, + &g_profile_NPC_PASSER2, + &g_profile_NPC_POST, + &g_profile_NPC_POUYA, + &g_profile_FORMATION_MNG, + &g_profile_NPC_FGUARD, + &g_profile_GUARD_MNG, + &g_profile_TAG_GUARD, + &g_profile_NPC_GUARD, + &g_profile_NPC_ASH, + &g_profile_NPC_ASHB, + &g_profile_NPC_SHAD, + &g_profile_NPC_RAFREL, + &g_profile_NPC_MOIR, + &g_profile_NPC_IMPAL, + &g_profile_NPC_SHOE, + &g_profile_NPC_DOORBOY, + &g_profile_NPC_PRAYER, + &g_profile_NPC_KASIHANA, + &g_profile_NPC_KASIKYU, + &g_profile_NPC_KASIMICH, + &g_profile_NPC_DRSOL, + &g_profile_NPC_CHIN, + &g_profile_NPC_INS, + &g_profile_NPC_SHOP0, + &g_profile_NPC_MK, + &g_profile_NPC_P2, + &g_profile_KYTAG00, + &g_profile_KYTAG01, + &g_profile_KYTAG02, + &g_profile_KYTAG03, + &g_profile_KYTAG04, + &g_profile_KYTAG05, + &g_profile_KYTAG06, + &g_profile_KYTAG07, + &g_profile_KYTAG08, + &g_profile_KYTAG09, + &g_profile_KYTAG10, + &g_profile_KYTAG11, + &g_profile_KYTAG12, + &g_profile_KYTAG13, + &g_profile_KYTAG14, + &g_profile_KYTAG15, + &g_profile_KYTAG16, + &g_profile_KYTAG17, + &g_profile_Ykgr, + &g_profile_TALK, + &g_profile_Obj_Crope, + &g_profile_Obj_Bombf, + &g_profile_Obj_BkLeaf, + &g_profile_Tag_Mhint, + &g_profile_Tag_Mmsg, + &g_profile_Tag_Mwait, + &g_profile_Tag_Mstop, + &g_profile_Tag_Stream, + &g_profile_Tag_Sppath, + &g_profile_Tag_Wljump, + &g_profile_Tag_TWGate, + &g_profile_Tag_Lv6Gate, + &g_profile_Tag_Lv7Gate, + &g_profile_Tag_Lv8Gate, + &g_profile_Tag_TheBHint, + &g_profile_Tag_Assist, + &g_profile_DEMO00, + &g_profile_TAG_CAMERA, + &g_profile_TAG_CHKPOINT, + &g_profile_TAG_EVENT, + &g_profile_TAG_EVT, + &g_profile_TAG_TELOP, + &g_profile_TAG_HOWL, + &g_profile_TAG_MSG, + &g_profile_TAG_LANTERN, + &g_profile_Tag_Mist, + &g_profile_DMIDNA, + &g_profile_KY_THUNDER, + &g_profile_VRBOX, + &g_profile_VRBOX2, + &g_profile_BG, + &g_profile_SET_BG_OBJ, + &g_profile_BG_OBJ, + &g_profile_MIRROR, + &g_profile_MOVIE_PLAYER, + &g_profile_TITLE, + &g_profile_FR, + &g_profile_ECONT, + &g_profile_MG_ROD, + &g_profile_E_ARROW, + &g_profile_BULLET, + &g_profile_SWHIT0, + &g_profile_E_TH_BALL, + &g_profile_TAG_EVTAREA, + &g_profile_TAG_EVTMSG, + &g_profile_TAG_KMSG, + &g_profile_TAG_PUSH, + &g_profile_E_MK_BO, + &g_profile_E_MM_MT, + &g_profile_OBJ_KBOX, + &g_profile_OBJ_FW, + &g_profile_B_GOS, + &g_profile_OBJ_YSTONE, + &g_profile_MANT, + &g_profile_CROD, + &g_profile_OBJ_PLEAF, + &g_profile_OBJ_KBACKET, + &g_profile_OBJ_YBAG, + &g_profile_OBJ_PUMPKIN, + &g_profile_OBJ_AUTOMATA, + &g_profile_OBJ_GADGET, + &g_profile_OBJ_KAGO, + &g_profile_Obj_Carry, + &g_profile_Obj_Stone, + &g_profile_OBJ_HB, + &g_profile_NPC_INKO, + &g_profile_BD, + &g_profile_Obj_Eff, + &g_profile_WPILLAR, + &g_profile_WMARK, + &g_profile_E_BI, + &g_profile_E_BI_LEAF, + &g_profile_START_AND_GOAL, + &g_profile_NPC_DF, + &g_profile_ARROW, + &g_profile_PATH_LINE, + &g_profile_TAG_ALLMATO, + &g_profile_Obj_Timer, + &g_profile_SCENE_EXIT, + &g_profile_CAMERA, + &g_profile_CAMERA2, + &g_profile_SUSPEND, + &g_profile_GRASS, + &g_profile_KYEFF, + &g_profile_KYEFF2, + &g_profile_MSG_OBJECT, + &g_profile_MENUWINDOW, + &g_profile_TIMER, + &g_profile_METER2, + &g_profile_GAMEOVER, + NULL, }; /* 80456C58-80456C6C 000078 0014+00 0/0 1/1 0/0 .text ModuleProlog */ @@ -1608,4 +810,4 @@ extern "C" void ModuleProlog() { /* 80456C6C-80456C7C 00008C 0010+00 0/0 1/1 0/0 .text ModuleEpilog */ extern "C" void ModuleEpilog() { g_fpcPf_ProfileList_p = NULL; -} \ No newline at end of file +} diff --git a/src/f_pc/f_pc_searcher.cpp b/src/f_pc/f_pc_searcher.cpp index f193b0f07b..8f6331dba7 100644 --- a/src/f_pc/f_pc_searcher.cpp +++ b/src/f_pc/f_pc_searcher.cpp @@ -7,18 +7,18 @@ /* 80023578-80023590 0018+00 s=0 e=3 z=77 None .text fpcSch_JudgeForPName__FPvPv */ void* fpcSch_JudgeForPName(void* i_proc, void* i_data) { - s16 proc_name = *(s16*)i_data; - - if (((base_process_class*)i_proc)->mProcName == proc_name) + s16 name = *(s16*)i_data; + if (((base_process_class*)i_proc)->name == name) return i_proc; + return NULL; } /* 80023590-800235A8 0018+00 s=0 e=44 z=270 None .text fpcSch_JudgeByID__FPvPv */ void* fpcSch_JudgeByID(void* i_proc, void* i_data) { - s32 process_id = *(s32*)i_data; - - if (((base_process_class*)i_proc)->mBsPcId == process_id) + fpc_ProcID process_id = *(fpc_ProcID*)i_data; + if (((base_process_class*)i_proc)->id == process_id) return i_proc; + return NULL; -} \ No newline at end of file +} diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index 6b3cc84f72..5c985ace73 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -6,16 +6,17 @@ #include "f_pc/f_pc_stdcreate_req.h" #include "f_pc/f_pc_load.h" #include "f_pc/f_pc_node.h" +#include "f_pc/f_pc_manager.h" /* 80023B70-80023BC4 0054+00 s=1 e=0 z=5 None .text * fpcSCtRq_phase_Load__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_Load(standard_create_request_class* i_SCtReq) { - switch (fpcLd_Load(i_SCtReq->mLoadID)) { - case 0: +s32 fpcSCtRq_phase_Load(standard_create_request_class* i_request) { + switch (fpcLd_Load(i_request->process_name)) { + case cPhs_INIT_e: return cPhs_INIT_e; - case 4: - return 2; - case 5: + case cPhs_COMPLEATE_e: + return cPhs_NEXT_e; + case cPhs_ERROR_e: default: return cPhs_ERROR_e; } @@ -23,64 +24,64 @@ s32 fpcSCtRq_phase_Load(standard_create_request_class* i_SCtReq) { /* 80023BC4-80023C2C 0068+00 s=1 e=0 z=9 None .text * fpcSCtRq_phase_CreateProcess__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_SCtReq) { - fpcLy_SetCurrentLayer(i_SCtReq->mBase.mpLayer); - i_SCtReq->mBase.mpRes = - fpcBs_Create(i_SCtReq->mLoadID, i_SCtReq->mBase.mBsPcId, i_SCtReq->unk_0x54); - if (i_SCtReq->mBase.mpRes == NULL) { - fpcLd_Free(i_SCtReq->mLoadID); +s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request) { + fpcLy_SetCurrentLayer(i_request->base.layer); + i_request->base.process = + fpcBs_Create(i_request->process_name, i_request->base.id, i_request->process_append); + if (i_request->base.process == NULL) { + fpcLd_Free(i_request->process_name); return cPhs_ERROR_e; } else { - i_SCtReq->mBase.mpRes->mpCtRq = (struct create_request*)i_SCtReq; - return 2; + i_request->base.process->create_req = &i_request->base; + return cPhs_NEXT_e; } } /* 80023C2C-80023C64 0038+00 s=1 e=0 z=3 None .text * fpcSCtRq_phase_SubCreateProcess__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_SCtReq) { - fpcLy_SetCurrentLayer(i_SCtReq->mBase.mpLayer); - return fpcBs_SubCreate(i_SCtReq->mBase.mpRes); +s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) { + fpcLy_SetCurrentLayer(i_request->base.layer); + return fpcBs_SubCreate(i_request->base.process); } /* 80023C64-80023CBC 0058+00 s=1 e=0 z=14 None .text * fpcSCtRq_phase_IsComplete__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_SCtReq) { - process_node_class* procNode = (process_node_class*)i_SCtReq->mBase.mpRes; - if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->mBase.mSubType) == 1) { - if (fpcLy_IsCreatingMesg(&procNode->mLayer) == 1) { +s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request) { + process_node_class* procNode = (process_node_class*)i_request->base.process; + if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->base.subtype) == TRUE) { + if (fpcLy_IsCreatingMesg(&procNode->layer) == TRUE) { return cPhs_INIT_e; } } - return 2; + return cPhs_NEXT_e; } /* 80023CBC-80023D0C 0050+00 s=1 e=0 z=5 None .text * fpcSCtRq_phase_PostMethod__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_SCtReq) { - if (i_SCtReq->unk_0x58 != NULL && - i_SCtReq->unk_0x58(i_SCtReq->mBase.mpRes, i_SCtReq->unk_0x5C) == 0) +s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request) { + if (i_request->create_post_method != NULL && + i_request->create_post_method(i_request->base.process, i_request->unk_0x5C) == 0) { return cPhs_INIT_e; } else { - return 2; + return cPhs_NEXT_e; } } /* 80023D0C-80023D14 0008+00 s=1 e=0 z=0 None .text * fpcSCtRq_phase_Done__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_Done(standard_create_request_class* i_SCtReq) { - return 2; +s32 fpcSCtRq_phase_Done(standard_create_request_class* i_request) { + return cPhs_NEXT_e; } /* 80023D14-80023D84 0070+00 s=1 e=0 z=2 None .text * fpcSCtRq_Handler__FP29standard_create_request_class */ -s32 fpcSCtRq_Handler(standard_create_request_class* i_SCtReq) { - s32 phase_state = cPhs_Do(&i_SCtReq->unk_0x48, i_SCtReq); +s32 fpcSCtRq_Handler(standard_create_request_class* i_request) { + s32 phase_state = cPhs_Do(&i_request->phase_request, i_request); switch (phase_state) { case cPhs_NEXT_e: - return fpcSCtRq_Handler(i_SCtReq); + return fpcSCtRq_Handler(i_request); case cPhs_COMPLEATE_e: return cPhs_COMPLEATE_e; case cPhs_LOADING_e: @@ -92,20 +93,20 @@ s32 fpcSCtRq_Handler(standard_create_request_class* i_SCtReq) { /* 80023D84-80023D8C 0008+00 s=1 e=0 z=0 None .text * fpcSCtRq_Delete__FP29standard_create_request_class */ -s32 fpcSCtRq_Delete(standard_create_request_class* i_SCtReq) { +s32 fpcSCtRq_Delete(standard_create_request_class* i_request) { return 1; } /* 80023D8C-80023D94 0008+00 s=1 e=0 z=1 None .text * fpcSCtRq_Cancel__FP29standard_create_request_class */ -s32 fpcSCtRq_Cancel(standard_create_request_class* i_SCtReq) { +s32 fpcSCtRq_Cancel(standard_create_request_class* i_request) { return 1; } /* 80023D94-80023E28 0094+00 s=0 e=12 z=1 None .text * fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv */ -s32 fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, - void* param_4, void* param_5) { +fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, + void* param_4, void* i_append) { static create_request_method_class submethod = { (cPhs__Handler)fpcSCtRq_Handler, (process_method_func)fpcSCtRq_Cancel, @@ -123,19 +124,19 @@ s32 fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_creat }; if (i_procName >= 0x7FFF) { - return -1; - } else { - standard_create_request_class* request = - (standard_create_request_class*)fpcCtRq_Create(i_layer, 0x60, &submethod); - if (request == NULL) { - return -1; - } else { - cPhs_Set(&request->unk_0x48, method); - request->mLoadID = i_procName; - request->unk_0x58 = i_createFunc; - request->unk_0x5C = param_4; - request->unk_0x54 = param_5; - return request->mBase.mBsPcId; - } + return fpcM_ERROR_PROCESS_ID_e; } -} \ No newline at end of file + + standard_create_request_class* request = + (standard_create_request_class*)fpcCtRq_Create(i_layer, sizeof(standard_create_request_class), &submethod); + if (request == NULL) { + return fpcM_ERROR_PROCESS_ID_e; + } + + cPhs_Set(&request->phase_request, method); + request->process_name = i_procName; + request->create_post_method = i_createFunc; + request->unk_0x5C = param_4; + request->process_append = i_append; + return request->base.id; +} diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index fb363c2e5b..c345b8298d 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -336,8 +336,8 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ f32 sp14; GXGetProjectionv(sp4C); GXGetViewportv(sp34); - GXProject(param_0->mLookat.mCenter.x, param_0->mLookat.mCenter.y, - param_0->mLookat.mCenter.z, param_0->mViewMtx, sp4C, sp34, &sp1C, &sp18, + GXProject(param_0->lookat.center.x, param_0->lookat.center.y, + param_0->lookat.center.z, param_0->viewMtx, sp4C, sp34, &sp1C, &sp18, &sp14); } @@ -356,12 +356,12 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ if (atn_actor != NULL) { cXyz sp28 = atn_actor->eyePos; - if (fabsf(sp28.y - camera_p->mLookat.mEye.y) < 400.0f) { - sp28.y = camera_p->mLookat.mEye.y; + if (fabsf(sp28.y - camera_p->lookat.eye.y) < 400.0f) { + sp28.y = camera_p->lookat.eye.y; } f32 var_f2 = - (atn_actor->current.pos.abs(camera_p->mLookat.mEye)) / (280.0f * temp_f31); + (atn_actor->current.pos.abs(camera_p->lookat.eye)) / (280.0f * temp_f31); var_f2 -= 0.8f; if (var_f2 < 0.0f) { var_f2 = 0.0f; @@ -390,11 +390,11 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ l_tevColor0.a = -255; } - x_orig = (int)param_1->mXOrig & ~7; - y_orig = (int)param_1->mYOrig & ~7; + x_orig = (int)param_1->x_orig & ~7; + y_orig = (int)param_1->y_orig & ~7; y_orig_pos = y_orig < 0 ? 0 : y_orig; - width = (int)param_1->mWidth & ~7; - height = (int)param_1->mHeight & ~7; + width = (int)param_1->width & ~7; + height = (int)param_1->height & ~7; zBufferTex = mDoGph_gInf_c::mZbufferTex; frameBufferTex = mDoGph_gInf_c::mFrameBufferTex; @@ -485,8 +485,8 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ GXSetDither(GX_TRUE); GXSetNumIndStages(0); Mtx44 ortho; - C_MTXOrtho(ortho, param_1->mYOrig, param_1->mYOrig + param_1->mHeight, param_1->mXOrig, - param_1->mXOrig + param_1->mWidth, 0.0f, 10.0f); + C_MTXOrtho(ortho, param_1->y_orig, param_1->y_orig + param_1->height, param_1->x_orig, + param_1->x_orig + param_1->width, 0.0f, 10.0f); GXLoadPosMtxImm(mDoMtx_getIdentity(), 0); mDoMtx_stack_c::transS(0.0025f, 0.0025f, 0.0f); GXLoadTexMtxImm(mDoMtx_stack_c::get(), 0x1e, GX_MTX2x4); @@ -521,20 +521,20 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ GXSetTevSwapModeTable(GX_TEV_SWAP3, GX_CH_BLUE, GX_CH_BLUE, GX_CH_BLUE, GX_CH_ALPHA); GXSetTevSwapMode(GX_TEVSTAGE0, GX_TEV_SWAP0, GX_TEV_SWAP0); - GXSetProjection(param_0->mProjMtx, GX_PERSPECTIVE); + GXSetProjection(param_0->projMtx, GX_PERSPECTIVE); } } /* 800091C0-800094B4 003B00 02F4+00 1/1 0/0 0/0 .text trimming__FP10view_classP15view_port_class */ static void trimming(view_class* param_0, view_port_class* param_1) { - s16 y_orig = (int)param_1->mYOrig & ~7; + s16 y_orig = (int)param_1->y_orig & ~7; s16 y_orig_pos = y_orig < 0 ? 0 : y_orig; - if ((y_orig_pos == 0) && (param_1->mScissor.mYOrig != param_1->mYOrig || - (param_1->mScissor.mHeight != param_1->mHeight))) + if ((y_orig_pos == 0) && (param_1->scissor.y_orig != param_1->y_orig || + (param_1->scissor.height != param_1->height))) { - s32 sc_top = (int)param_1->mScissor.mYOrig; - s32 sc_bottom = param_1->mScissor.mYOrig + param_1->mScissor.mHeight; + s32 sc_top = (int)param_1->scissor.y_orig; + s32 sc_bottom = param_1->scissor.y_orig + param_1->scissor.height; GXSetNumChans(1); GXSetChanCtrl(GX_ALPHA0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_NONE, GX_AF_NONE); GXSetNumTexGens(0); @@ -571,8 +571,8 @@ static void trimming(view_class* param_0, view_port_class* param_1) { GXPosition3s16(0, 0x1c0, -5); GXEnd(); } - GXSetScissor(param_1->mScissor.mXOrig, param_1->mScissor.mYOrig, param_1->mScissor.mWidth, - param_1->mScissor.mHeight); + GXSetScissor(param_1->scissor.x_orig, param_1->scissor.y_orig, param_1->scissor.width, + param_1->scissor.height); } /* 800094B4-80009544 003DF4 0090+00 2/2 1/1 0/0 .text mDoGph_drawFilterQuad__FScSc */ @@ -809,11 +809,11 @@ static void retry_captue_frame(view_class* param_0, view_port_class* param_1, in s16 height; void* tex; - x_orig = (int)param_1->mXOrig & 0xFFFFFFF8; - y_orig = (int)param_1->mYOrig & 0xFFFFFFF8; + x_orig = (int)param_1->x_orig & 0xFFFFFFF8; + y_orig = (int)param_1->y_orig & 0xFFFFFFF8; y_orig_pos = y_orig < 0 ? 0 : y_orig; - width = (int)param_1->mWidth & 0xFFFFFFF8; - height = (int)param_1->mHeight & 0xFFFFFFF8; + width = (int)param_1->width & 0xFFFFFFF8; + height = (int)param_1->height & 0xFFFFFFF8; tex = mDoGph_gInf_c::mFrameBufferTex; if (!dComIfGp_isPauseFlag()) { @@ -869,7 +869,7 @@ static void motionBlure(view_class* param_0) { GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_RGB8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB8, 0); mDoGph_drawFilterQuad(1, 1); - GXSetProjection(param_0->mProjMtx, GX_PERSPECTIVE); + GXSetProjection(param_0->projMtx, GX_PERSPECTIVE); } if (mDoGph_gInf_c::isBlure()) { g_env_light.mIsBlure = 1; @@ -930,36 +930,36 @@ int mDoGph_Painter() { camera_class* camera_p = dComIfGp_getCamera(camera_id); if (camera_p != NULL) { - dComIfGd_imageDrawShadow(camera_p->mViewMtx); + dComIfGd_imageDrawShadow(camera_p->viewMtx); view_port_class* view_port = window_p->getViewPort(); - if (view_port->mXOrig != 0.0f || view_port->mYOrig != 0.0f) { + if (view_port->x_orig != 0.0f || view_port->y_orig != 0.0f) { view_port_class new_port; - new_port.mXOrig = 0.0f; - new_port.mYOrig = 0.0f; - new_port.mWidth = 608.0f; - new_port.mHeight = 448.0f; - new_port.mNearZ = view_port->mNearZ; - new_port.mFarZ = view_port->mFarZ; - new_port.mScissor = view_port->mScissor; + new_port.x_orig = 0.0f; + new_port.y_orig = 0.0f; + new_port.width = 608.0f; + new_port.height = 448.0f; + new_port.near_z = view_port->near_z; + new_port.far_z = view_port->far_z; + new_port.scissor = view_port->scissor; view_port = &new_port; } - GXSetViewport(view_port->mXOrig, view_port->mYOrig, view_port->mWidth, - view_port->mHeight, view_port->mNearZ, view_port->mFarZ); - GXSetScissor(view_port->mXOrig, view_port->mYOrig, view_port->mWidth, - view_port->mHeight); + GXSetViewport(view_port->x_orig, view_port->y_orig, view_port->width, + view_port->height, view_port->near_z, view_port->far_z); + GXSetScissor(view_port->x_orig, view_port->y_orig, view_port->width, + view_port->height); - JPADrawInfo draw_info(camera_p->mViewMtx, camera_p->mFovy, camera_p->mAspect); + JPADrawInfo draw_info(camera_p->viewMtx, camera_p->fovy, camera_p->aspect); dComIfGp_setCurrentWindow(window_p); dComIfGp_setCurrentView(camera_p); dComIfGp_setCurrentViewport(view_port); - GXSetProjection(camera_p->mProjMtx, GX_PERSPECTIVE); + GXSetProjection(camera_p->projMtx, GX_PERSPECTIVE); PPCSync(); - j3dSys.setViewMtx(camera_p->mViewMtx); + j3dSys.setViewMtx(camera_p->viewMtx); dKy_setLight(); dComIfGd_drawOpaListSky(); dComIfGd_drawXluListSky(); @@ -972,7 +972,7 @@ int mDoGph_Painter() { dComIfGp_particle_drawFogPri0_B(&draw_info); dComIfGp_particle_drawNormalPri0_B(&draw_info); - dComIfGd_drawShadow(camera_p->mViewMtx); + dComIfGd_drawShadow(camera_p->viewMtx); dComIfGd_drawOpaList(); dComIfGd_drawOpaListDark(); @@ -1048,8 +1048,8 @@ int mDoGph_Painter() { j3dSys.setViewMtx(m2); dComIfGd_drawXluList2DScreen(); - j3dSys.setViewMtx(camera_p->mViewMtx); - GXSetProjection(camera_p->mProjMtx, GX_PERSPECTIVE); + j3dSys.setViewMtx(camera_p->viewMtx); + GXSetProjection(camera_p->projMtx, GX_PERSPECTIVE); j3dSys.reinitGX(); if ((g_env_light.mCameraInWater || !strcmp(dComIfGp_getStartStageName(), "D_MN08"))) @@ -1063,8 +1063,8 @@ int mDoGph_Painter() { } mDoGph_gInf_c::getBloom()->draw(); - j3dSys.setViewMtx(camera_p->mViewMtx); - GXSetProjection(camera_p->mProjMtx, GX_PERSPECTIVE); + j3dSys.setViewMtx(camera_p->viewMtx); + GXSetProjection(camera_p->projMtx, GX_PERSPECTIVE); dComIfGd_drawOpaList3Dlast(); ortho.setOrtho( diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp index 4a425e8647..a4ef6c3f07 100644 --- a/src/m_Do/m_Do_lib.cpp +++ b/src/m_Do/m_Do_lib.cpp @@ -94,20 +94,20 @@ void mDoLib_project(Vec* src, Vec* dst) { float yOffset; float xSize; float ySize; - if (viewPort->mXOrig != 0.0f) { - xOffset = (0.5f * ((2.0f * viewPort->mXOrig) + viewPort->mWidth)) - 304.0f; + if (viewPort->x_orig != 0.0f) { + xOffset = (0.5f * ((2.0f * viewPort->x_orig) + viewPort->width)) - 304.0f; xSize = 608.0f; } else { - xOffset = viewPort->mXOrig; - xSize = viewPort->mWidth; + xOffset = viewPort->x_orig; + xSize = viewPort->width; } - if (viewPort->mYOrig != 0.0f) { - yOffset = (0.5f * ((2.0f * viewPort->mYOrig) + viewPort->mHeight)) - 224.0f; + if (viewPort->y_orig != 0.0f) { + yOffset = (0.5f * ((2.0f * viewPort->y_orig) + viewPort->height)) - 224.0f; ySize = 448.0f; } else { - yOffset = viewPort->mYOrig; - ySize = viewPort->mHeight; + yOffset = viewPort->y_orig; + ySize = viewPort->height; } dst->x = ((0.5f + (multVec.x * f3)) * xSize) + xOffset; @@ -122,5 +122,5 @@ void mDoLib_pos2camera(Vec* src, Vec* dst) { dst->z = 0.0f; return; } - cMtx_multVec(dComIfGd_getView()->mViewMtx, src, dst); -} \ No newline at end of file + cMtx_multVec(dComIfGd_getView()->viewMtx, src, dst); +}