From dede32dbc9f23de3fb63a651165ef48de1c4f618 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Mon, 4 Mar 2024 17:33:13 -0800 Subject: [PATCH] d_a_tbox2 done, f_op_actor_mng cleanup, cleanup fopAc_ac_c member names (#2084) --- .../checkShieldAttackEmphasys__9daAlink_cFv.s | 43 - ...heckSpecialNpc__9daAlink_cFP10fopAc_ac_c.s | 17 - .../setGuardSe__9daAlink_cFP12dCcD_GObjInf.s | 53 - asm/f_op/f_op_actor_mng/__dt__8cM3dGPlaFv.s | 20 - ...AcM_getPolygonAngle__FRC13cBgS_PolyInfos.s | 47 - .../fopAcM_getWaterY__FPC4cXyzPf.s | 31 - .../gndCheck__11fopAcM_gc_cFPC4cXyz.s | 25 - .../roofCheck__11fopAcM_rc_cFPC4cXyz.s | 27 - .../waterCheck__11fopAcM_wt_cFPC4cXyz.s | 38 - .../d_a_tbox2/CreateHeap__9daTbox2_cFv.s | 126 -- .../d_a_tbox2/Create__9daTbox2_cFv.s | 93 -- .../d_a_tbox2/Delete__9daTbox2_cFv.s | 29 - .../d_a_tbox2/d_a_tbox2/Draw__9daTbox2_cFv.s | 54 - .../d_a_tbox2/Execute__9daTbox2_cFPPA3_A4_f.s | 61 - .../d_a_tbox2/__dt__10cCcD_GSttsFv.s | 20 - .../d_a_tbox2/__dt__10dCcD_GSttsFv.s | 26 - .../d_a_tbox2/__dt__12J3DFrameCtrlFv.s | 20 - .../d_a_tbox2/__dt__12dBgS_AcchCirFv.s | 30 - .../d_a_tbox2/__dt__12dBgS_ObjAcchFv.s | 30 - .../a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGAabFv.s | 20 - .../a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGCylFv.s | 20 - .../actionNotOpenDemo__9daTbox2_cFv.s | 29 - .../d_a_tbox2/actionOpenDemo__9daTbox2_cFv.s | 49 - .../d_a_tbox2/actionOpenWait__9daTbox2_cFv.s | 116 -- .../d_a_tbox2/action__9daTbox2_cFv.s | 49 - .../d_a_tbox2/boxCheck__9daTbox2_cFv.s | 84 - .../d_a_tbox2/create1st__9daTbox2_cFv.s | 152 -- .../daTbox2_MoveBGDelete__FP9daTbox2_c.s | 9 - .../daTbox2_MoveBGDraw__FP9daTbox2_c.s | 12 - .../daTbox2_MoveBGExecute__FP9daTbox2_c.s | 9 - .../daTbox2_create1st__FP9daTbox2_c.s | 112 -- .../d_a_tbox2/demoProc__9daTbox2_cFv.s | 151 -- .../d/a/d_a_tbox2/d_a_tbox2/func_80498148.s | 3 - .../d/a/d_a_tbox2/d_a_tbox2/func_80498150.s | 3 - .../d_a_tbox2/initBaseMtx__9daTbox2_cFv.s | 16 - .../init_actionNotOpenDemo__9daTbox2_cFv.s | 4 - .../init_actionOpenDemo__9daTbox2_cFv.s | 4 - .../init_actionOpenWait__9daTbox2_cFv.s | 4 - .../d_a_tbox2/init_actionWait__9daTbox2_cFv.s | 4 - .../d_a_tbox2/mode_exec__9daTbox2_cFv.s | 32 - .../d_a_tbox2/mode_exec_wait__9daTbox2_cFv.s | 73 - .../d_a_tbox2/mode_proc_call__9daTbox2_cFv.s | 37 - .../d_a_tbox2/openInit__9daTbox2_cFv.s | 37 - .../d_a_tbox2/setBaseMtx__9daTbox2_cFv.s | 26 - .../d_a_tbox2/setGetDemoItem__9daTbox2_cFv.s | 40 - include/JSystem/JUtility/JUTAssert.h | 4 + include/d/a/d_a_alink.h | 6 +- include/d/a/d_a_npc.h | 6 +- include/d/d_item.h | 1 + include/dolphin/os.h | 1 + include/f_op/f_op_actor.h | 86 +- include/f_op/f_op_actor_mng.h | 193 +-- include/f_op/f_op_camera.h | 2 +- include/f_op/f_op_kankyo.h | 6 +- include/f_op/f_op_msg.h | 4 +- include/f_op/f_op_msg_mng.h | 2 +- include/f_op/f_op_overlap.h | 2 +- include/f_op/f_op_view.h | 4 +- include/f_pc/f_pc_leaf.h | 2 +- include/f_pc/f_pc_node.h | 2 +- include/f_pc/f_pc_profile.h | 2 +- .../rel/d/a/d_a_scene_exit/d_a_scene_exit.h | 4 +- include/rel/d/a/d_a_tbox/d_a_tbox.h | 3 +- include/rel/d/a/d_a_tbox2/d_a_tbox2.h | 75 +- include/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.h | 2 +- .../a/npc/d_a_npc_wrestler/d_a_npc_wrestler.h | 2 +- .../d_a_obj_grave_stone/d_a_obj_grave_stone.h | 2 +- .../d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h | 2 +- .../obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h | 2 +- .../d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h | 4 +- .../d_a_obj_wind_stone/d_a_obj_wind_stone.h | 2 +- .../a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h | 2 +- .../d_a_tag_assistance/d_a_tag_assistance.h | 2 +- .../a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h | 26 +- .../rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.h | 2 +- .../rel/d/a/tag/d_a_tag_push/d_a_tag_push.h | 4 +- .../rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h | 2 +- .../tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h | 2 +- .../d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h | 2 +- rel/d/a/b/d_a_b_go/d_a_b_go.cpp | 22 +- rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp | 28 +- rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp | 8 +- rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp | 6 +- rel/d/a/d_a_alldie/d_a_alldie.cpp | 8 +- rel/d/a/d_a_andsw/d_a_andsw.cpp | 8 +- rel/d/a/d_a_andsw2/d_a_andsw2.cpp | 16 +- rel/d/a/d_a_bg/d_a_bg.cpp | 6 +- rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp | 14 +- rel/d/a/d_a_boomerang/d_a_boomerang.cpp | 24 +- rel/d/a/d_a_crod/d_a_crod.cpp | 16 +- rel/d/a/d_a_disappear/d_a_disappear.cpp | 2 +- rel/d/a/d_a_dmidna/d_a_dmidna.cpp | 4 +- rel/d/a/d_a_do/d_a_do.cpp | 43 +- rel/d/a/d_a_dshutter/d_a_dshutter.cpp | 40 +- rel/d/a/d_a_econt/d_a_econt.cpp | 8 +- rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp | 10 +- rel/d/a/d_a_hitobj/d_a_hitobj.cpp | 8 +- rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp | 4 +- rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp | 58 +- rel/d/a/d_a_mirror/d_a_mirror.cpp | 16 +- rel/d/a/d_a_myna/d_a_myna.cpp | 156 +- rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp | 8 +- rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp | 14 +- rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp | 2 +- rel/d/a/d_a_spinner/d_a_spinner.cpp | 4 +- rel/d/a/d_a_suspend/d_a_suspend.cpp | 14 +- rel/d/a/d_a_swTime/d_a_swTime.cpp | 8 +- rel/d/a/d_a_swc00/d_a_swc00.cpp | 2 +- rel/d/a/d_a_talk/d_a_talk.cpp | 10 +- rel/d/a/d_a_tbox/d_a_tbox_NONMATCHING.cpp | 138 +- rel/d/a/d_a_tbox2/Makefile | 2 - rel/d/a/d_a_tbox2/d_a_tbox2.cpp | 1487 ++++++----------- .../unknown_translation_unit_bss.cpp | 28 - rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp | 4 +- rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp | 30 +- .../d_a_door_dbdoor00/d_a_door_dbdoor00.cpp | 34 +- rel/d/a/door/d_a_door_push/d_a_door_push.cpp | 18 +- rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp | 14 +- rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp | 10 +- rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp | 4 +- rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp | 4 +- rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp | 104 +- rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp | 2 +- rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp | 14 +- rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp | 68 +- rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp | 34 +- rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp | 8 +- rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp | 18 +- rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp | 4 +- rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp | 17 +- rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp | 2 +- rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp | 12 +- rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp | 6 +- rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp | 4 +- rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp | 8 +- rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp | 70 +- rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp | 115 +- rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp | 16 +- .../a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp | 8 +- rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp | 8 +- rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp | 18 +- .../a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp | 8 +- rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp | 16 +- rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp | 18 +- .../obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp | 46 +- rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp | 6 +- rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp | 38 +- .../a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp | 10 +- rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp | 12 +- rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp | 20 +- .../d_a_obj_chandelier/d_a_obj_chandelier.cpp | 20 +- rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp | 60 +- .../a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp | 16 +- .../a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp | 10 +- .../a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp | 12 +- .../obj/d_a_obj_digplace/d_a_obj_digplace.cpp | 20 +- rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp | 4 +- .../a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp | 2 +- rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp | 4 +- .../d_a_obj_grave_stone.cpp | 22 +- .../d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp | 8 +- .../obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp | 6 +- rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp | 4 +- .../a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp | 28 +- rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp | 36 +- rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp | 20 +- rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp | 4 +- .../a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp | 14 +- rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp | 66 +- .../d_a_obj_lv1Candle00.cpp | 8 +- .../d_a_obj_lv1Candle01.cpp | 8 +- .../d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp | 8 +- .../d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp | 12 +- .../d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp | 8 +- .../a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp | 6 +- .../d_a_obj_lv4HsTarget.cpp | 6 +- .../d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp | 12 +- .../obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp | 6 +- .../a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp | 14 +- .../d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp | 12 +- .../d_a_obj_master_sword.cpp | 28 +- rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp | 12 +- rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp | 6 +- .../a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp | 38 +- rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp | 10 +- .../d_a_obj_onsenFire/d_a_obj_onsenFire.cpp | 8 +- rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp | 6 +- .../a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp | 4 +- rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp | 32 +- rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp | 12 +- .../d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp | 6 +- .../d_a_obj_snow_soup/d_a_obj_snow_soup.cpp | 4 +- .../a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp | 34 +- rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp | 293 ++-- .../d_a_obj_stoneMark/d_a_obj_stoneMark.cpp | 72 +- rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp | 14 +- .../d_a_obj_swpropeller.cpp | 8 +- .../d_a_obj_swspinner/d_a_obj_swspinner.cpp | 30 +- rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp | 28 +- rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp | 8 +- rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp | 14 +- rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp | 6 +- .../a/obj/d_a_obj_vground/d_a_obj_vground.cpp | 6 +- .../obj/d_a_obj_volcball/d_a_obj_volcball.cpp | 26 +- rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp | 38 +- rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp | 24 +- rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp | 32 +- .../d_a_obj_wind_stone/d_a_obj_wind_stone.cpp | 24 +- rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp | 8 +- rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp | 6 +- rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp | 20 +- rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp | 2 +- .../obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp | 18 +- .../d_a_obj_zrTuraraRock.cpp | 6 +- .../d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp | 8 +- .../obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp | 16 +- .../d_a_obj_mirror_6pole.cpp | 6 +- .../d_a_obj_mirror_chain.cpp | 6 +- .../d_a_obj_mirror_sand.cpp | 4 +- .../d_a_obj_mirror_screw.cpp | 8 +- .../d_a_obj_mirror_table.cpp | 8 +- rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp | 10 +- .../a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp | 48 +- .../a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp | 32 +- .../a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp | 30 +- rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp | 38 +- rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp | 4 +- rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp | 8 +- .../d_a_tag_assistance/d_a_tag_assistance.cpp | 8 +- .../d_a_tag_attack_item.cpp | 12 +- .../d_a_tag_attention/d_a_tag_attention.cpp | 14 +- .../d_a_tag_bottle_item.cpp | 38 +- .../d_a_tag_chgrestart/d_a_tag_chgrestart.cpp | 30 +- .../tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp | 14 +- rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp | 38 +- .../a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp | 74 +- rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp | 30 +- rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp | 8 +- rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp | 30 +- rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp | 24 +- rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp | 10 +- .../d_a_tag_kago_fall/d_a_tag_kago_fall.cpp | 28 +- .../a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp | 36 +- .../d_a_tag_lightball/d_a_tag_lightball.cpp | 10 +- .../a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp | 6 +- .../d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp | 2 +- rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp | 28 +- rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp | 26 +- rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp | 20 +- rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp | 26 +- rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp | 36 +- rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp | 8 +- .../d_a_tag_myna_light/d_a_tag_myna_light.cpp | 4 +- rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp | 2 +- rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp | 8 +- rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp | 18 +- .../tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp | 14 +- .../d_a_tag_river_back/d_a_tag_river_back.cpp | 16 +- .../tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp | 6 +- .../tag/d_a_tag_schedule/d_a_tag_schedule.cpp | 8 +- .../d_a_tag_setrestart/d_a_tag_setrestart.cpp | 24 +- .../d_a_tag_shop_camera.cpp | 4 +- .../d_a_tag_shop_item/d_a_tag_shop_item.cpp | 16 +- .../a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp | 8 +- .../a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp | 12 +- rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp | 10 +- .../tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp | 34 +- rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp | 14 +- .../d_a_tag_theB_hint/d_a_tag_theB_hint.cpp | 8 +- .../d_a_tag_wara_howl/d_a_tag_wara_howl.cpp | 8 +- .../a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp | 8 +- .../d_a_tag_waterfall/d_a_tag_waterfall.cpp | 8 +- rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp | 26 +- src/d/a/d_a_alink.cpp | 82 +- src/d/a/d_a_alink_bottle.inc | 4 +- src/d/a/d_a_alink_canoe.inc | 4 +- src/d/a/d_a_alink_cut.inc | 30 +- src/d/a/d_a_alink_demo.inc | 76 +- src/d/a/d_a_alink_effect.inc | 10 +- src/d/a/d_a_alink_guard.inc | 218 ++- src/d/a/d_a_alink_hang.inc | 16 +- src/d/a/d_a_alink_hook.inc | 20 +- src/d/a/d_a_alink_horse.inc | 6 +- src/d/a/d_a_alink_hvyboots.inc | 4 +- src/d/a/d_a_alink_link.inc | 156 +- src/d/a/d_a_alink_spinner.inc | 2 +- src/d/a/d_a_alink_sumou.inc | 2 +- src/d/a/d_a_alink_swim.inc | 6 +- src/d/a/d_a_alink_swindow.inc | 2 +- src/d/a/d_a_alink_weakfn.inc | 18 +- src/d/a/d_a_alink_wolf.inc | 80 +- src/d/a/d_a_itembase.cpp | 10 +- src/d/a/d_a_no_chg_room.cpp | 16 +- src/d/a/d_a_npc.cpp | 122 +- src/d/a/d_a_npc_cd.cpp | 4 +- src/d/a/d_a_npc_cd2.cpp | 12 +- src/d/a/d_a_obj.cpp | 8 +- src/d/a/d_a_obj_item.cpp | 56 +- src/d/bg/d_bg_s_acch.cpp | 10 +- src/d/bg/d_bg_s_movebg_actor.cpp | 4 +- src/d/cc/d_cc_s.cpp | 2 +- src/d/cc/d_cc_uty.cpp | 6 +- src/d/com/d_com_static.cpp | 6 +- src/d/d_attention.cpp | 84 +- src/d/d_demo.cpp | 12 +- src/d/d_door_param2.cpp | 12 +- src/d/d_insect.cpp | 10 +- src/d/event/d_event.cpp | 50 +- src/d/event/d_event_data.cpp | 3 +- src/d/event/d_event_lib.cpp | 20 +- src/d/event/d_event_manager.cpp | 22 +- src/d/kankyo/d_kankyo.cpp | 2 +- src/d/map/d_map_path.cpp | 105 +- src/d/msg/d_msg_class.cpp | 2 +- src/d/msg/d_msg_flow.cpp | 8 +- src/d/s/d_s_menu.cpp | 4 +- src/d/s/d_s_play.cpp | 8 +- src/d/s/d_s_room.cpp | 4 +- src/d/s/d_s_title.cpp | 8 +- src/d/shop/d_shop_camera.cpp | 16 +- src/d/shop/d_shop_item_ctrl.cpp | 10 +- src/d/shop/d_shop_system.cpp | 40 +- src/f_op/f_op_actor.cpp | 100 +- src/f_op/f_op_actor_mng.cpp | 639 +++---- src/f_op/f_op_camera.cpp | 2 +- src/f_op/f_op_kankyo.cpp | 20 +- src/f_op/f_op_msg.cpp | 20 +- src/f_op/f_op_msg_mng.cpp | 2 +- src/f_op/f_op_overlap.cpp | 2 +- src/f_op/f_op_view.cpp | 12 +- src/f_pc/f_pc_base.cpp | 2 +- src/f_pc/f_pc_leaf.cpp | 2 +- src/f_pc/f_pc_node.cpp | 2 +- src/m_Do/m_Do_graphic.cpp | 2 +- 334 files changed, 3797 insertions(+), 6195 deletions(-) delete mode 100644 asm/d/a/d_a_alink/checkShieldAttackEmphasys__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkSpecialNpc__9daAlink_cFP10fopAc_ac_c.s delete mode 100644 asm/d/a/d_a_alink/setGuardSe__9daAlink_cFP12dCcD_GObjInf.s delete mode 100644 asm/f_op/f_op_actor_mng/__dt__8cM3dGPlaFv.s delete mode 100644 asm/f_op/f_op_actor_mng/fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos.s delete mode 100644 asm/f_op/f_op_actor_mng/fopAcM_getWaterY__FPC4cXyzPf.s delete mode 100644 asm/f_op/f_op_actor_mng/gndCheck__11fopAcM_gc_cFPC4cXyz.s delete mode 100644 asm/f_op/f_op_actor_mng/roofCheck__11fopAcM_rc_cFPC4cXyz.s delete mode 100644 asm/f_op/f_op_actor_mng/waterCheck__11fopAcM_wt_cFPC4cXyz.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/CreateHeap__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/Create__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/Delete__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/Draw__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/Execute__9daTbox2_cFPPA3_A4_f.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__10cCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__10dCcD_GSttsFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12J3DFrameCtrlFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12dBgS_AcchCirFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12dBgS_ObjAcchFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGAabFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGCylFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionNotOpenDemo__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionOpenDemo__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionOpenWait__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/action__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/boxCheck__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/create1st__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGDelete__FP9daTbox2_c.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGDraw__FP9daTbox2_c.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGExecute__FP9daTbox2_c.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_create1st__FP9daTbox2_c.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/demoProc__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/func_80498148.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/func_80498150.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/initBaseMtx__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionNotOpenDemo__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionOpenDemo__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionOpenWait__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionWait__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_exec__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_exec_wait__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_proc_call__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/openInit__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/setBaseMtx__9daTbox2_cFv.s delete mode 100644 asm/rel/d/a/d_a_tbox2/d_a_tbox2/setGetDemoItem__9daTbox2_cFv.s delete mode 100644 rel/d/a/d_a_tbox2/unknown_translation_unit_bss.cpp diff --git a/asm/d/a/d_a_alink/checkShieldAttackEmphasys__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkShieldAttackEmphasys__9daAlink_cFv.s deleted file mode 100644 index bcfc40b0c5..0000000000 --- a/asm/d/a/d_a_alink/checkShieldAttackEmphasys__9daAlink_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_800DC5DC: -/* 800DC5DC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800DC5E0 7C 08 02 A6 */ mflr r0 -/* 800DC5E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800DC5E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DC5EC 48 28 5B F1 */ bl _savegpr_29 -/* 800DC5F0 7C 7D 1B 78 */ mr r29, r3 -/* 800DC5F4 3B C0 00 00 */ li r30, 0 -/* 800DC5F8 7F DF F3 78 */ mr r31, r30 -/* 800DC5FC 80 83 27 EC */ lwz r4, 0x27ec(r3) -/* 800DC600 28 04 00 00 */ cmplwi r4, 0 -/* 800DC604 41 82 00 20 */ beq lbl_800DC624 -/* 800DC608 80 04 05 5C */ lwz r0, 0x55c(r4) -/* 800DC60C 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa -/* 800DC610 41 82 00 14 */ beq lbl_800DC624 -/* 800DC614 4B FF 62 E1 */ bl checkCutHeadState__9daAlink_cFv -/* 800DC618 2C 03 00 00 */ cmpwi r3, 0 -/* 800DC61C 40 82 00 08 */ bne lbl_800DC624 -/* 800DC620 3B E0 00 01 */ li r31, 1 -lbl_800DC624: -/* 800DC624 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 800DC628 41 82 00 34 */ beq lbl_800DC65C -/* 800DC62C 38 60 00 01 */ li r3, 1 -/* 800DC630 80 9D 27 EC */ lwz r4, 0x27ec(r29) -/* 800DC634 88 04 04 96 */ lbz r0, 0x496(r4) -/* 800DC638 28 00 00 02 */ cmplwi r0, 2 -/* 800DC63C 40 82 00 14 */ bne lbl_800DC650 -/* 800DC640 A0 04 05 8E */ lhz r0, 0x58e(r4) -/* 800DC644 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800DC648 41 82 00 08 */ beq lbl_800DC650 -/* 800DC64C 38 60 00 00 */ li r3, 0 -lbl_800DC650: -/* 800DC650 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800DC654 41 82 00 08 */ beq lbl_800DC65C -/* 800DC658 3B C0 00 01 */ li r30, 1 -lbl_800DC65C: -/* 800DC65C 57 C3 06 3E */ clrlwi r3, r30, 0x18 -/* 800DC660 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DC664 48 28 5B C5 */ bl _restgpr_29 -/* 800DC668 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800DC66C 7C 08 03 A6 */ mtlr r0 -/* 800DC670 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DC674 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSpecialNpc__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkSpecialNpc__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 60a1124343..0000000000 --- a/asm/d/a/d_a_alink/checkSpecialNpc__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800DC5A4: -/* 800DC5A4 A8 03 00 08 */ lha r0, 8(r3) -/* 800DC5A8 38 80 00 00 */ li r4, 0 -/* 800DC5AC 2C 00 02 41 */ cmpwi r0, 0x241 -/* 800DC5B0 41 82 00 20 */ beq lbl_800DC5D0 -/* 800DC5B4 2C 00 02 5A */ cmpwi r0, 0x25a -/* 800DC5B8 41 82 00 18 */ beq lbl_800DC5D0 -/* 800DC5BC 2C 00 00 21 */ cmpwi r0, 0x21 -/* 800DC5C0 40 82 00 14 */ bne lbl_800DC5D4 -/* 800DC5C4 88 03 0A 7E */ lbz r0, 0xa7e(r3) -/* 800DC5C8 28 00 00 01 */ cmplwi r0, 1 -/* 800DC5CC 41 82 00 08 */ beq lbl_800DC5D4 -lbl_800DC5D0: -/* 800DC5D0 38 80 00 01 */ li r4, 1 -lbl_800DC5D4: -/* 800DC5D4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800DC5D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setGuardSe__9daAlink_cFP12dCcD_GObjInf.s b/asm/d/a/d_a_alink/setGuardSe__9daAlink_cFP12dCcD_GObjInf.s deleted file mode 100644 index 4a8b7a83c5..0000000000 --- a/asm/d/a/d_a_alink/setGuardSe__9daAlink_cFP12dCcD_GObjInf.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_800DD114: -/* 800DD114 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800DD118 7C 08 02 A6 */ mflr r0 -/* 800DD11C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800DD120 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DD124 48 28 50 B5 */ bl _savegpr_28 -/* 800DD128 7C 7C 1B 78 */ mr r28, r3 -/* 800DD12C 7C 9D 23 78 */ mr r29, r4 -/* 800DD130 4B FF F8 FD */ bl checkWoodShieldEquipNotIronBall__9daAlink_cCFv -/* 800DD134 2C 03 00 00 */ cmpwi r3, 0 -/* 800DD138 41 82 00 20 */ beq lbl_800DD158 -/* 800DD13C 7F 83 E3 78 */ mr r3, r28 -/* 800DD140 4B FF A6 89 */ bl checkMagicArmorNoDamage__9daAlink_cFv -/* 800DD144 2C 03 00 00 */ cmpwi r3, 0 -/* 800DD148 40 82 00 10 */ bne lbl_800DD158 -/* 800DD14C 3B E0 00 29 */ li r31, 0x29 -/* 800DD150 3B C0 00 00 */ li r30, 0 -/* 800DD154 48 00 00 0C */ b lbl_800DD160 -lbl_800DD158: -/* 800DD158 3B E0 00 28 */ li r31, 0x28 -/* 800DD15C 3B C0 00 01 */ li r30, 1 -lbl_800DD160: -/* 800DD160 7F A3 EB 78 */ mr r3, r29 -/* 800DD164 4B FA 73 E5 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 800DD168 28 03 00 00 */ cmplwi r3, 0 -/* 800DD16C 41 82 00 24 */ beq lbl_800DD190 -/* 800DD170 7F A3 EB 78 */ mr r3, r29 -/* 800DD174 4B FA 73 D5 */ bl GetTgHitGObj__12dCcD_GObjInfFv -/* 800DD178 80 03 00 10 */ lwz r0, 0x10(r3) -/* 800DD17C 28 00 00 20 */ cmplwi r0, 0x20 -/* 800DD180 40 82 00 10 */ bne lbl_800DD190 -/* 800DD184 3C 60 00 04 */ lis r3, 0x0004 /* 0x0004000B@ha */ -/* 800DD188 38 83 00 0B */ addi r4, r3, 0x000B /* 0x0004000B@l */ -/* 800DD18C 48 00 00 18 */ b lbl_800DD1A4 -lbl_800DD190: -/* 800DD190 7F A3 EB 78 */ mr r3, r29 -/* 800DD194 4B FA 73 E9 */ bl GetTgHitObjSe__12dCcD_GObjInfFv -/* 800DD198 7F C4 F3 78 */ mr r4, r30 -/* 800DD19C 4B FA 74 15 */ bl getHitSeID__12dCcD_GObjInfFUci -/* 800DD1A0 7C 64 1B 78 */ mr r4, r3 -lbl_800DD1A4: -/* 800DD1A4 38 7C 2C A8 */ addi r3, r28, 0x2ca8 -/* 800DD1A8 7F E5 FB 78 */ mr r5, r31 -/* 800DD1AC 81 9C 2C A8 */ lwz r12, 0x2ca8(r28) -/* 800DD1B0 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 800DD1B4 7D 89 03 A6 */ mtctr r12 -/* 800DD1B8 4E 80 04 21 */ bctrl -/* 800DD1BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800DD1C0 48 28 50 65 */ bl _restgpr_28 -/* 800DD1C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800DD1C8 7C 08 03 A6 */ mtlr r0 -/* 800DD1CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800DD1D0 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/__dt__8cM3dGPlaFv.s b/asm/f_op/f_op_actor_mng/__dt__8cM3dGPlaFv.s deleted file mode 100644 index 2d5983e04e..0000000000 --- a/asm/f_op/f_op_actor_mng/__dt__8cM3dGPlaFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8001DB90: -/* 8001DB90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001DB94 7C 08 02 A6 */ mflr r0 -/* 8001DB98 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001DB9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001DBA0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8001DBA4 41 82 00 1C */ beq lbl_8001DBC0 -/* 8001DBA8 3C A0 80 3A */ lis r5, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8001DBAC 38 05 37 C0 */ addi r0, r5, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8001DBB0 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8001DBB4 7C 80 07 35 */ extsh. r0, r4 -/* 8001DBB8 40 81 00 08 */ ble lbl_8001DBC0 -/* 8001DBBC 48 2B 11 81 */ bl __dl__FPv -lbl_8001DBC0: -/* 8001DBC0 7F E3 FB 78 */ mr r3, r31 -/* 8001DBC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001DBC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001DBCC 7C 08 03 A6 */ mtlr r0 -/* 8001DBD0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001DBD4 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos.s b/asm/f_op/f_op_actor_mng/fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos.s deleted file mode 100644 index 0d5853dc19..0000000000 --- a/asm/f_op/f_op_actor_mng/fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8001DAE4: -/* 8001DAE4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8001DAE8 7C 08 02 A6 */ mflr r0 -/* 8001DAEC 90 01 00 34 */ stw r0, 0x34(r1) -/* 8001DAF0 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001DAF4 48 34 46 E9 */ bl _savegpr_29 -/* 8001DAF8 7C 7D 1B 78 */ mr r29, r3 -/* 8001DAFC 7C 9E 23 78 */ mr r30, r4 -/* 8001DB00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8001DB04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8001DB08 3B E3 0F 38 */ addi r31, r3, 0xf38 -/* 8001DB0C 7F E3 FB 78 */ mr r3, r31 -/* 8001DB10 7F A4 EB 78 */ mr r4, r29 -/* 8001DB14 48 05 6B 4D */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo -/* 8001DB18 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8001DB1C 40 82 00 0C */ bne lbl_8001DB28 -/* 8001DB20 38 60 00 00 */ li r3, 0 -/* 8001DB24 48 00 00 54 */ b lbl_8001DB78 -lbl_8001DB28: -/* 8001DB28 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8001DB2C 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8001DB30 90 01 00 18 */ stw r0, 0x18(r1) -/* 8001DB34 7F E3 FB 78 */ mr r3, r31 -/* 8001DB38 7F A4 EB 78 */ mr r4, r29 -/* 8001DB3C 38 A1 00 08 */ addi r5, r1, 8 -/* 8001DB40 48 05 6C 05 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla -/* 8001DB44 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8001DB48 40 82 00 18 */ bne lbl_8001DB60 -/* 8001DB4C 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8001DB50 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8001DB54 90 01 00 18 */ stw r0, 0x18(r1) -/* 8001DB58 38 60 00 00 */ li r3, 0 -/* 8001DB5C 48 00 00 1C */ b lbl_8001DB78 -lbl_8001DB60: -/* 8001DB60 38 61 00 08 */ addi r3, r1, 8 -/* 8001DB64 7F C4 F3 78 */ mr r4, r30 -/* 8001DB68 48 00 00 71 */ bl fopAcM_getPolygonAngle__FPC8cM3dGPlas -/* 8001DB6C 3C 80 80 3A */ lis r4, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 8001DB70 38 04 37 C0 */ addi r0, r4, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 8001DB74 90 01 00 18 */ stw r0, 0x18(r1) -lbl_8001DB78: -/* 8001DB78 39 61 00 30 */ addi r11, r1, 0x30 -/* 8001DB7C 48 34 46 AD */ bl _restgpr_29 -/* 8001DB80 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8001DB84 7C 08 03 A6 */ mtlr r0 -/* 8001DB88 38 21 00 30 */ addi r1, r1, 0x30 -/* 8001DB8C 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/fopAcM_getWaterY__FPC4cXyzPf.s b/asm/f_op/f_op_actor_mng/fopAcM_getWaterY__FPC4cXyzPf.s deleted file mode 100644 index 820e0e9780..0000000000 --- a/asm/f_op/f_op_actor_mng/fopAcM_getWaterY__FPC4cXyzPf.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8001D890: -/* 8001D890 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001D894 7C 08 02 A6 */ mflr r0 -/* 8001D898 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001D89C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8001D8A0 7C 9F 23 78 */ mr r31, r4 -/* 8001D8A4 48 00 04 E1 */ bl waterCheck__11fopAcM_wt_cFPC4cXyz -/* 8001D8A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8001D8AC 41 82 00 34 */ beq lbl_8001D8E0 -/* 8001D8B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8001D8B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8001D8B8 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8001D8BC 3C 80 80 3F */ lis r4, mWaterCheck__11fopAcM_wt_c@ha /* 0x803F1D80@ha */ -/* 8001D8C0 38 84 1D 80 */ addi r4, r4, mWaterCheck__11fopAcM_wt_c@l /* 0x803F1D80@l */ -/* 8001D8C4 48 05 75 8D */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo -/* 8001D8C8 2C 03 00 06 */ cmpwi r3, 6 -/* 8001D8CC 41 82 00 14 */ beq lbl_8001D8E0 -/* 8001D8D0 C0 0D 87 58 */ lfs f0, mWaterY__11fopAcM_wt_c(r13) -/* 8001D8D4 D0 1F 00 00 */ stfs f0, 0(r31) -/* 8001D8D8 38 60 00 01 */ li r3, 1 -/* 8001D8DC 48 00 00 10 */ b lbl_8001D8EC -lbl_8001D8E0: -/* 8001D8E0 C0 02 82 58 */ lfs f0, lit_6353(r2) -/* 8001D8E4 D0 1F 00 00 */ stfs f0, 0(r31) -/* 8001D8E8 38 60 00 00 */ li r3, 0 -lbl_8001D8EC: -/* 8001D8EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8001D8F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001D8F4 7C 08 03 A6 */ mtlr r0 -/* 8001D8F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001D8FC 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/gndCheck__11fopAcM_gc_cFPC4cXyz.s b/asm/f_op/f_op_actor_mng/gndCheck__11fopAcM_gc_cFPC4cXyz.s deleted file mode 100644 index be70a576fc..0000000000 --- a/asm/f_op/f_op_actor_mng/gndCheck__11fopAcM_gc_cFPC4cXyz.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_8001DCBC: -/* 8001DCBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001DCC0 7C 08 02 A6 */ mflr r0 -/* 8001DCC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001DCC8 7C 64 1B 78 */ mr r4, r3 -/* 8001DCCC 3C 60 80 3F */ lis r3, mGndCheck__11fopAcM_gc_c@ha /* 0x803F1CC4@ha */ -/* 8001DCD0 38 63 1C C4 */ addi r3, r3, mGndCheck__11fopAcM_gc_c@l /* 0x803F1CC4@l */ -/* 8001DCD4 48 24 A0 55 */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 8001DCD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8001DCDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8001DCE0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8001DCE4 3C 80 80 3F */ lis r4, mGndCheck__11fopAcM_gc_c@ha /* 0x803F1CC4@ha */ -/* 8001DCE8 38 84 1C C4 */ addi r4, r4, mGndCheck__11fopAcM_gc_c@l /* 0x803F1CC4@l */ -/* 8001DCEC 48 05 67 B5 */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 8001DCF0 D0 2D 87 50 */ stfs f1, mGroundY__11fopAcM_gc_c(r13) -/* 8001DCF4 C0 42 82 58 */ lfs f2, lit_6353(r2) -/* 8001DCF8 FC 00 08 18 */ frsp f0, f1 -/* 8001DCFC FC 02 00 00 */ fcmpu cr0, f2, f0 -/* 8001DD00 7C 00 00 26 */ mfcr r0 -/* 8001DD04 54 00 1F FE */ rlwinm r0, r0, 3, 0x1f, 0x1f -/* 8001DD08 68 03 00 01 */ xori r3, r0, 1 -/* 8001DD0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001DD10 7C 08 03 A6 */ mtlr r0 -/* 8001DD14 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001DD18 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/roofCheck__11fopAcM_rc_cFPC4cXyz.s b/asm/f_op/f_op_actor_mng/roofCheck__11fopAcM_rc_cFPC4cXyz.s deleted file mode 100644 index 3f1b0ac9cf..0000000000 --- a/asm/f_op/f_op_actor_mng/roofCheck__11fopAcM_rc_cFPC4cXyz.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8001DD1C: -/* 8001DD1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8001DD20 7C 08 02 A6 */ mflr r0 -/* 8001DD24 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001DD28 C0 03 00 00 */ lfs f0, 0(r3) -/* 8001DD2C 3C 80 80 3F */ lis r4, mRoofCheck__11fopAcM_rc_c@ha /* 0x803F1D24@ha */ -/* 8001DD30 38 84 1D 24 */ addi r4, r4, mRoofCheck__11fopAcM_rc_c@l /* 0x803F1D24@l */ -/* 8001DD34 D0 04 00 3C */ stfs f0, 0x3c(r4) -/* 8001DD38 C0 03 00 04 */ lfs f0, 4(r3) -/* 8001DD3C D0 04 00 40 */ stfs f0, 0x40(r4) -/* 8001DD40 C0 03 00 08 */ lfs f0, 8(r3) -/* 8001DD44 D0 04 00 44 */ stfs f0, 0x44(r4) -/* 8001DD48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8001DD4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8001DD50 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8001DD54 48 05 77 49 */ bl RoofChk__4dBgSFP12dBgS_RoofChk -/* 8001DD58 D0 2D 87 54 */ stfs f1, mRoofY__11fopAcM_rc_c(r13) -/* 8001DD5C C0 42 82 5C */ lfs f2, lit_6517(r2) -/* 8001DD60 FC 00 08 18 */ frsp f0, f1 -/* 8001DD64 FC 02 00 00 */ fcmpu cr0, f2, f0 -/* 8001DD68 7C 00 00 26 */ mfcr r0 -/* 8001DD6C 54 00 1F FE */ rlwinm r0, r0, 3, 0x1f, 0x1f -/* 8001DD70 68 03 00 01 */ xori r3, r0, 1 -/* 8001DD74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8001DD78 7C 08 03 A6 */ mtlr r0 -/* 8001DD7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8001DD80 4E 80 00 20 */ blr diff --git a/asm/f_op/f_op_actor_mng/waterCheck__11fopAcM_wt_cFPC4cXyz.s b/asm/f_op/f_op_actor_mng/waterCheck__11fopAcM_wt_cFPC4cXyz.s deleted file mode 100644 index feb8cfe034..0000000000 --- a/asm/f_op/f_op_actor_mng/waterCheck__11fopAcM_wt_cFPC4cXyz.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8001DD84: -/* 8001DD84 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8001DD88 7C 08 02 A6 */ mflr r0 -/* 8001DD8C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8001DD90 C0 83 00 08 */ lfs f4, 8(r3) -/* 8001DD94 C0 43 00 04 */ lfs f2, 4(r3) -/* 8001DD98 C0 22 82 60 */ lfs f1, lit_6538(r2) -/* 8001DD9C EC 62 08 28 */ fsubs f3, f2, f1 -/* 8001DDA0 C0 03 00 00 */ lfs f0, 0(r3) -/* 8001DDA4 D0 01 00 08 */ stfs f0, 8(r1) -/* 8001DDA8 D0 61 00 0C */ stfs f3, 0xc(r1) -/* 8001DDAC D0 81 00 10 */ stfs f4, 0x10(r1) -/* 8001DDB0 3C 60 80 3F */ lis r3, mWaterCheck__11fopAcM_wt_c@ha /* 0x803F1D80@ha */ -/* 8001DDB4 38 63 1D 80 */ addi r3, r3, mWaterCheck__11fopAcM_wt_c@l /* 0x803F1D80@l */ -/* 8001DDB8 38 81 00 08 */ addi r4, r1, 8 -/* 8001DDBC EC 21 10 2A */ fadds f1, f1, f2 -/* 8001DDC0 48 05 AD D1 */ bl Set__14dBgS_SplGrpChkFR4cXyzf -/* 8001DDC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8001DDC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8001DDCC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8001DDD0 3C 80 80 3F */ lis r4, mWaterCheck__11fopAcM_wt_c@ha /* 0x803F1D80@ha */ -/* 8001DDD4 38 84 1D 80 */ addi r4, r4, mWaterCheck__11fopAcM_wt_c@l /* 0x803F1D80@l */ -/* 8001DDD8 48 05 77 8D */ bl SplGrpChk__4dBgSFP14dBgS_SplGrpChk -/* 8001DDDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8001DDE0 41 82 00 1C */ beq lbl_8001DDFC -/* 8001DDE4 3C 60 80 3F */ lis r3, mWaterCheck__11fopAcM_wt_c@ha /* 0x803F1D80@ha */ -/* 8001DDE8 38 63 1D 80 */ addi r3, r3, mWaterCheck__11fopAcM_wt_c@l /* 0x803F1D80@l */ -/* 8001DDEC C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 8001DDF0 D0 0D 87 58 */ stfs f0, mWaterY__11fopAcM_wt_c(r13) -/* 8001DDF4 38 60 00 01 */ li r3, 1 -/* 8001DDF8 48 00 00 08 */ b lbl_8001DE00 -lbl_8001DDFC: -/* 8001DDFC 38 60 00 00 */ li r3, 0 -lbl_8001DE00: -/* 8001DE00 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8001DE04 7C 08 03 A6 */ mtlr r0 -/* 8001DE08 38 21 00 20 */ addi r1, r1, 0x20 -/* 8001DE0C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/CreateHeap__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/CreateHeap__9daTbox2_cFv.s deleted file mode 100644 index bd9832e46c..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/CreateHeap__9daTbox2_cFv.s +++ /dev/null @@ -1,126 +0,0 @@ -lbl_80496C20: -/* 80496C20 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80496C24 7C 08 02 A6 */ mflr r0 -/* 80496C28 90 01 00 24 */ stw r0, 0x24(r1) -/* 80496C2C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80496C30 4B EC B5 A9 */ bl _savegpr_28 -/* 80496C34 7C 7E 1B 78 */ mr r30, r3 -/* 80496C38 3C 60 80 4A */ lis r3, l_arcName@ha /* 0x8049827C@ha */ -/* 80496C3C 38 63 82 7C */ addi r3, r3, l_arcName@l /* 0x8049827C@l */ -/* 80496C40 80 63 00 00 */ lwz r3, 0(r3) -/* 80496C44 88 1E 0A BC */ lbz r0, 0xabc(r30) -/* 80496C48 54 00 20 36 */ slwi r0, r0, 4 -/* 80496C4C 3C 80 80 4A */ lis r4, l_resInfo@ha /* 0x80498160@ha */ -/* 80496C50 38 84 81 60 */ addi r4, r4, l_resInfo@l /* 0x80498160@l */ -/* 80496C54 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80496C58 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80496C5C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80496C60 3F E5 00 02 */ addis r31, r5, 2 -/* 80496C64 3B FF C2 F8 */ addi r31, r31, -15624 -/* 80496C68 7F E5 FB 78 */ mr r5, r31 -/* 80496C6C 38 C0 00 80 */ li r6, 0x80 -/* 80496C70 4B BA 56 7D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80496C74 3C 80 00 08 */ lis r4, 8 -/* 80496C78 3C A0 11 00 */ lis r5, 0x1100 /* 0x11000084@ha */ -/* 80496C7C 38 A5 00 84 */ addi r5, r5, 0x0084 /* 0x11000084@l */ -/* 80496C80 4B B7 DF D5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl -/* 80496C84 90 7E 07 24 */ stw r3, 0x724(r30) -/* 80496C88 80 1E 07 24 */ lwz r0, 0x724(r30) -/* 80496C8C 28 00 00 00 */ cmplwi r0, 0 -/* 80496C90 40 82 00 0C */ bne lbl_80496C9C -/* 80496C94 38 60 00 00 */ li r3, 0 -/* 80496C98 48 00 01 44 */ b lbl_80496DDC -lbl_80496C9C: -/* 80496C9C 3C 60 80 4A */ lis r3, l_arcName@ha /* 0x8049827C@ha */ -/* 80496CA0 38 63 82 7C */ addi r3, r3, l_arcName@l /* 0x8049827C@l */ -/* 80496CA4 80 63 00 00 */ lwz r3, 0(r3) -/* 80496CA8 3C 80 80 4A */ lis r4, l_resInfo@ha /* 0x80498160@ha */ -/* 80496CAC 38 84 81 60 */ addi r4, r4, l_resInfo@l /* 0x80498160@l */ -/* 80496CB0 88 1E 0A BC */ lbz r0, 0xabc(r30) -/* 80496CB4 54 00 20 36 */ slwi r0, r0, 4 -/* 80496CB8 7C 84 02 14 */ add r4, r4, r0 -/* 80496CBC 80 84 00 04 */ lwz r4, 4(r4) -/* 80496CC0 7F E5 FB 78 */ mr r5, r31 -/* 80496CC4 38 C0 00 80 */ li r6, 0x80 -/* 80496CC8 4B BA 56 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80496CCC 7C 7C 1B 78 */ mr r28, r3 -/* 80496CD0 38 60 00 1C */ li r3, 0x1c -/* 80496CD4 4B E3 7F 79 */ bl __nw__FUl -/* 80496CD8 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80496CDC 41 82 00 20 */ beq lbl_80496CFC -/* 80496CE0 3C 80 80 4A */ lis r4, __vt__12J3DFrameCtrl@ha /* 0x80498444@ha */ -/* 80496CE4 38 04 84 44 */ addi r0, r4, __vt__12J3DFrameCtrl@l /* 0x80498444@l */ -/* 80496CE8 90 1D 00 00 */ stw r0, 0(r29) -/* 80496CEC 38 80 00 00 */ li r4, 0 -/* 80496CF0 4B E9 17 0D */ bl init__12J3DFrameCtrlFs -/* 80496CF4 38 00 00 00 */ li r0, 0 -/* 80496CF8 90 1D 00 18 */ stw r0, 0x18(r29) -lbl_80496CFC: -/* 80496CFC 93 BE 07 28 */ stw r29, 0x728(r30) -/* 80496D00 80 7E 07 28 */ lwz r3, 0x728(r30) -/* 80496D04 28 03 00 00 */ cmplwi r3, 0 -/* 80496D08 41 82 00 30 */ beq lbl_80496D38 -/* 80496D0C 7F 84 E3 78 */ mr r4, r28 -/* 80496D10 38 A0 00 01 */ li r5, 1 -/* 80496D14 38 C0 00 00 */ li r6, 0 -/* 80496D18 3C E0 80 4A */ lis r7, lit_3763@ha /* 0x804981D0@ha */ -/* 80496D1C C0 27 81 D0 */ lfs f1, lit_3763@l(r7) /* 0x804981D0@l */ -/* 80496D20 38 E0 00 00 */ li r7, 0 -/* 80496D24 39 00 FF FF */ li r8, -1 -/* 80496D28 39 20 00 00 */ li r9, 0 -/* 80496D2C 4B B7 6A B1 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -/* 80496D30 2C 03 00 00 */ cmpwi r3, 0 -/* 80496D34 40 82 00 0C */ bne lbl_80496D40 -lbl_80496D38: -/* 80496D38 38 60 00 00 */ li r3, 0 -/* 80496D3C 48 00 00 A0 */ b lbl_80496DDC -lbl_80496D40: -/* 80496D40 38 60 00 C0 */ li r3, 0xc0 -/* 80496D44 4B E3 7F 09 */ bl __nw__FUl -/* 80496D48 7C 60 1B 79 */ or. r0, r3, r3 -/* 80496D4C 41 82 00 0C */ beq lbl_80496D58 -/* 80496D50 4B BE 4C 21 */ bl __ct__4dBgWFv -/* 80496D54 7C 60 1B 78 */ mr r0, r3 -lbl_80496D58: -/* 80496D58 90 1E 0A C8 */ stw r0, 0xac8(r30) -/* 80496D5C 80 1E 0A C8 */ lwz r0, 0xac8(r30) -/* 80496D60 28 00 00 00 */ cmplwi r0, 0 -/* 80496D64 41 82 00 64 */ beq lbl_80496DC8 -/* 80496D68 3C 60 80 4A */ lis r3, l_arcName@ha /* 0x8049827C@ha */ -/* 80496D6C 38 63 82 7C */ addi r3, r3, l_arcName@l /* 0x8049827C@l */ -/* 80496D70 80 63 00 00 */ lwz r3, 0(r3) -/* 80496D74 3C 80 80 4A */ lis r4, l_resInfo@ha /* 0x80498160@ha */ -/* 80496D78 38 84 81 60 */ addi r4, r4, l_resInfo@l /* 0x80498160@l */ -/* 80496D7C 88 1E 0A BC */ lbz r0, 0xabc(r30) -/* 80496D80 54 00 20 36 */ slwi r0, r0, 4 -/* 80496D84 7C 84 02 14 */ add r4, r4, r0 -/* 80496D88 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80496D8C 7F E5 FB 78 */ mr r5, r31 -/* 80496D90 38 C0 00 80 */ li r6, 0x80 -/* 80496D94 4B BA 55 59 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 80496D98 7C 64 1B 78 */ mr r4, r3 -/* 80496D9C 80 7E 0A C8 */ lwz r3, 0xac8(r30) -/* 80496DA0 38 A0 00 01 */ li r5, 1 -/* 80496DA4 38 DE 05 6C */ addi r6, r30, 0x56c -/* 80496DA8 4B BE 31 91 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f -/* 80496DAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80496DB0 40 82 00 18 */ bne lbl_80496DC8 -/* 80496DB4 3C 60 80 07 */ lis r3, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80496DB8 38 03 5A D8 */ addi r0, r3, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80496DBC 80 7E 0A C8 */ lwz r3, 0xac8(r30) -/* 80496DC0 90 03 00 B0 */ stw r0, 0xb0(r3) -/* 80496DC4 48 00 00 14 */ b lbl_80496DD8 -lbl_80496DC8: -/* 80496DC8 38 00 00 00 */ li r0, 0 -/* 80496DCC 90 1E 0A C8 */ stw r0, 0xac8(r30) -/* 80496DD0 38 60 00 00 */ li r3, 0 -/* 80496DD4 48 00 00 08 */ b lbl_80496DDC -lbl_80496DD8: -/* 80496DD8 38 60 00 01 */ li r3, 1 -lbl_80496DDC: -/* 80496DDC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80496DE0 4B EC B4 45 */ bl _restgpr_28 -/* 80496DE4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80496DE8 7C 08 03 A6 */ mtlr r0 -/* 80496DEC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80496DF0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Create__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Create__9daTbox2_cFv.s deleted file mode 100644 index 61d5223e07..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Create__9daTbox2_cFv.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_80496AB8: -/* 80496AB8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80496ABC 7C 08 02 A6 */ mflr r0 -/* 80496AC0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80496AC4 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80496AC8 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80496ACC 7C 7F 1B 78 */ mr r31, r3 -/* 80496AD0 3C 80 80 4A */ lis r4, l_resInfo@ha /* 0x80498160@ha */ -/* 80496AD4 3B C4 81 60 */ addi r30, r4, l_resInfo@l /* 0x80498160@l */ -/* 80496AD8 48 00 0F 35 */ bl init_actionOpenWait__9daTbox2_cFv -/* 80496ADC 7F E3 FB 78 */ mr r3, r31 -/* 80496AE0 4B FF FF 39 */ bl initBaseMtx__9daTbox2_cFv -/* 80496AE4 80 7F 07 24 */ lwz r3, 0x724(r31) -/* 80496AE8 38 03 00 24 */ addi r0, r3, 0x24 -/* 80496AEC 90 1F 05 04 */ stw r0, 0x504(r31) -/* 80496AF0 80 7F 07 24 */ lwz r3, 0x724(r31) -/* 80496AF4 80 83 00 04 */ lwz r4, 4(r3) -/* 80496AF8 7F E3 FB 78 */ mr r3, r31 -/* 80496AFC 4B B8 3A 7D */ bl fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData -/* 80496B00 38 00 00 40 */ li r0, 0x40 -/* 80496B04 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80496B08 80 1F 05 5C */ lwz r0, 0x55c(r31) -/* 80496B0C 64 00 00 40 */ oris r0, r0, 0x40 -/* 80496B10 90 1F 05 5C */ stw r0, 0x55c(r31) -/* 80496B14 38 7F 09 04 */ addi r3, r31, 0x904 -/* 80496B18 C0 3E 00 5C */ lfs f1, 0x5c(r30) -/* 80496B1C C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 80496B20 4B BD F4 39 */ bl SetWall__12dBgS_AcchCirFff -/* 80496B24 38 1F 04 E4 */ addi r0, r31, 0x4e4 -/* 80496B28 90 01 00 08 */ stw r0, 8(r1) -/* 80496B2C 38 7F 07 2C */ addi r3, r31, 0x72c -/* 80496B30 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80496B34 38 BF 04 BC */ addi r5, r31, 0x4bc -/* 80496B38 7F E6 FB 78 */ mr r6, r31 -/* 80496B3C 38 E0 00 01 */ li r7, 1 -/* 80496B40 39 1F 09 04 */ addi r8, r31, 0x904 -/* 80496B44 39 3F 04 F8 */ addi r9, r31, 0x4f8 -/* 80496B48 39 5F 04 DC */ addi r10, r31, 0x4dc -/* 80496B4C 4B BD F6 FD */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz -/* 80496B50 C0 1E 00 64 */ lfs f0, 0x64(r30) -/* 80496B54 D0 1F 05 30 */ stfs f0, 0x530(r31) -/* 80496B58 38 7F 09 44 */ addi r3, r31, 0x944 -/* 80496B5C 38 80 00 FF */ li r4, 0xff -/* 80496B60 38 A0 00 FF */ li r5, 0xff -/* 80496B64 7F E6 FB 78 */ mr r6, r31 -/* 80496B68 4B BE CC F9 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c -/* 80496B6C 38 7F 09 80 */ addi r3, r31, 0x980 -/* 80496B70 3C 80 80 4A */ lis r4, l_cyl_src@ha /* 0x80498284@ha */ -/* 80496B74 38 84 82 84 */ addi r4, r4, l_cyl_src@l /* 0x80498284@l */ -/* 80496B78 4B BE DD 3D */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl -/* 80496B7C 38 1F 09 44 */ addi r0, r31, 0x944 -/* 80496B80 90 1F 09 C4 */ stw r0, 0x9c4(r31) -/* 80496B84 38 7F 0A A4 */ addi r3, r31, 0xaa4 -/* 80496B88 88 1F 0A BC */ lbz r0, 0xabc(r31) -/* 80496B8C 1C 00 00 14 */ mulli r0, r0, 0x14 -/* 80496B90 38 9E 00 20 */ addi r4, r30, 0x20 -/* 80496B94 7C 84 02 14 */ add r4, r4, r0 -/* 80496B98 4B DD 85 7D */ bl Set__8cM3dGCylFRC9cM3dGCylS -/* 80496B9C C0 5F 04 A8 */ lfs f2, 0x4a8(r31) -/* 80496BA0 D0 41 00 1C */ stfs f2, 0x1c(r1) -/* 80496BA4 C0 3F 04 AC */ lfs f1, 0x4ac(r31) -/* 80496BA8 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 80496BAC C0 1F 04 B0 */ lfs f0, 0x4b0(r31) -/* 80496BB0 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80496BB4 D0 41 00 10 */ stfs f2, 0x10(r1) -/* 80496BB8 D0 21 00 14 */ stfs f1, 0x14(r1) -/* 80496BBC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80496BC0 C0 1E 00 68 */ lfs f0, 0x68(r30) -/* 80496BC4 EC 01 00 2A */ fadds f0, f1, f0 -/* 80496BC8 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 80496BCC C0 1E 00 6C */ lfs f0, 0x6c(r30) -/* 80496BD0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80496BD4 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80496BD8 38 61 00 1C */ addi r3, r1, 0x1c -/* 80496BDC 38 81 00 10 */ addi r4, r1, 0x10 -/* 80496BE0 7F E5 FB 78 */ mr r5, r31 -/* 80496BE4 4B B8 70 85 */ bl lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 80496BE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80496BEC 40 82 00 10 */ bne lbl_80496BFC -/* 80496BF0 38 00 00 00 */ li r0, 0 -/* 80496BF4 98 1F 0A BE */ stb r0, 0xabe(r31) -/* 80496BF8 48 00 00 0C */ b lbl_80496C04 -lbl_80496BFC: -/* 80496BFC 38 00 00 01 */ li r0, 1 -/* 80496C00 98 1F 0A BE */ stb r0, 0xabe(r31) -lbl_80496C04: -/* 80496C04 38 60 00 01 */ li r3, 1 -/* 80496C08 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80496C0C 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80496C10 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80496C14 7C 08 03 A6 */ mtlr r0 -/* 80496C18 38 21 00 30 */ addi r1, r1, 0x30 -/* 80496C1C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Delete__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Delete__9daTbox2_cFv.s deleted file mode 100644 index 6c35882372..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Delete__9daTbox2_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80497E6C: -/* 80497E6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80497E70 7C 08 02 A6 */ mflr r0 -/* 80497E74 90 01 00 14 */ stw r0, 0x14(r1) -/* 80497E78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80497E7C 7C 7F 1B 78 */ mr r31, r3 -/* 80497E80 80 63 0A C8 */ lwz r3, 0xac8(r3) -/* 80497E84 28 03 00 00 */ cmplwi r3, 0 -/* 80497E88 41 82 00 24 */ beq lbl_80497EAC -/* 80497E8C 4B DD 03 49 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80497E90 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80497E94 41 82 00 18 */ beq lbl_80497EAC -/* 80497E98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80497E9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80497EA0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80497EA4 80 9F 0A C8 */ lwz r4, 0xac8(r31) -/* 80497EA8 4B BD C3 A9 */ bl Release__4cBgSFP9dBgW_Base -lbl_80497EAC: -/* 80497EAC 38 7F 07 1C */ addi r3, r31, 0x71c -/* 80497EB0 3C 80 80 4A */ lis r4, l_arcName@ha /* 0x8049827C@ha */ -/* 80497EB4 38 84 82 7C */ addi r4, r4, l_arcName@l /* 0x8049827C@l */ -/* 80497EB8 80 84 00 00 */ lwz r4, 0(r4) -/* 80497EBC 4B B9 51 4D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 80497EC0 38 60 00 01 */ li r3, 1 -/* 80497EC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80497EC8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80497ECC 7C 08 03 A6 */ mtlr r0 -/* 80497ED0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80497ED4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Draw__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Draw__9daTbox2_cFv.s deleted file mode 100644 index 03a1513528..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Draw__9daTbox2_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_80497DA0: -/* 80497DA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80497DA4 7C 08 02 A6 */ mflr r0 -/* 80497DA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80497DAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80497DB0 93 C1 00 08 */ stw r30, 8(r1) -/* 80497DB4 7C 7E 1B 78 */ mr r30, r3 -/* 80497DB8 88 03 0A BF */ lbz r0, 0xabf(r3) -/* 80497DBC 28 00 00 00 */ cmplwi r0, 0 -/* 80497DC0 41 82 00 0C */ beq lbl_80497DCC -/* 80497DC4 38 60 00 01 */ li r3, 1 -/* 80497DC8 48 00 00 8C */ b lbl_80497E54 -lbl_80497DCC: -/* 80497DCC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80497DD0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80497DD4 38 80 00 10 */ li r4, 0x10 -/* 80497DD8 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 80497DDC 38 DE 01 0C */ addi r6, r30, 0x10c -/* 80497DE0 4B D0 B9 E5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 80497DE4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80497DE8 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80497DEC 80 9E 07 24 */ lwz r4, 0x724(r30) -/* 80497DF0 80 84 00 04 */ lwz r4, 4(r4) -/* 80497DF4 38 BE 01 0C */ addi r5, r30, 0x10c -/* 80497DF8 4B D0 CF A9 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c -/* 80497DFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80497E00 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80497E04 80 04 5F 70 */ lwz r0, 0x5f70(r4) -/* 80497E08 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 80497E0C 3B E3 4A C8 */ addi r31, r3, j3dSys@l /* 0x80434AC8@l */ -/* 80497E10 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80497E14 80 04 5F 74 */ lwz r0, 0x5f74(r4) -/* 80497E18 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80497E1C 80 7E 07 24 */ lwz r3, 0x724(r30) -/* 80497E20 80 83 00 04 */ lwz r4, 4(r3) -/* 80497E24 80 7E 07 28 */ lwz r3, 0x728(r30) -/* 80497E28 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80497E2C 4B B7 5B A1 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80497E30 80 7E 07 24 */ lwz r3, 0x724(r30) -/* 80497E34 4B B7 5E 91 */ bl mDoExt_modelUpdateDL__FP8J3DModel -/* 80497E38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80497E3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80497E40 80 03 5F 80 */ lwz r0, 0x5f80(r3) -/* 80497E44 90 1F 00 48 */ stw r0, 0x48(r31) -/* 80497E48 80 03 5F 84 */ lwz r0, 0x5f84(r3) -/* 80497E4C 90 1F 00 4C */ stw r0, 0x4c(r31) -/* 80497E50 38 60 00 01 */ li r3, 1 -lbl_80497E54: -/* 80497E54 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80497E58 83 C1 00 08 */ lwz r30, 8(r1) -/* 80497E5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80497E60 7C 08 03 A6 */ mtlr r0 -/* 80497E64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80497E68 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Execute__9daTbox2_cFPPA3_A4_f.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Execute__9daTbox2_cFPPA3_A4_f.s deleted file mode 100644 index 949d4b70b1..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/Execute__9daTbox2_cFPPA3_A4_f.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80497500: -/* 80497500 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80497504 7C 08 02 A6 */ mflr r0 -/* 80497508 90 01 00 24 */ stw r0, 0x24(r1) -/* 8049750C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80497510 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80497514 7C 7E 1B 78 */ mr r30, r3 -/* 80497518 7C 9F 23 78 */ mr r31, r4 -/* 8049751C 48 00 00 D1 */ bl mode_proc_call__9daTbox2_cFv -/* 80497520 38 1E 05 6C */ addi r0, r30, 0x56c -/* 80497524 90 1F 00 00 */ stw r0, 0(r31) -/* 80497528 7F C3 F3 78 */ mr r3, r30 -/* 8049752C 4B FF F5 29 */ bl setBaseMtx__9daTbox2_cFv -/* 80497530 80 7E 0A C8 */ lwz r3, 0xac8(r30) -/* 80497534 28 03 00 00 */ cmplwi r3, 0 -/* 80497538 41 82 00 18 */ beq lbl_80497550 -/* 8049753C 4B DD 0C 99 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80497540 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80497544 41 82 00 0C */ beq lbl_80497550 -/* 80497548 80 7E 0A C8 */ lwz r3, 0xac8(r30) -/* 8049754C 4B BE 44 75 */ bl Move__4dBgWFv -lbl_80497550: -/* 80497550 88 1E 0A BC */ lbz r0, 0xabc(r30) -/* 80497554 1C 80 00 14 */ mulli r4, r0, 0x14 -/* 80497558 3C 60 80 4A */ lis r3, l_cyl_info@ha /* 0x80498180@ha */ -/* 8049755C 38 03 81 80 */ addi r0, r3, l_cyl_info@l /* 0x80498180@l */ -/* 80497560 7C 60 22 14 */ add r3, r0, r4 -/* 80497564 C0 03 00 00 */ lfs f0, 0(r3) -/* 80497568 D0 01 00 08 */ stfs f0, 8(r1) -/* 8049756C C0 03 00 04 */ lfs f0, 4(r3) -/* 80497570 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80497574 C0 03 00 08 */ lfs f0, 8(r3) -/* 80497578 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8049757C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80497580 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80497584 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 80497588 4B B7 4E 55 */ bl mDoMtx_YrotS__FPA4_fs -/* 8049758C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80497590 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80497594 38 81 00 08 */ addi r4, r1, 8 -/* 80497598 7C 85 23 78 */ mr r5, r4 -/* 8049759C 4B EA F7 D1 */ bl PSMTXMultVec -/* 804975A0 38 61 00 08 */ addi r3, r1, 8 -/* 804975A4 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 804975A8 7C 65 1B 78 */ mr r5, r3 -/* 804975AC 4B EA FA E5 */ bl PSVECAdd -/* 804975B0 38 7E 0A A4 */ addi r3, r30, 0xaa4 -/* 804975B4 38 81 00 08 */ addi r4, r1, 8 -/* 804975B8 4B DD 7C 25 */ bl SetC__8cM3dGCylFRC4cXyz -/* 804975BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804975C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804975C4 38 63 23 3C */ addi r3, r3, 0x233c -/* 804975C8 38 9E 09 80 */ addi r4, r30, 0x980 -/* 804975CC 4B DC D5 DD */ bl Set__4cCcSFP8cCcD_Obj -/* 804975D0 38 60 00 01 */ li r3, 1 -/* 804975D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 804975D8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 804975DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 804975E0 7C 08 03 A6 */ mtlr r0 -/* 804975E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 804975E8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__10cCcD_GSttsFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__10cCcD_GSttsFv.s deleted file mode 100644 index fe3bc5b827..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__10cCcD_GSttsFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_804980F8: -/* 804980F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804980FC 7C 08 02 A6 */ mflr r0 -/* 80498100 90 01 00 14 */ stw r0, 0x14(r1) -/* 80498104 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80498108 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8049810C 41 82 00 1C */ beq lbl_80498128 -/* 80498110 3C A0 80 4A */ lis r5, __vt__10cCcD_GStts@ha /* 0x804983B8@ha */ -/* 80498114 38 05 83 B8 */ addi r0, r5, __vt__10cCcD_GStts@l /* 0x804983B8@l */ -/* 80498118 90 1F 00 00 */ stw r0, 0(r31) -/* 8049811C 7C 80 07 35 */ extsh. r0, r4 -/* 80498120 40 81 00 08 */ ble lbl_80498128 -/* 80498124 4B E3 6C 19 */ bl __dl__FPv -lbl_80498128: -/* 80498128 7F E3 FB 78 */ mr r3, r31 -/* 8049812C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80498130 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80498134 7C 08 03 A6 */ mtlr r0 -/* 80498138 38 21 00 10 */ addi r1, r1, 0x10 -/* 8049813C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__10dCcD_GSttsFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__10dCcD_GSttsFv.s deleted file mode 100644 index 4c37543e9d..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__10dCcD_GSttsFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_804971F0: -/* 804971F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804971F4 7C 08 02 A6 */ mflr r0 -/* 804971F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 804971FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80497200 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80497204 41 82 00 30 */ beq lbl_80497234 -/* 80497208 3C 60 80 4A */ lis r3, __vt__10dCcD_GStts@ha /* 0x804983C4@ha */ -/* 8049720C 38 03 83 C4 */ addi r0, r3, __vt__10dCcD_GStts@l /* 0x804983C4@l */ -/* 80497210 90 1F 00 00 */ stw r0, 0(r31) -/* 80497214 41 82 00 10 */ beq lbl_80497224 -/* 80497218 3C 60 80 4A */ lis r3, __vt__10cCcD_GStts@ha /* 0x804983B8@ha */ -/* 8049721C 38 03 83 B8 */ addi r0, r3, __vt__10cCcD_GStts@l /* 0x804983B8@l */ -/* 80497220 90 1F 00 00 */ stw r0, 0(r31) -lbl_80497224: -/* 80497224 7C 80 07 35 */ extsh. r0, r4 -/* 80497228 40 81 00 0C */ ble lbl_80497234 -/* 8049722C 7F E3 FB 78 */ mr r3, r31 -/* 80497230 4B E3 7B 0D */ bl __dl__FPv -lbl_80497234: -/* 80497234 7F E3 FB 78 */ mr r3, r31 -/* 80497238 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8049723C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80497240 7C 08 03 A6 */ mtlr r0 -/* 80497244 38 21 00 10 */ addi r1, r1, 0x10 -/* 80497248 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12J3DFrameCtrlFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12J3DFrameCtrlFv.s deleted file mode 100644 index 56b32bdd22..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12J3DFrameCtrlFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80496DF4: -/* 80496DF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80496DF8 7C 08 02 A6 */ mflr r0 -/* 80496DFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80496E00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80496E04 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80496E08 41 82 00 1C */ beq lbl_80496E24 -/* 80496E0C 3C A0 80 4A */ lis r5, __vt__12J3DFrameCtrl@ha /* 0x80498444@ha */ -/* 80496E10 38 05 84 44 */ addi r0, r5, __vt__12J3DFrameCtrl@l /* 0x80498444@l */ -/* 80496E14 90 1F 00 00 */ stw r0, 0(r31) -/* 80496E18 7C 80 07 35 */ extsh. r0, r4 -/* 80496E1C 40 81 00 08 */ ble lbl_80496E24 -/* 80496E20 4B E3 7F 1D */ bl __dl__FPv -lbl_80496E24: -/* 80496E24 7F E3 FB 78 */ mr r3, r31 -/* 80496E28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80496E2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80496E30 7C 08 03 A6 */ mtlr r0 -/* 80496E34 38 21 00 10 */ addi r1, r1, 0x10 -/* 80496E38 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12dBgS_AcchCirFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12dBgS_AcchCirFv.s deleted file mode 100644 index 6e197cb1a6..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12dBgS_AcchCirFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80497080: -/* 80497080 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80497084 7C 08 02 A6 */ mflr r0 -/* 80497088 90 01 00 14 */ stw r0, 0x14(r1) -/* 8049708C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80497090 93 C1 00 08 */ stw r30, 8(r1) -/* 80497094 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80497098 7C 9F 23 78 */ mr r31, r4 -/* 8049709C 41 82 00 38 */ beq lbl_804970D4 -/* 804970A0 3C 60 80 4A */ lis r3, __vt__12dBgS_AcchCir@ha /* 0x804983D0@ha */ -/* 804970A4 38 03 83 D0 */ addi r0, r3, __vt__12dBgS_AcchCir@l /* 0x804983D0@l */ -/* 804970A8 90 1E 00 0C */ stw r0, 0xc(r30) -/* 804970AC 38 7E 00 14 */ addi r3, r30, 0x14 -/* 804970B0 38 80 FF FF */ li r4, -1 -/* 804970B4 4B DD 7E 65 */ bl __dt__8cM3dGCirFv -/* 804970B8 7F C3 F3 78 */ mr r3, r30 -/* 804970BC 38 80 00 00 */ li r4, 0 -/* 804970C0 4B DD 0F F1 */ bl __dt__13cBgS_PolyInfoFv -/* 804970C4 7F E0 07 35 */ extsh. r0, r31 -/* 804970C8 40 81 00 0C */ ble lbl_804970D4 -/* 804970CC 7F C3 F3 78 */ mr r3, r30 -/* 804970D0 4B E3 7C 6D */ bl __dl__FPv -lbl_804970D4: -/* 804970D4 7F C3 F3 78 */ mr r3, r30 -/* 804970D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804970DC 83 C1 00 08 */ lwz r30, 8(r1) -/* 804970E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804970E4 7C 08 03 A6 */ mtlr r0 -/* 804970E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 804970EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12dBgS_ObjAcchFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12dBgS_ObjAcchFv.s deleted file mode 100644 index 7841a9f093..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12dBgS_ObjAcchFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_804970F0: -/* 804970F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804970F4 7C 08 02 A6 */ mflr r0 -/* 804970F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 804970FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80497100 93 C1 00 08 */ stw r30, 8(r1) -/* 80497104 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80497108 7C 9F 23 78 */ mr r31, r4 -/* 8049710C 41 82 00 38 */ beq lbl_80497144 -/* 80497110 3C 80 80 4A */ lis r4, __vt__12dBgS_ObjAcch@ha /* 0x804983DC@ha */ -/* 80497114 38 84 83 DC */ addi r4, r4, __vt__12dBgS_ObjAcch@l /* 0x804983DC@l */ -/* 80497118 90 9E 00 10 */ stw r4, 0x10(r30) -/* 8049711C 38 04 00 0C */ addi r0, r4, 0xc -/* 80497120 90 1E 00 14 */ stw r0, 0x14(r30) -/* 80497124 38 04 00 18 */ addi r0, r4, 0x18 -/* 80497128 90 1E 00 24 */ stw r0, 0x24(r30) -/* 8049712C 38 80 00 00 */ li r4, 0 -/* 80497130 4B BD EE 65 */ bl __dt__9dBgS_AcchFv -/* 80497134 7F E0 07 35 */ extsh. r0, r31 -/* 80497138 40 81 00 0C */ ble lbl_80497144 -/* 8049713C 7F C3 F3 78 */ mr r3, r30 -/* 80497140 4B E3 7B FD */ bl __dl__FPv -lbl_80497144: -/* 80497144 7F C3 F3 78 */ mr r3, r30 -/* 80497148 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8049714C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80497150 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80497154 7C 08 03 A6 */ mtlr r0 -/* 80497158 38 21 00 10 */ addi r1, r1, 0x10 -/* 8049715C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGAabFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGAabFv.s deleted file mode 100644 index 0075c39a4e..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGAabFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_804971A8: -/* 804971A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804971AC 7C 08 02 A6 */ mflr r0 -/* 804971B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 804971B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804971B8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 804971BC 41 82 00 1C */ beq lbl_804971D8 -/* 804971C0 3C A0 80 4A */ lis r5, __vt__8cM3dGAab@ha /* 0x8049840C@ha */ -/* 804971C4 38 05 84 0C */ addi r0, r5, __vt__8cM3dGAab@l /* 0x8049840C@l */ -/* 804971C8 90 1F 00 18 */ stw r0, 0x18(r31) -/* 804971CC 7C 80 07 35 */ extsh. r0, r4 -/* 804971D0 40 81 00 08 */ ble lbl_804971D8 -/* 804971D4 4B E3 7B 69 */ bl __dl__FPv -lbl_804971D8: -/* 804971D8 7F E3 FB 78 */ mr r3, r31 -/* 804971DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804971E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804971E4 7C 08 03 A6 */ mtlr r0 -/* 804971E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 804971EC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGCylFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGCylFv.s deleted file mode 100644 index 60db347a91..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGCylFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80497160: -/* 80497160 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80497164 7C 08 02 A6 */ mflr r0 -/* 80497168 90 01 00 14 */ stw r0, 0x14(r1) -/* 8049716C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80497170 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80497174 41 82 00 1C */ beq lbl_80497190 -/* 80497178 3C A0 80 4A */ lis r5, __vt__8cM3dGCyl@ha /* 0x80498400@ha */ -/* 8049717C 38 05 84 00 */ addi r0, r5, __vt__8cM3dGCyl@l /* 0x80498400@l */ -/* 80497180 90 1F 00 14 */ stw r0, 0x14(r31) -/* 80497184 7C 80 07 35 */ extsh. r0, r4 -/* 80497188 40 81 00 08 */ ble lbl_80497190 -/* 8049718C 4B E3 7B B1 */ bl __dl__FPv -lbl_80497190: -/* 80497190 7F E3 FB 78 */ mr r3, r31 -/* 80497194 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80497198 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8049719C 7C 08 03 A6 */ mtlr r0 -/* 804971A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 804971A4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionNotOpenDemo__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionNotOpenDemo__9daTbox2_cFv.s deleted file mode 100644 index 6cfd9d182e..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionNotOpenDemo__9daTbox2_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_804978E4: -/* 804978E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804978E8 7C 08 02 A6 */ mflr r0 -/* 804978EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 804978F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804978F4 93 C1 00 08 */ stw r30, 8(r1) -/* 804978F8 7C 7E 1B 78 */ mr r30, r3 -/* 804978FC A8 83 00 FC */ lha r4, 0xfc(r3) -/* 80497900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80497904 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80497908 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 8049790C 4B BB 01 6D */ bl endCheck__16dEvent_manager_cFs -/* 80497910 2C 03 00 00 */ cmpwi r3, 0 -/* 80497914 41 82 00 18 */ beq lbl_8049792C -/* 80497918 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8049791C 4B BA AB 4D */ bl reset__14dEvt_control_cFv -/* 80497920 7F C3 F3 78 */ mr r3, r30 -/* 80497924 48 00 00 E9 */ bl init_actionOpenWait__9daTbox2_cFv -/* 80497928 48 00 00 0C */ b lbl_80497934 -lbl_8049792C: -/* 8049792C 7F C3 F3 78 */ mr r3, r30 -/* 80497930 4B FF F9 1D */ bl demoProc__9daTbox2_cFv -lbl_80497934: -/* 80497934 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80497938 83 C1 00 08 */ lwz r30, 8(r1) -/* 8049793C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80497940 7C 08 03 A6 */ mtlr r0 -/* 80497944 38 21 00 10 */ addi r1, r1, 0x10 -/* 80497948 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionOpenDemo__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionOpenDemo__9daTbox2_cFv.s deleted file mode 100644 index b384126a10..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionOpenDemo__9daTbox2_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80497958: -/* 80497958 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8049795C 7C 08 02 A6 */ mflr r0 -/* 80497960 90 01 00 14 */ stw r0, 0x14(r1) -/* 80497964 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80497968 93 C1 00 08 */ stw r30, 8(r1) -/* 8049796C 7C 7E 1B 78 */ mr r30, r3 -/* 80497970 A8 83 00 FC */ lha r4, 0xfc(r3) -/* 80497974 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80497978 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8049797C 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80497980 4B BB 00 F9 */ bl endCheck__16dEvent_manager_cFs -/* 80497984 2C 03 00 00 */ cmpwi r3, 0 -/* 80497988 41 82 00 64 */ beq lbl_804979EC -/* 8049798C 3B FF 4E C8 */ addi r31, r31, 0x4ec8 -/* 80497990 7F E3 FB 78 */ mr r3, r31 -/* 80497994 4B BA AA D5 */ bl reset__14dEvt_control_cFv -/* 80497998 3C 60 80 4A */ lis r3, lit_3763@ha /* 0x804981D0@ha */ -/* 8049799C C0 23 81 D0 */ lfs f1, lit_3763@l(r3) /* 0x804981D0@l */ -/* 804979A0 4B D1 10 A5 */ bl dKy_set_allcol_ratio__Ff -/* 804979A4 7F E3 FB 78 */ mr r3, r31 -/* 804979A8 38 80 00 00 */ li r4, 0 -/* 804979AC 4B BA BD 11 */ bl setPtI__14dEvt_control_cFPv -/* 804979B0 88 1E 07 18 */ lbz r0, 0x718(r30) -/* 804979B4 28 00 00 00 */ cmplwi r0, 0 -/* 804979B8 41 82 00 28 */ beq lbl_804979E0 -/* 804979BC 3C 60 80 4A */ lis r3, lit_3715@ha /* 0x804981C0@ha */ -/* 804979C0 C0 03 81 C0 */ lfs f0, lit_3715@l(r3) /* 0x804981C0@l */ -/* 804979C4 80 7E 07 28 */ lwz r3, 0x728(r30) -/* 804979C8 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 804979CC 80 7E 07 28 */ lwz r3, 0x728(r30) -/* 804979D0 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 804979D4 7F C3 F3 78 */ mr r3, r30 -/* 804979D8 48 00 00 35 */ bl init_actionOpenWait__9daTbox2_cFv -/* 804979DC 48 00 00 18 */ b lbl_804979F4 -lbl_804979E0: -/* 804979E0 7F C3 F3 78 */ mr r3, r30 -/* 804979E4 4B FF FE E5 */ bl init_actionWait__9daTbox2_cFv -/* 804979E8 48 00 00 0C */ b lbl_804979F4 -lbl_804979EC: -/* 804979EC 7F C3 F3 78 */ mr r3, r30 -/* 804979F0 4B FF F8 5D */ bl demoProc__9daTbox2_cFv -lbl_804979F4: -/* 804979F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804979F8 83 C1 00 08 */ lwz r30, 8(r1) -/* 804979FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80497A00 7C 08 03 A6 */ mtlr r0 -/* 80497A04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80497A08 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionOpenWait__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionOpenWait__9daTbox2_cFv.s deleted file mode 100644 index 6bcf061b3c..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionOpenWait__9daTbox2_cFv.s +++ /dev/null @@ -1,116 +0,0 @@ -lbl_80497A18: -/* 80497A18 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80497A1C 7C 08 02 A6 */ mflr r0 -/* 80497A20 90 01 00 24 */ stw r0, 0x24(r1) -/* 80497A24 39 61 00 20 */ addi r11, r1, 0x20 -/* 80497A28 4B EC A7 B1 */ bl _savegpr_28 -/* 80497A2C 7C 7E 1B 78 */ mr r30, r3 -/* 80497A30 3C 80 80 45 */ lis r4, m_midnaActor__9daPy_py_c@ha /* 0x80451018@ha */ -/* 80497A34 83 E4 10 18 */ lwz r31, m_midnaActor__9daPy_py_c@l(r4) /* 0x80451018@l */ -/* 80497A38 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80497A3C 3B A4 61 C0 */ addi r29, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80497A40 83 9D 5D AC */ lwz r28, 0x5dac(r29) -/* 80497A44 A0 03 00 F8 */ lhz r0, 0xf8(r3) -/* 80497A48 28 00 00 03 */ cmplwi r0, 3 -/* 80497A4C 40 82 00 D4 */ bne lbl_80497B20 -/* 80497A50 A0 1D 4F A0 */ lhz r0, 0x4fa0(r29) -/* 80497A54 60 00 00 04 */ ori r0, r0, 4 -/* 80497A58 B0 1D 4F A0 */ sth r0, 0x4fa0(r29) -/* 80497A5C 88 1E 0A BC */ lbz r0, 0xabc(r30) -/* 80497A60 28 00 00 00 */ cmplwi r0, 0 -/* 80497A64 41 82 00 60 */ beq lbl_80497AC4 -/* 80497A68 80 7D 5D B4 */ lwz r3, 0x5db4(r29) -/* 80497A6C 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80497A70 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80497A74 41 82 00 50 */ beq lbl_80497AC4 -/* 80497A78 7F E3 FB 78 */ mr r3, r31 -/* 80497A7C 39 9F 09 D4 */ addi r12, r31, 0x9d4 -/* 80497A80 4B EC A6 05 */ bl __ptmf_scall -/* 80497A84 60 00 00 00 */ nop -/* 80497A88 2C 03 00 00 */ cmpwi r3, 0 -/* 80497A8C 40 82 00 38 */ bne lbl_80497AC4 -/* 80497A90 38 7D 4F F8 */ addi r3, r29, 0x4ff8 -/* 80497A94 3C 80 80 4A */ lis r4, l_staff_name@ha /* 0x80498280@ha */ -/* 80497A98 38 84 82 80 */ addi r4, r4, l_staff_name@l /* 0x80498280@l */ -/* 80497A9C 80 84 00 00 */ lwz r4, 0(r4) -/* 80497AA0 38 A0 00 00 */ li r5, 0 -/* 80497AA4 38 C0 00 00 */ li r6, 0 -/* 80497AA8 4B BB 00 75 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80497AAC 90 7E 0A C4 */ stw r3, 0xac4(r30) -/* 80497AB0 7F C3 F3 78 */ mr r3, r30 -/* 80497AB4 4B FF F7 99 */ bl demoProc__9daTbox2_cFv -/* 80497AB8 7F C3 F3 78 */ mr r3, r30 -/* 80497ABC 4B FF FE 1D */ bl init_actionNotOpenDemo__9daTbox2_cFv -/* 80497AC0 48 00 00 F8 */ b lbl_80497BB8 -lbl_80497AC4: -/* 80497AC4 7F 83 E3 78 */ mr r3, r28 -/* 80497AC8 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 80497ACC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80497AD0 81 9C 06 28 */ lwz r12, 0x628(r28) -/* 80497AD4 81 8C 02 14 */ lwz r12, 0x214(r12) -/* 80497AD8 7D 89 03 A6 */ mtctr r12 -/* 80497ADC 4E 80 04 21 */ bctrl -/* 80497AE0 98 7E 07 18 */ stb r3, 0x718(r30) -/* 80497AE4 7F C3 F3 78 */ mr r3, r30 -/* 80497AE8 48 00 00 E9 */ bl setGetDemoItem__9daTbox2_cFv -/* 80497AEC 38 7D 4F F8 */ addi r3, r29, 0x4ff8 -/* 80497AF0 3C 80 80 4A */ lis r4, l_staff_name@ha /* 0x80498280@ha */ -/* 80497AF4 38 84 82 80 */ addi r4, r4, l_staff_name@l /* 0x80498280@l */ -/* 80497AF8 80 84 00 00 */ lwz r4, 0(r4) -/* 80497AFC 38 A0 00 00 */ li r5, 0 -/* 80497B00 38 C0 00 00 */ li r6, 0 -/* 80497B04 4B BB 00 19 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80497B08 90 7E 0A C4 */ stw r3, 0xac4(r30) -/* 80497B0C 7F C3 F3 78 */ mr r3, r30 -/* 80497B10 4B FF F7 3D */ bl demoProc__9daTbox2_cFv -/* 80497B14 7F C3 F3 78 */ mr r3, r30 -/* 80497B18 4B FF FE 35 */ bl init_actionOpenDemo__9daTbox2_cFv -/* 80497B1C 48 00 00 9C */ b lbl_80497BB8 -lbl_80497B20: -/* 80497B20 48 00 01 41 */ bl boxCheck__9daTbox2_cFv -/* 80497B24 2C 03 00 00 */ cmpwi r3, 0 -/* 80497B28 41 82 00 90 */ beq lbl_80497BB8 -/* 80497B2C A0 1E 00 FA */ lhz r0, 0xfa(r30) -/* 80497B30 60 00 00 04 */ ori r0, r0, 4 -/* 80497B34 B0 1E 00 FA */ sth r0, 0xfa(r30) -/* 80497B38 88 1E 0A BC */ lbz r0, 0xabc(r30) -/* 80497B3C 28 00 00 00 */ cmplwi r0, 0 -/* 80497B40 40 82 00 1C */ bne lbl_80497B5C -/* 80497B44 38 7E 00 F4 */ addi r3, r30, 0xf4 -/* 80497B48 3C 80 80 4A */ lis r4, d_a_tbox2__stringBase0@ha /* 0x804981E0@ha */ -/* 80497B4C 38 84 81 E0 */ addi r4, r4, d_a_tbox2__stringBase0@l /* 0x804981E0@l */ -/* 80497B50 38 84 00 2B */ addi r4, r4, 0x2b -/* 80497B54 4B BA B8 D5 */ bl setEventName__11dEvt_info_cFPc -/* 80497B58 48 00 00 60 */ b lbl_80497BB8 -lbl_80497B5C: -/* 80497B5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80497B60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80497B64 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 80497B68 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80497B6C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80497B70 41 82 00 34 */ beq lbl_80497BA4 -/* 80497B74 7F E3 FB 78 */ mr r3, r31 -/* 80497B78 39 9F 09 D4 */ addi r12, r31, 0x9d4 -/* 80497B7C 4B EC A5 09 */ bl __ptmf_scall -/* 80497B80 60 00 00 00 */ nop -/* 80497B84 2C 03 00 00 */ cmpwi r3, 0 -/* 80497B88 40 82 00 1C */ bne lbl_80497BA4 -/* 80497B8C 38 7E 00 F4 */ addi r3, r30, 0xf4 -/* 80497B90 3C 80 80 4A */ lis r4, d_a_tbox2__stringBase0@ha /* 0x804981E0@ha */ -/* 80497B94 38 84 81 E0 */ addi r4, r4, d_a_tbox2__stringBase0@l /* 0x804981E0@l */ -/* 80497B98 38 84 00 43 */ addi r4, r4, 0x43 -/* 80497B9C 4B BA B8 8D */ bl setEventName__11dEvt_info_cFPc -/* 80497BA0 48 00 00 18 */ b lbl_80497BB8 -lbl_80497BA4: -/* 80497BA4 38 7E 00 F4 */ addi r3, r30, 0xf4 -/* 80497BA8 3C 80 80 4A */ lis r4, d_a_tbox2__stringBase0@ha /* 0x804981E0@ha */ -/* 80497BAC 38 84 81 E0 */ addi r4, r4, d_a_tbox2__stringBase0@l /* 0x804981E0@l */ -/* 80497BB0 38 84 00 5C */ addi r4, r4, 0x5c -/* 80497BB4 4B BA B8 75 */ bl setEventName__11dEvt_info_cFPc -lbl_80497BB8: -/* 80497BB8 39 61 00 20 */ addi r11, r1, 0x20 -/* 80497BBC 4B EC A6 69 */ bl _restgpr_28 -/* 80497BC0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80497BC4 7C 08 03 A6 */ mtlr r0 -/* 80497BC8 38 21 00 20 */ addi r1, r1, 0x20 -/* 80497BCC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/action__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/action__9daTbox2_cFv.s deleted file mode 100644 index 84570ed58b..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/action__9daTbox2_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8049780C: -/* 8049780C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80497810 7C 08 02 A6 */ mflr r0 -/* 80497814 90 01 00 14 */ stw r0, 0x14(r1) -/* 80497818 3C 80 80 4A */ lis r4, cNullVec__6Z2Calc@ha /* 0x8049825C@ha */ -/* 8049781C 38 E4 82 5C */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x8049825C@l */ -/* 80497820 3C 80 80 4A */ lis r4, struct_80498480+0x1@ha /* 0x80498481@ha */ -/* 80497824 38 C4 84 81 */ addi r6, r4, struct_80498480+0x1@l /* 0x80498481@l */ -/* 80497828 88 06 00 00 */ lbz r0, 0(r6) -/* 8049782C 7C 00 07 75 */ extsb. r0, r0 -/* 80497830 40 82 00 70 */ bne lbl_804978A0 -/* 80497834 80 87 00 AC */ lwz r4, 0xac(r7) -/* 80497838 80 07 00 B0 */ lwz r0, 0xb0(r7) -/* 8049783C 90 87 00 DC */ stw r4, 0xdc(r7) -/* 80497840 90 07 00 E0 */ stw r0, 0xe0(r7) -/* 80497844 80 07 00 B4 */ lwz r0, 0xb4(r7) -/* 80497848 90 07 00 E4 */ stw r0, 0xe4(r7) -/* 8049784C 38 A7 00 DC */ addi r5, r7, 0xdc -/* 80497850 80 87 00 B8 */ lwz r4, 0xb8(r7) -/* 80497854 80 07 00 BC */ lwz r0, 0xbc(r7) -/* 80497858 90 85 00 0C */ stw r4, 0xc(r5) -/* 8049785C 90 05 00 10 */ stw r0, 0x10(r5) -/* 80497860 80 07 00 C0 */ lwz r0, 0xc0(r7) -/* 80497864 90 05 00 14 */ stw r0, 0x14(r5) -/* 80497868 80 87 00 C4 */ lwz r4, 0xc4(r7) -/* 8049786C 80 07 00 C8 */ lwz r0, 0xc8(r7) -/* 80497870 90 85 00 18 */ stw r4, 0x18(r5) -/* 80497874 90 05 00 1C */ stw r0, 0x1c(r5) -/* 80497878 80 07 00 CC */ lwz r0, 0xcc(r7) -/* 8049787C 90 05 00 20 */ stw r0, 0x20(r5) -/* 80497880 80 87 00 D0 */ lwz r4, 0xd0(r7) -/* 80497884 80 07 00 D4 */ lwz r0, 0xd4(r7) -/* 80497888 90 85 00 24 */ stw r4, 0x24(r5) -/* 8049788C 90 05 00 28 */ stw r0, 0x28(r5) -/* 80497890 80 07 00 D8 */ lwz r0, 0xd8(r7) -/* 80497894 90 05 00 2C */ stw r0, 0x2c(r5) -/* 80497898 38 00 00 01 */ li r0, 1 -/* 8049789C 98 06 00 00 */ stb r0, 0(r6) -lbl_804978A0: -/* 804978A0 88 03 0A BD */ lbz r0, 0xabd(r3) -/* 804978A4 1C 00 00 0C */ mulli r0, r0, 0xc -/* 804978A8 39 87 00 DC */ addi r12, r7, 0xdc -/* 804978AC 7D 8C 02 14 */ add r12, r12, r0 -/* 804978B0 4B EC A7 D5 */ bl __ptmf_scall -/* 804978B4 60 00 00 00 */ nop -/* 804978B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804978BC 7C 08 03 A6 */ mtlr r0 -/* 804978C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 804978C4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/boxCheck__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/boxCheck__9daTbox2_cFv.s deleted file mode 100644 index 804c84d370..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/boxCheck__9daTbox2_cFv.s +++ /dev/null @@ -1,84 +0,0 @@ -lbl_80497C60: -/* 80497C60 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80497C64 7C 08 02 A6 */ mflr r0 -/* 80497C68 90 01 00 54 */ stw r0, 0x54(r1) -/* 80497C6C DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80497C70 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80497C74 39 61 00 40 */ addi r11, r1, 0x40 -/* 80497C78 4B EC A5 61 */ bl _savegpr_28 -/* 80497C7C 7C 7C 1B 78 */ mr r28, r3 -/* 80497C80 3C 60 80 4A */ lis r3, l_resInfo@ha /* 0x80498160@ha */ -/* 80497C84 3B C3 81 60 */ addi r30, r3, l_resInfo@l /* 0x80498160@l */ -/* 80497C88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80497C8C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80497C90 83 BF 5D AC */ lwz r29, 0x5dac(r31) -/* 80497C94 38 7F 4E 00 */ addi r3, r31, 0x4e00 -/* 80497C98 3C 80 80 4A */ lis r4, d_a_tbox2__stringBase0@ha /* 0x804981E0@ha */ -/* 80497C9C 38 84 81 E0 */ addi r4, r4, d_a_tbox2__stringBase0@l /* 0x804981E0@l */ -/* 80497CA0 38 84 00 74 */ addi r4, r4, 0x74 -/* 80497CA4 4B ED 0C F1 */ bl strcmp -/* 80497CA8 2C 03 00 00 */ cmpwi r3, 0 -/* 80497CAC 40 82 00 34 */ bne lbl_80497CE0 -/* 80497CB0 88 1C 04 E2 */ lbz r0, 0x4e2(r28) -/* 80497CB4 2C 00 00 07 */ cmpwi r0, 7 -/* 80497CB8 40 82 00 28 */ bne lbl_80497CE0 -/* 80497CBC 7F A3 EB 78 */ mr r3, r29 -/* 80497CC0 81 9D 06 28 */ lwz r12, 0x628(r29) -/* 80497CC4 81 8C 01 C8 */ lwz r12, 0x1c8(r12) -/* 80497CC8 7D 89 03 A6 */ mtctr r12 -/* 80497CCC 4E 80 04 21 */ bctrl -/* 80497CD0 28 03 00 00 */ cmplwi r3, 0 -/* 80497CD4 40 82 00 0C */ bne lbl_80497CE0 -/* 80497CD8 38 60 00 00 */ li r3, 0 -/* 80497CDC 48 00 00 A4 */ b lbl_80497D80 -lbl_80497CE0: -/* 80497CE0 38 61 00 14 */ addi r3, r1, 0x14 -/* 80497CE4 38 9D 05 50 */ addi r4, r29, 0x550 -/* 80497CE8 38 BC 04 D0 */ addi r5, r28, 0x4d0 -/* 80497CEC 4B DC EE 49 */ bl __mi__4cXyzCFRC3Vec -/* 80497CF0 C0 41 00 14 */ lfs f2, 0x14(r1) -/* 80497CF4 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80497CF8 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80497CFC D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80497D00 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 80497D04 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 80497D08 D0 41 00 08 */ stfs f2, 8(r1) -/* 80497D0C C0 1E 00 60 */ lfs f0, 0x60(r30) -/* 80497D10 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80497D14 D0 21 00 10 */ stfs f1, 0x10(r1) -/* 80497D18 38 61 00 08 */ addi r3, r1, 8 -/* 80497D1C 4B EA F4 1D */ bl PSVECSquareMag -/* 80497D20 C0 5D 04 D4 */ lfs f2, 0x4d4(r29) -/* 80497D24 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) -/* 80497D28 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80497D2C FC 00 02 10 */ fabs f0, f0 -/* 80497D30 FF E0 00 18 */ frsp f31, f0 -/* 80497D34 C0 1E 00 78 */ lfs f0, 0x78(r30) -/* 80497D38 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80497D3C 40 80 00 40 */ bge lbl_80497D7C -/* 80497D40 7F 83 E3 78 */ mr r3, r28 -/* 80497D44 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 80497D48 4B B8 2A 55 */ bl fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80497D4C 2C 03 20 00 */ cmpwi r3, 0x2000 -/* 80497D50 40 80 00 2C */ bge lbl_80497D7C -/* 80497D54 7F A3 EB 78 */ mr r3, r29 -/* 80497D58 7F 84 E3 78 */ mr r4, r28 -/* 80497D5C 4B B8 2A 41 */ bl fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 80497D60 2C 03 20 00 */ cmpwi r3, 0x2000 -/* 80497D64 40 80 00 18 */ bge lbl_80497D7C -/* 80497D68 C0 1E 00 7C */ lfs f0, 0x7c(r30) -/* 80497D6C FC 1F 00 40 */ fcmpo cr0, f31, f0 -/* 80497D70 40 80 00 0C */ bge lbl_80497D7C -/* 80497D74 38 60 00 01 */ li r3, 1 -/* 80497D78 48 00 00 08 */ b lbl_80497D80 -lbl_80497D7C: -/* 80497D7C 38 60 00 00 */ li r3, 0 -lbl_80497D80: -/* 80497D80 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80497D84 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80497D88 39 61 00 40 */ addi r11, r1, 0x40 -/* 80497D8C 4B EC A4 99 */ bl _restgpr_28 -/* 80497D90 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80497D94 7C 08 03 A6 */ mtlr r0 -/* 80497D98 38 21 00 50 */ addi r1, r1, 0x50 -/* 80497D9C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/create1st__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/create1st__9daTbox2_cFv.s deleted file mode 100644 index bad459eebc..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/create1st__9daTbox2_cFv.s +++ /dev/null @@ -1,152 +0,0 @@ -lbl_80496E3C: -/* 80496E3C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80496E40 7C 08 02 A6 */ mflr r0 -/* 80496E44 90 01 00 34 */ stw r0, 0x34(r1) -/* 80496E48 39 61 00 30 */ addi r11, r1, 0x30 -/* 80496E4C 4B EC B3 7D */ bl _savegpr_24 -/* 80496E50 7C 7A 1B 78 */ mr r26, r3 -/* 80496E54 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80496E58 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80496E5C 40 82 01 74 */ bne lbl_80496FD0 -/* 80496E60 7F 40 D3 79 */ or. r0, r26, r26 -/* 80496E64 41 82 01 60 */ beq lbl_80496FC4 -/* 80496E68 7C 19 03 78 */ mr r25, r0 -/* 80496E6C 7C 1C 03 78 */ mr r28, r0 -/* 80496E70 4B BE 17 B5 */ bl __ct__16dBgS_MoveBgActorFv -/* 80496E74 3C 60 80 4A */ lis r3, __vt__12daTboxBase_c@ha /* 0x80498418@ha */ -/* 80496E78 38 03 84 18 */ addi r0, r3, __vt__12daTboxBase_c@l /* 0x80498418@l */ -/* 80496E7C 90 1C 05 9C */ stw r0, 0x59c(r28) -/* 80496E80 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80496E84 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80496E88 90 1C 05 B8 */ stw r0, 0x5b8(r28) -/* 80496E8C 38 7C 05 BC */ addi r3, r28, 0x5bc -/* 80496E90 4B BE C8 D1 */ bl __ct__10dCcD_GSttsFv -/* 80496E94 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80496E98 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80496E9C 90 7C 05 B8 */ stw r3, 0x5b8(r28) -/* 80496EA0 3B E3 00 20 */ addi r31, r3, 0x20 -/* 80496EA4 93 FC 05 BC */ stw r31, 0x5bc(r28) -/* 80496EA8 3B 1C 05 DC */ addi r24, r28, 0x5dc -/* 80496EAC 7F 03 C3 78 */ mr r3, r24 -/* 80496EB0 4B BE CB 79 */ bl __ct__12dCcD_GObjInfFv -/* 80496EB4 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80496EB8 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80496EBC 90 18 01 20 */ stw r0, 0x120(r24) -/* 80496EC0 3C 60 80 4A */ lis r3, __vt__8cM3dGAab@ha /* 0x8049840C@ha */ -/* 80496EC4 38 03 84 0C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8049840C@l */ -/* 80496EC8 90 18 01 1C */ stw r0, 0x11c(r24) -/* 80496ECC 3C 60 80 4A */ lis r3, __vt__8cM3dGCyl@ha /* 0x80498400@ha */ -/* 80496ED0 38 03 84 00 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80498400@l */ -/* 80496ED4 90 18 01 38 */ stw r0, 0x138(r24) -/* 80496ED8 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80496EDC 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80496EE0 90 78 01 20 */ stw r3, 0x120(r24) -/* 80496EE4 3B C3 00 58 */ addi r30, r3, 0x58 -/* 80496EE8 93 D8 01 38 */ stw r30, 0x138(r24) -/* 80496EEC 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80496EF0 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80496EF4 90 78 00 3C */ stw r3, 0x3c(r24) -/* 80496EF8 3B A3 00 2C */ addi r29, r3, 0x2c -/* 80496EFC 93 B8 01 20 */ stw r29, 0x120(r24) -/* 80496F00 3B 83 00 84 */ addi r28, r3, 0x84 -/* 80496F04 93 98 01 38 */ stw r28, 0x138(r24) -/* 80496F08 3C 60 80 4A */ lis r3, __vt__9daTbox2_c@ha /* 0x80498450@ha */ -/* 80496F0C 38 03 84 50 */ addi r0, r3, __vt__9daTbox2_c@l /* 0x80498450@l */ -/* 80496F10 90 19 05 9C */ stw r0, 0x59c(r25) -/* 80496F14 3B 19 07 2C */ addi r24, r25, 0x72c -/* 80496F18 7F 03 C3 78 */ mr r3, r24 -/* 80496F1C 4B BD F1 85 */ bl __ct__9dBgS_AcchFv -/* 80496F20 3C 60 80 4A */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x804983DC@ha */ -/* 80496F24 38 63 83 DC */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x804983DC@l */ -/* 80496F28 90 78 00 10 */ stw r3, 0x10(r24) -/* 80496F2C 38 03 00 0C */ addi r0, r3, 0xc -/* 80496F30 90 18 00 14 */ stw r0, 0x14(r24) -/* 80496F34 38 03 00 18 */ addi r0, r3, 0x18 -/* 80496F38 90 18 00 24 */ stw r0, 0x24(r24) -/* 80496F3C 38 78 00 14 */ addi r3, r24, 0x14 -/* 80496F40 4B BE 1F 29 */ bl SetObj__16dBgS_PolyPassChkFv -/* 80496F44 38 79 09 04 */ addi r3, r25, 0x904 -/* 80496F48 4B BD EF 65 */ bl __ct__12dBgS_AcchCirFv -/* 80496F4C 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80496F50 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80496F54 90 19 09 5C */ stw r0, 0x95c(r25) -/* 80496F58 38 79 09 60 */ addi r3, r25, 0x960 -/* 80496F5C 4B BE C8 05 */ bl __ct__10dCcD_GSttsFv -/* 80496F60 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80496F64 38 03 C2 E4 */ addi r0, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80496F68 90 19 09 5C */ stw r0, 0x95c(r25) -/* 80496F6C 93 F9 09 60 */ stw r31, 0x960(r25) -/* 80496F70 3B 19 09 80 */ addi r24, r25, 0x980 -/* 80496F74 7F 03 C3 78 */ mr r3, r24 -/* 80496F78 4B BE CA B1 */ bl __ct__12dCcD_GObjInfFv -/* 80496F7C 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80496F80 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80496F84 90 18 01 20 */ stw r0, 0x120(r24) -/* 80496F88 3C 60 80 4A */ lis r3, __vt__8cM3dGAab@ha /* 0x8049840C@ha */ -/* 80496F8C 38 03 84 0C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8049840C@l */ -/* 80496F90 90 18 01 1C */ stw r0, 0x11c(r24) -/* 80496F94 3C 60 80 4A */ lis r3, __vt__8cM3dGCyl@ha /* 0x80498400@ha */ -/* 80496F98 38 03 84 00 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80498400@l */ -/* 80496F9C 90 18 01 38 */ stw r0, 0x138(r24) -/* 80496FA0 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80496FA4 38 03 35 A4 */ addi r0, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80496FA8 90 18 01 20 */ stw r0, 0x120(r24) -/* 80496FAC 93 D8 01 38 */ stw r30, 0x138(r24) -/* 80496FB0 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80496FB4 38 03 C0 50 */ addi r0, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80496FB8 90 18 00 3C */ stw r0, 0x3c(r24) -/* 80496FBC 93 B8 01 20 */ stw r29, 0x120(r24) -/* 80496FC0 93 98 01 38 */ stw r28, 0x138(r24) -lbl_80496FC4: -/* 80496FC4 80 1A 04 A0 */ lwz r0, 0x4a0(r26) -/* 80496FC8 60 00 00 08 */ ori r0, r0, 8 -/* 80496FCC 90 1A 04 A0 */ stw r0, 0x4a0(r26) -lbl_80496FD0: -/* 80496FD0 80 1A 00 B0 */ lwz r0, 0xb0(r26) -/* 80496FD4 54 00 C7 3E */ rlwinm r0, r0, 0x18, 0x1c, 0x1f -/* 80496FD8 98 1A 0A BC */ stb r0, 0xabc(r26) -/* 80496FDC 38 7A 07 1C */ addi r3, r26, 0x71c -/* 80496FE0 3C 80 80 4A */ lis r4, l_arcName@ha /* 0x8049827C@ha */ -/* 80496FE4 38 84 82 7C */ addi r4, r4, l_arcName@l /* 0x8049827C@l */ -/* 80496FE8 80 84 00 00 */ lwz r4, 0(r4) -/* 80496FEC 4B B9 5E D1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc -/* 80496FF0 7C 60 1B 78 */ mr r0, r3 -/* 80496FF4 2C 00 00 04 */ cmpwi r0, 4 -/* 80496FF8 40 82 00 6C */ bne lbl_80497064 -/* 80496FFC 88 1A 0A BC */ lbz r0, 0xabc(r26) -/* 80497000 28 00 00 00 */ cmplwi r0, 0 -/* 80497004 40 82 00 0C */ bne lbl_80497010 -/* 80497008 3B 60 18 20 */ li r27, 0x1820 -/* 8049700C 48 00 00 10 */ b lbl_8049701C -lbl_80497010: -/* 80497010 28 00 00 01 */ cmplwi r0, 1 -/* 80497014 40 82 00 08 */ bne lbl_8049701C -/* 80497018 3B 60 20 40 */ li r27, 0x2040 -lbl_8049701C: -/* 8049701C 7F 43 D3 78 */ mr r3, r26 -/* 80497020 3C 80 80 4A */ lis r4, l_arcName@ha /* 0x8049827C@ha */ -/* 80497024 38 84 82 7C */ addi r4, r4, l_arcName@l /* 0x8049827C@l */ -/* 80497028 80 84 00 00 */ lwz r4, 0(r4) -/* 8049702C 3C A0 80 4A */ lis r5, l_resInfo@ha /* 0x80498160@ha */ -/* 80497030 38 A5 81 60 */ addi r5, r5, l_resInfo@l /* 0x80498160@l */ -/* 80497034 54 00 25 36 */ rlwinm r0, r0, 4, 0x14, 0x1b -/* 80497038 7C A5 02 14 */ add r5, r5, r0 -/* 8049703C 80 A5 00 08 */ lwz r5, 8(r5) -/* 80497040 3C C0 80 07 */ lis r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@ha /* 0x80075AD8@ha */ -/* 80497044 38 C6 5A D8 */ addi r6, r6, dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz@l /* 0x80075AD8@l */ -/* 80497048 7F 67 DB 78 */ mr r7, r27 -/* 8049704C 39 00 00 00 */ li r8, 0 -/* 80497050 4B BE 17 6D */ bl MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f -/* 80497054 7C 60 1B 78 */ mr r0, r3 -/* 80497058 2C 00 00 05 */ cmpwi r0, 5 -/* 8049705C 40 82 00 08 */ bne lbl_80497064 -/* 80497060 48 00 00 08 */ b lbl_80497068 -lbl_80497064: -/* 80497064 7C 03 03 78 */ mr r3, r0 -lbl_80497068: -/* 80497068 39 61 00 30 */ addi r11, r1, 0x30 -/* 8049706C 4B EC B1 A9 */ bl _restgpr_24 -/* 80497070 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80497074 7C 08 03 A6 */ mtlr r0 -/* 80497078 38 21 00 30 */ addi r1, r1, 0x30 -/* 8049707C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGDelete__FP9daTbox2_c.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGDelete__FP9daTbox2_c.s deleted file mode 100644 index b1a38c2f45..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGDelete__FP9daTbox2_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8049808C: -/* 8049808C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80498090 7C 08 02 A6 */ mflr r0 -/* 80498094 90 01 00 14 */ stw r0, 0x14(r1) -/* 80498098 4B BE 08 45 */ bl MoveBGDelete__16dBgS_MoveBgActorFv -/* 8049809C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804980A0 7C 08 03 A6 */ mtlr r0 -/* 804980A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 804980A8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGDraw__FP9daTbox2_c.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGDraw__FP9daTbox2_c.s deleted file mode 100644 index d2f0eeaabb..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGDraw__FP9daTbox2_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_804980CC: -/* 804980CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804980D0 7C 08 02 A6 */ mflr r0 -/* 804980D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804980D8 81 83 05 9C */ lwz r12, 0x59c(r3) -/* 804980DC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 804980E0 7D 89 03 A6 */ mtctr r12 -/* 804980E4 4E 80 04 21 */ bctrl -/* 804980E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804980EC 7C 08 03 A6 */ mtlr r0 -/* 804980F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 804980F4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGExecute__FP9daTbox2_c.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGExecute__FP9daTbox2_c.s deleted file mode 100644 index b392e5f648..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGExecute__FP9daTbox2_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_804980AC: -/* 804980AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804980B0 7C 08 02 A6 */ mflr r0 -/* 804980B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804980B8 4B BE 08 99 */ bl MoveBGExecute__16dBgS_MoveBgActorFv -/* 804980BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804980C0 7C 08 03 A6 */ mtlr r0 -/* 804980C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 804980C8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_create1st__FP9daTbox2_c.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_create1st__FP9daTbox2_c.s deleted file mode 100644 index 9d7454a342..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_create1st__FP9daTbox2_c.s +++ /dev/null @@ -1,112 +0,0 @@ -lbl_80497ED8: -/* 80497ED8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80497EDC 7C 08 02 A6 */ mflr r0 -/* 80497EE0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80497EE4 39 61 00 30 */ addi r11, r1, 0x30 -/* 80497EE8 4B EC A2 E5 */ bl _savegpr_25 -/* 80497EEC 7C 7B 1B 78 */ mr r27, r3 -/* 80497EF0 80 03 04 A0 */ lwz r0, 0x4a0(r3) -/* 80497EF4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 80497EF8 40 82 01 74 */ bne lbl_8049806C -/* 80497EFC 7F 60 DB 79 */ or. r0, r27, r27 -/* 80497F00 41 82 01 60 */ beq lbl_80498060 -/* 80497F04 7C 1A 03 78 */ mr r26, r0 -/* 80497F08 7C 1C 03 78 */ mr r28, r0 -/* 80497F0C 4B BE 07 19 */ bl __ct__16dBgS_MoveBgActorFv -/* 80497F10 3C 60 80 4A */ lis r3, __vt__12daTboxBase_c@ha /* 0x80498418@ha */ -/* 80497F14 38 03 84 18 */ addi r0, r3, __vt__12daTboxBase_c@l /* 0x80498418@l */ -/* 80497F18 90 1C 05 9C */ stw r0, 0x59c(r28) -/* 80497F1C 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80497F20 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80497F24 90 1C 05 B8 */ stw r0, 0x5b8(r28) -/* 80497F28 38 7C 05 BC */ addi r3, r28, 0x5bc -/* 80497F2C 4B BE B8 35 */ bl __ct__10dCcD_GSttsFv -/* 80497F30 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80497F34 38 63 C2 E4 */ addi r3, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80497F38 90 7C 05 B8 */ stw r3, 0x5b8(r28) -/* 80497F3C 3B E3 00 20 */ addi r31, r3, 0x20 -/* 80497F40 93 FC 05 BC */ stw r31, 0x5bc(r28) -/* 80497F44 3B 3C 05 DC */ addi r25, r28, 0x5dc -/* 80497F48 7F 23 CB 78 */ mr r3, r25 -/* 80497F4C 4B BE BA DD */ bl __ct__12dCcD_GObjInfFv -/* 80497F50 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 80497F54 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80497F58 90 19 01 20 */ stw r0, 0x120(r25) -/* 80497F5C 3C 60 80 4A */ lis r3, __vt__8cM3dGAab@ha /* 0x8049840C@ha */ -/* 80497F60 38 03 84 0C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8049840C@l */ -/* 80497F64 90 19 01 1C */ stw r0, 0x11c(r25) -/* 80497F68 3C 60 80 4A */ lis r3, __vt__8cM3dGCyl@ha /* 0x80498400@ha */ -/* 80497F6C 38 03 84 00 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80498400@l */ -/* 80497F70 90 19 01 38 */ stw r0, 0x138(r25) -/* 80497F74 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80497F78 38 63 35 A4 */ addi r3, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80497F7C 90 79 01 20 */ stw r3, 0x120(r25) -/* 80497F80 3B C3 00 58 */ addi r30, r3, 0x58 -/* 80497F84 93 D9 01 38 */ stw r30, 0x138(r25) -/* 80497F88 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80497F8C 38 63 C0 50 */ addi r3, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80497F90 90 79 00 3C */ stw r3, 0x3c(r25) -/* 80497F94 3B A3 00 2C */ addi r29, r3, 0x2c -/* 80497F98 93 B9 01 20 */ stw r29, 0x120(r25) -/* 80497F9C 3B 83 00 84 */ addi r28, r3, 0x84 -/* 80497FA0 93 99 01 38 */ stw r28, 0x138(r25) -/* 80497FA4 3C 60 80 4A */ lis r3, __vt__9daTbox2_c@ha /* 0x80498450@ha */ -/* 80497FA8 38 03 84 50 */ addi r0, r3, __vt__9daTbox2_c@l /* 0x80498450@l */ -/* 80497FAC 90 1A 05 9C */ stw r0, 0x59c(r26) -/* 80497FB0 3B 3A 07 2C */ addi r25, r26, 0x72c -/* 80497FB4 7F 23 CB 78 */ mr r3, r25 -/* 80497FB8 4B BD E0 E9 */ bl __ct__9dBgS_AcchFv -/* 80497FBC 3C 60 80 4A */ lis r3, __vt__12dBgS_ObjAcch@ha /* 0x804983DC@ha */ -/* 80497FC0 38 63 83 DC */ addi r3, r3, __vt__12dBgS_ObjAcch@l /* 0x804983DC@l */ -/* 80497FC4 90 79 00 10 */ stw r3, 0x10(r25) -/* 80497FC8 38 03 00 0C */ addi r0, r3, 0xc -/* 80497FCC 90 19 00 14 */ stw r0, 0x14(r25) -/* 80497FD0 38 03 00 18 */ addi r0, r3, 0x18 -/* 80497FD4 90 19 00 24 */ stw r0, 0x24(r25) -/* 80497FD8 38 79 00 14 */ addi r3, r25, 0x14 -/* 80497FDC 4B BE 0E 8D */ bl SetObj__16dBgS_PolyPassChkFv -/* 80497FE0 38 7A 09 04 */ addi r3, r26, 0x904 -/* 80497FE4 4B BD DE C9 */ bl __ct__12dBgS_AcchCirFv -/* 80497FE8 3C 60 80 3C */ lis r3, __vt__9cCcD_Stts@ha /* 0x803C3728@ha */ -/* 80497FEC 38 03 37 28 */ addi r0, r3, __vt__9cCcD_Stts@l /* 0x803C3728@l */ -/* 80497FF0 90 1A 09 5C */ stw r0, 0x95c(r26) -/* 80497FF4 38 7A 09 60 */ addi r3, r26, 0x960 -/* 80497FF8 4B BE B7 69 */ bl __ct__10dCcD_GSttsFv -/* 80497FFC 3C 60 80 3B */ lis r3, __vt__9dCcD_Stts@ha /* 0x803AC2E4@ha */ -/* 80498000 38 03 C2 E4 */ addi r0, r3, __vt__9dCcD_Stts@l /* 0x803AC2E4@l */ -/* 80498004 90 1A 09 5C */ stw r0, 0x95c(r26) -/* 80498008 93 FA 09 60 */ stw r31, 0x960(r26) -/* 8049800C 3B 3A 09 80 */ addi r25, r26, 0x980 -/* 80498010 7F 23 CB 78 */ mr r3, r25 -/* 80498014 4B BE BA 15 */ bl __ct__12dCcD_GObjInfFv -/* 80498018 3C 60 80 3C */ lis r3, __vt__14cCcD_ShapeAttr@ha /* 0x803C36D0@ha */ -/* 8049801C 38 03 36 D0 */ addi r0, r3, __vt__14cCcD_ShapeAttr@l /* 0x803C36D0@l */ -/* 80498020 90 19 01 20 */ stw r0, 0x120(r25) -/* 80498024 3C 60 80 4A */ lis r3, __vt__8cM3dGAab@ha /* 0x8049840C@ha */ -/* 80498028 38 03 84 0C */ addi r0, r3, __vt__8cM3dGAab@l /* 0x8049840C@l */ -/* 8049802C 90 19 01 1C */ stw r0, 0x11c(r25) -/* 80498030 3C 60 80 4A */ lis r3, __vt__8cM3dGCyl@ha /* 0x80498400@ha */ -/* 80498034 38 03 84 00 */ addi r0, r3, __vt__8cM3dGCyl@l /* 0x80498400@l */ -/* 80498038 90 19 01 38 */ stw r0, 0x138(r25) -/* 8049803C 3C 60 80 3C */ lis r3, __vt__12cCcD_CylAttr@ha /* 0x803C35A4@ha */ -/* 80498040 38 03 35 A4 */ addi r0, r3, __vt__12cCcD_CylAttr@l /* 0x803C35A4@l */ -/* 80498044 90 19 01 20 */ stw r0, 0x120(r25) -/* 80498048 93 D9 01 38 */ stw r30, 0x138(r25) -/* 8049804C 3C 60 80 3B */ lis r3, __vt__8dCcD_Cyl@ha /* 0x803AC050@ha */ -/* 80498050 38 03 C0 50 */ addi r0, r3, __vt__8dCcD_Cyl@l /* 0x803AC050@l */ -/* 80498054 90 19 00 3C */ stw r0, 0x3c(r25) -/* 80498058 93 B9 01 20 */ stw r29, 0x120(r25) -/* 8049805C 93 99 01 38 */ stw r28, 0x138(r25) -lbl_80498060: -/* 80498060 80 1B 04 A0 */ lwz r0, 0x4a0(r27) -/* 80498064 60 00 00 08 */ ori r0, r0, 8 -/* 80498068 90 1B 04 A0 */ stw r0, 0x4a0(r27) -lbl_8049806C: -/* 8049806C 7F 63 DB 78 */ mr r3, r27 -/* 80498070 4B FF ED CD */ bl create1st__9daTbox2_cFv -/* 80498074 39 61 00 30 */ addi r11, r1, 0x30 -/* 80498078 4B EC A1 A1 */ bl _restgpr_25 -/* 8049807C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80498080 7C 08 03 A6 */ mtlr r0 -/* 80498084 38 21 00 30 */ addi r1, r1, 0x30 -/* 80498088 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/demoProc__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/demoProc__9daTbox2_cFv.s deleted file mode 100644 index d66d5cf037..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/demoProc__9daTbox2_cFv.s +++ /dev/null @@ -1,151 +0,0 @@ -lbl_8049724C: -/* 8049724C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80497250 7C 08 02 A6 */ mflr r0 -/* 80497254 90 01 00 34 */ stw r0, 0x34(r1) -/* 80497258 39 61 00 30 */ addi r11, r1, 0x30 -/* 8049725C 4B EC AF 81 */ bl _savegpr_29 -/* 80497260 7C 7D 1B 78 */ mr r29, r3 -/* 80497264 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80497268 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8049726C 3B C3 4F F8 */ addi r30, r3, 0x4ff8 -/* 80497270 7F C3 F3 78 */ mr r3, r30 -/* 80497274 80 9D 0A C4 */ lwz r4, 0xac4(r29) -/* 80497278 3C A0 80 4A */ lis r5, action_table@ha /* 0x804982C8@ha */ -/* 8049727C 38 A5 82 C8 */ addi r5, r5, action_table@l /* 0x804982C8@l */ -/* 80497280 38 C0 00 04 */ li r6, 4 -/* 80497284 38 E0 00 00 */ li r7, 0 -/* 80497288 39 00 00 00 */ li r8, 0 -/* 8049728C 4B BB 0B 85 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii -/* 80497290 7C 7F 1B 78 */ mr r31, r3 -/* 80497294 7F C3 F3 78 */ mr r3, r30 -/* 80497298 80 9D 0A C4 */ lwz r4, 0xac4(r29) -/* 8049729C 4B BB 0A B1 */ bl getIsAddvance__16dEvent_manager_cFi -/* 804972A0 2C 03 00 00 */ cmpwi r3, 0 -/* 804972A4 41 82 01 48 */ beq lbl_804973EC -/* 804972A8 2C 1F 00 02 */ cmpwi r31, 2 -/* 804972AC 41 82 01 40 */ beq lbl_804973EC -/* 804972B0 40 80 00 10 */ bge lbl_804972C0 -/* 804972B4 2C 1F 00 01 */ cmpwi r31, 1 -/* 804972B8 40 80 00 14 */ bge lbl_804972CC -/* 804972BC 48 00 01 30 */ b lbl_804973EC -lbl_804972C0: -/* 804972C0 2C 1F 00 04 */ cmpwi r31, 4 -/* 804972C4 40 80 01 28 */ bge lbl_804973EC -/* 804972C8 48 00 00 64 */ b lbl_8049732C -lbl_804972CC: -/* 804972CC 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 804972D0 7C 03 07 74 */ extsb r3, r0 -/* 804972D4 4B B9 5D 99 */ bl dComIfGp_getReverb__Fi -/* 804972D8 7C 67 1B 78 */ mr r7, r3 -/* 804972DC 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080020@ha */ -/* 804972E0 38 03 00 20 */ addi r0, r3, 0x0020 /* 0x00080020@l */ -/* 804972E4 90 01 00 10 */ stw r0, 0x10(r1) -/* 804972E8 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804972EC 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804972F0 80 63 00 00 */ lwz r3, 0(r3) -/* 804972F4 38 81 00 10 */ addi r4, r1, 0x10 -/* 804972F8 38 BD 05 38 */ addi r5, r29, 0x538 -/* 804972FC 38 C0 00 00 */ li r6, 0 -/* 80497300 3D 00 80 4A */ lis r8, lit_3763@ha /* 0x804981D0@ha */ -/* 80497304 C0 28 81 D0 */ lfs f1, lit_3763@l(r8) /* 0x804981D0@l */ -/* 80497308 FC 40 08 90 */ fmr f2, f1 -/* 8049730C 3D 00 80 4A */ lis r8, lit_4021@ha /* 0x804981D4@ha */ -/* 80497310 C0 68 81 D4 */ lfs f3, lit_4021@l(r8) /* 0x804981D4@l */ -/* 80497314 FC 80 18 90 */ fmr f4, f3 -/* 80497318 39 00 00 00 */ li r8, 0 -/* 8049731C 4B E1 46 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80497320 7F A3 EB 78 */ mr r3, r29 -/* 80497324 48 00 01 55 */ bl openInit__9daTbox2_cFv -/* 80497328 48 00 00 C4 */ b lbl_804973EC -lbl_8049732C: -/* 8049732C 88 1D 0A BC */ lbz r0, 0xabc(r29) -/* 80497330 28 00 00 00 */ cmplwi r0, 0 -/* 80497334 40 82 00 5C */ bne lbl_80497390 -/* 80497338 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 8049733C 7C 03 07 74 */ extsb r3, r0 -/* 80497340 4B B9 5D 2D */ bl dComIfGp_getReverb__Fi -/* 80497344 7C 67 1B 78 */ mr r7, r3 -/* 80497348 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008001F@ha */ -/* 8049734C 38 03 00 1F */ addi r0, r3, 0x001F /* 0x0008001F@l */ -/* 80497350 90 01 00 0C */ stw r0, 0xc(r1) -/* 80497354 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 80497358 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 8049735C 80 63 00 00 */ lwz r3, 0(r3) -/* 80497360 38 81 00 0C */ addi r4, r1, 0xc -/* 80497364 38 BD 05 38 */ addi r5, r29, 0x538 -/* 80497368 38 C0 00 00 */ li r6, 0 -/* 8049736C 3D 00 80 4A */ lis r8, lit_3763@ha /* 0x804981D0@ha */ -/* 80497370 C0 28 81 D0 */ lfs f1, lit_3763@l(r8) /* 0x804981D0@l */ -/* 80497374 FC 40 08 90 */ fmr f2, f1 -/* 80497378 3D 00 80 4A */ lis r8, lit_4021@ha /* 0x804981D4@ha */ -/* 8049737C C0 68 81 D4 */ lfs f3, lit_4021@l(r8) /* 0x804981D4@l */ -/* 80497380 FC 80 18 90 */ fmr f4, f3 -/* 80497384 39 00 00 00 */ li r8, 0 -/* 80497388 4B E1 45 FD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8049738C 48 00 00 58 */ b lbl_804973E4 -lbl_80497390: -/* 80497390 88 1D 04 E2 */ lbz r0, 0x4e2(r29) -/* 80497394 7C 03 07 74 */ extsb r3, r0 -/* 80497398 4B B9 5C D5 */ bl dComIfGp_getReverb__Fi -/* 8049739C 7C 67 1B 78 */ mr r7, r3 -/* 804973A0 3C 60 00 08 */ lis r3, 0x0008 /* 0x00080020@ha */ -/* 804973A4 38 03 00 20 */ addi r0, r3, 0x0020 /* 0x00080020@l */ -/* 804973A8 90 01 00 08 */ stw r0, 8(r1) -/* 804973AC 3C 60 80 45 */ lis r3, mAudioMgrPtr__10Z2AudioMgr@ha /* 0x80451368@ha */ -/* 804973B0 38 63 13 68 */ addi r3, r3, mAudioMgrPtr__10Z2AudioMgr@l /* 0x80451368@l */ -/* 804973B4 80 63 00 00 */ lwz r3, 0(r3) -/* 804973B8 38 81 00 08 */ addi r4, r1, 8 -/* 804973BC 38 BD 05 38 */ addi r5, r29, 0x538 -/* 804973C0 38 C0 00 00 */ li r6, 0 -/* 804973C4 3D 00 80 4A */ lis r8, lit_3763@ha /* 0x804981D0@ha */ -/* 804973C8 C0 28 81 D0 */ lfs f1, lit_3763@l(r8) /* 0x804981D0@l */ -/* 804973CC FC 40 08 90 */ fmr f2, f1 -/* 804973D0 3D 00 80 4A */ lis r8, lit_4021@ha /* 0x804981D4@ha */ -/* 804973D4 C0 68 81 D4 */ lfs f3, lit_4021@l(r8) /* 0x804981D4@l */ -/* 804973D8 FC 80 18 90 */ fmr f4, f3 -/* 804973DC 39 00 00 00 */ li r8, 0 -/* 804973E0 4B E1 45 A5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -lbl_804973E4: -/* 804973E4 7F A3 EB 78 */ mr r3, r29 -/* 804973E8 48 00 00 91 */ bl openInit__9daTbox2_cFv -lbl_804973EC: -/* 804973EC 2C 1F 00 02 */ cmpwi r31, 2 -/* 804973F0 41 82 00 6C */ beq lbl_8049745C -/* 804973F4 40 80 00 10 */ bge lbl_80497404 -/* 804973F8 2C 1F 00 01 */ cmpwi r31, 1 -/* 804973FC 40 80 00 14 */ bge lbl_80497410 -/* 80497400 48 00 00 50 */ b lbl_80497450 -lbl_80497404: -/* 80497404 2C 1F 00 04 */ cmpwi r31, 4 -/* 80497408 40 80 00 48 */ bge lbl_80497450 -/* 8049740C 48 00 00 24 */ b lbl_80497430 -lbl_80497410: -/* 80497410 80 7D 07 28 */ lwz r3, 0x728(r29) -/* 80497414 4B B7 60 15 */ bl play__14mDoExt_baseAnmFv -/* 80497418 2C 03 00 00 */ cmpwi r3, 0 -/* 8049741C 41 82 00 40 */ beq lbl_8049745C -/* 80497420 7F C3 F3 78 */ mr r3, r30 -/* 80497424 80 9D 0A C4 */ lwz r4, 0xac4(r29) -/* 80497428 4B BB 0D 55 */ bl cutEnd__16dEvent_manager_cFi -/* 8049742C 48 00 00 30 */ b lbl_8049745C -lbl_80497430: -/* 80497430 80 7D 07 28 */ lwz r3, 0x728(r29) -/* 80497434 4B B7 5F F5 */ bl play__14mDoExt_baseAnmFv -/* 80497438 2C 03 00 00 */ cmpwi r3, 0 -/* 8049743C 41 82 00 20 */ beq lbl_8049745C -/* 80497440 7F C3 F3 78 */ mr r3, r30 -/* 80497444 80 9D 0A C4 */ lwz r4, 0xac4(r29) -/* 80497448 4B BB 0D 35 */ bl cutEnd__16dEvent_manager_cFi -/* 8049744C 48 00 00 10 */ b lbl_8049745C -lbl_80497450: -/* 80497450 7F C3 F3 78 */ mr r3, r30 -/* 80497454 80 9D 0A C4 */ lwz r4, 0xac4(r29) -/* 80497458 4B BB 0D 25 */ bl cutEnd__16dEvent_manager_cFi -lbl_8049745C: -/* 8049745C 38 60 00 00 */ li r3, 0 -/* 80497460 39 61 00 30 */ addi r11, r1, 0x30 -/* 80497464 4B EC AD C5 */ bl _restgpr_29 -/* 80497468 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8049746C 7C 08 03 A6 */ mtlr r0 -/* 80497470 38 21 00 30 */ addi r1, r1, 0x30 -/* 80497474 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/func_80498148.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/func_80498148.s deleted file mode 100644 index 682d2ed03e..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/func_80498148.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80498148: -/* 80498148 38 63 FF DC */ addi r3, r3, -36 -/* 8049814C 4B FF EF A4 */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/func_80498150.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/func_80498150.s deleted file mode 100644 index f329a1970c..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/func_80498150.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80498150: -/* 80498150 38 63 FF EC */ addi r3, r3, -20 -/* 80498154 4B FF EF 9C */ b __dt__12dBgS_ObjAcchFv diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/initBaseMtx__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/initBaseMtx__9daTbox2_cFv.s deleted file mode 100644 index 68dd51b913..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/initBaseMtx__9daTbox2_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80496A18: -/* 80496A18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80496A1C 7C 08 02 A6 */ mflr r0 -/* 80496A20 90 01 00 14 */ stw r0, 0x14(r1) -/* 80496A24 80 83 07 24 */ lwz r4, 0x724(r3) -/* 80496A28 C0 03 04 EC */ lfs f0, 0x4ec(r3) -/* 80496A2C D0 04 00 18 */ stfs f0, 0x18(r4) -/* 80496A30 C0 03 04 F0 */ lfs f0, 0x4f0(r3) -/* 80496A34 D0 04 00 1C */ stfs f0, 0x1c(r4) -/* 80496A38 C0 03 04 F4 */ lfs f0, 0x4f4(r3) -/* 80496A3C D0 04 00 20 */ stfs f0, 0x20(r4) -/* 80496A40 48 00 00 15 */ bl setBaseMtx__9daTbox2_cFv -/* 80496A44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80496A48 7C 08 03 A6 */ mtlr r0 -/* 80496A4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80496A50 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionNotOpenDemo__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionNotOpenDemo__9daTbox2_cFv.s deleted file mode 100644 index ad44adce17..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionNotOpenDemo__9daTbox2_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_804978D8: -/* 804978D8 38 00 00 02 */ li r0, 2 -/* 804978DC 98 03 0A BD */ stb r0, 0xabd(r3) -/* 804978E0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionOpenDemo__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionOpenDemo__9daTbox2_cFv.s deleted file mode 100644 index 655a658c65..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionOpenDemo__9daTbox2_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8049794C: -/* 8049794C 38 00 00 01 */ li r0, 1 -/* 80497950 98 03 0A BD */ stb r0, 0xabd(r3) -/* 80497954 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionOpenWait__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionOpenWait__9daTbox2_cFv.s deleted file mode 100644 index e569e9747a..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionOpenWait__9daTbox2_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80497A0C: -/* 80497A0C 38 00 00 00 */ li r0, 0 -/* 80497A10 98 03 0A BD */ stb r0, 0xabd(r3) -/* 80497A14 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionWait__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionWait__9daTbox2_cFv.s deleted file mode 100644 index f414fe1167..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionWait__9daTbox2_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_804978C8: -/* 804978C8 38 00 00 03 */ li r0, 3 -/* 804978CC 98 03 0A BD */ stb r0, 0xabd(r3) -/* 804978D0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_exec__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_exec__9daTbox2_cFv.s deleted file mode 100644 index c49a20c8fb..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_exec__9daTbox2_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80497790: -/* 80497790 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80497794 7C 08 02 A6 */ mflr r0 -/* 80497798 90 01 00 14 */ stw r0, 0x14(r1) -/* 8049779C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 804977A0 7C 7F 1B 78 */ mr r31, r3 -/* 804977A4 48 00 00 69 */ bl action__9daTbox2_cFv -/* 804977A8 7F E3 FB 78 */ mr r3, r31 -/* 804977AC 38 80 00 00 */ li r4, 0 -/* 804977B0 4B B8 2F 1D */ bl fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz -/* 804977B4 38 7F 07 2C */ addi r3, r31, 0x72c -/* 804977B8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804977BC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804977C0 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 804977C4 4B BD F2 E9 */ bl CrrPos__9dBgS_AcchFR4dBgS -/* 804977C8 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 804977CC D0 1F 05 50 */ stfs f0, 0x550(r31) -/* 804977D0 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 804977D4 D0 1F 05 54 */ stfs f0, 0x554(r31) -/* 804977D8 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 804977DC D0 1F 05 58 */ stfs f0, 0x558(r31) -/* 804977E0 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 804977E4 D0 1F 05 38 */ stfs f0, 0x538(r31) -/* 804977E8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 804977EC D0 1F 05 3C */ stfs f0, 0x53c(r31) -/* 804977F0 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 804977F4 D0 1F 05 40 */ stfs f0, 0x540(r31) -/* 804977F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804977FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80497800 7C 08 03 A6 */ mtlr r0 -/* 80497804 38 21 00 10 */ addi r1, r1, 0x10 -/* 80497808 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_exec_wait__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_exec_wait__9daTbox2_cFv.s deleted file mode 100644 index dda5271699..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_exec_wait__9daTbox2_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_80497678: -/* 80497678 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8049767C 7C 08 02 A6 */ mflr r0 -/* 80497680 90 01 00 34 */ stw r0, 0x34(r1) -/* 80497684 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80497688 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8049768C 7C 7F 1B 78 */ mr r31, r3 -/* 80497690 3B C0 00 00 */ li r30, 0 -/* 80497694 38 00 00 01 */ li r0, 1 -/* 80497698 98 03 0A BF */ stb r0, 0xabf(r3) -/* 8049769C C0 43 04 A8 */ lfs f2, 0x4a8(r3) -/* 804976A0 D0 41 00 14 */ stfs f2, 0x14(r1) -/* 804976A4 C0 23 04 AC */ lfs f1, 0x4ac(r3) -/* 804976A8 D0 21 00 18 */ stfs f1, 0x18(r1) -/* 804976AC C0 03 04 B0 */ lfs f0, 0x4b0(r3) -/* 804976B0 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 804976B4 D0 41 00 08 */ stfs f2, 8(r1) -/* 804976B8 D0 21 00 0C */ stfs f1, 0xc(r1) -/* 804976BC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 804976C0 3C 60 80 4A */ lis r3, lit_3717@ha /* 0x804981C8@ha */ -/* 804976C4 C0 03 81 C8 */ lfs f0, lit_3717@l(r3) /* 0x804981C8@l */ -/* 804976C8 EC 01 00 2A */ fadds f0, f1, f0 -/* 804976CC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 804976D0 3C 60 80 4A */ lis r3, lit_3718@ha /* 0x804981CC@ha */ -/* 804976D4 C0 03 81 CC */ lfs f0, lit_3718@l(r3) /* 0x804981CC@l */ -/* 804976D8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 804976DC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 804976E0 38 61 00 14 */ addi r3, r1, 0x14 -/* 804976E4 38 81 00 08 */ addi r4, r1, 8 -/* 804976E8 7F E5 FB 78 */ mr r5, r31 -/* 804976EC 4B B8 65 7D */ bl lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c -/* 804976F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 804976F4 41 82 00 64 */ beq lbl_80497758 -/* 804976F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804976FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80497700 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80497704 3C 80 80 3F */ lis r4, mLineCheck__11fopAcM_lc_c@ha /* 0x803F1C48@ha */ -/* 80497708 38 84 1C 48 */ addi r4, r4, mLineCheck__11fopAcM_lc_c@l /* 0x803F1C48@l */ -/* 8049770C 38 84 00 14 */ addi r4, r4, 0x14 -/* 80497710 4B BD D3 AD */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo -/* 80497714 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80497718 41 82 00 40 */ beq lbl_80497758 -/* 8049771C 3B C0 00 01 */ li r30, 1 -/* 80497720 3C 60 80 3F */ lis r3, mLineCheck__11fopAcM_lc_c@ha /* 0x803F1C48@ha */ -/* 80497724 38 63 1C 48 */ addi r3, r3, mLineCheck__11fopAcM_lc_c@l /* 0x803F1C48@l */ -/* 80497728 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 8049772C D0 1F 04 A8 */ stfs f0, 0x4a8(r31) -/* 80497730 C0 03 00 34 */ lfs f0, 0x34(r3) -/* 80497734 D0 1F 04 AC */ stfs f0, 0x4ac(r31) -/* 80497738 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 8049773C D0 1F 04 B0 */ stfs f0, 0x4b0(r31) -/* 80497740 C0 1F 04 A8 */ lfs f0, 0x4a8(r31) -/* 80497744 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) -/* 80497748 C0 1F 04 AC */ lfs f0, 0x4ac(r31) -/* 8049774C D0 1F 04 D4 */ stfs f0, 0x4d4(r31) -/* 80497750 C0 1F 04 B0 */ lfs f0, 0x4b0(r31) -/* 80497754 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) -lbl_80497758: -/* 80497758 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 8049775C 41 82 00 1C */ beq lbl_80497778 -/* 80497760 38 00 00 00 */ li r0, 0 -/* 80497764 98 1F 0A BF */ stb r0, 0xabf(r31) -/* 80497768 38 00 00 01 */ li r0, 1 -/* 8049776C 98 1F 0A BE */ stb r0, 0xabe(r31) -/* 80497770 7F E3 FB 78 */ mr r3, r31 -/* 80497774 48 00 00 1D */ bl mode_exec__9daTbox2_cFv -lbl_80497778: -/* 80497778 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8049777C 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80497780 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80497784 7C 08 03 A6 */ mtlr r0 -/* 80497788 38 21 00 30 */ addi r1, r1, 0x30 -/* 8049778C 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_proc_call__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_proc_call__9daTbox2_cFv.s deleted file mode 100644 index bd5d51a514..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_proc_call__9daTbox2_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_804975EC: -/* 804975EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 804975F0 7C 08 02 A6 */ mflr r0 -/* 804975F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 804975F8 3C 80 80 4A */ lis r4, cNullVec__6Z2Calc@ha /* 0x8049825C@ha */ -/* 804975FC 38 E4 82 5C */ addi r7, r4, cNullVec__6Z2Calc@l /* 0x8049825C@l */ -/* 80497600 3C 80 80 4A */ lis r4, struct_80498480+0x0@ha /* 0x80498480@ha */ -/* 80497604 38 C4 84 80 */ addi r6, r4, struct_80498480+0x0@l /* 0x80498480@l */ -/* 80497608 88 06 00 00 */ lbz r0, 0(r6) -/* 8049760C 7C 00 07 75 */ extsb. r0, r0 -/* 80497610 40 82 00 40 */ bne lbl_80497650 -/* 80497614 80 87 00 7C */ lwz r4, 0x7c(r7) -/* 80497618 80 07 00 80 */ lwz r0, 0x80(r7) -/* 8049761C 90 87 00 94 */ stw r4, 0x94(r7) -/* 80497620 90 07 00 98 */ stw r0, 0x98(r7) -/* 80497624 80 07 00 84 */ lwz r0, 0x84(r7) -/* 80497628 90 07 00 9C */ stw r0, 0x9c(r7) -/* 8049762C 38 A7 00 94 */ addi r5, r7, 0x94 -/* 80497630 80 87 00 88 */ lwz r4, 0x88(r7) -/* 80497634 80 07 00 8C */ lwz r0, 0x8c(r7) -/* 80497638 90 85 00 0C */ stw r4, 0xc(r5) -/* 8049763C 90 05 00 10 */ stw r0, 0x10(r5) -/* 80497640 80 07 00 90 */ lwz r0, 0x90(r7) -/* 80497644 90 05 00 14 */ stw r0, 0x14(r5) -/* 80497648 38 00 00 01 */ li r0, 1 -/* 8049764C 98 06 00 00 */ stb r0, 0(r6) -lbl_80497650: -/* 80497650 88 03 0A BE */ lbz r0, 0xabe(r3) -/* 80497654 1C 00 00 0C */ mulli r0, r0, 0xc -/* 80497658 39 87 00 94 */ addi r12, r7, 0x94 -/* 8049765C 7D 8C 02 14 */ add r12, r12, r0 -/* 80497660 4B EC AA 25 */ bl __ptmf_scall -/* 80497664 60 00 00 00 */ nop -/* 80497668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8049766C 7C 08 03 A6 */ mtlr r0 -/* 80497670 38 21 00 10 */ addi r1, r1, 0x10 -/* 80497674 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/openInit__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/openInit__9daTbox2_cFv.s deleted file mode 100644 index 7e7462cc4c..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/openInit__9daTbox2_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80497478: -/* 80497478 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8049747C 7C 08 02 A6 */ mflr r0 -/* 80497480 90 01 00 14 */ stw r0, 0x14(r1) -/* 80497484 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80497488 7C 7F 1B 78 */ mr r31, r3 -/* 8049748C 88 03 07 18 */ lbz r0, 0x718(r3) -/* 80497490 28 00 00 00 */ cmplwi r0, 0 -/* 80497494 40 82 00 48 */ bne lbl_804974DC -/* 80497498 80 9F 05 68 */ lwz r4, 0x568(r31) -/* 8049749C 28 04 00 00 */ cmplwi r4, 0 -/* 804974A0 41 82 00 14 */ beq lbl_804974B4 -/* 804974A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804974A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804974AC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 804974B0 4B BD CD A1 */ bl Release__4cBgSFP9dBgW_Base -lbl_804974B4: -/* 804974B4 80 9F 0A C8 */ lwz r4, 0xac8(r31) -/* 804974B8 28 04 00 00 */ cmplwi r4, 0 -/* 804974BC 41 82 00 20 */ beq lbl_804974DC -/* 804974C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 804974C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 804974C8 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 804974CC 7F E5 FB 78 */ mr r5, r31 -/* 804974D0 4B BD D5 39 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c -/* 804974D4 80 7F 0A C8 */ lwz r3, 0xac8(r31) -/* 804974D8 4B BE 44 E9 */ bl Move__4dBgWFv -lbl_804974DC: -/* 804974DC 3C 60 80 4A */ lis r3, lit_3763@ha /* 0x804981D0@ha */ -/* 804974E0 C0 03 81 D0 */ lfs f0, lit_3763@l(r3) /* 0x804981D0@l */ -/* 804974E4 80 7F 07 28 */ lwz r3, 0x728(r31) -/* 804974E8 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 804974EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 804974F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 804974F4 7C 08 03 A6 */ mtlr r0 -/* 804974F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 804974FC 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/setBaseMtx__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/setBaseMtx__9daTbox2_cFv.s deleted file mode 100644 index 03f39bd54a..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/setBaseMtx__9daTbox2_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80496A54: -/* 80496A54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80496A58 7C 08 02 A6 */ mflr r0 -/* 80496A5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80496A60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80496A64 7C 7F 1B 78 */ mr r31, r3 -/* 80496A68 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80496A6C 4B B7 62 F9 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 80496A70 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80496A74 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80496A78 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80496A7C 4B B7 59 B9 */ bl mDoMtx_YrotM__FPA4_fs -/* 80496A80 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80496A84 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80496A88 80 9F 07 24 */ lwz r4, 0x724(r31) -/* 80496A8C 38 84 00 24 */ addi r4, r4, 0x24 -/* 80496A90 4B EA FA 21 */ bl PSMTXCopy -/* 80496A94 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 80496A98 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80496A9C 38 9F 05 6C */ addi r4, r31, 0x56c -/* 80496AA0 4B EA FA 11 */ bl PSMTXCopy -/* 80496AA4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80496AA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80496AAC 7C 08 03 A6 */ mtlr r0 -/* 80496AB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80496AB4 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/setGetDemoItem__9daTbox2_cFv.s b/asm/rel/d/a/d_a_tbox2/d_a_tbox2/setGetDemoItem__9daTbox2_cFv.s deleted file mode 100644 index d63a791c25..0000000000 --- a/asm/rel/d/a/d_a_tbox2/d_a_tbox2/setGetDemoItem__9daTbox2_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80497BD0: -/* 80497BD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80497BD4 7C 08 02 A6 */ mflr r0 -/* 80497BD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80497BDC 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80497BE0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80497BE4 88 03 07 18 */ lbz r0, 0x718(r3) -/* 80497BE8 28 00 00 00 */ cmplwi r0, 0 -/* 80497BEC 41 82 00 28 */ beq lbl_80497C14 -/* 80497BF0 38 63 04 D0 */ addi r3, r3, 0x4d0 -/* 80497BF4 38 A0 00 01 */ li r5, 1 -/* 80497BF8 38 C0 FF FF */ li r6, -1 -/* 80497BFC 38 E0 FF FF */ li r7, -1 -/* 80497C00 39 00 00 00 */ li r8, 0 -/* 80497C04 39 20 00 00 */ li r9, 0 -/* 80497C08 4B B8 3F E1 */ bl fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz -/* 80497C0C 7C 64 1B 78 */ mr r4, r3 -/* 80497C10 48 00 00 20 */ b lbl_80497C30 -lbl_80497C14: -/* 80497C14 38 63 04 D0 */ addi r3, r3, 0x4d0 -/* 80497C18 38 A0 FF FF */ li r5, -1 -/* 80497C1C 38 C0 FF FF */ li r6, -1 -/* 80497C20 38 E0 00 00 */ li r7, 0 -/* 80497C24 39 00 00 00 */ li r8, 0 -/* 80497C28 4B B8 40 4D */ bl fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz -/* 80497C2C 7C 64 1B 78 */ mr r4, r3 -lbl_80497C30: -/* 80497C30 3C 04 00 01 */ addis r0, r4, 1 -/* 80497C34 28 00 FF FF */ cmplwi r0, 0xffff -/* 80497C38 41 82 00 14 */ beq lbl_80497C4C -/* 80497C3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80497C40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80497C44 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80497C48 4B BA BA A5 */ bl setPtI_Id__14dEvt_control_cFUi -lbl_80497C4C: -/* 80497C4C 38 60 00 01 */ li r3, 1 -/* 80497C50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80497C54 7C 08 03 A6 */ mtlr r0 -/* 80497C58 38 21 00 10 */ addi r1, r1, 0x10 -/* 80497C5C 4E 80 00 20 */ blr diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index f7e9c2a39c..ece097add4 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -28,12 +28,16 @@ #define JUT_LOG(LINE, ...) \ JUTAssertion::setLogMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__) +#define JUT_CONFIRM(LINE, COND) \ + JUTAssertion::setConfirmMessage(JUTAssertion::getSDevice(), __FILE__, LINE, COND, #COND) + #else #define JUT_ASSERT(...) #define JUT_ASSERT_REPORT(...) #define JUT_PANIC(...) #define JUT_WARN(...) #define JUT_LOG(...) +#define JUT_CONFIRM(...) #endif namespace JUTAssertion { diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index cf90f4d371..8541be8984 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -1813,7 +1813,7 @@ public: /* 800DC474 */ int procCoSwimFreezeReturn(); /* 800DC548 */ static BOOL checkEnemyGroup(fopAc_ac_c*); /* 800DC5A4 */ static BOOL checkSpecialNpc(fopAc_ac_c*); - /* 800DC5DC */ bool checkShieldAttackEmphasys(); + /* 800DC5DC */ BOOL checkShieldAttackEmphasys(); /* 800DC678 */ BOOL checkGuardActionChange(); /* 800DC79C */ void stickArrowIncrement(int); /* 800DC8C4 */ void setArrowShieldActor(fopAc_ac_c*, int); @@ -3262,7 +3262,7 @@ public: var_r5 = 0; if (mItemAcKeep.getActor() != NULL && - mItemAcKeep.getActor()->mEvtInfo.i_checkCommandDemoAccrpt() != 0) { + mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt() != 0) { var_r5 = 1; } @@ -3559,7 +3559,7 @@ private: /* 0x02854 */ daPy_actorKeep_c mCargoCarryAcKeep; /* 0x0285C */ daPy_actorKeep_c field_0x285c; /* 0x02864 */ dMsgFlow_c mMsgFlow; - /* 0x028B0 */ int field_0x28b0[0x10]; + /* 0x028B0 */ unsigned int mShieldArrowIDs[16]; /* 0x028F0 */ unsigned int mMsgClassID; /* 0x028F4 */ int mAtnActorID; /* 0x028F8 */ int field_0x28f8; diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h index 1001fc4ee3..72a7df4e6e 100644 --- a/include/d/a/d_a_npc.h +++ b/include/d/a/d_a_npc.h @@ -259,7 +259,7 @@ public: /* 0xD90 */ u32 field_0xd90; /* 0xD94 */ u32 field_0xd94; /* 0xD98 */ u32 field_0xd98; - /* 0xD9C */ profile_method_class* mSubMtd; + /* 0xD9C */ profile_method_class* sub_method; /* 0xDA0 */ u8 field_0xda0[8]; /* 0xDA8 */ u32 field_0xda8; /* 0xDAC */ int field_0xdac; @@ -640,13 +640,13 @@ public: /* 80155BCC */ virtual void drawOtherMdls(); BOOL chkActorInSpeakArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) { - return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[3]); + return chkActorInAttnArea(i_actorCheck, i_actorArea, attention_info.field_0x0[3]); } BOOL chkPlayerInSpeakArea(fopAc_ac_c* i_actor) { return chkActorInSpeakArea(daPy_getPlayerActorClass(), i_actor); } BOOL chkActorInTalkArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) { - return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[1]); + return chkActorInAttnArea(i_actorCheck, i_actorArea, attention_info.field_0x0[1]); } BOOL chkPlayerInTalkArea(fopAc_ac_c* i_actor) { return chkActorInTalkArea(daPy_getPlayerActorClass(), i_actor); diff --git a/include/d/d_item.h b/include/d/d_item.h index fc8a203535..0451fb2665 100644 --- a/include/d/d_item.h +++ b/include/d/d_item.h @@ -396,5 +396,6 @@ int isBomb(u8); int isArrow(u8); int addBombCount(u8, u8); BOOL isBottleItem(u8 item_no); +u8 check_itemno(int i_itemNo); #endif /* D_D_ITEM_H */ diff --git a/include/dolphin/os.h b/include/dolphin/os.h index ff73f5dbc1..b320ec27b1 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -99,6 +99,7 @@ void OSReportInit(void); #define ASSERTMSG(exp, msg) (void)((exp) || (OSPanic(__FILE__, __LINE__, (msg)), 0)) #else #define OS_REPORT(...) +#define OS_REPORT_ERROR(...) #define OS_PANIC(...) #define ASSERTMSG(exp, msg) ((void)0) #endif diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index bde1fcc29e..fe7ff9db7c 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -13,10 +13,10 @@ struct actor_method_class { struct actor_process_profile_definition { /* 0x00 */ leaf_process_profile_definition mBase; - /* 0x24 */ actor_method_class* mSubMtd; - /* 0x28 */ u32 mStatus; + /* 0x24 */ actor_method_class* sub_method; + /* 0x28 */ u32 status; /* 0x2C */ u8 mActorType; - /* 0x2D */ u8 mCullType; + /* 0x2D */ u8 cullType; }; // Unclear what this is. Only appears in 4 profiles (BG,DSHUTTER,PATH,SCENE_EXIT) @@ -156,8 +156,6 @@ public: }; // Size = 0x18 struct actor_place { - /* 807E2468 */ // void operator=(actor_place const&); - /* 0x00 */ cXyz pos; /* 0x0C */ csXyz angle; /* 0x12 */ s8 roomNo; @@ -165,65 +163,63 @@ struct actor_place { }; struct actor_attention_types { - void setFlag(u32 flags) { mFlags |= flags; } - /* 0x00 */ u8 field_0x0[9]; /* 0x0A */ s16 field_0xa; - /* 0x0C */ cXyz mPosition; - /* 0x18 */ u32 mFlags; + /* 0x0C */ cXyz position; + /* 0x18 */ u32 flags; }; // Size = 0x1C class dJntCol_c; struct cull_sphere { - /* 0x0 */ Vec mCenter; - /* 0xC */ f32 mRadius; + /* 0x0 */ Vec center; + /* 0xC */ f32 radius; }; struct cull_box { - /* 0x0 */ Vec mMin; - /* 0xC */ Vec mMax; + /* 0x0 */ Vec min; + /* 0xC */ Vec max; }; class fopAc_ac_c : public leafdraw_class { public: - /* 0x0C0 */ int mAcType; - /* 0x0C4 */ create_tag_class mAcTg; - /* 0x0D8 */ create_tag_class mDwTg; - /* 0x0EC */ profile_method_class* mSubMtd; - /* 0x0F0 */ JKRSolidHeap* mHeap; - /* 0x0F4 */ dEvt_info_c mEvtInfo; - /* 0x10C */ dKy_tevstr_c mTevStr; - /* 0x494 */ u16 mSetID; - /* 0x496 */ u8 mGroup; - /* 0x497 */ s8 mCullType; - /* 0x498 */ u8 mDemoActorId; - /* 0x499 */ s8 mSubtype; - /* 0x49A */ u8 mCarryType; - /* 0x49C */ u32 mStatus; - /* 0x4A0 */ u32 mCondition; - /* 0x4A4 */ u32 mParentPcId; - /* 0x4A8 */ actor_place orig; - /* 0x4BC */ actor_place next; + /* 0x0C0 */ int actor_type; + /* 0x0C4 */ create_tag_class actor_tag; + /* 0x0D8 */ create_tag_class draw_tag; + /* 0x0EC */ profile_method_class* sub_method; + /* 0x0F0 */ JKRSolidHeap* heap; + /* 0x0F4 */ dEvt_info_c eventInfo; + /* 0x10C */ dKy_tevstr_c tevStr; + /* 0x494 */ u16 setID; + /* 0x496 */ u8 group; + /* 0x497 */ u8 cullType; + /* 0x498 */ u8 demoActorID; + /* 0x499 */ s8 subtype; + /* 0x49A */ u8 carryType; + /* 0x49C */ u32 actor_status; + /* 0x4A0 */ u32 actor_condition; + /* 0x4A4 */ u32 parentActorID; + /* 0x4A8 */ actor_place home; + /* 0x4BC */ actor_place old; /* 0x4D0 */ actor_place current; /* 0x4E4 */ csXyz shape_angle; - /* 0x4EC */ cXyz mScale; + /* 0x4EC */ cXyz scale; /* 0x4F8 */ cXyz speed; - /* 0x504 */ MtxP mCullMtx; + /* 0x504 */ MtxP cullMtx; union { - /* 0x508 */ cull_box mBox; - /* 0x508 */ cull_sphere mSphere; - } mCull; - /* 0x520 */ f32 mCullSizeFar; + /* 0x508 */ cull_box box; + /* 0x508 */ cull_sphere sphere; + } cull; + /* 0x520 */ f32 cullSizeFar; /* 0x524 */ J3DModel* model; - /* 0x528 */ dJntCol_c* mJntCol; + /* 0x528 */ dJntCol_c* jntCol; /* 0x52C */ f32 speedF; - /* 0x530 */ f32 mGravity; - /* 0x534 */ f32 mMaxFallSpeed; - /* 0x538 */ cXyz mEyePos; - /* 0x544 */ actor_attention_types mAttentionInfo; + /* 0x530 */ f32 gravity; + /* 0x534 */ f32 maxFallSpeed; + /* 0x538 */ cXyz eyePos; + /* 0x544 */ actor_attention_types attention_info; /* 0x560 */ s16 field_0x560; - /* 0x562 */ s16 mHealth; + /* 0x562 */ s16 health; /* 0x564 */ u8 field_0x564; /* 0x565 */ u8 field_0x565; /* 0x566 */ u8 field_0x566; @@ -233,10 +229,6 @@ public: ~fopAc_ac_c(); static u32 stopStatus; - - const cXyz& getPosition() const { return current.pos; } - const csXyz& getAngle() const { return current.angle; } - s8 getRoomNo() const { return current.roomNo; } }; // Size: 0x568 STATIC_ASSERT(sizeof(fopAc_ac_c) == 0x568); diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 9099b6883b..1f786ac2d0 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -141,15 +141,15 @@ inline s16 fopAcM_GetName(void* pActor) { } inline MtxP fopAcM_GetMtx(const fopAc_ac_c* pActor) { - return pActor->mCullMtx; + return pActor->cullMtx; } -inline u32 fopAcM_checkStatus(fopAc_ac_c* pActor, u32 status) { - return pActor->mStatus & status; +inline u32 fopAcM_checkStatus(fopAc_ac_c* pActor, u32 actor_status) { + return pActor->actor_status & actor_status; } inline u32 fopAcM_checkCarryNow(fopAc_ac_c* pActor) { - return pActor->mStatus & 0x2000; + return pActor->actor_status & 0x2000; } enum fopAcM_CARRY { @@ -163,7 +163,7 @@ enum fopAcM_CARRY { }; inline u32 fopAcM_CheckCarryType(fopAc_ac_c* actor, fopAcM_CARRY type) { - return actor->mCarryType & type; + return actor->carryType & type; } inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) { @@ -183,7 +183,7 @@ inline void fopAcM_SetParam(void* p_actor, u32 param) { } inline void fopAcM_SetJntCol(fopAc_ac_c* i_actorP, dJntCol_c* i_jntColP) { - i_actorP->mJntCol = i_jntColP; + i_actorP->jntCol = i_jntColP; } inline s16 fopAcM_GetProfName(const void* pActor) { @@ -191,15 +191,15 @@ inline s16 fopAcM_GetProfName(const void* pActor) { } inline u8 fopAcM_GetGroup(const fopAc_ac_c* p_actor) { - return p_actor->mGroup; + return p_actor->group; } inline void fopAcM_OnStatus(fopAc_ac_c* pActor, u32 flag) { - pActor->mStatus |= flag; + pActor->actor_status |= flag; } inline void fopAcM_OffStatus(fopAc_ac_c* pActor, u32 flag) { - pActor->mStatus &= ~flag; + pActor->actor_status &= ~flag; } inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc func, void* param) { @@ -210,40 +210,40 @@ inline fopAc_ac_c* fopAcM_SearchByID(unsigned int id) { return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id); } -inline cXyz& fopAcM_GetPosition_p(fopAc_ac_c* pActor) { - return pActor->current.pos; +inline cXyz* fopAcM_GetPosition_p(fopAc_ac_c* pActor) { + return &pActor->current.pos; } inline cXyz& fopAcM_GetPosition(fopAc_ac_c* pActor) { return pActor->current.pos; } -inline cXyz& fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) { - return pActor->next.pos; +inline cXyz* fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) { + return &pActor->old.pos; } -inline cXyz& fopAcM_GetSpeed_p(fopAc_ac_c* pActor) { - return pActor->speed; +inline cXyz* fopAcM_GetSpeed_p(fopAc_ac_c* pActor) { + return &pActor->speed; } -inline csXyz& fopAcM_GetAngle_p(fopAc_ac_c* pActor) { - return pActor->current.angle; +inline csXyz* fopAcM_GetAngle_p(fopAc_ac_c* pActor) { + return &pActor->current.angle; } -inline csXyz& fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) { - return pActor->shape_angle; +inline csXyz* fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) { + return &pActor->shape_angle; } inline bool fopAcM_CheckCondition(fopAc_ac_c* p_actor, u32 flag) { - return p_actor->mCondition & flag; + return p_actor->actor_condition & flag; } inline void fopAcM_OnCondition(fopAc_ac_c* p_actor, u32 flag) { - p_actor->mCondition |= flag; + p_actor->actor_condition |= flag; } inline void fopAcM_OffCondition(fopAc_ac_c* p_actor, u32 flag) { - p_actor->mCondition &= ~flag; + p_actor->actor_condition &= ~flag; } inline BOOL fopAcM_IsActor(void* actor) { @@ -263,19 +263,19 @@ inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) { } inline s8 fopAcM_GetHomeRoomNo(const fopAc_ac_c* pActor) { - return pActor->orig.roomNo; + return pActor->home.roomNo; } inline void fopAcM_SetGravity(fopAc_ac_c* actor, f32 gravity) { - actor->mGravity = gravity; + actor->gravity = gravity; } inline void fopAcM_SetMaxFallSpeed(fopAc_ac_c* actor, f32 speed) { - actor->mMaxFallSpeed = speed; + actor->maxFallSpeed = speed; } inline void fopAcM_SetMtx(fopAc_ac_c* actor, MtxP m) { - actor->mCullMtx = m; + actor->cullMtx = m; } inline void fopAcM_SetSpeed(fopAc_ac_c* actor, f32 x, f32 y, f32 z) { @@ -286,8 +286,8 @@ inline void fopAcM_SetSpeedF(fopAc_ac_c* actor, f32 f) { actor->speedF = f; } -inline void fopAcM_SetStatus(fopAc_ac_c* actor, u32 status) { - actor->mStatus = status; +inline void fopAcM_SetStatus(fopAc_ac_c* actor, u32 actor_status) { + actor->actor_status = actor_status; } inline void fopAcM_SetModel(fopAc_ac_c* actor, J3DModel* model) { @@ -307,39 +307,39 @@ inline f32 fopAcM_GetSpeedF(const fopAc_ac_c* p_actor) { } inline f32 fopAcM_GetGravity(const fopAc_ac_c* p_actor) { - return p_actor->mGravity; + return p_actor->gravity; } inline f32 fopAcM_GetMaxFallSpeed(const fopAc_ac_c* p_actor) { - return p_actor->mMaxFallSpeed; + return p_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* p_actor) { + return &p_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* p_actor) { + return &p_actor->current.pos; } inline dJntCol_c* fopAcM_GetJntCol(fopAc_ac_c* i_actor) { - return i_actor->mJntCol; + return i_actor->jntCol; } inline void fopAcM_setCullSizeFar(fopAc_ac_c* i_actor, f32 i_far) { - i_actor->mCullSizeFar = i_far; + i_actor->cullSizeFar = i_far; } inline f32 fopAcM_getCullSizeFar(const fopAc_ac_c* i_actor) { - return i_actor->mCullSizeFar; + return i_actor->cullSizeFar; } inline void fopAcM_SetCullSize(fopAc_ac_c* i_actor, s8 i_cullsize) { - i_actor->mCullType = i_cullsize; + i_actor->cullType = i_cullsize; } inline int fopAcM_GetCullSize(const fopAc_ac_c* i_actor) { - return i_actor->mCullType; + return i_actor->cullType; } inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) { @@ -347,11 +347,11 @@ inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) { } inline Vec fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) { - return i_actor->mCull.mSphere.mCenter; + return i_actor->cull.sphere.center; } inline f32 fopAcM_getCullSizeSphereR(const fopAc_ac_c* i_actor) { - return i_actor->mCull.mSphere.mRadius; + return i_actor->cull.sphere.radius; } inline void dComIfGs_onSwitch(int i_no, int i_roomNo); @@ -390,7 +390,7 @@ inline f32 fopAcM_searchActorDistanceY(const fopAc_ac_c* actorA, const fopAc_ac_ } inline u16 fopAcM_GetSetId(const fopAc_ac_c* p_actor) { - return p_actor->mSetID; + return p_actor->setID; } inline void dComIfGs_onActor(int bitNo, int roomNo); @@ -638,12 +638,12 @@ inline void fopAcM_seStartCurrent(const fopAc_ac_c* actor, u32 sfxID, u32 param_ inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { s8 roomNo = fopAcM_GetRoomNo(actor); - mDoAud_seStart(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo)); + mDoAud_seStart(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo)); } inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { s8 roomNo = fopAcM_GetRoomNo(actor); - i_mDoAud_seStartLevel(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo)); + i_mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo)); } inline void fopAcM_seStartCurrentLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { @@ -656,110 +656,7 @@ inline void fopAcM_offActor(fopAc_ac_c* pActor, u32 flag) { } inline void fopAcM_OnCarryType(fopAc_ac_c* pActor, fopAcM_CARRY param_2) { - pActor->mCarryType |= param_2; -} - -extern "C" { -void fopAcM_initManager__Fv(void); -void fopAcM_CreateAppend__Fv(void); -void fopAcM_DeleteHeap__FP10fopAc_ac_c(void); -void fopAcM_FastCreate__FsPFPv_iPvPv(void); -void fopAcM_Log__FPC10fopAc_ac_cPCc(void); -void fopAcM_SearchByID__FUiPP10fopAc_ac_c(void); -void fopAcM_calcSpeed__FP10fopAc_ac_c(void); -void fopAcM_callCallback__FP10fopAc_ac_cPFP10fopAc_ac_c_iP7JKRHeap(void); -void fopAcM_cancelCarryNow__FP10fopAc_ac_c(void); -void fopAcM_create__FsUsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void); -void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void); -void fopAcM_createDemoItem__FPC4cXyziiPC5csXyziPC4cXyzUc(void); -void fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi(void); -void fopAcM_createItemForDirectGet__FPC4cXyziiPC5csXyzPC4cXyzff(void); -void fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz(void); -void fopAcM_createItemForSimpleDemo__FPC4cXyziiPC5csXyzPC4cXyzff(void); -void fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz(void); -void fopAcM_createItemFromTable__FPC4cXyziiiPC5csXyziPC4cXyzPfPfb(void); -void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(void); -void fopAcM_cullingCheck__FPC10fopAc_ac_c(void); -void fopAcM_delete__FP10fopAc_ac_c(void); -void fopAcM_delete__FUi(void); -void fopAcM_effHamonSet__FPUlPC4cXyzff(void); -void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(void); -void fopAcM_entrySolidHeap___FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(void); -void fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv(void); -void fopAcM_fastCreateItem__FPC4cXyziiPC5csXyzPC4cXyzPfPfiiPFPv_i(void); -void fopAcM_fastCreateItem2__FPC4cXyziiiiPC5csXyzPC4cXyz(void); -void fopAcM_fastCreate__FPCcUlPC4cXyziPC5csXyzPC4cXyzPFPv_iPv(void); -void fopAcM_findObject4EventCB__FP10fopAc_ac_cPv(void); -void fopAcM_findObjectCB__FPC10fopAc_ac_cPv(void); -void gndCheck__11fopAcM_gc_cFPC4cXyz(void); -void fopAcM_getEventPartner__FPC10fopAc_ac_c(void); -void fopAcM_getItemEventPartner__FPC10fopAc_ac_c(void); -void fopAcM_getItemNoFromTableNo__FUc(void); -void fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos(void); -void fopAcM_getPolygonAngle__FPC8cM3dGPlas(void); -void fopAcM_getProcNameString__FPC10fopAc_ac_c(void); -void fopAcM_getTalkEventPartner__FPC10fopAc_ac_c(void); -void fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii(void); -void fopAcM_getWaterY__FPC4cXyzPf(void); -void lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c(void); -void fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void); -void fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs(void); -void fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void); -void fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs(void); -void fopAcM_orderMapToolAutoNextEvent__FP10fopAc_ac_cUcsUsUsUs(void); -void fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs(void); -void fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs(void); -void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(void); -void fopAcM_orderOtherEvent__FP10fopAc_ac_cP10fopAc_ac_cPCcUsUsUs(void); -void fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs(void); -void fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void); -void fopAcM_orderTalkItemBtnEvent__FUsP10fopAc_ac_cP10fopAc_ac_cUsUs(void); -void fopAcM_orderTreasureEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void); -void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz(void); -void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(void); -void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(void); -void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c(void); -void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(void); -void fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c(void); -void fopAcM_searchFromName__FPCcUlUl(void); -void fopAcM_searchFromName4Event__FPCcs(void); -void fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(void); -void fopAcM_setCarryNow__FP10fopAc_ac_ci(void); -void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(void); -void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(void); -void fopAcM_setRoomLayer__FPvi(void); -void fopAcM_setStageLayer__FPv(void); -void waterCheck__11fopAcM_wt_cFPC4cXyz(void); -void fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz(void); -void fopAcM_SearchByName__FsPP10fopAc_ac_c(void); -void fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void); -void fopAcM_SetMin__FP10fopAc_ac_cfff(void); -void fopAcM_SetMax__FP10fopAc_ac_cfff(void); -void fopAcM_setCullSizeSphere__FP10fopAc_ac_cffff(void); -void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(void); -void fopAcM_addAngleY__FP10fopAc_ac_css(void); -void fopAcM_searchActorAngleX__FPC10fopAc_ac_cPC10fopAc_ac_c(void); -void fopAcM_searchActorDistance2__FPC10fopAc_ac_cPC10fopAc_ac_c(void); -void fopAcM_rollPlayerCrash__FPC10fopAc_ac_cfUlffif(void); -void fopAcM_checkCullingBox__FPA4_fffffff(void); -void fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs(void); -void fopAcM_createItemFromEnemyID__FUcPC4cXyziiPC5csXyzPC4cXyzPfPf(void); -void fopAcM_createItemForBoss__FPC4cXyziiPC5csXyzPC4cXyzffi(void); -void fopAcM_createItemForMidBoss__FPC4cXyziiPC5csXyzPC4cXyzii(void); -void fopAcM_createBokkuri__FUsPC4cXyziiiPC4cXyzii(void); -void fopAcM_createWarpHole__FPC4cXyzPC5csXyziUcUcUc(void); -void fopAcM_myRoomSearchEnemy__FSc(void); -void fopAcM_createDisappear__FPC10fopAc_ac_cPC4cXyzUcUcUc(void); -void fopAcM_otoCheck__FPC10fopAc_ac_cf(void); -void fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c(void); -void fopAcM_wayBgCheck__FPC10fopAc_ac_cff(void); -void fopAcM_plAngleCheck__FPC10fopAc_ac_cs(void); -void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void); -void fopAcM_riverStream__FP4cXyzPsPff(void); -void fopAcM_carryOffRevise__FP10fopAc_ac_c(void); -void fopAcM_searchFromName4Event__FPCcs(void); -void fopAcM_GetName__FPv(void); // mostly inlined -void fopAcM_GetID__FPCv(void); // mostly inlined + pActor->carryType |= param_2; } #endif diff --git a/include/f_op/f_op_camera.h b/include/f_op/f_op_camera.h index 9ae93e4b59..fa7cf44858 100644 --- a/include/f_op/f_op_camera.h +++ b/include/f_op/f_op_camera.h @@ -7,7 +7,7 @@ class camera_class; struct camera_process_profile_definition { /* 0x00 */ view_process_profile_definition mBase; - /* 0x3C */ leafdraw_method_class* mSubMtd; // Subclass methods + /* 0x3C */ leafdraw_method_class* sub_method; // Subclass methods }; static s32 fopCam_Draw(camera_class* param_1); diff --git a/include/f_op/f_op_kankyo.h b/include/f_op/f_op_kankyo.h index b903542986..fd58c54f88 100644 --- a/include/f_op/f_op_kankyo.h +++ b/include/f_op/f_op_kankyo.h @@ -7,8 +7,8 @@ class kankyo_class : public leafdraw_class { public: /* 0xC0 */ int mBsType; - /* 0xC4 */ create_tag_class mDwTg; - /* 0xD8 */ leafdraw_method_class* mSubMtd; + /* 0xC4 */ create_tag_class draw_tag; + /* 0xD8 */ leafdraw_method_class* sub_method; /* 0xDC */ cXyz mPos; /* 0xE8 */ cXyz mScale; /* 0xF4 */ u32 mParam; @@ -16,7 +16,7 @@ public: struct kankyo_process_profile_definition { /* 0x00 */ leaf_process_profile_definition base; - /* 0x24 */ leafdraw_method_class* mSubMtd; + /* 0x24 */ leafdraw_method_class* sub_method; }; // Size: 0x28 extern leafdraw_method_class g_fopKy_Method; diff --git a/include/f_op/f_op_msg.h b/include/f_op/f_op_msg.h index f792aaa716..64274bb09a 100644 --- a/include/f_op/f_op_msg.h +++ b/include/f_op/f_op_msg.h @@ -9,8 +9,8 @@ class fopAc_ac_c; class msg_class : public leafdraw_class { public: /* 0xC0 */ int mMsgType; - /* 0xC4 */ create_tag_class mDwTg; - /* 0xD8 */ leafdraw_method_class* mSubMtd; + /* 0xC4 */ create_tag_class draw_tag; + /* 0xD8 */ leafdraw_method_class* sub_method; /* 0xDC */ fopAc_ac_c* mpActor; /* 0xE0 */ cXyz mPos; /* 0xEC */ u32 mMsgID; diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index dd4cc9f39e..8e41c92f4e 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -11,7 +11,7 @@ class msg_class; struct msg_process_profile_definition { /* 0x00 */ leaf_process_profile_definition mBase; - /* 0x24 */ leafdraw_method_class* mSubMtd; // Subclass methods + /* 0x24 */ leafdraw_method_class* sub_method; // Subclass methods }; struct fopMsg_prm_class { diff --git a/include/f_op/f_op_overlap.h b/include/f_op/f_op_overlap.h index bd4930cc27..2f5bf7253f 100644 --- a/include/f_op/f_op_overlap.h +++ b/include/f_op/f_op_overlap.h @@ -12,7 +12,7 @@ public: struct overlap_process_profile_definition { /* 0x00 */ leaf_process_profile_definition base; - /* 0x24 */ leafdraw_method_class* mSubMtd; + /* 0x24 */ leafdraw_method_class* sub_method; }; // Size: 0x28 static s32 fopOvlp_Draw(void* param_1); diff --git a/include/f_op/f_op_view.h b/include/f_op/f_op_view.h index ef51df76b2..71cfb3ed59 100644 --- a/include/f_op/f_op_view.h +++ b/include/f_op/f_op_view.h @@ -7,7 +7,7 @@ struct view_process_profile_definition { /* 0x00 */ leaf_process_profile_definition mBase; - /* 0x24 */ leafdraw_method_class* mSubMtd; // Subclass methods + /* 0x24 */ leafdraw_method_class* sub_method; // Subclass methods /* 0x28 */ u8 unk28; /* 0x29 */ u8 unk29[3]; // pad /* 0x2C */ u32 unk2C; @@ -41,7 +41,7 @@ struct view_port_class { }; struct view_class : public leafdraw_class { - /* 0x0C0 */ leafdraw_method_class* mSubMtd; + /* 0x0C0 */ leafdraw_method_class* sub_method; /* 0x0C4 */ u8 field_0xc4; /* 0x0C8 */ f32 mNear; /* 0x0CC */ f32 mFar; diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h index 0cd8c1fe8b..a348a7e008 100644 --- a/include/f_pc/f_pc_leaf.h +++ b/include/f_pc/f_pc_leaf.h @@ -23,7 +23,7 @@ typedef struct leafdraw_class { typedef struct leaf_process_profile_definition { /* 0x00 */ process_profile_definition mBase; - /* 0x1C */ leafdraw_method_class* mSubMtd; // Subclass methods + /* 0x1C */ leafdraw_method_class* sub_method; // Subclass methods /* 0x20 */ s16 mPriority; // mDrawPriority } leaf_process_profile_definition; diff --git a/include/f_pc/f_pc_node.h b/include/f_pc/f_pc_node.h index c3c8a8c897..4360156bf9 100644 --- a/include/f_pc/f_pc_node.h +++ b/include/f_pc/f_pc_node.h @@ -22,7 +22,7 @@ typedef struct process_node_class { typedef struct node_process_profile_definition { /* 0x00 */ process_profile_definition mBase; - /* 0x1C */ process_method_class* mSubMtd; // Subclass methods + /* 0x1C */ process_method_class* sub_method; // Subclass methods } node_process_profile_definition; s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData); diff --git a/include/f_pc/f_pc_profile.h b/include/f_pc/f_pc_profile.h index 7c3dd68b2a..9418d9f645 100644 --- a/include/f_pc/f_pc_profile.h +++ b/include/f_pc/f_pc_profile.h @@ -13,7 +13,7 @@ typedef struct process_profile_definition { /* 0x04 */ u16 mListID; /* 0x06 */ u16 mListPrio; /* 0x08 */ s16 mProcName; - /* 0x0C */ process_method_class* mSubMtd; // Subclass methods + /* 0x0C */ process_method_class* sub_method; // Subclass methods /* 0x10 */ s32 mSize; /* 0x14 */ s32 mSizeOther; /* 0x18 */ s32 mParameters; diff --git a/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h b/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h index 1cc005dfee..1b5b89078b 100644 --- a/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h +++ b/include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h @@ -12,8 +12,8 @@ public: u8 getArg1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; } u8 getArg0() { return fopAcM_GetParam(this); } u32 getSwNo() { return fopAcM_GetParam(this) >> 0x18; } - u16 getOffEventBit() { return orig.angle.z & 0xFFF; } - u16 getOnEventBit() { return orig.angle.x & 0xFFF; } + u16 getOffEventBit() { return home.angle.z & 0xFFF; } + u16 getOnEventBit() { return home.angle.x & 0xFFF; } u8 getPathID() { return (fopAcM_GetParam(this) >> 0x10) & 0xFF; } void setSceneChangeOK() { mSceneChangeOK = true; } diff --git a/include/rel/d/a/d_a_tbox/d_a_tbox.h b/include/rel/d/a/d_a_tbox/d_a_tbox.h index 0ad9312400..1b05a72d4b 100644 --- a/include/rel/d/a/d_a_tbox/d_a_tbox.h +++ b/include/rel/d/a/d_a_tbox/d_a_tbox.h @@ -7,12 +7,13 @@ #include "d/bg/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" -#include "dolphin/types.h" class dBgW; class daTboxBase_c : public dBgS_MoveBgActor { protected: + virtual BOOL checkSmallTbox() = 0; + /* 0x5A0 */ dCcD_Stts mStts; /* 0x5DC */ dCcD_Cyl mCyl; }; diff --git a/include/rel/d/a/d_a_tbox2/d_a_tbox2.h b/include/rel/d/a/d_a_tbox2/d_a_tbox2.h index 62b9eac34d..586a1a8be0 100644 --- a/include/rel/d/a/d_a_tbox2/d_a_tbox2.h +++ b/include/rel/d/a/d_a_tbox2/d_a_tbox2.h @@ -1,6 +1,79 @@ #ifndef D_A_TBOX2_H #define D_A_TBOX2_H -#include "dolphin/types.h" +#include "rel/d/a/d_a_tbox/d_a_tbox.h" + +class daTbox2_c : public daTboxBase_c { +public: + enum Type_e { + TYPE_SMALL_e, + TYPE_BIG_e, + }; + + enum Mode_e { + MODE_EXEC_WAIT_e, + MODE_EXEC_e, + }; + + enum Action_e { + ACTION_OPEN_WAIT_e, + ACTION_OPEN_DEMO_e, + ACTION_NOT_OPEN_DEMO_e, + ACTION_WAIT_e, + }; + + enum EventAct_e { + EVACT_WAIT_e, + EVACT_OPEN_e, + EVACT_APPEAR_e, + EVACT_OPEN_SHORT_e, + }; + + /* 80496A18 */ void initBaseMtx(); + /* 80496A54 */ void setBaseMtx(); + /* 80496E3C */ int create1st(); + /* 8049724C */ int demoProc(); + /* 80497478 */ void openInit(); + /* 804975EC */ void mode_proc_call(); + /* 80497678 */ void mode_exec_wait(); + /* 80497790 */ void mode_exec(); + /* 8049780C */ void action(); + /* 804978C8 */ void init_actionWait(); + /* 804978D4 */ void actionWait(); + /* 804978D8 */ void init_actionNotOpenDemo(); + /* 804978E4 */ void actionNotOpenDemo(); + /* 8049794C */ void init_actionOpenDemo(); + /* 80497958 */ void actionOpenDemo(); + /* 80497A0C */ void init_actionOpenWait(); + /* 80497A18 */ void actionOpenWait(); + /* 80497BD0 */ int setGetDemoItem(); + /* 80497C60 */ BOOL boxCheck(); + + /* 80496C20 */ virtual int CreateHeap(); + /* 80496AB8 */ virtual int Create(); + /* 80497500 */ virtual int Execute(f32 (**)[3][4]); + /* 80497DA0 */ virtual int Draw(); + /* 80497E6C */ virtual int Delete(); + /* 80498140 */ virtual BOOL checkSmallTbox() { return true; } + + u8 getModelType() { return fopAcM_GetParamBit(this, 8, 4); } + u8 getItemNo() { return fopAcM_GetParamBit(this, 0, 8); } + + /* 0x718 */ u8 mReturnRupee; + /* 0x71C */ request_of_phase_process_class mPhase; + /* 0x724 */ J3DModel* mpModel; + /* 0x728 */ mDoExt_bckAnm* mpBck; + /* 0x72C */ dBgS_ObjAcch mAcch; + /* 0x904 */ dBgS_AcchCir mAcchCir; + /* 0x944 */ dCcD_Stts mCcStts2; + /* 0x980 */ dCcD_Cyl mCcCyl2; + /* 0xABC */ u8 mModelType; + /* 0xABD */ u8 mAction; + /* 0xABE */ u8 mMode; + /* 0xABF */ bool mNoDraw; + /* 0xAC0 */ u8 field_0xAC0[0xAC4 - 0xAC0]; + /* 0xAC4 */ int mStaffIdx; + /* 0xAC8 */ dBgW* mBoxBgW; +}; #endif /* D_A_TBOX2_H */ diff --git a/include/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.h b/include/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.h index 8c4ff1410a..8f8e11938d 100644 --- a/include/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.h +++ b/include/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.h @@ -177,7 +177,7 @@ public: #endif /* 0x04 */ s8 field_0x04; - /* 0x08 */ f32 mScale; + /* 0x08 */ f32 scale; /* 0x0C */ f32 mWalkSpeed; /* 0x10 */ f32 mRunSpeed; /* 0x14 */ f32 mSwimSpeed; diff --git a/include/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.h b/include/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.h index f65b5c59bc..f9ae983b0f 100644 --- a/include/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.h +++ b/include/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.h @@ -80,7 +80,7 @@ public: /* 80B40D24 */ virtual void drawOtherMdls(); int getWrestlerAction() { return mWrestlerAction; } - u8 getType() { return mSubtype & 0x7F; } + u8 getType() { return subtype & 0x7F; } u8 getWrestlerType() { return getType(); } static u8 mEvtSeqList[84]; diff --git a/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h b/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h index b917c6479f..def07c1c30 100644 --- a/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h +++ b/include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h @@ -17,7 +17,7 @@ public: /* 0x00 */ bool field_0x00; /* 0x04 */ cXyz mPos; /* 0x10 */ csXyz mAngle; - /* 0x18 */ cXyz mScale; + /* 0x18 */ cXyz scale; /* 0x24 */ dPaPo_c field_0x24; }; // Size: 0x5C diff --git a/include/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h b/include/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h index 29183c227e..404070509a 100644 --- a/include/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h +++ b/include/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h @@ -69,7 +69,7 @@ public: int prm = fopAcM_GetParam(this) >> 0x1C; u8 type; - switch (mSubtype) { + switch (subtype) { case 0: switch (prm) { case 1: diff --git a/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h b/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h index 8b432ce68d..0155686d38 100644 --- a/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h +++ b/include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h @@ -20,7 +20,7 @@ public: /* 0x0590 */ dBgS_ObjAcch mObjAcch; /* 0x0768 */ dBgS_AcchCir mAcchCir; /* 0x07A8 */ dCcD_Stts mStts; - /* 0x07E4 */ Mtx mCullMtx; + /* 0x07E4 */ Mtx cullMtx; }; #endif /* D_A_OBJ_STONEMARK_H */ diff --git a/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h b/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h index 85dd94beb1..17f0d5760a 100644 --- a/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h +++ b/include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h @@ -33,12 +33,12 @@ public: /* 80D310AC */ int execute(); /* 80D31810 */ int draw(); - GXLightObj* getLightObj() { return &mTevStr.mLightObj.mLightObj; } + GXLightObj* getLightObj() { return &tevStr.mLightObj.mLightObj; } J3DModelData* getChainModelData() { return mpChainModelData; } cXyz* getChainPos() { return mChainPos; } csXyz* getChainAngle() { return mChainAngle; } s16* getChainAngleZ() { return mChainRotation; } - cXyz& getJumpAimPos() { return mEyePos; } + cXyz& getJumpAimPos() { return eyePos; } cXyz& getTopPos() { return mTopPos; } cXyz& getRoofPos() { return mRoofPos; } f32 getPullLength() { return mPullLength; } diff --git a/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h b/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h index 8d72c5b403..843a22e468 100644 --- a/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h +++ b/include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h @@ -26,7 +26,7 @@ public: s8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); } int getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); } - u32 getSwBit1() { return orig.angle.x & 0xff; } + u32 getSwBit1() { return home.angle.x & 0xff; } u32 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } u32 getDelEveFlgId() { return fopAcM_GetParamBit(this, 0x10, 0x10); } diff --git a/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h b/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h index 60ad8fc378..d1e5259065 100644 --- a/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h +++ b/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h @@ -33,7 +33,7 @@ public: static u8 const M_attr[64]; static u8 ActionTable[72]; - int getType() { return mSubtype & 0x7F; } + int getType() { return subtype & 0x7F; } u8 getPathID() { return fopAcM_GetParam(this); } bool isPlayerCorrect() { return (s8)(u8)(fopAcM_GetParam(this) >> 8) > 0; } diff --git a/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h b/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h index b309dfc816..4380e6742c 100644 --- a/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h +++ b/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h @@ -8,7 +8,7 @@ class daTagAssist_c : public fopAc_ac_c { public: void create_init() { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; field_0x570 = -1; } diff --git a/include/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h b/include/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h index 1810dbc1aa..67a47304f5 100644 --- a/include/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h +++ b/include/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h @@ -9,7 +9,7 @@ class daTag_Chk_c : public fopAc_ac_c { public: /* 8048A6F8 */ s32 execute(); - u16 getAreaType() { return orig.angle.z & 0x100; } + u16 getAreaType() { return home.angle.z & 0x100; } u16 getHeight() { return fopAcM_GetParam(this) & 0xff; } u8 getSwBit() { return fopAcM_GetParam(this) >> 8; } u8 getSwBit2() { return fopAcM_GetParam(this) >> 16; } @@ -18,27 +18,27 @@ public: fopAcM_SetupActor(this, daTag_Chk_c); if (getAreaType() == 0) { - mScale.x *= 50.0f; - mScale.y *= 100.0f; - mScale.z *= 50.0f; + scale.x *= 50.0f; + scale.y *= 100.0f; + scale.z *= 50.0f; - mPos1.set(current.pos.x - mScale.x, current.pos.y, current.pos.z - mScale.z); - mPos2.set(current.pos.x + mScale.x, current.pos.y + mScale.y, current.pos.z + mScale.z); + mPos1.set(current.pos.x - scale.x, current.pos.y, current.pos.z - scale.z); + mPos2.set(current.pos.x + scale.x, current.pos.y + scale.y, current.pos.z + scale.z); } else { - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 0.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 0.0f; mPos1.set(0.0f, current.pos.y, 0.0f); - mPos2.set(0.0f, current.pos.y + mScale.y, 0.0f); + mPos2.set(0.0f, current.pos.y + scale.y, 0.0f); } - mAttentionInfo.mPosition = current.pos; + attention_info.position = current.pos; u16 l_height = getHeight(); - l_height != 0xff ? mAttentionInfo.mPosition.y += l_height * 10.0f : mAttentionInfo.mPosition.y += mScale.y * 0.5f; + l_height != 0xff ? attention_info.position.y += l_height * 10.0f : attention_info.position.y += scale.y * 0.5f; - mEyePos = mAttentionInfo.mPosition; + eyePos = attention_info.position; return cPhs_COMPLEATE_e; } private: diff --git a/include/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.h b/include/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.h index 288f84e1c5..7dbb86efbf 100644 --- a/include/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.h +++ b/include/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.h @@ -11,7 +11,7 @@ public: u8 getSwBit() { return fopAcM_GetParam(this) >> 8; } u8 getMode() { return fopAcM_GetParam(this); } - f32 getExtent() { return mScale.x * 100.0f;} + f32 getExtent() { return scale.x * 100.0f;} private: /* 0x568 */ u32 mSwitchNo; diff --git a/include/rel/d/a/tag/d_a_tag_push/d_a_tag_push.h b/include/rel/d/a/tag/d_a_tag_push/d_a_tag_push.h index 4f4f7e945a..7c5ceb9a99 100644 --- a/include/rel/d/a/tag/d_a_tag_push/d_a_tag_push.h +++ b/include/rel/d/a/tag/d_a_tag_push/d_a_tag_push.h @@ -28,10 +28,10 @@ public: u8 getBitSW2() { return (fopAcM_GetParam(this) >> 8) & 0xFF; } u32 getFlowNodeNo() { - if (orig.angle.x == 0xFFFF) { + if (home.angle.x == 0xFFFF) { return 0xFFFFFFFF; } else { - return orig.angle.x & 0xFFFF; + return home.angle.x & 0xFFFF; } } diff --git a/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h b/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h index ac6e254c48..8ab333e2a1 100644 --- a/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h +++ b/include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h @@ -11,7 +11,7 @@ public: int create(); void execute(); - u16 getMessageNo() { return orig.angle.z; } + u16 getMessageNo() { return home.angle.z; } private: /* 0x568 */ u16 mMessageNo; diff --git a/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h b/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h index 53f06335d3..54e85b4c8b 100644 --- a/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h +++ b/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h @@ -71,7 +71,7 @@ public: int create() { fopAcM_SetupActor(this, daTagTheBHint_c); - field_0x568 = pow(mScale.x * 100.0f,2.0f); + field_0x568 = pow(scale.x * 100.0f,2.0f); return cPhs_COMPLEATE_e; } diff --git a/include/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h b/include/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h index a9f4d8d2d7..b533afbaa2 100644 --- a/include/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h +++ b/include/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h @@ -17,7 +17,7 @@ public: if (field_0x568 < 0) { return NULL; } else { - return &mEyePos; + return &eyePos; } } diff --git a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp index 5e227e5336..629157d481 100644 --- a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp +++ b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp @@ -288,8 +288,8 @@ static int daB_GO_Draw(b_go_class* b_go) { if ((*(daB_GO_HIO_c*)l_HIO).mDisplayModelImage) { J3DModel* model = b_go->mpMorf->getModel(); - g_env_light.settingTevStruct(0, &b_go->current.pos, &b_go->mTevStr); - g_env_light.setLightTevColorType_MAJI(model->getModelData(), &b_go->mTevStr); + g_env_light.settingTevStruct(0, &b_go->current.pos, &b_go->tevStr); + g_env_light.setLightTevColorType_MAJI(model->getModelData(), &b_go->tevStr); b_go->mpMorf->entryDL(); } return 1; @@ -503,8 +503,8 @@ static void action(b_go_class* b_go) { b_go->mAngleToPlayer = fopAcM_searchActorAngleY(b_go, (fopAc_ac_c*)dComIfGp_getPlayer(0)); b_go->mDistToPlayer = fopAcM_searchActorDistance(b_go, (fopAc_ac_c*)dComIfGp_getPlayer(0)); - b_go->mStatus = b_go->mStatus; - b_go->mAttentionInfo.mFlags = 0; + b_go->actor_status = b_go->actor_status; + b_go->attention_info.flags = 0; if (b_go->field_0x688[1] == 0) { if (b_go->field_0x692 != 2) { @@ -542,7 +542,7 @@ static void action(b_go_class* b_go) { b_go->speed.z = newSpeed.z; VECAdd(&b_go->current.pos, &b_go->speed, &b_go->current.pos); - b_go->speed.y += b_go->mGravity; + b_go->speed.y += b_go->gravity; b_go->mAcch.CrrPos(dComIfG_Bgsp()); } @@ -608,7 +608,7 @@ static int daB_GO_Delete(b_go_class* b_go) { data_80604140[0] = 0; } - if (b_go->mHeap != NULL) { + if (b_go->heap != NULL) { b_go->mpMorf->stopZelAnime(); } @@ -705,21 +705,21 @@ static int daB_GO_Create(fopAc_ac_c* i_actor) { (*(daB_GO_HIO_c*)l_HIO).field_0x4 = -1; } - b_go->mAttentionInfo.mFlags = 4; - b_go->mCullMtx = b_go->mpMorf->getModel()->getBaseTRMtx(); + b_go->attention_info.flags = 4; + b_go->cullMtx = b_go->mpMorf->getModel()->getBaseTRMtx(); fopAcM_SetMin(b_go, -500.0f, -2000.0f, -500.0f); fopAcM_SetMax(b_go, 500.0f, 2000.0f, 500.0f); b_go->field_0x562 = 1000; b_go->field_0x560 = 1000; - b_go->mAcch.Set(&b_go->current.pos, &b_go->next.pos, b_go, 1, &b_go->mAcchCir, + b_go->mAcch.Set(&b_go->current.pos, &b_go->old.pos, b_go, 1, &b_go->mAcchCir, &b_go->speed, NULL, NULL); b_go->mAcchCir.SetWall(100.0f, 300.0f); - b_go->mZ2Enemy.init(&b_go->current.pos, &b_go->mEyePos, 3, 1); + b_go->mZ2Enemy.init(&b_go->current.pos, &b_go->eyePos, 3, 1); b_go->field_0xc9c = &b_go->mZ2Enemy; - b_go->mGravity = -7.0f; + b_go->gravity = -7.0f; b_go->mActionID = ACT_WAIT; daB_GO_Execute(b_go); diff --git a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp index 3d49c30504..fa67bbbe8d 100644 --- a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp +++ b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp @@ -296,8 +296,8 @@ static int daB_OH_Draw(b_oh_class* i_this) { J3DModel* model_p = i_this->mpMorf->getModel(); - g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(model_p, &i_this->mTevStr); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(model_p, &i_this->tevStr); i_this->mpBtk->entry(model_p->getModelData()); i_this->mpBrk->entry(model_p->getModelData()); @@ -934,7 +934,7 @@ static void action(b_oh_class* i_this) { i_this->mDistToPlayer = fopAcM_searchPlayerDistance(i_this); fopAcM_OffStatus(i_this, 0); - i_this->mAttentionInfo.mFlags = 0; + i_this->attention_info.flags = 0; uvar = 0; bvar = true; @@ -1006,7 +1006,7 @@ static void action(b_oh_class* i_this) { } cLib_addCalcAngleS2(&i_this->current.angle.x, -0xF2C, 4, 100); - cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->orig.angle.y, 4, 0x100); + cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->home.angle.y, 4, 0x100); } else if (uvar == 2) { f32 fvar = i_this->field_0xc8c; for (int i = i_this->field_0xca8; i < 30; i++) { @@ -1054,7 +1054,7 @@ static void action(b_oh_class* i_this) { } cLib_addCalcAngleS2(&i_this->current.angle.x, 0xA92, 4, 0x200); - cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->orig.angle.y, 4, 0x800); + cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->home.angle.y, 4, 0x800); } i_this->field_0x600 = @@ -1077,9 +1077,9 @@ static void action(b_oh_class* i_this) { mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&i_this->current.pos); - local_90.x = i_this->current.pos.x - boss->orig.pos.x; - local_90.z = i_this->current.pos.z - boss->orig.pos.z; - i_this->orig.angle.y = cM_atan2s(local_90.x, local_90.z); + local_90.x = i_this->current.pos.x - boss->home.pos.x; + local_90.z = i_this->current.pos.z - boss->home.pos.z; + i_this->home.angle.y = cM_atan2s(local_90.x, local_90.z); cLib_addCalcAngleS2(&i_this->shape_angle.y, i_this->current.angle.y, 2, 0x2000); cLib_addCalcAngleS2(&i_this->shape_angle.x, i_this->current.angle.x, 2, 0x2000); @@ -1193,14 +1193,14 @@ static void damage_check(b_oh_class* i_this) { for (int i = 7; i < 15; i++) { if (i_this->mColliders[i].ChkTgHit()) { i_this->mAtInfo.mpCollider = i_this->mColliders[i].GetTgHitObj(); - i_this->mHealth = 1000; + i_this->health = 1000; cc_at_check(i_this, &i_this->mAtInfo); MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i * 2 + 1), mDoMtx_stack_c::get()); - mDoMtx_stack_c::multVecZero(&i_this->mEyePos); - i_dComIfGp_setHitMark(1, i_this, &i_this->mEyePos, NULL, NULL, 0); - mDoAud_seStart(Z2SE_EN_OI_HIT_TENTACLE, &i_this->mEyePos, 0, 0); + mDoMtx_stack_c::multVecZero(&i_this->eyePos); + i_dComIfGp_setHitMark(1, i_this, &i_this->eyePos, NULL, NULL, 0); + mDoAud_seStart(Z2SE_EN_OI_HIT_TENTACLE, &i_this->eyePos, 0, 0); bvar = true; i_this->field_0x5f4 = 20; @@ -1264,7 +1264,7 @@ static int daB_OH_Execute(b_oh_class* i_this) { } if (i_this->field_0x5c8 == 0) { - boss = (b_ob_class*)fopAcM_SearchByID(i_this->mParentPcId); + boss = (b_ob_class*)fopAcM_SearchByID(i_this->parentActorID); } if (boss == NULL) { @@ -1475,7 +1475,7 @@ static int daB_OH_Create(fopAc_ac_c* i_this) { l_HIO.field_0x4 = -1; } - this_->mHealth = 1000; + this_->health = 1000; this_->field_0x560 = 1000; this_->field_0x5cc = cM_rndF(65536.0f); diff --git a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp index aaaf10b2c7..db4a765d3c 100644 --- a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp +++ b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp @@ -37,8 +37,8 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { static int daB_OH2_Draw(b_oh2_class* i_this) { J3DModel* model = i_this->mpMorf->getModel(); - g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(model, &i_this->mTevStr); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(model, &i_this->tevStr); i_this->mpBtk->entry(model->getModelData()); i_this->mpBrk->entry(model->getModelData()); @@ -182,7 +182,7 @@ static int daB_OH2_Execute(b_oh2_class* i_this) { } if (i_this->field_0x5c8 == 0) { - boss = (b_ob_class*)fopAcM_SearchByID(i_this->mParentPcId); + boss = (b_ob_class*)fopAcM_SearchByID(i_this->parentActorID); } if (boss == NULL) { @@ -214,7 +214,7 @@ static int daB_OH2_IsDelete(b_oh2_class* i_this) { /* 8061E4F0-8061E540 0008B0 0050+00 1/0 0/0 0/0 .text daB_OH2_Delete__FP11b_oh2_class */ static int daB_OH2_Delete(b_oh2_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "B_oh"); - if (i_this->mHeap != NULL) { + if (i_this->heap != NULL) { i_this->mpMorf->stopZelAnime(); } diff --git a/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp b/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp index 32fd57bbd5..7ff67483d4 100644 --- a/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp +++ b/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp @@ -26,8 +26,8 @@ static int daB_ZANTS_Create(daB_ZANTS_c*); /* 806529D8-80652AAC 000078 00D4+00 1/1 0/0 0/0 .text draw__11daB_ZANTS_cFv */ int daB_ZANTS_c::draw() { - g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mpBtkAnm->entry(mpModel->getModelData()); mpBrkAnm->entry(mpModel->getModelData()); @@ -225,7 +225,7 @@ int daB_ZANTS_c::create() { if (mpBgW && dComIfG_Bgsp().Regist(mpBgW, this)) { return cPhs_ERROR_e; } - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; field_0x588 = 150.0f; fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_SetMin(this, -200.0f, -500.0f, -500.0f); diff --git a/rel/d/a/d_a_alldie/d_a_alldie.cpp b/rel/d/a/d_a_alldie/d_a_alldie.cpp index 49690304e0..6def58ff00 100644 --- a/rel/d/a/d_a_alldie/d_a_alldie.cpp +++ b/rel/d/a/d_a_alldie/d_a_alldie.cpp @@ -61,7 +61,7 @@ int daAlldie_c::actionTimer() { /* 804D5938-804D59A0 000198 0068+00 1/1 0/0 0/0 .text actionOrder__10daAlldie_cFv */ int daAlldie_c::actionOrder() { - if (mEvtInfo.checkCommandDemoAccrpt()) { + if (eventInfo.checkCommandDemoAccrpt()) { mAction = ACT_EVENT; } else { fopAcM_orderOtherEventId(this, mEventIdx, getEventNo(), -1, 0, 1); @@ -89,7 +89,7 @@ int daAlldie_c::actionEvent() { /* 804D5A44-804D5B10 0002A4 00CC+00 1/1 0/0 0/0 .text actionNext__10daAlldie_cFv */ int daAlldie_c::actionNext() { - if (mEvtInfo.checkCommandDemoAccrpt()) { + if (eventInfo.checkCommandDemoAccrpt()) { mEventIdx = mNextEventIdx; s8 roomNo = fopAcM_GetRoomNo(this); @@ -188,8 +188,8 @@ int daAlldie_c::create() { mNextEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, mMapToolID); } - mEvtInfo.setEventId(mEventIdx); - mEvtInfo.setMapToolId(getEventNo()); + eventInfo.setEventId(mEventIdx); + eventInfo.setMapToolId(getEventNo()); return cPhs_COMPLEATE_e; } diff --git a/rel/d/a/d_a_andsw/d_a_andsw.cpp b/rel/d/a/d_a_andsw/d_a_andsw.cpp index 2d27fe8d1a..38304fa072 100644 --- a/rel/d/a/d_a_andsw/d_a_andsw.cpp +++ b/rel/d/a/d_a_andsw/d_a_andsw.cpp @@ -80,14 +80,14 @@ extern actor_process_profile_definition g_profile_ANDSW = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_ANDSW, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daAndsw_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 302, // mPriority - &l_daAndsw_Method, // mSubMtd + &l_daAndsw_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/d_a_andsw2/d_a_andsw2.cpp b/rel/d/a/d_a_andsw2/d_a_andsw2.cpp index e48366fa04..e1f9760cc0 100644 --- a/rel/d/a/d_a_andsw2/d_a_andsw2.cpp +++ b/rel/d/a/d_a_andsw2/d_a_andsw2.cpp @@ -35,7 +35,7 @@ extern "C" void isSwitch__10dSv_info_cCFii(); /* 804D5DF8-804D5E04 000078 000C+00 2/2 0/0 0/0 .text getEventNo__10daAndsw2_cFv */ u8 daAndsw2_c::getEventNo() { - return orig.angle.x & 0xFF; + return home.angle.x & 0xFF; } /* 804D5E04-804D5E10 000084 000C+00 6/6 0/0 0/0 .text getSwbit__10daAndsw2_cFv */ @@ -55,7 +55,7 @@ u8 daAndsw2_c::getType() { /* 804D5E28-804D5E34 0000A8 000C+00 1/1 0/0 0/0 .text getTimer__10daAndsw2_cFv */ u8 daAndsw2_c::getTimer() { - return orig.angle.z & 0xFF; + return home.angle.z & 0xFF; } /* 804D5E34-804D5E40 0000B4 000C+00 3/3 0/0 0/0 .text getNum__10daAndsw2_cFv */ @@ -76,7 +76,7 @@ u8 daAndsw2_c::getTopSw() { /* 804D5EB0-804D5EBC 000130 000C+00 1/1 0/0 0/0 .text getSwAns__10daAndsw2_cFv */ u8 daAndsw2_c::getSwAns() { - return (orig.angle.x >> 8) & 0xFF; + return (home.angle.x >> 8) & 0xFF; } /* 804D5EBC-804D5F64 00013C 00A8+00 4/4 0/0 0/0 .text chkAllSw2__10daAndsw2_cFv */ @@ -277,7 +277,7 @@ static int daAndsw2_actionTimer(daAndsw2_c* i_this) { // missing mr / out of order instruction #ifdef NONMATCHING static int daAndsw2_actionOrder(daAndsw2_c* i_this) { - if (i_this->mEvtInfo.i_checkCommandDemoAccrpt()) { + if (i_this->eventInfo.i_checkCommandDemoAccrpt()) { i_this->setActio(daAndsw2_c::ACT_EVENT_e); dComIfGs_onSwitch(i_this->getSwbit(), fopAcM_GetRoomNo(i_this)); } else if ((i_this->getType() == 1 && !i_this->chkAllSw2()) || @@ -404,14 +404,14 @@ extern actor_process_profile_definition g_profile_ANDSW2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_ANDSW2, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daAndsw2_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 303, // mPriority - &l_daAndsw2_Method, // mSubMtd + &l_daAndsw2_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // mCullType + fopAc_CULLBOX_6_e, // cullType }; diff --git a/rel/d/a/d_a_bg/d_a_bg.cpp b/rel/d/a/d_a_bg/d_a_bg.cpp index 3e40cbd0e5..76e3a4ba8c 100644 --- a/rel/d/a/d_a_bg/d_a_bg.cpp +++ b/rel/d/a/d_a_bg/d_a_bg.cpp @@ -701,12 +701,12 @@ extern "C" asm void __ct__11J3DLightObjFv() { daBg_c::~daBg_c() { int roomNo = fopAcM_GetParam(this); - if (mHeap != NULL && mpBgW != NULL) { + if (heap != NULL && mpBgW != NULL) { dComIfG_Bgsp().Release(mpBgW); dStage_roomControl_c::setBgW(roomNo, NULL); } - if (mHeap != NULL && mpKCol != NULL) { + if (heap != NULL && mpKCol != NULL) { dComIfG_Bgsp().Release(mpKCol); dStage_roomControl_c::setBgW(roomNo, NULL); } @@ -1007,7 +1007,7 @@ int daBg_c::create() { if (mHeap == NULL) { fopAcM_SetupActor(this, daBg_c); - orig.roomNo = roomNo; + home.roomNo = roomNo; current.roomNo = roomNo; JKRExpHeap* heap = dStage_roomControl_c::getMemoryBlock(roomNo); diff --git a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp index 827efa6027..8c55ccea92 100644 --- a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp +++ b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp @@ -855,12 +855,12 @@ int daBgObj_c::CreateHeap() { /* 8045A9E8-8045AAF0 001408 0108+00 1/1 0/0 0/0 .text create1st__9daBgObj_cFv */ int daBgObj_c::create1st() { if (field_0xcc9 == 0) { - field_0xcca = orig.angle.x; - field_0xccc = orig.angle.z; + field_0xcca = home.angle.x; + field_0xccc = home.angle.z; field_0xcc9 = 1; - orig.angle.z = 0; - orig.angle.x = 0; + home.angle.z = 0; + home.angle.x = 0; current.angle.z = 0; current.angle.x = 0; shape_angle.z = 0; @@ -1254,7 +1254,7 @@ int daBgObj_c::actionOrderWait() { // matches with literals #ifdef NONMATCHING int daBgObj_c::actionOrder() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(2); if (field_0xd01 < 5) { @@ -1392,11 +1392,11 @@ int daBgObj_c::Draw() { return 1; } - g_env_light.settingTevStruct(0x20, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0x20, ¤t.pos, &tevStr); for (int i = 0; i < 2; i++) { if (field_0x5a8[field_0xcc8][i] != NULL) { - g_env_light.setLightTevColorType_MAJI(field_0x5a8[field_0xcc8][i], &mTevStr); + g_env_light.setLightTevColorType_MAJI(field_0x5a8[field_0xcc8][i], &tevStr); } } diff --git a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp index 3984d81a61..2ac5e9f73f 100644 --- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp +++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp @@ -894,7 +894,7 @@ int daBoomerang_c::draw() { pushLockList(i); i--; } else { - mSight.setSight(&mLockActors[i]->mEyePos, i); + mSight.setSight(&mLockActors[i]->eyePos, i); } } else { @@ -911,7 +911,7 @@ int daBoomerang_c::draw() { field_0x6d8 = fopAcM_SearchByID(field_0x6d4); } if (field_0x6d8 != 0) { - mSight.setSight(&field_0x6d8->mEyePos, 5); + mSight.setSight(&field_0x6d8->eyePos, 5); } else { mSight.setSight(NULL, 5); } @@ -920,16 +920,16 @@ int daBoomerang_c::draw() { dComIfGd_set2DXlu((dDlst_base_c*)&mSight); } } - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(field_0x568, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(field_0x568, &tevStr); mDoExt_modelUpdateDL(field_0x568); daMirror_c::entry(field_0x568); if (fopAcM_GetParam(this) != 0) { - g_env_light.setLightTevColorType_MAJI(field_0x56c, &mTevStr); + g_env_light.setLightTevColorType_MAJI(field_0x56c, &tevStr); mDoExt_modelEntryDL(field_0x56c); daMirror_c::entry(field_0x56c); } else if (i_dComIfGp_checkPlayerStatus0(0, 0x80000) != 0) { - g_env_light.setLightTevColorType_MAJI(field_0x590, &mTevStr); + g_env_light.setLightTevColorType_MAJI(field_0x590, &tevStr); mDoExt_modelUpdateDL(field_0x590); } return 1; @@ -970,7 +970,7 @@ void daBoomerang_c::moveLineCallback(fopAc_ac_c* i_actorP) { if (i == field_0x951) { field_0x957 = 10; - field_0x9ac = i_actorP->mEyePos; + field_0x9ac = i_actorP->eyePos; field_0x9c4 = current.pos; } } @@ -1044,7 +1044,7 @@ int daBoomerang_c::setLockActor(fopAc_ac_c* param_0, int param_1) { } } if (param_1 != 0) { - f32 squareDistance = param_0->mEyePos.abs2(current.pos); + f32 squareDistance = param_0->eyePos.abs2(current.pos); if (squareDistance > field_0x984) { return 0; } @@ -1079,11 +1079,11 @@ void daBoomerang_c::setRoomInfo() { int roomNo; if (field_0x980 != -1000000000.0f) { roomNo = dComIfG_Bgsp().GetRoomId(field_0xd6c); - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0xd6c); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0xd6c); } else { roomNo = dComIfGp_roomControl_getStayNo(); } - mTevStr.mRoomNo = roomNo; + tevStr.mRoomNo = roomNo; field_0x953 = dComIfGp_getReverb(roomNo); field_0x9d0.SetRoomId(roomNo); fopAcM_SetRoomNo(this, roomNo); @@ -1179,7 +1179,7 @@ void daBoomerang_c::setAimPos() { } for (int i = field_0x951; i < mLockCnt; i++, field_0x951++) { if (mLockActors[i] != NULL) { - field_0x990 = mLockActors[i]->mEyePos; + field_0x990 = mLockActors[i]->eyePos; return; } if (field_0x718[i] != 0) { @@ -1241,7 +1241,7 @@ void daBoomerang_c::checkBgHit(cXyz* i_start, cXyz* i_end) { #ifdef NONMATCHING // Matches with literals JPABaseEmitter* daBoomerang_c::setEffectTraceMatrix(u32* param_0, u16 param_1) { - *param_0 = dComIfGp_particle_set(*param_0, param_1, ¤t.pos, &mTevStr); + *param_0 = dComIfGp_particle_set(*param_0, param_1, ¤t.pos, &tevStr); JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(*param_0); if (emitter != NULL) { emitter->setGlobalRTMatrix(field_0x568->getBaseTRMtx()); diff --git a/rel/d/a/d_a_crod/d_a_crod.cpp b/rel/d/a/d_a_crod/d_a_crod.cpp index 13748adfbb..077ba9178c 100644 --- a/rel/d/a/d_a_crod/d_a_crod.cpp +++ b/rel/d/a/d_a_crod/d_a_crod.cpp @@ -211,8 +211,8 @@ int daCrod_c::execute() { if (fopAcM_GetParam(this) == 6) { if (player->getIronBallCenterPos() != NULL) { current.pos = *player->getIronBallCenterPos(); - mAttentionInfo.mPosition = current.pos; - mEyePos = current.pos; + attention_info.position = current.pos; + eyePos = current.pos; } return 1; } else { @@ -322,8 +322,8 @@ int daCrod_c::execute() { posMove(); if (fopAcM_GetParam(this) == 3) { - mAtCps.SetStartEnd(next.pos, current.pos); - sp50 = current.pos - next.pos; + mAtCps.SetStartEnd(old.pos, current.pos); + sp50 = current.pos - old.pos; mAtCps.SetAtVec(sp50); dComIfG_Ccsp()->Set(&mAtCps); @@ -360,8 +360,8 @@ int daCrod_c::execute() { } } - mEyePos = current.pos; - mAttentionInfo.mPosition = current.pos; + eyePos = current.pos; + attention_info.position = current.pos; daAlink_c::simpleAnmPlay(mpBallBrk); daAlink_c::simpleAnmPlay(mpBallBtk); @@ -389,8 +389,8 @@ int daCrod_c::draw() { return 1; } - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpBallModel, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpBallModel, &tevStr); mDoExt_modelUpdateDL(mpBallModel); return 1; } diff --git a/rel/d/a/d_a_disappear/d_a_disappear.cpp b/rel/d/a/d_a_disappear/d_a_disappear.cpp index dadbb75f5e..62be38d913 100644 --- a/rel/d/a/d_a_disappear/d_a_disappear.cpp +++ b/rel/d/a/d_a_disappear/d_a_disappear.cpp @@ -18,7 +18,7 @@ static void* s_ks_sub(void* i_actor, void*) { fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor; if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == PROC_NPC_KS) { - actor_p->mHealth = 1; + actor_p->health = 1; } return NULL; diff --git a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp index 103d881974..9ff8c6cea0 100644 --- a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp +++ b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp @@ -84,8 +84,8 @@ static int daDmidna_Execute(daDmidna_c* i_this) { /* 8045D204-8045D268 0003A4 0064+00 1/1 0/0 0/0 .text draw__10daDmidna_cFv */ int daDmidna_c::draw() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(model, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model, &tevStr); mDoExt_modelEntryDL(model); return 1; } diff --git a/rel/d/a/d_a_do/d_a_do.cpp b/rel/d/a/d_a_do/d_a_do.cpp index f601a95d1b..bc70874d00 100644 --- a/rel/d/a/d_a_do/d_a_do.cpp +++ b/rel/d/a/d_a_do/d_a_do.cpp @@ -71,6 +71,7 @@ extern "C" extern char const* const d_a_do__stringBase0; // External References: // +extern "C" void fopAcM_riverStream__FP4cXyzPsPff(); extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); @@ -524,7 +525,7 @@ static int daDo_other_bg_check(do_class* i_this, fopAc_ac_c* i_actorP) { actor_pos.y += FLOAT_LABEL(lit_3816); dog_pos = dog->current.pos; - dog_pos.y = dog->mEyePos.y; + dog_pos.y = dog->eyePos.y; lin_chk.Set((cXyz*)&dog_pos, (cXyz*)&actor_pos, dog); if (dComIfG_Bgsp().LineCross(&lin_chk)) { @@ -724,8 +725,8 @@ static u32 search_food(do_class* i_this) { do { // for (int j = 0; j != target_info_count; j++) { fopAc_ac_c* actorP = target_info[i]; - f32 x_pos = actorP->current.pos.x - i_this->mEyePos.x; - f32 z_pos = actorP->current.pos.z - i_this->mEyePos.z; + f32 x_pos = actorP->current.pos.x - i_this->eyePos.x; + f32 z_pos = actorP->current.pos.z - i_this->eyePos.z; f32 f_pos = JMAFastSqrt(x_pos * x_pos + z_pos * z_pos); if (f_pos < tmp) { @@ -1041,7 +1042,7 @@ COMPILER_STRIP_GATE(0x8066EE58, &lit_4138); #ifdef NONMATCHING // matches with literals static void area_check(do_class* i_this) { - cXyz pos_delta = i_this->orig.pos - i_this->current.pos; + cXyz pos_delta = i_this->home.pos - i_this->current.pos; if (i_this->field_0x5b6 != 255) { if ((i_this->field_0x5b6 * FLOAT_LABEL(lit_3772) * FLOAT_LABEL(lit_3665)) > pos_delta.abs()) @@ -1293,7 +1294,7 @@ static void do_walk(do_class* i_this) { switch (i_this->mStayStatus + 1) { case 12: { - i_this->field_0x5b8 = i_this->orig.pos; + i_this->field_0x5b8 = i_this->home.pos; i_this->speedF >= l_HIO.mRunSpeed ? i_this->field_0x5e8 = 1.7 : i_this->field_0x5e8 = 4.0; i_this->field_0x5ec = 1.7; @@ -1330,7 +1331,7 @@ static void do_walk(do_class* i_this) { local_5c.z = cM_rndF(100.0f * i_this->field_0x5b6); MtxPosition(&local_5c, &i_this->field_0x5b8); - i_this->field_0x5b8 += i_this->orig.pos; + i_this->field_0x5b8 += i_this->home.pos; if (dansa_check(i_this, i_this->field_0x5b8, 0.0) == 0) { local_5c = i_this->field_0x5b8 - i_this->current.pos; @@ -2219,12 +2220,12 @@ static void do_swim(do_class* i_this) { cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mAngleYFromPlayer, 16, 0x100); i_this->speed.y = FLOAT_LABEL(lit_3682); - i_this->mGravity = FLOAT_LABEL(lit_3682); + i_this->gravity = FLOAT_LABEL(lit_3682); cLib_addCalc2(&i_this->current.pos.y, i_this->field_0x65c - FLOAT_LABEL(lit_4992), FLOAT_LABEL(lit_3662), FLOAT_LABEL(lit_4027)); - pos = i_this->mEyePos; + pos = i_this->eyePos; pos.y = i_this->field_0x65c; fopAcM_effHamonSet(&i_this->field_0xbcc, (cXyz*)&pos, FLOAT_LABEL(lit_4993), @@ -2549,7 +2550,7 @@ static void action(do_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - i_this->mGravity = FLOAT_LABEL(lit_5948); + i_this->gravity = FLOAT_LABEL(lit_5948); i_this->mDistFromPlayer = fopAcM_searchPlayerDistance(i_this); daPy_py_c* player2 = daPy_getPlayerActorClass(); @@ -2559,7 +2560,7 @@ static void action(do_class* i_this) { } i_this->mAngleYFromPlayer = fopAcM_searchPlayerAngleY(i_this); - i_this->mEyePosYDistFromPlayer = fabsf(i_this->mEyePos.y - player->current.pos.y); + i_this->mEyePosYDistFromPlayer = fabsf(i_this->eyePos.y - player->current.pos.y); if (!mDoCPd_c::getHoldR(PAD_1) || fabsf(i_this->current.pos.y - player->current.pos.y) > FLOAT_LABEL(lit_3816)) @@ -2696,13 +2697,13 @@ static void action(do_class* i_this) { } if (tmp2 != 0 && player->mSpeedF < FLOAT_LABEL(lit_3665)) { - cLib_onBit(i_this->mAttentionInfo.mFlags, 0x10); + cLib_onBit(i_this->attention_info.flags, 0x10); if (do_carry_check(i_this)) { return; } } else { - cLib_offBit(i_this->mAttentionInfo.mFlags, 0x10); + cLib_offBit(i_this->attention_info.flags, 0x10); } cLib_addCalcAngleS2(&i_this->current.angle.x, 0, 1, 0x400); @@ -2719,7 +2720,7 @@ static void action(do_class* i_this) { i_this->speed.x = pos2.x; i_this->speed.z = pos2.z; - i_this->speed.y += i_this->mGravity; + i_this->speed.y += i_this->gravity; ; i_this->current.pos += i_this->speed; @@ -2830,7 +2831,7 @@ static void action(do_class* i_this) { for (int i = 0; i < 4; i++) { // wrong i_this->mMsg.setMsg(dComIfGp_particle_set( - (u32)0, (u16)l_HIO.field_0x1c, &pos, &i_this->mTevStr, (csXyz*)0, + (u32)0, (u16)l_HIO.field_0x1c, &pos, &i_this->tevStr, (csXyz*)0, (cXyz*)&scc, (u8)0xFF, (dPa_levelEcallBack*)0, (s8)-1, (GXColor*)0, (GXColor*)0, (cXyz*)0)); } @@ -2862,11 +2863,11 @@ static void action(do_class* i_this) { cXyz eyePosDiff; if (i_this->field_0x624 == 0) { - eyePosDiff = player->mEyePos - i_this->mEyePos; + eyePosDiff = player->eyePos - i_this->eyePos; } else { i_this->field_0x624++; - eyePosDiff = i_this->mUnkPos - i_this->mEyePos; + eyePosDiff = i_this->mUnkPos - i_this->eyePos; } eyePosDiff.y += i_this->field_0x674.z * FLOAT_LABEL(lit_5952); @@ -2994,18 +2995,18 @@ static void message(do_class* i_this) { } } else { - if (i_dComIfGp_event_runCheck() && i_this->mEvtInfo.checkCommandTalk()) { + if (i_dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) { i_this->mMsg.init(i_this, i_this->field_0xc08, 0, 0); i_this->field_0xc06 = 1; } if (i_this->field_0xc05 == 2 && i_this->field_0xc08 != -1 && daPy_py_c::i_checkNowWolf()) { fopAcM_OnStatus(i_this, 0); - cLib_onBit(i_this->mAttentionInfo.mFlags, 0xa); - i_this->mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + cLib_onBit(i_this->attention_info.flags, 0xa); + i_this->eventInfo.i_onCondition(dEvtCnd_CANTALK_e); } else { fopAcM_OffStatus(i_this, 0); - cLib_offBit(i_this->mAttentionInfo.mFlags, 0xa); + cLib_offBit(i_this->attention_info.flags, 0xa); } } } @@ -3041,7 +3042,7 @@ static int daDo_Delete(do_class* i_this) { u8* tmp = (u8*)struct_8066F2B4 + 2; *tmp = 0; } - if (i_this->mHeap) { + if (i_this->heap) { i_this->mSound.deleteObject(); } return 1; diff --git a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp index d94ad2c3e2..14b6fa3148 100644 --- a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp +++ b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp @@ -166,8 +166,8 @@ int daDsh_c::CreateHeap() { /* 8046759C-80467640 00017C 00A4+00 1/0 0/0 0/0 .text Draw__7daDsh_cFv */ int daDsh_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); @@ -219,7 +219,7 @@ int daDsh_c::callExecute() { /* 804677D4-804677E4 0003B4 0010+00 1/0 0/0 0/0 .text initOpenWait__7daDsh_cFv */ int daDsh_c::initOpenWait() { - current.pos.y = orig.pos.y; + current.pos.y = home.pos.y; return 1; } @@ -345,9 +345,9 @@ COMPILER_STRIP_GATE(0x80467F1C, &l_heap_size); int daDsh_c::initOpen() { mTiltTime = getOpenTiltTime(); speed.y = 0.0f; - mGravity = getOpenAccel(); + gravity = getOpenAccel(); - cXyz check_pos(orig.pos.x, orig.pos.y + 100.0f, orig.pos.z); + cXyz check_pos(home.pos.x, home.pos.y + 100.0f, home.pos.z); bool water_check = fopAcM_wt_c::waterCheck(&check_pos); bool gnd_check = fopAcM_gc_c::gndCheck(&check_pos); @@ -367,18 +367,18 @@ static daDsh_c::action_c /* 80467988-80467A64 000568 00DC+00 1/0 0/0 0/0 .text executeOpen__7daDsh_cFv */ int daDsh_c::executeOpen() { if (mTiltTime != 0) { - current.pos.y = orig.pos.y + cM_rndFX(2.0f); + current.pos.y = home.pos.y + cM_rndFX(2.0f); } else { - cLib_chaseF(&speed.y, getOpenSpeed(), mGravity); + cLib_chaseF(&speed.y, getOpenSpeed(), gravity); current.pos.y += speed.y; - f32 closed_y_pos = orig.pos.y - OPEN_SIZE; + f32 closed_y_pos = home.pos.y - OPEN_SIZE; if (current.pos.y < closed_y_pos) { current.pos.y = closed_y_pos; if (speed.y < getOpenBoundSpeed()) { speed.y *= getOpenBoundRatio(); - mGravity = 8.0f; + gravity = 8.0f; } else { setAction(&l_closeWaitAction); } @@ -390,7 +390,7 @@ int daDsh_c::executeOpen() { /* 80467A64-80467A80 000644 001C+00 1/0 0/0 0/0 .text initCloseWait__7daDsh_cFv */ int daDsh_c::initCloseWait() { - current.pos.y = orig.pos.y - OPEN_SIZE; + current.pos.y = home.pos.y - OPEN_SIZE; return 1; } @@ -411,7 +411,7 @@ int daDsh_c::executeCloseWait() { int daDsh_c::initClose() { mTiltTime = getCloseTiltTime(); speed.y = 0.0f; - mGravity = getCloseAccel(); + gravity = getCloseAccel(); return 1; } @@ -419,17 +419,17 @@ int daDsh_c::initClose() { /* 80467B04-80467BE0 0006E4 00DC+00 1/0 0/0 0/0 .text executeClose__7daDsh_cFv */ int daDsh_c::executeClose() { if (mTiltTime != 0) { - current.pos.y = (orig.pos.y - OPEN_SIZE) + cM_rndFX(2.0f); + current.pos.y = (home.pos.y - OPEN_SIZE) + cM_rndFX(2.0f); } else { - cLib_chaseF(&speed.y, getCloseSpeed(), mGravity); + cLib_chaseF(&speed.y, getCloseSpeed(), gravity); current.pos.y += speed.y; - if (current.pos.y > orig.pos.y) { - current.pos.y = orig.pos.y; + if (current.pos.y > home.pos.y) { + current.pos.y = home.pos.y; if (speed.y > getCloseBoundSpeed()) { speed.y *= getCloseBoundRatio(); - mGravity = 8.0f; + gravity = 8.0f; } else { setAction(&l_openWaitAction); } @@ -704,16 +704,16 @@ extern actor_process_profile_definition2 g_profile_DSHUTTER = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_DSHUTTER, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daDsh_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 296, // mPriority - &l_daDsh_Method, // mSubMtd + &l_daDsh_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // mCullType + fopAc_CULLBOX_0_e, // cullType }, 0, }; diff --git a/rel/d/a/d_a_econt/d_a_econt.cpp b/rel/d/a/d_a_econt/d_a_econt.cpp index 9fb4a30656..8a97c42359 100644 --- a/rel/d/a/d_a_econt/d_a_econt.cpp +++ b/rel/d/a/d_a_econt/d_a_econt.cpp @@ -95,14 +95,14 @@ extern actor_process_profile_definition g_profile_ECONT = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_ECONT, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(econt_class), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 155, // mPriority - &l_daEcont_Method, // mSubMtd + &l_daEcont_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // mCullType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp b/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp index b506f45ec0..6a93d69afb 100644 --- a/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp +++ b/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp @@ -36,7 +36,7 @@ u8 daGuardMng_c::checkMerchantNum() { void daGuardMng_c::checkAppearTag(daTagGuard_c* i_this) { cXyz pos; if ((u8)i_this->getAppearPoint(&pos) != 0) { - pos -= fopAcM_GetPosition_p(dComIfGp_getPlayer(0)); + pos -= *fopAcM_GetPosition_p(dComIfGp_getPlayer(0)); f32 pos_abs = pos.abs2(); if (field_0x56c > pos_abs) { @@ -84,14 +84,14 @@ extern actor_process_profile_definition g_profile_GUARD_MNG = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_GUARD_MNG, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daGuardMng_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 407, // mPriority - &l_daGuardMng_Method, // mSubMtd + &l_daGuardMng_Method, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // mCullType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/d_a_hitobj/d_a_hitobj.cpp b/rel/d/a/d_a_hitobj/d_a_hitobj.cpp index 23f42b4d65..8a043797c6 100644 --- a/rel/d/a/d_a_hitobj/d_a_hitobj.cpp +++ b/rel/d/a/d_a_hitobj/d_a_hitobj.cpp @@ -90,14 +90,14 @@ extern actor_process_profile_definition g_profile_HITOBJ = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_HITOBJ, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(hitobj_class), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 690, // mPriority - &l_daHitobj_Method, // mSubMtd + &l_daHitobj_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // mCullType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp b/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp index b7605db946..a7caf0fec7 100644 --- a/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp +++ b/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp @@ -87,8 +87,8 @@ int daIzumiGate_c::Execute(Mtx** i_mtx) { /* 80849328-808493CC 000308 00A4+00 1/0 0/0 0/0 .text Draw__13daIzumiGate_cFv */ int daIzumiGate_c::Draw() { - g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp b/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp index 05d6a80c2c..e0521a6917 100644 --- a/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp +++ b/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp @@ -377,14 +377,14 @@ static J3DModel* ArcIX_A_crwaku_model[1]; #ifdef NONMATCHING static void koro2_draw(fshop_class* param_1) { - if (param_1->mScale.x > 5.0f) { + if (param_1->scale.x > 5.0f) { dComIfGd_setListBG(); } - g_env_light.setLightTevColorType_MAJI(ArcIX_A_crwaku_model[0], ¶m_1->mTevStr); + g_env_light.setLightTevColorType_MAJI(ArcIX_A_crwaku_model[0], ¶m_1->tevStr); mDoExt_modelUpdateDL(ArcIX_A_crwaku_model[0]); for (s32 iVar1 = 0; iVar1 < (s32)ARRAY_SIZE(param_1->mKoro2); iVar1++) { if (param_1->mKoro2[iVar1].mpModel != NULL) { - g_env_light.setLightTevColorType_MAJI(param_1->mKoro2[iVar1].mpModel, ¶m_1->mTevStr); + g_env_light.setLightTevColorType_MAJI(param_1->mKoro2[iVar1].mpModel, ¶m_1->tevStr); mDoExt_modelUpdateDL(param_1->mKoro2[iVar1].mpModel); } } @@ -1527,14 +1527,14 @@ static J3DModel* ArcIX_A_crsaka_model[8]; // regalloc #ifdef NONMATCHING static int daFshop_Draw(fshop_class* param_0) { - g_env_light.settingTevStruct(0x10, ¶m_0->current.pos, ¶m_0->mTevStr); + g_env_light.settingTevStruct(0x10, ¶m_0->current.pos, ¶m_0->tevStr); if (param_0->field_0x4070 != NULL) { - g_env_light.setLightTevColorType_MAJI(param_0->field_0x4070, ¶m_0->mTevStr); + g_env_light.setLightTevColorType_MAJI(param_0->field_0x4070, ¶m_0->tevStr); param_0->field_0x4070->getModelData()->getMaterialNodePointer(0)->getTevKColor(1)->r = 0; mDoExt_modelUpdateDL(param_0->field_0x4070); dComIfGd_setSimpleShadow( - ¶m_0->current.pos, param_0->field_0x40b4.GetGroundH(), 66.6f * param_0->mScale.x, + ¶m_0->current.pos, param_0->field_0x40b4.GetGroundH(), 66.6f * param_0->scale.x, param_0->field_0x40b4.m_gnd, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); return 1; } @@ -1554,7 +1554,7 @@ static int daFshop_Draw(fshop_class* param_0) { 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; if (fVar4 * fVar4 + fVar5 * fVar5 > 1200.0f) { - g_env_light.setLightTevColorType_MAJI(param_0->mLure[iVar12].field_0x14, ¶m_0->mTevStr); + g_env_light.setLightTevColorType_MAJI(param_0->mLure[iVar12].field_0x14, ¶m_0->tevStr); mDoExt_modelUpdateDL(param_0->mLure[iVar12].field_0x14); if (param_0->mLure[iVar12].field_0x24 != 3) { for (int local_50 = 0; local_50 < 2; local_50++) { @@ -1565,30 +1565,30 @@ static int daFshop_Draw(fshop_class* param_0) { } for (int iVar9 = 0; iVar9 < 3; iVar9++) { - g_env_light.setLightTevColorType_MAJI(param_0->mRod[iVar9].field_0x14, ¶m_0->mTevStr); + g_env_light.setLightTevColorType_MAJI(param_0->mRod[iVar9].field_0x14, ¶m_0->tevStr); mDoExt_modelUpdateDL(param_0->mRod[iVar9].field_0x14); - param_0->mRod[iVar9].line_mat.update(8, rod_color[iVar9], ¶m_0->mTevStr); + param_0->mRod[iVar9].line_mat.update(8, rod_color[iVar9], ¶m_0->tevStr); dComIfGd_set3DlineMat(¶m_0->mRod[iVar9].line_mat); for (int local_54 = 0; local_54 < 6; local_54++) { dComIfGp_entrySimpleModel(param_0->mRod[iVar9].field_0x18[local_54], cVar11); } } for (int local_58 = 0; local_58 < 2; local_58++) { - g_env_light.setLightTevColorType_MAJI(param_0->mTsubo[local_58].field_0x14, ¶m_0->mTevStr); + g_env_light.setLightTevColorType_MAJI(param_0->mTsubo[local_58].field_0x14, ¶m_0->tevStr); mDoExt_modelUpdateDL(param_0->mTsubo[local_58].field_0x14); } - param_0->field_0x3f88.update(0xf, 1.2f, l_color, 2, ¶m_0->mTevStr); + param_0->field_0x3f88.update(0xf, 1.2f, l_color, 2, ¶m_0->tevStr); dComIfGd_set3DlineMat(¶m_0->field_0x3f88); - g_env_light.setLightTevColorType_MAJI(param_0->field_0x6b30, ¶m_0->mTevStr); + g_env_light.setLightTevColorType_MAJI(param_0->field_0x6b30, ¶m_0->tevStr); mDoExt_modelUpdateDL(param_0->field_0x6b30); - g_env_light.setLightTevColorType_MAJI(param_0->field_0x3ff4, ¶m_0->mTevStr); + g_env_light.setLightTevColorType_MAJI(param_0->field_0x3ff4, ¶m_0->tevStr); mDoExt_modelUpdateDL(param_0->field_0x3ff4); if (param_0->field_0x4004 != NULL) { mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f); MtxP pfVar10 = mDoMtx_stack_c::get(); param_0->field_0x4004->i_setBaseTRMtx(pfVar10); - g_env_light.setLightTevColorType_MAJI(param_0->field_0x4004, ¶m_0->mTevStr); + g_env_light.setLightTevColorType_MAJI(param_0->field_0x4004, ¶m_0->tevStr); mDoExt_modelUpdateDL(param_0->field_0x4004); } return 1; @@ -2095,7 +2095,7 @@ static asm void weed_control(fshop_class* param_0, fs_weed_s* param_1) { static void stage_copy(fshop_class* param_0, fshop_class* param_1) { param_0->field_0x4014 = param_1->field_0x4014; param_0->field_0x4020 = param_1->field_0x4020; - param_0->mScale = param_1->mScale; + param_0->scale = param_1->scale; } /* ############################################################################################## */ @@ -2160,7 +2160,7 @@ static void koro2_mtx_set(fshop_class* param_1) { mDoMtx_stack_c::YrotM(param_1->field_0x4020.y); mDoMtx_stack_c::XrotM(param_1->field_0x4020.x); mDoMtx_stack_c::ZrotM(param_1->field_0x4020.z); - mDoMtx_stack_c::scaleM(param_1->mScale.x, param_1->mScale.x, param_1->mScale.x); + mDoMtx_stack_c::scaleM(param_1->scale.x, param_1->scale.x, param_1->scale.x); mDoMtx_stack_c::push(); mDoMtx_stack_c::scaleM(0.01f, 0.01f, 0.01f); param_1->mpA_crwaku_model->i_setBaseTRMtx(mDoMtx_stack_c::get()); @@ -2320,7 +2320,7 @@ static u8 data_80870AC4[4]; static void koro2_game(fshop_class* i_this) { cXyz sp5C; cXyz sp68; - i_this->mScale.x = 1.0f; + i_this->scale.x = 1.0f; switch (i_this->field_0x4010) { case 0: @@ -2339,7 +2339,7 @@ static void koro2_game(fshop_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0x4020.x, 0, 2, 0x200); cLib_addCalcAngleS2(&i_this->field_0x4020.z, 0, 2, 0x200); case 2: - i_this->mScale.x = 10.0f; + i_this->scale.x = 10.0f; if (i_this->field_0x4010 == 2) { static f32 old_stick_x = 0.0f; @@ -2681,7 +2681,7 @@ static int daFshop_Execute(fshop_class* param_1) { return; } if (param_1->field_0x4070 != NULL) { - param_1->mScale.x = 0.024f; + param_1->scale.x = 0.024f; cXyz local_cc; cXyz local_d8; BOOL bVar5 = FALSE; @@ -2692,13 +2692,13 @@ static int daFshop_Execute(fshop_class* param_1) { case 0: param_1->current.pos = BallStartPos; param_1->current.pos.y += 4.0f; - param_1->next.pos = param_1->current.pos; + param_1->old.pos = param_1->current.pos; param_1->field_0x428d = 10; break; case 1: param_1->current.pos = BallStartPos; param_1->current.pos.y += 4.0f; - param_1->next.pos = param_1->current.pos; + param_1->old.pos = param_1->current.pos; param_1->speed.zero(); param_1->field_0x0572++; param_1->field_0x428c = 3; @@ -2706,7 +2706,7 @@ static int daFshop_Execute(fshop_class* param_1) { param_1->field_0x428d = 10; case 2: bVar5 = TRUE; - param_1->mScale.x = 0.24f; + param_1->scale.x = 0.24f; break; } @@ -2754,11 +2754,11 @@ static int daFshop_Execute(fshop_class* param_1) { } } if (!bVar5) { - iVar9->mHealth = 1; + iVar9->health = 1; } else if (param_1->field_0x567 == 1) { - iVar9->mHealth = 0; + iVar9->health = 0; } else { - iVar9->mHealth = 2; + iVar9->health = 2; } *(u16*)((u8*)iVar9 + 0x752) = 0x49; @@ -2781,7 +2781,7 @@ static int daFshop_Execute(fshop_class* param_1) { } if (bVar5) { - uVar19->mHealth = 3; + uVar19->health = 3; *(u16*)((u8*)uVar19 + 0x752) = 0x49; } else { *(u16*)((u8*)uVar19 + 0x752) = 0x4c; @@ -2845,9 +2845,9 @@ static int daFshop_Execute(fshop_class* param_1) { camera_class* pmVar11 = dComIfGp_getCamera(0); mDoMtx_stack_c::transS(param_1->current.pos.x, param_1->current.pos.y, param_1->current.pos.z); - mDoMtx_stack_c::scaleM(param_1->mScale.x, param_1->mScale.x, - param_1->mScale.x); - mDoMtx_stack_c::transM(0.0f, 190.0f * param_1->mScale.x, 0.0f); + 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; 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)))); diff --git a/rel/d/a/d_a_mirror/d_a_mirror.cpp b/rel/d/a/d_a_mirror/d_a_mirror.cpp index c750cc4811..d578948609 100644 --- a/rel/d/a/d_a_mirror/d_a_mirror.cpp +++ b/rel/d/a/d_a_mirror/d_a_mirror.cpp @@ -543,7 +543,7 @@ bool daMirror_c::createHeap() { /* 80871F78-80872018 001438 00A0+00 1/1 0/0 0/0 .text setModelMtx__10daMirror_cFv */ void daMirror_c::setModelMtx() { - field_0x6f8->setBaseScale(mScale); + field_0x6f8->setBaseScale(scale); mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::XrotM(shape_angle.x); @@ -628,13 +628,13 @@ int daMirror_c::create() { {-72.5f, 145.0f, 0.0f}, {72.5f, 145.0f, 0.0f}, {72.5f, 0.0f, 0.0f}, {-72.5f, 0.0f, 0.0f}, }; - mDoMtx_stack_c::scaleS(mScale); + mDoMtx_stack_c::scaleS(scale); mDoMtx_stack_c::revConcat(field_0x6f8->getBaseTRMtx()); cMtx_multVecArray(mDoMtx_stack_c::get(), src, mPacket.getQuad(), 4); mPacket.getViewScale().set(-1.0f, 1.0f, 1.0f); } else { if (type == 1) { - mScale *= 10.0f; + scale *= 10.0f; mPacket.getViewScale().set(1.0,-1.0,1.0); } else { if (type == 3) { @@ -657,7 +657,7 @@ int daMirror_c::create() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::XrotM(shape_angle.x); - mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); + mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z); static Vec const data_8087260Cb[4] = { {-50.0f, 100.0f, 0.0f}, {50.0f, 100.0f, 0.0f}, {50.0f, 0.0f, 0.0f}, {-50.0f, 0.0f, 0.0f}, @@ -670,7 +670,7 @@ int daMirror_c::create() { static Vec const data_8087263C_a = { 0.0f, 50.0f, 0.0f, }; - mDoMtx_stack_c::multVec(&data_8087263C_a, &mEyePos); + mDoMtx_stack_c::multVec(&data_8087263C_a, &eyePos); return 4; } #else @@ -725,7 +725,7 @@ int daMirror_c::execute() { fopAcM_searchActorDistance2(this, player) < 40000.0f) { if (fopAcM_seenActorAngleY(this, player) < 0x4000) { - daPy_py_c::setLookPos(&mEyePos); + daPy_py_c::setLookPos(&eyePos); } } return 1; @@ -748,8 +748,8 @@ static int daMirror_draw(daMirror_c* param_0) { } if (param_0->field_0x6f8) { - g_env_light.settingTevStruct(0x10, ¶m_0->current.pos, ¶m_0->mTevStr); - g_env_light.setLightTevColorType(param_0->field_0x6f8->mModelData, ¶m_0->mTevStr); + g_env_light.settingTevStruct(0x10, ¶m_0->current.pos, ¶m_0->tevStr); + g_env_light.setLightTevColorType(param_0->field_0x6f8->mModelData, ¶m_0->tevStr); mDoExt_modelUpdateDL(param_0->field_0x6f8); } diff --git a/rel/d/a/d_a_myna/d_a_myna.cpp b/rel/d/a/d_a_myna/d_a_myna.cpp index 032567fd1c..63ee385e58 100644 --- a/rel/d/a/d_a_myna/d_a_myna.cpp +++ b/rel/d/a/d_a_myna/d_a_myna.cpp @@ -1348,7 +1348,7 @@ int daMyna_c::create() { return cPhs_ERROR_e; } else { fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); - mCreature.init(¤t.pos, &mEyePos, 3, 1); + mCreature.init(¤t.pos, &eyePos, 3, 1); initiate(); setRoomNo(); execute(); @@ -1416,7 +1416,7 @@ extern "C" asm void __dt__12J3DFrameCtrlFv() { /* 809463B8-8094640C 000838 0054+00 1/1 0/0 0/0 .text destroy__8daMyna_cFv */ int daMyna_c::destroy() { dComIfG_resDelete(&mPhase, "Npc_myna"); - if (mHeap != NULL) { + if (heap != NULL) { mpMorf->stopZelAnime(); } return 1; @@ -1426,8 +1426,8 @@ int daMyna_c::destroy() { int daMyna_c::draw() { J3DModel* model = mpMorf->getModel(); J3DModelData* modelData = model->getModelData(); - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(model->getModelData(), &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr); if (cLib_checkBit(field_0x914, 0x40)) { mBtpAnm.entry(modelData); } @@ -1461,8 +1461,8 @@ int daMyna_c::execute() { i_fpcM_Search(daMyna_searchLight, this); } setRoomNo(); - mAttentionInfo.mPosition.set(current.pos.x, current.pos.y + 40.0f, current.pos.z); - mEyePos.set(mAttentionInfo.mPosition); + attention_info.position.set(current.pos.x, current.pos.y + 40.0f, current.pos.z); + eyePos.set(attention_info.position); if (field_0x926 > 0) { field_0x926--; } @@ -1591,11 +1591,11 @@ asm void daMyna_c::attack_wait_init() { // Matches with literals #ifdef NONMATCHING void daMyna_c::attack_wait_move() { - if (current.angle.y != orig.angle.y) { - cLib_addCalcAngleS(¤t.angle.y, orig.angle.y, 4, 32767, 1500); - cLib_addCalcAngleS(¤t.angle.x, orig.angle.x, 4, 32767, 1500); - if (abs(s16(current.angle.y - orig.angle.y)) < 128) { - current.angle = orig.angle; + if (current.angle.y != home.angle.y) { + cLib_addCalcAngleS(¤t.angle.y, home.angle.y, 4, 32767, 1500); + cLib_addCalcAngleS(¤t.angle.x, home.angle.x, 4, 32767, 1500); + if (abs(s16(current.angle.y - home.angle.y)) < 128) { + current.angle = home.angle; } } if (!daPy_py_c::i_checkNowWolf() && daMyna_evtTagActor0 != NULL) { @@ -1603,9 +1603,9 @@ void daMyna_c::attack_wait_move() { if (!dComIfGs_isSaveSwitch(0x3C)) { if (chkPlayerInEvtArea(daMyna_evtTagActor0, var1)) { if (!isEventFlag(1)) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { field_0x92C = 1; } } else { @@ -1615,9 +1615,9 @@ void daMyna_c::attack_wait_move() { } else if (field_0x92A < l_HOSTIO.field_0x24) { field_0x92A++; } else { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { field_0x92C = 4; } } @@ -1654,7 +1654,7 @@ asm void daMyna_c::attack_before_talk_init() { /* 80946B40-80946BB4 000FC0 0074+00 1/0 0/0 0/0 .text attack_before_talk_move__8daMyna_cFv */ void daMyna_c::attack_before_talk_move() { - if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { i_dComIfGp_event_reset(); onEventFlag(1); field_0x92C = 2; @@ -1763,7 +1763,7 @@ void daMyna_c::attack_after_talk_init() { /* 80946E08-80946E84 001288 007C+00 1/0 0/0 0/0 .text attack_after_talk_move__8daMyna_cFv */ void daMyna_c::attack_after_talk_move() { - if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { i_dComIfGp_event_reset(); onEventFlag(2); field_0x91C = 0x139; @@ -1800,32 +1800,32 @@ void daMyna_c::greet_wait_move() { if (!daPy_py_c::i_checkNowWolf()) { if (daMyna_evtTagActor0 != NULL) { if (chkPlayerInEvtArea(daMyna_evtTagActor0, cXyz(cXyz(1.0f, 1.0f, 1.0f)))) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { field_0x92C = 6; } } else { if (isEventFlag(0)) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { field_0x92C = 10; } } } } else { if (fopAcM_searchPlayerDistanceXZ(this) < 350.0f) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { field_0x92C = 6; } } else { if (isEventFlag(0)) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { field_0x92C = 10; } } @@ -1883,7 +1883,7 @@ asm void daMyna_c::greet_talk_init() { /* 8094711C-809471BC 00159C 00A0+00 1/0 0/0 0/0 .text greet_talk_move__8daMyna_cFv */ void daMyna_c::greet_talk_move() { - if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { i_dComIfGp_event_reset(); if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { field_0x937 = 20; @@ -1929,9 +1929,9 @@ void daMyna_c::shopping_wait_move() { bool bVar1 = false; s16 nowTotalPrice = dMsgObject_getMsgObjectClass()->getNowTotalPrice(); if (dMsgObject_getMsgObjectClass()->isPaymentFlag()) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { field_0x92C = 9; dMsgObject_getMsgObjectClass()->offPaymentFlag(); } @@ -1944,7 +1944,7 @@ void daMyna_c::shopping_wait_move() { dMsgObject_addTotalPrice(mShopItems[i].mValueNum); field_0x931 = i; if (mShopItems[i].mFlowNodeNum != 0xFFFF) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); } } @@ -1966,13 +1966,13 @@ void daMyna_c::shopping_wait_move() { cXyz stack_2c(1.0f, 1.0f, 1.0f); if (chkPlayerInEvtArea(daMyna_evtTagActor1, stack_2c)) { if (isEventFlag(0)) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); bVar1 = true; field_0x933 = 1; } else if (field_0x931 != 0xFF && mShopItems[field_0x931].mItemStatus == 2) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); bVar1 = true; field_0x933 = 1; @@ -1983,23 +1983,23 @@ void daMyna_c::shopping_wait_move() { if (daMyna_evtTagActor0 != NULL) { cXyz stack_38(1.0f, 1.0f, 1.0f); if (!chkPlayerInEvtArea(daMyna_evtTagActor0, stack_38) && nowTotalPrice > 0) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); bVar1 = true; } } else if (fopAcM_searchPlayerDistanceXZ(this) > 450.0f) { if (isEventFlag(0)) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); bVar1 = true; } else if (field_0x931 != 0xFF && mShopItems[field_0x931].mItemStatus == 2) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); bVar1 = true; } } - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { if (!bVar1) { field_0x92C = 8; } else { @@ -2030,7 +2030,7 @@ void daMyna_c::shopping_talk_init() { /* 80947630-809476A0 001AB0 0070+00 1/0 0/0 0/0 .text shopping_talk_move__8daMyna_cFv */ void daMyna_c::shopping_talk_move() { - if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { i_dComIfGp_event_reset(); field_0x828 = NULL; field_0x92C = 7; @@ -2053,7 +2053,7 @@ void daMyna_c::thanks_talk_init() { /* 8094772C-80947794 001BAC 0068+00 1/0 0/0 0/0 .text thanks_talk_move__8daMyna_cFv */ void daMyna_c::thanks_talk_move() { - if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { i_dComIfGp_event_reset(); field_0x92C = 7; } @@ -2096,7 +2096,7 @@ void daMyna_c::byebye_talk_init() { /* 809478D0-80947A00 001D50 0130+00 1/0 0/0 0/0 .text byebye_talk_move__8daMyna_cFv */ void daMyna_c::byebye_talk_move() { bool bVar1 = true; - if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { if (field_0x933 == 0) { if (field_0x931 != 0xFF) { mShopItems[field_0x931].mItemStatus = 3; @@ -2272,7 +2272,7 @@ asm void daMyna_c::turn_on_end1_init() { // Matches when l_HOSTIO is the correct type #ifdef NONMATCHING void daMyna_c::turn_on_end1_move() { - cXyz local_18 = orig.pos - current.pos; + cXyz local_18 = home.pos - current.pos; s16 sVar2 = cM_atan2s(local_18.x, local_18.z); cLib_addCalcAngleS(¤t.angle.y, sVar2, l_HOSTIO.field_0x26, l_HOSTIO.field_0x28, l_HOSTIO.field_0x2A); @@ -2318,7 +2318,7 @@ asm void daMyna_c::turn_on_end2_init() { void daMyna_c::turn_on_end2_move() { cXyz stack_24; cXyz local_30; - cXyz local_3c = orig.pos - current.pos; + cXyz local_3c = home.pos - current.pos; s16 sVar2 = cM_atan2s(local_3c.x, local_3c.z); f32 fVar1 = ((field_0x82C.y - field_0x844.y) + (field_0x838.y - field_0x850.y)) * 0.5f; @@ -2330,10 +2330,10 @@ void daMyna_c::turn_on_end2_move() { cLib_offsetPos(&stack_24, ¤t.pos, sVar2, &local_30); current.pos = stack_24; - cXyz stack_48 = orig.pos - current.pos; + cXyz stack_48 = home.pos - current.pos; if (stack_48.abs() < l_HOSTIO.field_0x20) { - current.pos.set(orig.pos); + current.pos.set(home.pos); field_0x92C = 15; } } @@ -2357,11 +2357,11 @@ void daMyna_c::turn_on_end3_init() { // Matches when l_HOSTIO is the correct type #ifdef NONMATCHING void daMyna_c::turn_on_end3_move() { - cLib_addCalcAngleS(¤t.angle.y, orig.angle.y, l_HOSTIO.field_0x26, l_HOSTIO.field_0x28, + cLib_addCalcAngleS(¤t.angle.y, home.angle.y, l_HOSTIO.field_0x26, l_HOSTIO.field_0x28, l_HOSTIO.field_0x2A); - if (abs(current.angle.y - orig.angle.y) <= 16) { - current.angle.y = orig.angle.y; + if (abs(current.angle.y - home.angle.y) <= 16) { + current.angle.y = home.angle.y; field_0x92C = field_0x92D; } } @@ -2414,11 +2414,11 @@ void daMyna_c::attack_wait2_move() { if (daPy_py_c::i_checkNowWolf()) { field_0x92C = 7; } else { - if (current.angle.y != orig.angle.y) { - cLib_addCalcAngleS(¤t.angle.y, orig.angle.y, 4, 0x7FFF, 0x5DC); - cLib_addCalcAngleS(¤t.angle.x, orig.angle.x, 4, 0x7FFF, 0x5DC); - if (abs(s16(current.angle.y - orig.angle.y)) < 128) { - current.angle = orig.angle; + if (current.angle.y != home.angle.y) { + cLib_addCalcAngleS(¤t.angle.y, home.angle.y, 4, 0x7FFF, 0x5DC); + cLib_addCalcAngleS(¤t.angle.x, home.angle.x, 4, 0x7FFF, 0x5DC); + if (abs(s16(current.angle.y - home.angle.y)) < 128) { + current.angle = home.angle; } } @@ -2431,10 +2431,10 @@ void daMyna_c::attack_wait2_move() { } } else { if (field_0x939 == 1) { - current.angle = orig.angle; - mEvtInfo.i_onCondition(1); + current.angle = home.angle; + eventInfo.i_onCondition(1); fopAcM_orderSpeakEvent(this, 0, 0); - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { field_0x92C = 21; } } else if (field_0x92A < l_HOSTIO.field_0x24) { @@ -2477,7 +2477,7 @@ asm void daMyna_c::attack_before_talk2_init() { /* 809483DC-80948444 00285C 0068+00 1/0 0/0 0/0 .text attack_before_talk2_move__8daMyna_cFv */ void daMyna_c::attack_before_talk2_move() { - if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { i_dComIfGp_event_reset(); field_0x92C = 19; } @@ -2603,7 +2603,7 @@ void daMyna_c::attack2_talk_init() { /* 80948734-809487EC 002BB4 00B8+00 1/0 0/0 0/0 .text attack2_talk_move__8daMyna_cFv */ void daMyna_c::attack2_talk_move() { - if (mEvtInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { + if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { i_dComIfGp_event_reset(); field_0x828 = NULL; field_0x92C = 7; @@ -2708,10 +2708,10 @@ bool daMyna_c::fly_return_move() { cLib_addCalcAngleS(¤t.angle.y, sVar2, 4, 0x7FFF, 0x5DC); cLib_addCalcAngleS(¤t.angle.x, sVar1, 4, 0x7FFF, 0x5DC); - cLib_addCalcPos2(¤t.pos, orig.pos, 0.001f, 100.0f); + cLib_addCalcPos2(¤t.pos, home.pos, 0.001f, 100.0f); } else { - cXyz stack_48 = orig.pos; + cXyz stack_48 = home.pos; cXyz local_30 = stack_48 - current.pos; f32 fVar4 = JMAFastSqrt(local_30.x * local_30.x + local_30.z * local_30.z); s16 sVar1 = -cM_atan2s(local_30.y, fVar4); @@ -2723,7 +2723,7 @@ bool daMyna_c::fly_return_move() { cXyz local_44 = stack_48 - current.pos; if (local_44.abs() < 3.0f) { - current.pos.set(orig.pos); + current.pos.set(home.pos); return true; } } @@ -2818,7 +2818,7 @@ int daMyna_c::chkEvent() { if (daPy_py_c::i_checkNowWolf()) { if (!i_dComIfGp_getEvent().i_isOrderOK()) { retVal = 0; - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { if (field_0x92C == 0x10) { (this->*move_proc[field_0x92C])(); retVal = 0; @@ -2858,12 +2858,12 @@ int daMyna_c::orderEvent() { case 13: case 14: case 15: - mAttentionInfo.mFlags = 10; + attention_info.flags = 10; } - if (mAttentionInfo.mFlags == 10) { - mAttentionInfo.field_0x0[1] = 0x8B; - mAttentionInfo.field_0x0[3] = 0x8B; - mEvtInfo.i_onCondition(1); + if (attention_info.flags == 10) { + attention_info.field_0x0[1] = 0x8B; + attention_info.field_0x0[3] = 0x8B; + eventInfo.i_onCondition(1); } } return 1; @@ -3054,10 +3054,10 @@ asm void daMyna_c::setCollision() { void daMyna_c::set_mtx() { J3DModel* model = mpMorf->getModel(); cXyz local_18(current.pos); - mScale.set(l_HOSTIO.field_0x04, l_HOSTIO.field_0x04, l_HOSTIO.field_0x04); + scale.set(l_HOSTIO.field_0x04, l_HOSTIO.field_0x04, l_HOSTIO.field_0x04); mDoMtx_stack_c::transS(local_18); mDoMtx_stack_c::ZXYrotM(current.angle); - mDoMtx_stack_c::scaleM(mScale); + mDoMtx_stack_c::scaleM(scale); model->i_setBaseTRMtx(mDoMtx_stack_c::get()); mpMorf->modelCalc(); mDoMtx_stack_c::copy(mpMorf->getModel()->i_getAnmMtx(4)); @@ -3307,7 +3307,7 @@ int daMyna_c::getItemType(void* param_0) { /* 80949C0C-80949C44 00408C 0038+00 3/3 0/0 0/0 .text getFlowNodeNum__8daMyna_cFv */ u16 daMyna_c::getFlowNodeNum() { - u16 num = orig.angle.x; + u16 num = home.angle.x; bool bVar1 = false; if (num == 0xFFFF || num == 0) { bVar1 = true; @@ -3369,14 +3369,14 @@ int daMyna_c::chkPlayerInEvtArea(fopAc_ac_c* param_0, cXyz param_1) { mDoMtx_stack_c::transM(-param_0->current.pos.x, -param_0->current.pos.y, -param_0->current.pos.z); mDoMtx_stack_c::multVec(&daPy_getPlayerActorClass()->current.pos, &local_6c); - f32 fVar1 = fabsf(param_0->mScale.x + param_1.x); - f32 fVar2 = fabsf(param_0->mScale.z + param_1.z); + f32 fVar1 = fabsf(param_0->scale.x + param_1.x); + f32 fVar2 = fabsf(param_0->scale.z + param_1.z); f32 fVar3 = fabsf(local_6c.x); f32 fVar4 = fabsf(local_6c.z); local_60 = param_0->current.pos - daPy_getPlayerActorClass()->current.pos; if ((fVar3 * fVar3) / (fVar1 * fVar1) + (fVar4 * fVar4) / (fVar2 * fVar2) <= 1.0f && - -(param_0->mScale.y + param_1.y) < local_60.y && - local_60.y < (param_0->mScale.y + param_1.y)) + -(param_0->scale.y + param_1.y) < local_60.y && + local_60.y < (param_0->scale.y + param_1.y)) { retVal = 1; } @@ -3494,10 +3494,10 @@ void daMyna_c::playDefaultWaitAnime() { cXyz stack_70; local_58.x = daMyna_LightActor->current.pos.x; - local_58.y = orig.pos.y; + local_58.y = home.pos.y; local_58.z = daMyna_LightActor->current.pos.z; - cXyz stack_7c = local_58 - orig.pos; + cXyz stack_7c = local_58 - home.pos; s16 sVar42 = cM_atan2s(stack_7c.x, stack_7c.z); f32 fVar7 = stack_7c.abs(); @@ -3510,7 +3510,7 @@ void daMyna_c::playDefaultWaitAnime() { cLib_offsetPos(&stack_70, ¤t.pos, sVar42, &local_64); current.pos = stack_70; - cXyz stack_88 = current.pos - orig.pos; + cXyz stack_88 = current.pos - home.pos; if (fVar7 > field_0x910 * stack_88.abs()) { setAnimeType(1, 6.0f); } @@ -3518,7 +3518,7 @@ void daMyna_c::playDefaultWaitAnime() { case 5: cXyz local_94; cXyz stack_a0; - cXyz local_ac = orig.pos - current.pos; + cXyz local_ac = home.pos - current.pos; s16 sVar4 = cM_atan2s(local_ac.x, local_ac.z); f32 fVar2 = ((field_0x82C.y - field_0x844.y) + (field_0x838.y - field_0x850.y)) * 0.5f; @@ -3530,10 +3530,10 @@ void daMyna_c::playDefaultWaitAnime() { cLib_offsetPos(&stack_a0, ¤t.pos, sVar4, &local_94); current.pos = stack_a0; - cXyz stack_b8 = orig.pos - current.pos; + cXyz stack_b8 = home.pos - current.pos; if (stack_b8.abs() < l_HOSTIO.field_0x20) { - current.pos.set(orig.pos); + current.pos.set(home.pos); setAnimeType(1, 6.0f); } break; @@ -3583,7 +3583,7 @@ void daMyna_c::setDefaultWaitAnime(u8 param_0) { setAnimeType(3, 0.0f); break; default: - cXyz stack_24 = orig.pos - current.pos; + cXyz stack_24 = home.pos - current.pos; if (stack_24.abs() < l_HOSTIO.field_0x20) { field_0x910 = cM_rnd() * 0.25f + 0.25f; setAnimeType(6, 0.0f); diff --git a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp index 408ef1672f..2a59f468ad 100644 --- a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp +++ b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp @@ -83,9 +83,9 @@ static int daScex_Create(fopAc_ac_c* i_this) { mDoMtx_stack_c::transS(scex->current.pos.x, scex->current.pos.y, scex->current.pos.z); mDoMtx_stack_c::YrotM(scex->shape_angle.y); MTXInverse(mDoMtx_stack_c::get(), scex->mMatrix); - scex->mScale.x *= 75.0f; - scex->mScale.z *= 75.0f; - scex->mScale.y *= 150.0f; + scex->scale.x *= 75.0f; + scex->scale.z *= 75.0f; + scex->scale.y *= 150.0f; return cPhs_COMPLEATE_e; } @@ -148,7 +148,7 @@ int daScex_c::execute() { if (checkWork()) { mDoMtx_multVec(mMatrix, &player->current.pos, &spC); - if (spC.y >= 0.0f && spC.y <= mScale.y && fabsf(spC.x) <= mScale.x && fabsf(spC.z) <= mScale.z) { + if (spC.y >= 0.0f && spC.y <= scale.y && fabsf(spC.x) <= scale.x && fabsf(spC.z) <= scale.z) { switch (getArg1()) { case 0xFF: case 1: diff --git a/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp b/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp index 493eff52bb..c99da9af52 100644 --- a/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp +++ b/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp @@ -46,11 +46,11 @@ static char* l_evName = "SCENE_EXIT"; /* 8059E1B0-8059E230 0000D0 0080+00 1/1 0/0 0/0 .text Create__10daScExit_cFv */ int daScExit_c::Create() { - mRadius = mScale.x * 100.0f; + mRadius = scale.x * 100.0f; initBaseMtx(); mToolID = 0xFF; - mEvtInfo.setArchiveName(l_arcName); + eventInfo.setArchiveName(l_arcName); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xFF); return 1; } @@ -89,19 +89,19 @@ void daScExit_c::actionWait() { if (checkArea()) { setAction(ACTION_ORDER_EVENT_e); fopAcM_orderOtherEventId(this, mEventID, mToolID, 0xFFFF, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } /* 8059E408-8059E488 000328 0080+00 1/0 0/0 0/0 .text actionOrderEvent__10daScExit_cFv */ void daScExit_c::actionOrderEvent() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(ACTION_EVENT_e); demoProc(); dComIfGp_setPlayerStatus1(0, 0x4000000); } else { fopAcM_orderOtherEventId(this, mEventID, mToolID, 0xFFFF, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } @@ -139,8 +139,8 @@ int daScExit_c::demoProc() { break; case START_e: fopAcM_seStart(this, Z2SE_SY_WARP_FADE, 0); - mAttentionInfo.mPosition.y = current.pos.y + 800.0f; - mEyePos.y = mAttentionInfo.mPosition.y; + attention_info.position.y = current.pos.y + 800.0f; + eyePos.y = attention_info.position.y; break; case SCENE_CHG_e: break; diff --git a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp index fe48e4dcc9..3d9936c1ff 100644 --- a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp +++ b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp @@ -20,7 +20,7 @@ int daSetBgObj_c::CreateInit() { u16* spec_data_p = (u16*)dComIfG_getObjectRes(mArcName, l_specName); fopAcM_create(l_bg_profName[*spec_data_p], fopAcM_GetParam(this), ¤t.pos, - fopAcM_GetRoomNo(this), ¤t.angle, &mScale, -1); + fopAcM_GetRoomNo(this), ¤t.angle, &scale, -1); return 1; } diff --git a/rel/d/a/d_a_spinner/d_a_spinner.cpp b/rel/d/a/d_a_spinner/d_a_spinner.cpp index 97d0a3ee26..620bcf263b 100644 --- a/rel/d/a/d_a_spinner/d_a_spinner.cpp +++ b/rel/d/a/d_a_spinner/d_a_spinner.cpp @@ -515,12 +515,12 @@ void daSpinner_c::setRoomInfo() { int roomNo; if (mAcch.GetGroundH() != -1000000000.0f) { roomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd); } else { roomNo = dComIfGp_roomControl_getStayNo(); } - mTevStr.mRoomNo = roomNo; + tevStr.mRoomNo = roomNo; field_0xa6e = dComIfGp_getReverb(roomNo); mStts.SetRoomId(roomNo); fopAcM_SetRoomNo(this, roomNo); diff --git a/rel/d/a/d_a_suspend/d_a_suspend.cpp b/rel/d/a/d_a_suspend/d_a_suspend.cpp index d3baabb439..5c6635e24f 100644 --- a/rel/d/a/d_a_suspend/d_a_suspend.cpp +++ b/rel/d/a/d_a_suspend/d_a_suspend.cpp @@ -20,16 +20,16 @@ int daSus_c::create() { u8 arg1 = getArg1(); if (getScale() != 0) { - mScale.x *= 1250.0f; - mScale.y *= 2500.0f; - mScale.z *= 1250.0f; + scale.x *= 1250.0f; + scale.y *= 2500.0f; + scale.z *= 1250.0f; } else { - mScale.x *= 125.0f; - mScale.y *= 250.0f; - mScale.z *= 125.0f; + scale.x *= 125.0f; + scale.y *= 250.0f; + scale.z *= 125.0f; } - newData(roomNo, current.pos, mScale, sw, arg0, arg1); + newData(roomNo, current.pos, scale, sw, arg0, arg1); return cPhs_COMPLEATE_e; } diff --git a/rel/d/a/d_a_swTime/d_a_swTime.cpp b/rel/d/a/d_a_swTime/d_a_swTime.cpp index 36c41bbc45..5dd4062709 100644 --- a/rel/d/a/d_a_swTime/d_a_swTime.cpp +++ b/rel/d/a/d_a_swTime/d_a_swTime.cpp @@ -72,14 +72,14 @@ extern actor_process_profile_definition g_profile_SwTime = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_SwTime, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daSwTime_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 576, // mPriority - &l_daSwTime_Method, // mSubMtd + &l_daSwTime_Method, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/d_a_swc00/d_a_swc00.cpp b/rel/d/a/d_a_swc00/d_a_swc00.cpp index 79d58a1faf..92a5187d68 100644 --- a/rel/d/a/d_a_swc00/d_a_swc00.cpp +++ b/rel/d/a/d_a_swc00/d_a_swc00.cpp @@ -105,7 +105,7 @@ static bool hitCheck(daSwc00_c* i_swc) { f32 xz_dist = fopAcM_searchActorDistanceXZ2(i_swc, player); f32 y_dist = fopAcM_searchActorDistanceY(i_swc, player); - if (xz_dist < i_swc->mScale.x && -100.0f < y_dist && y_dist < i_swc->mScale.y) { + if (xz_dist < i_swc->scale.x && -100.0f < y_dist && y_dist < i_swc->scale.y) { return true; } } else if (shape == 0) { diff --git a/rel/d/a/d_a_talk/d_a_talk.cpp b/rel/d/a/d_a_talk/d_a_talk.cpp index 5e3ecdfd5a..6bc81de02e 100644 --- a/rel/d/a/d_a_talk/d_a_talk.cpp +++ b/rel/d/a/d_a_talk/d_a_talk.cpp @@ -34,7 +34,7 @@ int daTalk_c::create() { return cPhs_ERROR_e; } - mAttentionInfo = dMsgObject_getMsgObjectClass()->getpTalkActor()->mAttentionInfo; + attention_info = dMsgObject_getMsgObjectClass()->getpTalkActor()->attention_info; mMessageID = -1; return cPhs_COMPLEATE_e; } @@ -43,21 +43,21 @@ int daTalk_c::create() { int daTalk_c::execute() { dComIfG_inf_c& dcomif = g_dComIfG_gameInfo; if (dcomif.play.getEvent().runCheck()) { - if (!mEvtInfo.checkCommandTalk()) { + if (!eventInfo.checkCommandTalk()) { fopAcM_delete(this); } } else { if (fopAcM_searchPlayerDistanceXZ(this) > - dAttention_c::i_getDistTable(mAttentionInfo.field_0x0[1]).field_0x4) + dAttention_c::i_getDistTable(attention_info.field_0x0[1]).field_0x4) { mMessageID = -1; fopAcM_delete(this); } else { - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); } } - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { if (dMsgObject_getMsgObjectClass()->getNodeIdx() == 0xFF) { if (mMessageID == -1) { mMessageID = messageSet(); diff --git a/rel/d/a/d_a_tbox/d_a_tbox_NONMATCHING.cpp b/rel/d/a/d_a_tbox/d_a_tbox_NONMATCHING.cpp index 7375d34e2e..4bb0ad192e 100644 --- a/rel/d/a/d_a_tbox/d_a_tbox_NONMATCHING.cpp +++ b/rel/d/a/d_a_tbox/d_a_tbox_NONMATCHING.cpp @@ -75,7 +75,7 @@ static cXyz l_light_offset(0.0f, 35.0f, 0.0f); daTbox_HIO_c::daTbox_HIO_c() { mItemNo = 1; mUseDebugItemNo = 0; - mGravity = -2.0f; + gravity = -2.0f; mDemoType = 0; mTimerDisplay = 0; mCheckDisplay = 0; @@ -150,9 +150,9 @@ cPhs__Step daTbox_c::commonShapeSet() { return cPhs_ERROR_e; } } - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); mDoMtx_stack_c::transS(current.pos); - mDoMtx_stack_c::YrotM(orig.angle.y); + mDoMtx_stack_c::YrotM(home.angle.y); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); if (mpEffectModel != NULL) { mpEffectModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); @@ -254,7 +254,7 @@ void daTbox_c::surfaceProc() { field_0x750 = 0.0f; } mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x750, current.pos.z); - mDoMtx_stack_c::YrotM(orig.angle.y); + mDoMtx_stack_c::YrotM(home.angle.y); mDoMtx_copy(mDoMtx_stack_c::get(), mBgMtx); mpBgCollider->Move(); } @@ -363,21 +363,21 @@ void daTbox_c::CreateInit() { if (func_type == 5 || func_type == 6 || field_0x9cc == 1) { mAcchCir.SetWall(500.0f, 0.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, + mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, ¤t.angle, &shape_angle); - mGravity = -2.0f; + gravity = -2.0f; field_0x97d = true; field_0x97c = true; } else if (func_type == 3) { mAcchCir.SetWall(500.0f, 0.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL); } mTboxNo = getTboxNo(); mEventId = i_dComIfGp_getEventManager().getEventIdx(this, getEvent()); if (getShapeType() == SHAPE_BOSSKEY) { - mEvtInfo.setArchiveName(getModelInfo()->mArcName); + eventInfo.setArchiveName(getModelInfo()->mArcName); field_0x984 = i_dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_TREASURE_BOSS", 0xff); } @@ -397,17 +397,17 @@ void daTbox_c::initPos() { if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetRoomNo(this))) { dStage_dPnt_c* pnt = &path->m_points[path->m_num - 1]; current.pos = pnt->m_position; - orig.pos = pnt->m_position; + home.pos = pnt->m_position; } } else if (func_type == 6 && getSwType() == 0 && checkDrop()) { cXyz pos; calcJumpGoalAndAngle(&pos, ¤t.angle.y); current.pos = pos; - orig.pos = pos; - getDropSAngle(&orig.angle.y); + home.pos = pos; + getDropSAngle(&home.angle.y); } - cXyz vec1 = orig.pos; - cXyz vec2 = orig.pos; + cXyz vec1 = home.pos; + cXyz vec2 = home.pos; vec1.y += 5.0f; vec2.y -= 30.0f; bool line_check = fopAcM_lc_c::lineCheck(&vec1, &vec2, this); @@ -432,9 +432,9 @@ void daTbox_c::initAnm() { shape_angle.z = 0; shape_angle.x = 0; } - orig.pos = current.pos; - mAttentionInfo.mPosition = current.pos; - mEyePos = current.pos; + home.pos = current.pos; + attention_info.position = current.pos; + eyePos = current.pos; } setAction(&actionWait); int tbox_no = getTboxNo(); @@ -452,9 +452,9 @@ void daTbox_c::initAnm() { shape_angle.z = 0; shape_angle.x = 0; } - orig.pos = current.pos; - mAttentionInfo.mPosition = current.pos; - mEyePos = current.pos; + home.pos = current.pos; + attention_info.position = current.pos; + eyePos = current.pos; setAction(&actionOpenWait); } else { setAction(&actionDropWaitForWeb); @@ -498,7 +498,7 @@ int daTbox_c::boxCheck() { player->getKandelaarFlamePos() == NULL) { return false; } - cXyz vec = player->mAttentionInfo.mPosition - current.pos; + cXyz vec = player->attention_info.position - current.pos; f32 dist2_xz = vec.abs2XZ(); f32 dist_y = fabsf(player->current.pos.y - current.pos.y); if (dist2_xz < 22500.0f && fopAcM_seenPlayerAngleY(this) < 0x2000 && @@ -724,7 +724,7 @@ void daTbox_c::dropProc() { speedF = 0.0f; cXyz vec1(2.0f, 2.0f, 2.0f); s32 room_no = fopAcM_GetRoomNo(this); - dComIfGp_particle_setPolyColor(0xe7, mAcch.m_gnd, ¤t.pos, &mTevStr, &orig.angle, + dComIfGp_particle_setPolyColor(0xe7, mAcch.m_gnd, ¤t.pos, &tevStr &home.angle, &vec1, 0, NULL, room_no, NULL); dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); u32 sound_id = 0; @@ -738,9 +738,9 @@ void daTbox_c::dropProc() { if (bg_index >= 0 && bg_index < 0x100) { sound_id = dComIfG_Bgsp().GetMtrlSndId(&gnd_chk); } - mDoAud_seStart(0x8002f, &mEyePos, sound_id, dComIfGp_getReverb(orig.roomNo)); + mDoAud_seStart(0x8002f, &eyePos, sound_id, dComIfGp_getReverb(home.roomNo)); } - if (orig.pos.abs(current.pos) > 400.0f) { + if (home.pos.abs(current.pos) > 400.0f) { field_0x97c = true; field_0x97d = true; } @@ -751,10 +751,10 @@ void daTbox_c::demoInitAppear() { mpEffectAnm->setFrame(0.0f); mpEffectAnm->setPlaySpeed(1.0f); cXyz vec1(current.pos.x, current.pos.y + 55.0f, current.pos.z); - csXyz vec2 = orig.angle; + csXyz vec2 = home.angle; static u16 const eff_id[6] = {0x8840, 0x8841, 0x8842, 0x8843, 0x8844, 0x8845}; for (u32 i = 0; i < 6; i++) { - dComIfGp_particle_set(eff_id[i], &vec1, &vec2, &mScale, 0xff, NULL, -1, NULL, NULL, NULL); + dComIfGp_particle_set(eff_id[i], &vec1, &vec2, &scale, 0xff, NULL, -1, NULL, NULL, NULL); } flagOff(0x40); flagOn(1); @@ -909,7 +909,7 @@ int daTbox_c::actionWait() { /* 804939FC-80493CC8 002DBC 02CC+00 1/0 0/0 0/0 .text actionDemo__8daTbox_cFv */ int daTbox_c::actionDemo() { - if (dComIfGp_evmng_endCheck(mEvtInfo.getEventId())) { + if (dComIfGp_evmng_endCheck(eventInfo.getEventId())) { if (field_0x718) { mpAnm->setPlaySpeed(0.0f); mpAnm->setFrame(0.0f); @@ -978,7 +978,7 @@ int daTbox_c::actionDropDemo() { setAction(&actionOpenWait); i_dComIfGp_event_reset(); setDzb(); - orig.pos = current.pos; + home.pos = current.pos; if (field_0x9c9 != 0) { camera_class* camera = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); camera->mCamera.Start(); @@ -992,7 +992,7 @@ int daTbox_c::actionDropDemo() { dropProc(); if (mAcch.ChkGroundLanding() && field_0x97d) { setAction(&actionOpenWait); - orig.pos = current.pos; + home.pos = current.pos; } } return true; @@ -1255,7 +1255,7 @@ int daTbox_c::setGetDemoItem() { int daTbox_c::actionOpenWait() { daMidna_c* midna = daPy_py_c::getMidnaActor(); daPy_py_c* player = daPy_getPlayerActorClass(); - if (mEvtInfo.i_checkCommandDoor()) { + if (eventInfo.i_checkCommandDoor()) { dComIfGp_event_onEventFlag(4); if (getShapeType() != SHAPE_SMALL && player->i_checkNowWolf() && !midna->checkMetamorphoseEnable()) { @@ -1272,17 +1272,17 @@ int daTbox_c::actionOpenWait() { field_0x9f4 = 0; } } else if (boxCheck()) { - mEvtInfo.i_onCondition(4); + eventInfo.i_onCondition(4); if (getShapeType() == SHAPE_SMALL) { - mEvtInfo.setEventName("DEFAULT_TREASURE_SIMPLE"); + eventInfo.setEventName("DEFAULT_TREASURE_SIMPLE"); } else if (player->i_checkNowWolf() && !midna->checkMetamorphoseEnable()) { - mEvtInfo.setEventName("DEFAULT_TREASURE_NOTOPEN"); + eventInfo.setEventName("DEFAULT_TREASURE_NOTOPEN"); } else if (getShapeType() == SHAPE_BOSSKEY) { - mEvtInfo.setEventId(field_0x984); + eventInfo.setEventId(field_0x984); } else if (checkEnvEffectTbox()) { - mEvtInfo.setEventName("DEFAULT_TREASURE_EFFECT"); + eventInfo.setEventName("DEFAULT_TREASURE_EFFECT"); } else { - mEvtInfo.setEventName("DEFAULT_TREASURE_NORMAL"); + eventInfo.setEventName("DEFAULT_TREASURE_NORMAL"); } } return true; @@ -1333,8 +1333,8 @@ void daTbox_c::settingDropDemoCamera() { cXyz vec1, vec2, vec4, vec3, vec5, vec6; vec1.x = stage_arrow_data->mPosition.x; vec1.z = stage_arrow_data->mPosition.z; - vec2.x = orig.pos.x; - vec2.z = orig.pos.z; + vec2.x = home.pos.x; + vec2.z = home.pos.z; f32 dist_xz = vec1.abs(vec2); vec3 = cXyz::BaseY; s16 angle; @@ -1342,14 +1342,14 @@ void daTbox_c::settingDropDemoCamera() { vec4.x = stage_arrow_data->mPosition.x; vec4.y = 0.0f; vec4.z = stage_arrow_data->mPosition.z; - vec4 -= orig.pos; + vec4 -= home.pos; Mtx mtx; PSMTXRotAxisRad(mtx, &vec3, cM_s2rad(angle)); mDoMtx_multVec(mtx, &vec4, &vec4); - vec4 += orig.pos; + vec4 += home.pos; vec4.y = stage_arrow_data->mPosition.y; vec5 = vec4; - vec6 = orig.pos; + vec6 = home.pos; s16 arrow_angle = stage_arrow_data->mAngle.x; f32 dist = dist_xz * (cM_ssin(arrow_angle) / cM_scos(arrow_angle)); if (arrow_angle > 0) { @@ -1362,7 +1362,7 @@ void daTbox_c::settingDropDemoCamera() { /* 80494D88-80494E98 004148 0110+00 1/0 0/0 0/0 .text actionSwOnWait__8daTbox_cFv */ int daTbox_c::actionSwOnWait() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(&actionDemo2); mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); @@ -1372,7 +1372,7 @@ int daTbox_c::actionSwOnWait() { } else { fopAcM_orderOtherEventId(this, mEventId, getEvent(), 0xffff, 0, 1); } - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } return true; } @@ -1393,7 +1393,7 @@ int daTbox_c::actionSwOnWait2() { /* 80494F44-80495058 004304 0114+00 1/0 0/0 0/0 .text actionDropWait__8daTbox_cFv */ int daTbox_c::actionDropWait() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(&actionDropDemo); clrDzb(); field_0x97d = false; @@ -1404,7 +1404,7 @@ int daTbox_c::actionDropWait() { } else if (checkDrop()) { if (mEventId != -1) { fopAcM_orderOtherEventId(this, mEventId, getEvent(), 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } else { dropProcInitCall(); setAction(&actionDropDemo); @@ -1416,7 +1416,7 @@ int daTbox_c::actionDropWait() { /* 80495058-8049518C 004418 0134+00 1/0 0/0 0/0 .text actionGenocide__8daTbox_cFv */ int daTbox_c::actionGenocide() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(&actionDemo2); mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); @@ -1429,7 +1429,7 @@ int daTbox_c::actionGenocide() { } else { fopAcM_orderOtherEventId(this, mEventId, getEvent(), 0xffff, 0, 1); } - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); dComIfGs_onSwitch(getSwNo(), fopAcM_GetRoomNo(this)); } } @@ -1462,14 +1462,14 @@ int daTbox_c::actionDropWaitForWeb() { int daTbox_c::actionDropForWeb() { fopAcM_posMoveF(this, NULL); mAcch.CrrPos(dComIfG_Bgsp()); - orig.pos = current.pos; - mAttentionInfo.mPosition = current.pos; - mEyePos = current.pos; + home.pos = current.pos; + attention_info.position = current.pos; + eyePos = current.pos; setBaseMtx(); if (mAcch.ChkGroundLanding()) { cXyz vec(2.0f, 2.0f, 2.0f); s32 room_no = fopAcM_GetRoomNo(this); - dComIfGp_particle_setPolyColor(0xe7, mAcch.m_gnd, ¤t.pos, &mTevStr, &orig.angle, + dComIfGp_particle_setPolyColor(0xe7, mAcch.m_gnd, ¤t.pos, &tevStr, &home.angle, &vec, 0, NULL, room_no, NULL); dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); setDzb(); @@ -1487,9 +1487,9 @@ void daTbox_c::initBaseMtx() { field_0x9c4 = 0; mRotAxis = cXyz::BaseX; mDoMtx_identity(field_0x988); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); if (mpSlimeModel != NULL) { - mpSlimeModel->setBaseScale(mScale); + mpSlimeModel->setBaseScale(scale); } setBaseMtx(); if (mpBgW != NULL) { @@ -1510,8 +1510,8 @@ void daTbox_c::setBaseMtx() { } s16 angle; if (getDropSAngle(&angle) && fabsf(speed.y) > 2.0f) { - cLib_addCalcAngleS(&orig.angle.y, angle, 10, 0xc00, 0x400); - shape_angle = orig.angle; + cLib_addCalcAngleS(&home.angle.y, angle, 10, 0xc00, 0x400); + shape_angle = home.angle; } mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transM(0.0f, 50.0f, 0.0f); @@ -1550,14 +1550,14 @@ void daTbox_c::mode_exec_wait() { bool bvar1 = false; if (field_0x9cc != 0) { flagOn(0x40); - cXyz vec1(orig.pos); - cXyz vec2(orig.pos); + cXyz vec1(home.pos); + cXyz vec2(home.pos); vec1.y += 5.0f; vec2.y -= 30.0f; if (fopAcM_lc_c::lineCheck(&vec1, &vec2, this) && fopAcM_lc_c::checkMoveBG()) { bvar1 = true; - orig.pos = *fopAcM_lc_c::getCrossP(); - current.pos = orig.pos; + home.pos = *fopAcM_lc_c::getCrossP(); + current.pos = home.pos; } } if (bvar1) { @@ -1577,8 +1577,8 @@ void daTbox_c::mode_exec() { } else { mAcch.i_ClrGroundHit(); } - mAttentionInfo.mPosition = current.pos; - mEyePos = current.pos; + attention_info.position = current.pos; + eyePos = current.pos; setBaseMtx(); if (mpBgCollider == mpOpenBgW) { mpBgCollider->Move(); @@ -1590,10 +1590,10 @@ void daTbox_c::mode_exec() { /* 80495910-804959EC 004CD0 00DC+00 1/1 0/0 0/0 .text create1st__8daTbox_cFv */ cPhs__Step daTbox_c::create1st() { if (!mParamsInit) { - field_0x980 = orig.angle.x; - field_0x982 = orig.angle.z; - orig.angle.z = 0; - orig.angle.x = 0; + field_0x980 = home.angle.x; + field_0x982 = home.angle.z; + home.angle.z = 0; + home.angle.x = 0; mParamsInit = true; } daTbox_ModelInfo* model_info = getModelInfo(); @@ -1607,8 +1607,8 @@ cPhs__Step daTbox_c::create1st() { return step; } CreateInit(); - mAttentionInfo.mFlags = 0x40; - mAttentionInfo.mFlags |= 0x400000; + attention_info.flags = 0x40; + attention_info.flags |= 0x400000; return step; } @@ -1632,9 +1632,9 @@ int daTbox_c::Draw() { if (flagCheck(0x40)) { return true; } - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); if (mpEffectModel != NULL && mpEffectAnm->getPlaySpeed() != 0.0f) { - g_env_light.setLightTevColorType_MAJI(mpEffectModel, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpEffectModel, &tevStr); mpEffectAnm->entry(mpEffectModel->getModelData()); mDoExt_modelUpdateDL(mpEffectModel); mDoExt_brkAnmRemove(mpEffectModel->getModelData()); @@ -1642,7 +1642,7 @@ int daTbox_c::Draw() { if (flagCheck(1)) { return true; } - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); if (mpSlimeModel != NULL) { dComIfGd_setXluListBG(); mDoExt_modelUpdateDL(mpSlimeModel); diff --git a/rel/d/a/d_a_tbox2/Makefile b/rel/d/a/d_a_tbox2/Makefile index 06bf4a7e81..7102d5b6d8 100644 --- a/rel/d/a/d_a_tbox2/Makefile +++ b/rel/d/a/d_a_tbox2/Makefile @@ -8,12 +8,10 @@ M42_MAP := $(BUILD_DIR)/rel/d/a/d_a_tbox2.map M42_CPP_FILES := \ rel/executor.cpp \ - rel/d/a/d_a_tbox2/unknown_translation_unit_bss.cpp \ rel/d/a/d_a_tbox2/d_a_tbox2.cpp \ M42_O_FILES := \ $(BUILD_DIR)/rel/executor.o \ - $(BUILD_DIR)/rel/d/a/d_a_tbox2/unknown_translation_unit_bss.o \ $(BUILD_DIR)/rel/d/a/d_a_tbox2/d_a_tbox2.o \ M42_LIBS := \ diff --git a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp index c849f72c3a..06d79a9406 100644 --- a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp +++ b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp @@ -1,428 +1,69 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_tbox2 -// +/** + * d_a_tbox2.cpp + * Treasure Chest (Opened state not saved) + */ #include "rel/d/a/d_a_tbox2/d_a_tbox2.h" -#include "d/cc/d_cc_d.h" -#include "dol2asm.h" - -// -// Types: -// - -struct request_of_phase_process_class {}; - -struct mDoMtx_stack_c { - /* 8000CD64 */ void transS(cXyz const&); - - static u8 now[48]; -}; - -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c {}; - -struct fopAcM_lc_c { - /* 8001DC68 */ void lineCheck(cXyz const*, cXyz const*, fopAc_ac_c const*); - - static u8 mLineCheck[112]; -}; - -struct daTbox2_c { - /* 80496A18 */ void initBaseMtx(); - /* 80496A54 */ void setBaseMtx(); - /* 80496AB8 */ void Create(); - /* 80496C20 */ void CreateHeap(); - /* 80496E3C */ void create1st(); - /* 8049724C */ void demoProc(); - /* 80497478 */ void openInit(); - /* 80497500 */ void Execute(f32 (**)[3][4]); - /* 804975EC */ void mode_proc_call(); - /* 80497678 */ void mode_exec_wait(); - /* 80497790 */ void mode_exec(); - /* 8049780C */ void action(); - /* 804978C8 */ void init_actionWait(); - /* 804978D4 */ void actionWait(); - /* 804978D8 */ void init_actionNotOpenDemo(); - /* 804978E4 */ void actionNotOpenDemo(); - /* 8049794C */ void init_actionOpenDemo(); - /* 80497958 */ void actionOpenDemo(); - /* 80497A0C */ void init_actionOpenWait(); - /* 80497A18 */ void actionOpenWait(); - /* 80497BD0 */ void setGetDemoItem(); - /* 80497C60 */ void boxCheck(); - /* 80497DA0 */ void Draw(); - /* 80497E6C */ void Delete(); - /* 80498140 */ bool checkSmallTbox(); -}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dEvt_info_c { - /* 80043428 */ void setEventName(char*); -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 800436BC */ void setPtI(void*); -}; - -struct dEvent_manager_c { - /* 80047A78 */ void endCheck(s16); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 8004817C */ void cutEnd(int); -}; - -struct dBgW_Base {}; - -struct dBgW { - /* 8007B970 */ dBgW(); - /* 8007B9C0 */ void Move(); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjAcch { - /* 804970F0 */ ~dBgS_ObjAcch(); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct csXyz {}; - -struct dBgS_MoveBgActor { - /* 80078624 */ dBgS_MoveBgActor(); - /* 80078688 */ bool CreateHeap(); - /* 80078690 */ bool Create(); - /* 80078698 */ bool Execute(f32 (**)[3][4]); - /* 800786A0 */ bool Draw(); - /* 800786A8 */ bool Delete(); - /* 800786B0 */ bool IsDelete(); - /* 800786B8 */ bool ToFore(); - /* 800786C0 */ bool ToBack(); - /* 800787BC */ void MoveBGCreate(char const*, int, - void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, - csXyz*, csXyz*), - u32, f32 (*)[3][4]); - /* 800788DC */ void MoveBGDelete(); - /* 80078950 */ void MoveBGExecute(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80497080 */ ~dBgS_AcchCir(); -}; - -struct dBgS { - /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); - /* 80074ABC */ void ChkMoveBG(cBgS_PolyInfo const&); -}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cBgW_BgId { - /* 802681D4 */ void ChkUsed() const; -}; - -struct cBgD_t {}; - -struct cBgW { - /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); -}; - -struct cBgS { - /* 80074250 */ void Release(dBgW_Base*); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct J3DModel {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 80496DF4 */ ~J3DFrameCtrl(); -}; - -// -// Forward References: -// - -extern "C" void initBaseMtx__9daTbox2_cFv(); -extern "C" void setBaseMtx__9daTbox2_cFv(); -extern "C" void Create__9daTbox2_cFv(); -extern "C" void CreateHeap__9daTbox2_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void create1st__9daTbox2_cFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void demoProc__9daTbox2_cFv(); -extern "C" void openInit__9daTbox2_cFv(); -extern "C" void Execute__9daTbox2_cFPPA3_A4_f(); -extern "C" void mode_proc_call__9daTbox2_cFv(); -extern "C" void mode_exec_wait__9daTbox2_cFv(); -extern "C" void mode_exec__9daTbox2_cFv(); -extern "C" void action__9daTbox2_cFv(); -extern "C" void init_actionWait__9daTbox2_cFv(); -extern "C" void actionWait__9daTbox2_cFv(); -extern "C" void init_actionNotOpenDemo__9daTbox2_cFv(); -extern "C" void actionNotOpenDemo__9daTbox2_cFv(); -extern "C" void init_actionOpenDemo__9daTbox2_cFv(); -extern "C" void actionOpenDemo__9daTbox2_cFv(); -extern "C" void init_actionOpenWait__9daTbox2_cFv(); -extern "C" void actionOpenWait__9daTbox2_cFv(); -extern "C" void setGetDemoItem__9daTbox2_cFv(); -extern "C" void boxCheck__9daTbox2_cFv(); -extern "C" void Draw__9daTbox2_cFv(); -extern "C" void Delete__9daTbox2_cFv(); -extern "C" static void daTbox2_create1st__FP9daTbox2_c(); -extern "C" static void daTbox2_MoveBGDelete__FP9daTbox2_c(); -extern "C" static void daTbox2_MoveBGExecute__FP9daTbox2_c(); -extern "C" static void daTbox2_MoveBGDraw__FP9daTbox2_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" bool checkSmallTbox__9daTbox2_cFv(); -extern "C" static void func_80498148(); -extern "C" static void func_80498150(); -extern "C" extern char const* const d_a_tbox2__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(); -extern "C" void fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); -extern "C" void fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz(); -extern "C" void fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz(); -extern "C" void lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void setEventName__11dEvt_info_cFPc(); -extern "C" void setPtI__14dEvt_control_cFPv(); -extern "C" void setPtI_Id__14dEvt_control_cFUi(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void ChkMoveBG__4dBgSFRC13cBgS_PolyInfo(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void SetWall__12dBgS_AcchCirFff(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -extern "C" void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(); -extern "C" void CrrPos__9dBgS_AcchFR4dBgS(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool CreateHeap__16dBgS_MoveBgActorFv(); -extern "C" bool Create__16dBgS_MoveBgActorFv(); -extern "C" bool Execute__16dBgS_MoveBgActorFPPA3_A4_f(); -extern "C" bool Draw__16dBgS_MoveBgActorFv(); -extern "C" bool Delete__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void SetObj__16dBgS_PolyPassChkFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void dKy_set_allcol_ratio__Ff(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void Set__8cM3dGCylFRC9cM3dGCylS(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80498480[4]; - -// -// Declarations: -// +#include "d/a/d_a_player.h" +#include "d/bg/d_bg_w.h" +#include "d/com/d_com_inf_game.h" +#include "rel/d/a/d_a_midna/d_a_midna.h" /* 80496A18-80496A54 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::initBaseMtx() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/initBaseMtx__9daTbox2_cFv.s" +void daTbox2_c::initBaseMtx() { + mpModel->setBaseScale(scale); + setBaseMtx(); } -#pragma pop /* 80496A54-80496AB8 0000B4 0064+00 2/2 0/0 0/0 .text setBaseMtx__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::setBaseMtx() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/setBaseMtx__9daTbox2_cFv.s" +void daTbox2_c::setBaseMtx() { + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -#pragma pop -/* ############################################################################################## */ -/* 80498160-80498180 000000 0020+00 4/4 0/0 0/0 .rodata l_resInfo */ -SECTION_RODATA static u8 const l_resInfo[32] = { - 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0E, - 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x10, +struct res_info { + /* 0x0 */ int bmd_no; + /* 0x4 */ int bck_no; + /* 0x8 */ int dzb_id; + /* 0xC */ int dzb_no; +}; + +/* 80498160-80498180 000000 0020+00 4/4 0/0 0/0 .rodata l_resInfo */ +static const res_info l_resInfo[] = { + {9, 5, 13, 14}, // Small Chest + {10, 6, 15, 16}, // Big Chest }; -COMPILER_STRIP_GATE(0x80498160, &l_resInfo); /* 80498180-804981BC 000020 003C+00 1/2 0/0 0/0 .rodata l_cyl_info */ -SECTION_RODATA static u8 const l_cyl_info[60] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x20, 0x00, 0x00, 0x42, 0x20, 0x00, - 0x00, 0x42, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC2, 0x70, - 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xC2, 0x70, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, +static const cM3dGCylS l_cyl_info[] = { + { + {0.0f, 0.0f, -40.0f}, // center + 40.0f, // radius + 60.0f, // height + }, + { + {0.0f, 0.0f, -60.0f}, // center + 50.0f, // radius + 70.0f, // height + }, + { + {0.0f, 0.0f, -60.0f}, // center + 70.0f, // radius + 80.0f, // height + }, }; -COMPILER_STRIP_GATE(0x80498180, &l_cyl_info); - -/* 804981BC-804981C0 00005C 0004+00 0/1 0/0 0/0 .rodata @3714 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3714 = 50.0f; -COMPILER_STRIP_GATE(0x804981BC, &lit_3714); -#pragma pop - -/* 804981C0-804981C4 000060 0004+00 1/3 0/0 0/0 .rodata @3715 */ -SECTION_RODATA static u8 const lit_3715[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x804981C0, &lit_3715); - -/* 804981C4-804981C8 000064 0004+00 0/1 0/0 0/0 .rodata @3716 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3716 = -6.0f; -COMPILER_STRIP_GATE(0x804981C4, &lit_3716); -#pragma pop - -/* 804981C8-804981CC 000068 0004+00 1/2 0/0 0/0 .rodata @3717 */ -SECTION_RODATA static f32 const lit_3717 = 5.0f; -COMPILER_STRIP_GATE(0x804981C8, &lit_3717); - -/* 804981CC-804981D0 00006C 0004+00 1/2 0/0 0/0 .rodata @3718 */ -SECTION_RODATA static f32 const lit_3718 = 30.0f; -COMPILER_STRIP_GATE(0x804981CC, &lit_3718); - -/* 804981E0-804981E0 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804981E0 = "Tbox2"; -SECTION_DEAD static char const* const stringBase_804981E6 = "TREASURE"; -#pragma pop /* 8049825C-80498268 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80498268-8049827C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ #pragma push #pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -433,626 +74,460 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { #pragma pop /* 8049827C-80498280 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_tbox2__stringBase0; +static char* l_arcName = "Tbox2"; /* 80498280-80498284 -00001 0004+00 1/1 0/0 0/0 .data l_staff_name */ -SECTION_DATA static void* l_staff_name = (void*)(((char*)&d_a_tbox2__stringBase0) + 0x6); +static char* l_staff_name = "TREASURE"; /* 80498284-804982C8 000028 0044+00 1/1 0/0 0/0 .data l_cyl_src */ static dCcD_SrcCyl l_cyl_src = { { - {0x0, {{0x0, 0x0, 0x1e}, {0x0, 0x0}, 0x79}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_METAL, 0x2, 0x0, 0x0, 0x3}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf + {0x0, {{0x0, 0x0, 0x1e}, {0x0, 0x0}, 0x79}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_METAL, 0x2, 0x0, 0x0, 0x3}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl }; /* 80496AB8-80496C20 000118 0168+00 1/0 0/0 0/0 .text Create__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::Create() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/Create__9daTbox2_cFv.s" +int daTbox2_c::Create() { + init_actionOpenWait(); + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + + attention_info.flags = 0x40; + attention_info.flags |= 0x400000; + + mAcchCir.SetWall(50.0f, 0.0f); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), ¤t.angle, &shape_angle); + fopAcM_SetGravity(this, -6.0f); + + mCcStts2.Init(0xFF, 0xFF, this); + mCcCyl2.Set(l_cyl_src); + mCcCyl2.SetStts(&mCcStts2); + mCcCyl2.cM3dGCyl::Set(l_cyl_info[mModelType]); + + cXyz start(home.pos); + cXyz end(home.pos); + start.y += 5.0f; + end.y -= 30.0f; + + if (!fopAcM_lc_c::lineCheck(&start, &end, this)) { + // "No-Save Treasure Chest: No BG within 25cm, wait for MoveBG\n" + OS_REPORT("セーブ無し宝箱：２５ｃｍ以内にＢＧが無いのでMoveBGを待ちます！\n"); + mMode = MODE_EXEC_WAIT_e; + } else { + // "No-Save Treasure Chest: Chest location initialization complete!\n" + OS_REPORT("セーブ無し宝箱：宝箱位置初期設定完了！\n"); + mMode = MODE_EXEC_e; + } + + return 1; } -#pragma pop - -/* ############################################################################################## */ -/* 804981D0-804981D4 000070 0004+00 4/4 0/0 0/0 .rodata @3763 */ -SECTION_RODATA static f32 const lit_3763 = 1.0f; -COMPILER_STRIP_GATE(0x804981D0, &lit_3763); - -/* 804981E0-804981E0 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_804981EF = "WAIT"; -SECTION_DEAD static char const* const stringBase_804981F4 = "OPEN"; -SECTION_DEAD static char const* const stringBase_804981F9 = "APPEAR"; -SECTION_DEAD static char const* const stringBase_80498200 = "OPEN_SHORT"; -#pragma pop - -/* 804982C8-804982D8 -00001 0010+00 1/1 0/0 0/0 .data action_table$3964 */ -SECTION_DATA static void* action_table[4] = { - (void*)(((char*)&d_a_tbox2__stringBase0) + 0xF), - (void*)(((char*)&d_a_tbox2__stringBase0) + 0x14), - (void*)(((char*)&d_a_tbox2__stringBase0) + 0x19), - (void*)(((char*)&d_a_tbox2__stringBase0) + 0x20), -}; - -/* 804982D8-804982E4 -00001 000C+00 0/1 0/0 0/0 .data @4060 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4060[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_exec_wait__9daTbox2_cFv, -}; -#pragma pop - -/* 804982E4-804982F0 -00001 000C+00 0/1 0/0 0/0 .data @4061 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4061[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_exec__9daTbox2_cFv, -}; -#pragma pop - -/* 804982F0-80498308 000094 0018+00 0/1 0/0 0/0 .data l_func$4059 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func_4059[24] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80498308-80498314 -00001 000C+00 0/1 0/0 0/0 .data @4101 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4101[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOpenWait__9daTbox2_cFv, -}; -#pragma pop - -/* 80498314-80498320 -00001 000C+00 0/1 0/0 0/0 .data @4102 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4102[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOpenDemo__9daTbox2_cFv, -}; -#pragma pop - -/* 80498320-8049832C -00001 000C+00 0/1 0/0 0/0 .data @4103 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4103[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionNotOpenDemo__9daTbox2_cFv, -}; -#pragma pop - -/* 8049832C-80498338 -00001 000C+00 0/1 0/0 0/0 .data @4104 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_4104[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__9daTbox2_cFv, -}; -#pragma pop - -/* 80498338-80498368 0000DC 0030+00 0/1 0/0 0/0 .data l_func$4100 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func_4100[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80498368-80498388 -00001 0020+00 1/0 0/0 0/0 .data daTbox2_METHODS */ -SECTION_DATA static void* daTbox2_METHODS[8] = { - (void*)daTbox2_create1st__FP9daTbox2_c, - (void*)daTbox2_MoveBGDelete__FP9daTbox2_c, - (void*)daTbox2_MoveBGExecute__FP9daTbox2_c, - (void*)NULL, - (void*)daTbox2_MoveBGDraw__FP9daTbox2_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; - -/* 80498388-804983B8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TBOX2 */ -SECTION_DATA extern void* g_profile_TBOX2[12] = { - (void*)0xFFFFFFFD, (void*)0x0004FFFD, - (void*)0x00FC0000, (void*)&g_fpcLf_Method, - (void*)0x00000ACC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x010D0000, (void*)&daTbox2_METHODS, - (void*)0x00044100, (void*)0x000E0000, -}; - -/* 804983B8-804983C4 00015C 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 804983C4-804983D0 000168 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 804983D0-804983DC 000174 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 804983DC-80498400 000180 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80498150, - (void*)NULL, - (void*)NULL, - (void*)func_80498148, -}; - -/* 80498400-8049840C 0001A4 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 8049840C-80498418 0001B0 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80498418-80498444 0001BC 002C+00 2/2 0/0 0/0 .data __vt__12daTboxBase_c */ -SECTION_DATA extern void* __vt__12daTboxBase_c[11] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__16dBgS_MoveBgActorFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__16dBgS_MoveBgActorFPPA3_A4_f, - (void*)Draw__16dBgS_MoveBgActorFv, - (void*)Delete__16dBgS_MoveBgActorFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, - (void*)NULL, -}; - -/* 80498444-80498450 0001E8 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; /* 80496C20-80496DF4 000280 01D4+00 1/0 0/0 0/0 .text CreateHeap__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::CreateHeap() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/CreateHeap__9daTbox2_cFv.s" -} -#pragma pop +int daTbox2_c::CreateHeap() { + J3DModelData* modelData = + (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bmd_no); + JUT_ASSERT(modelData != 0); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return false; + } -/* 80496DF4-80496E3C 000454 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12J3DFrameCtrlFv.s" -} -#pragma pop + J3DAnmTransform* pbck = + (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bck_no); + JUT_ASSERT(pbck != 0); + mpBck = new mDoExt_bckAnm(); + if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) { + return false; + } -/* ############################################################################################## */ -/* 80498450-8049847C 0001F4 002C+00 2/2 0/0 0/0 .data __vt__9daTbox2_c */ -SECTION_DATA extern void* __vt__9daTbox2_c[11] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__9daTbox2_cFv, - (void*)Create__9daTbox2_cFv, - (void*)Execute__9daTbox2_cFPPA3_A4_f, - (void*)Draw__9daTbox2_cFv, - (void*)Delete__9daTbox2_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, - (void*)checkSmallTbox__9daTbox2_cFv, -}; + mBoxBgW = new dBgW(); + if (mBoxBgW != NULL && + !mBoxBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].dzb_no), + cBgW::MOVE_BG_e, &mBgMtx)) + { + mBoxBgW->SetCrrFunc(dBgS_MoveBGProc_TypicalRotY); + } else { + mBoxBgW = NULL; + return false; + } -/* 80496E3C-80497080 00049C 0244+00 1/1 0/0 0/0 .text create1st__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::create1st() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/create1st__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497080-804970F0 0006E0 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12dBgS_AcchCirFv.s" -} -#pragma pop - -/* 804970F0-80497160 000750 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* 80497160-804971A8 0007C0 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGCyl::~cM3dGCyl() { -extern "C" asm void __dt__8cM3dGCylFv() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGCylFv.s" -} -#pragma pop - -/* 804971A8-804971F0 000808 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cM3dGAab::~cM3dGAab() { -extern "C" asm void __dt__8cM3dGAabFv() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__8cM3dGAabFv.s" -} -#pragma pop - -/* 804971F0-8049724C 000850 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dCcD_GStts::~dCcD_GStts() { -extern "C" asm void __dt__10dCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__10dCcD_GSttsFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804981D4-804981D8 000074 0004+00 1/1 0/0 0/0 .rodata @4021 */ -SECTION_RODATA static f32 const lit_4021 = -1.0f; -COMPILER_STRIP_GATE(0x804981D4, &lit_4021); - -/* 8049724C-80497478 0008AC 022C+00 3/3 0/0 0/0 .text demoProc__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::demoProc() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/demoProc__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497478-80497500 000AD8 0088+00 1/1 0/0 0/0 .text openInit__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::openInit() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/openInit__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497500-804975EC 000B60 00EC+00 1/0 0/0 0/0 .text Execute__9daTbox2_cFPPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::Execute(f32 (**param_0)[3][4]) { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/Execute__9daTbox2_cFPPA3_A4_f.s" -} -#pragma pop - -/* 804975EC-80497678 000C4C 008C+00 1/1 0/0 0/0 .text mode_proc_call__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::mode_proc_call() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_proc_call__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497678-80497790 000CD8 0118+00 1/0 0/0 0/0 .text mode_exec_wait__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::mode_exec_wait() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_exec_wait__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497790-8049780C 000DF0 007C+00 2/1 0/0 0/0 .text mode_exec__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::mode_exec() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/mode_exec__9daTbox2_cFv.s" -} -#pragma pop - -/* 8049780C-804978C8 000E6C 00BC+00 1/1 0/0 0/0 .text action__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::action() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/action__9daTbox2_cFv.s" -} -#pragma pop - -/* 804978C8-804978D4 000F28 000C+00 1/1 0/0 0/0 .text init_actionWait__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::init_actionWait() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionWait__9daTbox2_cFv.s" -} -#pragma pop - -/* 804978D4-804978D8 000F34 0004+00 1/0 0/0 0/0 .text actionWait__9daTbox2_cFv */ -void daTbox2_c::actionWait() { - /* empty function */ -} - -/* 804978D8-804978E4 000F38 000C+00 1/1 0/0 0/0 .text init_actionNotOpenDemo__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::init_actionNotOpenDemo() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionNotOpenDemo__9daTbox2_cFv.s" -} -#pragma pop - -/* 804978E4-8049794C 000F44 0068+00 1/0 0/0 0/0 .text actionNotOpenDemo__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::actionNotOpenDemo() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionNotOpenDemo__9daTbox2_cFv.s" -} -#pragma pop - -/* 8049794C-80497958 000FAC 000C+00 1/1 0/0 0/0 .text init_actionOpenDemo__9daTbox2_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::init_actionOpenDemo() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionOpenDemo__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497958-80497A0C 000FB8 00B4+00 1/0 0/0 0/0 .text actionOpenDemo__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::actionOpenDemo() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionOpenDemo__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497A0C-80497A18 00106C 000C+00 3/3 0/0 0/0 .text init_actionOpenWait__9daTbox2_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::init_actionOpenWait() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/init_actionOpenWait__9daTbox2_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804981E0-804981E0 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_8049820B = "DEFAULT_TREASURE_SIMPLE"; -SECTION_DEAD static char const* const stringBase_80498223 = "DEFAULT_TREASURE_NOTOPEN"; -SECTION_DEAD static char const* const stringBase_8049823C = "DEFAULT_TREASURE_NORMAL"; -#pragma pop - -/* 80497A18-80497BD0 001078 01B8+00 1/0 0/0 0/0 .text actionOpenWait__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::actionOpenWait() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/actionOpenWait__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497BD0-80497C60 001230 0090+00 1/1 0/0 0/0 .text setGetDemoItem__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::setGetDemoItem() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/setGetDemoItem__9daTbox2_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804981D8-804981DC 000078 0004+00 0/1 0/0 0/0 .rodata @4266 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4266 = 22500.0f; -COMPILER_STRIP_GATE(0x804981D8, &lit_4266); -#pragma pop - -/* 804981DC-804981E0 00007C 0004+00 0/1 0/0 0/0 .rodata @4267 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4267 = 20.0f; -COMPILER_STRIP_GATE(0x804981DC, &lit_4267); -#pragma pop - -/* 804981E0-804981E0 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80498254 = "R_SP01"; -#pragma pop - -/* 80497C60-80497DA0 0012C0 0140+00 1/1 0/0 0/0 .text boxCheck__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::boxCheck() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/boxCheck__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497DA0-80497E6C 001400 00CC+00 1/0 0/0 0/0 .text Draw__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::Draw() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/Draw__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497E6C-80497ED8 0014CC 006C+00 1/0 0/0 0/0 .text Delete__9daTbox2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTbox2_c::Delete() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/Delete__9daTbox2_cFv.s" -} -#pragma pop - -/* 80497ED8-8049808C 001538 01B4+00 1/0 0/0 0/0 .text daTbox2_create1st__FP9daTbox2_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTbox2_create1st(daTbox2_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_create1st__FP9daTbox2_c.s" -} -#pragma pop - -/* 8049808C-804980AC 0016EC 0020+00 1/0 0/0 0/0 .text daTbox2_MoveBGDelete__FP9daTbox2_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTbox2_MoveBGDelete(daTbox2_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGDelete__FP9daTbox2_c.s" -} -#pragma pop - -/* 804980AC-804980CC 00170C 0020+00 1/0 0/0 0/0 .text daTbox2_MoveBGExecute__FP9daTbox2_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTbox2_MoveBGExecute(daTbox2_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGExecute__FP9daTbox2_c.s" -} -#pragma pop - -/* 804980CC-804980F8 00172C 002C+00 1/0 0/0 0/0 .text daTbox2_MoveBGDraw__FP9daTbox2_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTbox2_MoveBGDraw(daTbox2_c* param_0) { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/daTbox2_MoveBGDraw__FP9daTbox2_c.s" -} -#pragma pop - -/* 804980F8-80498140 001758 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm cCcD_GStts::~cCcD_GStts() { -extern "C" asm void __dt__10cCcD_GSttsFv() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/__dt__10cCcD_GSttsFv.s" -} -#pragma pop - -/* 80498140-80498148 0017A0 0008+00 1/0 0/0 0/0 .text checkSmallTbox__9daTbox2_cFv */ -bool daTbox2_c::checkSmallTbox() { return true; } -/* 80498148-80498150 0017A8 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80498148() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/func_80498148.s" -} -#pragma pop +/* 80496E3C-80497080 00049C 0244+00 1/1 0/0 0/0 .text create1st__9daTbox2_cFv */ +int daTbox2_c::create1st() { + fopAcM_SetupActor(this, daTbox2_c); + mModelType = getModelType(); -/* 80498150-80498158 0017B0 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void func_80498150() { - nofralloc -#include "asm/rel/d/a/d_a_tbox2/d_a_tbox2/func_80498150.s" -} -#pragma pop + int phase_state = dComIfG_resLoad(&mPhase, l_arcName); + if (phase_state == cPhs_COMPLEATE_e) { + u32 heap_size; + if (mModelType == TYPE_SMALL_e) { + heap_size = 0x1820; + } else if (mModelType == TYPE_BIG_e) { + heap_size = 0x2040; + } -/* 804981E0-804981E0 000080 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ + phase_state = MoveBGCreate(l_arcName, l_resInfo[mModelType].dzb_id, + dBgS_MoveBGProc_TypicalRotY, heap_size, NULL); + if (phase_state == cPhs_ERROR_e) { + return phase_state; + } + } + + return phase_state; +} + +/* 8049724C-80497478 0008AC 022C+00 3/3 0/0 0/0 .text demoProc__9daTbox2_cFv */ +int daTbox2_c::demoProc() { + static char* action_table[] = {"WAIT", "OPEN", "APPEAR", "OPEN_SHORT"}; + int act_idx = + dComIfGp_evmng_getMyActIdx(mStaffIdx, action_table, ARRAY_SIZE(action_table), 0, 0); + + if (dComIfGp_evmng_getIsAddvance(mStaffIdx)) { + switch (act_idx) { + case EVACT_OPEN_e: + fopAcM_seStart(this, Z2SE_OBJ_TBOX_OPEN_B, 0); + openInit(); + break; + case EVACT_OPEN_SHORT_e: + if (mModelType == TYPE_SMALL_e) { + fopAcM_seStart(this, Z2SE_OBJ_TBOX_OPEN_A, 0); + } else { + fopAcM_seStart(this, Z2SE_OBJ_TBOX_OPEN_B, 0); + } + + openInit(); + break; + } + } + + switch (act_idx) { + case EVACT_APPEAR_e: + break; + case EVACT_OPEN_e: + if (mpBck->play()) { + dComIfGp_evmng_cutEnd(mStaffIdx); + } + break; + case EVACT_OPEN_SHORT_e: + if (mpBck->play()) { + dComIfGp_evmng_cutEnd(mStaffIdx); + } + break; + default: + dComIfGp_evmng_cutEnd(mStaffIdx); + break; + } + + return 0; +} + +/* 80497478-80497500 000AD8 0088+00 1/1 0/0 0/0 .text openInit__9daTbox2_cFv */ +void daTbox2_c::openInit() { + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + if (!mReturnRupee) { + if (mpBgW != NULL) { + dComIfG_Bgsp().Release(mpBgW); + } + + if (mBoxBgW != NULL) { + dComIfG_Bgsp().Regist(mBoxBgW, this); + mBoxBgW->Move(); + } + } + + mpBck->setPlaySpeed(1.0f); +} + +/* 80497500-804975EC 000B60 00EC+00 1/0 0/0 0/0 .text Execute__9daTbox2_cFPPA3_A4_f */ +int daTbox2_c::Execute(Mtx** param_0) { + mode_proc_call(); + *param_0 = &mBgMtx; + setBaseMtx(); + + if (mBoxBgW != NULL && mBoxBgW->ChkUsed()) { + mBoxBgW->Move(); + } + + cXyz cyl_center(l_cyl_info[mModelType].mCenter); + mDoMtx_stack_c::YrotS(shape_angle.y); + mDoMtx_stack_c::multVec(&cyl_center, &cyl_center); + cyl_center += current.pos; + + mCcCyl2.SetC(cyl_center); + dComIfG_Ccsp()->Set(&mCcCyl2); + return 1; +} + +/* 804975EC-80497678 000C4C 008C+00 1/1 0/0 0/0 .text mode_proc_call__9daTbox2_cFv */ +void daTbox2_c::mode_proc_call() { + typedef void (daTbox2_c::*mode_func)(); + static mode_func l_func[] = { + &daTbox2_c::mode_exec_wait, + &daTbox2_c::mode_exec, + }; + + (this->*l_func[mMode])(); +} + +/* 80497678-80497790 000CD8 0118+00 1/0 0/0 0/0 .text mode_exec_wait__9daTbox2_cFv */ +void daTbox2_c::mode_exec_wait() { + bool start_exec = false; + mNoDraw = true; + + cXyz start(home.pos); + cXyz end(home.pos); + start.y += 5.0f; + end.y -= 30.0f; + + if (fopAcM_lc_c::lineCheck(&start, &end, this) && fopAcM_lc_c::checkMoveBG()) { + start_exec = true; + home.pos = *fopAcM_lc_c::getCrossP(); + current.pos = home.pos; + } + + if (start_exec) { + mNoDraw = false; + mMode = MODE_EXEC_e; + mode_exec(); + } +} + +/* 80497790-8049780C 000DF0 007C+00 2/1 0/0 0/0 .text mode_exec__9daTbox2_cFv */ +void daTbox2_c::mode_exec() { + action(); + fopAcM_posMoveF(this, NULL); + + mAcch.CrrPos(dComIfG_Bgsp()); + attention_info.position = current.pos; + eyePos = current.pos; +} + +/* 8049780C-804978C8 000E6C 00BC+00 1/1 0/0 0/0 .text action__9daTbox2_cFv */ +void daTbox2_c::action() { + typedef void (daTbox2_c::*action_func)(); + static action_func l_func[] = { + &daTbox2_c::actionOpenWait, + &daTbox2_c::actionOpenDemo, + &daTbox2_c::actionNotOpenDemo, + &daTbox2_c::actionWait, + }; + + (this->*l_func[mAction])(); +} + +/* 804978C8-804978D4 000F28 000C+00 1/1 0/0 0/0 .text init_actionWait__9daTbox2_cFv */ +void daTbox2_c::init_actionWait() { + mAction = ACTION_WAIT_e; +} + +/* 804978D4-804978D8 000F34 0004+00 1/0 0/0 0/0 .text actionWait__9daTbox2_cFv */ +void daTbox2_c::actionWait() {} + +/* 804978D8-804978E4 000F38 000C+00 1/1 0/0 0/0 .text init_actionNotOpenDemo__9daTbox2_cFv */ +void daTbox2_c::init_actionNotOpenDemo() { + mAction = ACTION_NOT_OPEN_DEMO_e; +} + +/* 804978E4-8049794C 000F44 0068+00 1/0 0/0 0/0 .text actionNotOpenDemo__9daTbox2_cFv */ +void daTbox2_c::actionNotOpenDemo() { + if (dComIfGp_evmng_endCheck(eventInfo.getEventId())) { + i_dComIfGp_event_reset(); + init_actionOpenWait(); + } else { + demoProc(); + } +} + +/* 8049794C-80497958 000FAC 000C+00 1/1 0/0 0/0 .text init_actionOpenDemo__9daTbox2_cFv + */ +void daTbox2_c::init_actionOpenDemo() { + mAction = ACTION_OPEN_DEMO_e; +} + +/* 80497958-80497A0C 000FB8 00B4+00 1/0 0/0 0/0 .text actionOpenDemo__9daTbox2_cFv */ +void daTbox2_c::actionOpenDemo() { + if (dComIfGp_evmng_endCheck(eventInfo.getEventId())) { + i_dComIfGp_event_reset(); + dKy_set_allcol_ratio(1.0f); + dComIfGp_event_setItemPartner(NULL); + + if (mReturnRupee) { + mpBck->setFrame(0); + mpBck->setPlaySpeed(0); + init_actionOpenWait(); + } else { + init_actionWait(); + } + } else { + demoProc(); + } +} + +/* 80497A0C-80497A18 00106C 000C+00 3/3 0/0 0/0 .text init_actionOpenWait__9daTbox2_cFv + */ +void daTbox2_c::init_actionOpenWait() { + mAction = ACTION_OPEN_WAIT_e; +} + +/* 80497A18-80497BD0 001078 01B8+00 1/0 0/0 0/0 .text actionOpenWait__9daTbox2_cFv */ +void daTbox2_c::actionOpenWait() { + daMidna_c* midna_p = (daMidna_c*)daPy_py_c::getMidnaActor(); // cast needed for reg alloc + daPy_py_c* player_p = daPy_getPlayerActorClass(); + + if (eventInfo.i_checkCommandDoor()) { + dComIfGp_event_onEventFlag(4); + + if (mModelType != TYPE_SMALL_e && daPy_py_c::i_checkNowWolf() && + !midna_p->checkMetamorphoseEnable()) + { + mStaffIdx = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); + demoProc(); + init_actionNotOpenDemo(); + } else { + mReturnRupee = player_p->checkTreasureRupeeReturn(getItemNo()); + setGetDemoItem(); + mStaffIdx = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); + demoProc(); + init_actionOpenDemo(); + } + } else if (boxCheck()) { + eventInfo.i_onCondition(dEvtCnd_CANDOOR_e); + + if (mModelType == TYPE_SMALL_e) { + eventInfo.setEventName("DEFAULT_TREASURE_SIMPLE"); + } else if (daPy_py_c::i_checkNowWolf() && !midna_p->checkMetamorphoseEnable()) { + eventInfo.setEventName("DEFAULT_TREASURE_NOTOPEN"); + } else { + eventInfo.setEventName("DEFAULT_TREASURE_NORMAL"); + } + } +} + +/* 80497BD0-80497C60 001230 0090+00 1/1 0/0 0/0 .text setGetDemoItem__9daTbox2_cFv */ +int daTbox2_c::setGetDemoItem() { + u8 item_no = getItemNo(); + + u32 partner_id; + if (mReturnRupee) { + partner_id = fopAcM_createItemForPresentDemo(¤t.pos, item_no, 1, -1, -1, NULL, NULL); + } else { + partner_id = fopAcM_createItemForTrBoxDemo(¤t.pos, item_no, -1, -1, NULL, NULL); + } + + if (partner_id != -1) { + dComIfGp_event_setItemPartnerId(partner_id); + } + + return 1; +} + +/* 80497C60-80497DA0 0012C0 0140+00 1/1 0/0 0/0 .text boxCheck__9daTbox2_cFv */ +BOOL daTbox2_c::boxCheck() { + daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); + + // Disable box in Link's basement unless lit Lantern is pulled out + if (strcmp(dComIfGp_getStartStageName(), "R_SP01") == 0 && fopAcM_GetRoomNo(this) == 7 && + player_p->getKandelaarFlamePos() == NULL) + { + return false; + } + + cXyz dist_to_box = player_p->attention_info.position - current.pos; + f32 xz_dist = dist_to_box.abs2XZ(); + f32 y_dist = fabsf(player_p->current.pos.y - current.pos.y); + + if (xz_dist < 22500.0f && fopAcM_seenPlayerAngleY(this) < 0x2000 && + fopAcM_seenActorAngleY(player_p, this) < 0x2000 && y_dist < 20.0f) + { + return true; + } + + return false; +} + +/* 80497DA0-80497E6C 001400 00CC+00 1/0 0/0 0/0 .text Draw__9daTbox2_cFv */ +int daTbox2_c::Draw() { + if (mNoDraw) { + return 1; + } + + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mpBck->entry(mpModel->getModelData()); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; +} + +/* 80497E6C-80497ED8 0014CC 006C+00 1/0 0/0 0/0 .text Delete__9daTbox2_cFv */ +int daTbox2_c::Delete() { + if (mBoxBgW != NULL && mBoxBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mBoxBgW); + } + + dComIfG_resDelete(&mPhase, l_arcName); + return 1; +} + +/* 80497ED8-8049808C 001538 01B4+00 1/0 0/0 0/0 .text daTbox2_create1st__FP9daTbox2_c */ +static int daTbox2_create1st(daTbox2_c* i_this) { + fopAcM_SetupActor(i_this, daTbox2_c); + return i_this->create1st(); +} + +/* 8049808C-804980AC 0016EC 0020+00 1/0 0/0 0/0 .text daTbox2_MoveBGDelete__FP9daTbox2_c + */ +static int daTbox2_MoveBGDelete(daTbox2_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 804980AC-804980CC 00170C 0020+00 1/0 0/0 0/0 .text daTbox2_MoveBGExecute__FP9daTbox2_c + */ +static int daTbox2_MoveBGExecute(daTbox2_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 804980CC-804980F8 00172C 002C+00 1/0 0/0 0/0 .text daTbox2_MoveBGDraw__FP9daTbox2_c */ +static int daTbox2_MoveBGDraw(daTbox2_c* i_this) { + return i_this->MoveBGDraw(); +} + +/* 80498368-80498388 -00001 0020+00 1/0 0/0 0/0 .data daTbox2_METHODS */ +static actor_method_class daTbox2_METHODS = { + (process_method_func)daTbox2_create1st, (process_method_func)daTbox2_MoveBGDelete, + (process_method_func)daTbox2_MoveBGExecute, (process_method_func)NULL, + (process_method_func)daTbox2_MoveBGDraw, +}; + +/* 80498388-804983B8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TBOX2 */ +extern actor_process_profile_definition g_profile_TBOX2 = { + fpcLy_CURRENT_e, + 4, + fpcPi_CURRENT_e, + PROC_TBOX2, + &g_fpcLf_Method.mBase, + sizeof(daTbox2_c), + 0, + 0, + &g_fopAc_Method.base, + 269, + &daTbox2_METHODS, + 0x44100, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, +}; \ No newline at end of file diff --git a/rel/d/a/d_a_tbox2/unknown_translation_unit_bss.cpp b/rel/d/a/d_a_tbox2/unknown_translation_unit_bss.cpp deleted file mode 100644 index 27f770f474..0000000000 --- a/rel/d/a/d_a_tbox2/unknown_translation_unit_bss.cpp +++ /dev/null @@ -1,28 +0,0 @@ -// -// Generated By: dol2asm -// Translation Unit: unknown_translation_unit_bss -// - -#include "rel/d/a/d_a_tbox2/unknown_translation_unit_bss.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 struct_80498480[4]; - -// -// External References: -// - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80498480-80498484 -00001 0004+00 0/0 2/2 0/0 .bss None */ -/* 80498480 0001+00 data_80498480 None */ -/* 80498481 0003+00 data_80498481 None */ -extern u8 struct_80498480[4]; -u8 struct_80498480[4]; diff --git a/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp b/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp index e7d0543346..b677fce7e8 100644 --- a/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp +++ b/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp @@ -70,8 +70,8 @@ int daWarpBug_c::draw() { } cLib_chaseS(&field_0x57c, 255, 25); - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); J3DModelData* modelData = mpModel->getModelData(); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { diff --git a/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp b/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp index 9558de7f90..bee3e0de9e 100644 --- a/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp +++ b/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp @@ -259,21 +259,21 @@ extern "C" asm void __dt__12J3DFrameCtrlFv() { /* 8066F738-8066F7EC 000398 00B4+00 3/3 0/0 0/0 .text calcMtx__9daBdoor_cFv */ void daBdoor_c::calcMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mOffsetY, current.pos.z); - mDoMtx_stack_c::YrotM(orig.angle.y); + mDoMtx_stack_c::YrotM(home.angle.y); mpDoorModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 300.0f, current.pos.z); - mDoMtx_stack_c::YrotM(orig.angle.y); + mDoMtx_stack_c::YrotM(home.angle.y); mpLockModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } /* 8066F7EC-8066F8E4 00044C 00F8+00 1/1 0/0 0/0 .text CreateInit__9daBdoor_cFv */ int daBdoor_c::CreateInit() { - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL); dComIfG_Bgsp().Regist(mpBgW, this); setAction(ACT_CLOSE_WAIT); - mAttentionInfo.mPosition.y += 250.0f; - mEyePos.y += 250.0f; - mAttentionInfo.mFlags = 0x20; + attention_info.position.y += 250.0f; + eyePos.y += 250.0f; + attention_info.flags = 0x20; calcMtx(); mpBgW->Move(); u8 swbit = door_param2_c::getSwbit(this); @@ -569,7 +569,7 @@ asm void daBdoor_c::calcGoal(cXyz* param_0, int param_1) { void daBdoor_c::smokeInit() { mParticlePos = current.pos; mParticleAngle = shape_angle; - dComIfGp_particle_setPolyColor(0x8156, mAcch.m_gnd, &mParticlePos, &mTevStr, &mParticleAngle, + dComIfGp_particle_setPolyColor(0x8156, mAcch.m_gnd, &mParticlePos, &tevStr, &mParticleAngle, NULL, 0, NULL, fopAcM_GetRoomNo(this), NULL); } #else @@ -649,14 +649,14 @@ static char const l_staff_name[13] = "SHUTTER_DOOR"; /* 80670328-806703C0 000F88 0098+00 1/0 0/0 0/0 .text actionCloseWait__9daBdoor_cFv */ BOOL daBdoor_c::actionCloseWait() { - if (mEvtInfo.i_checkCommandDoor()) { + if (eventInfo.i_checkCommandDoor()) { mStaffID = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); setAction(ACT_OPEN); } else { if (checkOpen()) { - mEvtInfo.setEventName((char*)l_door_open_demo); - mEvtInfo.i_onCondition(dEvtCnd_CANDOOR_e); + eventInfo.setEventName((char*)l_door_open_demo); + eventInfo.i_onCondition(dEvtCnd_CANDOOR_e); } } return 1; @@ -691,7 +691,7 @@ BOOL daBdoor_c::actionEnd() { dComIfG_Bgsp().Regist(mpBgW, this); } setAction(ACT_WAIT); - cXyz normal(cM_ssin(orig.angle.y), 0.0f, cM_scos(orig.angle.y)); + cXyz normal(cM_ssin(home.angle.y), 0.0f, cM_scos(home.angle.y)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz delta = player->current.pos - current.pos; f32 prod = delta.inprodXZ(normal); @@ -764,13 +764,13 @@ int daBdoor_c::draw() { if (!draw) { fopAcM_OffStatus(this, 0); } - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpDoorModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpDoorModel->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpDoorModel); dComIfGd_setList(); if (mLocked) { - g_env_light.setLightTevColorType_MAJI(mpLockModel->mModelData, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpLockModel->mModelData, &tevStr); mpLockAnm->entry(mpLockModel->getModelData()); mDoExt_modelUpdateDL(mpLockModel); } @@ -780,7 +780,7 @@ int daBdoor_c::draw() { /* 80670804-80670874 001464 0070+00 1/1 0/0 0/0 .text Delete__9daBdoor_cFv */ int daBdoor_c::Delete() { - if (mHeap != NULL && mpBgW->ChkUsed()) { + if (heap != NULL && mpBgW->ChkUsed()) { dComIfG_Bgsp().Release(mpBgW); } dComIfG_resDelete(&mPhaseReq, getArcName()); diff --git a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp index 695fa0fbb0..191411e6ac 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp +++ b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp @@ -141,7 +141,7 @@ void daDbDoor00_c::calcMtx() { cXyz xyz; mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); - mDoMtx_stack_c::YrotM(orig.angle.y); + mDoMtx_stack_c::YrotM(home.angle.y); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); mpModel2->i_setBaseTRMtx(mDoMtx_stack_c::get()); xyz.set(0.0f, 0.0f, -150.0f); @@ -173,15 +173,15 @@ int daDbDoor00_c::CreateInit() { s32 fRoomNo = door_param2_c::getFRoomNo(this); if (fopAcM_GetRoomNo(this) == -1) { fopAcM_SetRoomNo(this, fRoomNo); - mTevStr.mRoomNo = current.roomNo; + tevStr.mRoomNo = current.roomNo; } dComIfG_Bgsp().Regist(mpBgW, this); field_0x584 = 1; setAction(4); field_0x594 = 0x1e; - mAttentionInfo.mPosition.y += 250.0f; - mEyePos.y += 250.0f; - mAttentionInfo.mFlags = 0x20; + attention_info.position.y += 250.0f; + eyePos.y += 250.0f; + attention_info.flags = 0x20; calcMtx(); mpBgW->Move(); return 1; @@ -304,7 +304,7 @@ void daDbDoor00_c::demoProc() { /* 8045DE44-8045DF70 000B44 012C+00 1/1 0/0 0/0 .text checkArea__12daDbDoor00_cFv */ int daDbDoor00_c::checkArea() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(LINK_PTR); - cXyz sub = player->current.pos - orig.pos; + cXyz sub = player->current.pos - home.pos; cXyz area = sub; area.x = sub.z * cM_ssin(current.angle.y) - sub.x * cM_scos(current.angle.y); @@ -349,7 +349,7 @@ int daDbDoor00_c::actionLockWait() { /* 8045E000-8045E094 000D00 0094+00 1/0 0/0 0/0 .text actionLockOff__12daDbDoor00_cFv */ int daDbDoor00_c::actionLockOff() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { field_0x598 = i_dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0); demoProc(); setAction(3); @@ -373,7 +373,7 @@ int daDbDoor00_c::actionLockDemo() { /* 8045E108-8045E1C8 000E08 00C0+00 1/0 0/0 0/0 .text actionCloseWait__12daDbDoor00_cFv */ int daDbDoor00_c::actionCloseWait() { - if (mEvtInfo.i_checkCommandDoor()) { + if (eventInfo.i_checkCommandDoor()) { field_0x598 = i_dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0); demoProc(); setAction(5); @@ -381,8 +381,8 @@ int daDbDoor00_c::actionCloseWait() { field_0x584 = 0; } else { if (checkArea() != 0) { - mEvtInfo.setEventName("DEFAULT_DOUBLE_DOOR_OPEN"); - mEvtInfo.i_onCondition(4); + eventInfo.setEventName("DEFAULT_DOUBLE_DOOR_OPEN"); + eventInfo.i_onCondition(4); } } return 1; @@ -423,8 +423,8 @@ int daDbDoor00_c::draw() { dComIfG_Bgsp().Regist(mpBgW, this); field_0x584 = 1; } - g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel2, &mTevStr); + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel2, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel2); dComIfGd_setList(); @@ -433,7 +433,7 @@ int daDbDoor00_c::draw() { /* 8045E428-8045E49C 001128 0074+00 1/1 0/0 0/0 .text Delete__12daDbDoor00_cFv */ int daDbDoor00_c::Delete() { - if (mHeap != NULL) { + if (heap != NULL) { dComIfG_Bgsp().Release(mpBgW); } dComIfG_resDelete(&mPhaseReq, getBmdArcName()); @@ -484,14 +484,14 @@ extern actor_process_profile_definition g_profile_DBDOOR = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_DBDOOR, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daDbDoor00_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 295, // mPriority - &l_daDbdoor00_Method, // mSubMtd + &l_daDbdoor00_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // mCullType + fopAc_CULLBOX_6_e, // cullType }; diff --git a/rel/d/a/door/d_a_door_push/d_a_door_push.cpp b/rel/d/a/door/d_a_door_push/d_a_door_push.cpp index c5fd247ea4..80634d147d 100644 --- a/rel/d/a/door/d_a_door_push/d_a_door_push.cpp +++ b/rel/d/a/door/d_a_door_push/d_a_door_push.cpp @@ -40,8 +40,8 @@ static void PPCallBack2(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2, /* 80677E08-80677F38 0000C8 0130+00 1/1 0/0 0/0 .text initBaseMtx__12daDoorPush_cFv */ void daDoorPush_c::initBaseMtx() { - mpModel[0]->setBaseScale(mScale); - mpModel[1]->setBaseScale(mScale); + mpModel[0]->setBaseScale(scale); + mpModel[1]->setBaseScale(scale); mXyz[0].set(-550.0f, 0.0f, 0.0f); mDoMtx_stack_c::YrotS(shape_angle.y); mDoMtx_stack_c::multVec(&mXyz[0], &mXyz[0]); @@ -122,7 +122,7 @@ int daDoorPush_c::Create() { l_cull_box[1].y, l_cull_box[1].z); mpBgW->SetPushPullCallback((dBgW_Base::PushPull_CallBack)PPCallBack); mpDoorBgW->SetPushPullCallback((dBgW_Base::PushPull_CallBack)PPCallBack2); - mEvtInfo.setArchiveName(l_arcName); + eventInfo.setArchiveName(l_arcName); for (int i = 0; i < 2; i++) { field_0x63a[i] = i_dComIfGp_getEventManager().getEventIdx(this, "PUSH_DOOR_L", 0xff); field_0x63e[i] = 0xff; @@ -250,19 +250,19 @@ void daDoorPush_c::actionOpenWait() { if (mIndex != 2) { setAction(1); fopAcM_orderOtherEventId(this, field_0x63a[mIndex], field_0x63e[mIndex], 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } /* 8067877C-806787F8 000A3C 007C+00 1/0 0/0 0/0 .text actionOrderEvent__12daDoorPush_cFv */ void daDoorPush_c::actionOrderEvent() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(2); demoProc(); } else { fopAcM_orderOtherEventId(this, field_0x63a[mIndex], field_0x63e[mIndex], 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } @@ -364,16 +364,16 @@ void daDoorPush_c::setGoal() { goal.set(-300.0f, 0.0f, -400.0f); } mDoMtx_stack_c::transS(current.pos); - mDoMtx_stack_c::YrotM(orig.angle.y); + mDoMtx_stack_c::YrotM(home.angle.y); mDoMtx_stack_c::multVec(&goal, &goal); dComIfGp_evmng_setGoal(&goal); } /* 80678C70-80678D2C 000F30 00BC+00 1/0 0/0 0/0 .text Draw__12daDoorPush_cFv */ int daDoorPush_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); for (int i = 0; i < 2; i++) { - g_env_light.setLightTevColorType_MAJI(mpModel[i], &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[i], &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel[i]); dComIfGd_setList(); diff --git a/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp b/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp index 3ddc940ed4..ea7b28d965 100644 --- a/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp +++ b/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp @@ -20,13 +20,13 @@ static int daE_ARROW_Draw(e_arrow_class* i_this) { } if (fopAcM_GetParam(i_this) & 0x80000000) { - g_env_light.settingTevStruct(2, &i_this->current.pos, &i_this->mTevStr); + g_env_light.settingTevStruct(2, &i_this->current.pos, &i_this->tevStr); } else { - g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); } if (i_this->mpModel != NULL) { - g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr); mDoExt_modelUpdateDL(i_this->mpModel); } @@ -248,7 +248,7 @@ static void hit_check(e_arrow_class* i_this) { cXyz sp114(0.3f, 0.3f, 0.3f); i_this->mStickSmokeEMKey = dComIfGp_particle_set( i_this->mStickSmokeEMKey, dPa_name::ZI_J_dashSmoke_a_e, &i_this->current.pos, - &i_this->mTevStr, &i_this->shape_angle, &sp114, 0xFF, NULL, -1, NULL, NULL, NULL); + &i_this->tevStr, &i_this->shape_angle, &sp114, 0xFF, NULL, -1, NULL, NULL, NULL); } else { cXyz sp120 = i_this->current.pos + (i_this->speed * 0.5f); i_this->mCcTgSph.SetC(sp120); @@ -340,7 +340,7 @@ static void e_arrow_shot(e_arrow_class* i_this) { i_this->shape_angle.z = cM_rndF(0xFFFF); - fopAc_ac_c* parent_p = fopAcM_SearchByID(i_this->mParentPcId); + fopAc_ac_c* parent_p = fopAcM_SearchByID(i_this->parentActorID); if (parent_p != NULL) { i_this->field_0x5d0 = parent_p->speed.x; i_this->field_0x5d4 = parent_p->speed.z; @@ -351,7 +351,7 @@ static void e_arrow_shot(e_arrow_class* i_this) { if (coach_p != NULL) { cXyz sp30; - sp30 = coach_p->mEyePos - i_this->current.pos; + sp30 = coach_p->eyePos - i_this->current.pos; s16 temp_r4 = cM_atan2s(sp30.x, sp30.z); s16 temp_r0 = temp_r4 - i_this->current.angle.y; @@ -678,7 +678,7 @@ static void action(e_arrow_class* i_this) { i_this->current.pos.y += i_this->speed.y; i_this->current.pos.z += i_this->speed.z + i_this->field_0x5d4; - i_this->mEyePos = i_this->current.pos; + i_this->eyePos = i_this->current.pos; } /* 8067E0BC-8067E304 0019DC 0248+00 1/0 0/0 0/0 .text daE_ARROW_Execute__FP13e_arrow_class */ diff --git a/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp b/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp index 66e650c96f..689a45b2bc 100644 --- a/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp +++ b/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp @@ -12,8 +12,8 @@ static int daE_BI_LEAF_Draw(e_bi_leaf_class* i_this) { return 1; } - g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr); mDoExt_modelUpdateDL(i_this->mpModel); return 1; } @@ -23,9 +23,9 @@ static void action(e_bi_leaf_class* i_this) { switch (i_this->mAction) { case 0: if (i_this->mTimer == 0) { - fopAc_ac_c* parent_p = fopAcM_SearchByID(i_this->mParentPcId); + fopAc_ac_c* parent_p = fopAcM_SearchByID(i_this->parentActorID); if (parent_p == NULL) { - OS_REPORT("//////////////LEAF ID 2 %d\n", i_this->mParentPcId); + OS_REPORT("//////////////LEAF ID 2 %d\n", i_this->parentActorID); if (fopAcM_GetRoomNo(i_this) == 50) { i_this->mTimer = 90; @@ -41,7 +41,7 @@ static void action(e_bi_leaf_class* i_this) { if (i_this->mTimer == 0) { i_this->mAction = 0; - i_this->mParentPcId = + i_this->parentActorID = fopAcM_createChild(PROC_E_BI, fopAcM_GetID(i_this), (i_this->field_0x5b4 << 8) | 1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->current.angle, NULL, -1, NULL); diff --git a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp index a66eedaa1e..ffe5d00ab7 100644 --- a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp +++ b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp @@ -6,8 +6,8 @@ /* 806A1E38-806A1EA0 000078 0068+00 1/0 0/0 0/0 .text daE_DB_LEAF_Draw__FP15e_db_leaf_class */ static int daE_DB_LEAF_Draw(e_db_leaf_class* i_this) { - g_env_light.settingTevStruct(0,&i_this->current.pos,&i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(),&i_this->mTevStr); + g_env_light.settingTevStruct(0,&i_this->current.pos,&i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(),&i_this->tevStr); i_this->mpMorf->entryDL(); return 1; } diff --git a/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp b/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp index 9d8474546a..f3a7071920 100644 --- a/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp +++ b/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp @@ -9,8 +9,8 @@ /* 806DFF58-806DFFC0 000078 0068+00 1/0 0/0 0/0 .text daE_HB_LEAF_Draw__FP15e_hb_leaf_class */ static int daE_HB_LEAF_Draw(e_hb_leaf_class* i_this) { - g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(), &i_this->mTevStr); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(), &i_this->tevStr); i_this->mpMorf->entryDL(); return 1; } diff --git a/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp b/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp index 4bbf6e6f8f..fdc5ab7c58 100644 --- a/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp +++ b/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp @@ -253,10 +253,10 @@ void daE_PH_c::FlyAnm() { SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); } - mFlyRockEMKey = dComIfGp_particle_set(mFlyRockEMKey, 0x878C, ¤t.pos, &mTevStr, + mFlyRockEMKey = dComIfGp_particle_set(mFlyRockEMKey, 0x878C, ¤t.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); mFlyTsubuEMKey = - dComIfGp_particle_set(mFlyTsubuEMKey, 0x878D, ¤t.pos, &mTevStr, &shape_angle, + dComIfGp_particle_set(mFlyTsubuEMKey, 0x878D, ¤t.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); } @@ -602,10 +602,10 @@ void daE_PH_c::FlyAnm2() { SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); } - mFlyRockEMKey = dComIfGp_particle_set(mFlyRockEMKey, 0x878C, ¤t.pos, &mTevStr, + mFlyRockEMKey = dComIfGp_particle_set(mFlyRockEMKey, 0x878C, ¤t.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); mFlyTsubuEMKey = - dComIfGp_particle_set(mFlyTsubuEMKey, 0x878D, ¤t.pos, &mTevStr, &shape_angle, + dComIfGp_particle_set(mFlyTsubuEMKey, 0x878D, ¤t.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); } @@ -613,19 +613,19 @@ void daE_PH_c::FlyAnm2() { if (fopAcM_searchPlayerDistance(this) < 1000.0f && i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; field_0x630 = -10.0f - BREG_F(0); field_0x5ae = 15; field_0x616 = 0x1000; field_0x618 = 0x1000; SetAnm(ANM_HANG_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); } else if (fopAcM_checkHookCarryNow(this)) { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } else if (mAnmID != ANM_WAIT) { SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); } } else if (mAnmID == ANM_HANG_WAIT) { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; if (!fopAcM_checkHookCarryNow(this) || !i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { SetAnm(ANM_HANG_END, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, mAnmSpeed); @@ -668,7 +668,7 @@ void daE_PH_c::StopAction() { mSound.startCreatureSoundLevel(Z2SE_EN_PH_PROPELLER, field_0x612 + 0x500, -1); if (field_0x5ae == 0) { - cLib_addCalc2(¤t.pos.y, orig.pos.y, 0.1f, nREG_F(1) + 30.0f); + cLib_addCalc2(¤t.pos.y, home.pos.y, 0.1f, nREG_F(1) + 30.0f); } if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { @@ -707,7 +707,7 @@ void daE_PH_c::Action() { AttentionSet(); if (fopAcM_searchPlayerDistance(this) > 2000.0f || other_bg_check(this, player_p)) { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } break; case 2: @@ -715,7 +715,7 @@ void daE_PH_c::Action() { StopAction(); if (fopAcM_searchPlayerDistance(this) > 3000.0f || other_bg_check(this, player_p)) { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } cXyz* cc_move_p = mCcStts.GetCCMoveP(); @@ -738,7 +738,7 @@ void daE_PH_c::Action() { } } } else { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; if (dComIfGs_isSwitch(0x3F, fopAcM_GetRoomNo(this))) { field_0x5b2 = 1; @@ -749,7 +749,7 @@ void daE_PH_c::Action() { break; default: if (fopAcM_searchPlayerDistance(this) > 2000.0f || other_bg_check(this, player_p)) { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } S_Action(); @@ -936,16 +936,16 @@ void daE_PH_c::DemoAction() { if (mAnmID == ANM_APPEAR) { mDemoRockEMKey = - dComIfGp_particle_set(mDemoRockEMKey, 0x8C6F, ¤t.pos, &mTevStr, &shape_angle, + dComIfGp_particle_set(mDemoRockEMKey, 0x8C6F, ¤t.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); mDemoTsubuEMKey = - dComIfGp_particle_set(mDemoTsubuEMKey, 0x8C70, ¤t.pos, &mTevStr, &shape_angle, + dComIfGp_particle_set(mDemoTsubuEMKey, 0x8C70, ¤t.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); mDemoRock2EMKey = - dComIfGp_particle_set(mDemoRock2EMKey, 0x8C71, ¤t.pos, &mTevStr, &shape_angle, + dComIfGp_particle_set(mDemoRock2EMKey, 0x8C71, ¤t.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); mDemoRock3EMKey = - dComIfGp_particle_set(mDemoRock3EMKey, 0x8C72, ¤t.pos, &mTevStr, &shape_angle, + dComIfGp_particle_set(mDemoRock3EMKey, 0x8C72, ¤t.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); } } @@ -957,7 +957,7 @@ void daE_PH_c::ToumeiAction() { if (fopAcM_searchPlayerDistance(this) > XREG_F(1) + 2300.0f || i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } if (mCcSph.ChkTgHit() && field_0x5ae == 0) { @@ -965,9 +965,9 @@ void daE_PH_c::ToumeiAction() { field_0x5ae = 20; mStopTimer = 300; - dComIfGp_particle_set(0x878C, ¤t.pos, &mTevStr, &shape_angle, NULL); - dComIfGp_particle_set(0x878D, ¤t.pos, &mTevStr, &shape_angle, NULL); - dComIfGp_particle_set(0x878E, ¤t.pos, &mTevStr, &shape_angle, NULL); + dComIfGp_particle_set(0x878C, ¤t.pos, &tevStr, &shape_angle, NULL); + dComIfGp_particle_set(0x878D, ¤t.pos, &tevStr, &shape_angle, NULL); + dComIfGp_particle_set(0x878E, ¤t.pos, &tevStr, &shape_angle, NULL); mSound.startCreatureSound(Z2SE_EN_PH_HIT, 0, -1); } @@ -1041,26 +1041,26 @@ void daE_PH_c::AttentionSet() { if (mAnmID != ANM_HANG_START && mAnmID != ANM_HANG_WAIT && mAnmID != ANM_HANG_END) { if (strcmp(dComIfGp_getStartStageName(), "D_MN07A") == 0) { - mAttentionInfo.field_0x0[2] = 0x52; + attention_info.field_0x0[2] = 0x52; } else { - mAttentionInfo.field_0x0[2] = 0x53; + attention_info.field_0x0[2] = 0x53; } - mAttentionInfo.mFlags = 4; + attention_info.flags = 4; } else if (current.pos.absXZ(fopAcM_GetPosition(player_p)) > 1000.0f) { if (strcmp(dComIfGp_getStartStageName(), "D_MN07A") == 0) { - mAttentionInfo.field_0x0[2] = 0x52; + attention_info.field_0x0[2] = 0x52; } else { - mAttentionInfo.field_0x0[2] = 0x53; + attention_info.field_0x0[2] = 0x53; } } else { - mAttentionInfo.field_0x0[2] = 0; - mAttentionInfo.mFlags = 0; + attention_info.field_0x0[2] = 0; + attention_info.flags = 0; } if (player_p->checkDragonHangRide()) { - mAttentionInfo.field_0x0[2] = 0; - mAttentionInfo.mFlags = 0; + attention_info.field_0x0[2] = 0; + attention_info.flags = 0; } } @@ -1107,7 +1107,7 @@ void daE_PH_c::ObjHit() { SetAnm(ANM_DAMAGE_ARROW, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 1.0f); } - dComIfGp_particle_set(0x878E, ¤t.pos, &mTevStr, &shape_angle, NULL); + dComIfGp_particle_set(0x878E, ¤t.pos, &tevStr, &shape_angle, NULL); mSound.startCreatureSound(Z2SE_EN_PH_HIT, 0, -1); mCcSph.OffTgSetBit(); } @@ -1138,12 +1138,12 @@ void daE_PH_c::De_Timer() { /* 807411C0-80741200 003E60 0040+00 1/1 0/0 0/0 .text EyeSet__8daE_PH_cFv */ void daE_PH_c::EyeSet() { - mEyePos = current.pos; - mEyePos.y += TREG_F(2); + eyePos = current.pos; + eyePos.y += TREG_F(2); - mAttentionInfo.mPosition.x = current.pos.x; - mAttentionInfo.mPosition.z = current.pos.z; - mAttentionInfo.mPosition.y = current.pos.y + 170.0f + TREG_F(1); + attention_info.position.x = current.pos.x; + attention_info.position.z = current.pos.z; + attention_info.position.y = current.pos.y + 170.0f + TREG_F(1); } /* 80741200-80741268 003EA0 0068+00 1/1 0/0 0/0 .text Delete__8daE_PH_cFv */ @@ -1153,7 +1153,7 @@ int daE_PH_c::Delete() { initialized = 0; } - if (mHeap != NULL) { + if (heap != NULL) { mpMorf->stopZelAnime(); } @@ -1179,18 +1179,18 @@ int daE_PH_c::Draw() { cXyz sp28; sp28.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(model, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model, &tevStr); mpMorf->entryDL(); mShadowKey = dComIfGd_setShadow(mShadowKey, 0, model, &sp28, BREG_F(16) + 1000.0f, BREG_F(17) + 100.0f, current.pos.y, mAcch.GetGroundH(), - mAcch.m_gnd, &mTevStr, 0, 1.0f, + mAcch.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } } else { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(model, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model, &tevStr); } return 1; @@ -1228,7 +1228,7 @@ int daE_PH_c::create() { return cPhs_ERROR_e; } - mGravity = 0.0f; + gravity = 0.0f; field_0x5b4 = (fopAcM_GetParam(this) >> 4) & 0xF; if (field_0x5b4 == 0 || field_0x5b4 == 15) { @@ -1263,11 +1263,11 @@ int daE_PH_c::create() { fopAcM_setCullSizeFar(this, 3.0f); fopAcM_setCullSizeBox(this, -500.0f, -500.0f, -500.0f, 500.0f, 500.0f, 500.0f); - mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, - &fopAcM_GetSpeed_p(this), NULL, NULL); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), NULL, NULL); - mAttentionInfo.mFlags = 4; - mAttentionInfo.field_0x0[2] = 0x22; + attention_info.flags = 4; + attention_info.field_0x0[2] = 0x22; cXyz sp3C(current.pos.x, current.pos.y + 200.0f, current.pos.z); mSound.init(¤t.pos, &sp3C, 3, 1); @@ -1297,16 +1297,16 @@ int daE_PH_c::create() { mCcSph.OffTgShield(); mCcSph.OnTgNoHitMark(); - mAttentionInfo.field_0x0[2] = 0; - mAttentionInfo.mFlags = 0; + attention_info.field_0x0[2] = 0; + attention_info.flags = 0; cXyz sp48(current.pos.x, current.pos.y, current.pos.z); - mAttentionInfo.mPosition.x = current.pos.x; - mAttentionInfo.mPosition.z = current.pos.z; - mAttentionInfo.mPosition.y = current.pos.y + 150.0f + TREG_F(1); + attention_info.position.x = current.pos.x; + attention_info.position.z = current.pos.z; + attention_info.position.y = current.pos.y + 150.0f + TREG_F(1); } else if (mAction == 2 || mAction == 4 || mAction == 5) { speedF = 0.0f; - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } else { SearchNearP(); } diff --git a/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp b/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp index 5bf7e8d9d1..d9eb784e7d 100644 --- a/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp +++ b/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp @@ -27,7 +27,7 @@ static int daE_ST_LINE_IsDelete(e_st_line_class* i_this) { /* 807A6FAC-807A7008 0000CC 005C+00 1/0 0/0 0/0 .text daE_ST_LINE_Delete__FP15e_st_line_class */ static int daE_ST_LINE_Delete(e_st_line_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_st"); - if (i_this->field_0xcc4 == 0 && i_this->mHeap != NULL) { + if (i_this->field_0xcc4 == 0 && i_this->heap != NULL) { i_this->mSound.deleteObject(); } diff --git a/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp b/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp index 0b9446db6e..883e88367f 100644 --- a/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp +++ b/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp @@ -8,8 +8,8 @@ /* 807F7E18-807F7EC0 000078 00A8+00 1/0 0/0 0/0 .text daE_YD_LEAF_Draw__FP15e_yd_leaf_class */ static int daE_YD_LEAF_Draw(e_yd_leaf_class* i_this) { - g_env_light.settingTevStruct(2, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(), &i_this->mTevStr); + g_env_light.settingTevStruct(2, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(), &i_this->tevStr); dComIfGd_setListDark(); i_this->mpMorf->entryDL(); @@ -22,14 +22,14 @@ static int daE_YD_LEAF_Execute(e_yd_leaf_class* i_this) { if (i_this->field_0x5ba == 0) { stage_stag_info_class* pstag = i_dComIfGp_getStage()->getStagInfo(); if (dStage_stagInfo_GetSTType(pstag) != ST_FIELD && - fopAcM_SearchByID(i_this->mParentPcId) == NULL) + fopAcM_SearchByID(i_this->parentActorID) == NULL) { i_this->field_0x5ba = 1; } } else { - cLib_addCalc0(&i_this->mScale.y, 1.0f, 0.08f); + cLib_addCalc0(&i_this->scale.y, 1.0f, 0.08f); - if (i_this->mScale.y <= 0.01f) { + if (i_this->scale.y <= 0.01f) { fopAcM_delete(i_this); } } @@ -37,7 +37,7 @@ static int daE_YD_LEAF_Execute(e_yd_leaf_class* i_this) { mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); mDoMtx_stack_c::YrotM(i_this->shape_angle.y); mDoMtx_stack_c::XrotM(i_this->shape_angle.x); - mDoMtx_stack_c::scaleM(i_this->mScale.y, i_this->mScale.y, i_this->mScale.y); + mDoMtx_stack_c::scaleM(i_this->scale.y, i_this->scale.y, i_this->scale.y); i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpMorf->modelCalc(); return 1; @@ -86,7 +86,7 @@ static int daE_YD_LEAF_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////E_YD_LEAF SET 2 !!\n"); fopAcM_SetMtx(a_this, a_this->mpMorf->getModel()->getBaseTRMtx()); - a_this->mScale.y = 1.0f; + a_this->scale.y = 1.0f; daE_YD_LEAF_Execute(a_this); } diff --git a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp index e16b8ab6c9..6b44dd8eb7 100644 --- a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp +++ b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp @@ -348,16 +348,16 @@ extern actor_process_profile_definition g_profile_E_YK = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_E_YK, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(e_yk_class), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 188, // mPriority - &l_daE_YK_Method, // mSubMtd + &l_daE_YK_Method, // sub_method 0x10050100, // mStatus fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80807E80-80807E8C 000110 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -500,8 +500,8 @@ static asm void anm_init(e_yk_class* param_0, int param_1, f32 param_2, u8 param static int daE_YK_Draw(e_yk_class* i_this) { J3DModel* model = i_this->mpMorfSO->getModel(); - g_env_light.settingTevStruct(2,&i_this->current.pos,&i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(model,&i_this->mTevStr); + g_env_light.settingTevStruct(2,&i_this->current.pos,&i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(model,&i_this->tevStr); dComIfGd_setListDark(); @@ -535,7 +535,7 @@ static bool other_bg_check(e_yk_class* i_this, fopAc_ac_c* i_actorP) { actor_pos.y += 100.0f; yk_pos = i_this->current.pos; - yk_pos.y = i_this->mEyePos.y; + yk_pos.y = i_this->eyePos.y; lin_chk.Set(&yk_pos,&actor_pos,i_this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { @@ -639,7 +639,7 @@ static void damage_check(e_yk_class* i_this) { // If keese was hit by Clawshot or Slingshot, subtract 1 from health if (i_this->mAtColliderInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) || i_this->mAtColliderInfo.mpCollider->ChkAtType(AT_TYPE_SLINGSHOT)) { - i_this->mHealth--; + i_this->health--; } // If keese was hit by shield attack, set some fields and play controller vibration @@ -672,7 +672,7 @@ static void damage_check(e_yk_class* i_this) { i_this->field_0x698 = i_this->mAtColliderInfo.mHitDirection; // If keese is dead, play death sound - if (i_this->mHealth <= 0) { + if (i_this->health <= 0) { i_this->mCreature.startCreatureVoice(Z2SE_EN_YK_V_DEATH,-1); i_this->mpMorfSO->setPlaySpeed(0.2f); i_this->field_0x6a0 = 1; @@ -896,9 +896,9 @@ static void e_yk_roof(e_yk_class* i_this) { } } - cLib_addCalc2(&i_this->current.pos.x,i_this->orig.pos.x,0.5f,fabsf(i_this->speed.x)); - cLib_addCalc2(&i_this->current.pos.y,i_this->orig.pos.y,0.5f,fabsf(i_this->speed.y)); - cLib_addCalc2(&i_this->current.pos.z,i_this->orig.pos.z,0.5f,fabsf(i_this->speed.z)); + cLib_addCalc2(&i_this->current.pos.x,i_this->home.pos.x,0.5f,fabsf(i_this->speed.x)); + cLib_addCalc2(&i_this->current.pos.y,i_this->home.pos.y,0.5f,fabsf(i_this->speed.y)); + cLib_addCalc2(&i_this->current.pos.z,i_this->home.pos.z,0.5f,fabsf(i_this->speed.z)); if (pl_check(i_this,i_this->mPlayerTrigger,1)) { i_this->mAction = ACT_FIGHT_FLY; @@ -1196,9 +1196,9 @@ static void e_yk_fly(e_yk_class* i_this) { } if (i_this->field_0x6a2[0] == 0) { - i_this->mPathPntPos.x = i_this->orig.pos.x + cM_rndFX(500.0f); - i_this->mPathPntPos.y = i_this->orig.pos.y + cM_rndFX(200.0f); - i_this->mPathPntPos.z = i_this->orig.pos.z + cM_rndFX(500.0f); + i_this->mPathPntPos.x = i_this->home.pos.x + cM_rndFX(500.0f); + i_this->mPathPntPos.y = i_this->home.pos.y + cM_rndFX(200.0f); + i_this->mPathPntPos.z = i_this->home.pos.z + cM_rndFX(500.0f); cXyz pos = i_this->mPathPntPos - i_this->current.pos; @@ -1249,7 +1249,7 @@ static void e_yk_return(e_yk_class* i_this) { cLib_addCalc2(&i_this->speedF,l_HIO.field_0x0c,1.0f, 0.3f * l_HIO.field_0x0c); - i_this->mPathPntPos = i_this->orig.pos; + i_this->mPathPntPos = i_this->home.pos; fly_move(i_this); cXyz pos = i_this->current.pos - i_this->mPathPntPos; @@ -1395,7 +1395,7 @@ static void e_yk_chance(e_yk_class* i_this) { i_this->field_0x69a.y = cM_rndF(65536.0f); fopAcM_effSmokeSet1(&i_this->field_0xa78,&i_this->field_0xa7c, &i_this->current.pos,&i_this->shape_angle, - 0.8f,&i_this->mTevStr,1); + 0.8f,&i_this->tevStr,1); i_this->mCreature.startCreatureVoice(Z2SE_EN_YK_V_FAINT,-1); } @@ -1664,12 +1664,12 @@ static void action(e_yk_class* i_this) { } i_this->current.pos.y -= 30.0f; - i_this->next.pos.y -= 30.0f; + i_this->old.pos.y -= 30.0f; i_this->field_0x708.CrrPos(dComIfG_Bgsp()); i_this->current.pos.y += 30.0f; - i_this->next.pos.y += 30.0f; + i_this->old.pos.y += 30.0f; } #else #pragma push @@ -1728,18 +1728,18 @@ static int daE_YK_Execute(e_yk_class* i_this) { if (i_this->mAction == ACT_WOLFBITE && i_this->mActionPhase < 2) { fopAcM_OffStatus(i_this,0); - i_this->mAttentionInfo.mFlags = 0; + i_this->attention_info.flags = 0; // need to define inline here MTXCopy(daPy_getLinkPlayerActorClass()->getWolfMouthMatrix(),mDoMtx_stack_c::now); model->i_setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&i_this->current.pos); } else { - if (i_this->mHealth > 0 && i_this->field_0x6a0 == 0 && i_this->current.pos.y < player->current.pos.y) { - i_this->mAttentionInfo.mFlags = 4; + if (i_this->health > 0 && i_this->field_0x6a0 == 0 && i_this->current.pos.y < player->current.pos.y) { + i_this->attention_info.flags = 4; } else { fopAcM_OffStatus(i_this,0); - i_this->mAttentionInfo.mFlags = 0; + i_this->attention_info.flags = 0; } mDoMtx_stack_c::transS(i_this->current.pos.x,i_this->current.pos.y,i_this->current.pos.z); @@ -1785,9 +1785,9 @@ static int daE_YK_Execute(e_yk_class* i_this) { MTXCopy(model->i_getAnmMtx(2),(MtxP)calc_mtx); pos.set(0.0f,0.0f,0.0f); - MtxPosition(&pos,&i_this->mEyePos); - i_this->mAttentionInfo.mPosition = i_this->mEyePos; - i_this->mAttentionInfo.mPosition.y += 20.0f; + MtxPosition(&pos,&i_this->eyePos); + i_this->attention_info.position = i_this->eyePos; + i_this->attention_info.position.y += 20.0f; pos.set(0.0f,0.0f,0.0f); MtxPosition(&pos,&pos2); @@ -1800,7 +1800,7 @@ static int daE_YK_Execute(e_yk_class* i_this) { i_this->mCollisionSphere.SetR(30.0f * l_HIO.field_0x08); dComIfG_Ccsp()->Set(&i_this->mCollisionSphere); - setMidnaBindEffect(i_this,&i_this->mCreature,&i_this->mEyePos,&cXyz(0.5f,0.5f,0.5f)); + setMidnaBindEffect(i_this,&i_this->mCreature,&i_this->eyePos,&cXyz(0.5f,0.5f,0.5f)); } return 1; @@ -1829,7 +1829,7 @@ static int daE_YK_Delete(e_yk_class* i_this) { data_80807EF8 = 0; } - if (i_this->mHeap) { + if (i_this->heap) { i_this->mpMorfSO->stopZelAnime(); } @@ -1959,26 +1959,26 @@ static int daE_YK_Create(fopAc_ac_c* i_this) { l_HIO.field_0x04 = -1; } - yk->mAttentionInfo.mFlags = 4; + yk->attention_info.flags = 4; fopAcM_SetMtx(yk,yk->mpMorfSO->getModel()->getBaseTRMtx()); fopAcM_SetMin(yk,-200.0f,-200.0f,-200.0f); fopAcM_SetMax(yk,200.0f,200.0f,200.0f); - yk->mHealth = 1; + yk->health = 1; yk->field_0x560 = 1; yk->mCollisionStatus.Init(0x1e,0,yk); yk->mCollisionSphere.Set(*(dCcD_SrcSph*)&e_idx); // something weird going on here yk->mCollisionSphere.SetStts(&yk->mCollisionStatus); - yk->field_0x708.Set(&fopAcM_GetPosition_p(yk), - &fopAcM_GetOldPosition_p(yk),yk,1, - &yk->field_0x6c8, &fopAcM_GetSpeed_p(yk), + yk->field_0x708.Set(fopAcM_GetPosition_p(yk), + fopAcM_GetOldPosition_p(yk),yk,1, + &yk->field_0x6c8, fopAcM_GetSpeed_p(yk), 0,0); yk->field_0x6c8.SetWall(50.0f,50.0f); - yk->mCreature.init(&yk->current.pos,&yk->mEyePos,3,1); + yk->mCreature.init(&yk->current.pos,&yk->eyePos,3,1); yk->mCreature.setEnemyName("E_yk"); yk->mAtColliderInfo.mpSound = &yk->mCreature; diff --git a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp index c49fab20d0..cf851dd717 100644 --- a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp +++ b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp @@ -729,8 +729,8 @@ int daE_YM_c::draw() { } J3DModel* model_p = field_0x5b4->getModel(); - g_env_light.settingTevStruct(6, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(model_p->getModelData(), &mTevStr); + g_env_light.settingTevStruct(6, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model_p->getModelData(), &tevStr); J3DModelData* modelData_p = model_p->getModelData(); for (u16 i = 0; i < modelData_p->getMaterialNum(); i++) { @@ -750,7 +750,7 @@ int daE_YM_c::draw() { field_0x69c = dComIfGd_setShadow(field_0x69c, 1, model_p, &sp40, 400.0f, 0.0f, current.pos.y, field_0x760.GetGroundH(), field_0x760.m_gnd, - &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } return 1; @@ -862,9 +862,9 @@ void daE_YM_c::setElecEffect1() { } cXyz cStack_38(iVar5[0][3], iVar5[1][3], iVar5[2][3]); - field_0xad8 = dComIfGp_particle_set(field_0xad8, 0x8393, &cStack_38, &mTevStr, &shape_angle, &cStack_2c, + field_0xad8 = dComIfGp_particle_set(field_0xad8, 0x8393, &cStack_38, &tevStr, &shape_angle, &cStack_2c, 0xff, 0, 0xffffffff, 0, 0, 0); - field_0xadc = dComIfGp_particle_set(field_0xadc, 0x8394, &cStack_38, &mTevStr, &shape_angle, &cStack_2c, + field_0xadc = dComIfGp_particle_set(field_0xadc, 0x8394, &cStack_38, &tevStr, &shape_angle, &cStack_2c, 0xff, 0, 0xffffffff, 0, 0, 0); } #else @@ -892,9 +892,9 @@ void daE_YM_c::setElecEffect2() { } cXyz cStack_38(iVar5[0][3], iVar5[1][3], iVar5[2][3]); setElecEffect1(); - field_0xae0 = dComIfGp_particle_set(field_0xae0, 0x8395, &cStack_38, &mTevStr, &shape_angle, &cStack_2c, + field_0xae0 = dComIfGp_particle_set(field_0xae0, 0x8395, &cStack_38, &tevStr, &shape_angle, &cStack_2c, 0xff, 0, 0xffffffff, 0, 0, 0); - field_0xae4 = dComIfGp_particle_set(field_0xae4, 0x8396, &cStack_38, &mTevStr, &shape_angle, &cStack_2c, + field_0xae4 = dComIfGp_particle_set(field_0xae4, 0x8396, &cStack_38, &tevStr, &shape_angle, &cStack_2c, 0xff, 0, 0xffffffff, 0, 0, 0); } #else @@ -1300,7 +1300,7 @@ void daE_YM_c::damage_check() { field_0x5bc.startCreatureSound(Z2SE_EN_YM_DEATH, 0, -1); if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_10000000)) { - i_dComIfGp_setHitMark(3, this, &mEyePos, NULL, NULL, 0); + i_dComIfGp_setHitMark(3, this, &eyePos, NULL, NULL, 0); } setActionMode(ACT_DOWN); @@ -1556,14 +1556,14 @@ asm void daE_YM_c::checkFlyTerritory() { /* 8080E630-8080E6A0 0065F0 0070+00 1/1 0/0 0/0 .text initFly__8daE_YM_cFv */ void daE_YM_c::initFly() { - mAttentionInfo.field_0x0[2] = 46; - mGravity = FLOAT_LABEL(lit_3926); + attention_info.field_0x0[2] = 46; + gravity = FLOAT_LABEL(lit_3926); field_0x6e4 = 0; if (mTagPosP != NULL) { field_0x670 = mTagPos; } else { - field_0x670 = orig.pos; + field_0x670 = home.pos; } mType = 3; @@ -1995,7 +1995,7 @@ int daE_YM_c::_delete() { data_80815D28[0] = 0; } - if (mHeap != NULL) { + if (heap != NULL) { field_0x5bc.deleteObject(); } @@ -2210,23 +2210,23 @@ int daE_YM_c::create() { } field_0x714 = 4; - mAttentionInfo.field_0x0[2] = 58; + attention_info.field_0x0[2] = 58; fopAcM_SetMtx(this, field_0x5b4->getModel()->getBaseTRMtx()); fopAcM_SetMin(this, -200.0f, -100.0f, -200.0f); fopAcM_SetMax(this, 200.0f, 100.0f, 200.0f); - field_0x760.Set(¤t.pos, &next.pos, this, 1, &field_0x720, &speed, NULL, NULL); + field_0x760.Set(¤t.pos, &old.pos, this, 1, &field_0x720, &speed, NULL, NULL); field_0x760.OnLineCheck(); field_0x720.SetWall(30.0f, 60.0f); - mHealth = 10; + health = 10; field_0x560 = 10; field_0x938.Init(100, 0, this); mSphCc.Set(E_YM_n::cc_sph_src); mSphCc.SetStts(&field_0x938); - field_0x5bc.init(¤t.pos, &mEyePos, 3, 1); + field_0x5bc.init(¤t.pos, &eyePos, 3, 1); field_0x5bc.setEnemyName("E_ym"); mAtInfo.mpSound = &field_0x5bc; mAtInfo.mPowerType = 1; @@ -2255,7 +2255,7 @@ int daE_YM_c::create() { mpPath = dPath_GetRoomPath(tmp0, fopAcM_GetRoomNo(this)); if (mpPath != NULL) { - mAttentionInfo.field_0x0[7] = 31; + attention_info.field_0x0[7] = 31; field_0x6a6 = 4; field_0x670 = current.pos; setActionMode(ACT_WAIT); diff --git a/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp b/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp index d53d37e9c0..6defc1a3cf 100644 --- a/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp +++ b/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp @@ -87,14 +87,14 @@ 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, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daE_YM_TAG_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 195, // mPriority - &l_daE_YM_TAG_Method, // mSubMtd + &l_daE_YM_TAG_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // mCullType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp index c61903c29e..8954d7e1d4 100644 --- a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp +++ b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp @@ -183,7 +183,7 @@ static void wether_tag_move(kytag00_class* i_this) { f32 var_f1 = i_this->current.pos.abs(spC); if (var_f1 < i_this->field_0x584 && check_pos.y >= i_this->current.pos.y - temp_f31 && - check_pos.y < temp_f31 + (i_this->current.pos.y + (5000.0f * i_this->mScale.y)) && + check_pos.y < temp_f31 + (i_this->current.pos.y + (5000.0f * i_this->scale.y)) && i_this->field_0x588 > 0.0f) { f32 var_f9 = 1.0f; @@ -207,7 +207,7 @@ static void wether_tag_move(kytag00_class* i_this) { } } else if (0.0f != temp_f31) { f32 var_f2_2 = - (check_pos.y - (i_this->current.pos.y + (5000.0f * i_this->mScale.y))) / temp_f31; + (check_pos.y - (i_this->current.pos.y + (5000.0f * i_this->scale.y))) / temp_f31; if (var_f2_2 < 0.0f) { var_f2_2 = 0.0f; } @@ -377,7 +377,7 @@ static void wether_tag_efect_move(kytag00_class* i_this) { f32 var_f1 = i_this->current.pos.abs(spC); if (var_f1 < i_this->field_0x584 && check_pos.y >= i_this->current.pos.y - temp_f31 && - check_pos.y < temp_f31 + (i_this->current.pos.y + (5000.0f * i_this->mScale.y)) && + check_pos.y < temp_f31 + (i_this->current.pos.y + (5000.0f * i_this->scale.y)) && i_this->field_0x588 > 0.0f) { f32 var_f9 = 1.0f; @@ -403,7 +403,7 @@ static void wether_tag_efect_move(kytag00_class* i_this) { } } else if (0.0f != temp_f31) { f32 var_f2_2 = - (check_pos.y - (i_this->current.pos.y + (5000.0f * i_this->mScale.y))) / temp_f31; + (check_pos.y - (i_this->current.pos.y + (5000.0f * i_this->scale.y))) / temp_f31; if (var_f2_2 < 0.0f) { var_f2_2 = 0.0f; } @@ -417,7 +417,7 @@ static void wether_tag_efect_move(kytag00_class* i_this) { raincnt_set(var_f9); break; case 2: - if (i_this->orig.roomNo == dComIfGp_roomControl_getStayNo()) { + if (i_this->home.roomNo == dComIfGp_roomControl_getStayNo()) { g_env_light.field_0xe92 = false; if (g_env_light.mSnowCount < (int)(var_f9 * 500.0f)) { @@ -447,7 +447,7 @@ static void wether_tag_efect_move(kytag00_class* i_this) { case 14: g_env_light.field_0xea9 = 0; - if (i_this->orig.roomNo == dComIfGp_roomControl_getStayNo()) { + if (i_this->home.roomNo == dComIfGp_roomControl_getStayNo()) { g_env_light.mHousiCount = var_f9 * 300.0f; } else { g_env_light.mHousiCount = 0; @@ -510,7 +510,7 @@ static void wether_tag_efect_move(kytag00_class* i_this) { g_env_light.field_0x1048 = var_f9 * 100.0f; break; case 16: - if (i_this->orig.roomNo == dComIfGp_roomControl_getStayNo()) { + if (i_this->home.roomNo == dComIfGp_roomControl_getStayNo()) { g_env_light.field_0xe92 = true; if (g_env_light.mSnowCount < (int)(var_f9 * 500.0f)) { @@ -727,8 +727,8 @@ static int daKytag00_Create(fopAc_ac_c* i_this) { a_this->field_0x57c = 10; } - a_this->field_0x580 = a_this->mScale.x * 5000.0f; - a_this->field_0x584 = a_this->mScale.x * 5000.0f + a_this->field_0x578 * 100.0f; + a_this->field_0x580 = a_this->scale.x * 5000.0f; + a_this->field_0x584 = a_this->scale.x * 5000.0f + a_this->field_0x578 * 100.0f; a_this->field_0x56c = 0; a_this->field_0x56d = 0; g_env_light.mMoyaCount = 0; diff --git a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp index 69c25ffd80..c1d5cd4567 100644 --- a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp +++ b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp @@ -19,7 +19,7 @@ static int daKytag02_Execute(kytag02_class* i_this) { dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); cXyz* wind_vec = dKyw_get_wind_vec(); - if (dComIfGs_isSwitch(i_this->field_0x577, i_this->orig.roomNo)) { + if (dComIfGs_isSwitch(i_this->field_0x577, i_this->home.roomNo)) { dKyw_evt_wind_set_go(); dKyw_evt_wind_set(0, i_this->current.angle.y); @@ -115,7 +115,7 @@ static int daKytag02_Create(fopAc_ac_c* i_this) { this_->field_0x578 = fopAcM_GetParam(this_) & 0xFF; - if (dComIfGs_isSwitch(this_->field_0x577, this_->orig.roomNo)) { + if (dComIfGs_isSwitch(this_->field_0x577, this_->home.roomNo)) { dKyw_evt_wind_set_go(); dKyw_evt_wind_set(0, this_->current.angle.y); diff --git a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp index 5448ac2c9b..89899b3c5d 100644 --- a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp +++ b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp @@ -33,17 +33,18 @@ static int daKytag05_Delete(kytag05_class* i_this) { /* 80528A78-80528B10 000098 0098+00 1/0 0/0 0/0 .text daKytag05_Create__FP10fopAc_ac_c */ static int daKytag05_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(i_this, kytag05_class); - kytag05_class* tag = static_cast(i_this); + kytag05_class* a_this = static_cast(i_this); - tag->field_0x56c = fopAcM_GetParam(tag) >> 8; - tag->mSceneListID = fopAcM_GetParam(tag); - tag->field_0x568 = 100.0f * tag->mScale.x; + a_this->field_0x56c = fopAcM_GetParam(a_this) >> 8; + a_this->mSceneListID = fopAcM_GetParam(a_this); + a_this->field_0x568 = 100.0f * a_this->scale.x; - if (!tag->field_0x56c) { - tag->mAttentionInfo.field_0x0[7] = 0x21; - tag->mAttentionInfo.setFlag(0x80); + if (!a_this->field_0x56c) { + a_this->attention_info.field_0x0[7] = 0x21; + a_this->attention_info.flags |= 0x80; } - return 4; + + return cPhs_COMPLEATE_e; } /* ############################################################################################## */ diff --git a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp index 0bbd675a6f..610e4b7cdf 100644 --- a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp +++ b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp @@ -935,7 +935,7 @@ static void daKytag06_type_05_Execute(kytag06_class* i_this) { spX.y = i_this->current.pos.y; spX.z = player->current.pos.z; - if (i_this->current.pos.abs(spX) < i_this->mScale.x * 5000.0f) { + if (i_this->current.pos.abs(spX) < i_this->scale.x * 5000.0f) { g_env_light.field_0x130b = 1; } } diff --git a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp index a127fb2b58..b93a5ddeaf 100644 --- a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp +++ b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp @@ -20,7 +20,7 @@ static int daKytag07_Execute(kytag07_class* i_this) { if (i_this->field_0x58c != 99) { cLib_addCalc(&i_this->mLightInfluence.mPow,i_this->field_0x588,0.1f,1000.0f,0.001f); } else { - if (i_this->orig.roomNo != dStage_roomControl_c::getStayNo()) { + if (i_this->home.roomNo != dStage_roomControl_c::getStayNo()) { cLib_addCalc(&i_this->mLightInfluence.mPow,0.0f,0.25f,10000.0f,1.0f); } @@ -62,7 +62,7 @@ static int daKytag07_Create(fopAc_ac_c* i_this) { kytag07->mLightInfluence.mColor.b = fopAcM_GetParam(i_this) >> 16 & 0xFF; kytag07->mLightInfluence.mPow = 1e-10; kytag07->mLightInfluence.mFluctuation = 1.0f; - kytag07->field_0x588 = 1000.0f * kytag07->mScale.x; + kytag07->field_0x588 = 1000.0f * kytag07->scale.x; kytag07->field_0x58c = 0; @@ -86,14 +86,14 @@ extern actor_process_profile_definition g_profile_KYTAG07 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_KYTAG07, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(kytag07_class), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 101, // mPriority - &l_daKytag07_Method, // mSubMtd + &l_daKytag07_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // mCullType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp index 420c48c28e..6d457f240a 100644 --- a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp +++ b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp @@ -12,12 +12,12 @@ */ static int daKytag09_Draw(kytag09_class* i_this) { J3DModelData* modelData = i_this->mpModel->getModelData(); - g_env_light.settingTevStruct(0x10, NULL, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(modelData, &i_this->mTevStr); + g_env_light.settingTevStruct(0x10, NULL, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(modelData, &i_this->tevStr); if (i_this->mType != 1) { modelData = i_this->mpModel2->getModelData(); - g_env_light.setLightTevColorType_MAJI(modelData, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(modelData, &i_this->tevStr); } mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f); diff --git a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp index a52d0e0623..a970c6e4fd 100644 --- a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp +++ b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp @@ -93,8 +93,8 @@ static int daKytag14_Create(fopAc_ac_c* i_this) { a_this->mSwitchNo1 = a_this->current.angle.z & 0xFF; a_this->mSwitchNo2 = (a_this->current.angle.z >> 8) & 0xFF; - if (a_this->orig.roomNo != -1) { - a_this->mSaveRoomNo = a_this->orig.roomNo; + if (a_this->home.roomNo != -1) { + a_this->mSaveRoomNo = a_this->home.roomNo; } return cPhs_COMPLEATE_e; diff --git a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp index 72be4cb1f5..17f7f5850e 100644 --- a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp +++ b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp @@ -53,14 +53,14 @@ extern actor_process_profile_definition g_profile_KYTAG17 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_KYTAG17, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(kytag17_class), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 111, // mPriority - &l_daKytag17_Method, // mSubMtd + &l_daKytag17_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // mCullType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp index 965cc9ed1e..c3a106de8d 100644 --- a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp +++ b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp @@ -921,9 +921,9 @@ cPhs__Step daNpcAsh_c::Create() { fopAcM_SetMtx(this, mMcaMorf->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f); - mZ2.init(¤t.pos, &mEyePos, 3, 1); + mZ2.init(¤t.pos, &eyePos, 3, 1); mAcchCir.SetWall(daNpcAsh_Param_c::m.m1C, daNpcAsh_Param_c::m.m18); - mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, &fopAcM_GetSpeed_p(this), &fopAcM_GetAngle_p(this), &fopAcM_GetShapeAngle_p(this)); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mAcch.SetRoofNone(); mAcch.SetWaterNone(); mAcch.CrrPos(dComIfG_Bgsp()); @@ -1153,11 +1153,11 @@ int daNpcAsh_c::Draw() { mMcaMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); draw(0, 0, daNpcAsh_Param_c::m.mShadow, NULL, 0); if (field_0xf60 == 1) { - g_env_light.setLightTevColorType_MAJI(mModelBow->mModelData, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mModelBow->mModelData, &tevStr); mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(16)); mModelBow->i_setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mModelBow); - g_env_light.setLightTevColorType_MAJI(mModelQuiver->mModelData, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mModelQuiver->mModelData, &tevStr); mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(2)); mModelQuiver->i_setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mModelQuiver); @@ -1382,10 +1382,10 @@ void daNpcAsh_c::reset() { mLookMode = -1; field_0xf5c = 0; mGravity = daNpcAsh_Param_c::m.mGravity; - current.pos = orig.pos; - next.pos = current.pos; - current.angle.set(0, orig.angle.y, 0); - next.angle = current.angle; + current.pos = home.pos; + old.pos = current.pos; + current.angle.set(0, home.angle.y, 0); + old.angle = current.angle; shape_angle = current.angle; field_0x8f0 = current.angle; field_0x8f6 = field_0x8f0; @@ -1816,7 +1816,7 @@ bool daNpcAsh_c::wait_type0(void* param_0) { setExpression(7, -1.0f); if (!isMap()) { setMotion(0, -1.0f, false); - } else if (field_0x8f0.y == orig.angle.y) { + } else if (field_0x8f0.y == home.angle.y) { setMotion(1, -1.0f, false); } field_0x96c = 0; @@ -1844,8 +1844,8 @@ bool daNpcAsh_c::wait_type0(void* param_0) { } else { setLookMode(0, NULL); } - if (orig.angle.y != field_0x8f0.y) { - if (step(orig.angle.y, true)) { + if (home.angle.y != field_0x8f0.y) { + if (step(home.angle.y, true)) { setExpression(7, -1.0f); if (!isMap()) { setMotion(0, -1.0f, false); @@ -1857,7 +1857,7 @@ bool daNpcAsh_c::wait_type0(void* param_0) { } daTag_EvtArea_c* evtArea = (daTag_EvtArea_c*)mActorMngr[5].getActorP(); if (evtArea != NULL) { - if (evtArea->chkPointInArea(fopAcM_GetPosition_p(daPy_getPlayerActorClass()))) { + if (evtArea->chkPointInArea(*fopAcM_GetPosition_p(daPy_getPlayerActorClass()))) { daNpcF_offTmpBit(11); mOrderEvtNo = 2; fopAcM_delete(evtArea); @@ -1865,8 +1865,8 @@ bool daNpcAsh_c::wait_type0(void* param_0) { } } } - if (field_0x8f0.y != orig.angle.y) { - if (step(orig.angle.y, true)) { + if (field_0x8f0.y != home.angle.y) { + if (step(home.angle.y, true)) { if (!isMap()) { setMotion(0, -1.0f, false); } else { @@ -1876,7 +1876,7 @@ bool daNpcAsh_c::wait_type0(void* param_0) { } } if (i_dComIfGp_event_runCheck()) { - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { if (isSneaking()) { mOrderEvtNo = 3; @@ -1892,7 +1892,7 @@ bool daNpcAsh_c::wait_type0(void* param_0) { } } else { if (mOrderEvtNo != 0) { - mEvtInfo.setArchiveName("Ash"); + eventInfo.setArchiveName("Ash"); } orderEvent(mMapToolId, mOrderEvtNo != 0 ? l_evtNames[mOrderEvtNo] : NULL, -1, 40, -1, 1); } @@ -1970,7 +1970,7 @@ bool daNpcAsh_c::wait_type1(void* param_0) { case 0: if (daNpcF_chkTmpBit(0x76)) { current.pos.set(-4300.0f, 0.0f, 8627.657f); - next.pos = current.pos; + old.pos = current.pos; setAngle(-0x6000); field_0xf54++; } @@ -2076,7 +2076,7 @@ bool daNpcAsh_c::demo(void* param_0) { field_0xf5c = 2; // no break case 2: - if (i_dComIfGp_event_runCheck() && !mEvtInfo.checkCommandTalk()) { + if (i_dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { s32 cutIndex = i_dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0); if (cutIndex != -1) { mCutIndex = cutIndex; @@ -2088,7 +2088,7 @@ bool daNpcAsh_c::demo(void* param_0) { i_dComIfGp_getEventManager().cutEnd(cutIndex); } } - if (mEvtInfo.checkCommandDemoAccrpt() && field_0x9d4 != -1 && i_dComIfGp_getEventManager().endCheck(field_0x9d4)) { + if (eventInfo.checkCommandDemoAccrpt() && field_0x9d4 != -1 && i_dComIfGp_getEventManager().endCheck(field_0x9d4)) { i_dComIfGp_event_reset(); mOrderEvtNo = 0; field_0x9d4 = -1; @@ -2448,21 +2448,21 @@ asm void calc__11J3DTexNoAnmCFPUs() { // literals void daNpcAsh_c::setParam() { searchActors(); - mAttentionInfo.mFlags = 0xa; + attention_info.flags = 0xa; if (isSneaking()) { - mAttentionInfo.field_0x0[0] = 0x4e; - mAttentionInfo.field_0x0[1] = mAttentionInfo.field_0x0[0]; - mAttentionInfo.field_0x0[3] = 0x4d; - mAttentionInfo.mFlags |= 0x800000; + attention_info.field_0x0[0] = 0x4e; + attention_info.field_0x0[1] = attention_info.field_0x0[0]; + attention_info.field_0x0[3] = 0x4d; + attention_info.flags |= 0x800000; } else { if (!strcmp(dComIfGp_getStartStageName(), "R_SP116")) { - mAttentionInfo.field_0x0[0] = getDistTableIdx(3, 6); - mAttentionInfo.field_0x0[1] = mAttentionInfo.field_0x0[0]; - mAttentionInfo.field_0x0[3] = getDistTableIdx(2, 6); + attention_info.field_0x0[0] = getDistTableIdx(3, 6); + attention_info.field_0x0[1] = attention_info.field_0x0[0]; + attention_info.field_0x0[3] = getDistTableIdx(2, 6); } else { - mAttentionInfo.field_0x0[0] = getDistTableIdx(daNpcAsh_Param_c::m.m4C, daNpcAsh_Param_c::m.m4E); - mAttentionInfo.field_0x0[1] = mAttentionInfo.field_0x0[0]; - mAttentionInfo.field_0x0[3] = getDistTableIdx(daNpcAsh_Param_c::m.m48, daNpcAsh_Param_c::m.m4A); + attention_info.field_0x0[0] = getDistTableIdx(daNpcAsh_Param_c::m.m4C, daNpcAsh_Param_c::m.m4E); + attention_info.field_0x0[1] = attention_info.field_0x0[0]; + attention_info.field_0x0[3] = getDistTableIdx(daNpcAsh_Param_c::m.m48, daNpcAsh_Param_c::m.m4A); } } } @@ -2482,7 +2482,7 @@ BOOL daNpcAsh_c::main() { if (mpActionFn != NULL) { (this->*mpActionFn)(NULL); } - if (i_dComIfGp_event_runCheck() != 0 && !mEvtInfo.checkCommandTalk() && mItemPartnerId != -1) { + if (i_dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && mItemPartnerId != -1) { dComIfGp_event_setItemPartnerId(mItemPartnerId); mItemPartnerId = -1; } @@ -2596,14 +2596,14 @@ void daNpcAsh_c::setAttnPos() { cXyz vec(10.0f, 10.0f, 0.0f); mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); - mDoMtx_stack_c::multVec(&vec, &mEyePos); + mDoMtx_stack_c::multVec(&vec, &eyePos); vec.x = 0.0f; mDoMtx_stack_c::multVec(&vec, &vec); field_0x902.x = cLib_targetAngleX(&mHeadPos, &vec); field_0x902.y = cLib_targetAngleY(&mHeadPos, &vec); cXyz* attnPos = mLookat.getAttnPos(); if (attnPos != NULL) { - cXyz local_48 = *attnPos - mEyePos; + cXyz local_48 = *attnPos - eyePos; field_0x8fc.y = -(field_0x91a[2].y + field_0x8f0.y); field_0x8fc.y += cM_atan2s(local_48.x, local_48.z); field_0x8fc.x = -cM_atan2s(local_48.y, local_48.absXZ()); @@ -2612,7 +2612,7 @@ void daNpcAsh_c::setAttnPos() { field_0x8fc.y = 0; field_0x8fc.x = 0; } - mAttentionInfo.mPosition.set(mHeadPos.x, mHeadPos.y + 35.0f, mHeadPos.z); + attention_info.position.set(mHeadPos.x, mHeadPos.y + 35.0f, mHeadPos.z); cXyz center; mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(2)); mDoMtx_stack_c::multVecZero(¢er); @@ -2705,7 +2705,7 @@ void daNpcAsh_c::lookat() { break; } if (actor != NULL) { - mLookPos = actor->mAttentionInfo.mPosition; + mLookPos = actor->attention_info.position; if (mLookMode != 2 && mLookMode != 3) { mLookPos.y -= 40.0f; } diff --git a/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp b/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp index 129b7cf6e3..e521dcdf18 100644 --- a/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp +++ b/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp @@ -86,6 +86,7 @@ extern "C" extern char const* const d_a_npc_ne__stringBase0; // External References: // +extern "C" void fopAcM_riverStream__FP4cXyzPsPff(); extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); @@ -485,7 +486,7 @@ SECTION_DATA extern void* __vt__14daNpc_Ne_HIO_c[3] = { // matches with literals daNpc_Ne_HIO_c::daNpc_Ne_HIO_c() : field_0x04(-1), - mScale(1.0f), + scale(1.0f), mWalkSpeed(2.5f), mRunSpeed(12.0f), field_0x14(2.0f), @@ -619,11 +620,11 @@ static int daNpc_Ne_Draw(npc_ne_class* i_this) { if (!dComIfGs_wolfeye_effect_check()) { return 1; } - g_env_light.settingTevStruct(4, &i_this->current.pos, &i_this->mTevStr); + g_env_light.settingTevStruct(4, &i_this->current.pos, &i_this->tevStr); } else { - g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); } - g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->tevStr); i_this->mpBtkAnm->entry(model->getModelData()); i_this->mpBtpAnm->entry(model->getModelData()); @@ -633,14 +634,14 @@ static int daNpc_Ne_Draw(npc_ne_class* i_this) { cXyz vec(i_this->current.pos.x, i_this->current.pos.y + 100.0f, i_this->current.pos.z); i_this->mShadowKey = dComIfGd_setShadow( i_this->mShadowKey, 1, model, &vec, 0.0f, 400.0f, i_this->current.pos.y, - i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->mTevStr, + i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex() ); } if (i_this->field_0x5b4 == 3) { g_env_light.setLightTevColorType_MAJI(i_this->mpDishMorf->getModel()->mModelData, - &i_this->mTevStr); + &i_this->tevStr); i_this->mpDishMorf->entryDL(); } @@ -1124,9 +1125,9 @@ static fopAc_ac_c* search_bird(npc_ne_class* i_this) { while (i < target_info_count) { fopAc_ac_c* actor = target_info[i]; cXyz eye_delta, delta; - eye_delta.x = actor->current.pos.x - i_this->mEyePos.x; - eye_delta.y = actor->current.pos.y + 50.0f - i_this->mEyePos.y; - eye_delta.z = actor->current.pos.z - i_this->mEyePos.z; + eye_delta.x = actor->current.pos.x - i_this->eyePos.x; + eye_delta.y = actor->current.pos.y + 50.0f - i_this->eyePos.y; + eye_delta.z = actor->current.pos.z - i_this->eyePos.z; delta.x = actor->current.pos.x - i_this->current.pos.x; delta.z = actor->current.pos.z - i_this->current.pos.z; f32 eye_dist = JMAFastSqrt(eye_delta.x * eye_delta.x + eye_delta.z * eye_delta.z); @@ -1135,7 +1136,7 @@ static fopAc_ac_c* search_bird(npc_ne_class* i_this) { if (target_bgc[i] || other_bg_check(i_this, actor)) { target_bgc[i] = true; } else { - if (fabsf(actor->current.pos.y + 50.0f - i_this->mEyePos.y) <= 100.0f) { + if (fabsf(actor->current.pos.y + 50.0f - i_this->eyePos.y) <= 100.0f) { s16 angle = i_this->shape_angle.y - cM_atan2s(eye_delta.x, eye_delta.z); if (angle < 0x4000 && angle > -0x4000) { return actor; @@ -2770,7 +2771,7 @@ static int npc_ne_home(npc_ne_class* i_this) { i_this->current.pos.x = home_path[i_this->mHomePathIdx].mPosition.x; i_this->current.pos.y = home_path[i_this->mHomePathIdx].mPosition.y; i_this->current.pos.z = home_path[i_this->mHomePathIdx].mPosition.z; - i_this->next.pos = i_this->current.pos; + i_this->old.pos = i_this->current.pos; anm_init(i_this, npc_ne_class::ANM_TO_JUMP, 5.0f, 0, 1.0f); i_this->mState = 11; i_this->mHomePathIdx = home_path_search(i_this, 0); @@ -2851,7 +2852,7 @@ static int npc_ne_home(npc_ne_class* i_this) { i_this->current.pos.x = home_path[i_this->mHomePathIdx].mPosition.x; i_this->current.pos.y = home_path[i_this->mHomePathIdx].mPosition.y; i_this->current.pos.z = home_path[i_this->mHomePathIdx].mPosition.z; - i_this->next.pos = i_this->current.pos; + i_this->old.pos = i_this->current.pos; i_this->field_0xcb4 = 1; i_this->field_0xc5e = 0x7a; } @@ -2869,7 +2870,7 @@ static int npc_ne_home(npc_ne_class* i_this) { target_speed = l_HIO.mRunSpeed * 1.5f; ret = 0; i_this->speed.y = 0.0f; - i_this->mGravity = 0.0f; + i_this->gravity = 0.0f; vec.x = home_path[0].mPosition.x; vec.z = home_path[0].mPosition.z; vec -= i_this->current.pos; @@ -3135,7 +3136,7 @@ static void npc_ne_swim(npc_ne_class* i_this) { cLib_addCalc2(&i_this->speedF, l_HIO.mSwimSpeed, 1.0f, 0.1f); cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mTargetAngleY, 0x20, max_angle_step); i_this->speed.y = 0.0f; - i_this->mGravity = 0.0f; + i_this->gravity = 0.0f; cLib_addCalc2(&i_this->current.pos.y, i_this->field_0x6bc - i_this->mBaseScale.z * 45.0f, 1.0f, 5.0f); if (i_this->mTimers[1] == 0 && i_this->mAcch.ChkWallHit()) { @@ -3211,7 +3212,7 @@ static void npc_ne_outswim(npc_ne_class* i_this) { cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mTargetAngleY, 4, 0x800); i_this->speed.y = 0.0f; - i_this->mGravity = 0.0f; + i_this->gravity = 0.0f; } #else #pragma push @@ -3259,7 +3260,7 @@ static int npc_ne_climb(npc_ne_class* i_this) { if (wall_angle != 1) { anm_init(i_this, npc_ne_class::ANM_TO_JUMP, 5.0f, 0, 1.0f); i_this->current.angle.y = wall_angle; - i_this->current.pos = i_this->next.pos; + i_this->current.pos = i_this->old.pos; i_this->speedF = 0.0f; i_this->mState++; } else { @@ -3333,7 +3334,7 @@ static int npc_ne_climb(npc_ne_class* i_this) { if (ret == 0) { i_this->speed.y = 0.0f; i_this->speedF = 0.0f; - i_this->mGravity = 0.0f; + i_this->gravity = 0.0f; } return ret; } @@ -3410,7 +3411,7 @@ static void npc_ne_s_drop(npc_ne_class* i_this) { i_this->field_0x67a = 3; i_this->speed.y = 0.0f; i_this->speedF = 0.0f; - i_this->mGravity = 0.0f; + i_this->gravity = 0.0f; if (!i_this->mpMorf->isStop()) { break; } @@ -3519,7 +3520,7 @@ static int npc_ne_carry(npc_ne_class* i_this) { if (fabsf(i_this->current.pos.y - dComIfG_Bgsp().GroundCross(&gnd_chk)) < 30.0f) { i_this->current.pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); i_this->field_0x91c = i_this->current.pos.y; - i_this->mGravity = 0.0f; + i_this->gravity = 0.0f; } else { i_this->mAction = npc_ne_class::ACT_DROP; i_this->mState = 0; @@ -3542,7 +3543,7 @@ static int npc_ne_carry(npc_ne_class* i_this) { dBgS_LinChk lin_chk; cXyz pos = i_this->current.pos; pos.y += 2.0f; - lin_chk.Set(&player->mEyePos, &pos, i_this); + lin_chk.Set(&player->eyePos, &pos, i_this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { i_this->current.pos = lin_chk.i_GetCross(); } @@ -3653,7 +3654,7 @@ COMPILER_STRIP_GATE(0x80A92550, &lit_6812); // regalloc static void action(npc_ne_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - i_this->mGravity = -7.0f; + i_this->gravity = -7.0f; if (i_this->mResName == "Npc_net") { i_this->mDistToTarget = 10000.0f; @@ -3665,7 +3666,7 @@ static void action(npc_ne_class* i_this) { } i_this->mAngleToPlayer = fopAcM_searchPlayerAngleY(i_this); - i_this->field_0x6b8 = fabsf(player->mEyePos.y - player->current.pos.y); + i_this->field_0x6b8 = fabsf(player->eyePos.y - player->current.pos.y); if (fabsf(i_this->current.pos.y - player->current.pos.y) > 50.0f) { i_this->field_0x6b8 = 100.0f; } @@ -3806,12 +3807,12 @@ static void action(npc_ne_class* i_this) { } if (bvar9 && i_this->field_0x701 == 0) { - cLib_onBit(i_this->mAttentionInfo.mFlags, 0x10); + cLib_onBit(i_this->attention_info.flags, 0x10); if (ne_carry_check(i_this)) { return; } } else { - cLib_offBit(i_this->mAttentionInfo.mFlags, 0x10); + cLib_offBit(i_this->attention_info.flags, 0x10); } cXyz vec1, vec2, vec3; @@ -3822,7 +3823,7 @@ static void action(npc_ne_class* i_this) { && rod->field_0x13b4 != 0 && !i_this->mNoFollow) { if (i_this->mDistToTarget > 500.0f) { i_this->current.pos = ground_search(i_this); - i_this->next = i_this->current; + i_this->old = i_this->current; } } else if (!i_this->mNoFollow) { if (i_this->mDistToTarget > 700.0f && fopAcM_CheckCondition(i_this, 4) @@ -3846,7 +3847,7 @@ static void action(npc_ne_class* i_this) { i_this->mState = 0; } i_this->current.pos = vec2; - i_this->next = i_this->current; + i_this->old = i_this->current; } } } else { @@ -3856,7 +3857,7 @@ static void action(npc_ne_class* i_this) { i_this->current.pos.set(3400.0f, 84.13f, 64.0f); i_this->current.angle.y = -0x6987; i_this->shape_angle.y = i_this->current.angle.y; - i_this->next = i_this->orig = i_this->current; + i_this->old = i_this->home = i_this->current; i_this->speedF = 0.0f; } } @@ -3870,7 +3871,7 @@ static void action(npc_ne_class* i_this) { MtxPosition(&vec1, &vec2); i_this->speed.x = vec2.x; i_this->speed.z = vec2.z; - i_this->speed.y += i_this->mGravity; + i_this->speed.y += i_this->gravity; i_this->current.pos += i_this->speed; if (i_this->speed.y < -120.0f) { i_this->speed.y = -120.0f; @@ -3932,7 +3933,7 @@ static void action(npc_ne_class* i_this) { i_this->mState = 0; i_this->mSound.startSound(Z2SE_CAT_CRY_ANNOY, 0, -1); } else if (fvar15 > 30.0f && i_this->mAction != npc_ne_class::ACT_ROOF) { - i_this->current.pos = i_this->next.pos; + i_this->current.pos = i_this->old.pos; i_this->mAction = npc_ne_class::ACT_S_DROP; i_this->mState = 0; } @@ -3987,7 +3988,7 @@ static void action(npc_ne_class* i_this) { if (i_this->field_0x668 == 2) { vec1 = i_this->field_0x66c - i_this->current.pos; } else { - vec1 = player->mEyePos - i_this->current.pos; + vec1 = player->eyePos - i_this->current.pos; if (!daPy_py_c::i_checkNowWolf()) { vec1.y += i_this->mBaseScale.z * -40.0f; } @@ -4047,7 +4048,7 @@ static void action(npc_ne_class* i_this) { i_this->field_0x68a = 0; if (ivar5 != 0) { - cXyz vec4 = i_this->mEyePos; + cXyz vec4 = i_this->eyePos; vec4.y = i_this->field_0x6bc; if (ivar5 == 1) { if (i_this->field_0x658 == 0) { @@ -4265,13 +4266,13 @@ static int message(npc_ne_class* i_this) { i_this->field_0xc0a = 0; if (i_this->field_0x5b7 == 1 && (i_this->mMsgFlow.getNowMsgNo() == 0x18a1 || i_this->mMsgFlow.getNowMsgNo() == 0x18a2)) { - fopAcM_createItem(&dComIfGp_getPlayer(0)->mEyePos, SILVER_RUPEE, -1, + fopAcM_createItem(&dComIfGp_getPlayer(0)->eyePos, SILVER_RUPEE, -1, fopAcM_GetRoomNo(i_this), NULL, NULL, 3); } } return 1; } else { - if (i_dComIfGp_event_runCheck() && i_this->mEvtInfo.checkCommandTalk()) { + if (i_dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) { i_this->mMsgFlow.init(i_this, i_this->mFlowID, 0, NULL); i_this->field_0xc0a = 1; } @@ -4279,14 +4280,14 @@ static int message(npc_ne_class* i_this) { if (i_this->field_0xc08 == 2 && i_this->mFlowID != -1 && daPy_py_c::i_checkNowWolf() && !fopAcM_otherBgCheck(daPy_getLinkPlayerActorClass(), i_this)) { fopAcM_OnStatus(i_this, 0); - i_this->mAttentionInfo.mFlags |= 0xa; + i_this->attention_info.flags |= 0xa; if (i_this->mResName == "Npc_net") { - i_this->mAttentionInfo.mFlags |= 0xc00000; + i_this->attention_info.flags |= 0xc00000; } - i_this->mEvtInfo.i_onCondition(1); + i_this->eventInfo.i_onCondition(1); } else { fopAcM_OffStatus(i_this, 0); - i_this->mAttentionInfo.mFlags &= ~0xc0000a; + i_this->attention_info.flags &= ~0xc0000a; } return 0; @@ -4368,11 +4369,11 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { mDoMtx_stack_c::YrotM(i_this->shape_angle.y); mDoMtx_stack_c::XrotM(i_this->shape_angle.x); mDoMtx_stack_c::ZrotM(i_this->shape_angle.z); - i_this->mScale.x = i_this->mBaseScale.x * l_HIO.mScale; - mDoMtx_stack_c::scaleM(i_this->mScale.x, i_this->mScale.x, i_this->mScale.x); + i_this->scale.x = i_this->mBaseScale.x * l_HIO.scale; + mDoMtx_stack_c::scaleM(i_this->scale.x, i_this->scale.x, i_this->scale.x); J3DModel* model = i_this->mpMorf->getModel(); model->i_setBaseTRMtx(mDoMtx_stack_c::get()); - i_this->mpMorf->play(&i_this->mEyePos, 0, 0); + i_this->mpMorf->play(&i_this->eyePos, 0, 0); i_this->mpBtkAnm->setFrame(i_this->mBtkFrame); i_this->mpBtpAnm->setFrame(i_this->mBtpFrame); i_this->mpMorf->modelCalc(); @@ -4381,14 +4382,14 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { mDoMtx_stack_c::transS(i_this->mDishPos.x, i_this->mDishPos.y, i_this->mDishPos.z); mDoMtx_stack_c::YrotM(i_this->shape_angle.y); i_this->mpDishMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); - i_this->mpDishMorf->play(&i_this->mEyePos, 0, 0); + i_this->mpDishMorf->play(&i_this->eyePos, 0, 0); i_this->mpDishMorf->modelCalc(); } PSMTXCopy(model->i_getAnmMtx(4), *calc_mtx); - MtxPosition(&vec1, &i_this->mEyePos); - i_this->mAttentionInfo.mPosition = i_this->mEyePos; - i_this->mAttentionInfo.mPosition.y += i_this->mBaseScale.y * 20.0f; + MtxPosition(&vec1, &i_this->eyePos); + i_this->attention_info.position = i_this->eyePos; + i_this->attention_info.position.y += i_this->mBaseScale.y * 20.0f; PSMTXCopy(model->i_getAnmMtx(3), *calc_mtx); vec1.set(i_this->field_0xbf4 + -30.0f, 0.0f, 0.0f); @@ -4403,7 +4404,7 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { dComIfG_Ccsp()->Set(&i_this->mCcSph); cXyz vec3(-20000.0f, 300000.0f, -10000.0f); - vec2 = i_this->mEyePos; + vec2 = i_this->eyePos; if (i_this->field_0xbcc == 0) { vec2 += vec3; } else { @@ -4421,7 +4422,7 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { static u16 e_name[2] = {0x8497, 0x8498}; for (int i = 0; i < 2; i++) { i_this->mParticle[i] = dComIfGp_particle_set(i_this->mParticle[i], e_name[i], - &i_this->mEyePos, NULL, NULL); + &i_this->eyePos, NULL, NULL); JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->mParticle[i]); if (emitter != NULL) { emitter->setGlobalAlpha(!dComIfGs_wolfeye_effect_check() ? 0xff : 0); @@ -4446,12 +4447,12 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { } fish->mpMorf->play(NULL, 0, 0); fish->mpMorf->modelCalc(); - fish->current.pos = i_this->mEyePos; - fish->mEyePos = i_this->mEyePos; + fish->current.pos = i_this->eyePos; + fish->eyePos = i_this->eyePos; } - if (i_this->current.pos.y - i_this->orig.pos.y < -5000.0f && fopAcM_CheckCondition(i_this, 4)) { - i_this->next.pos = i_this->current.pos = i_this->orig.pos; + if (i_this->current.pos.y - i_this->home.pos.y < -5000.0f && fopAcM_CheckCondition(i_this, 4)) { + i_this->old.pos = i_this->current.pos = i_this->home.pos; } return 1; @@ -4480,7 +4481,7 @@ static int daNpc_Ne_Delete(npc_ne_class* i_this) { if (i_this->field_0xcc1 != 0) { l_hioInit = false; } - if (i_this->mHeap != NULL) { + if (i_this->heap != NULL) { i_this->mSound.deleteObject(); } return 1; @@ -4654,7 +4655,7 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { if (i_dComIfGs_isEventBit(0x1001)) { _this->mAction = npc_ne_class::ACT_ROOF; _this->current.pos.set(1005.0f, 766.0f, -1423.0f); - _this->next = _this->orig = _this->current; + _this->old = _this->home = _this->current; _this->current.angle.y = 0; _this->mNoFollow = true; } else { @@ -4662,7 +4663,7 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { _this->current.pos.set(3400.0f, 84.13f, 64.0f); _this->current.angle.y = -0x6987; _this->shape_angle.y = _this->current.angle.y; - _this->next = _this->orig = _this->current; + _this->old = _this->home = _this->current; _this->mNoFollow = true; _this->field_0x701 = 1; } @@ -4681,10 +4682,10 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { fopAcM_OnStatus(_this, 0x100); fopAcM_OnCarryType(_this, fopAcM_CARRY_TYPE_8); - _this->mAttentionInfo.mFlags = 0; - _this->mAttentionInfo.field_0x0[4] = 7; + _this->attention_info.flags = 0; + _this->attention_info.field_0x0[4] = 7; fopAcM_SetMtx(_this, _this->mpMorf->getModel()->getBaseTRMtx()); - _this->mHealth = 1; + _this->health = 1; _this->field_0x560 = 1; /* 80A92950-80A92990 000360 0040+00 1/1 0/0 0/0 .data cc_sph_src$7518 */ @@ -4738,7 +4739,7 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { } else { _this->mBaseScale.set(1.0f, 1.0f, 1.0f); } - _this->mAcch.Set(&_this->current.pos, &_this->next.pos, _this, 1, + _this->mAcch.Set(&_this->current.pos, &_this->old.pos, _this, 1, &_this->mAcchCir, &_this->speed, NULL, NULL); _this->mAcchCir.SetWall(_this->mBaseScale.y * 30.0f, _this->mBaseScale.z * 35.0f); _this->field_0x5e0 = cM_rndFX(0.2f) + 1.0f; diff --git a/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp b/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp index a559d9f363..082750e9bd 100644 --- a/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp +++ b/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp @@ -221,8 +221,8 @@ static asm int nodeCallBack(J3DJoint* param_0, int param_1) { /* 80B25B78-80B25BDC 000258 0064+00 1/0 0/0 0/0 .text daNPC_TR_Draw__FP12npc_tr_class */ static int daNPC_TR_Draw(npc_tr_class* npc_tr) { - g_env_light.settingTevStruct(0, &npc_tr->current.pos, &npc_tr->mTevStr); - g_env_light.setLightTevColorType_MAJI(npc_tr->field_0x5b8->mModelData, &npc_tr->mTevStr); + g_env_light.settingTevStruct(0, &npc_tr->current.pos, &npc_tr->tevStr); + g_env_light.setLightTevColorType_MAJI(npc_tr->field_0x5b8->mModelData, &npc_tr->tevStr); mDoExt_modelUpdateDL(npc_tr->field_0x5b8); return 1; } @@ -387,9 +387,9 @@ static void npc_tr_move(npc_tr_class* npc_tr) { case 0: if (npc_tr->field_0x5dc[0] == 0) { for (int i = 0; i < 100; i++) { - npc_tr->field_0x5c4.x = npc_tr->orig.pos.x + cM_rndFX(1000.0f); - npc_tr->field_0x5c4.y = npc_tr->orig.pos.y + cM_rndFX(200.0f); - npc_tr->field_0x5c4.z = npc_tr->orig.pos.z + cM_rndFX(1000.0f); + npc_tr->field_0x5c4.x = npc_tr->home.pos.x + cM_rndFX(1000.0f); + npc_tr->field_0x5c4.y = npc_tr->home.pos.y + cM_rndFX(200.0f); + npc_tr->field_0x5c4.z = npc_tr->home.pos.z + cM_rndFX(1000.0f); cXyz distance = npc_tr->field_0x5c4 - npc_tr->current.pos; distance.y = 0.0f; @@ -521,7 +521,7 @@ static int daNPC_TR_Execute(npc_tr_class* npc_tr) { mDoMtx_stack_c::YrotM(npc_tr->shape_angle.y + npc_tr->field_0x5f0); mDoMtx_stack_c::XrotM(npc_tr->shape_angle.x); - f32 scale = npc_tr->mScale.x * l_HIO.field_0x8; + f32 scale = npc_tr->scale.x * l_HIO.field_0x8; mDoMtx_stack_c::scaleM(scale, scale, scale); MTXCopy(mDoMtx_stack_c::get(), npc_tr->field_0x5b8->mBaseTransformMtx); @@ -587,8 +587,8 @@ static int daNPC_TR_Create(fopAc_ac_c* i_this) { l_HIO.field_0x4 = -1; } - npc_tr->mCullMtx = npc_tr->field_0x5b8->getBaseTRMtx(); - npc_tr->mScale.x = cM_rndFX(0.1f) + 0.8f; + npc_tr->cullMtx = npc_tr->field_0x5b8->getBaseTRMtx(); + npc_tr->scale.x = cM_rndFX(0.1f) + 0.8f; daNPC_TR_Execute(npc_tr); } diff --git a/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp b/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp index 7bd3fd5f13..a36646d658 100644 --- a/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp +++ b/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp @@ -55,7 +55,7 @@ daBarDesk_HIO_c::daBarDesk_HIO_c() : field_0x4(10), field_0x5(3) { void daBarDesk_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -148,15 +148,15 @@ void daBarDesk_c::modeBreak() { void daBarDesk_c::setBreakEffect() { static const u16 particle_id[2] = {0x85F4, 0x85F5}; for (int i = 0; i < 2; i++) { - dComIfGp_particle_set(particle_id[i], ¤t.pos, NULL, &mScale, + dComIfGp_particle_set(particle_id[i], ¤t.pos, NULL, &scale, 0xff, NULL, -1, NULL, NULL, NULL); } } /* 80BA98E8-80BA998C 000848 00A4+00 1/0 0/0 0/0 .text Draw__11daBarDesk_cFv */ int daBarDesk_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp b/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp index b51fda92ce..bdaaaf3cd7 100644 --- a/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp +++ b/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp @@ -28,7 +28,7 @@ static char* l_arcName = "M_BBox"; /* 80BACD38-80BACD74 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjBBox_cFv */ void daObjBBox_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -85,7 +85,7 @@ int daObjBBox_c::Execute(Mtx** i_mtx) { if (hitObj != NULL) { if (hitObj->ChkAtType(0xd8000000)) { for (int i = 0; i < 5; i++) { - dComIfGp_particle_set(particle_id[i], ¤t.pos, NULL, &mScale, 0xff, NULL, + dComIfGp_particle_set(particle_id[i], ¤t.pos, NULL, &scale, 0xff, NULL, -1, NULL, NULL, NULL); } fopAcM_seStart(this, Z2SE_OBJ_WOODBOX_BREAK, 0); @@ -103,8 +103,8 @@ int daObjBBox_c::Execute(Mtx** i_mtx) { /* 80BAD234-80BAD2D8 000574 00A4+00 1/0 0/0 0/0 .text Draw__11daObjBBox_cFv */ int daObjBBox_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp b/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp index 389f00ecf5..5888a885bc 100644 --- a/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp +++ b/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp @@ -47,7 +47,7 @@ cPhs__Step daObj_Bed_c::create() { } fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 200.0f, 200.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, + mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, ¤t.angle, &shape_angle); mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; @@ -103,20 +103,20 @@ int daObj_Bed_c::Execute() { PSMTXCopy(mpModel->getBaseTRMtx(), mMtx); mpCollider->Move(); } - mEyePos = mAttentionInfo.mPosition = current.pos; - mAttentionInfo.mFlags = 0; + eyePos = attention_info.position = current.pos; + attention_info.flags = 0; return 1; } /* 80BADDF4-80BADEB8 000874 00C4+00 1/1 0/0 0/0 .text Draw__11daObj_Bed_cFv */ int daObj_Bed_c::Draw() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); mDoExt_modelUpdateDL(mpModel); if (mGroundH != -1e9f) { mShadow = dComIfGd_setShadow(mShadow, 1, mpModel, ¤t.pos, daObj_Bed_Param_c::m.field_0xc, 20.0f, - current.pos.y, mGroundH, mGndChk, &mTevStr, 0, + current.pos.y, mGroundH, mGndChk, &tevStr, 0, 1.0f, &dDlst_shadowControl_c::mSimpleTexObj); } return 1; @@ -150,8 +150,8 @@ int daObj_Bed_c::isDelete() { /* 80BADF34-80BADF90 0009B4 005C+00 2/2 0/0 0/0 .text setEnvTevColor__11daObj_Bed_cFv */ void daObj_Bed_c::setEnvTevColor() { - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); - mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); + tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); } /* 80BADF90-80BADFD0 000A10 0040+00 2/2 0/0 0/0 .text setRoomNo__11daObj_Bed_cFv */ @@ -163,7 +163,7 @@ void daObj_Bed_c::setRoomNo() { void daObj_Bed_c::setMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle); - mDoMtx_stack_c::scaleM(mScale); + mDoMtx_stack_c::scaleM(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } diff --git a/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp b/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp index 2e79ac5d66..883c874fd1 100644 --- a/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp +++ b/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp @@ -19,12 +19,12 @@ void daBkLeaf_c::setBokkuri() { csXyz currentAngle = current.angle; daObjCarry_c::make_prm(¤tAngle, 6, getItem(), getItemBit(), 1, 2); field_0x578 = fopAcM_createChild(PROC_Obj_Carry, fopAcM_GetID(this), 0, ¤t.pos, - fopAcM_GetRoomNo(this), ¤tAngle, &mScale, -1, 0); + fopAcM_GetRoomNo(this), ¤tAngle, &scale, -1, 0); } /* 80BB618C-80BB61C8 00012C 003C+00 1/1 0/0 0/0 .text initBaseMtx__10daBkLeaf_cFv */ void daBkLeaf_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -149,8 +149,8 @@ int daBkLeaf_c::execute() { /* 80BB65C4-80BB6654 000564 0090+00 1/1 0/0 0/0 .text draw__10daBkLeaf_cFv */ int daBkLeaf_c::draw() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mpBckAnm->entry(mpModel->getModelData()); mDoExt_modelUpdateDL(mpModel); mpBckAnm->remove(mpModel->getModelData()); diff --git a/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp b/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp index 1bf16ce3e3..8f5e436cbe 100644 --- a/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp +++ b/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp @@ -27,7 +27,7 @@ static void* search_door(void* i_actor, void* i_this) { /* 80578D4C-80578D88 0000AC 003C+00 1/1 0/0 0/0 .text initBaseMtx__13daObjBkDoor_cFv */ void daObjBkDoor_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -113,7 +113,7 @@ int daObjBkDoor_c::create1st() { void daObjBkDoor_c::openCheck() { if (!mOpenCheckDone) { fopAc_ac_c* actor = fopAcM_Search((fopAcIt_JudgeFunc)search_door, this); - if (actor == NULL || (orig.angle.GetY() - actor->orig.angle.GetY()) != 0) { + if (actor == NULL || (home.angle.GetY() - actor->home.angle.GetY()) != 0) { mOpening = true; } mOpenCheckDone = true; @@ -179,8 +179,8 @@ int daObjBkDoor_c::Execute(Mtx** i_mtxP) { /* 805792E4-80579388 000644 00A4+00 1/0 0/0 0/0 .text Draw__13daObjBkDoor_cFv */ int daObjBkDoor_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); @@ -232,14 +232,14 @@ extern actor_process_profile_definition g_profile_Obj_BkDoor = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_BkDoor, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daObjBkDoor_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 451, // mPriority - &daObjBkDoor_METHODS, // mSubMtd + &daObjBkDoor_METHODS, // sub_method 0x40100, // mStatus 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp index 278b3160d5..3d27698400 100644 --- a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp +++ b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp @@ -33,9 +33,9 @@ int daObjBombf_c::create() { } fopAcM_SetMtx(this, field_0x570->getBaseTRMtx()); - mTevStr.mRoomNo = fopAcM_GetRoomNo(this); - mAttentionInfo.mPosition = current.pos; - mEyePos = mAttentionInfo.mPosition; + tevStr.mRoomNo = fopAcM_GetRoomNo(this); + attention_info.position = current.pos; + eyePos = attention_info.position; field_0x574 = 0xffffffff; setMatrix(); fopAcM_SetMin(this, -75.0f, 0.0f, -75.0f); @@ -108,8 +108,8 @@ static int daObjBombf_Execute(daObjBombf_c* i_this) { /* 80BBADF8-80BBAE5C 000478 0064+00 1/1 0/0 0/0 .text draw__12daObjBombf_cFv */ int daObjBombf_c::draw() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(field_0x570->mModelData, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(field_0x570->mModelData, &tevStr); mDoExt_modelUpdateDL(field_0x570); return 1; } @@ -132,14 +132,14 @@ extern actor_process_profile_definition g_profile_Obj_Bombf = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Bombf, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daObjBombf_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 251, // mPriority - &l_daObjBombf_Method, // mSubMtd + &l_daObjBombf_Method, // sub_method 0x40100, // mStatus fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp index 1b6163e388..22456228c0 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp +++ b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp @@ -235,8 +235,8 @@ static int getNowLevel() { /* 80579700-80579748 000140 0048+00 1/1 0/0 0/0 .text initBaseMtx__15daObjBossWarp_cFv */ void daObjBossWarp_c::initBaseMtx() { - mScale.y = 0.15f; - mpModel->setBaseScale(mScale); + scale.y = 0.15f; + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -271,7 +271,7 @@ int daObjBossWarp_c::Create() { mAction = 0; } - mEvtInfo.mArchiveName = l_arcName; + eventInfo.mArchiveName = l_arcName; mWarpCheckEventId = i_dComIfGp_getEventManager().getEventIdx(this, l_warp_check_evName, 0xff); mWarpCancelEventId = i_dComIfGp_getEventManager().getEventIdx(this, l_warp_cancel_evName, 0xff); @@ -336,7 +336,7 @@ void daObjBossWarp_c::appear(int param_0) { for (int i = 0; i < 4; i++) { if (mpParticle[i] == NULL) { if (i == 3) { - mpParticle[i] = dComIfGp_particle_set(l_eff_id[i], &mParticlePos, NULL, &mScale); + mpParticle[i] = dComIfGp_particle_set(l_eff_id[i], &mParticlePos, NULL, &scale); } else { mpParticle[i] = dComIfGp_particle_set(l_eff_id[i], &mParticlePos, NULL, NULL); if (i == 0) { @@ -455,12 +455,12 @@ int daObjBossWarp_c::execute() { mpBtkAnm[1]->play(); if (mScalingUp) { - cLib_chaseF(&mScale.y, 1.0f, 0.016f); + cLib_chaseF(&scale.y, 1.0f, 0.016f); } if (mpParticle[3] != NULL) { JGeometry::TVec3 scale; - JGeometry::setTVec3f(&mScale.x, &scale.x); + JGeometry::setTVec3f(&scale.x, &scale.x); mpParticle[3]->setGlobalScale(scale); } @@ -505,19 +505,19 @@ void daObjBossWarp_c::event_proc_call() { void daObjBossWarp_c::actionWait() { setAction(ACT_ORDER_EVENT); fopAcM_orderOtherEventId(this, mBossClearEventId, mBossClearMapToolId, 0xffff, 3, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } /* 8057A54C-8057A610 000F8C 00C4+00 1/0 0/0 0/0 .text actionOrderEvent__15daObjBossWarp_cFv */ void daObjBossWarp_c::actionOrderEvent() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { dComIfGp_event_setTalkPartner(i_fopAcM_SearchByName(PROC_OBJ_YSTONE)); setAction(ACT_EVENT); mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); demoProc(); } else { fopAcM_orderOtherEventId(this, mBossClearEventId, mBossClearMapToolId, 0xffff, 3, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } @@ -537,19 +537,19 @@ void daObjBossWarp_c::actionWaitWarp() { if (checkDistance()) { setAction(ACT_ORDER_CHK_EVENT); fopAcM_orderOtherEventId(this, mWarpCheckEventId, 0xff, 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } /* 8057A6E0-8057A778 001120 0098+00 1/0 0/0 0/0 .text actionOrderWarpEvent__15daObjBossWarp_cFv */ void daObjBossWarp_c::actionOrderWarpEvent() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(ACT_WARP_EVENT); mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); demoProc(); } else { fopAcM_orderOtherEventId(this, mBossWarpInEventId, mBossWarpInMapToolId, 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } @@ -568,16 +568,16 @@ void daObjBossWarp_c::actionDead() { /* 8057A7C8-8057A8B4 001208 00EC+00 1/0 0/0 0/0 .text actionOrderChkEvent__15daObjBossWarp_cFv */ void daObjBossWarp_c::actionOrderChkEvent() { daMidna_c* midna = daPy_py_c::getMidnaActor(); - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(ACT_CHK_EVENT); mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); - mAttentionInfo.mPosition = midna->mAttentionInfo.mPosition; - mAttentionInfo.mPosition.y += 100.0f; - mEyePos = mAttentionInfo.mPosition; + attention_info.position = midna->attention_info.position; + attention_info.position.y += 100.0f; + eyePos = attention_info.position; demoProc(); } else { fopAcM_orderOtherEventId(this, mWarpCheckEventId, 0xff, 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } @@ -589,11 +589,11 @@ void daObjBossWarp_c::actionChkEvent() { if (mWarpChoice == 0) { setAction(ACT_ORDER_WARP_EVENT); fopAcM_orderOtherEventId(this, mBossWarpInEventId, mBossWarpInMapToolId, 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } else if (mWarpChoice == 1) { setAction(ACT_ORDER_CANCEL_EVENT); fopAcM_orderOtherEventId(this, mWarpCancelEventId, 0xff, 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } else { demoProc(); @@ -603,13 +603,13 @@ void daObjBossWarp_c::actionChkEvent() { /* 8057A994-8057AA2C 0013D4 0098+00 1/0 0/0 0/0 .text actionOrderCancelEvent__15daObjBossWarp_cFv */ void daObjBossWarp_c::actionOrderCancelEvent() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(ACT_CANCEL_EVENT); mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); demoProc(); } else { fopAcM_orderOtherEventId(this, mWarpCancelEventId, 0xff, 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } @@ -1008,8 +1008,8 @@ void daObjBossWarp_c::setGoal() { /* 8057B190-8057B23C 001BD0 00AC+00 1/1 0/0 0/0 .text draw__15daObjBossWarp_cFv */ int daObjBossWarp_c::draw() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); mpBrkAnm->entry(mpModel->getModelData()); mpBtkAnm[0]->entry(mpModel->getModelData()); mpBtkAnm[1]->entry(mpModel->getModelData()); diff --git a/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp b/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp index 7380f07621..4afcb387ef 100644 --- a/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp +++ b/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp @@ -36,7 +36,7 @@ void daBsGate_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); mDoMtx_stack_c::transM(mOpenDist, 0.0f, 0.0f); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -161,8 +161,8 @@ void daBsGate_c::modeClose() { /* 80BC2F94-80BC3038 0007F4 00A4+00 1/0 0/0 0/0 .text Draw__10daBsGate_cFv */ int daBsGate_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp index be5c45869e..261773fba4 100644 --- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp +++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp @@ -1966,16 +1966,16 @@ extern actor_process_profile_definition g_profile_Obj_Carry = { 8, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Carry, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daObjCarry_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 244, // mPriority - &l_daObjCarry_Method, // mSubMtd + &l_daObjCarry_Method, // sub_method 0x40500, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 8047B160-8047B16C 000B10 000C+00 1/1 0/0 0/0 .data __vt__12dBgS_AcchCir */ @@ -2353,11 +2353,11 @@ void daObjCarry_c::setBaseMtx() { if (mType == TYPE_BOKKURI) { mDoMtx_stack_c::transS(current.pos.x,current.pos.y + (f32)data(),current.pos.z); - mDoMtx_stack_c::transM(0.0f,mScale.x*(f32)data(),0.0f); + mDoMtx_stack_c::transM(0.0f,scale.x*(f32)data(),0.0f); mDoMtx_stack_c::concat(mStack_0x58); - mDoMtx_stack_c::transM(0.0f,-mScale.x*(f32)data(),0.0f); + mDoMtx_stack_c::transM(0.0f,-scale.x*(f32)data(),0.0f); mDoMtx_stack_c::ZXYrotM(shape_angle.x+field_0xd64,shape_angle.y+field_0xd6a,shape_angle.z+field_0xd66); - mDoMtx_stack_c::transM(0.0f,mScale.x * 35.0f * field_0xd84,field_0xd84 * -25.0f); + mDoMtx_stack_c::transM(0.0f,scale.x * 35.0f * field_0xd84,field_0xd84 * -25.0f); mDoMtx_stack_c::XrotM(field_0xd84*16384.0f); } else if (mType == TYPE_KIBAKO || mType == TYPE_TARU || mType == TYPE_DOKURO) { @@ -2377,7 +2377,7 @@ void daObjCarry_c::setBaseMtx() { } mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); } #else #pragma push @@ -2394,10 +2394,10 @@ asm void daObjCarry_c::setBaseMtx() { s32 daObjCarry_c::preInit() { fopAcM_SetupActor(this, daObjCarry_c); if (field_0xd15 == 0) { - mItemNo = orig.angle.x; - field_0xd18 = orig.angle.z; - orig.angle.z = 0; - orig.angle.x = 0; + mItemNo = home.angle.x; + field_0xd18 = home.angle.z; + home.angle.z = 0; + home.angle.x = 0; current.angle.z = 0; current.angle.x = 0; shape_angle.z = 0; @@ -2590,11 +2590,11 @@ COMPILER_STRIP_GATE(0x8047A3C0, &lit_4597); #ifdef NONMATCHING // need to map data() first void daObjCarry_c::Create() { - mScale.set((f32)data(), (f32)data(), (f32)data()); // need to map data + scale.set((f32)data(), (f32)data(), (f32)data()); // need to map data fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); mAcchCir.SetWall((f32)data(), (f32)data()); // need to map data - mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, &fopAcM_GetSpeed_p(this), ¤t.angle, &shape_angle); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), ¤t.angle, &shape_angle); mAcch.SetWtrChkMode(2); mAcch.ClrRoofNone(); mAcch.SetRoofCrrHeight(80.0f); @@ -2655,12 +2655,12 @@ s32 daObjCarry_c::CreateInit_ironball() { u8 l_saveID = getSaveID(); current.pos = getPos(l_saveID); - next.pos = current.pos; - mAttentionInfo.mPosition = current.pos; - mEyePos = current.pos; + old.pos = current.pos; + attention_info.position = current.pos; + eyePos = current.pos; fopAcM_SetRoomNo(this,getRoomNo(l_saveID)); - mTevStr.mRoomNo = fopAcM_GetRoomNo(this); + tevStr.mRoomNo = fopAcM_GetRoomNo(this); if (chkSttsFlag(l_saveID,1)) { mDraw = 1; @@ -2731,7 +2731,7 @@ s32 daObjCarry_c::CreateInit_bokkuri() { field_0xd76 = 255; speedF = FLOAT_LABEL(lit_4683); speed.y = FLOAT_LABEL(lit_4684); - mScale.set(FLOAT_LABEL(lit_4685),FLOAT_LABEL(lit_4685),FLOAT_LABEL(lit_4685)); + scale.set(FLOAT_LABEL(lit_4685),FLOAT_LABEL(lit_4685),FLOAT_LABEL(lit_4685)); mode_init_dbDrop(1); break; case 2: diff --git a/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp b/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp index 66db48c869..343d63ad85 100644 --- a/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp +++ b/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp @@ -49,11 +49,11 @@ int daObjCatDoor_c::createHeap() { } int daObjCatDoor_c::draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); - fopAc_ac_c* p1 = static_cast(this); - g_env_light.setLightTevColorType_MAJI(mDoor1.pmodel, &p1->mTevStr); - g_env_light.setLightTevColorType_MAJI(mDoor2.pmodel, &p1->mTevStr); + fopAc_ac_c* p1 = static_cast(this); + g_env_light.setLightTevColorType_MAJI(mDoor1.pmodel, &p1->tevStr); + g_env_light.setLightTevColorType_MAJI(mDoor2.pmodel, &p1->tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mDoor1.pmodel); @@ -116,7 +116,7 @@ void daObjCatDoor_c::create_init() { /* 80BC43F4-80BC4454 0001B4 0060+00 1/1 0/0 0/0 .text initBaseMtx__14daObjCatDoor_cFv */ void daObjCatDoor_c::initBaseMtx() { - mCullMtx = mMtx; + cullMtx = mMtx; mDoMtx_stack_c::transS(current.pos); mDoMtx_YrotM(mDoMtx_stack_c::get(), shape_angle.y); mDoMtx_copy(mDoMtx_stack_c::get(), mMtx); diff --git a/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp b/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp index 4b4d0bad44..8ac745bec4 100644 --- a/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp +++ b/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp @@ -17,7 +17,7 @@ void daObjBoard_c::initBaseMtx() { void daObjBoard_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - mDoMtx_stack_c::scaleM(mScale); + mDoMtx_stack_c::scaleM(scale); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } @@ -38,15 +38,15 @@ static Vec l_cull_box[2] = { /* 8057B9C8-8057BA70 0000E8 00A8+00 1/0 0/0 0/0 .text Create__12daObjBoard_cFv */ int daObjBoard_c::Create() { if (getNameArg() == 1) { - mScale.x *= 10.0f; - mScale.z *= 10.0f; + scale.x *= 10.0f; + scale.z *= 10.0f; } initBaseMtx(); fopAcM_SetMtx(this, field_0x5a8); - fopAcM_setCullSizeBox(this, l_cull_box[0].x * mScale.x, l_cull_box[0].y, - l_cull_box[0].z * mScale.z, l_cull_box[1].x * mScale.x, l_cull_box[1].y, - l_cull_box[1].z * mScale.z); + fopAcM_setCullSizeBox(this, l_cull_box[0].x * scale.x, l_cull_box[0].y, + l_cull_box[0].z * scale.z, l_cull_box[1].x * scale.x, l_cull_box[1].y, + l_cull_box[1].z * scale.z); return 1; } diff --git a/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp b/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp index 1dfc5bd7d5..de28ed9e4b 100644 --- a/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp @@ -84,7 +84,7 @@ cPhs__Step daObjCdoor_c::create() { return cPhs_ERROR_e; } fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); - mTevStr.mRoomNo = dStage_roomControl_c::mStayNo; + tevStr.mRoomNo = dStage_roomControl_c::mStayNo; fopAcM_setCullSizeBox2(this, mpModel->getModelData()); mSw = fopAcM_GetParam(this) & 0xff; mChainID = -1; @@ -113,12 +113,12 @@ cPhs__Step daObjCdoor_c::create() { fopAcIt_Judge((fopAcIt_JudgeFunc)daObjCdoor_searchChain, this); } } - mAttentionInfo.mPosition.set( + attention_info.position.set( current.pos.x, current.pos.y + l_attentionOffsetY[mType], current.pos.z ); - mEyePos = mAttentionInfo.mPosition; + eyePos = attention_info.position; setMatrix(); } return step; @@ -177,14 +177,14 @@ void daObjCdoor_c::execCdoor() { if (chain->getEndFlg()) { mChainID = -1; mEnd = true; - current.pos.y = orig.pos.y + l_moveOffsetY[mType]; + current.pos.y = home.pos.y + l_moveOffsetY[mType]; if (mCamLock) { dCam_getBody()->ForceLockOff(this); mCamLock = false; } fopAcM_seStartCurrent(this, Z2SE_OBJ_OPEN_CHAIN_SW_DOOR, 0); } else { - current.pos.y = orig.pos.y + l_moveOffsetY[mType] * chain->getMoveDisRate(); + current.pos.y = home.pos.y + l_moveOffsetY[mType] * chain->getMoveDisRate(); if (chain->checkRideFlg()) { dCam_getBody()->ForceLockOn(this); mCamLock = true; @@ -285,18 +285,18 @@ void daObjCdoor_c::actionWait() { if (mMapToolID != 0xff) { setAction(ACT_ORDER_EVENT); fopAcM_orderOtherEventId(this, mEventID, mMapToolID, 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } /* 80BC7B34-80BC7B9C 000DF4 0068+00 1/0 0/0 0/0 .text actionOrderEvent__12daObjCdoor_cFv */ void daObjCdoor_c::actionOrderEvent() { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(ACT_EVENT); } else { fopAcM_orderOtherEventId(this, mEventID, mMapToolID, 0xffff, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } @@ -315,8 +315,8 @@ void daObjCdoor_c::actionDead() { /* 80BC7C04-80BC7CE4 000EC4 00E0+00 1/0 0/0 0/0 .text Draw__12daObjCdoor_cFv */ int daObjCdoor_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); if (mType == 1) { J3DModelData* model_data = mpModel->getModelData(); if (mIsOpen) { diff --git a/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp b/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp index d479b4b8bf..1155d5c120 100644 --- a/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp +++ b/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp @@ -81,8 +81,8 @@ int daObjChandelier_c::Delete() { /* 80BC8194-80BC8238 0002D4 00A4+00 1/0 0/0 0/0 .text Draw__17daObjChandelier_cFv */ int daObjChandelier_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); @@ -121,8 +121,8 @@ void daObjChandelier_c::exeModeStartSwg() { mMode = MODE_DOWN; field_0x5fc = 0; mTimer = 0; - shape_angle.y = orig.angle.y; - shape_angle.z = orig.angle.z; + shape_angle.y = home.angle.y; + shape_angle.z = home.angle.z; current.pos = field_0x5a8; } else { mTimer++; @@ -133,7 +133,7 @@ void daObjChandelier_c::exeModeStartSwg() { */ void daObjChandelier_c::exeModeDown() { current.pos.y += speed.y; - speed.y += mGravity; + speed.y += gravity; if (current.pos.y <= field_0x5f4) { fopAcM_seStartCurrent(this, Z2SE_OBJ_CHANDLV9_DOWN, 0); mMode = MODE_END_SWG; @@ -184,7 +184,7 @@ void daObjChandelier_c::init() { field_0x5a8 = current.pos; field_0x60a = 0; field_0x60b = field_0x60a; - mGravity = -3.0f; + gravity = -3.0f; speed.x = 0.0f; speed.y = -1.0f; speed.z = 0.0f; @@ -228,8 +228,8 @@ void daObjChandelier_c::moveSwing(f32 param_0, f32 param_1, f32 param_2, f32 par } } field_0x606 += field_0x608 * 0x200; - current.pos.x = orig.pos.x + cM_ssin(field_0x606) * 3.0f; - current.pos.z = orig.pos.z + cM_scos(field_0x606) * 3.0f; + current.pos.x = home.pos.x + cM_ssin(field_0x606) * 3.0f; + current.pos.z = home.pos.z + cM_scos(field_0x606) * 3.0f; u32 u1 = field_0x5f8 * field_0x5ec * 127.0f * 0.1f; if (u1 > 0x7f) { u1 = 0x7f; @@ -260,8 +260,8 @@ void daObjChandelier_c::moveSwingFall() { void daObjChandelier_c::hookSwingInitParm() { field_0x5ec = 1.2f; field_0x5f0 = 0.7f; - shape_angle.y = orig.angle.y; - shape_angle.z = orig.angle.z; + shape_angle.y = home.angle.y; + shape_angle.z = home.angle.z; current.pos = field_0x5a8; field_0x604 = 30; field_0x5fc = 0; diff --git a/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp b/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp index 8b1d577fbf..94c6458de8 100644 --- a/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp +++ b/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp @@ -117,7 +117,7 @@ static int daObjCHO_Delete(daObjCHO_c* i_this) { /* 80BCA78C-80BCA88C 00056C 0100+00 1/1 0/0 0/0 .text SpeedSet__10daObjCHO_cFv */ void daObjCHO_c::SpeedSet() { - speed.y += mGravity; + speed.y += gravity; current.pos.y += speed.y; cXyz vec1(0.0f, 0.0f, speedF); cXyz vec2(0.0f, 0.0f, 0.0f); @@ -135,7 +135,7 @@ void daObjCHO_c::SpeedSet() { void daObjCHO_c::WallCheck() { dBgS_LinChk lin_chk; lin_chk.SetObj(); - lin_chk.Set(&next.pos, ¤t.pos, NULL); + lin_chk.Set(&old.pos, ¤t.pos, NULL); if (dComIfG_Bgsp().LineCross(&lin_chk)) { current.pos = lin_chk.i_GetCross(); mTargetAngleY += 0x100; @@ -174,7 +174,7 @@ void daObjCHO_c::WaitAction() { mTimers[0] = 200; J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 7); mpMorf->setAnm(anm, 2, 5.0f, 1.0f, 0.0f, -1.0f); - orig.pos = current.pos; + home.pos = current.pos; } mTargetAngleY = cLib_targetAngleY(¤t.pos, &target); cLib_addCalcAngleS2(¤t.angle.y, mTargetAngleY, 0xc, 0x1000); @@ -224,7 +224,7 @@ void daObjCHO_c::MoveAction() { } if (mTimers[0] == 0) { - cXyz vec = orig.pos - current.pos; + cXyz vec = home.pos - current.pos; vec.x += cM_rndFX(100.0f); vec.z += cM_rndFX(100.0f); mTargetAngleY = cM_atan2s(vec.x, vec.z); @@ -337,7 +337,7 @@ void daObjCHO_c::ParticleSet() { } else { cLib_addCalc2(&mParticleScale, 1.0f, 1.0f, 1.0f); } - mParticleKey1 = dComIfGp_particle_set(mParticleKey1, 0xa1b, ¤t.pos, &mTevStr, + mParticleKey1 = dComIfGp_particle_set(mParticleKey1, 0xa1b, ¤t.pos, &tevStr, &shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL); f32 scale = mParticleScale; JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mParticleKey1); @@ -361,8 +361,8 @@ void daObjCHO_c::BoomChk() { if (dComIfG_Bgsp().LineCross(&lin_chk)) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(lin_chk, &plane); - next.pos = lin_chk.i_GetCross(); - current.pos = next.pos; + old.pos = lin_chk.i_GetCross(); + current.pos = old.pos; mAction = ACT_MOVE; mSubAction = 0; speedF = 5.0f; @@ -371,9 +371,9 @@ void daObjCHO_c::BoomChk() { mTimers[2] = 100; J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 6); mpMorf->setAnm(anm, 2, 5.0f, 1.0f, 0.0f, -1.0f); - orig.pos = current.pos; + home.pos = current.pos; } else { - orig.pos = current.pos; + home.pos = current.pos; mAction = ACT_MOVE; mSubAction = 0; mBoomerangHit = false; @@ -382,7 +382,7 @@ void daObjCHO_c::BoomChk() { mTimers[2] = 100; J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 6); mpMorf->setAnm(anm, 2, 5.0f, 1.0f, 0.0f, -1.0f); - current.pos.y = next.pos.y = player->current.pos.y + 100.0f; + current.pos.y = old.pos.y = player->current.pos.y + 100.0f; } } } @@ -405,27 +405,27 @@ int daObjCHO_c::Execute() { } checkGroundPos(); - mAttentionInfo.mPosition = current.pos; - mEyePos = current.pos; - mEyePos.y += 10.0f; + attention_info.position = current.pos; + eyePos = current.pos; + eyePos.y += 10.0f; switch (mLocation) { case LOC_OUTSIDE: if (!fopAcM_checkHookCarryNow(this)) { Action(); } else { - orig.pos = current.pos; + home.pos = current.pos; } - mParticleKey2 = dComIfGp_particle_set(mParticleKey2, 0xa1c, ¤t.pos, &mTevStr, + mParticleKey2 = dComIfGp_particle_set(mParticleKey2, 0xa1c, ¤t.pos, &tevStr, &shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL); SetCcSph(); ObjHit(); BoomChk(); - mEyePos = current.pos; - mEyePos.y += 10.0f; - mAttentionInfo.mPosition = mEyePos; - mAttentionInfo.mPosition.y += 10.0f; + eyePos = current.pos; + eyePos.y += 10.0f; + attention_info.position = eyePos; + attention_info.position.y += 10.0f; ParticleSet(); break; case LOC_AGITHA: @@ -475,7 +475,7 @@ int daObjCHO_c::Delete() { if (mHIOInit) { hioInit = false; } - if (mHeap != NULL) { + if (heap != NULL) { mpMorf->stopZelAnime(); } return 1; @@ -485,7 +485,7 @@ int daObjCHO_c::Delete() { void daObjCHO_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - mDoMtx_stack_c::scaleM(mScale); + mDoMtx_stack_c::scaleM(scale); mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); mpMorf->modelCalc(); } @@ -494,8 +494,8 @@ int daObjCHO_c::Draw() { if (mDraw) { Z_BufferChk(); J3DModel* model = mpMorf->getModel(); - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(model->mModelData, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model->mModelData, &tevStr); mpBtkAnm->entry(model->getModelData()); mpBrkAnm->entry(model->getModelData()); mpMorf->entryDL(); @@ -569,20 +569,20 @@ cPhs__Step daObjCHO_c::create() { mTargetSpeedY = -2.0f; mTimers[1] = 20; mTimers[2] = 100; - mScale.set(0.0f, 0.0f, 0.0f); + scale.set(0.0f, 0.0f, 0.0f); } else { mDraw = true; mAction = ACT_MOVE; } - mAttentionInfo.field_0x0[4] = 0x5D; + attention_info.field_0x0[4] = 0x5D; mSex = (fopAcM_GetParam(this) >> 4) & 1; m_itemNo = l_cho_itemno[mSex]; m_saveBitNo = l_musiya_num[mSex]; if (mSex == SEX_FEMALE) { - mScale.set(l_HIO.mScaleFemale, l_HIO.mScaleFemale, l_HIO.mScaleFemale); + scale.set(l_HIO.mScaleFemale, l_HIO.mScaleFemale, l_HIO.mScaleFemale); } else if (mSex == SEX_MALE) { - mScale.set(l_HIO.mScaleMale, l_HIO.mScaleMale, l_HIO.mScaleMale); + scale.set(l_HIO.mScaleMale, l_HIO.mScaleMale, l_HIO.mScaleMale); } if (!CreateChk()) { @@ -599,8 +599,8 @@ cPhs__Step daObjCHO_c::create() { l_HIO.field_0x4 = -1; } - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); - mGravity = 0.0f; + mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + gravity = 0.0f; if (mLocation == LOC_OUTSIDE) { InitCcSph(); } @@ -613,7 +613,7 @@ cPhs__Step daObjCHO_c::create() { fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); fopAcM_SetMin(this, -50.0f, -50.0f, -50.0f); fopAcM_SetMax(this, 50.0f, 50.0f, 50.0f); - mCreatureSound.init(¤t.pos, &mEyePos, 3, 1); + mCreatureSound.init(¤t.pos, &eyePos, 3, 1); daObjCHO_Execute(this); } diff --git a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp index 955aca4657..7c1cc2c609 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp @@ -18,9 +18,9 @@ void daCowdoor_c::setBaseMtx() { /* 80BCC86C-80BCC8C4 0000EC 0058+00 1/0 0/0 0/0 .text Create__11daCowdoor_cFv */ int daCowdoor_c::Create() { setBaseMtx(); - mCullMtx = field_0x5a8->mBaseTransformMtx; + cullMtx = field_0x5a8->mBaseTransformMtx; fopAcM_setCullSizeBox2(this, field_0x5a8->getModelData()); - mCullSizeFar = 5.0f; + cullSizeFar = 5.0f; return 1; } @@ -64,8 +64,8 @@ int daCowdoor_c::Execute(f32 (**param_0)[3][4]) { /* 80BCCA48-80BCCAEC 0002C8 00A4+00 1/0 0/0 0/0 .text Draw__11daCowdoor_cFv */ int daCowdoor_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(field_0x5a8->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(field_0x5a8->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(field_0x5a8); dComIfGd_setList(); @@ -113,14 +113,14 @@ extern actor_process_profile_definition g_profile_Obj_Cowdoor = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Cowdoor, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daCowdoor_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 447, // mPriority - &l_daCowdoor_Method, // mSubMtd + &l_daCowdoor_Method, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp index 980cea9468..ef2cd03288 100644 --- a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp +++ b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp @@ -15,8 +15,8 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { /* 80BD63B8-80BD6410 000098 0058+00 1/1 0/0 0/0 .text initBaseMtx__14daObjCrystal_cFv */ void daObjCrystal_c::initBaseMtx() { - mpModel[0]->setBaseScale(mScale); - mpModel[1]->setBaseScale(mScale); + mpModel[0]->setBaseScale(scale); + mpModel[1]->setBaseScale(scale); setBaseMtx(); } @@ -37,7 +37,7 @@ int daObjCrystal_c::Create() { initBaseMtx(); fopAcM_SetMtx(this, mpModel[0]->getBaseTRMtx()); - mpEmitter = dComIfGp_particle_set(0x8BED, ¤t.pos, &orig.angle, &mScale, 255, NULL, -1, + mpEmitter = dComIfGp_particle_set(0x8BED, ¤t.pos, &home.angle, &scale, 255, NULL, -1, NULL, NULL, NULL); mJointID = 0xFFFF; @@ -101,10 +101,10 @@ int daObjCrystal_c::execute() { /* 80BD673C-80BD67C8 00041C 008C+00 1/1 0/0 0/0 .text draw__14daObjCrystal_cFv */ int daObjCrystal_c::draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); for (int i = 0; i < 2; i++) { - g_env_light.setLightTevColorType_MAJI(mpModel[i], &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[i], &tevStr); mDoExt_modelUpdateDL(mpModel[i]); } diff --git a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp index 534f3815d4..e947f69d62 100644 --- a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp +++ b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp @@ -24,9 +24,9 @@ int daObjDigholl_c::create() { } fopAcM_SetMin(this, -60.0f, 0.0f, -100.0f); fopAcM_SetMax(this, 60.0f, 10.0f, 100.0f); - mAttentionInfo.mPosition = current.pos; - mEyePos = mAttentionInfo.mPosition; - mAttentionInfo.field_0x0[7] = 0x20; + attention_info.position = current.pos; + eyePos = attention_info.position; + attention_info.field_0x0[7] = 0x20; return cPhs_COMPLEATE_e; } @@ -51,9 +51,9 @@ int daObjDigholl_c::execute() { (field_0x56a == 0xff || i_fopAcM_isSwitch(this, field_0x56a)) && (f32)fabsf(current.pos.y - player->current.pos.y) < 40.0f) { - mAttentionInfo.mFlags = 0x80; + attention_info.flags = 0x80; } else { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } if (field_0x568 == 1) { if (cLib_distanceAngleS(player->shape_angle.y, shape_angle.y) < 0x6000) { @@ -74,7 +74,7 @@ int daObjDigholl_c::execute() { if ((player->current.pos.abs2XZ(current.pos) < 250000.0f) && (fabsf(current.pos.y - player->current.pos.y) < 200.0f)) { - daPy_py_c::setLookPos(&mAttentionInfo.mPosition); + daPy_py_c::setLookPos(&attention_info.position); } } diff --git a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp index ce4161f1b2..50062b03cb 100644 --- a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp +++ b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp @@ -35,12 +35,12 @@ int daObjDigpl_c::create() { mDoMtx_copy(mDoMtx_stack_c::get(), field_0x570); fopAcM_SetMtx(this, field_0x570); - mAttentionInfo.mPosition = current.pos; - mEyePos = mAttentionInfo.mPosition; - mTevStr.mRoomNo = dComIfGp_roomControl_getStayNo(); + attention_info.position = current.pos; + eyePos = attention_info.position; + tevStr.mRoomNo = dComIfGp_roomControl_getStayNo(); fopAcM_SetMin(this, -550.0f, -250.0f, -550.0f); fopAcM_SetMax(this, 550.0f, 250.0f, 550.0f); - mAttentionInfo.field_0x0[7] = 27; + attention_info.field_0x0[7] = 27; return cPhs_COMPLEATE_e; } @@ -98,11 +98,11 @@ int daObjDigpl_c::execute() { } } - mAttentionInfo.mFlags &= ~0x80; + attention_info.flags &= ~0x80; if (mpDigPoints != NULL) { current.pos.y = player_p->current.pos.y + 100000.0f; - mAttentionInfo.mPosition.y = current.pos.y; + attention_info.position.y = current.pos.y; cXyz point_pos; dStage_dPnt_c* point_p = mpDigPoints->m_points; @@ -127,8 +127,8 @@ int daObjDigpl_c::execute() { mCurrentDigPoint = i; current.pos = point_pos; - mAttentionInfo.mPosition = point_pos; - mEyePos = point_pos; + attention_info.position = point_pos; + eyePos = point_pos; if (point_p->field_0x3 == 0) { mType = 0; @@ -146,13 +146,13 @@ int daObjDigpl_c::execute() { f32 dist_to_player = fopAcM_searchPlayerDistanceXZ2(this); if (seen_angle <= 0x2800 || dist_to_player < 1600.0f) { - mAttentionInfo.mFlags |= 0x80; + attention_info.flags |= 0x80; } if (dist_to_player < 250000.0f && fabsf(current.pos.y - player_p->current.pos.y) < 200.0f) { - daPy_py_c::setLookPos(&mAttentionInfo.mPosition); + daPy_py_c::setLookPos(&attention_info.position); } } diff --git a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp index ef24fa701a..dd3b4effc4 100644 --- a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp +++ b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp @@ -19,8 +19,8 @@ int daObjEff::Act_c::_create() { if (daObj::PrmAbstract(this, PRM_8, PRM_0) == 3) { s32 roomNo = fopAcM_GetRoomNo(this); - dComIfGp_particle_setColor(0x00E7, ¤t.pos, NULL, NULL, NULL, 0.0f, 55, NULL, &mScale, - NULL, roomNo, &mScale); + dComIfGp_particle_setColor(0x00E7, ¤t.pos, NULL, NULL, NULL, 0.0f, 55, NULL, &scale, + NULL, roomNo, &scale); } return cPhs_ERROR_e; diff --git a/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp b/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp index 7d7d8a103c..f34f176d9b 100644 --- a/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp +++ b/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp @@ -37,7 +37,7 @@ public: u32 getTime() { return fopAcM_GetParamBit(this, 8, 8); } u32 getPos() { return fopAcM_GetParamBit(this, 0x14, 8); } - BOOL checkFallStart() { return fopAcM_SearchByID(mParentPcId)->speed.y != 0.0f; } + BOOL checkFallStart() { return fopAcM_SearchByID(parentActorID)->speed.y != 0.0f; } /* 0x5A0 */ request_of_phase_process_class mPhaseReq; /* 0x5A8 */ Mtx mMtx; diff --git a/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp b/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp index f2d5626938..e1dbe9c949 100644 --- a/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp +++ b/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp @@ -59,8 +59,8 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; static int daObj_Fmobj_Draw(obj_fmobj_class* i_this) { J3DModel* model_p = i_this->mpModel; - g_env_light.settingTevStruct(0x40, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(model_p, &i_this->mTevStr); + g_env_light.settingTevStruct(0x40, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(model_p, &i_this->tevStr); mDoExt_modelUpdateDL(model_p); return 1; } diff --git a/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp b/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp index 57880ba0d5..3e47687fc2 100644 --- a/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp +++ b/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp @@ -51,7 +51,7 @@ void daGraveStone_c::moveCalc() { setEnvTevColor(); setRoomNo(); } - mAttentionInfo.mPosition = current.pos; + attention_info.position = current.pos; PSMTXCopy(mpModel->getBaseTRMtx(), mDoMtx_stack_c::get()); cXyz vec(0.0f, 0.0f, 0.0f); @@ -98,7 +98,7 @@ void daGraveStone_c::moveCalc() { int daGraveStone_c::setPrtcl() { for (int i = 0; i < 4; i++) { mPrtclMngr[i].field_0x24.setEffectCenter( - &mTevStr, &mPrtclMngr[i].mPos, 0, 0, + &tevStr, &mPrtclMngr[i].mPos, 0, 0, mPrtclMngr[i].field_0x00 == true ? &mPrtclMngr[i].mPos : NULL, mPrtclMngr[i].field_0x00 == true ? &mPrtclMngr[i].mAngle : NULL, NULL, fopAcM_GetRoomNo(this), 0.0f, speedF @@ -106,10 +106,10 @@ int daGraveStone_c::setPrtcl() { if (mPrtclMngr[i].field_0x00) { JPABaseEmitter* emitter = mPrtclMngr[i].field_0x24.getCenterEmitter(0, 0); if (emitter != NULL) { - mPrtclMngr[i].mScale.set(2.5f, 2.5f, 2.5f); - // JGeometry::TVec3 scale(mPrtclMngr[i].mScale); + mPrtclMngr[i].scale.set(2.5f, 2.5f, 2.5f); + // JGeometry::TVec3 scale(mPrtclMngr[i].scale); JGeometry::TVec3 scale; - JGeometry::setTVec3f(&mPrtclMngr[i].mScale.x, &scale.x); + JGeometry::setTVec3f(&mPrtclMngr[i].scale.x, &scale.x); emitter->setGlobalParticleScale(scale); } } @@ -121,8 +121,8 @@ int daGraveStone_c::setPrtcl() { /* 80C12A38-80C12A94 0004B8 005C+00 2/2 0/0 0/0 .text setEnvTevColor__14daGraveStone_cFv */ void daGraveStone_c::setEnvTevColor() { - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); - mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); + tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); } /* 80C12A94-80C12AD8 000514 0044+00 2/2 0/0 0/0 .text setRoomNo__14daGraveStone_cFv */ @@ -137,7 +137,7 @@ int daGraveStone_c::Create() { setBaseMtx(); fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); mAcchCir.SetWall(0.0f, 0.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, ¤t.angle, &shape_angle); + mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, ¤t.angle, &shape_angle); mColStatus.Init(0xff, 0, this); mColCyl.Set(mCcDCyl); mColCyl.SetStts(&mColStatus); @@ -145,7 +145,7 @@ int daGraveStone_c::Create() { mGndChk = mAcch.m_gnd; setEnvTevColor(); setRoomNo(); - mAttentionInfo.mPosition = current.pos; + attention_info.position = current.pos; for (int i = 0; i < 4; i++) { mPrtclMngr[i].field_0x24.init(&mAcch, 0.0f, 0.0f); } @@ -193,8 +193,8 @@ int daGraveStone_c::Execute(Mtx** i_mtxP) { /* 80C13078-80C1311C 000AF8 00A4+00 1/0 0/0 0/0 .text Draw__14daGraveStone_cFv */ int daGraveStone_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp b/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp index 34f331bcde..9894a983ce 100644 --- a/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp +++ b/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp @@ -162,7 +162,7 @@ static dCcD_SrcCyl l_cc_cyl_src = { // matches with vtables setup #ifdef NONMATCHING int daObjHBombkoya_c::Create() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); fopAcM_SetMtx(this, NULL); cM3dGAab aab(*mpBgW->GetBnd()); @@ -172,7 +172,7 @@ int daObjHBombkoya_c::Create() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(current.angle.y); - mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); + mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z); MTXCopy(mDoMtx_stack_c::get(), mMtx); for (int i = 0; i < 9; i++) { @@ -354,8 +354,8 @@ int daObjHBombkoya_c::Execute(Mtx** param_0) { /* 80C1C098-80C1C16C 000898 00D4+00 1/0 0/0 0/0 .text Draw__16daObjHBombkoya_cFv */ int daObjHBombkoya_c::Draw() { if (mActive && !i_fopAcM_isSwitch(this, getSw2No())) { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); diff --git a/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp b/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp index 12c35693f2..41f29b3b7e 100644 --- a/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp +++ b/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp @@ -18,7 +18,7 @@ daHsTarget_HIO_c::daHsTarget_HIO_c() {} void daHsTarget_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -68,8 +68,8 @@ int daHsTarget_c::Execute(f32 (**param_0)[3][4]) { /* 80C1F6C4-80C1F728 000384 0064+00 1/0 0/0 0/0 .text Draw__12daHsTarget_cFv */ int daHsTarget_c::Draw() { - g_env_light.settingTevStruct(0x40, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x40, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); mDoExt_modelUpdateDL(mpModel); return 1; } diff --git a/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp b/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp index cb960828a3..92f8e0d70c 100644 --- a/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp +++ b/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp @@ -633,8 +633,8 @@ asm int daObjIce_l_c::Execute(Mtx** param_0) { /* 80C206AC-80C20750 000D2C 00A4+00 1/0 0/0 0/0 .text Draw__12daObjIce_l_cFv */ int daObjIce_l_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListDarkBG(); mDoExt_modelUpdateDL(mpModel); diff --git a/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp b/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp index bd73e6c148..446f66912e 100644 --- a/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp +++ b/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp @@ -424,7 +424,7 @@ extern "C" asm void __dt__8cM3dGPlaFv() { /* 80C389BC-80C389F8 0003BC 003C+00 1/1 0/0 0/0 .text initBaseMtx__15daItemKantera_cFv */ #ifdef NONMATCHING void daItemKantera_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } #else @@ -486,8 +486,8 @@ int daItemKantera_c::Create() { initBaseMtx(); fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); mAcchCir.SetWall(30.0f, 30.0f); - mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, - &fopAcM_GetSpeed_p(this), NULL, NULL); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), NULL, NULL); mColStatus.Init(0, 0xff, this); mCollider.Set(l_cyl_src); mCollider.SetStts(&mColStatus); @@ -523,10 +523,10 @@ int daItemKantera_c::create() { fopAcM_SetupActor(this, daItemKantera_c); if (field_0x937 == 0) { - field_0x938 = orig.angle.x; - field_0x93a = orig.angle.z; - orig.angle.z = 0; - orig.angle.x = 0; + field_0x938 = home.angle.x; + field_0x93a = home.angle.z; + home.angle.z = 0; + home.angle.x = 0; current.angle.z = 0; current.angle.x = 0; shape_angle.z = 0; @@ -700,9 +700,9 @@ asm int daItemKantera_c::actionInit() { int daItemKantera_c::actionWaitInit() { mCollider.OffTgSPrmBit(1); mCollider.OffCoSPrmBit(1); - cLib_offBit(mAttentionInfo.mFlags, 0x10); - mAttentionInfo.field_0x0[4] = 16; - mAttentionInfo.mPosition = current.pos; + cLib_offBit(attention_info.flags, 0x10); + attention_info.field_0x0[4] = 16; + attention_info.position = current.pos; show(); setStatus(1); return 1; @@ -740,12 +740,12 @@ asm int daItemKantera_c::actionWait() { */ #ifdef NONMATCHING int daItemKantera_c::initActionOrderGetDemo() { - cLib_offBit(mAttentionInfo.mFlags, 0x10); + cLib_offBit(attention_info.flags, 0x10); mCollider.OffTgSPrmBit(1); mCollider.OffCoSPrmBit(1); hide(); fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(8); + eventInfo.i_onCondition(8); field_0x92c = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this), NULL, NULL); setStatus(2); @@ -765,14 +765,14 @@ asm int daItemKantera_c::initActionOrderGetDemo() { /* 80C392D0-80C3934C 000CD0 007C+00 1/0 0/0 0/0 .text actionOrderGetDemo__15daItemKantera_cFv */ #ifdef NONMATCHING int daItemKantera_c::actionOrderGetDemo() { - if (mEvtInfo.checkCommandItem()) { + if (eventInfo.checkCommandItem()) { setStatus(3); if (field_0x92c != -1) { dComIfGp_event_setItemPartnerId(field_0x92c); } } else { fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(8); + eventInfo.i_onCondition(8); } return 1; } diff --git a/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp b/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp index 5b46007783..c72e9bc33d 100644 --- a/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp +++ b/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp @@ -86,10 +86,10 @@ void daObjKGate_c::initBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(current.angle.y); MTXCopy(mDoMtx_stack_c::get(), field_0xb18); - mpGateModel->setBaseScale(mScale); + mpGateModel->setBaseScale(scale); if (mNameArg == 0 || mNameArg == 1) { - mpGateModel2->setBaseScale(mScale); + mpGateModel2->setBaseScale(scale); } else if (mNameArg == 2) { cXyz scale(1.0f, 1.0f, -1.0f); mpGateModel2->setBaseScale(scale); @@ -97,11 +97,11 @@ void daObjKGate_c::initBaseMtx() { if (getSwNo() != 0xFF) { if (mpKeyModel != NULL) { - mpKeyModel->setBaseScale(mScale); + mpKeyModel->setBaseScale(scale); } if (mpHookModel != NULL) { - mpHookModel->setBaseScale(mScale); + mpHookModel->setBaseScale(scale); } } @@ -248,7 +248,7 @@ int daObjKGate_c::Create() { if (mNameArg == 0 || mNameArg == 2) { if (sw_no != 0xFF && !i_fopAcM_isSwitch(this, sw_no)) { - mEvtInfo.setArchiveName(l_arcName[mNameArg]); + eventInfo.setArchiveName(l_arcName[mNameArg]); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_evName[mNameArg], 0xFF); mMapToolID = getEventID(); @@ -271,9 +271,9 @@ int daObjKGate_c::Create() { setAction(ACT_DEAD); } - mAttentionInfo.mPosition.y += 150.0f; - mEyePos.y += 150.0f; - mAttentionInfo.mFlags = 0x20; + attention_info.position.y += 150.0f; + eyePos.y += 150.0f; + attention_info.flags = 0x20; initBaseMtx(); fopAcM_SetMtx(this, field_0xb18); @@ -881,15 +881,15 @@ void daObjKGate_c::action_typeB() { /* 8058A1B0-8058A294 0021B0 00E4+00 1/0 0/0 0/0 .text actionWaitEvent__12daObjKGate_cFv */ void daObjKGate_c::actionWaitEvent() { - if (mEvtInfo.i_checkCommandDoor()) { + if (eventInfo.i_checkCommandDoor()) { setAction(ACT_EVENT); dComIfGp_setItemKeyNumCount(-1); i_fopAcM_onSwitch(this, getSwNo()); fopAcM_seStart(this, Z2SE_OBJ_FLN_GATE_L_OP, 0); } else if (checkOpen()) { - mEvtInfo.setEventId(mEventID); - mEvtInfo.setMapToolId(mMapToolID); - mEvtInfo.i_onCondition(dEvtCnd_CANDOOR_e); + eventInfo.setEventId(mEventID); + eventInfo.setMapToolId(mMapToolID); + eventInfo.i_onCondition(dEvtCnd_CANDOOR_e); } } @@ -981,9 +981,9 @@ int daObjKGate_c::Execute(Mtx** param_0) { /* 8058A5B8-8058A6F4 0025B8 013C+00 1/0 0/0 0/0 .text Draw__12daObjKGate_cFv */ int daObjKGate_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpGateModel, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpGateModel2, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpGateModel, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpGateModel2, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpGateModel); @@ -991,15 +991,15 @@ int daObjKGate_c::Draw() { dComIfGd_setList(); if (getSwNo() != 0xFF) { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); if (mpHookModel != NULL) { - g_env_light.setLightTevColorType_MAJI(mpHookModel, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpHookModel, &tevStr); mDoExt_modelUpdateDL(mpHookModel); } if (mpKeyModel != NULL) { - g_env_light.setLightTevColorType_MAJI(mpKeyModel, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpKeyModel, &tevStr); mDoExt_modelUpdateDL(mpKeyModel); } } diff --git a/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp b/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp index 9905c86adc..d72027c778 100644 --- a/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp +++ b/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp @@ -46,8 +46,8 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { /* 80C44010-80C44080 000210 0070+00 1/0 0/0 0/0 .text daObj_Ki_Draw__FP12obj_ki_class */ static int daObj_Ki_Draw(obj_ki_class* i_this) { J3DModel* model = i_this->mpMorf->getModel(); - g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->mTevStr); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->tevStr); i_this->mpMorf->entryDL(); return 1; } @@ -76,7 +76,7 @@ static int daObj_Ki_Execute(obj_ki_class* i_this) { mDoMtx_stack_c::YrotM(i_this->shape_angle.y); mDoMtx_stack_c::XrotM(i_this->shape_angle.x); mDoMtx_stack_c::ZrotM(i_this->shape_angle.z); - mDoMtx_stack_c::scaleM(i_this->mScale.x, i_this->mScale.y, i_this->mScale.z); + mDoMtx_stack_c::scaleM(i_this->scale.x, i_this->scale.y, i_this->scale.z); i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); PSMTXCopy(mDoMtx_stack_c::get(), i_this->mMtx); i_this->mpBgW->Move(); @@ -184,24 +184,24 @@ static cPhs__Step daObj_Ki_Create(fopAc_ac_c* i_this) { fopAcM_SetMtx(_this, _this->mpMorf->getModel()->getBaseTRMtx()); if (_this->mScaleXZ != 0xff) { - _this->mScale.x = _this->mScaleXZ * 0.1f; - _this->mScale.z = _this->mScale.x; + _this->scale.x = _this->mScaleXZ * 0.1f; + _this->scale.z = _this->scale.x; } else { - _this->mScale.x = cM_rndFX(0.2f) + 1.0f; - _this->mScale.z = _this->mScale.x; + _this->scale.x = cM_rndFX(0.2f) + 1.0f; + _this->scale.z = _this->scale.x; } if (_this->mScaleY != 0xff) { - _this->mScale.y = _this->mScaleY * 0.1f; + _this->scale.y = _this->mScaleY * 0.1f; } else { - _this->mScale.y = cM_rndFX(0.2f) + 1.0f; + _this->scale.y = cM_rndFX(0.2f) + 1.0f; } cXyz vec; for (int i = 0; i < 3; i++) { MtxTrans(_this->current.pos.x, _this->current.pos.y, _this->current.pos.z, 0); mDoMtx_YrotM(*calc_mtx, _this->shape_angle.y + i * 0x5555 + 6000); - MtxScale(_this->mScale.x, _this->mScale.y, _this->mScale.z, 1); + MtxScale(_this->scale.x, _this->scale.y, _this->scale.z, 1); vec.x = 0.0f; vec.y = 0.0f; vec.z = 50.0f; diff --git a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp index 9bbfacb78e..764c23375a 100644 --- a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp +++ b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp @@ -81,8 +81,8 @@ int daObjKJgjs_c::Execute(f32 (**i_mtx)[3][4]) { /* 80C46320-80C463C4 000300 00A4+00 1/0 0/0 0/0 .text Draw__12daObjKJgjs_cFv */ int daObjKJgjs_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp b/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp index ee68e74eb3..3c04ca82a1 100644 --- a/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp +++ b/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp @@ -29,7 +29,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { /* 80C46768-80C467A4 000148 003C+00 1/1 0/0 0/0 .text initBaseMtx__14daObjKKanban_cFv */ void daObjKKanban_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -130,8 +130,8 @@ int daObjKKanban_c::Execute(Mtx** i_mtx) { /* 80C46C1C-80C46CC0 0005FC 00A4+00 1/0 0/0 0/0 .text Draw__14daObjKKanban_cFv */ int daObjKKanban_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); @@ -182,14 +182,14 @@ extern actor_process_profile_definition g_profile_Obj_KKanban = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_KKanban, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daObjKKanban_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 548, // mPriority - &daObjKKanban_METHODS, // mSubMtd + &daObjKKanban_METHODS, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp b/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp index 090622030a..59f5cff7da 100644 --- a/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp +++ b/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp @@ -41,8 +41,8 @@ daObj_Lbox_HIO_c::daObj_Lbox_HIO_c() { /* 80C5359C-80C53600 00011C 0064+00 1/0 0/0 0/0 .text daObj_Lbox_Draw__FP14obj_lbox_class */ static int daObj_Lbox_Draw(obj_lbox_class* i_this) { - g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(i_this->mpModel->mModelData, &i_this->mTevStr); + g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel->mModelData, &i_this->tevStr); mDoExt_modelUpdateDL(i_this->mpModel); return 1; } @@ -78,13 +78,13 @@ static void action(obj_lbox_class* i_this) { i_this->field_0x57a = 2; i_this->field_0x57c = 0; fopAcM_effSmokeSet1(&i_this->field_0xa84, &i_this->field_0xa88, &i_this->current.pos, - &i_this->shape_angle, 3.5f, &i_this->mTevStr, 1); + &i_this->shape_angle, 3.5f, &i_this->tevStr, 1); } break; } fopAcM_OffStatus(i_this, 0); - i_this->mAttentionInfo.mFlags = 0; + i_this->attention_info.flags = 0; i_this->mObjAcch.CrrPos(dComIfG_Bgsp()); mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); mDoMtx_stack_c::YrotM(i_this->shape_angle.y); @@ -101,8 +101,8 @@ static void action(obj_lbox_class* i_this) { i_this->mSph.SetC(cStack_48); i_this->mSph.SetR(150.0f * l_HIO.mSize); dComIfG_Ccsp()->Set(&i_this->mSph); - i_this->mEyePos = i_this->current.pos; - i_this->mAttentionInfo.mPosition = i_this->mEyePos; + i_this->eyePos = i_this->current.pos; + i_this->attention_info.position = i_this->eyePos; } /* 80C5396C-80C539C8 0004EC 005C+00 2/1 0/0 0/0 .text daObj_Lbox_Execute__FP14obj_lbox_class */ @@ -135,70 +135,70 @@ static int daObj_Lbox_Delete(obj_lbox_class* i_this) { /* 80C53A38-80C53B3C 0005B8 0104+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ static int useHeapInit(fopAc_ac_c* i_this) { - obj_lbox_class* _this = static_cast(i_this); + obj_lbox_class* a_this = static_cast(i_this); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_lbox", 4); JUT_ASSERT(478, modelData != 0); - _this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); - if (_this->mpModel == NULL) { + a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (a_this->mpModel == NULL) { return 0; } - _this->mpBgW = new dBgW(); - if (_this->mpBgW == NULL) { + a_this->mpBgW = new dBgW(); + if (a_this->mpBgW == NULL) { return 0; } cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes("Obj_lbox", 7); - if (_this->mpBgW->Set(dzb, 1, &_this->mMtx) == true) { + if (a_this->mpBgW->Set(dzb, 1, &a_this->mMtx) == true) { return 0; } - _this->mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); + a_this->mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); return 1; } /* 80C53B3C-80C53E14 0006BC 02D8+00 1/0 0/0 0/0 .text daObj_Lbox_Create__FP10fopAc_ac_c */ static cPhs__Step daObj_Lbox_Create(fopAc_ac_c* i_this) { - obj_lbox_class* _this = static_cast(i_this); - fopAcM_SetupActor(_this, obj_lbox_class); - cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhaseReq, "Obj_lbox"); + obj_lbox_class* a_this = static_cast(i_this); + fopAcM_SetupActor(a_this, obj_lbox_class); + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&a_this->mPhaseReq, "Obj_lbox"); if (step == cPhs_COMPLEATE_e) { - _this->mParam = fopAcM_GetParam(i_this); - if (_this->mParam == 0xFF) { - _this->mParam = 0; + a_this->mParam = fopAcM_GetParam(i_this); + if (a_this->mParam == 0xFF) { + a_this->mParam = 0; } - if (!fopAcM_entrySolidHeap(_this, useHeapInit, 0x4b000)) { + if (!fopAcM_entrySolidHeap(a_this, useHeapInit, 0x4b000)) { return cPhs_ERROR_e; } - if (dComIfG_Bgsp().Regist(_this->mpBgW, _this)) { + if (dComIfG_Bgsp().Regist(a_this->mpBgW, a_this)) { return cPhs_ERROR_e; } if (data_80C540E8 == 0) { - _this->field_0xa8c = 1; + a_this->field_0xa8c = 1; data_80C540E8 = 1; l_HIO.field_0x4 = -1; } - fopAcM_SetMtx(_this, _this->mpModel->getBaseTRMtx()); - fopAcM_SetMin(_this, -200.0f, -3000.0f, -200.0f); - fopAcM_SetMax(_this, 200.0f, 3000.0f, 200.0f); + fopAcM_SetMtx(a_this, a_this->mpModel->getBaseTRMtx()); + fopAcM_SetMin(a_this, -200.0f, -3000.0f, -200.0f); + fopAcM_SetMax(a_this, 200.0f, 3000.0f, 200.0f); - _this->mStts.Init(0xff, 0, _this); - _this->mSph.Set(cc_sph_src); - _this->mSph.SetStts(&_this->mStts); - _this->mObjAcch.Set(&fopAcM_GetPosition_p(_this), &fopAcM_GetOldPosition_p(_this), _this, 1, - &_this->mAcchCir, &fopAcM_GetSpeed_p(_this), NULL, NULL); - _this->mAcchCir.SetWall(50.0f, 50.0f); + a_this->mStts.Init(0xff, 0, a_this); + a_this->mSph.Set(cc_sph_src); + a_this->mSph.SetStts(&a_this->mStts); + a_this->mObjAcch.Set(fopAcM_GetPosition_p(a_this), fopAcM_GetOldPosition_p(a_this), a_this, 1, + &a_this->mAcchCir, fopAcM_GetSpeed_p(a_this), NULL, NULL); + a_this->mAcchCir.SetWall(50.0f, 50.0f); - _this->mAttentionInfo.field_0x0[2] = 0x16; + a_this->attention_info.field_0x0[2] = 0x16; - daObj_Lbox_Execute(_this); + daObj_Lbox_Execute(a_this); } return step; diff --git a/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp b/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp index 3f28e3cfa3..50b811365f 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp @@ -41,7 +41,7 @@ daLv1Cdl00_HIO_c::daLv1Cdl00_HIO_c() : void daLv1Cdl00_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -81,7 +81,7 @@ cPhs__Step daLv1Cdl00_c::create() { if (mSwType == 0xff) { mSwType = 0; } - mEyePos = mTorchPos; + eyePos = mTorchPos; mIsSwitch = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); mIsLit = false; if (!mSwType) { @@ -244,8 +244,8 @@ int daLv1Cdl00_c::Execute() { /* 80C567EC-80C56890 000BCC 00A4+00 1/1 0/0 0/0 .text Draw__12daLv1Cdl00_cFv */ int daLv1Cdl00_c::Draw() { - g_env_light.settingTevStruct(0x40, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x40, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp b/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp index f675639abc..1395abfce4 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp @@ -41,7 +41,7 @@ daLv1Cdl01_HIO_c::daLv1Cdl01_HIO_c() : void daLv1Cdl01_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -77,7 +77,7 @@ cPhs__Step daLv1Cdl01_c::create() { mIsLit = true; mTimer = 0; setLight(); - mEyePos = mTorchPos; + eyePos = mTorchPos; mStts.Init(0xff, 0xff, this); mCyl.Set(mCcDCyl); mCyl.SetStts(&mStts); @@ -197,8 +197,8 @@ int daLv1Cdl01_c::Execute(f32 (**param_0)[3][4]) { /* 80C575F4-80C57698 000A34 00A4+00 1/0 0/0 0/0 .text Draw__12daLv1Cdl01_cFv */ int daLv1Cdl01_c::Draw() { - g_env_light.settingTevStruct(0x40, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x40, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp b/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp index 0055b048d0..50f93ba3dd 100644 --- a/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp +++ b/rel/d/a/obj/d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp @@ -75,7 +75,7 @@ static u32 const l_bmdIdx[3] = { void daLv2Candle_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -121,7 +121,7 @@ cPhs__Step daLv2Candle_c::create() { if (mSwType == 0xf) { mSwType = 0; } - mEyePos = mTorchPos; + eyePos = mTorchPos; mSw = getSw(); if (mSw == 0xff) { mIsLit = true; @@ -368,8 +368,8 @@ int daLv2Candle_c::Execute() { /* 8058EEC8-8058EF6C 000F68 00A4+00 1/1 0/0 0/0 .text Draw__13daLv2Candle_cFv */ int daLv2Candle_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp b/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp index 5805837122..8f0fa7c41b 100644 --- a/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp +++ b/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp @@ -11,8 +11,8 @@ /* 80C5B578-80C5B71C 000078 01A4+00 1/0 0/0 0/0 .text * daObj_Lv3waterB_Draw__FP19obj_lv3WaterB_class */ static int daObj_Lv3waterB_Draw(obj_lv3WaterB_class* i_this) { - g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(i_this->mpBWaterModel, &i_this->mTevStr); + g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpBWaterModel, &i_this->tevStr); i_this->mpBWaterBtk->entry(i_this->mpBWaterModel->getModelData()); @@ -32,7 +32,7 @@ static int daObj_Lv3waterB_Draw(obj_lv3WaterB_class* i_this) { mDoExt_modelUpdateDL(i_this->mpBWaterModel); if (i_this->mpOctHibiModel != NULL) { - g_env_light.setLightTevColorType_MAJI(i_this->mpOctHibiModel, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpOctHibiModel, &i_this->tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(i_this->mpOctHibiModel); @@ -56,11 +56,11 @@ static void action(obj_lv3WaterB_class* i_this) { dKy_custom_colset(4, 4, 0.0f); if (i_this->field_0x586 == 0) { - i_this->current.pos.y = (i_this->orig.pos.y - 14450.0f) + 160.0f + 4000.0f; + i_this->current.pos.y = (i_this->home.pos.y - 14450.0f) + 160.0f + 4000.0f; i_this->field_0x586 = 1; } - cLib_addCalc2(&i_this->current.pos.y, (i_this->orig.pos.y - 14450.0f) + 160.0f, 0.05f, + cLib_addCalc2(&i_this->current.pos.y, (i_this->home.pos.y - 14450.0f) + 160.0f, 0.05f, 10.0f); break; } @@ -192,7 +192,7 @@ static int daObj_Lv3waterB_Create(fopAc_ac_c* i_this) { } if (dComIfGs_isStageBossEnemy()) { - a_this->current.pos.y = (a_this->orig.pos.y - 14450.0f) + 160.0f; + a_this->current.pos.y = (a_this->home.pos.y - 14450.0f) + 160.0f; a_this->mAction = 2; a_this->field_0x586 = 1; a_this->mpOctHibiModel = NULL; diff --git a/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp b/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp index e3db5d77c3..474f53bcbe 100644 --- a/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp +++ b/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp @@ -170,16 +170,16 @@ extern actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv3R10Saka, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daObjLv3saka_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 528, // mPriority - &daObjLv3saka_METHODS, // mSubMtd + &daObjLv3saka_METHODS, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C5C3DC-80C5C3DC 000018 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp b/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp index 1d3541ed28..8f9225c35b 100644 --- a/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp +++ b/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp @@ -42,7 +42,7 @@ void daLv4Gate_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); mDoMtx_stack_c::transM(mMoveValue, 0.0f, 0.0f); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -176,8 +176,8 @@ void daLv4Gate_c::modeMoveEnd() {} /* 80C5F1E8-80C5F28C 000768 00A4+00 1/0 0/0 0/0 .text Draw__11daLv4Gate_cFv */ int daLv4Gate_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); diff --git a/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp b/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp index f069a1a6ba..d2daa93c26 100644 --- a/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp +++ b/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp @@ -16,7 +16,7 @@ void daLv4HsTarget_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -59,8 +59,8 @@ int daLv4HsTarget_c::Execute(Mtx** param_0) { /* 80C5F870-80C5F8D4 000330 0064+00 1/0 0/0 0/0 .text Draw__15daLv4HsTarget_cFv */ int daLv4HsTarget_c::Draw() { - g_env_light.settingTevStruct(0x40, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x40, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); return 1; diff --git a/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp b/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp index 4da13928d7..fd1958107b 100644 --- a/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp @@ -44,7 +44,7 @@ void daLv4PoGate_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); mDoMtx_stack_c::transM(0.0f, mMoveValue, 0.0f); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -139,7 +139,7 @@ void daLv4PoGate_c::modeWait() {} /* 80C600A0-80C60150 0005A0 00B0+00 1/1 0/0 0/0 .text init_modeMoveOpen__13daLv4PoGate_cFv */ void daLv4PoGate_c::init_modeMoveOpen() { cXyz sound_pos(current.pos); - sound_pos.y = orig.pos.y; + sound_pos.y = home.pos.y; mDoAud_seStart(Z2SE_OBJ_POU_GATE_OP, &sound_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); setEffect(0); @@ -158,7 +158,7 @@ void daLv4PoGate_c::modeMoveOpen() { /* 80C60200-80C602B0 000700 00B0+00 1/1 0/0 0/0 .text init_modeMoveClose__13daLv4PoGate_cFv */ void daLv4PoGate_c::init_modeMoveClose() { cXyz sound_pos(current.pos); - sound_pos.y = orig.pos.y; + sound_pos.y = home.pos.y; mDoAud_seStart(Z2SE_OBJ_POU_GATE_CL, &sound_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); setEffect(1); @@ -259,15 +259,15 @@ void daLv4PoGate_c::setEffect(int param_0) { } for (int i = start_idx; i < num; i++) { - dComIfGp_particle_set(particle_id[i], ¤t.pos, &shape_angle, &mScale, 255, NULL, -1, + dComIfGp_particle_set(particle_id[i], ¤t.pos, &shape_angle, &scale, 255, NULL, -1, NULL, NULL, NULL); } } /* 80C605F8-80C6069C 000AF8 00A4+00 1/0 0/0 0/0 .text Draw__13daLv4PoGate_cFv */ int daLv4PoGate_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); diff --git a/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp b/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp index 7dd1bda09d..e560b87ce5 100644 --- a/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp @@ -10,7 +10,7 @@ /* 80C677F8-80C67834 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__15daObjLv4Floor_cFv */ void daObjLv4Floor_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -135,8 +135,8 @@ void daObjLv4Floor_c::mode_dead() { /* 80C67BD4-80C67C78 000454 00A4+00 1/0 0/0 0/0 .text Draw__15daObjLv4Floor_cFv */ int daObjLv4Floor_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); diff --git a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp index e45f7dbc17..8e0aeace4b 100644 --- a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp +++ b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp @@ -32,7 +32,7 @@ static void* searchSwSpinSub(void* param_0, void* param_1) { /* 80C67FB4-80C67FF0 000114 003C+00 1/1 0/0 0/0 .text initBaseMtx__14daObjLv4Gear_cFv */ void daObjLv4Gear_c::initBaseMtx() { - mpModel->mBaseScale = mScale; + mpModel->mBaseScale = scale; setBaseMtx(); } @@ -144,8 +144,8 @@ int daObjLv4Gear_c::execute() { /* 80C683E0-80C68444 000540 0064+00 1/1 0/0 0/0 .text draw__14daObjLv4Gear_cFv */ int daObjLv4Gear_c::draw() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); return 1; } @@ -190,16 +190,16 @@ extern actor_process_profile_definition g_profile_Obj_Lv4Gear = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Lv4Gear, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daObjLv4Gear_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 561, // mPriority - &l_daObjLv4Gear_Method, // mSubMtd + &l_daObjLv4Gear_Method, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80C68524-80C68524 000024 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp b/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp index ce6062c47a..95aa007aa2 100644 --- a/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp +++ b/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp @@ -409,15 +409,15 @@ extern "C" asm void __dt__14mDoHIO_entry_cFv() { // matches with literals #ifdef NONMATCHING void daMagLiftRot_c::setBaseMtx() { - mScale.x = field_0x62c; - mScale.y = 1.0f; - mScale.z = field_0x630; + scale.x = field_0x62c; + scale.y = 1.0f; + scale.z = field_0x630; mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z); mDoMtx_stack_c::ZXYrotM(field_0x5e6.x, field_0x5e6.y, field_0x5e6.z); mDoMtx_stack_c::transM(field_0x5ec.x, field_0x5ec.y, field_0x5ec.z); - mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); + mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z); // this generates a cXyz dtor symbol with causes issues, // but this function doesnt match unless it's like this?? @@ -870,8 +870,8 @@ void daMagLiftRot_c::modeMoveWait() { /* 80C8F86C-80C8F970 00100C 0104+00 1/0 0/0 0/0 .text Draw__14daMagLiftRot_cFv */ int daMagLiftRot_c::Draw() { - g_env_light.settingTevStruct(0x40, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x40, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); J3DModelData* modelData = mpModel->getModelData(); if (l_btkIdx[mType] != -1) { diff --git a/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp b/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp index 649f701512..5970f9c38e 100644 --- a/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp +++ b/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp @@ -174,10 +174,10 @@ extern "C" extern u8 data_80C91AD0[4]; /* 80C90AF8-80C90B50 000078 0058+00 1/0 0/0 0/0 .text initWait__18daObjMasterSword_cFv */ void daObjMasterSword_c::initWait() { - cLib_onBit(mAttentionInfo.mFlags, 0x10); - current.pos = orig.pos; - current.angle = orig.angle; - shape_angle = orig.angle; + cLib_onBit(attention_info.flags, 0x10); + current.pos = home.pos; + current.angle = home.angle; + shape_angle = home.angle; } /* 80C90B50-80C90C50 0000D0 0100+00 1/0 0/0 0/0 .text executeWait__18daObjMasterSword_cFv @@ -504,18 +504,18 @@ void daObjMasterSword_c::create_init() { initBaseMtx(); fopAcM_OnCarryType(this, fopAcM_CARRY_UNK_30); - cLib_onBit(mAttentionInfo.mFlags, 0x10); - mAttentionInfo.field_0x0[4] = 74; - mAttentionInfo.mPosition = current.pos; - mAttentionInfo.mPosition.y += 100.0f; - mEyePos = mAttentionInfo.mPosition; + cLib_onBit(attention_info.flags, 0x10); + attention_info.field_0x0[4] = 74; + attention_info.position = current.pos; + attention_info.position.y += 100.0f; + eyePos = attention_info.position; dBgS_AcchCir cir_check; dBgS_ObjAcch obj_check; cir_check.SetWall(10.0f, 30.0f); - obj_check.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &cir_check, - &fopAcM_GetSpeed_p(this), NULL, NULL); + obj_check.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &cir_check, + fopAcM_GetSpeed_p(this), NULL, NULL); obj_check.CrrPos(dComIfG_Bgsp()); field_0x738 = obj_check.GetGroundH(); @@ -695,8 +695,8 @@ int daObjMasterSword_c::draw() { } J3DModelData* modelData = mpModel->getModelData(); - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mBtk.entry(modelData); @@ -710,7 +710,7 @@ int daObjMasterSword_c::draw() { cXyz sp8 = cXyz(current.pos.x, current.pos.y + 50.0f, current.pos.z); mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, &sp8, 200.0f, 10.0f, current.pos.y, field_0x738, - field_0x728, &mTevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + field_0x728, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); return 1; } diff --git a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp index da87d508f9..3d543190f7 100644 --- a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp +++ b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp @@ -41,14 +41,14 @@ static Vec const l_roll_crash_check_areaL2[4] = { /* 805935B8-80593630 000078 0078+00 1/1 0/0 0/0 .text initBaseMtx__12daObjMGate_cFv */ void daObjMGate_c::initBaseMtx() { if (mpKeyModel != NULL) { - mpKeyModel->setBaseScale(mScale); + mpKeyModel->setBaseScale(scale); } if (getType() == TYPE_LEFT) { - mScale.z = -1.0f; + scale.z = -1.0f; } - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -235,15 +235,15 @@ int daObjMGate_c::Execute(Mtx** param_0) { /* 80593C4C-80593D18 00070C 00CC+00 1/0 0/0 0/0 .text Draw__12daObjMGate_cFv */ int daObjMGate_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); if (mpKeyModel != NULL) { - g_env_light.setLightTevColorType_MAJI(mpKeyModel, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpKeyModel, &tevStr); mDoExt_modelUpdateDL(mpKeyModel); } diff --git a/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp b/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp index 7d322b8340..da64f86ad0 100644 --- a/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp +++ b/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp @@ -20,8 +20,8 @@ daObj_Myogan_HIO_c::daObj_Myogan_HIO_c() { /* 80C9EBDC-80C9EC70 00011C 0094+00 1/0 0/0 0/0 .text daObj_Myogan_Draw__FP16obj_myogan_class */ static int daObj_Myogan_Draw(obj_myogan_class* i_this) { - g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr); i_this->mpBrk->entry(i_this->mpModel->getModelData()); i_this->mpBtk->entry(i_this->mpModel->getModelData()); @@ -40,7 +40,7 @@ static daObj_Myogan_HIO_c l_HIO; static void action(obj_myogan_class* i_this) { switch (i_this->mAction) { case 0: - cLib_addCalc2(&i_this->current.pos.y, i_this->orig.pos.y + l_HIO.mNormalHeight, 0.05f, + cLib_addCalc2(&i_this->current.pos.y, i_this->home.pos.y + l_HIO.mNormalHeight, 0.05f, 10.0f); break; case 1: diff --git a/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp b/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp index 87c8bc0ffc..333f870512 100644 --- a/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp +++ b/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp @@ -146,16 +146,16 @@ int daObj_Oiltubo_c::Execute() { /* 80CA6EDC-80CA6FC8 00083C 00EC+00 1/1 0/0 0/0 .text Draw__15daObj_Oiltubo_cFv */ int daObj_Oiltubo_c::Draw() { - g_env_light.settingTevStruct(8, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpBModel, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(8, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpBModel, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); mBtk.entry(mpBModel->getModelData()); mDoExt_modelUpdateDL(mpBModel); mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, ¤t.pos, 800.0f, 120.0f, - current.pos.y, mGroundHeight, mGroundChk, &mTevStr, 0, 1.0f, + current.pos.y, mGroundHeight, mGroundChk, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); return 1; } @@ -173,7 +173,7 @@ const char* daObj_Oiltubo_c::getResName() { /* 80CA6FF8-80CA7068 000958 0070+00 1/1 0/0 0/0 .text restart__15daObj_Oiltubo_cFv */ void daObj_Oiltubo_c::restart() { - current.angle.set(0, orig.angle.y, 0); + current.angle.set(0, home.angle.y, 0); shape_angle = current.angle; setProcess(&wait); @@ -186,12 +186,12 @@ void daObj_Oiltubo_c::initialize() { fopAcM_setCullSizeBox2(this, mpModel->getModelData()); fopAcM_setCullSizeBox2(this, mpBModel->getModelData()); - mEvtInfo.setArchiveName((char*)getResName()); - mAttentionInfo.mFlags = 0; + eventInfo.setArchiveName((char*)getResName()); + attention_info.flags = 0; mAcchCir.SetWall(50.0f, 70.0f); - mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, - &fopAcM_GetSpeed_p(this), &fopAcM_GetAngle_p(this), &fopAcM_GetShapeAngle_p(this)); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(0xFF, 0, this); mCcAtCyl.Set(mCcDCyl); @@ -232,7 +232,7 @@ int daObj_Oiltubo_c::setProcess(daObj_Oiltubo_c::processFn i_process) { /* 80CA72BC-80CA7318 000C1C 005C+00 1/1 0/0 0/0 .text setParam__15daObj_Oiltubo_cFv */ void daObj_Oiltubo_c::setParam() { - mScale.set(1.0f, 1.0f, 1.0f); + scale.set(1.0f, 1.0f, 1.0f); mAcchCir.SetWallR(50.0f); mAcchCir.SetWallH(70.0f); } @@ -240,8 +240,8 @@ void daObj_Oiltubo_c::setParam() { /* 80CA7318-80CA7374 000C78 005C+00 2/2 0/0 0/0 .text setEnvTevColor__15daObj_Oiltubo_cFv */ void daObj_Oiltubo_c::setEnvTevColor() { - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGroundChk); - mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGroundChk); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGroundChk); + tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGroundChk); } /* 80CA7374-80CA73B8 000CD4 0044+00 2/2 0/0 0/0 .text setRoomNo__15daObj_Oiltubo_cFv */ @@ -256,7 +256,7 @@ void daObj_Oiltubo_c::setRoomNo() { void daObj_Oiltubo_c::setMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle); - mDoMtx_stack_c::scaleM(mScale); + mDoMtx_stack_c::scaleM(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); mpBModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); @@ -264,9 +264,9 @@ void daObj_Oiltubo_c::setMtx() { /* 80CA7430-80CA7478 000D90 0048+00 1/1 0/0 0/0 .text setAttnPos__15daObj_Oiltubo_cFv */ void daObj_Oiltubo_c::setAttnPos() { - mAttentionInfo.mPosition = current.pos; - mAttentionInfo.mPosition.y += 150.0f; - mEyePos = current.pos; + attention_info.position = current.pos; + attention_info.position.y += 150.0f; + eyePos = current.pos; } /* 80CA7478-80CA74C8 000DD8 0050+00 1/1 0/0 0/0 .text chkEvent__15daObj_Oiltubo_cFv */ @@ -276,7 +276,7 @@ BOOL daObj_Oiltubo_c::chkEvent() { if (!i_dComIfGp_getEvent().i_isOrderOK()) { var_r5 = 0; - if (mEvtInfo.i_checkCommandCatch()) { + if (eventInfo.i_checkCommandCatch()) { return var_r5; } } @@ -288,9 +288,9 @@ BOOL daObj_Oiltubo_c::chkEvent() { int daObj_Oiltubo_c::wait(void* unused) { switch (mMode) { case 1: - if (!mEvtInfo.i_checkCommandCatch()) { + if (!eventInfo.i_checkCommandCatch()) { dComIfGp_att_CatchRequest(this, OIL_BOTTLE_2, 100.0f, 50.0f, -50.0f, 0x2000, 1); - mEvtInfo.i_onCondition(0x40); + eventInfo.i_onCondition(0x40); } break; case 2: diff --git a/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp b/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp index af57d549fa..c9ec9ddd47 100644 --- a/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp +++ b/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp @@ -9,8 +9,8 @@ /* 80CA7B58-80CA7BB0 000078 0058+00 1/1 0/0 0/0 .text initBaseMtx__12daObjOnsen_cFv */ void daObjOnsen_c::initBaseMtx() { - mpModel[0]->setBaseScale(mScale); - mpModel[1]->setBaseScale(mScale); + mpModel[0]->setBaseScale(scale); + mpModel[1]->setBaseScale(scale); setBaseMtx(); } @@ -99,9 +99,9 @@ int daObjOnsen_c::Execute(Mtx** i_mtx) { /* 80CA7F1C-80CA8008 00043C 00EC+00 1/0 0/0 0/0 .text Draw__12daObjOnsen_cFv */ int daObjOnsen_c::Draw() { - g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel[0], &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel[1], &mTevStr); + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[0], &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[1], &tevStr); dKy_bg_MAxx_proc(mpModel[0]); mDoExt_modelUpdateDL(mpModel[0]); mpBtk->entry(mpModel[1]->getModelData()); diff --git a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp index 00b3fef79d..6d7b22ac75 100644 --- a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp +++ b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp @@ -57,14 +57,14 @@ 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, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daObjOnsenFire_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 612, // mPriority - &l_daObjOnsenFire_Method, // mSubMtd + &l_daObjOnsenFire_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp b/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp index 9a5b16794b..79a3c741e5 100644 --- a/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp +++ b/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp @@ -46,7 +46,7 @@ int daObjProp_c::create() { } else { init(); setModelMtx(); - mCullMtx = mpModel->getBaseTRMtx(); + cullMtx = mpModel->getBaseTRMtx(); fopAcM_setCullSizeBox2(this, mpModel->getModelData()); } } @@ -61,8 +61,8 @@ int daObjProp_c::Delete() { /* 80CB543C-80CB54A0 0002DC 0064+00 1/1 0/0 0/0 .text draw__11daObjProp_cFv */ int daObjProp_c::draw() { - g_env_light.settingTevStruct(NULL, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(NULL, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); mDoExt_modelUpdate(mpModel); return 1; } diff --git a/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp b/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp index 1203f1103d..12e49b7c8e 100644 --- a/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp +++ b/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp @@ -70,8 +70,8 @@ int daObjRCircle_c::Delete() { /* 80CB8A5C-80CB8B28 00047C 00CC+00 1/1 0/0 0/0 .text draw__14daObjRCircle_cFv */ int daObjRCircle_c::draw() { - g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); J3DModelData* modelData = mpModel->mModelData; mBtk.entry(modelData); mBrk.entry(modelData); diff --git a/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp b/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp index b549a9cbda..dee312c1ee 100644 --- a/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp +++ b/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp @@ -97,15 +97,15 @@ void daObjRgate_c::initBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(current.angle.y); MTXCopy(mDoMtx_stack_c::get(), field_0xb14); - mpGateModel->setBaseScale(mScale); + mpGateModel->setBaseScale(scale); if (getSwNo() != 0xFF) { if (mpKeyModel != NULL) { - mpKeyModel->setBaseScale(mScale); + mpKeyModel->setBaseScale(scale); } if (mpHookModel != NULL) { - mpHookModel->setBaseScale(mScale); + mpHookModel->setBaseScale(scale); } } @@ -245,7 +245,7 @@ int daObjRgate_c::Create() { if (sw_no != 0xFF && !i_fopAcM_isSwitch(this, sw_no) && !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) { - mEvtInfo.setArchiveName(l_arcName); + eventInfo.setArchiveName(l_arcName); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xFF); mMapToolID = getEventID(); @@ -256,9 +256,9 @@ int daObjRgate_c::Create() { setAction(ACT_DEAD); } - mAttentionInfo.mPosition.y += 150.0f; - mEyePos.y += 150.0f; - mAttentionInfo.mFlags = 0x20; + attention_info.position.y += 150.0f; + eyePos.y += 150.0f; + attention_info.flags = 0x20; initBaseMtx(); fopAcM_SetMtx(this, field_0xb14); @@ -767,15 +767,15 @@ void daObjRgate_c::action_typeA() { /* 80CBBA10-80CBBAF4 001DF0 00E4+00 1/0 0/0 0/0 .text actionWaitEvent__12daObjRgate_cFv */ void daObjRgate_c::actionWaitEvent() { - if (mEvtInfo.i_checkCommandDoor()) { + if (eventInfo.i_checkCommandDoor()) { setAction(ACT_EVENT); dComIfGp_setItemKeyNumCount(-1); i_fopAcM_onSwitch(this, getSwNo()); fopAcM_seStart(this, Z2SE_OBJ_RIDER_GATE_L_OP, 0); } else if (checkOpen()) { - mEvtInfo.setEventId(mEventID); - mEvtInfo.setMapToolId(mMapToolID); - mEvtInfo.i_onCondition(dEvtCnd_CANDOOR_e); + eventInfo.setEventId(mEventID); + eventInfo.setMapToolId(mMapToolID); + eventInfo.i_onCondition(dEvtCnd_CANDOOR_e); } } @@ -867,23 +867,23 @@ int daObjRgate_c::Execute(Mtx** param_0) { /* 80CBBE18-80CBBF34 0021F8 011C+00 1/0 0/0 0/0 .text Draw__12daObjRgate_cFv */ int daObjRgate_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpGateModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpGateModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpGateModel); dComIfGd_setList(); if (getSwNo() != 0xFF) { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); if (mpHookModel != NULL) { - g_env_light.setLightTevColorType_MAJI(mpHookModel, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpHookModel, &tevStr); mDoExt_modelUpdateDL(mpHookModel); } if (mpKeyModel != NULL) { - g_env_light.setLightTevColorType_MAJI(mpKeyModel, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpKeyModel, &tevStr); mDoExt_modelUpdateDL(mpKeyModel); } } diff --git a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp index 96693aecd4..dd26ad3761 100644 --- a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp +++ b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp @@ -23,7 +23,7 @@ int daObjSmoke_c::Create() { initBaseMtx(); if (i_fopAcM_isSwitch(this, getSwbit())) { - mParticle = dComIfGp_particle_set(0x85A6, ¤t.pos, ¤t.angle, &mScale, 255, NULL, + mParticle = dComIfGp_particle_set(0x85A6, ¤t.pos, ¤t.angle, &scale, 255, NULL, -1, NULL, NULL, NULL); } @@ -42,7 +42,7 @@ int daObjSmoke_c::create() { /* 80CDD004-80CDD0B8 000204 00B4+00 1/1 0/0 0/0 .text execute__12daObjSmoke_cFv */ int daObjSmoke_c::execute() { if (i_fopAcM_isSwitch(this, getSwbit()) && !mParticle) { - mParticle = dComIfGp_particle_set(0x85A6, ¤t.pos, ¤t.angle, &mScale, 255, NULL, + mParticle = dComIfGp_particle_set(0x85A6, ¤t.pos, ¤t.angle, &scale, 255, NULL, -1, NULL, NULL, NULL); } @@ -90,14 +90,14 @@ extern actor_process_profile_definition g_profile_Obj_Smoke = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_Smoke, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daObjSmoke_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 632, // mPriority - &l_daObjSmoke_Method, // mSubMtd + &l_daObjSmoke_Method, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp index 14f9807e6d..0ce2435059 100644 --- a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp +++ b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp @@ -28,7 +28,7 @@ void daSnowEffTag_c::setBaseMtx() { int daSnowEffTag_c::create() { fopAcM_SetupActor(this, daSnowEffTag_c); - mMaxSize = mScale.x * 100.0f; + mMaxSize = scale.x * 100.0f; switch (getArg0()) { case -1: @@ -46,7 +46,7 @@ int daSnowEffTag_c::create() { break; } - s16 tan = cM_atan2s(mMaxSize - mSize, mScale.y * 100.0f); + s16 tan = cM_atan2s(mMaxSize - mSize, scale.y * 100.0f); field_0x574 = cM_ssin(tan) / cM_scos(tan); mPlayedSound = false; @@ -61,7 +61,7 @@ bool daSnowEffTag_c::playerAreaCheck() { bool in_area = false; if (player_p->current.pos.y < current.pos.y || - player_p->current.pos.y > current.pos.y + mScale.y * 100.0f) + player_p->current.pos.y > current.pos.y + scale.y * 100.0f) { return false; } else { diff --git a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp index c3d04a837f..ff7d455b4f 100644 --- a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp +++ b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp @@ -82,8 +82,8 @@ int daObjSnowSoup_c::Delete() { /* 80CDFBC4-80CDFC40 0003E4 007C+00 1/1 0/0 0/0 .text draw__15daObjSnowSoup_cFv */ int daObjSnowSoup_c::draw() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel[mState]->mModelData, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[mState]->mModelData, &tevStr); mDoExt_modelUpdate(mpModel[mState]); return 1; } diff --git a/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp b/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp index fdc62c8679..6d67e53057 100644 --- a/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp +++ b/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp @@ -150,8 +150,8 @@ int daObj_SSItem_c::Draw() { if (field_0xB0E == 2) { return 1; } else { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); mDoExt_modelUpdateDL(mpModel); if (field_0xB00 != -1000000000.0f) { cM3dGPla plane; @@ -217,7 +217,7 @@ u8 daObj_SSItem_c::getTypeFromParam() { /* 80CE789C-80CE78D4 000CFC 0038+00 1/1 0/0 0/0 .text getFlowNodeNum__14daObj_SSItem_cFv */ u16 daObj_SSItem_c::getFlowNodeNum() { - u16 num = orig.angle.x; + u16 num = home.angle.x; bool bVar1 = false; if (num == 0xFFFF || num == 0) { bVar1 = true; @@ -240,7 +240,7 @@ u16 daObj_SSItem_c::getValue() { /* 80CE78E0-80CE7950 000D40 0070+00 1/1 0/0 0/0 .text restart__14daObj_SSItem_cFv */ void daObj_SSItem_c::restart() { - current.angle.set(0, orig.angle.y, 0); + current.angle.set(0, home.angle.y, 0); shape_angle = current.angle; setProcess(&wait); } @@ -249,13 +249,13 @@ void daObj_SSItem_c::restart() { void daObj_SSItem_c::initialize() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -30.0f, -15.0f, -30.0f, 30.0f, 45.0f, 30.0f); - mEvtInfo.setArchiveName(getResName()); - mAttentionInfo.mFlags = 0; - mAttentionInfo.field_0x0[4] = 6; + eventInfo.setArchiveName(getResName()); + attention_info.flags = 0; + attention_info.field_0x0[4] = 6; fopAcM_OnCarryType(this, fopAcM_CARRY_SIDE); mAcchCir.SetWall(24.0f, 12.0f); - mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, - &fopAcM_GetSpeed_p(this), &fopAcM_GetAngle_p(this), &fopAcM_GetShapeAngle_p(this)); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mStts.Init(0xFF, 0, this); mAtCyl.Set(mCcDCyl); mAtCyl.SetStts(&mStts); @@ -288,18 +288,18 @@ int daObj_SSItem_c::setProcess(ProcessFunc i_process) { /* 80CE7BB4-80CE7C24 001014 0070+00 1/1 0/0 0/0 .text setParam__14daObj_SSItem_cFv */ void daObj_SSItem_c::setParam() { - mScale.set(1.4f, 1.4f, 1.4f); - cLib_onBit(mAttentionInfo.mFlags, 0x10); + scale.set(1.4f, 1.4f, 1.4f); + cLib_onBit(attention_info.flags, 0x10); mAcchCir.SetWallR(24.0f); mAcchCir.SetWallH(12.0f); - mGravity = -5.0f; + gravity = -5.0f; } /* 80CE7C24-80CE7C80 001084 005C+00 2/2 0/0 0/0 .text setEnvTevColor__14daObj_SSItem_cFv */ void daObj_SSItem_c::setEnvTevColor() { - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); - mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); + tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); } /* 80CE7C80-80CE7CC4 0010E0 0044+00 2/2 0/0 0/0 .text setRoomNo__14daObj_SSItem_cFv */ @@ -313,14 +313,14 @@ void daObj_SSItem_c::setRoomNo() { void daObj_SSItem_c::setMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle); - mDoMtx_stack_c::scaleM(mScale); + mDoMtx_stack_c::scaleM(scale); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80CE7D28-80CE7D5C 001188 0034+00 1/1 0/0 0/0 .text setAttnPos__14daObj_SSItem_cFv */ void daObj_SSItem_c::setAttnPos() { - mAttentionInfo.mPosition = current.pos; - mEyePos = current.pos; + attention_info.position = current.pos; + eyePos = current.pos; } /* 80CE7D5C-80CE7D8C 0011BC 0030+00 1/0 0/0 0/0 .text wait__14daObj_SSItem_cFPv */ diff --git a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp index 95d26a10f9..7939ae349e 100644 --- a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp +++ b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp @@ -1,9 +1,9 @@ /** * d_a_obj_stone.cpp * Actor - Object Stone - * + * * Small and large rocks - * + * */ #include "rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h" @@ -178,10 +178,7 @@ extern "C" extern u8 data_80CECE10[4]; /* ############################################################################################## */ /* 80CECAB4-80CECABC 000000 0008+00 14/14 0/0 0/0 .rodata l_bmdIdx */ -const static int l_bmdIdx[2] = { - 3, - 3 -}; +const static int l_bmdIdx[2] = {3, 3}; COMPILER_STRIP_GATE(0x80CECAB4, &l_bmdIdx); /* 80CECABC-80CECAFC 000008 0040+00 0/1 0/0 0/0 .rodata l_sph_src */ @@ -199,8 +196,7 @@ const static dCcD_SrcSph l_sph_src = { {0.0f, 0.0f, 0.0f}, 50.0f, }, - } -}; + }}; COMPILER_STRIP_GATE(0x80CECABC, &l_sph_src); #pragma pop @@ -209,7 +205,7 @@ COMPILER_STRIP_GATE(0x80CECABC, &l_sph_src); #pragma force_active on // radius const static f32 l_r[2] = { - 30.0f, + 30.0f, 50.0f, }; COMPILER_STRIP_GATE(0x80CECAFC, &l_r); @@ -218,10 +214,7 @@ COMPILER_STRIP_GATE(0x80CECAFC, &l_r); /* 80CECB04-80CECB0C 000050 0008+00 0/1 0/0 0/0 .rodata l_rolling_speedF */ #pragma push #pragma force_active on -const static f32 l_rolling_speedF[2] = { - 9.0f, - 9.0f -}; +const static f32 l_rolling_speedF[2] = {9.0f, 9.0f}; COMPILER_STRIP_GATE(0x80CECB04, &l_rolling_speedF); #pragma pop @@ -229,41 +222,32 @@ COMPILER_STRIP_GATE(0x80CECB04, &l_rolling_speedF); #pragma push #pragma force_active on const static u32 l_rolling_time[2] = { - 0x0000001E, + 0x0000001E, 0x00000017, }; COMPILER_STRIP_GATE(0x80CECB0C, &l_rolling_time); #pragma pop /* 80CECB14-80CECB1C 000060 0008+00 1/2 0/0 0/0 .rodata l_initial_offsetY */ -const static f32 l_initial_offsetY[2] = { - 10.0f, - 20.0f -}; +const static f32 l_initial_offsetY[2] = {10.0f, 20.0f}; COMPILER_STRIP_GATE(0x80CECB14, &l_initial_offsetY); /* 80CECB1C-80CECB24 000068 0008+00 0/3 0/0 0/0 .rodata l_put_offsetY */ #pragma push #pragma force_active on -const static f32 l_put_offsetY[2] = { - 20.0f, - 30.0f -}; +const static f32 l_put_offsetY[2] = {20.0f, 30.0f}; COMPILER_STRIP_GATE(0x80CECB1C, &l_put_offsetY); #pragma pop /* 80CECB24-80CECB28 000070 0002+02 1/2 0/0 0/0 .rodata l_weight */ -const static u8 l_weight[2] = { - 0x78, - 0xC8 -}; +const static u8 l_weight[2] = {0x78, 0xC8}; COMPILER_STRIP_GATE(0x80CECB24, &l_weight); /* 80CECB28-80CECB30 000074 0008+00 0/1 0/0 0/0 .rodata l_speedH */ #pragma push #pragma force_active on const static f32 l_speedH[2] = { - 36.0f, + 36.0f, 43.0f, }; COMPILER_STRIP_GATE(0x80CECB28, &l_speedH); @@ -273,7 +257,7 @@ COMPILER_STRIP_GATE(0x80CECB28, &l_speedH); #pragma push #pragma force_active on const static f32 l_speedV[2] = { - 27.0f, + 27.0f, 22.0f, }; COMPILER_STRIP_GATE(0x80CECB30, &l_speedV); @@ -283,7 +267,7 @@ COMPILER_STRIP_GATE(0x80CECB30, &l_speedV); #pragma push #pragma force_active on const static f32 l_water_speedH[2] = { - 5.0f, + 5.0f, 5.0f, }; COMPILER_STRIP_GATE(0x80CECB38, &l_water_speedH); @@ -293,7 +277,7 @@ COMPILER_STRIP_GATE(0x80CECB38, &l_water_speedH); #pragma push #pragma force_active on const static f32 l_water_speedV[2] = { - 5.0f, + 5.0f, 5.0f, }; COMPILER_STRIP_GATE(0x80CECB40, &l_water_speedV); @@ -303,7 +287,7 @@ COMPILER_STRIP_GATE(0x80CECB40, &l_water_speedV); #pragma push #pragma force_active on const static f32 l_water_resist[2] = { - 0.02f, + 0.02f, 0.02f, }; COMPILER_STRIP_GATE(0x80CECB48, &l_water_resist); @@ -313,7 +297,7 @@ COMPILER_STRIP_GATE(0x80CECB48, &l_water_resist); #pragma push #pragma force_active on const static f32 l_water_walk_resist[2] = { - 0.15f, + 0.15f, 0.15f, }; COMPILER_STRIP_GATE(0x80CECB50, &l_water_walk_resist); @@ -323,24 +307,21 @@ COMPILER_STRIP_GATE(0x80CECB50, &l_water_walk_resist); #pragma push #pragma force_active on const static f32 l_buoyancy[2] = { - 5.9f, + 5.9f, 5.9f, }; COMPILER_STRIP_GATE(0x80CECB58, &l_buoyancy); #pragma pop /* 80CECB60-80CECB68 0000AC 0008+00 1/1 0/0 0/0 .rodata l_shadow_size */ -const static f32 l_shadow_size[2] = { - 40.0f, - 65.0f -}; +const static f32 l_shadow_size[2] = {40.0f, 65.0f}; COMPILER_STRIP_GATE(0x80CECB60, &l_shadow_size); /* 80CECB68-80CECB70 0000B4 0008+00 0/1 0/0 0/0 .rodata l_wpillar_scl */ #pragma push #pragma force_active on const static f32 l_wpillar_scl[2] = { - 0.65f, + 0.65f, 1.1f, }; COMPILER_STRIP_GATE(0x80CECB68, &l_wpillar_scl); @@ -350,7 +331,7 @@ COMPILER_STRIP_GATE(0x80CECB68, &l_wpillar_scl); #pragma push #pragma force_active on const static f32 l_hamon_scl[2] = { - 0.7f, + 0.7f, 1.2f, }; COMPILER_STRIP_GATE(0x80CECB70, &l_hamon_scl); @@ -360,7 +341,7 @@ COMPILER_STRIP_GATE(0x80CECB70, &l_hamon_scl); #pragma push #pragma force_active on const static f32 l_yogan_eff_scl[2] = { - 0.6f, + 0.6f, 1.1f, }; COMPILER_STRIP_GATE(0x80CECB78, &l_yogan_eff_scl); @@ -370,7 +351,7 @@ COMPILER_STRIP_GATE(0x80CECB78, &l_yogan_eff_scl); #pragma push #pragma force_active on const static f32 l_wall_h[2] = { - 30.0f, + 30.0f, 50.0f, }; COMPILER_STRIP_GATE(0x80CECB80, &l_wall_h); @@ -379,30 +360,21 @@ COMPILER_STRIP_GATE(0x80CECB80, &l_wall_h); /* 80CECB88-80CECB90 0000D4 0008+00 0/1 0/0 0/0 .rodata l_wall_r */ #pragma push #pragma force_active on -const static f32 l_wall_r[2] = { - 30.0f, - 50.0f -}; +const static f32 l_wall_r[2] = {30.0f, 50.0f}; COMPILER_STRIP_GATE(0x80CECB88, &l_wall_r); #pragma pop /* 80CECB90-80CECB94 0000DC 0004+00 0/1 0/0 0/0 .rodata l_rot_angle */ #pragma push #pragma force_active on -const static s16 l_rot_angle[2] = { - 35, - 18 -}; +const static s16 l_rot_angle[2] = {35, 18}; COMPILER_STRIP_GATE(0x80CECB90, &l_rot_angle); #pragma pop /* 80CECB94-80CECB98 0000E0 0004+00 0/1 0/0 0/0 .rodata l_walk_rot_angle */ #pragma push #pragma force_active on -const static s16 l_walk_rot_angle[2] = { - 40, - 40 -}; +const static s16 l_walk_rot_angle[2] = {40, 40}; COMPILER_STRIP_GATE(0x80CECB94, &l_walk_rot_angle); #pragma pop @@ -465,8 +437,8 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { /* 80CECC74-80CECC7C -00001 0008+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName[2] = { - "D_Srock", // small rock - "D_Brock", // big rock + "D_Srock", // small rock + "D_Brock", // big rock }; /* 80CECC7C-80CECC88 -00001 000C+00 0/1 0/0 0/0 .data @4015 */ @@ -556,27 +528,25 @@ SECTION_DATA static u8 l_func[84] = { static actor_method_class l_daObjStone_Method = { (process_method_func)daObjStone_Create__FP10fopAc_ac_c, (process_method_func)daObjStone_Delete__FP12daObjStone_c, - (process_method_func)daObjStone_Execute__FP12daObjStone_c, - (process_method_func)0, - (process_method_func)daObjStone_Draw__FP12daObjStone_c -}; + (process_method_func)daObjStone_Execute__FP12daObjStone_c, (process_method_func)0, + (process_method_func)daObjStone_Draw__FP12daObjStone_c}; /* 80CECD44-80CECD74 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Stone */ extern actor_process_profile_definition g_profile_Obj_Stone = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Stone, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd - sizeof(daObjStone_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // mSubMtd - 511, // mPriority - &l_daObjStone_Method, // mSubMtd - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLSPHERE_8_e, // mCullType + fpcLy_CURRENT_e, // mLayerID + 8, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Stone, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjStone_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 511, // mPriority + &l_daObjStone_Method, // sub_method + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLSPHERE_8_e, // cullType }; /* 80CECD74-80CECDA4 000120 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */ @@ -656,11 +626,11 @@ SECTION_DATA extern void* __vt__8cM3dGPla[3] = { static f32 bound(cXyz* param_0, cBgS_PolyInfo const& param_1, f32 param_2) { cM3dGPla plane; f32 ret; - if (dComIfG_Bgsp().GetTriPla(param_1,&plane)) { + if (dComIfG_Bgsp().GetTriPla(param_1, &plane)) { cXyz pos; f32 abs = param_0->abs(); - C_VECReflect(param_0,(Vec*)&plane,&pos); + C_VECReflect(param_0, (Vec*)&plane, &pos); *param_0 = pos * abs * param_2; return param_0->absXZ(); @@ -701,16 +671,16 @@ void daObjStone_c::initBaseMtx() { field_0x091c = 0; field_0x0930 = ZeroQuat; field_0x0920 = field_0x0930; - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } /* 80CE9468-80CE9540 000468 00D8+00 2/2 0/0 0/0 .text setBaseMtx__12daObjStone_cFv */ void daObjStone_c::setBaseMtx() { - mDoMtx_quatMultiply(&field_0x0920,&field_0x0930,&field_0x0920); - mDoMtx_stack_c::transS(current.pos.x,current.pos.y+mInitialOffsetY,current.pos.z); + mDoMtx_quatMultiply(&field_0x0920, &field_0x0930, &field_0x0920); + mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mInitialOffsetY, current.pos.z); mDoMtx_stack_c::quatM(&field_0x0920); - mDoMtx_stack_c::ZXYrotM(shape_angle.x,shape_angle.y,shape_angle.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); mDoMtx_stack_c::ZXYrotM(mShapeAngle); mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); field_0x0930 = field_0x0920; @@ -736,18 +706,19 @@ int daObjStone_c::Create() { mShapeAngle = shape_angle; shape_angle.setall(0); - fopAcM_SetMtx(this,mpModel->getBaseTRMtx()); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); // set chkCirlce wall bounds - mChkCircle.SetWall(l_wall_h[mStoneType],l_wall_r[mStoneType]); + mChkCircle.SetWall(l_wall_h[mStoneType], l_wall_r[mStoneType]); // setup chkobj - mChkObj.Set(&fopAcM_GetPosition_p(this),&fopAcM_GetOldPosition_p(this),this,1,&mChkCircle,&fopAcM_GetSpeed_p(this),0,0); + mChkObj.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mChkCircle, + fopAcM_GetSpeed_p(this), 0, 0); mChkObj.SetWtrChkMode(2); mChkObj.ClrObj(); mChkObj.SetBomb(); - mStatus.Init(l_weight[mStoneType],0xFF,this); + mStatus.Init(l_weight[mStoneType], 0xFF, this); // setup collider mCollider.Set(l_sph_src); @@ -758,10 +729,10 @@ int daObjStone_c::Create() { mCollider.SetAtAtp(2); } - fopAcM_setCullSizeSphere(this,0.0f,0.0f,0.0f,l_r[mStoneType]*1.2f); - cLib_onBit(mAttentionInfo.mFlags,0x10); - mAttentionInfo.field_0x0[4] = 0x2A; - fopAcM_OnCarryType(this,fopAcM_CARRY_LIGHT); + fopAcM_setCullSizeSphere(this, 0.0f, 0.0f, 0.0f, l_r[mStoneType] * 1.2f); + cLib_onBit(attention_info.flags, 0x10); + attention_info.field_0x0[4] = 0x2A; + fopAcM_OnCarryType(this, fopAcM_CARRY_LIGHT); cXyz other_pos = current.pos; @@ -772,7 +743,7 @@ int daObjStone_c::Create() { // Set heavy carry type if big stone if (mStoneType == OBJ_STONE_TYPE_BIG) { - fopAcM_OnCarryType(this,fopAcM_CARRY_HEAVY); + fopAcM_OnCarryType(this, fopAcM_CARRY_HEAVY); } init_modePutWait(); @@ -784,9 +755,10 @@ int daObjStone_c::Create() { pos.y += 1.0f; // Create the mark actor that goes under the stone - fopAcM_createChild(PROC_Obj_StoneMark,fopAcM_GetID(this),stoneType,&pos,fopAcM_GetRoomNo(this),&shape_angle,&mScale,-1,0); + fopAcM_createChild(PROC_Obj_StoneMark, fopAcM_GetID(this), stoneType, &pos, + fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, 0); - mSound.init(¤t.pos,1); + mSound.init(¤t.pos, 1); mLastPosY = current.pos.y; return 1; @@ -804,7 +776,9 @@ asm int daObjStone_c::Create() { /* 80CE97C0-80CE9840 0007C0 0080+00 1/1 0/0 0/0 .text CreateHeap__12daObjStone_cFv */ bool daObjStone_c::CreateHeap() { - mpModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName[mStoneType],l_bmdIdx[mStoneType]),0x80000,0x11000084); + mpModel = mDoExt_J3DModel__create( + (J3DModelData*)dComIfG_getObjectRes(l_arcName[mStoneType], l_bmdIdx[mStoneType]), 0x80000, + 0x11000084); return mpModel != NULL; } @@ -816,11 +790,11 @@ int daObjStone_c::create() { mStoneType = getType(); - int phase = dComIfG_resLoad(&mPhase,l_arcName[mStoneType]); + int phase = dComIfG_resLoad(&mPhase, l_arcName[mStoneType]); if (phase == cPhs_COMPLEATE_e) { // Allocate solid heap on GAME and load rock's model into it - if (!fopAcM_entrySolidHeap(this,(heapCallbackFunc)CheckCreateHeap,0x860)) { + if (!fopAcM_entrySolidHeap(this, (heapCallbackFunc)CheckCreateHeap, 0x860)) { return cPhs_ERROR_e; } @@ -910,21 +884,21 @@ int daObjStone_c::execute() { cXyz pos; mStatus.SetWeight(l_weight[this->mStoneType]); - fopAcM_SetGravity(this,FLOAT_LABEL(lit_4010)); + fopAcM_SetGravity(this, FLOAT_LABEL(lit_4010)); mode_proc_call(); if (mCollider.ChkTgHit() && mCollider.GetTgHitObj()) { - mSound.startCollisionSE(mCollider.GetTgHitObjHitSeID(1),2,0); + mSound.startCollisionSE(mCollider.GetTgHitObjHitSeID(1), 2, 0); } - mSound.framework(0,dComIfGp_getReverb(fopAcM_GetRoomNo(this))); - mAttentionInfo.mPosition = current.pos; - mEyePos = mAttentionInfo.mPosition; + mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + attention_info.position = current.pos; + eyePos = attention_info.position; setBaseMtx(); pos = current.pos; pos.y += mInitialOffsetY; - + mCollider.SetC(pos); dComIfG_Ccsp()->Set(&mCollider); mChkObj.OffLineCheck(); @@ -1058,7 +1032,7 @@ extern "C" asm void __dt__14dBgS_ObjGndChkFv() { void daObjStone_c::init_modePutWait() { mCollider.OffAtSPrmBit(1); mCollider.OnCoSPrmBit(1); - cLib_onBit(mAttentionInfo.mFlags,0x10); + cLib_onBit(attention_info.flags, 0x10); mInitialOffsetY = l_initial_offsetY[mStoneType]; mMode = 0; field_0x0907 = 3; @@ -1073,7 +1047,7 @@ void daObjStone_c::modePutWait() { void daObjStone_c::init_modeWait() { mCollider.OffAtSPrmBit(1); mCollider.OnCoSPrmBit(1); - cLib_onBit(mAttentionInfo.mFlags,0x10); + cLib_onBit(attention_info.flags, 0x10); mMode = 0; field_0x0907 = 0; } @@ -1098,8 +1072,8 @@ void daObjStone_c::modeWait() { mMode++; speedF *= FLOAT_LABEL(lit_4678); - fopAcM_posMoveF(this,mStatus.GetCCMoveP()); - cLib_chaseF(&mInitialOffsetY,l_put_offsetY[mStoneType],FLOAT_LABEL(lit_4679)); + fopAcM_posMoveF(this, mStatus.GetCCMoveP()); + cLib_chaseF(&mInitialOffsetY, l_put_offsetY[mStoneType], FLOAT_LABEL(lit_4679)); if (mMode > 5 && checkRollAngle()) { init_modeWalk(); @@ -1110,7 +1084,7 @@ void daObjStone_c::modeWait() { void daObjStone_c::init_modeDrop() { mCollider.OnAtSPrmBit(1); mCollider.OnCoSPrmBit(1); - cLib_offBit(mAttentionInfo.mFlags,0x10); + cLib_offBit(attention_info.flags, 0x10); mMode = 0; mLastPosY = current.pos.y; field_0x0907 = 1; @@ -1126,7 +1100,8 @@ void daObjStone_c::modeDrop() { if (mIsInWater != 0) { mCollider.OffAtSPrmBit(1); - mChkObj.ChkGroundHit() ? cLib_onBit(mAttentionInfo.mFlags,0x10) : cLib_offBit(mAttentionInfo.mFlags,0x10); + mChkObj.ChkGroundHit() ? cLib_onBit(attention_info.flags, 0x10) : + cLib_offBit(attention_info.flags, 0x10); pos2.x = speedF * cM_ssin(current.angle.y); pos2.y = speed.y; @@ -1136,16 +1111,15 @@ void daObjStone_c::modeDrop() { pos.x = -pos.x * l_water_resist[mStoneType]; pos.y = -pos.y * l_water_resist[mStoneType]; pos.z = -pos.z * l_water_resist[mStoneType]; - - + pos2 += pos; - speedF = sqrtf(pos2.x*pos2.x + pos2.z*pos2.z); + speedF = sqrtf(pos2.x * pos2.x + pos2.z * pos2.z); speed.y = pos2.y; - fopAcM_SetGravity(this,-6.0f + l_buoyancy[mStoneType]); + fopAcM_SetGravity(this, -6.0f + l_buoyancy[mStoneType]); } - fopAcM_posMoveF(this,mStatus.GetCCMoveP()); + fopAcM_posMoveF(this, mStatus.GetCCMoveP()); mLastSpeedY = speed.y; calcRotBaseMtx(0); } @@ -1166,17 +1140,17 @@ asm void daObjStone_c::modeDrop() { void daObjStone_c::init_modeCarry() { mCollider.OffCoSPrmBit(1); mCollider.OffAtSPrmBit(1); - fopAcM_SetModel(this,mpModel); + fopAcM_SetModel(this, mpModel); mMode = 0; field_0x0950 = field_0x0907; if (mIsInWater == 0) { if (mStoneType == OBJ_STONE_TYPE_BIG) { - fopAcM_seStart(this,Z2SE_OBJ_CMN_L_ROCK_LIFT,0); // literals inline + fopAcM_seStart(this, Z2SE_OBJ_CMN_L_ROCK_LIFT, 0); // literals inline } else { - fopAcM_seStart(this,Z2SE_OBJ_CMN_ROCK_LIFT,0); // literals inline + fopAcM_seStart(this, Z2SE_OBJ_CMN_ROCK_LIFT, 0); // literals inline } } - + field_0x0907 = 2; } #else @@ -1226,7 +1200,9 @@ void daObjStone_c::modeCarry() { } } - if ((mStoneType == OBJ_STONE_TYPE_SMALL && mMode > 8) || (mStoneType == OBJ_STONE_TYPE_BIG && mMode > 17)) { + if ((mStoneType == OBJ_STONE_TYPE_SMALL && mMode > 8) || + (mStoneType == OBJ_STONE_TYPE_BIG && mMode > 17)) + { f32 frame_rate = daPy_getLinkPlayerActorClass()->getBaseAnimeFrameRate() * 0.25f; mDoMtx_quatSlerp(&field_0x0930, &ZeroQuat, &field_0x0930, frame_rate); } @@ -1245,7 +1221,7 @@ void daObjStone_c::modeCarry() { if (speed.y < -10.0f) speed.y = -10.0f; - + if (speed.y > 10.0f) speed.y = 10.0f; @@ -1261,7 +1237,6 @@ void daObjStone_c::modeCarry() { model = 0; } - } #else #pragma push @@ -1278,7 +1253,7 @@ asm void daObjStone_c::modeCarry() { void daObjStone_c::init_modeWalk() { mCollider.OffAtSPrmBit(1); mCollider.OnCoSPrmBit(1); - cLib_onBit(mAttentionInfo.mFlags,0x10); + cLib_onBit(attention_info.flags, 0x10); mMode = 0; field_0x0907 = 4; } @@ -1337,9 +1312,9 @@ void daObjStone_c::init_modePushWolfNonBreak() { if (mIsInWater == 0) { if (mStoneType == OBJ_STONE_TYPE_BIG) { - fopAcM_seStart(this,Z2SE_OBJ_CMN_L_ROCK_ROLL,0); // literals inline + fopAcM_seStart(this, Z2SE_OBJ_CMN_L_ROCK_ROLL, 0); // literals inline } else { - fopAcM_seStart(this,Z2SE_OBJ_CMN_ROCK_ROLL,0); // literals inline + fopAcM_seStart(this, Z2SE_OBJ_CMN_ROCK_ROLL, 0); // literals inline } } @@ -1377,8 +1352,8 @@ void daObjStone_c::init_modeYogan() { mCollider.OnCoSPrmBit(1); mInitialOffsetY = l_initial_offsetY[mStoneType]; mMode = 0; - fopAcM_SetGravity(this,FLOAT_LABEL(lit_5063)); - fopAcM_SetMaxFallSpeed(this,FLOAT_LABEL(lit_5064)); + fopAcM_SetGravity(this, FLOAT_LABEL(lit_5063)); + fopAcM_SetMaxFallSpeed(this, FLOAT_LABEL(lit_5064)); current.pos.y = mChkObj.m_wtr.GetHeight(); field_0x0907 = 6; } @@ -1401,8 +1376,8 @@ void daObjStone_c::modeYogan() { bool gnd_landing = mChkObj.ChkGroundLanding(); speedF *= FLOAT_LABEL(lit_5075); - fopAcM_posMoveF(this,0); - + fopAcM_posMoveF(this, 0); + if (pos_check || gnd_landing) { fopAcM_delete(this); } @@ -1415,12 +1390,7 @@ void daObjStone_c::modeYogan() { #pragma push #pragma force_active on const static u8 l_eff_id[10] = { - 0x85, - 0x9B, - 0x85, - 0x9C, - 0x85, - 0x9D, + 0x85, 0x9B, 0x85, 0x9C, 0x85, 0x9D, }; COMPILER_STRIP_GATE(0x80CECC20, &l_eff_id); #pragma pop @@ -1454,12 +1424,10 @@ void daObjStone_c::CrrPos() { cXyz pos = current.pos; u8 mode = field_0x0907; - - + if (mode == 2) { check1 = true; pos = current.pos; - } if (field_0x0907 == 3) { @@ -1467,9 +1435,9 @@ void daObjStone_c::CrrPos() { } if (!check2) { - mChkObj.CrrPos(dComIfG_Bgsp()); - } - + mChkObj.CrrPos(dComIfG_Bgsp()); + } + if (check1) { current.pos = pos; } @@ -1481,15 +1449,16 @@ void daObjStone_c::CrrPos() { void daObjStone_c::createItem() { int item_no = getItemNo(); int item_bit = getItemBit(); - - csXyz angle(0,orig.angle.y,0); + + csXyz angle(0, home.angle.y, 0); u8 item_type = getItemType(); if (item_type == 0) { - cXyz pos(orig.pos); - fopAcM_createItem(&pos,item_no,item_bit,fopAcM_GetHomeRoomNo(this),&angle,0,8); + cXyz pos(home.pos); + fopAcM_createItem(&pos, item_no, item_bit, fopAcM_GetHomeRoomNo(this), &angle, 0, 8); } else { - fopAcM_createItemFromTable(&orig.pos,item_no,item_bit,fopAcM_GetHomeRoomNo(this),&angle,8,0,0,0,false); + fopAcM_createItemFromTable(&home.pos, item_no, item_bit, fopAcM_GetHomeRoomNo(this), &angle, + 8, 0, 0, 0, false); } } #else @@ -1526,25 +1495,30 @@ asm void daObjStone_c::calcRotBaseMtx(s16* param_0) { /* 80CEC5BC-80CEC6D8 0035BC 011C+00 1/1 0/0 0/0 .text checkRollAngle__12daObjStone_cFv */ #ifdef NONMATCHING -// matches but cM3dGPla dtor will be generated in wrong place until TU is finished (due to bound function float literal inlines) +// matches but cM3dGPla dtor will be generated in wrong place until TU is finished (due to bound +// function float literal inlines) int daObjStone_c::checkRollAngle() { cXyz pos = current.pos; pos.y += FLOAT_LABEL(lit_4644); cM3dGPla plane; bool gnd_chk = fopAcM_gc_c::gndCheck(&pos); - bool triPla = dComIfG_Bgsp().GetTriPla(*(dBgS_GndChk*)&fopAcM_gc_c::mGndCheck,&plane); // there's an inline here but it can be used until fopAcM_gc_c::mGndCheck is properly setup + bool triPla = + dComIfG_Bgsp().GetTriPla(*(dBgS_GndChk*)&fopAcM_gc_c::mGndCheck, + &plane); // there's an inline here but it can be used until + // fopAcM_gc_c::mGndCheck is properly setup f32 ground_y = fopAcM_gc_c::getGroundY(); if (gnd_chk && FLOAT_LABEL(lit_4637) != ground_y && triPla) { - f32 tmp2 = cM_scos(i_cM_deg2s(FLOAT_LABEL(lit_5018))); // not sure what happened here. debug implies there's a multiply happening in cM_deg2s, but retail has no such instructions + f32 tmp2 = cM_scos(i_cM_deg2s(FLOAT_LABEL( + lit_5018))); // not sure what happened here. debug implies there's a multiply happening + // in cM_deg2s, but retail has no such instructions cXyz pos2 = plane.mNormal; if (pos2.y < tmp2) { return 1; } - } return 0; @@ -1564,11 +1538,7 @@ asm int daObjStone_c::checkRollAngle() { /* 80CECC34-80CECC3C 000180 0006+02 0/1 0/0 0/0 .rodata l_carry_eff_id$5307 */ #pragma push #pragma force_active on -const static u16 l_carry_eff_id[3] = { - 0x859E, - 0x859F, - 0x85A0 -}; +const static u16 l_carry_eff_id[3] = {0x859E, 0x859F, 0x85A0}; COMPILER_STRIP_GATE(0x80CECC34, &l_carry_eff_id); #pragma pop @@ -1586,9 +1556,9 @@ void daObjStone_c::set_carry_eff() { if (field_0x0950 == 3) { for (int i = 0; i < 3; i++) { - field_0x0964[i] = dComIfGp_particle_set(l_carry_eff_id[i], - ¤t.pos,0,&pos,0xFF,0,0xFFFFFFFF, - 0,0,0); // float literal inline + field_0x0964[i] = + dComIfGp_particle_set(l_carry_eff_id[i], ¤t.pos, 0, &pos, 0xFF, 0, 0xFFFFFFFF, + 0, 0, 0); // float literal inline if (field_0x0964[i] != 0) { field_0x0964[i]->becomeImmortalEmitter(); } @@ -1618,8 +1588,8 @@ asm void daObjStone_c::effect_delete(bool param_0) { /* 80CEC888-80CEC948 003888 00C0+00 1/1 0/0 0/0 .text draw__12daObjStone_cFv */ int daObjStone_c::draw() { - g_env_light.settingTevStruct(8,¤t.pos,&mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel,&mTevStr); + g_env_light.settingTevStruct(8, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); if (!model) { @@ -1627,13 +1597,8 @@ int daObjStone_c::draw() { GXTexObj* pTex = dDlst_shadowControl_c::getSimpleTex(); cXyz pos = current.pos; - dComIfGd_setSimpleShadow(&pos, - mChkObj.GetGroundH(), - shadow_size, - mChkObj.m_gnd, - 0, - FLOAT_LABEL(lit_3845), - pTex); + dComIfGd_setSimpleShadow(&pos, mChkObj.GetGroundH(), shadow_size, mChkObj.m_gnd, 0, + FLOAT_LABEL(lit_3845), pTex); } return 1; } @@ -1642,9 +1607,9 @@ int daObjStone_c::draw() { int daObjStone_c::_delete() { mSound.deleteObject(); u16 setid = fopAcM_GetSetId(this); - fopAcM_offActor(this,setid); + fopAcM_offActor(this, setid); effect_delete(true); - dComIfG_resDelete(&mPhase,l_arcName[mStoneType]); + dComIfG_resDelete(&mPhase, l_arcName[mStoneType]); return 1; } diff --git a/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp b/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp index cd0b618d72..4da0fdd180 100644 --- a/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp +++ b/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.cpp @@ -1,17 +1,17 @@ /** * d_a_obj_stoneMark.cpp * Actor - Object Stone Mark - * + * * Visual mark under the stone actor (d_a_obj_stone) - * + * */ #include "rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h" #include "JSystem/JKernel/JKRHeap.h" -#include "m_Do/m_Do_lib.h" -#include "f_op/f_op_actor_mng.h" #include "d/com/d_com_inf_game.h" #include "d/d_procname.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_lib.h" /* 8059A410-8059A414 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char* l_arcName = "A_IwaAto"; @@ -25,19 +25,19 @@ void daObjSMark_c::initBaseMtx() { void daObjSMark_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - MTXCopy(mDoMtx_stack_c::get(), mCullMtx); + MTXCopy(mDoMtx_stack_c::get(), cullMtx); } /* 8059A080-8059A168 0000E0 00E8+00 1/1 0/0 0/0 .text Create__12daObjSMark_cFv */ int daObjSMark_c::Create() { initBaseMtx(); - fopAcM_SetMtx(this, mCullMtx); - fopAcM_setCullSizeSphere(this,0.0f,0.0f,0.0f,100.0f); - mAcchCir.SetWall(30.0f,30.0f); - mObjAcch.Set(&fopAcM_GetPosition_p(this),&fopAcM_GetOldPosition_p(this),this,1, - &mAcchCir,&fopAcM_GetSpeed_p(this),0,0); + fopAcM_SetMtx(this, cullMtx); + fopAcM_setCullSizeSphere(this, 0.0f, 0.0f, 0.0f, 100.0f); + mAcchCir.SetWall(30.0f, 30.0f); + mObjAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + fopAcM_GetSpeed_p(this), 0, 0); mObjAcch.CrrPos(dComIfG_Bgsp()); - mDoLib_setResTimgObj((ResTIMG*)dComIfG_getObjectRes(l_arcName,3),&mTexObj,0,0); + mDoLib_setResTimgObj((ResTIMG*)dComIfG_getObjectRes(l_arcName, 3), &mTexObj, 0, 0); return 1; } @@ -45,8 +45,8 @@ int daObjSMark_c::Create() { int daObjSMark_c::create() { fopAcM_SetupActor(this, daObjSMark_c); - int phase = dComIfG_resLoad(&mpPhase,l_arcName); - if (phase == cPhs_COMPLEATE_e){ + int phase = dComIfG_resLoad(&mpPhase, l_arcName); + if (phase == cPhs_COMPLEATE_e) { if (!Create()) { return cPhs_ERROR_e; } @@ -57,23 +57,17 @@ int daObjSMark_c::create() { /* 8059A2CC-8059A33C 00032C 0070+00 1/1 0/0 0/0 .text draw__12daObjSMark_cFv */ int daObjSMark_c::draw() { - static const f32 l_shadow_size[2] = { - 55.0f, - 85.0f - }; - dComIfGd_setSimpleShadow(¤t.pos, - mObjAcch.GetGroundH(), - l_shadow_size[fopAcM_GetParam(this) & 0xFF], - mObjAcch.m_gnd, - shape_angle.y, - (-0.6f - g_env_light.field_0x1238 * (0.7f - 0.3f)), - &this->mTexObj); + static const f32 l_shadow_size[2] = {55.0f, 85.0f}; + dComIfGd_setSimpleShadow(¤t.pos, mObjAcch.GetGroundH(), + l_shadow_size[fopAcM_GetParam(this) & 0xFF], mObjAcch.m_gnd, + shape_angle.y, (-0.6f - g_env_light.field_0x1238 * (0.7f - 0.3f)), + &this->mTexObj); return 1; } /* 8059A33C-8059A370 00039C 0034+00 1/1 0/0 0/0 .text _delete__12daObjSMark_cFv */ int daObjSMark_c::_delete() { - dComIfG_resDelete(&mpPhase,l_arcName); + dComIfG_resDelete(&mpPhase, l_arcName); return 1; } /* 8059A370-8059A390 0003D0 0020+00 1/0 0/0 0/0 .text daObjSMark_Draw__FP12daObjSMark_c @@ -108,18 +102,18 @@ static actor_method_class l_daObjSMark_Method = { /* 8059A434-8059A464 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_StoneMark */ extern actor_process_profile_definition g_profile_Obj_StoneMark = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_StoneMark, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd - sizeof(daObjSMark_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // mSubMtd - 534, // mPriority - &l_daObjSMark_Method, // mSubMtd - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLSPHERE_8_e, // mCullType + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_StoneMark, // mProcName + &g_fpcLf_Method.mBase, // sub_method + sizeof(daObjSMark_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 534, // mPriority + &l_daObjSMark_Method, // sub_method + 0x40100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLSPHERE_8_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp b/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp index dbcbdc7e68..9b42108ccc 100644 --- a/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp +++ b/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp @@ -10,15 +10,15 @@ /* 80CF0078-80CF0148 000078 00D0+00 1/1 0/0 0/0 .text draw__14daObj_Suisya_cFv */ int daObj_Suisya_c::draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); cXyz sp18; sp18.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, &sp18, 400.0f, 0.0f, current.pos.y, - mAcch.GetGroundH(), mAcch.m_gnd, &mTevStr, 0, 1.0f, + mAcch.GetGroundH(), mAcch.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); return 1; } @@ -87,14 +87,14 @@ int daObj_Suisya_c::create() { return cPhs_ERROR_e; } - mAttentionInfo.mFlags = 0; - mCullMtx = mpModel->getBaseTRMtx(); + attention_info.flags = 0; + cullMtx = mpModel->getBaseTRMtx(); fopAcM_SetMin(this, -200.0f, -500.0f, -500.0f); fopAcM_SetMax(this, 200.0f, 500.0, 500.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL); mAcchCir.SetWall(0.0f, 0.0f); - mHealth = 60; + health = 60; field_0x560 = 60; daObj_Suisya_Execute(this); diff --git a/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp b/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp index 931afa61b2..c956ade3d6 100644 --- a/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp +++ b/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp @@ -39,7 +39,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { /* 8059A5E8-8059A624 000148 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjSwPr_cFv */ void daObjSwPr_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -116,7 +116,7 @@ int daObjSwPr_c::Create() { jnt->setCallBack(nodeCallBack); mpModel->setUserArea((u32)this); - mEyePos.y += 100.0f; + eyePos.y += 100.0f; // Set CullSizeFar for Outside Bridge room in Forest Temple if (strcmp(dComIfGp_getStartStageName(), "D_MN05") == 0 && fopAcM_GetRoomNo(this) == 4) { @@ -314,8 +314,8 @@ int daObjSwPr_c::execute() { /* 8059B148-8059B1AC 000CA8 0064+00 1/1 0/0 0/0 .text draw__11daObjSwPr_cFv */ int daObjSwPr_c::draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); return 1; diff --git a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp index f7742c7154..34cc109bf6 100644 --- a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp +++ b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp @@ -19,7 +19,7 @@ static void* search_spinner_sub(void* param_0, void* param_1) { if (swspinner->field_0x5e8 == NULL) { swspinner->field_0x5e8 = 1; } - spinner->setSpinnerTag(swspinner->mAttentionInfo.mPosition); + spinner->setSpinnerTag(swspinner->attention_info.position); return spinner; } if (swspinner->field_0x5e8 != NULL) { @@ -34,8 +34,8 @@ static void* search_spinner_sub(void* param_0, void* param_1) { /* 80D00174-80D001CC 000274 0058+00 1/1 0/0 0/0 .text initBaseMtx__16daObjSwSpinner_cFv */ void daObjSwSpinner_c::initBaseMtx() { - mpModel1->setBaseScale(mScale); - mpModel2->setBaseScale(mScale); + mpModel1->setBaseScale(scale); + mpModel2->setBaseScale(scale); setBaseMtx(); } @@ -48,7 +48,7 @@ void daObjSwSpinner_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mMtx); MTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y + field_0x5e4, current.pos.z); - mDoMtx_stack_c::YrotM(orig.angle.y); + mDoMtx_stack_c::YrotM(home.angle.y); mpModel2->i_setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); @@ -64,7 +64,7 @@ int daObjSwSpinner_c::Create() { field_0x5e4 = 30.0f; field_0x5ea = 1; } - mAttentionInfo.mPosition.y -= 100.0f; + attention_info.position.y -= 100.0f; initBaseMtx(); fopAcM_SetMtx(this, mpModel1->getBaseTRMtx()); @@ -146,7 +146,7 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) { spinner->offSpinnerTag(); field_0x5e8 = NULL; } - shape_angle.y = orig.angle.y; + shape_angle.y = home.angle.y; field_0x5ea = NULL; } if (field_0x5eb == NULL) { @@ -173,8 +173,8 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) { *param_0 = &mBgMtx; setBaseMtx(); mpBgW2->Move(); - mAttentionInfo.mPosition = current.pos; - mAttentionInfo.mPosition.y -= 100.0f; + attention_info.position = current.pos; + attention_info.position.y -= 100.0f; field_0x5eb = i_fopAcM_isSwitch(this, getSwBit2()) ? 1 : 0; field_0x5e9 = field_0x5e8; @@ -183,9 +183,9 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) { /* 80D00890-80D00954 000990 00C4+00 1/0 0/0 0/0 .text Draw__16daObjSwSpinner_cFv */ int daObjSwSpinner_c::Draw() { - g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel1, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel2, &mTevStr); + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel1, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel2, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel1); @@ -245,16 +245,16 @@ extern actor_process_profile_definition g_profile_Obj_SwSpinner = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_SwSpinner, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daObjSwSpinner_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 559, // mPriority - &daObjSwSpinner_METHODS, // mSubMtd + &daObjSwSpinner_METHODS, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D00AD4-80D00AD4 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp b/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp index 886f113869..fc615888ff 100644 --- a/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp +++ b/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp @@ -115,16 +115,16 @@ int daObjTable_c::Create() { i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[264]))) { mpModel->getModelData()->getMaterialNodePointer(4)->getShape()->hide(); - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } else { - mAttentionInfo.mFlags = 0x2000000a; + attention_info.flags = 0x2000000a; - mAttentionInfo.field_0x0[0] = dKy_darkworld_check() ? 218 : 98; - mAttentionInfo.field_0x0[1] = mAttentionInfo.field_0x0[0]; - mAttentionInfo.field_0x0[3] = mAttentionInfo.field_0x0[0]; + attention_info.field_0x0[0] = dKy_darkworld_check() ? 218 : 98; + attention_info.field_0x0[1] = attention_info.field_0x0[0]; + attention_info.field_0x0[3] = attention_info.field_0x0[0]; } - mAttentionInfo.mPosition.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + attention_info.position.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); mMsgFlow.init(this, getMessageNo(), 0, NULL); dMsgObject_endFlowGroup(); @@ -138,21 +138,21 @@ int daObjTable_c::Create() { /* 80D0695C-80D06AD8 00059C 017C+00 1/0 0/0 0/0 .text Execute__12daObjTable_cFPPA3_A4_f */ int daObjTable_c::Execute(Mtx** i_mtx) { - mEvtInfo.i_onCondition(1); + eventInfo.i_onCondition(1); dComIfG_inf_c& gameInfo = g_dComIfG_gameInfo; if (i_dComIfGp_event_runCheck()) { - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { if (mMsgFlow.doFlow(this, NULL, 0) != 0) { gameInfo.getPlay().getEvent().reset(this); // Fake match? - mEvtInfo.setArchiveName("Table"); - i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName()); + eventInfo.setArchiveName("Table"); + i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, "TABLE_MAP", -1); fopAcM_orderChangeEventId(this, mEventID, 1, -1); } } else if (i_dComIfGp_getEventManager().getMyStaffId(l_arcName, NULL, 0) != -1 && - mEvtInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && + eventInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && i_dComIfGp_getEventManager().endCheck(mEventID)) { mEventID = -1; @@ -169,8 +169,8 @@ int daObjTable_c::Execute(Mtx** i_mtx) { /* 80D06AD8-80D06BC8 000718 00F0+00 1/0 0/0 0/0 .text Draw__12daObjTable_cFv */ int daObjTable_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); @@ -178,7 +178,7 @@ int daObjTable_c::Draw() { cXyz v(current.pos.x, current.pos.y + 100.0f, current.pos.z); mShadowKey = - dComIfGd_setRealShadow(mShadowKey, 1, mpModel, &v, 500.0f, current.pos.y, &mTevStr); + dComIfGd_setRealShadow(mShadowKey, 1, mpModel, &v, 500.0f, current.pos.y, &tevStr); return 1; } diff --git a/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp b/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp index 71a309b151..7c45108b89 100644 --- a/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp +++ b/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp @@ -11,7 +11,7 @@ /* 80D0BC18-80D0BC54 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__11daObjGake_cFv */ void daObjGake_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -28,7 +28,7 @@ void daObjGake_c::setBaseMtx() { int daObjGake_c::Create() { mEventBit1 = getEventBit1(); mEventBit2 = getEventBit2(); - mEvtInfo.setIdx(getType()); + eventInfo.setIdx(getType()); initBaseMtx(); fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); @@ -99,8 +99,8 @@ int daObjGake_c::Draw() { return 1; } - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); diff --git a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp index 39ad6e8b48..9745a91a74 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp +++ b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp @@ -15,7 +15,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { /* 80D12BB8-80D12BF4 000098 003C+00 1/1 0/0 0/0 .text initBaseMtx__12daObjTMoon_cFv */ void daObjTMoon_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -66,12 +66,12 @@ int daObjTMoon_c::execute() { (field_0x574 != 0x3ff) && (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x574]))) { - fopDwTg_DrawQTo(&mDwTg); + fopDwTg_DrawQTo(&draw_tag); return 1; } else if ((field_0x574 != 0x3ff) && (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x574]))) { - fopDwTg_ToDrawQ(&mDwTg, fpcLf_GetPriority(this)); + fopDwTg_ToDrawQ(&draw_tag, fpcLf_GetPriority(this)); return 1; } return 1; @@ -125,14 +125,14 @@ extern actor_process_profile_definition g_profile_Obj_TMoon = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_TMoon, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daObjTMoon_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 569, // mPriority - &l_daObjTMoon_Method, // mSubMtd + &l_daObjTMoon_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp b/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp index 7229fdb20a..4b3061b399 100644 --- a/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp +++ b/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp @@ -11,8 +11,8 @@ /* 80D20F58-80D20FBC 000078 0064+00 1/0 0/0 0/0 .text daObj_Usaku_Draw__FP15obj_usaku_class */ static int daObj_Usaku_Draw(obj_usaku_class* i_this) { - g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr); mDoExt_modelUpdateDL(i_this->mpModel); return 1; @@ -92,7 +92,7 @@ static int daObj_Usaku_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - a_this->mCullMtx = a_this->mpModel->getBaseTRMtx(); + a_this->cullMtx = a_this->mpModel->getBaseTRMtx(); fopAcM_SetMin(a_this, -300.0f, -600.0f, -300.0f); fopAcM_SetMax(a_this, 300.0f, 600.0f, 300.0f); daObj_Usaku_Execute(a_this); diff --git a/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp b/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp index 0f033674a2..8ef2029d31 100644 --- a/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp +++ b/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp @@ -15,7 +15,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { /* 80D213F8-80D21448 000098 0050+00 1/1 0/0 0/0 .text initBaseMtx__11daObjVGnd_cFv */ void daObjVGnd_c::initBaseMtx() { current.pos.y += 5.0f; - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -96,8 +96,8 @@ int daObjVGnd_c::execute() { /* 80D21878-80D2194C 000518 00D4+00 1/1 0/0 0/0 .text draw__11daObjVGnd_cFv */ int daObjVGnd_c::draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); mpBrk->entry(mpModel->getModelData()); mpBtk->entry(mpModel->getModelData()); dComIfGd_setListDarkBG(); diff --git a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp index 093cc3f7fe..e0f241027b 100644 --- a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp +++ b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp @@ -638,11 +638,11 @@ extern "C" asm void __dt__12dBgS_AcchCirFv() { /* 80D22424-80D22484 000984 0060+00 1/1 0/0 0/0 .text execute__15daObjVolcBall_cFv */ int daObjVolcBall_c::execute() { - f32 gravity = getData()->mGravity; - f32 fall_speed = getData()->mMaxFallSpeed; + f32 ball_gravity = getData()->mGravity; + f32 ball_fall_speed = getData()->mMaxFallSpeed; - mGravity = gravity; - mMaxFallSpeed = fall_speed; + gravity = ball_gravity; + maxFallSpeed = ball_fall_speed; action(); return 1; @@ -957,7 +957,7 @@ void daObjVolcBall_c::setEruptEffect(int i_ballNo) { vball_s* ball = &mBall[i_ballNo]; for (int i = 0; i < 6; i++) { - dComIfGp_particle_setColor(l_effect_id[i], &ball->field_0x4, &mTevStr, NULL, NULL, + dComIfGp_particle_setColor(l_effect_id[i], &ball->field_0x4, &tevStr, NULL, NULL, FLOAT_LABEL(lit_3717), 0xFF, NULL, &ball->field_0x1c, NULL, -1, NULL); } @@ -979,7 +979,7 @@ void daObjVolcBall_c::setFallEffect(int i_ballNo) { sp28 = ball->field_0x1c; } - dComIfGp_particle_setColor(l_fall_effect_id[i], &ball->field_0x4, &mTevStr, NULL, NULL, + dComIfGp_particle_setColor(l_fall_effect_id[i], &ball->field_0x4, &tevStr, NULL, NULL, FLOAT_LABEL(lit_3717), 0xFF, &ball->field_0x34, &sp28, &ball->field_0x390[i], -1, NULL); } @@ -1280,17 +1280,17 @@ COMPILER_STRIP_GATE(0x80D23E7C, &lit_4447); // matches with literals #ifdef NONMATCHING int daObjVolcBall_c::draw() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); - mTevStr.mLightPosWorld.x = mBall[8].field_0x4.x; - mTevStr.mLightPosWorld.y = mBall[8].field_0x4.y; - mTevStr.mLightPosWorld.z = mBall[8].field_0x4.z; - mTevStr.field_0x344 = mBall[8].field_0x50; + tevStr.mLightPosWorld.x = mBall[8].field_0x4.x; + tevStr.mLightPosWorld.y = mBall[8].field_0x4.y; + tevStr.mLightPosWorld.z = mBall[8].field_0x4.z; + tevStr.field_0x344 = mBall[8].field_0x50; vball_s* ball = mBall; for (int i = 0; i < 9; i++) { if (ball->field_0x376 != 0) { - g_env_light.setLightTevColorType_MAJI(ball->mpModel, &mTevStr); + g_env_light.setLightTevColorType_MAJI(ball->mpModel, &tevStr); mDoExt_modelUpdateDL(ball->mpModel); } @@ -1300,7 +1300,7 @@ int daObjVolcBall_c::draw() { if (mBall[8].field_0x376 != 0) { mBall[8].field_0x370 = dComIfGd_setShadow( mBall[8].field_0x370, 0, mBall[8].mpModel, &mBall[8].field_0x364, 2000.0f, 0.0f, - mBall[8].field_0x364.y, mBall[8].mAcch.GetGroundH(), mBall[8].mAcch.m_gnd, &mTevStr, 0, + mBall[8].field_0x364.y, mBall[8].mAcch.GetGroundH(), mBall[8].mAcch.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } diff --git a/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp b/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp index 599db51aff..e045256700 100644 --- a/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp +++ b/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp @@ -294,10 +294,10 @@ cPhs__Step daObjWchain_c::create() { if (!fopAcM_entrySolidHeap(this, daObjWchain_createHeap, 0x820)) { return cPhs_ERROR_e; } - mTevStr.mRoomNo = dStage_roomControl_c::mStayNo; - mAttentionInfo.mPosition = current.pos; - mEyePos = mAttentionInfo.mPosition; - mAttentionInfo.field_0x0[0] = 0x1c; + tevStr.mRoomNo = dStage_roomControl_c::mStayNo; + attention_info.position = current.pos; + eyePos = attention_info.position; + attention_info.field_0x0[0] = 0x1c; fopAcM_SetMtx(this, mpHandleModel->getBaseTRMtx()); fopAcM_SetMin(this, -200.0f, -45.0f, -200.0f); fopAcM_SetMax(this, 200.0f, 800.0f, 200.0f); @@ -305,7 +305,7 @@ cPhs__Step daObjWchain_c::create() { current.pos.y += 53.75f; mRoofPos.set(current.pos.x, current.pos.y + 280.0f - 100.0f, current.pos.z); mRealRoofY = mRoofPos.y + 250.0f; - mInitOutLength = mRoofPos.y - orig.pos.y; + mInitOutLength = mRoofPos.y - home.pos.y; if (!mRepeatable && i_fopAcM_isSwitch(this, mSw)) { current.pos.y -= 100.0f; mEnd = true; @@ -315,7 +315,7 @@ cPhs__Step daObjWchain_c::create() { mPullLength = 0.0f; } shape_angle.x = 0x4000; - mGravity = -7.0f; + gravity = -7.0f; cXyz* chain_pos = &mChainPos[0xf]; cXyz* chain_speed = &mChainSpeed[0xf]; csXyz* chain_angle = &mChainAngle[0xf]; @@ -434,7 +434,7 @@ void daObjWchain_c::setMatrix() { mDoMtx_stack_c::transM(0.0f, 0.0f, 8.75f); mpHandleModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); static Vec const eyeOffset = {0.0f, 0.0f, 53.75f}; - mDoMtx_stack_c::multVec(&eyeOffset, &mEyePos); + mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); } #else #pragma push @@ -680,7 +680,7 @@ void daObjWchain_c::setChainPos() { vec1 += local_90; prob *= 0.5f; } - vec1.y += mGravity; + vec1.y += gravity; vec1 += *chain_speed; chain_angle->z += getChainAngleZ(chain_speed, abs((s16)(chain_angle->z - chain_angle[-1].z))); vec1.normalizeZP(); @@ -694,7 +694,7 @@ void daObjWchain_c::setChainPos() { shape_angle.z += getChainAngleZ(&speed, abs((s16)(shape_angle.z - mChainAngle[0xf].z))); prev_pos = mTopPos; vec1 = mTopPos - current.pos; - vec1.y += mGravity; + vec1.y += gravity; vec1 += speed; vec1.normalizeZP(); mTopPos = current.pos + vec1 * 53.75f; @@ -751,11 +751,11 @@ int daObjWchain_c::execute() { mDown = false; } - if (fopAcM_rc_c::roofCheck(&orig.pos)) { + if (fopAcM_rc_c::roofCheck(&home.pos)) { mRealRoofY = fopAcM_rc_c::getRoofY(); if (mRoofPos.y > mRealRoofY) { mRoofPos.y = mRealRoofY; - mInitOutLength = mRoofPos.y - orig.pos.y; + mInitOutLength = mRoofPos.y - home.pos.y; } mRealRoofY += 250.0f; } @@ -763,12 +763,12 @@ int daObjWchain_c::execute() { setChainPos(); if (daPy_py_c::i_checkNowWolf() && !mRide && mPullLength < 0.1f) { - mAttentionInfo.mFlags |= 1; + attention_info.flags |= 1; } else { - mAttentionInfo.mFlags &= ~1; + attention_info.flags &= ~1; } - mAttentionInfo.mPosition = current.pos; - mAttentionInfo.mPosition.y += 150.0f; + attention_info.position = current.pos; + attention_info.position.y += 150.0f; setMatrix(); @@ -827,7 +827,7 @@ void daObjWchain_shape_c::draw() { s16* rotation = chain->getChainAngleZ(); J3DModelData* model_data = chain->getChainModelData(); J3DMaterial* material = model_data->getMaterialNodePointer(0); - dKy_tevstr_c& tevstr = chain->mTevStr; + dKy_tevstr_c& tevstr = chain->tevStr; j3dSys.setVtxPos(model_data->getVtxPosArray()); j3dSys.setVtxNrm(model_data->getVtxNrmArray()); j3dSys.setVtxCol(model_data->getVtxColorArray(0)); @@ -891,10 +891,10 @@ asm void daObjWchain_shape_c::draw() { #ifdef NONMATCHING // matches once daObjWchain_shape_c inheritance is resolved int daObjWchain_c::draw() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpHandleModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpHandleModel->mModelData, &tevStr); mDoExt_modelUpdateDL(mpHandleModel); - g_env_light.setLightTevColorType_MAJI(mpChainModelData, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpChainModelData, &tevStr); dComIfGd_getOpaList()->entryImm(&mShape, 0); return 1; } diff --git a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp index b30d3f8d2d..2b7a319b4d 100644 --- a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp +++ b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp @@ -81,8 +81,8 @@ daObj_Web0_HIO_c::daObj_Web0_HIO_c() { /* 80D34544-80D345C0 000104 007C+00 1/0 0/0 0/0 .text daObj_Web0_Draw__FP14obj_web0_class */ static int daObj_Web0_Draw(obj_web0_class* i_this) { - g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr); i_this->mpBrk->entry(i_this->mpModel->getModelData()); mDoExt_modelUpdateDL(i_this->mpModel); @@ -146,7 +146,7 @@ static void damage_check(obj_web0_class* i_this) { } if (daPy_getPlayerActorClass()->checkFrontRollCrash() && - fopAcM_searchPlayerDistanceXZ(i_this) < i_this->mScale.x * 260.0f) { + fopAcM_searchPlayerDistanceXZ(i_this) < i_this->scale.x * 260.0f) { i_this->mReboundTimer = 20; fopAcM_seStart(i_this, Z2SE_OBJ_WEB_BOUND_L, 0); } @@ -224,7 +224,7 @@ static int daObj_Web0_Execute(obj_web0_class* i_this) { if (i_this->mDeleteTimer != 0) { if (i_this->mDeleteTimer == 1) { - cXyz sp30(i_this->mScale); + cXyz sp30(i_this->scale); sp30.z = 1.0f; dComIfGp_particle_set(0x840C, &i_this->current.pos, &i_this->shape_angle, &sp30); @@ -248,7 +248,7 @@ static int daObj_Web0_Execute(obj_web0_class* i_this) { mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); mDoMtx_stack_c::YrotM(i_this->shape_angle.y); mDoMtx_stack_c::ZrotM(i_this->shape_angle.z); - mDoMtx_stack_c::scaleM(i_this->mScale.x, i_this->mScale.y, i_this->mScale.z); + mDoMtx_stack_c::scaleM(i_this->scale.x, i_this->scale.y, i_this->scale.z); i_this->mpBrk->play(); i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); @@ -257,7 +257,7 @@ static int daObj_Web0_Execute(obj_web0_class* i_this) { i_this->mReboundTimer--; } - i_this->mScale.z = i_this->mReboundTimer * cM_ssin(i_this->mReboundTimer * 0x1900) * 0.075f; + i_this->scale.z = i_this->mReboundTimer * cM_ssin(i_this->mReboundTimer * 0x1900) * 0.075f; s16 tmp = (fopAcM_searchPlayerAngleY(i_this) + 0x4000) - i_this->shape_angle.y; if (tmp < 0) { @@ -269,7 +269,7 @@ static int daObj_Web0_Execute(obj_web0_class* i_this) { cXyz sp3C(i_this->current.pos); if (i_this->field_0x57c & 1) { - sp3C.y -= i_this->mScale.x * 70.0f; + sp3C.y -= i_this->scale.x * 70.0f; } s16 svar9 = i_this->shape_angle.y; @@ -283,7 +283,7 @@ static int daObj_Web0_Execute(obj_web0_class* i_this) { } i_this->mSphCc.SetC(sp3C); - i_this->mSphCc.SetR(i_this->mScale.x * 150.0f); + i_this->mSphCc.SetR(i_this->scale.x * 150.0f); dComIfG_Ccsp()->Set(&i_this->mSphCc); return 1; @@ -413,7 +413,7 @@ static int daObj_Web0_Create(fopAc_ac_c* i_this) { fopAcM_SetMtx(_this, _this->mpModel->getBaseTRMtx()); fopAcM_SetMin(_this, -1000.0f, -1000.0f, -1000.0f); fopAcM_SetMax(_this, 1000.0f, 1000.0f, 1000.0f); - _this->mHealth = 30; + _this->health = 30; _this->field_0x560 = 30; _this->mStts.Init(250, 0, _this); @@ -422,11 +422,11 @@ static int daObj_Web0_Create(fopAc_ac_c* i_this) { _this->mSphCc.OnTgNoHitMark(); if (_this->mScaleXY != 0xFF && _this->mScaleXY != 0) { - _this->mScale.x = _this->mScaleXY; - _this->mScale.y = _this->mScaleXY; + _this->scale.x = _this->mScaleXY; + _this->scale.y = _this->mScaleXY; } - _this->mEyePos = _this->current.pos; + _this->eyePos = _this->current.pos; daObj_Web0_Execute(_this); } diff --git a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp index 71260f3373..084b1a50f7 100644 --- a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp +++ b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp @@ -20,8 +20,8 @@ daObj_Web1_HIO_c::daObj_Web1_HIO_c() { /* 80D353C4-80D35440 000104 007C+00 1/0 0/0 0/0 .text daObj_Web1_Draw__FP14obj_web1_class */ static int daObj_Web1_Draw(obj_web1_class* i_this) { - g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->mTevStr); - g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->mTevStr); + g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr); i_this->mpBrk->entry(i_this->mpModel->getModelData()); mDoExt_modelUpdateDL(i_this->mpModel); @@ -92,10 +92,10 @@ static void action(obj_web1_class* i_this) { break; } - i_this->mScale.y = i_this->field_0x5b0 + + i_this->scale.y = i_this->field_0x5b0 + i_this->mReboundTimer * cM_ssin(i_this->mReboundTimer * 0xF00) * 0.02f; - if (i_this->mScale.y < 0.1f) { - i_this->mScale.y = 0.1f; + if (i_this->scale.y < 0.1f) { + i_this->scale.y = 0.1f; } f32 target = 0.0f; @@ -144,9 +144,9 @@ static int daObj_Web1_Execute(obj_web1_class* i_this) { if (i_this->mDeleteTimer != 0) { if (i_this->mDeleteTimer == 1) { cXyz scale; - scale.x = i_this->mScale.x; - scale.y = i_this->mScale.x; - scale.z = i_this->mScale.x; + scale.x = i_this->scale.x; + scale.y = i_this->scale.x; + scale.z = i_this->scale.x; dComIfGp_particle_set(0x840E, &i_this->current.pos, &i_this->shape_angle, &scale); i_this->mpBrk->setPlaySpeed(1.0f); @@ -166,20 +166,20 @@ static int daObj_Web1_Execute(obj_web1_class* i_this) { mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); mDoMtx_stack_c::YrotM(i_this->shape_angle.y); - mDoMtx_stack_c::scaleM(i_this->mScale.x, i_this->mScale.y * i_this->mScale.x + 0.05f, - i_this->mScale.x); + mDoMtx_stack_c::scaleM(i_this->scale.x, i_this->scale.y * i_this->scale.x + 0.05f, + i_this->scale.x); i_this->mpBrk->play(); i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); - mDoMtx_stack_c::scaleM(i_this->mScale.x * 1.2f, i_this->mScale.x, i_this->mScale.x * 1.2f); - mDoMtx_stack_c::transM(0.0f, i_this->mScale.x * i_this->mScale.y * -15.0f + 9.0f, 0.0f); + mDoMtx_stack_c::scaleM(i_this->scale.x * 1.2f, i_this->scale.x, i_this->scale.x * 1.2f); + mDoMtx_stack_c::transM(0.0f, i_this->scale.x * i_this->scale.y * -15.0f + 9.0f, 0.0f); MTXCopy(mDoMtx_stack_c::get(), i_this->mMtx); i_this->mpBgW->Move(); i_this->mCylCc.SetC(i_this->current.pos); - i_this->mCylCc.SetR(i_this->mScale.x * 150.0f); + i_this->mCylCc.SetR(i_this->scale.x * 150.0f); dComIfG_Ccsp()->Set(&i_this->mCylCc); return 1; @@ -203,7 +203,7 @@ static int daObj_Web1_Delete(obj_web1_class* i_this) { dComIfG_Bgsp().Release(i_this->mpBgW); - if (i_this->mHeap != NULL) { + if (i_this->heap != NULL) { i_this->mZ2SoundObj.deleteObject(); } return 1; @@ -305,7 +305,7 @@ static int daObj_Web1_Create(fopAc_ac_c* i_this) { fopAcM_SetMax(_this, 1000.0f, 1000.0f, 1000.0f); if (_this->mScaleX != 0xFF && _this->mScaleX != 0) { - _this->mScale.x = _this->mScaleX; + _this->scale.x = _this->mScaleX; } _this->current.pos.y -= 13.0f; @@ -315,7 +315,7 @@ static int daObj_Web1_Create(fopAc_ac_c* i_this) { _this->mCylCc.SetStts(&_this->mStts); _this->mCylCc.OnTgNoHitMark(); - _this->mEyePos = _this->current.pos; + _this->eyePos = _this->current.pos; daObj_Web1_Execute(_this); } diff --git a/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp b/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp index 6730bfd1d2..03faa898d3 100644 --- a/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp +++ b/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp @@ -76,7 +76,7 @@ int daWindStone_c::create() { dBgS_AcchCir acchCir; dBgS_ObjAcch objAcch; acchCir.SetWall(0.0f, 10.0f); - objAcch.Set(¤t.pos, &next.pos, this, 1, &acchCir, &fopAcM_GetSpeed_p(this), NULL, + objAcch.Set(¤t.pos, &old.pos, this, 1, &acchCir, fopAcM_GetSpeed_p(this), NULL, NULL); objAcch.CrrPos(dComIfG_Bgsp()); field_0x5bc = objAcch.GetGroundH(); @@ -107,14 +107,14 @@ int daWindStone_c::execute() { /* 80D37F6C-80D3806C 0005EC 0100+00 1/1 0/0 0/0 .text draw__13daWindStone_cFv */ int daWindStone_c::draw() { - g_env_light.settingTevStruct(8, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(8, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); cXyz shadowPos(current.pos.x, current.pos.y, current.pos.z); field_0x5c0 = dComIfGd_setShadow(field_0x5c0, 1, mpModel, &shadowPos, 500.0f, 0.0f, - current.pos.y, field_0x5bc, mPolyInfo, &mTevStr, 0, 1.0f, + current.pos.y, field_0x5bc, mPolyInfo, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); return 1; } @@ -177,7 +177,7 @@ bool daWindStone_c::chkEveOccur() { /* 80D382C4-80D3835C 000944 0098+00 1/1 0/0 0/0 .text exeModeHowl__13daWindStone_cFv */ void daWindStone_c::exeModeHowl() { if (!chkEveOccur()) { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; field_0x5c4 = 2; } else { s8 tuneId = getTuneId(); @@ -186,10 +186,10 @@ void daWindStone_c::exeModeHowl() { // ¤t.pos); daAlink_getAlinkActorClass()->i_getWolfHowlMgrP()->startWindStoneSound(tuneId, ¤t.pos); - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; if (chkWlfInRange()) { - mAttentionInfo.mFlags |= 0x80; - mAttentionInfo.field_0x0[7] = 65; + attention_info.flags |= 0x80; + attention_info.field_0x0[7] = 65; } } } @@ -288,14 +288,14 @@ extern actor_process_profile_definition g_profile_Obj_WindStone = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Obj_WindStone, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daWindStone_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 732, // mPriority - &daWindStone_METHODS, // mSubMtd + &daWindStone_METHODS, // sub_method 0x40100, // mStatus fopAc_ENV_e, // mActorType - fopAc_CULLBOX_0_e, // mCullType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp b/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp index d169474938..8e51acb28c 100644 --- a/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp +++ b/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp @@ -32,7 +32,7 @@ static dCcD_SrcCyl l_cyl_src = { /* 80D38758-80D387B8 000078 0060+00 1/1 0/0 0/0 .text initBaseMtx__13daObjWindow_cFv */ void daObjWindow_c::initBaseMtx() { mpModel->calc(); - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -58,7 +58,7 @@ int daObjWindow_c::Create() { mCyl.Set(l_cyl_src); mCyl.SetStts(&mStts); } - mTevStr.field_0x364 = getLightInf(); + tevStr.field_0x364 = getLightInf(); return 1; } @@ -138,8 +138,8 @@ int daObjWindow_c::Execute(Mtx** i_mtx) { /* 80D38F28-80D39000 000848 00D8+00 1/0 0/0 0/0 .text Draw__13daObjWindow_cFv */ int daObjWindow_c::Draw() { - g_env_light.settingTevStruct(0x14, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x14, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); dComIfGd_setListBG(); if (mpBckAnm != NULL) { mpBckAnm->entry(mpModel->getModelData()); diff --git a/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp b/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp index e426edea42..abfac342a7 100644 --- a/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp +++ b/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp @@ -34,7 +34,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { /* 80D3B998-80D3B9D4 000098 003C+00 1/1 0/0 0/0 .text initBaseMtx__13daObjWSword_cFv */ void daObjWSword_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } @@ -87,8 +87,8 @@ int daObjWSword_c::execute() { /* 80D3BDF0-80D3BE54 0004F0 0064+00 1/1 0/0 0/0 .text draw__13daObjWSword_cFv */ int daObjWSword_c::draw() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); return 1; } diff --git a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp index 5d78bd57d8..b878e001a7 100644 --- a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp +++ b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp @@ -54,16 +54,16 @@ static int getNowLevel() { /* 80D3E090-80D3E180 0000F0 00F0+00 1/0 0/0 0/0 .text daObj_Ystone_Draw__FP16obj_ystone_class */ static int daObj_Ystone_Draw(obj_ystone_class* i_this) { - g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); if (i_this->mLevel < 3) { if (!i_this->field_0x59b) { - g_env_light.setLightTevColorType_MAJI(i_this->mpModel->mModelData, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpModel->mModelData, &i_this->tevStr); i_this->mpBrkAnm->entry(i_this->mpModel->getModelData()); mDoExt_modelUpdateDL(i_this->mpModel); } } else { J3DModel* model = i_this->mpMorf->getModel(); - g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->mTevStr); + g_env_light.setLightTevColorType_MAJI(model->mModelData, &i_this->tevStr); if (i_this->field_0x59a) { i_this->mpBtkAnm->entry(model->getModelData()); } @@ -109,7 +109,7 @@ static void action(obj_ystone_class* i_this) { setModelBaseMtx(i_this); i_this->mParticleKey = dComIfGp_particle_set(i_this->mParticleKey, 0x8403, &i_this->current.pos, - &i_this->mTevStr, &i_this->shape_angle, NULL, 0xff, + &i_this->tevStr, &i_this->shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL); i_this->mpBrkAnm->play(); } else { @@ -121,12 +121,12 @@ static void action(obj_ystone_class* i_this) { J3DAnmTextureSRTKey* btk_anm; switch (i_this->mMirrorMode) { case 0: - g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->mTevStr); + g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr); static u16 mirror_effect_id[10] = { 0x89A0, 0x89A1, 0x89A2, 0x89A5, 0x89A6, 0x89A7, 0x89A8, 0x89A9, 0x89AA, 0x89AB }; for (int i = 0; i < 10; i++) { - dComIfGp_particle_set(mirror_effect_id[i], &i_this->current.pos, &i_this->mTevStr, + dComIfGp_particle_set(mirror_effect_id[i], &i_this->current.pos, &i_this->tevStr, &i_this->shape_angle, NULL); } i_this->mMirrorMode = 1; @@ -147,7 +147,7 @@ static void action(obj_ystone_class* i_this) { case 2: i_this->mParticleKey = dComIfGp_particle_set(i_this->mParticleKey, 0x89a3, &i_this->current.pos, - &i_this->mTevStr, &i_this->shape_angle, NULL, 0xff, + &i_this->tevStr, &i_this->shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL); i_this->shape_angle.y += 0x100; break; @@ -169,7 +169,7 @@ static void action(obj_ystone_class* i_this) { cXyz particle_pos; mDoMtx_stack_c::multVecZero(&particle_pos); i_this->mParticleKey = - dComIfGp_particle_set(i_this->mParticleKey, 0x89a4, &particle_pos, &i_this->mTevStr, + dComIfGp_particle_set(i_this->mParticleKey, 0x89a4, &particle_pos, &i_this->tevStr, &i_this->shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL); break; } @@ -200,8 +200,8 @@ static int daObj_Ystone_Execute(obj_ystone_class* i_this) { return 1; } else { action(i_this); - i_this->mEyePos = i_this->current.pos; - i_this->mAttentionInfo.mPosition = i_this->current.pos; + i_this->eyePos = i_this->current.pos; + i_this->attention_info.position = i_this->current.pos; return 1; } } diff --git a/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp b/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp index a39e8bceb0..004ed6446b 100644 --- a/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp +++ b/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp @@ -13,7 +13,7 @@ /* 80D3EE18-80D3EE54 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__13daObjZCloth_cFv */ void daObjZCloth_c::initBaseMtx() { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } diff --git a/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp b/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp index c087b31b42..89448201d1 100644 --- a/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp +++ b/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp @@ -360,12 +360,12 @@ cPhs__Step daZrTurara_c::create() { J3DJoint* rock_joint = mpRockModel->getModelData()->getJointNodePointer(0); fopAcM_setCullSizeBox( this, - mScale.x * rock_joint->getMin()->x, - mScale.y * rock_joint->getMin()->y, - mScale.z * rock_joint->getMin()->z, - mScale.x * base_joint->getMax()->x, - mScale.y * base_joint->getMax()->y, - mScale.z * base_joint->getMax()->z + scale.x * rock_joint->getMin()->x, + scale.y * rock_joint->getMin()->y, + scale.z * rock_joint->getMin()->z, + scale.x * base_joint->getMax()->x, + scale.y * base_joint->getMax()->y, + scale.z * base_joint->getMax()->z ); u8 scale = getScale(); if (scale == 0xff) { @@ -598,9 +598,9 @@ void daZrTurara_c::modeEnd() { /* 80D412B0-80D41380 000E30 00D0+00 1/0 0/0 0/0 .text Draw__12daZrTurara_cFv */ int daZrTurara_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpBaseModel->mModelData, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpRockModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpBaseModel->mModelData, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpRockModel->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpBaseModel); if (mDrawRock) { diff --git a/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp b/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp index d9e4976d60..8c764d87cf 100644 --- a/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp +++ b/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp @@ -85,7 +85,7 @@ cPhs__Step daZrTuraRc_c::create() { return cPhs_ERROR_e; } mAcchCir.SetWall(130.0f, 65.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL); mAcch.SetWaterCheckOffset(10000.0f); mCcStatus.Init(0xff, 0xff, this); mCcSph.Set(mCcDSph); @@ -173,8 +173,8 @@ void daZrTuraRc_c::modeDropEnd() { /* 80D42160-80D421C4 0009C0 0064+00 1/1 0/0 0/0 .text Draw__12daZrTuraRc_cFv */ int daZrTuraRc_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); mDoExt_modelUpdateDL(mpModel); return 1; } diff --git a/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp b/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp index fc02802eaf..cd28460030 100644 --- a/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp +++ b/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp @@ -155,7 +155,7 @@ int daZraFreeze_c::CreateHeap() { "zrA_pain_TW.bmd", "zrA_sol_TW.bmd", }; - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdName[mSubtype]); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdName[subtype]); mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; @@ -256,7 +256,7 @@ int daZraFreeze_c::Execute() { } } else { if (i_dComIfGp_event_runCheck()) { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { daPy_getPlayerActorClass()->onWolfEyeKeep(); } else if (field_0x5cf == 1) { dComIfGs_sense_type_change_Set(-1); @@ -276,8 +276,8 @@ int daZraFreeze_c::Execute() { int daZraFreeze_c::Draw() { if (field_0x5b0 == 0xff || dComIfGs_isSwitch(field_0x5b0, fopAcM_GetRoomNo(this))) { if (mTwilight != 0 && dComIfGs_wolfeye_effect_check() == true) { - g_env_light.settingTevStruct(4, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(4, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); mDoExt_modelUpdateDL(mpModel); } } diff --git a/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp b/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp index c687daf683..d752a3f486 100644 --- a/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp +++ b/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp @@ -17,8 +17,8 @@ static char const* l_arcName = "H_ZraRock"; void daObjZraRock_c::setAttnPos() { cXyz vec(10.0f, 152.3f, 0.0f); mDoMtx_stack_c::ZXYrotS(current.angle.x, current.angle.y, current.angle.z); - mDoMtx_stack_c::multVec(&vec, &mAttentionInfo.mPosition); - mAttentionInfo.mPosition += current.pos; + mDoMtx_stack_c::multVec(&vec, &attention_info.position); + attention_info.position += current.pos; } /* 80D44D3C-80D44DCC 0000FC 0090+00 2/2 0/0 0/0 .text setBaseMtx__14daObjZraRock_cFv */ @@ -33,8 +33,8 @@ void daObjZraRock_c::setBaseMtx() { /* 80D44DCC-80D44E28 00018C 005C+00 1/1 0/0 0/0 .text setEnvTevColor__14daObjZraRock_cFv */ void daObjZraRock_c::setEnvTevColor() { - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); - mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); + tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mGndChk); } /* 80D44E28-80D44E68 0001E8 0040+00 1/1 0/0 0/0 .text setRoomNo__14daObjZraRock_cFv */ @@ -50,7 +50,7 @@ int daObjZraRock_c::Create() { fopAcM_setCullSizeBox(this, joint->getMin()->x, joint->getMin()->y, joint->getMin()->z, joint->getMax()->x, joint->getMax()->y, joint->getMax()->z); mAcchCir.SetWall(0.0f, 0.0f); - mObjAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, ¤t.angle, &shape_angle); + mObjAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, ¤t.angle, &shape_angle); mObjAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mObjAcch.m_gnd; setEnvTevColor(); @@ -107,16 +107,16 @@ int daObjZraRock_c::Execute(Mtx** i_mtx) { /* 80D45374-80D454AC 000734 0138+00 1/0 0/0 0/0 .text Draw__14daObjZraRock_cFv */ int daObjZraRock_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); if (mDemoStart) { - g_env_light.setLightTevColorType_MAJI(mpModelXlu->mModelData, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModelXlu->mModelData, &tevStr); dComIfGd_setListBG(); mBrkAnm.entry(mpModelXlu->getModelData()); mDoExt_modelUpdateDL(mpModelXlu); mBrkAnm.remove(mpModelXlu->getModelData()); dComIfGd_setList(); } else { - g_env_light.setLightTevColorType_MAJI(mpModelOpa->mModelData, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModelOpa->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModelOpa); dComIfGd_setList(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp index 645b49d1d8..9c7c21ed40 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp @@ -79,7 +79,7 @@ void daObjMirror6Pole_c::initBaseMtx() { void daObjMirror6Pole_c::create_init() { initBaseMtx(); - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; setAction(MODE_WAIT_e); } @@ -163,8 +163,8 @@ static int daObjMirror6Pole_Execute(daObjMirror6Pole_c* i_this) { } int daObjMirror6Pole_c::draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mpBck->entry(mpModel->getModelData()); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp index 6f902c054b..477f73e2f6 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp @@ -360,10 +360,10 @@ int daObjMirrorChain_c::draw() { static f32 const SCISSOR_CENTER_Y = 4779.58f; static f32 const SCISSOR_CENTER_Z = -23024.53f; static f32 const SCISSOR_SIZE = 984.0f; - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { - g_env_light.setLightTevColorType_MAJI(mpPortalModel->mModelData, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpPortalModel->mModelData, &tevStr); if (mpBckAnm != NULL) { mpBckAnm->entry(mpPortalModel->getModelData()); } diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp index 9ea9ca1e53..db9de12ca1 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp @@ -74,8 +74,8 @@ void daObjMirrorSand_c::setBaseMtx() { } int daObjMirrorSand_c::draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mpBck->entry(mpModel->getModelData()); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp index a728c37ae1..9a4852b8c2 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp @@ -126,8 +126,8 @@ void daObjMirrorScrew_c::executeDown() { Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_MR_SCRW_MV, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - if (current.pos.y <= orig.pos.y + M_attr.mDownDist) { - current.pos.y = orig.pos.y + M_attr.mDownDist; + if (current.pos.y <= home.pos.y + M_attr.mDownDist) { + current.pos.y = home.pos.y + M_attr.mDownDist; // fake match: these should be dComIfGp_getVibration() gameinfo->play.getVibration().StartShock(8, 0xf, cXyz(0.0f, 1.0f, 0.0f)); gameinfo->play.getVibration().StopQuake(0x1f); @@ -255,8 +255,8 @@ int daObjMirrorScrew_c::Execute(Mtx** i_mtxP) { /* 80C99608-80C996AC 000BA8 00A4+00 1/0 0/0 0/0 .text Draw__18daObjMirrorScrew_cFv */ int daObjMirrorScrew_c::Draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp index 060a75f172..9a66c4b1ef 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp @@ -340,11 +340,11 @@ static int daObjMirrorTable_Draw(daObjMirrorTable_c* i_this) { /* 80C9A298-80C9A4B0 0009F8 0218+00 1/1 0/0 0/0 .text draw__18daObjMirrorTable_cFv */ int daObjMirrorTable_c::draw() { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpTableModel->mModelData, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpMirrorModel->mModelData, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpTableModel->mModelData, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpMirrorModel->mModelData, &tevStr); if (mpStairModel != NULL) { - g_env_light.setLightTevColorType_MAJI(mpStairModel->mModelData, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpStairModel->mModelData, &tevStr); } mpTableUpBckAnm->entry(mpTableModel->getModelData()); dComIfGd_setListBG(); diff --git a/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp b/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp index 073d8a168d..d86cb714a2 100644 --- a/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp @@ -44,7 +44,7 @@ bool daTagCstaSw_c::areaCheck() { } cXyz vec_to_actor = current.pos - sekizo_p->current.pos; - if (vec_to_actor.absXZ() <= mScale.x * 100.0f) { + if (vec_to_actor.absXZ() <= scale.x * 100.0f) { in_area = true; } @@ -117,14 +117,14 @@ extern actor_process_profile_definition g_profile_Tag_CstaSw = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_CstaSw, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagCstaSw_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 657, // mPriority - &l_daTagCstaSw_Method, // mSubMtd + &l_daTagCstaSw_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp b/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp index c51fd91d20..e969419ec6 100644 --- a/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp @@ -21,6 +21,10 @@ extern "C" extern char const* const d_a_tag_Lv6Gate__stringBase0; // External References: // +extern "C" void fopAcM_SearchByID__FUiPP10fopAc_ac_c(); +extern "C" void fopAcM_SearchByName__FsPP10fopAc_ac_c(); +extern "C" void fopAcM_delete__FUi(); +extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void push__14mDoMtx_stack_cFv(); extern "C" void pop__14mDoMtx_stack_cFv(); @@ -177,9 +181,9 @@ void daTagLv6Gate_c::initBaseMtx() { void daTagLv6Gate_c::create_init() { fopAcM_setCullSizeBox(this, -50.0f, 0.0f, -50.0f, 50.0f, 100.0f, 50.0f); - mAttentionInfo.mPosition = current.pos; - mAttentionInfo.mFlags = (i_fopAcM_isSwitch(this, getSwitchNo1()) != 0) ? 0 : 0x80; - mAttentionInfo.field_0x0[7] = 89; + attention_info.position = current.pos; + attention_info.flags = (i_fopAcM_isSwitch(this, getSwitchNo1()) != 0) ? 0 : 0x80; + attention_info.field_0x0[7] = 89; mEvtId = -1; field_0x76a = 0; @@ -189,7 +193,7 @@ void daTagLv6Gate_c::create_init() { initBaseMtx(); if (!i_fopAcM_isSwitch(this, getSwitchNo1())) { - mParentPcId = fopAcM_create(PROC_NPC_TKS, 2, &cXyz(-13.272481f, 2887.0f, -10373.718f), + parentActorID = fopAcM_create(PROC_NPC_TKS, 2, &cXyz(-13.272481f, 2887.0f, -10373.718f), fopAcM_GetRoomNo(this), &csXyz(0, 0x7FFF, 0), NULL, -1); } } @@ -232,7 +236,7 @@ bool daTagLv6Gate_c::checkOpenArea() { actor = (i == 0) ? daPy_getPlayerActorClass() : i_fopAcM_SearchByName(PROC_NPC_TKS); if (actor != NULL) { mDoMtx_stack_c::push(); - mDoMtx_stack_c::multVec(&fopAcM_GetPosition_p(actor), &pos); + mDoMtx_stack_c::multVec(fopAcM_GetPosition_p(actor), &pos); mDoMtx_stack_c::pop(); if (pos.x >= l_minRelative[0] && pos.x <= l_maxRelative[0] && pos.z >= l_minRelative[2] && pos.z <= l_maxRelative[2]) @@ -268,14 +272,14 @@ void daTagLv6Gate_c::cut4() { fopAc_ac_c* actor1; actor1 = NULL; - fopAcM_SearchByID(mParentPcId, &actor1); + fopAcM_SearchByID(parentActorID, &actor1); if (actor1 == NULL) { return; } - fopAcM_GetOldPosition_p(actor1) = pos; - fopAcM_GetPosition_p(actor1) = pos; + *fopAcM_GetOldPosition_p(actor1) = pos; + *fopAcM_GetPosition_p(actor1) = pos; actor2 = NULL; fopAcM_SearchByName(PROC_NPC_TKC, &actor2); @@ -285,14 +289,14 @@ void daTagLv6Gate_c::cut4() { } fopAcM_GetOldPosition_p(actor2) = pos; - fopAcM_GetPosition_p(actor2) = pos; + *fopAcM_GetPosition_p(actor2) = pos; } /* 80D4FEDC-80D5068C 0006BC 07B0+00 1/1 0/0 0/0 .text execute__14daTagLv6Gate_cFv */ int daTagLv6Gate_c::execute() { // Fake match? dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); - if (i_dComIfGp_event_runCheck() && !mEvtInfo.checkCommandTalk()) { + if (i_dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { s32 cut_index = i_dComIfGp_evmng_getMyStaffId(l_arcName, NULL, 0); if (cut_index != -1) { // int* cut_name = (int*)i_dComIfGp_getEventManager().getMyNowCutName(cut_index); @@ -321,7 +325,7 @@ int daTagLv6Gate_c::execute() { if (!mBgW[0].ChkUsed()) { dComIfG_Bgsp().Regist(&mBgW[0], this); } - fopAcM_delete(mParentPcId); + fopAcM_delete(parentActorID); } } @@ -335,19 +339,19 @@ int daTagLv6Gate_c::execute() { dComIfGp_evmng_cutEnd(cut_index); } - if (mEvtInfo.checkCommandDemoAccrpt() && mEvtId != -1 && + if (eventInfo.checkCommandDemoAccrpt() && mEvtId != -1 && dComIfGp_evmng_endCheck(mEvtId)) { i_dComIfGp_event_reset(); mEvtId = -1; } } } else if (field_0x76a && !i_fopAcM_isSwitch(this, getSwitchNo1())) { - mEvtInfo.setArchiveName(l_arcName); - i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName()); + eventInfo.setArchiveName(l_arcName); + i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEvtId = i_dComIfGp_getEventManager().getEventIdx(this, "LV6_GATE_APPEAR", -1); fopAcM_orderOtherEventId(this, mEvtId, -1, -1, 0, 1); i_fopAcM_onSwitch(this, getSwitchNo1()); - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } if (i_fopAcM_isSwitch(this, getSwitchNo2())) { @@ -469,12 +473,12 @@ static int daTagLv6Gate_Draw(daTagLv6Gate_c* i_this) { /* 80D506AC-80D50848 000E8C 019C+00 1/1 0/0 0/0 .text draw__14daTagLv6Gate_cFv */ int daTagLv6Gate_c::draw() { - g_env_light.settingTevStruct(16, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); dComIfGd_setListBG(); if (i_fopAcM_isSwitch(this, getSwitchNo2())) { - g_env_light.setLightTevColorType_MAJI(mpModel[0], &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[0], &tevStr); mpBtk[0]->entry(mpModel[0]->getModelData()); mpBtk[1]->entry(mpModel[0]->getModelData()); mDoExt_modelUpdateDL(mpModel[0]); @@ -488,7 +492,7 @@ int daTagLv6Gate_c::draw() { model_data->getMaterialNodePointer(i)->getTevKColor(3)->a = field_0x760[i]; } - g_env_light.setLightTevColorType_MAJI(mpModel[1], &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpModel[1], &tevStr); mDoExt_modelUpdateDL(mpModel[1]); dComIfGd_setList(); @@ -530,14 +534,14 @@ extern actor_process_profile_definition g_profile_Tag_Lv6Gate = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Lv6Gate, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagLv6Gate_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 262, // mPriority - &l_daTagLv6Gate_Method, // mSubMtd + &l_daTagLv6Gate_Method, // sub_method 0x40000, // mStatus 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp b/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp index dd07fcc92a..1407916cb0 100644 --- a/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp @@ -53,7 +53,7 @@ int daTagLv7Gate_c::create() { fopAcM_SetupActor(this, daTagLv7Gate_c); - if (fopAcM_GetPosition_p(daPy_getPlayerActorClass()).y < 7500.0f) { + if (fopAcM_GetPosition_p(daPy_getPlayerActorClass())->y < 7500.0f) { return cPhs_ERROR_e; } else { phase = dComIfG_resLoad(&mPhase, l_arcName); @@ -110,13 +110,13 @@ void daTagLv7Gate_c::setBaseMtx() { mDoMtx_stack_c::multVec(&local_34, (Vec*)&mPos1); MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx); - mAttentionInfo.mPosition = mPos1; + attention_info.position = mPos1; } } /* 80D50D30-80D511A8 0002F0 0478+00 1/1 0/0 0/0 .text create_init__14daTagLv7Gate_cFv */ void daTagLv7Gate_c::create_init() { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; mLastFrame = 0; field_0x5ac = 0; mEvtId = -1; @@ -126,7 +126,7 @@ void daTagLv7Gate_c::create_init() { setPath(getPathID() & 0xFF); - mAttentionInfo.mPosition = mPos1; + attention_info.position = mPos1; if (mpModel) { initBaseMtx(); @@ -165,8 +165,8 @@ void daTagLv7Gate_c::create_init() { fopAcM_create(PROC_NPC_TKJ, 0, &pos, fopAcM_GetRoomNo(this), &local_54, NULL, -1); } } - mEvtInfo.setArchiveName(l_arcName); - i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName()); + eventInfo.setArchiveName(l_arcName); + i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEvtId = i_dComIfGp_getEventManager().getEventIdx(this, mEvName, -1); fopAcM_orderOtherEventId(this, mEvtId, -1, -1, 2, 1); } @@ -227,7 +227,7 @@ void daTagLv7Gate_c::flyAnime() { int daTagLv7Gate_c::execute() { // Fakematch dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); - if (i_dComIfGp_event_runCheck() != 0 && !mEvtInfo.checkCommandTalk()) { + if (i_dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { s32 cut_index = i_dComIfGp_evmng_getMyStaffId(l_arcName, NULL, 0); if (cut_index != -1) { int* cut_name = (int*)play.getEvtManager().getMyNowCutName(cut_index); // Fakematch @@ -261,7 +261,7 @@ int daTagLv7Gate_c::execute() { break; } - if (mEvtInfo.checkCommandDemoAccrpt() && mEvtId != -1 && + if (eventInfo.checkCommandDemoAccrpt() && mEvtId != -1 && dComIfGp_evmng_endCheck(mEvtId)) { // i_dComIfGp_event_reset(); play.getEvent().reset(); // Fakematch @@ -273,8 +273,8 @@ int daTagLv7Gate_c::execute() { } } else { if (!field_0x5b0) { - mEvtInfo.setArchiveName(l_arcName); - i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName()); + eventInfo.setArchiveName(l_arcName); + i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEvtId = i_dComIfGp_getEventManager().getEventIdx(this, mEvName, -1); fopAcM_orderOtherEventId(this, mEvtId, -1, -1, 0, 1); field_0x5b0 = true; @@ -341,8 +341,8 @@ void daTagLv7Gate_c::calcFly() { int daTagLv7Gate_c::draw() { if (field_0x5b1) { - g_env_light.settingTevStruct(0, &mPos1, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0, &mPos1, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mpBck->entry(mpModel->getModelData()); mDoExt_modelUpdateDL(mpModel); mpBck->remove(mpModel->getModelData()); @@ -385,14 +385,14 @@ extern actor_process_profile_definition g_profile_Tag_Lv7Gate = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Lv7Gate, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagLv7Gate_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 263, // mPriority - &l_daTagLv7Gate_Method, // mSubMtd + &l_daTagLv7Gate_Method, // sub_method 0x40000, // mStatus 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp b/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp index e7a599e90b..2a0982a66f 100644 --- a/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp @@ -39,8 +39,8 @@ inline void daTagLv8Gate_c::create_init() { fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f); fopAcM_OnCarryType(this, fopAcM_CARRY_LIGHT); - mAttentionInfo.mFlags = 0x10; - mAttentionInfo.field_0x0[4] = 90; + attention_info.flags = 0x10; + attention_info.field_0x0[4] = 90; mEventID = -1; @@ -76,8 +76,8 @@ inline int daTagLv8Gate_c::draw() { material->getTevKColor(1)->b = 100; } - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); if (mpBck != NULL) { mpBck->entry(mpModel->getModelData()); @@ -128,7 +128,7 @@ static int daTagLv8Gate_Execute(daTagLv8Gate_c* i_this) { int daTagLv8Gate_c::execute() { dComIfG_inf_c& game_info = g_dComIfG_gameInfo; // Fake match? - if (game_info.getPlay().getEvent().runCheck() && !mEvtInfo.checkCommandTalk()) { + if (game_info.getPlay().getEvent().runCheck() && !eventInfo.checkCommandTalk()) { s32 cut_index = i_dComIfGp_getEventManager().getMyStaffId(l_arcName, NULL, 0); if (cut_index != -1) { @@ -148,14 +148,14 @@ int daTagLv8Gate_c::execute() { break; case '0002': - dStage_changeScene(getSceneNo(), 0.0f, 0, getRoomNo(), 0, -1); + dStage_changeScene(getSceneNo(), 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); break; } } if (i_dComIfGp_getEvent().i_checkSkipEdge()) { i_dComIfGp_event_reset(); - dStage_changeScene(getSceneNo(), 0.0f, 0, getRoomNo(), 0, -1); + dStage_changeScene(getSceneNo(), 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); } switch (*cut_name) { @@ -165,7 +165,7 @@ int daTagLv8Gate_c::execute() { break; } - if (mEvtInfo.i_checkCommandDemoAccrpt() && mEventID != -1) { + if (eventInfo.i_checkCommandDemoAccrpt() && mEventID != -1) { if (dComIfGp_evmng_endCheck(mEventID)) { mEventID = -1; } @@ -186,9 +186,9 @@ int daTagLv8Gate_c::execute() { if (fopAcM_checkCarryNow(this)) { fopAcM_cancelCarryNow(this); - mAttentionInfo.mFlags &= ~0x10; - mEvtInfo.setArchiveName(l_arcName); - i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName()); + attention_info.flags &= ~0x10; + eventInfo.setArchiveName(l_arcName); + i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, "LV8_GATE_ENTRY", -1); fopAcM_orderOtherEventId(this, mEventID, -1, -1, 0, 1); } @@ -237,14 +237,14 @@ extern actor_process_profile_definition g_profile_Tag_Lv8Gate = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Lv8Gate, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagLv8Gate_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 0x108, // mPriority - &l_daTagLv8Gate_Method, // mSubMtd + &l_daTagLv8Gate_Method, // sub_method 0x40000, // mStatus 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp index 2e55031799..3267739c67 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp +++ b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp @@ -459,7 +459,7 @@ SECTION_DATA actionFunc daTagTWGate_c::ActionTable[13][2] = { /* 80D52604-80D528F0 000084 02EC+00 1/0 0/0 0/0 .text executeWait__13daTagTWGate_cFv */ void daTagTWGate_c::executeWait() { - f32 radius = pow(mScale.x * 100.0f, 2.0f); + f32 radius = pow(scale.x * 100.0f, 2.0f); f32 distance = fopAcM_searchActorDistanceXZ2(this, (fopAc_ac_c*)dComIfGp_getPlayer(0)); if (distance < radius) { @@ -521,7 +521,7 @@ void daTagTWGate_c::executeWait() { /* 80D528F0-80D5297C 000370 008C+00 1/0 0/0 0/0 .text initDemoFilone1__13daTagTWGate_cFv */ void daTagTWGate_c::initDemoFilone1() { - mEvtInfo.setArchiveName(l_zevParamTbl[mType].mArcName); + eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1); } @@ -554,7 +554,7 @@ void daTagTWGate_c::executeDemoFilone1() { dComIfGp_evmng_cutEnd(staffId); } - if (mEvtInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && + if (eventInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && dComIfGp_evmng_endCheck(mEventID)) { mActionID = ACT_DEMO_FILONE_2; mAction = ActionTable[mActionID]; @@ -578,8 +578,8 @@ asm void daTagTWGate_c::executeDemoFilone1() { #ifdef NONMATCHING void daTagTWGate_c::initDemoFilone2() { i_fopAcM_onSwitch(this, getSwitch()); - mEvtInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName()); + eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); + i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, -1); @@ -636,7 +636,7 @@ void daTagTWGate_c::executeDemoFilone2() { break; } - if (mEvtInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && + if (eventInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && dComIfGp_evmng_endCheck(mEventID)) { i_dComIfGp_getEvent().reset(); field_0x5e0 = 0; @@ -652,8 +652,8 @@ void daTagTWGate_c::executeDemoFilone2() { void daTagTWGate_c::initDemoFilone3() { field_0x5de = 1; mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1; // checking if wolf? - mEvtInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName()); + eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); + i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); i_dComIfGp_getEvent().reset(this); @@ -773,7 +773,7 @@ void daTagTWGate_c::executeDemoFilone3() { break; } - if (mEvtInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && + if (eventInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && dComIfGp_evmng_endCheck(mEventID)) { i_dComIfGp_getEvent().reset(); field_0x5e0 = 0; @@ -797,7 +797,7 @@ asm void daTagTWGate_c::executeDemoFilone3() { /* 80D53250-80D532DC 000CD0 008C+00 1/0 0/0 0/0 .text initDemoOrdin1__13daTagTWGate_cFv */ void daTagTWGate_c::initDemoOrdin1() { - mEvtInfo.setArchiveName(l_zevParamTbl[mType].mArcName); + eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1); } @@ -838,8 +838,8 @@ asm void daTagTWGate_c::executeDemoOrdin2() { void daTagTWGate_c::initDemoOrdin3() { field_0x5de = 1; mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1; // checking if wolf? - mEvtInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName()); + eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); + i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); i_dComIfGp_getEvent().reset(this); @@ -859,7 +859,7 @@ asm void daTagTWGate_c::executeDemoOrdin3() { /* 80D53BD0-80D53C5C 001650 008C+00 1/0 0/0 0/0 .text initDemoRanail1__13daTagTWGate_cFv */ void daTagTWGate_c::initDemoRanail1() { - mEvtInfo.setArchiveName(l_zevParamTbl[mType].mArcName); + eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1); } @@ -900,8 +900,8 @@ asm void daTagTWGate_c::executeDemoRanail2() { void daTagTWGate_c::initDemoRanail3() { field_0x5de = 1; mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1; // checking if wolf? - mEvtInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName()); + eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); + i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); i_dComIfGp_getEvent().reset(this); @@ -922,7 +922,7 @@ asm void daTagTWGate_c::executeDemoRanail3() { /* 80D5456C-80D545F8 001FEC 008C+00 1/0 0/0 0/0 .text initDemoHyral1__13daTagTWGate_cFv */ void daTagTWGate_c::initDemoHyral1() { - mEvtInfo.setArchiveName(l_zevParamTbl[mType].mArcName); + eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1); } @@ -963,8 +963,8 @@ asm void daTagTWGate_c::executeDemoHyral2() { void daTagTWGate_c::initDemoHyral3() { field_0x5de = 1; mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1; // checking if wolf? - mEvtInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - i_dComIfGp_getEventManager().setObjectArchive(mEvtInfo.getArchiveName()); + eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); + i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); i_dComIfGp_getEvent().reset(this); @@ -1000,7 +1000,7 @@ COMPILER_STRIP_GATE(0x80D55844, &lit_4791); // matches with literals #ifdef NONMATCHING void daTagTWGate_c::initBaseMtx() { - mCullMtx = mpMorf->getModel()->getBaseTRMtx(); + cullMtx = mpMorf->getModel()->getBaseTRMtx(); fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); shape_angle.y = player->shape_angle.y + 0x8000; diff --git a/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp b/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp index bd233b9ae4..12f76bc321 100644 --- a/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp +++ b/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp @@ -35,8 +35,8 @@ int daTagAJnot_c::execute() { daPy_py_c* player = daPy_getPlayerActorClass(); f32 y_dist_to_player = player->current.pos.y - current.pos.y; - if (y_dist_to_player >= 0.0f && y_dist_to_player <= mScale.y * 100.0f && - player->current.pos.abs2XZ(current.pos) <= mScale.x * (10000.0f * mScale.x)) + if (y_dist_to_player >= 0.0f && y_dist_to_player <= scale.y * 100.0f && + player->current.pos.abs2XZ(current.pos) <= scale.x * (10000.0f * scale.x)) { int prm = (fopAcM_GetParam(this) & 0xF); diff --git a/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp b/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp index 2004ad633e..d9aa7dd313 100644 --- a/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp +++ b/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp @@ -33,14 +33,14 @@ extern actor_process_profile_definition g_profile_Tag_Arena = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Arena, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagArena_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 333, // mPriority - &l_daTagArena_Method, // mSubMtd + &l_daTagArena_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp b/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp index 2341fa5f1e..5c2e591492 100644 --- a/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp +++ b/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp @@ -44,14 +44,14 @@ extern actor_process_profile_definition g_profile_Tag_Assist = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Assist, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagAssist_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 266, // mPriority - &l_daTagAssist_Method, // mSubMtd + &l_daTagAssist_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp b/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp index 71e2f39d54..16daff3814 100644 --- a/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp +++ b/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp @@ -138,10 +138,10 @@ int daTagAtkItem_c::Create() { mCcStts.Init(0, 0xFF, this); mCyl.Set(l_cyl_src); mCyl.SetStts(&mCcStts); - mCyl.SetR(mScale.x * 50.0f); - mCyl.SetH(mScale.y * 100.0f); + mCyl.SetR(scale.x * 50.0f); + mCyl.SetH(scale.y * 100.0f); - current.pos.y = orig.pos.y - mScale.y * 100.0f; + current.pos.y = home.pos.y - scale.y * 100.0f; return 1; } @@ -340,8 +340,8 @@ BOOL daTagAtkItem_c::checkHit() { daPy_py_c* player_p = daPy_getPlayerActorClass(); if ((player_p->checkFrontRollCrash() || player_p->checkWolfAttackReverse()) && - player_p->current.pos.absXZ(current.pos) < mScale.x * 50.0f && - fabsf(player_p->current.pos.y - current.pos.y) < mScale.y * 100.0f) + player_p->current.pos.absXZ(current.pos) < scale.x * 50.0f && + fabsf(player_p->current.pos.y - current.pos.y) < scale.y * 100.0f) { #ifdef DEBUG // "Attack Reaction Item: Rotate attack hit!\n" @@ -368,7 +368,7 @@ void daTagAtkItem_c::createItem() { for (int i = 0; i < create_num; i++) { angle.y += (s16)cM_rndFX(0x7FFF); - fopAcM_createItemFromTable(&orig.pos, getItemNo(), item_bit, fopAcM_GetHomeRoomNo(this), + fopAcM_createItemFromTable(&home.pos, getItemNo(), item_bit, fopAcM_GetHomeRoomNo(this), &angle, 0, NULL, NULL, NULL, false); if (item_bit != 0xFF) { diff --git a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp index 6b205a61aa..79c5c3e724 100644 --- a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp +++ b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp @@ -11,7 +11,7 @@ static const u8 l_dist_tbl[] = { 0x23, 0x24 }; /* 804D5318-804D5354 000078 003C+00 1/1 0/0 0/0 .text Create__8daAttp_cFv */ int daAttp_c::Create() { - mAttentionInfo.field_0x0[0] = l_dist_tbl[daAttp_prm::getArg4(this)]; + attention_info.field_0x0[0] = l_dist_tbl[daAttp_prm::getArg4(this)]; execute(); return 1; @@ -113,9 +113,9 @@ int daAttp_c::execute() { } if (bVar1) { - mAttentionInfo.mFlags = mAttentionInfo.mFlags | 1; + attention_info.flags = attention_info.flags | 1; } else { - mAttentionInfo.mFlags = mAttentionInfo.mFlags & 0xfffffffe; + attention_info.flags = attention_info.flags & 0xfffffffe; } return 1; @@ -166,14 +166,14 @@ extern actor_process_profile_definition g_profile_Tag_Attp = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Attp, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daAttp_c), // mSize 0, // mSizeOther 0, // mParameter - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 440, // mPriority - &l_daAttp_Method, // mSubMtd + &l_daAttp_Method, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // mCullType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp b/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp index 318d5e8c63..aaa2060ef5 100644 --- a/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp +++ b/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp @@ -58,7 +58,7 @@ void daTag_BottleItem_c::setTypeFromParam() { /* 80D56100-80D56170 0001A0 0070+00 1/1 0/0 0/0 .text restart__18daTag_BottleItem_cFv */ void daTag_BottleItem_c::restart() { - current.angle.set(0,orig.angle.y,0); + current.angle.set(0,home.angle.y,0); shape_angle = current.angle; setProcess(&daTag_BottleItem_c::wait); } @@ -67,8 +67,8 @@ void daTag_BottleItem_c::restart() { */ void daTag_BottleItem_c::initialize() { fopAcM_setCullSizeBox(this,-30.0f,-15.0f,-30.0f,30.0f,45.0f,30.0f); - mAttentionInfo.mFlags = 0; - mAttentionInfo.field_0x0[4] = 6; + attention_info.flags = 0; + attention_info.field_0x0[4] = 6; fopAcM_OnCarryType(this,fopAcM_CARRY_SIDE); restart(); Execute(); @@ -108,8 +108,8 @@ int daTag_BottleItem_c::setProcess(ProcessFunc i_processFunc) { /* 80D56300-80D56334 0003A0 0034+00 1/1 0/0 0/0 .text setAttnPos__18daTag_BottleItem_cFv */ void daTag_BottleItem_c::setAttnPos() { - mAttentionInfo.mPosition = current.pos; - mEyePos = current.pos; + attention_info.position = current.pos; + eyePos = current.pos; } /* 80D56334-80D56384 0003D4 0050+00 1/1 0/0 0/0 .text chkEvent__18daTag_BottleItem_cFv */ @@ -119,7 +119,7 @@ s32 daTag_BottleItem_c::chkEvent() { if (!i_dComIfGp_getEvent().i_isOrderOK()) { uVar2 = 0; - if (mEvtInfo.i_checkCommandCatch()) { + if (eventInfo.i_checkCommandCatch()) { return uVar2; } } @@ -132,15 +132,15 @@ s32 daTag_BottleItem_c::orderEvent() { makeSoup(); if (!daPy_py_c::i_checkNowWolf() && mBottleItemType != EMPTY_BOTTLE) { - mAttentionInfo.mFlags = 0x20000008; + attention_info.flags = 0x20000008; } else { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } - if (mAttentionInfo.mFlags == 0x20000008) { - mAttentionInfo.field_0x0[1] = EMPTY_BOTTLE; - mAttentionInfo.field_0x0[3] = EMPTY_BOTTLE; - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + if (attention_info.flags == 0x20000008) { + attention_info.field_0x0[1] = EMPTY_BOTTLE; + attention_info.field_0x0[3] = EMPTY_BOTTLE; + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); } return 1; @@ -161,12 +161,12 @@ void daTag_BottleItem_c::makeSoup() { int daTag_BottleItem_c::wait(void* param_0) { switch(mEventType) { case 1: - if (mEvtInfo.i_checkCommandCatch() == 0){ + if (eventInfo.i_checkCommandCatch() == 0){ fopAc_ac_c* player = dComIfGp_getPlayer(0); - cXyz pos = mAttentionInfo.mPosition - player->mAttentionInfo.mPosition; + cXyz pos = attention_info.position - player->attention_info.position; dComIfGp_att_CatchRequest(this,mBottleItemType,140.0f,pos.y+100.0f,pos.y-100.0f,0x2000,1); - mEvtInfo.i_onCondition(0x40); + eventInfo.i_onCondition(0x40); } case 2: case 0: @@ -218,14 +218,14 @@ extern actor_process_profile_definition g_profile_TAG_BTLITM = { 7, // mListID fpcPi_CURRENT_e, // mListPri PROC_TAG_SSDRINK, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTag_BottleItem_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 70, // mPriority - &daTag_BottleItem_MethodTable, // mSubMtd + &daTag_BottleItem_MethodTable, // sub_method 0x64100, // mStatus 5, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp b/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp index d729559b61..1b301cd0c3 100644 --- a/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp +++ b/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp @@ -9,17 +9,17 @@ /* 80D56758-80D567E4 000078 008C+00 1/1 0/0 0/0 .text Create__17daTagChgRestart_cFv */ s32 daTagChgRestart_c::Create() { - mVertices[0].x = -100.0f * mScale.x; - mVertices[0].z = -100.0f * mScale.z; + mVertices[0].x = -100.0f * scale.x; + mVertices[0].z = -100.0f * scale.z; - mVertices[1].x = 100.0f * mScale.x; - mVertices[1].z = -100.0f * mScale.z; + mVertices[1].x = 100.0f * scale.x; + mVertices[1].z = -100.0f * scale.z; - mVertices[2].x = 100.0f * mScale.x; - mVertices[2].z = 100.0f * mScale.z; + mVertices[2].x = 100.0f * scale.x; + mVertices[2].z = 100.0f * scale.z; - mVertices[3].x = -100.0f * mScale.x; - mVertices[3].z = 100.0f * mScale.z; + mVertices[3].x = -100.0f * scale.x; + mVertices[3].z = 100.0f * scale.z; mVertices[3].y = 0.0f; mVertices[2].y = 0.0f; @@ -48,7 +48,7 @@ s32 daTagChgRestart_c::execute() { fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz pos = player->current.pos; - pos -= orig.pos; + pos -= home.pos; mDoMtx_stack_c::YrotS(-current.angle.y); mDoMtx_stack_c::multVec(&pos, &pos); @@ -56,8 +56,8 @@ s32 daTagChgRestart_c::execute() { if (mVertices[0].x < pos.x && mVertices[0].z < pos.z && mVertices[2].x > pos.x && mVertices[2].z > pos.z) { - cXyz restart_pos = orig.pos; - s16 restart_angle = orig.angle.y; + cXyz restart_pos = home.pos; + s16 restart_angle = home.angle.y; u8 playerNo = daTagChgRestart_prm::getPlayerNo(this); if (playerNo != 0xFF) { @@ -122,14 +122,14 @@ extern actor_process_profile_definition g_profile_Tag_ChgRestart = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_ChgRestart, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagChgRestart_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 591, // mPriority - &l_daTagChgRestart_Method, // mSubMtd + &l_daTagChgRestart_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp index dd3ac3339d..5e74fb2ead 100644 --- a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp +++ b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp @@ -147,11 +147,11 @@ s32 daTag_Chk_c::execute() { u16 areaType = getAreaType(); } - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; if (bVar6) { - daPy_py_c::setLookPos(&mAttentionInfo.mPosition); - mAttentionInfo.mFlags = 0x1000; + daPy_py_c::setLookPos(&attention_info.position); + attention_info.flags = 0x1000; } return 1; @@ -265,14 +265,14 @@ extern actor_process_profile_definition g_profile_TAG_CHKPOINT = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_CHKPOINT, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTag_Chk_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 280, // mPriority - &l_daTag_Chk_Method, // mSubMtd + &l_daTag_Chk_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // mCullType + fopAc_CULLBOX_6_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp b/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp index 78d8c6e3d9..310d95974a 100644 --- a/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp +++ b/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp @@ -33,7 +33,7 @@ int daTag_Evt_c::create() { fopAcM_SetupActor(this, daTag_Evt_c); cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, l_resFileName); if (phase == cPhs_COMPLEATE_e) { - mEvtInfo.setArchiveName(l_resFileName); + eventInfo.setArchiveName(l_resFileName); strcpy(field_0x568, "TagEvt"); getParam(); field_0x572 = -1; @@ -50,16 +50,16 @@ int daTag_Evt_c::destroy() { /* 8048BA0C-8048BE44 00016C 0438+00 1/1 0/0 0/0 .text execute__11daTag_Evt_cFv */ int daTag_Evt_c::execute() { BOOL bVar = true; - mEyePos.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); - mAttentionInfo.mPosition = mEyePos; + eyePos.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + attention_info.position = eyePos; fopAcM_SetRoomNo(this, dComIfGp_roomControl_getStayNo()); if (field_0x5E4 == 0 || field_0x5E4 == 1) { dComIfG_inf_c* pGameInfo = &g_dComIfG_gameInfo; if (i_dComIfGp_event_runCheck() != 0) { bVar = false; int iVar1 = i_dComIfGp_evmng_getMyStaffId(field_0x568, 0, 0); - if (!mEvtInfo.checkCommandTalk()) { - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (!eventInfo.checkCommandTalk()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { if (i_dComIfGp_getEventManager().endCheck(field_0x572)) { i_dComIfGp_event_reset(); field_0x570 = 0; @@ -105,7 +105,7 @@ int daTag_Evt_c::execute() { } if (!isDelete() && cLib_calcTimer(&field_0x5D0) == 0) { cXyz var1 = daPy_getPlayerActorClass()->current.pos - current.pos; - if (var1.absXZ() < mScale.x && -mScale.y < var1.y && var1.y < mScale.y) { + if (var1.absXZ() < scale.x && -scale.y < var1.y && var1.y < scale.y) { field_0x570 = 1; } } @@ -136,25 +136,25 @@ int daTag_Evt_c::getParam() { } field_0x5E4 = fopAcM_GetParam(this) >> 0x1E; - field_0x5DD = orig.angle.x; - field_0x5DE = (u16)orig.angle.x >> 8; - field_0x5D4 = orig.angle.z & 0xFF; - if ((orig.angle.z & 0xFF00) != 0xFF00) { - field_0x5D0 = ((orig.angle.z & 0xFF00) >> 8) * 0x1E; + field_0x5DD = home.angle.x; + field_0x5DE = (u16)home.angle.x >> 8; + field_0x5D4 = home.angle.z & 0xFF; + if ((home.angle.z & 0xFF00) != 0xFF00) { + field_0x5D0 = ((home.angle.z & 0xFF00) >> 8) * 0x1E; } else { field_0x5D0 = 0; } field_0x574 = -1; - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 100.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; if (field_0x5E4 == 1) { - mScale.x *= 10.0f; - mScale.y *= 10.0f; - mScale.z *= 10.0f; + scale.x *= 10.0f; + scale.y *= 10.0f; + scale.z *= 10.0f; } - orig.angle.x = 0; - orig.angle.z = 0; + home.angle.x = 0; + home.angle.z = 0; return 1; } diff --git a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp index 015cecb356..5fd7892411 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp @@ -25,11 +25,11 @@ u32 daTag_EvtArea_c::getOffEvtBit() { } u8 daTag_EvtArea_c::getBitSW() { - return orig.angle.x & 0xff; + return home.angle.x & 0xff; } u8 daTag_EvtArea_c::getBitSW2() { - return (orig.angle.x & 0xff00) >> 8; + return (home.angle.x & 0xff00) >> 8; } /* 8048C4F8-8048C728 000078 0230+00 2/1 0/0 0/0 .text create__15daTag_EvtArea_cFv */ @@ -50,50 +50,50 @@ cPhs__Step daTag_EvtArea_c::create() { case 10: case 11: case 12: - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 100.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; break; case 13: - mScale.x *= 200.0f; - mScale.y *= 200.0f; - mScale.z *= 200.0f; + scale.x *= 200.0f; + scale.y *= 200.0f; + scale.z *= 200.0f; break; case 14: - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 100.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; break; case 15: - mScale.x *= 0.5f; - mScale.z *= 0.5f; - mScale.x *= 1000.0f; - mScale.y *= 1000.0f; - mScale.z *= 1000.0f; + scale.x *= 0.5f; + scale.z *= 0.5f; + scale.x *= 1000.0f; + scale.y *= 1000.0f; + scale.z *= 1000.0f; break; case 16: case 17: case 18: case 19: case 20: - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 100.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; break; case 21: - mScale.x *= 1000.0f; - mScale.z *= 1000.0f; + scale.x *= 1000.0f; + scale.z *= 1000.0f; break; case 22: case 23: - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 100.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; break; default: - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 100.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; } if (isDelete()) { return cPhs_ERROR_e; @@ -110,24 +110,24 @@ bool daTag_EvtArea_c::Delete() { /* 8048C730-8048C894 0002B0 0164+00 1/1 0/0 0/0 .text Execute__15daTag_EvtArea_cFv */ bool daTag_EvtArea_c::Execute() { - if (orig.roomNo == dComIfGp_roomControl_getStayNo()) { + if (home.roomNo == dComIfGp_roomControl_getStayNo()) { if (isDelete()) { fopAcM_delete(this); return true; } else { - mAttentionInfo.mPosition = current.pos; + attention_info.position = current.pos; if (getType() == 8) { - mAttentionInfo.mPosition.y += 100.0f; + attention_info.position.y += 100.0f; } - mGroup = 0; - mEyePos = mAttentionInfo.mPosition; + group = 0; + eyePos = attention_info.position; if (getType() == 15) { if (chkPointInArea(daPy_getPlayerActorClass()->current.pos)) { - mEyePos = daPy_getPlayerActorClass()->mEyePos; - mGroup = 4; + eyePos = daPy_getPlayerActorClass()->eyePos; + group = 4; } } - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; return true; } } else { @@ -173,10 +173,10 @@ BOOL daTag_EvtArea_c::chkPointInArea(cXyz param_0, cXyz param_1) { if ((getOnEvtBit() != -1 && daNpcT_chkEvtBit(getOnEvtBit())) || (getBitSW() != 0xff && dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this))) || (getOnEvtBit() == -1 && getBitSW() == 0xff)) { - local_84 = mScale + param_1; + local_84 = scale + param_1; if (getType() == 15 || getType() == 16) { local_6c = daPy_getPlayerActorClass()->current.pos; - local_6c -= orig.pos; + local_6c -= home.pos; mDoMtx_YrotS(mDoMtx_stack_c::now, -current.angle.y); mDoMtx_stack_c::multVec(&local_6c, &local_6c); local_48.x = -local_84.x; diff --git a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp index 87c2d1e7ea..96c1f210f3 100644 --- a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp +++ b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp @@ -46,12 +46,12 @@ static char* l_myName = "EvtMsg"; int daTag_EvtMsg_c::create() { fopAcM_SetupActor(this, daTag_EvtMsg_c); - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z = mScale.x; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z = scale.x; - if (orig.angle.z != 0xFFFF) { - mFlowID = orig.angle.z; + if (home.angle.z != 0xFFFF) { + mFlowID = home.angle.z; } else { mFlowID = -1; } @@ -71,11 +71,11 @@ int daTag_EvtMsg_c::Delete() { int daTag_EvtMsg_c::Execute() { dEvent_manager_c& evt_mng = i_dComIfGp_getEventManager(); - if (orig.roomNo == dComIfGp_roomControl_getStayNo()) { + if (home.roomNo == dComIfGp_roomControl_getStayNo()) { if (i_dComIfGp_event_runCheck() != 0) { int staff_id; BOOL reset = false; - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { if (field_0x572 != 0) { mMsgFlow.init(this, mFlowID, 0, NULL); } @@ -83,7 +83,7 @@ int daTag_EvtMsg_c::Execute() { if (mMsgFlow.doFlow(this, NULL, 0)) { reset = true; } - } else if (mEvtInfo.checkCommandDemoAccrpt() && mEventID != -1 && + } else if (eventInfo.checkCommandDemoAccrpt() && mEventID != -1 && evt_mng.endCheck(mEventID)) { mEventID = -1; @@ -122,14 +122,14 @@ int daTag_EvtMsg_c::Execute() { fopAcM_orderOtherEventId(this, mEventID, 0xFF, 0xFFFF, 0, 1); } } else { - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 0, 0); } } } - mAttentionInfo.mFlags = 0; - mAttentionInfo.mPosition = current.pos; - mEyePos = mAttentionInfo.mPosition; + attention_info.flags = 0; + attention_info.position = current.pos; + eyePos = attention_info.position; return 1; } @@ -163,12 +163,12 @@ u32 daTag_EvtMsg_c::getOffEvtBit() { /* 8048D35C-8048D368 00049C 000C+00 1/1 0/0 0/0 .text getOnSwBit__14daTag_EvtMsg_cFv */ u8 daTag_EvtMsg_c::getOnSwBit() { - return orig.angle.x & 0xFF; + return home.angle.x & 0xFF; } /* 8048D368-8048D374 0004A8 000C+00 2/2 0/0 0/0 .text getOffSwBit__14daTag_EvtMsg_cFv */ u8 daTag_EvtMsg_c::getOffSwBit() { - return (orig.angle.x >> 8) & 0xFF; + return (home.angle.x >> 8) & 0xFF; } /* 8048D374-8048D384 0004B4 0010+00 1/1 0/0 0/0 .text getProcType__14daTag_EvtMsg_cFv */ @@ -201,7 +201,7 @@ BOOL daTag_EvtMsg_c::chkPointInArea(cXyz param_0) { getOnSwBit() == 0xFF || (getOnSwBit() != 0xFF && !dComIfGs_isSwitch(getOnSwBit(), fopAcM_GetRoomNo(this)))) { - return daNpcF_chkPointInArea(param_0, current.pos, mScale, shape_angle.y); + return daNpcF_chkPointInArea(param_0, current.pos, scale, shape_angle.y); } return 0; diff --git a/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp b/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp index 3c03ba3045..d9064d59c8 100644 --- a/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp +++ b/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp @@ -31,14 +31,14 @@ extern actor_process_profile_definition g_profile_TAG_GRA = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_GRA, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagGra_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 20, // mPriority - &l_daTagGra_Method, // mSubMtd + &l_daTagGra_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp b/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp index c3d7d5b9a5..c7701d604a 100644 --- a/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp +++ b/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp @@ -46,7 +46,7 @@ int daTagHjump_c::create() { if (phase == cPhs_COMPLEATE_e) { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); - mTevStr.mRoomNo = fopAcM_GetRoomNo(this); + tevStr.mRoomNo = fopAcM_GetRoomNo(this); mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); @@ -56,13 +56,13 @@ int daTagHjump_c::create() { current.pos.y -= 100.0f; mpBgW->SetLock(); - mScale.x = 250.0f; - mScale.y = 350.0f; - mScale.z = 400.0f; + scale.x = 250.0f; + scale.y = 350.0f; + scale.z = 400.0f; field_0x5b8 = 200.0f; - fopAcM_SetMin(this, -mScale.x, 0.0f, -50.0f); - fopAcM_SetMax(this, mScale.x, 200.0f, 50.0f); + fopAcM_SetMin(this, -scale.x, 0.0f, -50.0f); + fopAcM_SetMax(this, scale.x, 200.0f, 50.0f); field_0x5ae = 0x2000; fopAcM_setCullSizeFar(this, 5.0f); @@ -71,9 +71,9 @@ int daTagHjump_c::create() { } } else { phase = cPhs_COMPLEATE_e; - mScale.x *= 100.0f; - mScale.z *= 100.0f; - mScale.y *= 100.0f; + scale.x *= 100.0f; + scale.z *= 100.0f; + scale.y *= 100.0f; if (field_0x5ad == 0 || field_0x5ad == 1) { field_0x5b8 = 50.0f; @@ -84,7 +84,7 @@ int daTagHjump_c::create() { } } - field_0x5b4 = current.pos.y + mScale.y; + field_0x5b4 = current.pos.y + scale.y; return phase; } @@ -140,8 +140,8 @@ int daTagHjump_c::execute() { fpoAcM_relativePos(this, &horse_p->current.pos, &rel_pos); f32 temp_f3 = fabsf(rel_pos.z); - if (rel_pos.y >= 0.0f && rel_pos.y <= mScale.y && fabsf(rel_pos.x) <= mScale.x) { - if (temp_f3 >= (mScale.z - field_0x5b8) && temp_f3 <= (mScale.z + field_0x5b8) && + if (rel_pos.y >= 0.0f && rel_pos.y <= scale.y && fabsf(rel_pos.x) <= scale.x) { + if (temp_f3 >= (scale.z - field_0x5b8) && temp_f3 <= (scale.z + field_0x5b8) && ((rel_pos.z > 0.0f && abs_angle > 0x8000 - field_0x5ae) || (rel_pos.z < 0.0f && abs_angle < field_0x5ae))) { @@ -155,7 +155,7 @@ int daTagHjump_c::execute() { } rel_pos.x += (temp_f3_2 * cM_ssin(angle_diff)) + (var_f4 * cM_ssin(angle_diff)); - if (fabsf(rel_pos.x) <= mScale.x || + if (fabsf(rel_pos.x) <= scale.x || (mType == TYPE_TRIGGER_e && field_0x5ad == 4)) { horse_p->onTagJump(temp_f3_2, field_0x5b4, var_f4); @@ -176,8 +176,8 @@ static int daTagHjump_Execute(daTagHjump_c* i_this) { /* 805A4154-805A4204 000714 00B0+00 1/0 0/0 0/0 .text Draw__12daTagHjump_cFv */ int daTagHjump_c::Draw() { if (mType != TYPE_TRIGGER_e) { - g_env_light.settingTevStruct(0x10, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); diff --git a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp index 36ccdda692..fd260e94a3 100644 --- a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp +++ b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp @@ -24,11 +24,11 @@ int daTag_Howl_c::destroy() { /* 8048D9C4-8048DA24 0000E4 0060+00 1/1 0/0 0/0 .text execute__12daTag_Howl_cFv */ int daTag_Howl_c::execute() { fopAcM_SetRoomNo(this, dComIfGp_roomControl_getStayNo()); - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; if (isAreaCheck()) { - mAttentionInfo.mFlags |= 0x80; - mAttentionInfo.field_0x0[7] = 0x41; + attention_info.flags |= 0x80; + attention_info.field_0x0[7] = 0x41; } return 1; @@ -49,8 +49,8 @@ u8 daTag_Howl_c::isAreaCheck() { cXyz vec_to_player = daPy_getPlayerActorClass()->current.pos - current.pos; if (daPy_py_c::i_checkNowWolf()) { - if (vec_to_player.absXZ() < mScale.x && -mScale.y < vec_to_player.y && - vec_to_player.y < mScale.y) + if (vec_to_player.absXZ() < scale.x && -scale.y < vec_to_player.y && + vec_to_player.y < scale.y) { return true; } @@ -63,9 +63,9 @@ u8 daTag_Howl_c::isAreaCheck() { int daTag_Howl_c::getParam() { mCurveID = fopAcM_GetParam(this) & 0xF; field_0x569 = fopAcM_GetParam(this) >> 0x1E; - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 100.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; return 1; } @@ -114,14 +114,14 @@ extern actor_process_profile_definition g_profile_TAG_HOWL = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_HOWL, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTag_Howl_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 283, // mPriority - &daTag_Howl_MethodTable, // mSubMtd + &daTag_Howl_MethodTable, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp index c8e90607b5..09c299f29b 100644 --- a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp +++ b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp @@ -15,9 +15,9 @@ int daTagHstop_c::create() { fopAcM_SetupActor(this, daTagHstop_c); - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 100.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; if (m_top != NULL) { daTagHstop_c* last = m_top; @@ -109,7 +109,7 @@ dMsgFlow_c daTagHstop_c::m_msgFlow; /* 805A475C-805A4AA8 00045C 034C+00 1/1 0/0 0/0 .text execute__12daTagHstop_cFv */ int daTagHstop_c::execute() { - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { if (field_0x573 == 2) { m_msgFlow.init(this, (u16)shape_angle.z, 0, NULL); field_0x573 = 3; @@ -148,7 +148,7 @@ int daTagHstop_c::execute() { } } else if (field_0x573 == 2 && !i_dComIfGp_getHorseActor()->checkTurnStand()) { fopAcM_orderSpeakEvent(this, 0, 0); - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); } } else if (mPrm1 == 2 && !i_dComIfGp_event_runCheck()) { if (dComIfGs_getArrowNum() == 0 && !dComIfGs_isSwitch(0x8D, fopAcM_GetHomeRoomNo(this))) diff --git a/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp b/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp index 6f310ae11c..f90c0d7b23 100644 --- a/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp +++ b/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp @@ -39,9 +39,9 @@ int daTagKagoFall_c::create() { mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_inverse(mDoMtx_stack_c::get(), mMtx); - mScale.x *= 75.0f; - mScale.z *= 75.0f; - mScale.y *= 150.0f; + scale.x *= 75.0f; + scale.z *= 75.0f; + scale.y *= 150.0f; setActionMode(ACTION_MODE_FALL, 0); } @@ -99,9 +99,9 @@ void daTagKagoFall_c::actionWaitRiver() { } if (i_dComIfGp_checkPlayerStatus0(0, 0x100000) && i_dComIfGs_getLife()) { - if (!mEvtInfo.checkCommandDemoAccrpt()) { + if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 1, -1, 3); - mEvtInfo.i_onCondition(dEvtCnd_CANDEMO_e); + eventInfo.i_onCondition(dEvtCnd_CANDEMO_e); } else { camera->Stop(); camera->SetTrimSize(3); @@ -127,7 +127,7 @@ void daTagKagoFall_c::actionWaitRiver() { mActionState = 2; } - dCam_getBody()->Set(player->mEyePos, mRestartPos); + dCam_getBody()->Set(player->eyePos, mRestartPos); break; case 2: @@ -136,7 +136,7 @@ void daTagKagoFall_c::actionWaitRiver() { mActionState = 3; mTimer = 40; } - dCam_getBody()->Set(player->mEyePos, mRestartPos); + dCam_getBody()->Set(player->eyePos, mRestartPos); break; case 3: @@ -178,7 +178,7 @@ void daTagKagoFall_c::actionWaitFall() { case 0: mDoMtx_multVec(mMtx, &player->current.pos, &v); - if (v.y <= mScale.y && v.y >= 0.0f && fabsf(v.x) <= mScale.x && fabsf(v.z) <= mScale.z) { + if (v.y <= scale.y && v.y >= 0.0f && fabsf(v.x) <= scale.x && fabsf(v.z) <= scale.z) { mActionState = 1; } @@ -205,10 +205,10 @@ void daTagKagoFall_c::actionWaitFall() { player->voiceStart(Z2SE_WL_V_FALL_TO_RESTART); mPlayedSceneChangeSfx = true; } - } else if (!mEvtInfo.checkCommandDemoAccrpt()) { + } else if (!eventInfo.checkCommandDemoAccrpt()) { mRestartPos = player->current.pos; fopAcM_orderPotentialEvent(this, 1, -1, 0); - mEvtInfo.i_onCondition(dEvtCnd_CANDEMO_e); + eventInfo.i_onCondition(dEvtCnd_CANDEMO_e); } else { mDoGph_gInf_c::fadeOut(0.05f, static_cast(g_blackColor)); mTimer = 60; @@ -301,14 +301,14 @@ extern actor_process_profile_definition g_profile_Tag_KagoFall = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_KagoFall, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagKagoFall_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 557, // mPriority - &l_daTagKagoFall_Method, // mSubMtd + &l_daTagKagoFall_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp index 892de84b27..daa4d1703e 100644 --- a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp +++ b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp @@ -28,7 +28,7 @@ int daTag_Lantern_c::Execute() { dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); // fake match if (i_dComIfGp_event_runCheck()) { - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { if (!field_0x604) { mMsgFlow.init(this, mFlowIndex, 0, NULL); field_0x604++; @@ -39,7 +39,7 @@ int daTag_Lantern_c::Execute() { } } } else if (field_0x5f8) { - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 0, 0); } @@ -49,16 +49,16 @@ int daTag_Lantern_c::Execute() { s32 room_no; if (mGroundCross != -1000000000.0f) { room_no = dComIfG_Bgsp().GetRoomId(mGndChk); - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mGndChk); } else { room_no = dComIfGp_roomControl_getStayNo(); } - mTevStr.mRoomNo = room_no; - fopAcM_SetRoomNo(this, mTevStr.mRoomNo); - mAttentionInfo.mFlags = 0; - mAttentionInfo.mPosition = current.pos; - mEyePos = mAttentionInfo.mPosition; + tevStr.mRoomNo = room_no; + fopAcM_SetRoomNo(this, tevStr.mRoomNo); + attention_info.flags = 0; + attention_info.position = current.pos; + eyePos = attention_info.position; return 1; } @@ -71,18 +71,18 @@ int daTag_Lantern_c::Draw() { void daTag_Lantern_c::initialize() { fopAcM_setCullSizeBox(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); - if (orig.angle.z != 0xFFFF) { - mFlowIndex = orig.angle.z; + if (home.angle.z != 0xFFFF) { + mFlowIndex = home.angle.z; } else { mFlowIndex = -1; } - orig.angle.z = 0; + home.angle.z = 0; field_0x5fc = fopAcM_GetParam(this) & 0xFFF; - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 100.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; Execute(); } @@ -128,14 +128,14 @@ extern actor_process_profile_definition g_profile_TAG_LANTERN = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_LANTERN, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTag_Lantern_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 286, // mPriority - &daTag_Lantern_MethodTable, // mSubMtd + &daTag_Lantern_MethodTable, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp b/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp index 765719634f..be4f422952 100644 --- a/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp +++ b/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp @@ -27,7 +27,7 @@ int daTagLightBall_c::Create() { } mInfluence.mPos = current.pos; - mInfluence.field_0xc = mScale.x * 100.0f; + mInfluence.field_0xc = scale.x * 100.0f; if (swbit != 0xFF) { if (getType() == 15) { @@ -135,14 +135,14 @@ extern actor_process_profile_definition g_profile_Tag_LightBall = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_LightBall, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagLightBall_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 547, // mPriority - &l_daTagLightBall_Method, // mSubMtd + &l_daTagLightBall_Method, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp index 20d60e5ad1..639c5e91a7 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp +++ b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp @@ -12,7 +12,7 @@ int daTag_Lv5Soup_c::create() { fopAcM_SetupActor(this, daTag_Lv5Soup_c); fopAcM_setCullSizeBox(this, -30.0f, -15.0f, -30.0f, 30.0f, 45.0f, 30.0f); - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; return cPhs_COMPLEATE_e; } @@ -47,8 +47,8 @@ int daTag_Lv5Soup_c::Draw() { /* 80D5AEA4-80D5B06C 0001C4 01C8+00 1/1 0/0 0/0 .text isAreaCheck__15daTag_Lv5Soup_cFv */ bool daTag_Lv5Soup_c::isAreaCheck() { cXyz dist = daPy_getPlayerActorClass()->current.pos - current.pos; - f32 boundX = mScale.x * 100.0f; - f32 boundY = mScale.y * 100.0f; + f32 boundX = scale.x * 100.0f; + f32 boundY = scale.y * 100.0f; if (dist.absXZ() < boundX && -boundY < dist.y && dist.y < boundY) { return true; diff --git a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp index 6b24d1ffcc..a4c5b2028b 100644 --- a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp @@ -45,7 +45,7 @@ bool daLv6CstaSw_c::areaCheck() { } cXyz vec_to_actor = current.pos - sekizo_p->current.pos; - if (vec_to_actor.absXZ() <= mScale.x * 100.0f) { + if (vec_to_actor.absXZ() <= scale.x * 100.0f) { in_area = true; } diff --git a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp index 3246285c1e..11060f910f 100644 --- a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp +++ b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp @@ -88,7 +88,7 @@ int daTagMhint_c::create() { field_0x56b = (fopAcM_GetParam(this) >> 0x1D) & 1; if (daPy_getPlayerActorClass() != NULL) { - field_0x572 = fopAcM_GetID(daPy_getPlayerActorClass()) == mParentPcId; + field_0x572 = fopAcM_GetID(daPy_getPlayerActorClass()) == parentActorID; } else { field_0x572 = 0; } @@ -100,12 +100,12 @@ int daTagMhint_c::create() { mEventID = i_dComIfGp_getEventManager().getEventIdx(this, mToolEventID); if ((fopAcM_GetParam(this) >> 0x1E) & 1) { - mScale.x *= FLOAT_LABEL(lit_3741); - mScale.y *= FLOAT_LABEL(lit_3741); + scale.x *= FLOAT_LABEL(lit_3741); + scale.y *= FLOAT_LABEL(lit_3741); } - field_0x5cc = mScale.x * (mScale.x * 10000.0f); - field_0x5d0 = current.pos.y + mScale.y * 100.0f; + field_0x5cc = scale.x * (scale.x * 10000.0f); + field_0x5d0 = current.pos.y + scale.y * 100.0f; if (!checkNoAttention()) { stage_arrow_data_class* arrow_data_p = @@ -114,9 +114,9 @@ int daTagMhint_c::create() { ->mEntries[field_0x56d] .field_0x10]; - mEyePos.set(arrow_data_p->mPosition.x, arrow_data_p->mPosition.y, + eyePos.set(arrow_data_p->mPosition.x, arrow_data_p->mPosition.y, arrow_data_p->mPosition.z); - mAttentionInfo.mPosition = mEyePos; + attention_info.position = eyePos; } return cPhs_COMPLEATE_e; @@ -158,7 +158,7 @@ SECTION_DEAD static char const* const stringBase_805A604C = "D_MN04B"; #ifdef NONMATCHING void daTagMhint_c::eventOrder() { if (!i_dComIfGp_event_runCheck()) { - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); if (!daPy_getPlayerActorClass()->checkPlayerFly() || i_dComIfGp_checkPlayerStatus0(0, 0x100000)) @@ -224,20 +224,20 @@ int daTagMhint_c::execute() { } if (checkNoAttention()) { - mAttentionInfo.mPosition = midna_p->mAttentionInfo.mPosition; + attention_info.position = midna_p->attention_info.position; shape_angle.y = midna_p->shape_angle.y; - mEyePos = mAttentionInfo.mPosition; + eyePos = attention_info.position; } else { shape_angle.y = fopAcM_searchPlayerAngleY(this); } - if (mEvtInfo.i_checkCommandDemoAccrpt()) { + if (eventInfo.i_checkCommandDemoAccrpt()) { if (dComIfGp_evmng_endCheck(mEventID)) { i_dComIfGp_event_reset(); fopAcM_orderSpeakEvent(this, 3, 0); field_0x570 = 1; } - } else if (mEvtInfo.checkCommandTalk()) { + } else if (eventInfo.checkCommandTalk()) { if (!midna_p->checkShadowModeTalkWait()) { if (field_0x56e == 0) { mMsgFlow.init(this, shape_angle.z & 0xFFFF, 0, NULL); @@ -280,7 +280,7 @@ int daTagMhint_c::execute() { } } else { if (field_0x570 != 0) { - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 3, 0); return 1; } @@ -321,7 +321,7 @@ int daTagMhint_c::execute() { } } - if (!mEvtInfo.chkCondition(dEvtCnd_CANTALK_e)) { + if (!eventInfo.chkCondition(dEvtCnd_CANTALK_e)) { field_0x56f = 0; } diff --git a/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp b/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp index ffc9da846a..b2dfe8bee8 100644 --- a/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp +++ b/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp @@ -51,17 +51,17 @@ BOOL daTagMist_c::isMySw() { /* 8048F370-8048F444 000190 00D4+00 1/1 0/0 0/0 .text Create__11daTagMist_cFv */ int daTagMist_c::Create() { - mVertices[0].x = mScale.x * -50.0f; - mVertices[0].z = mScale.z * -50.0f; + mVertices[0].x = scale.x * -50.0f; + mVertices[0].z = scale.z * -50.0f; - mVertices[1].x = mScale.x * 50.0f; - mVertices[1].z = mScale.z * -50.0f; + mVertices[1].x = scale.x * 50.0f; + mVertices[1].z = scale.z * -50.0f; - mVertices[2].x = mScale.x * 50.0f; - mVertices[2].z = mScale.z * 50.0f; + mVertices[2].x = scale.x * 50.0f; + mVertices[2].z = scale.z * 50.0f; - mVertices[3].x = mScale.x * -50.0f; - mVertices[3].z = mScale.z * 50.0f; + mVertices[3].x = scale.x * -50.0f; + mVertices[3].z = scale.z * 50.0f; mVertices[3].y = 0.0f; mVertices[2].y = 0.0f; @@ -83,11 +83,11 @@ int daTagMist_c::create() { if (!mInitParams) { mInitParams = true; - field_0x5a2 = orig.angle.x; - field_0x5a4 = orig.angle.z; + field_0x5a2 = home.angle.x; + field_0x5a4 = home.angle.z; - orig.angle.z = 0; - orig.angle.x = 0; + home.angle.z = 0; + home.angle.x = 0; current.angle.z = 0; current.angle.x = 0; shape_angle.z = 0; @@ -109,7 +109,7 @@ int daTagMist_c::execute() { fopAc_ac_c* player_p = dComIfGp_getPlayer(0); cXyz player_dist(player_p->current.pos); - player_dist -= orig.pos; + player_dist -= home.pos; mDoMtx_stack_c::YrotS(-current.angle.y); mDoMtx_stack_c::multVec(&player_dist, &player_dist); diff --git a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp index a116315aa3..da7f404a7a 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp +++ b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp @@ -22,12 +22,12 @@ int daTagMmsg_c::create() { field_0x569 = (shape_angle.x >> 8) & 0xFF; if ((fpcM_GetParam(this) >> 30) & 1) { - mScale.x *= 10.0f; - mScale.y *= 10.0f; + scale.x *= 10.0f; + scale.y *= 10.0f; } - field_0x574 = mScale.x * (10000.0f * mScale.x); - field_0x578 = current.pos.y + mScale.y * 100.0f; + field_0x574 = scale.x * (10000.0f * scale.x); + field_0x578 = current.pos.y + scale.y * 100.0f; mAttention = shape_angle.y; if (!checkNoAttention()) { @@ -36,8 +36,8 @@ int daTagMmsg_c::create() { &dComIfGp_getRoomArrow(roomNo) ->mEntries[dComIfGp_getRoomCamera(roomNo)->mEntries[mAttention].field_0x10] .mPosition; - mEyePos.set(tmp->x, tmp->y, tmp->z); - mAttentionInfo.mPosition = mEyePos; + eyePos.set(tmp->x, tmp->y, tmp->z); + attention_info.position = eyePos; } shape_angle.y = fopAcM_searchPlayerAngleY(this); @@ -119,14 +119,14 @@ extern actor_process_profile_definition g_profile_Tag_Mmsg = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Mmsg, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagMmsg_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 255, // mPriority - &l_daTagMmsg_Method, // mSubMtd + &l_daTagMmsg_Method, // sub_method 0x44000, // mStatus fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp index 9d8085993e..40756a3eeb 100644 --- a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp @@ -102,11 +102,11 @@ int daTagMstop_c::create() { field_0x572 = 0xFFFF; } - f32 tmp = mScale.x; - tmp *= 10000.0f * mScale.x; + f32 tmp = scale.x; + tmp *= 10000.0f * scale.x; field_0x5c0 = tmp; - field_0x5c4 = current.pos.y + mScale.y * 100.0f; + field_0x5c4 = current.pos.y + scale.y * 100.0f; csXyz pos_angle; @@ -121,8 +121,8 @@ int daTagMstop_c::create() { ->mEntries[dComIfGp_getRoomCamera(room)->field_0x4[idx].field_0x10] .mPosition; - mEyePos.set(pos->x, pos->y, pos->z); - mAttentionInfo.mPosition = mEyePos; + eyePos.set(pos->x, pos->y, pos->z); + attention_info.position = eyePos; } shape_angle.y = fopAcM_searchPlayerAngleY(this); @@ -157,7 +157,7 @@ static int daTagMstop_Delete(daTagMstop_c* i_this) { /* 805A63C4-805A63F8 000304 0034+00 1/1 0/0 0/0 .text eventOrder__12daTagMstop_cFv */ void daTagMstop_c::eventOrder() { - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 0, 0); } @@ -212,9 +212,9 @@ int daTagMstop_c::execute() { daPy_py_c* player_p = daPy_getLinkPlayerActorClass(); if (checkNoAttention()) { - mAttentionInfo.mPosition = midna_p->mAttentionInfo.mPosition; + attention_info.position = midna_p->attention_info.position; shape_angle.y = midna_p->shape_angle.y; - mEyePos = mAttentionInfo.mPosition; + eyePos = attention_info.position; } else { shape_angle.y = fopAcM_searchPlayerAngleY(this); } @@ -238,7 +238,7 @@ int daTagMstop_c::execute() { player_p->i_changeDemoPos0(&field_0x5c8); } - } else if (mEvtInfo.checkCommandTalk()) { + } else if (eventInfo.checkCommandTalk()) { if (field_0x56e == 2) { if (!midna_p->checkShadowModelDraw() || midna_p->checkShadowReturnEnd()) { i_dComIfGp_getEvent().reset(this); @@ -312,14 +312,14 @@ extern actor_process_profile_definition g_profile_Tag_Mstop = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Mstop, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagMstop_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 257 , // mPriority - &l_daTagMstop_Method, // mSubMtd + &l_daTagMstop_Method, // sub_method 0x44000, // mStatus fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp b/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp index 9c075030e5..66e3aff1e8 100644 --- a/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp +++ b/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp @@ -38,7 +38,7 @@ int daTagMwait_c::create() { field_0x56d = 0; } - mScale *= 100.0f; + scale *= 100.0f; u32 wait_y_offset = (fopAcM_GetParam(this) >> 0x18) & 0xFF; if (wait_y_offset == 0 || wait_y_offset == 0xFF) { @@ -46,11 +46,11 @@ int daTagMwait_c::create() { } mWaitPosition.set(current.pos.x, current.pos.y + (wait_y_offset * 10.0f), current.pos.z); - mAttentionInfo.mPosition.set(mWaitPosition.x, mWaitPosition.y + 220.0f, mWaitPosition.z); - mEyePos.set(mWaitPosition.x, mWaitPosition.y + 150.0f, mWaitPosition.z); + attention_info.position.set(mWaitPosition.x, mWaitPosition.y + 220.0f, mWaitPosition.z); + eyePos.set(mWaitPosition.x, mWaitPosition.y + 150.0f, mWaitPosition.z); - mAttentionInfo.field_0x0[1] = 54; - mAttentionInfo.mFlags = 0; + attention_info.field_0x0[1] = 54; + attention_info.flags = 0; return cPhs_COMPLEATE_e; } @@ -79,9 +79,9 @@ int daTagMwait_c::execute() { return 1; } - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { if (!mEnteredTrigger || !midna_p->checkReturnAnime()) { if (!mInitMsgFlow) { mMsgFlow.init(this, (u16)shape_angle.z, 0, NULL); @@ -97,9 +97,9 @@ int daTagMwait_c::execute() { } } else if (mEnteredTrigger) { fopAcM_orderSpeakEvent(this, 0, 0); - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); - mAttentionInfo.mPosition = midna_p->mAttentionInfo.mPosition; - mEyePos = mAttentionInfo.mPosition; + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); + attention_info.position = midna_p->attention_info.position; + eyePos = attention_info.position; } else { mInitMsgFlow = false; @@ -117,9 +117,9 @@ int daTagMwait_c::execute() { } f32 player_dist = player_p->current.pos.abs2XZ(current.pos); - if ((player_dist <= mScale.x * mScale.x && + if ((player_dist <= scale.x * scale.x && player_p->current.pos.y >= current.pos.y && - player_p->current.pos.y <= current.pos.y + mScale.y) || + player_p->current.pos.y <= current.pos.y + scale.y) || i_fopAcM_isSwitch(this, mEnterSw)) { midna_p->offTagWaitPos(); @@ -129,17 +129,17 @@ int daTagMwait_c::execute() { if (shape_angle.z == 0) { fopAcM_delete(this); } else { - mAttentionInfo.mPosition = midna_p->mAttentionInfo.mPosition; - mEyePos = mAttentionInfo.mPosition; + attention_info.position = midna_p->attention_info.position; + eyePos = attention_info.position; fopAcM_orderSpeakEvent(this, 0, 0); - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); } } else if (field_0x570 > 0.0f && player_dist < field_0x570 && player_p->current.pos.y >= current.pos.y && - player_p->current.pos.y <= current.pos.y + mScale.y) + player_p->current.pos.y <= current.pos.y + scale.y) { - mAttentionInfo.mFlags = 2; - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + attention_info.flags = 2; + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); } } } diff --git a/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp b/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp index 80a5e8d86d..db1ded60d9 100644 --- a/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp +++ b/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp @@ -84,14 +84,14 @@ extern actor_process_profile_definition g_profile_TAG_MYNA2 = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_MYNA2, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagMyna2_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 394, // mPriority - &l_daTagMyna2_Method, // mSubMtd + &l_daTagMyna2_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp b/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp index 57f1cb7233..8e51939dd8 100644 --- a/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp +++ b/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp @@ -129,8 +129,8 @@ u32 daTag_MynaLight_c::getTurnOffTime() { */ void daTag_MynaLight_c::initialize() { fopAcM_setCullSizeBox(this, -30.0, -15.0, -30.0, 30.0, 45.0, 30.0); - mAttentionInfo.mFlags = 0; - current.angle.set(0, orig.angle.y, 0); + attention_info.flags = 0; + current.angle.set(0, home.angle.y, 0); shape_angle = current.angle; field_0x56c = 0.0f; mTurnOnFlag = false; diff --git a/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp b/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp index 01044ec83b..d0e90f49d1 100644 --- a/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp +++ b/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp @@ -50,7 +50,7 @@ int daTagPati_c::Execute() { void daTagPati_c::col_set() { mCyl.SetR(1350.f); mCyl.SetH(300000.0f); - mCyl.SetC(orig.pos); + mCyl.SetC(home.pos); dComIfG_Ccsp()->Set(&mCyl); } diff --git a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp index 64ab807687..1ea77e997e 100644 --- a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp +++ b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp @@ -88,14 +88,14 @@ extern actor_process_profile_definition g_profile_Tag_poFire = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_poFire, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagPoFire_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 649, // mPriority - &l_daTagPoFire_Method, // mSubMtd + &l_daTagPoFire_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp b/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp index a39fc49596..e021966df1 100644 --- a/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp +++ b/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp @@ -53,9 +53,9 @@ void* daTag_Push_c::srchActor(void* param_0, void* param_1) { /* 80490418-804904D4 0001D8 00BC+00 1/1 0/0 0/0 .text create__12daTag_Push_cFv */ int daTag_Push_c::create() { fopAcM_SetupActor(this, daTag_Push_c); - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z = mScale.x; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z = scale.x; if (isDelete()) { return cPhs_ERROR_e; } else { @@ -70,7 +70,7 @@ int daTag_Push_c::Delete() { /* 804904DC-804906BC 00029C 01E0+00 1/1 0/0 0/0 .text Execute__12daTag_Push_cFv */ int daTag_Push_c::Execute() { - if (orig.roomNo == dComIfGp_roomControl_getStayNo()) { + if (home.roomNo == dComIfGp_roomControl_getStayNo()) { fopAc_ac_c* actor = mActorMngr.getActorP(); if (isDelete()) { if (actor != NULL && fopAcM_GetName(actor) != PROC_NPC_JAGAR && @@ -89,7 +89,7 @@ int daTag_Push_c::Execute() { } } if (actor != NULL && - daPy_getPlayerActorClass()->mEvtInfo.chkCondition(dEvtCnd_CANTALK_e) != false) + daPy_getPlayerActorClass()->eventInfo.chkCondition(dEvtCnd_CANTALK_e) != false) { if (chkPointInArea(cXyz(daPy_getPlayerActorClass()->current.pos))) { if (fopAcM_GetName(actor) == PROC_NPC_GRS || @@ -104,9 +104,9 @@ int daTag_Push_c::Execute() { } } } - mAttentionInfo.mFlags = 0; - mAttentionInfo.mPosition = current.pos; - mEyePos = mAttentionInfo.mPosition; + attention_info.flags = 0; + attention_info.position = current.pos; + eyePos = attention_info.position; return 1; } } @@ -134,7 +134,7 @@ int daTag_Push_c::chkPointInArea(cXyz param_0) { if ((getBitSW() != 0xFF && dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this))) || getBitSW() == 0xFF) { - return daNpcT_chkPointInArea(param_0, current.pos, mScale, shape_angle.y, 1); + return daNpcT_chkPointInArea(param_0, current.pos, scale, shape_angle.y, 1); } else { return 0; } diff --git a/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp b/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp index 70faeb8290..f7bf4f1802 100644 --- a/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp +++ b/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp @@ -48,9 +48,9 @@ int daTagRetRm_c::execute() { /* 80D5F010-80D5F050 0001F0 0040+00 1/1 0/0 0/0 .text init__12daTagRetRm_cFv */ void daTagRetRm_c::init() { - field_0x56c = mScale.x * 50; - field_0x570 = mScale.y * 100; - field_0x574 = mScale.z * 50; + field_0x56c = scale.x * 50; + field_0x570 = scale.y * 100; + field_0x574 = scale.z * 50; field_0x578 = 0; } @@ -109,14 +109,14 @@ extern actor_process_profile_definition g_profile_Tag_RetRoom = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_RetRoom, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagRetRm_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 731, // mPriority - &daTagRetRm_METHODS, // mSubMtd + &daTagRetRm_METHODS, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp b/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp index 83e56f0982..d9e5389232 100644 --- a/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp +++ b/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp @@ -47,7 +47,7 @@ static char* l_evName = "RIVER_BACK"; /* 80D5F2F8-80D5F360 000078 0068+00 1/1 0/0 0/0 .text Create__16daTagRiverBack_cFv */ int daTagRiverBack_c::Create() { mMapToolID = -1; - mEvtInfo.setArchiveName(l_arcName); + eventInfo.setArchiveName(l_arcName); mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_evName, -1); return 1; } @@ -103,21 +103,21 @@ void daTagRiverBack_c::actionWait() { mCount = 0; setAction(ACTION_ORDER_EVENT_e); fopAcM_orderOtherEventId(this, mEventID, mMapToolID, 0xFFFF, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } /* 80D5F5BC-80D5F66C 00033C 00B0+00 1/0 0/0 0/0 .text actionOrderEvent__16daTagRiverBack_cFv */ void daTagRiverBack_c::actionOrderEvent() { daPy_py_c* player = daPy_getPlayerActorClass(); - if (mEvtInfo.checkCommandDemoAccrpt()) { + if (eventInfo.checkCommandDemoAccrpt()) { setAction(ACTION_EVENT_e); mStaffID = i_dComIfGp_evmng_getMyStaffId(l_staffName, NULL, 0); player->mNoResetFlg0 |= 0x10000; demoProc(); } else { fopAcM_orderOtherEventId(this, mEventID, mMapToolID, 0xFFFF, 0, 1); - mEvtInfo.i_onCondition(2); + eventInfo.i_onCondition(2); } } @@ -214,16 +214,16 @@ extern actor_process_profile_definition g_profile_Tag_RiverBack = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_RiverBack, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagRiverBack_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 556, // mPriority - &l_daTagRiverBack_Method, // mSubMtd + &l_daTagRiverBack_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; /* 80D5F950-80D5F950 00000C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp b/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp index 04a6971664..c0e33edf2c 100644 --- a/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp +++ b/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp @@ -80,9 +80,9 @@ int daTagRmbitSw_c::execute() { /* 80D5FDB8-80D5FDF0 000338 0038+00 1/1 0/0 0/0 .text init__14daTagRmbitSw_cFv */ void daTagRmbitSw_c::init() { - field_0x56c = mScale.x * 50.0f; - field_0x570 = mScale.y * 100.0f; - field_0x574 = mScale.z * 50.0f; + field_0x56c = scale.x * 50.0f; + field_0x570 = scale.y * 100.0f; + field_0x574 = scale.z * 50.0f; } /* 80D5FDF0-80D5FEEC 000370 00FC+00 1/1 0/0 0/0 .text chkPlyrInTag__14daTagRmbitSw_cFv */ diff --git a/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp b/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp index e041f40788..a824a3ef09 100644 --- a/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp +++ b/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp @@ -31,14 +31,14 @@ extern actor_process_profile_definition g_profile_Tag_Schedule = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Schedule, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagSchedule_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 396, // mPriority - &l_daTagSchedule_Method, // mSubMtd + &l_daTagSchedule_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp index b8670dc3ac..abf51e5841 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp +++ b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp @@ -11,17 +11,17 @@ /* 80D603F8-80D6048C 000078 0094+00 1/1 0/0 0/0 .text Create__14daTagRestart_cFv */ int daTagRestart_c::Create() { - field_0x56c[0].x = mScale.x * -100.0f; - field_0x56c[0].z = mScale.z * -100.0f; + field_0x56c[0].x = scale.x * -100.0f; + field_0x56c[0].z = scale.z * -100.0f; - field_0x56c[1].x = mScale.x * 100.0f; - field_0x56c[1].z = mScale.z * -100.0f; + field_0x56c[1].x = scale.x * 100.0f; + field_0x56c[1].z = scale.z * -100.0f; - field_0x56c[2].x = mScale.x * 100.0f; - field_0x56c[2].z = mScale.z * 100.0f; + field_0x56c[2].x = scale.x * 100.0f; + field_0x56c[2].z = scale.z * 100.0f; - field_0x56c[3].x = mScale.x * -100.0f; - field_0x56c[3].z = mScale.z * 100.0f; + field_0x56c[3].x = scale.x * -100.0f; + field_0x56c[3].z = scale.z * 100.0f; field_0x56c[3].y = 0.0f; field_0x56c[2].y = 0.0f; @@ -48,7 +48,7 @@ int daTagRestart_c::execute() { fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz player_pos = player->current.pos; - player_pos -= orig.pos; + player_pos -= home.pos; mDoMtx_stack_c::YrotS(-current.angle.y); mDoMtx_stack_c::multVec(&player_pos, &player_pos); @@ -60,15 +60,15 @@ int daTagRestart_c::execute() { cXyz pos_offset; s16 restart_angle; if (roomNo == daTagRestart_prm::getFRoomNo(this)) { - restart_angle = orig.angle.y; + restart_angle = home.angle.y; pos_offset.set(0.0f, 0.0f, 100.0f); } else { - restart_angle = orig.angle.y + 0x8000; + restart_angle = home.angle.y + 0x8000; pos_offset.set(0.0f, 0.0f, -100.0f); } pos_offset.y += 100.0f; - mDoMtx_stack_c::YrotS(orig.angle.y); + mDoMtx_stack_c::YrotS(home.angle.y); mDoMtx_stack_c::multVec(&pos_offset, &pos_offset); cXyz restart_pos = current.pos + pos_offset; diff --git a/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp b/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp index c463140e4b..5fc0544dac 100644 --- a/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp +++ b/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp @@ -35,8 +35,8 @@ int daTag_ShopCamera_c::Draw() { void daTag_ShopCamera_c::initialize() { fopAcM_setCullSizeBox(this,-30.0f,-15.0f,-30.0f,30.0f,45.0f,30.0f); - mAttentionInfo.mFlags = 0; - current.angle.set(0,orig.angle.y,0); + attention_info.flags = 0; + current.angle.set(0,home.angle.y,0); shape_angle = current.angle; } diff --git a/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp b/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp index 51e64cb288..6f287a9254 100644 --- a/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp +++ b/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp @@ -151,20 +151,20 @@ u8 daTag_ShopItem_c::getGroupID() { /* 80D61044-80D61050 000544 000C+00 3/3 0/0 1/1 .text getSwitchBit1__16daTag_ShopItem_cFv */ u8 daTag_ShopItem_c::getSwitchBit1() { - return orig.angle.z & 0xFF; + return home.angle.z & 0xFF; } /* 80D61050-80D6105C 000550 000C+00 3/3 0/0 0/0 .text getSwitchBit2__16daTag_ShopItem_cFv */ u8 daTag_ShopItem_c::getSwitchBit2() { - return orig.angle.z >> 8 & 0xFF; + return home.angle.z >> 8 & 0xFF; } /* 80D6105C-80D610E0 00055C 0084+00 1/1 0/0 0/0 .text initialize__16daTag_ShopItem_cFv */ void daTag_ShopItem_c::initialize() { fopAcM_setCullSizeBox(this, -30.0f, -15.0f, -30.0f, 30.0f, 45.0f, 30.0f); - mAttentionInfo.mFlags = 0; - current.angle.set(0, orig.angle.y, 0); + attention_info.flags = 0; + current.angle.set(0, home.angle.y, 0); shape_angle = current.angle; mProcessID = -1; } @@ -210,14 +210,14 @@ extern actor_process_profile_definition g_profile_TAG_SHOPITM = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_TAG_SHOPITM, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTag_ShopItem_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 75, // mPriority - &daTag_ShopItem_MethodTable, // mSubMtd + &daTag_ShopItem_MethodTable, // sub_method 0x64100, // mStatus 5, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp index f2863131c0..4a99d91088 100644 --- a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp +++ b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp @@ -105,14 +105,14 @@ extern actor_process_profile_definition g_profile_Tag_SmkEmt = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_SmkEmt, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagSmkEmt_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 743, // mPriority - &daTagSmkEmt_METHODS, // mSubMtd + &daTagSmkEmt_METHODS, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp b/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp index a48c2375f5..dde9481f79 100644 --- a/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp +++ b/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp @@ -40,8 +40,8 @@ void daTagSpinner_c::setBaseMtx() { /* 80D6191C-80D6196C 00029C 0050+00 1/1 0/0 0/0 .text Create__14daTagSpinner_cFv */ int daTagSpinner_c::Create() { initBaseMtx(); - mRadius = mScale.x * 100.0f; - field_0x56c = mScale.y * 100.0f; + mRadius = scale.x * 100.0f; + field_0x56c = scale.y * 100.0f; return 1; } @@ -118,14 +118,14 @@ extern actor_process_profile_definition g_profile_Tag_Spinner = { 3, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Spinner, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagSpinner_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 605, // mPriority - &l_daTagSpinner_Method, // mSubMtd + &l_daTagSpinner_Method, // sub_method 0x40100, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; \ No newline at end of file diff --git a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp index 34a3d45ed1..9134dda448 100644 --- a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp +++ b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp @@ -72,7 +72,7 @@ int daTagSpring_c::execute() { /* 805A6C84-805A6DFC 0002A4 0178+00 1/1 0/0 0/0 .text checkArea__13daTagSpring_cFv */ u8 daTagSpring_c::checkArea() { fopAc_ac_c* player_p = daPy_getPlayerActorClass(); - return player_p->current.pos.absXZ(current.pos) < (mScale.x * 1000); + return player_p->current.pos.absXZ(current.pos) < (scale.x * 1000); } /* 805A6DFC-805A6E04 00041C 0008+00 1/1 0/0 0/0 .text _delete__13daTagSpring_cFv */ @@ -110,14 +110,14 @@ extern actor_process_profile_definition g_profile_Tag_Spring = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Spring, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagSpring_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 587, // mPriority - &l_daTagSpring_Method, // mSubMtd + &l_daTagSpring_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp b/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp index 098e6e5bd7..12b59ff845 100644 --- a/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp +++ b/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp @@ -84,7 +84,7 @@ u8 daTag_SSDrink_c::getSwitchFromParam() { /* 80D62F8C-80D62FC8 00024C 003C+00 3/3 0/0 0/0 .text getFlowNodeNum__15daTag_SSDrink_cFv */ u16 daTag_SSDrink_c::getFlowNodeNum() { - u16 num = orig.angle.x; + u16 num = home.angle.x; bool bVar1 = false; if (num == 0xFFFF || num == 0) { bVar1 = true; @@ -107,7 +107,7 @@ u16 daTag_SSDrink_c::getValue() { /* 80D62FD4-80D63044 000294 0070+00 1/1 0/0 0/0 .text restart__15daTag_SSDrink_cFv */ void daTag_SSDrink_c::restart() { - current.angle.set(0, orig.angle.y, 0); + current.angle.set(0, home.angle.y, 0); shape_angle = current.angle; setProcess(&daTag_SSDrink_c::wait); } @@ -115,8 +115,8 @@ void daTag_SSDrink_c::restart() { /* 80D63044-80D630BC 000304 0078+00 1/1 0/0 0/0 .text initialize__15daTag_SSDrink_cFv */ void daTag_SSDrink_c::initialize() { fopAcM_setCullSizeBox(this, -30.0f, -15.0f, -30.0f, 30.0f, 45.0f, 30.0f); - mAttentionInfo.mFlags = 0; - mAttentionInfo.field_0x0[4] = 6; + attention_info.flags = 0; + attention_info.field_0x0[4] = 6; fopAcM_OnCarryType(this, fopAcM_CARRY_SIDE); restart(); Execute(); @@ -153,8 +153,8 @@ int daTag_SSDrink_c::setProcess(ProcessFunc i_processFunc) { /* 80D631D4-80D63208 000494 0034+00 1/1 0/0 0/0 .text setAttnPos__15daTag_SSDrink_cFv */ void daTag_SSDrink_c::setAttnPos() { - mAttentionInfo.mPosition = current.pos; - mEyePos = current.pos; + attention_info.position = current.pos; + eyePos = current.pos; } /* 80D63208-80D63384 0004C8 017C+00 1/1 0/0 0/0 .text chkEvent__15daTag_SSDrink_cFv */ @@ -162,7 +162,7 @@ int daTag_SSDrink_c::chkEvent() { int retVal = 1; if (!i_dComIfGp_getEvent().i_isOrderOK()) { retVal = 0; - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { if (!checkProcess(&daTag_SSDrink_c::talk) == 0) { retVal = (this->*mProcessFunc)(0); } else { @@ -171,7 +171,7 @@ int daTag_SSDrink_c::chkEvent() { } } return retVal; - } else if (mEvtInfo.i_checkCommandCatch()) { + } else if (eventInfo.i_checkCommandCatch()) { if (field_0x5D4 == 0) { if (getParentPtr() != NULL) { ((daMyna_c*)getParentPtr())->onEventFlag(0); @@ -190,16 +190,16 @@ int daTag_SSDrink_c::orderEvent() { if (!dComIfGp_getLinkPlayer()->i_checkWolf() && i_fopAcM_isSwitch(this, getSwitchFromParam()) && field_0x5D3 != 0x60 && getFlowNodeNum() != 0xFFFF) { - mAttentionInfo.mFlags = 0x40000008; + attention_info.flags = 0x40000008; } else { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; } - if (mAttentionInfo.mFlags == 0x40000008) { + if (attention_info.flags == 0x40000008) { if (fopAcM_searchPlayerDistanceXZ(this) <= 160.0f && fopAcM_seenPlayerAngleY() <= 0x2000) { - mAttentionInfo.field_0x0[1] = 0x9D; - mAttentionInfo.field_0x0[3] = 0x9D; - mEvtInfo.i_onCondition(1); + attention_info.field_0x0[1] = 0x9D; + attention_info.field_0x0[3] = 0x9D; + eventInfo.i_onCondition(1); } } @@ -210,16 +210,16 @@ int daTag_SSDrink_c::orderEvent() { int daTag_SSDrink_c::wait(void* param_0) { switch (mEventType) { case 1: - if (!mEvtInfo.i_checkCommandCatch()) { + if (!eventInfo.i_checkCommandCatch()) { if (i_fopAcM_isSwitch(this, getSwitchFromParam())) { if (fopAcM_searchPlayerDistanceXZ(this) <= 160.0f && fopAcM_seenPlayerAngleY() <= 0x2000) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - cXyz local_28 = mAttentionInfo.mPosition - player->mAttentionInfo.mPosition; + cXyz local_28 = attention_info.position - player->attention_info.position; dComIfGp_att_CatchRequest(this, field_0x5D3, 200.0f, local_28.y + 100.0f, local_28.y - 100.0f, 0x4000, 1); - mEvtInfo.i_onCondition(0x40); + eventInfo.i_onCondition(0x40); } if (field_0x5D4 != 0) { field_0x5D4 = 0; diff --git a/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp b/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp index 8b075be31b..64d8b3bc7c 100644 --- a/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp +++ b/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp @@ -18,9 +18,9 @@ int daTagStream_c::create() { fopAcM_GetParam(this) >> 24 != 0 ? mParameters = 0 : mParameters = 1; - mScale.x *= 100.0f; - mScale.y *= 100.0f; - mScale.z *= 100.0f; + scale.x *= 100.0f; + scale.y *= 100.0f; + scale.z *= 100.0f; if (m_top) { daTagStream_c* top = m_top; @@ -124,14 +124,14 @@ extern actor_process_profile_definition g_profile_Tag_Stream = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_Stream, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagStream_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 259, // mPriority - &l_daTagStream_Method, // mSubMtd + &l_daTagStream_Method, // sub_method 0x44000, // mStatus fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp b/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp index 5673f3e9e8..8566b0e9b3 100644 --- a/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp +++ b/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp @@ -36,14 +36,14 @@ extern actor_process_profile_definition g_profile_Tag_TheBHint = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_TheBHint, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagTheBHint_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 265, // mPriority - &l_daTagTheBHint_Method, // mSubMtd + &l_daTagTheBHint_Method, // sub_method 0x40000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + fopAc_CULLBOX_CUSTOM_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp index 1e42d6030f..e786698c53 100644 --- a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp +++ b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp @@ -34,11 +34,11 @@ int daTagWrHowl_c::draw() { /* 80D6403C-80D64090 00017C 0054+00 1/1 0/0 0/0 .text execute__13daTagWrHowl_cFv */ int daTagWrHowl_c::execute() { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; if (chkWlfInTag()) { - mAttentionInfo.mFlags |= 0x80; - mAttentionInfo.field_0x0[7] = 65; + attention_info.flags |= 0x80; + attention_info.field_0x0[7] = 65; } return 1; @@ -46,7 +46,7 @@ int daTagWrHowl_c::execute() { /* 80D64090-80D640B4 0001D0 0024+00 1/1 0/0 0/0 .text init__13daTagWrHowl_cFv */ void daTagWrHowl_c::init() { - field_0x56c = 50.0f * mScale.x; + field_0x56c = 50.0f * scale.x; field_0x570 = field_0x56c * field_0x56c; } diff --git a/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp b/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp index f0be42813d..b7a60d2004 100644 --- a/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp +++ b/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp @@ -108,14 +108,14 @@ extern actor_process_profile_definition g_profile_Tag_WatchGe = { 7, // mListID fpcPi_CURRENT_e, // mListPrio PROC_Tag_WatchGe, // mProcName - &g_fpcLf_Method.mBase, // mSubMtd + &g_fpcLf_Method.mBase, // sub_method sizeof(daTagWatchGe_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopAc_Method.base, // mSubMtd + &g_fopAc_Method.base, // sub_method 193, // mPriority - &l_daTagWatchGe_Method, // mSubMtd + &l_daTagWatchGe_Method, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // mCullType + fopAc_CULLBOX_0_e, // cullType }; diff --git a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp index 8d2583f9e4..1d3366fc2e 100644 --- a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp +++ b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp @@ -114,7 +114,7 @@ bool daTagWaterFall_c::checkHitWaterFall(cXyz objPos) { f32 ellipseRadiusA = mCylinderRadiusA; - mDoMtx_stack_c::YrotS(-fopAcM_GetShapeAngle_p(this).y); + mDoMtx_stack_c::YrotS(-fopAcM_GetShapeAngle_p(this)->y); const cXyz& waterfallTagPos = fopAcM_GetPosition(this); mDoMtx_stack_c::transM(-waterfallTagPos.x, -waterfallTagPos.y, -waterfallTagPos.z); @@ -264,14 +264,14 @@ cPhs__Step daTagWaterFall_c::create() { mCylinderHeight = 0.0f; } - mCylinderRadiusB = static_cast((fopAcM_GetAngle_p(this).x & 0x0000FFFF)); + mCylinderRadiusB = static_cast((fopAcM_GetAngle_p(this)->x & 0x0000FFFF)); if (mCylinderRadiusB <= 0.0f) { mCylinderRadiusB = mCylinderRadiusA; } - fopAcM_GetShapeAngle_p(this).x = 0; - fopAcM_GetAngle_p(this).x = 0; + fopAcM_GetShapeAngle_p(this)->x = 0; + fopAcM_GetAngle_p(this)->x = 0; if (m_master_id + (1 << 16) == 0xFFFF) { u32 id = fopAcM_GetID(this); diff --git a/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp b/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp index 8be41d128a..54f6d74f15 100644 --- a/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp +++ b/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp @@ -71,8 +71,8 @@ int daTagWljump_c::create() { return 5; } - mAttentionInfo.field_0x0[0] = 0x32; - mAttentionInfo.field_0x0[7] = 0x32; + attention_info.field_0x0[0] = 0x32; + attention_info.field_0x0[7] = 0x32; shape_angle.z = 0; field_0x568 = -1; field_0x56c[0] = (fopAcM_GetParam(this) >> 16) & 0xf; @@ -109,7 +109,7 @@ static int daTagWljump_Delete(daTagWljump_c* param_0) { // reg swap #ifdef NONMATCHING int daTagWljump_c::execute() { - mAttentionInfo.mFlags = 0; + attention_info.flags = 0; if (field_0x56c[1]) { field_0x56c[1]--; } @@ -121,7 +121,7 @@ int daTagWljump_c::execute() { return 1; } - if (mEvtInfo.checkCommandTalk()) { + if (eventInfo.checkCommandTalk()) { s32 bVar2 = 1; if (!midnaActor->checkShadowModeTalkWait()) { if (shape_angle.x != 0 && @@ -141,7 +141,7 @@ int daTagWljump_c::execute() { } } else { field_0x568 = field_0x570; - if (midnaActor->current.pos.abs(mEyePos) < 5.0f) { + if (midnaActor->current.pos.abs(eyePos) < 5.0f) { bVar2 = 0; } } @@ -219,9 +219,9 @@ int daTagWljump_c::execute() { } if (field_0x568 >= 0) { dStage_dPnt_c* pPoint = &field_0x5c4->m_points[field_0x568]; - mEyePos.set(pPoint->m_position.x, pPoint->m_position.y, pPoint->m_position.z); - mAttentionInfo.mPosition = mEyePos; - mAttentionInfo.mPosition.y += 220.0f; + eyePos.set(pPoint->m_position.x, pPoint->m_position.y, pPoint->m_position.z); + attention_info.position = eyePos; + attention_info.position.y += 220.0f; field_0x5c8 = pPoint->field_0x3 * 10.0f; if (pPoint->field_0x1 == 1) { shape_angle.z = 1; @@ -230,9 +230,9 @@ int daTagWljump_c::execute() { } if (field_0x572 == 0) { if (!g_dComIfG_gameInfo.play.getEvent().runCheck()) { - mEvtInfo.i_onCondition(dEvtCnd_CANTALK_e); + eventInfo.i_onCondition(dEvtCnd_CANTALK_e); if (!linkPlayer->checkPlayerFly() && - linkPlayer->mEvtInfo.chkCondition(dEvtCnd_CANTALK_e)) { + linkPlayer->eventInfo.chkCondition(dEvtCnd_CANTALK_e)) { dComIfGp_att_ZHintRequest(this, 0x1ff); if (field_0x56c[2] == 0) { field_0x56c[2] = 1; @@ -246,7 +246,7 @@ int daTagWljump_c::execute() { field_0x570 = field_0x568; field_0x568 = -1; } else { - mAttentionInfo.mFlags |= 0x81; + attention_info.flags |= 0x81; } } else { field_0x572 = 0; @@ -255,8 +255,8 @@ int daTagWljump_c::execute() { field_0x572 = 0; field_0x568 = -1; } - current.pos = mAttentionInfo.mPosition; - if (!mEvtInfo.chkCondition(dEvtCnd_CANTALK_e)) { + current.pos = attention_info.position; + if (!eventInfo.chkCondition(dEvtCnd_CANTALK_e)) { field_0x56c[2] = 0; } diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index b0938336c6..892a54ebd3 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -12701,7 +12701,7 @@ void daAlink_c::playerInit() { mAnmHeap9.createHeap(daPy_anmHeap_c::HEAP_TYPE_3); resetBasAnime(); - mZ2Link.init(¤t.pos, &mEyePos, &field_0x3720); + mZ2Link.init(¤t.pos, &eyePos, &field_0x3720); mZ2Link.initKantera(&mKandelaarFlamePos); mZ2Link.setKanteraState(0); mProcID = 0x160; @@ -12785,7 +12785,7 @@ void daAlink_c::playerInit() { field_0x2f97 = -1; for (int i = 0; i < 0x10; i++) { - field_0x28b0[i] = -1; + mShieldArrowIDs[i] = -1; } mAtnActorID = -1; mMsgClassID = -1; @@ -12908,16 +12908,16 @@ int daAlink_c::create() { if ((!checkBossOctaIealRoom() && dComIfGs_Wolf_Change_Check() == 1) || startPoint == -4 || sceneMode == 9) { - mAttentionInfo.mPosition.set(current.pos.x + cM_ssin(shape_angle.y) * 70.0f, + attention_info.position.set(current.pos.x + cM_ssin(shape_angle.y) * 70.0f, current.pos.y + 80.0f, current.pos.z + cM_scos(shape_angle.y) * 70.0f); i_onNoResetFlg1(FLG1_IS_WOLF); } else if (horseStart) { - mAttentionInfo.mPosition.y = current.pos.y + 150.0f; + attention_info.position.y = current.pos.y + 150.0f; } else { - mAttentionInfo.mPosition.y = current.pos.y + 275.0f; + attention_info.position.y = current.pos.y + 275.0f; } - mAttentionInfo.mFlags = -1; + attention_info.flags = -1; if (!i_dComIfGp_getEventManager().dataLoaded()) { return cPhs_INIT_e; @@ -13089,7 +13089,7 @@ s32 daAlink_c::setRoomInfo() { roomID = dComIfG_Bgsp().GetRoomId(mLinkAcch.m_gnd); if (roomID != fopAcM_GetRoomNo(this)) { - mTevStr.mRoomNo = roomID; + tevStr.mRoomNo = roomID; mVoiceReverbIntensity = dComIfGp_getReverb(roomID); field_0x814.SetRoomId(roomID); fopAcM_SetRoomNo(this, roomID); @@ -13100,7 +13100,7 @@ s32 daAlink_c::setRoomInfo() { roomID = fopAcM_GetRoomNo(this); } - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mLinkAcch.m_gnd); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mLinkAcch.m_gnd); field_0x3174 = dComIfG_Bgsp().GetGroundCode(mLinkAcch.m_gnd); field_0x2fbb = dComIfG_Bgsp().GetPolyAtt0(mLinkAcch.m_gnd); field_0x2fa8 = dComIfG_Bgsp().GetSpecialCode(mLinkAcch.m_gnd); @@ -13726,7 +13726,7 @@ BOOL daAlink_c::checkNoCollisionCorret() { (!strcmp(i_dComIfGp_getEventManager().getRunEventName(), "SCENE_EXIT") || (fopAcM_getTalkEventPartner(this) && fopAcM_getTalkEventPartner(this) == getMidnaActor()))) || - mEvtInfo.i_checkCommandDoor()) + eventInfo.i_checkCommandDoor()) { return true; } @@ -13740,7 +13740,7 @@ void daAlink_c::decSwordBlur() { m_swordBlur.field_0x14 = 0; } else { m_swordBlur.field_0x14 -= 10; - m_swordBlur.traceBlur(¤t.pos, &next.pos, shape_angle.y - field_0x2fe6); + m_swordBlur.traceBlur(¤t.pos, &old.pos, shape_angle.y - field_0x2fe6); } } @@ -15062,7 +15062,7 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 i_angle, int param_2 if (checkEventRun() || param_2 != 0 || mSpecialMode != 0) { if (p_pos != NULL) { current.pos = *p_pos; - next.pos = current.pos; + old.pos = current.pos; field_0x3798 = current.pos; i_onEndResetFlg0(ERFLG0_UNK_800000); i_onEndResetFlg2(ERFLG2_UNK_100); @@ -15105,7 +15105,7 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, csXyz const* p_angle) { if (checkEventRun() || mSpecialMode != 0) { if (p_pos != NULL) { current.pos = *p_pos; - next.pos = current.pos; + old.pos = current.pos; field_0x3798 = current.pos; i_onEndResetFlg0(ERFLG0_UNK_800000); i_onEndResetFlg2(ERFLG2_UNK_100); @@ -15128,7 +15128,7 @@ void daAlink_c::setPlayerPosAndAngle(Mtx param_0) { current.pos.x = param_0[0][3]; current.pos.y = param_0[1][3]; current.pos.z = param_0[2][3]; - next.pos = current.pos; + old.pos = current.pos; field_0x3798 = current.pos; i_onEndResetFlg0(ERFLG0_UNK_800000); i_onEndResetFlg2(ERFLG2_UNK_100); @@ -15204,7 +15204,7 @@ void daAlink_c::setStickData() { u32 demoMode = mDemo.getDemoMode(); if (checkDemoMoveMode(demoMode)) { - if (dDemo_c::m_object->getActor(mDemoActorId) != NULL) { + if (dDemo_c::m_object->getActor(demoActorID) != NULL) { field_0x33a8 = 1.0f; } else { field_0x33a8 = mDemo.getStick(); @@ -15682,21 +15682,21 @@ BOOL daAlink_c::setTalkStatus() { if (notTalk()) { setDoStatus(0x90); } else { - if (field_0x27f4->mAttentionInfo.mFlags & 0x2000000) { + if (field_0x27f4->attention_info.flags & 0x2000000) { return 0; } - if (field_0x27f4->mAttentionInfo.mFlags & 0x800000) { + if (field_0x27f4->attention_info.flags & 0x800000) { setDoStatus(0x3B); - } else if (field_0x27f4->mAttentionInfo.mFlags & 0x20000000) { + } else if (field_0x27f4->attention_info.flags & 0x20000000) { if (fopAcM_GetName(field_0x27f4) == PROC_OBJ_SSDRINK) { setDoStatus(0x3C); } else { setDoStatus(8); } - } else if (field_0x27f4->mAttentionInfo.mFlags & 0x40000000) { + } else if (field_0x27f4->attention_info.flags & 0x40000000) { setDoStatus(0x80); - } else if (field_0x27f4->mAttentionInfo.mFlags & 0x8000000) { + } else if (field_0x27f4->attention_info.flags & 0x8000000) { setDoStatus(0x1B); } else { setDoStatus(0x1C); @@ -17332,8 +17332,8 @@ void daAlink_c::setSpecialGravity(f32 i_gravity, f32 i_speed, int i_offFlag) { i_onNoResetFlg3(FLG3_UNK_4000); } - mGravity = i_gravity; - mMaxFallSpeed = i_speed; + gravity = i_gravity; + maxFallSpeed = i_speed; } /* 800BB7A0-800BBD40 0B60E0 05A0+00 1/1 0/0 0/0 .text transAnimeProc__9daAlink_cFP4cXyzff @@ -17505,14 +17505,14 @@ void daAlink_c::posMove() { speed.y = -var_f31 * cM_ssin(var_r26); } else if ((checkBootsOrArmorHeavy() && mProcID != PROC_DEAD) || mProcID == PROC_SWIM_DIVE) { - speed.y += mGravity; + speed.y += gravity; - if (speed.y < mMaxFallSpeed) { - speed.y = mMaxFallSpeed; + if (speed.y < maxFallSpeed) { + speed.y = maxFallSpeed; } } else if (speed.y > daAlinkHIO_swim_c0::m.mMaxFloatUpSpeed) { - speed.y += mGravity; - } else if (speed.y < mMaxFallSpeed) { + speed.y += gravity; + } else if (speed.y < maxFallSpeed) { speed.y += 1.0f; } else { if (checkZoraWearAbility() && @@ -17535,24 +17535,24 @@ void daAlink_c::posMove() { if (checkHeavyStateOn(1, 1) && mProcID != PROC_SPINNER_READY && !i_checkNoResetFlg0(FLG0_UNDERWATER)) { - speed.y += mGravity * 2.25f; + speed.y += gravity * 2.25f; - if (speed.y < mMaxFallSpeed * 1.5f) { - speed.y = mMaxFallSpeed * 1.5f; + if (speed.y < maxFallSpeed * 1.5f) { + speed.y = maxFallSpeed * 1.5f; } } else { - speed.y += mGravity; + speed.y += gravity; - if (speed.y < mMaxFallSpeed) { - speed.y = mMaxFallSpeed; + if (speed.y < maxFallSpeed) { + speed.y = maxFallSpeed } } } else if (checkBoardRide()) { mLinkAcch.OffLineCheck(); - speed.y += mGravity; + speed.y += gravity; - if (speed.y < mMaxFallSpeed) { - speed.y = mMaxFallSpeed; + if (speed.y < maxFallSpeed) { + speed.y = maxFallSpeed; } } @@ -17587,7 +17587,7 @@ void daAlink_c::posMove() { if (i_getSumouMode() && mProcID != PROC_SUMOU_WIN_LOSE) { current.pos.y = var_f31 - 1.0f; - speed.y = mGravity; + speed.y = gravity; } field_0x342c = 0.0f; @@ -18050,8 +18050,8 @@ int daAlink_c::checkSceneChange(int exitID) { if (hStop->getActiveFlg()) { fpoAcM_relativePos(hStop, ¤t.pos, &sp8); - if (sp8.y >= -200.0f && sp8.y <= hStop->mScale.y + 600.0f && - fabsf(sp8.x) <= hStop->mScale.x && fabsf(sp8.z) <= hStop->mScale.z) + if (sp8.y >= -200.0f && sp8.y <= hStop->scale.y + 600.0f && + fabsf(sp8.x) <= hStop->scale.x && fabsf(sp8.z) <= hStop->scale.z) { return 0; } @@ -18107,7 +18107,7 @@ int daAlink_c::checkSceneChange(int exitID) { exitMode = 0; } - if (mEvtInfo.i_checkCommandDoor() || mProcID == PROC_WARP || mProcID == WOLF_DIG || + if (eventInfo.i_checkCommandDoor() || mProcID == PROC_WARP || mProcID == WOLF_DIG || mProcID == PROC_WOLF_DIG_THROUGH || field_0x3106 != 0 || dComIfGp_event_compulsory(this, NULL, -1)) { @@ -18141,7 +18141,7 @@ int daAlink_c::checkSceneChange(int exitID) { if (sceneChanged) { i_onNoResetFlg0(FLG0_UNK_4000); - if (!mEvtInfo.i_checkCommandDoor()) { + if (!eventInfo.i_checkCommandDoor()) { mDemo.setOriginalDemoType(); if (checkUpperReadyThrowAnime()) { @@ -19162,7 +19162,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { if (temp_r31 && (mItemAcKeep.getActor() == NULL || - mItemAcKeep.getActor()->mEvtInfo.i_checkCommandDemoAccrpt()) && + mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt()) && !i_checkEndResetFlg0(ERFLG0_UNK_1000)) { deleteEquipItem(0, 0); diff --git a/src/d/a/d_a_alink_bottle.inc b/src/d/a/d_a_alink_bottle.inc index f2eb15aeab..d587677392 100644 --- a/src/d/a/d_a_alink_bottle.inc +++ b/src/d/a/d_a_alink_bottle.inc @@ -618,7 +618,7 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) { BOOL temp_r3; s16 temp_r30; if (var_r31 != NULL) { - if (var_r31->mAttentionInfo.mPosition.y > field_0x3834.y - 30.0f) { + if (var_r31->attention_info.position.y > field_0x3834.y - 30.0f) { temp_r3 = false; } else { temp_r3 = true; @@ -697,7 +697,7 @@ int daAlink_c::procBottleSwing() { daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl; if (mProcVar2.field_0x300c == 0) { - if (mEvtInfo.i_checkCommandCatch()) { + if (eventInfo.i_checkCommandCatch()) { if (mProcVar3.field_0x300e.x == 0) { dComIfGp_getVibration().StartShock(1, 1, cXyz(0.0f, 1.0f, 0.0f)); mProcVar3.field_0x300e.x = 1; diff --git a/src/d/a/d_a_alink_canoe.inc b/src/d/a/d_a_alink_canoe.inc index 67351d57bb..1ac9a578a7 100644 --- a/src/d/a/d_a_alink_canoe.inc +++ b/src/d/a/d_a_alink_canoe.inc @@ -258,7 +258,7 @@ int daAlink_c::procCanoeRideInit() { daAlinkHIO_wallCatch_c0::m.mClimbStartFrame, daAlinkHIO_wallCatch_c0::m.mClimbAnm.mEndFrame, daAlinkHIO_wallCatch_c0::m.mClimbAnm.mInterpolation); - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; @@ -330,7 +330,7 @@ int daAlink_c::procCanoeJumpRideInit(fopAc_ac_c* param_0) { deleteEquipItem(0, 0); mRideAcKeep.setData(canoe); - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; diff --git a/src/d/a/d_a_alink_cut.inc b/src/d/a/d_a_alink_cut.inc index 1bd01c8cc4..ffe0a198c5 100644 --- a/src/d/a/d_a_alink_cut.inc +++ b/src/d/a/d_a_alink_cut.inc @@ -134,8 +134,8 @@ bool daAlink_c::checkCutFastReady() { if (i_checkModeFlg(1) && !i_checkRideOn() && i_checkSwordGet() && i_checkModeFlg(4) && !i_checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p)) { - f32 xz_dist = target_p->mEyePos.abs2XZ(current.pos); - f32 y_dist = fabsf(target_p->mEyePos.y - current.pos.y); + f32 xz_dist = target_p->eyePos.abs2XZ(current.pos); + f32 y_dist = fabsf(target_p->eyePos.y - current.pos.y); if ((xz_dist < 160000.0f && y_dist < 300.0f) || (i_checkNoResetFlg0(FLG0_UNK_1000000) && xz_dist < 202500.0f && y_dist < 350.0f)) @@ -751,19 +751,19 @@ void daAlink_c::setCutJumpSpeed(int i_airAt) { } if (mTargetedActor != NULL && !i_airAt) { - shape_angle.y = cLib_targetAngleY(¤t.pos, &mTargetedActor->mEyePos); - cXyz targetPos(mTargetedActor->mEyePos.x - (cM_ssin(shape_angle.y) * 70.0f), - mTargetedActor->mEyePos.y + 50.0f, - mTargetedActor->mEyePos.z - (cM_scos(shape_angle.y) * 70.0f)); + shape_angle.y = cLib_targetAngleY(¤t.pos, &mTargetedActor->eyePos); + cXyz targetPos(mTargetedActor->eyePos.x - (cM_ssin(shape_angle.y) * 70.0f), + mTargetedActor->eyePos.y + 50.0f, + mTargetedActor->eyePos.z - (cM_scos(shape_angle.y) * 70.0f)); if (fopAcM_gc_c::gndCheck(&targetPos)) { targetPos.y = fopAcM_gc_c::getGroundY(); } else { - targetPos.y = mTargetedActor->mEyePos.y; + targetPos.y = mTargetedActor->eyePos.y; } - f32 dvar12 = speed.y + mGravity; - f32 dvar10 = 1.0f / mGravity; + f32 dvar12 = speed.y + gravity; + f32 dvar10 = 1.0f / gravity; f32 fvar1 = targetPos.y - (current.pos.y - (dvar10 * (dvar12 * dvar12) * 0.5f)); if (fvar1 > 0.0f) { @@ -1948,8 +1948,8 @@ int daAlink_c::procCutDownInit() { speed.y *= 1.5f; } - f32 var_f4 = speed.y + mGravity; - f32 var_f5 = 1.0f / mGravity; + f32 var_f4 = speed.y + gravity; + f32 var_f5 = 1.0f / gravity; f32 temp_f1 = sp2C.y - (current.pos.y - var_f5 * (var_f4 * var_f4) * 0.5f); if (temp_f1 > 0.0f) { @@ -2128,7 +2128,7 @@ int daAlink_c::procCutHeadInit() { commonProcInit(PROC_CUT_HEAD); resetCombo(1); setSingleAnimeParam(ANM_CUT_HEAD_JUMP, &daAlinkHIO_cutHead_c0::m.mJumpAnm); - setSpecialGravity(daAlinkHIO_cutHead_c0::m.mGravity, mMaxFallSpeed, 0); + setSpecialGravity(daAlinkHIO_cutHead_c0::m.mGravity, maxFallSpeed, 0); cXyz sp2C; if (enemy_p != NULL) { @@ -2140,8 +2140,8 @@ int daAlink_c::procCutHeadInit() { } f32 fvar9 = cLib_minMaxLimit(sp2C.y, 30.0f, daAlinkHIO_cutHead_c0::m.mMaxHeight); - f32 fvar10 = JMAFastSqrt((fvar9 * -2.0f) / mGravity); - speed.y = fvar10 * -mGravity; + f32 fvar10 = JMAFastSqrt((fvar9 * -2.0f) / gravity); + speed.y = fvar10 * -gravity; f32 fvar5 = sp2C.absXZ(); if (fvar5 > daAlinkHIO_cutHead_c0::m.mMaxDistance) { @@ -2183,7 +2183,7 @@ int daAlink_c::procCutHead() { f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; speed.y = tmp_0; - setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + setSpecialGravity(tmp_0, maxFallSpeed, 0); mProcVar3.field_0x300e.x = 1; setCutWaterDropEffect(); setSwordVoiceSe(Z2SE_AL_V_KABUTO_ATK); diff --git a/src/d/a/d_a_alink_demo.inc b/src/d/a/d_a_alink_demo.inc index 3601237f10..19429e90f9 100644 --- a/src/d/a/d_a_alink_demo.inc +++ b/src/d/a/d_a_alink_demo.inc @@ -560,7 +560,7 @@ void daAlink_c::setDemoData() { mMidnaTalkDelayTimer--; } } else { - dDemo_actor_c* demo_actor_p = dDemo_c::getActor(mDemoActorId); + dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID); cXyz* pos_p = NULL; s16 angle; u32 demo_mode = 1; @@ -731,7 +731,7 @@ void daAlink_c::setDemoData() { if (mDemo.getTimer() != 0) { mDemo.decTimer(); - cXyz tmp_sp = current.pos - orig.pos; + cXyz tmp_sp = current.pos - home.pos; if (tmp_sp.abs2XZ() > 90000.0f) { mDemo.setTimer(0); dComIfGp_evmng_cutEnd(field_0x3184); @@ -1101,7 +1101,7 @@ void daAlink_c::setShapeAngleToTalkActor() { { s16 target; if (partner_name == PROC_Tag_Mhint || partner_name == PROC_Tag_Mstop) { - target = cLib_targetAngleY(¤t.pos, &partner_p->mEyePos); + target = cLib_targetAngleY(¤t.pos, &partner_p->eyePos); } else { target = fopAcM_searchActorAngleY(this, partner_p); } @@ -1137,7 +1137,7 @@ u8 daAlink_c::setTradeItemAnime() { } u32 partner_id = fopAcM_createItemForPresentDemo( - ¤t.pos, item_no, 3, -1, fopAcM_GetRoomNo(this), &shape_angle, &mScale); + ¤t.pos, item_no, 3, -1, fopAcM_GetRoomNo(this), &shape_angle, &scale); dComIfGp_event_setItemPartnerId(partner_id); } @@ -1253,7 +1253,7 @@ void daAlink_c::setDemoBodyBck(dDemo_actor_c* param_0, u16 param_1) { mNowAnmPackUnder[0].setAnmTransform(bck); mNowAnmPackUpper[0].setAnmTransform(bck); - dDemo_actor_c* demo_actor_p = dDemo_c::getActor(mDemoActorId); + dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID); if (demo_actor_p->checkEnable(0x80)) { field_0x2060->initOldFrameMorf(demo_actor_p->getPrm_Morf(), 0, field_0x30c6); } @@ -1402,7 +1402,7 @@ asm void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16 #ifdef NONMATCHING f32 daAlink_c::setStickAnmData(J3DAnmBase* i_anm, int param_1, int param_2, u16 param_3, int param_4) { - dDemo_actor_c* demo_actor_p = dDemo_c::getActor(mDemoActorId); + dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID); f32 var_f31; if (i_anm != NULL) { @@ -1540,7 +1540,7 @@ int daAlink_c::procCoToolDemoInit() { // matches with literals #ifdef NONMATCHING int daAlink_c::procCoToolDemo() { - dDemo_actor_c* demo_actor_p = dDemo_c::getActor(mDemoActorId); + dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID); BOOL var_r29 = 0; i_onEndResetFlg1(ERFLG1_GANON_FINISH); @@ -1622,7 +1622,7 @@ int daAlink_c::procCoToolDemo() { mProcVar2.field_0x300c = 2; } else { field_0x3484 = 0.0f; - mTevStr.field_0x344 = 0.0f; + tevStr.field_0x344 = 0.0f; field_0x347c = -0.5f; if (i_checkWolf()) { @@ -2697,7 +2697,7 @@ int daAlink_c::procCoLookWait() { if (look_actor_p != NULL) { s16 target_angle; - s16 svar1 = cLib_targetAngleY(&field_0x34e0, &look_actor_p->mEyePos) - shape_angle.y; + s16 svar1 = cLib_targetAngleY(&field_0x34e0, &look_actor_p->eyePos) - shape_angle.y; if (svar1 > 0x6000) { target_angle = shape_angle.y + 0x6000; @@ -2783,7 +2783,7 @@ int daAlink_c::procMonkeyMoveInit() { } current.angle.y = shape_angle.y; - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); f32 tmp_0 = FLOAT_LABEL(lit_6108); speed.y = tmp_0; @@ -3150,7 +3150,7 @@ int daAlink_c::procCoCaughtInit() { f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; speed.y = tmp_0; - setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + setSpecialGravity(tmp_0, maxFallSpeed, 0); mBodyAngle.z = 0; return 1; } @@ -3572,7 +3572,7 @@ int daAlink_c::procCoTwGateInit() { field_0x33b0 = field_0x3588.y; mNormalSpeed = 0.0f; - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); speed.y = 0.0f; return 1; } @@ -3683,7 +3683,7 @@ int daAlink_c::procZoraMoveInit() { f32 tmp_0 = FLOAT_LABEL(lit_6108); speed.y = tmp_0; mNormalSpeed = tmp_0; - setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + setSpecialGravity(tmp_0, maxFallSpeed, 0); deleteEquipItem(FALSE, TRUE); mProcVar3.field_0x300e.y = 5000; @@ -3928,7 +3928,7 @@ asm int daAlink_c::procNotUseItemInit(int param_0) { int daAlink_c::procNotUseItem() { if (mProcVar2.field_0x300c == 0) { u32 item_partner_id = fopAcM_createItemForPresentDemo( - ¤t.pos, field_0x3198, 5, -1, fopAcM_GetRoomNo(this), &shape_angle, &mScale); + ¤t.pos, field_0x3198, 5, -1, fopAcM_GetRoomNo(this), &shape_angle, &scale); dComIfGp_event_setItemPartnerId(item_partner_id); mProcVar2.field_0x300c = 1; } @@ -4232,7 +4232,7 @@ int daAlink_c::procDungeonWarpInit() { mProcVar2.field_0x300c = 0; mProcVar3.field_0x300e.z = 0; - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); mProcVar3.field_0x300e.x = 0; mProcVar3.field_0x300e.y = 0; @@ -4253,21 +4253,21 @@ int daAlink_c::procDungeonWarp() { f32 sin = cM_ssin(mProcVar2.field_0x300c); shape_angle.y += (s16)(14336.0f * sin); - mProcVar3.field_0x300e.x = 8.0f * sin + 24.0f * (1.0f - mScale.x); + mProcVar3.field_0x300e.x = 8.0f * sin + 24.0f * (1.0f - scale.x); if (mProcVar3.field_0x300e.z != 0) { return 1; } else { if (mProcVar2.field_0x300c == 0x4000) { if (mProcVar3.field_0x300e.y == 0) { - dComIfGp_particle_set(0xA61, ¤t.pos, &mTevStr, NULL, NULL); + dComIfGp_particle_set(0xA61, ¤t.pos, &tevStr, NULL, NULL); mProcVar3.field_0x300e.y = 1; } - cLib_addCalc(&mScale.x, 0.0f, 0.5f, 0.4f, 0.005f); - cLib_addCalc(&mScale.y, 2.5f, 0.5f, 0.5f, 0.1f); + cLib_addCalc(&scale.x, 0.0f, 0.5f, 0.4f, 0.005f); + cLib_addCalc(&scale.y, 2.5f, 0.5f, 0.5f, 0.1f); - if (mScale.x < 0.01f) { + if (scale.x < 0.01f) { i_onNoResetFlg0(FLG0_UNK_8000000); if (checkItemGet(DUNGEON_EXIT, 1)) { int escape = @@ -4282,13 +4282,13 @@ int daAlink_c::procDungeonWarp() { mProcVar3.field_0x300e.z = 1; } current.pos.y += 5.0f; - field_0x2b98 = (1.0f - mScale.y) * 100.0f; + field_0x2b98 = (1.0f - scale.y) * 100.0f; } else if (mProcVar2.field_0x300c >= 0x2000) { - cLib_chaseF(&mScale.x, 0.8f, 0.01f); + cLib_chaseF(&scale.x, 0.8f, 0.01f); } - mScale.z = mScale.x; - mpLinkModel->setBaseScale(mScale); + scale.z = scale.x; + mpLinkModel->setBaseScale(scale); } return 1; @@ -4311,7 +4311,7 @@ asm int daAlink_c::procDungeonWarp() { int daAlink_c::procDungeonWarpSceneStartInit() { commonProcInit(PROC_DUNGEON_WARP_SCN_START); - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, daAlinkHIO_basic_c0::m.mAnmBlendFactor); @@ -4326,8 +4326,8 @@ int daAlink_c::procDungeonWarpSceneStartInit() { current.pos.y += 120.0f; shape_angle.y += 0x7F7A; - mScale.set(0.0f, 1.5f, 0.0f); - mpLinkModel->setBaseScale(mScale); + scale.set(0.0f, 1.5f, 0.0f); + mpLinkModel->setBaseScale(scale); return 1; } #else @@ -4354,10 +4354,10 @@ int daAlink_c::procDungeonWarpSceneStart() { return 1; } - BOOL var_r31 = cLib_chaseF(&mScale.x, 1.0f, 0.05f); - mScale.z = mScale.x; - cLib_chaseF(&mScale.y, 1.0f, 0.025f); - mpLinkModel->setBaseScale(mScale); + BOOL var_r31 = cLib_chaseF(&scale.x, 1.0f, 0.05f); + scale.z = scale.x; + cLib_chaseF(&scale.y, 1.0f, 0.025f); + mpLinkModel->setBaseScale(scale); if (!var_r31) { current.pos.y -= 5.0f; @@ -4372,7 +4372,7 @@ int daAlink_c::procDungeonWarpSceneStart() { f32 sin = cM_ssin(mProcVar2.field_0x300c); shape_angle.y += (s16)(sin * 14336.0f); - mProcVar3.field_0x300e.x = (sin * 8.0f) + ((1.0f - mScale.x) * 24.0f); + mProcVar3.field_0x300e.x = (sin * 8.0f) + ((1.0f - scale.x) * 24.0f); return 1; } #else @@ -4497,16 +4497,16 @@ void daAlink_c::checkWarpStart() { const char* portal; if (!i_checkMidnaRide()) { if (dComIfGp_TargetWarpPt_get() == 3) { - mEvtInfo.setArchiveName("Obj_kbrg"); + eventInfo.setArchiveName("Obj_kbrg"); portal = kBridgePortal; } else if (dComIfGp_TargetWarpPt_get() == 6) { - mEvtInfo.setArchiveName("Obj_obrg"); + eventInfo.setArchiveName("Obj_obrg"); portal = oBridgePortal; } else if (dComIfGp_TargetWarpPt_get() == 9) { - mEvtInfo.setArchiveName("M_VolcBom"); + eventInfo.setArchiveName("M_VolcBom"); portal = volcBomPortal; } else if (dComIfGp_TargetWarpPt_get() == 8) { - mEvtInfo.setArchiveName("SCanCrs"); + eventInfo.setArchiveName("SCanCrs"); portal = cannonPortal; } else { portal = defaultPortal; @@ -4642,7 +4642,7 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) { field_0x3484 = 0.0f; if (!mLinkAcch.ChkGroundHit()) { - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); mProcVar1.field_0x300a = 1; } @@ -4686,7 +4686,7 @@ int daAlink_c::procCoWarp() { var_f1 = daAlinkHIO_autoJump_c0::m.mGravity; } - setSpecialGravity(var_f1, mMaxFallSpeed, 1); + setSpecialGravity(var_f1, maxFallSpeed, 1); } if (mDemo.getDemoMode() == 0x2D) { diff --git a/src/d/a/d_a_alink_effect.inc b/src/d/a/d_a_alink_effect.inc index 3befbadddb..a818a27792 100644 --- a/src/d/a/d_a_alink_effect.inc +++ b/src/d/a/d_a_alink_effect.inc @@ -12,7 +12,7 @@ // matches with literal #ifdef NONMATCHING void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, csXyz const* param_3) { - *param_0 = dComIfGp_particle_set(*param_0, param_1, param_2, &mTevStr, param_3, NULL, 0xFF, + *param_0 = dComIfGp_particle_set(*param_0, param_1, param_2, &tevStr, param_3, NULL, 0xFF, NULL, 0xFF, NULL, NULL, NULL); dComIfGp_particle_levelEmitterOnEventMove(*param_0); dComIfGp_particle_getEmitter(*param_0); @@ -33,7 +33,7 @@ asm JPABaseEmitter* daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* * setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz */ JPABaseEmitter* daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_PolyInfo& param_2, cXyz const* param_3, csXyz const* param_4) { - *param_0 = dComIfGp_particle_setPolyColor(*param_0, param_1, param_2, param_3, &mTevStr, + *param_0 = dComIfGp_particle_setPolyColor(*param_0, param_1, param_2, param_3, &tevStr, param_4, NULL, 0, NULL, -1, NULL); dComIfGp_particle_levelEmitterOnEventMove(*param_0); @@ -44,7 +44,7 @@ JPABaseEmitter* daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_P * setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz */ JPABaseEmitter* daAlink_c::setEmitterColor(u32* param_0, u16 param_1, cXyz const* param_2, csXyz const* param_3) { - *param_0 = dComIfGp_particle_setColor(*param_0, param_1, param_2, &mTevStr, NULL, NULL, + *param_0 = dComIfGp_particle_setColor(*param_0, param_1, param_2, &tevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1, param_3, NULL, NULL, -1, NULL); dComIfGp_particle_levelEmitterOnEventMove(*param_0); @@ -361,7 +361,7 @@ void daAlink_c::setCutWaterDropEffect() { if (field_0x32c0[0] > 0) { cXyz sp18; mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(1), &sp18); - dComIfGp_particle_setColor(0x2A4, &sp18, &mTevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1, + dComIfGp_particle_setColor(0x2A4, &sp18, &tevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1, &shape_angle, NULL, NULL, -1, NULL); } } @@ -557,7 +557,7 @@ void daAlink_c::clearWoodShieldBurnEffect() { void daAlink_c::setWoodShieldBurnOutEffect() { for (int i = 0; i < 2; i++) { JPABaseEmitter* emitter = dComIfGp_particle_setColor( - effName_42340[i], ¤t.pos, &mTevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1); + effName_42340[i], ¤t.pos, &tevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1); if (emitter != NULL) { emitter->setGlobalRTMatrix(mShieldModel->getBaseTRMtx()); diff --git a/src/d/a/d_a_alink_guard.inc b/src/d/a/d_a_alink_guard.inc index 2aab1e1d8e..4847479fe0 100644 --- a/src/d/a/d_a_alink_guard.inc +++ b/src/d/a/d_a_alink_guard.inc @@ -3,33 +3,54 @@ * Player Shield action handling */ +#include "d/a/d_a_alink.h" +#include "d/com/d_com_inf_game.h" + /* 800DC548-800DC5A4 0D6E88 005C+00 13/13 0/0 0/0 .text checkEnemyGroup__9daAlink_cFP10fopAc_ac_c */ BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* i_actor) { - return i_actor != NULL && (fopAcM_GetGroup(i_actor) == 2 || fopAcM_GetName(i_actor) == PROC_E_ZH || checkSpecialNpc(i_actor)); + return i_actor != NULL && (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e || + fopAcM_GetName(i_actor) == PROC_E_ZH || checkSpecialNpc(i_actor)); } +// properly setup later +class daNpc_Kn_c : public fopAc_ac_c { +public: + bool checkBattleMode() { return true; } +}; + +class daObj_GrA_c : public fopAc_ac_c { +public: + bool checkNpcObjGra() { return field_0xa7e == 1; } + + u8 temp[0xA7E - 0x568]; + u8 field_0xa7e; +}; + /* 800DC5A4-800DC5DC 0D6EE4 0038+00 4/4 0/0 0/0 .text checkSpecialNpc__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkSpecialNpc__9daAlink_cFP10fopAc_ac_c.s" +BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* i_actor) { + s16 name = fopAcM_GetName(i_actor); + + return ((name == PROC_NPC_KAKASHI || name == PROC_NPC_KN) && + static_cast(i_actor)->checkBattleMode()) || + (name == PROC_OBJ_GRA && !static_cast(i_actor)->checkNpcObjGra()); } -#pragma pop /* 800DC5DC-800DC678 0D6F1C 009C+00 1/1 0/0 0/0 .text checkShieldAttackEmphasys__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkShieldAttackEmphasys() { - nofralloc -#include "asm/d/a/d_a_alink/checkShieldAttackEmphasys__9daAlink_cFv.s" +BOOL daAlink_c::checkShieldAttackEmphasys() { + return mTargetedActor != NULL && (mTargetedActor->attention_info.flags & 0x200000) && + !checkCutHeadState() && + (fopAcM_GetGroup(mTargetedActor) != fopAc_ENEMY_e || + !static_cast(mTargetedActor)->checkDownFlg()); } -#pragma pop /* 800DC678-800DC79C 0D6FB8 0124+00 5/5 0/0 0/0 .text checkGuardActionChange__9daAlink_cFv */ +/* BOOL daAlink_c::checkGuardActionChange() { + return i_checkAttentionLock() && !checkIronBallWaitAnime() && !checkGrabAnime() && +!checkCopyRodControllAnime() && mTargetedActor != NULL && !checkSpecialNpc(mTargetedActor) && +(fopAcM_GetGroup(mTargetedActor) != 3 && fopAcM_GetGroup(mTargetedActor) != fopAc_NPC_e); +} */ + #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -41,6 +62,38 @@ asm BOOL daAlink_c::checkGuardActionChange() { /* 800DC79C-800DC8C4 0D70DC 0128+00 3/3 0/0 0/0 .text stickArrowIncrement__9daAlink_cFi */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::stickArrowIncrement(int param_0) { + if (!i_checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW)) { + s16 arrow_num = 0; + + for (int i = 0; i < 16; i++) { + if (mShieldArrowIDs[i] != -1) { + if (field_0x2f7c[i] == 0 || param_0) { + arrow_num++; + mShieldArrowIDs[i] = -1; + field_0x2f7c[i] = 0; + } else { + field_0x2f7c[i]--; + } + } + } + + if (arrow_num != 0) { + if (i_checkShieldGet() && checkItemGet(BOW, true)) { + int arrow_type = arrow_num == 1 ? ARROW_1 : ARROW_10; + + dComIfGp_setItemArrowNumCount(arrow_num); + fopAcM_createItemForSimpleDemo(¤t.pos, arrow_type, -1, NULL, NULL, 0.0f, + 0.0f); + } + + i_onResetFlg0(RFLG0_UNK_1); + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -49,9 +102,48 @@ asm void daAlink_c::stickArrowIncrement(int param_0) { #include "asm/d/a/d_a_alink/stickArrowIncrement__9daAlink_cFi.s" } #pragma pop +#endif /* 800DC8C4-800DCA2C 0D7204 0168+00 0/0 0/0 1/1 .text * setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) { + unsigned int new_arrow_id = fopAcM_GetID(i_actor); + + int arrow_num = 0; + for (; arrow_num < 16; arrow_num++) { + if (mShieldArrowIDs[arrow_num] == -1) { + mShieldArrowIDs[arrow_num] = new_arrow_id; + field_0x2f7c[arrow_num] = 10; + break; + } + } + + if (arrow_num == 16) { + fopAc_ac_c* first_arrow = fopAcM_SearchByID(mShieldArrowIDs[0]); + if (first_arrow != NULL) { + fopAcM_delete(first_arrow); + } + + int i = 0; + for (; i < 15; i++) { + mShieldArrowIDs[i] = mShieldArrowIDs[i + 1]; + field_0x2f7c[i] = field_0x2f7c[i + 1]; + } + + mShieldArrowIDs[i] = new_arrow_id; + field_0x2f7c[i] = 10; + + dComIfGp_setItemArrowNumCount(1); + fopAcM_createItemForSimpleDemo(¤t.pos, ARROW_10, -1, NULL, NULL, 0.0f, 0.0f); + } + + if (param_1 && field_0x2fcb == 0 && !checkMagicArmorNoDamage()) { + field_0x2fcb = 120; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -60,6 +152,7 @@ asm void daAlink_c::setArrowShieldActor(fopAc_ac_c* param_0, int param_1) { #include "asm/d/a/d_a_alink/setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci.s" } #pragma pop +#endif /* 800DCA2C-800DCA80 0D736C 0054+00 1/1 0/0 2/2 .text * checkWoodShieldEquipNotIronBall__9daAlink_cCFv */ @@ -69,6 +162,36 @@ BOOL daAlink_c::checkWoodShieldEquipNotIronBall() const { /* 800DCA80-800DCD74 0D73C0 02F4+00 0/0 0/0 1/1 .text * getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::getArrowShieldOffset(cXyz const* param_0, csXyz const* param_1, cXyz* param_2, + cXyz* param_3) const { + cXyz sp54; + mDoMtx_stack_c::ZXYrotS(param_1->x + cM_rndFX(0x1000), param_1->y + cM_rndFX(0x1000), 0); + mDoMtx_stack_c::multVec(&cXyz::BaseZ, &sp54); + mDoMtx_stack_c::copy(getShieldMtx()); + mDoMtx_stack_c::inverse(); + mDoMtx_stack_c::multVecSR(&sp54, param_3); + + cXyz sp60; + mDoMtx_multVec(getShieldMtx(), &localCenter, &sp60); + + cM3dGPla plane(&field_0x351c, -field_0x351c.inprod(sp60)); + + cXyz sp6C; + cXyz sp78 = *param_0 + sp54; + plane.crossInfLin(*param_0, sp78, sp6C); + + if (sp6C.abs(sp60) > 20.0f) { + sp6C = sp6C - sp60; + sp6C.normalize(); + sp6C *= 20.0f; + sp6C += sp60; + } + + mDoMtx_stack_c::multVec(&sp6C, param_2); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -78,6 +201,7 @@ asm void daAlink_c::getArrowShieldOffset(cXyz const* param_0, csXyz const* param #include "asm/d/a/d_a_alink/getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz.s" } #pragma pop +#endif /* 800DCD74-800DCDF0 0D76B4 007C+00 0/0 0/0 2/2 .text * setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz */ @@ -94,14 +218,15 @@ void daAlink_c::setArrowShieldPos(cXyz* param_0, csXyz* param_1, cXyz const* par /* 800DCDF0-800DCE6C 0D7730 007C+00 17/17 0/0 0/0 .text checkUpperGuardAnime__9daAlink_cCFv */ BOOL daAlink_c::checkUpperGuardAnime() const { - return i_checkNoResetFlg2(FLG2_UNK_8000000) && !checkEventRun() && !i_checkNoResetFlg0(FLG0_UNK_2) && - mProcID != PROC_GUARD_BREAK && mProcID != PROC_CUT_REVERSE && mProcID != PROC_GUARD_ATTACK; + return i_checkNoResetFlg2(FLG2_UNK_8000000) && !checkEventRun() && + !i_checkNoResetFlg0(FLG0_UNK_2) && mProcID != PROC_GUARD_BREAK && + mProcID != PROC_CUT_REVERSE && mProcID != PROC_GUARD_ATTACK; } /* 800DCE6C-800DCF04 0D77AC 0098+00 1/0 0/0 0/0 .text checkPlayerGuard__9daAlink_cCFv */ BOOL daAlink_c::checkPlayerGuard() const { return (i_checkSmallUpperGuardAnime() || (i_checkShieldGet() && checkHorseLieAnime())) || - checkUpperGuardAnime(); + checkUpperGuardAnime(); } /* 800DCF04-800DCF64 0D7844 0060+00 5/5 0/0 0/0 .text checkPlayerGuardAndAttack__9daAlink_cCFv */ @@ -111,7 +236,8 @@ BOOL daAlink_c::checkPlayerGuardAndAttack() const { /* 800DCF64-800DD008 0D78A4 00A4+00 2/2 0/0 0/0 .text checkGuardAccept__9daAlink_cFv */ BOOL daAlink_c::checkGuardAccept() { - return i_checkModeFlg(0x80) && i_checkShieldGet() && !i_checkFmChainGrabAnime() && !checkNotBattleStage(); + return i_checkModeFlg(0x80) && i_checkShieldGet() && !i_checkFmChainGrabAnime() && + !checkNotBattleStage(); } /* 800DD008-800DD018 0D7948 0010+00 11/11 0/0 0/0 .text setUpperGuardAnime__9daAlink_cFf @@ -124,9 +250,10 @@ void daAlink_c::setUpperGuardAnime(f32) { void daAlink_c::setShieldGuard() { if ((mProcID == PROC_GUARD_SLIP && mEquipItem != IRONBALL) || i_checkSmallUpperGuardAnime() || (checkGuardAccept() && !checkGrabAnime() && !checkUpperReadyThrowAnime() && - !checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() && - !checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) && - !i_checkRideOn() && checkGuardActionChange())) { + !checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() && + !checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) && + !i_checkRideOn() && checkGuardActionChange())) + { i_onNoResetFlg2(FLG2_UNK_8000000); } else { i_offNoResetFlg2(FLG2_UNK_8000000); @@ -134,16 +261,48 @@ void daAlink_c::setShieldGuard() { } /* 800DD114-800DD1D4 0D7A54 00C0+00 1/1 0/0 0/0 .text setGuardSe__9daAlink_cFP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGuardSe(dCcD_GObjInf* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setGuardSe__9daAlink_cFP12dCcD_GObjInf.s" +void daAlink_c::setGuardSe(dCcD_GObjInf* i_objinf) { + int var_r31; + int var_r30; + + if (checkWoodShieldEquipNotIronBall() && !checkMagicArmorNoDamage()) { + var_r31 = 0x29; + var_r30 = 0; + } else { + var_r31 = 0x28; + var_r30 = 1; + } + + u32 hit_se; + if (i_objinf->GetTgHitGObj() != NULL && i_objinf->GetTgHitGObj()->GetAtType() == AT_TYPE_BOMB) { + hit_se = Z2SE_HIT_METAL_WEAPON; + } else { + hit_se = i_objinf->GetTgHitObjHitSeID(var_r30); + } + + mZ2Link.startCollisionSE(hit_se, var_r31); } -#pragma pop /* 800DD1D4-800DD3E4 0D7B14 0210+00 1/1 0/0 0/0 .text setSmallGuard__9daAlink_cFP12dCcD_GObjInf */ +#ifdef NONMATCHING +void daAlink_c::setSmallGuard(dCcD_GObjInf* i_objinf) { + setUpperAnimeBase(0x16); + cXyz* dmg_vec = (cXyz*)getDamageVec(i_objinf); + + mBodyAngle.y = (dmg_vec->atan2sX_Z() + 0x8000) - shape_angle.y; + if (abs(mBodyAngle.y) > 0x7000) { + mBodyAngle.y = 0; + } else { + mBodyAngle.y = + cLib_minMaxLimit((s16)mBodyAngle.y, -daAlinkHIO_guard_c0::m.mSmallGuardLRAngleMax, + daAlinkHIO_guard_c0::m.mSmallGuardLRAngleMax); + } + + s16 max = daAlinkHIO_guard_c0::m.mSmallGuardFBAngleMax; + s16 min = -max; + mBodyAngle.x = cLib_minMaxLimit(cM_atan2s(dmg_vec->y, dmg_vec->absXZ()), min, max); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -152,6 +311,7 @@ asm void daAlink_c::setSmallGuard(dCcD_GObjInf* param_0) { #include "asm/d/a/d_a_alink/setSmallGuard__9daAlink_cFP12dCcD_GObjInf.s" } #pragma pop +#endif /* 800DD3E4-800DD894 0D7D24 04B0+00 1/1 0/0 0/0 .text * procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf */ diff --git a/src/d/a/d_a_alink_hang.inc b/src/d/a/d_a_alink_hang.inc index 011d351077..07b4bd0f12 100644 --- a/src/d/a/d_a_alink_hang.inc +++ b/src/d/a/d_a_alink_hang.inc @@ -522,7 +522,7 @@ int daAlink_c::procBossBodyHangInit(fopAc_ac_c* param_0) { f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; - setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + setSpecialGravity(tmp_0, maxFallSpeed, 0); speed.y = FLOAT_LABEL(lit_6108); mProcVar2.field_0x300c = 0; @@ -682,7 +682,7 @@ int daAlink_c::procLadderUpEndInit(int param_0) { setSingleAnimeBaseSpeed(anm_id, daAlinkHIO_ladder_c0::m.field_0x30, daAlinkHIO_ladder_c0::m.field_0x34); field_0x2f99 = 14; - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); f32 tmp_0 = FLOAT_LABEL(lit_6108); speed.y = tmp_0; @@ -765,7 +765,7 @@ int daAlink_c::procLadderDownEndInit(int param_0) { setSingleAnimeBaseSpeed(anm_id, daAlinkHIO_ladder_c0::m.field_0x40, daAlinkHIO_ladder_c0::m.field_0x44); field_0x2f99 = 14; - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); field_0x30a0 = 0x2800; field_0x33f4 = lit_6040; @@ -1118,7 +1118,7 @@ asm int daAlink_c::procClimbWait() { int daAlink_c::procClimbToRoofInit() { commonProcInit(PROC_CLIMB_TO_ROOF); setSingleAnimeBase(ANM_ROOF_UP); - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); f32 tmp_0 = FLOAT_LABEL(lit_6108); speed.y = tmp_0; @@ -1205,7 +1205,7 @@ int daAlink_c::procRoofHangStartInit(cBgS_PolyInfo const& param_0, cXyz const& p field_0x2f98 = 4; deleteEquipItem(TRUE, FALSE); - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; @@ -1303,7 +1303,7 @@ int daAlink_c::procRoofHangSideMoveInit() { setSingleAnimeBaseSpeed(anm_id, getRoofHangSMoveAnmSpeed(), daAlinkHIO_roofHang_c0::m.field_0x40); - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; @@ -1373,7 +1373,7 @@ int daAlink_c::procRoofHangTurnInit() { } field_0x2f98 = 4; - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; speed.y = tmp_0; @@ -1424,7 +1424,7 @@ int daAlink_c::procRoofSwitchHangInit(fopAc_ac_c* param_0) { deleteEquipItem(TRUE, FALSE); setSingleAnimeParam(ANM_ROOF_HANG, &daAlinkHIO_roofHang_c0::m.field_0x0); - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); f32 tmp_0 = FLOAT_LABEL(lit_6108); speed.y = tmp_0; mNormalSpeed = tmp_0; diff --git a/src/d/a/d_a_alink_hook.inc b/src/d/a/d_a_alink_hook.inc index af99b8e064..473d847f5d 100644 --- a/src/d/a/d_a_alink_hook.inc +++ b/src/d/a/d_a_alink_hook.inc @@ -306,7 +306,7 @@ void daAlink_c::setHookshotSight() { BOOL line_cross = checkSightLine(length, &sight_pos); if (mHookTargetAcKeep.getActor() != NULL) { - mSight.setPos(&mHookTargetAcKeep.getActor()->mEyePos); + mSight.setPos(&mHookTargetAcKeep.getActor()->eyePos); } else { mSight.setPos(&sight_pos); } @@ -894,7 +894,7 @@ void daAlink_c::setHookshotPos() { } } else { if (checkChaseHookshot()) { - cXyz sp188 = mTargetedActor->mEyePos - mHookshotTopPos; + cXyz sp188 = mTargetedActor->eyePos - mHookshotTopPos; if (sp188.inprod(mIronBallCenterPos) >= 0.0f) { mIronBallCenterPos = sp188; mIronBallCenterPos.normalizeZP(); @@ -979,11 +979,11 @@ void daAlink_c::setHookshotPos() { poly.mNormal.atan2sX_Z(), 0); dComIfGp_particle_setPolyColor( - particle_id, mRopeLinChk, mRopeLinChk.GetCrossP(), &mTevStr, &sp30, + particle_id, mRopeLinChk, mRopeLinChk.GetCrossP(), &tevStr, &sp30, (cXyz*)&l_hookSnowSandHitScale, 0, NULL, -1, NULL); if (poly_att0 == 0xD) { dComIfGp_particle_setPolyColor( - 0x8820, mRopeLinChk, mRopeLinChk.GetCrossP(), &mTevStr, &sp30, + 0x8820, mRopeLinChk, mRopeLinChk.GetCrossP(), &tevStr, &sp30, (cXyz*)&l_hookSnowSandHitScale, 0, NULL, -1, NULL); } } else { @@ -1416,7 +1416,7 @@ int daAlink_c::procHookshotFlyInit() { setSingleAnimeBase(anm); mBodyAngle.x = 0; - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); mNormalSpeed = 0.0f; speed.y = 0.0f; @@ -1641,7 +1641,7 @@ int daAlink_c::procHookshotRoofWaitInit(int param_0, fopAc_ac_c* param_1, int pa resetHookshotMode(); field_0x3024 = 1; - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); mNormalSpeed = 0.0f; speed.y = 0.0f; current.angle.y = shape_angle.y; @@ -1759,7 +1759,7 @@ int daAlink_c::procHookshotRoofShootInit(fopAc_ac_c* param_0) { setSingleAnimeBaseSpeed(anm, 1.0f, 3.0f); setFastShotTimer(); - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); mNormalSpeed = 0.0f; speed.y = 0.0f; field_0x2b98 = 6.5f; @@ -1880,7 +1880,7 @@ int daAlink_c::procHookshotRoofBootsInit(fopAc_ac_c* param_0) { setSingleAnimeBaseMorf(anm, 2.0f); resetHookshotMode(); field_0x3024 = 1; - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); mNormalSpeed = 0.0f; speed.y = 0.0f; current.angle.y = shape_angle.y; @@ -1984,7 +1984,7 @@ int daAlink_c::procHookshotWallWaitInit(int param_0, s16 param_1, int param_2) { dComIfGp_setPlayerStatus1(0, 0x2000000); resetHookshotMode(); field_0x3024 = 1; - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); mNormalSpeed = 0.0f; speed.y = 0.0f; current.angle.y = shape_angle.y; @@ -2098,7 +2098,7 @@ int daAlink_c::procHookshotWallShootInit() { setSingleAnimeBaseSpeed(anm, 1.0f, 3.0f); setFastShotTimer(); - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); mNormalSpeed = 0.0f; speed.y = 0.0f; diff --git a/src/d/a/d_a_alink_horse.inc b/src/d/a/d_a_alink_horse.inc index d8fb19c6fa..1e9dfd06d8 100644 --- a/src/d/a/d_a_alink_horse.inc +++ b/src/d/a/d_a_alink_horse.inc @@ -150,7 +150,7 @@ void daAlink_c::commonInitForceRideRein() { field_0x30a6 = 0; initServiceWaitTime(); - mAttentionInfo.field_0xa = 0x46; + attention_info.field_0xa = 0x46; mUnderFrameCtrl[0].onEndFlg(); } @@ -222,7 +222,7 @@ void daAlink_c::rideGetOff() { mRideStatus = 0; i_offNoResetFlg1(FLG1_UNK_1800); - mAttentionInfo.field_0xa = 10; + attention_info.field_0xa = 10; shape_angle.x = 0; shape_angle.z = 0; } @@ -930,7 +930,7 @@ void daAlink_c::setBodyAngleRideReadyAnime() { s16 angle; if (mTargetedActor != NULL) { angle = cLib_minMaxLimit( - (s16)(cLib_targetAngleY(¤t.pos, &mTargetedActor->mEyePos) - shape_angle.y), + (s16)(cLib_targetAngleY(¤t.pos, &mTargetedActor->eyePos) - shape_angle.y), (s16)-0x3800, (s16)0x3800); } else { angle = 0; diff --git a/src/d/a/d_a_alink_hvyboots.inc b/src/d/a/d_a_alink_hvyboots.inc index 2a199e227e..ef93cb4e94 100644 --- a/src/d/a/d_a_alink_hvyboots.inc +++ b/src/d/a/d_a_alink_hvyboots.inc @@ -272,7 +272,7 @@ int daAlink_c::cancelMagneBootsOn() { current.pos.y = gnd_cross; } - next.pos = current.pos; + old.pos = current.pos; field_0x3798 = current.pos; mMagneBootsTopVec = cXyz::BaseY; @@ -398,7 +398,7 @@ int daAlink_c::procMagneBootsFlyInit() { mPolyInfo2.SetPolyInfo(mMagneLineChk); field_0x37c8 = mMagneLineChk.i_GetCross(); - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); speed.y = 0.0f; mNormalSpeed = 0.0f; diff --git a/src/d/a/d_a_alink_link.inc b/src/d/a/d_a_alink_link.inc index da91ba1dc1..42ff1ddc4d 100644 --- a/src/d/a/d_a_alink_link.inc +++ b/src/d/a/d_a_alink_link.inc @@ -1583,7 +1583,7 @@ int daAlink_c::procAutoJump() { if (!checkGrabGlide()) { setSpecialGravity(daAlinkHIO_autoJump_c0::m.mGravity, - daAlinkHIO_autoJump_c0::m.mMaxFallSpeed, 1); + daAlinkHIO_autoJump_c0::m.maxFallSpeed, 1); mProcVar2.field_0x300c = 0; resetUpperAnime(UPPER_1, 3.0f); field_0x30a0 = 0; @@ -1596,7 +1596,7 @@ int daAlink_c::procAutoJump() { setSpecialGravity(-1.0f, field_0x3478, 0); } else { setSpecialGravity(daAlinkHIO_autoJump_c0::m.mGravity, - daAlinkHIO_autoJump_c0::m.mMaxFallSpeed * 0.66f, 0); + daAlinkHIO_autoJump_c0::m.maxFallSpeed * 0.66f, 0); } s16 diff; @@ -1619,7 +1619,7 @@ int daAlink_c::procAutoJump() { if (field_0x3198 != 0x8C && temp_f1 > daAlinkHIO_damFall_c0::m.mFallAnmTransitionHeight) { setSingleAnimeBaseSpeed(ANM_DMG_FALL, 0.0f, daAlinkHIO_damFall_c0::m.mFallAnmMorf); field_0x3198 = 0x8C; - } else if (speed.y < -mGravity && field_0x2f99 == 4) { + } else if (speed.y < -gravity && field_0x2f99 == 4) { if (checkGrabGlide()) { setSpecialGravity(-1.0f, field_0x3478, 0); mProcVar2.field_0x300c = 1; @@ -1667,7 +1667,7 @@ int daAlink_c::procDiveJumpInit() { speed.y = daAlinkHIO_autoJump_c0::m.mDiveSpeedV; mNormalSpeed = daAlinkHIO_autoJump_c0::m.mDiveSpeedH; - mGravity = daAlinkHIO_autoJump_c0::m.mDiveGravity; + gravity = daAlinkHIO_autoJump_c0::m.mDiveGravity; mProcVar2.field_0x300c = 0; current.angle.y = shape_angle.y; @@ -2026,7 +2026,7 @@ int daAlink_c::procSmallJump() { if (mLinkAcch.ChkGroundHit()) { checkLandAction(0); - } else if (speed.y < -mGravity) { + } else if (speed.y < -gravity) { procFallInit(2, daAlinkHIO_smallJump_c0::m.mFallInterpolation); } else { field_0x2f99 = 7; @@ -2038,10 +2038,10 @@ int daAlink_c::procSmallJump() { if (checkHeavyStateOn(1, 1) && !i_checkNoResetFlg0(FLG0_UNDERWATER)) { speed.y = JMAFastSqrt(2.0f * ((daAlinkHIO_smallJump_c0::m.mTargetHeightOffset + (field_0x3478 - current.pos.y)) * - -(mGravity * 2.25f))); + -(gravity * 2.25f))); } else { speed.y = - JMAFastSqrt(2.0f * (-mGravity * (daAlinkHIO_smallJump_c0::m.mTargetHeightOffset + + JMAFastSqrt(2.0f * (-gravity * (daAlinkHIO_smallJump_c0::m.mTargetHeightOffset + (field_0x3478 - current.pos.y)))); } @@ -2385,7 +2385,7 @@ int daAlink_c::procCoMetamorphoseOnlyInit() { f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; speed.y = tmp_0; - setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + setSpecialGravity(tmp_0, maxFallSpeed, 0); return 1; } @@ -2535,7 +2535,7 @@ int daAlink_c::execute() { if (dComIfGp_event_runCheck()) { field_0x3184 = dComIfGp_evmng_getMyStaffId("Alink", this, 0); - if (mEvtInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(4) && + if (eventInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(4) && mEquipItem == noentry71) { deleteEquipItem(FALSE, FALSE); @@ -2565,7 +2565,7 @@ int daAlink_c::execute() { current.angle.y = angle_y - (s16)(current.angle.y - angle_y); } - dComIfG_Bgsp().MoveBgCrrPos(mMagneLineChk, true, &next.pos, NULL, NULL, false, false); + dComIfG_Bgsp().MoveBgCrrPos(mMagneLineChk, true, &old.pos, NULL, NULL, false, false); if (getMoveBGActorName(mMagneLineChk, 0) == PROC_Obj_MagneArm) { field_0x34c8.y += current.pos.y - pos_y; @@ -2588,11 +2588,11 @@ int daAlink_c::execute() { dComIfG_Bgsp().MoveBgCrrPos(mLinkAcch.m_gnd, uvar23, ¤t.pos, ¤t.angle, &shape_angle, false, false); - dComIfG_Bgsp().MoveBgCrrPos(mLinkAcch.m_gnd, uvar23, &next.pos, NULL, NULL, false, false); + dComIfG_Bgsp().MoveBgCrrPos(mLinkAcch.m_gnd, uvar23, &old.pos, NULL, NULL, false, false); field_0x34c8.y += (current.pos.y - pos_y) * 0.1f; } - field_0x3798 = next.pos; + field_0x3798 = old.pos; field_0x2fe6 = shape_angle.y; mPrevStickAngle = mStickAngle; field_0x33a4 = field_0x33ac; @@ -2645,7 +2645,7 @@ int daAlink_c::execute() { field_0x2f91 = 0; - if (mProcID == PROC_BOTTLE_SWING && mEvtInfo.checkCommandCatch()) { + if (mProcID == PROC_BOTTLE_SWING && eventInfo.checkCommandCatch()) { mDemo.setSpecialDemoType(); } @@ -2791,11 +2791,11 @@ int daAlink_c::execute() { } } - if (checkEndResetFlg1(ERFLG1_UNK_200) || (checkDungeon() && mEvtInfo.checkCommandDoor()) || + if (checkEndResetFlg1(ERFLG1_UNK_200) || (checkDungeon() && eventInfo.checkCommandDoor()) || mProcID == PROC_WOLF_GET_SMELL || mProcID == PROC_WOLF_DIG || mProcID == PROC_WOLF_DIG_THROUGH || checkNoResetFlg0(FLG0_UNK_4000) || dComIfGp_checkPlayerStatus1(0, 0x1000000) || - (checkEventRun() && partner != NULL && (partner->mAttentionInfo.mFlags & 0x400000)) || + (checkEventRun() && partner != NULL && (partner->attention_info.flags & 0x400000)) || !strcmp(dComIfGp_getEventManager().getRunEventName(), l_defaultGetEventName)) { mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime; @@ -3278,7 +3278,7 @@ int daAlink_c::execute() { } if (checkDeadHP()) { - mEvtInfo.offCondition(fopAcCnd_NOEXEC_e); + eventInfo.offCondition(fopAcCnd_NOEXEC_e); } else if (!checkMagneBootsOn()) { f32 var_f31_2; if (mLinkAcch.ChkGroundHit()) { @@ -3290,18 +3290,18 @@ int daAlink_c::execute() { } if (cBgW_CheckBGround(var_f31_2) && !checkModeFlg(MODE_PLAYER_FLY)) { - mEvtInfo.onCondition(0x5D); + eventInfo.onCondition(0x5D); } else if (checkModeFlg(MODE_SWIMMING) || mProcID == PROC_WOLF_ROPE_MOVE || ((checkReinRide() || checkCanoeRide() || checkSpinnerRide()) && !checkNoResetFlg3(FLG3_UNK_80000) && !checkModeFlg(MODE_JUMP))) { - mEvtInfo.onCondition(dEvtCnd_CANTALK_e); + eventInfo.onCondition(dEvtCnd_CANTALK_e); if (checkReinRide() || checkCanoeRide()) { - mEvtInfo.onCondition(dEvtCnd_CANGETITEM_e); + eventInfo.onCondition(dEvtCnd_CANGETITEM_e); } } } else if (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) { - mEvtInfo.onCondition(dEvtCnd_CANTALK_e); + eventInfo.onCondition(dEvtCnd_CANTALK_e); } if (checkEndResetFlg1(ERFLG1_UNK_40000) && checkMidnaRide() && checkWolf()) { @@ -3471,7 +3471,7 @@ int daAlink_c::execute() { mEndResetFlg1 = 0; mEndResetFlg2 = 0; - field_0x3540 = next.pos; + field_0x3540 = old.pos; field_0x3108 = shape_angle.y; if (checkHorseRide() && checkBoarSingleBattle()) { @@ -3594,14 +3594,14 @@ void daAlink_c::modelCalc(J3DModel* p_model) { /* 800CC298-800CC2E0 0C6BD8 0048+00 2/2 0/0 0/0 .text basicModelDraw__9daAlink_cFP8J3DModel */ void daAlink_c::basicModelDraw(J3DModel* i_model) { - g_env_light.setLightTevColorType_MAJI(i_model, &mTevStr); + g_env_light.setLightTevColorType_MAJI(i_model, &tevStr); mDoExt_modelEntryDL(i_model); } /* 800CC2E0-800CC364 0C6C20 0084+00 1/1 0/0 0/0 .text modelDraw__9daAlink_cFP8J3DModeli */ void daAlink_c::modelDraw(J3DModel* i_model, int param_1) { - g_env_light.setLightTevColorType_MAJI(i_model, &mTevStr); + g_env_light.setLightTevColorType_MAJI(i_model, &tevStr); if (param_1 == 0) { mDoExt_modelEntryDL(i_model); @@ -3674,12 +3674,12 @@ void daAlink_c::setWaterDropColor(J3DGXColorS10 const* i_color) { /* 800CC7DC-800CC7FC 0C711C 0020+00 2/2 0/0 0/0 .text initTevCustomColor__9daAlink_cFv */ void daAlink_c::initTevCustomColor() { - mTevStr.field_0x367 = 0; - mTevStr.mFogColor.r = 0; - mTevStr.mFogColor.g = 0; - mTevStr.mFogColor.b = 0; - mTevStr.field_0x360 = 0; - mTevStr.field_0x362 = 0; + tevStr.field_0x367 = 0; + tevStr.mFogColor.r = 0; + tevStr.mFogColor.g = 0; + tevStr.mFogColor.b = 0; + tevStr.field_0x360 = 0; + tevStr.field_0x362 = 0; } /* 800CC7FC-800CD78C 0C713C 0F90+00 1/1 0/0 0/0 .text draw__9daAlink_cFv */ @@ -3687,9 +3687,9 @@ void daAlink_c::initTevCustomColor() { #ifdef NONMATCHING int daAlink_c::draw() { if (i_checkWolf()) { - g_env_light.settingTevStruct(9, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(9, ¤t.pos, &tevStr); } else { - g_env_light.settingTevStruct(10, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(10, ¤t.pos, &tevStr); } initTevCustomColor(); @@ -3712,15 +3712,15 @@ int daAlink_c::draw() { if (mClothesChangeWaitTimer != 0) { if (mProcID == PROC_METAMORPHOSE) { if (mProcVar3.field_0x300e.x > 0) { - mTevStr.mFogColor.r = 255; + tevStr.mFogColor.r = 255; } else { - mTevStr.mFogColor.r = -255; + tevStr.mFogColor.r = -255; } - mTevStr.mFogColor.g = mTevStr.mFogColor.r; - mTevStr.mFogColor.b = mTevStr.mFogColor.r; + tevStr.mFogColor.g = tevStr.mFogColor.r; + tevStr.mFogColor.b = tevStr.mFogColor.r; - g_env_light.setLightTevColorType_MAJI(mpWlChangeModel, &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpWlChangeModel, &tevStr); mDoExt_modelEntryDL(mpWlChangeModel); } return 1; @@ -3731,22 +3731,22 @@ int daAlink_c::draw() { BOOL var_r31 = 1; if (field_0x06f4 != NULL) { - field_0x06f4->getTevColorReg(0, &mTevStr.mFogColor); + field_0x06f4->getTevColorReg(0, &tevStr.mFogColor); } else if (mProcID == PROC_METAMORPHOSE || mProcID == PROC_DUNGEON_WARP || mProcID == PROC_DUNGEON_WARP_SCN_START) { - mTevStr.mFogColor.r = mProcVar3.field_0x300e.x; - mTevStr.mFogColor.g = mProcVar3.field_0x300e.x; - mTevStr.mFogColor.b = mProcVar3.field_0x300e.x; + tevStr.mFogColor.r = mProcVar3.field_0x300e.x; + tevStr.mFogColor.g = mProcVar3.field_0x300e.x; + tevStr.mFogColor.b = mProcVar3.field_0x300e.x; } else if (field_0x346c != 0.0f) { f32 var_f2 = fabsf(field_0x346c); - mTevStr.mFogColor.r = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropR; - mTevStr.mFogColor.g = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropG; - mTevStr.mFogColor.b = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropB; + tevStr.mFogColor.r = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropR; + tevStr.mFogColor.g = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropG; + tevStr.mFogColor.b = var_f2 * daAlinkHIO_wolf_c0::m.mLightDropB; } else if (checkFreezeDamage()) { - mTevStr.mFogColor.r = daAlinkHIO_damage_c0::m.mFreezeR; - mTevStr.mFogColor.g = daAlinkHIO_damage_c0::m.mFreezeG; - mTevStr.mFogColor.b = daAlinkHIO_damage_c0::m.mFreezeB; + tevStr.mFogColor.r = daAlinkHIO_damage_c0::m.mFreezeR; + tevStr.mFogColor.g = daAlinkHIO_damage_c0::m.mFreezeG; + tevStr.mFogColor.b = daAlinkHIO_damage_c0::m.mFreezeB; } else if (mDamageTimer != 0) { if (!checkMagicArmorNoDamage()) { int color_timer = mDamageTimer + mDamageColorTime; @@ -3767,25 +3767,25 @@ int daAlink_c::draw() { } f32 var_f2 = fabsf(cM_ssin(color_timer * 0x800)); - mTevStr.field_0x360 = r * var_f2; - mTevStr.field_0x361 = g * var_f2; - mTevStr.field_0x362 = b * var_f2; + tevStr.field_0x360 = r * var_f2; + tevStr.field_0x361 = g * var_f2; + tevStr.field_0x362 = b * var_f2; var_r31 = 0; } } else if (field_0x3006 != 0) { f32 temp_f4 = 1.0f - (field_0x3006 * (1.0f / daAlinkHIO_damage_c0::m.mFreezeTime)); f32 temp_f3 = 1.0f - temp_f4; - mTevStr.mFogColor.r = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitR) + + tevStr.mFogColor.r = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitR) + (temp_f3 * daAlinkHIO_damage_c0::m.mFreezeR); - mTevStr.mFogColor.g = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitG) + + tevStr.mFogColor.g = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitG) + (temp_f3 * daAlinkHIO_damage_c0::m.mFreezeG); - mTevStr.mFogColor.b = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitB) + + tevStr.mFogColor.b = (temp_f4 * daAlinkHIO_damage_c0::m.mFreezeInitB) + (temp_f3 * daAlinkHIO_damage_c0::m.mFreezeB); } else if (field_0x32b0[0].r != 0) { - mTevStr.mFogColor.r = field_0x32b0[0].r; - mTevStr.mFogColor.g = field_0x32b0[0].g; - mTevStr.mFogColor.b = field_0x32b0[0].b; + tevStr.mFogColor.r = field_0x32b0[0].r; + tevStr.mFogColor.g = field_0x32b0[0].g; + tevStr.mFogColor.b = field_0x32b0[0].b; var_r29 = 1; } else { var_r31 = 0; @@ -3802,7 +3802,7 @@ int daAlink_c::draw() { setWaterDropColor(&field_0x32b0[1]); } else { mSwordUpColorIntensity = 0.0f; - setWaterDropColor((J3DGXColorS10*)&mTevStr.mFogColor); + setWaterDropColor((J3DGXColorS10*)&tevStr.mFogColor); } } else { if (checkMagicArmorWearAbility()) { @@ -3826,9 +3826,9 @@ int daAlink_c::draw() { } } - mTevStr.field_0x360 = 0; - mTevStr.field_0x361 = 0; - mTevStr.field_0x362 = 0; + tevStr.field_0x360 = 0; + tevStr.field_0x361 = 0; + tevStr.field_0x362 = 0; if (checkSwordDraw()) { modelDraw(mSwordModel, temp_r30); @@ -3913,9 +3913,9 @@ int daAlink_c::draw() { modelDraw(mpLinkFaceModel, var_r3); } - mTevStr.field_0x360 = 0; - mTevStr.field_0x361 = 0; - mTevStr.field_0x362 = 0; + tevStr.field_0x360 = 0; + tevStr.field_0x361 = 0; + tevStr.field_0x362 = 0; if (checkSwordDraw()) { if (!i_checkNoResetFlg3(FLG3_UNK_80000000)) { @@ -3930,9 +3930,9 @@ int daAlink_c::draw() { if (checkShieldDraw()) { BOOL var_r24_2; if (checkWoodShieldEquip() && field_0x2fcb != 0 && mProcID != PROC_METAMORPHOSE) { - mTevStr.mFogColor.r = -((120 - field_0x2fcb) * 32) / 120; - mTevStr.mFogColor.g = mTevStr.mFogColor.r; - mTevStr.mFogColor.b = mTevStr.mFogColor.r; + tevStr.mFogColor.r = -((120 - field_0x2fcb) * 32) / 120; + tevStr.mFogColor.g = tevStr.mFogColor.r; + tevStr.mFogColor.b = tevStr.mFogColor.r; var_r24_2 = 1; } else { var_r24_2 = 0; @@ -3940,16 +3940,16 @@ int daAlink_c::draw() { modelDraw(mShieldModel, var_r3); if (var_r24_2) { - mTevStr.mFogColor.r = 0; - mTevStr.mFogColor.g = 0; - mTevStr.mFogColor.b = 0; + tevStr.mFogColor.r = 0; + tevStr.mFogColor.g = 0; + tevStr.mFogColor.b = 0; } } if (var_r29) { - mTevStr.mFogColor.r = 0; - mTevStr.mFogColor.g = 0; - mTevStr.mFogColor.b = 0; + tevStr.mFogColor.r = 0; + tevStr.mFogColor.g = 0; + tevStr.mFogColor.b = 0; } if (checkItemDraw()) { @@ -3994,22 +3994,22 @@ int daAlink_c::draw() { } if (i_checkEquipHeavyBoots()) { - GXColorS10 color = mTevStr.mFogColor; + GXColorS10 color = tevStr.mFogColor; for (int i = 0; i < 2; i++) { JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x3228[i][0]); if (emitter_p != NULL) { - mTevStr.mFogColor.r = 5; - mTevStr.mFogColor.g = mTevStr.mFogColor.r; - mTevStr.mFogColor.b = mTevStr.mFogColor.r; + tevStr.mFogColor.r = 5; + tevStr.mFogColor.g = tevStr.mFogColor.r; + tevStr.mFogColor.b = tevStr.mFogColor.r; } else { - mTevStr.mFogColor = color; + tevStr.mFogColor = color; } modelDraw(mpLinkBootModels[i], temp_r30); } - mTevStr.mFogColor = color; + tevStr.mFogColor = color; } } @@ -4340,7 +4340,7 @@ int daAlink_c::procCoPeepSubjectivityInit() { } i_onPlayerNoDraw(); - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); speed.y = FLOAT_LABEL(lit_6108); dComIfGp_setPlayerStatus0(0, 0x2000); field_0x3478 = lit_6183; diff --git a/src/d/a/d_a_alink_spinner.inc b/src/d/a/d_a_alink_spinner.inc index 84744353bd..eeb2293520 100644 --- a/src/d/a/d_a_alink_spinner.inc +++ b/src/d/a/d_a_alink_spinner.inc @@ -200,7 +200,7 @@ int daAlink_c::procSpinnerWaitInit() { setBgCheckParam(); setSingleAnimeBaseSpeed(ANM_RIDE_CROUCH, daAlinkHIO_board_c0::m.mSitAnmSpeed, 4.0f); speed.y = 0.0f; - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); mNormalSpeed = 0.0f; mProcVar2.field_0x300c = 0; diff --git a/src/d/a/d_a_alink_sumou.inc b/src/d/a/d_a_alink_sumou.inc index 7c0ce76e69..71edd4456b 100644 --- a/src/d/a/d_a_alink_sumou.inc +++ b/src/d/a/d_a_alink_sumou.inc @@ -897,7 +897,7 @@ int daAlink_c::procSumouWinLoseInit() { field_0x3198 = anm; mNormalSpeed = 0.0f; - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); speed.y = 0.0f; setFootEffectProcType(5); mProcVar3.field_0x300e.x = 0; diff --git a/src/d/a/d_a_alink_swim.inc b/src/d/a/d_a_alink_swim.inc index 2d26c210fc..79e3baab45 100644 --- a/src/d/a/d_a_alink_swim.inc +++ b/src/d/a/d_a_alink_swim.inc @@ -495,7 +495,7 @@ int daAlink_c::procSwimWait() { current.angle.y = shape_angle.y; } - mMaxFallSpeed = getSwimMaxFallSpeed(); + maxFallSpeed = getSwimMaxFallSpeed(); field_0x594 = getSwimFrontMaxSpeed(); setSpeedAndAngleSwim(); @@ -628,7 +628,7 @@ int daAlink_c::procSwimMove() { #ifdef NONMATCHING int daAlink_c::procSwimDiveInit() { commonProcInit(PROC_SWIM_DIVE); - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); speed.y = 0.0f; if (i_checkNoResetFlg0(FLG0_UNK_100)) { @@ -760,7 +760,7 @@ int daAlink_c::procSwimHookshotSubjectInit() { /* 80104D7C-80104EB8 0FF6BC 013C+00 1/0 0/0 0/0 .text procSwimHookshotSubject__9daAlink_cFv */ int daAlink_c::procSwimHookshotSubject() { - mMaxFallSpeed = getSwimMaxFallSpeed(); + maxFallSpeed = getSwimMaxFallSpeed(); field_0x594 = getSwimFrontMaxSpeed(); if (checkHookshotWait()) { diff --git a/src/d/a/d_a_alink_swindow.inc b/src/d/a/d_a_alink_swindow.inc index bc48df968b..4270ac9ee8 100644 --- a/src/d/a/d_a_alink_swindow.inc +++ b/src/d/a/d_a_alink_swindow.inc @@ -280,7 +280,7 @@ void daAlink_c::statusWindowExecute(cXyz const* param_0, s16 param_1) { /* 80140984-80140AC8 13B2C4 0144+00 0/0 1/1 0/0 .text statusWindowDraw__9daAlink_cFv */ void daAlink_c::statusWindowDraw() { if (mClothesChangeWaitTimer == 0) { - g_env_light.settingTevStruct(12, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(12, ¤t.pos, &tevStr); initTevCustomColor(); if (!i_checkWolf()) { diff --git a/src/d/a/d_a_alink_weakfn.inc b/src/d/a/d_a_alink_weakfn.inc index 19e715566d..fda52b1216 100644 --- a/src/d/a/d_a_alink_weakfn.inc +++ b/src/d/a/d_a_alink_weakfn.inc @@ -514,12 +514,12 @@ void daPy_py_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 param_1) { /* 8014150C-80141514 13BE4C 0008+00 1/0 0/0 0/0 .text getModelMtx__9daPy_py_cFv */ MtxP daPy_py_c::getModelMtx() { - return mCullMtx; + return cullMtx; } /* 80141514-8014151C 13BE54 0008+00 1/0 0/0 0/0 .text getInvMtx__9daPy_py_cFv */ MtxP daPy_py_c::getInvMtx() { - return mCullMtx; + return cullMtx; } /* 8014151C-80141524 13BE5C 0008+00 1/0 0/0 0/0 .text getShadowTalkAtnPos__9daPy_py_cFv @@ -530,37 +530,37 @@ cXyz* daPy_py_c::getShadowTalkAtnPos() { /* 80141524-8014152C 13BE64 0008+00 1/0 0/0 0/0 .text getLeftItemMatrix__9daPy_py_cFv */ MtxP daPy_py_c::getLeftItemMatrix() { - return mCullMtx; + return cullMtx; } /* 8014152C-80141534 13BE6C 0008+00 1/0 0/0 0/0 .text getRightItemMatrix__9daPy_py_cFv */ MtxP daPy_py_c::getRightItemMatrix() { - return mCullMtx; + return cullMtx; } /* 80141534-8014153C 13BE74 0008+00 1/0 0/0 0/0 .text getLeftHandMatrix__9daPy_py_cFv */ MtxP daPy_py_c::getLeftHandMatrix() { - return mCullMtx; + return cullMtx; } /* 8014153C-80141544 13BE7C 0008+00 1/0 0/0 0/0 .text getRightHandMatrix__9daPy_py_cFv */ MtxP daPy_py_c::getRightHandMatrix() { - return mCullMtx; + return cullMtx; } /* 80141544-8014154C 13BE84 0008+00 1/0 0/0 0/0 .text getLinkBackBone1Matrix__9daPy_py_cFv */ MtxP daPy_py_c::getLinkBackBone1Matrix() { - return mCullMtx; + return cullMtx; } /* 8014154C-80141554 13BE8C 0008+00 1/0 0/0 0/0 .text getWolfMouthMatrix__9daPy_py_cFv */ MtxP daPy_py_c::getWolfMouthMatrix() { - return mCullMtx; + return cullMtx; } /* 80141554-8014155C 13BE94 0008+00 1/0 0/0 0/0 .text getWolfBackbone2Matrix__9daPy_py_cFv */ MtxP daPy_py_c::getWolfBackbone2Matrix() { - return mCullMtx; + return cullMtx; } /* 8014155C-80141564 13BE9C 0008+00 1/0 0/0 0/0 .text getBottleMtx__9daPy_py_cFv */ diff --git a/src/d/a/d_a_alink_wolf.inc b/src/d/a/d_a_alink_wolf.inc index bbc0159981..173f28e8f2 100644 --- a/src/d/a/d_a_alink_wolf.inc +++ b/src/d/a/d_a_alink_wolf.inc @@ -226,7 +226,7 @@ void daAlink_c::changeWolf() { field_0x32c4 = 1; field_0x32c6 = 2; field_0x30b6 = 2; - mAttentionInfo.field_0xa = 50; + attention_info.field_0xa = 50; dCcD_Cyl* cyl_p = field_0x850; for (int i = 0; i < 3; i++) { @@ -522,7 +522,7 @@ void daAlink_c::changeLink(int param_0) { field_0x30b6 = 5; field_0x32c4 = 2; field_0x32c6 = 16; - mAttentionInfo.field_0xa = 10; + attention_info.field_0xa = 10; dCcD_Cyl* cyl_p = field_0x850; for (int i = 0; i < 3; i++) { @@ -1884,7 +1884,7 @@ int daAlink_c::procWolfSideStepInit(int param_0) { if (field_0x2f98 == 1) { if (mTargetedActor != NULL) { - mProcVar2.field_0x300c = cLib_targetAngleY(¤t.pos, &mTargetedActor->mEyePos); + mProcVar2.field_0x300c = cLib_targetAngleY(¤t.pos, &mTargetedActor->eyePos); } else { mProcVar2.field_0x300c = shape_angle.y; } @@ -2030,7 +2030,7 @@ int daAlink_c::procWolfBackJumpInit(int param_0) { } if (mTargetedActor != NULL && param_0 == 0) { - mProcVar2.field_0x300c = cLib_targetAngleY(¤t.pos, &mTargetedActor->mEyePos); + mProcVar2.field_0x300c = cLib_targetAngleY(¤t.pos, &mTargetedActor->eyePos); } else { mProcVar2.field_0x300c = shape_angle.y; } @@ -2273,7 +2273,7 @@ int daAlink_c::procWolfAutoJump() { field_0x2f99 = 12; setSingleAnimeWolfBaseSpeed(WANM_FALL_LAND, 0.0f, daAlinkHIO_wlDamFall_c0::m.field_0x3C); } else if (checkUnderMove0BckNoArcWolf(WANM_JUMP_ATTACK_START)) { - if (speed.y < -mGravity) { + if (speed.y < -gravity) { field_0x2f99 = 12; setSingleAnimeWolfParam(WANM_JUMP_ATTACK, &daAlinkHIO_wlAutoJump_c0::m.field_0x28); } else if (checkAnmEnd(frameCtrl_p)) { @@ -2285,7 +2285,7 @@ int daAlink_c::procWolfAutoJump() { mProcVar2.field_0x300c = 0; } } else if (mProcVar2.field_0x300c == 0 && checkUnderMove0BckNoArcWolf(WANM_JUMP_ATTACK) && - speed.y < -mGravity) + speed.y < -gravity) { mProcVar2.field_0x300c = 1; frameCtrl_p->setRate(daAlinkHIO_wlAutoJump_c0::m.field_0x28.mSpeed); @@ -3145,8 +3145,8 @@ int daAlink_c::procWolfHowlDemoInit() { cXyz sp14; cXyz sp8; - sp14.set(mAttentionInfo.mPosition.x, mAttentionInfo.mPosition.y - 50.0f, - mAttentionInfo.mPosition.z); + sp14.set(attention_info.position.x, attention_info.position.y - 50.0f, + attention_info.position.z); sp8.set(sp14.x + var_f31, sp14.y, sp14.z + var_f30); if (commonLineCheck(&sp14, &sp8)) { @@ -3727,7 +3727,7 @@ int daAlink_c::procWolfRopeMoveInit(int param_0, int param_1) { getNowAnmPackUnder(UNDER_0)->setFrame(13.5f); } - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); speed.y = 0.0f; if (param_1) { @@ -3817,7 +3817,7 @@ int daAlink_c::procWolfRopeHangInit(int param_0) { mProcVar0.field_0x3008 = 0; setWolfRopePosY(); setWolfRopeOffsetY(0); - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); speed.y = 0.0f; mNormalSpeed = 0.0f; shape_angle.x = 0; @@ -3852,7 +3852,7 @@ int daAlink_c::procWolfRopeTurnInit() { commonProcInit(PROC_WOLF_ROPE_TURN); setSingleAnimeWolfParam(WANM_ROPE_TURN, &daAlinkHIO_wlRope_c0::m.field_0x0); voiceStart(Z2SE_WL_V_BREATH_JUMP); - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); speed.y = 0.0f; mNormalSpeed = 0.0f; @@ -3905,7 +3905,7 @@ int daAlink_c::procWolfRopeStaggerInit(int param_0) { mProcVar3.field_0x300e.y = param_0; mProcVar2.field_0x300c = initWolfRopeShapeAngle(); - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); speed.y = 0.0f; current.angle.y = shape_angle.y; @@ -3953,7 +3953,7 @@ int daAlink_c::procWolfRopeSubjectivityInit() { mProcVar2.field_0x300c = initWolfRopeShapeAngle(); current.angle.y = shape_angle.y; - setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); f32 tmp_0 = FLOAT_LABEL(lit_6108); speed.y = tmp_0; @@ -4015,7 +4015,7 @@ asm int daAlink_c::getWolfTagJumpTime() const { /* 80133EF0-80134000 12E830 0110+00 3/3 1/1 1/1 .text checkMidnaLockJumpPoint__9daAlink_cCFv */ const cXyz* daAlink_c::checkMidnaLockJumpPoint() const { if ((!mLinkAcch.i_ChkGroundHit() && mProcID != PROC_WOLF_TAG_JUMP) || checkMidnaUseAbility() || - getMidnaActor()->mEvtInfo.checkCommandTalk()) + getMidnaActor()->eventInfo.checkCommandTalk()) { return NULL; } @@ -4806,7 +4806,7 @@ BOOL daAlink_c::checkMidnaDisappearMode() const { return mProcID == PROC_WOLF_DIG_THROUGH || (i_checkWolf() && i_dComIfGp_checkPlayerStatus0(0, 0x8000000) && !i_dComIfGp_checkPlayerStatus0(0, 0x10) && - (mTargetedActor == NULL || !(mTargetedActor->mAttentionInfo.mFlags & 0x800000))); + (mTargetedActor == NULL || !(mTargetedActor->attention_info.flags & 0x800000))); } /* 801371FC-801372B4 131B3C 00B8+00 3/3 0/0 0/0 .text checkWolfLieContinue__9daAlink_cFi @@ -4817,7 +4817,7 @@ BOOL daAlink_c::checkWolfLieContinue(int param_0) { cM3dGPla slide_poly; if ((param_0 || - ((mTargetedActor != NULL && (mTargetedActor->mAttentionInfo.mFlags & 0x800000)) && + ((mTargetedActor != NULL && (mTargetedActor->attention_info.flags & 0x800000)) && (fopAcM_GetName(mTargetedActor) == PROC_NPC_JAGAR || fopAcM_GetName(mTargetedActor) == PROC_NPC_BOU))) && !getSlidePolygon(&slide_poly) && !checkWolfLieWaterIn()) @@ -5544,8 +5544,8 @@ void daAlink_c::resetWolfBallGrab() { resetUpperAnime(UPPER_2, 3.0f); } - dComIfGp_particle_setColor(0x86CE, &mHeldItemRootPos, &mTevStr, NULL, NULL, 0.0f, 0xFF); - dComIfGp_particle_setColor(0x86CF, &mHeldItemRootPos, &mTevStr, NULL, NULL, 0.0f, 0xFF); + dComIfGp_particle_setColor(0x86CE, &mHeldItemRootPos, &tevStr, NULL, NULL, 0.0f, 0xFF); + dComIfGp_particle_setColor(0x86CF, &mHeldItemRootPos, &tevStr, NULL, NULL, 0.0f, 0xFF); i_onEndResetFlg0(ERFLG0_UNK_20000000); i_offNoResetFlg3(FLG3_UNK_200000); } @@ -5636,12 +5636,12 @@ void daAlink_c::searchWolfLockEnemy(fopAc_ac_c* i_actor, void* i_data) { } fopEn_enemy_c* enemy_p = static_cast(i_actor); - if (fopAcM_GetGroup(enemy_p) == 2 && enemy_p->mAttentionInfo.mFlags & 5 && + if (fopAcM_GetGroup(enemy_p) == 2 && enemy_p->attention_info.flags & 5 && !enemy_p->checkWolfNoLock()) { - f32 dist_to_enemy = current.pos.abs2(enemy_p->mEyePos); + f32 dist_to_enemy = current.pos.abs2(enemy_p->eyePos); - if (enemy_p->mEyePos.y >= current.pos.y - lit_6895 && dist_to_enemy < field_0x3478) { + if (enemy_p->eyePos.y >= current.pos.y - lit_6895 && dist_to_enemy < field_0x3478) { field_0x3478 = dist_to_enemy; *lock_actor_pp = i_actor; } @@ -5862,7 +5862,7 @@ int daAlink_c::procWolfRollAttackMove() { if (!swordButton() || mProcVar1.field_0x300a == 0) { if (mTargetedActor != NULL) { - shape_angle.y = cLib_targetAngleY(¤t.pos, &mTargetedActor->mEyePos); + shape_angle.y = cLib_targetAngleY(¤t.pos, &mTargetedActor->eyePos); current.angle.y = shape_angle.y; } @@ -6084,7 +6084,7 @@ int daAlink_c::procWolfJumpAttackKickInit() { f32 tmp_0 = FLOAT_LABEL(lit_6108); speed.y = tmp_0; mNormalSpeed = tmp_0; - setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + setSpecialGravity(tmp_0, maxFallSpeed, 0); voiceStart(Z2SE_WL_V_ATTACK_S); seStartOnlyReverb(Z2SE_WOLFATTACK_WIND_S); @@ -6294,7 +6294,7 @@ int daAlink_c::procWolfWaitAttackInit(int i_attackType) { atk_hio->field_0x0.mEndFrame, atk_hio->field_0x0.mInterpolation); if (mTargetedActor != NULL) { - shape_angle.y = cLib_targetAngleY(¤t.pos, &mTargetedActor->mEyePos); + shape_angle.y = cLib_targetAngleY(¤t.pos, &mTargetedActor->eyePos); } current.angle.y = shape_angle.y; @@ -6523,12 +6523,12 @@ int daAlink_c::procWolfDownAttackInit() { speed.y = daAlinkHIO_wlAtDown_c0::m.field_0x90; - f32 temp_f3 = speed.y + mGravity; - f32 var_f0 = temp_f3 * temp_f3 + mGravity * 2.0f * (sp24.y - current.pos.y); + f32 temp_f3 = speed.y + gravity; + f32 var_f0 = temp_f3 * temp_f3 + gravity * 2.0f * (sp24.y - current.pos.y); if (var_f0 < 0.0f) { - mNormalSpeed = (var_f1 * mGravity) / -temp_f3; + mNormalSpeed = (var_f1 * gravity) / -temp_f3; } else { - mNormalSpeed = (var_f1 * mGravity) / (-JMAFastSqrt(var_f0) - temp_f3); + mNormalSpeed = (var_f1 * gravity) / (-JMAFastSqrt(var_f0) - temp_f3); } mProcVar2.field_0x300c = 0; @@ -6556,7 +6556,7 @@ int daAlink_c::procWolfDownAttack() { fopEn_enemy_c* enemy_p = (fopEn_enemy_c*)field_0x280c.getActor(); if (enemy_p != NULL && enemy_p->checkDownFlg() && - mEyePos.abs2XZ(enemy_p->getDownPos()) < 10000.0f && + eyePos.abs2XZ(enemy_p->getDownPos()) < 10000.0f && fabsf(enemy_p->current.pos.y - current.pos.y) < 50.0f) { procWolfDownAtLandInit(enemy_p); @@ -6633,11 +6633,11 @@ int daAlink_c::procWolfDownAtLand() { if (enemy_p != NULL) { enemy_p->onWolfDownPullEndFlg(); - dComIfGp_particle_setColor(0x86CA, &enemy_p->getDownPos(), &mTevStr, NULL, NULL, + dComIfGp_particle_setColor(0x86CA, &enemy_p->getDownPos(), &tevStr, NULL, NULL, 0.0f, 0xFF); - dComIfGp_particle_setColor(0x86CB, &enemy_p->getDownPos(), &mTevStr, NULL, NULL, + dComIfGp_particle_setColor(0x86CB, &enemy_p->getDownPos(), &tevStr, NULL, NULL, 0.0f, 0xFF); - dComIfGp_particle_setColor(0x86CC, &enemy_p->getDownPos(), &mTevStr, NULL, NULL, + dComIfGp_particle_setColor(0x86CC, &enemy_p->getDownPos(), &tevStr, NULL, NULL, 0.0f, 0xFF); } @@ -6750,7 +6750,7 @@ int daAlink_c::procWolfLockAttack() { mProcVar0.field_0x3008--; if (mProcVar0.field_0x3008 == 0) { - setSpecialGravity(daAlinkHIO_wlAtLock_c0::m.field_0x48, mMaxFallSpeed, 0); + setSpecialGravity(daAlinkHIO_wlAtLock_c0::m.field_0x48, maxFallSpeed, 0); } } else if (mNormalSpeed > 30.0f) { cLib_addCalc(&mNormalSpeed, 30.0f, 0.3f, 5.0f, 1.0f); @@ -6800,7 +6800,7 @@ asm int daAlink_c::procWolfLockAttack() { int daAlink_c::procWolfLockAttackTurnInit(int param_0) { commonProcInit(PROC_WOLF_LOCK_ATTACK_TURN); - if (abs((s16)(cLib_targetAngleY(¤t.pos, &mWolfLockAcKeep[0].getActor()->mEyePos) - + if (abs((s16)(cLib_targetAngleY(¤t.pos, &mWolfLockAcKeep[0].getActor()->eyePos) - shape_angle.y)) > 0x4000) { setSingleAnimeWolfParam(WANM_ATTACK_A_END_BACK, &daAlinkHIO_wlAtLock_c0::m.field_0x14); @@ -6852,7 +6852,7 @@ int daAlink_c::procWolfLockAttackTurn() { } if (mWolfLockNum != 0) { - s16 target_angle = cLib_targetAngleY(¤t.pos, &mWolfLockAcKeep[0].getActor()->mEyePos); + s16 target_angle = cLib_targetAngleY(¤t.pos, &mWolfLockAcKeep[0].getActor()->eyePos); if (mProcVar2.field_0x300c != 0) { target_angle += 0x8000; } @@ -7037,7 +7037,7 @@ int daAlink_c::procWolfEnemyHangBiteInit() { f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; speed.y = tmp_0; - setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + setSpecialGravity(tmp_0, maxFallSpeed, 0); if (!setWolfEnemyHangBitePos((fopEn_enemy_c*)field_0x281c.getActor())) { return procWolfJumpAttackKickInit(); @@ -7461,7 +7461,7 @@ int daAlink_c::procWolfCargoCarryInit() { f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; speed.y = tmp_0; - setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + setSpecialGravity(tmp_0, maxFallSpeed, 0); daAlink_WANM anm; if (checkCargoCarry()) { @@ -7587,7 +7587,7 @@ int daAlink_c::procWolfGanonCatchInit() { } mDemo.i_setSpecialDemoType(); - field_0x27f4->mStatus |= 0x800; + field_0x27f4->actor_status |= 0x800; commonProcInit(PROC_WOLF_GANON_CATCH); field_0x280c.setData(field_0x27f4); @@ -7724,7 +7724,7 @@ int daAlink_c::procWolfChainReady() { mProcVar2.field_0x300c = angle >> 1; mNormalSpeed = dist_xz * 40.0f / dist + 1.0f; mProcVar0.field_0x3008 = dist_xz / mNormalSpeed + 1.0f; - speed.y = (vec1.y - mGravity * 0.5f * mProcVar0.field_0x3008 * mProcVar0.field_0x3008) + speed.y = (vec1.y - gravity * 0.5f * mProcVar0.field_0x3008 * mProcVar0.field_0x3008) / mProcVar0.field_0x3008; } else { mProcVar0.field_0x3008--; @@ -7759,7 +7759,7 @@ int daAlink_c::procWolfChainWaitInit() { chain->onRide(); field_0x2f99 = 0x50; current.pos = chain->getTopPos(); - setSpecialGravity(0.0f, mMaxFallSpeed, 0); + setSpecialGravity(0.0f, maxFallSpeed, 0); speed.y = 0.0f; mProcVar3.field_0x300e.y = 0; mProcVar0.field_0x3008 = daAlinkHIO_wlChain_c0::m.field_0x3C + 20; diff --git a/src/d/a/d_a_itembase.cpp b/src/d/a/d_a_itembase.cpp index cc28227ae0..bf0d8a9eeb 100644 --- a/src/d/a/d_a_itembase.cpp +++ b/src/d/a/d_a_itembase.cpp @@ -166,17 +166,17 @@ void daItemBase_c::settingBeforeDraw() { /* 80144D18-80144D70 13F658 0058+00 1/0 0/0 8/0 .text setTevStr__12daItemBase_cFv */ void daItemBase_c::setTevStr() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); } /* 80144D70-80144EDC 13F6B0 016C+00 1/0 1/0 9/1 .text setShadow__12daItemBase_cFv */ void daItemBase_c::setShadow() { - f32 scale = mScale.x * getShadowSize(); + f32 size = scale.x * getShadowSize(); if (!chkFlag(0x10)) { if (getShadowSize() != 0.0f) { - dComIfGd_setSimpleShadow(¤t.pos, mAcch.GetGroundH(), scale, mAcch.m_gnd, 0, 1.0f, + dComIfGd_setSimpleShadow(¤t.pos, mAcch.GetGroundH(), size, mAcch.m_gnd, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } } else { @@ -186,7 +186,7 @@ void daItemBase_c::setShadow() { } field_0x91c = dComIfGd_setShadow(field_0x91c, 3, mpModel, ¤t.pos, shadowSize, 0.0f, - current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &mTevStr, + current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } } diff --git a/src/d/a/d_a_no_chg_room.cpp b/src/d/a/d_a_no_chg_room.cpp index 28681c91d9..49e54b5bbb 100644 --- a/src/d/a/d_a_no_chg_room.cpp +++ b/src/d/a/d_a_no_chg_room.cpp @@ -66,9 +66,9 @@ int daNocrm_c::execute() { cXyz sp14; mDoMtx_multVec(mInvMtx, &cur_player_pos, &sp14); - if (sp14.y < 0.0f || sp14.y > mScale.y || fabsf(sp14.x) > mScale.x || fabsf(sp14.z) > mScale.z) + if (sp14.y < 0.0f || sp14.y > scale.y || fabsf(sp14.x) > scale.x || fabsf(sp14.z) > scale.z) { - if (mSubtype == 0 || !mRoomLoading || + if (subtype == 0 || !mRoomLoading || dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != 0) { return 1; @@ -79,7 +79,7 @@ int daNocrm_c::execute() { return 1; } - sp14.z = sp14.z < 0.0f ? -mScale.z : mScale.z; + sp14.z = sp14.z < 0.0f ? -scale.z : scale.z; cXyz new_player_pos; mDoMtx_multVec(mMtx, &sp14, &new_player_pos); @@ -88,7 +88,7 @@ int daNocrm_c::execute() { player_p->shape_angle.y, 1); } - if (mSubtype == 0) { + if (subtype == 0) { dStage_roomControl_c::setRoomReadId(getReadRoomId()); } else { dStage_roomControl_c::onNoChangeRoom(); @@ -101,9 +101,9 @@ int daNocrm_c::execute() { /* 80145508-801455A8 13FE48 00A0+00 1/1 0/0 0/0 .text getRoomNo__9daNocrm_cFi */ int daNocrm_c::getRoomNo(int param_0) { if (mRoomNo[param_0] < 0) { - f32 z_offset = param_0 ? -mScale.z : mScale.z; + f32 z_offset = param_0 ? -scale.z : scale.z; - cXyz offset(0.0f, mScale.y, z_offset); + cXyz offset(0.0f, scale.y, z_offset); cXyz check_pos; mDoMtx_multVec(mMtx, &offset, &check_pos); @@ -120,7 +120,7 @@ int daNocrm_c::getRoomNo(int param_0) { } int daNocrm_c::create() { - if (mSubtype == 0 && getReadRoomId() < 0) { + if (subtype == 0 && getReadRoomId() < 0) { // "Room Load Rectangle: Load ID is -1, so destroy self!\n" OSReport_Warning("部屋読み込み矩形：読み込みＩＤが−１ですので、自滅します！\n"); return cPhs_ERROR_e; @@ -131,7 +131,7 @@ int daNocrm_c::create() { cMtx_copy(mDoMtx_stack_c::get(), mMtx); cMtx_inverse(mDoMtx_stack_c::get(), mInvMtx); - mScale *= getScaleType() ? 1000.0f : 100.0f; + scale *= getScaleType() ? 1000.0f : 100.0f; mRoomNo[0] = -1; mRoomNo[1] = -1; return cPhs_COMPLEATE_e; diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index 09011e6b6f..fdc9ae6ad5 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -1801,26 +1801,26 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo return 1; } - mTevStr.mFogColor.r = 0; - mTevStr.mFogColor.g = 0; - mTevStr.mFogColor.b = 0; - mTevStr.mFogColor.a = 0; + tevStr.mFogColor.r = 0; + tevStr.mFogColor.g = 0; + tevStr.mFogColor.b = 0; + tevStr.mFogColor.a = 0; if (i_color != NULL) { - mTevStr.mFogColor.r = i_color->r; - mTevStr.mFogColor.g = i_color->g; - mTevStr.mFogColor.b = i_color->b; - mTevStr.mFogColor.a = i_color->a; + tevStr.mFogColor.r = i_color->r; + tevStr.mFogColor.g = i_color->g; + tevStr.mFogColor.b = i_color->b; + tevStr.mFogColor.a = i_color->a; } if (field_0xdb8 != 0 && mTimer != 0) { f32 r = (f32)mTimer / (f32)field_0xdb8; if (cM3d_IsZero(r) == false) { - mTevStr.mFogColor.r = r * 20.0f; + tevStr.mFogColor.r = r * 20.0f; } } else if (param_0 != 0) { - mTevStr.mFogColor.g = 20; + tevStr.mFogColor.g = 20; } if (field_0xd98 & 0x800) { @@ -1846,14 +1846,14 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo if (i_drawGhost) { drawGhost(); } else if (field_0xa89 != 0) { - g_env_light.settingTevStruct(4, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(model->getModelData(), &mTevStr); + g_env_light.settingTevStruct(4, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr); dComIfGd_setListDark(); mMcaMorfAnm[0]->entryDL(); dComIfGd_setList(); } else { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(model->getModelData(), &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr); mMcaMorfAnm[0]->entryDL(); } @@ -1876,7 +1876,7 @@ int daNpcT_c::draw(int param_0, int i_setEffMtx, f32 param_2, GXColorS10* i_colo if (param_6 == 0) { if (param_7 == 0) { field_0xd94 = dComIfGd_setShadow(field_0xd94, 1, model, ¤t.pos, param_2, param_4, - current.pos.y, field_0xdf4, field_0x930, &mTevStr, 0, + current.pos.y, field_0xdf4, field_0x930, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } else { dComIfGd_setSimpleShadow(¤t.pos, field_0xdf4, param_4, field_0x930, 0, 1.0f, @@ -1901,8 +1901,8 @@ asm int daNpcT_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param /* 80148C70-80148CCC 1435B0 005C+00 1/1 0/0 58/58 .text setEnvTevColor__8daNpcT_cFv */ void daNpcT_c::setEnvTevColor() { - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0x930); - mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(field_0x930); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0x930); + tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(field_0x930); } /* 80148CCC-80148D10 14360C 0044+00 1/1 0/0 58/58 .text setRoomNo__8daNpcT_cFv */ @@ -2109,7 +2109,7 @@ void daNpcT_c::setMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(field_0xd78); - mDoMtx_stack_c::scaleM(mScale); + mDoMtx_stack_c::scaleM(scale); model->i_setBaseTRMtx(mDoMtx_stack_c::get()); model->setUserArea((u32)this); @@ -2198,21 +2198,21 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa *param_0 = -1; *param_1 = -1; - if (param_3 != 0 || mEvtInfo.checkCommandTalk() || field_0xdac != -1) { + if (param_3 != 0 || eventInfo.checkCommandTalk() || field_0xdac != -1) { fopAc_ac_c* talk_partner = dComIfGp_event_getTalkPartner(); dMsgObject_c* talk_partner_conv = (dMsgObject_c*)talk_partner; if (talk_partner == param_2) { fopAc_ac_c* conv_actor = talk_partner_conv->getActor(); - u16 actor_command = conv_actor->mEvtInfo.mCommand; + u16 actor_command = conv_actor->eventInfo.mCommand; if (actor_command == 2 || actor_command == 3) { - mSubMtd = (profile_method_class*)-1; + sub_method = (profile_method_class*)-1; } else if (actor_command == 6) { - if (conv_actor->mSubMtd != mSubMtd) { + if (conv_actor->sub_method != sub_method) { *param_0 = dComIfGp_getMesgFaceAnimeAttrInfo(); *param_1 = dComIfGp_getMesgAnimeAttrInfo(); - mSubMtd = conv_actor->mSubMtd; + sub_method = conv_actor->sub_method; } if (dMsgObject_c::isMouthCheck()) { @@ -2226,10 +2226,10 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa if (field_0xd98 & 0x4000) { field_0xd98 &= ~0x4000; } - mSubMtd = (profile_method_class*)-1; + sub_method = (profile_method_class*)-1; } } else { - mSubMtd = (profile_method_class*)-1; + sub_method = (profile_method_class*)-1; if (field_0xdb4) { field_0xdb4 = 1; } @@ -2301,9 +2301,9 @@ bool daNpcT_c::checkCullDraw() { /* 8014A064-8014A0B0 1449A4 004C+00 1/0 1/0 60/0 .text twilight__8daNpcT_cFv */ void daNpcT_c::twilight() { if (field_0xa89 != 0) { - mAttentionInfo.mFlags |= 0x400000; + attention_info.flags |= 0x400000; field_0xe2b = 0; - mAttentionInfo.mFlags |= 0x800000; + attention_info.flags |= 0x800000; setHitodamaPrtcl(); } } @@ -2367,7 +2367,7 @@ void daNpcT_c::setPos(cXyz i_pos) { i_pos.y = dComIfG_Bgsp().GroundCross(&field_0x930); current.pos = i_pos; - next.pos = current.pos; + old.pos = current.pos; } /* 8014A99C-8014AA18 1452DC 007C+00 0/0 0/0 29/29 .text setAngle__8daNpcT_cF5csXyz */ @@ -2376,7 +2376,7 @@ void daNpcT_c::setAngle(csXyz i_angle) { shape_angle = current.angle; field_0xd78 = current.angle; field_0xd7e = field_0xd78; - next.angle = current.angle; + old.angle = current.angle; } /* 8014AA18-8014AA40 145358 0028+00 0/0 0/0 138/138 .text setAngle__8daNpcT_cFs */ @@ -2385,7 +2385,7 @@ void daNpcT_c::setAngle(s16 i_angle) { shape_angle.y = current.angle.y; field_0xd78.y = current.angle.y; field_0xd7e.y = field_0xd78.y; - next.angle.y = current.angle.y; + old.angle.y = current.angle.y; } /* 8014AA40-8014AAD0 145380 0090+00 0/0 0/0 33/33 .text hitChk__8daNpcT_cFP12dCcD_GObjInfUl */ @@ -3568,7 +3568,7 @@ void daBaseNpc_c::attnSttsOn(int param_0, int param_1) { tmp = 1; } - mAttentionInfo.mFlags = tmp; + attention_info.flags = tmp; } /* 8014EFF0-8014EFF4 149930 0004+00 2/0 0/0 1/0 .text setParam__11daBaseNpc_cFv */ @@ -3582,7 +3582,7 @@ void daBaseNpc_c::orderEvent(int param_0, char* i_evtName) { mEvtIdx = i_dComIfGp_getEventManager().getEventIdx(this, i_evtName, -1); fopAcM_orderOtherEventId(this, mEvtIdx, -1, -1, 0, 1); } else { - if ((mUnk >= 0 && mAttentionInfo.mFlags == 10) && (mEvtInfo.mCondition |= 1, param_0 != 0)) + if ((mUnk >= 0 && attention_info.flags == 10) && (eventInfo.mCondition |= 1, param_0 != 0)) { fopAcM_orderSpeakEvent(this, 0, 0); } @@ -3595,8 +3595,8 @@ void daBaseNpc_c::mainProc() { /* 8014F0A0-8014F0FC 1499E0 005C+00 1/1 0/0 2/2 .text setEnvTevColor__11daBaseNpc_cFv */ void daBaseNpc_c::setEnvTevColor() { - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mBgSPolyInfo); - mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mBgSPolyInfo); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mBgSPolyInfo); + tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mBgSPolyInfo); } /* 8014F0FC-8014F140 149A3C 0044+00 1/1 0/0 2/2 .text setRoomNo__11daBaseNpc_cFv */ @@ -3700,7 +3700,7 @@ void daBaseNpc_c::setMtx(int param_0) { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(field_0x91a); - mDoMtx_stack_c::scaleM(mScale); + mDoMtx_stack_c::scaleM(scale); model->i_setBaseTRMtx(mDoMtx_stack_c::get()); @@ -4594,8 +4594,8 @@ BOOL daNpcF_c::execute() { cLib_chaseF(&field_0x978, 0.0f, 1.0f); setCollisions(); if (field_0x9f4 != 0) { - mAttentionInfo.mFlags |= 0x400000; - mAttentionInfo.mFlags |= 0x800000; + attention_info.flags |= 0x400000; + attention_info.flags |= 0x800000; setHitodamaPrtcl(); } field_0x8f6 = field_0x8f0; @@ -4644,27 +4644,27 @@ BOOL daNpcF_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param_3, fVar1 = 0.0f; } if (cM3d_IsZero_inverted(fVar1)) { - mTevStr.mFogColor.r = (s16)(fVar1 * 20.0f); - mTevStr.mFogColor.g = 0; + tevStr.mFogColor.r = (s16)(fVar1 * 20.0f); + tevStr.mFogColor.g = 0; } else if (param_0) { - mTevStr.mFogColor.g = 20; - mTevStr.mFogColor.r = 0; + tevStr.mFogColor.g = 20; + tevStr.mFogColor.r = 0; } else if (param_3 != NULL) { - mTevStr.mFogColor.r = param_3->r; - mTevStr.mFogColor.g = param_3->g; - mTevStr.mFogColor.b = param_3->b; - mTevStr.mFogColor.a = param_3->a; + tevStr.mFogColor.r = param_3->r; + tevStr.mFogColor.g = param_3->g; + tevStr.mFogColor.b = param_3->b; + tevStr.mFogColor.a = param_3->a; } else { - mTevStr.mFogColor.g = 0; - mTevStr.mFogColor.r = 0; + tevStr.mFogColor.g = 0; + tevStr.mFogColor.r = 0; } if (field_0x9f4) { - g_env_light.settingTevStruct(4, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(4, ¤t.pos, &tevStr); } else { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); } - g_env_light.setLightTevColorType_MAJI(model->getModelData(), &mTevStr); + g_env_light.setLightTevColorType_MAJI(model->getModelData(), &tevStr); if (!drawDbgInfo()) { if (mAnmFlags & ANM_PLAY_BTP) { @@ -4702,7 +4702,7 @@ BOOL daNpcF_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param_3, } field_0x9a0 = dComIfGd_setShadow(field_0x9a0, true, model, ¤t.pos, param_2, 20.0f, - current.pos.y, field_0x980, field_0xa44, &mTevStr, 0, + current.pos.y, field_0x980, field_0xa44, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); drawOtherMdls(); @@ -5228,17 +5228,17 @@ asm void daNpcF_c::setDamage(int param_0, int param_1, int param_2) { int daNpcF_c::ctrlMsgAnm(int& expression, int& motion, fopAc_ac_c* param_2, int param_3) { expression = -1; motion = -1; - if (param_3 || mEvtInfo.checkCommandTalk() || mCutIndex != -1) { + if (param_3 || eventInfo.checkCommandTalk() || mCutIndex != -1) { fopAc_ac_c* talkPartner = dComIfGp_event_getTalkPartner(); if (talkPartner == param_2) { fopAc_ac_c* actor = dMsgObject_c::getActor(); - if (actor->mEvtInfo.mCommand == 2 || actor->mEvtInfo.mCommand == 3) { + if (actor->eventInfo.mCommand == 2 || actor->eventInfo.mCommand == 3) { field_0x9a4 = (profile_method_class*)-1; - } else if (actor->mEvtInfo.mCommand == 6) { - if (actor->mSubMtd != field_0x9a4) { + } else if (actor->eventInfo.mCommand == 6) { + if (actor->sub_method != field_0x9a4) { expression = dComIfGp_getMesgFaceAnimeAttrInfo(); motion = dComIfGp_getMesgAnimeAttrInfo(); - field_0x9a4 = actor->mSubMtd; + field_0x9a4 = actor->sub_method; } if (dMsgObject_c::isMouthCheck()) { mAnmFlags &= ~ANM_PAUSE_EXPRESSION; @@ -5508,7 +5508,7 @@ fopAc_ac_c* daNpcF_c::getAttnActorP(int param_0, void* (*param_1)(void*, void*), mFindCount = 0; fpcEx_Search((fpcLyIt_JudgeFunc)param_1, this); for (int i = 0; i < mFindCount; i++) { - if (chkPointInArea(getAttentionPos(mFindActorPList[i]), mAttentionInfo.mPosition, + if (chkPointInArea(getAttentionPos(mFindActorPList[i]), attention_info.position, param_2, param_3, param_4, 0) && chkActorInSight2(mFindActorPList[i], param_5, param_6)) { @@ -5634,7 +5634,7 @@ BOOL daNpcF_c::chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 para /* 8015496C-801549E0 14F2AC 0074+00 3/3 0/0 0/0 .text getAttentionPos__8daNpcF_cFP10fopAc_ac_c */ cXyz daNpcF_c::getAttentionPos(fopAc_ac_c* i_ActorP) { - cXyz pos = i_ActorP->mAttentionInfo.mPosition; + cXyz pos = i_ActorP->attention_info.position; if (fopAcM_GetName(i_ActorP) == PROC_ALINK) { pos.y -= daPy_py_c::getAttentionOffsetY(); @@ -5674,9 +5674,9 @@ void daNpcF_c::setHitodamaPrtcl() { field_0x9b8.x *= cM_scos(shape_angle.y); field_0x9d2 += 0x400; - local_20.x = mEyePos.x + field_0x9b8.x + field_0x9c4.x; - local_20.y = mEyePos.y + field_0x9b8.y + field_0x9c4.y; - local_20.z = mEyePos.z + field_0x9b8.z + field_0x9c4.z; + local_20.x = eyePos.x + field_0x9b8.x + field_0x9c4.x; + local_20.y = eyePos.y + field_0x9b8.y + field_0x9c4.y; + local_20.z = eyePos.z + field_0x9b8.z + field_0x9c4.z; for (int i = 0; i < 2; i++) { field_0x9a8[i] = diff --git a/src/d/a/d_a_npc_cd.cpp b/src/d/a/d_a_npc_cd.cpp index e54ea7604e..113063b2d8 100644 --- a/src/d/a/d_a_npc_cd.cpp +++ b/src/d/a/d_a_npc_cd.cpp @@ -701,8 +701,8 @@ int daNpcCd_c::removeResrc(int idx, int param_1) { /* 80156D1C-80156D78 15165C 005C+00 0/0 0/0 1/1 .text setEnvTevCol__9daNpcCd_cFv */ void daNpcCd_c::setEnvTevCol() { - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd); - mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd); + tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); } /* 80156D78-80156DBC 1516B8 0044+00 0/0 0/0 1/1 .text setRoomNo__9daNpcCd_cFv */ diff --git a/src/d/a/d_a_npc_cd2.cpp b/src/d/a/d_a_npc_cd2.cpp index 43dae827ed..fae85574da 100644 --- a/src/d/a/d_a_npc_cd2.cpp +++ b/src/d/a/d_a_npc_cd2.cpp @@ -1809,8 +1809,8 @@ int daNpcCd2_c::removeResrc(int idx, int param_1) { /* 80158D88-80158DE4 1536C8 005C+00 0/0 0/0 4/4 .text setEnvTevCol__10daNpcCd2_cFv */ void daNpcCd2_c::setEnvTevCol() { - mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd); - mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); + tevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd); + tevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); } /* 80158DE4-80158E28 153724 0044+00 0/0 0/0 4/4 .text setRoomNo__10daNpcCd2_cFv */ @@ -1872,7 +1872,7 @@ int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) { u32 x = !isM_(); s32 jntNum = a_jntNumTbl[idx][x]; if (i_model && jntNum >= 0) { - g_env_light.setLightTevColorType_MAJI(i_model, &mTevStr); + g_env_light.setLightTevColorType_MAJI(i_model, &tevStr); mDoMtx_copy(mpMorf->getModel()->i_getAnmMtx(jntNum), mDoMtx_stack_c::now); mDoMtx_stack_c::scaleM(i_scale, i_scale, i_scale); i_model->i_setBaseTRMtx(mDoMtx_stack_c::now); @@ -1894,15 +1894,15 @@ asm int daNpcCd2_c::drawObj(int param_0, J3DModel* param_1, f32 param_2) { /* 801590FC-80159258 153A3C 015C+00 0/0 0/0 4/4 .text drawNpc__10daNpcCd2_cFv */ int daNpcCd2_c::drawNpc() { if (field_0xac6) { - g_env_light.settingTevStruct(4, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(4, ¤t.pos, &tevStr); } else { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); } if (field_0xac6 && !daPy_py_c::checkNowWolfEyeUp()) { setHitodamaParticle(); return 1; } - g_env_light.setLightTevColorType_MAJI(mpMorf->getModel(), &mTevStr); + g_env_light.setLightTevColorType_MAJI(mpMorf->getModel(), &tevStr); if (field_0xac6) { dComIfGd_setListDark(); } diff --git a/src/d/a/d_a_obj.cpp b/src/d/a/d_a_obj.cpp index 3c0d4c816f..d5e0fd7ea5 100644 --- a/src/d/a/d_a_obj.cpp +++ b/src/d/a/d_a_obj.cpp @@ -24,7 +24,7 @@ void eff_break_tsubo(fopAc_ac_c* i_actor, cXyz i_scale, int i_type) { dPa_name::ZI_J_M_tuboHahen_e, &i_actor->current.pos, NULL, NULL, 0xFF, (dPa_modelEcallBack*)&dPa_modelEcallBack::mEcallback, roomNo, NULL, NULL, &i_scale); - dPa_modelEcallBack::setModel(emitter, tubo_bmd, i_actor->mTevStr, 3, tubo_btp, 0, i_type); + dPa_modelEcallBack::setModel(emitter, tubo_bmd, i_actor->tevStr, 3, tubo_btp, 0, i_type); s32 roomNo2 = fopAcM_GetRoomNo(i_actor); dComIfGp_particle_set(dPa_name::ZI_J_tuboHahen_e, &i_actor->current.pos, NULL, NULL, 0xFF, @@ -97,7 +97,7 @@ void posMoveF_grade_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* param_ if (param_2 != NULL) { cXyz sp28(*param_5); - sp28.y += i_actor->mGravity; + sp28.y += i_actor->gravity; if (param_6 != NULL) { sp28 += *param_6; @@ -136,10 +136,10 @@ void posMoveF_grade(fopAc_ac_c* i_actor, cXyz const* param_1, cXyz const* stream f32 speedF = fopAcM_GetSpeedF(i_actor); f32 gravity = fopAcM_GetGravity(i_actor); - cXyz& speed_p = fopAcM_GetSpeed_p(i_actor); + cXyz* speed_p = fopAcM_GetSpeed_p(i_actor); f32 speed_x = spB8.x + (spAC.x + (speedF * cM_ssin(i_actor->current.angle.y))); - f32 speed_y = spB8.y + (spAC.y + (speed_p.y + gravity)); + f32 speed_y = spB8.y + (spAC.y + (speed_p->y + gravity)); f32 speed_z = spB8.z + (spAC.z + (speedF * cM_scos(i_actor->current.angle.y))); if (param_8 != NULL) { diff --git a/src/d/a/d_a_obj_item.cpp b/src/d/a/d_a_obj_item.cpp index e049382f6f..fee624feaa 100644 --- a/src/d/a/d_a_obj_item.cpp +++ b/src/d/a/d_a_obj_item.cpp @@ -251,7 +251,7 @@ const daItemBase_data& daItemBase_c::getData() { /* 8015B0C4-8015B108 155A04 0044+00 1/1 0/0 0/0 .text initBaseMtx__8daItem_cFv */ void daItem_c::initBaseMtx() { if (mpModel != NULL) { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); setBaseMtx(); } } @@ -259,7 +259,7 @@ void daItem_c::initBaseMtx() { /* 8015B108-8015B190 155A48 0088+00 2/2 0/0 0/0 .text setBaseMtx__8daItem_cFv */ void daItem_c::setBaseMtx() { if (mpModel != NULL) { - mpModel->setBaseScale(mScale); + mpModel->setBaseScale(scale); switch (m_itemNo) { case GREEN_RUPEE: @@ -295,7 +295,7 @@ SECTION_SDATA2 static f32 lit_3923 = 0.5f; #ifdef NONMATCHING void daItem_c::setBaseMtx_1() { f32 max_y = mpModel->getModelData()->getJointNodePointer(0)->getMax()->y; - f32 y = (max_y / 2) * mScale.y; + f32 y = (max_y / 2) * scale.y; mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::transM(0.0f, y, 0.0f); @@ -547,7 +547,7 @@ SECTION_SDATA2 static f64 lit_4072 = 4503599627370496.0 /* cast u32 to float */; #ifdef NONMATCHING void daItem_c::CreateInit() { mAcchCir.SetWall(30.0f, 30.0f); - mAcch.Set(¤t.pos, &next.pos, this, 1, &mAcchCir, &speed, NULL, NULL); + mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL); mAcch.ClrWaterNone(); mAcch.ClrRoofNone(); mAcch.SetWtrChkMode(2); @@ -562,9 +562,9 @@ void daItem_c::CreateInit() { f32 cylHeight = dItem_data::getH(m_itemNo); f32 cylRadius = dItem_data::getR(m_itemNo); - if (mScale.x > 1.0f) { - cylHeight *= mScale.x; - cylRadius *= mScale.x; + if (scale.x > 1.0f) { + cylHeight *= scale.x; + cylRadius *= scale.x; } mCollider.SetR(cylRadius); @@ -623,7 +623,7 @@ void daItem_c::CreateInit() { mAcch.CrrPos(dComIfG_Bgsp()); - if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > orig.pos.y + 150.0f) { + if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > home.pos.y + 150.0f) { field_0x9c0 = 1; } @@ -746,10 +746,10 @@ int daItem_c::_daItem_create() { fopAcM_SetupActor(this, daItem_c); if (!field_0x95d) { - field_0x92c = orig.angle.x; - field_0x92e = orig.angle.z; - orig.angle.z = 0; - orig.angle.x = 0; + field_0x92c = home.angle.x; + field_0x92e = home.angle.z; + home.angle.z = 0; + home.angle.x = 0; current.angle.z = 0; current.angle.x = 0; shape_angle.z = 0; @@ -822,10 +822,10 @@ int daItem_c::_daItem_execute() { field_0x950 = speed; CountTimer(); - mEyePos = current.pos; - mEyePos.y += (f32)dItem_data::getH(m_itemNo) / 2; + eyePos = current.pos; + eyePos.y += (f32)dItem_data::getH(m_itemNo) / 2; - mAttentionInfo.mPosition = current.pos; + attention_info.position = current.pos; if (mCollider.ChkTgHit()) { cCcD_Obj* hitObj = mCollider.GetTgHitObj(); @@ -919,14 +919,14 @@ void daItem_c::procInitNormal() { void daItem_c::procMainNormal() { move_proc_call(); - if (mScale != field_0x930) { + if (scale != field_0x930) { f32 chase_x = field_0x930.x / getData().field_0xc; f32 chase_y = field_0x930.y / getData().field_0xc; f32 chase_z = field_0x930.z / getData().field_0xc; - cLib_chaseF(&mScale.x, field_0x930.x, chase_x); - cLib_chaseF(&mScale.y, field_0x930.y, chase_y); - cLib_chaseF(&mScale.z, field_0x930.z, chase_z); + cLib_chaseF(&scale.x, field_0x930.x, chase_x); + cLib_chaseF(&scale.y, field_0x930.y, chase_y); + cLib_chaseF(&scale.z, field_0x930.z, chase_z); } if (field_0x942 == 0) { @@ -974,7 +974,7 @@ void daItem_c::procInitSimpleGetDemo() { current.pos.y += 15.0f; shape_angle.z = 0; shape_angle.x = 0; - mScale = field_0x930; + scale = field_0x930; fopAcM_SetSpeed(this, 0, getData().field_0x2c, 0); fopAcM_SetGravity(this, getData().field_0x30); show(); @@ -1015,7 +1015,7 @@ void daItem_c::procInitGetDemoEvent() { field_0x9c1 = 10; fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e); + eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e); m_item_id = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this), NULL, NULL); @@ -1025,7 +1025,7 @@ void daItem_c::procInitGetDemoEvent() { /* 8015C2A4-8015C3BC 156BE4 0118+00 1/0 0/0 0/0 .text procWaitGetDemoEvent__8daItem_cFv */ void daItem_c::procWaitGetDemoEvent() { - if (mEvtInfo.checkCommandItem()) { + if (eventInfo.checkCommandItem()) { setStatus(4); if (m_item_id != -1) { dComIfGp_event_setItemPartnerId(m_item_id); @@ -1033,7 +1033,7 @@ void daItem_c::procWaitGetDemoEvent() { } else { if (m_itemNo == BOOMERANG) { fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e); + eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e); return; } @@ -1048,7 +1048,7 @@ void daItem_c::procWaitGetDemoEvent() { } } else { fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e); + eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e); } } } @@ -1114,7 +1114,7 @@ void daItem_c::procMainSwOnWait() { if (i_fopAcM_isSwitch(this, field_0x93c)) { mAcch.CrrPos(dComIfG_Bgsp()); - if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > lit_4070[0] + orig.pos.y) { + if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > lit_4070[0] + home.pos.y) { field_0x9c0 = 1; } @@ -1187,7 +1187,7 @@ void daItem_c::mode_water_init() { shape_angle.z = 0; shape_angle.x = 0; field_0x940 = 0; - mScale = field_0x930; + scale = field_0x930; } /* 8015CCD0-8015CDCC 157610 00FC+00 1/0 0/0 0/0 .text mode_wait__8daItem_cFv */ @@ -1284,8 +1284,8 @@ asm void daItem_c::mode_water() { /* 8015CE94-8015CEEC 1577D4 0058+00 1/0 0/0 0/0 .text setTevStr__8daItem_cFv */ void daItem_c::setTevStr() { - g_env_light.settingTevStruct(0, ¤t.pos, &mTevStr); - g_env_light.setLightTevColorType_MAJI(mpModel, &mTevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); } /* 8015CEEC-8015D0A8 15782C 01BC+00 6/6 0/0 0/0 .text itemGetNextExecute__8daItem_cFv */ diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index 9c9f33ede6..ff14f4e045 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -124,11 +124,11 @@ void dBgS_Acch::Set(fopAc_ac_c* i_actor, int i_tbl_size, dBgS_AcchCir* i_acchcir m_my_ac = i_actor; SetActorPid(fopAcM_GetID(i_actor)); - pm_pos = &fopAcM_GetPosition_p(i_actor); - pm_old_pos = &fopAcM_GetOldPosition_p(i_actor); - pm_speed = &fopAcM_GetSpeed_p(i_actor); - pm_angle = &fopAcM_GetAngle_p(i_actor); - pm_shape_angle = &fopAcM_GetShapeAngle_p(i_actor); + pm_pos = fopAcM_GetPosition_p(i_actor); + pm_old_pos = fopAcM_GetOldPosition_p(i_actor); + pm_speed = fopAcM_GetSpeed_p(i_actor); + pm_angle = fopAcM_GetAngle_p(i_actor); + pm_shape_angle = fopAcM_GetShapeAngle_p(i_actor); } /* 800762D8-80076350 070C18 0078+00 1/1 0/0 0/0 .text GroundCheckInit__9dBgS_AcchFR4dBgS diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/bg/d_bg_s_movebg_actor.cpp index 774c245984..26ed5f5234 100644 --- a/src/d/bg/d_bg_s_movebg_actor.cpp +++ b/src/d/bg/d_bg_s_movebg_actor.cpp @@ -107,7 +107,7 @@ int dBgS_MoveBgActor::MoveBGCreate(char const* i_arcName, int i_dzb_id, if (i_bgMtx == NULL) { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); + mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } else { MTXCopy(*i_bgMtx, mBgMtx); @@ -147,7 +147,7 @@ int dBgS_MoveBgActor::MoveBGExecute() { if (new_mtx == NULL) { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mDoMtx_stack_c::scaleM(mScale.x, mScale.y, mScale.z); + mDoMtx_stack_c::scaleM(scale.x, scale.y, scale.z); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } else { MTXCopy(*new_mtx, mBgMtx); diff --git a/src/d/cc/d_cc_s.cpp b/src/d/cc/d_cc_s.cpp index 76d600829e..72a3650f4a 100644 --- a/src/d/cc/d_cc_s.cpp +++ b/src/d/cc/d_cc_s.cpp @@ -165,7 +165,7 @@ bool dCcS::ChkShieldFrontRange(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, int param_2 if (tgObj->GetTgShieldFrontRangeYAngle() != NULL) { var_r4 = *tgObj->GetTgShieldFrontRangeYAngle(); } else { - var_r4 = fopAcM_GetShapeAngle_p(tgActor).y; + var_r4 = fopAcM_GetShapeAngle_p(tgActor)->y; } s16 shield_range = tgObj->GetTgShieldRange(); diff --git a/src/d/cc/d_cc_uty.cpp b/src/d/cc/d_cc_uty.cpp index 3b3875c501..72c0b908d0 100644 --- a/src/d/cc/d_cc_uty.cpp +++ b/src/d/cc/d_cc_uty.cpp @@ -444,13 +444,13 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) { } if (i_AtInfo->mAttackPower != 0) { - i_enemy->mHealth -= i_AtInfo->mAttackPower; + i_enemy->health -= i_AtInfo->mAttackPower; } s8 pause_time = 0; - if (i_AtInfo->mAttackPower != 0 && i_enemy->mHealth <= 0) { + if (i_AtInfo->mAttackPower != 0 && i_enemy->health <= 0) { i_AtInfo->mHitStatus = 2; - i_enemy->mHealth = 0; + i_enemy->health = 0; } int uvar8; diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp index 0975ddc8bb..7806e885ae 100644 --- a/src/d/com/d_com_static.cpp +++ b/src/d/com/d_com_static.cpp @@ -192,7 +192,7 @@ u8 daSus_c::data_c::check(fopAc_ac_c* i_actor) { u8 tmp = 0x80; - if (check(i_actor->orig.pos)) { + if (check(i_actor->home.pos)) { tmp |= 1; } @@ -473,8 +473,8 @@ SECTION_SDATA2 f32 daDsh_c::CLOSE_BOUND_RATIO = -0.4f; int daTagStream_c::checkArea(cXyz const* param_0) { cXyz relativePos; fpoAcM_relativePos(this, param_0, &relativePos); - if (relativePos.y >= 0.0f && relativePos.y <= mScale.y && fabsf(relativePos.x) <= mScale.x && - fabsf(relativePos.z) <= mScale.z) + if (relativePos.y >= 0.0f && relativePos.y <= scale.y && fabsf(relativePos.x) <= scale.x && + fabsf(relativePos.z) <= scale.z) { return 1; } diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index cbdde8ad1f..9069b354d8 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -509,7 +509,7 @@ dAttList_c* dAttention_c::getActionBtnB() { dAttList_c* list = GetLockonList(0); if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth() && - !(list->getActor()->mAttentionInfo.mFlags & 0x2000000)) { + !(list->getActor()->attention_info.flags & 0x2000000)) { return list; } @@ -519,7 +519,7 @@ dAttList_c* dAttention_c::getActionBtnB() { for (i = 0; i < mActionCount; i++) { if (mActionList[i].mType == 3) { - if (!(mActionList[i].getActor()->mAttentionInfo.mFlags & 0x2000000)) { + if (!(mActionList[i].getActor()->attention_info.flags & 0x2000000)) { return &mActionList[i]; } continue; @@ -536,7 +536,7 @@ dAttList_c* dAttention_c::getActionBtnXY() { dAttList_c* list = GetLockonList(0); if (list != NULL && list->getActor() != NULL && list->mType == 1 && LockonTruth()) { - if (list->getActor()->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { + if (list->getActor()->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { return list; } @@ -549,7 +549,7 @@ dAttList_c* dAttention_c::getActionBtnXY() { for (i = 0; i < mActionCount; i++) { if (mActionList[i].mType == 3) { - if (mActionList[i].getActor()->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { + if (mActionList[i].getActor()->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { return &mActionList[i]; } } @@ -795,16 +795,16 @@ f32 dAttention_c::calcWeight(int param_0, fopAc_ac_c* param_1, f32 param_2, s16 f32 dvar12; type_tbl_entry* entry = &table[i]; - if (mPlayerAttentionFlags & entry->field_0x2 & param_1->mAttentionInfo.mFlags) { - u8 index = param_1->mAttentionInfo.field_0x0[entry->field_0x0]; + if (mPlayerAttentionFlags & entry->field_0x2 & param_1->attention_info.flags) { + u8 index = param_1->attention_info.field_0x0[entry->field_0x0]; dist_entry* d_entry = &dist_table[index]; if (fopAcM_checkStatus(param_1, 0x20000000) || - check_event_condition(entry->field_0x0, param_1->mEvtInfo.getCondition())) { + check_event_condition(entry->field_0x0, param_1->eventInfo.getCondition())) { dvar12 = 0.0f; } else if (check_flontofplayer(d_entry->field_0x18, param_3, param_4)) { dvar12 = 0.0f; - } else if (!check_distace(&mOwnerAttnPos, param_3, ¶m_1->mAttentionInfo.mPosition, + } else if (!check_distace(&mOwnerAttnPos, param_3, ¶m_1->attention_info.position, d_entry->field_0x0, d_entry->field_0x8, d_entry->field_0xc, d_entry->field_0x10)) { dvar12 = 0.0f; @@ -953,7 +953,7 @@ asm void dAttention_c::initList(u32 param_0) { /* 8007138C-800713CC 06BCCC 0040+00 1/1 0/0 0/0 .text select_attention__FP10fopAc_ac_cPv */ static int select_attention(fopAc_ac_c* param_0, void* i_attention) { - if (param_0->mAttentionInfo.mFlags == 0) { + if (param_0->attention_info.flags == 0) { return 0; } @@ -969,7 +969,7 @@ int dAttention_c::makeList() { /* 80071424-80071488 06BD64 0064+00 1/1 0/0 0/0 .text setOwnerAttentionPos__12dAttention_cFv */ void dAttention_c::setOwnerAttentionPos() { - mOwnerAttnPos = mpPlayer->mAttentionInfo.mPosition; + mOwnerAttnPos = mpPlayer->attention_info.position; if (fopAcM_GetName(mpPlayer) == PROC_ALINK) { mOwnerAttnPos.y -= ((daPy_py_c*)mpPlayer)->getAttentionOffsetY(); @@ -984,21 +984,21 @@ int dAttention_c::SelectAttention(fopAc_ac_c* param_0) { if (param_0 == mpPlayer || mpPlayer == NULL) { return 0; } - mPlayerAttentionFlags = mpPlayer->mAttentionInfo.mFlags; - cSGlobe acStack_40(param_0->mAttentionInfo.mPosition - mOwnerAttnPos); - acStack_4c = acStack_40.U() - fopAcM_GetShapeAngle_p(mpPlayer).y; - acStack_50 = cSAngle(acStack_40.U().Inv()) - fopAcM_GetShapeAngle_p(param_0).y; + mPlayerAttentionFlags = mpPlayer->attention_info.flags; + cSGlobe acStack_40(param_0->attention_info.position - mOwnerAttnPos); + acStack_4c = acStack_40.U() - fopAcM_GetShapeAngle_p(mpPlayer)->y; + acStack_50 = cSAngle(acStack_40.U().Inv()) - fopAcM_GetShapeAngle_p(param_0)->y; u32 local_48; - if ((param_0->mAttentionInfo.mFlags & 7) != 0 && chkFlag(0x4000) == 0) + if ((param_0->attention_info.flags & 7) != 0 && chkFlag(0x4000) == 0) { f32 dVar5 = calcWeight(0x4c, param_0, acStack_40.R(), acStack_4c.Val(), acStack_50.Val(), &local_48); setList(0x4c, param_0, dVar5, acStack_40.R(), acStack_4c, local_48); } - if ((param_0->mAttentionInfo.mFlags & 0xf8) != 0) { + if ((param_0->attention_info.flags & 0xf8) != 0) { f32 dVar5 = calcWeight(0x41, param_0, acStack_40.R(), acStack_4c.Val(), acStack_50.Val(), &local_48); setList(0x41, param_0, dVar5, acStack_40.R(), acStack_4c, local_48); } - if (((param_0->mAttentionInfo).mFlags & 0x100) != 0) { + if (((param_0->attention_info).flags & 0x100) != 0) { f32 dVar5 = calcWeight(0x43, param_0, acStack_40.R(), acStack_4c.Val(), acStack_50.Val(), &local_48); setList(0x43, param_0, dVar5, acStack_40.R(), acStack_4c, local_48); } @@ -1134,27 +1134,27 @@ bool dAttention_c::chaseAttention() { } if (!chkFlag(0x4000)) { - cSGlobe g1 = actor->mAttentionInfo.mPosition - mOwnerAttnPos; + cSGlobe g1 = actor->attention_info.position - mOwnerAttnPos; cSAngle a1; - a1 = g1.U() - fopAcM_GetShapeAngle_p(mpPlayer).y; + a1 = g1.U() - fopAcM_GetShapeAngle_p(mpPlayer)->y; - cSGlobe g2(mOwnerAttnPos - actor->mAttentionInfo.mPosition); + cSGlobe g2(mOwnerAttnPos - actor->attention_info.position); cSAngle a2; - a2 = g2.U() - fopAcM_GetShapeAngle_p(actor).y; + a2 = g2.U() - fopAcM_GetShapeAngle_p(actor)->y; u32 type; f32 weight = calcWeight(0x4C, actor, g1.R(), a1.Val(), a2.Val(), &type); if (weight <= 0.0f) { type = mLockOnList[offset].mType; - int tbl_idx = actor->mAttentionInfo.field_0x0[type]; + int tbl_idx = actor->attention_info.field_0x0[type]; - if (!chkAttMask(type, actor->mAttentionInfo.mFlags)) { + if (!chkAttMask(type, actor->attention_info.flags)) { return false; - } else if (check_event_condition(type, actor->mEvtInfo.getCondition())) { + } else if (check_event_condition(type, actor->eventInfo.getCondition())) { return false; } else if (check_flontofplayer(dist_table[tbl_idx].field_0x18, a1.Val(), a2.Val())) { return false; - } else if (check_distace(&mOwnerAttnPos, a1.Val(), &actor->mAttentionInfo.mPosition, + } else if (check_distace(&mOwnerAttnPos, a1.Val(), &actor->attention_info.position, dist_table[tbl_idx].field_0x4, dist_table[tbl_idx].field_0x8, dist_table[tbl_idx].field_0xc, dist_table[tbl_idx].field_0x10)) { @@ -1172,7 +1172,7 @@ bool dAttention_c::chaseAttention() { return true; } - return (actor->mAttentionInfo.mFlags & 7) != false; + return (actor->attention_info.flags & 7) != false; } #else #pragma push @@ -1196,12 +1196,12 @@ f32 dAttention_c::EnemyDistance(fopAc_ac_c* i_actor) { distance = -1.0f; } else if (fopAcM_GetProfName(i_actor) == PROC_ALINK) { distance = -1.0f; - } else if (!(i_actor->mAttentionInfo.mFlags & 4) && - !(i_actor->mAttentionInfo.mFlags & 0x4000000)) { + } else if (!(i_actor->attention_info.flags & 4) && + !(i_actor->attention_info.flags & 0x4000000)) { distance = -1.0f; } else { distance = fopAcM_searchActorDistance(mpPlayer, i_actor); - u8 tmp = i_actor->mAttentionInfo.field_0x0[2]; + u8 tmp = i_actor->attention_info.field_0x0[2]; if (distance < dist_table[tmp].field_0x0 + dist_table[tmp].field_0x8) { return distance; @@ -1696,7 +1696,7 @@ void dAttention_c::Draw() { if (!i_dComIfGp_event_runCheck()) { if (target != NULL) { - draw[0].draw(target->mAttentionInfo.mPosition, tmp); + draw[0].draw(target->attention_info.position, tmp); if (mLockonCount >= 2 && draw[1].field_0x173 == 2) { int listIdx = mLockOnOffset; @@ -1708,19 +1708,19 @@ void dAttention_c::Draw() { } if (mLockOnList[listIdx].getActor() != NULL) { fopAc_ac_c* actor = mLockOnList[listIdx].getActor(); - draw[1].draw(actor->mAttentionInfo.mPosition, tmp); + draw[1].draw(actor->attention_info.position, tmp); } } mTargetActorID = fopAcM_GetID(target); - mDrawAttnPos = target->mAttentionInfo.mPosition; + mDrawAttnPos = target->attention_info.position; field_0x328 = 0; } else if (field_0x328 > 0) { fopAc_ac_c* actor = fopAcM_SearchByID(mTargetActorID); if (actor != NULL) { - draw[0].draw(actor->mAttentionInfo.mPosition, tmp); - mDrawAttnPos = actor->mAttentionInfo.mPosition; + draw[0].draw(actor->attention_info.position, tmp); + mDrawAttnPos = actor->attention_info.position; } else { draw[0].draw(mDrawAttnPos, tmp); } @@ -1941,7 +1941,7 @@ fopAc_ac_c* dAttention_c::LockonTarget(s32 param_0) { } fopAc_ac_c* actor = mLockOnList[listIdx].getActor(); - if (actor == NULL || !(actor->mAttentionInfo.mFlags & 7)) { + if (actor == NULL || !(actor->attention_info.flags & 7)) { return NULL; } @@ -1961,9 +1961,9 @@ f32 dAttention_c::LockonReleaseDistanse() { return 0.0f; } - int idx = actor->mAttentionInfo.field_0x0[mLockOnList[mLockOnOffset].mType]; - cSGlobe tmp_g(actor->mAttentionInfo.mPosition - mOwnerAttnPos); - cSAngle tmp_a(tmp_g.U() - fopAcM_GetShapeAngle_p(mpPlayer).y); + int idx = actor->attention_info.field_0x0[mLockOnList[mLockOnOffset].mType]; + cSGlobe tmp_g(actor->attention_info.position - mOwnerAttnPos); + cSAngle tmp_a(tmp_g.U() - fopAcM_GetShapeAngle_p(mpPlayer)->y); return distace_angle_adjust(dist_table[idx].field_0x8, tmp_a, 1.0f) + dist_table[idx].field_0x4; } @@ -2122,7 +2122,7 @@ int dAttCatch_c::request(fopAc_ac_c* param_1, u8 param_2, f32 param_3, f32 param if (param_7 > field_0x4) { return 0; } - cXyz acStack_48 = param_1->mAttentionInfo.mPosition - player->mAttentionInfo.mPosition; + cXyz acStack_48 = param_1->attention_info.position - player->attention_info.position; if (acStack_48.y < param_5 || acStack_48.y > param_4) { return 0; } @@ -2132,7 +2132,7 @@ int dAttCatch_c::request(fopAc_ac_c* param_1, u8 param_2, f32 param_3, f32 param } if (param_6 != 0) { cSGlobe acStack_50(acStack_48); - s16 sVar5 = acStack_50.U() - fopAcM_GetShapeAngle_p((fopAc_ac_c*)player).y; + s16 sVar5 = acStack_50.U() - fopAcM_GetShapeAngle_p((fopAc_ac_c*)player)->y; if (sVar5 < 0) { sVar5 = -sVar5; } @@ -2192,7 +2192,7 @@ int dAttLook_c::request(fopAc_ac_c* param_1, f32 param_2, f32 param_3, f32 param if (param_6 > field_0x4) { return 0; } - cXyz acStack_48 = param_1->mEyePos - player->mEyePos; + cXyz acStack_48 = param_1->eyePos - player->eyePos; if (acStack_48.y < param_4 || acStack_48.y > param_3) { return 0; } @@ -2203,7 +2203,7 @@ int dAttLook_c::request(fopAc_ac_c* param_1, f32 param_2, f32 param_3, f32 param if (param_5 != 0) { acStack_48 = param_1->current.pos - player->current.pos; cSGlobe acStack_50(acStack_48); - s16 sVar5 = acStack_50.U() - fopAcM_GetShapeAngle_p(player).y; + s16 sVar5 = acStack_50.U() - fopAcM_GetShapeAngle_p(player)->y; if (sVar5 < 0) { sVar5 = -sVar5; } diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 20076804e8..aee5665346 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -627,7 +627,7 @@ asm dDemo_actor_c::dDemo_actor_c() { dDemo_actor_c::~dDemo_actor_c() { fopAc_ac_c* actor = getActor(); if (actor != NULL) { - actor->mDemoActorId = 0; + actor->demoActorID = 0; } mActorId = -1; @@ -779,7 +779,7 @@ SECTION_SDATA2 static f32 lit_4152 = -1.0f; #ifdef NONMATCHING int dDemo_setDemoData(fopAc_ac_c* param_0, u8 param_1, mDoExt_McaMorf* param_2, char const* param_3, int param_4, u16* param_5, u32 param_6, s8 param_7) { - dDemo_actor_c* demo_actor = dDemo_c::getActor(param_0->mDemoActorId); + dDemo_actor_c* demo_actor = dDemo_c::getActor(param_0->demoActorID); if (demo_actor == NULL) { return 0; @@ -788,7 +788,7 @@ int dDemo_setDemoData(fopAc_ac_c* param_0, u8 param_1, mDoExt_McaMorf* param_2, u32 flags = demo_actor->checkEnable(param_1); if (flags & 2) { param_0->current.pos = demo_actor->getTrans(); - param_0->next.pos = param_0->current.pos; + param_0->old.pos = param_0->current.pos; } if (flags & 8) { @@ -800,7 +800,7 @@ int dDemo_setDemoData(fopAc_ac_c* param_0, u8 param_1, mDoExt_McaMorf* param_2, } if (flags & 0x80) { - param_0->mGravity = demo_actor->getPrm_Morf(); + param_0->gravity = demo_actor->getPrm_Morf(); } if (param_2 == NULL) { @@ -1232,7 +1232,7 @@ dDemo_object_c::~dDemo_object_c() { /* 80038FC0-80039088 033900 00C8+00 1/1 0/0 0/0 .text appendActor__14dDemo_object_cFP10fopAc_ac_c */ JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) { - dDemo_actor_c* demoActor = dDemo_c::getActor(p_actor->mDemoActorId); + dDemo_actor_c* demoActor = dDemo_c::getActor(p_actor->demoActorID); if (demoActor != NULL) { return demoActor; @@ -1251,7 +1251,7 @@ JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) { mActorNum++; mpActors[curActorNum] = demoActor; demoActor->setActor(p_actor); - p_actor->mDemoActorId = mActorNum; + p_actor->demoActorID = mActorNum; if (p_actor->model != NULL) { demoActor->setModel((J3DModel*)p_actor->model); diff --git a/src/d/d_door_param2.cpp b/src/d/d_door_param2.cpp index dab9a61221..5fdee0b343 100644 --- a/src/d/d_door_param2.cpp +++ b/src/d/d_door_param2.cpp @@ -43,18 +43,18 @@ u32 door_param2_c::getBRoomNo(fopAc_ac_c* i_actor) { /* 8003A1D0-8003A1DC 034B10 000C+00 0/0 0/0 25/25 .text getSwbit__13door_param2_cFP10fopAc_ac_c */ u32 door_param2_c::getSwbit(fopAc_ac_c* i_actor) { - return i_actor->orig.angle.z & 0xFF; + return i_actor->home.angle.z & 0xFF; } /* 8003A1DC-8003A1E8 034B1C 000C+00 0/0 0/0 12/12 .text getSwbit2__13door_param2_cFP10fopAc_ac_c */ u32 door_param2_c::getSwbit2(fopAc_ac_c* i_actor) { - return (i_actor->orig.angle.z >> 8) & 0xFF; + return (i_actor->home.angle.z >> 8) & 0xFF; } /* 8003A1E8-8003A1F4 034B28 000C+00 0/0 0/0 3/3 .text getSwbit3__13door_param2_cFP10fopAc_ac_c */ u32 door_param2_c::getSwbit3(fopAc_ac_c* i_actor) { - return (i_actor->orig.angle.x >> 8) & 0xFF; + return (i_actor->home.angle.x >> 8) & 0xFF; } /* 8003A1F4-8003A200 034B34 000C+00 0/0 0/0 4/4 .text isMsgDoor__13door_param2_cFP10fopAc_ac_c */ @@ -64,18 +64,18 @@ u32 door_param2_c::isMsgDoor(fopAc_ac_c* i_actor) { /* 8003A200-8003A20C 034B40 000C+00 0/0 0/0 3/3 .text getEventNo__13door_param2_cFP10fopAc_ac_c */ u32 door_param2_c::getEventNo(fopAc_ac_c* i_actor) { - return i_actor->orig.angle.x & 0xFF; + return i_actor->home.angle.x & 0xFF; } /* 8003A20C-8003A218 034B4C 000C+00 0/0 0/0 2/2 .text getEventNo2__13door_param2_cFP10fopAc_ac_c */ u32 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) { - return (i_actor->orig.angle.x >> 8) & 0xFF; + return (i_actor->home.angle.x >> 8) & 0xFF; } /* 8003A218-8003A224 034B58 000C+00 0/0 0/0 2/2 .text getMsgNo__13door_param2_cFP10fopAc_ac_c */ u16 door_param2_c::getMsgNo(fopAc_ac_c* i_actor) { - return i_actor->orig.angle.x; + return i_actor->home.angle.x; } /* 8003A224-8003A230 034B64 000C+00 0/0 0/0 6/6 .text getExitNo__13door_param2_cFP10fopAc_ac_c */ diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index 4fa3ff5aea..17e2d28d45 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -26,10 +26,10 @@ void dInsect_c::Insect_GetDemoMain() { switch (m_mode) { case 0: if (fopAcM_checkCarryNow(this)) { - cLib_offBit(mAttentionInfo.mFlags, 0x10); + cLib_offBit(attention_info.flags, 0x10); fopAcM_cancelCarryNow(this); fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e); + eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e); m_itemId = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this), NULL, NULL); @@ -39,11 +39,11 @@ void dInsect_c::Insect_GetDemoMain() { field_0x585 = 1; } } else { - cLib_onBit(mAttentionInfo.mFlags, 0x10); + cLib_onBit(attention_info.flags, 0x10); } break; case 1: - if (mEvtInfo.checkCommandItem()) { + if (eventInfo.checkCommandItem()) { if (m_itemId != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(m_itemId); } @@ -52,7 +52,7 @@ void dInsect_c::Insect_GetDemoMain() { m_mode = 2; } else { fopAcM_orderItemEvent(this, 0, 0); - mEvtInfo.i_onCondition(dEvtCnd_CANGETITEM_e); + eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e); } break; case 2: diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 792e350df2..5ba560ef40 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -329,7 +329,7 @@ void dEvt_control_c::setParam(dEvt_order_c* p_order) { s32 dEvt_control_c::beforeFlagProc(dEvt_order_c* p_order) { fopAc_ac_c* actor = p_order->mActor2; - if (p_order->mFlag & 4 && actor->mEvtInfo.chkCondition(dEvtCnd_CANTALK_e) != true) { + if (p_order->mFlag & 4 && actor->eventInfo.chkCondition(dEvtCnd_CANTALK_e) != true) { return 0; } @@ -357,10 +357,10 @@ int dEvt_control_c::commonCheck(dEvt_order_c* p_order, u16 condition, u16 comman fopAc_ac_c* actor1 = p_order->mActor1; fopAc_ac_c* actor2 = p_order->mActor2; - if ((actor1 != NULL && actor1->mEvtInfo.chkCondition(condition)) && - (actor2 != NULL && actor2->mEvtInfo.chkCondition(condition))) { - actor1->mEvtInfo.setCommand(command); - actor2->mEvtInfo.setCommand(command); + if ((actor1 != NULL && actor1->eventInfo.chkCondition(condition)) && + (actor2 != NULL && actor2->eventInfo.chkCondition(condition))) { + actor1->eventInfo.setCommand(command); + actor2->eventInfo.setCommand(command); setParam(p_order); return 1; } @@ -395,8 +395,8 @@ int dEvt_control_c::talkCheck(dEvt_order_c* p_order) { if (commonCheck(p_order, 1, 1)) { mMode = EVT_MODE_TALK; if (mSpecifiedEvent == -1) { - if (actor != NULL && actor->mEvtInfo.getEventName() != NULL) { - mSpecifiedEvent = actor->mEvtInfo.getEventId(); + if (actor != NULL && actor->eventInfo.getEventName() != NULL) { + mSpecifiedEvent = actor->eventInfo.getEventId(); } else { mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, 0xFF, -1); } @@ -443,7 +443,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) { return 0; } - if (pActor2 == NULL || !pActor2->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { + if (pActor2 == NULL || !pActor2->eventInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) { return 0; } @@ -464,13 +464,13 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) { fopAc_ac_c* actor2 = p_order->mActor2; fopAc_ac_c* actor1 = p_order->mActor1; - if (actor1 == NULL || (actor2 != NULL && !actor2->mEvtInfo.chkCondition(0x40))) { + if (actor1 == NULL || (actor2 != NULL && !actor2->eventInfo.chkCondition(0x40))) { return 0; } - actor1->mEvtInfo.setCommand(dEvtCmd_INCATCH_e); + actor1->eventInfo.setCommand(dEvtCmd_INCATCH_e); if (actor2 != NULL) { - actor2->mEvtInfo.setCommand(dEvtCmd_INCATCH_e); + actor2->eventInfo.setCommand(dEvtCmd_INCATCH_e); } setParam(p_order); @@ -487,12 +487,12 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) { int dEvt_control_c::talkEnd() { fopAc_ac_c* actor = getPt1(); if (actor != NULL) { - actor->mEvtInfo.setCommand(dEvtCmd_NONE_e); + actor->eventInfo.setCommand(dEvtCmd_NONE_e); } actor = getPt2(); if (actor != NULL) { - actor->mEvtInfo.setCommand(dEvtCmd_NONE_e); + actor->eventInfo.setCommand(dEvtCmd_NONE_e); } if (mSpecifiedEvent != -1) { @@ -519,11 +519,11 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) { } if (!(p_order->mFlag & 0x10)) { - if (actor1 != NULL && !actor1->mEvtInfo.chkCondition(2)) { + if (actor1 != NULL && !actor1->eventInfo.chkCondition(2)) { return 0; } - if (actor2 != NULL && !actor2->mEvtInfo.chkCondition(2)) { + if (actor2 != NULL && !actor2->eventInfo.chkCondition(2)) { return 0; } } @@ -533,7 +533,7 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) { } if (actor1 != NULL) { - i_dComIfGp_getEventManager().setObjectArchive(actor1->mEvtInfo.getArchiveName()); + i_dComIfGp_getEventManager().setObjectArchive(actor1->eventInfo.getArchiveName()); } if (!i_dComIfGp_getEventManager().order(eventId)) { @@ -541,11 +541,11 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) { } if (actor1 != NULL) { - actor1->mEvtInfo.setCommand(dEvtCmd_INDEMO_e); + actor1->eventInfo.setCommand(dEvtCmd_INDEMO_e); } if (actor2 != NULL) { - actor2->mEvtInfo.setCommand(dEvtCmd_INDEMO_e); + actor2->eventInfo.setCommand(dEvtCmd_INDEMO_e); } mMode = EVT_MODE_DEMO; @@ -558,12 +558,12 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) { int dEvt_control_c::demoEnd() { fopAc_ac_c* actor = getPt1(); if (actor != NULL) { - actor->mEvtInfo.setCommand(dEvtCmd_NONE_e); + actor->eventInfo.setCommand(dEvtCmd_NONE_e); } actor = getPt2(); if (actor != NULL) { - actor->mEvtInfo.setCommand(dEvtCmd_NONE_e); + actor->eventInfo.setCommand(dEvtCmd_NONE_e); } if (mSpecifiedEvent != -1) { @@ -579,7 +579,7 @@ int dEvt_control_c::potentialCheck(dEvt_order_c* p_order) { if (!beforeFlagProc(p_order)) { return 0; } else { - actor->mEvtInfo.setCommand(dEvtCmd_INDEMO_e); + actor->eventInfo.setCommand(dEvtCmd_INDEMO_e); mMode = EVT_MODE_DEMO; setParam(p_order); afterFlagProc(p_order); @@ -595,11 +595,11 @@ int dEvt_control_c::doorCheck(dEvt_order_c* p_order) { fopAc_ac_c* actor2 = getPt2(); if (actor2 != NULL) { - i_dComIfGp_getEventManager().setObjectArchive(actor2->mEvtInfo.getArchiveName()); + i_dComIfGp_getEventManager().setObjectArchive(actor2->eventInfo.getArchiveName()); } - if (mSpecifiedEvent == -1 && actor2 != NULL && actor2->mEvtInfo.getEventId() != -1) { - mSpecifiedEvent = actor2->mEvtInfo.getEventId(); + if (mSpecifiedEvent == -1 && actor2 != NULL && actor2->eventInfo.getEventId() != -1) { + mSpecifiedEvent = actor2->eventInfo.getEventId(); } if (mSpecifiedEvent != -1 && @@ -1134,7 +1134,7 @@ int dEvt_control_c::moveApproval(void* param_0) { return 2; } - if (actor->mDemoActorId != 0) { + if (actor->demoActorID != 0) { return 2; } break; diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index 0e132f19cd..93cf52285a 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -686,7 +686,8 @@ void dEvDtStaff_c::specialProcCreate() { cXyz* posP = dComIfGp_evmng_getMyXyzP(staffId, "POS"); if (posP == NULL) { - pos = dComIfGp_getPlayer(0)->getPosition(); + fopAc_ac_c* player_p = dComIfGp_getPlayer(0); + pos = player_p->current.pos; } else { pos = *posP; } diff --git a/src/d/event/d_event_lib.cpp b/src/d/event/d_event_lib.cpp index e70bfdaaeb..fd992d47b1 100644 --- a/src/d/event/d_event_lib.cpp +++ b/src/d/event/d_event_lib.cpp @@ -36,11 +36,11 @@ BOOL dEvLib_callback_c::setEvent(int mapToolId, int eventIdx, int param_2) { if (mAction != NULL) { return FALSE; } else { - mActor->mEvtInfo.setMapToolId(mapToolId); + mActor->eventInfo.setMapToolId(mapToolId); if (mapToolId != 0xFF && eventIdx == 0xFF) { eventIdx = i_dComIfGp_getEventManager().getEventIdx(mActor, mapToolId); } - mActor->mEvtInfo.setEventId(eventIdx); + mActor->eventInfo.setEventId(eventIdx); _C = param_2; return setAction(&l_startAction); } @@ -89,15 +89,15 @@ BOOL dEvLib_callback_c::initStart() { /* 80048A70-80048B1C 0433B0 00AC+00 2/1 0/0 0/0 .text executeStart__17dEvLib_callback_cFv */ BOOL dEvLib_callback_c::executeStart() { - if (!mActor->mEvtInfo.checkCommandDemoAccrpt()) { - if (mActor->mEvtInfo.getMapToolId() != 0xFF) { - fopAcM_orderMapToolEvent(mActor, mActor->mEvtInfo.getMapToolId(), - mActor->mEvtInfo.getEventId(), 0xFFFF, _C, 0); + if (!mActor->eventInfo.checkCommandDemoAccrpt()) { + if (mActor->eventInfo.getMapToolId() != 0xFF) { + fopAcM_orderMapToolEvent(mActor, mActor->eventInfo.getMapToolId(), + mActor->eventInfo.getEventId(), 0xFFFF, _C, 0); } else { - fopAcM_orderOtherEventId(mActor, mActor->mEvtInfo.getEventId(), - mActor->mEvtInfo.getMapToolId(), 0xFFFF, 0, _C); + fopAcM_orderOtherEventId(mActor, mActor->eventInfo.getEventId(), + mActor->eventInfo.getMapToolId(), 0xFFFF, 0, _C); } - mActor->mEvtInfo.i_onCondition(2); + mActor->eventInfo.i_onCondition(2); return TRUE; } else { return setAction(&l_runAction); @@ -112,7 +112,7 @@ BOOL dEvLib_callback_c::initRun() { /* 80048B48-80048BD8 043488 0090+00 1/0 0/0 0/0 .text executeRun__17dEvLib_callback_cFv */ BOOL dEvLib_callback_c::executeRun() { - if (!i_dComIfGp_getEventManager().endCheck(mActor->mEvtInfo.getEventId())) { + if (!i_dComIfGp_getEventManager().endCheck(mActor->eventInfo.getEventId())) { return eventRun(); } else { i_dComIfGp_getEvent().reset(); diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index 88472c5a6c..e66072ac5b 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -379,7 +379,7 @@ void dEvent_manager_c::Sequencer() { int cutType = dStage_MapEvent_dt_c_getEventSCutType(mapEvent); if (iVar5 && cutType != 1) { bVar1 = true; - cXyz attentionPos(dComIfGp_getPlayer(0)->mAttentionInfo.mPosition); + cXyz attentionPos(dComIfGp_getPlayer(0)->attention_info.position); cXyz camCenter = dCam_getBody()->Center(); f32 distance = cXyz((attentionPos - camCenter)).abs(); @@ -553,7 +553,7 @@ s16 dEvent_manager_c::getEventIdx(char const* eventName, u8 mapToolID, s32 roomN /* 80047698-80047758 041FD8 00C0+00 0/0 3/3 25/25 .text * getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc */ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 mapToolID) { - dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, pActor->getRoomNo()); + dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, fopAcM_GetRoomNo(pActor)); if (data != NULL) { switch (data->mType) { case 1: @@ -571,7 +571,7 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 mapToolID) { /* 80047758-80047930 042098 01D8+00 1/1 10/10 92/92 .text * getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc */ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 mapToolID) { - s8 actorRoomNo = pActor->getRoomNo(); + s8 actorRoomNo = fopAcM_GetRoomNo(pActor); if (mapToolID != 0xFF) { dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, actorRoomNo); @@ -599,9 +599,9 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 dEvDtBase_c* eventP = &mEventList[type]; dEvDtBase_c event; if (type < 4 || 9 < type || actorRoomNo == mEventList[type].roomNo()) { - if (pActor != NULL && type == 2 && pActor->mEvtInfo.getArchiveName() != NULL) { + if (pActor != NULL && type == 2 && pActor->eventInfo.getArchiveName() != NULL) { event.init( - (char*)dComIfG_getObjectRes(pActor->mEvtInfo.getArchiveName(), DataFileName), + (char*)dComIfG_getObjectRes(pActor->eventInfo.getArchiveName(), DataFileName), -1); eventP = &event; } @@ -693,7 +693,7 @@ int dEvent_manager_c::getMyStaffId(char const* staffName, fopAc_ac_c* pActor, in return -1; } else { if (pActor != NULL) { - evtIdx = pActor->mEvtInfo.getIdx(); + evtIdx = pActor->eventInfo.getIdx(); } if (mCurrentEventCompositId == -1) { return -1; @@ -920,9 +920,9 @@ int dEvent_manager_c::getEventPrio(fopAc_ac_c* pActor, s16 eventCompositId) { dEvDtEvent_c* event = NULL; dEvDtBase_c eventBase; if (getTypeCompositId(eventCompositId) == 2 && pActor != NULL && - pActor->mEvtInfo.getArchiveName() != NULL) + pActor->eventInfo.getArchiveName() != NULL) { - char* data = (char*)dComIfG_getObjectRes(pActor->mEvtInfo.getArchiveName(), DataFileName); + char* data = (char*)dComIfG_getObjectRes(pActor->eventInfo.getArchiveName(), DataFileName); eventBase.init(data, -1); event = eventBase.mEventP; } @@ -1002,7 +1002,7 @@ static fopAc_ac_c* findShutterCallBack(fopAc_ac_c* pActor, void* param_1) { return NULL; } - cXyz diff = pActor->orig.pos - prms->mActor->orig.pos; + cXyz diff = pActor->home.pos - prms->mActor->home.pos; if (diff.x < 10 && diff.x > -10 && diff.y < 10 && diff.y > -10 && diff.z < 10 && diff.z > -10) { return pActor; } @@ -1019,8 +1019,8 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 bsTypeId, int param_1) { (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)findShutterCallBack, &prms); if (shutterActor != NULL && param_1 != 0) { - cXyz goal(shutterActor->orig.pos); - s16 angle = prms.mActor->orig.angle.y + 0x8000; + cXyz goal(shutterActor->home.pos); + s16 angle = prms.mActor->home.angle.y + 0x8000; goal.x += cM_ssin(angle) * 100; goal.z += cM_scos(angle) * 100; setGoal(&goal); diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index bef235be8c..751b201f3f 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -2393,7 +2393,7 @@ void dScnKy_env_light_c::setDaytime() { fopAc_ac_c* ac = dMsgObject_c::getActor(); bool tmp = true; - if (ac != NULL && ac->mEvtInfo.mCommand >= 2) { + if (ac != NULL && ac->eventInfo.mCommand >= 2) { tmp = false; } diff --git a/src/d/map/d_map_path.cpp b/src/d/map/d_map_path.cpp index fa281a8f4f..00777a7408 100644 --- a/src/d/map/d_map_path.cpp +++ b/src/d/map/d_map_path.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d/map/d_map_path -// +/** + * d_map_path.cpp + * + */ #include "d/map/d_map_path.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -9,50 +9,6 @@ #include "d/com/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" -// -// Forward References: -// - -extern "C" void create__Q28dMpath_n18dTexObjAggregate_cFv(); -extern "C" void remove__Q28dMpath_n18dTexObjAggregate_cFv(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class(); -extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class(); -extern "C" void drawPath__11dDrawPath_cFv(); -extern "C" void makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs(); -extern "C" void renderingMap__15dRenderingMap_cFv(); -extern "C" void setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv(); -extern "C" void setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv(); -extern "C" void drawBack__18dRenderingFDAmap_cCFv(); -extern "C" void preRenderingMap__18dRenderingFDAmap_cFv(); -extern "C" void postRenderingMap__18dRenderingFDAmap_cFv(); -extern "C" void renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class(); -extern "C" void getDecoLineColor__18dRenderingFDAmap_cFii(); -extern "C" void getDecorationLineWidth__18dRenderingFDAmap_cFi(); -extern "C" void __sinit_d_map_path_cpp(); -extern "C" void __dt__Q28dMpath_n18dTexObjAggregate_cFv(); -extern "C" extern char const* const d_map_d_map_path__stringBase0; -extern "C" extern void* __vt__18dRenderingFDAmap_c[26]; -extern "C" extern void* __vt__11dDrawPath_c[16]; -extern "C" u8 m_texObjAgg__8dMpath_n[28]; - -// -// External References: -// - -extern "C" void draw__12dDlst_base_cFv(); -extern "C" bool isDrawType__11dDrawPath_cFi(); -extern "C" void __dt__18dRenderingFDAmap_cFv(); -extern "C" void __dt__11dDrawPath_cFv(); -extern "C" void getLineColor__11dDrawPath_cFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); - -// -// Declarations: -// - /* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */ void dMpath_n::dTexObjAggregate_c::create() { static int const data[7] = { @@ -382,56 +338,3 @@ const GXColor* dRenderingFDAmap_c::getDecoLineColor(int param_0, int param_1) { s32 dRenderingFDAmap_c::getDecorationLineWidth(int param_0) { return getLineWidth(param_0); } - -/* ############################################################################################## */ -/* 803A7C90-803A7CF8 004DB0 0068+00 0/0 12/12 0/0 .data __vt__18dRenderingFDAmap_c */ -extern void* __vt__18dRenderingFDAmap_c[26] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__12dDlst_base_cFv, - (void*)__dt__18dRenderingFDAmap_cFv, - (void*)isDrawType__11dDrawPath_cFi, - (void*)NULL, - (void*)getLineColor__11dDrawPath_cFii, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)drawPath__11dDrawPath_cFv, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)preRenderingMap__18dRenderingFDAmap_cFv, - (void*)postRenderingMap__18dRenderingFDAmap_cFv, - (void*)NULL, - (void*)getDecoLineColor__18dRenderingFDAmap_cFii, - (void*)getDecorationLineWidth__18dRenderingFDAmap_cFi, -}; - -/* 803A7CF8-803A7D38 004E18 0040+00 0/0 15/15 0/0 .data __vt__11dDrawPath_c */ -extern void* __vt__11dDrawPath_c[16] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__12dDlst_base_cFv, - (void*)__dt__11dDrawPath_cFv, - (void*)isDrawType__11dDrawPath_cFi, - (void*)NULL, - (void*)getLineColor__11dDrawPath_cFii, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)drawPath__11dDrawPath_cFv, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class, - (void*)rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class, -}; - -/* 80379C4C-80379C4C 0062AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index a7851261dd..5ef974714a 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -847,7 +847,7 @@ void jmessage_tReference::calcDistance() { mDistanceScale = 1.0f; } else { fopAc_ac_c* player = dComIfGp_getPlayer(0); - (mActorPos - player->mAttentionInfo.mPosition).absXZ(); + (mActorPos - player->attention_info.position).absXZ(); mDistanceScale = 1.0f; } } diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 89087af763..e1c2d3218c 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -1213,10 +1213,10 @@ int dMsgFlow_c::query006(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, #ifdef NONMATCHING int dMsgFlow_c::query007(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { u32 uVar3 = *(u16*)(flow_node->params); - cXyz this_00 = daPy_getPlayerActorClass()->mAttentionInfo.mPosition; + cXyz this_00 = daPy_getPlayerActorClass()->attention_info.position; this_00.y -= daPy_getPlayerActorClass()->getAttentionOffsetY(); - s16 uVar8 = (cSGlobe(param_1->mAttentionInfo.mPosition - this_00).U() - daPy_getPlayerActorClass()->shape_angle.GetY()); - u8 attentionId = param_1->mAttentionInfo.field_0x0[3]; + s16 uVar8 = (cSGlobe(param_1->attention_info.position - this_00).U() - daPy_getPlayerActorClass()->shape_angle.GetY()); + u8 attentionId = param_1->attention_info.field_0x0[3]; f32 fVar1 = dAttention_c::getDistTable(attentionId).field_0x4; u16 x = uVar3; if (x != 0) { @@ -1224,7 +1224,7 @@ int dMsgFlow_c::query007(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, } return (u16) dComIfGp_getAttention().checkDistance( - &this_00, uVar8, ¶m_1->mAttentionInfo.mPosition, fVar1, + &this_00, uVar8, ¶m_1->attention_info.position, fVar1, dAttention_c::getDistTable(attentionId).field_0x8, dAttention_c::getDistTable(attentionId).field_0xc, dAttention_c::getDistTable(attentionId).field_0x10); diff --git a/src/d/s/d_s_menu.cpp b/src/d/s/d_s_menu.cpp index 424e2298eb..2c6814c12b 100644 --- a/src/d/s/d_s_menu.cpp +++ b/src/d/s/d_s_menu.cpp @@ -14,10 +14,10 @@ extern scene_process_profile_definition g_profile_MENU_SCENE = { 1, // mListID fpcPi_CURRENT_e, // mListPrio PROC_MENU_SCENE, // mProcName - &g_fpcNd_Method.mBase, // mSubMtd + &g_fpcNd_Method.mBase, // sub_method 0, // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // mSubMtd + &g_fopScn_Method.mBase, // sub_method NULL, // mpMtd }; diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp index 6b1c96ca6a..e9846c97fe 100644 --- a/src/d/s/d_s_play.cpp +++ b/src/d/s/d_s_play.cpp @@ -760,11 +760,11 @@ scene_process_profile_definition g_profile_PLAY_SCENE = { 1, // mListID fpcPi_CURRENT_e, // mListPrio PROC_PLAY_SCENE, // mProcName - &g_fpcNd_Method.mBase, // mSubMtd + &g_fpcNd_Method.mBase, // sub_method sizeof(dScnPly_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // mSubMtd + &g_fopScn_Method.mBase, // sub_method (process_method_class*)&l_dScnPly_Method, // mpMtd }; @@ -774,10 +774,10 @@ scene_process_profile_definition g_profile_OPENING_SCENE = { 1, // mListID fpcPi_CURRENT_e, // mListPrio PROC_OPENING_SCENE, // mProcName - &g_fpcNd_Method.mBase, // mSubMtd + &g_fpcNd_Method.mBase, // sub_method sizeof(dScnPly_c), // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // mSubMtd + &g_fopScn_Method.mBase, // sub_method (process_method_class*)&l_dScnPly_Method, // mpMtd }; \ No newline at end of file diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp index 603ffc159f..1b8ff00b00 100644 --- a/src/d/s/d_s_room.cpp +++ b/src/d/s/d_s_room.cpp @@ -441,10 +441,10 @@ scene_process_profile_definition g_profile_ROOM_SCENE = { 0, // mListID fpcPi_CURRENT_e, // mListPrio PROC_ROOM_SCENE, // mProcName - &g_fpcNd_Method.mBase, // mSubMtd + &g_fpcNd_Method.mBase, // sub_method sizeof(room_of_scene_class), // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // mSubMtd + &g_fopScn_Method.mBase, // sub_method (process_method_class*)&l_dScnRoom_Method, // mpMtd }; diff --git a/src/d/s/d_s_title.cpp b/src/d/s/d_s_title.cpp index 52916935e3..995a2a7e67 100644 --- a/src/d/s/d_s_title.cpp +++ b/src/d/s/d_s_title.cpp @@ -14,11 +14,11 @@ extern scene_process_profile_definition g_profile_WARNING_SCENE = { 1, // mListID fpcPi_CURRENT_e, // mListPrio PROC_WARNING_SCENE, // mProcName - &g_fpcNd_Method.mBase, // mSubMtd + &g_fpcNd_Method.mBase, // sub_method 0x204, // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // mSubMtd + &g_fopScn_Method.mBase, // sub_method NULL, // mpMtd }; @@ -28,10 +28,10 @@ extern scene_process_profile_definition g_profile_WARNING2_SCENE = { 1, // mListID fpcPi_CURRENT_e, // mListPrio PROC_WARNING2_SCENE, // mProcName - &g_fpcNd_Method.mBase, // mSubMtd + &g_fpcNd_Method.mBase, // sub_method 0x204, // mSize 0, // mSizeOther 0, // mParameters - &g_fopScn_Method.mBase, // mSubMtd + &g_fopScn_Method.mBase, // sub_method NULL, // mpMtd }; diff --git a/src/d/shop/d_shop_camera.cpp b/src/d/shop/d_shop_camera.cpp index ce08aa7a89..c761eda53b 100644 --- a/src/d/shop/d_shop_camera.cpp +++ b/src/d/shop/d_shop_camera.cpp @@ -187,7 +187,7 @@ void ShopCam_action_c::setCamDataIdx(fopAc_ac_c* param_1, fopAc_ac_c* param_2, f fopAc_ac_c* param_4, cXyz* param_5, cXyz* param_6) { field_0xd6 = -1; if (field_0x18 == NULL) { - field_0xb0 = param_1->mEyePos; + field_0xb0 = param_1->eyePos; } field_0x18 = param_1; @@ -222,7 +222,7 @@ void ShopCam_action_c::setCamDataIdx2(fopAc_ac_c* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_7, cXyz* param_8, cXyz* param_9) { field_0xd6 = -1; if (field_0x18 == NULL) { - field_0xb0 = param_1->mEyePos; + field_0xb0 = param_1->eyePos; } field_0x18 = param_1; @@ -264,17 +264,17 @@ void ShopCam_action_c::_debugSetCamera() { if (field_0x1c != NULL && field_0x20 != NULL && field_0x24 != NULL && field_0x28 != NULL && field_0x2c == NULL && field_0x30 == NULL) { - local_4c.x = (field_0x24->orig.pos.x + field_0x20->orig.pos.x) / 2; - local_4c.y = (field_0x24->orig.pos.y + field_0x20->orig.pos.y) / 2; - local_4c.z = (field_0x24->orig.pos.z + field_0x20->orig.pos.z) / 2; + local_4c.x = (field_0x24->home.pos.x + field_0x20->home.pos.x) / 2; + local_4c.y = (field_0x24->home.pos.y + field_0x20->home.pos.y) / 2; + local_4c.z = (field_0x24->home.pos.z + field_0x20->home.pos.z) / 2; } else { if (field_0x1c != NULL && field_0x20 != NULL && field_0x24 != NULL && field_0x28 != NULL && field_0x2c != NULL && field_0x30 == NULL) { - local_4c.set(field_0x28->orig.pos); + local_4c.set(field_0x28->home.pos); bVar1 = true; } else { - local_4c.set(field_0x20->orig.pos); + local_4c.set(field_0x20->home.pos); } } @@ -297,7 +297,7 @@ void ShopCam_action_c::_debugSetCamera() { * setMasterCamCtrPos__16ShopCam_action_cFP4cXyz */ void ShopCam_action_c::setMasterCamCtrPos(cXyz* param_0) { if (param_0 == NULL) { - field_0xb0.set(field_0x18->mEyePos); + field_0xb0.set(field_0x18->eyePos); } else { field_0xb0.set(*param_0); } diff --git a/src/d/shop/d_shop_item_ctrl.cpp b/src/d/shop/d_shop_item_ctrl.cpp index 8a4f199278..04d3e72a54 100644 --- a/src/d/shop/d_shop_item_ctrl.cpp +++ b/src/d/shop/d_shop_item_ctrl.cpp @@ -39,7 +39,7 @@ bool dShopItemCtrl_c::isHomePos(int i_itemIdx) { daShopItem_c* item = (daShopItem_c*)fopAcM_SearchByID(mItemIndex[i_itemIdx]); if (item != NULL) { cXyz* item_pos = item->getPosP(); - cXyz item_home = item->orig.pos; + cXyz item_home = item->home.pos; if (item_pos->x == item_home.x && item_pos->y == item_home.y && item_pos->z == item_home.z) @@ -64,7 +64,7 @@ void dShopItemCtrl_c::setRotateAnime(int i_itemIdx) { if (i == i_itemIdx - 1) { item_rot->y += 0x200; } else { - cLib_addCalcAngleS(&item_rot->y, item->orig.angle.y, 4, 0x800, 0x80); + cLib_addCalcAngleS(&item_rot->y, item->home.angle.y, 4, 0x800, 0x80); } } } @@ -84,7 +84,7 @@ void dShopItemCtrl_c::setZoomAnime(int param_1, cXyz* param_2, s16 param_3, bool } cXyz* pos_p = shopItem->getPosP(); - cXyz target_pos = shopItem->orig.pos; + cXyz target_pos = shopItem->home.pos; cXyz cStack_50 = *param_2 - target_pos; s16 x_angle = shopItem->getAngleX(); s16 y_angle = shopItem->getAngleY(); @@ -93,13 +93,13 @@ void dShopItemCtrl_c::setZoomAnime(int param_1, cXyz* param_2, s16 param_3, bool cLib_addCalcPos2(pos_p, *param_2, 0.5f, 0.05f * cStack_50.abs()); cLib_addCalcAngleS(&x_angle, param_3, 4, 0x800, 0x80); shopItem->setAngleX(x_angle); - cLib_addCalcAngleS(&y_angle, shopItem->orig.angle.y, 4, 0x800, 0x80); + cLib_addCalcAngleS(&y_angle, shopItem->home.angle.y, 4, 0x800, 0x80); shopItem->setAngleY(y_angle); } else { cLib_addCalcPos2(pos_p, target_pos, 0.5f, 0.1f * cStack_50.abs()); cXyz cStack_5c = *pos_p - target_pos; if (cStack_5c.abs() < 0.01f) { - pos_p->set(shopItem->orig.pos); + pos_p->set(shopItem->home.pos); } cLib_addCalcAngleS(&x_angle, 0, 4, 0x800, 0x80); diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp index 02a49d4142..01b4c5b8c4 100644 --- a/src/d/shop/d_shop_system.cpp +++ b/src/d/shop/d_shop_system.cpp @@ -57,8 +57,8 @@ static int dShopSystem_searchItemActor(void* i_actor, void* param_1) { dShopSystem_itemActor[4] != i_actor && dShopSystem_itemActor[5] != i_actor && dShopSystem_itemActor[6] != i_actor) { - u8 sw = static_cast(i_actor)->orig.angle.z; - u8 sw2 = ((u16) static_cast(i_actor)->orig.angle.z) >> 8; + u8 sw = static_cast(i_actor)->home.angle.z; + u8 sw2 = ((u16) static_cast(i_actor)->home.angle.z) >> 8; u8 item_no = fopAcM_GetParam(i_actor) & 0xFF; if ((sw == 0xFF || !dComIfGs_isSaveSwitch(sw)) && @@ -772,32 +772,32 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { if (dShopSystem_itemActor[1] != NULL && dShopSystem_cameraActor[1] != NULL) { cXyz local_40; - local_40.set(dShopSystem_itemActor[1]->orig.pos); + local_40.set(dShopSystem_itemActor[1]->home.pos); f32 tmp_05 = 0.5f; if (dShopSystem_sellItemMax == 4) { if (dShopSystem_itemActor[2] != NULL) { - f32 tmp = (dShopSystem_itemActor[2]->orig.pos.x + - dShopSystem_itemActor[1]->orig.pos.x); + f32 tmp = (dShopSystem_itemActor[2]->home.pos.x + + dShopSystem_itemActor[1]->home.pos.x); local_40.x = tmp * tmp_05; - f32 tmp2 = (dShopSystem_itemActor[2]->orig.pos.y + - dShopSystem_itemActor[1]->orig.pos.y); + f32 tmp2 = (dShopSystem_itemActor[2]->home.pos.y + + dShopSystem_itemActor[1]->home.pos.y); local_40.y = tmp2 * tmp_05; - f32 tmp3 = (dShopSystem_itemActor[2]->orig.pos.z + - dShopSystem_itemActor[1]->orig.pos.z); + f32 tmp3 = (dShopSystem_itemActor[2]->home.pos.z + + dShopSystem_itemActor[1]->home.pos.z); local_40.z = tmp3 * tmp_05; } } else if (dShopSystem_sellItemMax == 5) { f32 tmp = - (dShopSystem_itemActor[2]->orig.pos.x + dShopSystem_itemActor[3]->orig.pos.x); + (dShopSystem_itemActor[2]->home.pos.x + dShopSystem_itemActor[3]->home.pos.x); local_40.x = tmp * tmp_05; - local_40.y = dShopSystem_itemActor[0]->orig.pos.y; + local_40.y = dShopSystem_itemActor[0]->home.pos.y; f32 tmp3 = - (dShopSystem_itemActor[2]->orig.pos.z + dShopSystem_itemActor[3]->orig.pos.z); + (dShopSystem_itemActor[2]->home.pos.z + dShopSystem_itemActor[3]->home.pos.z); local_40.z = tmp3 * tmp_05; } @@ -1405,7 +1405,7 @@ void dShopSystem_c::setSoldOutFlag() { void dShopSystem_c::setSoldOut() { if (mSoldOutFlag != 0xFF) { if (field_0xf60 < 0) { - u8 sw = (u8)dShopSystem_itemActor[mSoldOutFlag]->orig.angle.z & 0xFF; + u8 sw = (u8)dShopSystem_itemActor[mSoldOutFlag]->home.angle.z & 0xFF; if (sw != 0xFF && !dComIfGs_isSaveSwitch(sw)) { dComIfGs_onSaveSwitch(sw); } @@ -1532,8 +1532,8 @@ int dShopSystem_c::searchItemActor() { for (int i = 0; i < dShopSystem_sellItemMax; i++) { u32 processId = dShopSystem_itemActor[i]->getProcessID(); mItemCtrl.setItemIndex(i, processId); - mItemCtrl.setMessageIndex(i, (u16)dShopSystem_itemActor[i]->orig.angle.x != 0xFFFF ? - (u16)dShopSystem_itemActor[i]->orig.angle.x : + mItemCtrl.setMessageIndex(i, (u16)dShopSystem_itemActor[i]->home.angle.x != 0xFFFF ? + (u16)dShopSystem_itemActor[i]->home.angle.x : -1); if (processId + 0x10000 == 0xFFFF) { @@ -1569,8 +1569,8 @@ int dShopSystem_c::searchItemActor() { for (int i = 0; i < 7; i++) { if (dShopSystem_itemActor[i] != NULL) { - u8 sw0 = dShopSystem_itemActor[i]->orig.angle.z; - u8 sw1 = ((u16)dShopSystem_itemActor[i]->orig.angle.z) >> 8; + u8 sw0 = dShopSystem_itemActor[i]->home.angle.z; + u8 sw1 = ((u16)dShopSystem_itemActor[i]->home.angle.z) >> 8; if ((sw0 != 0xFF && !dComIfGs_isSaveSwitch(sw0)) && (sw1 != 0xFF && !dComIfGs_isSaveSwitch(sw1))) @@ -1589,8 +1589,8 @@ int dShopSystem_c::searchItemActor() { for (int i = 0; i < 7; i++) { if (dShopSystem_itemActor[i] != NULL) { - u8 sw0 = dShopSystem_itemActor[i]->orig.angle.z; - u8 sw1 = ((u16)dShopSystem_itemActor[i]->orig.angle.z) >> 8; + u8 sw0 = dShopSystem_itemActor[i]->home.angle.z; + u8 sw1 = ((u16)dShopSystem_itemActor[i]->home.angle.z) >> 8; if ((sw0 != 0xFF && !dComIfGs_isSaveSwitch(sw0)) && (sw1 != 0xFF && !dComIfGs_isSaveSwitch(sw1))) @@ -1611,7 +1611,7 @@ int dShopSystem_c::searchItemActor() { /* 8019AB00-8019AB1C 195440 001C+00 1/1 0/0 0/0 .text getFlowNodeNum__13dShopSystem_cFv */ int dShopSystem_c::getFlowNodeNum() { - u16 num = orig.angle.x; + u16 num = home.angle.x; if (num == 0xFFFF) { return -1; } diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 37abc24c04..82c1809935 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -26,7 +26,7 @@ static 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)->mAcType); + return fpcM_IsJustType(g_fopAc_type, ((fopAc_ac_c*)i_this)->actor_type); } /* ############################################################################################## */ @@ -45,7 +45,7 @@ static int fopAc_Draw(void* i_this) { !fopAcM_checkStatus(a_this, 0x21000000)) { fopAcM_OffCondition(a_this, fopAcCnd_NODRAW_e); - ret = fpcLf_DrawMethod((leafdraw_method_class*)a_this->mSubMtd, a_this); + ret = fpcLf_DrawMethod((leafdraw_method_class*)a_this->sub_method, a_this); } else { fopAcM_OnCondition(a_this, fopAcCnd_NODRAW_e); } @@ -64,7 +64,7 @@ static int fopAc_Execute(void* i_this) { if (!dComIfGp_isPauseFlag() && dScnPly_c::isPause()) { if (!dComIfA_PauseCheck()) { daSus_c::check(a_this); - a_this->mEvtInfo.beforeProc(); + a_this->eventInfo.beforeProc(); s32 move = dComIfGp_event_moveApproval(i_this); fopAcM_OffStatus(a_this, 0x40000000); @@ -74,15 +74,15 @@ static int fopAc_Execute(void* i_this) { (!fopAcM_checkStatus(a_this, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(a_this, 4))))) { fopAcM_OffCondition(a_this, fopAcCnd_NOEXEC_e); - a_this->next = a_this->current; - ret = fpcMtd_Execute((process_method_class*)a_this->mSubMtd, a_this); + a_this->old = a_this->current; + ret = fpcMtd_Execute((process_method_class*)a_this->sub_method, a_this); } else { - a_this->mEvtInfo.suspendProc(a_this); + a_this->eventInfo.suspendProc(a_this); fopAcM_OnCondition(a_this, fopAcCnd_NOEXEC_e); } if (fopAcM_checkStatus(a_this, 0x20) && - a_this->orig.pos.y - a_this->current.pos.y > 5000.0f) + a_this->home.pos.y - a_this->current.pos.y > 5000.0f) { fopAcM_delete(a_this); } @@ -102,9 +102,9 @@ 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->mSubMtd, a_this); + int isDelete = fpcMtd_IsDelete((process_method_class*)a_this->sub_method, a_this); if (isDelete == true) { - fopDwTg_DrawQTo(&a_this->mDwTg); + fopDwTg_DrawQTo(&a_this->draw_tag); } return isDelete; @@ -114,13 +114,13 @@ static int fopAc_IsDelete(void* i_this) { 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->mSubMtd, a_this); + int deleted = fpcMtd_Delete((process_method_class*)a_this->sub_method, a_this); if (deleted == true) { - fopAcTg_ActorQTo(&a_this->mAcTg); - fopDwTg_DrawQTo(&a_this->mDwTg); + fopAcTg_ActorQTo(&a_this->actor_tag); + fopDwTg_DrawQTo(&a_this->draw_tag); fopAcM_DeleteHeap(a_this); - dDemo_actor_c* demoAc = dDemo_c::getActor(a_this->mDemoActorId); + dDemo_actor_c* demoAc = dDemo_c::getActor(a_this->demoActorID); if (demoAc != NULL) { demoAc->setActor(NULL); } @@ -136,47 +136,47 @@ static int fopAc_Create(void* i_this) { if (fpcM_IsFirstCreating(i_this)) { actor_process_profile_definition* profile = (actor_process_profile_definition*)fpcM_GetProfile(i_this); - a_this->mAcType = fpcBs_MakeOfType(&g_fopAc_type); - a_this->mSubMtd = (profile_method_class*)profile->mSubMtd; + a_this->actor_type = fpcBs_MakeOfType(&g_fopAc_type); + a_this->sub_method = (profile_method_class*)profile->sub_method; - fopAcTg_Init(&a_this->mAcTg, a_this); - fopAcTg_ToActorQ(&a_this->mAcTg); - fopDwTg_Init(&a_this->mDwTg, a_this); + fopAcTg_Init(&a_this->actor_tag, a_this); + fopAcTg_ToActorQ(&a_this->actor_tag); + fopDwTg_Init(&a_this->draw_tag, a_this); - a_this->mStatus = profile->mStatus; - a_this->mGroup = profile->mActorType; - a_this->mCullType = profile->mCullType; + a_this->actor_status = profile->status; + a_this->group = profile->mActorType; + a_this->cullType = profile->cullType; fopAcM_prm_class* append = fopAcM_GetAppend(a_this); if (append != NULL) { fopAcM_SetParam(a_this, append->mParameter); - a_this->orig.pos = append->mPos; - a_this->orig.angle = append->mAngle; + a_this->home.pos = append->mPos; + a_this->home.angle = append->mAngle; a_this->shape_angle = append->mAngle; - a_this->mParentPcId = append->mParentPId; - a_this->mSubtype = append->mSubtype; - a_this->mScale.set(append->mScale[0] * 0.1f, append->mScale[1] * 0.1f, + 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->mSetID = append->mEnemyNo; - a_this->orig.roomNo = append->mRoomNo; + a_this->setID = append->mEnemyNo; + a_this->home.roomNo = append->mRoomNo; } - a_this->next = a_this->orig; - a_this->current = a_this->orig; - a_this->mEyePos = a_this->orig.pos; - a_this->mMaxFallSpeed = -100.0f; - a_this->mAttentionInfo.field_0x0[0] = 1; - a_this->mAttentionInfo.field_0x0[1] = 2; - a_this->mAttentionInfo.field_0x0[2] = 3; - a_this->mAttentionInfo.field_0x0[3] = 5; - a_this->mAttentionInfo.field_0x0[4] = 6; - a_this->mAttentionInfo.field_0x0[7] = 14; - a_this->mAttentionInfo.field_0x0[5] = 15; - a_this->mAttentionInfo.field_0x0[6] = 15; - a_this->mAttentionInfo.field_0x0[8] = 51; - a_this->mAttentionInfo.mPosition = a_this->orig.pos; - a_this->mAttentionInfo.field_0xa = 30; - dKy_tevstr_init(&a_this->mTevStr, a_this->orig.roomNo, -1); + a_this->old = a_this->home; + a_this->current = a_this->home; + a_this->eyePos = a_this->home.pos; + a_this->maxFallSpeed = -100.0f; + a_this->attention_info.field_0x0[0] = 1; + a_this->attention_info.field_0x0[1] = 2; + a_this->attention_info.field_0x0[2] = 3; + a_this->attention_info.field_0x0[3] = 5; + a_this->attention_info.field_0x0[4] = 6; + a_this->attention_info.field_0x0[7] = 14; + a_this->attention_info.field_0x0[5] = 15; + a_this->attention_info.field_0x0[6] = 15; + a_this->attention_info.field_0x0[8] = 51; + a_this->attention_info.position = a_this->home.pos; + a_this->attention_info.field_0xa = 30; + dKy_tevstr_init(&a_this->tevStr, a_this->home.roomNo, -1); int roomNo = dComIfGp_roomControl_getStayNo(); if (roomNo >= 0) { @@ -184,22 +184,22 @@ static int fopAc_Create(void* i_this) { } dStage_FileList_dt_c* filelist = NULL; - if (a_this->orig.roomNo >= 0) { + if (a_this->home.roomNo >= 0) { filelist = - dComIfGp_roomControl_getStatusRoomDt(a_this->orig.roomNo)->mRoomDt.getFileListInfo(); + dComIfGp_roomControl_getStatusRoomDt(a_this->home.roomNo)->mRoomDt.getFileListInfo(); } if (filelist != NULL) { if (!dStage_FileList_dt_GetEnemyAppear1Flag(filelist)) { u32 sw = dStage_FileList_dt_GetBitSw(filelist); - if (sw != 0xFF && dComIfGs_isSwitch(sw, a_this->orig.roomNo) && + if (sw != 0xFF && dComIfGs_isSwitch(sw, a_this->home.roomNo) && profile->mActorType == fopAc_ENEMY_e) { return cPhs_ERROR_e; } } else { u32 sw = dStage_FileList_dt_GetBitSw(filelist); - if (sw != 0xFF && !dComIfGs_isSwitch(sw, a_this->orig.roomNo) && + if (sw != 0xFF && !dComIfGs_isSwitch(sw, a_this->home.roomNo) && profile->mActorType == fopAc_ENEMY_e) { return cPhs_ERROR_e; @@ -208,10 +208,10 @@ static int fopAc_Create(void* i_this) { } } - int ret = fpcMtd_Create((process_method_class*)a_this->mSubMtd, a_this); + int ret = fpcMtd_Create((process_method_class*)a_this->sub_method, a_this); if (ret == cPhs_COMPLEATE_e) { s32 priority = fpcLf_GetPriority(a_this); - fopDwTg_ToDrawQ(&a_this->mDwTg, priority); + fopDwTg_ToDrawQ(&a_this->draw_tag, priority); } else if (ret == cPhs_ERROR_e) { fopAcM_OnCondition(a_this, 0x10); } diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 1df3eea83c..6399db06ed 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1,35 +1,26 @@ -// -// Generated By: dol2asm -// Translation Unit: f_op/f_op_actor_mng -// +/** + * f_op_actor_mng.cpp + * Actor Manager + */ + +#pragma nosyminline on #include "f_op/f_op_actor_mng.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/a/d_a_player.h" #include "d/d_item.h" #include "d/d_path.h" -#include "d/d_procname.h" #include "dol2asm.h" -#include "dolphin/os.h" -#include "f_op/f_op_actor.h" #include "f_op/f_op_scene_mng.h" -#include "global.h" -#include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_lib.h" -#include "m_Do/m_Do_mtx.h" #include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h" -#include "d/a/d_a_player.h" #define MAKE_ITEM_PARAMS(itemNo, itemBitNo, param_2, param_3) \ ((itemNo & 0xFF) << 0 | (itemBitNo & 0xFF) << 0x8 | param_2 << 0x10 | (param_3 & 0xF) << 0x18) -// -// Types: -// - - // // Forward References: // @@ -165,11 +156,6 @@ extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" f32 mRoofY__11fopAcM_rc_c; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -// TODO: move - -u8 check_itemno(int param1); -BOOL isHeart(u8); - // // External References: // @@ -283,14 +269,16 @@ extern "C" extern u8 data_80451164[4]; // /* 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* param_3, +void* fopAcM_FastCreate(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_createData, void* i_data) { - return fpcM_FastCreate(i_procName, i_createFunc, param_3, i_data); + return fpcM_FastCreate(i_procName, i_createFunc, i_createData, i_data); } /* 800198C4-80019934 014204 0070+00 1/1 5/5 18/18 .text fopAcM_setStageLayer__FPv */ void fopAcM_setStageLayer(void* i_proc) { scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); + JUT_ASSERT(stageProc != 0); + fpcM_ChangeLayerID(i_proc, fopScnM_LayerID(stageProc)); } @@ -298,6 +286,8 @@ void fopAcM_setStageLayer(void* i_proc) { void fopAcM_setRoomLayer(void* i_proc, int i_roomNo) { if (i_roomNo >= 0) { scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(i_roomNo)); + JUT_ASSERT(roomProc != 0); + fpcM_ChangeLayerID(i_proc, fopScnM_LayerID(roomProc)); } } @@ -389,9 +379,7 @@ fopAcM_prm_class* createAppend(u16 i_enemyNo, u32 i_parameters, const cXyz* i_po } /* 80019C78-80019C7C 0145B8 0004+00 3/3 0/0 0/0 .text fopAcM_Log__FPC10fopAc_ac_cPCc */ -void fopAcM_Log(fopAc_ac_c const* i_actor, char const* str) { - /* empty function */ -} +void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message) {} /* 80019C7C-80019CB8 0145BC 003C+00 0/0 10/10 483/483 .text fopAcM_delete__FP10fopAc_ac_c */ @@ -441,12 +429,12 @@ s32 fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roo 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* prmClass = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, - i_scale, i_subType, 0xFFFFFFFF); - if (prmClass == NULL) { + fopAcM_prm_class* prm = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale, + i_subType, 0xFFFFFFFF); + if (prm == NULL) { return NULL; } else { - return fpcM_FastCreate(i_procName, i_createFunc, i_createFuncData, prmClass); + return fpcM_FastCreate(i_procName, i_createFunc, i_createFuncData, prm); } } @@ -469,12 +457,12 @@ void* fopAcM_fastCreate(const char* p_actorName, u32 i_parameters, const cXyz* i s32 fopAcM_createChild(s16 i_procName, unsigned int 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* paramClass = createAppend(0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, - i_scale, i_subType, i_parentProcID); - if (paramClass == NULL) { + 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, paramClass); + return fpcM_Create(i_procName, i_createFunc, prm); } } @@ -483,58 +471,67 @@ s32 fopAcM_createChild(s16 i_procName, unsigned int i_parentProcID, u32 i_parame s32 fopAcM_createChildFromOffset(s16 i_procName, unsigned int 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* parentActor = fopAcM_SearchByID(i_parentProcID); - s16 parent_angleY = parentActor->current.angle.y; + fopAc_ac_c* parent_actor = fopAcM_SearchByID(i_parentProcID); + s16 parent_angleY = parent_actor->current.angle.y; - cXyz tmpPos; + cXyz offset_pos; if (i_pos == NULL) { - tmpPos = cXyz::Zero; + offset_pos = cXyz::Zero; } else { - tmpPos = *i_pos; + offset_pos = *i_pos; } - csXyz tmpRot; + csXyz offset_angle; if (i_angle == NULL) { - tmpRot = csXyz::Zero; + offset_angle = csXyz::Zero; } else { - tmpRot = *i_angle; + offset_angle = *i_angle; } - cXyz parentPos = parentActor->current.pos; - csXyz newAngle(tmpRot); + cXyz parentPos = parent_actor->current.pos; + csXyz angle(offset_angle); - newAngle.y += parent_angleY; - parentPos.x += tmpPos.z * cM_ssin(parent_angleY) + tmpPos.x * cM_scos(parent_angleY); - parentPos.y += tmpPos.y; - parentPos.z += tmpPos.z * cM_scos(parent_angleY) - tmpPos.x * cM_ssin(parent_angleY); + 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); - fopAcM_prm_class* prmClass = createAppend(0xFFFF, i_parameters, &parentPos, i_roomNo, &newAngle, - i_scale, i_subType, i_parentProcID); - if (prmClass == NULL) { + 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, prmClass); + return fpcM_Create(i_procName, i_createFunc, prm); } } -/* ############################################################################################## */ -/* 803788C8-803788C8 004F28 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -// "Creating Actor Heap" -SECTION_DEAD static char const* const stringBase_803788D7 = "アクターのヒープの生成"; +BOOL fopAcM_createHeap(fopAc_ac_c* i_this, u32 size, u32 align) { + JUT_ASSERT(i_this); + JUT_ASSERT(i_this->heap == 0); -// "fopAcM_createHeap allocation failure\n" -SECTION_DEAD static char const* const stringBase_803788EE = "fopAcM_createHeap 確保失敗\n"; -#pragma pop + // "Creating Actor Heap" + fopAcM_Log(i_this, "アクターのヒープの生成"); + if (align == 0) + align = 0x20; + + i_this->heap = mDoExt_createSolidHeapFromGameToCurrent(size, align); + if (i_this->heap == 0) { + // "fopAcM_createHeap allocation failure\n" + OSReport_Error("fopAcM_createHeap 確保失敗\n"); + JUT_CONFIRM(i_this->heap != 0); + return FALSE; + } + + return TRUE; +} /* 8001A138-8001A188 014A78 0050+00 0/0 1/1 1/1 .text fopAcM_DeleteHeap__FP10fopAc_ac_c */ void fopAcM_DeleteHeap(fopAc_ac_c* i_actor) { // "Destroying actor's heap" fopAcM_Log(i_actor, "アクターのヒープの破壊"); - if (i_actor->mHeap != NULL) { - mDoExt_destroySolidHeap(i_actor->mHeap); - i_actor->mHeap = NULL; + if (i_actor->heap != NULL) { + mDoExt_destroySolidHeap(i_actor->heap); + i_actor->heap = NULL; } } @@ -548,10 +545,11 @@ s32 fopAcM_callCallback(fopAc_ac_c* i_actor, heapCallbackFunc i_callback, JKRHea } /* 80450CC8-80450CCC -00001 0004+00 2/2 0/0 0/0 .sbss None */ -/* 80450CC8 0001+00 data_80450CC8 None */ -/* 80450CC9 0003+00 data_80450CC9 None */ -static u8 HeapAdjustEntry; -static u8 HeapAdjustVerbose; +namespace fopAcM { +bool HeapAdjustEntry; +bool HeapAdjustVerbose; +bool HeapAdjustQuiet; +} // namespace fopAcM /* 8001A1E8-8001A4B0 014B28 02C8+00 1/1 0/0 0/0 .text * fopAcM_entrySolidHeap___FP10fopAc_ac_cPFP10fopAc_ac_c_iUl */ @@ -559,14 +557,29 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback const char* procNameString = fopAcM_getProcNameString(i_actor); JKRSolidHeap* heap00 = NULL; + if (fopAcM::HeapAdjustVerbose) { + OS_REPORT("\x1b[36mfopAcM_entrySolidHeap 開始 [%s] 見積もりサイズ=%08x\n\x1b[m", + procNameString, i_size); + } + if (i_size != 0) { i_size = ALIGN_NEXT(i_size, 0x10); } while (true) { if (i_size != 0) { + if (fopAcM::HeapAdjustVerbose) { + OS_REPORT("見積もりヒープサイズで(%08x)確保してみます。 [%s]\n", i_size, + procNameString); + } + heap00 = mDoExt_createSolidHeapFromGame(i_size, 0x20); if (heap00 != NULL) { + if (fopAcM::HeapAdjustVerbose) { + OS_REPORT("見積もりヒープサイズで登録してみます。%08x [%s]\n", heap00, + procNameString); + } + bool status = fopAcM_callCallback(i_actor, i_heapCallback, heap00) != 0; if (!status) { // "Entry for estimated heap size(%08x) failed. %08x[%s]\n" @@ -604,9 +617,9 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback break; } - if (HeapAdjustEntry == 0) { + if (fopAcM::HeapAdjustEntry == 0) { mDoExt_adjustSolidHeap(heap00); - i_actor->mHeap = heap00; + i_actor->heap = heap00; return true; } else { JKRSolidHeap* heap = NULL; @@ -635,19 +648,20 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback if (heap != NULL) { mDoExt_adjustSolidHeap(heap); - i_actor->mHeap = heap; + i_actor->heap = heap; return true; } if (heap00 != NULL) { mDoExt_adjustSolidHeap(heap00); - i_actor->mHeap = heap00; + i_actor->heap = heap00; return true; } OSReport_Error("ばぐばぐです\n"); // "There's a big bug\n" + JUT_ASSERT(0); OSReport_Error("緊急回避措置\n"); // "Emergency action\n" - HeapAdjustEntry = 0; + fopAcM::HeapAdjustEntry = false; } } // "fopAcM_entrySolidHeap didn't work [%s]\n" @@ -658,58 +672,58 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback /* 8001A4B0-8001A528 014DF0 0078+00 0/0 4/4 446/446 .text * fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl */ bool fopAcM_entrySolidHeap(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, u32 i_size) { - u8 oldCC9 = HeapAdjustVerbose; + bool var_r31 = fopAcM::HeapAdjustVerbose; if (i_size & 0x80000000) { - HeapAdjustVerbose = 1; + fopAcM::HeapAdjustVerbose = true; } - u8 oldCC8 = HeapAdjustEntry; + bool var_r30 = fopAcM::HeapAdjustEntry; if (i_size & 0x20000000) { - HeapAdjustEntry = 0; + fopAcM::HeapAdjustEntry = false; } else if (i_size & 0x10000000) { - HeapAdjustEntry = 1; + fopAcM::HeapAdjustEntry = true; } bool result = fopAcM_entrySolidHeap_(i_actor, i_heapCallback, i_size & 0xFFFFFF); - HeapAdjustVerbose = oldCC9; - HeapAdjustEntry = oldCC8; + fopAcM::HeapAdjustVerbose = var_r31; + fopAcM::HeapAdjustEntry = var_r30; return result; } /* 8001A528-8001A538 014E68 0010+00 0/0 0/0 136/136 .text fopAcM_SetMin__FP10fopAc_ac_cfff */ void fopAcM_SetMin(fopAc_ac_c* i_actor, f32 i_minX, f32 i_minY, f32 i_minZ) { - i_actor->mCull.mBox.mMin.x = i_minX; - i_actor->mCull.mBox.mMin.y = i_minY; - i_actor->mCull.mBox.mMin.z = i_minZ; + i_actor->cull.box.min.x = i_minX; + i_actor->cull.box.min.y = i_minY; + i_actor->cull.box.min.z = i_minZ; } /* 8001A538-8001A548 014E78 0010+00 0/0 0/0 136/136 .text fopAcM_SetMax__FP10fopAc_ac_cfff */ void fopAcM_SetMax(fopAc_ac_c* i_actor, f32 i_maxX, f32 i_maxY, f32 i_maxZ) { - i_actor->mCull.mBox.mMax.x = i_maxX; - i_actor->mCull.mBox.mMax.y = i_maxY; - i_actor->mCull.mBox.mMax.z = i_maxZ; + i_actor->cull.box.max.x = i_maxX; + i_actor->cull.box.max.y = i_maxY; + i_actor->cull.box.max.z = i_maxZ; } /* 8001A548-8001A564 014E88 001C+00 1/1 0/0 260/260 .text * fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff */ void fopAcM_setCullSizeBox(fopAc_ac_c* i_actor, f32 i_minX, f32 i_minY, f32 i_minZ, f32 i_maxX, f32 i_maxY, f32 i_maxZ) { - i_actor->mCull.mBox.mMin.x = i_minX; - i_actor->mCull.mBox.mMin.y = i_minY; - i_actor->mCull.mBox.mMin.z = i_minZ; + i_actor->cull.box.min.x = i_minX; + i_actor->cull.box.min.y = i_minY; + i_actor->cull.box.min.z = i_minZ; - i_actor->mCull.mBox.mMax.x = i_maxX; - i_actor->mCull.mBox.mMax.y = i_maxY; - i_actor->mCull.mBox.mMax.z = i_maxZ; + i_actor->cull.box.max.x = i_maxX; + i_actor->cull.box.max.y = i_maxY; + i_actor->cull.box.max.z = i_maxZ; } /* 8001A564-8001A578 014EA4 0014+00 0/0 0/0 4/4 .text fopAcM_setCullSizeSphere__FP10fopAc_ac_cffff */ void fopAcM_setCullSizeSphere(fopAc_ac_c* i_actor, f32 i_minX, f32 i_minY, f32 i_minZ, f32 radius) { - i_actor->mCull.mSphere.mCenter.x = i_minX; - i_actor->mCull.mSphere.mCenter.y = i_minY; - i_actor->mCull.mSphere.mCenter.z = i_minZ; - i_actor->mCull.mSphere.mRadius = radius; + i_actor->cull.sphere.center.x = i_minX; + i_actor->cull.sphere.center.y = i_minY; + i_actor->cull.sphere.center.z = i_minZ; + i_actor->cull.sphere.radius = radius; } /* 8001A578-8001A5DC 014EB8 0064+00 0/0 0/0 123/123 .text @@ -717,12 +731,12 @@ void fopAcM_setCullSizeSphere(fopAc_ac_c* i_actor, f32 i_minX, f32 i_minY, f32 i void fopAcM_setCullSizeBox2(fopAc_ac_c* i_actor, J3DModelData* i_modelData) { J3DJoint* jointNode = i_modelData->getJointNodePointer(0); - f32 minX = i_actor->mScale.x * jointNode->getMin()->x; - f32 minY = i_actor->mScale.y * jointNode->getMin()->y; - f32 minZ = i_actor->mScale.z * jointNode->getMin()->z; - f32 maxX = i_actor->mScale.x * jointNode->getMax()->x; - f32 maxY = i_actor->mScale.y * jointNode->getMax()->y; - f32 maxZ = i_actor->mScale.z * jointNode->getMax()->z; + f32 minX = i_actor->scale.x * jointNode->getMin()->x; + f32 minY = i_actor->scale.y * jointNode->getMin()->y; + f32 minZ = i_actor->scale.z * jointNode->getMin()->z; + f32 maxX = i_actor->scale.x * jointNode->getMax()->x; + f32 maxY = i_actor->scale.y * jointNode->getMax()->y; + f32 maxZ = i_actor->scale.z * jointNode->getMax()->z; fopAcM_setCullSizeBox(i_actor, minX, minY, minZ, maxX, maxY, maxZ); } @@ -730,37 +744,37 @@ void fopAcM_setCullSizeBox2(fopAc_ac_c* i_actor, J3DModelData* i_modelData) { /* 8001A5DC-8001A60C 014F1C 0030+00 0/0 0/0 1/1 .text fopAcM_addAngleY__FP10fopAc_ac_css */ bool fopAcM_addAngleY(fopAc_ac_c* i_actor, s16 i_target, s16 i_step) { - return cLib_chaseAngleS(&fopAcM_GetAngle_p(i_actor).y, i_target, i_step); -} - -inline void clampMin(f32& val, f32 min) { - if (val < min) { - val = min; - } + return cLib_chaseAngleS(&fopAcM_GetAngle_p(i_actor)->y, i_target, i_step); } /* 8001A60C-8001A660 014F4C 0054+00 1/1 0/0 8/8 .text fopAcM_calcSpeed__FP10fopAc_ac_c */ void fopAcM_calcSpeed(fopAc_ac_c* i_actor) { f32 speedF = fopAcM_GetSpeedF(i_actor); f32 gravity = fopAcM_GetGravity(i_actor); - f32 xSpeed = speedF * cM_ssin(i_actor->getAngle().GetY()); - f32 ySpeed = i_actor->speed.y + gravity; - f32 zSpeed = speedF * cM_scos(i_actor->getAngle().GetY()); + cXyz* speed = fopAcM_GetSpeed_p(i_actor); - clampMin(ySpeed, fopAcM_GetMaxFallSpeed(i_actor)); + f32 xSpeed = speedF * cM_ssin(i_actor->current.angle.y); + f32 ySpeed = speed->y + gravity; + f32 zSpeed = speedF * cM_scos(i_actor->current.angle.y); + + if (ySpeed < fopAcM_GetMaxFallSpeed(i_actor)) { + ySpeed = fopAcM_GetMaxFallSpeed(i_actor); + } fopAcM_SetSpeed(i_actor, xSpeed, ySpeed, zSpeed); } /* 8001A660-8001A6CC 014FA0 006C+00 1/1 1/1 17/17 .text fopAcM_posMove__FP10fopAc_ac_cPC4cXyz */ void fopAcM_posMove(fopAc_ac_c* i_actor, const cXyz* i_movePos) { - i_actor->current.pos.x += i_actor->speed.x; - i_actor->current.pos.y += i_actor->speed.y; - i_actor->current.pos.z += i_actor->speed.z; + cXyz* pos = fopAcM_GetPosition_p(i_actor); + cXyz* speed = fopAcM_GetSpeed_p(i_actor); + pos->x += speed->x; + pos->y += speed->y; + pos->z += speed->z; if (i_movePos != NULL) { - i_actor->current.pos.x += i_movePos->x; - i_actor->current.pos.y += i_movePos->y; - i_actor->current.pos.z += i_movePos->z; + pos->x += i_movePos->x; + pos->y += i_movePos->y; + pos->z += i_movePos->z; } } @@ -774,7 +788,7 @@ void fopAcM_posMoveF(fopAc_ac_c* i_actor, const cXyz* i_movePos) { /* 8001A710-8001A738 015050 0028+00 1/1 26/26 596/596 .text * fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c */ s16 fopAcM_searchActorAngleY(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) { - return cLib_targetAngleY(&i_actorA->current.pos, &i_actorB->current.pos); + return cLib_targetAngleY(fopAcM_GetPosition_p(i_actorA), fopAcM_GetPosition_p(i_actorB)); } /* ############################################################################################## */ @@ -786,19 +800,17 @@ SECTION_SDATA2 static u8 lit_4645[4] = { 0x00, }; -inline f32 square(f32 f) { - return f * f; -} - /* 8001A738-8001A79C 015078 0064+00 0/0 0/0 13/13 .text * fopAcM_searchActorAngleX__FPC10fopAc_ac_cPC10fopAc_ac_c */ // matches with literals #ifdef NONMATCHING s16 fopAcM_searchActorAngleX(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 cM_atan2s(posB.y - posA.y, - JMAFastSqrt(square(posB.x - posA.x) + square(posB.z - posA.z))); + const cXyz* posA = fopAcM_GetPosition_p(i_actorA); + const cXyz* posB = fopAcM_GetPosition_p(i_actorB); + + f32 x_dist = posB->x - posA->x; + f32 z_dist = posB->z - posA->z; + return cM_atan2s(posB->y - posA->y, JMAFastSqrt(x_dist * x_dist + z_dist * z_dist)); } #else #pragma push @@ -814,8 +826,9 @@ asm s16 fopAcM_searchActorAngleX(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p /* 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) { - return abs(static_cast(cLib_targetAngleY(&i_actorA->current.pos, &i_actorB->current.pos) - - i_actorA->shape_angle.y)); + s16 target_angle = + cLib_targetAngleY(fopAcM_GetPosition_p(i_actorA), fopAcM_GetPosition_p(i_actorB)); + return abs((s16)(target_angle - i_actorA->shape_angle.y)); } /* ############################################################################################## */ @@ -848,25 +861,25 @@ inline f32 local_sqrtf(f32 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 tmp = (i_actorB->current.pos - i_actorA->current.pos); - return local_sqrtf(tmp.abs2()); + cXyz dist = (*fopAcM_GetPosition_p(i_actorB) - *fopAcM_GetPosition_p(i_actorA)); + return local_sqrtf(dist.abs2()); } /* 8001A914-8001A964 015254 0050+00 0/0 0/0 2/2 .text * fopAcM_searchActorDistance2__FPC10fopAc_ac_cPC10fopAc_ac_c */ f32 fopAcM_searchActorDistance2(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) { - cXyz tmp = (i_actorB->current.pos - i_actorA->current.pos); - return tmp.abs2(); + cXyz dist = (*fopAcM_GetPosition_p(i_actorB) - *fopAcM_GetPosition_p(i_actorA)); + return dist.abs2(); } /* 8001A964-8001AA94 0152A4 0130+00 0/0 3/3 125/125 .text * fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c */ +// matches with literals #ifdef NONMATCHING -// matches besides data 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()); + const cXyz* posA = fopAcM_GetPosition_p(i_actorA); + const cXyz* posB = fopAcM_GetPosition_p(i_actorB); + return sqrtf((*posB - *posA).abs2XZ()); } #else #pragma push @@ -881,12 +894,12 @@ asm f32 fopAcM_searchActorDistanceXZ(const fopAc_ac_c* i_actorA, const fopAc_ac_ /* 8001AA94-8001AAE0 0153D4 004C+00 1/1 4/4 30/30 .text * fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c */ +// matches with literals #ifdef NONMATCHING -// matches besides data f32 fopAcM_searchActorDistanceXZ2(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 (posB - posA).abs2XZ(); + const cXyz* posA = fopAcM_GetPosition_p(i_actorA); + const cXyz* posB = fopAcM_GetPosition_p(i_actorB); + return (*posB - *posA).abs2XZ() } #else #pragma push @@ -938,13 +951,12 @@ s32 fopAcM_checkCullingBox(Mtx pMtx, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 Vec tmp1 = {x1, y1, z1}; Vec tmp2 = {x2, y2, z2}; Mtx tmpMtx; - MTXConcat(j3dSys.mViewMtx, pMtx, tmpMtx); - return mDoLib_clipper::mClipper.clip(tmpMtx, &tmp2, &tmp1) != 0; + MTXConcat(j3dSys.getViewMtx(), pMtx, tmpMtx); + return mDoLib_clipper::clip(tmpMtx, &tmp2, &tmp1) != 0; } -/* ############################################################################################## */ /* 803A35F0-803A3740 000710 0150+00 1/1 0/0 0/0 .data l_cullSizeBox */ -SECTION_DATA static cull_box l_cullSizeBox[] = { +static cull_box l_cullSizeBox[] = { { {-40.0f, 0.0f, -40.0f}, {40.0f, 125.0f, 40.0f}, @@ -1004,7 +1016,7 @@ SECTION_DATA static cull_box l_cullSizeBox[] = { }; /* 803A3740-803A37C0 000860 0080+00 1/1 0/0 0/0 .data l_cullSizeSphere */ -SECTION_DATA static cull_sphere l_cullSizeSphere[] = { +static cull_sphere l_cullSizeSphere[] = { { {0.0f, 0.0f, 0.0f}, 80.0f, @@ -1063,13 +1075,13 @@ 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->mCull.mBox.mMax, - &i_actor->mCull.mBox.mMin); + 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->mCull.mBox.mMax, - &i_actor->mCull.mBox.mMin); + return mDoLib_clipper::clip(mtx_p, &i_actor->cull.box.max, + &i_actor->cull.box.min); } } else { cull_box* box = &l_cullSizeBox[cullsize]; @@ -1200,8 +1212,8 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, priority = 0xFF; } - s16 eventID = actorB->mEvtInfo.getEventId(); - u8 toolID = actorB->mEvtInfo.getMapToolId(); + s16 eventID = actorB->eventInfo.getEventId(); + u8 toolID = actorB->eventInfo.getMapToolId(); if (fopAcM_GetProfName(actorB) == 0x55 && toolID != 0xFF) { eventID = i_dComIfGp_getEventManager().getEventIdx(actorA, NULL, toolID); @@ -1480,7 +1492,6 @@ struct ItemTableList { }; /* 8001BCFC-8001BE14 01663C 0118+00 2/2 0/0 0/0 .text fopAcM_getItemNoFromTableNo__FUc */ -// out of order instructions / regalloc u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo) { u8 tableNo = i_tableNo; ItemTableList* tableList = (ItemTableList*)dComIfGp_getItemTable(); @@ -1489,6 +1500,15 @@ u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo) { return i_tableNo; } +#ifdef DEBUG + if (tableList->mTableNum - 1 < i_tableNo) { + // "Table Num<%d>, Specified Table<%d>, over table num!\n" + OSReport_Error("テーブル数<%d>、指定テーブル番号<%d>で、テーブル数オーバーしています！\n", + tableList->mTableNum, i_tableNo); + i_tableNo = 0; + } +#endif + u8 hp_percent = (i_dComIfGs_getLife() * 100) / (((dComIfGs_getMaxLife() / 5) * 4) & 0xFC); switch (i_tableNo) { @@ -1511,7 +1531,7 @@ u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo) { break; } - return tableList->mTables[tableNo][(int)cM_rndF(15.999899864196777f)]; + return tableList->mTables[tableNo][(int)cM_rndF(15.9999f)]; } struct EnemyTableList { @@ -1579,10 +1599,25 @@ asm s32 fopAcM_createItemFromEnemyID(u8 param_0, cXyz const* param_1, int param_ 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) { + // 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 + + ItemTableList* tableList = (ItemTableList*)dComIfGp_getItemTable(); + if (i_tableNo == 0xFF) { return -1; } +#ifdef DEBUG + if (tableList->mTableNum - 1 < i_tableNo) { + // "Table Num<%d>, Specified Table<%d>, over table num!\n" + OSReport_Error("テーブル数<%d>、指定テーブル番号<%d>で、テーブル数オーバーしています！\n", + tableList->mTableNum, i_tableNo); + i_tableNo = 0; + } +#endif + s32 itemNo = fopAcM_getItemNoFromTableNo(i_tableNo); if (itemNo == NO_ITEM) { return -1; @@ -1616,14 +1651,18 @@ asm s32 fopAcM_createItemFromTable(cXyz const* param_0, int param_1, int param_2 /* 8001C078-8001C0D4 0169B8 005C+00 2/2 0/0 0/0 .text * fopAcM_createDemoItem__FPC4cXyziiPC5csXyziPC4cXyzUc */ -s32 fopAcM_createDemoItem(const cXyz* i_pos, int itemNo, int itemBitNo, const csXyz* i_angle, +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) { - if (itemNo == NO_ITEM) { + // 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, - (itemNo & 0xFF) | (itemBitNo & 0x7F) << 0x8 | (param_7 << 0x10), i_pos, - i_roomNo, i_angle, scale, -1); + (i_itemNo & 0xFF) | (i_itemBitNo & 0x7F) << 0x8 | (param_7 << 0x10), + i_pos, i_roomNo, i_angle, scale, -1); } } @@ -1670,6 +1709,10 @@ void* fopAcM_createItemForSimpleDemo(const cXyz* i_pos, int i_itemNo, int i_room * 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) { + // 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; } @@ -1688,13 +1731,30 @@ s32 fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_ro switch (i_itemNo) { case RECOVERY_FAILY: return fopAcM_create(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1); +#ifdef DEBUG + case SMALL_KEY: + // "Small Key: Can't support map display, so program generation is prohibited!\n" + OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); + JUT_ASSERT(0); + break; + case KANTERA: + // "Lantern: Program generation is prohibited!\n" + OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); + JUT_ASSERT(0); + break; + case LIGHT_DROP: + // "Light Drop: Program generation is prohibited!\n" + OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); + JUT_ASSERT(0); + break; +#endif case KAKERA_HEART: case UTAWA_HEART: return fopAcM_create(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1); case TRIPLE_HEART: for (int i = 0; i < 2; i++) { fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1); - item_angle.y = cM_rndFX(32767.0f); + item_angle.y = cM_rndFX(0x7FFF); } default: return fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1); @@ -1705,6 +1765,10 @@ s32 fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_ro * 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) { + // 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 + csXyz item_angle(csXyz::Zero); if (i_itemNo == NO_ITEM) { @@ -1725,6 +1789,23 @@ void* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i case RECOVERY_FAILY: return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); +#ifdef DEBUG + case SMALL_KEY: + // "Small Key: Can't support map display, so program generation is prohibited!\n" + OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); + JUT_ASSERT(0); + break; + case KANTERA: + // "Lantern: Program generation is prohibited!\n" + OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); + JUT_ASSERT(0); + break; + case LIGHT_DROP: + // "Light Drop: Program generation is prohibited!\n" + OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); + JUT_ASSERT(0); + break; +#endif case KAKERA_HEART: case UTAWA_HEART: return fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, @@ -1756,6 +1837,9 @@ SECTION_SDATA2 static f32 lit_5810 = 1.0f; 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) { + JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256); + + csXyz angle; if (i_itemNo == NO_ITEM) { return NULL; } @@ -1770,11 +1854,27 @@ void* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, const *p_speedF = lit_5808 * *p_speedF; } - csXyz angle; switch (i_itemNo) { case RECOVERY_FAILY: return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); +#ifdef DEBUG + case SMALL_KEY: + // "Small Key: Can't support map display, so program generation is prohibited!\n" + OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); + JUT_ASSERT(0); + break; + case KANTERA: + // "Lantern: Program generation is prohibited!\n" + OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); + JUT_ASSERT(0); + break; + case LIGHT_DROP: + // "Light Drop: Program generation is prohibited!\n" + OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); + JUT_ASSERT(0); + break; +#endif case KAKERA_HEART: case UTAWA_HEART: return fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, @@ -1860,7 +1960,7 @@ 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)->mGroup == fopAc_ENEMY_e) + static_cast(i_actor)->group == fopAc_ENEMY_e) { return i_actor; } else { @@ -1869,9 +1969,12 @@ void* enemySearchJugge(void* i_actor, void* i_data) { } /* 8001CA1C-8001CAD8 01735C 00BC+00 0/0 0/0 6/6 .text fopAcM_myRoomSearchEnemy__FSc */ -fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 i_roomNo) { - int procID = dStage_roomControl_c::getStatusProcID(i_roomNo); +fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { + JUT_ASSERT(roomNo >= 0); + + int procID = dStage_roomControl_c::getStatusProcID(roomNo); scene_class* roomProc = fopScnM_SearchByID(procID); + JUT_ASSERT(roomProc != 0); u32 actorID = ((daPy_py_c*)dComIfGp_getPlayer(0))->getGrabActorID(); fopAc_ac_c* actor = fopAcM_SearchByID(actorID); @@ -1887,7 +1990,7 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 i_roomNo) { * fopAcM_createDisappear__FPC10fopAc_ac_cPC4cXyzUcUcUc */ s32 fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 param_3, u8 param_4, u8 param_5) { - s8 roomNo = i_actor->current.roomNo; + s8 roomNo = fopAcM_GetRoomNo(i_actor); return fopAcM_GetID(fopAcM_fastCreate(PROC_DISAPPEAR, (param_5 << 0x10) | (param_3 << 0x8) | param_4, i_pos, roomNo, &i_actor->current.angle, NULL, 0xFF, NULL, NULL)); @@ -1896,7 +1999,7 @@ s32 fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 para /* 8001CB48-8001CBA0 017488 0058+00 0/0 6/6 7/7 .text fopAcM_setCarryNow__FP10fopAc_ac_ci */ void fopAcM_setCarryNow(fopAc_ac_c* i_actor, int param_1) { - i_actor->mStatus |= 0x2000; + i_actor->actor_status |= 0x2000; if (param_1 != 0) { fopAcM_setStageLayer(i_actor); @@ -1907,7 +2010,7 @@ void fopAcM_setCarryNow(fopAc_ac_c* i_actor, int param_1) { /* 8001CBA0-8001CC5C 0174E0 00BC+00 0/0 5/5 21/21 .text fopAcM_cancelCarryNow__FP10fopAc_ac_c */ void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) { if (fopAcM_checkCarryNow(i_actor)) { - i_actor->mStatus &= ~0x2000; + i_actor->actor_status &= ~0x2000; s8 roomNo = fopAcM_GetHomeRoomNo(i_actor); if (roomNo != -1) { @@ -1923,7 +2026,7 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) { i_actor->shape_angle.x = 0; if (i_dComIfGp_event_runCheck() && fopAcM_GetGroup(i_actor) != 2) { - i_actor->mStatus |= 0x800; + i_actor->actor_status |= 0x800; } } } @@ -1964,43 +2067,43 @@ SECTION_SDATA2 static f32 lit_6035 = 100.0f; * fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c */ s32 fopAcM_otherBgCheck(fopAc_ac_c const* param_0, fopAc_ac_c const* param_1) { dBgS_LinChk linChk; - cXyz tmp1; - cXyz tmp0; + cXyz start; + cXyz end; - tmp0 = param_1->current.pos; - tmp0.y += lit_6035; + end = param_1->current.pos; + end.y += lit_6035; - tmp1 = param_0->current.pos; - tmp1.y = param_0->mEyePos.y; + start = param_0->current.pos; + start.y = param_0->eyePos.y; - linChk.Set(&tmp1, &tmp0, param_0); + linChk.Set(&start, &end, param_0); if (dComIfG_Bgsp().LineCross(&linChk)) { - return 1; + return TRUE; } - return 0; + return FALSE; } /* 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) { dBgS_LinChk linChk; - cXyz tmp1; - cXyz tmp0; - cXyz tmp2; + cXyz offset; + cXyz start; + cXyz end; - tmp0 = param_0->current.pos; - tmp0.y += param_2; + start = param_0->current.pos; + start.y += param_2; mDoMtx_YrotS((MtxP)calc_mtx, param_0->shape_angle.y); - tmp1.x = FLOAT_LABEL(lit_4645); - tmp1.y = 50.0f; - tmp1.z = param_1; + offset.x = FLOAT_LABEL(lit_4645); + offset.y = 50.0f; + offset.z = param_1; - MtxPosition(&tmp1, &tmp2); - VECAdd(&tmp2, ¶m_0->current.pos, &tmp2); + MtxPosition(&offset, &end); + VECAdd(&end, ¶m_0->current.pos, &end); - linChk.Set(&tmp0, &tmp2, param_0); + linChk.Set(&start, &end, param_0); if (dComIfG_Bgsp().LineCross(&linChk)) { return 1; @@ -2062,8 +2165,8 @@ f32 fopAcM_gc_c::mGroundY; void fopAcM_effSmokeSet1(u32* param_0, u32* param_1, cXyz const* param_2, csXyz const* param_3, f32 param_4, dKy_tevstr_c const* param_5, int param_6) { cXyz p2; - float z = param_2->z; - float y = FLOAT_LABEL(lit_6035) + param_2->y; + f32 z = param_2->z; + f32 y = FLOAT_LABEL(lit_6035) + param_2->y; p2.x = param_2->x; p2.y = y; p2.z = z; @@ -2123,27 +2226,27 @@ s32 fopAcM_riverStream(cXyz* param_0, s16* param_1, f32* param_2, f32 param_3) { s32 fopAcM_carryOffRevise(fopAc_ac_c* param_0) { fopAc_ac_c* player = dComIfGp_getPlayer(0); dBgS_LinChk linChk; - cXyz tmp1; - cXyz tmp0; - cXyz tmp2; + cXyz offset; + cXyz start; + cXyz end; - tmp0 = player->current.pos; - tmp0.y = param_0->current.pos.y; + start = player->current.pos; + start.y = param_0->current.pos.y; mDoMtx_YrotS((MtxP)calc_mtx, player->shape_angle.y); - tmp1.x = FLOAT_LABEL(lit_4645); - tmp1.y = param_0->current.pos.y - player->current.pos.y; - tmp1.z = 150.0f; + offset.x = FLOAT_LABEL(lit_4645); + offset.y = param_0->current.pos.y - player->current.pos.y; + offset.z = 150.0f; - MtxPosition(&tmp1, &tmp2); - VECAdd(&tmp2, &player->current.pos, &tmp2); + MtxPosition(&offset, &end); + VECAdd(&end, &player->current.pos, &end); - linChk.Set(&tmp0, &tmp2, param_0); + linChk.Set(&start, &end, param_0); if (dComIfG_Bgsp().LineCross(&linChk)) { param_0->current.pos.x = player->current.pos.x; param_0->current.pos.z = player->current.pos.z; - param_0->next.pos = param_0->current.pos; + param_0->old.pos = param_0->current.pos; param_0->speedF = FLOAT_LABEL(lit_4645); return 1; } @@ -2190,11 +2293,11 @@ COMPILER_STRIP_GATE(0x80378898, &mtx_adj); // matches with literals #ifdef NONMATCHING void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelData) { - const cXyz* pEyePos = &i_actor->mEyePos; + const cXyz* pEyePos = &i_actor->eyePos; dCamera_c* camera = dCam_getCamera(); cXyz v1 = *pEyePos - camera->field_0xd8; cXyz v2; - get_vectle_calc(&i_actor->mTevStr.field_0x32c, pEyePos, &v2); + get_vectle_calc(&i_actor->tevStr.field_0x32c, pEyePos, &v2); Vec half; C_VECHalfAngle(&v1, &v2, &half); Mtx mtx; @@ -2236,7 +2339,7 @@ asm void fopAcM_setEffectMtx(fopAc_ac_c const* param_0, J3DModelData const* para /* 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->mSubtype); + const char* name = dStage_getName2(i_actor->mBase.mBsTypeId, i_actor->subtype); return name != NULL ? name : "UNKOWN"; } @@ -2248,7 +2351,7 @@ 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->mSubtype) { + if (prm->mProcName == fopAcM_GetProfName(i_actor) && prm->mSubType == i_actor->subtype) { if (prm->mParam0 == 0 || prm->mParam1 == (prm->mParam0 & fopAcM_GetParam(i_actor))) { return i_actor; } @@ -2282,8 +2385,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->mSubtype) { - if (prm->mEventID < 0 || prm->mEventID == i_actor->mEvtInfo.getIdx()) { + if (prm->mProcName == fopAcM_GetProfName(i_actor) && prm->mSubType == i_actor->subtype) { + if (prm->mEventID < 0 || prm->mEventID == i_actor->eventInfo.getIdx()) { return i_actor; } } @@ -2335,18 +2438,16 @@ f32 fopAcM_rc_c::mRoofY; /* 80450CD8-80450CE0 0001D8 0004+04 2/2 4/4 19/19 .sbss mWaterY__11fopAcM_wt_c */ f32 fopAcM_wt_c::mWaterY; -/* 80451C58-80451C5C 000258 0004+00 2/2 0/0 0/0 .sdata2 @6353 */ -SECTION_SDATA2 static f32 lit_6353 = -1000000000.0f; - /* 8001D890-8001D900 0181D0 0070+00 0/0 2/2 19/19 .text fopAcM_getWaterY__FPC4cXyzPf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 fopAcM_getWaterY(cXyz const* param_0, f32* param_1) { - nofralloc -#include "asm/f_op/f_op_actor_mng/fopAcM_getWaterY__FPC4cXyzPf.s" +s32 fopAcM_getWaterY(cXyz const* param_0, f32* param_1) { + if (fopAcM_wt_c::waterCheck(param_0) && fopAcM_wt_c::getPolyAtt0() != 6) { + *param_1 = fopAcM_wt_c::getWaterY(); + return 1; + } else { + *param_1 = -1000000000.0f; + return 0; + } } -#pragma pop /* 8001D900-8001D9A8 018240 00A8+00 0/0 2/2 2/2 .text * fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz */ @@ -2393,18 +2494,8 @@ s32 fopAcM_getWaterStream(cXyz const* param_0, cBgS_PolyInfo const& param_1, cXy return 0; } -/* ############################################################################################## */ -/* 803A37C0-803A37CC 0008E0 000C+00 2/2 93/93 0/0 .data __vt__8cM3dGPla */ -SECTION_DATA extern void* __vt__8cM3dGPla[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGPlaFv, -}; - /* 8001DAE4-8001DB90 018424 00AC+00 0/0 2/2 8/8 .text fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos */ -// matches when TU vtable data is correct -#ifdef NONMATCHING s16 fopAcM_getPolygonAngle(cBgS_PolyInfo const& poly, s16 param_1) { if (!dComIfG_Bgsp().ChkPolySafe(poly)) { return 0; @@ -2417,26 +2508,6 @@ s16 fopAcM_getPolygonAngle(cBgS_PolyInfo const& poly, s16 param_1) { return fopAcM_getPolygonAngle(&plane, param_1); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s16 fopAcM_getPolygonAngle(cBgS_PolyInfo const& param_0, s16 param_1) { - nofralloc -#include "asm/f_op/f_op_actor_mng/fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos.s" -} -#pragma pop -#endif - -/* 8001DB90-8001DBD8 0184D0 0048+00 1/0 9/9 0/0 .text __dt__8cM3dGPlaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void __dt__8cM3dGPlaFv() { - nofralloc -#include "asm/f_op/f_op_actor_mng/__dt__8cM3dGPlaFv.s" -} -#pragma pop /* 8001DBD8-8001DC68 018518 0090+00 1/1 5/5 18/18 .text fopAcM_getPolygonAngle__FPC8cM3dGPlas */ // matches with literals @@ -2466,66 +2537,38 @@ asm s16 fopAcM_getPolygonAngle(cM3dGPla const* param_0, s16 param_1) { /* 8001DC68-8001DCBC 0185A8 0054+00 0/0 5/5 21/21 .text * lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c */ -bool fopAcM_lc_c::lineCheck(cXyz const* param_0, cXyz const* param_1, fopAc_ac_c const* param_2) { - mLineCheck.Set(param_0, param_1, param_2); - dComIfG_Bgsp().LineCross(&mLineCheck); +bool fopAcM_lc_c::lineCheck(cXyz const* i_start, cXyz const* i_end, fopAc_ac_c const* i_actor) { + mLineCheck.Set(i_start, i_end, i_actor); + return dComIfG_Bgsp().LineCross(&mLineCheck); } /* 8001DCBC-8001DD1C 0185FC 0060+00 1/1 10/10 108/108 .text gndCheck__11fopAcM_gc_cFPC4cXyz */ -// return value calculation -#ifdef NONMATCHING -bool fopAcM_gc_c::gndCheck(cXyz const* param_0) { - ((cBgS_GndChk*)mGndCheck)->SetPos(param_0); - mGroundY = dComIfG_Bgsp().GroundCross((cBgS_GndChk*)mGndCheck); - return -1000000000.0f > mGroundY; +bool fopAcM_gc_c::gndCheck(cXyz const* i_pos) { + mGndCheck.SetPos(i_pos); + mGroundY = dComIfG_Bgsp().GroundCross(&mGndCheck); + return -1000000000.0f != mGroundY; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool fopAcM_gc_c::gndCheck(cXyz const* param_0) { - nofralloc -#include "asm/f_op/f_op_actor_mng/gndCheck__11fopAcM_gc_cFPC4cXyz.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80451C5C-80451C60 00025C 0004+00 1/1 0/0 0/0 .sdata2 @6517 */ -SECTION_SDATA2 static f32 lit_6517 = 1000000000.0f; /* 8001DD1C-8001DD84 01865C 0068+00 0/0 0/0 3/3 .text roofCheck__11fopAcM_rc_cFPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool fopAcM_rc_c::roofCheck(cXyz const* param_0) { - nofralloc -#include "asm/f_op/f_op_actor_mng/roofCheck__11fopAcM_rc_cFPC4cXyz.s" +bool fopAcM_rc_c::roofCheck(cXyz const* i_pos) { + mRoofCheck.i_SetPos(*i_pos); + mRoofY = dComIfG_Bgsp().RoofChk(&mRoofCheck); + return 1000000000.0f != mRoofY; } -#pragma pop - -/* ############################################################################################## */ -/* 80451C60-80451C68 000260 0004+04 1/1 0/0 0/0 .sdata2 @6538 */ -SECTION_SDATA2 static f32 lit_6538[1 + 1 /* padding */] = { - 500.0f, - /* padding */ - 0.0f, -}; /* 8001DD84-8001DE10 0186C4 008C+00 1/1 4/4 22/22 .text waterCheck__11fopAcM_wt_cFPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool fopAcM_wt_c::waterCheck(cXyz const* param_0) { - nofralloc -#include "asm/f_op/f_op_actor_mng/waterCheck__11fopAcM_wt_cFPC4cXyz.s" +bool fopAcM_wt_c::waterCheck(cXyz const* i_pos) { + cXyz pos(i_pos->x, i_pos->y - 500.0f, i_pos->z); + mWaterCheck.Set(pos, i_pos->y + 500.0f); + + if (dComIfG_Bgsp().WaterChk(&mWaterCheck)) { + mWaterY = mWaterCheck.GetHeight(); + return true; + } + + return false; } -#pragma pop /* 8001DE10-8001DE14 018750 0004+00 0/0 1/1 0/0 .text fopAcM_initManager__Fv */ -void fopAcM_initManager() { - /* empty function */ -} - -#pragma nosyminline on \ No newline at end of file +void fopAcM_initManager() {} \ 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 61c682fe1b..15533b145f 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -91,7 +91,7 @@ static int fopCam_Create(void* i_this) { if (fpcM_IsFirstCreating(i_this)) { camera_process_profile_definition* profile = (camera_process_profile_definition*)fpcM_GetProfile(i_this); - _this->mpMtd = profile->mSubMtd; + _this->mpMtd = profile->sub_method; fopDwTg_Init(&_this->mCreateTag, _this); u32* append = (u32*)fpcM_GetAppend(_this); diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index 6fcdd80e12..82257f118d 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -16,7 +16,7 @@ static int fopKy_Draw(void* i_this) { kankyo_class* _this = (kankyo_class*)i_this; if (!dComIfGp_isPauseFlag()) { - ret = fpcLf_DrawMethod(_this->mSubMtd, i_this); + ret = fpcLf_DrawMethod(_this->sub_method, i_this); } return ret; @@ -28,7 +28,7 @@ static int fopKy_Execute(void* i_this) { kankyo_class* _this = (kankyo_class*)i_this; if (dScnPly_c::isPause() && (!dComIfGp_isPauseFlag() || fpcM_GetName(i_this) == PROC_ENVSE)) { - ret = fpcMtd_Execute(&_this->mSubMtd->mBase, i_this); + ret = fpcMtd_Execute(&_this->sub_method->mBase, i_this); } return ret; @@ -39,9 +39,9 @@ static int fopKy_IsDelete(void* i_this) { int ret; kankyo_class* _this = (kankyo_class*)i_this; - ret = fpcMtd_IsDelete(&_this->mSubMtd->mBase, _this); + ret = fpcMtd_IsDelete(&_this->sub_method->mBase, _this); if (ret == 1) { - fopDwTg_DrawQTo(&_this->mDwTg); + fopDwTg_DrawQTo(&_this->draw_tag); } return ret; @@ -51,8 +51,8 @@ static int fopKy_IsDelete(void* i_this) { static int fopKy_Delete(void* i_this) { kankyo_class* _this = (kankyo_class*)i_this; - int ret = fpcMtd_Delete(&_this->mSubMtd->mBase, _this); - fopDwTg_DrawQTo(&_this->mDwTg); + int ret = fpcMtd_Delete(&_this->sub_method->mBase, _this); + fopDwTg_DrawQTo(&_this->draw_tag); return ret; } @@ -70,9 +70,9 @@ static int fopKy_Create(void* i_this) { (kankyo_process_profile_definition*)fpcM_GetProfile(i_this); _this->mBsType = fpcBs_MakeOfType(&fopKy_KANKYO_TYPE); - _this->mSubMtd = profile->mSubMtd; + _this->sub_method = profile->sub_method; - fopDwTg_Init(&_this->mDwTg, _this); + fopDwTg_Init(&_this->draw_tag, _this); fopKyM_prm_class* append = (fopKyM_prm_class*)fopKyM_GetAppend(_this); if (append != NULL) { @@ -82,10 +82,10 @@ static int fopKy_Create(void* i_this) { } } - int ret = fpcMtd_Create(&_this->mSubMtd->mBase, _this); + int ret = fpcMtd_Create(&_this->sub_method->mBase, _this); if (ret == cPhs_COMPLEATE_e) { s32 priority = fpcLf_GetPriority(_this); - fopDwTg_ToDrawQ(&_this->mDwTg, priority); + fopDwTg_ToDrawQ(&_this->draw_tag, priority); } return ret; diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp index a7f9e18752..59637aea2b 100644 --- a/src/f_op/f_op_msg.cpp +++ b/src/f_op/f_op_msg.cpp @@ -12,7 +12,7 @@ /* 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->mSubMtd, i_this); + return fpcLf_DrawMethod(_this->sub_method, i_this); } /* 8001F4B0-8001F4E8 019DF0 0038+00 1/0 0/0 0/0 .text fopMsg_Execute__FPv */ @@ -21,7 +21,7 @@ static int fopMsg_Execute(void* i_this) { int stat = 1; if (dScnPly_c::isPause()) { - stat = fpcMtd_Execute(&_this->mSubMtd->mBase, i_this); + stat = fpcMtd_Execute(&_this->sub_method->mBase, i_this); } return stat; @@ -31,9 +31,9 @@ static int fopMsg_Execute(void* i_this) { static int fopMsg_IsDelete(void* i_this) { msg_class* _this = static_cast(i_this); - int stat = fpcMtd_IsDelete(&_this->mSubMtd->mBase, i_this); + int stat = fpcMtd_IsDelete(&_this->sub_method->mBase, i_this); if (stat == 1) { - fopDwTg_DrawQTo(&_this->mDwTg); + fopDwTg_DrawQTo(&_this->draw_tag); } return stat; @@ -43,8 +43,8 @@ static int fopMsg_IsDelete(void* i_this) { static int fopMsg_Delete(void* i_this) { msg_class* _this = static_cast(i_this); - int stat = fpcMtd_Delete(&_this->mSubMtd->mBase, i_this); - fopDwTg_DrawQTo(&_this->mDwTg); + int stat = fpcMtd_Delete(&_this->sub_method->mBase, i_this); + fopDwTg_DrawQTo(&_this->draw_tag); return stat; } @@ -61,8 +61,8 @@ int fopMsg_Create(void* i_this) { msg_process_profile_definition* profile = (msg_process_profile_definition*)fpcM_GetProfile(i_this); _this->mMsgType = fpcBs_MakeOfType(&fopMsg_MSG_TYPE); - _this->mSubMtd = profile->mSubMtd; - fopDwTg_Init(&_this->mDwTg, _this); + _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; @@ -73,10 +73,10 @@ int fopMsg_Create(void* i_this) { } } - int status = fpcMtd_Create(&_this->mSubMtd->mBase, _this); + int status = fpcMtd_Create(&_this->sub_method->mBase, _this); if (status == cPhs_COMPLEATE_e) { s32 priority = fpcLf_GetPriority(_this); - fopDwTg_ToDrawQ(&_this->mDwTg, priority); + fopDwTg_ToDrawQ(&_this->draw_tag, priority); } return status; diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index ca7f35770d..7f5f19b2a8 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -177,7 +177,7 @@ int fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_actorP, u32 param_2) { cXyz pos; if (i_actorP) { - pos = i_actorP->mEyePos; + pos = i_actorP->eyePos; } else { pos.set(FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902), FLOAT_LABEL(lit_3902)); } diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp index dfb4336f3b..82f56e69d0 100644 --- a/src/f_op/f_op_overlap.cpp +++ b/src/f_op/f_op_overlap.cpp @@ -40,7 +40,7 @@ static s32 fopOvlp_Create(void* i_this) { (overlap_process_profile_definition*)fpcM_GetProfile(_this); cReq_Create((request_base_class*)&_this->field_0xc4, 1); - _this->field_0xc0 = profile->mSubMtd; + _this->field_0xc0 = profile->sub_method; _this->field_0xc8 = -1; } diff --git a/src/f_op/f_op_view.cpp b/src/f_op/f_op_view.cpp index a85e199c72..ab20108103 100644 --- a/src/f_op/f_op_view.cpp +++ b/src/f_op/f_op_view.cpp @@ -8,23 +8,23 @@ /* 8001F1A8-8001F1D0 019AE8 0028+00 1/0 0/0 0/0 .text fopVw_Draw__FP10view_class */ void fopVw_Draw(view_class* i_this) { - fpcLf_DrawMethod(i_this->mSubMtd, i_this); + fpcLf_DrawMethod(i_this->sub_method, 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->mSubMtd->mBase, i_this); + fpcMtd_Execute(&i_this->sub_method->mBase, 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->mSubMtd->mBase, _this); + return fpcMtd_IsDelete(&_this->sub_method->mBase, _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->mSubMtd->mBase, i_this); + return fpcMtd_Delete(&i_this->sub_method->mBase, i_this); } /* 8001F248-8001F284 019B88 003C+00 1/0 0/0 0/0 .text fopVw_Create__FPv */ @@ -33,10 +33,10 @@ s32 fopVw_Create(void* i_this) { view_process_profile_definition* pProf = (view_process_profile_definition*)fpcM_GetProfile(_this); - _this->mSubMtd = pProf->mSubMtd; + _this->sub_method = pProf->sub_method; _this->field_0xc4 = pProf->unk28; - return fpcMtd_Create(&_this->mSubMtd->mBase, _this); + return fpcMtd_Create(&_this->sub_method->mBase, _this); } /* ############################################################################################## */ diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index 833b503bca..5c11548ec8 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -102,7 +102,7 @@ base_process_class* fpcBs_Create(s16 i_procTypeID, unsigned int i_procID, void* procClass->mBsType = fpcBs_MakeOfType(&g_fpcBs_type); procClass->mProcName = procProfDef->mProcName; fpcPause_Init(procClass); - procClass->mpPcMtd = procProfDef->mSubMtd; + procClass->mpPcMtd = procProfDef->sub_method; procClass->mpProf = procProfDef; procClass->mpUserData = i_data; procClass->mParameters = procProfDef->mParameters; diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index 3eb49afbce..6ee65629ea 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -52,7 +52,7 @@ 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->mSubMtd; + 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; diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp index e3bcff2d12..840d8c722c 100644 --- a/src/f_pc/f_pc_node.cpp +++ b/src/f_pc/f_pc_node.cpp @@ -98,7 +98,7 @@ s32 fpcNd_Create(process_node_class* i_procNode) { 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->mSubMtd; + pProcNode->mpNodeMtd = (nodedraw_method_class*)pProcProfileDef->sub_method; fpcLy_Create(&pProcNode->mLayer, pProcNode, pProcNode->mLayerNodeLists, 0x10); pProcNode->mUnk0 = 0; } diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index dca7473dc1..4379b3dd9a 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -635,7 +635,7 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ fopAcM_SearchByID(daPy_getLinkPlayerActorClass()->getAtnActorID()); if (atn_actor != NULL) { - cXyz sp28 = atn_actor->mEyePos; + cXyz sp28 = atn_actor->eyePos; if (fabsf(sp28.y - camera_p->mLookat.mEye.y) < 400.0f) { sp28.y = camera_p->mLookat.mEye.y; }