From 25d51079a315a7e8e1b745f06ca857b2c48cf532 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 19 Mar 2024 04:31:53 -0700 Subject: [PATCH] remove "duplicated" inlines (#2099) * fix f_op_actor_mng inlines * fix f_pc inlines * fix d_a_alink weak func signatures * fix d_com_inf_game inlines * fix some more inlines * fix rest of player inlines * m_Do / JSystem inlines fixed * fix upstream changes --- ...2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2.s | 4 + .../checkForceNormalColor__9daMidna_cCFv.s | 4 + .../checkForceTiredColor__9daMidna_cCFv.s | 4 + ...Flg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3.s | 4 + .../d_a_alink/dMeter2Info_offUseButton__Fi.s | 8 + .../dMeter2Info_setFloatingMessage__FUssb.s | 16 + asm/d/a/d_a_alink/func_80141AE8.s | 9 + .../getGiantPuzzleAimAngle__9daPy_py_cCFv.s | 3 + asm/d/a/d_a_alink/getInvMtx__9daPy_py_cFv.s | 3 + .../getLeftHandMatrix__9daPy_py_cFv.s | 3 + .../getLeftItemMatrix__9daPy_py_cFv.s | 3 + .../getLinkBackBone1Matrix__9daPy_py_cFv.s | 3 + asm/d/a/d_a_alink/getModelMtx__9daPy_py_cFv.s | 3 + .../getRightHandMatrix__9daPy_py_cFv.s | 3 + .../getRightItemMatrix__9daPy_py_cFv.s | 3 + .../getShadowTalkAtnPos__9daPy_py_cFv.s | 3 + .../a/d_a_alink/getSumouMode__9daPy_py_cCFv.s | 11 + .../getWolfBackbone2Matrix__9daPy_py_cFv.s | 3 + .../getWolfMouthMatrix__9daPy_py_cFv.s | 3 + .../a/d_a_alink/getZeldaActor__9daHorse_cFv.s | 3 + .../a/d_a_alink/onForcePanic__9daMidna_cFv.s | 5 + .../d_a_alink/onNoServiceWait__9daMidna_cFv.s | 5 + include/JSystem/J3DGraphAnimator/J3DModel.h | 11 +- include/JSystem/JKernel/JKRHeap.h | 2 +- include/d/a/d_a_alink.h | 36 +- include/d/a/d_a_player.h | 189 ++-- include/d/com/d_com_inf_game.h | 73 +- include/d/d_stage.h | 1 + include/d/event/d_event.h | 9 +- include/d/kankyo/d_kankyo.h | 2 +- include/f_op/f_op_actor_mng.h | 13 +- include/f_pc/f_pc_base.h | 5 - include/f_pc/f_pc_executor.h | 8 - include/f_pc/f_pc_manager.h | 15 +- include/f_pc/f_pc_priority.h | 2 - include/f_pc/f_pc_searcher.h | 8 - include/f_pc/f_pc_stdcreate_req.h | 4 - include/m_Do/m_Do_Reset.h | 3 +- include/m_Do/m_Do_audio.h | 3 +- include/rel/d/a/d_a_horse/d_a_horse.h | 10 +- include/rel/d/a/d_a_midna/d_a_midna.h | 4 +- include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h | 2 +- include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h | 2 +- .../d_a_obj_lv4CandleTag.h | 2 +- .../d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h | 4 +- .../d_a_obj_mirror_6pole.h | 6 +- .../d_a_obj_mirror_sand/d_a_obj_mirror_sand.h | 6 +- .../rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.h | 2 +- .../tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h | 4 +- libs/JSystem/J3DGraphAnimator/J3DJoint.cpp | 2 +- libs/JSystem/J3DGraphAnimator/J3DModel.cpp | 4 +- libs/JSystem/JKernel/JKRAram.cpp | 6 +- libs/JSystem/JKernel/JKRAramArchive.cpp | 8 +- libs/JSystem/JKernel/JKRAramStream.cpp | 2 +- libs/JSystem/JKernel/JKRCompArchive.cpp | 2 +- libs/JSystem/JKernel/JKRDvdArchive.cpp | 2 +- libs/JSystem/JKernel/JKRDvdRipper.cpp | 20 +- libs/JSystem/JKernel/JKRExpHeap.cpp | 2 +- libs/JSystem/JKernel/JKRThread.cpp | 2 +- libs/Z2AudioLib/Z2EnvSeMgr.cpp | 2 +- libs/Z2AudioLib/Z2StatusMgr.cpp | 2 +- obj_files.mk | 1 + rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp | 16 +- rel/d/a/b/d_a_b_go/d_a_b_go.cpp | 2 +- rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp | 6 +- rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp | 10 +- rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp | 18 +- rel/d/a/b/d_a_b_oh/d_a_b_oh_NONMATCHING.cpp | 18 +- rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp | 6 +- rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp | 4 +- rel/d/a/d_a_alldie/d_a_alldie.cpp | 8 +- rel/d/a/d_a_andsw/d_a_andsw.cpp | 4 +- rel/d/a/d_a_andsw2/d_a_andsw2.cpp | 14 +- rel/d/a/d_a_bg/d_a_bg.cpp | 4 +- rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp | 24 +- rel/d/a/d_a_boomerang/d_a_boomerang.cpp | 4 +- rel/d/a/d_a_crod/d_a_crod.cpp | 6 +- rel/d/a/d_a_disappear/d_a_disappear.cpp | 2 +- rel/d/a/d_a_dmidna/d_a_dmidna.cpp | 2 +- rel/d/a/d_a_do/d_a_do.cpp | 10 +- rel/d/a/d_a_dshutter/d_a_dshutter.cpp | 6 +- rel/d/a/d_a_econt/d_a_econt.cpp | 4 +- rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp | 2 +- rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp | 42 +- rel/d/a/d_a_mirror/d_a_mirror.cpp | 6 +- rel/d/a/d_a_movie_player/d_a_movie_player.cpp | 2 +- rel/d/a/d_a_myna/d_a_myna.cpp | 52 +- rel/d/a/d_a_ni/d_a_ni_NONMATCHING.cpp | 50 +- rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp | 10 +- rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp | 4 +- rel/d/a/d_a_shop_item/d_a_shop_item.cpp | 2 +- rel/d/a/d_a_swTime/d_a_swTime.cpp | 4 +- rel/d/a/d_a_swc00/d_a_swc00.cpp | 2 +- rel/d/a/d_a_tbox/d_a_tbox_NONMATCHING.cpp | 54 +- rel/d/a/d_a_tbox2/d_a_tbox2.cpp | 10 +- rel/d/a/d_a_vrbox/d_a_vrbox.cpp | 2 +- rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp | 12 +- rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp | 8 +- .../d_a_door_dbdoor00/d_a_door_dbdoor00.cpp | 14 +- rel/d/a/door/d_a_door_push/d_a_door_push.cpp | 8 +- 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 | 2 +- rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp | 2 +- rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp | 2 +- rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp | 54 +- rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp | 63 +- rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp | 4 +- rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp | 14 +- rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp | 16 +- rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp | 2 +- rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp | 2 +- rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp | 8 +- rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp | 38 +- rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp | 10 +- rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp | 6 +- rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp | 6 +- rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp | 4 +- rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp | 2 +- rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp | 56 +- rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp | 6 +- rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp | 36 +- rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp | 2 +- .../a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp | 6 +- rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp | 6 +- rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp | 2 +- .../a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp | 2 +- rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp | 6 +- .../obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp | 40 +- rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp | 10 +- rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp | 6 +- .../a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp | 4 +- rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp | 4 +- rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp | 12 +- .../d_a_obj_chandelier/d_a_obj_chandelier.cpp | 6 +- rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp | 10 +- .../a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp | 6 +- .../a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp | 8 +- .../obj/d_a_obj_digplace/d_a_obj_digplace.cpp | 4 +- .../a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp | 4 +- rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp | 2 +- .../a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp | 4 +- .../d_a_obj_grave_stone.cpp | 2 +- .../d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp | 12 +- .../a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp | 14 +- .../obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp | 2 +- rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp | 2 +- rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp | 10 +- .../a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp | 2 +- rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp | 34 +- rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp | 6 +- .../a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp | 4 +- rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp | 2 +- .../d_a_obj_lv1Candle00.cpp | 16 +- .../d_a_obj_lv1Candle01.cpp | 4 +- .../d_a_obj_lv2Candle/d_a_obj_lv2Candle.cpp | 14 +- .../d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp | 4 +- .../d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp | 4 +- .../d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp | 6 +- .../d_a_obj_lv3waterEff.cpp | 2 +- .../d_a_obj_lv4CandleDemoTag.cpp | 14 +- .../a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp | 8 +- .../d_a_obj_lv4HsTarget.cpp | 2 +- .../d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp | 6 +- .../obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp | 6 +- .../d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp | 4 +- .../d_a_obj_master_sword.cpp | 6 +- rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp | 4 +- rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp | 2 +- .../a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp | 6 +- .../d_a_obj_onsenFire/d_a_obj_onsenFire.cpp | 2 +- .../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 | 38 +- rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp | 2 +- rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp | 2 +- rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp | 4 +- .../d_a_obj_snow_soup/d_a_obj_snow_soup.cpp | 14 +- .../a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp | 2 +- rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp | 2 +- rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp | 2 +- .../a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp | 16 +- .../a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp | 20 +- .../a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp | 42 +- .../d_a_obj_swpropeller.cpp | 20 +- .../d_a_obj_swspinner/d_a_obj_swspinner.cpp | 14 +- rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp | 34 +- 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 | 6 +- rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp | 2 +- .../a/obj/d_a_obj_vground/d_a_obj_vground.cpp | 4 +- .../obj/d_a_obj_volcball/d_a_obj_volcball.cpp | 24 +- rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp | 14 +- rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp | 2 +- rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp | 4 +- .../d_a_obj_wind_stone/d_a_obj_wind_stone.cpp | 18 +- rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp | 4 +- rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp | 2 +- rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp | 6 +- rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp | 2 +- .../obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp | 10 +- .../d_a_obj_zrTuraraRock.cpp | 2 +- .../d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp | 6 +- .../obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp | 4 +- .../d_a_obj_mirror_6pole.cpp | 6 +- .../d_a_obj_mirror_chain.cpp | 30 +- .../d_a_obj_mirror_sand.cpp | 2 +- .../d_a_obj_mirror_screw.cpp | 28 +- .../d_a_obj_mirror_table.cpp | 44 +- rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.cpp | 8 +- .../a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp | 41 +- .../a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp | 22 +- .../a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp | 22 +- rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp | 84 +- .../d_a_tag_attention/d_a_tag_attention.cpp | 4 +- .../d_a_tag_bottle_item.cpp | 6 +- .../d_a_tag_chgrestart/d_a_tag_chgrestart.cpp | 4 +- rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp | 24 +- rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp | 10 +- rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp | 2 +- rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp | 12 +- rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp | 8 +- rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp | 12 +- .../d_a_tag_kago_fall/d_a_tag_kago_fall.cpp | 12 +- .../a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp | 2 +- .../d_a_tag_lightball/d_a_tag_lightball.cpp | 20 +- .../tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp | 14 +- .../a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp | 4 +- .../d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp | 8 +- rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp | 24 +- rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp | 8 +- rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp | 6 +- rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp | 24 +- rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp | 10 +- rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp | 4 +- .../d_a_tag_myna_light/d_a_tag_myna_light.cpp | 4 +- rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp | 4 +- .../d_a_tag_river_back/d_a_tag_river_back.cpp | 12 +- .../tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp | 4 +- .../d_a_tag_shop_item/d_a_tag_shop_item.cpp | 2 +- .../a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp | 4 +- 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 | 8 +- rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp | 2 +- .../d_a_tag_waterfall/d_a_tag_waterfall.cpp | 2 +- rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp | 12 +- src/DynamicLink.cpp | 6 +- src/c/c_damagereaction.cpp | 2 +- src/d/a/d_a_alink.cpp | 990 +++++++++--------- src/d/a/d_a_alink_boom.inc | 52 +- src/d/a/d_a_alink_bottle.inc | 66 +- src/d/a/d_a_alink_bow.inc | 46 +- src/d/a/d_a_alink_canoe.inc | 2 +- src/d/a/d_a_alink_copyrod.inc | 22 +- src/d/a/d_a_alink_crawl.inc | 4 +- src/d/a/d_a_alink_cut.inc | 188 ++-- src/d/a/d_a_alink_damage.inc | 82 +- src/d/a/d_a_alink_demo.inc | 432 ++++---- src/d/a/d_a_alink_effect.inc | 4 +- src/d/a/d_a_alink_grab.inc | 10 +- src/d/a/d_a_alink_guard.inc | 24 +- src/d/a/d_a_alink_hang.inc | 18 +- src/d/a/d_a_alink_hook.inc | 86 +- src/d/a/d_a_alink_horse.inc | 84 +- src/d/a/d_a_alink_hvyboots.inc | 44 +- src/d/a/d_a_alink_iceleaf.inc | 10 +- src/d/a/d_a_alink_ironball.inc | 10 +- src/d/a/d_a_alink_kandelaar.inc | 38 +- src/d/a/d_a_alink_link.inc | 721 +++++++------ 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 | 86 +- src/d/a/d_a_alink_swindow.inc | 38 +- src/d/a/d_a_alink_weakfn.inc | 641 +++++++----- src/d/a/d_a_alink_whistle.inc | 10 +- src/d/a/d_a_alink_wolf.inc | 260 ++--- src/d/a/d_a_no_chg_room.cpp | 4 +- src/d/a/d_a_npc.cpp | 18 +- src/d/a/d_a_npc_cd2.cpp | 8 +- src/d/a/d_a_obj_item.cpp | 12 +- src/d/a/d_a_player.cpp | 20 +- src/d/bg/d_bg_w.cpp | 4 +- src/d/bg/d_bg_w_kcol.cpp | 4 +- src/d/cc/d_cc_s.cpp | 6 +- src/d/cc/d_cc_uty.cpp | 2 +- src/d/com/d_com_inf_game.cpp | 162 +-- src/d/com/d_com_static.cpp | 6 +- src/d/d_attention.cpp | 20 +- src/d/d_demo.cpp | 2 +- src/d/d_drawlist.cpp | 4 +- src/d/d_envse.cpp | 6 +- src/d/d_ev_camera.cpp | 4 +- src/d/d_eye_hl.cpp | 2 +- src/d/d_gameover.cpp | 4 +- src/d/d_insect.cpp | 4 +- src/d/d_item.cpp | 166 +-- src/d/d_jnt_col.cpp | 4 +- src/d/d_k_wmark.cpp | 2 +- src/d/d_k_wpillar.cpp | 2 +- src/d/d_ky_thunder.cpp | 6 +- src/d/d_npc_lib.cpp | 2 +- src/d/d_path.cpp | 4 +- src/d/d_resorce.cpp | 2 +- src/d/d_scope.cpp | 4 +- src/d/d_simple_model.cpp | 2 +- src/d/d_stage.cpp | 14 +- src/d/d_timer.cpp | 2 +- src/d/d_tresure.cpp | 4 +- src/d/event/d_event.cpp | 84 +- src/d/event/d_event_data.cpp | 56 +- src/d/event/d_event_lib.cpp | 6 +- src/d/event/d_event_manager.cpp | 36 +- src/d/file/d_file_sel_info.cpp | 2 +- src/d/file/d_file_select.cpp | 2 +- src/d/kankyo/d_kankyo.cpp | 34 +- src/d/kankyo/d_kankyo_rain.cpp | 16 +- src/d/kankyo/d_kankyo_wether.cpp | 8 +- src/d/map/d_map.cpp | 6 +- src/d/map/d_map_path_dmap.cpp | 2 +- src/d/menu/d_menu_collect.cpp | 62 +- src/d/menu/d_menu_dmap.cpp | 6 +- src/d/menu/d_menu_insect.cpp | 10 +- src/d/menu/d_menu_item_explain.cpp | 2 +- src/d/menu/d_menu_save.cpp | 12 +- src/d/menu/d_menu_skill.cpp | 2 +- src/d/menu/d_menu_window.cpp | 6 +- src/d/menu/d_menu_window_HIO.cpp | 6 +- src/d/meter/d_meter2.cpp | 112 +- src/d/meter/d_meter2_draw.cpp | 32 +- src/d/meter/d_meter2_info.cpp | 10 +- src/d/meter/d_meter_button.cpp | 6 +- src/d/meter/d_meter_hakusha.cpp | 4 +- src/d/meter/d_meter_map.cpp | 40 +- src/d/msg/d_msg_class.cpp | 12 +- src/d/msg/d_msg_flow.cpp | 26 +- src/d/msg/d_msg_object.cpp | 2 +- src/d/particle/d_particle.cpp | 6 +- src/d/s/d_s_logo.cpp | 2 +- src/d/s/d_s_play.cpp | 8 +- src/d/s/d_s_room.cpp | 4 +- src/d/save/d_save.cpp | 22 +- src/d/save/d_save_HIO.cpp | 2 +- src/d/shop/d_shop_camera.cpp | 10 +- src/f_op/f_op_actor.cpp | 2 +- src/f_op/f_op_actor_mng.cpp | 72 +- src/m_Do/m_Do_Reset.cpp | 5 - src/m_Do/m_Do_ext.cpp | 6 +- src/m_Do/m_Do_graphic.cpp | 2 +- src/m_Do/m_Do_main.cpp | 2 +- 347 files changed, 3972 insertions(+), 3892 deletions(-) create mode 100644 asm/d/a/d_a_alink/checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2.s create mode 100644 asm/d/a/d_a_alink/checkForceNormalColor__9daMidna_cCFv.s create mode 100644 asm/d/a/d_a_alink/checkForceTiredColor__9daMidna_cCFv.s create mode 100644 asm/d/a/d_a_alink/checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3.s create mode 100644 asm/d/a/d_a_alink/dMeter2Info_offUseButton__Fi.s create mode 100644 asm/d/a/d_a_alink/dMeter2Info_setFloatingMessage__FUssb.s create mode 100644 asm/d/a/d_a_alink/func_80141AE8.s create mode 100644 asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daPy_py_cCFv.s create mode 100644 asm/d/a/d_a_alink/getInvMtx__9daPy_py_cFv.s create mode 100644 asm/d/a/d_a_alink/getLeftHandMatrix__9daPy_py_cFv.s create mode 100644 asm/d/a/d_a_alink/getLeftItemMatrix__9daPy_py_cFv.s create mode 100644 asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daPy_py_cFv.s create mode 100644 asm/d/a/d_a_alink/getModelMtx__9daPy_py_cFv.s create mode 100644 asm/d/a/d_a_alink/getRightHandMatrix__9daPy_py_cFv.s create mode 100644 asm/d/a/d_a_alink/getRightItemMatrix__9daPy_py_cFv.s create mode 100644 asm/d/a/d_a_alink/getShadowTalkAtnPos__9daPy_py_cFv.s create mode 100644 asm/d/a/d_a_alink/getSumouMode__9daPy_py_cCFv.s create mode 100644 asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daPy_py_cFv.s create mode 100644 asm/d/a/d_a_alink/getWolfMouthMatrix__9daPy_py_cFv.s create mode 100644 asm/d/a/d_a_alink/getZeldaActor__9daHorse_cFv.s create mode 100644 asm/d/a/d_a_alink/onForcePanic__9daMidna_cFv.s create mode 100644 asm/d/a/d_a_alink/onNoServiceWait__9daMidna_cFv.s diff --git a/asm/d/a/d_a_alink/checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2.s b/asm/d/a/d_a_alink/checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2.s new file mode 100644 index 00000000000..81dbc7cbffd --- /dev/null +++ b/asm/d/a/d_a_alink/checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2.s @@ -0,0 +1,4 @@ +lbl_80141190: +/* 80141190 80 03 05 90 */ lwz r0, 0x590(r3) +/* 80141194 7C 03 20 38 */ and r3, r0, r4 +/* 80141198 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkForceNormalColor__9daMidna_cCFv.s b/asm/d/a/d_a_alink/checkForceNormalColor__9daMidna_cCFv.s new file mode 100644 index 00000000000..675d730958a --- /dev/null +++ b/asm/d/a/d_a_alink/checkForceNormalColor__9daMidna_cCFv.s @@ -0,0 +1,4 @@ +lbl_80141A04: +/* 80141A04 80 03 08 94 */ lwz r0, 0x894(r3) +/* 80141A08 54 03 07 38 */ rlwinm r3, r0, 0, 0x1c, 0x1c +/* 80141A0C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkForceTiredColor__9daMidna_cCFv.s b/asm/d/a/d_a_alink/checkForceTiredColor__9daMidna_cCFv.s new file mode 100644 index 00000000000..e7d90c60506 --- /dev/null +++ b/asm/d/a/d_a_alink/checkForceTiredColor__9daMidna_cCFv.s @@ -0,0 +1,4 @@ +lbl_80141A10: +/* 80141A10 80 03 08 94 */ lwz r0, 0x894(r3) +/* 80141A14 54 03 07 7A */ rlwinm r3, r0, 0, 0x1d, 0x1d +/* 80141A18 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3.s b/asm/d/a/d_a_alink/checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3.s new file mode 100644 index 00000000000..d50a1967b5d --- /dev/null +++ b/asm/d/a/d_a_alink/checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3.s @@ -0,0 +1,4 @@ +lbl_801411D4: +/* 801411D4 80 03 05 7C */ lwz r0, 0x57c(r3) +/* 801411D8 7C 03 20 38 */ and r3, r0, r4 +/* 801411DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dMeter2Info_offUseButton__Fi.s b/asm/d/a/d_a_alink/dMeter2Info_offUseButton__Fi.s new file mode 100644 index 00000000000..d3ae511bcfc --- /dev/null +++ b/asm/d/a/d_a_alink/dMeter2Info_offUseButton__Fi.s @@ -0,0 +1,8 @@ +lbl_8014196C: +/* 8014196C 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ +/* 80141970 38 A4 01 88 */ addi r5, r4, g_meter2_info@l /* 0x80430188@l */ +/* 80141974 A0 85 00 AE */ lhz r4, 0xae(r5) +/* 80141978 54 60 04 3E */ clrlwi r0, r3, 0x10 +/* 8014197C 7C 80 00 78 */ andc r0, r4, r0 +/* 80141980 B0 05 00 AE */ sth r0, 0xae(r5) +/* 80141984 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dMeter2Info_setFloatingMessage__FUssb.s b/asm/d/a/d_a_alink/dMeter2Info_setFloatingMessage__FUssb.s new file mode 100644 index 00000000000..ad3dac04ad9 --- /dev/null +++ b/asm/d/a/d_a_alink/dMeter2Info_setFloatingMessage__FUssb.s @@ -0,0 +1,16 @@ +lbl_801419B8: +/* 801419B8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 801419BC 7C 08 02 A6 */ mflr r0 +/* 801419C0 90 01 00 14 */ stw r0, 0x14(r1) +/* 801419C4 7C 67 1B 78 */ mr r7, r3 +/* 801419C8 7C 80 23 78 */ mr r0, r4 +/* 801419CC 7C A6 2B 78 */ mr r6, r5 +/* 801419D0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ +/* 801419D4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ +/* 801419D8 7C E4 3B 78 */ mr r4, r7 +/* 801419DC 7C 05 03 78 */ mr r5, r0 +/* 801419E0 48 0D A7 01 */ bl setFloatingMessage__13dMeter2Info_cFUssb +/* 801419E4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 801419E8 7C 08 03 A6 */ mtlr r0 +/* 801419EC 38 21 00 10 */ addi r1, r1, 0x10 +/* 801419F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/func_80141AE8.s b/asm/d/a/d_a_alink/func_80141AE8.s new file mode 100644 index 00000000000..6f469f5fde2 --- /dev/null +++ b/asm/d/a/d_a_alink/func_80141AE8.s @@ -0,0 +1,9 @@ +lbl_80141AE8: +/* 80141AE8 88 83 00 00 */ lbz r4, 0(r3) +/* 80141AEC 28 04 00 00 */ cmplwi r4, 0 +/* 80141AF0 41 82 00 0C */ beq lbl_80141AFC +/* 80141AF4 38 04 FF FF */ addi r0, r4, -1 +/* 80141AF8 98 03 00 00 */ stb r0, 0(r3) +lbl_80141AFC: +/* 80141AFC 88 63 00 00 */ lbz r3, 0(r3) +/* 80141B00 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daPy_py_cCFv.s b/asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daPy_py_cCFv.s new file mode 100644 index 00000000000..035de771597 --- /dev/null +++ b/asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daPy_py_cCFv.s @@ -0,0 +1,3 @@ +lbl_80141874: +/* 80141874 A8 63 04 E6 */ lha r3, 0x4e6(r3) +/* 80141878 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getInvMtx__9daPy_py_cFv.s b/asm/d/a/d_a_alink/getInvMtx__9daPy_py_cFv.s new file mode 100644 index 00000000000..6d096e4eca6 --- /dev/null +++ b/asm/d/a/d_a_alink/getInvMtx__9daPy_py_cFv.s @@ -0,0 +1,3 @@ +lbl_80141514: +/* 80141514 80 63 05 04 */ lwz r3, 0x504(r3) +/* 80141518 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getLeftHandMatrix__9daPy_py_cFv.s b/asm/d/a/d_a_alink/getLeftHandMatrix__9daPy_py_cFv.s new file mode 100644 index 00000000000..c4adb5af911 --- /dev/null +++ b/asm/d/a/d_a_alink/getLeftHandMatrix__9daPy_py_cFv.s @@ -0,0 +1,3 @@ +lbl_80141534: +/* 80141534 80 63 05 04 */ lwz r3, 0x504(r3) +/* 80141538 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getLeftItemMatrix__9daPy_py_cFv.s b/asm/d/a/d_a_alink/getLeftItemMatrix__9daPy_py_cFv.s new file mode 100644 index 00000000000..684aa439a14 --- /dev/null +++ b/asm/d/a/d_a_alink/getLeftItemMatrix__9daPy_py_cFv.s @@ -0,0 +1,3 @@ +lbl_80141524: +/* 80141524 80 63 05 04 */ lwz r3, 0x504(r3) +/* 80141528 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daPy_py_cFv.s b/asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daPy_py_cFv.s new file mode 100644 index 00000000000..347d75ff9ec --- /dev/null +++ b/asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daPy_py_cFv.s @@ -0,0 +1,3 @@ +lbl_80141544: +/* 80141544 80 63 05 04 */ lwz r3, 0x504(r3) +/* 80141548 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getModelMtx__9daPy_py_cFv.s b/asm/d/a/d_a_alink/getModelMtx__9daPy_py_cFv.s new file mode 100644 index 00000000000..8175a6c1c88 --- /dev/null +++ b/asm/d/a/d_a_alink/getModelMtx__9daPy_py_cFv.s @@ -0,0 +1,3 @@ +lbl_8014150C: +/* 8014150C 80 63 05 04 */ lwz r3, 0x504(r3) +/* 80141510 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getRightHandMatrix__9daPy_py_cFv.s b/asm/d/a/d_a_alink/getRightHandMatrix__9daPy_py_cFv.s new file mode 100644 index 00000000000..e069f94e349 --- /dev/null +++ b/asm/d/a/d_a_alink/getRightHandMatrix__9daPy_py_cFv.s @@ -0,0 +1,3 @@ +lbl_8014153C: +/* 8014153C 80 63 05 04 */ lwz r3, 0x504(r3) +/* 80141540 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getRightItemMatrix__9daPy_py_cFv.s b/asm/d/a/d_a_alink/getRightItemMatrix__9daPy_py_cFv.s new file mode 100644 index 00000000000..a99a4202734 --- /dev/null +++ b/asm/d/a/d_a_alink/getRightItemMatrix__9daPy_py_cFv.s @@ -0,0 +1,3 @@ +lbl_8014152C: +/* 8014152C 80 63 05 04 */ lwz r3, 0x504(r3) +/* 80141530 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getShadowTalkAtnPos__9daPy_py_cFv.s b/asm/d/a/d_a_alink/getShadowTalkAtnPos__9daPy_py_cFv.s new file mode 100644 index 00000000000..597e4eb15b1 --- /dev/null +++ b/asm/d/a/d_a_alink/getShadowTalkAtnPos__9daPy_py_cFv.s @@ -0,0 +1,3 @@ +lbl_8014151C: +/* 8014151C 38 63 04 D0 */ addi r3, r3, 0x4d0 +/* 80141520 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSumouMode__9daPy_py_cCFv.s b/asm/d/a/d_a_alink/getSumouMode__9daPy_py_cCFv.s new file mode 100644 index 00000000000..e715b235c02 --- /dev/null +++ b/asm/d/a/d_a_alink/getSumouMode__9daPy_py_cCFv.s @@ -0,0 +1,11 @@ +lbl_801411B0: +/* 801411B0 38 00 00 00 */ li r0, 0 +/* 801411B4 88 63 05 6A */ lbz r3, 0x56a(r3) +/* 801411B8 28 03 00 00 */ cmplwi r3, 0 +/* 801411BC 41 82 00 10 */ beq lbl_801411CC +/* 801411C0 28 03 00 26 */ cmplwi r3, 0x26 +/* 801411C4 40 80 00 08 */ bge lbl_801411CC +/* 801411C8 38 00 00 01 */ li r0, 1 +lbl_801411CC: +/* 801411CC 7C 03 03 78 */ mr r3, r0 +/* 801411D0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daPy_py_cFv.s b/asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daPy_py_cFv.s new file mode 100644 index 00000000000..017b0f1ac71 --- /dev/null +++ b/asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daPy_py_cFv.s @@ -0,0 +1,3 @@ +lbl_80141554: +/* 80141554 80 63 05 04 */ lwz r3, 0x504(r3) +/* 80141558 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getWolfMouthMatrix__9daPy_py_cFv.s b/asm/d/a/d_a_alink/getWolfMouthMatrix__9daPy_py_cFv.s new file mode 100644 index 00000000000..84d9294cf17 --- /dev/null +++ b/asm/d/a/d_a_alink/getWolfMouthMatrix__9daPy_py_cFv.s @@ -0,0 +1,3 @@ +lbl_8014154C: +/* 8014154C 80 63 05 04 */ lwz r3, 0x504(r3) +/* 80141550 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getZeldaActor__9daHorse_cFv.s b/asm/d/a/d_a_alink/getZeldaActor__9daHorse_cFv.s new file mode 100644 index 00000000000..e4f83ae3d81 --- /dev/null +++ b/asm/d/a/d_a_alink/getZeldaActor__9daHorse_cFv.s @@ -0,0 +1,3 @@ +lbl_80141944: +/* 80141944 80 63 12 58 */ lwz r3, 0x1258(r3) +/* 80141948 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/onForcePanic__9daMidna_cFv.s b/asm/d/a/d_a_alink/onForcePanic__9daMidna_cFv.s new file mode 100644 index 00000000000..75001d2796b --- /dev/null +++ b/asm/d/a/d_a_alink/onForcePanic__9daMidna_cFv.s @@ -0,0 +1,5 @@ +lbl_801419F4: +/* 801419F4 80 03 08 98 */ lwz r0, 0x898(r3) +/* 801419F8 60 00 00 08 */ ori r0, r0, 8 +/* 801419FC 90 03 08 98 */ stw r0, 0x898(r3) +/* 80141A00 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/onNoServiceWait__9daMidna_cFv.s b/asm/d/a/d_a_alink/onNoServiceWait__9daMidna_cFv.s new file mode 100644 index 00000000000..786d003d4e6 --- /dev/null +++ b/asm/d/a/d_a_alink/onNoServiceWait__9daMidna_cFv.s @@ -0,0 +1,5 @@ +lbl_80141A84: +/* 80141A84 80 03 08 98 */ lwz r0, 0x898(r3) +/* 80141A88 60 00 00 80 */ ori r0, r0, 0x80 +/* 80141A8C 90 03 08 98 */ stw r0, 0x898(r3) +/* 80141A90 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h index 297d79fadcd..4fa4973b2a9 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModel.h +++ b/include/JSystem/J3DGraphAnimator/J3DModel.h @@ -39,7 +39,6 @@ class J3DModel { entryModelData(param_0, param_1, param_2); } - /* 800CFFF4 */ void setBaseTRMtx(f32 (*)[4]); /* 80327100 */ void initialize(); /* 80327184 */ s32 entryModelData(J3DModelData*, u32, u32); /* 80327300 */ s32 createShapePacket(J3DModelData*); @@ -56,7 +55,6 @@ class J3DModel { /* 803281B4 */ void calcBumpMtx(); /* 803282B8 */ void calcBBoardMtx(); /* 803282EC */ void prepareShapePackets(); - MtxP getAnmMtx(int); /* 80327CA4 */ virtual void update(); /* 80327E4C */ virtual void entry(); @@ -75,7 +73,7 @@ class J3DModel { bool isCpuSkinningOn() const { return (mFlags & J3DMdlFlag_SkinPosCpu) && (mFlags & J3DMdlFlag_SkinNrmCpu); } Mtx& getBaseTRMtx() { return mBaseTransformMtx; } - void i_setBaseTRMtx(Mtx m) { MTXCopy(m, mBaseTransformMtx); } + void setBaseTRMtx(Mtx m) { MTXCopy(m, mBaseTransformMtx); } u32 getMtxCalcMode() const { return mFlags & 0x03; } J3DVertexBuffer* getVertexBuffer() const { return (J3DVertexBuffer*)&mVertexBuffer; } J3DMatPacket* getMatPacket(u16 idx) const { return &mMatPacket[idx]; } @@ -89,11 +87,8 @@ class J3DModel { void setUserArea(u32 area) { mUserArea = area; } u32 getUserArea() const { return mUserArea; } Vec* getBaseScale() { return &mBaseScale; } - void setAnmMtx(int i, Mtx m) { mMtxBuffer->setAnmMtx(i, m); } - - // is there a better way to handle inlines with same name as non-inlines? - MtxP i_getAnmMtx(int p1) { return mMtxBuffer->getAnmMtx(p1); } - void i_setAnmMtx(int p1, Mtx mtx) { mMtxBuffer->setAnmMtx(p1, mtx); } + void setAnmMtx(int jointNo, Mtx m) { mMtxBuffer->setAnmMtx(jointNo, m); } + MtxP getAnmMtx(int jointNo) { return mMtxBuffer->getAnmMtx(jointNo); } /* 0x04 */ J3DModelData* mModelData; /* 0x08 */ u32 mFlags; diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index 7d78d525fd2..3ea9ae25086 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -211,7 +211,7 @@ inline void JKRFreeToSysHeap(void* ptr) { systemHeap->free(ptr); } -inline void i_JKRFree(void* ptr) { +inline void JKRFree(void* ptr) { JKRHeap::free(ptr, NULL); } diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 64b05d9803c..6c5db5633fe 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -156,7 +156,6 @@ class daAlink_matAnm_c : public J3DMaterialAnm { static u8 m_morf_frame; -private: /* 0x0F4 */ f32 field_0xf4; /* 0x0F8 */ f32 field_0xf8; /* 0x0FC */ f32 mNowOffsetX; @@ -1669,16 +1668,9 @@ class daAlink_c : public daPy_py_c { /* 800CF100 */ int procCoPeepSubjectivityInit(); /* 800CF1B8 */ int procCoPeepSubjectivity(); /* 800CF380 */ daAlink_c(); - /* 800CFEB0 */ BOOL checkRideOn() const; - /* 800CFF4C */ BOOL checkAttentionLock(); - /* 800D0020 */ BOOL checkFmChainGrabAnime() const; - /* 800D0048 */ BOOL checkSmallUpperGuardAnime() const; - /* 800D00EC */ u32 checkReinRide() const; /* 800D0110 */ BOOL checkWolfEnemyThrowAnime() const; - /* 800D0138 */ int checkSpecialDemoMode() const; /* 800D014C */ void setMidnaTalkStatus(u8); /* 800D0164 */ void set3DStatus(u8, u8); - /* 800D018C */ u32 checkModeFlg(u32) const; /* 800D2684 */ void checkCutTurnCharge(); /* 800D0E08 */ void checkLightSwordMtrl(); /* 800D0E98 */ BOOL checkSwordEquipAnime() const; @@ -3136,15 +3128,14 @@ class daAlink_c : public daPy_py_c { virtual bool checkCopyRodEquip() const; virtual BOOL checkCutJumpMode() const; - // inlined dupes - u32 i_checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; } - bool i_checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); } - bool i_checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); } + u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; } + bool checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); } + bool checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); } Z2WolfHowlMgr* i_getWolfHowlMgrP() { return &mZ2WolfHowlMgr; } // this might be a fake match, but helps fix usage in many functions #pragma optimization_level 2 - BOOL i_checkAttentionLock() { return mAttention->Lockon(); } + BOOL checkAttentionLock() { return mAttention->Lockon(); } #pragma optimization_level 3 bool checkUpperAnime(u16 i_idx) const { return mUpperAnmHeap[UPPER_2].getIdx() == i_idx; } @@ -3241,15 +3232,15 @@ class daAlink_c : public daPy_py_c { } s32 checkPlayerDemoMode() const { return mDemo.getDemoType(); } - BOOL i_checkSpecialDemoMode() const { return mDemo.getDemoType() == 5; } - static bool checkMidnaChargeAttack() { return i_dComIfGs_isEventBit(0x501); } + BOOL checkSpecialDemoMode() const { return mDemo.getDemoType() == 5; } + static bool checkMidnaChargeAttack() { return dComIfGs_isEventBit(0x501); } u16 getMidnaMsgNum() const { return mMidnaMsgNum; } u32 getStartEvent() { return fopAcM_GetParam(this) >> 0x18; } const daAlink_AnmData* getAnmData(daAlink_ANM anmID) const { return &m_anmDataTable[anmID]; } const daAlink_FaceTexData* getFaceTexData(daAlink_FTANM i_anmID) const { return &m_faceTexDataTable[i_anmID]; } - BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; } + BOOL checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; } int getGrassHowlEventActor() const { return field_0x3198; } MtxP getShieldMtx() const { return mShieldModel->getBaseTRMtx(); } @@ -3273,7 +3264,7 @@ class daAlink_c : public daPy_py_c { if (!var_r3) { bool var_r3_2 = 0; - if (mProcID != PROC_FISHING_CAST && i_checkNoResetFlg2(FLG2_UNK_20000000)) { + if (mProcID != PROC_FISHING_CAST && checkNoResetFlg2(FLG2_UNK_20000000)) { var_r3_2 = 1; } @@ -3287,7 +3278,7 @@ class daAlink_c : public daPy_py_c { MtxP getCopyRodMtx() { if (mHeldItemModel != NULL) { - return mHeldItemModel->i_getAnmMtx(0); + return mHeldItemModel->getAnmMtx(0); } return NULL; } @@ -3298,7 +3289,7 @@ class daAlink_c : public daPy_py_c { void clearIronBallActor() { field_0x173c.SetActor(this); } BOOL checkCanoeRideOwn(const fopAc_ac_c* param_0) const { return checkCanoeRide() && mRideAcKeep.getActorConst() == param_0; } - bool checkWolfDashMode() const { return i_checkNoResetFlg1(FLG1_DASH_MODE); } + bool checkWolfDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); } bool checkWolfLieWaterIn() const { return mWaterY > current.pos.y + 20.5f; } J3DModel* initModel(J3DModelData* p_modelData, u32 param_1) { @@ -3317,9 +3308,9 @@ class daAlink_c : public daPy_py_c { bool checkHorseGetOffMode() const { return mProcID == PROC_HORSE_GETOFF; } bool checkHorseRideOn() const { return mProcID == PROC_HORSE_RIDE; } - BOOL i_checkRideOn() const { return mRideStatus != 0; } + BOOL checkRideOn() const { return mRideStatus != 0; } - bool checkSwimDashMode() const { return i_checkNoResetFlg1(FLG1_DASH_MODE); } + bool checkSwimDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); } bool talkTrigger() const { return mItemTrigger & BTN_A; } J3DAnmTransform* getNowAnmPackUnder(daAlink_UNDER i_idx) { @@ -3399,7 +3390,6 @@ class daAlink_c : public daPy_py_c { static u8 m_fEffParamProc[72]; -private: /* 0x0062C */ request_of_phase_process_class mPhaseReq; /* 0x00634 */ char* mArcName; /* 0x00638 */ JKRExpHeap* field_0x0638; @@ -6250,7 +6240,7 @@ class daAlinkHIO_hookshot_c0 { }; inline BOOL dComIfGs_isTransformLV(int i_no); -inline BOOL i_dComIfGs_isEventBit(const u16); +inline BOOL dComIfGs_isEventBit(const u16); static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* param_0, void* param_1); static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* param_0, void* param_1); diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 0f5d05366ef..4c3e6ac0168 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -143,8 +143,6 @@ class daPy_demo_c { DEMO_NEW_ANM0_e = 0x200, }; - void setSpecialDemoType(); - void setDemoType(u16 pType) { mDemoType = pType; } int getDemoType() const { return mDemoType; } void setDemoMode(u32 mode) { mDemoMode = mode; } @@ -152,7 +150,7 @@ class daPy_demo_c { int getParam1() const { return mParam1; } s16 getParam2() const { return mParam2; } void setOriginalDemoType() { setDemoType(3); } - void i_setSpecialDemoType() { setDemoType(5); } + void setSpecialDemoType() { setDemoType(5); } void setSystemDemoType() { setDemoType(2); } void setStick(f32 stick) { mStick = stick; } void setMoveAngle(s16 angle) { mDemoMoveAngle = angle; } @@ -186,7 +184,7 @@ class daMidna_c; class daSpinner_c; class daPy_py_c; inline daPy_py_c* dComIfGp_getLinkPlayer(); -inline BOOL i_dComIfGs_isEventBit(const u16); +inline BOOL dComIfGs_isEventBit(const u16); class daPy_py_c : public fopAc_ac_c { public: @@ -231,6 +229,7 @@ class daPy_py_c : public fopAc_ac_c { FLG0_UNK_80000 = 0x80000, FLG0_UNK_40000 = 0x40000, FLG0_UNK_20000 = 0x20000, + FLG0_UNK_10000 = 0x10000, FLG0_UNK_8000 = 0x8000, FLG0_UNK_4000 = 0x4000, FLG0_UNK_2000 = 0x2000, @@ -260,6 +259,7 @@ class daPy_py_c : public fopAc_ac_c { FLG1_IS_WOLF = 0x2000000, FLG1_UNK_800000 = 0x800000, FLG1_DASH_MODE = 0x400000, + FLG1_UNK_100000 = 0x100000, FLG1_UNK_10000 = 0x10000, FLG1_UNK_8000 = 0x8000, FLG1_THROW_DAMAGE = 0x4000, @@ -276,6 +276,7 @@ class daPy_py_c : public fopAc_ac_c { FLG1_UNK_1 = 1, FLG1_UNK_1800 = 0x1800, + FLG1_UNK_10100000 = FLG1_UNK_10000000 | FLG1_UNK_100000, }; enum daPy_FLG2 { @@ -310,6 +311,7 @@ class daPy_py_c : public fopAc_ac_c { FLG2_UNK_1 = 1, FLG2_UNK_58 = FLG2_UNK_40 | FLG2_UNK_10 | FLG2_UNK_8, + FLG2_UNK_10000001 = FLG2_UNK_10000000 | FLG2_UNK_1, }; enum daPy_FLG3 { @@ -391,6 +393,7 @@ class daPy_py_c : public fopAc_ac_c { ERFLG2_UNK_100 = 0x100, ERFLG2_UNK_40 = 0x40, ERFLG2_UNK_20 = 0x20, + ERFLG2_UNK_10 = 0x10, ERFLG2_UNK_2 = 2, }; @@ -420,6 +423,7 @@ class daPy_py_c : public fopAc_ac_c { enum daPy_RFLG1 { RFLG1_UNK_100 = 0x100, + RFLG1_UNK_40 = 0x40, RFLG1_UNK_30 = 0x30, RFLG1_UNK_2 = 0x2, RFLG1_WOLF_ATTACK_REVERSE = 0x1, @@ -518,41 +522,19 @@ class daPy_py_c : public fopAc_ac_c { static void setPlayerDamage(int, int); static void setMidnaMotionNum(int); static void setMidnaFaceNum(int); - u32 checkNoResetFlg0(daPy_FLG0) const; - u32 checkEquipHeavyBoots() const; - u32 checkBoarSingleBattle() const; - u32 checkEndResetFlg0(daPy_ERFLG0) const; - void onNoResetFlg2(daPy_py_c::daPy_FLG2); - void offNoResetFlg0(daPy_py_c::daPy_FLG0); - int checkEndResetFlg2(daPy_py_c::daPy_ERFLG2) const; - bool getSumouMode() const; - int checkNoResetFlg3(daPy_py_c::daPy_FLG3) const; BOOL checkShieldGet(); - void onNoResetFlg0(daPy_py_c::daPy_FLG0); - u32 checkEndResetFlg1(daPy_py_c::daPy_ERFLG1) const; - void offNoResetFlg1(daPy_py_c::daPy_FLG1); - void offNoResetFlg2(daPy_py_c::daPy_FLG2); - u32 checkWolf() const; BOOL checkSwordGet(); - u32 checkResetFlg0(daPy_py_c::daPy_RFLG0) const; - u32 checkNoResetFlg2(daPy_py_c::daPy_FLG2) const; - u32 checkMagneBootsOn() const; - void changeDemoPos0(cXyz const*); - void changeDemoMode(u32, int, int, s16); void changeDemoParam2(s16); - void cancelOriginalDemo(); - void changeOriginalDemo(); cXyz getHeadTopPos() const; - /* 801829E0 */ BOOL checkThrowDamage() const { return i_checkNoResetFlg1(FLG1_THROW_DAMAGE); } - /* 80182A10 */ BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; } - /* 80182AAC */ cXyz* getRightFootPosP() { return &mRightFootPos; } - /* 80182AB4 */ cXyz* getLeftFootPosP() { return &mLeftFootPos; } - /* 80182AC4 */ BOOL checkCopyRodThrowAfter() const { return i_checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); } - /* 80182AD8 */ BOOL checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); } - /* 80182B9C */ const cXyz& getRightHandPos() const { return mRightHandPos; } - /* 8015DFD8 */ const cXyz* getItemPos() const { return &mItemPos; } - /* 8015DFF4 */ const cXyz* getLeftHandPos() const { return &mLeftHandPos; } - /* 800977B4 */ bool checkMidnaRide() const; + BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); } + BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; } + cXyz* getRightFootPosP() { return &mRightFootPos; } + cXyz* getLeftFootPosP() { return &mLeftFootPos; } + BOOL checkCopyRodThrowAfter() const { return checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); } + BOOL checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); } + const cXyz& getRightHandPos() const { return mRightHandPos; } + const cXyz* getItemPos() const { return &mItemPos; } + const cXyz* getLeftHandPos() const { return &mLeftHandPos; } virtual cXyz* getMidnaAtnPos() const; virtual void setMidnaMsgNum(fopAc_ac_c*, u16); @@ -734,39 +716,38 @@ class daPy_py_c : public fopAc_ac_c { return sumouCameraMode; } - bool i_getSumouMode() const { return getSumouCameraMode(); } - void i_cancelOriginalDemo() { + bool getSumouMode() const { return getSumouCameraMode(); } + void cancelOriginalDemo() { mDemo.setSystemDemoType(); mDemo.setDemoMode(1); } - bool checkStatusWindowDraw() { return i_checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); } + bool checkStatusWindowDraw() { return checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); } bool checkCargoCarry() const { return mSpecialMode == SMODE_CARGO_CARRY; } - bool getHeavyStateAndBoots() { return i_checkNoResetFlg0(FLG0_HVY_STATE); } - bool checkEnemyAttentionLock() const { return i_checkResetFlg0(RFLG0_ENEMY_ATTN_LOCK); } + bool getHeavyStateAndBoots() { return checkNoResetFlg0(FLG0_HVY_STATE); } + bool checkEnemyAttentionLock() const { return checkResetFlg0(RFLG0_ENEMY_ATTN_LOCK); } bool checkCanoeSlider() const { return mSpecialMode == 0x2D; } bool checkGoatStopGame() const { return mSpecialMode == 0x2A; } - bool i_checkGoronSideMove() const { return mSpecialMode == 0x2B; } u8 getCutType() const { return mCutType; } u16 getSwordAtUpTime() const { return mSwordUpTimer; } s16 getDamageWaitTimer() const { return mDamageTimer; } - bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); } - bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); } - bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); } + bool checkWaterInMove() const { return checkNoResetFlg0(FLG0_UNDERWATER); } + bool checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCN_CHG_START); } + bool checkFrontRollCrash() const { return checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); } bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); } - bool checkFreezeDamage() const { return i_checkNoResetFlg1(FLG1_UNK_40000000); } - bool checkWolfTagLockJumpReady() const { return i_checkResetFlg0(RFLG0_UNK_20000); } - bool getGrabUpEnd() const { return i_checkResetFlg0(RFLG0_GRAB_UP_END); } - bool getGrabPutStart() const { return i_checkResetFlg0(RFLG0_GRAB_PUT_START); } - - void onBossRoomWait() { i_onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); } - void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); } - void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); } - void onNotHang() { i_onEndResetFlg0(ERFLG0_NOT_HANG); } - void onShieldBackBone() { i_onEndResetFlg1(ERFLG1_GANON_FINISH); } - void onWolfEyeKeep() { i_onEndResetFlg1(ERFLG1_WOLF_EYE_KEEP); } - void onFogFade() { i_onNoResetFlg2(FLG2_UNK_4000); } - BOOL checkStickArrowReset() const { return i_checkResetFlg0(RFLG0_UNK_1); } + bool checkFreezeDamage() const { return checkNoResetFlg1(FLG1_UNK_40000000); } + bool checkWolfTagLockJumpReady() const { return checkResetFlg0(RFLG0_UNK_20000); } + bool getGrabUpEnd() const { return checkResetFlg0(RFLG0_GRAB_UP_END); } + bool getGrabPutStart() const { return checkResetFlg0(RFLG0_GRAB_PUT_START); } + + void onBossRoomWait() { onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); } + void onForceAutoJump() { onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); } + void onNotAutoJump() { onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); } + void onNotHang() { onEndResetFlg0(ERFLG0_NOT_HANG); } + void onShieldBackBone() { onEndResetFlg1(ERFLG1_GANON_FINISH); } + void onWolfEyeKeep() { onEndResetFlg1(ERFLG1_WOLF_EYE_KEEP); } + void onFogFade() { onNoResetFlg2(FLG2_UNK_4000); } + BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_UNK_1); } void offCargoCarry() { if (checkCargoCarry()) { @@ -775,7 +756,7 @@ class daPy_py_c : public fopAc_ac_c { } void offGoronSideMove() { - if (i_checkGoronSideMove()) { + if (checkGoronSideMove()) { mSpecialMode = 0; } } @@ -785,71 +766,67 @@ class daPy_py_c : public fopAc_ac_c { BOOL checkMidnaWarp() const { return 0; } - // some functions use these function as an inline - // is there a better way to handle this? - u32 i_checkNoResetFlg0(daPy_FLG0 i_flag) const { return mNoResetFlg0 & i_flag; } - u32 i_checkNoResetFlg1(daPy_FLG1 i_flag) const { return mNoResetFlg1 & i_flag; } - u32 i_checkNoResetFlg2(daPy_FLG2 i_flag) const { return mNoResetFlg2 & i_flag; } - u32 i_checkNoResetFlg3(daPy_FLG3 i_flag) const { return mNoResetFlg3 & i_flag; } + u32 checkNoResetFlg0(daPy_FLG0 i_flag) const { return mNoResetFlg0 & i_flag; } + u32 checkNoResetFlg1(daPy_FLG1 i_flag) const { return mNoResetFlg1 & i_flag; } + u32 checkNoResetFlg2(daPy_FLG2 i_flag) const { return mNoResetFlg2 & i_flag; } + u32 checkNoResetFlg3(daPy_FLG3 i_flag) const { return mNoResetFlg3 & i_flag; } - void i_onNoResetFlg0(int i_flag) { mNoResetFlg0 |= i_flag; } - void i_onNoResetFlg1(int i_flag) { mNoResetFlg1 |= i_flag; } - void i_onNoResetFlg2(int i_flag) { mNoResetFlg2 |= i_flag; } - void i_onNoResetFlg3(int i_flag) { mNoResetFlg3 |= i_flag; } + void onNoResetFlg0(daPy_FLG0 i_flag) { mNoResetFlg0 |= i_flag; } + void onNoResetFlg1(daPy_FLG1 i_flag) { mNoResetFlg1 |= i_flag; } + void onNoResetFlg2(daPy_FLG2 i_flag) { mNoResetFlg2 |= i_flag; } + void onNoResetFlg3(daPy_FLG3 i_flag) { mNoResetFlg3 |= i_flag; } - void i_offNoResetFlg0(int i_flag) { mNoResetFlg0 &= ~i_flag; } - void i_offNoResetFlg1(int i_flag) { mNoResetFlg1 &= ~i_flag; } - void i_offNoResetFlg2(int i_flag) { mNoResetFlg2 &= ~i_flag; } - void i_offNoResetFlg3(int i_flag) { mNoResetFlg3 &= ~i_flag; } + void offNoResetFlg0(daPy_FLG0 i_flag) { mNoResetFlg0 &= ~i_flag; } + void offNoResetFlg1(daPy_FLG1 i_flag) { mNoResetFlg1 &= ~i_flag; } + void offNoResetFlg2(daPy_FLG2 i_flag) { mNoResetFlg2 &= ~i_flag; } + void offNoResetFlg3(daPy_FLG3 i_flag) { mNoResetFlg3 &= ~i_flag; } - void i_offResetFlg0(int flag) { mResetFlg0 &= ~flag; } - void i_offResetFlg1(int flag) { mResetFlg1 &= ~flag; } - void i_onResetFlg0(int flag) { mResetFlg0 |= flag; } - void i_onResetFlg1(int flag) { mResetFlg1 |= flag; } + void offResetFlg0(daPy_RFLG0 flag) { mResetFlg0 &= ~flag; } + void offResetFlg1(daPy_RFLG1 flag) { mResetFlg1 &= ~flag; } + void onResetFlg0(daPy_RFLG0 flag) { mResetFlg0 |= flag; } + void onResetFlg1(daPy_RFLG1 flag) { mResetFlg1 |= flag; } - void i_onEndResetFlg0(int i_flag) { mEndResetFlg0 |= i_flag; } - void i_onEndResetFlg2(int i_flag) { mEndResetFlg2 |= i_flag; } - void i_offEndResetFlg2(daPy_ERFLG2 i_flag) { mEndResetFlg2 &= ~i_flag; } + void onEndResetFlg0(daPy_ERFLG0 i_flag) { mEndResetFlg0 |= i_flag; } + void onEndResetFlg2(daPy_ERFLG2 i_flag) { mEndResetFlg2 |= i_flag; } + void offEndResetFlg2(daPy_ERFLG2 i_flag) { mEndResetFlg2 &= ~i_flag; } - u32 i_checkResetFlg0(daPy_py_c::daPy_RFLG0 i_flag) const { return mResetFlg0 & i_flag; } - u32 checkResetFlg1(daPy_py_c::daPy_RFLG1 i_flag) const { return mResetFlg1 & i_flag; } + u32 checkResetFlg0(daPy_RFLG0 i_flag) const { return mResetFlg0 & i_flag; } + u32 checkResetFlg1(daPy_RFLG1 i_flag) const { return mResetFlg1 & i_flag; } - u32 i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 i_flag) const { return mEndResetFlg0 & i_flag; } - u32 i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 i_flag) const { return mEndResetFlg1 & i_flag; } - u32 i_checkEndResetFlg2(daPy_py_c::daPy_ERFLG2 i_flag) const { return mEndResetFlg2 & i_flag; } + u32 checkEndResetFlg0(daPy_ERFLG0 i_flag) const { return mEndResetFlg0 & i_flag; } + u32 checkEndResetFlg1(daPy_ERFLG1 i_flag) const { return mEndResetFlg1 & i_flag; } + u32 checkEndResetFlg2(daPy_ERFLG2 i_flag) const { return mEndResetFlg2 & i_flag; } - void i_onEndResetFlg1(daPy_ERFLG1 i_flag) { mEndResetFlg1 |= i_flag; } + void onEndResetFlg1(daPy_ERFLG1 i_flag) { mEndResetFlg1 |= i_flag; } cXyz* getLeftHandPosP() { return &mLeftHandPos; } cXyz* getRightHandPosP() { return &mRightHandPos; } - cXyz* i_getLeftFootPosP() { return &mLeftFootPos; } - cXyz* i_getRightFootPosP() { return &mRightFootPos; } - - u32 i_checkWolf() const { return i_checkNoResetFlg1(FLG1_IS_WOLF); } - BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); } - BOOL i_checkMagneBootsOn() const { return i_checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); } - bool i_checkMidnaRide() const { return i_checkNoResetFlg0(FLG0_MIDNA_RIDE); } - void i_onPlayerNoDraw() { i_onNoResetFlg0(FLG0_PLAYER_NO_DRAW); } - void i_offPlayerNoDraw() { i_offNoResetFlg0(FLG0_PLAYER_NO_DRAW); } - void i_onPushPullKeep() { i_onNoResetFlg0(FLG0_PUSH_PULL_KEEP); } - void i_offPushPullKeep() { i_offNoResetFlg0(FLG0_PUSH_PULL_KEEP); } - void onLightSwordGetEffect() { i_onEndResetFlg2(FLG2_UNK_10); } - - u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } - - void i_changeOriginalDemo() { + + u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); } + BOOL checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); } + BOOL checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); } + bool checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); } + void onPlayerNoDraw() { onNoResetFlg0(FLG0_PLAYER_NO_DRAW); } + void offPlayerNoDraw() { offNoResetFlg0(FLG0_PLAYER_NO_DRAW); } + void onPushPullKeep() { onNoResetFlg0(FLG0_PUSH_PULL_KEEP); } + void offPushPullKeep() { offNoResetFlg0(FLG0_PUSH_PULL_KEEP); } + void onLightSwordGetEffect() { onEndResetFlg2(ERFLG2_UNK_10); } + + u32 checkBoarSingleBattle() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } + + void changeOriginalDemo() { mDemo.setOriginalDemoType(); mDemo.setParam0(0); } - void i_changeDemoMode(u32 i_demoMode, int i_param0, int i_param1, s16 i_param2) { + void changeDemoMode(u32 i_demoMode, int i_param0, int i_param1, s16 i_param2) { mDemo.setDemoMode(i_demoMode); mDemo.setParam0(i_param0); mDemo.setParam1(i_param1); mDemo.setParam2(i_param2); } - void i_changeDemoPos0(const cXyz* i_posP) { mDemo.setPos0(i_posP); } + void changeDemoPos0(const cXyz* i_posP) { mDemo.setPos0(i_posP); } void changeDemoMoveAngle(s16 i_angle) { mDemo.setMoveAngle(i_angle); } @@ -860,10 +837,10 @@ class daPy_py_c : public fopAc_ac_c { inline BOOL i_checkSwordGet(); inline bool i_checkShieldGet() const; inline static BOOL checkNowWolf(); - inline static BOOL i_checkNowWolf() { return dComIfGp_getLinkPlayer()->i_checkWolf(); } + inline static BOOL i_checkNowWolf() { return dComIfGp_getLinkPlayer()->checkWolf(); } inline bool checkZoraWearFlg() const; inline bool checkMagicArmorWearFlg() const; - inline static BOOL i_checkFirstMidnaDemo() { return i_dComIfGs_isEventBit(0xc10); } + inline static BOOL i_checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); } static int checkNowWolfPowerUp() { return checkNowWolfEyeUp(); } static daMidna_c* getMidnaActor() { return m_midnaActor; } @@ -872,7 +849,7 @@ class daPy_py_c : public fopAc_ac_c { // static void onWolfEnemyCatch(fopAc_ac_c* i_actorP) { onWolfEnemyBiteAll(i_actorP,8);} bool checkWolfEnemyCatchOwn(fopAc_ac_c* i_actorP) { return checkWolfEnemyBiteAllOwn(i_actorP); } - bool checkWolfEnemyLeftThrow() const { return i_checkNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); } + bool checkWolfEnemyLeftThrow() const { return checkNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); } static daMidna_c* m_midnaActor; }; diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 8a7cd35942e..1f37bf0757b 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -981,10 +981,6 @@ void dComIfGs_onStageSwitch(int i_stageNo, int i_no); void dComIfGs_offStageSwitch(int i_stageNo, int i_no); void dComIfGs_PolyDamageOff_Set(s8 param_0); u8 dComIfGs_staffroll_next_go_check(); -BOOL dComIfGs_isEventBit(u16 i_flag); -int dComIfGs_isItemFirstBit(u8 i_no); -u16 dComIfGs_getRupee(); -static u16 dComIfGs_getLife(); s8 dComIfGs_BossLife_public_Get(); u8 dComIfGs_checkGetInsectNum(); u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx); @@ -993,11 +989,11 @@ inline void dComIfGs_init() { g_dComIfG_gameInfo.info.init(); } -inline int i_dComIfGs_isItemFirstBit(u8 i_no) { +inline int dComIfGs_isItemFirstBit(u8 i_no) { return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no); } -inline u16 i_dComIfGs_getRupee() { +inline u16 dComIfGs_getRupee() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getRupee(); } @@ -1124,7 +1120,7 @@ inline void dComIfGs_onEventBit(u16 i_flag) { // debug rom says `i_flag` is not const, but it's needed to match in some places? // missing some other inline maybe? -inline BOOL i_dComIfGs_isEventBit(const u16 i_flag) { +inline BOOL dComIfGs_isEventBit(const u16 i_flag) { return g_dComIfG_gameInfo.info.getEvent().isEventBit(i_flag); } @@ -1221,7 +1217,7 @@ inline u16 dComIfGs_getMaxLife() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMaxLife(); } -inline u16 i_dComIfGs_getLife() { +inline u16 dComIfGs_getLife() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife(); } @@ -1691,7 +1687,7 @@ inline u8 dComIfGs_getTmpReg(u16 i_reg) { return g_dComIfG_gameInfo.info.getTmp().getEventReg(i_reg); } -inline u8 i_dComIfGs_getEventReg(u16 reg) { +inline u8 dComIfGs_getEventReg(u16 reg) { return g_dComIfG_gameInfo.info.getEvent().getEventReg(reg); } @@ -1890,23 +1886,6 @@ JKRExpHeap* dComIfGp_getSubHeap2D(int flag); void dComIfGp_world_dark_set(u8); u8 dComIfGp_getNowLevel(); void dComIfGp_calcNowRegion(); -daHorse_c* dComIfGp_getHorseActor(); -static BOOL dComIfGp_event_runCheck(); -static s32 dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2); -static u16 dComIfGp_event_chkEventFlag(u16 flag); -static s8 dComIfGp_getPlayerCameraID(int idx); -static dEvent_manager_c& dComIfGp_getEventManager(); -static u32 dComIfGp_checkPlayerStatus0(int param_0, u32 param_1); -static u32 dComIfGp_checkPlayerStatus1(int param_0, u32 param_1); -static dEvt_control_c& dComIfGp_getEvent(); -static bool dComIfGp_evmng_startCheck(char const* param_0); -static dStage_stageDt_c* dComIfGp_getStage(); -void dComIfGp_setItemLifeCount(f32 amount, u8 type); -void dComIfGp_setItemRupeeCount(s32 param_0); -static u8 dComIfGp_getDoStatus(); -static u8 dComIfGp_getRStatus(); -static dAttCatch_c* dComIfGp_att_getCatghTarget(); -static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1); bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle); void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num); bool dComIfGp_isLightDropMapVisible(); @@ -1919,19 +1898,19 @@ inline void dComIfGp_init() { g_dComIfG_gameInfo.play.init(); } -inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) { +inline bool dComIfGp_checkPlayerStatus0(int param_0, u32 flag) { return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag); } -inline bool i_dComIfGp_checkPlayerStatus1(int param_0, u32 flag) { +inline bool dComIfGp_checkPlayerStatus1(int param_0, u32 flag) { return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag); } -inline void i_dComIfGp_setItemLifeCount(float amount, u8 type) { +inline void dComIfGp_setItemLifeCount(float amount, u8 type) { g_dComIfG_gameInfo.play.setItemLifeCount(amount, type); } -inline void i_dComIfGp_setItemRupeeCount(int amount) { +inline void dComIfGp_setItemRupeeCount(int amount) { g_dComIfG_gameInfo.play.setItemRupeeCount(amount); } @@ -1951,7 +1930,7 @@ inline u8 dComIfGp_att_getCatchChgItem() { return dComIfGp_getAttention().getCatchChgItem(); } -inline fopAc_ac_c* i_dComIfGp_att_getCatghTarget() { +inline fopAc_ac_c* dComIfGp_att_getCatghTarget() { return dComIfGp_getAttention().getCatghTarget(); } @@ -1987,11 +1966,11 @@ inline fopAc_ac_c* dComIfGp_getPlayer(int idx) { return g_dComIfG_gameInfo.play.getPlayer(idx); } -inline int i_dComIfGp_getPlayerCameraID(int idx) { +inline int dComIfGp_getPlayerCameraID(int idx) { return g_dComIfG_gameInfo.play.getPlayerCameraID(idx); } -inline daHorse_c* i_dComIfGp_getHorseActor() { +inline daHorse_c* dComIfGp_getHorseActor() { return (daHorse_c*)g_dComIfG_gameInfo.play.getPlayerPtr(1); } @@ -2628,7 +2607,7 @@ inline void dComIfGp_clearPlayerStatus1(int param_0, u32 flag) { g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 1, flag); } -inline dStage_stageDt_c* i_dComIfGp_getStage() { +inline dStage_stageDt_c* dComIfGp_getStage() { return &g_dComIfG_gameInfo.play.getStage(); } @@ -3003,7 +2982,7 @@ inline void dComIfGp_deleteSimpleModel() { g_dComIfG_gameInfo.play.deleteSimpleModel(); } -inline void i_dComIfGp_setHitMark(u16 i_hitmark, fopAc_ac_c* param_1, const cXyz* param_2, +inline void dComIfGp_setHitMark(u16 i_hitmark, fopAc_ac_c* param_1, const cXyz* param_2, const csXyz* param_3, const cXyz* param_4, u32 i_atType) { g_dComIfG_gameInfo.play.getParticle()->setHitMark(i_hitmark, param_1, param_2, param_3, param_4, i_atType); @@ -3108,11 +3087,11 @@ inline void dComIfGp_roomControl_zoneCountCheck(int i_roomNo) { g_dComIfG_gameInfo.play.mRoomControl.zoneCountCheck(i_roomNo); } -inline u8 i_dComIfGp_getRStatus() { +inline u8 dComIfGp_getRStatus() { return g_dComIfG_gameInfo.play.getRStatus(); } -inline void i_dComIfGp_setBottleStatus(u8 param_0, u8 param_1) { +inline void dComIfGp_setBottleStatus(u8 param_0, u8 param_1) { g_dComIfG_gameInfo.play.setBottleStatus(param_0, param_1); } @@ -3120,7 +3099,7 @@ inline void dComIfGp_setBottleStatusForce(u8 param_0, u8 param_1) { g_dComIfG_gameInfo.play.setBottleStatusForce(param_0, param_1); } -inline u8 i_dComIfGp_getDoStatus() { +inline u8 dComIfGp_getDoStatus() { return g_dComIfG_gameInfo.play.getDoStatus(); } @@ -3128,11 +3107,11 @@ inline u8 dComIfGp_getAdvanceDirection() { return g_dComIfG_gameInfo.play.getDirection(); } -inline dEvt_control_c& i_dComIfGp_getEvent() { +inline dEvt_control_c& dComIfGp_getEvent() { return g_dComIfG_gameInfo.play.getEvent(); } -inline dEvent_manager_c& i_dComIfGp_getEventManager() { +inline dEvent_manager_c& dComIfGp_getEventManager() { return g_dComIfG_gameInfo.play.getEvtManager(); } @@ -3170,11 +3149,11 @@ inline void dComIfGp_event_setGtItm(int i_itemNo) { g_dComIfG_gameInfo.play.getEvent().setGtItm(i_itemNo); } -inline void i_dComIfGp_event_reset() { +inline void dComIfGp_event_reset() { g_dComIfG_gameInfo.play.getEvent().reset(); } -inline void i_dComIfGp_event_remove() { +inline void dComIfGp_event_remove() { g_dComIfG_gameInfo.play.getEvent().remove(); } @@ -3194,7 +3173,7 @@ inline cXyz* dComIfGp_evmng_getGoal() { return dComIfGp_getPEvtManager()->getGoal(); } -inline BOOL i_dComIfGp_evmng_startCheck(char const* i_event) { +inline BOOL dComIfGp_evmng_startCheck(char const* i_event) { return g_dComIfG_gameInfo.play.getEvtManager().startCheckOld(i_event); } @@ -3250,7 +3229,7 @@ inline fopAc_ac_c* dComIfGp_event_getPt2() { return g_dComIfG_gameInfo.play.getEvent().convPId(pt2); } -inline BOOL i_dComIfGp_event_runCheck() { +inline BOOL dComIfGp_event_runCheck() { return g_dComIfG_gameInfo.play.getEvent().runCheck(); } @@ -3259,13 +3238,13 @@ inline f32 dComIfGp_event_getCullRate() { } inline u16 dComIfGp_event_checkHind(u16 flag) { - if (!i_dComIfGp_event_runCheck()) { + if (!dComIfGp_event_runCheck()) { return false; } return g_dComIfG_gameInfo.play.getEvent().checkHind(flag); } -inline u16 i_dComIfGp_event_chkEventFlag(u16 flag) { +inline u16 dComIfGp_event_chkEventFlag(u16 flag) { return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(flag); } @@ -3281,7 +3260,7 @@ inline u8 dComIfGp_event_getMode() { return g_dComIfG_gameInfo.play.getEvent().getMode(); } -inline int i_dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2) { +inline int dComIfGp_evmng_getMyStaffId(const char* pName, fopAc_ac_c* pActor, int param_2) { return dComIfGp_getPEvtManager()->getMyStaffId(pName, pActor, param_2); } diff --git a/include/d/d_stage.h b/include/d/d_stage.h index e469243d41a..8da24f94ea8 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -761,6 +761,7 @@ extern s8 mOldStayNo__20dStage_roomControl_c; extern s8 mNextStayNo__20dStage_roomControl_c; extern s8 m_time_pass__20dStage_roomControl_c; extern u8 mNoChangeRoom__20dStage_roomControl_c; +extern s8 data_804505F0; // roomReadId class dStage_roomControl_c { public: diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index 6fae2842efa..8d55dd1dcef 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -138,9 +138,6 @@ class dEvt_control_c { void setPtI_Id(unsigned int id); void setPtD(void* ptr); void setGtItm(u8 itemNo); - BOOL isOrderOK(); - /* 807DFAD8 */ void checkSkipEdge(); - /* 807E2908 */ void startCheckSkipEdge(void*); u16 chkFlag2(u16 flag) { return flag & mFlag2; } BOOL runCheck() { return mEventStatus != 0; } @@ -158,15 +155,15 @@ class dEvt_control_c { void setCullRate(f32 f) { mCullRate = f; } BOOL chkTalkXY() { return field_0xed == 1 || field_0xed == 2; } - bool i_isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; } + bool isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; } fopAc_ac_c* getPt1() { return convPId(mPt1); } fopAc_ac_c* getPt2() { return convPId(mPt2); } fopAc_ac_c* getPtT() { return convPId(mPtT); } bool isChangeOK(void* param_0) { return mChangeOK == param_0; } u8 getPreItemNo() { return mPreItemNo; } u8 getGtItm() { return mGtItm; } - void i_startCheckSkipEdge(void* param_0) { setSkipProc(param_0, dEv_noFinishSkipProc, 0); } - bool i_checkSkipEdge() { return chkFlag2(8) != false; } + void startCheckSkipEdge(void* param_0) { setSkipProc(param_0, dEv_noFinishSkipProc, 0); } + bool checkSkipEdge() { return chkFlag2(8) != false; } public: /* 0x000 */ u8 field_0x0[4]; diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 91b9fd243ff..353dc8f8542 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -522,7 +522,7 @@ extern dScnKy_env_light_c g_env_light; STATIC_ASSERT(sizeof(dScnKy_env_light_c) == 4880); -inline dScnKy_env_light_c* i_dKy_getEnvlight() { +inline dScnKy_env_light_c* dKy_getEnvlight() { return &g_env_light; } diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 442f5428815..887f5427d2e 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -364,19 +364,19 @@ inline void dComIfGs_offSwitch(int i_no, int i_roomNo); inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo); inline void dComIfGs_offActor(int i_no, int i_roomNo); -inline void i_fopAcM_onSwitch(const fopAc_ac_c* pActor, int sw) { +inline void fopAcM_onSwitch(const fopAc_ac_c* pActor, int sw) { return dComIfGs_onSwitch(sw, fopAcM_GetHomeRoomNo(pActor)); } -inline void i_fopAcM_offSwitch(const fopAc_ac_c* pActor, int sw) { +inline void fopAcM_offSwitch(const fopAc_ac_c* pActor, int sw) { return dComIfGs_offSwitch(sw, fopAcM_GetHomeRoomNo(pActor)); } -inline BOOL i_fopAcM_isSwitch(const fopAc_ac_c* item, int sw) { +inline BOOL fopAcM_isSwitch(const fopAc_ac_c* item, int sw) { return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(item)); } -inline fopAc_ac_c* i_fopAcM_SearchByName(s16 proc_id) { +inline fopAc_ac_c* fopAcM_SearchByName(s16 proc_id) { return (fopAc_ac_c*)fopAcIt_Judge(fpcSch_JudgeForPName, &proc_id); } @@ -514,7 +514,6 @@ s32 fopAcM_orderTreasureEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16); fopAc_ac_c* fopAcM_getTalkEventPartner(const fopAc_ac_c*); fopAc_ac_c* fopAcM_getItemEventPartner(const fopAc_ac_c*); fopAc_ac_c* fopAcM_getEventPartner(const fopAc_ac_c*); -static void fopAcM_onSwitch(fopAc_ac_c const* param_0, int param_1); s32 fopAcM_createItemForPresentDemo(cXyz const* p_pos, int i_itemNo, u8 param_2, int i_itemBitNo, int i_roomNo, csXyz const* p_angle, cXyz const* p_scale); @@ -648,12 +647,12 @@ inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { s8 roomNo = fopAcM_GetRoomNo(actor); - i_mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo)); + mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo)); } inline void fopAcM_seStartCurrentLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { s8 roomNo = fopAcM_GetRoomNo(actor); - i_mDoAud_seStartLevel(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo)); + mDoAud_seStartLevel(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo)); } inline void fopAcM_offActor(fopAc_ac_c* pActor, u32 flag) { diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index dd446d30669..1e67869182b 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -43,9 +43,4 @@ s32 fpcBs_Delete(base_process_class* pProc); base_process_class* fpcBs_Create(s16 pProcTypeID, unsigned int pProcID, void* pData); s32 fpcBs_SubCreate(base_process_class* pProc); -extern "C" { -void fpcBs_MakeOfType__FPi(void); -void fpcBs_Is_JustOfType__Fii(void); -} - #endif diff --git a/include/f_pc/f_pc_executor.h b/include/f_pc/f_pc_executor.h index a987a5fadb4..6c15d163786 100644 --- a/include/f_pc/f_pc_executor.h +++ b/include/f_pc/f_pc_executor.h @@ -16,12 +16,4 @@ s32 fpcEx_Execute(base_process_class* pProc); s32 fpcEx_ToExecuteQ(base_process_class* pProc); void fpcEx_Handler(fpcLnIt_QueueFunc pFunc); -inline base_process_class* i_fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) { - return fpcEx_Search(pFunc, pUserData); -} - -extern "C" { -void fpcEx_IsExist__FUi(void); -} - #endif diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 00e2932174e..5081b75a0b3 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -6,6 +6,7 @@ #include "f_pc/f_pc_leaf.h" #include "f_pc/f_pc_node.h" #include "f_pc/f_pc_stdcreate_req.h" +#include "f_pc/f_pc_searcher.h" enum { fpcM_ERROR_PROCESS_ID_e = -1, @@ -70,13 +71,21 @@ inline void* fpcM_LyJudge(process_node_class* i_node, fpcLyIt_JudgeFunc i_func, return fpcLyIt_Judge(&i_node->mLayer, i_func, i_data); } +inline base_process_class* fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) { + return fpcEx_Search(pFunc, pUserData); +} + +inline base_process_class* fpcM_SearchByName(s16 name) { + return (base_process_class*)fpcLyIt_AllJudge(fpcSch_JudgeForPName, &name); +} + void fpcM_Draw(void* pProc); s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc); s32 fpcM_Execute(void* pProc); s32 fpcM_Delete(void* pProc); BOOL fpcM_IsCreating(unsigned int pID); void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2); -void fpcM_Init(void); +void fpcM_Init(); base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData); s32 fpcM_IsPause(void* pProc, u8 param_2); @@ -84,8 +93,4 @@ void fpcM_PauseEnable(void* pProc, u8 param_2); void fpcM_PauseDisable(void* pProc, u8 param_2); void* fpcM_JudgeInLayer(unsigned int pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData); -extern "C" { -void fpcM_Delete__FPv(void); -} - #endif diff --git a/include/f_pc/f_pc_priority.h b/include/f_pc/f_pc_priority.h index d1ed8f30086..d319d2420c3 100644 --- a/include/f_pc/f_pc_priority.h +++ b/include/f_pc/f_pc_priority.h @@ -33,6 +33,4 @@ s32 fpcPi_Handler(void); s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, unsigned int layer, u16 listID, u16 priority); -extern s8 data_804505F0; // roomReadId - #endif diff --git a/include/f_pc/f_pc_searcher.h b/include/f_pc/f_pc_searcher.h index 9d416236bce..4b078a7887f 100644 --- a/include/f_pc/f_pc_searcher.h +++ b/include/f_pc/f_pc_searcher.h @@ -8,12 +8,4 @@ void* fpcSch_JudgeForPName(void* pProc, void* pUserData); void* fpcSch_JudgeByID(void* pProc, void* pUserData); -extern "C" { -void fpcSch_JudgeForPName__FPvPv(void); -} - -inline base_process_class* i_fpcM_SearchByName(s16 name) { - return (base_process_class*)fpcLyIt_AllJudge(fpcSch_JudgeForPName, &name); -} - #endif diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index 0184402c7da..0753650c74c 100644 --- a/include/f_pc/f_pc_stdcreate_req.h +++ b/include/f_pc/f_pc_stdcreate_req.h @@ -27,8 +27,4 @@ s32 fpcSCtRq_Cancel(standard_create_request_class*); s32 fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5); -extern "C" { -void fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv(void); -} - #endif \ No newline at end of file diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h index 3898fe6db76..a40d331ef42 100644 --- a/include/m_Do/m_Do_Reset.h +++ b/include/m_Do/m_Do_Reset.h @@ -50,8 +50,7 @@ class mDoRst { static void on3ButtonReset() { mResetData->m3ButtonReset = 1; } static void onShutdown() { mResetData->mShutdown = true; } - static mDoRstData* getResetData(); - static mDoRstData* i_getResetData() { return mResetData; } + static mDoRstData* getResetData() { return mResetData; } static void setResetData(mDoRstData* rstData) { mResetData = rstData; } static mDoRstData* mResetData; diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 4010865adde..44513cac216 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -33,7 +33,6 @@ void mDoAud_setSceneName(char const* spot, s32 room, s32 layer); s32 mDoAud_load1stDynamicWave(); static void mDoAud_setLinkGroupInfo(u8 param_0); static void mDoAud_setLinkHp(s32 param_0, s32 param_1); -static void mDoAud_seStartLevel(u32 param_0, Vec const* param_1, u32 param_2, s8 param_3); void mDoAud_setFadeInStart(u8 param_0); void mDoAud_setFadeOutStart(u8 param_0); @@ -82,7 +81,7 @@ inline void mDoAud_seStart(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_re -1.0f, -1.0f, 0); } -inline void i_mDoAud_seStartLevel(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_reverb) { +inline void mDoAud_seStartLevel(u32 i_sfxID, const Vec* i_sePos, u32 param_2, s8 i_reverb) { Z2AudioMgr::getInterface()->seStartLevel(i_sfxID, i_sePos, param_2, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f, 0); } diff --git a/include/rel/d/a/d_a_horse/d_a_horse.h b/include/rel/d/a/d_a_horse/d_a_horse.h index 9836edfd1fa..b8a484dda22 100644 --- a/include/rel/d/a/d_a_horse/d_a_horse.h +++ b/include/rel/d/a/d_a_horse/d_a_horse.h @@ -66,9 +66,7 @@ class daHorse_c : public fopAc_ac_c { /* 807E27BC */ void cancelOriginalDemo(); /* 807E27F8 */ void onDemoJumpDistance(f32, f32); /* 807E28B8 */ void changeDemoPos0(cXyz const*); - /* 807E28D4 */ void changeDemoMode(u32, int); /* 807E28E0 */ void setHorsePosAndAngle(cXyz const*, s16); - /* 807E2964 */ void changeOriginalDemo(); /* 80838498 */ void coHitCallbackBoarJump(fopAc_ac_c*); /* 80838798 */ void coHitCallbackBoarHit(fopAc_ac_c*, dCcD_GObjInf*); /* 80838904 */ void coHitCallbackCowHit(fopAc_ac_c*); @@ -162,8 +160,8 @@ class daHorse_c : public fopAc_ac_c { f32 getLashMaxSpeedF() { return mLashMaxSpeedF; } void changeDemoMoveAngle(s16 angle) { mDemoMoveAngle = angle; } void setDemoStickR(f32 stick) { mDemoStickR = stick; } - void i_changeDemoMode(u32 param_0, int param_1) { field_0x1740 = param_0; field_0x1728 = param_1; } - void i_changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; } + void changeDemoMode(u32 param_0, int param_1) { field_0x1740 = param_0; field_0x1728 = param_1; } + void changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; } void i_setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*mpSetHorsePosAngleFn)(i_pos, i_angle); } void onRideFlg() { (this->*mpOnRideFlgFn)(); } void offRideFlg() { (this->*mpOffRideFlgFn)(); } @@ -172,8 +170,8 @@ class daHorse_c : public fopAc_ac_c { void onEndResetStateFlg0(daHorse_ERFLG0 i_flag) { mEndResetStateFlg0 |= i_flag;} void offNoDrawWait() { offStateFlg0(NO_DRAW_WAIT); } bool checkSpecialWallHit(const cXyz& param_0) { return (this->*mpCheckSpecialWallHitFn)(param_0); } - MtxP getSaddleMtx() { return field_0x570->i_getAnmMtx(21); } - MtxP getRootMtx() { return field_0x570->i_getAnmMtx(0); } + MtxP getSaddleMtx() { return field_0x570->getAnmMtx(21); } + MtxP getRootMtx() { return field_0x570->getAnmMtx(0); } f32 getAnmFrameMax(int i_idx) const { return field_0x5b0[i_idx].getEnd(); } f32 getAnmFrame(int i_idx) const { return field_0x5b0[i_idx].getFrame(); } s16 getAimNeckAngleY() const { return mAimNeckAngleY; } diff --git a/include/rel/d/a/d_a_midna/d_a_midna.h b/include/rel/d/a/d_a_midna/d_a_midna.h index 363d8790382..b989d836506 100644 --- a/include/rel/d/a/d_a_midna/d_a_midna.h +++ b/include/rel/d/a/d_a_midna/d_a_midna.h @@ -138,7 +138,7 @@ class daMidna_c : public fopAc_ac_c { } MtxP getMtxHairTop() { - return field_0x574->i_getAnmMtx(10); + return field_0x574->getAnmMtx(10); } bool checkReturnAnime() const { @@ -171,7 +171,7 @@ class daMidna_c : public fopAc_ac_c { inline static BOOL checkMidnaRealBody(); static bool i_checkMidnaTired() { - return dComIfGs_isTransformLV(3) && !i_dComIfGs_isEventBit(0x1E08); + return dComIfGs_isTransformLV(3) && !dComIfGs_isEventBit(0x1E08); } void resetRatBody() {} diff --git a/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h b/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h index 17db7837ef4..661268fedec 100644 --- a/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h +++ b/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h @@ -22,7 +22,7 @@ class e_wb_class : public fopEn_enemy_c { BOOL checkNormalRideMode() const; void setRunRideMode(); - MtxP getRideMtx() { return field_0x5e0->getModel()->i_getAnmMtx(15); } + MtxP getRideMtx() { return field_0x5e0->getModel()->getAnmMtx(15); } f32 nowAnimeFrame() const { return field_0x5e0->getFrame(); } s16 getWaitRollAngle() const { return mWaitRollAngle; } bool checkGetOff() const { return speedF < 3.0f; } diff --git a/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h b/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h index eecc40dbf17..b80250e32c8 100644 --- a/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h +++ b/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h @@ -5,7 +5,7 @@ class e_yc_class : public fopEn_enemy_c { public: - MtxP getLegR3Mtx() { return field_0x5B8->getModel()->i_getAnmMtx(28); } + MtxP getLegR3Mtx() { return field_0x5B8->getModel()->getAnmMtx(28); } /* 0x5AC */ u8 field_0x5ac[0x5B8 - 0x5AC]; /* 0x5B8 */ mDoExt_McaMorfSO* field_0x5B8; diff --git a/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h b/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h index c796bb9167c..47866d3aed9 100644 --- a/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h +++ b/include/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.h @@ -49,7 +49,7 @@ class dalv4CandleTag_c : public fopAc_ac_c { u8 getSwNG() { return fopAcM_GetParamBit(this, 0x10, 8); } u8 getSwTotal() { return fopAcM_GetParamBit(this, 0x18, 8); } int getEventID() { return shape_angle.x & 0xff; } - u8 getNGSwStat() { return i_fopAcM_isSwitch(this, mSwNG); } + u8 getNGSwStat() { return fopAcM_isSwitch(this, mSwNG); } /* 0x584 */ u8 mMode; /* 0x585 */ u8 mSwTop; diff --git a/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h b/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h index 5e8b7314ca1..6f6e3ae786e 100644 --- a/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h +++ b/include/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.h @@ -14,11 +14,11 @@ class obj_ystone_class : public fopAc_ac_c { field_0x598 = 1; if (mLevel < 3) { if (mpModel != NULL) { - mpModel->i_setBaseTRMtx(i_mtx); + mpModel->setBaseTRMtx(i_mtx); } } else { if (mpMorf != NULL) { - mpMorf->getModel()->i_setBaseTRMtx(i_mtx); + mpMorf->getModel()->setBaseTRMtx(i_mtx); } } } diff --git a/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h b/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h index 11abab9ea3a..10328f63e2e 100644 --- a/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h +++ b/include/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.h @@ -36,9 +36,9 @@ class daObjMirror6Pole_c : public fopAc_ac_c { void setAnmSpeed(f32 speed) { mpBck->setPlaySpeed(speed); } bool isSwitch() { - return i_fopAcM_isSwitch(this, getSwitchNo()) || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]); + return fopAcM_isSwitch(this, getSwitchNo()) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]); } void setAction(Mode_e i_action) { diff --git a/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h b/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h index 2ce20f0b600..7bed2744f6e 100644 --- a/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h +++ b/include/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.h @@ -23,9 +23,9 @@ class daObjMirrorSand_c : public fopAc_ac_c { void setAnmSpeed(f32 speed) { mpBck->setPlaySpeed(speed); } bool isSwitch() { - return i_fopAcM_isSwitch(this, getSwitchNo()) || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]); + return fopAcM_isSwitch(this, getSwitchNo()) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]); } /* 0x568 */ J3DModel* mpModel; diff --git a/include/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.h b/include/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.h index 7da50c0ec7a..cc52577f241 100644 --- a/include/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.h +++ b/include/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.h @@ -10,7 +10,7 @@ class daTagMwait_c : public fopAc_ac_c { /* 80D5C01C */ ~daTagMwait_c(); /* 80D5C0A8 */ int execute(); - bool checkEndMessage() {return i_fopAcM_isSwitch(this, mEnterSw); } + bool checkEndMessage() {return fopAcM_isSwitch(this, mEnterSw); } /* 0x568 */ u8 mOnSw; /* 0x569 */ u8 mEnterSw; 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 54e85b4c8b1..6fb55daf385 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 @@ -76,14 +76,14 @@ class daTagTheBHint_c : public fopAc_ac_c { } int execute() { - if (i_fopAcM_isSwitch(this,getSwitchNo())) { + if (fopAcM_isSwitch(this,getSwitchNo())) { fopAcM_delete(this); return 1; } else { f32 distance = fopAcM_searchPlayerDistanceXZ2(this); if (distance < field_0x568) { - daNpcTheB_c* the_b = (daNpcTheB_c*)i_fpcM_SearchByName(PROC_NPC_THEB); + daNpcTheB_c* the_b = (daNpcTheB_c*)fpcM_SearchByName(PROC_NPC_THEB); if (the_b) { s8 roomNo = getRoomNo(); diff --git a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp index 6cd22cdc44f..632adaf0c67 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp @@ -185,7 +185,7 @@ J3DJoint::J3DJoint() { /* 8032F254-8032F3F8 329B94 01A4+00 0/0 1/1 0/0 .text entryIn__8J3DJointFv */ void J3DJoint::entryIn() { - MtxP anmMtx = j3dSys.getModel()->i_getAnmMtx(mJntNo); + MtxP anmMtx = j3dSys.getModel()->getAnmMtx(mJntNo); j3dSys.getDrawBuffer(0)->setZMtx(anmMtx); j3dSys.getDrawBuffer(1)->setZMtx(anmMtx); for (J3DMaterial* mesh = mMesh; mesh != NULL;) { diff --git a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp index 90a387b42f9..135a29b185c 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp @@ -369,7 +369,7 @@ void J3DModel::calcMaterial() { } int jntNo = material->getJoint()->getJntNo(); - material->calc(i_getAnmMtx(jntNo)); + material->calc(getAnmMtx(jntNo)); } } @@ -384,7 +384,7 @@ void J3DModel::calcDiffTexMtx() { for (u16 i = 0; i < num; i++) { j3dSys.setMatPacket(getMatPacket(i)); J3DMaterial* materialNode = getModelData()->getMaterialNodePointer(i); - materialNode->calcDiffTexMtx(i_getAnmMtx(materialNode->getJoint()->getJntNo())); + materialNode->calcDiffTexMtx(getAnmMtx(materialNode->getJoint()->getJntNo())); } num = getModelData()->getShapeNum(); diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index 40583f4e505..998dadfc21a 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -243,7 +243,7 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS } if (rv == NULL) { - i_JKRFree(szpSpace); + JKRFree(szpSpace); return NULL; } else { changeGroupIdIfNeed(rv, id); @@ -358,9 +358,9 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32 *tsPtr = 0; decompSZS_subroutine(firstSrcData(), (u8*)dst); - i_JKRFree(szpBuf); + JKRFree(szpBuf); if (refBuf) { - i_JKRFree(refBuf); + JKRFree(refBuf); } DCStoreRangeNoSync(dst, *tsPtr); diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index 8bb19ff1352..698fe98dadb 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -133,7 +133,7 @@ JKRAramArchive::~JKRAramArchive() { } if (mExpandedSize != NULL) { - i_JKRFree(mExpandedSize); + JKRFree(mExpandedSize); mExpandedSize = NULL; } @@ -208,7 +208,7 @@ bool JKRAramArchive::open(s32 entryNum) { mExpandedSize = (s32*)JKRAllocFromHeap(mHeap, mArcInfoBlock->num_file_entries << 2, abs(alignment)); if (mExpandedSize == NULL) { - i_JKRFree(mArcInfoBlock); + JKRFree(mArcInfoBlock); mMountMode = 0; goto cleanup; } @@ -221,10 +221,10 @@ bool JKRAramArchive::open(s32 entryNum) { mMountDirection == MOUNT_DIRECTION_HEAD ? JKRAramHeap::HEAD : JKRAramHeap::TAIL); if (mBlock == NULL) { if (mArcInfoBlock) { - i_JKRFree(mArcInfoBlock); + JKRFree(mArcInfoBlock); } if (mExpandedSize) { - i_JKRFree(mExpandedSize); + JKRFree(mExpandedSize); } mMountMode = 0; } else { diff --git a/libs/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp index d58a87e91e8..55ca1266462 100644 --- a/libs/JSystem/JKernel/JKRAramStream.cpp +++ b/libs/JSystem/JKernel/JKRAramStream.cpp @@ -127,7 +127,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { } if (command->mAllocatedTransferBuffer) { - i_JKRFree(buffer); + JKRFree(buffer); command->mAllocatedTransferBuffer = false; } } diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp index 088dbd5e701..13f521026fd 100644 --- a/libs/JSystem/JKernel/JKRCompArchive.cpp +++ b/libs/JSystem/JKernel/JKRCompArchive.cpp @@ -49,7 +49,7 @@ JKRCompArchive::~JKRCompArchive() { } if (mExpandedSize != NULL) { - i_JKRFree(mExpandedSize); + JKRFree(mExpandedSize); mExpandedSize = NULL; } diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp index 85884106300..9dea8fad707 100644 --- a/libs/JSystem/JKernel/JKRDvdArchive.cpp +++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp @@ -40,7 +40,7 @@ JKRDvdArchive::~JKRDvdArchive() { } if (mExpandedSize) { - i_JKRFree(mExpandedSize); + JKRFree(mExpandedSize); mExpandedSize = NULL; } diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp index 27404035924..1a7d5a88ec9 100644 --- a/libs/JSystem/JKernel/JKRDvdRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp @@ -134,7 +134,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch { if (hasAllocated == true) { - i_JKRFree(dst); + JKRFree(dst); return NULL; } } @@ -172,7 +172,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch { if (hasAllocated == true) { - i_JKRFree(dst); + JKRFree(dst); } return NULL; } @@ -196,7 +196,7 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch if (readBytes == -3 || !errorRetry) { if (hasAllocated == true) - i_JKRFree(dst); + JKRFree(dst); return NULL; } VIWaitForRetrace(); @@ -232,16 +232,16 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch if (readBytes == -3 || !errorRetry) { if (hasAllocated == true) - i_JKRFree(dst); + JKRFree(dst); - i_JKRFree(mem); + JKRFree(mem); return NULL; } VIWaitForRetrace(); } DCInvalidateRange(mem, fileSizeAligned); JKRDecompress(mem, dst, expandSize, offset); - i_JKRFree(mem); + JKRFree(mem); if (param_8) { *param_8 = expandSize; @@ -253,14 +253,14 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch if (JKRDecompressFromDVD(dvdFile, dst, fileSizeAligned, expandSize, offset, 0, param_8) != 0u) { if (hasAllocated) - i_JKRFree(dst); + JKRFree(dst); dst = NULL; } return dst; } else if (hasAllocated) { - i_JKRFree(dst); + JKRFree(dst); dst = NULL; } return NULL; @@ -367,10 +367,10 @@ static int JKRDecompressFromDVD(JKRDvdFile* dvdFile, void* dst, u32 fileSize, u3 *tsPtr = 0; u8 *data = firstSrcData(); u32 result = (data != NULL) ? decompSZS_subroutine(data, (u8 *)dst) : -1; // figure out correct datatypes - i_JKRFree(szpBuf); + JKRFree(szpBuf); if (refBuf) { - i_JKRFree(refBuf); + JKRFree(refBuf); } DCStoreRangeNoSync(dst, *tsPtr); OSUnlockMutex(&decompMutex); diff --git a/libs/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/JKernel/JKRExpHeap.cpp index 55be7f84f43..ffa8d43db53 100644 --- a/libs/JSystem/JKernel/JKRExpHeap.cpp +++ b/libs/JSystem/JKernel/JKRExpHeap.cpp @@ -137,7 +137,7 @@ JKRExpHeap* JKRExpHeap::create(u32 size, JKRHeap* parent, bool errorFlag) { new (memory) JKRExpHeap(dataPtr, alignedSize - expHeapSize, parent, errorFlag); if (newHeap == NULL) { - i_JKRFree(memory); + JKRFree(memory); return NULL; } diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp index c310a4fc35b..5b7885cd7a8 100644 --- a/libs/JSystem/JKernel/JKRThread.cpp +++ b/libs/JSystem/JKernel/JKRThread.cpp @@ -71,7 +71,7 @@ JKRThread::~JKRThread() { JKRFreeToHeap(mHeap, mStackMemory); JKRFreeToHeap(mHeap, mThreadRecord); } - i_JKRFree(mMessages); + JKRFree(mMessages); } /* 802D1830-802D18A4 2CC170 0074+00 3/3 0/0 0/0 .text setCommon_mesgQueue__9JKRThreadFP7JKRHeapi diff --git a/libs/Z2AudioLib/Z2EnvSeMgr.cpp b/libs/Z2AudioLib/Z2EnvSeMgr.cpp index 5a797dce241..2b045cb345a 100644 --- a/libs/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/libs/Z2AudioLib/Z2EnvSeMgr.cpp @@ -608,7 +608,7 @@ void Z2EnvSeMgr::framework() { int sceneNum = Z2GetSceneMgr()->getCurrentSceneNum(); if (field_0x64.getPosCount() >= 0) { if (field_0x214 == 0x12 || - (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[104]) && !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[250]))) + (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[104]) && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[250]))) { int lVar12 = 0; if (sceneNum == 0x17 || sceneNum == 0x18 || (sceneNum == 0x19)) { diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp index 0db1b0cecd5..41d92bd5208 100644 --- a/libs/Z2AudioLib/Z2StatusMgr.cpp +++ b/libs/Z2AudioLib/Z2StatusMgr.cpp @@ -38,7 +38,7 @@ void Z2StatusMgr::heartGaugeOn() { /* 802B5F7C-802B60CC 2B08BC 0150+00 0/0 1/1 0/0 .text processHeartGaugeSound__11Z2StatusMgrFv */ void Z2StatusMgr::processHeartGaugeSound() { - if (!i_dComIfGp_event_runCheck() && mHeartGaugeOn != 0) { + if (!dComIfGp_event_runCheck() && mHeartGaugeOn != 0) { if (dScnPly_c::isPause()) { mHeartGaugeOn--; } diff --git a/obj_files.mk b/obj_files.mk index eaf2d0c1c60..02df0c196bd 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -1086,4 +1086,5 @@ O_FILES_SYM_ON := \ $(BUILD_DIR)/src/d/bg/d_bg_s_poly_pass_chk.o \ $(BUILD_DIR)/src/f_op/f_op_actor_mng.o \ $(BUILD_DIR)/src/d/map/d_map.o \ + $(BUILD_DIR)/src/m_Do/m_Do_Reset.o \ \ No newline at end of file diff --git a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp index 7053e8b7b26..6e07ed1502e 100644 --- a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp +++ b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp @@ -2128,7 +2128,7 @@ asm void daB_DS_c::mCreateTrap(bool param_0) { // matches with literals void daB_DS_c::mChangeVer2() { if (mBitSw != 0xff) { - i_fopAcM_offSwitch(this, mBitSw); + fopAcM_offSwitch(this, mBitSw); } field_0x7ec = 0.0f; shape_angle.x = 0; @@ -4351,7 +4351,7 @@ asm void daB_DS_c::executeCircle() { /* 805D02F8-805D0374 0051B8 007C+00 1/1 0/0 0/0 .text mBreakBoneSUB__8daB_DS_cFv */ void daB_DS_c::mBreakBoneSUB() { if (mBitSw3 != 0xff) { - i_fopAcM_offSwitch(this, mBitSw3); + fopAcM_offSwitch(this, mBitSw3); mSoundPos = current.pos; mSound.startCollisionSE(Z2SE_HIT_SWORD, 0x1f); } @@ -5093,7 +5093,7 @@ void daB_DS_c::executeDamage() { i_dComIfGp_event_reset(); if (mBitSw3 != 0xff) { - i_fopAcM_offSwitch(this, mBitSw3); + fopAcM_offSwitch(this, mBitSw3); } mBirthTrapTimerF = 0x1e; shape_angle.y = current.angle.y = fopAcM_searchPlayerAngleY(this) + 0xc000; @@ -5110,7 +5110,7 @@ void daB_DS_c::executeDamage() { if (cLib_calcTimer(&mActionTimer) == 0 && field_0x7dc[mBackboneJoint] == 0.0f) { if (mBitSw != 0xff) { - i_fopAcM_offSwitch(this, mBitSw); + fopAcM_offSwitch(this, mBitSw); } setBck(Ds_damage_id[mBackboneJoint], 0, 3.0f, 1.0f); for (int i = 0; i < 4; i++) { @@ -9981,7 +9981,7 @@ cPhs__Step daB_DS_c::create() { field_0x7e8 = 0.0f; field_0x7ec = 255.0f; if (mBitSw != 0xff) { - i_fopAcM_offSwitch(this, mBitSw); + fopAcM_offSwitch(this, mBitSw); } attention_info.field_0x0[2] = 0; attention_info.flags &= ~4; @@ -9998,7 +9998,7 @@ cPhs__Step daB_DS_c::create() { dComIfGs_onZoneSwitch(5, fopAcM_GetRoomNo(this)); } if (mBitSw3 != 0xff) { - i_fopAcM_offSwitch(this, mBitSw3); + fopAcM_offSwitch(this, mBitSw3); } if (mAction != ACT_OPENING_DEMO) { field_0x7f8 = 0.5f; @@ -10254,7 +10254,7 @@ extern "C" asm void __dt__4cXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::changeDemoPos0(cXyz const* param_0) { +extern "C" asm void changeDemoPos0__9daPy_py_cFPC4cXyz() { nofralloc #include "asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/changeDemoPos0__9daPy_py_cFPC4cXyz.s" } @@ -10275,7 +10275,7 @@ extern "C" asm void __as__4cXyzFRC4cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) { +extern "C" asm void changeDemoMode__9daPy_py_cFUliis() { nofralloc #include "asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/changeDemoMode__9daPy_py_cFUliis.s" } 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 8287496f590..a2b6ac97038 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 @@ -225,7 +225,7 @@ static int daB_GO_Execute(b_go_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(l_HIO.mSmallSize, l_HIO.mSmallSize, l_HIO.mSmallSize); - i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); i_this->mpMorf->modelCalc(); diff --git a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp index ecab4e26aa6..e51b3ef2a16 100644 --- a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp +++ b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp @@ -163,7 +163,7 @@ static void stick(b_gos_class* i_this) { cLib_addCalc2(&i_this->speedF, 200, 1, 1); J3DModel* boss_model = boss->mpMorf->getModel(); - MTXCopy(boss_model->i_getAnmMtx(j_info[i_this->mJointIndex].joint_no & 0xFF), *calc_mtx); + MTXCopy(boss_model->getAnmMtx(j_info[i_this->mJointIndex].joint_no & 0xFF), *calc_mtx); offset.x = 0.0f; offset.y = 0.0f; @@ -172,7 +172,7 @@ static void stick(b_gos_class* i_this) { if (j_info[i_this->mJointIndex].field_0x4 < 1.0f) { cXyz sp60; - MTXCopy(boss_model->i_getAnmMtx((j_info[i_this->mJointIndex].joint_no >> 8) & 0xFF), + MTXCopy(boss_model->getAnmMtx((j_info[i_this->mJointIndex].joint_no >> 8) & 0xFF), *calc_mtx); offset.x = 0.0f; @@ -306,7 +306,7 @@ static int daB_GOS_Execute(b_gos_class* i_this) { mDoMtx_stack_c::XrotM(i_this->shape_angle.x); mDoMtx_stack_c::scaleM(l_HIO.mSize, l_HIO.mSize, l_HIO.mSize); mDoMtx_stack_c::transM(0.0f, i_this->field_0x698, i_this->field_0x69c); - i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this))); i_this->mpMorf->modelCalc(); diff --git a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp index 29f93a304de..f062e996bb9 100644 --- a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp +++ b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp @@ -1861,7 +1861,7 @@ extern "C" asm void dComIfGp_particle_set__FUlUsPC4cXyzPC5csXyzPC4cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_control_c::checkSkipEdge() { +extern "C" asm void checkSkipEdge__14dEvt_control_cFv() { nofralloc #include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/checkSkipEdge__14dEvt_control_cFv.s" } @@ -2812,7 +2812,7 @@ static asm void func_8061A894() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::cancelOriginalDemo() { +extern "C" asm void cancelOriginalDemo__9daPy_py_cFv() { nofralloc #include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/cancelOriginalDemo__9daPy_py_cFv.s" } @@ -2822,7 +2822,7 @@ asm void daPy_py_c::cancelOriginalDemo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGp_event_reset() { +static asm void dComIfGp_event_reset__Fv() { nofralloc #include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/dComIfGp_event_reset__Fv.s" } @@ -2899,7 +2899,7 @@ extern "C" asm void __as__4cXyzFRC4cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) { +extern "C" asm void changeDemoMode__9daPy_py_cFUliis() { nofralloc #include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/changeDemoMode__9daPy_py_cFUliis.s" } @@ -2909,7 +2909,7 @@ asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 pa #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::changeOriginalDemo() { +extern "C" asm void changeOriginalDemo__9daPy_py_cFv() { nofralloc #include "asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/changeOriginalDemo__9daPy_py_cFv.s" } 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 815e0c4d64b..1c18a05c2cc 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 @@ -264,14 +264,14 @@ static int nodeCallBack(J3DJoint* param_0, int param_1) { b_oh_class* this_ = (b_oh_class*)model_p->getUserArea(); if (this_ != NULL && jnt_no >= this_->field_0xca8 && jnt_no <= 29) { - MTXCopy(model_p->i_getAnmMtx(jnt_no), *calc_mtx); + MTXCopy(model_p->getAnmMtx(jnt_no), *calc_mtx); mDoMtx_YrotM(*calc_mtx, this_->field_0x61c[jnt_no].y + this_->field_0x784[jnt_no].y); mDoMtx_ZrotM(*calc_mtx, this_->field_0x61c[jnt_no].x + this_->field_0x784[jnt_no].x); MtxTrans(this_->mTentacleLength + -100.0f, 1.0f, 1.0f, 1); MTXCopy(*calc_mtx, J3DSys::mCurrentMtx); MtxScale(1.0f, this_->field_0x8ec[jnt_no] + this_->field_0x9dc[jnt_no], this_->field_0x8ec[jnt_no] + this_->field_0x9dc[jnt_no], 1); - model_p->i_setAnmMtx(jnt_no, *calc_mtx); + model_p->setAnmMtx(jnt_no, *calc_mtx); } } @@ -475,7 +475,7 @@ static void start(b_oh_class* i_this) { case 1: if (i_this->field_0xcac < -100.0f) { for (int i = 0; i < 28; i++) { - MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i), mDoMtx_stack_c::get()); + MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(i), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&sp28); if (sp28.y > boss->field_0x47a0) { @@ -761,7 +761,7 @@ static void attack(b_oh_class* i_this) { if (i_this->mColliders[i].ChkCoHit()) { cCcD_Obj* obj_p = i_this->mColliders[i].GetCoHitObj(); if (fopAcM_GetName(obj_p->GetAc()) == PROC_ALINK && - !i_dComIfGp_event_runCheck()) + !dComIfGp_event_runCheck()) { if (!player_p->checkHookshotShootReturnMode() && boss->field_0x4744 == 0) @@ -1074,7 +1074,7 @@ static void action(b_oh_class* i_this) { cLib_addCalc2(&a_this->mTentacleLength, l_HIO.mLength, 0.1f, 0.5f); } - MTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(a_this->field_0x5c8 + 8), + MTXCopy(boss->mParts[0].field_0x0->getModel()->getAnmMtx(a_this->field_0x5c8 + 8), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&a_this->current.pos); @@ -1197,10 +1197,10 @@ static void damage_check(b_oh_class* i_this) { i_this->health = 1000; cc_at_check(i_this, &i_this->mAtInfo); - MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i * 2 + 1), + MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(i * 2 + 1), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&i_this->eyePos); - i_dComIfGp_setHitMark(1, i_this, &i_this->eyePos, NULL, NULL, 0); + 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; @@ -1301,7 +1301,7 @@ static int daB_OH_Execute(b_oh_class* i_this) { mDoMtx_stack_c::scaleM(l_HIO.mModelSize, l_HIO.mModelSize, l_HIO.mModelSize); J3DModel* model_p = i_this->mpMorf->getModel(); - model_p->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model_p->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)), 0); i_this->mpBtk->play(); i_this->mpBrk->play(); @@ -1313,7 +1313,7 @@ static int daB_OH_Execute(b_oh_class* i_this) { } for (int i = 0; i < 15; i++) { - MTXCopy(model_p->i_getAnmMtx(tmp + i * 2), mDoMtx_stack_c::get()); + MTXCopy(model_p->getAnmMtx(tmp + i * 2), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&collider_center); if (i_this->mAction >= ACTION_END) { diff --git a/rel/d/a/b/d_a_b_oh/d_a_b_oh_NONMATCHING.cpp b/rel/d/a/b/d_a_b_oh/d_a_b_oh_NONMATCHING.cpp index f07637241de..c97abbe4e51 100644 --- a/rel/d/a/b/d_a_b_oh/d_a_b_oh_NONMATCHING.cpp +++ b/rel/d/a/b/d_a_b_oh/d_a_b_oh_NONMATCHING.cpp @@ -172,14 +172,14 @@ static int nodeCallBack(J3DJoint* param_0, int param_1) { b_oh_class* this_ = (b_oh_class*)model_p->getUserArea(); if (this_ != NULL && jnt_no >= this_->field_0xca8 && jnt_no <= 29) { - MTXCopy(model_p->i_getAnmMtx(jnt_no), *calc_mtx); + MTXCopy(model_p->getAnmMtx(jnt_no), *calc_mtx); mDoMtx_YrotM(*calc_mtx, this_->field_0x61c[jnt_no].y + this_->field_0x784[jnt_no].y); mDoMtx_ZrotM(*calc_mtx, this_->field_0x61c[jnt_no].x + this_->field_0x784[jnt_no].x); MtxTrans(this_->mTentacleLength + -100.0f, 1.0f, 1.0f, 1); MTXCopy(*calc_mtx, J3DSys::mCurrentMtx); MtxScale(1.0f, this_->field_0x8ec[jnt_no] + this_->field_0x9dc[jnt_no], this_->field_0x8ec[jnt_no] + this_->field_0x9dc[jnt_no], 1); - model_p->i_setAnmMtx(jnt_no, *calc_mtx); + model_p->setAnmMtx(jnt_no, *calc_mtx); } } @@ -328,7 +328,7 @@ static void start(b_oh_class* i_this) { case 1: if (i_this->field_0xcac < -100.0f) { for (int i = 0; i < 28; i++) { - MTXCopy(i_this->mpMorf->getModel()->i_getAnmMtx(i), mDoMtx_stack_c::get()); + MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(i), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&sp28); if (sp28.y > boss->field_0x47a0) { @@ -453,7 +453,7 @@ static void attack(b_oh_class* i_this) { if (i_this->mColliders[i].ChkCoHit()) { cCcD_Obj* obj_p = i_this->mColliders[i].GetCoHitObj(); if (fopAcM_GetName(obj_p->GetAc()) == PROC_ALINK && - !i_dComIfGp_event_runCheck()) + !dComIfGp_event_runCheck()) { if (!player_p->checkHookshotShootReturnMode() && boss->field_0x4744 == 0) @@ -716,7 +716,7 @@ static void action(b_oh_class* i_this) { cLib_addCalc2(&a_this->mTentacleLength, l_HIO.mLength, 0.1f, 0.5f); } - MTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(a_this->field_0x5c8 + 8), + MTXCopy(boss->mParts[0].field_0x0->getModel()->getAnmMtx(a_this->field_0x5c8 + 8), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&a_this->current.pos); @@ -768,9 +768,9 @@ static void damage_check(b_oh_class* i_this) { 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()); + MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(i * 2 + 1), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&i_this->eyePos); - i_dComIfGp_setHitMark(1, i_this, &i_this->eyePos, NULL, NULL, 0); + 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; @@ -851,7 +851,7 @@ static int daB_OH_Execute(b_oh_class* i_this) { mDoMtx_stack_c::scaleM(l_HIO.mModelSize, l_HIO.mModelSize, l_HIO.mModelSize); J3DModel* model_p = i_this->mpMorf->getModel(); - model_p->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model_p->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)), 0); i_this->mpBtk->play(); i_this->mpBrk->play(); @@ -863,7 +863,7 @@ static int daB_OH_Execute(b_oh_class* i_this) { } for (int i = 0; i < 15; i++) { - MTXCopy(model_p->i_getAnmMtx(tmp + i * 2), mDoMtx_stack_c::get()); + MTXCopy(model_p->getAnmMtx(tmp + i * 2), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&collider_center); if (i_this->mAction >= ACTION_END) { 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 db4a765d3cd..01c00f1577f 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 @@ -141,10 +141,10 @@ static void action(b_oh2_class* i_this) { break; } - MTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(i_this->field_0x5c8 + 8), + MTXCopy(boss->mParts[0].field_0x0->getModel()->getAnmMtx(i_this->field_0x5c8 + 8), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&i_this->current.pos); - MTXCopy(boss->mParts[0].field_0x0->getModel()->i_getAnmMtx(0), mDoMtx_stack_c::get()); + MTXCopy(boss->mParts[0].field_0x0->getModel()->getAnmMtx(0), mDoMtx_stack_c::get()); local_20.set(0.0f, 0.0f, i_this->field_0x5c8 * 20.0f + 650.0f); mDoMtx_stack_c::multVec(&local_20, &vstack_2C); @@ -159,7 +159,7 @@ static void action(b_oh2_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); - i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); int roomNo = fopAcM_GetRoomNo(i_this); i_this->mpMorf->play(0, dComIfGp_getReverb(roomNo)); 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 52fdb6046e3..831389f1756 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 @@ -44,7 +44,7 @@ static void zants_ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_ /* 80652B28-80652DA8 0001C8 0280+00 1/1 0/0 0/0 .text action__11daB_ZANTS_cFv */ void daB_ZANTS_c::action() { daPy_py_c* player = daPy_getPlayerActorClass(); - if (player->i_checkMagneBootsOn()) { + if (player->checkMagneBootsOn()) { mSinkTimers[TIMER_PLAYER] = 3; mPlayerID = fopAcM_GetID(player); } @@ -115,7 +115,7 @@ int daB_ZANTS_c::execute() { mDoMtx_stack_c::YrotM(-mRotation.y); mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::transM(0.0f, -30.0f, 0.0f); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); cMtx_copy(mDoMtx_stack_c::get(), mMtx); if (mpBgW != NULL) { 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 6def58ff002..7e2bffcb5a3 100644 --- a/rel/d/a/d_a_alldie/d_a_alldie.cpp +++ b/rel/d/a/d_a_alldie/d_a_alldie.cpp @@ -73,7 +73,7 @@ int daAlldie_c::actionOrder() { /* 804D59A0-804D5A44 000200 00A4+00 2/2 0/0 0/0 .text actionEvent__10daAlldie_cFv */ int daAlldie_c::actionEvent() { if (dComIfGp_evmng_endCheck(mEventIdx)) { - i_dComIfGp_getEvent().reset(); + dComIfGp_getEvent().reset(); if (mNextEventIdx != -1) { mAction = ACT_NEXT; @@ -98,7 +98,7 @@ int daAlldie_c::actionNext() { if (map_evt != NULL) { mMapToolID = map_evt->field_0x5; - mNextEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, mMapToolID); + mNextEventIdx = dComIfGp_getEventManager().getEventIdx(this, mMapToolID); } else { mMapToolID = -1; } @@ -178,14 +178,14 @@ int daAlldie_c::create() { current.angle.z = 0; current.angle.x = 0; - mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo()); + mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo()); mMapToolID = -1; mNextEventIdx = -1; dStage_MapEvent_dt_c* map_evt = dEvt_control_c::searchMapEventData(getEventNo(), roomNo); if (map_evt != NULL) { mMapToolID = map_evt->field_0x5; - mNextEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, mMapToolID); + mNextEventIdx = dComIfGp_getEventManager().getEventIdx(this, mMapToolID); } eventInfo.setEventId(mEventIdx); 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 38304fa0720..84993e95905 100644 --- a/rel/d/a/d_a_andsw/d_a_andsw.cpp +++ b/rel/d/a/d_a_andsw/d_a_andsw.cpp @@ -29,13 +29,13 @@ int daAndsw_c::create() { /* 80457A20-80457ABC 000120 009C+00 1/1 0/0 0/0 .text execute__9daAndsw_cFv */ int daAndsw_c::execute() { - if (i_fopAcM_isSwitch(this,mSwNo2)) { + if (fopAcM_isSwitch(this,mSwNo2)) { if (0 < mTimer) { mTimer--; } if (mTimer == 0) { - i_fopAcM_offSwitch(this,mSwNo); + fopAcM_offSwitch(this,mSwNo); if (getType() == 1) { fopAcM_delete(this); 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 e1f9760cc0f..2ba7b41d409 100644 --- a/rel/d/a/d_a_andsw2/d_a_andsw2.cpp +++ b/rel/d/a/d_a_andsw2/d_a_andsw2.cpp @@ -152,7 +152,7 @@ int daAndsw2_c::create() { setActio(ACT_ON_ALL_e); } - mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo()); + mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo()); break; case 1: case 6: @@ -164,7 +164,7 @@ int daAndsw2_c::create() { setActio(ACT_ON_ALL_e); } - mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo()); + mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo()); break; case 2: if (sw == 0xFF || dComIfGs_isSwitch(sw, fopAcM_GetRoomNo(this))) { @@ -173,7 +173,7 @@ int daAndsw2_c::create() { setActio(ACT_ON_ALL_e); } - mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo()); + mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo()); break; case 3: if (sw == 0xFF || dComIfGs_isSwitch(sw, fopAcM_GetRoomNo(this))) { @@ -182,14 +182,14 @@ int daAndsw2_c::create() { setActio(ACT_ON_ALL_e); } - mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo()); + mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo()); break; case 4: setActio(ACT_ON_ALL_e); break; case 5: setActio(ACT_ON_ALL_e); - mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, getEventNo()); + mEventIdx = dComIfGp_getEventManager().getEventIdx(this, getEventNo()); break; default: setActio(ACT_WAIT_e); @@ -288,7 +288,7 @@ static int daAndsw2_actionOrder(daAndsw2_c* i_this) { i_this->setActio(daAndsw2_c::ACT_ON_ALL_e); } else { if (i_this->getType() == 5 && - i_fopAcM_isSwitch(i_this, dLib_getEventSwitchNo(i_this->getEventNo()))) + fopAcM_isSwitch(i_this, dLib_getEventSwitchNo(i_this->getEventNo()))) { dComIfGs_onSwitch(i_this->getSwbit(), fopAcM_GetRoomNo(i_this)); i_this->setActio(daAndsw2_c::ACT_OFF_e); @@ -321,7 +321,7 @@ static int daAndsw2_actionEvent(daAndsw2_c* i_this) { i_this->setActio(daAndsw2_c::ACT_WAIT_e); } - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } return 1; 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 76e3a4ba8c9..2b2efbff8c3 100644 --- a/rel/d/a/d_a_bg/d_a_bg.cpp +++ b/rel/d/a/d_a_bg/d_a_bg.cpp @@ -829,7 +829,7 @@ int daBg_c::draw() { field_0x5f0 = 0; } - if (i_dComIfGs_isEventBit(dSv_event_flag_c::M_077)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::M_077)) { field_0x5f0 = 9; } } else if (!memcmp(&name[3], "MA15", 4)) { @@ -1050,7 +1050,7 @@ int daBg_c::create() { if (model != NULL) { mDoMtx_stack_c::transS(transX, 0.0f, transY); mDoMtx_stack_c::YrotM(angle); - model->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); J3DModelData* modelData = model->getModelData(); for (u16 j = 0; j < modelData->getMaterialNum(); j++) { 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 8c55ccea924..fd0b1826ca1 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 @@ -516,7 +516,7 @@ void daBgObj_c::initBaseMtx() { void daBgObj_c::setBaseMtx() { for (int i = 0; i < 2; i++) { if (field_0x5a8[field_0xcc8][i] != NULL) { - field_0x5a8[field_0xcc8][i]->i_setBaseTRMtx(mBgMtx); + field_0x5a8[field_0xcc8][i]->setBaseTRMtx(mBgMtx); } } } @@ -582,7 +582,7 @@ int daBgObj_c::CreateInitType0() { /* 8045A160-8045A2B8 000B80 0158+00 3/0 0/0 0/0 .text CreateInitType1__9daBgObj_cFv */ int daBgObj_c::CreateInitType1() { - if (i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) { + if (fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) { field_0xcc8 = 1; release(mpBgW); regist(mpBgW2); @@ -611,7 +611,7 @@ int daBgObj_c::CreateInitType1() { settingCullSizeBoxForCull(field_0xcc8); - mEventIdx = i_dComIfGp_getEventManager().getEventIdx(this, daBgObj_prm::getEvId(this)); + mEventIdx = dComIfGp_getEventManager().getEventIdx(this, daBgObj_prm::getEvId(this)); if (mpBgW2 != NULL) { mpBgW2->Move(); @@ -1024,12 +1024,12 @@ BOOL daBgObj_c::checkDestroy() { return false; } - if (!i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this)) && + if (!fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this)) && (daBgObj_prm::getSwBit2(this) == 0xFF || - (i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit2(this)) && + (fopAcM_isSwitch(this, daBgObj_prm::getSwBit2(this)) && daBgObj_prm::getObjArg0(this) == 0xFF) || (daBgObj_prm::getSwBit2(this) != 0xFF && - !i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit2(this)) && + !fopAcM_isSwitch(this, daBgObj_prm::getSwBit2(this)) && daBgObj_prm::getObjArg0(this) == 0))) { return true; @@ -1242,7 +1242,7 @@ int daBgObj_c::actionOrderWait() { orderWait_cyl(); break; } - } else if (i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) { + } else if (fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) { orderWait_spec(); field_0xd00 = 1; } @@ -1267,7 +1267,7 @@ int daBgObj_c::actionOrder() { setAction(3); } - if (!i_fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this)) || field_0xd00 != 0 || + if (!fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this)) || field_0xd00 != 0 || field_0xcc8 == 0) { release(mpBgW); @@ -1281,7 +1281,7 @@ int daBgObj_c::actionOrder() { setAttentionInfo(attn_actor_p); } - i_fopAcM_onSwitch(this, daBgObj_prm::getSwBit(this)); + fopAcM_onSwitch(this, daBgObj_prm::getSwBit(this)); field_0xd00 = 0; } } @@ -1303,7 +1303,7 @@ asm int daBgObj_c::actionOrder() { int daBgObj_c::actionEvent() { if (dComIfGp_evmng_endCheck(mEventIdx)) { setAction(3); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } return 1; @@ -1321,7 +1321,7 @@ int daBgObj_c::ExecuteType0() { if (swBit != 0xFF) { if (arg0 == 0xFF) { - if (i_fopAcM_isSwitch(this, swBit)) { + if (fopAcM_isSwitch(this, swBit)) { if (field_0xcc8 == 1) { regist(mpBgW); field_0xcc8 = 0; @@ -1331,7 +1331,7 @@ int daBgObj_c::ExecuteType0() { field_0xcc8 = 1; } } else if (arg0 == 0) { - if (i_fopAcM_isSwitch(this, swBit)) { + if (fopAcM_isSwitch(this, swBit)) { if (field_0xcc8 == 0) { release(mpBgW); field_0xcc8 = 1; 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 2ac5e9f73f0..9ddf8907b6c 100644 --- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp +++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp @@ -916,7 +916,7 @@ int daBoomerang_c::draw() { mSight.setSight(NULL, 5); } } - if (i_dComIfGp_event_runCheck() == 0) { + if (dComIfGp_event_runCheck() == 0) { dComIfGd_set2DXlu((dDlst_base_c*)&mSight); } } @@ -928,7 +928,7 @@ int daBoomerang_c::draw() { 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) { + } else if (dComIfGp_checkPlayerStatus0(0, 0x80000) != 0) { g_env_light.setLightTevColorType_MAJI(field_0x590, &tevStr); mDoExt_modelUpdateDL(field_0x590); } 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 077ba9178c4..669d0408272 100644 --- a/rel/d/a/d_a_crod/d_a_crod.cpp +++ b/rel/d/a/d_a_crod/d_a_crod.cpp @@ -160,7 +160,7 @@ void daCrod_c::setRoomInfo() {} void daCrod_c::setMatrix() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - mpBallModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpBallModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 804A3500-804A3580 000740 0080+00 1/1 0/0 0/0 .text posMove__8daCrod_cFv */ @@ -287,12 +287,12 @@ int daCrod_c::execute() { setReturn(); } } else if (fopAcM_GetParam(this) == 0) { - if (i_dComIfGp_checkPlayerStatus0(0, 0x80)) { + if (dComIfGp_checkPlayerStatus0(0, 0x80)) { fopAcM_SetParam(this, 1); setBckAnm(ANM_WAIT_A_T_START); } } else if (fopAcM_GetParam(this) == 1) { - if (!i_dComIfGp_checkPlayerStatus0(0, 0x80)) { + if (!dComIfGp_checkPlayerStatus0(0, 0x80)) { fopAcM_SetParam(this, 0); setBckAnm(ANM_WAIT_A); } 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 62be38d913c..fa0e41c61e5 100644 --- a/rel/d/a/d_a_disappear/d_a_disappear.cpp +++ b/rel/d/a/d_a_disappear/d_a_disappear.cpp @@ -81,7 +81,7 @@ static void set_disappear(disappear_class* i_this, f32 i_scale) { dKy_Sound_set(i_this->current.pos, 120, fopAcM_GetID(i_this), 10); - i_fpcM_Search(s_ks_sub, i_this); + fpcM_Search(s_ks_sub, i_this); if (i_this->field_0x567 == 3) { fopAcM_seStart(i_this, JA_SE_CM_MONS_EXPLODE, 0); 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 9ff8c6cea01..b1242c2325e 100644 --- a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp +++ b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp @@ -66,7 +66,7 @@ static int daDmidna_Delete(daDmidna_c* i_this) { void daDmidna_c::setMatrix() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); - model->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); mpModelMorf->modelCalc(); } 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 bc70874d006..354cab0d4c3 100644 --- a/rel/d/a/d_a_do/d_a_do.cpp +++ b/rel/d/a/d_a_do/d_a_do.cpp @@ -443,7 +443,7 @@ static int nodeCallBack(J3DJoint* i_jntP, int param_1) { do_class* user_area = (do_class*)model->getUserArea(); if (user_area) { - MTXCopy(model->i_getAnmMtx(joint_num), *calc_mtx); + MTXCopy(model->getAnmMtx(joint_num), *calc_mtx); if (joint_num == 9 || joint_num == 10) { cMtx_YrotM(*calc_mtx, user_area->field_0x60e.y + user_area->field_0x626.y); @@ -715,7 +715,7 @@ static u32 search_food(do_class* i_this) { target_bgc[i] = 0; } - i_fpcM_Search((fpcLyIt_JudgeFunc)s_w_sub, i_this); + fpcM_Search((fpcLyIt_JudgeFunc)s_w_sub, i_this); f32 tmp = FLOAT_LABEL(lit_3662); if (target_info_count != 0) { @@ -2448,7 +2448,7 @@ static void do_message(do_class* i_this) { i_this->field_0x616 = 1; cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mAngleYFromPlayer, 2, 0x1000); - if (i_dComIfGp_event_runCheck() == 0 && i_this->mDistFromPlayer > FLOAT_LABEL(lit_3773)) { + if (dComIfGp_event_runCheck() == 0 && i_this->mDistFromPlayer > FLOAT_LABEL(lit_3773)) { i_this->mAction = ACT_STAY; i_this->mStayStatus = 0; } @@ -2990,12 +2990,12 @@ static void message(do_class* i_this) { i_this->field_0x604 = 10; if (i_this->mMsg.doFlow(i_this, 0, 0)) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); i_this->field_0xc06 = 0; } } else { - if (i_dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) { i_this->mMsg.init(i_this, i_this->field_0xc08, 0, 0); i_this->field_0xc06 = 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 14b6fa31480..83f62fa10f0 100644 --- a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp +++ b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp @@ -189,7 +189,7 @@ void daDsh_c::setMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } @@ -325,7 +325,7 @@ static daDsh_c::action_c l_openAction /* (&daDsh_c::initOpen, &daDsh_c::executeO /* 804677E4-80467840 0003C4 005C+00 1/0 0/0 0/0 .text executeOpenWait__7daDsh_cFv */ int daDsh_c::executeOpenWait() { - if (i_fopAcM_isSwitch(this, mSw)) { + if (fopAcM_isSwitch(this, mSw)) { setAction(&l_openAction); } @@ -400,7 +400,7 @@ static daDsh_c::action_c l_closeAction /* (&daDsh_c::initClose, &daDsh_c::execut /* 80467A80-80467ADC 000660 005C+00 1/0 0/0 0/0 .text executeCloseWait__7daDsh_cFv */ int daDsh_c::executeCloseWait() { - if (!i_fopAcM_isSwitch(this, mSw)) { + if (!fopAcM_isSwitch(this, mSw)) { setAction(&l_closeAction); } 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 8a97c42359d..91110364a3e 100644 --- a/rel/d/a/d_a_econt/d_a_econt.cpp +++ b/rel/d/a/d_a_econt/d_a_econt.cpp @@ -27,9 +27,9 @@ static void* s_rd_sub(void* i_this, void* param_1) { /* 80519578-80519664 0000D8 00EC+00 1/1 0/0 0/0 .text rider_game__FP11econt_class */ static void rider_game(econt_class* i_this) { - if (dComIfGs_isSwitch(0x2e,fopAcM_GetRoomNo(i_this)) && i_dComIfGp_event_runCheck() == 0) { + if (dComIfGs_isSwitch(0x2e,fopAcM_GetRoomNo(i_this)) && dComIfGp_event_runCheck() == 0) { data_805197E0[0] = 0; - i_fpcM_Search(s_rd_sub,i_this); + fpcM_Search(s_rd_sub,i_this); if (i_this->field_0x5b4 == 0) { if (i_this->field_0x5b8[0] == 0) { 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 6a93d69afb7..2b9b5cfba48 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 @@ -27,7 +27,7 @@ static void* s_sub(void* i_actorP, void* i_this) { u8 daGuardMng_c::checkMerchantNum() { field_0x56c = 1000000000.0f; mMerchantNum = 0; - i_fpcM_Search(s_sub,this); + fpcM_Search(s_sub,this); return mMerchantNum; } 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 e0521a69174..1951bdcb94a 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 @@ -196,7 +196,7 @@ static int Reel_CallBack(J3DJoint* param_0, int param_1) { u16 uVar1 = param_0->getJntNo(); J3DModel* model = j3dSys.getModel(); s32 iVar2 = model->getUserArea(); - MTXCopy(model->i_getAnmMtx(uVar1), (MtxP)calc_mtx); + MTXCopy(model->getAnmMtx(uVar1), (MtxP)calc_mtx); cMtx_XrotM((MtxP)calc_mtx, (int)*(short*)(iVar2 + 0x58)); model->setAnmMtx(uVar1, (MtxP)calc_mtx); PSMTXCopy((MtxP)calc_mtx, (MtxP) J3DSys::mCurrentMtx); @@ -232,11 +232,11 @@ static int frog_CallBack(J3DJoint* param_0, int param_1) { J3DModel* model = j3dSys.getModel(); model->getUserArea(); if (sVar2 == 1) { - MtxP uVar1 = model->i_getAnmMtx(sVar2); + MtxP uVar1 = model->getAnmMtx(sVar2); MTXCopy(uVar1, (MtxP)calc_mtx); cMtx_YrotM((MtxP)calc_mtx, -8800); MtxScale(2.0f, 1.0f, 1.5f, 1); - model->i_setAnmMtx(sVar2, (MtxP)calc_mtx); + model->setAnmMtx(sVar2, (MtxP)calc_mtx); MTXCopy((MtxP)calc_mtx, (MtxP)J3DSys::mCurrentMtx); } } @@ -1587,7 +1587,7 @@ static int daFshop_Draw(fshop_class* param_0) { 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); + param_0->field_0x4004->setBaseTRMtx(pfVar10); g_env_light.setLightTevColorType_MAJI(param_0->field_0x4004, ¶m_0->tevStr); mDoExt_modelUpdateDL(param_0->field_0x4004); } @@ -1741,17 +1741,17 @@ static void lure_set(fshop_class* param_0) { mDoMtx_stack_c::ZrotM(pLure->field_0x10); mDoMtx_stack_c::scaleM(pLure->field_0x2c, pLure->field_0x2c, pLure->field_0x28); mDoMtx_stack_c::transM(0.0f, 0.0f, 0.0f); - pLure->field_0x14->i_setBaseTRMtx(mDoMtx_stack_c::get()); + pLure->field_0x14->setBaseTRMtx(mDoMtx_stack_c::get()); if (pLure->field_0x24 != 3) { mDoMtx_stack_c::push(); mDoMtx_stack_c::transM(0.0f, hook_1_offy[pLure->field_0x24], 1.0f); mDoMtx_stack_c::XrotM(-10000); - pLure->field_0x18[0]->i_setBaseTRMtx(mDoMtx_stack_c::get()); + pLure->field_0x18[0]->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::pop(); mDoMtx_stack_c::transM(0.0f, hook_2_offy[pLure->field_0x24], hook_2_offz[pLure->field_0x24]); mDoMtx_stack_c::XrotM(0x4000); - pLure->field_0x18[1]->i_setBaseTRMtx(mDoMtx_stack_c::get()); + pLure->field_0x18[1]->setBaseTRMtx(mDoMtx_stack_c::get()); } } } @@ -1816,7 +1816,7 @@ static void rod_set(fshop_class* param_0) { } mDoMtx_stack_c::XrotM(1300); mDoMtx_stack_c::YrotM(0); - pRod->field_0x14->i_setBaseTRMtx(mDoMtx_stack_c::get()); + pRod->field_0x14->setBaseTRMtx(mDoMtx_stack_c::get()); cXyz* local_64 = pRod->line_mat.getPos(0); if (pRod->field_0x4c == 0) { mDoMtx_stack_c::transM(0.0f, 15.0f, 0.0f); @@ -1844,7 +1844,7 @@ static void rod_set(fshop_class* param_0) { mDoMtx_stack_c::scaleM(guide_s[local_6c], guide_s[local_6c], guide_s[local_6c]); mDoMtx_stack_c::transM(0.0f, 4.0f, 0.0f); mDoMtx_stack_c::YrotM(0x4000); - pRod->field_0x18[local_6c]->i_setBaseTRMtx(mDoMtx_stack_c::get()); + pRod->field_0x18[local_6c]->setBaseTRMtx(mDoMtx_stack_c::get()); } } } @@ -1986,7 +1986,7 @@ static void tsubo_set(fshop_class* param_1) { } pTsubo->field_0x20 = cM_rndF(65536.0f); pTsubo->field_0x22 = cM_rndF(65536.0f); - fopAc_ac_c* henna = i_fopAcM_SearchByName(PROC_NPC_HENNA); + fopAc_ac_c* henna = fopAcM_SearchByName(PROC_NPC_HENNA); if (henna != NULL) { // TODO: include henna header file ((u8*)henna)[0x7b5] = 0x3c; @@ -2001,7 +2001,7 @@ static void tsubo_set(fshop_class* param_1) { mDoMtx_stack_c::XrotM(xrot); mDoMtx_stack_c::ZrotM(zrot); mDoMtx_stack_c::scaleM(1.0f, 1.0f, 1.0f); - pTsubo->field_0x14->i_setBaseTRMtx(mDoMtx_stack_c::get()); + pTsubo->field_0x14->setBaseTRMtx(mDoMtx_stack_c::get()); cLib_addCalc0(&pTsubo->field_0x1c, 1.0f, 50.0f); } } @@ -2163,7 +2163,7 @@ static void koro2_mtx_set(fshop_class* param_1) { 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()); + param_1->mpA_crwaku_model->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), param_1->field_0x4030); param_1->field_0x402c->Move(); mDoMtx_stack_c::pop(); @@ -2179,7 +2179,7 @@ static void koro2_mtx_set(fshop_class* param_1) { param_1->mKoro2[iVar8].field_0x44.z); mDoMtx_stack_c::push(); mDoMtx_stack_c::scaleM(0.01f, 0.01f, 0.01f); - param_1->mKoro2[iVar8].mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + param_1->mKoro2[iVar8].mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), param_1->mKoro2[iVar8].field_0x04); param_1->mKoro2[iVar8].mpBgW->Move(); mDoMtx_stack_c::pop(); @@ -2388,12 +2388,12 @@ static void koro2_game(fshop_class* i_this) { break; } - i_this->field_0x4008 = (fshop_class*)i_fpcM_Search(s_sel_sub, i_this); + i_this->field_0x4008 = (fshop_class*)fpcM_Search(s_sel_sub, i_this); if (i_this->field_0x4008 != NULL) { stage_copy(i_this->field_0x4008, i_this); i_this->field_0x4008->field_0x400d = 0; - fshop_class* ball_p = (fshop_class*)i_fpcM_Search(s_ball_sub, i_this); + fshop_class* ball_p = (fshop_class*)fpcM_Search(s_ball_sub, i_this); if (ball_p != NULL) { ball_p->field_0x4008 = i_this->field_0x4008; } @@ -2742,7 +2742,7 @@ static int daFshop_Execute(fshop_class* param_1) { } // TODO: include henna npc header - fopAc_ac_c* iVar9 = i_fopAcM_SearchByName(PROC_NPC_HENNA); + fopAc_ac_c* iVar9 = fopAcM_SearchByName(PROC_NPC_HENNA); if (iVar9 != NULL && ((u8*)iVar9)[0x7b9] != 0 && (param_1->field_0x567 == 1 || dTimer_getRestTimeMs() == 0)) { @@ -2770,7 +2770,7 @@ static int daFshop_Execute(fshop_class* param_1) { local_cc = *(cXyz*)&BallEndPos - param_1->current.pos; if (local_cc.abs() < 65.0f) { // TODO: include henna npc header - fopAc_ac_c* uVar19 = i_fopAcM_SearchByName(PROC_NPC_HENNA); + fopAc_ac_c* uVar19 = fopAcM_SearchByName(PROC_NPC_HENNA); if (uVar19 != NULL) { BOOL bVar5 = FALSE; for (int local_13c = 0; local_13c < 100; local_13c++) { @@ -2851,7 +2851,7 @@ static int daFshop_Execute(fshop_class* param_1) { 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)))); - param_1->field_0x4070->i_setBaseTRMtx(mDoMtx_stack_c::get()); + param_1->field_0x4070->setBaseTRMtx(mDoMtx_stack_c::get()); return 1; } else { lure_set(param_1); @@ -2864,7 +2864,7 @@ static int daFshop_Execute(fshop_class* param_1) { for (s32 local_150 = 0; local_150 < 15; local_150++, local_148++) { *local_148 = pWeed[local_14c].field_0x00[local_150]; } - i_fpcM_Search(s_fish_sub, &pWeed[local_14c]); + fpcM_Search(s_fish_sub, &pWeed[local_14c]); } cXyz cStack_f0(-720.0f, 30.0f, 70.0f); cXyz cStack_fc(0.5f, 0.5f, 0.5f); @@ -2887,7 +2887,7 @@ static int daFshop_Execute(fshop_class* param_1) { mDoMtx_stack_c::transS(-450.0f, 25.0f, -250.0f); mDoMtx_stack_c::YrotM(0x4000); mDoMtx_stack_c::ZrotM(iVar6 + 2000); - param_1->field_0x6b30->i_setBaseTRMtx(mDoMtx_stack_c::get()); + param_1->field_0x6b30->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::transS(-450.0f, 0.0f, -250.0f); mDoMtx_stack_c::scaleM(4.0f, 1.5f, 1.0f); MTXCopy(mDoMtx_stack_c::get(), param_1->field_0x6b38); @@ -2912,7 +2912,7 @@ static int daFshop_Execute(fshop_class* param_1) { mDoMtx_stack_c::XrotM(iVar10); mDoMtx_stack_c::ZrotM(iVar11); mDoMtx_stack_c::transM(-10.0f, -7.0f, 65.0f); - param_1->field_0x3ff4->i_setBaseTRMtx(mDoMtx_stack_c::get()); + param_1->field_0x3ff4->setBaseTRMtx(mDoMtx_stack_c::get()); koro2_game(param_1); } return 1; 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 2659cf95398..22f4704a5e9 100644 --- a/rel/d/a/d_a_mirror/d_a_mirror.cpp +++ b/rel/d/a/d_a_mirror/d_a_mirror.cpp @@ -205,7 +205,7 @@ void dMirror_packet_c::modelDraw(J3DModel* i_model, Mtx param_1) { return; } - dScnKy_env_light_c* kankyo = i_dKy_getEnvlight(); + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); JUT_ASSERT(kankyo != 0); GXColor color = {0}; @@ -477,7 +477,7 @@ void daMirror_c::setModelMtx() { mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::XrotM(shape_angle.x); mDoMtx_stack_c::ZrotM(0x2000); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80872018-8087206C 0014D8 0054+00 1/0 0/0 0/0 .text daMirror_create__FP10daMirror_c */ @@ -488,7 +488,7 @@ static int daMirror_create(daMirror_c* i_this) { /* 8087206C-80872344 00152C 02D8+00 2/2 0/0 0/0 .text create__10daMirror_cFv */ int daMirror_c::create() { - if (getSw() != 0xFF && !i_fopAcM_isSwitch(this, getSw())) { + if (getSw() != 0xFF && !fopAcM_isSwitch(this, getSw())) { return cPhs_COMPLEATE_e; } diff --git a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp index 2ca00a3e6bb..c2ade04b607 100644 --- a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp +++ b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp @@ -1882,7 +1882,7 @@ static asm void daMP_ActivePlayer_Finish() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void JKRFree(void* param_0) { +extern "C" asm void JKRFree__FPv() { nofralloc #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/JKRFree__FPv.s" } 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 63ee385e581..6153861c398 100644 --- a/rel/d/a/d_a_myna/d_a_myna.cpp +++ b/rel/d/a/d_a_myna/d_a_myna.cpp @@ -1458,7 +1458,7 @@ int daMyna_c::execute() { setItemInfo(); int iVar1 = chkEvent(); if (daMyna_LightActor == NULL) { - i_fpcM_Search(daMyna_searchLight, this); + fpcM_Search(daMyna_searchLight, this); } setRoomNo(); attention_info.position.set(current.pos.x, current.pos.y + 40.0f, current.pos.z); @@ -1563,7 +1563,7 @@ asm int daMyna_c::createHeap() { /* 8094686C-809468EC 000CEC 0080+00 1/1 0/0 0/0 .text jntNodeCB__8daMyna_cFP8J3DJointP8J3DModel */ int daMyna_c::jntNodeCB(J3DJoint* i_jnt, J3DModel* i_model) { u16 jntNo = i_jnt->getJntNo(); - mDoMtx_stack_c::copy(i_model->i_getAnmMtx(jntNo)); + mDoMtx_stack_c::copy(i_model->getAnmMtx(jntNo)); i_model->setAnmMtx(jntNo, mDoMtx_stack_c::get()); cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); return 1; @@ -1655,7 +1655,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 (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); onEventFlag(1); field_0x92C = 2; } @@ -1764,7 +1764,7 @@ void daMyna_c::attack_after_talk_init() { */ void daMyna_c::attack_after_talk_move() { if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); onEventFlag(2); field_0x91C = 0x139; field_0x92C = 5; @@ -1884,8 +1884,8 @@ 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 (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { - i_dComIfGp_event_reset(); - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { + dComIfGp_event_reset(); + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { field_0x937 = 20; field_0x92C = 19; } else { @@ -1921,7 +1921,7 @@ COMPILER_STRIP_GATE(0x8094B204, &lit_4655); #ifdef NONMATCHING void daMyna_c::shopping_wait_move() { if (!daPy_py_c::i_checkNowWolf()) { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { field_0x92C = 17; field_0x937 = 20; } else { @@ -1960,7 +1960,7 @@ void daMyna_c::shopping_wait_move() { } } - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203]) && + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203]) && daMyna_evtTagActor1 != NULL) { cXyz stack_2c(1.0f, 1.0f, 1.0f); @@ -2031,7 +2031,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 (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); field_0x828 = NULL; field_0x92C = 7; } @@ -2054,7 +2054,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 (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); field_0x92C = 7; } } @@ -2112,8 +2112,8 @@ void daMyna_c::byebye_talk_move() { bVar1 = false; } - i_dComIfGp_event_reset(); - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { + dComIfGp_event_reset(); + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { field_0x92C = 0x11; field_0x937 = 0x14; } else if (bVar1) { @@ -2384,7 +2384,7 @@ void daMyna_c::wolf_talk_init() { /* 80948118-80948174 002598 005C+00 1/0 0/0 0/0 .text wolf_talk_move__8daMyna_cFv */ void daMyna_c::wolf_talk_move() { if (mMsgFlow.doFlow(this, NULL, 0) != 0) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); field_0x92C = field_0x92E; } } @@ -2424,7 +2424,7 @@ void daMyna_c::attack_wait2_move() { if (daMyna_evtTagActor0 != NULL) { cXyz stack_1c(1.0f, 1.0f, 1.0f); - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { if (chkPlayerInEvtArea(daMyna_evtTagActor0, stack_1c)) { field_0x937 = 20; field_0x92C = 19; @@ -2478,7 +2478,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 (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); field_0x92C = 19; } } @@ -2577,7 +2577,7 @@ void daMyna_c::attack2_move() { mSph.OffAtVsPlayerBit(); if (field_0x937 != 0) { field_0x937--; - if (i_dComIfGs_getLife() <= 1) { + if (dComIfGs_getLife() <= 1) { dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[802]); field_0x937 = 0; } @@ -2604,7 +2604,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 (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); field_0x828 = NULL; field_0x92C = 7; dMsgObject_setTotalPayment(0); @@ -2816,7 +2816,7 @@ asm void daMyna_c::talkAnime(msg_class* param_0) { int daMyna_c::chkEvent() { int retVal = 1; if (daPy_py_c::i_checkNowWolf()) { - if (!i_dComIfGp_getEvent().i_isOrderOK()) { + if (!dComIfGp_getEvent().isOrderOK()) { retVal = 0; if (eventInfo.checkCommandTalk()) { if (field_0x92C == 0x10) { @@ -2948,7 +2948,7 @@ void daMyna_c::initiate() { field_0x920 = 0; field_0x922 = 0; - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) { field_0x932 = 0; field_0x938 = 0; } else { @@ -3002,10 +3002,10 @@ asm void daMyna_c::initiate() { void daMyna_c::setItemInfo() { if (daMyna_actor_count != -1 && mNumShopItems > daMyna_actor_count) { daMyna_actor_count = 0; - i_fpcM_Search(daMyna_searchSSItem, this); + fpcM_Search(daMyna_searchSSItem, this); } if (daMyna_evtTagActor0 == NULL) { - i_fpcM_Search(daMyna_searchEvtTag, this); + fpcM_Search(daMyna_searchEvtTag, this); } if (daMyna_actor_count != -1 && mNumShopItems <= daMyna_actor_count) { for (int i = 0; i < mNumShopItems; i++) { @@ -3058,13 +3058,13 @@ void daMyna_c::set_mtx() { mDoMtx_stack_c::transS(local_18); mDoMtx_stack_c::ZXYrotM(current.angle); mDoMtx_stack_c::scaleM(scale); - model->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); mpMorf->modelCalc(); - mDoMtx_stack_c::copy(mpMorf->getModel()->i_getAnmMtx(4)); + mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&field_0x82C); - mDoMtx_stack_c::copy(mpMorf->getModel()->i_getAnmMtx(4)); + mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&field_0x838); - mDoMtx_stack_c::copy(mpMorf->getModel()->i_getAnmMtx(0x10)); + mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x10)); mDoMtx_stack_c::multVecZero(&field_0x85C); field_0x82C -= current.pos; field_0x838 -= current.pos; @@ -3337,7 +3337,7 @@ void daMyna_c::checkDead() { if (daMyna_evtTagActor0 == NULL || (daMyna_evtTagActor0 != NULL && !chkPlayerInEvtArea(daMyna_evtTagActor0, var1))) { - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[203])) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[203]); } } diff --git a/rel/d/a/d_a_ni/d_a_ni_NONMATCHING.cpp b/rel/d/a/d_a_ni/d_a_ni_NONMATCHING.cpp index c7307bce0ce..c9f1e6c4d9d 100644 --- a/rel/d/a/d_a_ni/d_a_ni_NONMATCHING.cpp +++ b/rel/d/a/d_a_ni/d_a_ni_NONMATCHING.cpp @@ -434,7 +434,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { J3DModel* model = j3dSys.getModel(); ni_class* a_this = (ni_class*)model->getUserArea(); if (a_this != NULL) { - MTXCopy(model->i_getAnmMtx(joint_no), *calc_mtx); + MTXCopy(model->getAnmMtx(joint_no), *calc_mtx); if (joint_no == JNT_HEAD) { cMtx_YrotM(*calc_mtx, a_this->field_0x61c); cMtx_XrotM(*calc_mtx, a_this->field_0x61a); @@ -449,26 +449,26 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { cMtx_ZrotM(*calc_mtx, a_this->field_0x9ee[joint_no - 1]); } - model->i_setAnmMtx(joint_no, *calc_mtx); + model->setAnmMtx(joint_no, *calc_mtx); MTXCopy(*calc_mtx, j3dSys.mCurrentMtx); if (joint_no == TREG_S(0)) { - MTXCopy(model->i_getAnmMtx(joint_no), *calc_mtx); + MTXCopy(model->getAnmMtx(joint_no), *calc_mtx); cMtx_YrotM(*calc_mtx, TREG_S(1)); cMtx_XrotM(*calc_mtx, TREG_S(2)); cMtx_ZrotM(*calc_mtx, TREG_S(3)); - model->i_setAnmMtx(joint_no, *calc_mtx); + model->setAnmMtx(joint_no, *calc_mtx); MTXCopy(*calc_mtx, j3dSys.mCurrentMtx); } if (joint_no == TREG_S(4)) { - MTXCopy(model->i_getAnmMtx(joint_no), *calc_mtx); + MTXCopy(model->getAnmMtx(joint_no), *calc_mtx); cMtx_YrotM(*calc_mtx, TREG_S(5)); cMtx_XrotM(*calc_mtx, TREG_S(6)); cMtx_ZrotM(*calc_mtx, TREG_S(7)); - model->i_setAnmMtx(joint_no, *calc_mtx); + model->setAnmMtx(joint_no, *calc_mtx); MTXCopy(*calc_mtx, j3dSys.mCurrentMtx); } } @@ -554,8 +554,8 @@ static void damage_check(ni_class* i_this) { if (i_this->mAtInfo.mHitType == 1 && i_this->health <= 0) { i_this->health = 0; - if (!i_dComIfGp_event_runCheck() && - i_fpcM_Search(s_play_sub, i_this) == NULL) + if (!dComIfGp_event_runCheck() && + fpcM_Search(s_play_sub, i_this) == NULL) { i_this->mAction = ACTION_PLAY_e; i_this->mMode = 0; @@ -693,7 +693,7 @@ static fopAc_ac_c* search_test(ni_class* i_this) { target_info[i] = NULL; } - i_fpcM_Search(s_t_sub, i_this); + fpcM_Search(s_t_sub, i_this); f32 search_range = 100.0f; if (target_info_count != 0) { @@ -822,7 +822,7 @@ static void ni_normal(ni_class* i_this) { i_this->field_0x60e = 1; } - if (i_dComIfGp_checkPlayerStatus0(0, 0x8000000)) { + if (dComIfGp_checkPlayerStatus0(0, 0x8000000)) { i_this->field_0x60e = 30; } @@ -847,7 +847,7 @@ static void ni_normal(ni_class* i_this) { } } - fopAc_ac_c* cow = i_fopAcM_SearchByName(PROC_COW); + fopAc_ac_c* cow = fopAcM_SearchByName(PROC_COW); if (cow != NULL && cow->speedF > 1.0f) { sp50 = cow->current.pos - a_this->current.pos; f32 var_f30 = sp50.abs(); @@ -1244,7 +1244,7 @@ static void* s_b_sub(void* i_actor, void* i_data) { /* 8094DD74-8094DED0 002234 015C+00 1/1 0/0 0/0 .text ni_windspin__FP8ni_class */ static void ni_windspin(ni_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - fopAc_ac_c* boomerang = (fopAc_ac_c*)i_fpcM_Search(s_b_sub, i_this); + fopAc_ac_c* boomerang = (fopAc_ac_c*)fpcM_Search(s_b_sub, i_this); switch (i_this->mMode) { case 0: @@ -1284,7 +1284,7 @@ static void ni_windspin(ni_class* i_this) { class daNpcMoiR_c : public fopAc_ac_c { public: - MtxP getHandRMtx() { return mpMorf->getModel()->i_getAnmMtx(0x11); } + MtxP getHandRMtx() { return mpMorf->getModel()->getAnmMtx(0x11); } /* 0x568 */ mDoExt_McaMorfSO* mpMorf; }; @@ -1293,7 +1293,7 @@ class daNpcMoiR_c : public fopAc_ac_c { static int ni_demo0(ni_class* i_this) { cXyz sp28; cXyz sp34; - daNpcMoiR_c* moi = (daNpcMoiR_c*)i_fopAcM_SearchByName(PROC_NPC_MOIR); + daNpcMoiR_c* moi = (daNpcMoiR_c*)fopAcM_SearchByName(PROC_NPC_MOIR); if (i_this->mTimers[0] == 0 && moi != NULL) { mDoMtx_stack_c::copy(moi->getHandRMtx()); @@ -1378,7 +1378,7 @@ static void ni_message(ni_class* i_this) { cLib_addCalc0(&i_this->speedF, 1.0f, 2.0f); cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mAngleToPlayer, 2, 0x1000); - if (!i_dComIfGp_event_runCheck() && i_this->mDistToPlayer > 400.0f) { + if (!dComIfGp_event_runCheck() && i_this->mDistToPlayer > 400.0f) { i_this->mAction = ACTION_NORMAL_e; i_this->mMode = 0; } @@ -1649,7 +1649,7 @@ static int ni_play(ni_class* i_this) { static void play_camera(ni_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; // necessary for reg alloc - camera_class* camera = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_class* camera0 = (camera_class*)dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); cXyz sp1D8; @@ -1687,8 +1687,8 @@ static void play_camera(ni_class* i_this) { i_this->field_0xad4 = camera0->mLookat.mCenter; i_this->field_0xaec = dComIfGd_getView()->mFovy; - player->i_changeOriginalDemo(); - player->i_changeDemoMode(1, 1, 0, 0); + player->changeOriginalDemo(); + player->changeDemoMode(1, 1, 0, 0); mDoGph_gInf_c::fadeOut(0.1f, g_blackColor); // fallthrough @@ -1803,9 +1803,9 @@ static void play_camera(ni_class* i_this) { camera->mCamera.Reset(i_this->field_0xad4, i_this->field_0xac8, i_this->field_0xaec, 0); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); - player->i_cancelOriginalDemo(); + player->cancelOriginalDemo(); i_this->mPlayCamMode = 0; i_this->mAction = ACTION_NORMAL_e; @@ -2197,13 +2197,13 @@ static int message(ni_class* i_this) { i_this->field_0x60c = 10; if (i_this->mMsgFlow.doFlow(i_this, NULL, 0)) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); i_this->field_0xa52 = 0; } return 1; } - if (i_dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) { i_this->mMsgFlow.init(i_this, i_this->mFlowNo, 0, NULL); i_this->field_0xa52 = 1; OS_REPORT("////////NI MSG FNO %d\n", i_this->mFlowNo); @@ -2263,14 +2263,14 @@ static int daNi_Execute(ni_class* i_this) { mDoMtx_stack_c::YrotM(i_this->shape_angle.y + i_this->field_0x9ec); mDoMtx_stack_c::ZrotM(i_this->shape_angle.z); mDoMtx_stack_c::scaleM(l_HIO.mBaseSize, l_HIO.mBaseSize, l_HIO.mBaseSize); - model->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); } i_this->mpMorf->play(&i_this->eyePos, 0, 0); i_this->mpBtk->setFrame(i_this->mColor); i_this->mpMorf->modelCalc(); - MTXCopy(model->i_getAnmMtx(5), *calc_mtx); + MTXCopy(model->getAnmMtx(5), *calc_mtx); MtxPosition(&sp30, &i_this->eyePos); i_this->attention_info.position = i_this->eyePos; i_this->attention_info.position.y += 30.0f; @@ -2463,7 +2463,7 @@ static int daNi_Create(fopAc_ac_c* i_this) { } if (strcmp(dComIfGp_getStartStageName(), "F_SP108") == 0 && - !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[528])) + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[528])) { a_this->mAction = ACTION_DEMO0_e; a_this->mTimers[0] = 10; 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 2a59f468ad1..2bf5048adc1 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 @@ -42,22 +42,22 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* 80485838-80485974 000078 013C+00 1/1 0/0 0/0 .text checkWork__8daScex_cFv */ int daScex_c::checkWork() { if (getArg1() == 0xFF || getArg1() == 0 || getArg1() == 3) { - if (i_fopAcM_isSwitch(this, getSwNo())) { + if (fopAcM_isSwitch(this, getSwNo())) { return 0; } } else if ((getArg1() == 1 || getArg1() == 2 || getArg1() == 4) && getSwNo() != 0xFF) { - if (!i_fopAcM_isSwitch(this, getSwNo())) { + if (!fopAcM_isSwitch(this, getSwNo())) { return 0; } } u16 offBit = getOffEventBit(); - if (offBit != 0x0FFF && i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[offBit])) { + if (offBit != 0x0FFF && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[offBit])) { return 0; } u16 onBit = getOnEventBit(); - if (onBit != 0x0FFF && !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[onBit])) { + if (onBit != 0x0FFF && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[onBit])) { return 0; } @@ -175,7 +175,7 @@ int daScex_c::execute() { if (getArg1() == 0xFF || getArg1() == 0 || getArg1() == 3) { if (getSwNo() != 0xFF) { - i_fopAcM_onSwitch(this, getSwNo()); + fopAcM_onSwitch(this, getSwNo()); } } } 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 c99da9af52a..447ee1e8b4e 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 @@ -51,7 +51,7 @@ int daScExit_c::Create() { mToolID = 0xFF; eventInfo.setArchiveName(l_arcName); - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xFF); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xFF); return 1; } @@ -109,7 +109,7 @@ void daScExit_c::actionOrderEvent() { void daScExit_c::actionEvent() { if (dComIfGp_evmng_endCheck(mEventID)) { setAction(ACTION_DEAD_e); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } else { demoProc(); dComIfGp_setPlayerStatus1(0, 0x4000000); diff --git a/rel/d/a/d_a_shop_item/d_a_shop_item.cpp b/rel/d/a/d_a_shop_item/d_a_shop_item.cpp index e667f169a06..e5f891eee1d 100644 --- a/rel/d/a/d_a_shop_item/d_a_shop_item.cpp +++ b/rel/d/a/d_a_shop_item/d_a_shop_item.cpp @@ -160,7 +160,7 @@ void daShopItem_c::set_mtx() { mDoMtx_stack_c::XrotM(mData[mShopItemID].get_angleOffsetX()); } - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 8059EEF4-8059EF48 0005B4 0054+00 1/1 0/0 0/0 .text _execute__12daShopItem_cFv */ 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 5dd4062709f..11140d83a21 100644 --- a/rel/d/a/d_a_swTime/d_a_swTime.cpp +++ b/rel/d/a/d_a_swTime/d_a_swTime.cpp @@ -27,12 +27,12 @@ int daSwTime_c::create() { /* 80D4F6C8-80D4F758 000108 0090+00 1/1 0/0 0/0 .text execute__10daSwTime_cFv */ int daSwTime_c::execute() { - if (mSwbit2 != 0xFF && !i_fopAcM_isSwitch(this,mSwbit2)) { + if (mSwbit2 != 0xFF && !fopAcM_isSwitch(this,mSwbit2)) { return 1; } if (dKy_getdaytime_hour() == mTime && dKy_getdaytime_minute() == 0) { - i_fopAcM_onSwitch(this,mSwbit); + fopAcM_onSwitch(this,mSwbit); } return 1; 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 92a5187d685..d8ec12a1f29 100644 --- a/rel/d/a/d_a_swc00/d_a_swc00.cpp +++ b/rel/d/a/d_a_swc00/d_a_swc00.cpp @@ -91,7 +91,7 @@ static bool hitCheck(daSwc00_c* i_swc) { fopAc_ac_c* player; if (daSwc00_getCondition(i_swc) == 2) { - player = (fopAc_ac_c*)i_dComIfGp_getHorseActor(); + player = (fopAc_ac_c*)dComIfGp_getHorseActor(); } else { player = playerAc; } 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 4bb0ad192e9..139dbea7bbc 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 @@ -153,9 +153,9 @@ cPhs__Step daTbox_c::commonShapeSet() { mpModel->setBaseScale(scale); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(home.angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); if (mpEffectModel != NULL) { - mpEffectModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpEffectModel->setBaseTRMtx(mDoMtx_stack_c::get()); } mDoMtx_copy(mDoMtx_stack_c::get(), mBgMtx); return cPhs_COMPLEATE_e; @@ -374,11 +374,11 @@ void daTbox_c::CreateInit() { } mTboxNo = getTboxNo(); - mEventId = i_dComIfGp_getEventManager().getEventIdx(this, getEvent()); + mEventId = dComIfGp_getEventManager().getEventIdx(this, getEvent()); if (getShapeType() == SHAPE_BOSSKEY) { eventInfo.setArchiveName(getModelInfo()->mArcName); - field_0x984 = i_dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_TREASURE_BOSS", 0xff); + field_0x984 = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_TREASURE_BOSS", 0xff); } initBaseMtx(); @@ -445,7 +445,7 @@ void daTbox_c::initAnm() { if (func_type == 6 && !checkDrop()) { setAction(&actionDropWait); } else if (func_type == 3) { - if (i_fopAcM_isSwitch(this, getSwNo())) { + if (fopAcM_isSwitch(this, getSwNo())) { cXyz pos = current.pos; if (fopAcM_gc_c::gndCheck(&pos)) { current.pos.y = fopAcM_gc_c::getGroundY(); @@ -664,7 +664,7 @@ int daTbox_c::getDir() { u16 bit = 1; u16 dir = 0; for (int i = 0; i < 4; i++) { - if (i_fopAcM_isSwitch(this, getSwNo() + i)) { + if (fopAcM_isSwitch(this, getSwNo() + i)) { dir += bit; } bit = bit << 1; @@ -917,7 +917,7 @@ int daTbox_c::actionDemo() { } else { setAction(&actionWait); } - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); dKy_set_allcol_ratio(1.0f); flagOff(0x18); dComIfGp_event_setItemPartner(NULL); @@ -927,10 +927,10 @@ int daTbox_c::actionDemo() { if (fopAcM_GetRoomNo(this) == 0) { switch (getTboxNo()) { case 3: - dComIfGs_setEventReg(0xedff, i_dComIfGs_getEventReg(0xedff) | 0x40); + dComIfGs_setEventReg(0xedff, dComIfGs_getEventReg(0xedff) | 0x40); break; case 2: - dComIfGs_setEventReg(0xebff, i_dComIfGs_getEventReg(0xebff) | 0x10); + dComIfGs_setEventReg(0xebff, dComIfGs_getEventReg(0xebff) | 0x10); break; default: OSReport_Error("ハートの欠片：想定外の配置です。イベントビットセットできませんでした！\n"); @@ -939,7 +939,7 @@ int daTbox_c::actionDemo() { } else if (fopAcM_GetRoomNo(this) == 3) { switch (getTboxNo()) { case 5: - dComIfGs_setEventReg(0xf0ff, i_dComIfGs_getEventReg(0xf0ff) | 0x80); + dComIfGs_setEventReg(0xf0ff, dComIfGs_getEventReg(0xf0ff) | 0x80); break; default: OSReport_Error("ハートの欠片：想定外の配置です。イベントビットセットできませんでした！\n"); @@ -948,7 +948,7 @@ int daTbox_c::actionDemo() { } } else if (!strcmp(dComIfGp_getStartStageName(), "F_SP109")) { if (fopAcM_GetRoomNo(this) == 0 && getTboxNo() == 0x15) { - dComIfGs_setEventReg(0xefff, i_dComIfGs_getEventReg(0xefff) | 0x10); + dComIfGs_setEventReg(0xefff, dComIfGs_getEventReg(0xefff) | 0x10); } } } @@ -964,7 +964,7 @@ int daTbox_c::actionDemo2() { if ((getEvent() == 0xff && dComIfGp_evmng_endCheck("DEFAULT_TREASURE_APPEAR")) || (getEvent() != 0xff && dComIfGp_evmng_endCheck(mEventId))) { setAction(&actionOpenWait); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } else { demoProc(); } @@ -976,11 +976,11 @@ int daTbox_c::actionDropDemo() { if (mEventId != -1) { if (dComIfGp_evmng_endCheck(mEventId)) { setAction(&actionOpenWait); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); setDzb(); home.pos = current.pos; if (field_0x9c9 != 0) { - camera_class* camera = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); field_0x9c9 = 0; @@ -1260,14 +1260,14 @@ int daTbox_c::actionOpenWait() { if (getShapeType() != SHAPE_SMALL && player->i_checkNowWolf() && !midna->checkMetamorphoseEnable()) { setAction(&actionNotOpenDemo); - mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); demoProc(); field_0x9f4 = 0; } else { field_0x718 = player->checkTreasureRupeeReturn(getItemNo()); setGetDemoItem(); setAction(&actionDemo); - mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); demoProc(); field_0x9f4 = 0; } @@ -1292,7 +1292,7 @@ int daTbox_c::actionOpenWait() { int daTbox_c::actionNotOpenDemo() { if (dComIfGp_evmng_endCheck(mEventId)) { setAction(&actionOpenWait); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } else { demoProc(); } @@ -1307,7 +1307,7 @@ int daTbox_c::checkDrop() { } } else if (getSwType() == 0) { for (int i = 0; i < 4; i++) { - if (i_fopAcM_isSwitch(this, getSwNo() + i)) { + if (fopAcM_isSwitch(this, getSwNo() + i)) { return true; } } @@ -1319,7 +1319,7 @@ int daTbox_c::checkDrop() { */ // nonmatching (regalloc) void daTbox_c::settingDropDemoCamera() { - camera_class* player_camera = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); player_camera->mCamera.Stop(); dStage_MapEvent_dt_c* event_data = dEvt_control_c::searchMapEventData(getEvent(), fopAcM_GetRoomNo(this)); @@ -1364,7 +1364,7 @@ void daTbox_c::settingDropDemoCamera() { int daTbox_c::actionSwOnWait() { if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(&actionDemo2); - mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); } else if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetRoomNo(this))) { if (getEvent() == 0xff) { @@ -1397,7 +1397,7 @@ int daTbox_c::actionDropWait() { setAction(&actionDropDemo); clrDzb(); field_0x97d = false; - mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); if (getSwType() == 0) { settingDropDemoCamera(); } @@ -1418,7 +1418,7 @@ int daTbox_c::actionDropWait() { int daTbox_c::actionGenocide() { if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(&actionDemo2); - mStaffId = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); } else if (!fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this))) { if (mTimer != 0) { @@ -1450,7 +1450,7 @@ int daTbox_c::actionDropWaitForWeb() { shape_angle.z = 0; shape_angle.x = 0; fopAcM_SetGravity(this, -2.0f); - i_fopAcM_onSwitch(this, getSwNo()); + fopAcM_onSwitch(this, getSwNo()); } } setBaseMtx(); @@ -1520,16 +1520,16 @@ void daTbox_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::transM(0.0f, -50.0f, 0.0f); if (field_0x9fc != 0) { - mpModel->i_setBaseTRMtx(field_0xa00); + mpModel->setBaseTRMtx(field_0xa00); } else { - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } mDoMtx_concat(mtx, field_0x988, field_0x988); mDoMtx_copy(mpModel->getBaseTRMtx(), mBgMtx); if (mpSlimeModel != NULL) { mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 15.0f, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle); - mpSlimeModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpSlimeModel->setBaseTRMtx(mDoMtx_stack_c::get()); } } @@ -1620,7 +1620,7 @@ int daTbox_c::Execute(f32 (**param_0)[3][4]) { mDoMtx_stack_c::YrotS(shape_angle.y); mDoMtx_stack_c::multVec(¢er, ¢er); center += current.pos; - if ((getSwNo() != 0xff && i_fopAcM_isSwitch(this, getSwNo())) || getSwNo() == 0xff) { + if ((getSwNo() != 0xff && fopAcM_isSwitch(this, getSwNo())) || getSwNo() == 0xff) { mCyl.SetC(center); dComIfG_Ccsp()->Set(&mCyl); } 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 06d79a9406b..e2ad0450103 100644 --- a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp +++ b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp @@ -19,7 +19,7 @@ void daTbox2_c::initBaseMtx() { void daTbox2_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } @@ -344,7 +344,7 @@ void daTbox2_c::init_actionNotOpenDemo() { /* 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(); + dComIfGp_event_reset(); init_actionOpenWait(); } else { demoProc(); @@ -360,7 +360,7 @@ void daTbox2_c::init_actionOpenDemo() { /* 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(); + dComIfGp_event_reset(); dKy_set_allcol_ratio(1.0f); dComIfGp_event_setItemPartner(NULL); @@ -393,13 +393,13 @@ void daTbox2_c::actionOpenWait() { if (mModelType != TYPE_SMALL_e && daPy_py_c::i_checkNowWolf() && !midna_p->checkMetamorphoseEnable()) { - mStaffIdx = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); + mStaffIdx = 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); + mStaffIdx = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); init_actionOpenDemo(); } diff --git a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp index 988b06a359e..9ded445c96e 100644 --- a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp +++ b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp @@ -41,7 +41,7 @@ static int daVrbox_Draw(vrbox_class* i_this) { mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - fvar, dComIfGd_getInvViewMtx()[2][3]); - soraModel_p->i_setBaseTRMtx(mDoMtx_stack_c::get()); + soraModel_p->setBaseTRMtx(mDoMtx_stack_c::get()); dKy_GxFog_set(); // these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData? diff --git a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp index 43a548688e2..a7cacf4ee58 100644 --- a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp +++ b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp @@ -297,15 +297,15 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { dComIfGd_setListSky(); mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - var_f31, dComIfGd_getInvViewMtx()[2][3]); - kasumim_model_p->i_setBaseTRMtx(mDoMtx_stack_c::get()); + kasumim_model_p->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(kasumim_model_p); mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - var_f31, dComIfGd_getInvViewMtx()[2][3]); - kumo_model_p->i_setBaseTRMtx(mDoMtx_stack_c::get()); + kumo_model_p->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(kumo_model_p); - if (dStage_stagInfo_GetArg0(i_dComIfGp_getStage()->getStagInfo()) != 0 && sun_model_p != NULL && + if (dStage_stagInfo_GetArg0(dComIfGp_getStage()->getStagInfo()) != 0 && sun_model_p != NULL && sun_p != NULL && sun_p->mSunAlpha > 0.0f) { sp14 = sun_p->mPos[0]; @@ -343,7 +343,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { } mDoMtx_stack_c::scaleM(scale, scale, scale); - sun_model_p->i_setBaseTRMtx(mDoMtx_stack_c::get()); + sun_model_p->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(sun_model_p); if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) { @@ -359,7 +359,7 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { mDoMtx_stack_c::scaleM(scale, scale + 0.15f, scale); mDoMtx_stack_c::ZrotM(-mangZ); - sun2_model_p->i_setBaseTRMtx(mDoMtx_stack_c::get()); + sun2_model_p->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(sun2_model_p); mangZ += (s16)(483.0f + cM_rndF(100.0f)); } @@ -473,7 +473,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { wind_vec = *windVec_p; - dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()); + dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); cam_eye = camera_p->mLookat.mEye; cam_center = camera_p->mLookat.mCenter; 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 bee3e0de9e5..9a73da0ecc2 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 @@ -260,10 +260,10 @@ extern "C" asm void __dt__12J3DFrameCtrlFv() { void daBdoor_c::calcMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mOffsetY, current.pos.z); mDoMtx_stack_c::YrotM(home.angle.y); - mpDoorModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpDoorModel->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 300.0f, current.pos.z); mDoMtx_stack_c::YrotM(home.angle.y); - mpLockModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpLockModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 8066F7EC-8066F8E4 00044C 00F8+00 1/1 0/0 0/0 .text CreateInit__9daBdoor_cFv */ @@ -650,7 +650,7 @@ 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 (eventInfo.i_checkCommandDoor()) { - mStaffID = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); + mStaffID = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); setAction(ACT_OPEN); } else { @@ -733,7 +733,7 @@ int daBdoor_c::execute() { &actionEnd, }; if (fopAcM_checkStatus(this, 0x1000)) { - mStaffID = i_dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); + mStaffID = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); } else { (this->*l_action[mAction])(); 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 191411e6ac4..3b75c8f8b45 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 @@ -20,13 +20,13 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { u16 jointNo = i_joint->getJntNo(); J3DModel* model = j3dSys.getModel(); daDbDoor00_c* area = (daDbDoor00_c*)model->getUserArea(); - MTXCopy(model->i_getAnmMtx(jointNo), mDoMtx_stack_c::get()); + MTXCopy(model->getAnmMtx(jointNo), mDoMtx_stack_c::get()); if (jointNo == area->field_0x5c0 && area->field_0x585 == 1) { mDoMtx_stack_c::YrotM(-area->field_0x58a); } else if (jointNo == area->field_0x5c1 && area->field_0x585 == 0) { mDoMtx_stack_c::YrotM(area->field_0x58a); } - model->i_setAnmMtx(jointNo, mDoMtx_stack_c::get()); + model->setAnmMtx(jointNo, mDoMtx_stack_c::get()); mDoMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); } return 1; @@ -142,8 +142,8 @@ void daDbDoor00_c::calcMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(home.angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); - mpModel2->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel2->setBaseTRMtx(mDoMtx_stack_c::get()); xyz.set(0.0f, 0.0f, -150.0f); mDoMtx_stack_c::multVec(&xyz, &field_0x5a8); xyz.set(0.0f, 0.0f, -400.0f); @@ -350,7 +350,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 (eventInfo.i_checkCommandDemoAccrpt()) { - field_0x598 = i_dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0); + field_0x598 = dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0); demoProc(); setAction(3); } else { @@ -362,7 +362,7 @@ int daDbDoor00_c::actionLockOff() { /* 8045E094-8045E108 000D94 0074+00 1/0 0/0 0/0 .text actionLockDemo__12daDbDoor00_cFv */ int daDbDoor00_c::actionLockDemo() { if (dComIfGp_evmng_endCheck("DBDOOR00_STOP_OPEN")) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); setAction(4); } else { demoProc(); @@ -374,7 +374,7 @@ int daDbDoor00_c::actionLockDemo() { */ int daDbDoor00_c::actionCloseWait() { if (eventInfo.i_checkCommandDoor()) { - field_0x598 = i_dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0); + field_0x598 = dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0); demoProc(); setAction(5); dComIfG_Bgsp().Release(mpBgW); 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 80634d147d8..a1fafb4389c 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 @@ -124,7 +124,7 @@ int daDoorPush_c::Create() { mpDoorBgW->SetPushPullCallback((dBgW_Base::PushPull_CallBack)PPCallBack2); eventInfo.setArchiveName(l_arcName); for (int i = 0; i < 2; i++) { - field_0x63a[i] = i_dComIfGp_getEventManager().getEventIdx(this, "PUSH_DOOR_L", 0xff); + field_0x63a[i] = dComIfGp_getEventManager().getEventIdx(this, "PUSH_DOOR_L", 0xff); field_0x63e[i] = 0xff; } fopAcM_setCullSizeFar(this, 5.0f); @@ -278,7 +278,7 @@ static char* action_table[3] = {"WAIT", "OPEN", "SCENE_CHG"}; int daDoorPush_c::demoProc() { daPy_py_c* player = daPy_getPlayerActorClass(); - field_0x644 = i_dComIfGp_evmng_getMyStaffId("pdoor", NULL, 0); + field_0x644 = dComIfGp_evmng_getMyStaffId("pdoor", NULL, 0); s32 actIdx = dComIfGp_evmng_getMyActIdx(field_0x644, action_table, ARRAY_SIZE(action_table), 0, 0); @@ -309,7 +309,7 @@ int daDoorPush_c::demoProc() { break; case OPEN_e: if (rotate() != 0) { - ((daPy_py_c*)dComIfGp_getPlayer(0))->i_offPushPullKeep(); + ((daPy_py_c*)dComIfGp_getPlayer(0))->offPushPullKeep(); setGoal(); fopAcM_seStart(this, Z2SE_OBJ_HYRULE_DR_STOP, 0); field_0x641 = 1; @@ -336,7 +336,7 @@ int daDoorPush_c::demoProc() { /* 80678AEC-80678B10 000DAC 0024+00 1/1 0/0 0/0 .text rotateInit__12daDoorPush_cFv */ void daDoorPush_c::rotateInit() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - player->i_onPushPullKeep(); + player->onPushPullKeep(); field_0x649 = 0; } 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 ea7b28d9654..5a47bb0338f 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 @@ -307,7 +307,7 @@ static void hit_check(e_arrow_class* i_this) { if (i_this->mCcAtSph.ChkAtHit()) { cXyz sp12C(0.4f, 0.4f, 0.4f); - i_dComIfGp_setHitMark(1, i_this, &i_this->current.pos, &i_this->shape_angle, &sp12C, + dComIfGp_setHitMark(1, i_this, &i_this->current.pos, &i_this->shape_angle, &sp12C, 0); fopAcM_delete(i_this); @@ -347,7 +347,7 @@ static void e_arrow_shot(e_arrow_class* i_this) { } case 1: if (i_this->mFlags & 0x20) { - fopAc_ac_c* coach_p = i_fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach_p = fopAcM_SearchByName(PROC_NPC_COACH); if (coach_p != NULL) { cXyz sp30; @@ -499,7 +499,7 @@ static void e_arrow_demo_fire(e_arrow_class* i_this) { } if (!player_p->checkWolfDig() && - (!i_dComIfGp_event_runCheck() || + (!dComIfGp_event_runCheck() || fopAcM_getTalkEventPartner(daPy_getLinkPlayerActorClass()) != (fopAc_ac_c*)daPy_py_c::getMidnaActor())) { @@ -508,7 +508,7 @@ static void e_arrow_demo_fire(e_arrow_class* i_this) { } } - if (i_this->field_0xa0c == 0 && i_fpcM_Search(s_limit_sub, i_this) != NULL) { + if (i_this->field_0xa0c == 0 && fpcM_Search(s_limit_sub, i_this) != NULL) { dBgS_ObjGndChk gnd_chk; sp9C = player_p->current.pos; sp9C.y += 200.0f; @@ -522,7 +522,7 @@ static void e_arrow_demo_fire(e_arrow_class* i_this) { cLib_addCalc2(&i_this->field_0xa10, 10.0f, 1.0f, 1.0f); - if (!i_dComIfGp_event_runCheck()) { + if (!dComIfGp_event_runCheck()) { sp9C.y = 0.0f; sp9C.x = 0.0f; @@ -738,7 +738,7 @@ static int daE_ARROW_Execute(e_arrow_class* i_this) { mDoMtx_stack_c::XrotM(-2000); mDoMtx_stack_c::transM(-60.0f, -10.0f, 40.0f); - i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this))); return 1; } @@ -869,7 +869,7 @@ static int daE_ARROW_Create(fopAc_ac_c* i_this) { } mDoMtx_stack_c::scaleS(0.0f, 0.0f, 0.0f); - a_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + a_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } return phase_state; 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 689a45b2bc2..ce30a897069 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 @@ -65,7 +65,7 @@ static int daE_BI_LEAF_Execute(e_bi_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); - i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); return 1; } 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 ffe5d00ab73..b405af180a4 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 @@ -17,7 +17,7 @@ static int daE_DB_LEAF_Execute(e_db_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); - i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::now); + i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::now); i_this->mpMorf->modelCalc(); 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 f3a70719200..623131edcab 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 @@ -20,7 +20,7 @@ static int daE_HB_LEAF_Execute(e_hb_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); - i_this->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpMorf->modelCalc(); fopAc_ac_c* actor = fopAcM_SearchByID(i_this->field_0x5bc); 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 fdc5ab7c586..9d4facd16f4 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 @@ -96,14 +96,14 @@ static BOOL other_bg_check(daE_PH_c* i_this, fopAc_ac_c* i_other) { /* 8073D5C4-8073D648 000264 0084+00 1/1 0/0 0/0 .text SetStopingCam__8daE_PH_cFv */ void daE_PH_c::SetStopingCam() { - camera_class* camera_p = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_p->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); } /* 8073D648-8073D768 0002E8 0120+00 1/1 0/0 0/0 .text SetStopCam__8daE_PH_cF4cXyzffs */ void daE_PH_c::SetStopCam(cXyz i_center, f32 i_offsetZ, f32 i_offsetY, s16 i_offsetAngle) { - camera_class* camera_p = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset(0.0f, i_offsetY, i_offsetZ); cXyz eye_offset(0.0f, 0.0f, 0.0f); @@ -125,25 +125,25 @@ void daE_PH_c::SetCMoveCam(cXyz i_target, f32 i_scale, f32 i_maxStep) { /* 8073D7AC-8073D850 00044C 00A4+00 1/1 0/0 0/0 .text SetReleaseCam__8daE_PH_cFv */ void daE_PH_c::SetReleaseCam() { - camera_class* camera_p = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_p->mCamera.Reset(mCamCenter, mCamEye); camera_p->mCamera.Start(); camera_p->mCamera.SetTrimSize(0); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } /* 8073D850-8073D904 0004F0 00B4+00 1/1 0/0 0/0 .text ctrlJoint__8daE_PH_cFP8J3DJointP8J3DModel */ int daE_PH_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int jnt_no = i_joint->getJntNo(); - mDoMtx_stack_c::copy(i_model->i_getAnmMtx(jnt_no)); + mDoMtx_stack_c::copy(i_model->getAnmMtx(jnt_no)); if (jnt_no == PH_JNT_HEAD) { mDoMtx_stack_c::YrotM(mHeadRotY); mDoMtx_stack_c::XrotM(-mHeadRotX); } - i_model->i_setAnmMtx(jnt_no, mDoMtx_stack_c::get()); + i_model->setAnmMtx(jnt_no, mDoMtx_stack_c::get()); cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); return 1; } @@ -261,7 +261,7 @@ void daE_PH_c::FlyAnm() { } if (mAnmID == ANM_HANG_START || mAnmID == ANM_WAIT) { - if (fopAcM_checkHookCarryNow(this) && i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { + if (fopAcM_checkHookCarryNow(this) && dComIfGp_checkPlayerStatus1(0, 0x10000)) { field_0x630 = -10.0f - BREG_F(0); field_0x5ae = 15; field_0x616 = 0x1000; @@ -271,7 +271,7 @@ void daE_PH_c::FlyAnm() { SetAnm(ANM_WAIT, J3DFrameCtrl::LOOP_REPEAT_e, 5.0f, mAnmSpeed); } } else if (mAnmID == ANM_HANG_WAIT) { - if (!fopAcM_checkHookCarryNow(this) || !i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { + if (!fopAcM_checkHookCarryNow(this) || !dComIfGp_checkPlayerStatus1(0, 0x10000)) { SetAnm(ANM_HANG_END, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, mAnmSpeed); } } else if (mAnmID == ANM_HANG_END) { @@ -383,7 +383,7 @@ void daE_PH_c::DownBoots() { speedF = 0.0f; current.pos.y += -10.0f; - if (!player_p->i_checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { + if (!player_p->checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { mCAction++; mAnmSpeed = nREG_F(0) + 3.0f; field_0x620 = nREG_F(0) + 3.0f; @@ -402,7 +402,7 @@ void daE_PH_c::UpBoots() { mTargetSpeedY = 0.0f; current.pos.y += 10.0f; - if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { + if (player_p->checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { mCAction--; mAnmSpeed = nREG_F(0) + 3.0f; field_0x620 = nREG_F(0) + 3.0f; @@ -421,14 +421,14 @@ void daE_PH_c::C_Action() { switch (mCAction) { case 0: - if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { + if (player_p->checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { mCAction++; field_0x640 = current.pos.y; mAnmSpeed = nREG_F(0) + 6.0f; field_0x620 = nREG_F(0) + 6.0f; } - if (!player_p->i_checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { + if (!player_p->checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { field_0x620 = field_0x5b8; } @@ -446,7 +446,7 @@ void daE_PH_c::C_Action() { break; case 1: DownBoots(); - if (!player_p->i_checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { + if (!player_p->checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { field_0x620 = field_0x5b8; } break; @@ -464,7 +464,7 @@ void daE_PH_c::C_Action() { } UpBoots(); - if (!player_p->i_checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { + if (!player_p->checkEquipHeavyBoots() || mAnmID != ANM_HANG_WAIT) { field_0x620 = field_0x5b8; } break; @@ -611,7 +611,7 @@ void daE_PH_c::FlyAnm2() { if (mAnmID == ANM_WAIT) { if (fopAcM_searchPlayerDistance(this) < 1000.0f && - i_dComIfGp_checkPlayerStatus1(0, 0x10000)) + dComIfGp_checkPlayerStatus1(0, 0x10000)) { attention_info.flags = 0; field_0x630 = -10.0f - BREG_F(0); @@ -627,7 +627,7 @@ void daE_PH_c::FlyAnm2() { } else if (mAnmID == ANM_HANG_WAIT) { attention_info.flags = 0; - if (!fopAcM_checkHookCarryNow(this) || !i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { + if (!fopAcM_checkHookCarryNow(this) || !dComIfGp_checkPlayerStatus1(0, 0x10000)) { SetAnm(ANM_HANG_END, J3DFrameCtrl::LOOP_ONCE_e, 5.0f, mAnmSpeed); } } else if (mAnmID == ANM_HANG_END) { @@ -671,7 +671,7 @@ void daE_PH_c::StopAction() { cLib_addCalc2(¤t.pos.y, home.pos.y, 0.1f, nREG_F(1) + 30.0f); } - if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { + if (player_p->checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { mCAction++; field_0x640 = current.pos.y; mAnmSpeed = nREG_F(0) + 6.0f; @@ -680,7 +680,7 @@ void daE_PH_c::StopAction() { break; case 1: DownBoots(); - if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { + if (player_p->checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { mAnmSpeed = nREG_F(0) + 6.0f; field_0x620 = nREG_F(0) + 6.0f; } @@ -688,7 +688,7 @@ void daE_PH_c::StopAction() { case 2: UpBoots(); - if (player_p->i_checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { + if (player_p->checkEquipHeavyBoots() && mAnmID == ANM_HANG_WAIT) { mAnmSpeed = nREG_F(0) + 6.0f; field_0x620 = nREG_F(0) + 6.0f; } @@ -785,7 +785,7 @@ void daE_PH_c::SetHeadAngle(s16 i_targetAngle) { void daE_PH_c::CamAction() { cXyz sp20(0.0f, 0.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->i_getAnmMtx(2)); + mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); mDoMtx_stack_c::multVec(&sp20, &sp20); sp20.y += yREG_F(3); @@ -824,7 +824,7 @@ void daE_PH_c::CamAction() { SetReleaseCam(); Z2GetAudioMgr()->bgmStart(Z2BGM_DRAGON_BTL02, 0, 0); - i_fopAcM_onSwitch(this, 0x3F); + fopAcM_onSwitch(this, 0x3F); break; } } @@ -920,7 +920,7 @@ void daE_PH_c::DemoAction() { mpMorf->setPlaySpeed(speed.y / 20.0f + 1.0f); - if (mTimers[1] == 0 || !i_dComIfGp_event_runCheck()) { + if (mTimers[1] == 0 || !dComIfGp_event_runCheck()) { fopAcM_delete(this); } break; @@ -955,7 +955,7 @@ void daE_PH_c::ToumeiAction() { cXyz hs_offset; if (fopAcM_searchPlayerDistance(this) > XREG_F(1) + 2300.0f || - i_dComIfGp_checkPlayerStatus1(0, 0x10000)) + dComIfGp_checkPlayerStatus1(0, 0x10000)) { attention_info.flags = 0; } @@ -1073,7 +1073,7 @@ void daE_PH_c::ObjHit() { cXyz hs_offset(0.0f, y + KREG_F(8), 0.0f); - if (i_dComIfGp_checkPlayerStatus0(0, 0x4000)) { + if (dComIfGp_checkPlayerStatus0(0, 0x4000)) { mCcSph.OffTgShield(); } else { mCcSph.OnTgShield(); @@ -1167,7 +1167,7 @@ void daE_PH_c::setBaseMtx() { mDoMtx_stack_c::XrotM(shape_angle.x); mDoMtx_stack_c::ZrotM(shape_angle.z); - mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); mpMorf->modelCalc(); } @@ -1331,8 +1331,8 @@ int daE_PH_c::create() { if (strcmp(dComIfGp_getStartStageName(), "D_MN07A") == 0 && mAction == 2) { if (!dComIfGs_isZoneSwitch(2, fopAcM_GetRoomNo(this))) { field_0x5b2 = 0; - i_fopAcM_offSwitch(this, 0x10); - i_fopAcM_offSwitch(this, 0x3F); + fopAcM_offSwitch(this, 0x10); + fopAcM_offSwitch(this, 0x3F); } } diff --git a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp index 103eaa618f8..0949124cbef 100644 --- a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp +++ b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp @@ -146,18 +146,17 @@ extern "C" void set__4cXyzFfff(); extern "C" void onCondition__11dEvt_info_cFUs(); extern "C" void checkCommandDemoAccrpt__11dEvt_info_cFv(); extern "C" void __ct__4cXyzFv(); -extern "C" static void fopAcM_SearchByName__Fs(); +extern "C" static void fopAcM_SearchByName__Fs(s16); extern "C" static void fopAcM_SearchByID__FUi(unsigned int); extern "C" static daHorse_c* dComIfGp_getHorseActor__Fv(); extern "C" static void dComIfGp_getPlayer__Fi(int); extern "C" static void dComIfGp_getCamera__Fi(int); -extern "C" static void dComIfGp_getPlayerCameraID__Fi(); +extern "C" static void dComIfGp_getPlayerCameraID__Fi(int); extern "C" static void dMsgObject_isTalkNowCheck__Fv(); extern "C" void abs__4cXyzCFv(); extern "C" static void cMtx_XrotM__FPA4_fs(); extern "C" static void JMAFastSqrt__Ff(); -extern "C" static void dComIfGp_particle_set__FUlUsPC4cXyzPC5csXyzPC4cXyz(u32 param_0, u16 param_1, cXyz const* param_2, - csXyz const* param_3, cXyz const* param_4); +extern "C" static void dComIfGp_particle_set__FUlUsPC4cXyzPC5csXyzPC4cXyz(); extern "C" void cancelOriginalDemo__9daHorse_cFv(); extern "C" void __ct__10JAISoundIDFUl(u32* this_replacement, u32 param_0); extern "C" static void dComIfGp_getVibration__Fv(); @@ -172,7 +171,7 @@ extern "C" void changeDemoMode__9daHorse_cFUli(); extern "C" void setHorsePosAndAngle__9daHorse_cFPC4cXyzs(); extern "C" void startCheckSkipEdge__14dEvt_control_cFPv(); extern "C" static void dComIfGp_getEvent__Fv(); -extern "C" static void fpcM_Search__FPFPvPv_PvPv(); +extern "C" static void fpcM_Search__FPFPvPv_PvPv(void* (*param_0)(void*, void*), void* param_1); extern "C" void changeOriginalDemo__9daHorse_cFv(); extern "C" extern char const* const d_a_e_wb__stringBase0; @@ -2799,7 +2798,7 @@ asm void mDoGph_gInf_c::fadeIn(f32 param_0, _GXColor& param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_control_c::checkSkipEdge() { +extern "C" asm void checkSkipEdge__14dEvt_control_cFv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/checkSkipEdge__14dEvt_control_cFv.s" } @@ -4540,8 +4539,7 @@ static asm void func_807E22B0() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGp_setHitMark(u16 param_0, fopAc_ac_c* param_1, cXyz const* param_2, - csXyz const* param_3, cXyz const* param_4, u32 param_5) { +extern "C" asm void dComIfGp_setHitMark__FUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dComIfGp_setHitMark__FUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl.s" } @@ -4552,7 +4550,7 @@ static asm void dComIfGp_setHitMark(u16 param_0, fopAc_ac_c* param_1, cXyz const #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::changeDemoPos0(cXyz const* param_0) { +extern "C" asm void changeDemoPos0__9daPy_py_cFPC4cXyz() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/changeDemoPos0__9daPy_py_cFPC4cXyz.s" } @@ -4562,7 +4560,7 @@ asm void daPy_py_c::changeDemoPos0(cXyz const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::changeDemoMode(u32 param_0, int param_1, int param_2, s16 param_3) { +extern "C" asm void changeDemoMode__9daPy_py_cFUliis() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/changeDemoMode__9daPy_py_cFUliis.s" } @@ -4577,7 +4575,7 @@ void daPy_py_c::changeDemoParam2(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void std::fabsf(f32 param_0) { +extern "C" asm void fabsf__3stdFf() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/fabsf__3stdFf.s" } @@ -4619,7 +4617,7 @@ static asm void fopAcM_searchPlayerAngleY__FPC10fopAc_ac_c(fopAc_ac_c const* par #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGs_onEventBit__FUs(u16 param_0) { +extern "C" asm void dComIfGs_onEventBit__FUs(u16) { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dComIfGs_onEventBit__FUs.s" } @@ -4640,7 +4638,7 @@ extern "C" asm void Z2GetAudioMgr__Fv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::cancelOriginalDemo() { +extern "C" asm void cancelOriginalDemo__9daPy_py_cFv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/cancelOriginalDemo__9daPy_py_cFv.s" } @@ -4650,7 +4648,7 @@ asm void daPy_py_c::cancelOriginalDemo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGp_event_reset() { +extern "C" asm void dComIfGp_event_reset__Fv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dComIfGp_event_reset__Fv.s" } @@ -4660,7 +4658,7 @@ static asm void dComIfGp_event_reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::changeOriginalDemo() { +extern "C" asm void changeOriginalDemo__9daPy_py_cFv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/changeOriginalDemo__9daPy_py_cFv.s" } @@ -4670,7 +4668,7 @@ asm void daPy_py_c::changeOriginalDemo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void daPy_getPlayerActorClass__Fv() { +extern "C" asm void daPy_getPlayerActorClass__Fv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/daPy_getPlayerActorClass__Fv.s" } @@ -4714,7 +4712,7 @@ extern "C" asm void set__4cXyzFfff() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_info_c::onCondition(u16 param_0) { +extern "C" asm void onCondition__11dEvt_info_cFUs() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/onCondition__11dEvt_info_cFUs.s" } @@ -4741,7 +4739,7 @@ extern "C" void __ct__4cXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void fopAcM_SearchByName(s16 param_0) { +extern "C" asm void fopAcM_SearchByName__Fs(s16) { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/fopAcM_SearchByName__Fs.s" } @@ -4751,7 +4749,7 @@ static asm void fopAcM_SearchByName(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" static asm void fopAcM_SearchByID__FUi(unsigned int param_0) { +extern "C" asm void fopAcM_SearchByID__FUi(unsigned int) { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/fopAcM_SearchByID__FUi.s" } @@ -4761,7 +4759,7 @@ extern "C" static asm void fopAcM_SearchByID__FUi(unsigned int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm daHorse_c* dComIfGp_getHorseActor__Fv() { +extern "C" asm daHorse_c* dComIfGp_getHorseActor__Fv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dComIfGp_getHorseActor__Fv.s" } @@ -4771,7 +4769,7 @@ static asm daHorse_c* dComIfGp_getHorseActor__Fv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGp_getPlayer__Fi(int param_0) { +extern "C" asm void dComIfGp_getPlayer__Fi(int) { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dComIfGp_getPlayer__Fi.s" } @@ -4781,7 +4779,7 @@ static asm void dComIfGp_getPlayer__Fi(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGp_getCamera__Fi(int param_0) { +extern "C" asm void dComIfGp_getCamera__Fi(int) { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dComIfGp_getCamera__Fi.s" } @@ -4791,7 +4789,7 @@ static asm void dComIfGp_getCamera__Fi(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm s8 dComIfGp_getPlayerCameraID(int param_0) { +extern "C" asm void dComIfGp_getPlayerCameraID__Fi(int) { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dComIfGp_getPlayerCameraID__Fi.s" } @@ -4801,7 +4799,7 @@ static asm s8 dComIfGp_getPlayerCameraID(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dMsgObject_isTalkNowCheck() { +extern "C" asm void dMsgObject_isTalkNowCheck__Fv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dMsgObject_isTalkNowCheck__Fv.s" } @@ -4845,8 +4843,7 @@ static asm void JMAFastSqrt__Ff() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGp_particle_set__FUlUsPC4cXyzPC5csXyzPC4cXyz(u32 param_0, u16 param_1, cXyz const* param_2, - csXyz const* param_3, cXyz const* param_4) { +extern "C" asm void dComIfGp_particle_set__FUlUsPC4cXyzPC5csXyzPC4cXyz() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dComIfGp_particle_set__FUlUsPC4cXyzPC5csXyzPC4cXyz.s" } @@ -4856,7 +4853,7 @@ static asm void dComIfGp_particle_set__FUlUsPC4cXyzPC5csXyzPC4cXyz(u32 param_0, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daHorse_c::cancelOriginalDemo() { +extern "C" asm void cancelOriginalDemo__9daHorse_cFv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/cancelOriginalDemo__9daHorse_cFv.s" } @@ -4871,7 +4868,7 @@ extern "C" void __ct__10JAISoundIDFUl(u32* this_replacement, u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGp_getVibration__Fv() { +extern "C" asm void dComIfGp_getVibration__Fv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dComIfGp_getVibration__Fv.s" } @@ -4956,7 +4953,7 @@ asm void daHorse_c::changeDemoPos0(cXyz const* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daHorse_c::changeDemoMode(u32 param_0, int param_1) { +extern "C" asm void changeDemoMode__9daHorse_cFUli() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/changeDemoMode__9daHorse_cFUli.s" } @@ -4976,7 +4973,7 @@ asm void daHorse_c::setHorsePosAndAngle(cXyz const* param_0, s16 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_control_c::startCheckSkipEdge(void* param_0) { +extern "C" asm void startCheckSkipEdge__14dEvt_control_cFPv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/startCheckSkipEdge__14dEvt_control_cFPv.s" } @@ -4986,7 +4983,7 @@ asm void dEvt_control_c::startCheckSkipEdge(void* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm dEvt_control_c& dComIfGp_getEvent() { +extern "C" asm void dComIfGp_getEvent__Fv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/dComIfGp_getEvent__Fv.s" } @@ -4996,7 +4993,7 @@ static asm dEvt_control_c& dComIfGp_getEvent() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void fpcM_Search(void* (*param_0)(void*, void*), void* param_1) { +static asm void fpcM_Search__FPFPvPv_PvPv(void* (*param_0)(void*, void*), void* param_1) { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/fpcM_Search__FPFPvPv_PvPv.s" } @@ -5006,7 +5003,7 @@ static asm void fpcM_Search(void* (*param_0)(void*, void*), void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daHorse_c::changeOriginalDemo() { +extern "C" asm void changeOriginalDemo__9daHorse_cFv() { nofralloc #include "asm/rel/d/a/e/d_a_e_wb/d_a_e_wb/changeOriginalDemo__9daHorse_cFv.s" } 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 883e88367fb..1272aa1e5df 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 @@ -20,7 +20,7 @@ static int daE_YD_LEAF_Draw(e_yd_leaf_class* i_this) { /* 807F7EC0-807F7FEC 000120 012C+00 2/1 0/0 0/0 .text daE_YD_LEAF_Execute__FP15e_yd_leaf_class */ 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(); + stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo(); if (dStage_stagInfo_GetSTType(pstag) != ST_FIELD && fopAcM_SearchByID(i_this->parentActorID) == NULL) { @@ -38,7 +38,7 @@ static int daE_YD_LEAF_Execute(e_yd_leaf_class* i_this) { mDoMtx_stack_c::YrotM(i_this->shape_angle.y); mDoMtx_stack_c::XrotM(i_this->shape_angle.x); 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->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpMorf->modelCalc(); return 1; } 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 6b44dd8eb70..e61d64121ff 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 @@ -513,7 +513,7 @@ static int daE_YK_Draw(e_yk_class* i_this) { /* 80804B38-80804BB0 0003F8 0078+00 1/1 0/0 0/0 .text shot_b_sub__FPvPv */ static void* shot_b_sub(void* param_0, void* param_1) { if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_BOOMERANG && - !i_dComIfGp_checkPlayerStatus0(0,0x80000) && + !dComIfGp_checkPlayerStatus0(0,0x80000) && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(param_0) == 1) { return param_0; @@ -1535,7 +1535,7 @@ COMPILER_STRIP_GATE(0x80807D44, &lit_4725); #ifdef NONMATCHING // matches with literals static void e_yk_wind(e_yk_class* i_this) { - e_yk_class* yk = (e_yk_class*)i_fpcM_Search(shot_b_sub,i_this); + e_yk_class* yk = (e_yk_class*)fpcM_Search(shot_b_sub,i_this); i_this->speedF = 0.0f; switch(i_this->mActionPhase) { @@ -1732,7 +1732,7 @@ static int daE_YK_Execute(e_yk_class* i_this) { // need to define inline here MTXCopy(daPy_getLinkPlayerActorClass()->getWolfMouthMatrix(),mDoMtx_stack_c::now); - model->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&i_this->current.pos); } else { if (i_this->health > 0 && i_this->field_0x6a0 == 0 && i_this->current.pos.y < player->current.pos.y) { @@ -1747,7 +1747,7 @@ static int daE_YK_Execute(e_yk_class* i_this) { mDoMtx_stack_c::ZrotM(i_this->shape_angle.z); mDoMtx_stack_c::scaleM(l_HIO.field_0x08,l_HIO.field_0x08,l_HIO.field_0x08); - model->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); } i_this->mpMorfSO->modelCalc(); @@ -1774,7 +1774,7 @@ static int daE_YK_Execute(e_yk_class* i_this) { JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->mParticleEmitterIds[i]); if (emitter) { - emitter->setGlobalRTMatrix(model->i_getAnmMtx(e_idx[i])); + emitter->setGlobalRTMatrix(model->getAnmMtx(e_idx[i])); }; } } @@ -1782,7 +1782,7 @@ static int daE_YK_Execute(e_yk_class* i_this) { - MTXCopy(model->i_getAnmMtx(2),(MtxP)calc_mtx); + MTXCopy(model->getAnmMtx(2),(MtxP)calc_mtx); pos.set(0.0f,0.0f,0.0f); MtxPosition(&pos,&i_this->eyePos); @@ -1928,7 +1928,7 @@ static int daE_YK_Create(fopAc_ac_c* i_this) { yk->mPlayerTrigger = 100.0f * yk->mPlayerTriggerBase; - if (i_fopAcM_SearchByName(PROC_E_PZ)) { + if (fopAcM_SearchByName(PROC_E_PZ)) { // For phantom zant fights. Used in pl_check above yk->mPlayerTrigger = 100000.0f; } 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 cf851dd7177..7ac37f96ca0 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 @@ -856,9 +856,9 @@ void daE_YM_c::setElecEffect1() { cXyz cStack_2c(fVar3, fVar3, fVar3); MtxP iVar5; if (mFlyType == true) { - iVar5 = field_0x5b4->getModel()->i_getAnmMtx(8); + iVar5 = field_0x5b4->getModel()->getAnmMtx(8); } else { - iVar5 = field_0x5b4->getModel()->i_getAnmMtx(0); + iVar5 = field_0x5b4->getModel()->getAnmMtx(0); } cXyz cStack_38(iVar5[0][3], iVar5[1][3], iVar5[2][3]); @@ -886,9 +886,9 @@ void daE_YM_c::setElecEffect2() { cXyz cStack_2c(fVar3, fVar3, fVar3); MtxP iVar5; if (mFlyType == true) { - iVar5 = field_0x5b4->getModel()->i_getAnmMtx(8); + iVar5 = field_0x5b4->getModel()->getAnmMtx(8); } else { - iVar5 = field_0x5b4->getModel()->i_getAnmMtx(0); + iVar5 = field_0x5b4->getModel()->getAnmMtx(0); } cXyz cStack_38(iVar5[0][3], iVar5[1][3], iVar5[2][3]); setElecEffect1(); @@ -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, &eyePos, NULL, NULL, 0); + dComIfGp_setHitMark(3, this, &eyePos, NULL, NULL, 0); } setActionMode(ACT_DOWN); @@ -1858,7 +1858,7 @@ static void* s_ym_sub(void* param_0, void* param_1) { void daE_YM_c::checkFrinedSamePos() { if (mFriendFlag == 0) { setFriendFlag(0x80); - i_fpcM_Search(s_ym_sub, this); + fpcM_Search(s_ym_sub, this); } } @@ -1879,7 +1879,7 @@ void daE_YM_c::mtx_set() { mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::scaleM(field_0x68c, field_0x68c, field_0x68c); - field_0x5b4->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + field_0x5b4->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); field_0x5b4->modelCalc(); } @@ -2111,7 +2111,7 @@ void daE_YM_c::setHideType() { m_near_obj = NULL; m_obj_dist = FLOAT_LABEL(lit_3925); - i_fpcM_Search(s_obj_sub, this); + fpcM_Search(s_obj_sub, this); if (m_near_obj != NULL) { cXyz obj_pos(m_near_obj->current.pos); 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 6defc1a3cfb..174c94db495 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 @@ -29,7 +29,7 @@ static void* s_e_ym(void* i_actorP1, void* i_actorP2) { /* 80815E8C-80815EF8 00010C 006C+00 1/1 0/0 0/0 .text execute__12daE_YM_TAG_cFv */ int daE_YM_TAG_c::execute() { - daE_YM_c* shadow_insectP = (daE_YM_c*)i_fpcM_Search(s_e_ym,this); + daE_YM_c* shadow_insectP = (daE_YM_c*)fpcM_Search(s_e_ym,this); if (shadow_insectP) { shadow_insectP->setTagPos(current.pos); 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 8954d7e1d42..9035dc8ca5a 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 @@ -98,7 +98,7 @@ static cXyz get_check_pos(kytag00_class* i_this) { f32 temp_f2 = i_this->current.pos.abs(player_p->current.pos); ret = player_p->current.pos; - if (i_dComIfGp_event_runCheck() && temp_f < temp_f2) { + if (dComIfGp_event_runCheck() && temp_f < temp_f2) { ret = camera_p->mLookat.mEye; } } else { 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 c1d5cd45674..434cc93eff8 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 @@ -16,7 +16,7 @@ static int daKytag02_Draw(kytag02_class* i_this) { /* 80855AC0-80855CC4 000080 0204+00 1/0 0/0 0/0 .text daKytag02_Execute__FP13kytag02_class */ static int daKytag02_Execute(kytag02_class* i_this) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); cXyz* wind_vec = dKyw_get_wind_vec(); if (dComIfGs_isSwitch(i_this->field_0x577, i_this->home.roomNo)) { @@ -63,7 +63,7 @@ static int daKytag02_Execute(kytag02_class* i_this) { env_light->custom_windpower = 0.3f; } } else { - env_light = i_dKy_getEnvlight(); + env_light = dKy_getEnvlight(); env_light->mEvtWindSet = 0; if (i_this->field_0x578 != 99) { @@ -91,7 +91,7 @@ static int daKytag02_IsDelete(kytag02_class* i_this) { /* 80855CCC-80855CEC 00028C 0020+00 1/0 0/0 0/0 .text daKytag02_Delete__FP13kytag02_class */ static int daKytag02_Delete(kytag02_class* i_this) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); env_light->mEvtWindSet = 0; env_light->mMoyaCount = 0; @@ -101,7 +101,7 @@ static int daKytag02_Delete(kytag02_class* i_this) { /* 80855CEC-80855DF4 0002AC 0108+00 1/0 0/0 0/0 .text daKytag02_Create__FP10fopAc_ac_c */ static int daKytag02_Create(fopAc_ac_c* i_this) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); dKyw_get_wind_vec(); fopAcM_SetupActor(i_this, kytag02_class); 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 610e4b7cdf7..ee9df5cd67b 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 @@ -12,7 +12,7 @@ /* 8085786C-80857918 0000EC 00AC+00 1/1 0/0 0/0 .text dice_wether_init__FUcff */ static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); env_light->mDiceWeatherMode = i_weatherMode; env_light->mDiceWeatherTime = @@ -25,7 +25,7 @@ static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentT /* 80857918-808579EC 000198 00D4+00 1/1 0/0 0/0 .text dice_wether_execute__FUcff */ static void dice_wether_execute(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); env_light->mDiceWeatherMode = i_weatherMode; if (env_light->mDiceWeatherMode != DICE_MODE_DONE_e) { @@ -45,7 +45,7 @@ static void dice_wether_execute(u8 i_weatherMode, f32 i_weatherTime, f32 i_curre /* 808579EC-80857A50 00026C 0064+00 3/3 0/0 0/0 .text dice_rain_minus__Fv */ static void dice_rain_minus() { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); if ((g_Counter.mCounter0 & 3) == 0) { // run block every 4 frames @@ -98,7 +98,7 @@ static void dKy_event_proc() { static u8 S_wether_mode_pat05[4] = {1, 5, 1, 0xFF}; static f32 S_wether_time_pat05[3] = {3.75f, 7.5f, 3.75f}; - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); if (!g_env_light.mCameraInWater) { if (g_env_light.mInitAnmTimer == 0) { @@ -322,7 +322,7 @@ static int daKytag06_Draw(kytag06_class* i_this) { /* 8085814C-8085824C 0009CC 0100+00 1/1 0/0 0/0 .text * daKytag06_lv7_boss_wether_proc__FP13kytag06_classUc */ static void daKytag06_lv7_boss_wether_proc(kytag06_class* i_this, u8 param_1) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); g_env_light.mThunderEff.mMode = 0; u8 weather_colpat = g_env_light.mColpatWeather; @@ -360,7 +360,7 @@ static void daKytag06_lv7_boss_wether_proc(kytag06_class* i_this, u8 param_1) { /* 8085824C-808584B4 000ACC 0268+00 1/1 0/0 0/0 .text * daKytag06_Ganon_wether_proc__FP13kytag06_classUc */ static void daKytag06_Ganon_wether_proc(kytag06_class* i_this, u8 param_1) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); g_env_light.mThunderEff.mMode = 0; dKyw_evt_wind_set(0, -0x4000); @@ -425,7 +425,7 @@ static void daKytag06_Ganon_wether_proc(kytag06_class* i_this, u8 param_1) { break; } - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { g_env_light.mThunderEff.mMode = 1; } } @@ -433,7 +433,7 @@ static void daKytag06_Ganon_wether_proc(kytag06_class* i_this, u8 param_1) { /* 808584B4-808586C4 000D34 0210+00 3/2 0/0 0/0 .text daKytag06_wether_proc__FP13kytag06_classUc */ static void daKytag06_wether_proc(kytag06_class* i_this, u8 param_1) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); g_env_light.mThunderEff.mMode = 0; u8 weather_colpat = env_light->mColpatWeather; @@ -537,7 +537,7 @@ static void daKytag06_wether_proc(kytag06_class* i_this, u8 param_1) { /* 808586C4-808586F0 000F44 002C+00 1/1 0/0 0/0 .text * daKytag06_type_07_wether_Execute__FP13kytag06_class */ static void daKytag06_type_07_wether_Execute(kytag06_class* i_this) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); daKytag06_wether_proc(i_this, env_light->field_0x12cc); } @@ -546,7 +546,7 @@ static void daKytag06_type_07_wether_Execute(kytag06_class* i_this) { static void daKytag06_type_07_Execute(kytag06_class* i_this) { cXyz spX; f32 current_time = dComIfGs_getTime(); - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); camera_class* camera = dComIfGp_getCamera(0); if (i_this->field_0x574 == 0) { @@ -726,7 +726,7 @@ static void daKytag06_type_06_Execute(kytag06_class* i_this) { }; dComIfGs_getTime(); - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); daKytag06_wether_proc(i_this, env_light->field_0x12cc); cXyz spX; @@ -792,14 +792,14 @@ static void daKytag06_type_06_Execute(kytag06_class* i_this) { /* 80858CD4-80858D00 001554 002C+00 1/1 0/0 0/0 .text daKytag06_type_08_Execute__FP13kytag06_class */ static void daKytag06_type_08_Execute(kytag06_class* i_this) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); daKytag06_lv7_boss_wether_proc(i_this, env_light->field_0x12cc); } /* 80858D00-80858D2C 001580 002C+00 1/1 0/0 0/0 .text daKytag06_type_09_Execute__FP13kytag06_class */ static void daKytag06_type_09_Execute(kytag06_class* i_this) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); daKytag06_Ganon_wether_proc(i_this, env_light->field_0x12cc); } @@ -807,13 +807,13 @@ static void daKytag06_type_09_Execute(kytag06_class* i_this) { */ static void daKytag06_type_10_Execute(kytag06_class* i_this) { u8 tmp = 0; - if (i_dComIfGs_isEventBit(dSv_event_flag_c::F_0266)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::F_0266)) { // 2008: Snowpeak Ruins completed tmp = 0; - } else if (i_dComIfGs_isEventBit(dSv_event_flag_c::F_0065)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::F_0065)) { // 1420: Talked to Yeta after giving cheese tmp = 2; - } else if (i_dComIfGs_isEventBit(dSv_event_flag_c::F_0064)) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::F_0064)) { // 1440: Talked to Yeta after giving pumpkin tmp = 1; } @@ -948,7 +948,7 @@ static void daKytag06_type_03_Execute(kytag06_class* i_this) { switch (i_this->mMode) { case 0: // 0C01: Midna's Desperate Hour started 1E08: Midna's Desperate Hour Completed - if (i_dComIfGs_isEventBit(dSv_event_flag_c::M_071) && !i_dComIfGs_isEventBit(dSv_event_flag_c::F_0250)) { + if (dComIfGs_isEventBit(dSv_event_flag_c::M_071) && !dComIfGs_isEventBit(dSv_event_flag_c::F_0250)) { i_this->mMode = 1; i_this->field_0x578 = 450; dKy_change_colpat(i_this->field_0x591); @@ -1167,7 +1167,7 @@ static int daKytag06_Execute(kytag06_class* i_this) { if (time < 255.0f) { time += 0.03f; - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { time += 0.1f; } @@ -1246,7 +1246,7 @@ static void daKytag06_type03_init(fopAc_ac_c* i_this) { if (this_->field_0x597 == 0) { // 0C01: Midna's Desperate Hour started 1E08: Midna's Desperate Hour Completed - if (i_dComIfGs_isEventBit(0x0C01) && !i_dComIfGs_isEventBit(0x1E08) && this_->mSwNo != 0xFF) + if (dComIfGs_isEventBit(0x0C01) && !dComIfGs_isEventBit(0x1E08) && this_->mSwNo != 0xFF) { s32 stayNo = dComIfGp_roomControl_getStayNo(); diff --git a/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp b/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp index 6095a0faeb7..ee9d536f501 100644 --- a/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp +++ b/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp @@ -285,7 +285,7 @@ COMPILER_STRIP_GATE(0x8085B30C, &lit_4041); // matches with literals #ifdef NONMATCHING static int daKytag08_Execute(kytag08_class* i_this) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); daPy_py_c* player_p = daPy_getPlayerActorClass(); JGeometry::TVec3 particle_scale; @@ -300,7 +300,7 @@ static int daKytag08_Execute(kytag08_class* i_this) { i_this->current.pos.z = env_light->field_0x0c18[0].mPos.z; } - if (i_this->field_0x5b8.abs(i_this->current.pos) < 2000.0f && !i_dComIfGp_event_runCheck()) { + if (i_this->field_0x5b8.abs(i_this->current.pos) < 2000.0f && !dComIfGp_event_runCheck()) { if (i_this->field_0x5d4 > 100) { f32 var_f30; f32 var_f31; @@ -334,12 +334,12 @@ static int daKytag08_Execute(kytag08_class* i_this) { } if (!dKy_shadow_mode_check(2)) { - if (!i_dComIfGp_event_runCheck()) { + if (!dComIfGp_event_runCheck()) { cLib_addCalc(&i_this->field_0x5d0, 0.0f, 0.2f, 0.005f, 0.001f); } } else if (i_this->field_0x5d4 != 0) { cLib_addCalc(&i_this->field_0x5d0, 1.0f, 0.5f, 0.01f, 0.001f); - } else if (!i_dComIfGp_event_runCheck()) { + } else if (!dComIfGp_event_runCheck()) { cLib_addCalc(&i_this->field_0x5d0, 0.25f, 0.01f, 0.002f, 0.001f); } @@ -552,7 +552,7 @@ SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { #ifdef NONMATCHING static int daKytag08_Create(fopAc_ac_c* i_this) { cXyz sp(1.0f, 1.0f, 1.0f); - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); fopAcM_SetupActor(i_this, kytag08_class); 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 6d457f240a2..be9d65673c0 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 @@ -27,8 +27,8 @@ static int daKytag09_Draw(kytag09_class* i_this) { dComIfGd_setListBG(); if (i_this->mType != 1) { - i_this->mpModel->i_setBaseTRMtx(m); - i_this->mpModel2->i_setBaseTRMtx(m); + i_this->mpModel->setBaseTRMtx(m); + i_this->mpModel2->setBaseTRMtx(m); if (!dComIfGs_isDarkClearLV(1)) { i_this->mBtk_2.entry(i_this->mpModel->getModelData()); @@ -40,7 +40,7 @@ static int daKytag09_Draw(kytag09_class* i_this) { mDoExt_modelUpdateDL(i_this->mpModel2); } } else { - i_this->mpModel->i_setBaseTRMtx(m); + i_this->mpModel->setBaseTRMtx(m); if (!dComIfGs_isDarkClearLV(0)) { i_this->mBtk_2.entry(i_this->mpModel->getModelData()); diff --git a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp index a8d6d2cdc91..8b1683f9970 100644 --- a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp +++ b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp @@ -17,13 +17,13 @@ static int daKytag11_Draw(kytag11_class* i_this) { /* 80529520-80529798 000080 0278+00 1/0 0/0 0/0 .text daKytag11_Execute__FP13kytag11_class */ static int daKytag11_Execute(kytag11_class* i_this) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); i_this->mChangeTime = false; i_this->mChangeTime = true; if (i_this->mOnEventID != 0xFFF) { - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mOnEventID])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mOnEventID])) { i_this->mChangeTime = false; } } else if (i_this->mOnSwitchNo != 0xFF) { @@ -34,7 +34,7 @@ static int daKytag11_Execute(kytag11_class* i_this) { } if (i_this->mOffEventID != 0xFFF) { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mOffEventID])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mOffEventID])) { i_this->mChangeTime = false; } } else if (i_this->mOffSwitchNo != 0xFF) { 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 a970c6e4fdd..db686e71473 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 @@ -28,7 +28,7 @@ static int daKytag14_Execute(kytag14_class* i_this) { } if (i_this->mEventID1 != 0xFFFF) { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mEventID1])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mEventID1])) { event1_set = true; } else { event1_set = false; @@ -36,7 +36,7 @@ static int daKytag14_Execute(kytag14_class* i_this) { } if (i_this->mEventID2 != 0xFFFF) { - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mEventID2])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_this->mEventID2])) { event2_unset = true; } else { event2_unset = false; diff --git a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp index 3f2c2fb6da6..00df251fcbc 100644 --- a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp +++ b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp @@ -35,7 +35,7 @@ static int daKytag15_Draw(kytag15_class* i_this) { mat_p->setTevColor(0, &color); i_this->mpModel->setBaseScale(scale); - i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mBtk.entry(i_this->mpModel->getModelData()); i_this->mBtk.play(); 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 c3a106de8d6..7e16d581d30 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 @@ -256,16 +256,16 @@ void daNpcAsh_c::setLookMode(int i_lookMode, fopAc_ac_c* i_talkPartner) { void daNpcAsh_c::searchActors() { if (!mActorMngr[1].getActorP()) { - mActorMngr[1].entry(i_fopAcM_SearchByName(PROC_NPC_SHAD)); + mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_SHAD)); } if (!mActorMngr[2].getActorP()) { - mActorMngr[2].entry(i_fopAcM_SearchByName(PROC_NPC_RAFREL)); + mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_RAFREL)); } if (!mActorMngr[3].getActorP()) { - mActorMngr[3].entry(i_fopAcM_SearchByName(PROC_NPC_MOIR)); + mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR)); } if (isMap() && !mActorMngr[4].getActorP()) { - mActorMngr[4].entry(i_fopAcM_SearchByName(PROC_Obj_Table)); + mActorMngr[4].entry(fopAcM_SearchByName(PROC_Obj_Table)); } if (!mActorMngr[5].getActorP()) { mActorMngr[5].entry(getEvtAreaTagP(17, 0)); @@ -1154,12 +1154,12 @@ int daNpcAsh_c::Draw() { draw(0, 0, daNpcAsh_Param_c::m.mShadow, NULL, 0); if (field_0xf60 == 1) { g_env_light.setLightTevColorType_MAJI(mModelBow->mModelData, &tevStr); - mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(16)); - mModelBow->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->getAnmMtx(16)); + mModelBow->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mModelBow); g_env_light.setLightTevColorType_MAJI(mModelQuiver->mModelData, &tevStr); - mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(2)); - mModelQuiver->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->getAnmMtx(2)); + mModelQuiver->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mModelQuiver); } return 1; @@ -1173,14 +1173,14 @@ bool daNpcAsh_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int jointNo = i_joint->getJntNo(); int lookatJoints[3] = {1, 3, 4}; if (jointNo == 0) { - mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(1)); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(3)); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(4)); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } - mDoMtx_stack_c::copy(i_model->i_getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(i_model->getAnmMtx(jointNo)); switch (jointNo) { case 1: case 3: @@ -1875,7 +1875,7 @@ bool daNpcAsh_c::wait_type0(void* param_0) { field_0x96c = 0; } } - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { if (isSneaking()) { @@ -1886,7 +1886,7 @@ bool daNpcAsh_c::wait_type0(void* param_0) { } } } else { - if (i_dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0) != -1) { + if (dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0) != -1) { setAction(&demo); } } @@ -2045,7 +2045,7 @@ bool daNpcAsh_c::talk(void* param_0) { case 3: setExpression(7, -1.0f); if (field_0x9ec == 0) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } break; } @@ -2076,20 +2076,20 @@ bool daNpcAsh_c::demo(void* param_0) { field_0xf5c = 2; // no break case 2: - if (i_dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { - s32 cutIndex = i_dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0); + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { + s32 cutIndex = dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0); if (cutIndex != -1) { mCutIndex = cutIndex; - s32 eventIdx = i_dComIfGp_getEventManager().getMyActIdx(cutIndex, l_evtNames, 6, 0, 0); + s32 eventIdx = dComIfGp_getEventManager().getMyActIdx(cutIndex, l_evtNames, 6, 0, 0); if (eventIdx >= 1 && eventIdx < 6) { mOrderEvtNo = eventIdx; } if ((this->*(mEvtSeqList[mOrderEvtNo]))(cutIndex)) { - i_dComIfGp_getEventManager().cutEnd(cutIndex); + dComIfGp_getEventManager().cutEnd(cutIndex); } } - if (eventInfo.checkCommandDemoAccrpt() && field_0x9d4 != -1 && i_dComIfGp_getEventManager().endCheck(field_0x9d4)) { - i_dComIfGp_event_reset(); + if (eventInfo.checkCommandDemoAccrpt() && field_0x9d4 != -1 && dComIfGp_getEventManager().endCheck(field_0x9d4)) { + dComIfGp_event_reset(); mOrderEvtNo = 0; field_0x9d4 = -1; if (field_0xf60 == 0) { @@ -2218,7 +2218,7 @@ BOOL daNpcAsh_c::EvCut_Introduction(int cutIndex) { if (prm == NULL) { return false; } - if (i_dComIfGp_getEventManager().getIsAddvance(cutIndex)) { + if (dComIfGp_getEventManager().getIsAddvance(cutIndex)) { switch (*prm) { case 0: case 2: @@ -2246,7 +2246,7 @@ COMPILER_STRIP_GATE(0x8095D8C0, &lit_5254); BOOL daNpcAsh_c::EvCut_Meeting(int cutIndex) { int expression, motion; fopAc_ac_c* talkPartner; - dEvent_manager_c& evtMgr = i_dComIfGp_getEventManager(); + dEvent_manager_c& evtMgr = dComIfGp_getEventManager(); fopAc_ac_c* actors[4] = { mActorMngr[2].getActorP(), (fopAc_ac_c*)this, @@ -2315,7 +2315,7 @@ COMPILER_STRIP_GATE(0x8095D8D0, &lit_5295); BOOL daNpcAsh_c::EvCut_WiretapSponsor(int cutIndex) { int expression, motion; fopAc_ac_c* talkPartner; - dEvent_manager_c& evtMgr = i_dComIfGp_getEventManager(); + dEvent_manager_c& evtMgr = dComIfGp_getEventManager(); fopAc_ac_c* actors[4] = { mActorMngr[2].getActorP(), (fopAc_ac_c*)this, @@ -2372,7 +2372,7 @@ BOOL daNpcAsh_c::EvCut_WiretapEntrant(int cutIndex) { if (prm == NULL) { return false; } - if (i_dComIfGp_getEventManager().getIsAddvance(cutIndex)) { + if (dComIfGp_getEventManager().getIsAddvance(cutIndex)) { switch (*prm) { case 0: setExpression(7, -1.0f); @@ -2482,7 +2482,7 @@ BOOL daNpcAsh_c::main() { if (mpActionFn != NULL) { (this->*mpActionFn)(NULL); } - if (i_dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && mItemPartnerId != -1) { + if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && mItemPartnerId != -1) { dComIfGp_event_setItemPartnerId(mItemPartnerId); mItemPartnerId = -1; } @@ -2594,7 +2594,7 @@ void daNpcAsh_c::setAttnPos() { setMtx2(); lookat(); cXyz vec(10.0f, 10.0f, 0.0f); - mDoMtx_stack_c::copy(mMcaMorf->getModel()->i_getAnmMtx(4)); + mDoMtx_stack_c::copy(mMcaMorf->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&vec, &eyePos); vec.x = 0.0f; @@ -2614,7 +2614,7 @@ void daNpcAsh_c::setAttnPos() { } 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::copy(mMcaMorf->getModel()->getAnmMtx(2)); mDoMtx_stack_c::multVecZero(¢er); center.y = current.pos.y; mCcCyl[0].SetC(center); diff --git a/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp b/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp index c7fcb11fdd2..fc2094f2e44 100644 --- a/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp +++ b/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp @@ -29,7 +29,7 @@ static int daNpc_Fish_Delete(npc_fish_class* i_this) { /* 80542198-80542254 000098 00BC+00 1/1 0/0 0/0 .text fish_set__FP10fopAc_ac_cP11fish_data_s */ static void fish_set(fopAc_ac_c* i_this, fish_data_s* data) { - dScnKy_env_light_c* envLight = i_dKy_getEnvlight(); + dScnKy_env_light_c* envLight = dKy_getEnvlight(); cXyz pos; for (int i = 0; i < 100; i++, data++) { if (data->param < 0) { @@ -143,7 +143,7 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) { if (strcmp(dComIfGp_getStartStageName(), "F_SP127")) { return 5; } else { - dScnKy_env_light_c* envLight = i_dKy_getEnvlight(); + dScnKy_env_light_c* envLight = dKy_getEnvlight(); s32 param = 0; if (envLight->mPondSeason == 2) { param = 160; @@ -163,7 +163,7 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) { fopAcM_create(PROC_FR, 0, &pos, fopAcM_GetRoomNo(i_this), &angle, NULL, -1); } } - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[463])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[463])) { fish_set(i_this, fish_d127); } else { fish_set(i_this, fish_d127_S); 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 e521dcdf188..a377d54cd99 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 @@ -546,7 +546,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { J3DModel* model = j3dSys.getModel(); npc_ne_class* _this = (npc_ne_class*)model->getUserArea(); if (_this != NULL) { - PSMTXCopy(model->i_getAnmMtx(jnt_no), *calc_mtx); + PSMTXCopy(model->getAnmMtx(jnt_no), *calc_mtx); // head if (jnt_no == 4) { @@ -582,7 +582,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { mDoMtx_ZrotM(*calc_mtx, 0); } - model->i_setAnmMtx(jnt_no, *calc_mtx); + model->setAnmMtx(jnt_no, *calc_mtx); PSMTXCopy(*calc_mtx, J3DSys::mCurrentMtx); } } @@ -1928,7 +1928,7 @@ static void npc_ne_tame(npc_ne_class* i_this) { i_this->mpMorf->setPlaySpeed(i_this->mAnmSpeed); - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[470])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[470])) { if (fpcEx_Search(s_fish_sub, i_this) != NULL) { i_this->mAction = npc_ne_class::ACT_HOME; i_this->mState = 10; @@ -3583,7 +3583,7 @@ static void npc_ne_dish(npc_ne_class* i_this) { case 1: default: - if (!i_dComIfGs_isEventBit(0x1001)) { + if (!dComIfGs_isEventBit(0x1001)) { i_this->current.pos.y = 20000.0f; i_this->speed.y = 0.0f; fopAcM_OffStatus(i_this, 0x100); @@ -3818,7 +3818,7 @@ static void action(npc_ne_class* i_this) { cXyz vec1, vec2, vec3; if (i_this->field_0x701 != 0 && i_this->mAction != npc_ne_class::ACT_SANBASI && player->current.pos.z > -2800.0f) { - dmg_rod_class* rod = static_cast(i_fopAcM_SearchByName(PROC_MG_ROD)); + dmg_rod_class* rod = static_cast(fopAcM_SearchByName(PROC_MG_ROD)); if (rod != NULL && rod->field_0xf7c == 1 && rod->field_0xf7e != 5 && rod->field_0x13b4 != 0 && !i_this->mNoFollow) { if (i_this->mDistToTarget > 500.0f) { @@ -4262,7 +4262,7 @@ static int message(npc_ne_class* i_this) { if (i_this->field_0xc0a != 0) { i_this->field_0x656 = 10; if (i_this->mMsgFlow.doFlow(i_this, NULL, 0)) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); i_this->field_0xc0a = 0; if (i_this->field_0x5b7 == 1 && (i_this->mMsgFlow.getNowMsgNo() == 0x18a1 || i_this->mMsgFlow.getNowMsgNo() == 0x18a2)) { @@ -4272,7 +4272,7 @@ static int message(npc_ne_class* i_this) { } return 1; } else { - if (i_dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && i_this->eventInfo.checkCommandTalk()) { i_this->mMsgFlow.init(i_this, i_this->mFlowID, 0, NULL); i_this->field_0xc0a = 1; } @@ -4335,9 +4335,9 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { i_this->field_0x640++; if (i_this->field_0x701 != 0 && (i_this->field_0x640 & 0xf) == 0) { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[470]) + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[470]) && i_this->mDistToTarget < 1500.0f) { - if (i_fopAcM_SearchByName(PROC_MG_ROD) != NULL) { + if (fopAcM_SearchByName(PROC_MG_ROD) != NULL) { i_this->mNoFollow = false; } else { i_this->mNoFollow = true; @@ -4372,7 +4372,7 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { 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()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpMorf->play(&i_this->eyePos, 0, 0); i_this->mpBtkAnm->setFrame(i_this->mBtkFrame); i_this->mpBtpAnm->setFrame(i_this->mBtpFrame); @@ -4381,17 +4381,17 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { if (i_this->field_0x5b4 == 3) { 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->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpDishMorf->play(&i_this->eyePos, 0, 0); i_this->mpDishMorf->modelCalc(); } - PSMTXCopy(model->i_getAnmMtx(4), *calc_mtx); + PSMTXCopy(model->getAnmMtx(4), *calc_mtx); 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); + PSMTXCopy(model->getAnmMtx(3), *calc_mtx); vec1.set(i_this->field_0xbf4 + -30.0f, 0.0f, 0.0f); cLib_addCalc0(&i_this->field_0xbf4, 1.0f, 5.0f); cXyz vec2; @@ -4432,11 +4432,11 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { if (i_this->mFishID != -1 && i_this->field_0xcc0 != 0) { mg_fish_class* fish = static_cast(fopAcM_SearchByID(i_this->mFishID)); - PSMTXCopy(model->i_getAnmMtx(4), mDoMtx_stack_c::get()); + PSMTXCopy(model->getAnmMtx(4), mDoMtx_stack_c::get()); mDoMtx_stack_c::ZrotM(-19000); mDoMtx_stack_c::scaleM(0.5f, 0.5f, 0.5f); mDoMtx_stack_c::transM(5.0f, 35.0f, 15.0f); - fish->mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + fish->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); int ivar3 = cM_ssin(g_Counter.mTimer * 15000) * 1500.0f; for (int i = 0; i <= fish->field_0x72c; i++) { fish->field_0x718[i] = ivar3; @@ -4531,7 +4531,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (_this->field_0x5b4 == 3) { static int dish_bck[2] = {9, 8}; - int dish_flag = i_dComIfGs_isEventBit(0x1001) ? 1 : 0; + int dish_flag = dComIfGs_isEventBit(0x1001) ? 1 : 0; _this->mpDishMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes(_this->mResName, 29), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(_this->mResName, dish_bck[dish_flag]), @@ -4628,7 +4628,7 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { _this->field_0x5b7 = (u8)(fopAcM_GetParam(_this) >> 0x18); if (_this->field_0x5b7 == 1 && - !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[457])) { + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[457])) { return cPhs_ERROR_e; } @@ -4652,7 +4652,7 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { if (_this->field_0x5b4 == 1) { _this->mAction = npc_ne_class::ACT_TAME; } else if (_this->field_0x5b4 == 2) { - if (i_dComIfGs_isEventBit(0x1001)) { + if (dComIfGs_isEventBit(0x1001)) { _this->mAction = npc_ne_class::ACT_ROOF; _this->current.pos.set(1005.0f, 766.0f, -1423.0f); _this->old = _this->home = _this->current; 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 082750e9bdd..ee66f5d2181 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 @@ -195,7 +195,7 @@ static int nodeCallBack(J3DJoint* p_joint, int param_1) { J3DModel* sysModel = j3dSys.mModel; npc_tr_class* npc_tr = (npc_tr_class*)sysModel->mUserArea; - MTXCopy(sysModel->i_getAnmMtx(jointNo), *calc_mtx); + MTXCopy(sysModel->getAnmMtx(jointNo), *calc_mtx); if (jointNo == 1) { mDoMtx_YrotM(*calc_mtx, npc_tr->field_0x5f2[0] + (s16)(npc_tr->field_0x5f8 * 0.3f)); 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 a36646d658b..5b16533a3e0 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 @@ -56,7 +56,7 @@ 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(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80BA9288-80BA92F4 0001E8 006C+00 1/0 0/0 0/0 .text CreateHeap__11daBarDesk_cFv */ @@ -72,7 +72,7 @@ int daBarDesk_c::CreateHeap() { /* 80BA92F4-80BA94B8 000254 01C4+00 1/1 0/0 0/0 .text create__11daBarDesk_cFv */ cPhs__Step daBarDesk_c::create() { fopAcM_SetupActor(this, daBarDesk_c); - if (i_fopAcM_isSwitch(this, (u8)fopAcM_GetParam(this))) { + if (fopAcM_isSwitch(this, (u8)fopAcM_GetParam(this))) { return cPhs_ERROR_e; } cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "KHdesk"); @@ -135,7 +135,7 @@ void daBarDesk_c::init_modeBreak() { dComIfGp_getReverb(fopAcM_GetRoomNo(this))); setBreakEffect(); dComIfGp_getVibration().StartShock(l_HIO.field_0x5, 15, cXyz(0.0f, 1.0f, 0.0f)); - i_fopAcM_onSwitch(this, (u8)fopAcM_GetParam(this)); + fopAcM_onSwitch(this, (u8)fopAcM_GetParam(this)); mMode = 1; } 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 bdaaaf3cd7c..964552e5ef0 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 @@ -36,7 +36,7 @@ void daObjBBox_c::initBaseMtx() { void daObjBBox_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } @@ -62,7 +62,7 @@ int daObjBBox_c::CreateHeap() { int daObjBBox_c::create1st() { fopAcM_SetupActor(this, daObjBBox_c); - if (i_fopAcM_isSwitch(this, getSwNo())) { + if (fopAcM_isSwitch(this, getSwNo())) { return cPhs_ERROR_e; } int phase = dComIfG_resLoad(&mPhaseReq, l_arcName); @@ -89,7 +89,7 @@ int daObjBBox_c::Execute(Mtx** i_mtx) { -1, NULL, NULL, NULL); } fopAcM_seStart(this, Z2SE_OBJ_WOODBOX_BREAK, 0); - i_fopAcM_onSwitch(this, getSwNo()); + fopAcM_onSwitch(this, getSwNo()); fopAcM_delete(this); } } 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 5888a885bcb..99989fb40aa 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 @@ -164,7 +164,7 @@ 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(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80BAE034-80BAE054 000AB4 0020+00 1/0 0/0 0/0 .text daObj_Bed_Create__FPv */ 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 883c874fd19..426d9949c20 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 @@ -32,7 +32,7 @@ void daBkLeaf_c::initBaseMtx() { void daBkLeaf_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80BB621C-80BB629C 0001BC 0080+00 1/1 0/0 0/0 .text Create__10daBkLeaf_cFv */ 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 8f5e436cbe1..6754e2ea12b 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 @@ -37,7 +37,7 @@ void daObjBkDoor_c::setBaseMtx() { mDoMtx_YrotM(mDoMtx_stack_c::get(), shape_angle.y); mDoMtx_ZXYrotM(mDoMtx_stack_c::get(), mRotation.x, mRotation.y, mRotation.z); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_copy(mDoMtx_stack_c::get(), mBgMtx); } @@ -67,7 +67,7 @@ static Vec const l_roll_crash_check_areaR[] = { /* 80578E14-80578EA0 000174 008C+00 1/0 0/0 0/0 .text Create__13daObjBkDoor_cFv */ int daObjBkDoor_c::Create() { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[15])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[15])) { shape_angle.y -= 0x8000; } @@ -124,7 +124,7 @@ void daObjBkDoor_c::openCheck() { */ int daObjBkDoor_c::Execute(Mtx** i_mtxP) { daPy_py_c* player = dComIfGp_getLinkPlayer(); - BOOL unk_event = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[15]); + BOOL unk_event = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[15]); mFrameCounter++; openCheck(); 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 22456228c00..cbd041d3182 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 @@ -244,7 +244,7 @@ void daObjBossWarp_c::initBaseMtx() { void daObjBossWarp_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 2.0f, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 805797B8-80579934 0001F8 017C+00 1/1 0/0 0/0 .text Create__15daObjBossWarp_cFv */ @@ -256,24 +256,24 @@ int daObjBossWarp_c::Create() { mBossClearEventId = -1; } else { mBossClearEventId = - i_dComIfGp_getEventManager().getEventIdx(this, l_clearEvName[level], 0xff); + dComIfGp_getEventManager().getEventIdx(this, l_clearEvName[level], 0xff); } mBossClearMapToolId = 0xff; if (!isFirst() || level == 8) { - mBossWarpInEventId = i_dComIfGp_getEventManager().getEventIdx(this, "BOSS_WARPIN", 0xff); + mBossWarpInEventId = dComIfGp_getEventManager().getEventIdx(this, "BOSS_WARPIN", 0xff); mBossWarpInMapToolId = 0xff; mAction = 3; set_appear(); } else { - mBossWarpInEventId = i_dComIfGp_getEventManager().getEventIdx(this, "BOSS_WARPIN_M", 0xff); + mBossWarpInEventId = dComIfGp_getEventManager().getEventIdx(this, "BOSS_WARPIN_M", 0xff); mBossWarpInMapToolId = 0xff; mAction = 0; } 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); + mWarpCheckEventId = dComIfGp_getEventManager().getEventIdx(this, l_warp_check_evName, 0xff); + mWarpCancelEventId = dComIfGp_getEventManager().getEventIdx(this, l_warp_cancel_evName, 0xff); mScaleF = 1.0f; execute(); @@ -401,9 +401,9 @@ COMPILER_STRIP_GATE(0x8057B488, &lit_4119); #ifdef NONMATCHING // regalloc int daObjBossWarp_c::execute() { - if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != 3) { + if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) { u8 sw = getSwNo(); - if (sw == 0xff || i_fopAcM_isSwitch(this, sw)) { + if (sw == 0xff || fopAcM_isSwitch(this, sw)) { field_0x591 = true; } else { field_0x591 = false; @@ -427,7 +427,7 @@ int daObjBossWarp_c::execute() { if (field_0x595 && midna != NULL) { midna->onTagWaitPos(&field_0x620); } - obj_ystone_class* ystone = (obj_ystone_class*)i_fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); int level = getNowLevel(); if (ystone != NULL && midna != NULL) { @@ -465,7 +465,7 @@ int daObjBossWarp_c::execute() { } if (mpBrkAnm != NULL && mpBrkAnm->getFrame() != 0.0f) { - i_mDoAud_seStartLevel(Z2SE_OBJ_MDN_ESCAPE_HOLE, ¤t.pos, 0, 0); + mDoAud_seStartLevel(Z2SE_OBJ_MDN_ESCAPE_HOLE, ¤t.pos, 0, 0); } setBaseMtx(); @@ -511,9 +511,9 @@ void daObjBossWarp_c::actionWait() { /* 8057A54C-8057A610 000F8C 00C4+00 1/0 0/0 0/0 .text actionOrderEvent__15daObjBossWarp_cFv */ void daObjBossWarp_c::actionOrderEvent() { if (eventInfo.i_checkCommandDemoAccrpt()) { - dComIfGp_event_setTalkPartner(i_fopAcM_SearchByName(PROC_OBJ_YSTONE)); + dComIfGp_event_setTalkPartner(fopAcM_SearchByName(PROC_OBJ_YSTONE)); setAction(ACT_EVENT); - mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); demoProc(); } else { fopAcM_orderOtherEventId(this, mBossClearEventId, mBossClearMapToolId, 0xffff, 3, 1); @@ -525,7 +525,7 @@ void daObjBossWarp_c::actionOrderEvent() { void daObjBossWarp_c::actionEvent() { if (dComIfGp_evmng_endCheck(mBossClearEventId)) { setAction(ACT_WAIT_WARP); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } else { demoProc(); } @@ -545,7 +545,7 @@ void daObjBossWarp_c::actionWaitWarp() { void daObjBossWarp_c::actionOrderWarpEvent() { if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(ACT_WARP_EVENT); - mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); demoProc(); } else { fopAcM_orderOtherEventId(this, mBossWarpInEventId, mBossWarpInMapToolId, 0xffff, 0, 1); @@ -570,7 +570,7 @@ void daObjBossWarp_c::actionOrderChkEvent() { daMidna_c* midna = daPy_py_c::getMidnaActor(); if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(ACT_CHK_EVENT); - mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); attention_info.position = midna->attention_info.position; attention_info.position.y += 100.0f; eyePos = attention_info.position; @@ -585,7 +585,7 @@ void daObjBossWarp_c::actionOrderChkEvent() { */ void daObjBossWarp_c::actionChkEvent() { if (dComIfGp_evmng_endCheck(mWarpCheckEventId)) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); if (mWarpChoice == 0) { setAction(ACT_ORDER_WARP_EVENT); fopAcM_orderOtherEventId(this, mBossWarpInEventId, mBossWarpInMapToolId, 0xffff, 0, 1); @@ -605,7 +605,7 @@ void daObjBossWarp_c::actionChkEvent() { void daObjBossWarp_c::actionOrderCancelEvent() { if (eventInfo.i_checkCommandDemoAccrpt()) { setAction(ACT_CANCEL_EVENT); - mStaffId = i_dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); + mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); demoProc(); } else { fopAcM_orderOtherEventId(this, mWarpCancelEventId, 0xff, 0xffff, 0, 1); @@ -616,7 +616,7 @@ void daObjBossWarp_c::actionOrderCancelEvent() { /* 8057AA2C-8057AA94 00146C 0068+00 1/0 0/0 0/0 .text actionCancelEvent__15daObjBossWarp_cFv */ void daObjBossWarp_c::actionCancelEvent() { if (dComIfGp_evmng_endCheck(mWarpCancelEventId)) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); setAction(ACT_WAIT_WARP); } else { demoProc(); @@ -735,10 +735,10 @@ int daObjBossWarp_c::demoProc() { }; daPy_py_c* player = daPy_getPlayerActorClass(); - obj_ystone_class* ystone = (obj_ystone_class*)i_fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); cXyz unused(100000.0f, 0.0f, 0.0f); daMidna_c* midna = daPy_py_c::getMidnaActor(); - daObjLife_c* life_container = (daObjLife_c*)i_fopAcM_SearchByName(PROC_Obj_LifeContainer); + daObjLife_c* life_container = (daObjLife_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer); cXyz life_pos(900.0f, 0.0f, 0.0f); int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 15, 0, 0); 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 4afcb387ef9..ed43ef22109 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 @@ -37,7 +37,7 @@ void daBsGate_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); mDoMtx_stack_c::transM(mOpenDist, 0.0f, 0.0f); mpModel->setBaseScale(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80BC29AC-80BC2A18 00020C 006C+00 1/0 0/0 0/0 .text CreateHeap__10daBsGate_cFv */ @@ -60,7 +60,7 @@ cPhs__Step daBsGate_c::create() { } fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox2(this, mpModel->getModelData()); - mOpen = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); + mOpen = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); mSide = (fopAcM_GetParam(this) >> 8) & 0xff; mTargetDist = -250.0f; if (mSide == 1) { @@ -96,7 +96,7 @@ void daBsGate_c::moveGate() { &modeClose, }; u8 was_open = mOpen; - mOpen = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); + mOpen = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); if (mOpen != was_open) { if (mOpen) { init_modeOpen(); @@ -125,7 +125,7 @@ void daBsGate_c::init_modeOpen() { /* 80BC2CE0-80BC2E34 000540 0154+00 1/0 0/0 0/0 .text modeOpen__10daBsGate_cFv */ void daBsGate_c::modeOpen() { if (mSide == 0) { - i_mDoAud_seStartLevel(Z2SE_OBJ_SW_W_DR_OP, ¤t.pos, 0, + mDoAud_seStartLevel(Z2SE_OBJ_SW_W_DR_OP, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } if (cLib_addCalc(&mOpenDist, mTargetDist, 0.2f, l_HIO.mOpenSpeed, 0.5f) == 0.0f) { @@ -146,7 +146,7 @@ void daBsGate_c::init_modeClose() { /* 80BC2E40-80BC2F94 0006A0 0154+00 1/0 0/0 0/0 .text modeClose__10daBsGate_cFv */ void daBsGate_c::modeClose() { if (mSide == 0) { - i_mDoAud_seStartLevel(Z2SE_OBJ_SW_W_DR_CL, ¤t.pos, 0, + mDoAud_seStartLevel(Z2SE_OBJ_SW_W_DR_CL, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } if (cLib_addCalc(&mOpenDist, 0.0f, 0.4f, l_HIO.mCloseSpeed, 0.5f) == 0.0f) { 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 261773fba4f..240ff8ea525 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 @@ -2376,7 +2376,7 @@ void daObjCarry_c::setBaseMtx() { field_0xd3c = field_0xd4c; } - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); mpModel->setBaseScale(scale); } #else @@ -2691,7 +2691,7 @@ s32 daObjCarry_c::CreateInit_taru() { */ bool daObjCarry_c::CreateInit_dokuro() { mode_init_wait(); - return !i_fopAcM_isSwitch(this,getSwbit()); + return !fopAcM_isSwitch(this,getSwbit()); } /* ############################################################################################## */ @@ -2809,7 +2809,7 @@ s32 daObjCarry_c::CreateInit_Lv8Ball() { field_0x7c8.OffTgNoHitMark(); field_0x7c8.OnTgShieldHit(); - if (i_fopAcM_isSwitch(this,getSwbit())) { + if (fopAcM_isSwitch(this,getSwbit())) { mode_init_fit(); } else { mode_init_wait(); 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 343d63ad85e..58d0b59b5c4 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 @@ -100,7 +100,7 @@ int daObjCatDoor_c::create() { void daObjCatDoor_c::create_init() { ASSERT(getSwitchNo() != 0xff); fopAcM_setCullSizeBox(this, -200.0f, 0.0f, -20.0f, 200.0f, 260.0f, 100.0f); - if (i_fopAcM_isSwitch(this, getSwitchNo())) { + if (fopAcM_isSwitch(this, getSwitchNo())) { mDoor1.angle = 0x8800; mDoor2.angle = 0x7800; } else { @@ -155,7 +155,7 @@ void daObjCatDoor_c::calcOpen() { } if (prev != 0 && res != 0) { - i_fopAcM_onSwitch(this, getSwitchNo()); + fopAcM_onSwitch(this, getSwitchNo()); } } 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 8ac745bec4e..6e88d6e7db2 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 @@ -101,7 +101,7 @@ int daObjBoard_c::Execute(Mtx** param_0) { case 5: case 7: case 15: - if (i_fopAcM_isSwitch(this, getSwNo())) { + if (fopAcM_isSwitch(this, getSwNo())) { if (!mpBgW->ChkUsed()) { dComIfG_Bgsp().Regist(mpBgW, this); } @@ -116,7 +116,7 @@ int daObjBoard_c::Execute(Mtx** param_0) { case 4: case 6: case 8: - if (i_fopAcM_isSwitch(this, getSwNo())) { + if (fopAcM_isSwitch(this, getSwNo())) { if (mpBgW->ChkUsed()) { dComIfG_Bgsp().Release(mpBgW); } 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 de28ed9e4b5..dc7074b54b7 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 @@ -90,9 +90,9 @@ cPhs__Step daObjCdoor_c::create() { mChainID = -1; mEnd = false; if (mType == 1) { - mIsOpen = i_fopAcM_isSwitch(this, mSw); + mIsOpen = fopAcM_isSwitch(this, mSw); mMapToolID = (fopAcM_GetParam(this) >> 0xc) & 0xff; - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, mMapToolID); + mEventID = dComIfGp_getEventManager().getEventIdx(this, mMapToolID); setAction(ACT_WAIT); if (mMapToolID == 0xff) { setAction(ACT_DEAD); @@ -106,7 +106,7 @@ cPhs__Step daObjCdoor_c::create() { } init_modeWait(); } else { - if (i_fopAcM_isSwitch(this, mSw)) { + if (fopAcM_isSwitch(this, mSw)) { mEnd = 1; current.pos.y += l_moveOffsetY[mType]; } else { @@ -147,7 +147,7 @@ static int daObjCdoor_Delete(daObjCdoor_c* i_this) { void daObjCdoor_c::setMatrix() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80BC7424-80BC7478 0006E4 0054+00 1/0 0/0 0/0 .text Execute__12daObjCdoor_cFPPA3_A4_f @@ -208,7 +208,7 @@ void daObjCdoor_c::execWgate() { &modeClose, }; u8 was_open = mIsOpen; - mIsOpen = i_fopAcM_isSwitch(this, mSw); + mIsOpen = fopAcM_isSwitch(this, mSw); if (mIsOpen != was_open) { if (mIsOpen) { init_modeOpen(); @@ -304,7 +304,7 @@ void daObjCdoor_c::actionOrderEvent() { void daObjCdoor_c::actionEvent() { if (dComIfGp_evmng_endCheck(mEventID)) { setAction(ACT_DEAD); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } } 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 1155d5c1202..ffe0b907ed5 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 @@ -104,7 +104,7 @@ int daObjChandelier_c::Execute(f32 (**param_0)[3][4]) { void daObjChandelier_c::exeModeWait() { exeModeHookSwg(); u8 sw = getSW_0(); - if (i_fopAcM_isSwitch(this, sw)) { + if (fopAcM_isSwitch(this, sw)) { mMode = MODE_START_SWG; field_0x5ec = 0.5f; field_0x5f0 = 0.0f; @@ -195,7 +195,7 @@ void daObjChandelier_c::init() { field_0x5f4 = current.pos.y - 800.0f; if (getArg_0() == 0) { u8 sw = getSW_0(); - if (i_fopAcM_isSwitch(this, sw)) { + if (fopAcM_isSwitch(this, sw)) { mMode = MODE_HOOK_SWG; current.pos.y = field_0x5f4; field_0x5a8 = current.pos; @@ -210,7 +210,7 @@ void daObjChandelier_c::setModelMtx() { mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::ZrotM(shape_angle.z); PSMTXCopy(mDoMtx_stack_c::get(), mMtx); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80BC8780-80BC89B0 0008C0 0230+00 2/2 0/0 0/0 .text moveSwing__17daObjChandelier_cFffff 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 63e31632e4a..792201c0187 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 @@ -485,7 +485,7 @@ void daObjCHO_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::scaleM(scale); - mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); mpMorf->modelCalc(); } @@ -528,8 +528,8 @@ bool daObjCHO_c::CreateChk() { if (mLocation != LOC_UNK_2) { if (param != 0) { - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) - || !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]])) + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) + || !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]])) { return false; } @@ -540,9 +540,9 @@ bool daObjCHO_c::CreateChk() { if (dMenu_Insect_c::isCatchNotGiveInsect(l_cho_itemno[mSex])) { return false; } - if ((mSex == SEX_MALE && !i_dComIfGs_isEventBit( + if ((mSex == SEX_MALE && !dComIfGs_isEventBit( dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]])) - || (mSex == SEX_FEMALE && !i_dComIfGs_isEventBit( + || (mSex == SEX_FEMALE && !dComIfGs_isEventBit( dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]))) { return false; 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 ef2cd032889..a2d43803af9 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 @@ -25,8 +25,8 @@ void daObjCrystal_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - mpModel[0]->i_setBaseTRMtx(mDoMtx_stack_c::get()); - mpModel[1]->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel[0]->setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel[1]->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80BD68F0-80BD68F4 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ @@ -51,7 +51,7 @@ int daObjCrystal_c::Create() { mpModel[0]->calc(); if (mpEmitter != NULL) { - mpEmitter->setGlobalRTMatrix(mpModel[0]->i_getAnmMtx(mJointID)); + mpEmitter->setGlobalRTMatrix(mpModel[0]->getAnmMtx(mJointID)); } return 1; 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 e947f69d62a..ca972aff297 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 @@ -18,7 +18,7 @@ int daObjDigholl_c::create() { if (field_0x56c == 0xff) { field_0x56c = -1; } - if (i_fopAcM_isSwitch(this, field_0x569)) { + if (fopAcM_isSwitch(this, field_0x569)) { field_0x568 = 2; field_0x56b = 1; } @@ -48,7 +48,7 @@ static int daObjDigholl_Delete(daObjDigholl_c* i_this) { int daObjDigholl_c::execute() { daPy_py_c* player = daPy_getLinkPlayerActorClass(); if (player->i_checkNowWolf() && - (field_0x56a == 0xff || i_fopAcM_isSwitch(this, field_0x56a)) && + (field_0x56a == 0xff || fopAcM_isSwitch(this, field_0x56a)) && (f32)fabsf(current.pos.y - player->current.pos.y) < 40.0f) { attention_info.flags = 0x80; @@ -60,9 +60,9 @@ int daObjDigholl_c::execute() { shape_angle.y = player->shape_angle.y + 0x10000 - 0x8000; current.angle.y = shape_angle.y; } - i_fopAcM_onSwitch(this, field_0x569); + fopAcM_onSwitch(this, field_0x569); - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { if (player->getBaseAnimeFrame() > 35.0f) { field_0x56b = 1; } 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 50062b03cbc..4cd550b3854 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 @@ -26,7 +26,7 @@ int daObjDigpl_c::create() { mType = 0; } - if (mSwitch != 0xFF && i_fopAcM_isSwitch(this, mSwitch)) { + if (mSwitch != 0xFF && fopAcM_isSwitch(this, mSwitch)) { return cPhs_ERROR_e; } @@ -67,7 +67,7 @@ int daObjDigpl_c::execute() { if (mDigFlg == 1) { if (mSwitch != 0xFF) { - i_fopAcM_onSwitch(this, mSwitch); + fopAcM_onSwitch(this, mSwitch); } cXyz item_pos(current.pos.x, current.pos.y - 30.0f, current.pos.z); diff --git a/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp b/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp index 3e97132abc1..65155019d7d 100644 --- a/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp +++ b/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp @@ -22,7 +22,7 @@ void daObjDigSnow_c::initBaseMtx() { void daObjDigSnow_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } @@ -95,7 +95,7 @@ int daObjDigSnow_c::create1st() { /* 80BDCE84-80BDCF00 0002A4 007C+00 1/0 0/0 0/0 .text Execute__14daObjDigSnow_cFPPA3_A4_f */ int daObjDigSnow_c::Execute(Mtx** i_mtx) { - if (dComIfGp_getLinkPlayer()->i_checkWolf()) { + if (dComIfGp_getLinkPlayer()->checkWolf()) { attention_info.flags = 0x80; } else { attention_info.flags = 0; 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 e1dbe9c9494..85a52c60d64 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 @@ -167,7 +167,7 @@ static int daObj_Fmobj_Create(fopAc_ac_c* i_this) { mDoMtx_stack_c::transS(a_this->current.pos.x, a_this->current.pos.y, a_this->current.pos.z); mDoMtx_stack_c::YrotM(a_this->shape_angle.y); - a_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + a_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::transM(0.0f, -30.0f, 0.0f); MTXCopy(mDoMtx_stack_c::get(), a_this->mDzbMtx); diff --git a/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp b/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp index 8a7cda2c359..9b58cd1719d 100644 --- a/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp +++ b/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp @@ -18,7 +18,7 @@ int daObjGraWall_c::Create() { return cPhs_ERROR_e; } } else { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[62]) != 0) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[62]) != 0) { return cPhs_ERROR_e; } } @@ -35,7 +35,7 @@ int daObjGraWall_c::Execute() { return 1; } } else { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[62]) != 0) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[62]) != 0) { fopAcM_delete(this); 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 3e47687fc2e..43656b34709 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 @@ -37,7 +37,7 @@ dCcD_SrcCyl const daGraveStone_c::mCcDCyl = { void daGraveStone_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx); } 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 9894a983cec..361ccbe79d5 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 @@ -105,7 +105,7 @@ static char* l_arcName = "H_Bombkoy"; /* 80C1B878-80C1B938 000078 00C0+00 1/1 0/0 0/0 .text create1st__16daObjHBombkoya_cFv */ int daObjHBombkoya_c::create1st() { - if (i_fopAcM_isSwitch(this, getSw2No())) { + if (fopAcM_isSwitch(this, getSw2No())) { return cPhs_ERROR_e; } @@ -134,7 +134,7 @@ int daObjHBombkoya_c::CreateHeap() { Mtx m; MTXIdentity(m); - mpModel->i_setBaseTRMtx(m); + mpModel->setBaseTRMtx(m); return 1; } @@ -241,8 +241,8 @@ bool daObjHBombkoya_c::setParticle(u16* i_particleIDs, int i_particleMax, int daObjHBombkoya_c::Execute(Mtx** param_0) { *param_0 = &mBgMtx; - if (i_fopAcM_isSwitch(this, getSwNo())) { - if (i_fopAcM_isSwitch(this, getSw2No())) { + if (fopAcM_isSwitch(this, getSwNo())) { + if (fopAcM_isSwitch(this, getSw2No())) { mActive = false; fopAcM_delete(this); } else { @@ -284,7 +284,7 @@ int daObjHBombkoya_c::Execute(Mtx** param_0) { Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_BOMB_HOUSE_BURN, ¤t.pos, 900, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } else { - i_fopAcM_onSwitch(this, getSw2No()); + fopAcM_onSwitch(this, getSw2No()); if (mTimer == 170) { Z2GetAudioMgr()->seStart(Z2SE_OBJ_BOMB_HOUSE_EXPLD, ¤t.pos, 0, 0, @@ -353,7 +353,7 @@ 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())) { + if (mActive && !fopAcM_isSwitch(this, getSw2No())) { g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); diff --git a/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp b/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp index 906378b7b71..1ac1884ae4e 100644 --- a/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp +++ b/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp @@ -53,7 +53,7 @@ void daHeavySw_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); mDoMtx_stack_c::ZXYrotM(field_0x5cc.x, field_0x5cc.y, field_0x5cc.z); mpModel->setBaseScale(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80C1CC70-80C1CCDC 000270 006C+00 1/0 0/0 0/0 .text CreateHeap__11daHeavySw_cFv */ @@ -89,7 +89,7 @@ int daHeavySw_c::create() { field_0x5cc.y = 0; field_0x5cc.z = 0; u8 param = fopAcM_GetParam(this); - if (i_fopAcM_isSwitch(this, param)) { + if (fopAcM_isSwitch(this, param)) { field_0x5bc = 300.0f; init_modeMoveEnd(); } else { @@ -108,7 +108,7 @@ void daHeavySw_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* p daHeavySw_c* heavySw = static_cast(param_1); heavySw->field_0x5d8 = 1; heavySw->field_0x5dc = - static_cast(dComIfGp_getLinkPlayer())->i_checkEquipHeavyBoots(); + static_cast(dComIfGp_getLinkPlayer())->checkEquipHeavyBoots(); } } @@ -187,7 +187,7 @@ void daHeavySw_c::modeRide() { } } else { s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this)); - i_mDoAud_seStartLevel(Z2SE_OBJ_HEAVYSW_MOVE, ¤t.pos, 0, reverb); + mDoAud_seStartLevel(Z2SE_OBJ_HEAVYSW_MOVE, ¤t.pos, 0, reverb); cLib_chaseF(&speedF, field_0x5d4, field_0x5d4 / 30.0f); f32 calc = cLib_addCalc(&field_0x5bc, l_HIO.field_0x10, 1.0f, fopAcM_GetSpeedF(this), 0.1f); if (calc == 0.0f) { @@ -266,7 +266,7 @@ void daHeavySw_c::modeMove() { void daHeavySw_c::init_modeMoveEnd() { field_0x5c5 = 1; u8 param = fopAcM_GetParam(this); - if (!i_fopAcM_isSwitch(this, param)) { + if (!fopAcM_isSwitch(this, param)) { s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this)); mDoAud_seStart(Z2SE_OBJ_HEAVYSW_STOP, ¤t.pos, 0, reverb); dComIfGp_getVibration().StartShock(l_HIO.field_0x34, 0xF, cXyz(0.0f, 1.0f, 0.0f)); @@ -280,9 +280,9 @@ void daHeavySw_c::modeMoveEnd() { if (field_0x5c4 != 0) { field_0x5c4--; } else { - BOOL is_switch = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); + BOOL is_switch = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); if (!is_switch) { - i_fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); + fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); } } } 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 41f29b3b7e4..9732d301f18 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 @@ -19,7 +19,7 @@ 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(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80C1F8A0-80C1F8A8 000000 0008+00 1/1 0/0 0/0 .rodata l_bmdIdx */ 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 92f8e0d70cc..1a81326a60a 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 @@ -236,7 +236,7 @@ void daObjIce_l_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::scaleM(field_0x5b4); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); cMtx_copy(mDoMtx_stack_c::get(), mBgMtx); } diff --git a/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp b/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp index a5cea9eb4ff..52802679edb 100644 --- a/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp +++ b/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp @@ -679,7 +679,7 @@ void daObjKABUTO_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(field_0x72a); mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::scaleM(scale); - mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); mpMorf->modelCalc(); } @@ -723,8 +723,8 @@ bool daObjKABUTO_c::CreateChk() { if (mLocation != LOC_UNK_2) { if (param != 0) { - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) - || !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]])) + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) + || !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]])) { return false; } @@ -735,9 +735,9 @@ bool daObjKABUTO_c::CreateChk() { if (dMenu_Insect_c::isCatchNotGiveInsect(l_kab_itemno[mSex])) { return false; } - if ((mSex == SEX_MALE && !i_dComIfGs_isEventBit( + if ((mSex == SEX_MALE && !dComIfGs_isEventBit( dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]])) - || (mSex == SEX_FEMALE && !i_dComIfGs_isEventBit( + || (mSex == SEX_FEMALE && !dComIfGs_isEventBit( dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]]))) { return false; 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 446f66912ec..895a692fb1b 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 @@ -799,7 +799,7 @@ SECTION_DEAD static char const* const stringBase_80C396CC = "DEFAULT_GETITEM"; #ifdef NONMATCHING int daItemKantera_c::actionGetDemo() { if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); fopAcM_delete(this); } 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 c72e9bc33d0..53ea63ce840 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 @@ -137,7 +137,7 @@ void daObjKGate_c::setBaseMtx() { mDoMtx_stack_c::YrotM(current.angle.y); mDoMtx_stack_c::YrotM(mGateLAngle); - mpGateModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpGateModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); field_0xbf0 = current.pos + sp30; @@ -147,7 +147,7 @@ void daObjKGate_c::setBaseMtx() { mDoMtx_stack_c::YrotM(0x7FFF); mDoMtx_stack_c::YrotM(mGateRAngle); - mpGateModel2->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpGateModel2->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), field_0xae8); field_0xbfc = sp3C; @@ -178,7 +178,7 @@ void daObjKGate_c::setBaseMtx() { mDoMtx_stack_c::ZrotM(field_0xbb2); mDoMtx_stack_c::ZrotM(var_r29); mDoMtx_stack_c::transM(-14.0f, 0.0f, 0.0f); - mpHookModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpHookModel->setBaseTRMtx(mDoMtx_stack_c::get()); if (mpKeyModel != NULL) { if (field_0xbb2 == 0) { @@ -188,7 +188,7 @@ void daObjKGate_c::setBaseMtx() { mDoMtx_stack_c::YrotM(current.angle.y + mGateLAngle); mDoMtx_stack_c::XrotM(-0xE38); mDoMtx_stack_c::XrotM(-field_0xbae); - mpKeyModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpKeyModel->setBaseTRMtx(mDoMtx_stack_c::get()); } else { field_0xbe8 += -2.5f; if (field_0xbe8 < -20.0f) { @@ -209,7 +209,7 @@ void daObjKGate_c::setBaseMtx() { cLib_addCalcAngleS(&mKeyRot.x, -0x4000, 5, 0xC00, 0x400); mDoMtx_stack_c::transS(mEffPos); mDoMtx_stack_c::ZXYrotM(mKeyRot); - mpKeyModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpKeyModel->setBaseTRMtx(mDoMtx_stack_c::get()); } } } @@ -247,10 +247,10 @@ int daObjKGate_c::Create() { u8 sw_no = getSwNo(); if (mNameArg == 0 || mNameArg == 2) { - if (sw_no != 0xFF && !i_fopAcM_isSwitch(this, sw_no)) { + if (sw_no != 0xFF && !fopAcM_isSwitch(this, sw_no)) { eventInfo.setArchiveName(l_arcName[mNameArg]); - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_evName[mNameArg], 0xFF); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_evName[mNameArg], 0xFF); mMapToolID = getEventID(); setAction(ACT_WAIT_EVENT); } else { @@ -354,7 +354,7 @@ int daObjKGate_c::CreateHeap() { int daObjKGate_c::create1st() { mNameArg = getNameArg(); if (mNameArg == 1) { - if (i_fopAcM_isSwitch(this, getSwNo())) { + if (fopAcM_isSwitch(this, getSwNo())) { return cPhs_ERROR_e; } } @@ -414,7 +414,7 @@ int daObjKGate_c::checkAreaL(cXyz const* param_0, cXyz const* param_1) { offset.set(0.0f, 0.0f, 250.0f); - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (horse_p != NULL) { mDoMtx_stack_c::transS(horse_p->current.pos); mDoMtx_stack_c::YrotM(horse_p->shape_angle.y); @@ -499,7 +499,7 @@ int daObjKGate_c::checkAreaR(cXyz const* param_0, cXyz const* param_1) { offset.set(0.0f, 0.0f, 250.0f); - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (horse_p != NULL) { mDoMtx_stack_c::transS(horse_p->current.pos); mDoMtx_stack_c::YrotM(horse_p->shape_angle.y); @@ -637,7 +637,7 @@ void daObjKGate_c::action_typeA() { u8 sw_no = getSwNo(); daPy_py_c* player_p = daPy_getPlayerActorClass(); - if (i_fopAcM_isSwitch(this, sw_no) || sw_no == 0xFF) { + if (fopAcM_isSwitch(this, sw_no) || sw_no == 0xFF) { cXyz unused1; cXyz unused2; @@ -672,7 +672,7 @@ void daObjKGate_c::action_typeA() { } } - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (horse_p != NULL && horse_p->speedF != 0.0f) { if (chk_l == AREA_CHECK_HORSE) { switch (checkDirL(horse_p)) { @@ -826,7 +826,7 @@ void daObjKGate_c::action_typeB() { u8 sw_no = getSwNo(); daPy_py_c* player_p = daPy_getPlayerActorClass(); - if (!i_fopAcM_isSwitch(this, sw_no)) { + if (!fopAcM_isSwitch(this, sw_no)) { cXyz unused1; cXyz unused2; int chk_l = checkAreaL(&unused1, &unused2); @@ -858,7 +858,7 @@ void daObjKGate_c::action_typeB() { cCcD_Obj* hit_obj = field_0x5f4[i].GetTgHitObj(); if (hit_obj != NULL && hit_obj->ChkAtType(AT_TYPE_BOMB)) { - i_fopAcM_onSwitch(this, sw_no); + fopAcM_onSwitch(this, sw_no); fopAcM_delete(this); break; } @@ -884,7 +884,7 @@ void daObjKGate_c::actionWaitEvent() { if (eventInfo.i_checkCommandDoor()) { setAction(ACT_EVENT); dComIfGp_setItemKeyNumCount(-1); - i_fopAcM_onSwitch(this, getSwNo()); + fopAcM_onSwitch(this, getSwNo()); fopAcM_seStart(this, Z2SE_OBJ_FLN_GATE_L_OP, 0); } else if (checkOpen()) { eventInfo.setEventId(mEventID); @@ -897,7 +897,7 @@ void daObjKGate_c::actionWaitEvent() { void daObjKGate_c::actionEvent() { if (dComIfGp_evmng_endCheck(mEventID)) { setAction(ACT_DEAD); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } else { demoProc(); } @@ -918,7 +918,7 @@ void daObjKGate_c::event_proc_call() { /* 8058A3A4-8058A508 0023A4 0164+00 1/1 0/0 0/0 .text demoProc__12daObjKGate_cFv */ void daObjKGate_c::demoProc() { - mStaffID = i_dComIfGp_evmng_getMyStaffId("K_GATE", NULL, 0); + mStaffID = dComIfGp_evmng_getMyStaffId("K_GATE", NULL, 0); int demo_action = getDemoAction(); if (dComIfGp_evmng_getIsAddvance(mStaffID)) { 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 d72027c7785..78fe8122aff 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 @@ -32,11 +32,11 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { J3DModel* model = j3dSys.getModel(); obj_ki_class* _this = (obj_ki_class*)model->getUserArea(); if (_this != NULL && jnt_no >= 2 && jnt_no <= 4) { - PSMTXCopy(model->i_getAnmMtx(jnt_no), *calc_mtx); + PSMTXCopy(model->getAnmMtx(jnt_no), *calc_mtx); mDoMtx_YrotM(*calc_mtx, _this->field_0x58c[jnt_no - 2].y); mDoMtx_XrotM(*calc_mtx, _this->field_0x58c[jnt_no - 2].x); mDoMtx_ZrotM(*calc_mtx, _this->field_0x58c[jnt_no - 2].z); - model->i_setAnmMtx(jnt_no, *calc_mtx); + model->setAnmMtx(jnt_no, *calc_mtx); PSMTXCopy(*calc_mtx, J3DSys::mCurrentMtx); } } @@ -77,7 +77,7 @@ static int daObj_Ki_Execute(obj_ki_class* i_this) { mDoMtx_stack_c::XrotM(i_this->shape_angle.x); mDoMtx_stack_c::ZrotM(i_this->shape_angle.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()); + i_this->mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); PSMTXCopy(mDoMtx_stack_c::get(), i_this->mMtx); i_this->mpBgW->Move(); i_this->mpMorf->modelCalc(); 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 3c04ca82a1f..af5b98df5c0 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 @@ -16,7 +16,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { J3DModel* model = j3dSys.getModel(); daObjKKanban_c* userArea = (daObjKKanban_c*)model->getUserArea(); if (jointNo == userArea->mJointIdx) { - cMtx_copy(model->i_getAnmMtx(jointNo), mDoMtx_stack_c::get()); + cMtx_copy(model->getAnmMtx(jointNo), mDoMtx_stack_c::get()); mDoMtx_stack_c::XrotM(userArea->mRotX); mDoMtx_stack_c::ZrotM(userArea->mRotZ); model->setAnmMtx(jointNo, mDoMtx_stack_c::get()); @@ -37,7 +37,7 @@ void daObjKKanban_c::initBaseMtx() { void daObjKKanban_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80C46F98-80C46F9C -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ 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 59f5cff7dac..18cfa990cf9 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 @@ -90,7 +90,7 @@ static void action(obj_lbox_class* i_this) { mDoMtx_stack_c::YrotM(i_this->shape_angle.y); mDoMtx_stack_c::ZrotM(i_this->shape_angle.z); mDoMtx_stack_c::scaleM(l_HIO.mSize, l_HIO.mSize, l_HIO.mSize); - i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), i_this->mMtx); i_this->mpBgW->Move(); cXyz cStack_48(i_this->current.pos); 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 50b811365fa..50a2f8c4a3a 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 @@ -42,7 +42,7 @@ 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(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80C55E08-80C55E74 0001E8 006C+00 1/1 0/0 0/0 .text CreateHeap__12daLv1Cdl00_cFv */ @@ -82,7 +82,7 @@ cPhs__Step daLv1Cdl00_c::create() { mSwType = 0; } eyePos = mTorchPos; - mIsSwitch = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); + mIsSwitch = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); mIsLit = false; if (!mSwType) { if (mIsSwitch) { @@ -159,7 +159,7 @@ void daLv1Cdl00_c::pointLightProc() { /* 80C56388-80C567EC 000768 0464+00 1/1 0/0 0/0 .text Execute__12daLv1Cdl00_cFv */ int daLv1Cdl00_c::Execute() { - u8 sw = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); + u8 sw = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff); if (mIsSwitch != sw) { mIsLit = false; mCyl.SetAtMtrl(0); @@ -187,7 +187,7 @@ int daLv1Cdl00_c::Execute() { g_whiteColor, g_whiteColor, 0, 0.0f); dComIfGp_particle_setSimple(0x103, &mTorchPos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f); - i_mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } setBaseMtx(); @@ -198,9 +198,9 @@ int daLv1Cdl00_c::Execute() { mIsLit = true; mCyl.SetAtMtrl(1); if (!mSwType) { - i_fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); + fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); } else { - i_fopAcM_offSwitch(this, fopAcM_GetParam(this) & 0xff); + fopAcM_offSwitch(this, fopAcM_GetParam(this) & 0xff); } mDoAud_seStart(0x80017, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); setLight(); @@ -209,9 +209,9 @@ int daLv1Cdl00_c::Execute() { mIsLit = false; mCyl.SetAtMtrl(0); if (!mSwType) { - i_fopAcM_offSwitch(this, fopAcM_GetParam(this) & 0xff); + fopAcM_offSwitch(this, fopAcM_GetParam(this) & 0xff); } else { - i_fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); + fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xff); } mDoAud_seStart(0x80019, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); cutLight(); 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 1395abfce4b..e34d391df70 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 @@ -42,7 +42,7 @@ 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(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80C56DA8-80C56E14 0001E8 006C+00 1/0 0/0 0/0 .text CreateHeap__12daLv1Cdl01_cFv */ @@ -151,7 +151,7 @@ int daLv1Cdl01_c::Execute(f32 (**param_0)[3][4]) { g_whiteColor, g_whiteColor, 0, 0.0f); dComIfGp_particle_setSimple(0x103, &mTorchPos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f); - i_mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } setBaseMtx(); 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 50f93ba3ddc..3c731b5ecbe 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 @@ -76,7 +76,7 @@ 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(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 8058E1C4-8058E244 000264 0080+00 1/1 0/0 0/0 .text CreateHeap__13daLv2Candle_cFv */ @@ -149,7 +149,7 @@ cPhs__Step daLv2Candle_c::create() { /* 8058E5BC-8058E608 00065C 004C+00 2/2 0/0 0/0 .text isSwitch__13daLv2Candle_cFv */ u8 daLv2Candle_c::isSwitch() { - return mSwType ^ i_fopAcM_isSwitch(this, mSw); + return mSwType ^ fopAcM_isSwitch(this, mSw); } /* 8058E608-8058E628 0006A8 0020+00 1/1 0/0 0/0 .text @@ -282,7 +282,7 @@ int daLv2Candle_c::Execute() { g_whiteColor, g_whiteColor, 0, 0.0f); dComIfGp_particle_setSimple(0x103, &mTorchPos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f); - i_mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } if (field_0x734 != NULL) { @@ -303,9 +303,9 @@ int daLv2Candle_c::Execute() { mIsLit = true; mCyl.SetAtMtrl(1); if (!mSwType) { - i_fopAcM_onSwitch(this, mSw); + fopAcM_onSwitch(this, mSw); } else { - i_fopAcM_offSwitch(this, mSw); + fopAcM_offSwitch(this, mSw); } mDoAud_seStart(0x80017, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); setLight(); @@ -320,9 +320,9 @@ int daLv2Candle_c::Execute() { mTimer = l_HIO.mTimer; } else if (!mSwType) { - i_fopAcM_offSwitch(this, mSw); + fopAcM_offSwitch(this, mSw); } else { - i_fopAcM_onSwitch(this, mSw); + fopAcM_onSwitch(this, mSw); } } cCcD_Obj* obj = mCyl.GetTgHitObj(); diff --git a/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp b/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp index f4e11cc93e8..97b10e0efce 100644 --- a/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp @@ -37,7 +37,7 @@ void daLv3Candle_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(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80C58594-80C5859C 000030 0008+00 1/1 0/0 0/0 .rodata l_bmdIdx */ @@ -147,7 +147,7 @@ int daLv3Candle_c::Execute() { dComIfGp_particle_setSimple(0x101, &mTorchPos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f); dComIfGp_particle_setSimple(0x103, &mTorchPos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f); - i_mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mDoAud_seStartLevel(0x80018, &mTorchPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); if (mSph.ChkTgHit()) { cCcD_Obj* obj = mSph.GetTgHitObj(); 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 8f0fa7c41b8..9643fc4f378 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 @@ -66,7 +66,7 @@ static void action(obj_lv3WaterB_class* i_this) { } mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); - i_this->mpBWaterModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpBWaterModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), i_this->mpBWaterMtx); i_this->mpBWaterBgW->Move(); @@ -74,7 +74,7 @@ static void action(obj_lv3WaterB_class* i_this) { if (i_this->mpOctHibiModel != NULL) { mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f); - i_this->mpOctHibiModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpOctHibiModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), i_this->mpOctHibiMtx); i_this->mpOctHibiBgW->Move(); 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 474f53bcbe5..be552982e70 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 @@ -23,7 +23,7 @@ void daObjLv3saka_c::setBaseMtx() { /* 80C5BED8-80C5BFA0 0000F8 00C8+00 1/0 0/0 0/0 .text Create__14daObjLv3saka_cFv */ int daObjLv3saka_c::Create() { - if (i_fopAcM_isSwitch(this, getSwbit())) { + if (fopAcM_isSwitch(this, getSwbit())) { if (mpBgW->ChkUsed()) { dComIfG_Bgsp().Release(mpBgW); } @@ -33,7 +33,7 @@ int daObjLv3saka_c::Create() { initBaseMtx(); - if (i_fopAcM_isSwitch(this, getSwbit())) { + if (fopAcM_isSwitch(this, getSwbit())) { mpBgW2->Move(); } @@ -84,7 +84,7 @@ int daObjLv3saka_c::create1st() { /* 80C5C0FC-80C5C17C 00031C 0080+00 1/0 0/0 0/0 .text Execute__14daObjLv3saka_cFPPA3_A4_f */ int daObjLv3saka_c::Execute(Mtx** param_0) { - if (i_fopAcM_isSwitch(this, getSwbit())) { + if (fopAcM_isSwitch(this, getSwbit())) { setWtrDzb(); } else { setNrmDzb(); diff --git a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp index 1730dff06b1..f1147f7a1ee 100644 --- a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp +++ b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp @@ -56,7 +56,7 @@ int daObjWaterEff_c::execute() { } for (int i = 0; i < 2; i++) { - i_mDoAud_seStartLevel(Z2SE_OBJ_WTR_STREAM, &mSePositions[i], 0, 0); + mDoAud_seStartLevel(Z2SE_OBJ_WTR_STREAM, &mSePositions[i], 0, 0); } return 1; diff --git a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp index 42bee1bcbe8..dbf144203ff 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp @@ -277,11 +277,11 @@ int dalv4CandleDemoTag_c::create() { mSwNG = getSwNG(); mSwDest = getSwDest(); - i_fopAcM_offSwitch(this, mSwDest); + fopAcM_offSwitch(this, mSwDest); setBaseMtx(); - if (i_fopAcM_isSwitch(this, getSwOK())) { + if (fopAcM_isSwitch(this, getSwOK())) { init_modeEnd(); } else { init_modeWatch(); @@ -355,7 +355,7 @@ void dalv4CandleDemoTag_c::modeWatch() { var3 = mpShutterActor->getStatus(); } - if (i_fopAcM_isSwitch(this, mSwNG) && var3 != 0) { + if (fopAcM_isSwitch(this, mSwNG) && var3 != 0) { if (mEnemyWaitTime == 0) { if (getEventID() != 0xFF) { orderEvent(getEventID(), 0xFF, 1); @@ -367,7 +367,7 @@ void dalv4CandleDemoTag_c::modeWatch() { } } - if (i_fopAcM_isSwitch(this, getSwOK())) { + if (fopAcM_isSwitch(this, getSwOK())) { init_modeEnd(); } } @@ -406,8 +406,8 @@ void dalv4CandleDemoTag_c::init_modeNG() { /* 80C5CEC0-80C5CF34 0005C0 0074+00 1/0 0/0 0/0 .text modeNG__20dalv4CandleDemoTag_cFv */ void dalv4CandleDemoTag_c::modeNG() { if (!fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this))) { - i_fopAcM_onSwitch(this, mSwDest); - i_fopAcM_offSwitch(this, mSwNG); + fopAcM_onSwitch(this, mSwDest); + fopAcM_offSwitch(this, mSwNG); init_modeWatch(); } } @@ -420,7 +420,7 @@ void dalv4CandleDemoTag_c::init_modeEnd() { /* 80C5CF40-80C5CF78 000640 0038+00 1/0 0/0 0/0 .text modeEnd__20dalv4CandleDemoTag_cFv */ void dalv4CandleDemoTag_c::modeEnd() { - i_fopAcM_offSwitch(this, mSwNG); + fopAcM_offSwitch(this, mSwNG); } /* 80C5CF78-80C5CF9C 000678 0024+00 2/1 0/0 0/0 .text eventStart__20dalv4CandleDemoTag_cFv */ 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 8f9225c35b4..bce005898f5 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 @@ -43,7 +43,7 @@ void daLv4Gate_c::setBaseMtx() { mDoMtx_stack_c::transM(mMoveValue, 0.0f, 0.0f); mpModel->setBaseScale(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80C5EC80-80C5ECEC 000200 006C+00 1/0 0/0 0/0 .text CreateHeap__11daLv4Gate_cFv */ @@ -71,7 +71,7 @@ int daLv4Gate_c::create() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox2(this, mpModel->getModelData()); - mInitMove = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF); + mInitMove = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF); mMoveType = fopAcM_GetParam(this) >> 8; f32 target; @@ -125,7 +125,7 @@ void daLv4Gate_c::init_modeWait() { /* 80C5EF54-80C5EFB0 0004D4 005C+00 1/0 0/0 0/0 .text modeWait__11daLv4Gate_cFv */ void daLv4Gate_c::modeWait() { - mInitMove = i_fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF); + mInitMove = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF); if (mInitMove) { init_modeMove(); } @@ -144,7 +144,7 @@ void daLv4Gate_c::modeMove() { mDoMtx_stack_c::multVec(&sound_pos, &sound_pos); sound_pos += current.pos; - i_mDoAud_seStartLevel(Z2SE_OBJ_GORONGATE_MOVE, &sound_pos, 0, + mDoAud_seStartLevel(Z2SE_OBJ_GORONGATE_MOVE, &sound_pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); if (cLib_addCalc(&mMoveValue, mMoveTarget, 0.2f, l_HIO.mMoveSpeed, 0.5f) == 0.0f) { 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 d2daa93c263..60e7c19f45e 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 @@ -17,7 +17,7 @@ void daLv4HsTarget_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); mpModel->setBaseScale(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80C5F718-80C5F784 0001D8 006C+00 1/0 0/0 0/0 .text CreateHeap__15daLv4HsTarget_cFv */ 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 fd1958107b7..f1445172c84 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 @@ -45,7 +45,7 @@ void daLv4PoGate_c::setBaseMtx() { mDoMtx_stack_c::transM(0.0f, mMoveValue, 0.0f); mpModel->setBaseScale(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80C5FD40-80C5FDAC 000240 006C+00 1/0 0/0 0/0 .text CreateHeap__13daLv4PoGate_cFv */ @@ -75,7 +75,7 @@ int daLv4PoGate_c::create() { fopAcM_setCullSizeBox2(this, mpModel->getModelData()); mSw = getSw(); - mInitMove = i_fopAcM_isSwitch(this, mSw); + mInitMove = fopAcM_isSwitch(this, mSw); mMoveTarget = 1000.0f; mMoveValue = 0.0f; @@ -115,7 +115,7 @@ void daLv4PoGate_c::moveGate() { }; u8 current_state = mInitMove; - mInitMove = i_fopAcM_isSwitch(this, mSw); + mInitMove = fopAcM_isSwitch(this, mSw); if (mInitMove != current_state) { if (mInitMove) { 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 e560b87ce55..0090dd584d2 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 @@ -19,7 +19,7 @@ void daObjLv4Floor_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mMoveYPos, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } @@ -69,7 +69,7 @@ int daObjLv4Floor_c::create1st() { return phase; } - if (i_fopAcM_isSwitch(this, getSwbit())) { + if (fopAcM_isSwitch(this, getSwbit())) { return cPhs_ERROR_e; } @@ -101,7 +101,7 @@ void daObjLv4Floor_c::action() { /* 80C67AD4-80C67B28 000354 0054+00 1/0 0/0 0/0 .text mode_wait__15daObjLv4Floor_cFv */ void daObjLv4Floor_c::mode_wait() { - if (i_fopAcM_isSwitch(this, getSwbit())) { + if (fopAcM_isSwitch(this, getSwbit())) { mode_init_move(); } } 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 95aa007aa2e..aa4dc2527da 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 @@ -423,7 +423,7 @@ void daMagLiftRot_c::setBaseMtx() { // but this function doesnt match unless it's like this?? mpModel->setBaseScale(cXyz(1.0f, 1.0f, 1.0f)); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } #else @@ -860,7 +860,7 @@ void daMagLiftRot_c::init_modeMoveWait() { /* 80C8F810-80C8F86C 000FB0 005C+00 1/0 0/0 0/0 .text modeMoveWait__14daMagLiftRot_cFv */ void daMagLiftRot_c::modeMoveWait() { - u8 sw_on = i_fopAcM_isSwitch(this, (fopAcM_GetParam(this) >> 0x18) & 0xFF); + u8 sw_on = fopAcM_isSwitch(this, (fopAcM_GetParam(this) >> 0x18) & 0xFF); if (sw_on) { mTimer = 15; 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 5970f9c38ee..df2a3f2400c 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 @@ -404,7 +404,7 @@ SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { int daObjMasterSword_c::create() { fopAcM_SetupActor(this, daObjMasterSword_c); - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[getFlagNo()])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[getFlagNo()])) { return cPhs_ERROR_e; } @@ -481,7 +481,7 @@ void daObjMasterSword_c::initBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } void daObjMasterSword_c::callInit() { @@ -651,7 +651,7 @@ int daObjMasterSword_c::execute() { dMeter2Info_setSword(MASTER_SWORD, false); dComIfGs_setSelectEquipSword(MASTER_SWORD); - i_dComIfGp_setItemLifeCount(dComIfGs_getMaxLife(), 0); + dComIfGp_setItemLifeCount(dComIfGs_getMaxLife(), 0); dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[getFlagNo()]); fopAcM_delete(this); } 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 3d543190f71..90d226a4212 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 @@ -57,7 +57,7 @@ void daObjMGate_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::ZXYrotM(mGateAngle.x, mGateAngle.y, mGateAngle.z); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); if (mpKeyModel != NULL) { @@ -68,7 +68,7 @@ void daObjMGate_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(mGateAngle.x, mGateAngle.y, mGateAngle.z); mDoMtx_stack_c::transM(key_offset); mDoMtx_stack_c::XrotM(mGateKeyAngle); - mpKeyModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpKeyModel->setBaseTRMtx(mDoMtx_stack_c::get()); } } 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 da64f86ad02..a85707f9686 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 @@ -51,7 +51,7 @@ static void action(obj_myogan_class* i_this) { mDoMtx_stack_c::YrotM(i_this->shape_angle.y); mDoMtx_stack_c::scaleM(l_HIO.mSize, l_HIO.mSize, l_HIO.mSize); - i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), i_this->mBgMtx); i_this->mpBgW->Move(); 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 333f8705126..33be0026c8d 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 @@ -258,8 +258,8 @@ void daObj_Oiltubo_c::setMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::scaleM(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); - mpBModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + mpBModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80CA7430-80CA7478 000D90 0048+00 1/1 0/0 0/0 .text setAttnPos__15daObj_Oiltubo_cFv */ @@ -273,7 +273,7 @@ void daObj_Oiltubo_c::setAttnPos() { BOOL daObj_Oiltubo_c::chkEvent() { BOOL var_r5 = 1; - if (!i_dComIfGp_getEvent().i_isOrderOK()) { + if (!dComIfGp_getEvent().isOrderOK()) { var_r5 = 0; if (eventInfo.i_checkCommandCatch()) { 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 6d7b22ac751..f213eda9dff 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 @@ -10,7 +10,7 @@ /* 80CA8278-80CA82F4 000078 007C+00 1/1 0/0 0/0 .text create__16daObjOnsenFire_cFv */ int daObjOnsenFire_c::create() { fopAcM_SetupActor(this, daObjOnsenFire_c); - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[377]) == 0) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[377]) == 0) { return cPhs_ERROR_e; } return cPhs_COMPLEATE_e; 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 12e49b7c8ed..57b594e0107 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 @@ -43,7 +43,7 @@ int daObjRCircle_c::createHeap() { /* 80CB8928-80CB8A28 000348 0100+00 1/1 0/0 0/0 .text create__14daObjRCircle_cFv */ int daObjRCircle_c::create() { fopAcM_SetupActor(this, daObjRCircle_c); - if (i_fopAcM_isSwitch(this, getSwBit())) { + if (fopAcM_isSwitch(this, getSwBit())) { return cPhs_ERROR_e; } @@ -88,7 +88,7 @@ int daObjRCircle_c::execute() { fopAcM_delete(this); } } else { - if (i_fopAcM_isSwitch(this, getSwBit())) { + if (fopAcM_isSwitch(this, getSwBit())) { mSwitch = 1; mBrk.setPlaySpeed(1.0f); } 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 dee312c1eee..2b571726240 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 @@ -53,15 +53,15 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { daObjRgate_c* actor_p = (daObjRgate_c*)model_p->getUserArea(); if (jnt_no == GATE_L_JNT) { - MTXCopy(model_p->i_getAnmMtx(jnt_no), mDoMtx_stack_c::get()); + MTXCopy(model_p->getAnmMtx(jnt_no), mDoMtx_stack_c::get()); mDoMtx_stack_c::YrotM(actor_p->mGateLAngle); - model_p->i_setAnmMtx(jnt_no, mDoMtx_stack_c::get()); + model_p->setAnmMtx(jnt_no, mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); } else if (jnt_no == GATE_R_JNT) { - MTXCopy(model_p->i_getAnmMtx(jnt_no), mDoMtx_stack_c::get()); + MTXCopy(model_p->getAnmMtx(jnt_no), mDoMtx_stack_c::get()); mDoMtx_stack_c::YrotM(actor_p->mGateRAngle); - model_p->i_setAnmMtx(jnt_no, mDoMtx_stack_c::get()); + model_p->setAnmMtx(jnt_no, mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); } @@ -123,7 +123,7 @@ void daObjRgate_c::initBaseMtx() { void daObjRgate_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(current.angle.y); - mpGateModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpGateModel->setBaseTRMtx(mDoMtx_stack_c::get()); cXyz sp30(-350.0f, 0.0f, 0.0f); cXyz sp3C(350.0f, 0.0f, 0.0f); @@ -180,7 +180,7 @@ void daObjRgate_c::setBaseMtx() { mDoMtx_stack_c::ZrotM(field_0xbae); mDoMtx_stack_c::ZrotM(var_r29); mDoMtx_stack_c::transM(-14.0f, 0.0f, 0.0f); - mpHookModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpHookModel->setBaseTRMtx(mDoMtx_stack_c::get()); if (mpKeyModel != NULL) { if (field_0xbae == 0) { @@ -189,7 +189,7 @@ void daObjRgate_c::setBaseMtx() { mDoMtx_stack_c::YrotM(current.angle.y + mGateLAngle); mDoMtx_stack_c::XrotM(-0xE38); mDoMtx_stack_c::XrotM(-field_0xbaa); - mpKeyModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpKeyModel->setBaseTRMtx(mDoMtx_stack_c::get()); } else { field_0xbe4 += -2.5f; if (field_0xbe4 < -20.0f) { @@ -210,7 +210,7 @@ void daObjRgate_c::setBaseMtx() { cLib_addCalcAngleS(&mKeyRot.x, -0x4000, 5, 0xC00, 0x400); mDoMtx_stack_c::transS(mEffPos); mDoMtx_stack_c::ZXYrotM(mKeyRot); - mpKeyModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpKeyModel->setBaseTRMtx(mDoMtx_stack_c::get()); } } } @@ -242,12 +242,12 @@ int daObjRgate_c::Create() { static char* l_evName = "RIDER_GATE_OPEN00"; u8 sw_no = getSwNo(); - if (sw_no != 0xFF && !i_fopAcM_isSwitch(this, sw_no) && - !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) + if (sw_no != 0xFF && !fopAcM_isSwitch(this, sw_no) && + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) { eventInfo.setArchiveName(l_arcName); - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xFF); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xFF); mMapToolID = getEventID(); setAction(ACT_WAIT_EVENT); } else { @@ -375,7 +375,7 @@ int daObjRgate_c::checkAreaL(cXyz const* unused1, cXyz const* unused2) { if (daPy_getPlayerActorClass()->checkHorseRide()) { offset.set(0.0f, 0.0f, 250.0f); - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (horse_p != NULL) { mDoMtx_stack_c::transS(horse_p->current.pos); mDoMtx_stack_c::YrotM(horse_p->shape_angle.y); @@ -452,7 +452,7 @@ int daObjRgate_c::checkAreaR(cXyz const* unused1, cXyz const* unused2) { if (daPy_getPlayerActorClass()->checkHorseRide()) { offset.set(0.0f, 0.0f, 250.0f); - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (horse_p != NULL) { mDoMtx_stack_c::transS(horse_p->current.pos); mDoMtx_stack_c::YrotM(horse_p->shape_angle.y); @@ -570,7 +570,7 @@ void daObjRgate_c::setCrkSE() { /* 80CBB308-80CBB370 0016E8 0068+00 1/1 0/0 0/0 .text action__12daObjRgate_cFv */ void daObjRgate_c::action() { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) { mGateLAngle = 0x4000; mGateRAngle = -0x4000; } else { @@ -583,7 +583,7 @@ void daObjRgate_c::action_typeA() { u8 sw_no = getSwNo(); daPy_py_c* player_p = daPy_getPlayerActorClass(); - if (i_fopAcM_isSwitch(this, sw_no) || sw_no == 0xFF) { + if (fopAcM_isSwitch(this, sw_no) || sw_no == 0xFF) { cXyz unused1; cXyz unused2; @@ -618,7 +618,7 @@ void daObjRgate_c::action_typeA() { } } - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (horse_p != NULL && horse_p->speedF != 0.0f) { if (chk_l == AREA_CHECK_HORSE) { switch (checkDirL(horse_p)) { @@ -770,7 +770,7 @@ void daObjRgate_c::actionWaitEvent() { if (eventInfo.i_checkCommandDoor()) { setAction(ACT_EVENT); dComIfGp_setItemKeyNumCount(-1); - i_fopAcM_onSwitch(this, getSwNo()); + fopAcM_onSwitch(this, getSwNo()); fopAcM_seStart(this, Z2SE_OBJ_RIDER_GATE_L_OP, 0); } else if (checkOpen()) { eventInfo.setEventId(mEventID); @@ -783,7 +783,7 @@ void daObjRgate_c::actionWaitEvent() { void daObjRgate_c::actionEvent() { if (dComIfGp_evmng_endCheck(mEventID)) { setAction(ACT_DEAD); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } else { demoProc(); } @@ -804,7 +804,7 @@ void daObjRgate_c::event_proc_call() { /* 80CBBC04-80CBBD68 001FE4 0164+00 1/1 0/0 0/0 .text demoProc__12daObjRgate_cFv */ void daObjRgate_c::demoProc() { - mStaffID = i_dComIfGp_evmng_getMyStaffId("K_GATE", NULL, 0); + mStaffID = dComIfGp_evmng_getMyStaffId("K_GATE", NULL, 0); int demo_action = getDemoAction(); if (dComIfGp_evmng_getIsAddvance(mStaffID)) { diff --git a/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp b/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp index acdb16ee471..c79f1924c53 100644 --- a/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp +++ b/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp @@ -39,7 +39,7 @@ static int daObj_Rock_Execute(obj_rock_class* i_this) { mDoMtx_YrotM(mDoMtx_stack_c::get(), rock->mRot); mDoMtx_stack_c::scaleM(rock->mScale.x, rock->mScale.y, rock->mScale.z); - rock->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + rock->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); rock->mCollider.SetC(rock->mPos); rock->mCollider.SetR(rock->mScale.x * 100.0f); diff --git a/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp b/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp index 350ae382154..3f3d1ff2e67 100644 --- a/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp +++ b/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp @@ -124,7 +124,7 @@ void daObj_Sekizo_c::initBaseMtx() { void daObj_Sekizo_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); cMtx_copy(mDoMtx_stack_c::get(), mBgMtx); } 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 dd26ad3761d..825f0833387 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 @@ -22,7 +22,7 @@ void daObjSmoke_c::setBaseMtx() { int daObjSmoke_c::Create() { initBaseMtx(); - if (i_fopAcM_isSwitch(this, getSwbit())) { + if (fopAcM_isSwitch(this, getSwbit())) { mParticle = dComIfGp_particle_set(0x85A6, ¤t.pos, ¤t.angle, &scale, 255, NULL, -1, NULL, NULL, NULL); } @@ -41,7 +41,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) { + if (fopAcM_isSwitch(this, getSwbit()) && !mParticle) { mParticle = dComIfGp_particle_set(0x85A6, ¤t.pos, ¤t.angle, &scale, 255, NULL, -1, NULL, NULL, NULL); } 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 ff7d455b4f8..b1f1d291c3e 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 @@ -90,11 +90,11 @@ int daObjSnowSoup_c::draw() { /* 80CDFC40-80CDFE14 000460 01D4+00 1/1 0/0 0/0 .text execute__15daObjSnowSoup_cFv */ int daObjSnowSoup_c::execute() { - i_mDoAud_seStartLevel(Z2SE_OBJ_NABE_BUBBLE, &mBubblePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); - i_mDoAud_seStartLevel(Z2SE_OBJ_FIREWOOD_BURNING, &mFirewoodPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mDoAud_seStartLevel(Z2SE_OBJ_NABE_BUBBLE, &mBubblePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mDoAud_seStartLevel(Z2SE_OBJ_FIREWOOD_BURNING, &mFirewoodPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); switch (mState) { case 0: - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[7])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[7])) { deleteSmkEmtChange(mState); mState = 1; createSmkEmtChange(mState); @@ -104,7 +104,7 @@ int daObjSnowSoup_c::execute() { } break; case 1: - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[8])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[8])) { deleteSmkEmtChange(mState); mState = 2; createSmkEmtChange(mState); @@ -123,9 +123,9 @@ int daObjSnowSoup_c::execute() { /* 80CDFE14-80CDFEA4 000634 0090+00 1/1 0/0 0/0 .text init__15daObjSnowSoup_cFv */ void daObjSnowSoup_c::init() { mState = 0; - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[8])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[8])) { mState = 2; - } else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[7])) { + } else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[7])) { mState = 1; } } @@ -134,7 +134,7 @@ void daObjSnowSoup_c::init() { void daObjSnowSoup_c::setModelMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel[mState]->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel[mState]->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80CDFF14-80CDFFF8 000734 00E4+00 1/1 0/0 0/0 .text createSmkEmtCommon__15daObjSnowSoup_cFv */ 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 6d67e53057b..d056985c746 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 @@ -314,7 +314,7 @@ 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(scale); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80CE7D28-80CE7D5C 001188 0034+00 1/1 0/0 0/0 .text setAttnPos__14daObj_SSItem_cFv */ 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 7939ae349e7..442b155d0bc 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 @@ -682,7 +682,7 @@ void daObjStone_c::setBaseMtx() { mDoMtx_stack_c::quatM(&field_0x0920); 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()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); field_0x0930 = field_0x0920; field_0x0920 = ZeroQuat; } 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 9b42108ccce..486f34b85c7 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 @@ -36,7 +36,7 @@ int daObj_Suisya_c::execute() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); return 1; } diff --git a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp index dcfdbaf8640..8b85da48098 100644 --- a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp +++ b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp @@ -208,7 +208,7 @@ void daObjSwBallA_c::search_ball() { for (int i = 0; i < 8; i++) { l_target_info[i] = NULL; } - i_fpcM_Search(s_ball_sub, this); + fpcM_Search(s_ball_sub, this); for (int i = 0; i < l_target_info_count; i++) { if (l_target_info[i] != 0) { u32 id = fopAcM_GetID(l_target_info[i]); @@ -242,7 +242,7 @@ void daObjSwBallA_c::initBaseMtx() { void daObjSwBallA_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* ############################################################################################## */ @@ -266,11 +266,11 @@ int daObjSwBallA_c::Create() { field_0x58c[i] = -1; } field_0x5c0 = -1; - if (i_fopAcM_isSwitch(this, getSwbit2())) { + if (fopAcM_isSwitch(this, getSwbit2())) { field_0x588->setFrame(field_0x588->getEndFrame()); field_0x5ae = 2; } else { - i_fopAcM_offSwitch(this, getSwbit()); + fopAcM_offSwitch(this, getSwbit()); field_0x588->setFrame(0.0f); field_0x5ae = 0; } @@ -531,11 +531,11 @@ void daObjSwBallA_c::actionRun() { if (field_0x5c0 == -1) { fopAcM_seStart(this, Z2SE_OBJ_L8_L_BALL_SW_OFF, 0); field_0x588->setPlaySpeed(-1.0f); - i_fopAcM_offSwitch(this, getSwbit()); + fopAcM_offSwitch(this, getSwbit()); field_0x5ae = 0; } else { if (field_0x588->play() != 0) { - i_fopAcM_onSwitch(this, getSwbit()); + fopAcM_onSwitch(this, getSwbit()); if (getEvent() != 0xff) { orderEvent(getEvent(), 0xff, 1); } @@ -693,8 +693,8 @@ asm int daObjSwBallA_c::draw() { /* 80CF41F4-80CF4274 000F74 0080+00 1/1 0/0 0/0 .text _delete__14daObjSwBallA_cFv */ int daObjSwBallA_c::_delete() { - if (!i_fopAcM_isSwitch(this, getSwbit2())) { - i_fopAcM_offSwitch(this, getSwbit()); + if (!fopAcM_isSwitch(this, getSwbit2())) { + fopAcM_offSwitch(this, getSwbit()); } dComIfG_resDelete(&field_0x57c, l_arcName); return 1; diff --git a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp index 4f7701f7bf3..1fac6152d69 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp +++ b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp @@ -234,7 +234,7 @@ void daObjSwBallB_c::search_ball() { for (int i = 0; i < 2; i++) { l_target_info[i] = NULL; } - i_fpcM_Search(s_ball_sub, this); + fpcM_Search(s_ball_sub, this); for (int i = 0; i < l_target_info_count; i++) { if (l_target_info[i] != 0) { u32 id = fopAcM_GetID(l_target_info[i]); @@ -277,7 +277,7 @@ void daObjSwBallB_c::initBaseMtx() { void daObjSwBallB_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80CF49F0-80CF4B74 0004B0 0184+00 1/1 0/0 0/0 .text Create__14daObjSwBallB_cFv */ @@ -293,12 +293,12 @@ int daObjSwBallB_c::Create() { } field_0x59c = -1; - if (fopAcM_GetRoomNo(this) == 0 && i_fopAcM_isSwitch(this, 0x3f)) { + if (fopAcM_GetRoomNo(this) == 0 && fopAcM_isSwitch(this, 0x3f)) { field_0x588->setFrame(field_0x588->getEndFrame()); if (getArg1() == 1) { - i_fopAcM_onSwitch(this, getSwbit2()); + fopAcM_onSwitch(this, getSwbit2()); } - i_fopAcM_onSwitch(this, getSwbit()); + fopAcM_onSwitch(this, getSwbit()); field_0x596 = 5; } GXColor* color = mModel->getModelData()->getMaterialNodePointer(0)->getTevKColor(1); @@ -551,7 +551,7 @@ void daObjSwBallB_c::actionRun() { if (field_0x59c == -1) { field_0x588->setPlaySpeed(-1.0f); if (dComIfGp_roomControl_getStayNo() != 0) { - i_fopAcM_offSwitch(this, getSwbit()); + fopAcM_offSwitch(this, getSwbit()); } fopAcM_seStart(this, Z2SE_OBJ_L8_L_BALL_SW_OFF, 0); field_0x5a8 = -1; @@ -562,10 +562,10 @@ void daObjSwBallB_c::actionRun() { daObjCarry_c* carryObj = (daObjCarry_c*)fopAcM_SearchByID(field_0x59c); if (carryObj != NULL) { if (getArg1() == 1) { - i_fopAcM_onSwitch(this, getSwbit2()); + fopAcM_onSwitch(this, getSwbit2()); } if (carryObj->getType() == 8) { - i_fopAcM_onSwitch(this, getSwbit()); + fopAcM_onSwitch(this, getSwbit()); dComIfGs_onEventBit(l_event_bitA[getID()]); field_0x5a8 = 0; } else { @@ -574,7 +574,7 @@ void daObjSwBallB_c::actionRun() { } } } else { - i_fopAcM_onSwitch(this, getSwbit()); + fopAcM_onSwitch(this, getSwbit()); } if (getEvent() != 0xff) { orderEvent(getEvent(), 0xff, 1); @@ -640,7 +640,7 @@ void daObjSwBallB_c::PutCrrPos() { fopAcM_GetName(carryObj) == PROC_Obj_Carry && carryObj->prm_chk_type_lightball()) { player->setForcePutPos(current.pos); - if (!i_dComIfGp_event_runCheck()) { + if (!dComIfGp_event_runCheck()) { dComIfGp_setDoStatus(0x14, 2); } } diff --git a/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp b/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp index 34af5302b1b..b610dad7d18 100644 --- a/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp +++ b/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp @@ -56,7 +56,7 @@ void daObjSwBallC_c::initBaseMtx() { void daObjSwBallC_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* ############################################################################################## */ @@ -100,7 +100,7 @@ int daObjSwBallC_c::Create() { joint->getMin()->x, joint->getMin()->y, joint->getMin()->z, joint->getMax()->x, joint->getMax()->y, joint->getMax()->z); - if (i_fopAcM_isSwitch(this, 0x3d) && i_fopAcM_isSwitch(this, 0x3e)) { + if (fopAcM_isSwitch(this, 0x3d) && fopAcM_isSwitch(this, 0x3e)) { field_0x574->setPlaySpeed(1.0f); field_0x574->setFrame(field_0x574->getEndFrame()); } @@ -110,8 +110,8 @@ int daObjSwBallC_c::Create() { color->b = l_color.b; field_0x57e = -1; eventInfo.setArchiveName(l_arcName); - field_0x57c = i_dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xff); - if (i_fopAcM_isSwitch(this, 0x3f)) { + field_0x57c = dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xff); + if (fopAcM_isSwitch(this, 0x3f)) { setLightOnSwB(); setAction(3); } @@ -176,7 +176,7 @@ static char* action_table[13] = { /* 80CF6200-80CF629C 0006E0 009C+00 1/0 0/0 0/0 .text actionWait__14daObjSwBallC_cFv */ void daObjSwBallC_c::actionWait() { - if (i_fopAcM_isSwitch(this, 0x3d) && i_fopAcM_isSwitch(this, 0x3e)) { + if (fopAcM_isSwitch(this, 0x3d) && fopAcM_isSwitch(this, 0x3e)) { setAction(1); fopAcM_orderOtherEventId(this, field_0x57c, field_0x57e, 0xffff, 0, 1); eventInfo.i_onCondition(2); @@ -188,7 +188,7 @@ void daObjSwBallC_c::actionOrderEvent() { if (eventInfo.checkCommandDemoAccrpt()) { setAction(2); demoProc(); - i_fopAcM_onSwitch(this, 0x3f); + fopAcM_onSwitch(this, 0x3f); dComIfGs_onTbox(10); dComIfGs_onTbox(11); } else { @@ -201,10 +201,10 @@ void daObjSwBallC_c::actionOrderEvent() { void daObjSwBallC_c::actionEvent() { if (dComIfGp_evmng_endCheck(field_0x57c)) { setAction(3); - i_dComIfGp_event_reset(); - i_fopAcM_onSwitch(this, 0x58); + dComIfGp_event_reset(); + fopAcM_onSwitch(this, 0x58); for (int i = 0; i < 8; i++) { - i_fopAcM_onSwitch(this, i + 0x50); + fopAcM_onSwitch(this, i + 0x50); } } else { demoProc(); @@ -221,7 +221,7 @@ int daObjSwBallC_c::demoProc() { daPy_py_c* player = daPy_getPlayerActorClass(); cXyz acStack_38; int uVar1 = dComIfGp_evmng_getMyActIdx(field_0x578, action_table, 13, 0, 0); - field_0x578 = i_dComIfGp_evmng_getMyStaffId(l_staffName, NULL, 0); + field_0x578 = dComIfGp_evmng_getMyStaffId(l_staffName, NULL, 0); player->onShieldBackBone(); if (dComIfGp_evmng_getIsAddvance(field_0x578)) { switch (uVar1) { @@ -258,16 +258,16 @@ int daObjSwBallC_c::demoProc() { dMeter2Info_setSword(0x29, 0); break; case 11: - player->i_changeOriginalDemo(); + player->changeOriginalDemo(); field_0x580 = 2; acStack_38.set(262.5f, -188.0f, 10712.5f); player->setPlayerPosAndAngle(&acStack_38, 0, 0); - player->i_changeDemoMode(4, 1, 0, 0); + player->changeDemoMode(4, 1, 0, 0); break; case 12: - player->i_changeOriginalDemo(); + player->changeOriginalDemo(); field_0x580 = 2; - player->i_changeDemoMode(4, 1, 0, 0); + player->changeDemoMode(4, 1, 0, 0); break; case 9: field_0x588 = -1; @@ -321,7 +321,7 @@ int daObjSwBallC_c::demoProc() { case 11: case 12: if (cLib_calcTimer(&field_0x580) == 0) { - player->i_cancelOriginalDemo(); + player->cancelOriginalDemo(); dComIfGp_evmng_cutEnd(field_0x578); } break; @@ -343,7 +343,7 @@ int daObjSwBallC_c::demoProc() { void daObjSwBallC_c::setLightOnSwB() { for (u8 i = 0; i < 6; i++) { field_0x582 = i; - daObjSwBallB_c* ball = (daObjSwBallB_c*)i_fpcM_Search(s_swb_sub, this); + daObjSwBallB_c* ball = (daObjSwBallB_c*)fpcM_Search(s_swb_sub, this); if (ball != NULL) { ball->setLightOn(); } @@ -355,7 +355,7 @@ void daObjSwBallC_c::setLightOnSwB() { void daObjSwBallC_c::setLightOffSwB() { for (u8 i = 0; i < 6; i++) { field_0x582 = i; - daObjSwBallB_c* ball = (daObjSwBallB_c*)i_fpcM_Search(s_swb_sub, this); + daObjSwBallB_c* ball = (daObjSwBallB_c*)fpcM_Search(s_swb_sub, this); if (ball != NULL) { ball->setLightOff(); } @@ -371,7 +371,7 @@ void daObjSwBallC_c::deleteLightBall() { /* 80CF692C-80CF6964 000E0C 0038+00 1/1 0/0 0/0 .text deleteLightBallA__14daObjSwBallC_cFv */ void daObjSwBallC_c::deleteLightBallA() { - fopAc_ac_c* ball = (fopAc_ac_c*)i_fpcM_Search(s_ballA_sub, this); + fopAc_ac_c* ball = (fopAc_ac_c*)fpcM_Search(s_ballA_sub, this); if (ball != NULL) { fopAcM_delete(ball); } @@ -379,7 +379,7 @@ void daObjSwBallC_c::deleteLightBallA() { /* 80CF6964-80CF699C 000E44 0038+00 1/1 0/0 0/0 .text deleteLightBallB__14daObjSwBallC_cFv */ void daObjSwBallC_c::deleteLightBallB() { - fopAc_ac_c* ball = (fopAc_ac_c*)i_fpcM_Search(s_ballB_sub, this); + fopAc_ac_c* ball = (fopAc_ac_c*)fpcM_Search(s_ballB_sub, this); if (ball != NULL) { fopAcM_delete(ball); } @@ -388,14 +388,14 @@ void daObjSwBallC_c::deleteLightBallB() { /* 80CF699C-80CF6A74 000E7C 00D8+00 1/1 0/0 0/0 .text calcLightBallScale__14daObjSwBallC_cFv */ int daObjSwBallC_c::calcLightBallScale() { int uVar3 = 0; - fopAc_ac_c* ball = (fopAc_ac_c*)i_fpcM_Search(s_ballA_sub, this); + fopAc_ac_c* ball = (fopAc_ac_c*)fpcM_Search(s_ballA_sub, this); if (ball != NULL) { fopAcM_OnStatus(ball, 0x800); uVar3 = cLib_chaseF(&ball->scale.x, 0.0f, 0.05f); ball->scale.y = ball->scale.x; ball->scale.z = ball->scale.x; } - ball = (fopAc_ac_c*)i_fpcM_Search(s_ballB_sub, this); + ball = (fopAc_ac_c*)fpcM_Search(s_ballB_sub, this); if (ball != NULL) { fopAcM_OnStatus(ball, 0x800); uVar3 &= cLib_chaseF(&ball->scale.x, 0.0f, 0.05f); 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 c956ade3d64..762a1a0d976 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 @@ -22,9 +22,9 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { daObjSwPr_c* swpr_p = (daObjSwPr_c*)model_p->getUserArea(); if (jnt_no == swpr_p->mKaitenJntID) { - cMtx_copy(model_p->i_getAnmMtx(jnt_no), mDoMtx_stack_c::get()); + cMtx_copy(model_p->getAnmMtx(jnt_no), mDoMtx_stack_c::get()); mDoMtx_stack_c::YrotM(swpr_p->field_0x82c); - model_p->i_setAnmMtx(jnt_no, mDoMtx_stack_c::get()); + model_p->setAnmMtx(jnt_no, mDoMtx_stack_c::get()); mDoMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); } } @@ -47,7 +47,7 @@ void daObjSwPr_c::initBaseMtx() { void daObjSwPr_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 8059B2C8-8059B2D0 000000 0008+00 3/3 0/0 0/0 .rodata l_bmdName */ @@ -176,9 +176,9 @@ void daObjSwPr_c::switchCtrl() { int sw = getSwbit(); if (mRotateSpeed == 0) { - i_fopAcM_offSwitch(this, sw); + fopAcM_offSwitch(this, sw); } else if (cLib_calcTimer(&mSwDelayTimer) == 0) { - i_fopAcM_onSwitch(this, sw); + fopAcM_onSwitch(this, sw); } } @@ -248,9 +248,9 @@ void daObjSwPr_c::execute_type_wind() { field_0x834++; if (field_0x834 == 20) { - i_fopAcM_onSwitch(this, sw); + fopAcM_onSwitch(this, sw); } else if (field_0x834 == 25) { - i_fopAcM_offSwitch(this, sw); + fopAcM_offSwitch(this, sw); } } } @@ -267,16 +267,16 @@ void daObjSwPr_c::execute_type_wind() { { mRotateSpeed = 7000; mRotateInitSpeed = mRotateSpeed; - i_fopAcM_onSwitch(this, sw); + fopAcM_onSwitch(this, sw); mSwOffDelayTimer = 10; if (getSwbit2() != 0xFF) { - i_fopAcM_onSwitch(this, getSwbit2()); + fopAcM_onSwitch(this, getSwbit2()); } } } } else if (mSwOffDelayTimer != 0 && cLib_calcTimer(&mSwOffDelayTimer) == 0) { - i_fopAcM_offSwitch(this, sw); + fopAcM_offSwitch(this, sw); } cLib_addCalcAngleS(&mRotateSpeed, target_speed, 30, 100, 50); 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 34cc109bf6b..36c36b5bae1 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 @@ -44,20 +44,20 @@ void daObjSwSpinner_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel1->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel1->setBaseTRMtx(mDoMtx_stack_c::get()); 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(home.angle.y); - mpModel2->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel2->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } /* ############################################################################################## */ /* 80D00284-80D0035C 000384 00D8+00 1/0 0/0 0/0 .text Create__16daObjSwSpinner_cFv */ int daObjSwSpinner_c::Create() { - if (i_fopAcM_isSwitch(this, getSwBit2())) { + if (fopAcM_isSwitch(this, getSwBit2())) { field_0x5e4 = 50.0f; field_0x5ea = 0; } else { @@ -140,7 +140,7 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) { mCount += 1; } - if (i_fopAcM_isSwitch(this, getSwBit2())) { + if (fopAcM_isSwitch(this, getSwBit2())) { if (cLib_addCalc(&field_0x5e4, 50.0f, 0.1f, 10.0f, 2.0f) == 0.0f && field_0x5ea != NULL) { if (field_0x5e8 != NULL) { spinner->offSpinnerTag(); @@ -155,9 +155,9 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) { } else if (field_0x5e8 != NULL) { if (mCount > 200) { if (mRotSpeedY > 3000) { - i_fopAcM_onSwitch(this, getSwBit()); + fopAcM_onSwitch(this, getSwBit()); } else { - i_fopAcM_offSwitch(this, getSwBit()); + fopAcM_offSwitch(this, getSwBit()); } } } else { @@ -175,7 +175,7 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) { mpBgW2->Move(); attention_info.position = current.pos; attention_info.position.y -= 100.0f; - field_0x5eb = i_fopAcM_isSwitch(this, getSwBit2()) ? 1 : 0; + field_0x5eb = fopAcM_isSwitch(this, getSwBit2()) ? 1 : 0; field_0x5e9 = field_0x5e8; return 1; 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 fc615888ff5..0043b5f2c1f 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 @@ -23,7 +23,7 @@ void daObjTable_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); cMtx_copy(mDoMtx_stack_c::get(), mBgMtx); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } int daObjTable_c::create() { @@ -89,19 +89,19 @@ int daObjTable_c::Create() { mpModel->getModelData()->getMaterialNodePointer(2)->getShape()->hide(); } else { if (dComIfG_play_c::getLayerNo(0) == 4) { - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361])) { mpModel->getModelData()->getMaterialNodePointer(0)->getShape()->hide(); } - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) && - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266]) && - !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[267])) + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266]) && + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[267])) { mpModel->getModelData()->getMaterialNodePointer(1)->getShape()->hide(); } - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) && - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266]) && - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[267]) && - !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[268])) + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266]) && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[267]) && + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[268])) { mpModel->getModelData()->getMaterialNodePointer(2)->getShape()->hide(); } @@ -110,9 +110,9 @@ int daObjTable_c::Create() { } } - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[103]) && - !(!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[268]) && - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[264]))) + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[103]) && + !(!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[268]) && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[264]))) { mpModel->getModelData()->getMaterialNodePointer(4)->getShape()->hide(); attention_info.flags = 0; @@ -141,19 +141,19 @@ int daObjTable_c::Execute(Mtx** i_mtx) { eventInfo.i_onCondition(1); dComIfG_inf_c& gameInfo = g_dComIfG_gameInfo; - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (mMsgFlow.doFlow(this, NULL, 0) != 0) { gameInfo.getPlay().getEvent().reset(this); // Fake match? eventInfo.setArchiveName("Table"); - i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, "TABLE_MAP", -1); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + mEventID = dComIfGp_getEventManager().getEventIdx(this, "TABLE_MAP", -1); fopAcM_orderChangeEventId(this, mEventID, 1, -1); } - } else if (i_dComIfGp_getEventManager().getMyStaffId(l_arcName, NULL, 0) != -1 && + } else if (dComIfGp_getEventManager().getMyStaffId(l_arcName, NULL, 0) != -1 && eventInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && - i_dComIfGp_getEventManager().endCheck(mEventID)) + dComIfGp_getEventManager().endCheck(mEventID)) { mEventID = -1; dMeter2Info_setPauseStatus(7); 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 7c45108b896..c9a4456965b 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 @@ -20,7 +20,7 @@ void daObjGake_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } @@ -68,9 +68,9 @@ int daObjGake_c::create1st() { /* 80D0BE24-80D0BF7C 000284 0158+00 1/0 0/0 0/0 .text Execute__11daObjGake_cFPPA3_A4_f */ int daObjGake_c::Execute(Mtx** param_0) { if ((mEventBit2 != 0x3FF && - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit2])) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit2])) || (mEventBit1 != 0x3FF && - !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit1]))) + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit1]))) { if (mpBgW != NULL && mpBgW->ChkUsed()) { dComIfG_Bgsp().Release(mpBgW); @@ -80,7 +80,7 @@ int daObjGake_c::Execute(Mtx** param_0) { return 1; } - if (mEventBit1 != 0x3FF && i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit1])) { + if (mEventBit1 != 0x3FF && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit1])) { if (mpBgW != NULL && !mpBgW->ChkUsed()) { dComIfG_Bgsp().Regist(mpBgW, this); } 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 9745a91a74c..d1868c2864f 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 @@ -62,14 +62,14 @@ int daObjTMoon_c::create() { /* 80D12DC0-80D12EB4 0002A0 00F4+00 1/1 0/0 0/0 .text execute__12daObjTMoon_cFv */ int daObjTMoon_c::execute() { if ((field_0x576 != 0x3ff) && - (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x576])) || + (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x576])) || (field_0x574 != 0x3ff) && - (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x574]))) + (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x574]))) { fopDwTg_DrawQTo(&draw_tag); return 1; } else if ((field_0x574 != 0x3ff) && - (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x574]))) + (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x574]))) { fopDwTg_ToDrawQ(&draw_tag, fpcLf_GetPriority(this)); return 1; 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 4b3061b3992..4966b3b0416 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 @@ -23,7 +23,7 @@ static int daObj_Usaku_Execute(obj_usaku_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); - i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); if (i_this->mpBgW != NULL) { MTXCopy(mDoMtx_stack_c::get(), i_this->mBgMtx); i_this->mpBgW->Move(); 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 8ef2029d31a..7522b03829e 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 @@ -78,11 +78,11 @@ int daObjVGnd_c::create() { /* 80D217A8-80D21878 000448 00D0+00 2/2 0/0 0/0 .text execute__11daObjVGnd_cFv */ int daObjVGnd_c::execute() { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[65])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[65])) { mpBrk->setFrame(2.0f); mpBtk->setFrame(2.0f); } else { - if (i_fopAcM_isSwitch(this, getSwbit())) { + if (fopAcM_isSwitch(this, getSwbit())) { mpBrk->setFrame(1.0f); mpBtk->setFrame(1.0f); } else { 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 e0f241027b6..25c23576640 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 @@ -456,7 +456,7 @@ int daObjVolcBall_c::Create() { fopAcM_setCullSizeBox(this, -1000.0f, 0.0f, -1000.0f, 1000.0f, 1000.0f, 1000.0f); if (mIsBigVolc == 0) { - if (i_fopAcM_isSwitch(this, getSwBit())) { + if (fopAcM_isSwitch(this, getSwBit())) { initActionWarning(); } else { initActionSwWait(); @@ -501,7 +501,7 @@ int daObjVolcBall_c::create() { mIsBigVolc = checkBigVolc(); if (mIsBigVolc == 1) { - if (i_fopAcM_isSwitch(this, getSwBit2())) { + if (fopAcM_isSwitch(this, getSwBit2())) { return cPhs_ERROR_e; } @@ -720,7 +720,7 @@ asm void daObjVolcBall_c::actionPlayerWait() { /* 80D2267C-80D22724 000BDC 00A8+00 1/0 0/0 0/0 .text actionSwWait__15daObjVolcBall_cFv */ void daObjVolcBall_c::actionSwWait() { - if (i_fopAcM_isSwitch(this, getSwBit())) { + if (fopAcM_isSwitch(this, getSwBit())) { setAction(MODE_STOP); mTime = getData()->mNormalWaitTime * FLOAT_LABEL(lit_3715) + cM_rndFX(getData()->mRandWaitTime * FLOAT_LABEL(lit_3715)); @@ -729,7 +729,7 @@ void daObjVolcBall_c::actionSwWait() { /* 80D22724-80D227E4 000C84 00C0+00 1/0 0/0 0/0 .text actionStop__15daObjVolcBall_cFv */ void daObjVolcBall_c::actionStop() { - if (!i_fopAcM_isSwitch(this, getSwBit())) { + if (!fopAcM_isSwitch(this, getSwBit())) { setAction(MODE_SWITCH_WAIT); } @@ -762,7 +762,7 @@ void daObjVolcBall_c::actionWarning() { } if (getSwBit() != 0xFF) { - if (!i_fopAcM_isSwitch(this, getSwBit())) { + if (!fopAcM_isSwitch(this, getSwBit())) { dComIfGp_getVibration().StopQuake(31); setAction(MODE_SWITCH_WAIT); } @@ -776,7 +776,7 @@ void daObjVolcBall_c::actionWarning() { mSearchBallCreateTimer = getData()->mSearchBallCreateTime * 30; } - i_mDoAud_seStartLevel(Z2SE_ENV_VOLCANO_SHAKE, NULL, 0, + mDoAud_seStartLevel(Z2SE_ENV_VOLCANO_SHAKE, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } #else @@ -826,7 +826,7 @@ void daObjVolcBall_c::actionEruption() { if (timer != 0) { bool bvar2 = false; - if (getSwBit() != 0xFF && !i_fopAcM_isSwitch(this, getSwBit())) { + if (getSwBit() != 0xFF && !fopAcM_isSwitch(this, getSwBit())) { bvar2 = true; } @@ -880,7 +880,7 @@ void daObjVolcBall_c::actionEruption() { dComIfGp_getVibration().StopQuake(31); } - i_mDoAud_seStartLevel(Z2SE_ENV_VOLCANO_SHAKE, NULL, 0, + mDoAud_seStartLevel(Z2SE_ENV_VOLCANO_SHAKE, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } #else @@ -910,7 +910,7 @@ void daObjVolcBall_c::initActionEnd() { /* 80D22CD4-80D22DDC 001234 0108+00 1/0 0/0 0/0 .text actionEnd__15daObjVolcBall_cFv */ void daObjVolcBall_c::actionEnd() { - if (mIsBigVolc != 1 || (mIsBigVolc == 1 && i_fopAcM_isSwitch(this, getSwBit()))) { + if (mIsBigVolc != 1 || (mIsBigVolc == 1 && fopAcM_isSwitch(this, getSwBit()))) { return; } @@ -1203,7 +1203,7 @@ int daObjVolcBall_c::executeBall() { mDoMtx_stack_c::transS(ball->field_0x4); mDoMtx_stack_c::ZXYrotM(ball->field_0x34); - ball->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + ball->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); ball->mpModel->setBaseScale(ball->field_0x28); ball->mAcch.CrrPos(dComIfG_Bgsp()); @@ -1216,10 +1216,10 @@ int daObjVolcBall_c::executeBall() { ball->field_0x376 = 0; } else { if (i == 8) { - i_mDoAud_seStartLevel(Z2SE_OBJ_ROCK_FALL_DIRECT, &ball->field_0x4, 0, + mDoAud_seStartLevel(Z2SE_OBJ_ROCK_FALL_DIRECT, &ball->field_0x4, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } else { - i_mDoAud_seStartLevel(Z2SE_OBJ_ROCK_FALL_DUMMY, &ball->field_0x4, 0, + mDoAud_seStartLevel(Z2SE_OBJ_ROCK_FALL_DUMMY, &ball->field_0x4, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } 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 e045256700f..d5b42bd432d 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 @@ -306,7 +306,7 @@ cPhs__Step daObjWchain_c::create() { mRoofPos.set(current.pos.x, current.pos.y + 280.0f - 100.0f, current.pos.z); mRealRoofY = mRoofPos.y + 250.0f; mInitOutLength = mRoofPos.y - home.pos.y; - if (!mRepeatable && i_fopAcM_isSwitch(this, mSw)) { + if (!mRepeatable && fopAcM_isSwitch(this, mSw)) { current.pos.y -= 100.0f; mEnd = true; mPullLength = 100.0f; @@ -432,7 +432,7 @@ void daObjWchain_c::setMatrix() { mDoMtx_stack_c::ZrotM(mHandleRotation); mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); mDoMtx_stack_c::transM(0.0f, 0.0f, 8.75f); - mpHandleModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpHandleModel->setBaseTRMtx(mDoMtx_stack_c::get()); static Vec const eyeOffset = {0.0f, 0.0f, 53.75f}; mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); } @@ -637,7 +637,7 @@ void daObjWchain_c::setChainPos() { mReset = false; mEnd = false; } - } else if (mRepeatable || !i_fopAcM_isSwitch(this, mSw)) { + } else if (mRepeatable || !fopAcM_isSwitch(this, mSw)) { cLib_chaseF(&mPullLength, 0.0f, 5.0f); } else { mPullLength = 100.0f; @@ -777,13 +777,13 @@ int daObjWchain_c::execute() { mNowSwitch = false; if (mRepeatable) { mReset = true; - if (i_fopAcM_isSwitch(this, mSw)) { - i_fopAcM_offSwitch(this, mSw); + if (fopAcM_isSwitch(this, mSw)) { + fopAcM_offSwitch(this, mSw); } else { - i_fopAcM_onSwitch(this, mSw); + fopAcM_onSwitch(this, mSw); } } else { - i_fopAcM_onSwitch(this, mSw); + fopAcM_onSwitch(this, mSw); } field_0x77e = 20; } else if (mRide && !mDown) { 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 2b7a319b4d5..ae47ad738b4 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 @@ -251,7 +251,7 @@ static int daObj_Web0_Execute(obj_web0_class* i_this) { 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()); + i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); if (i_this->mReboundTimer != 0) { i_this->mReboundTimer--; 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 084b1a50f76..d5f5ca8e3f0 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 @@ -43,7 +43,7 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) _this->mReboundTimer = 60; } - if (daPy_getPlayerActorClass()->i_checkEquipHeavyBoots()) { + if (daPy_getPlayerActorClass()->checkEquipHeavyBoots()) { _this->field_0x5aa = 120; } else { _this->field_0x5aa = 6; @@ -170,7 +170,7 @@ static int daObj_Web1_Execute(obj_web1_class* i_this) { i_this->scale.x); i_this->mpBrk->play(); - i_this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mpModel->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->scale.x * 1.2f, i_this->scale.x, i_this->scale.x * 1.2f); 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 03faa898d3f..8797f78968b 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 @@ -83,7 +83,7 @@ int daWindStone_c::create() { mPolyInfo = objAcch.m_gnd; if (field_0x5c4 == 0) { - i_fopAcM_onSwitch(this, getSwBit1()); + fopAcM_onSwitch(this, getSwBit1()); } } return phase; @@ -121,8 +121,8 @@ int daWindStone_c::draw() { /* 80D3806C-80D3811C 0006EC 00B0+00 1/1 0/0 0/0 .text Delete__13daWindStone_cFv */ int daWindStone_c::Delete() { - if (i_fopAcM_isSwitch(this, getSwBit1())) { - i_fopAcM_offSwitch(this, getSwBit1()); + if (fopAcM_isSwitch(this, getSwBit1())) { + fopAcM_offSwitch(this, getSwBit1()); } if (mpBgW != NULL && mpBgW->ChkUsed()) { dComIfG_Bgsp().Release(mpBgW); @@ -135,7 +135,7 @@ int daWindStone_c::Delete() { void daWindStone_c::setModelMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80D38180-80D381EC 000800 006C+00 1/1 0/0 0/0 .text init__13daWindStone_cFv */ @@ -168,7 +168,7 @@ bool daWindStone_c::chkWlfInRange() { /* 80D38278-80D382C4 0008F8 004C+00 2/2 0/0 0/0 .text chkEveOccur__13daWindStone_cFv */ bool daWindStone_c::chkEveOccur() { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[getDelEveFlgId()]) == false) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[getDelEveFlgId()]) == false) { return true; } return false; @@ -182,7 +182,7 @@ void daWindStone_c::exeModeHowl() { } else { s8 tuneId = getTuneId(); // Fake match. Should be: - // daAlink_getAlinkActorClass()->daAlink_c::getWolfHowlMgrP()->startWindStoneSound(tuneId, + // daAlink_getAlinkActorClass()->daAlink_c::i_getWolfHowlMgrP()->startWindStoneSound(tuneId, // ¤t.pos); daAlink_getAlinkActorClass()->i_getWolfHowlMgrP()->startWindStoneSound(tuneId, ¤t.pos); @@ -197,10 +197,10 @@ void daWindStone_c::exeModeHowl() { /* 80D3835C-80D383FC 0009DC 00A0+00 1/1 0/0 0/0 .text exeModeMapDisp__13daWindStone_cFv */ void daWindStone_c::exeModeMapDisp() { - if (i_dComIfGp_getEvent().i_isOrderOK() || !i_dComIfGp_event_runCheck()) { + if (dComIfGp_getEvent().isOrderOK() || !dComIfGp_event_runCheck()) { dMeter2Info_setGoldWolfMapType(getGoldWolfIdx()); dMeter2Info_setPauseStatus(5); - i_fopAcM_onSwitch(this, getSwBit2()); + fopAcM_onSwitch(this, getSwBit2()); field_0x5c4 = 2; } } @@ -208,7 +208,7 @@ void daWindStone_c::exeModeMapDisp() { /* 80D383FC-80D384C4 000A7C 00C8+00 1/1 0/0 0/0 .text chkMapDispMode__13daWindStone_cFv */ bool daWindStone_c::chkMapDispMode() { - if (i_fopAcM_isSwitch(this, getSwBit2())) { + if (fopAcM_isSwitch(this, getSwBit2())) { return false; } s16 start_point = dComIfGs_getStartPoint(); 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 8e51acb28ce..3bca028c0eb 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 @@ -40,9 +40,9 @@ void daObjWindow_c::initBaseMtx() { void daObjWindow_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(current.angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); if (mpBckAnm != NULL) { - MTXCopy(mpModel->i_getAnmMtx(0), mBgMtx); + MTXCopy(mpModel->getAnmMtx(0), mBgMtx); } else { MTXCopy(mpModel->getBaseTRMtx(), mBgMtx); } 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 abfac342a7f..6b799ac82f0 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 @@ -42,7 +42,7 @@ void daObjWSword_c::initBaseMtx() { void daObjWSword_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->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80D3BA40-80D3BAB8 000140 0078+00 1/1 0/0 0/0 .text Create__13daObjWSword_cFv */ 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 b878e001a70..e457230e1bd 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 @@ -85,7 +85,7 @@ static void setModelBaseMtx(obj_ystone_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->mScaleF, i_this->mScaleF, i_this->mScaleF); - model->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); } else { i_this->field_0x598 = 0; mDoMtx_stack_c::copy(model->getBaseTRMtx()); @@ -165,7 +165,7 @@ static void action(obj_ystone_class* i_this) { case 4: { i_this->shape_angle.y += 0x100; - mDoMtx_stack_c::copy(i_this->mpMorf->getModel()->i_getAnmMtx(0)); + mDoMtx_stack_c::copy(i_this->mpMorf->getModel()->getAnmMtx(0)); cXyz particle_pos; mDoMtx_stack_c::multVecZero(&particle_pos); i_this->mParticleKey = @@ -286,7 +286,7 @@ static cPhs__Step daObj_Ystone_Create(fopAc_ac_c* i_this) { _this->field_0x59b = true; } mDoMtx_stack_c::scaleS(0.0f, 0.0f, 0.0f); - _this->mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + _this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } else { fopAcM_SetMtx(_this, _this->mpMorf->getModel()->getBaseTRMtx()); _this->mMirrorMode = fopAcM_GetParam(_this) & 0xff; 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 004ed6446b4..b89805cae3d 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 @@ -21,7 +21,7 @@ void daObjZCloth_c::initBaseMtx() { void daObjZCloth_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->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80D3EEC0-80D3EF0C 000120 004C+00 1/1 0/0 0/0 .text Create__13daObjZCloth_cFv */ 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 89448201d14..945127e8325 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 @@ -279,13 +279,13 @@ void daZrTurara_c::setBaseMtx() { // cXyz scale(1.0f, 1.0f, 1.0f); cXyz scale(FLOAT_LABEL(lit_3699), FLOAT_LABEL(lit_3699), FLOAT_LABEL(lit_3699)); mpBaseModel->setBaseScale(scale); - mpBaseModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpBaseModel->setBaseTRMtx(mDoMtx_stack_c::get()); PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx); 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::scaleM(mScaleF, mScaleF, mScaleF); mpRockModel->setBaseScale(scale); - mpRockModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpRockModel->setBaseTRMtx(mDoMtx_stack_c::get()); PSMTXCopy(mDoMtx_stack_c::get(), mRockBgMtx); } @@ -343,7 +343,7 @@ cPhs__Step daZrTurara_c::create() { mCcCyl.Set(mCcDCyl); mCcCyl.SetStts(&mCcStatus); u8 sw1 = getSwBit1(); - if (i_fopAcM_isSwitch(this, sw1)) { + if (fopAcM_isSwitch(this, sw1)) { if (mpRockBgW != NULL) { dComIfG_Bgsp().Release(mpRockBgW); mpRockBgW->Move(); @@ -487,7 +487,7 @@ asm void daZrTurara_c::move() { /* 80D40D88-80D40E0C 000908 0084+00 1/0 0/0 0/0 .text modeWait__12daZrTurara_cFv */ void daZrTurara_c::modeWait() { - if (mSw2 != 0xff && i_fopAcM_isSwitch(this, mSw2)) { + if (mSw2 != 0xff && fopAcM_isSwitch(this, mSw2)) { init_modeBreak(); } if (mCcCyl.ChkTgHit() && mCcCyl.GetTgHitGObj()->GetAtType() == AT_TYPE_BOMB) { @@ -519,7 +519,7 @@ void daZrTurara_c::init_modeBreak() { dComIfGp_particle_set(0x8a97, ¤t.pos, NULL, &scale); mParticleKey = dComIfGp_particle_set(mParticleKey, 0x8a98, ¤t.pos, NULL, &scale); u8 sw1 = getSwBit1(); - i_fopAcM_onSwitch(this, sw1); + fopAcM_onSwitch(this, sw1); mDebrisCount = 0; mBreakTimer = 0; mMode = 1; 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 8c764d87cf3..9f6a112a033 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 @@ -63,7 +63,7 @@ void daZrTuraRc_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); mDoMtx_stack_c::scaleM(mScaleF, mScaleF, mScaleF); mpModel->setBaseScale(cXyz(1.0f, 1.0f, 1.0f)); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 80D419D4-80D41A40 000234 006C+00 1/1 0/0 0/0 .text CreateHeap__12daZrTuraRc_cFv */ 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 cd28460030b..660367b27ca 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 @@ -84,7 +84,7 @@ static f32 const l_DATA[2] = { 800.0f, 0.0f }; void daZraFreeze_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::XYZrotM(shape_angle); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); PSMTXCopy(mDoMtx_stack_c::get(), mMtx); } @@ -246,7 +246,7 @@ int daZraFreeze_c::Execute() { if (mTwilight != 0 && daPy_py_c::checkNowWolfEyeUp()) { cXyz delta = current.pos - daPy_getPlayerActorClass()->current.pos; if (delta.absXZ() < l_DATA[0] && chkActorInScreen()) { - mEventId = i_dComIfGp_getEventManager().getEventIdx(this, "zora_koori", 0xff); + mEventId = dComIfGp_getEventManager().getEventIdx(this, "zora_koori", 0xff); fopAcM_orderOtherEventId(this, mEventId, mMapToolId, 0xffff, 4, 1); dComIfGs_onSwitch(field_0x5b2, fopAcM_GetRoomNo(this)); daPy_getPlayerActorClass()->onWolfEyeKeep(); @@ -255,7 +255,7 @@ int daZraFreeze_c::Execute() { } } } else { - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { if (eventInfo.i_checkCommandDemoAccrpt()) { daPy_getPlayerActorClass()->onWolfEyeKeep(); } else if (field_0x5cf == 1) { 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 d752a3f4863..9a92ba9deb8 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 @@ -25,8 +25,8 @@ void daObjZraRock_c::setAttnPos() { void daObjZraRock_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); - mpModelOpa->i_setBaseTRMtx(mDoMtx_stack_c::get()); - mpModelXlu->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModelOpa->setBaseTRMtx(mDoMtx_stack_c::get()); + mpModelXlu->setBaseTRMtx(mDoMtx_stack_c::get()); PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx); } 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 9c7c21ed40c..af7f2feedb0 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 @@ -45,7 +45,7 @@ static actionFunc daObjMirror6Pole_c::ActionTable[][2] = { /* 80C95E2C-80C95E88 00008C 005C+00 1/0 0/0 0/0 .text executeWait__18daObjMirror6Pole_cFv */ void daObjMirror6Pole_c::executeWait() { - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { setAction(MODE_DEMO_e); } } @@ -56,7 +56,7 @@ void daObjMirror6Pole_c::initDemo() {} /* 80C95E8C-80C95EFC 0000EC 0070+00 1/0 0/0 0/0 .text executeDemo__18daObjMirror6Pole_cFv */ void daObjMirror6Pole_c::executeDemo() { - if (!i_dComIfGp_event_runCheck()) { + if (!dComIfGp_event_runCheck()) { setAction(MODE_WAIT_e); } @@ -69,7 +69,7 @@ void daObjMirror6Pole_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } void daObjMirror6Pole_c::initBaseMtx() { 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 477f73e2f61..af18b8a7915 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 @@ -217,7 +217,7 @@ extern void* __vt__12J3DFrameCtrl[3]; // matches with literals int daObjMirrorChain_c::createHeap() { J3DModelData* model_data; - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 16); mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000284); @@ -235,7 +235,7 @@ int daObjMirrorChain_c::createHeap() { return 0; } - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { J3DModelData* portal_model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 12); mpPortalModel = mDoExt_J3DModel__create(portal_model_data, 0, 0x11000084); if (mpPortalModel == NULL) { @@ -268,16 +268,16 @@ int daObjMirrorChain_c::createHeap() { } else { J3DAnmTransform* bck_anm = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 8); mpBckAnm = new mDoExt_bckAnm(); - bool b = i_fopAcM_isSwitch(this, getSwitchNo()) - || i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]); + bool b = fopAcM_isSwitch(this, getSwitchNo()) + || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]); f32 rate = b ? 1.0f : 0.0f; if (mpBckAnm == NULL || !mpBckAnm->init(bck_anm, 1, 0, rate, 0, -1, false)) { return 0; } - if (i_fopAcM_isSwitch(this, getSwitchNo()) - || i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361])) + if (fopAcM_isSwitch(this, getSwitchNo()) + || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361])) { mpBckAnm->setFrame(bck_anm->getFrameMax()); } @@ -340,9 +340,9 @@ void daObjMirrorChain_c::initBaseMtx() { void daObjMirrorChain_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); if (mpPortalModel != NULL) { - mpPortalModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpPortalModel->setBaseTRMtx(mDoMtx_stack_c::get()); } MTXCopy(mDoMtx_stack_c::get(), mMtx); mpActiveBgW->Move(); @@ -362,7 +362,7 @@ int daObjMirrorChain_c::draw() { static f32 const SCISSOR_SIZE = 984.0f; 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])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { g_env_light.setLightTevColorType_MAJI(mpPortalModel->mModelData, &tevStr); if (mpBckAnm != NULL) { mpBckAnm->entry(mpPortalModel->getModelData()); @@ -499,7 +499,7 @@ int daObjMirrorChain_c::execute() { mpPortalBrkAnm->play(); } - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]) + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]) && mpBckAnm != NULL && mpBckAnm->getPlaySpeed() > 0.0f) { if (mpActiveBgW == &mBgW[0]) { dComIfG_Bgsp().Release(&mBgW[0]); @@ -511,12 +511,12 @@ int daObjMirrorChain_c::execute() { if (mpEmitter == NULL) { mpEmitter = dComIfGp_particle_set(0x8acc, ¤t.pos, &shape_angle, NULL); cXyz pos; - mDoMtx_stack_c::copy(mpModel->i_getAnmMtx(1)); + mDoMtx_stack_c::copy(mpModel->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&pos); Z2GetAudioMgr()->seStart(Z2SE_OBJ_MR_CHIN, &pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } else { cXyz pos; - mDoMtx_stack_c::copy(mpModel->i_getAnmMtx(26)); + mDoMtx_stack_c::copy(mpModel->getAnmMtx(26)); mDoMtx_stack_c::multVecZero(&pos); mpEmitter->setGlobalTranslation(pos.x, pos.y, pos.z); } @@ -560,7 +560,7 @@ static int daObjMirrorChain_Delete(daObjMirrorChain_c* i_this) { } void daObjMirrorChain_c::create_init() { - if (mpBckAnm != NULL && !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { + if (mpBckAnm != NULL && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { mpBckAnm->setPlaySpeed(FLOAT_LABEL(lit_3917)); } mpEmitter = NULL; @@ -568,8 +568,8 @@ void daObjMirrorChain_c::create_init() { mBgW[0].SetRoomId(fopAcM_GetRoomNo(this)); mBgW[1].SetCrrFunc(NULL); mBgW[1].SetRoomId(fopAcM_GetRoomNo(this)); - bool b = i_fopAcM_isSwitch(this, getSwitchNo()) - || i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]); + bool b = fopAcM_isSwitch(this, getSwitchNo()) + || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]); mpActiveBgW = b ? &mBgW[1] : &mBgW[0]; dComIfG_Bgsp().Regist(mpActiveBgW, this); initBaseMtx(); 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 db9de12ca12..09da155276f 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 @@ -68,7 +68,7 @@ void daObjMirrorSand_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); cMtx_copy(mDoMtx_stack_c::get(), mBgMtx); mpCurrentBgw->Move(); } 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 9a4852b8c2e..1a4fc26de7b 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 @@ -96,10 +96,10 @@ void daObjMirrorScrew_c::initDown() { */ void daObjMirrorScrew_c::executeDown() { dComIfG_inf_c* gameinfo = &g_dComIfG_gameInfo; - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { daPy_py_c* player = daPy_getPlayerActorClass(); - player->i_changeOriginalDemo(); - player->i_changeDemoMode(0xe, 1, 0, 0); + player->changeOriginalDemo(); + player->changeDemoMode(0xe, 1, 0, 0); } if (mSpinCount >= 0) { @@ -135,7 +135,7 @@ void daObjMirrorScrew_c::executeDown() { 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); u8 sw = getSwitchNo(); if (sw != 0xff) { - i_fopAcM_onSwitch(this, sw); + fopAcM_onSwitch(this, sw); } fopAcM_delete(this); } @@ -168,9 +168,9 @@ static int daObjMirrorScrew_Delete(daObjMirrorScrew_c* i_this) { cPhs__Step daObjMirrorScrew_c::create() { fopAcM_SetupActor(this, daObjMirrorScrew_c); - if (i_fopAcM_isSwitch(this, getSwitchNo()) - || i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) - || i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) + if (fopAcM_isSwitch(this, getSwitchNo()) + || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) + || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { return cPhs_ERROR_e; } @@ -202,7 +202,7 @@ void daObjMirrorScrew_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); MTXCopy(mDoMtx_stack_c::get(), mBgMtx); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } void daObjMirrorScrew_c::initBaseMtx() { @@ -230,22 +230,22 @@ int daObjMirrorScrew_c::Create() { /* 80C99490-80C99608 000A30 0178+00 1/0 0/0 0/0 .text Execute__18daObjMirrorScrew_cFPPA3_A4_f */ int daObjMirrorScrew_c::Execute(Mtx** i_mtxP) { if (mpSwSpinner == NULL) { - mpSwSpinner = static_cast(i_fopAcM_SearchByName(PROC_Obj_SwSpinner)); + mpSwSpinner = static_cast(fopAcM_SearchByName(PROC_Obj_SwSpinner)); } if (mpSpPath == NULL) { - mpSpPath = static_cast(i_fopAcM_SearchByName(PROC_Tag_Sppath)); + mpSpPath = static_cast(fopAcM_SearchByName(PROC_Tag_Sppath)); } if (mpChain == NULL) { - mpChain = static_cast(i_fopAcM_SearchByName(PROC_Obj_MirrorChain)); + mpChain = static_cast(fopAcM_SearchByName(PROC_Obj_MirrorChain)); } if (mpTable == NULL) { - mpTable = static_cast(i_fopAcM_SearchByName(PROC_Obj_MirrorTable)); + mpTable = static_cast(fopAcM_SearchByName(PROC_Obj_MirrorTable)); } if (mp6Pole == NULL) { - mp6Pole = static_cast(i_fopAcM_SearchByName(PROC_Obj_Mirror6Pole)); + mp6Pole = static_cast(fopAcM_SearchByName(PROC_Obj_Mirror6Pole)); } if (mpSand == NULL) { - mpSand = static_cast(i_fopAcM_SearchByName(PROC_Obj_MirrorSand)); + mpSand = static_cast(fopAcM_SearchByName(PROC_Obj_MirrorSand)); } callExecute(); setBaseMtx(); 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 9a66c4b1efe..21a989972f0 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 @@ -143,7 +143,7 @@ int daObjMirrorTable_c::createHeap() { return 0; } - int mirror_res_id = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]) ? 13 : 14; + int mirror_res_id = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]) ? 13 : 14; J3DModelData* mirror_model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, mirror_res_id); mpMirrorModel = mDoExt_J3DModel__create(mirror_model_data, 0, 0x11000084); if (mpMirrorModel == NULL) { @@ -165,7 +165,7 @@ int daObjMirrorTable_c::createHeap() { return 0; } - int mirror_dzb_id = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]) ? 31 : 32; + int mirror_dzb_id = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]) ? 31 : 32; cBgD_t* mirror_dzb = (cBgD_t*)dComIfG_getObjectRes(l_arcName, mirror_dzb_id); if (mBgW[1].Set(mirror_dzb, 1, &mMtx[1])) { return 0; @@ -180,7 +180,7 @@ int daObjMirrorTable_c::createHeap() { mpMSquareBckAnm = NULL; mpLightBtkAnm = NULL; - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { J3DModelData* stair_model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 20); mpStairModel = mDoExt_J3DModel__create(stair_model_data, 0x80000, 0x11000084); @@ -257,9 +257,9 @@ extern "C" asm void __dt__12J3DFrameCtrlFv() { /* 80C99F7C-80C9A040 0006DC 00C4+00 1/1 0/0 0/0 .text isSwitch__18daObjMirrorTable_cFv */ bool daObjMirrorTable_c::isSwitch() { - return i_fopAcM_isSwitch(this, getSwitchNo()) - || i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) - || i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]) + return fopAcM_isSwitch(this, getSwitchNo()) + || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) + || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]) ? 1 : 0; } @@ -279,10 +279,10 @@ void daObjMirrorTable_c::checkOnPanel() { pos = player->getRightHandPosP(); break; case 2: - pos = player->i_getLeftFootPosP(); + pos = player->getLeftFootPosP(); break; case 3: - pos = player->i_getRightFootPosP(); + pos = player->getRightFootPosP(); break; } mDoMtx_stack_c::push(); @@ -299,9 +299,9 @@ void daObjMirrorTable_c::checkOnPanel() { for (int i = 0; i < 2; i++) { cXyz* pos; if (i == 0) { - pos = player->i_getLeftFootPosP(); + pos = player->getLeftFootPosP(); } else { - pos = player->i_getRightFootPosP(); + pos = player->getRightFootPosP(); } mDoMtx_stack_c::push(); mDoMtx_stack_c::multVec(pos, &rel_pos); @@ -380,18 +380,18 @@ int daObjMirrorTable_c::draw() { void daObjMirrorTable_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); - mpTableModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpTableModel->setBaseTRMtx(mDoMtx_stack_c::get()); if (mpStairModel != NULL) { - mpStairModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpStairModel->setBaseTRMtx(mDoMtx_stack_c::get()); } if (mpPanelModel != NULL) { - mpPanelModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpPanelModel->setBaseTRMtx(mDoMtx_stack_c::get()); } if (mpLightModel != NULL) { - mpLightModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpLightModel->setBaseTRMtx(mDoMtx_stack_c::get()); } if (mpMSquareModel != NULL) { - mpMSquareModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpMSquareModel->setBaseTRMtx(mDoMtx_stack_c::get()); } if (mBgW[0].ChkUsed()) { MTXCopy(mDoMtx_stack_c::get(), mMtx[0]); @@ -401,8 +401,8 @@ void daObjMirrorTable_c::setBaseMtx() { MTXCopy(mDoMtx_stack_c::get(), mMtx[2]); mBgW[2].Move(); } - mDoMtx_stack_c::copy(mpTableModel->i_getAnmMtx(1)); - mpMirrorModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_stack_c::copy(mpTableModel->getAnmMtx(1)); + mpMirrorModel->setBaseTRMtx(mDoMtx_stack_c::get()); if (mBgW[0].ChkUsed()) { MTXCopy(mDoMtx_stack_c::get(), mMtx[1]); mBgW[1].Move(); @@ -467,12 +467,12 @@ int daObjMirrorTable_c::execute() { mpTableUpBckAnm->play(); if (!mpTableUpBckAnm->isStop()) { cXyz pos; - mDoMtx_stack_c::copy(mpTableModel->i_getAnmMtx(0)); + mDoMtx_stack_c::copy(mpTableModel->getAnmMtx(0)); mDoMtx_stack_c::multVecZero(&pos); Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_MR_TBLE, &pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { if (!mBgW[0].ChkUsed() && mpTableUpBckAnm->getPlaySpeed() > 0.0f) { dComIfG_Bgsp().Regist(&mBgW[0], this); dComIfG_Bgsp().Regist(&mBgW[1], this); @@ -608,7 +608,7 @@ SECTION_DEAD static char const* const stringBase_80C9B299 = "F_SP125"; #ifdef NONMATCHING // matches with literals once isSwitch is properly inlined void daObjMirrorTable_c::create_init() { - bool mirror_complete_flag = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]); + bool mirror_complete_flag = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]); mpTableUpBckAnm->setPlaySpeed(0.0f); mBgW[0].SetCrrFunc(NULL); @@ -648,8 +648,8 @@ void daObjMirrorTable_c::create_init() { field_0x874 = false; - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]) - && i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361])) + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]) + && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361])) { cXyz pos(1760.0f, 4714.3f, -20624.0f); csXyz angle(0, 0x8000, 0); 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 d86cb714a25..adb1d60f8c7 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 @@ -54,12 +54,12 @@ bool daTagCstaSw_c::areaCheck() { /* 805A2340-805A23F0 000400 00B0+00 1/1 0/0 0/0 .text Execute__13daTagCstaSw_cFv */ int daTagCstaSw_c::Execute() { if (areaCheck() == 1) { - if (!i_fopAcM_isSwitch(this, mSwitch)) { - i_fopAcM_onSwitch(this, mSwitch); + if (!fopAcM_isSwitch(this, mSwitch)) { + fopAcM_onSwitch(this, mSwitch); } } else { - if (i_fopAcM_isSwitch(this, mSwitch)) { - i_fopAcM_offSwitch(this, mSwitch); + if (fopAcM_isSwitch(this, mSwitch)) { + fopAcM_offSwitch(this, mSwitch); } } return 1; 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 e969419ec6b..aae12a7a75f 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,7 @@ extern "C" extern char const* const d_a_tag_Lv6Gate__stringBase0; // External References: // +extern "C" void fpcSch_JudgeForPName__FPvPv(void); extern "C" void fopAcM_SearchByID__FUiPP10fopAc_ac_c(); extern "C" void fopAcM_SearchByName__FsPP10fopAc_ac_c(); extern "C" void fopAcM_delete__FUi(); @@ -89,7 +90,7 @@ int daTagLv6Gate_c::createHeap() { return 0; } - if (i_fopAcM_isSwitch(this, getSwitchNo2())) { + if (fopAcM_isSwitch(this, getSwitchNo2())) { mpBtk[0]->setFrame(mpBtk[0]->getEndFrame()); } @@ -169,20 +170,20 @@ void daTagLv6Gate_c::initBaseMtx() { mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f); mDoMtx_stack_c::YrotM(0); MTXCopy(mDoMtx_stack_c::get(), field_0x6f8[0]); - mpModel[0]->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel[0]->setBaseTRMtx(mDoMtx_stack_c::get()); mBgW[0].Move(); mDoMtx_stack_c::transS(0.0f, 2887.0f, -8330.0f); mDoMtx_stack_c::YrotM(0); MTXCopy(mDoMtx_stack_c::get(), field_0x6f8[1]); - mpModel[1]->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel[1]->setBaseTRMtx(mDoMtx_stack_c::get()); mBgW[1].Move(); } void daTagLv6Gate_c::create_init() { fopAcM_setCullSizeBox(this, -50.0f, 0.0f, -50.0f, 50.0f, 100.0f, 50.0f); attention_info.position = current.pos; - attention_info.flags = (i_fopAcM_isSwitch(this, getSwitchNo1()) != 0) ? 0 : 0x80; + attention_info.flags = (fopAcM_isSwitch(this, getSwitchNo1()) != 0) ? 0 : 0x80; attention_info.field_0x0[7] = 89; mEvtId = -1; field_0x76a = 0; @@ -192,7 +193,7 @@ void daTagLv6Gate_c::create_init() { initBaseMtx(); - if (!i_fopAcM_isSwitch(this, getSwitchNo1())) { + if (!fopAcM_isSwitch(this, getSwitchNo1())) { parentActorID = fopAcM_create(PROC_NPC_TKS, 2, &cXyz(-13.272481f, 2887.0f, -10373.718f), fopAcM_GetRoomNo(this), &csXyz(0, 0x7FFF, 0), NULL, -1); } @@ -225,7 +226,7 @@ bool daTagLv6Gate_c::checkOpenArea() { fopAc_ac_c* actor; cXyz pos; - if (!i_fopAcM_isSwitch(this, getSwitchNo2())) { + if (!fopAcM_isSwitch(this, getSwitchNo2())) { return false; } @@ -233,7 +234,7 @@ bool daTagLv6Gate_c::checkOpenArea() { mDoMtx_stack_c::inverse(); for (int i = 0; i < 2; i++) { - actor = (i == 0) ? daPy_getPlayerActorClass() : i_fopAcM_SearchByName(PROC_NPC_TKS); + actor = (i == 0) ? daPy_getPlayerActorClass() : fopAcM_SearchByName(PROC_NPC_TKS); if (actor != NULL) { mDoMtx_stack_c::push(); mDoMtx_stack_c::multVec(fopAcM_GetPosition_p(actor), &pos); @@ -250,7 +251,7 @@ bool daTagLv6Gate_c::checkOpenArea() { } void daTagLv6Gate_c::cut1() { - i_dComIfGp_getEvent().setSkipZev(this, "LV6_GATE_APPEAR_SKIP"); + dComIfGp_getEvent().setSkipZev(this, "LV6_GATE_APPEAR_SKIP"); cXyz pos(0.0f, 0.0f, 78.0f); @@ -296,10 +297,10 @@ void daTagLv6Gate_c::cut4() { int daTagLv6Gate_c::execute() { // Fake match? dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); - if (i_dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { - s32 cut_index = i_dComIfGp_evmng_getMyStaffId(l_arcName, NULL, 0); + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { + s32 cut_index = dComIfGp_evmng_getMyStaffId(l_arcName, NULL, 0); if (cut_index != -1) { - // int* cut_name = (int*)i_dComIfGp_getEventManager().getMyNowCutName(cut_index); + // int* cut_name = (int*)dComIfGp_getEventManager().getMyNowCutName(cut_index); int* cut_name = (int*)play.getEvtManager().getMyNowCutName(cut_index); daPy_getPlayerActorClass()->onShieldBackBone(); @@ -313,14 +314,14 @@ int daTagLv6Gate_c::execute() { cut2(); break; case '0003': - i_fopAcM_onSwitch(this, getSwitchNo2()); + fopAcM_onSwitch(this, getSwitchNo2()); seStair(); break; case '0004': cut4(); break; case '0006': - i_fopAcM_onSwitch(this, getSwitchNo2()); + fopAcM_onSwitch(this, getSwitchNo2()); mpBtk[0]->setFrame(mpBtk[0]->getEndFrame()); if (!mBgW[0].ChkUsed()) { dComIfG_Bgsp().Regist(&mBgW[0], this); @@ -341,20 +342,20 @@ int daTagLv6Gate_c::execute() { if (eventInfo.checkCommandDemoAccrpt() && mEvtId != -1 && dComIfGp_evmng_endCheck(mEvtId)) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); mEvtId = -1; } } - } else if (field_0x76a && !i_fopAcM_isSwitch(this, getSwitchNo1())) { + } else if (field_0x76a && !fopAcM_isSwitch(this, getSwitchNo1())) { eventInfo.setArchiveName(l_arcName); - i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); - mEvtId = i_dComIfGp_getEventManager().getEventIdx(this, "LV6_GATE_APPEAR", -1); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + mEvtId = dComIfGp_getEventManager().getEventIdx(this, "LV6_GATE_APPEAR", -1); fopAcM_orderOtherEventId(this, mEvtId, -1, -1, 0, 1); - i_fopAcM_onSwitch(this, getSwitchNo1()); + fopAcM_onSwitch(this, getSwitchNo1()); attention_info.flags = 0; } - if (i_fopAcM_isSwitch(this, getSwitchNo2())) { + if (fopAcM_isSwitch(this, getSwitchNo2())) { if (!mBgW[0].ChkUsed()) { dComIfG_Bgsp().Regist(&mBgW[0], this); } @@ -477,7 +478,7 @@ int daTagLv6Gate_c::draw() { dComIfGd_setListBG(); - if (i_fopAcM_isSwitch(this, getSwitchNo2())) { + if (fopAcM_isSwitch(this, getSwitchNo2())) { g_env_light.setLightTevColorType_MAJI(mpModel[0], &tevStr); mpBtk[0]->entry(mpModel[0]->getModelData()); mpBtk[1]->entry(mpModel[0]->getModelData()); 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 1407916cb01..84d0e8794d1 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 @@ -14,7 +14,7 @@ static char* l_arcName = "Lv7Gate"; int daTagLv7Gate_c::createHeap() { // Watched City in the Sky start cutscene - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[510])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[510])) { return 1; } @@ -134,11 +134,11 @@ void daTagLv7Gate_c::create_init() { } // City in the Sky clear - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[268])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[268])) { mEvName = "LV7_NORMAL_START"; } else { // Watched City in the Sky start cutscene - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[510])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[510])) { if (dComIfGs_isDungeonItemWarp()) { mEvName = "LV7_CANNON_BACK"; } else { @@ -166,8 +166,8 @@ void daTagLv7Gate_c::create_init() { } } eventInfo.setArchiveName(l_arcName); - i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); - mEvtId = i_dComIfGp_getEventManager().getEventIdx(this, mEvName, -1); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + mEvtId = dComIfGp_getEventManager().getEventIdx(this, mEvName, -1); fopAcM_orderOtherEventId(this, mEvtId, -1, -1, 2, 1); } @@ -227,8 +227,8 @@ void daTagLv7Gate_c::flyAnime() { int daTagLv7Gate_c::execute() { // Fakematch dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); - if (i_dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { - s32 cut_index = i_dComIfGp_evmng_getMyStaffId(l_arcName, NULL, 0); + if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { + s32 cut_index = dComIfGp_evmng_getMyStaffId(l_arcName, NULL, 0); if (cut_index != -1) { int* cut_name = (int*)play.getEvtManager().getMyNowCutName(cut_index); // Fakematch @@ -252,7 +252,7 @@ int daTagLv7Gate_c::execute() { dComIfGp_evmng_cutEnd(cut_index); break; case '0002': - i_mDoAud_seStartLevel(Z2SE_EN_DR_DEMO_FIRST, &mPos1, 0, 0); + mDoAud_seStartLevel(Z2SE_EN_DR_DEMO_FIRST, &mPos1, 0, 0); if (!field_0x5b1) { dComIfGp_evmng_cutEnd(cut_index); } @@ -263,7 +263,7 @@ int daTagLv7Gate_c::execute() { if (eventInfo.checkCommandDemoAccrpt() && mEvtId != -1 && dComIfGp_evmng_endCheck(mEvtId)) { - // i_dComIfGp_event_reset(); + // dComIfGp_event_reset(); play.getEvent().reset(); // Fakematch mEvtId = -1; fopAcM_delete(this); @@ -274,8 +274,8 @@ int daTagLv7Gate_c::execute() { } else { if (!field_0x5b0) { eventInfo.setArchiveName(l_arcName); - i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); - mEvtId = i_dComIfGp_getEventManager().getEventIdx(this, mEvName, -1); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + mEvtId = dComIfGp_getEventManager().getEventIdx(this, mEvName, -1); fopAcM_orderOtherEventId(this, mEvtId, -1, -1, 0, 1); field_0x5b0 = true; } else { 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 2a0982a66f5..b36b7b761ca 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 @@ -31,7 +31,7 @@ inline void daTagLv8Gate_c::initBaseMtx() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y + 0x8000); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } } @@ -51,7 +51,7 @@ inline int daTagLv8Gate_c::create() { fopAcM_SetupActor(this, daTagLv8Gate_c); cPhs__Step step; - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { step = cPhs_ERROR_e; } else { step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName); @@ -129,19 +129,19 @@ int daTagLv8Gate_c::execute() { dComIfG_inf_c& game_info = g_dComIfG_gameInfo; // Fake match? if (game_info.getPlay().getEvent().runCheck() && !eventInfo.checkCommandTalk()) { - s32 cut_index = i_dComIfGp_getEventManager().getMyStaffId(l_arcName, NULL, 0); + s32 cut_index = dComIfGp_getEventManager().getMyStaffId(l_arcName, NULL, 0); if (cut_index != -1) { - int* cut_name = (int*)i_dComIfGp_getEventManager().getMyNowCutName(cut_index); + int* cut_name = (int*)dComIfGp_getEventManager().getMyNowCutName(cut_index); - if (i_dComIfGp_getEventManager().getIsAddvance(cut_index)) { + if (dComIfGp_getEventManager().getIsAddvance(cut_index)) { switch (*cut_name) { case '0001': - i_dComIfGp_getEvent().setSkipProc(this, dEv_noFinishSkipProc, 0); + dComIfGp_getEvent().setSkipProc(this, dEv_noFinishSkipProc, 0); daPy_getPlayerActorClass()->setPlayerPosAndAngle(¤t.pos, shape_angle.y, 0); - fopAc_ac_c* mirror_table = i_fopAcM_SearchByName(PROC_Obj_MirrorTable); + fopAc_ac_c* mirror_table = fopAcM_SearchByName(PROC_Obj_MirrorTable); if (mirror_table != NULL) { static_cast(mirror_table)->field_0x874 = true; } @@ -153,8 +153,8 @@ int daTagLv8Gate_c::execute() { } } - if (i_dComIfGp_getEvent().i_checkSkipEdge()) { - i_dComIfGp_event_reset(); + if (dComIfGp_getEvent().checkSkipEdge()) { + dComIfGp_event_reset(); dStage_changeScene(getSceneNo(), 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); } @@ -188,8 +188,8 @@ int daTagLv8Gate_c::execute() { fopAcM_cancelCarryNow(this); attention_info.flags &= ~0x10; eventInfo.setArchiveName(l_arcName); - i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, "LV8_GATE_ENTRY", -1); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + mEventID = dComIfGp_getEventManager().getEventIdx(this, "LV8_GATE_ENTRY", -1); fopAcM_orderOtherEventId(this, mEventID, -1, -1, 0, 1); } } 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 3267739c67f..d3a0d1927f8 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 @@ -92,7 +92,7 @@ class daTagTWGate_c : public fopAc_ac_c { void callExecute() { (this->*mAction[1])(); - i_mDoAud_seStartLevel(Z2SE_OBJ_DARK_GATE, ¤t.pos, 0, 0); + mDoAud_seStartLevel(Z2SE_OBJ_DARK_GATE, ¤t.pos, 0, 0); } int execute() { @@ -468,7 +468,7 @@ void daTagTWGate_c::executeWait() { switch (mType) { case TYPE_FILONE: - if (i_fopAcM_isSwitch(this, getSwitch())) { + if (fopAcM_isSwitch(this, getSwitch())) { mActionID = ACT_DEMO_FILONE_2; mAction = &ActionTable[mActionID][0]; (this->**mAction)(); @@ -479,7 +479,7 @@ void daTagTWGate_c::executeWait() { } break; case TYPE_ORDIN: - if (i_fopAcM_isSwitch(this, getSwitch())) { + if (fopAcM_isSwitch(this, getSwitch())) { mActionID = ACT_DEMO_ORDIN_2; mAction = &ActionTable[mActionID][0]; (this->**mAction)(); @@ -490,7 +490,7 @@ void daTagTWGate_c::executeWait() { } break; case TYPE_RANAIL: - if (i_fopAcM_isSwitch(this, getSwitch())) { + if (fopAcM_isSwitch(this, getSwitch())) { mActionID = ACT_DEMO_RANAIL_2; mAction = &ActionTable[mActionID][0]; (this->**mAction)(); @@ -501,7 +501,7 @@ void daTagTWGate_c::executeWait() { } break; case TYPE_HYRAL: - if (i_fopAcM_isSwitch(this, getSwitch())) { + if (fopAcM_isSwitch(this, getSwitch())) { mActionID = ACT_DEMO_HYRAL_2; mAction = &ActionTable[mActionID][0]; (this->**mAction)(); @@ -522,7 +522,7 @@ void daTagTWGate_c::executeWait() { */ void daTagTWGate_c::initDemoFilone1() { eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1); } @@ -530,23 +530,23 @@ void daTagTWGate_c::initDemoFilone1() { // swapped r30 / r31 #ifdef NONMATCHING void daTagTWGate_c::executeDemoFilone1() { - int staffId = i_dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { - int* cutName = (int*)i_dComIfGp_getEventManager().getMyNowCutName(staffId); + int* cutName = (int*)dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*cutName) { case 0x30303031: - i_dComIfGp_getEvent().setSkipProc(this, dEv_noFinishSkipProc, 0); + dComIfGp_getEvent().setSkipProc(this, dEv_noFinishSkipProc, 0); break; } } switch (*cutName) { case 0x30303031: - if (i_dComIfGp_getEvent().chkFlag2(8)) { - i_dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent().chkFlag2(8)) { + dComIfGp_getEvent().onSkipFade(); mActionID = ACT_DEMO_FILONE_2; mAction = ActionTable[mActionID]; (this->**mAction)(); @@ -577,14 +577,14 @@ asm void daTagTWGate_c::executeDemoFilone1() { */ #ifdef NONMATCHING void daTagTWGate_c::initDemoFilone2() { - i_fopAcM_onSwitch(this, getSwitch()); + fopAcM_onSwitch(this, getSwitch()); eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = - i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, -1); + dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, -1); if (g_dComIfG_gameInfo.play.mEvent.mEventStatus != 0) { - i_dComIfGp_getEvent().reset(this); + dComIfGp_getEvent().reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, -1); } else { fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1); @@ -603,10 +603,10 @@ asm void daTagTWGate_c::initDemoFilone2() { /* 80D52BF0-80D52DB4 000670 01C4+00 1/0 0/0 0/0 .text executeDemoFilone2__13daTagTWGate_cFv */ void daTagTWGate_c::executeDemoFilone2() { - s32 staffId = i_dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); + s32 staffId = dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { - int* cutName = (int*)i_dComIfGp_getEventManager().getMyNowCutName(staffId); + int* cutName = (int*)dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*cutName) { @@ -638,7 +638,7 @@ void daTagTWGate_c::executeDemoFilone2() { if (eventInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && dComIfGp_evmng_endCheck(mEventID)) { - i_dComIfGp_getEvent().reset(); + dComIfGp_getEvent().reset(); field_0x5e0 = 0; mActionID = ACT_WAIT; mAction = ActionTable[mActionID]; @@ -653,10 +653,10 @@ void daTagTWGate_c::initDemoFilone3() { field_0x5de = 1; mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1; // checking if wolf? eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = - i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); - i_dComIfGp_getEvent().reset(this); + dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); + dComIfGp_getEvent().reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, -1); } @@ -696,17 +696,17 @@ COMPILER_STRIP_GATE(0x80D5583C, &lit_4083); // matches without literals #ifdef NONMATCHING void daTagTWGate_c::executeDemoFilone3() { - s32 staffId = i_dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); + s32 staffId = dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { - int* cutName = (int*)i_dComIfGp_getEventManager().getMyNowCutName(staffId); + int* cutName = (int*)dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*cutName) { case 0x30303031: break; case 0x30303032: - i_dComIfGp_getEvent().setSkipProc(this, dEv_noFinishSkipProc, 0); + dComIfGp_getEvent().setSkipProc(this, dEv_noFinishSkipProc, 0); field_0x5e1 = 0; break; case 0x30303033: @@ -730,8 +730,8 @@ void daTagTWGate_c::executeDemoFilone3() { } break; case 0x30303032: - if (i_dComIfGp_getEvent().chkFlag2(8)) { - i_dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent().chkFlag2(8)) { + dComIfGp_getEvent().onSkipFade(); dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, l_zevParamTbl[mType].mRoomNo, @@ -759,8 +759,8 @@ void daTagTWGate_c::executeDemoFilone3() { } break; case 0x30303033: - if (i_dComIfGp_getEvent().chkFlag2(8)) { - i_dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent().chkFlag2(8)) { + dComIfGp_getEvent().onSkipFade(); dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, l_zevParamTbl[mType].mRoomNo, @@ -775,7 +775,7 @@ void daTagTWGate_c::executeDemoFilone3() { if (eventInfo.i_checkCommandDemoAccrpt() && mEventID != -1 && dComIfGp_evmng_endCheck(mEventID)) { - i_dComIfGp_getEvent().reset(); + dComIfGp_getEvent().reset(); field_0x5e0 = 0; mActionID = ACT_WAIT; mAction = ActionTable[mActionID]; @@ -798,7 +798,7 @@ asm void daTagTWGate_c::executeDemoFilone3() { */ void daTagTWGate_c::initDemoOrdin1() { eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1); } @@ -839,10 +839,10 @@ void daTagTWGate_c::initDemoOrdin3() { field_0x5de = 1; mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1; // checking if wolf? eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = - i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); - i_dComIfGp_getEvent().reset(this); + dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); + dComIfGp_getEvent().reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, -1); } @@ -860,7 +860,7 @@ asm void daTagTWGate_c::executeDemoOrdin3() { */ void daTagTWGate_c::initDemoRanail1() { eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1); } @@ -901,10 +901,10 @@ void daTagTWGate_c::initDemoRanail3() { field_0x5de = 1; mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1; // checking if wolf? eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = - i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); - i_dComIfGp_getEvent().reset(this); + dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); + dComIfGp_getEvent().reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, -1); dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[170]); } @@ -923,7 +923,7 @@ asm void daTagTWGate_c::executeDemoRanail3() { */ void daTagTWGate_c::initDemoHyral1() { eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1); fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1); } @@ -964,10 +964,10 @@ void daTagTWGate_c::initDemoHyral3() { field_0x5de = 1; mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1; // checking if wolf? eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - i_dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = - i_dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); - i_dComIfGp_getEvent().reset(this); + dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); + dComIfGp_getEvent().reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, -1); } @@ -1012,7 +1012,7 @@ void daTagTWGate_c::initBaseMtx() { current.pos.y = mDoMtx_stack_c::get()[1][3]; current.pos.z = mDoMtx_stack_c::get()[2][3]; - mpMorf->getModel()->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); } #else #pragma push 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 79c5c3e724c..5faf1a90117 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 @@ -65,7 +65,7 @@ int daAttp_c::execute() { break; } - if (i_fopAcM_isSwitch(this, daAttp_prm::getSw1(this))) { + if (fopAcM_isSwitch(this, daAttp_prm::getSw1(this))) { switch (daAttp_prm::getArg1(this)) { case 0: break; @@ -102,7 +102,7 @@ int daAttp_c::execute() { } if (daAttp_prm::getSw2(this) != 0xff) { - if (i_fopAcM_isSwitch(this, daAttp_prm::getSw2(this))) { + if (fopAcM_isSwitch(this, daAttp_prm::getSw2(this))) { if (daAttp_prm::getArg3(this) == 0) { bVar1 = false; } 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 aaa2060ef52..ba73ad38705 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 @@ -116,7 +116,7 @@ void daTag_BottleItem_c::setAttnPos() { s32 daTag_BottleItem_c::chkEvent() { s32 uVar2 = 1; - if (!i_dComIfGp_getEvent().i_isOrderOK()) { + if (!dComIfGp_getEvent().isOrderOK()) { uVar2 = 0; if (eventInfo.i_checkCommandCatch()) { @@ -148,11 +148,11 @@ s32 daTag_BottleItem_c::orderEvent() { /* 80D56418-80D564A0 0004B8 0088+00 2/2 0/0 0/0 .text makeSoup__18daTag_BottleItem_cFv */ void daTag_BottleItem_c::makeSoup() { - if (mBottleItemType == LV1_SOUP && i_dComIfGs_isEventBit(2)) { + if (mBottleItemType == LV1_SOUP && dComIfGs_isEventBit(2)) { mBottleItemType = LV2_SOUP; } - if (mBottleItemType == LV2_SOUP && i_dComIfGs_isEventBit(1)) { + if (mBottleItemType == LV2_SOUP && dComIfGs_isEventBit(1)) { mBottleItemType = LV3_SOUP; } } 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 1b301cd0c38..a09a4dee1fa 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 @@ -42,7 +42,7 @@ s32 daTagChgRestart_c::create() { /* 80D568B8-80D56A84 0001D8 01CC+00 1/1 0/0 0/0 .text execute__17daTagChgRestart_cFv */ s32 daTagChgRestart_c::execute() { - if (i_fopAcM_isSwitch(this, daTagChgRestart_prm::getSwNo(this))) { + if (fopAcM_isSwitch(this, daTagChgRestart_prm::getSwNo(this))) { return 1; } @@ -80,7 +80,7 @@ s32 daTagChgRestart_c::execute() { s32 l_roomNo = fopAcM_GetRoomNo(player); dComIfGs_setRestartRoom(restart_pos, restart_angle, l_roomNo); - i_fopAcM_onSwitch(this, daTagChgRestart_prm::getSwNo(this)); + fopAcM_onSwitch(this, daTagChgRestart_prm::getSwNo(this)); } return 1; 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 310d95974aa..68cdb5cd95e 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 @@ -55,19 +55,19 @@ int daTag_Evt_c::execute() { 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) { + if (dComIfGp_event_runCheck() != 0) { bVar = false; - int iVar1 = i_dComIfGp_evmng_getMyStaffId(field_0x568, 0, 0); + int iVar1 = dComIfGp_evmng_getMyStaffId(field_0x568, 0, 0); if (!eventInfo.checkCommandTalk()) { if (eventInfo.i_checkCommandDemoAccrpt()) { - if (i_dComIfGp_getEventManager().endCheck(field_0x572)) { - i_dComIfGp_event_reset(); + if (dComIfGp_getEventManager().endCheck(field_0x572)) { + dComIfGp_event_reset(); field_0x570 = 0; field_0x572 = -1; bVar = true; } else { if (iVar1 != -1) { - int actIdx = i_dComIfGp_getEventManager().getMyActIdx( + int actIdx = dComIfGp_getEventManager().getMyActIdx( iVar1, mEvtCutList, 3, 0, 0); int iVar2 = 0; switch (actIdx) { @@ -81,14 +81,14 @@ int daTag_Evt_c::execute() { iVar2 = doEvtCutNext(iVar1); } if (iVar2 != 0) { - i_dComIfGp_getEventManager().cutEnd(iVar1); + dComIfGp_getEventManager().cutEnd(iVar1); } } } } } else if (field_0x5DC != 0) { if (mMsgFlow.doFlow(this, NULL, 0) != 0) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); u16 eventId = mMsgFlow.getEventId(NULL); if (eventId != 0) { daNpcMsg_setEvtNum(eventId); @@ -163,10 +163,10 @@ int daTag_Evt_c::isDelete() { if (field_0x5E0 != 0xFFF || field_0x5E2 != 0xFFF) { if (field_0x5E0 == 0xFFF || (field_0x5E0 != 0xFFF && - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x5E0]) != 0)) + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x5E0]) != 0)) { if (field_0x5E2 != 0xFFF) { - return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x5E2]); + return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x5E2]); } else { return false; } @@ -192,7 +192,7 @@ int daTag_Evt_c::isDelete() { /* 8048C090-8048C124 0007F0 0094+00 1/1 0/0 0/0 .text doEvtCutWait__11daTag_Evt_cFi */ int daTag_Evt_c::doEvtCutWait(int param_0) { - if (i_dComIfGp_getEventManager().getIsAddvance(param_0)) { + if (dComIfGp_getEventManager().getIsAddvance(param_0)) { int* pTimer = dComIfGp_evmng_getMyIntegerP(param_0, "timer"); mTimer = (pTimer == NULL ? 0 : *pTimer); } @@ -201,7 +201,7 @@ int daTag_Evt_c::doEvtCutWait(int param_0) { /* 8048C124-8048C1C8 000884 00A4+00 1/1 0/0 0/0 .text doEvtCutTalk__11daTag_Evt_cFi */ int daTag_Evt_c::doEvtCutTalk(int param_0) { - if (i_dComIfGp_getEventManager().getIsAddvance(param_0)) { + if (dComIfGp_getEventManager().getIsAddvance(param_0)) { mMsgFlow.init(this, *dComIfGp_evmng_getMyIntegerP(param_0, "flowNodeNo"), 0, NULL); return 0; } else { @@ -211,7 +211,7 @@ int daTag_Evt_c::doEvtCutTalk(int param_0) { /* 8048C1C8-8048C27C 000928 00B4+00 1/1 0/0 0/0 .text doEvtCutNext__11daTag_Evt_cFi */ int daTag_Evt_c::doEvtCutNext(int param_0) { - if (i_dComIfGp_getEventManager().getIsAddvance(param_0)) { + if (dComIfGp_getEventManager().getIsAddvance(param_0)) { if ((field_0x5E4 == 0 || field_0x5E4 == 1) && field_0x5DE != 0xFF) { dComIfGs_onSwitch(field_0x5DE, fopAcM_GetRoomNo(this)); } 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 96c1f210f38..fbd7ba2dece 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 @@ -69,10 +69,10 @@ int daTag_EvtMsg_c::Delete() { /* 8048D01C-8048D31C 00015C 0300+00 1/1 0/0 0/0 .text Execute__14daTag_EvtMsg_cFv */ int daTag_EvtMsg_c::Execute() { - dEvent_manager_c& evt_mng = i_dComIfGp_getEventManager(); + dEvent_manager_c& evt_mng = dComIfGp_getEventManager(); if (home.roomNo == dComIfGp_roomControl_getStayNo()) { - if (i_dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck() != 0) { int staff_id; BOOL reset = false; if (eventInfo.checkCommandTalk()) { @@ -103,7 +103,7 @@ int daTag_EvtMsg_c::Execute() { dComIfGs_onSwitch(getOffSwBit(), fopAcM_GetRoomNo(this)); } - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } } else if (isDelete()) { fopAcM_delete(this); @@ -209,7 +209,7 @@ BOOL daTag_EvtMsg_c::chkPointInArea(cXyz param_0) { /* 8048D54C-8048D5CC 00068C 0080+00 1/0 0/0 0/0 .text ECut_talk__14daTag_EvtMsg_cFi */ BOOL daTag_EvtMsg_c::ECut_talk(int i_staffID) { - if (i_dComIfGp_getEventManager().getIsAddvance(i_staffID)) { + if (dComIfGp_getEventManager().getIsAddvance(i_staffID)) { mMsgFlow.init(this, mFlowID, 0, NULL); } @@ -222,7 +222,7 @@ BOOL daTag_EvtMsg_c::ECut_talk(int i_staffID) { /* 8048D5CC-8048D668 00070C 009C+00 1/0 0/0 0/0 .text ECut_wait__14daTag_EvtMsg_cFi */ BOOL daTag_EvtMsg_c::ECut_wait(int i_staffID) { - dEvent_manager_c& evt_mng = i_dComIfGp_getEventManager(); + dEvent_manager_c& evt_mng = dComIfGp_getEventManager(); int timer = 0; int* data_p = dComIfGp_evmng_getMyIntegerP(i_staffID, "timer"); diff --git a/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp b/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp index 103b589e957..d5f87145262 100644 --- a/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp +++ b/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp @@ -42,7 +42,7 @@ int daTagGstart_c::execute() { if ((mSwNo == 0xFF || dComIfGs_isSwitch(mSwNo, fopAcM_GetHomeRoomNo(this))) && (mSwNo2 == 0xFF || !dComIfGs_isSwitch(mSwNo2, fopAcM_GetHomeRoomNo(this)))) { - if (mType != 0 || dComIfGp_getLinkPlayer()->i_checkWolf()) { + if (mType != 0 || dComIfGp_getLinkPlayer()->checkWolf()) { dComIfGp_getLinkPlayer()->onSceneChangeDead(field_0x56a, fopAcM_GetRoomNo(this)); } } diff --git a/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp b/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp index dc7c9d8d0c2..dbf78dcf5e7 100644 --- a/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp +++ b/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp @@ -14,7 +14,7 @@ int daTagHinit_c::create() { field_0x569 = shape_angle.x; - if (field_0x569 != 0xFF && i_fopAcM_isSwitch(this, field_0x569)) { + if (field_0x569 != 0xFF && fopAcM_isSwitch(this, field_0x569)) { return cPhs_ERROR_e; } @@ -44,16 +44,16 @@ static int daTagHinit_Delete(daTagHinit_c* i_this) { /* 805A389C-805A39B8 0001BC 011C+00 1/1 0/0 0/0 .text execute__12daTagHinit_cFv */ int daTagHinit_c::execute() { if ((field_0x56c == 0xFFFF || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x56c])) && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x56c])) && (field_0x56e == 0xFFFF || - !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x56e])) && - (field_0x568 == 0xFF || i_fopAcM_isSwitch(this, field_0x568))) + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x56e])) && + (field_0x568 == 0xFF || fopAcM_isSwitch(this, field_0x568))) { if (field_0x569 != 0xFF) { - i_fopAcM_onSwitch(this, field_0x569); + fopAcM_onSwitch(this, field_0x569); } - daHorse_c* horse = i_dComIfGp_getHorseActor(); + daHorse_c* horse = dComIfGp_getHorseActor(); horse->i_setHorsePosAndAngle(¤t.pos, shape_angle.y); horse->offNoDrawWait(); fopAcM_delete(this); 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 c7701d604a7..09663e83a78 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 @@ -50,7 +50,7 @@ int daTagHjump_c::create() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::get()[1][3] -= 100.0f; current.pos.y -= 100.0f; @@ -111,14 +111,14 @@ static int daTagHjump_Delete(daTagHjump_c* i_this) { /* 805A3E70-805A4134 000430 02C4+00 1/1 0/0 0/0 .text execute__12daTagHjump_cFv */ int daTagHjump_c::execute() { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (horse_p != NULL && (mType != TYPE_TRIGGER_e || ((mOnFlagID == 0xFFF || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mOnFlagID])) && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mOnFlagID])) && (mOffFlagID == 0xFFF || - !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mOffFlagID]))))) + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mOffFlagID]))))) { s16 angle_diff = horse_p->shape_angle.y - shape_angle.y; int abs_angle = abs(angle_diff); 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 09c299f29ba..348bfb61cde 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 @@ -114,7 +114,7 @@ int daTagHstop_c::execute() { m_msgFlow.init(this, (u16)shape_angle.z, 0, NULL); field_0x573 = 3; } else if (m_msgFlow.doFlow(this, NULL, 0)) { - i_dComIfGp_getEvent().reset(); + dComIfGp_getEvent().reset(); field_0x573 = 0; s16 arrow_num = dComIfGp_getItemMaxArrowNumCount(); @@ -136,21 +136,21 @@ int daTagHstop_c::execute() { setActive(); if (field_0x573) { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (mPrm1 != 2 || dComIfGs_getArrowNum() != 0 || horse_p == NULL) { field_0x573 = 0; } else if (field_0x573 == 1) { - if (i_dComIfGp_getHorseActor()->checkTurnStand() && - !i_dComIfGp_getHorseActor()->checkTurnStandCamera()) + if (dComIfGp_getHorseActor()->checkTurnStand() && + !dComIfGp_getHorseActor()->checkTurnStandCamera()) { field_0x573 = 2; } - } else if (field_0x573 == 2 && !i_dComIfGp_getHorseActor()->checkTurnStand()) { + } else if (field_0x573 == 2 && !dComIfGp_getHorseActor()->checkTurnStand()) { fopAcM_orderSpeakEvent(this, 0, 0); eventInfo.i_onCondition(dEvtCnd_CANTALK_e); } - } else if (mPrm1 == 2 && !i_dComIfGp_event_runCheck()) { + } else if (mPrm1 == 2 && !dComIfGp_event_runCheck()) { if (dComIfGs_getArrowNum() == 0 && !dComIfGs_isSwitch(0x8D, fopAcM_GetHomeRoomNo(this))) { dComIfGs_onSwitch(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 f90c0d7b23e..aeda8d6e7a6 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 @@ -98,7 +98,7 @@ void daTagKagoFall_c::actionWaitRiver() { } } - if (i_dComIfGp_checkPlayerStatus0(0, 0x100000) && i_dComIfGs_getLife()) { + if (dComIfGp_checkPlayerStatus0(0, 0x100000) && dComIfGs_getLife()) { if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 1, -1, 3); eventInfo.i_onCondition(dEvtCnd_CANDEMO_e); @@ -109,7 +109,7 @@ void daTagKagoFall_c::actionWaitRiver() { mRestartPos = dCam_getBody()->Eye(); mActionState = 1; mTimer = 30; - player->i_onNoResetFlg0(daPy_py_c::RFLG0_UNK_10000); + player->onNoResetFlg0(daPy_py_c::FLG0_UNK_10000); mRiverTimer = 60; } } @@ -132,7 +132,7 @@ void daTagKagoFall_c::actionWaitRiver() { case 2: if (mRiverTimer == 0) { - daPy_getPlayerActorClass()->i_offNoResetFlg0(daPy_py_c::RFLG0_UNK_10000); + daPy_getPlayerActorClass()->offNoResetFlg0(daPy_py_c::FLG0_UNK_10000); mActionState = 3; mTimer = 40; } @@ -147,7 +147,7 @@ void daTagKagoFall_c::actionWaitRiver() { break; case 4: - daPy_getPlayerActorClass()->i_offNoResetFlg0(daPy_py_c::RFLG0_UNK_10000); + daPy_getPlayerActorClass()->offNoResetFlg0(daPy_py_c::FLG0_UNK_10000); int msg = mMsgFlow.doFlow(this, NULL, 0); if (msg != 0) { @@ -196,10 +196,10 @@ void daTagKagoFall_c::actionWaitFall() { break; case 1: - if (i_dComIfGs_getLife() == 0) { + if (dComIfGs_getLife() == 0) { player->onSceneChangeAreaJump(mExitID, -1, NULL); - if (player->i_checkNoResetFlg2(daPy_py_c::FLG2_SCN_CHG_START) && !mPlayedSceneChangeSfx) + if (player->checkNoResetFlg2(daPy_py_c::FLG2_SCN_CHG_START) && !mPlayedSceneChangeSfx) { Z2GetAudioMgr()->seStart(Z2SE_FORCE_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); player->voiceStart(Z2SE_WL_V_FALL_TO_RESTART); 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 daa4d1703e7..23f8ec7d501 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 @@ -27,7 +27,7 @@ int daTag_Lantern_c::Delete() { int daTag_Lantern_c::Execute() { dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); // fake match - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (!field_0x604) { mMsgFlow.init(this, mFlowIndex, 0, NULL); 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 be4f422952f..24150950e4b 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 @@ -21,8 +21,8 @@ int daTagLightBall_c::Create() { initBaseMtx(); u8 swbit = getSwBit(); if (fopAcM_GetRoomNo(this) == 7) { - if (!i_fopAcM_isSwitch(this, 70)) { - i_fopAcM_offSwitch(this, swbit); + if (!fopAcM_isSwitch(this, 70)) { + fopAcM_offSwitch(this, swbit); } } @@ -31,19 +31,19 @@ int daTagLightBall_c::Create() { if (swbit != 0xFF) { if (getType() == 15) { - if (i_fopAcM_isSwitch(this, swbit)) { + if (fopAcM_isSwitch(this, swbit)) { dKy_dalkmist_inf_set(&mInfluence); mInfSet = true; } } else { - if (!i_fopAcM_isSwitch(this, swbit)) { + if (!fopAcM_isSwitch(this, swbit)) { dKy_dalkmist_inf_set(&mInfluence); mInfSet = true; } } } - field_0x57c = i_fopAcM_isSwitch(this, swbit); + field_0x57c = fopAcM_isSwitch(this, swbit); return 1; } @@ -63,24 +63,24 @@ int daTagLightBall_c::execute() { u8 swbit = getSwBit(); if (swbit != 0xFF) { if (getType() == 15) { - if (field_0x57c && !i_fopAcM_isSwitch(this, swbit)) { + if (field_0x57c && !fopAcM_isSwitch(this, swbit)) { dKy_dalkmist_inf_cut(&mInfluence); mInfSet = false; - } else if (!field_0x57c && i_fopAcM_isSwitch(this, swbit)) { + } else if (!field_0x57c && fopAcM_isSwitch(this, swbit)) { dKy_dalkmist_inf_set(&mInfluence); mInfSet = true; } - } else if (!field_0x57c && i_fopAcM_isSwitch(this, swbit)) { + } else if (!field_0x57c && fopAcM_isSwitch(this, swbit)) { dKy_dalkmist_inf_cut(&mInfluence); mInfSet = false; - } else if (field_0x57c && !i_fopAcM_isSwitch(this, swbit)) { + } else if (field_0x57c && !fopAcM_isSwitch(this, swbit)) { dKy_dalkmist_inf_set(&mInfluence); mInfSet = true; } } mInfluence.mPos = current.pos; - field_0x57c = i_fopAcM_isSwitch(this, swbit); + field_0x57c = fopAcM_isSwitch(this, swbit); return 1; } diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp b/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp index dac436c302b..a7324bbf0d3 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp +++ b/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp @@ -15,7 +15,7 @@ int daTagLv2PrChk_c::Create() { return 0; } - if (i_fopAcM_isSwitch(this, getSwbit())) { + if (fopAcM_isSwitch(this, getSwbit())) { mAction = ACTION_END_e; } else { mAction = ACTION_CHECK_e; @@ -70,10 +70,10 @@ void daTagLv2PrChk_c::action() { /* 805A4DF4-805A5290 000214 049C+00 1/0 0/0 0/0 .text actionCheck__15daTagLv2PrChk_cFv */ void daTagLv2PrChk_c::actionCheck() { - bool switch_1 = i_fopAcM_isSwitch(this, mSwbit2); - bool switch_2 = i_fopAcM_isSwitch(this, mSwbit2 + 1); - bool switch_3 = i_fopAcM_isSwitch(this, mSwbit2 + 2); - bool switch_4 = i_fopAcM_isSwitch(this, mSwbit2 + 3); + bool switch_1 = fopAcM_isSwitch(this, mSwbit2); + bool switch_2 = fopAcM_isSwitch(this, mSwbit2 + 1); + bool switch_3 = fopAcM_isSwitch(this, mSwbit2 + 2); + bool switch_4 = fopAcM_isSwitch(this, mSwbit2 + 3); int active_switch_num = switch_1 + switch_2 + switch_3 + switch_4; switch (mMode) { @@ -141,7 +141,7 @@ void daTagLv2PrChk_c::actionCheck() { } break; case MODE_PUZZLE_CLEAR: - i_fopAcM_onSwitch(this, getSwbit()); + fopAcM_onSwitch(this, getSwbit()); mAction = ACTION_END_e; break; case MODE_CHECK_RESET: @@ -149,7 +149,7 @@ void daTagLv2PrChk_c::actionCheck() { mMode = MODE_CHECK_FIRST_SW; field_0x56d = 0; } else if (active_switch_num > 1 || field_0x56d == 1) { - i_fopAcM_onSwitch(this, getSwbit3()); + fopAcM_onSwitch(this, getSwbit3()); } break; case MODE_CHECK_WRONG_ORDER: 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 639c5e91a7b..fb0de6b9dae 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 @@ -25,13 +25,13 @@ int daTag_Lv5Soup_c::Delete() { int daTag_Lv5Soup_c::Execute() { if (isAreaCheck()) { // Yeto took pumpkin and pumpkin not in soup - if (i_dComIfGs_isEventBit(0x0020) && !i_dComIfGs_isEventBit(0x0002)) { + if (dComIfGs_isEventBit(0x0020) && !dComIfGs_isEventBit(0x0002)) { // Pumpkin in soup dComIfGs_onEventBit(0x0002); } // Yeto took cheese and cheese not in soup - if (i_dComIfGs_isEventBit(0x0010) && !i_dComIfGs_isEventBit(0x0001)) { + if (dComIfGs_isEventBit(0x0010) && !dComIfGs_isEventBit(0x0001)) { // Cheese in soup dComIfGs_onEventBit(0x0001); } 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 a4c5b2028bf..22143015fac 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 @@ -55,12 +55,12 @@ bool daLv6CstaSw_c::areaCheck() { /* 80D5B600-80D5B6B0 000400 00B0+00 1/1 0/0 0/0 .text Execute__13daLv6CstaSw_cFv */ int daLv6CstaSw_c::Execute() { if (areaCheck() == true) { - if (!i_fopAcM_isSwitch(this, mSwitch)) { - i_fopAcM_onSwitch(this, mSwitch); + if (!fopAcM_isSwitch(this, mSwitch)) { + fopAcM_onSwitch(this, mSwitch); } } else { - if (i_fopAcM_isSwitch(this, mSwitch)) { - i_fopAcM_offSwitch(this, mSwitch); + if (fopAcM_isSwitch(this, mSwitch)) { + fopAcM_offSwitch(this, mSwitch); } } 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 11060f910f2..058e4fd5554 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 @@ -98,7 +98,7 @@ int daTagMhint_c::create() { field_0x56d = shape_angle.y & 0xFF; mToolEventID = (shape_angle.y >> 8) & 0xFF; - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, mToolEventID); + mEventID = dComIfGp_getEventManager().getEventIdx(this, mToolEventID); if ((fopAcM_GetParam(this) >> 0x1E) & 1) { scale.x *= FLOAT_LABEL(lit_3741); scale.y *= FLOAT_LABEL(lit_3741); @@ -157,11 +157,11 @@ SECTION_DEAD static char const* const stringBase_805A604C = "D_MN04B"; // literals / player ptr re-loads #ifdef NONMATCHING void daTagMhint_c::eventOrder() { - if (!i_dComIfGp_event_runCheck()) { + if (!dComIfGp_event_runCheck()) { eventInfo.i_onCondition(dEvtCnd_CANTALK_e); if (!daPy_getPlayerActorClass()->checkPlayerFly() || - i_dComIfGp_checkPlayerStatus0(0, 0x100000)) + dComIfGp_checkPlayerStatus0(0, 0x100000)) { if (field_0x56a != 0) { if (checkEventID()) { @@ -169,7 +169,7 @@ void daTagMhint_c::eventOrder() { } else { fopAcM_orderSpeakEvent(this, 0, 0); } - } else if (!daPy_getPlayerActorClass()->i_checkMagneBootsOn() || + } else if (!daPy_getPlayerActorClass()->checkMagneBootsOn() || strcmp(dComIfGp_getStartStageName(), "D_MN04B") == 0) { dComIfGp_att_ZHintRequest(this, 0x1FF); @@ -233,7 +233,7 @@ int daTagMhint_c::execute() { if (eventInfo.i_checkCommandDemoAccrpt()) { if (dComIfGp_evmng_endCheck(mEventID)) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); fopAcM_orderSpeakEvent(this, 3, 0); field_0x570 = 1; } @@ -264,12 +264,12 @@ int daTagMhint_c::execute() { } if (tmp) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); field_0x570 = 0; if (field_0x572 != 0 || (field_0x56b != 0 && mSwitch != 0xFF)) { if (field_0x56b != 0) { - i_fopAcM_onSwitch(this, mSwitch); + fopAcM_onSwitch(this, mSwitch); } fopAcM_delete(this); @@ -286,12 +286,12 @@ int daTagMhint_c::execute() { } if (field_0x57c != 0x3FF && - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x57c])) + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x57c])) { return 1; } - if (mSwitch != 0xFF && i_fopAcM_isSwitch(this, mSwitch)) { + if (mSwitch != 0xFF && fopAcM_isSwitch(this, mSwitch)) { fopAcM_delete(this); return 1; } @@ -303,10 +303,10 @@ int daTagMhint_c::execute() { fopAcM_searchPlayerDistanceXZ2(this) < field_0x5cc) { if ((field_0x574 == 0x3FF || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x574])) && - (field_0x568 == 0xFF || i_fopAcM_isSwitch(this, field_0x568))) + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x574])) && + (field_0x568 == 0xFF || fopAcM_isSwitch(this, field_0x568))) { - if (field_0x578 != 0x1FF && field_0x578 != 0 && !i_dComIfGp_event_runCheck()) { + if (field_0x578 != 0x1FF && field_0x578 != 0 && !dComIfGp_event_runCheck()) { field_0x578--; } 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 b2dfe8bee81..c871c799030 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 @@ -17,7 +17,7 @@ void daTagMist_c::offSw() { sw_no_num = daTagMist_prm::getSwNoNum(this); for (int i = 0; i < sw_no_num; i++) { - i_fopAcM_offSwitch(this, top_sw_no + i); + fopAcM_offSwitch(this, top_sw_no + i); } } @@ -30,7 +30,7 @@ void daTagMist_c::onMySw() { my_sw_no = daTagMist_prm::getMySwNo(this); if (my_sw_no != 0xFF) { - i_fopAcM_onSwitch(this, top_sw_no + my_sw_no); + fopAcM_onSwitch(this, top_sw_no + my_sw_no); } } @@ -42,7 +42,7 @@ BOOL daTagMist_c::isMySw() { top_sw_no = daTagMist_prm::getTopSwNo(this); my_sw_no = daTagMist_prm::getMySwNo(this); - if (my_sw_no != 0xFF && i_fopAcM_isSwitch(this, top_sw_no + my_sw_no)) { + if (my_sw_no != 0xFF && fopAcM_isSwitch(this, top_sw_no + my_sw_no)) { return TRUE; } else { return FALSE; @@ -103,7 +103,7 @@ int daTagMist_c::create() { /* 8048F558-8048F690 000378 0138+00 1/1 0/0 0/0 .text execute__11daTagMist_cFv */ int daTagMist_c::execute() { - if (i_fopAcM_isSwitch(this, daTagMist_prm::getSwNo2(this))) { + if (fopAcM_isSwitch(this, daTagMist_prm::getSwNo2(this))) { return 1; } 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 da7f404a7ac..8ce27681d0a 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 @@ -65,7 +65,7 @@ int daTagMmsg_c::execute() { return 1; } - if (field_0x572 != 0x3FF && i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x572])) + if (field_0x572 != 0x3FF && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x572])) { return 1; } @@ -75,7 +75,7 @@ int daTagMmsg_c::execute() { return 1; } - if (mUseFlg && !i_dComIfGp_event_runCheck() && field_0x56b && field_0x569 != 0xFF) { + if (mUseFlg && !dComIfGp_event_runCheck() && field_0x56b && field_0x569 != 0xFF) { dComIfGs_onSwitch(field_0x569, fopAcM_GetHomeRoomNo(this)); fopAcM_delete(this); return 1; @@ -85,7 +85,7 @@ int daTagMmsg_c::execute() { if ((current.pos.y <= player->current.pos.y) && (field_0x578 >= player->current.pos.y) && (fopAcM_searchPlayerDistanceXZ2(this) < field_0x574) && (field_0x570 == 0x3FF || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x570])) && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x570])) && (field_0x568 == 0xFF || dComIfGs_isSwitch(field_0x568, fopAcM_GetHomeRoomNo(this)))) { player->setMidnaMsgNum(this, shape_angle.z); 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 40756a3eeb1..6508c33b832 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 @@ -221,27 +221,27 @@ int daTagMstop_c::execute() { if (field_0x56e == 4) { if (field_0x5c8.abs2(player_p->current.pos) < 2500.0f) { - i_dComIfGp_event_reset(); - player_p->i_cancelOriginalDemo(); + dComIfGp_event_reset(); + player_p->cancelOriginalDemo(); field_0x56e = 0; } } else if (field_0x56e == 3) { if (player_p->checkHorseRide()) { player_p->setPlayerPosAndAngle(&field_0x5c8, player_p->shape_angle.y, 0); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); field_0x56e = 0; } else { field_0x56e = 4; - player_p->i_changeOriginalDemo(); - field_0x56a == 0 ? player_p->i_changeDemoMode(3, 0, 0, 0) : - player_p->i_changeDemoMode(2, 0, 0, 0); + player_p->changeOriginalDemo(); + field_0x56a == 0 ? player_p->changeDemoMode(3, 0, 0, 0) : + player_p->changeDemoMode(2, 0, 0, 0); - player_p->i_changeDemoPos0(&field_0x5c8); + player_p->changeDemoPos0(&field_0x5c8); } } else if (eventInfo.checkCommandTalk()) { if (field_0x56e == 2) { if (!midna_p->checkShadowModelDraw() || midna_p->checkShadowReturnEnd()) { - i_dComIfGp_getEvent().reset(this); + dComIfGp_getEvent().reset(this); fopAcM_orderPotentialEvent(this, 0x400, 0x14f, 1); field_0x56e = 3; } @@ -259,15 +259,15 @@ int daTagMstop_c::execute() { } } } - } else if ((mSwitch != 0xFF && i_fopAcM_isSwitch(this, mSwitch)) || + } else if ((mSwitch != 0xFF && fopAcM_isSwitch(this, mSwitch)) || (field_0x572 != 0xFFFF && - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x572]))) + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x572]))) { fopAcM_delete(this); return 1; - } else if ((field_0x568 != 0xFF && !i_fopAcM_isSwitch(this, field_0x568)) || + } else if ((field_0x568 != 0xFF && !fopAcM_isSwitch(this, field_0x568)) || (field_0x570 != 0xFFFF && - !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x570]))) + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x570]))) { return 1; } else if (current.pos.y <= player_p->current.pos.y && field_0x5c4 >= player_p->current.pos.y && 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 66e3aff1e83..b0ad0456369 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 @@ -15,7 +15,7 @@ int daTagMwait_c::create() { mEnterSw = fopAcM_GetParam(this) >> 8; - if (i_fopAcM_isSwitch(this, mEnterSw)) { + if (fopAcM_isSwitch(this, mEnterSw)) { return cPhs_ERROR_e; } @@ -87,7 +87,7 @@ int daTagMwait_c::execute() { mMsgFlow.init(this, (u16)shape_angle.z, 0, NULL); mInitMsgFlow = true; } else if (mMsgFlow.doFlow(this, NULL, 0)) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); if (mEnteredTrigger) { fopAcM_delete(this); @@ -103,7 +103,7 @@ int daTagMwait_c::execute() { } else { mInitMsgFlow = false; - if (daPy_py_c::i_checkNowWolf() && midna_p != NULL && i_fopAcM_isSwitch(this, mOnSw)) + if (daPy_py_c::i_checkNowWolf() && midna_p != NULL && fopAcM_isSwitch(this, mOnSw)) { if (mWarpToPos == 1) { midna_p->onTagWaitPosWarp(&mWaitPosition); @@ -120,10 +120,10 @@ int daTagMwait_c::execute() { if ((player_dist <= scale.x * scale.x && player_p->current.pos.y >= current.pos.y && player_p->current.pos.y <= current.pos.y + scale.y) || - i_fopAcM_isSwitch(this, mEnterSw)) + fopAcM_isSwitch(this, mEnterSw)) { midna_p->offTagWaitPos(); - i_fopAcM_onSwitch(this, mEnterSw); + fopAcM_onSwitch(this, mEnterSw); mEnteredTrigger = true; if (shape_angle.z == 0) { 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 db1ded60d9e..fcff088d2d1 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 @@ -18,7 +18,7 @@ s32 daTagMyna2_c::create() { /* 80D5C708-80D5C9A8 0000E8 02A0+00 1/1 0/0 0/0 .text execute__12daTagMyna2_cFv */ s32 daTagMyna2_c::execute() { - if (!i_dComIfGp_event_runCheck()) { + if (!dComIfGp_event_runCheck()) { if (!dComIfGs_isSwitch(mSwitchNo,fopAcM_GetRoomNo(this))) { if ((dComIfGp_getPlayer(0)->current.pos - current.pos).absXZ() < getExtent()) { s16 angle_y = (s16)fopAcM_searchPlayerAngleY(this); @@ -43,7 +43,7 @@ s32 daTagMyna2_c::execute() { } } - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { mTimer = 5; } else { cLib_calcTimer(&mTimer); 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 8e51939dd8c..5eb705c37da 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 @@ -48,10 +48,10 @@ int daTag_MynaLight_c::Execute() { if (mTurnOnFlag) { if (dComIfGp_roomControl_getStayNo() != 0) { - i_mDoAud_seStartLevel(Z2SE_OBJ_MYNA_LIGHT_BURNING, (Vec*)¤t.pos, 0, + mDoAud_seStartLevel(Z2SE_OBJ_MYNA_LIGHT_BURNING, (Vec*)¤t.pos, 0, dComIfGp_getReverb(dComIfGp_roomControl_getStayNo())); } else { - i_mDoAud_seStartLevel(Z2SE_OBJ_MYNA_LIGHT_BURNING, (Vec*)¤t.pos, 0, 0); + mDoAud_seStartLevel(Z2SE_OBJ_MYNA_LIGHT_BURNING, (Vec*)¤t.pos, 0, 0); } } return 1; 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 e021966df11..25ac326ea2f 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 @@ -81,9 +81,9 @@ int daTag_Push_c::Execute() { fopAcM_delete(this); return 1; } else { - if (!i_dComIfGp_event_runCheck()) { + if (!dComIfGp_event_runCheck()) { if (actor == NULL) { - actor = (fopAc_ac_c*)(i_fpcM_Search(srchActor, this)); + actor = (fopAc_ac_c*)(fpcM_Search(srchActor, this)); if (actor != NULL) { mActorMngr.entry(actor); } 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 d9e53892326..13ded3c534e 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 @@ -48,7 +48,7 @@ static char* l_evName = "RIVER_BACK"; int daTagRiverBack_c::Create() { mMapToolID = -1; eventInfo.setArchiveName(l_arcName); - mEventID = i_dComIfGp_getEventManager().getEventIdx(this, l_evName, -1); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_evName, -1); return 1; } @@ -68,12 +68,12 @@ int daTagRiverBack_c::create() { /* 80D5F3F0-80D5F48C 000170 009C+00 1/1 0/0 0/0 .text execute__16daTagRiverBack_cFv */ int daTagRiverBack_c::execute() { u8 swBit = getSwBit(); - if (swBit != 0xFF && i_fopAcM_isSwitch(this, swBit) != 0) { + if (swBit != 0xFF && fopAcM_isSwitch(this, swBit) != 0) { return 1; } u8 swBit2 = getSwBit2(); - if (swBit2 != 0xFF && i_fopAcM_isSwitch(this, swBit2) == 0) { + if (swBit2 != 0xFF && fopAcM_isSwitch(this, swBit2) == 0) { return 1; } @@ -99,7 +99,7 @@ void daTagRiverBack_c::event_proc_call() { /* 80D5F548-80D5F5BC 0002C8 0074+00 1/0 0/0 0/0 .text actionWait__16daTagRiverBack_cFv */ void daTagRiverBack_c::actionWait() { - if (i_dComIfGp_checkPlayerStatus0(0, 0x100000) != 0) { + if (dComIfGp_checkPlayerStatus0(0, 0x100000) != 0) { mCount = 0; setAction(ACTION_ORDER_EVENT_e); fopAcM_orderOtherEventId(this, mEventID, mMapToolID, 0xFFFF, 0, 1); @@ -112,7 +112,7 @@ void daTagRiverBack_c::actionOrderEvent() { daPy_py_c* player = daPy_getPlayerActorClass(); if (eventInfo.checkCommandDemoAccrpt()) { setAction(ACTION_EVENT_e); - mStaffID = i_dComIfGp_evmng_getMyStaffId(l_staffName, NULL, 0); + mStaffID = dComIfGp_evmng_getMyStaffId(l_staffName, NULL, 0); player->mNoResetFlg0 |= 0x10000; demoProc(); } else { @@ -128,7 +128,7 @@ void daTagRiverBack_c::actionEvent() { mCount += 1; if (dComIfGp_evmng_endCheck(mEventID)) { setAction(ACTION_DEAD_e); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } else { demoProc(); if (mCount == 30) { 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 c0e33edf2c0..2ec0d536793 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 @@ -34,7 +34,7 @@ int daTagRmbitSw_c::draw() { int daTagRmbitSw_c::execute() { if (chkPlyrInTag()) { if (getArg3_CngBitFlg() == 1) { - if ((s32)getSwBit() == 0xff || i_fopAcM_isSwitch(this, getSwBit())) { + if ((s32)getSwBit() == 0xff || fopAcM_isSwitch(this, getSwBit())) { if (getArg2_CngBitVal() == 1) { if (getArg0_RoomSaveTableNo() == -1) { dComIfGs_onVisitedRoom(getArg1_RoomNo()); @@ -54,7 +54,7 @@ int daTagRmbitSw_c::execute() { } } else { if (!getArg3_CngBitFlg()) { - if ((s32)getSwBit() == 0xff || !i_fopAcM_isSwitch(this, getSwBit())) { + if ((s32)getSwBit() == 0xff || !fopAcM_isSwitch(this, getSwBit())) { if (getArg2_CngBitVal() == 1) { if (getArg0_RoomSaveTableNo() == -1) { dComIfGs_onVisitedRoom(getArg1_RoomNo()); 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 6f287a92542..0bf5f00736f 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 @@ -15,7 +15,7 @@ int daTag_ShopItem_c::create() { if (strcmp("F_SP109", dComIfGp_getStartStageName()) == 0) { // saveBitLabels[64] = Goron Mines completed - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[64])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[64])) { return cPhs_ERROR_e; } 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 dde9481f798..9e9eb5ec193 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 @@ -76,9 +76,9 @@ int daTagSpinner_c::execute() { if (mpSpinner) { mpSpinner->setSpinnerTag(current.pos); - i_fopAcM_onSwitch(this, daTagSpinner_prm::getSwNo(this)); + fopAcM_onSwitch(this, daTagSpinner_prm::getSwNo(this)); } else { - i_fopAcM_offSwitch(this, daTagSpinner_prm::getSwNo(this)); + fopAcM_offSwitch(this, daTagSpinner_prm::getSwNo(this)); } return 1; } 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 9134dda4489..6867e5d39ef 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 @@ -40,27 +40,27 @@ int daTagSpring_c::create() { /* 805A6B5C-805A6C84 00017C 0128+00 1/1 0/0 0/0 .text execute__13daTagSpring_cFv */ int daTagSpring_c::execute() { if (getSwbit() != 0xFF) { - if (!i_fopAcM_isSwitch(this, getSwbit())) { + if (!fopAcM_isSwitch(this, getSwbit())) { return 1; } } - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { return 1; } fopAc_ac_c* player_p = daPy_getPlayerActorClass(); if (checkArea() && fopAcM_wt_c::waterCheck(&player_p->current.pos) && - (!i_dComIfGp_checkPlayerStatus0(0, 0x100000) && + (!dComIfGp_checkPlayerStatus0(0, 0x100000) && fopAcM_wt_c::mWaterY > player_p->current.pos.y || - i_dComIfGp_checkPlayerStatus0(0, 0x100000))) + dComIfGp_checkPlayerStatus0(0, 0x100000))) { if (mTimer != 0) { mTimer--; } else { mTimer = 30; - i_dComIfGp_setItemLifeCount(1.0f, 1); + dComIfGp_setItemLifeCount(1.0f, 1); } } else { mTimer = 30; 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 12b59ff8453..acf8f0d8c97 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 @@ -160,7 +160,7 @@ void daTag_SSDrink_c::setAttnPos() { /* 80D63208-80D63384 0004C8 017C+00 1/1 0/0 0/0 .text chkEvent__15daTag_SSDrink_cFv */ int daTag_SSDrink_c::chkEvent() { int retVal = 1; - if (!i_dComIfGp_getEvent().i_isOrderOK()) { + if (!dComIfGp_getEvent().isOrderOK()) { retVal = 0; if (eventInfo.checkCommandTalk()) { if (!checkProcess(&daTag_SSDrink_c::talk) == 0) { @@ -187,7 +187,7 @@ int daTag_SSDrink_c::chkEvent() { /* 80D63384-80D63490 000644 010C+00 1/1 0/0 0/0 .text orderEvent__15daTag_SSDrink_cFv */ int daTag_SSDrink_c::orderEvent() { - if (!dComIfGp_getLinkPlayer()->i_checkWolf() && i_fopAcM_isSwitch(this, getSwitchFromParam()) && + if (!dComIfGp_getLinkPlayer()->checkWolf() && fopAcM_isSwitch(this, getSwitchFromParam()) && field_0x5D3 != 0x60 && getFlowNodeNum() != 0xFFFF) { attention_info.flags = 0x40000008; @@ -211,7 +211,7 @@ int daTag_SSDrink_c::wait(void* param_0) { switch (mEventType) { case 1: if (!eventInfo.i_checkCommandCatch()) { - if (i_fopAcM_isSwitch(this, getSwitchFromParam())) { + if (fopAcM_isSwitch(this, getSwitchFromParam())) { if (fopAcM_searchPlayerDistanceXZ(this) <= 160.0f && fopAcM_seenPlayerAngleY() <= 0x2000) { @@ -242,7 +242,7 @@ int daTag_SSDrink_c::talk(void* param_0) { break; case 1: if (field_0x578.doFlow(this, NULL, 0) != 0) { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); setProcess(&daTag_SSDrink_c::wait); retVal = 1; } 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 64d8b3bc7cc..e4c6aa19520 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 @@ -88,7 +88,7 @@ static int daTagStream_Delete(daTagStream_c* i_this) { /* 80D63B58-80D63BC0 0002D8 0068+00 1/1 0/0 0/0 .text execute__13daTagStream_cFv */ int daTagStream_c::execute() { - if (field_0x56b == 0xFF || i_fopAcM_isSwitch(this,field_0x56b)) { + if (field_0x56b == 0xFF || fopAcM_isSwitch(this,field_0x56b)) { mStreamOn = 1; } else { mStreamOn = 0; 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 1d3366fc2e4..8df53556d54 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 @@ -157,7 +157,7 @@ int daTagWaterFall_c::execute() { if (masterId == waterfallId) { if (mFrameCountdown) { - const dScnKy_env_light_c* const envLight = i_dKy_getEnvlight(); + const dScnKy_env_light_c* const envLight = dKy_getEnvlight(); mFogNear = envLight->mFogNear; mFogFar = envLight->mFogFar; mFrameCountdown--; 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 54f6d74f158..0e4d88f083c 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 @@ -126,7 +126,7 @@ int daTagWljump_c::execute() { if (!midnaActor->checkShadowModeTalkWait()) { if (shape_angle.x != 0 && (field_0x571 == 0xff || - !i_fopAcM_isSwitch(this, field_0x571))) + !fopAcM_isSwitch(this, field_0x571))) { if (field_0x56c[3] == 0) { mMsgFlow.init(this, shape_angle.x & 0xffff, 0, NULL); @@ -150,13 +150,13 @@ int daTagWljump_c::execute() { return 1; } field_0x56c[3] = 0; - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); field_0x56c[0] = 0; field_0x572 = 1; if (field_0x571 != 0xff) { - i_fopAcM_onSwitch(this, field_0x571); + fopAcM_onSwitch(this, field_0x571); } - } else if (!i_dComIfGp_getEvent().i_isOrderOK()) { + } else if (!dComIfGp_getEvent().isOrderOK()) { field_0x572 = 0; } else { if (!midnaActor->checkWolfNoPos()) { @@ -174,7 +174,7 @@ int daTagWljump_c::execute() { midnaActor->i_checkMidnaTired()) { return 1; } - if (field_0x571 != 0xff && i_fopAcM_isSwitch(this, field_0x571)) { + if (field_0x571 != 0xff && fopAcM_isSwitch(this, field_0x571)) { field_0x56c[0] = 0; if (field_0x573) { field_0x573 = 0; @@ -183,7 +183,7 @@ int daTagWljump_c::execute() { } } if (field_0x56c[0] != 0 || field_0x572 != 0 || field_0x571 == 0xff || - i_fopAcM_isSwitch(this, field_0x571)) + fopAcM_isSwitch(this, field_0x571)) { s32 uVar6; dStage_dPnt_c* pbVar7 = field_0x5c4->m_points; diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index a3558b9729b..967838b763d 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -222,7 +222,7 @@ bool DynamicModuleControl::do_load() { s32 i = 0; while (true) { if (mModule != NULL) { - i_JKRFree(mModule); + JKRFree(mModule); mModule = NULL; } char buffer[64]; @@ -340,7 +340,7 @@ BOOL DynamicModuleControl::do_load_async() { */ bool DynamicModuleControl::do_unload() { if (mModule != NULL) { - i_JKRFree(mModule); + JKRFree(mModule); mModule = NULL; } return true; @@ -469,7 +469,7 @@ bool DynamicModuleControl::do_unlink() { } sAllocBytes = sAllocBytes - getModuleSize(); if (mBss != NULL) { - i_JKRFree(mBss); + JKRFree(mBss); mBss = NULL; } do_unload(); diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 3855f795c5c..7f31d098586 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -110,7 +110,7 @@ void JPTraceParticleCallBack4::draw(JPABaseEmitter* param_0, JPABaseParticle* pa /* 800182A8-80018328 012BE8 0080+00 0/0 0/0 22/22 .text cDmrNowMidnaTalk__Fv */ BOOL cDmrNowMidnaTalk() { - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_getTalkEventPartner(daPy_getLinkPlayerActorClass()); if (actor) { if (fopAcM_GetName(actor) == PROC_MIDNA || fopAcM_GetName(actor) == PROC_Tag_Mhint || diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 892a54ebd3a..0c787bd9282 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -497,126 +497,126 @@ extern "C" void __dt__29dAlink_bottleWaterPcallBack_cFv(); extern "C" void __dt__14daAlink_blur_cFv(); extern "C" void __dt__15daAlink_sight_cFv(); extern "C" void __dt__20daAlink_lockCursor_cFv(); -extern "C" void checkRideOn__9daAlink_cCFv(); -extern "C" static void dComIfGp_att_getCatghTarget__Fv(); -extern "C" static void mDoAud_setLinkHp__Fll(); -extern "C" static void dComIfGs_getLife__Fv(); -extern "C" static void dComIfGp_getRStatus__Fv(); -extern "C" void checkAttentionLock__9daAlink_cFv(); +extern "C" BOOL checkRideOn__9daAlink_cCFv(daAlink_c* this_); +extern "C" static dAttCatch_c* dComIfGp_att_getCatghTarget__Fv(); +extern "C" static void mDoAud_setLinkHp__Fll(s32 param_0, s32 param_1); +extern "C" static u16 dComIfGs_getLife__Fv(); +extern "C" static u8 dComIfGp_getRStatus__Fv(); +extern "C" BOOL checkAttentionLock__9daAlink_cFv(daAlink_c* this_); extern "C" void dComIfGp_setItemLifeCount__FfUc(f32, u8); extern "C" static void cMtx_multVec__FPA4_CfPC3VecP3Vec(); static void cMtx_multVec(f32 const (*param_0)[4], Vec const* param_1, Vec* param_2); -extern "C" void getAnmMtx__8J3DModelFi(); -extern "C" void setBaseTRMtx__8J3DModelFPA4_f(); -extern "C" void checkFmChainGrabAnime__9daAlink_cCFv(); -extern "C" void checkSmallUpperGuardAnime__9daAlink_cCFv(); +extern "C" MtxP getAnmMtx__8J3DModelFi(J3DModel* this_, int i); +extern "C" void setBaseTRMtx__8J3DModelFPA4_f(J3DModel* this_, MtxP matrix); +extern "C" BOOL checkFmChainGrabAnime__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkSmallUpperGuardAnime__9daAlink_cCFv(daAlink_c* this_); extern "C" static void dComIfGp_evmng_startCheck__FPCc(); -extern "C" static void mDoAud_setLinkGroupInfo__FUc(); +extern "C" static void mDoAud_setLinkGroupInfo__FUc(u8 param_0); extern "C" void getAnm__25mDoExt_MtxCalcAnmBlendTblFi(); -extern "C" void ChkRoofHit__9dBgS_AcchCFv(); -extern "C" void ClrGroundHit__9dBgS_AcchFv(); -extern "C" void checkReinRide__9daAlink_cCFv(); -extern "C" void checkWolfEnemyThrowAnime__9daAlink_cCFv(); -extern "C" void checkSpecialDemoMode__9daAlink_cCFv(); -extern "C" void setMidnaTalkStatus__9daAlink_cFUc(); -extern "C" void set3DStatus__9daAlink_cFUcUc(); -extern "C" void offSetFlg__16daAlink_matAnm_cFv(); -extern "C" void checkModeFlg__9daAlink_cCFUl(); -extern "C" void getShieldChangeWaitTimer__9daAlink_cCFv(); -extern "C" void getClothesChangeWaitTimer__9daAlink_cCFv(); -extern "C" void checkHorseStart__9daAlink_cFv(); -extern "C" void checkCutTurnCharge__9daAlink_cCFv(); -extern "C" void checkAcceptDungeonWarpAlink__9daAlink_cFi(); -extern "C" void getSpinnerActor__9daAlink_cFv(); -extern "C" void getSumouCounter__9daAlink_cCFv(); -extern "C" void checkSumouWithstand__9daAlink_cCFv(); -extern "C" void setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs(); -extern "C" void getModelMtx__9daAlink_cFv(); -extern "C" void getInvMtx__9daAlink_cFv(); -extern "C" void getLinkBackBone1Matrix__9daAlink_cFv(); -extern "C" void getWolfMouthMatrix__9daAlink_cFv(); -extern "C" void getWolfBackbone2Matrix__9daAlink_cFv(); -extern "C" void getBottleMtx__9daAlink_cFv(); -extern "C" void getHeadMtx__9daAlink_cFv(); -extern "C" void getGroundY__9daAlink_cFv(); -extern "C" void getBaseAnimeFrameRate__9daAlink_cCFv(); -extern "C" void getAtnActorID__9daAlink_cCFv(); -extern "C" void getItemID__9daAlink_cCFv(); -extern "C" void getGrabActorID__9daAlink_cCFv(); -extern "C" void setForcePutPos__9daAlink_cFRC4cXyz(); -extern "C" void checkPlayerFly__9daAlink_cCFv(); -extern "C" void checkFrontRoll__9daAlink_cCFv(); -extern "C" void checkWolfDash__9daAlink_cCFv(); -extern "C" void checkAutoJump__9daAlink_cCFv(); -extern "C" void checkSideStep__9daAlink_cCFv(); -extern "C" void checkWolfTriggerJump__9daAlink_cCFv(); -extern "C" void checkGuardBreakMode__9daAlink_cCFv(); -extern "C" void checkLv3Slide__9daAlink_cCFv(); -extern "C" void checkWolfHowlDemoMode__9daAlink_cCFv(); -extern "C" void checkElecDamage__9daAlink_cCFv(); -extern "C" void checkEmptyBottleSwing__9daAlink_cCFv(); -extern "C" void checkBottleSwingMode__9daAlink_cCFv(); -extern "C" void checkHawkWait__9daAlink_cCFv(); -extern "C" void checkGoatThrow__9daAlink_cCFv(); -extern "C" void checkGoatThrowAfter__9daAlink_cCFv(); -extern "C" void checkWolfTagLockJump__9daAlink_cCFv(); -extern "C" void checkWolfTagLockJumpLand__9daAlink_cCFv(); -extern "C" void checkWolfRopeHang__9daAlink_cCFv(); -extern "C" void checkRollJump__9daAlink_cCFv(); -extern "C" void checkGoronRideWait__9daAlink_cCFv(); -extern "C" void checkWolfChain__9daAlink_cCFv(); -extern "C" void checkWolfWait__9daAlink_cCFv(); -extern "C" void checkWolfJumpAttack__9daAlink_cCFv(); -extern "C" void checkWolfRSit__9daAlink_cCFv(); -extern "C" void checkBottleDrinkEnd__9daAlink_cCFv(); -extern "C" void checkWolfDig__9daAlink_cCFv(); -extern "C" void checkCutCharge__9daAlink_cCFv(); -extern "C" void checkCutLargeJumpCharge__9daAlink_cCFv(); -extern "C" void checkComboCutTurn__9daAlink_cCFv(); -extern "C" void checkClimbMove__9daAlink_cCFv(); -extern "C" void checkGrassWhistle__9daAlink_cCFv(); -extern "C" void checkBoarRun__9daAlink_cCFv(); -extern "C" void checkHorseRideNotReady__9daAlink_cCFv(); -extern "C" void getSearchBallScale__9daAlink_cCFv(); -extern "C" void checkFastShotTime__9daAlink_cFv(); -extern "C" void checkCutJumpCancelTurn__9daAlink_cCFv(); -extern "C" void checkSingleBoarBattleSecondBowReady__9daAlink_cCFv(); -extern "C" void cancelDungeonWarpReadyNeck__9daAlink_cFv(); -extern "C" void onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c(); -extern "C" void onSceneChangeDead__9daAlink_cFUci(); -extern "C" void checkNoEquipItem__9daAlink_cCFv(); -extern "C" void getBoardCutTurnOffsetAngleY__9daAlink_cCFv(); -extern "C" void getMagneBootsTopVec__9daAlink_cFv(); -extern "C" void setCargoCarry__9daAlink_cFP10fopAc_ac_c(); -extern "C" void setGoronSideMove__9daAlink_cFP10fopAc_ac_c(); -extern "C" void setSumouReady__9daAlink_cFP10fopAc_ac_c(); -extern "C" void setSumouPushBackDirection__9daAlink_cFs(); -extern "C" void setSumouLoseHeadUp__9daAlink_cFv(); -extern "C" void checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c(); -extern "C" void checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c(); -extern "C" void setWolfEnemyHangBiteAngle__9daAlink_cFs(); -extern "C" void setSumouGraspCancelCount__9daAlink_cFi(); -extern "C" void checkItemSwordEquip__9daAlink_cCFv(); -extern "C" void getSinkShapeOffset__9daAlink_cCFv(); -extern "C" void checkSinkDead__9daAlink_cCFv(); -extern "C" void checkCutJumpMode__9daAlink_cCFv(); -extern "C" void getGiantPuzzleAimAngle__9daAlink_cCFv(); -extern "C" void getSwordChangeWaitTimer__9daAlink_cCFv(); -extern "C" void checkMetamorphose__9daAlink_cCFv(); -extern "C" void checkWolfDownAttackPullOut__9daAlink_cCFv(); +extern "C" bool ChkRoofHit__9dBgS_AcchCFv(dBgS_Acch* this_); +extern "C" void ClrGroundHit__9dBgS_AcchFv(dBgS_Acch* this_); +extern "C" u32 checkReinRide__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfEnemyThrowAnime__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkSpecialDemoMode__9daAlink_cCFv(daAlink_c* this_); +extern "C" void setMidnaTalkStatus__9daAlink_cFUc(daAlink_c* this_, u8 status); +extern "C" void set3DStatus__9daAlink_cFUcUc(daAlink_c* this_, u8 status, u8 direction); +extern "C" void offSetFlg__16daAlink_matAnm_cFv(daAlink_matAnm_c*); +extern "C" u32 checkModeFlg__9daAlink_cCFUl(daAlink_c* this_, u32); +extern "C" u8 getShieldChangeWaitTimer__9daAlink_cCFv(daAlink_c* this_); +extern "C" u8 getClothesChangeWaitTimer__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkHorseStart__9daAlink_cFv(daAlink_c* this_); +extern "C" BOOL checkCutTurnCharge__9daAlink_cCFv(daAlink_c* this_); +extern "C" bool checkAcceptDungeonWarpAlink__9daAlink_cFi(daAlink_c* this_); +extern "C" daSpinner_c* getSpinnerActor__9daAlink_cFv(daAlink_c* this_); +extern "C" s16 getSumouCounter__9daAlink_cCFv(daAlink_c* this_); +extern "C" s16 checkSumouWithstand__9daAlink_cCFv(daAlink_c* this_); +extern "C" void setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs(daAlink_c* this_, fopAc_ac_c* param_0, u16 pMsgNum); +extern "C" MtxP getModelMtx__9daAlink_cFv(daAlink_c* this_); +extern "C" MtxP getInvMtx__9daAlink_cFv(daAlink_c* this_); +extern "C" MtxP getLinkBackBone1Matrix__9daAlink_cFv(daAlink_c* this_); +extern "C" MtxP getWolfMouthMatrix__9daAlink_cFv(daAlink_c* this_); +extern "C" MtxP getWolfBackbone2Matrix__9daAlink_cFv(daAlink_c* this_); +extern "C" MtxP getBottleMtx__9daAlink_cFv(daAlink_c* this_); +extern "C" MtxP getHeadMtx__9daAlink_cFv(daAlink_c* this_); +extern "C" f32 getGroundY__9daAlink_cFv(daAlink_c* this_); +extern "C" f32 getBaseAnimeFrameRate__9daAlink_cCFv(daAlink_c* this_); +extern "C" s32 getAtnActorID__9daAlink_cCFv(daAlink_c* this_); +extern "C" s32 getItemID__9daAlink_cCFv(daAlink_c* this_); +extern "C" s32 getGrabActorID__9daAlink_cCFv(daAlink_c* this_); +extern "C" void setForcePutPos__9daAlink_cFRC4cXyz(daAlink_c* this_, cXyz const& pPutPos); +extern "C" u32 checkPlayerFly__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkFrontRoll__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfDash__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkAutoJump__9daAlink_cCFv(daAlink_c* this_); +extern "C" bool checkSideStep__9daAlink_cCFv(daAlink_c* this_); +extern "C" bool checkWolfTriggerJump__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkGuardBreakMode__9daAlink_cCFv(daAlink_c* this_); +extern "C" bool checkLv3Slide__9daAlink_cCFv(daAlink_c* this_); +extern "C" bool checkWolfHowlDemoMode__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkElecDamage__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkEmptyBottleSwing__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkBottleSwingMode__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkHawkWait__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkGoatThrow__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkGoatThrowAfter__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfTagLockJump__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfTagLockJumpLand__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfRopeHang__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkRollJump__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkGoronRideWait__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfChain__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfWait__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfJumpAttack__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfRSit__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkBottleDrinkEnd__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfDig__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkCutCharge__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkCutLargeJumpCharge__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkComboCutTurn__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkClimbMove__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkGrassWhistle__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkBoarRun__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkHorseRideNotReady__9daAlink_cCFv(daAlink_c* this_); +extern "C" f32 getSearchBallScale__9daAlink_cCFv(daAlink_c* this_); +extern "C" s16 checkFastShotTime__9daAlink_cFv(daAlink_c* this_); +extern "C" BOOL checkCutJumpCancelTurn__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkSingleBoarBattleSecondBowReady__9daAlink_cCFv(daAlink_c* this_); +extern "C" void cancelDungeonWarpReadyNeck__9daAlink_cFv(daAlink_c* this_); +extern "C" void onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c(daAlink_c* this_, u8 exitID, u8 exitDirection, fopAc_ac_c* scexAc); +extern "C" void onSceneChangeDead__9daAlink_cFUci(daAlink_c* this_, u8 param_0, int param_1); +extern "C" bool checkNoEquipItem__9daAlink_cCFv(daAlink_c* this_); +extern "C" s16 getBoardCutTurnOffsetAngleY__9daAlink_cCFv(daAlink_c* this_); +extern "C" cXyz* getMagneBootsTopVec__9daAlink_cFv(daAlink_c* this_); +extern "C" void setCargoCarry__9daAlink_cFP10fopAc_ac_c(daAlink_c* this_, fopAc_ac_c* p_actor); +extern "C" void setGoronSideMove__9daAlink_cFP10fopAc_ac_c(daAlink_c* this_, fopAc_ac_c* p_actor); +extern "C" void setSumouReady__9daAlink_cFP10fopAc_ac_c(daAlink_c* this_, fopAc_ac_c* p_actor); +extern "C" void setSumouPushBackDirection__9daAlink_cFs(daAlink_c* this_, s16 param_0); +extern "C" void setSumouLoseHeadUp__9daAlink_cFv(daAlink_c* this_); +extern "C" bool checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c(daAlink_c* this_, const fopAc_ac_c* p_actor); +extern "C" bool checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c(daAlink_c* this_, const fopAc_ac_c* p_actor); +extern "C" void setWolfEnemyHangBiteAngle__9daAlink_cFs(daAlink_c* this_, s16 angle); +extern "C" void setSumouGraspCancelCount__9daAlink_cFi(daAlink_c* this_, int param_0); +extern "C" bool checkItemSwordEquip__9daAlink_cCFv(daAlink_c* this_); +extern "C" f32 getSinkShapeOffset__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkSinkDead__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkCutJumpMode__9daAlink_cCFv(daAlink_c* this_); +extern "C" s16 getGiantPuzzleAimAngle__9daAlink_cCFv(daAlink_c* this_); +extern "C" u8 getSwordChangeWaitTimer__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkMetamorphose__9daAlink_cCFv(daAlink_c* this_); +extern "C" BOOL checkWolfDownAttackPullOut__9daAlink_cCFv(daAlink_c* this_); extern "C" void getMidnaAtnPos__9daAlink_cCFv(); -extern "C" void checkCopyRodEquip__9daAlink_cCFv(); -extern "C" void checkCanoeFishingGetLeft__9daAlink_cCFv(); -extern "C" void checkCanoeFishingGetRight__9daAlink_cCFv(); -extern "C" void checkBeeChildDrink__9daAlink_cCFv(); -extern "C" void getWolfHowlMgrP__9daAlink_cFv(); -extern "C" void checkWolfHowlSuccessAnime__9daAlink_cCFv(); -extern "C" void checkOctaIealHang__9daAlink_cCFv(); -extern "C" void cancelOctaIealHang__9daAlink_cFv(); -extern "C" void cancelDragonHangBackJump__9daAlink_cFv(); -extern "C" void setOctaIealWildHang__9daAlink_cFv(); -extern "C" void checkDragonHangRide__9daAlink_cCFv(); -extern "C" void playerStartCollisionSE__9daAlink_cFUlUl(); +extern "C" bool checkCopyRodEquip__9daAlink_cCFv(daAlink_c* this_); +extern "C" bool checkCanoeFishingGetLeft__9daAlink_cCFv(daAlink_c* this_); +extern "C" bool checkCanoeFishingGetRight__9daAlink_cCFv(daAlink_c* this_); +extern "C" u8 checkBeeChildDrink__9daAlink_cCFv(daAlink_c* this_); +extern "C" Z2WolfHowlMgr* getWolfHowlMgrP__9daAlink_cFv(daAlink_c* this_); +extern "C" BOOL checkWolfHowlSuccessAnime__9daAlink_cCFv(daAlink_c* this_); +extern "C" bool checkOctaIealHang__9daAlink_cCFv(daAlink_c* this_); +extern "C" void cancelOctaIealHang__9daAlink_cFv(daAlink_c* this_); +extern "C" void cancelDragonHangBackJump__9daAlink_cFv(daAlink_c* this_); +extern "C" void setOctaIealWildHang__9daAlink_cFv(daAlink_c* this_); +extern "C" bool checkDragonHangRide__9daAlink_cCFv(daAlink_c* this_); +extern "C" void playerStartCollisionSE__9daAlink_cFUlUl(daAlink_c* this_, u32 param_0, u32 param_1); extern "C" void __dt__16daAlink_matAnm_cFv(); extern "C" void __dt__12dBgS_ObjAcchFv(); extern "C" void __dt__Q29daAlink_c14hsChainShape_cFv(); @@ -2011,50 +2011,50 @@ extern "C" void __ct__8dCcD_CpsFv(); extern "C" void __ct__8dCcD_CylFv(); extern "C" void __dt__9cCcD_SttsFv(); extern "C" void __ct__16daPy_actorKeep_cFv(); -extern "C" void onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2(); +extern "C" void onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2(daPy_py_c* this_, daPy_py_c::daPy_FLG2 pFlag); extern "C" void offNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0(); extern "C" static void mDoAud_seStartLevel__FUlPC3VecUlSc(); extern "C" void checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2(); -extern "C" static void dComIfGp_setBottleStatus__FUcUc(); +extern "C" static void dComIfGp_setBottleStatus__FUcUc(u8 param_0, u8 param_1); extern "C" void getSumouMode__9daPy_py_cCFv(); extern "C" void checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3(); extern "C" void onCondition__11dEvt_info_cFUs(); extern "C" void __ct__8cM3dGPlaFv(); extern "C" void offCondition__11dEvt_info_cFUs(); -extern "C" void checkShieldGet__9daPy_py_cFv(); -extern "C" static void fopAcM_onSwitch__FPC10fopAc_ac_ci(); -extern "C" void dComIfGs_isItemFirstBit__FUc(u8); +extern "C" BOOL checkShieldGet__9daPy_py_cFv(); +extern "C" static void fopAcM_onSwitch__FPC10fopAc_ac_ci(fopAc_ac_c const* param_0, int param_1); +extern "C" int dComIfGs_isItemFirstBit__FUc(u8); extern "C" static void dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class(); extern "C" static void dComIfGp_getStage__Fv(); -extern "C" void checkEquipHeavyBoots__9daPy_py_cCFv(); +extern "C" u32 checkEquipHeavyBoots__9daPy_py_cCFv(daPy_py_c* this_); extern "C" void fopAcM_GetName__FPv(); -extern "C" void onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0(); +extern "C" void onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0(daPy_py_c* this_, daPy_py_c::daPy_FLG0 pFlag); extern "C" void isOrderOK__14dEvt_control_cFv(); -extern "C" static void dComIfGp_getEvent__Fv(); -extern "C" static void dComIfGp_checkPlayerStatus0__FiUl(); -extern "C" static void dComIfGp_checkPlayerStatus1__FiUl(); -extern "C" void checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1(); -extern "C" static void dComIfGp_getEventManager__Fv(); +extern "C" static dEvt_control_c& dComIfGp_getEvent__Fv(); +extern "C" static u32 dComIfGp_checkPlayerStatus0__FiUl(int param_0, u32 param_1); +extern "C" static u32 dComIfGp_checkPlayerStatus1__FiUl(int param_0, u32 param_1); +extern "C" u32 checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1(daPy_py_c* this_, daPy_py_c::daPy_ERFLG1 pFlag); +extern "C" static dEvent_manager_c& dComIfGp_getEventManager__Fv(); extern "C" void offNoResetFlg1__9daPy_py_cFQ29daPy_py_c9daPy_FLG1(); extern "C" void offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2(); -extern "C" void setSpecialDemoType__11daPy_demo_cFv(); +extern "C" void setSpecialDemoType__11daPy_demo_cFv(daPy_demo_c* this_); extern "C" void checkCommandCatch__11dEvt_info_cFv(); -extern "C" void dComIfGs_isEventBit__FUs(); -extern "C" void checkWolf__9daPy_py_cCFv(); -extern "C" void checkSwordGet__9daPy_py_cFv(); -extern "C" void checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0(); -extern "C" void ChkGroundHit__9dBgS_AcchCFv(); -extern "C" void checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0(); -extern "C" static void dComIfGp_getPlayerCameraID__Fi(); -extern "C" static void dComIfGp_event_chkEventFlag__FUs(); -extern "C" void checkCommandDoor__11dEvt_info_cFv(); -extern "C" static void dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci(); -extern "C" static void dComIfGp_event_runCheck__Fv(); -extern "C" void checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2(); -extern "C" void checkMagneBootsOn__9daPy_py_cCFv(); -extern "C" void dComIfGp_getHorseActor__Fv(); -extern "C" void checkBoarSingleBattle__9daPy_py_cCFv(); -extern "C" void checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0(); +extern "C" BOOL dComIfGs_isEventBit__FUs(u16); +extern "C" u32 checkWolf__9daPy_py_cCFv(daPy_py_c* this_); +extern "C" BOOL checkSwordGet__9daPy_py_cFv(); +extern "C" u32 checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0(daPy_py_c* this_, daPy_py_c::daPy_RFLG0 pFlag); +extern "C" bool ChkGroundHit__9dBgS_AcchCFv(dBgS_Acch* this_); +extern "C" u32 checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0(daPy_py_c* this_, daPy_py_c::daPy_FLG0 pFlag); +extern "C" static int dComIfGp_getPlayerCameraID__Fi(int param_0); +extern "C" static u16 dComIfGp_event_chkEventFlag__FUs(u16 flag); +extern "C" BOOL checkCommandDoor__11dEvt_info_cFv(dEvt_info_c* this_); +extern "C" static s32 dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci(char const* param_0, fopAc_ac_c* param_1, int param_2); +extern "C" static BOOL dComIfGp_event_runCheck__Fv(); +extern "C" u32 checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2(daPy_py_c* this_, daPy_py_c::daPy_FLG2 pFlag); +extern "C" u32 checkMagneBootsOn__9daPy_py_cCFv(daPy_py_c* this_); +extern "C" daHorse_c* dComIfGp_getHorseActor__Fv(); +extern "C" u32 checkBoarSingleBattle__9daPy_py_cCFv(daPy_py_c* this_); +extern "C" u32 checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0(daPy_py_c* this_, daPy_py_c::daPy_ERFLG0 pFlag); extern "C" bool getMidnaAtnPos__9daPy_py_cCFv(); extern "C" void setMidnaMsgNum__9daPy_py_cFP10fopAc_ac_cUs(); extern "C" void getModelMtx__9daPy_py_cFv(); @@ -2105,8 +2105,8 @@ extern "C" bool checkGrassWhistle__9daPy_py_cCFv(); extern "C" bool checkBoarRun__9daPy_py_cCFv(); extern "C" bool checkFmChainPut__9daPy_py_cCFv(); extern "C" bool checkHorseElecDamage__9daPy_py_cCFv(); -extern "C" void getBaseAnimeFrameRate__9daPy_py_cCFv(); -extern "C" void getBaseAnimeFrame__9daPy_py_cCFv(); +extern "C" f32 getBaseAnimeFrameRate__9daPy_py_cCFv(); +extern "C" f32 getBaseAnimeFrame__9daPy_py_cCFv(); extern "C" void setAnimeFrame__9daPy_py_cFf(); extern "C" bool checkWolfLock__9daPy_py_cCFP10fopAc_ac_c(); extern "C" bool cancelWolfLock__9daPy_py_cFP10fopAc_ac_c(); @@ -2146,14 +2146,14 @@ extern "C" void onSceneChangeDead__9daPy_py_cFUci(); extern "C" bool getSpinnerActor__9daPy_py_cFv(); extern "C" bool checkHorseRideNotReady__9daPy_py_cCFv(); extern "C" bool checkArrowChargeEnd__9daPy_py_cCFv(); -extern "C" void getSearchBallScale__9daPy_py_cCFv(); +extern "C" f32 getSearchBallScale__9daPy_py_cCFv(); extern "C" bool checkFastShotTime__9daPy_py_cFv(); extern "C" bool checkNoEquipItem__9daPy_py_cCFv(); extern "C" bool checkFireMaterial__9daPy_py_cCFv(); extern "C" bool checkKandelaarSwing__9daPy_py_cCFi(); extern "C" bool getBoardCutTurnOffsetAngleY__9daPy_py_cCFv(); -extern "C" void getMagneHitPos__9daPy_py_cFv(); -extern "C" void getMagneBootsTopVec__9daPy_py_cFv(); +extern "C" cXyz* getMagneHitPos__9daPy_py_cFv(daPy_py_c* this_); +extern "C" cXyz* getMagneBootsTopVec__9daPy_py_cFv(daPy_py_c* this_); extern "C" bool checkUseKandelaar__9daPy_py_cFi(); extern "C" void setDkCaught__9daPy_py_cFP10fopAc_ac_c(); extern "C" void onPressedDamage__9daPy_py_cFRC4cXyzs(); @@ -2202,7 +2202,7 @@ extern "C" bool checkWolfDownAttackPullOut__9daPy_py_cCFv(); extern "C" bool checkBootsOrArmorHeavy__9daPy_py_cCFv(); extern "C" s32 getBottleOpenAppearItem__9daPy_py_cCFv(); extern "C" bool checkItemSwordEquip__9daPy_py_cCFv(); -extern "C" void getSinkShapeOffset__9daPy_py_cCFv(); +extern "C" f32 getSinkShapeOffset__9daPy_py_cCFv(); extern "C" bool checkSinkDead__9daPy_py_cCFv(); extern "C" bool checkHorseStart__9daPy_py_cFv(); extern "C" bool getWolfHowlMgrP__9daPy_py_cFv(); @@ -2211,11 +2211,11 @@ extern "C" bool checkCopyRodTopUse__9daPy_py_cFv(); extern "C" bool checkCopyRodEquip__9daPy_py_cCFv(); extern "C" bool checkCutJumpMode__9daPy_py_cCFv(); extern "C" void getZeldaActor__9daHorse_cFv(); -extern "C" static void dComIfGp_getDoStatus__Fv(); +extern "C" static u8 dComIfGp_getDoStatus__Fv(); extern "C" void __ct__4cXyzFfff(f32, f32, f32); extern "C" static void dMeter2Info_offUseButton__Fi(); -extern "C" void setLinkState__14Z2CreatureLinkFUc(); -extern "C" void dComIfGs_getRupee__Fv(); +extern "C" void setLinkState__14Z2CreatureLinkFUc(Z2CreatureLink* this_, u8 param_0); +extern "C" u16 dComIfGs_getRupee__Fv(); extern "C" void dComIfGp_setItemRupeeCount__Fl(s32); extern "C" static void dMeter2Info_setFloatingMessage__FUssb(); extern "C" void onForcePanic__9daMidna_cFv(); @@ -2226,7 +2226,7 @@ extern "C" void onNoServiceWait__9daMidna_cFv(); extern "C" void setControllActorData__8daCrod_cFv(); extern "C" void func_80141ACC(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e, daObjMovebox::Act_c::Prm_e); -extern "C" int func_80141AE8(u8*); +extern "C" u8 func_80141AE8(u8*); extern "C" void __sinit_d_a_alink_cpp(); extern "C" static void func_801446D4(); extern "C" static void func_801446DC(); @@ -3309,7 +3309,7 @@ bool daAlink_c::modelCallBack(int i_jointNo) { if (i_jointNo == 0) { setUpperFront(); } else if (i_jointNo == 26) { - if (!i_getSumouMode()) { + if (!getSumouMode()) { setFootMatrix(); } setArmMatrix(); @@ -4507,13 +4507,13 @@ asm void daAlink_c::setHairAngle(cXyz* param_0, f32 param_1, f32 param_2) { /* 800A0744-800A07D8 09B084 0094+00 0/0 1/1 0/0 .text setLookPosFromOut__9daAlink_cFP4cXyz */ void daAlink_c::setLookPosFromOut(cXyz* p_pos) { - if (i_checkEndResetFlg0(ERFLG0_UNK_4)) { + if (checkEndResetFlg0(ERFLG0_UNK_4)) { if (current.pos.abs2(mLookPosFromOut) < current.pos.abs2(*p_pos)) { return; } } - i_onEndResetFlg0(ERFLG0_UNK_4); + onEndResetFlg0(ERFLG0_UNK_4); mLookPosFromOut = *p_pos; } @@ -4528,12 +4528,12 @@ COMPILER_STRIP_GATE(0x8038D658, &lit_3757); /* 800A07D8-800A0868 09B118 0090+00 2/2 0/0 0/0 .text checkAttentionPosAngle__9daAlink_cFP4cXyz */ bool daAlink_c::checkAttentionPosAngle(cXyz* param_0) { - if (i_checkNoResetFlg1(FLG1_UNK_4)) { + if (checkNoResetFlg1(FLG1_UNK_4)) { return true; } int tmp; - if (i_checkModeFlg(MODE_RIDING) || i_checkEndResetFlg0(ERFLG0_UNK_400)) { + if (checkModeFlg(MODE_RIDING) || checkEndResetFlg0(ERFLG0_UNK_400)) { tmp = daAlinkHIO_horse_c0::m.mSearchRangeAngle; } else { tmp = 0x6000; @@ -6415,9 +6415,9 @@ asm void daAlink_c::handBgCheck() { /* 800A3C8C-800A3CE4 09E5CC 0058+00 11/11 0/0 0/0 .text setItemHeap__9daAlink_cFv */ JKRHeap* daAlink_c::setItemHeap() { - if (!i_checkResetFlg0(RFLG0_UNK_4000)) { + if (!checkResetFlg0(RFLG0_UNK_4000)) { field_0x2fa0 ^= 1; - i_onResetFlg0(RFLG0_UNK_4000); + onResetFlg0(RFLG0_UNK_4000); } return mItemHeap[field_0x2fa0].setAnimeHeap(); @@ -12510,7 +12510,7 @@ BOOL daPy_py_c::i_checkSwordGet() { /* 800A4910-800A4BC8 09F250 02B8+00 5/5 0/0 0/0 .text setSelectEquipItem__9daAlink_cFi */ void daAlink_c::setSelectEquipItem(int param_0) { - if (!i_checkWolf()) { + if (!checkWolf()) { J3DModel* temp = mSwordModel; if (checkWoodSwordEquip()) { @@ -12527,7 +12527,7 @@ void daAlink_c::setSelectEquipItem(int param_0) { mSheathModel = mpSwASheathModel; } - if (!i_checkSwordGet() || checkWoodSwordEquip() || i_checkNoResetFlg3(FLG3_UNK_1000000)) { + if (!i_checkSwordGet() || checkWoodSwordEquip() || checkNoResetFlg3(FLG3_UNK_1000000)) { if (field_0x06ec != NULL) { field_0x06ec->hide(); } @@ -12538,7 +12538,7 @@ void daAlink_c::setSelectEquipItem(int param_0) { } if (mClothesChangeWaitTimer == 0 && - (temp != mSwordModel || i_checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW))) + (temp != mSwordModel || checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW))) { if (temp != mSwordModel) { mSwordChangeWaitTimer = 5; @@ -12568,7 +12568,7 @@ void daAlink_c::setSelectEquipItem(int param_0) { if (checkZoraWearAbility()) { if (checkZoraWearMaskDraw()) { field_0x06f0->show(); - if (!i_checkEquipHeavyBoots()) { + if (!checkEquipHeavyBoots()) { field_0x06e4->show(); } } else { @@ -12634,7 +12634,7 @@ void daAlink_c::playerInit() { mAnmHeap3.setBufferSize(0x20000); mAnmHeap3.createHeap(daPy_anmHeap_c::HEAP_TYPE_4); - if (i_checkWolf()) { + if (checkWolf()) { changeWolf(); } else { changeLink(0); @@ -12732,7 +12732,7 @@ void daAlink_c::playerInit() { field_0x3184 = -1; mExitID = 0x3F; - i_onNoResetFlg0(FLG0_UNK_100); + onNoResetFlg0(FLG0_UNK_100); offOxygenTimer(); int startMode = getStartMode(); @@ -12811,7 +12811,7 @@ void daAlink_c::playerInit() { setSelectEquipItem(0); if (checkStageName("D_MN08") || checkStageName("D_MN08B") || checkStageName("D_MN08C")) { - i_onNoResetFlg3(FLG3_UNK_40000000); + onNoResetFlg3(FLG3_UNK_40000000); } } @@ -12887,7 +12887,7 @@ int daAlink_c::create() { if (!bgWaitFlg) { // Event Flag: Finished Sewers - if (checkCasualWearFlg() && i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { + if (checkCasualWearFlg() && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { dComIfGs_setSelectEquipClothes(WEAR_KOKIRI); } @@ -12911,7 +12911,7 @@ int daAlink_c::create() { 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); + onNoResetFlg1(FLG1_IS_WOLF); } else if (horseStart) { attention_info.position.y = current.pos.y + 150.0f; } else { @@ -12919,11 +12919,11 @@ int daAlink_c::create() { } attention_info.flags = -1; - if (!i_dComIfGp_getEventManager().dataLoaded()) { + if (!dComIfGp_getEventManager().dataLoaded()) { return cPhs_INIT_e; } - setArcName(i_checkWolf()); + setArcName(checkWolf()); setOriginalHeap(&field_0x0638, 0xA2800); if (dComIfG_resLoad(&mPhaseReq, mArcName, field_0x0638) != cPhs_COMPLEATE_e) { return cPhs_INIT_e; @@ -12940,7 +12940,7 @@ int daAlink_c::create() { } mAttention = &dComIfGp_getAttention(); - field_0x317c = i_dComIfGp_getPlayerCameraID(0); + field_0x317c = dComIfGp_getPlayerCameraID(0); playerInit(); bgWaitFlg = 1; @@ -12970,13 +12970,13 @@ int daAlink_c::create() { (!mLinkAcch.ChkWaterHit() || mLinkAcch.m_wtr.GetHeight() < current.pos.y)) || ((checkCarryStartLightBallA() || checkCarryStartLightBallB()) && !fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchLightBall, NULL)) || - (horseStart && i_dComIfGp_getHorseActor() == NULL)) + (horseStart && dComIfGp_getHorseActor() == NULL)) { return cPhs_INIT_e; } if (var_r24) { - i_dComIfGp_getEvent().setPtD(var_r24); + dComIfGp_getEvent().setPtD(var_r24); } bgWaitFlg = 0; @@ -12991,11 +12991,11 @@ int daAlink_c::create() { if (checkStageName("F_SP102") && fopAcM_GetRoomNo(this) == 0 && dComIfG_play_c::getLayerNo(0) == 4) { - i_onNoResetFlg2(FLG2_UNK_800000); + onNoResetFlg2(FLG2_UNK_800000); } else if (checkStageName("F_SP123") && fopAcM_GetRoomNo(this) == 13 && dComIfG_play_c::getLayerNo(0) == 0) { - i_onNoResetFlg2(FLG2_UNK_1000000); + onNoResetFlg2(FLG2_UNK_1000000); } J3DAnmTransform* at1; @@ -13016,7 +13016,7 @@ int daAlink_c::create() { mpLinkModel->calc(); playFaceTextureAnime(); - if (!i_checkWolf()) { + if (!checkWolf()) { setItemMatrix(0); } else { setWolfItemMatrix(); @@ -13030,14 +13030,14 @@ int daAlink_c::create() { setAttentionPos(); setItemActor(); - if (dComIfGs_getLastSceneMode() & 0x400000 && !i_checkWolf() && !checkNotHeavyBootsStage() && + if (dComIfGs_getLastSceneMode() & 0x400000 && !checkWolf() && !checkNotHeavyBootsStage() && !horseStart && !enteringCity) { setHeavyBoots(1); } if (dComIfGs_getLastSceneMode() & 0x200000 && !checkCloudSea()) { - i_onNoResetFlg2(1); + onNoResetFlg2(1); mZ2Link.setKanteraState(2); } @@ -13053,13 +13053,13 @@ int daAlink_c::create() { daTagMhint_c::createPortalWarpMissTag(fopAcM_GetID(this), fopAcM_GetRoomNo(this)); } - if (i_dStage_stagInfo_GetSaveTbl(i_dComIfGp_getStage()->getStagInfo()) == 0x11) { - if (!i_dComIfGs_isItemFirstBit(HYLIA_SHIELD) && !i_dComIfGs_isItemFirstBit(SHIELD) && - !i_dComIfGs_isItemFirstBit(WOOD_SHIELD)) + if (i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) == 0x11) { + if (!dComIfGs_isItemFirstBit(HYLIA_SHIELD) && !dComIfGs_isItemFirstBit(SHIELD) && + !dComIfGs_isItemFirstBit(WOOD_SHIELD)) { - i_fopAcM_onSwitch(this, 0x6F); + fopAcM_onSwitch(this, 0x6F); } else { - i_fopAcM_offSwitch(this, 0x6F); + fopAcM_offSwitch(this, 0x6F); } } @@ -13105,7 +13105,7 @@ s32 daAlink_c::setRoomInfo() { field_0x2fbb = dComIfG_Bgsp().GetPolyAtt0(mLinkAcch.m_gnd); field_0x2fa8 = dComIfG_Bgsp().GetSpecialCode(mLinkAcch.m_gnd); - if (field_0x2fa8 == 6 && i_checkWolf()) { + if (field_0x2fa8 == 6 && checkWolf()) { field_0x2fa8 = 5; } @@ -13113,7 +13113,7 @@ s32 daAlink_c::setRoomInfo() { if (field_0x2fbb == 3) { field_0x2fbd = dComIfG_Bgsp().GetPolyAtt1(mLinkAcch.m_gnd); - if (field_0x2fbd == 4 && i_checkWolf()) { + if (field_0x2fbd == 4 && checkWolf()) { field_0x2fbd = 0; } @@ -13350,7 +13350,7 @@ int daAlink_c::setRollJump(f32 param_0, f32 param_1, s16 param_2) { field_0x3410 = param_0; field_0x3414 = param_1; field_0x30ee = param_2; - i_onEndResetFlg0(ERFLG0_UNK_100); + onEndResetFlg0(ERFLG0_UNK_100); return 1; } @@ -13666,7 +13666,7 @@ void daAlink_c::setSwordAtCollision(int param_0) { if (checkCutDashAnime() && (checkCutDashEnemyHit(mAtCps[0]) || checkCutDashEnemyHit(mAtCps[1]) || checkCutDashEnemyHit(mAtCps[2]))) { - i_onNoResetFlg1(FLG1_UNK_4000000); + onNoResetFlg1(FLG1_UNK_4000000); } if (mProcID == PROC_CUT_FINISH_JUMP_UP) { @@ -13721,9 +13721,9 @@ void daAlink_c::setSwordAtCollision(int param_0) { /* 800AA5E8-800AA6B4 0A4F28 00CC+00 4/4 0/0 0/0 .text checkNoCollisionCorret__9daAlink_cFv */ BOOL daAlink_c::checkNoCollisionCorret() { - if (i_checkModeFlg(0x12800) || mDemo.getDemoType() == 1 || mProcID == PROC_DOOR_OPEN || + if (checkModeFlg(0x12800) || mDemo.getDemoType() == 1 || mProcID == PROC_DOOR_OPEN || (checkEventRun() && - (!strcmp(i_dComIfGp_getEventManager().getRunEventName(), "SCENE_EXIT") || + (!strcmp(dComIfGp_getEventManager().getRunEventName(), "SCENE_EXIT") || (fopAcM_getTalkEventPartner(this) && fopAcM_getTalkEventPartner(this) == getMidnaActor()))) || eventInfo.i_checkCommandDoor()) @@ -13747,7 +13747,7 @@ void daAlink_c::decSwordBlur() { /* 800AA714-800AA7EC 0A5054 00D8+00 2/2 0/0 0/0 .text resetWolfAtCollision__9daAlink_cFv */ void daAlink_c::resetWolfAtCollision() { - if (i_checkNoResetFlg0(FLG0_UNK_40)) { + if (checkNoResetFlg0(FLG0_UNK_40)) { if (!setSwordHitVibration(&mAtCyl) && !setSwordHitVibration(&field_0x850[0]) && !setSwordHitVibration(&field_0x850[1])) { @@ -13756,7 +13756,7 @@ void daAlink_c::resetWolfAtCollision() { field_0xFB8.OffTgWolfSpNoDamage(); mAtCyl.ResetAtHit(); - i_offNoResetFlg0(FLG0_UNK_40); + offNoResetFlg0(FLG0_UNK_40); dCcD_Cyl* cyl = field_0x850; for (int i = 0; i < 3; i++) { @@ -13772,7 +13772,7 @@ void daAlink_c::resetWolfAtCollision() { void daAlink_c::setWolfAtCollision() { cXyz sp8; - if (i_checkResetFlg0(RFLG0_UNK_2)) { + if (checkResetFlg0(RFLG0_UNK_2)) { if (!setSwordHitVibration(&mAtCyl) && !setSwordHitVibration(&field_0x850[0]) && !setSwordHitVibration(&field_0x850[1])) { @@ -13788,7 +13788,7 @@ void daAlink_c::setWolfAtCollision() { sp8.set(current.pos.x + field_0x3438 * cM_ssin(shape_angle.y), current.pos.y, current.pos.z + field_0x3438 * cM_scos(shape_angle.y)); - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { mAtCyl.StartCAt(sp8); if (mProcID == PROC_WOLF_LOCK_ATTACK || mProcID == PROC_WOLF_JUMP_ATTACK) { @@ -13812,7 +13812,7 @@ void daAlink_c::setWolfAtCollision() { g_dComIfG_gameInfo.play.mCcs.SetMass(&mAtCyl, 1); } - i_onNoResetFlg0(FLG0_UNK_40); + onNoResetFlg0(FLG0_UNK_40); } else { resetWolfAtCollision(); } @@ -13820,14 +13820,14 @@ void daAlink_c::setWolfAtCollision() { /* 800AA9DC-800AAABC 0A531C 00E0+00 3/3 0/0 0/0 .text resetAtCollision__9daAlink_cFi */ void daAlink_c::resetAtCollision(int param_0) { - if (i_checkNoResetFlg0(FLG0_UNK_40)) { + if (checkNoResetFlg0(FLG0_UNK_40)) { if (param_0 && !setSwordHitVibration(&mAtCps[0]) && !setSwordHitVibration(&mAtCps[1]) && !setSwordHitVibration(&mAtCps[2]) && !setSwordHitVibration(&mAtCyl)) { setSwordHitVibration(&field_0xFB8); } - i_offNoResetFlg0(FLG0_UNK_40); + offNoResetFlg0(FLG0_UNK_40); for (int i = 0; i < 3; i++) { mAtCps[i].ResetAtHit(); @@ -13896,7 +13896,7 @@ void daAlink_c::cancelLockAt() { /* 800ABB84-800ABDB8 0A64C4 0234+00 1/1 0/0 0/0 .text setCollisionPos__9daAlink_cFv */ void daAlink_c::setCollisionPos() { cXyz sp74; - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(0), &sp74); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(0), &sp74); cXyz sp68 = (sp74 + mHeadTopPos) * lit_5943; f32 var_f31; @@ -13966,7 +13966,7 @@ void daAlink_c::setCollision() { dCcD_Cyl* var_r31 = field_0x850; if (checkIronBallWaitAnime() || - (checkPlayerGuardAndAttack() && !i_checkEndResetFlg1(ERFLG1_UNK_20))) + (checkPlayerGuardAndAttack() && !checkEndResetFlg1(ERFLG1_UNK_20))) { BOOL var_r27; if (field_0x3114 >= 0x3000 && field_0x3114 <= 0x5000) { @@ -13997,7 +13997,7 @@ void daAlink_c::setCollision() { var_r31->OffTgShield(); var_r31->OffTgSpShield(); - if (i_checkWolf()) { + if (checkWolf()) { var_r31->OffTgShieldFrontRange(); } else { var_r31->OnTgShieldFrontRange(); @@ -14008,22 +14008,22 @@ void daAlink_c::setCollision() { } if (checkNoCollisionCorret() && !checkOctaIealSpecialCollect()) { - i_onNoResetFlg3(FLG3_UNK_20000000); + onNoResetFlg3(FLG3_UNK_20000000); } - if (i_checkWolf()) { + if (checkWolf()) { setWolfCollisionPos(); } else { setCollisionPos(); } - if (mDamageTimer != 0 || i_checkModeFlg(8)) { + if (mDamageTimer != 0 || checkModeFlg(8)) { for (int i = 0; i < 3; i++) { field_0x850[i].OffTgSetBit(); field_0x850[i].ResetTgHit(); } - if (i_checkWolf()) { + if (checkWolf()) { field_0xFB8.OffTgSetBit(); field_0xFB8.ResetTgHit(); } @@ -14032,7 +14032,7 @@ void daAlink_c::setCollision() { field_0x850[i].OnTgSetBit(); } - if (i_checkWolf()) { + if (checkWolf()) { field_0xFB8.OnTgSetBit(); } } @@ -14048,7 +14048,7 @@ void daAlink_c::setCollision() { g_dComIfG_gameInfo.play.mCcs.Set(&field_0x850[0]); g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0x850[0], 1); - if (i_checkWolf()) { + if (checkWolf()) { setWolfAtCollision(); for (int i = 0; i < 3; i++) { @@ -14056,7 +14056,7 @@ void daAlink_c::setCollision() { g_dComIfG_gameInfo.play.mCcs.SetMass(&field_0x850[i], 1); } - if (i_checkModeFlg(0x100000)) { + if (checkModeFlg(0x100000)) { field_0xFB8.OffCoSetBit(); field_0xFB8.ResetCoHit(); } else { @@ -14133,7 +14133,7 @@ void daAlink_c::setAnimeFrame(f32 frame) { * setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff */ void daAlink_c::setFrameCtrl(daPy_frameCtrl_c* i_ctrl, u8 i_attr, s16 i_start, s16 i_end, f32 i_rate, f32 i_frame) { - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { if (checkZoraWearAbility()) { i_rate *= daAlinkHIO_magneBoots_c0::m.mZoraWaterAnmSpeed; } else { @@ -14203,7 +14203,7 @@ int daAlink_c::getUnderUpperAnime(daAlink_c::daAlink_ANM i_anmID, J3DAnmTransfor s32 var_r31; const daAlink_BckData* bck_data = getMainBckData(i_anmID); - i_offNoResetFlg0(FLG0_UNK_2); + offNoResetFlg0(FLG0_UNK_2); *i_underBck = (J3DAnmTransform*)getAnimeResource(&mUnderAnmHeap[i_anmPackID], bck_data->m_underID, i_bufSize); @@ -14286,23 +14286,23 @@ int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB, int temp_r0 = getUnderUpperAnime(i_anmB, &under_bckB, &upper_bckB, 1, 0x2C00); if ((temp_r3 | temp_r0) != 0 && i_morf < 0.0f) { - if (i_anmA == ANM_WAIT_B && i_checkModeFlg(1)) { + if (i_anmA == ANM_WAIT_B && checkModeFlg(1)) { i_morf = daAlinkHIO_move_c0::m.mWaitBInterpolation; } else { i_morf = daAlinkHIO_basic_c0::m.mAnmBlendFactor; } - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { if (checkZoraWearAbility()) { i_morf *= (1.0f / daAlinkHIO_magneBoots_c0::m.mZoraWaterAnmSpeed); } else { i_morf *= (1.0f / daAlinkHIO_magneBoots_c0::m.mWaterStartWalkAnmRate); } } - } else if (i_anmA == ANM_WAIT_B && i_checkModeFlg(1) && i_morf > 0.0f) { + } else if (i_anmA == ANM_WAIT_B && checkModeFlg(1) && i_morf > 0.0f) { i_morf = daAlinkHIO_move_c0::m.mWaitBInterpolation; - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { if (checkZoraWearAbility()) { i_morf *= (1.0f / daAlinkHIO_magneBoots_c0::m.mZoraWaterAnmSpeed); } else { @@ -14319,7 +14319,7 @@ int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB, setHandIndex(i_anmA); - if (i_checkReinRide()) { + if (checkReinRide()) { if (checkRestHPAnime() && (checkUnderMove0BckNoArc(ANM_HORSE_WAIT) || checkUnderMove0BckNoArc(ANM_HORSE_WALK_A) || checkUnderMove0BckNoArc(ANM_HORSE_WALK_B))) @@ -14432,7 +14432,7 @@ void daAlink_c::allAnimePlay() { J3DAnmTransform* upper0_bck = getNowAnmPackUpper(UPPER_0); J3DAnmTransform* upper1_bck = getNowAnmPackUpper(UPPER_1); - if (i_checkWolf()) { + if (checkWolf()) { setWolfAnmVoice(); } @@ -14458,7 +14458,7 @@ void daAlink_c::allAnimePlay() { mpDemoHRTmpBck->play(); } - if (i_checkNoResetFlg1(FLG1_UNK_10)) { + if (checkNoResetFlg1(FLG1_UNK_10)) { if (field_0x069c != NULL && field_0x069c->getBlkAnm() != NULL) { simpleAnmPlay(field_0x069c->getBlkAnm()); } @@ -14633,7 +14633,7 @@ BOOL daAlink_c::checkAtnRightAnime() { f32 daAlink_c::getMoveGroundAngleSpeedRate() { s16 gnd_angle; - if (field_0x3174 == 8 || i_checkMagneBootsOn() || !mLinkAcch.ChkGroundHit()) { + if (field_0x3174 == 8 || checkMagneBootsOn() || !mLinkAcch.ChkGroundHit()) { gnd_angle = 0; } else { gnd_angle = getGroundAngle(&mLinkAcch.m_gnd, current.angle.y); @@ -14724,7 +14724,7 @@ void daAlink_c::setFaceBtk(u16 i_resID, int param_1, u16 i_arcNo) { J3DAnmTextureSRTKey* btk; if (arc_no != 0xFFFF) { btk = (J3DAnmTextureSRTKey*)mFaceBtkHeap.loadDataDemoRID(res_id, arc_no); - i_offNoResetFlg1(FLG1_UNK_2000); + offNoResetFlg1(FLG1_UNK_2000); } else if (var_r4 != 0) { btk = (J3DAnmTextureSRTKey*)mFaceBtkHeap.loadDataPriIdx(res_id); } else { @@ -14941,20 +14941,20 @@ void dBgS_RoofChk::SetPos(cXyz const& pos) { /* 800B1488-800B14B4 0ABDC8 002C+00 4/4 0/0 0/0 .text checkWaterPolygonUnder__9daAlink_cFv */ BOOL daAlink_c::checkWaterPolygonUnder() { - return i_checkModeFlg(MODE_SWIMMING) || current.pos.y < mWaterY; + return checkModeFlg(MODE_SWIMMING) || current.pos.y < mWaterY; } /* 800B14B4-800B154C 0ABDF4 0098+00 2/2 0/0 0/0 .text setWaterY__9daAlink_cFv */ void daAlink_c::setWaterY() { if (mLinkAcch.ChkWaterHit()) { - i_onNoResetFlg0(FLG0_UNK_80); + onNoResetFlg0(FLG0_UNK_80); field_0x2fbc = dComIfG_Bgsp().GetPolyAtt0(mLinkAcch.m_wtr); mWaterY = mLinkAcch.m_wtr.GetHeight(); if (field_0x2fbc != 6) { checkWaterInKandelaar(mWaterY); } } else { - i_offNoResetFlg0(FLG0_UNK_80); + offNoResetFlg0(FLG0_UNK_80); field_0x2fbc = 16; mWaterY = lit_9138; } @@ -14972,7 +14972,7 @@ asm void daAlink_c::setHangWaterY() { /* 800B172C-800B1770 0AC06C 0044+00 3/3 0/0 0/0 .text setSandDownBgCheckWallH__9daAlink_cFv */ void daAlink_c::setSandDownBgCheckWallH() { - if (!i_checkModeFlg(0x400)) { + if (!checkModeFlg(0x400)) { for (int i = 0; i < 3; i++) { field_0x18B0[i].SetWallH(field_0x2bac[i] + mSinkShapeOffset); } @@ -15064,8 +15064,8 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 i_angle, int param_2 current.pos = *p_pos; old.pos = current.pos; field_0x3798 = current.pos; - i_onEndResetFlg0(ERFLG0_UNK_800000); - i_onEndResetFlg2(ERFLG2_UNK_100); + onEndResetFlg0(ERFLG0_UNK_800000); + onEndResetFlg2(ERFLG2_UNK_100); if (mDemo.getDemoMode() != 0x59) { speed.y = FLOAT_LABEL(lit_6108); } @@ -15074,19 +15074,19 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 i_angle, int param_2 shape_angle.y = i_angle; current.angle.y = i_angle; field_0x2fe6 = shape_angle.y; - if ((mProcID == PROC_TALK || mProcID == PROC_TRADE_ITEM_OUT) && !i_checkWolf()) { + if ((mProcID == PROC_TALK || mProcID == PROC_TRADE_ITEM_OUT) && !checkWolf()) { if (field_0x3198 != 0) { field_0x37c8.x = current.pos.x; field_0x37c8.z = current.pos.z; } } - if (i_checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) { + if (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) { field_0x3118 = shape_angle.y; } if (checkHorseRide()) { - i_dComIfGp_getHorseActor()->i_setHorsePosAndAngle(¤t.pos, shape_angle.y); + dComIfGp_getHorseActor()->i_setHorsePosAndAngle(¤t.pos, shape_angle.y); } else if (checkSpinnerRide()) { fopAc_ac_c* rideAc = mRideAcKeep.getActor(); rideAc->current.pos = current.pos; @@ -15107,8 +15107,8 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, csXyz const* p_angle) { current.pos = *p_pos; old.pos = current.pos; field_0x3798 = current.pos; - i_onEndResetFlg0(ERFLG0_UNK_800000); - i_onEndResetFlg2(ERFLG2_UNK_100); + onEndResetFlg0(ERFLG0_UNK_800000); + onEndResetFlg2(ERFLG2_UNK_100); speed.y = FLOAT_LABEL(lit_6108); } @@ -15130,8 +15130,8 @@ void daAlink_c::setPlayerPosAndAngle(Mtx param_0) { current.pos.z = param_0[2][3]; old.pos = current.pos; field_0x3798 = current.pos; - i_onEndResetFlg0(ERFLG0_UNK_800000); - i_onEndResetFlg2(ERFLG2_UNK_100); + onEndResetFlg0(ERFLG0_UNK_800000); + onEndResetFlg2(ERFLG2_UNK_100); mDoMtx_MtxToRot(param_0, &shape_angle); current.angle.y = shape_angle.y; field_0x2fe6 = shape_angle.y; @@ -15216,7 +15216,7 @@ void daAlink_c::setStickData() { if (checkHorseRide()) { s16 angle = mDemo.getMoveAngle(); - i_dComIfGp_getHorseActor()->changeDemoMoveAngle(angle); + dComIfGp_getHorseActor()->changeDemoMoveAngle(angle); } } else { field_0x33a8 = 0.0f; @@ -15237,7 +15237,7 @@ void daAlink_c::setStickData() { field_0x33ac = 0.0f; mStickAngle = 0; dComIfGp_2dShowOff(); - i_onNoResetFlg2(FLG2_UNK_80); + onNoResetFlg2(FLG2_UNK_80); var_r31 = 1; field_0x2fe4 = shape_angle.y; } else { @@ -15266,7 +15266,7 @@ void daAlink_c::setStickData() { field_0x33ac = field_0x33a8; field_0x2fe2 = mStickAngle + dCam_getControledAngleY(dComIfGp_getCamera(field_0x317c)); - if (i_checkMagneBootsOn()) { + if (checkMagneBootsOn()) { if (field_0x2fb9 == 1 || (field_0x2fb9 == 0 && field_0x3114 != -0x8000 && field_0x3114 <= 0x6000)) { @@ -15331,9 +15331,9 @@ void daAlink_c::setStickData() { } if (checkHeavyStateOn(1, 1) && - (!checkBootsOrArmorHeavy() || !i_checkNoResetFlg0(FLG0_UNDERWATER))) + (!checkBootsOrArmorHeavy() || !checkNoResetFlg0(FLG0_UNDERWATER))) { - if (i_checkWolf() && checkHeavyStateOn(1, 0) && mSinkShapeOffset < -30.0f) { + if (checkWolf() && checkHeavyStateOn(1, 0) && mSinkShapeOffset < -30.0f) { mHeavySpeedMultiplier = daAlinkHIO_magneBoots_c0::m.mInputFactor * 0.4f; } else { mHeavySpeedMultiplier = daAlinkHIO_magneBoots_c0::m.mInputFactor; @@ -15346,10 +15346,10 @@ void daAlink_c::setStickData() { mHeavySpeedMultiplier = daAlinkHIO_magneBoots_c0::m.mWaterInputFactor; } field_0x33a8 *= mHeavySpeedMultiplier; - } else if ((i_checkWolf() && field_0x2fbc == 11 && checkWaterPolygonUnder()) || + } else if ((checkWolf() && field_0x2fbc == 11 && checkWaterPolygonUnder()) || field_0x2fbb == 11) { - i_onNoResetFlg0(FLG0_UNK_40000000); + onNoResetFlg0(FLG0_UNK_40000000); field_0x33a8 *= daAlinkHIO_wolf_c0::m.mUnderwaterInputRate; mHeavySpeedMultiplier = daAlinkHIO_wolf_c0::m.mUnderwaterInputRate; } @@ -15371,11 +15371,11 @@ void daAlink_c::setStickData() { } if (!doButton()) { - i_offNoResetFlg0(FLG0_UNK_10000000); + offNoResetFlg0(FLG0_UNK_10000000); } - if (!var_r31 && i_checkNoResetFlg2(FLG2_UNK_80)) { - i_offNoResetFlg2(FLG2_UNK_80); + if (!var_r31 && checkNoResetFlg2(FLG2_UNK_80)) { + offNoResetFlg2(FLG2_UNK_80); dComIfGp_2dShowOn(); } } @@ -15450,7 +15450,7 @@ BOOL daAlink_c::checkAtnWaitAnime() { * setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c */ void daAlink_c::setTiredVoice(daPy_frameCtrl_c* i_frameCtrl) { if (i_frameCtrl->checkPass(lit_7448)) { - if (i_dComIfGs_getLife() <= 2) { + if (dComIfGs_getLife() <= 2) { voiceStart(Z2SE_AL_V_TIRED_L); } else { voiceStart(Z2SE_AL_V_TIRED_S); @@ -15462,7 +15462,7 @@ void daAlink_c::setTiredVoice(daPy_frameCtrl_c* i_frameCtrl) { BOOL daAlink_c::checkRestHPAnime() { if (!checkPlayerGuard() && (checkNoUpperAnime() || checkHorseTiredAnime()) && mTargetedActor == NULL && !checkWindSpeedOnAngle() && - ((!checkPlayerDemoMode() && i_dComIfGs_getLife() <= 4) || mDemo.getDemoMode() == 0x12)) + ((!checkPlayerDemoMode() && dComIfGs_getLife() <= 4) || mDemo.getDemoMode() == 0x12)) { return true; } @@ -15525,9 +15525,9 @@ asm bool daAlink_c::setShapeAngleToAtnActor(int param_0) { void daAlink_c::initServiceWaitTime() { field_0x30ca = cM_rndF(150.0f) + 300.0f; - if (i_checkWolf()) { + if (checkWolf()) { field_0x30ca >>= 2; // divide by 4 - } else if (i_checkReinRide()) { + } else if (checkReinRide()) { field_0x30ca *= 0.75f; } } @@ -15662,8 +15662,8 @@ BOOL daAlink_c::notTalk() { } if ((mMidnaTalkDelayTimer != 0 || - (i_checkMagneBootsOn() && !cBgW_CheckBGround(mMagneBootsTopVec.y))) || - !i_checkModeFlg(MODE_SWIMMING | MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | + (checkMagneBootsOn() && !cBgW_CheckBGround(mMagneBootsTopVec.y))) || + !checkModeFlg(MODE_SWIMMING | MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | MODE_RIDING | MODE_NO_COLLISION | MODE_CLIMB | MODE_JUMP) && !safe_poly) { @@ -15674,7 +15674,7 @@ BOOL daAlink_c::notTalk() { /* 800B4A08-800B4B2C 0AF348 0124+00 11/11 0/0 0/0 .text setTalkStatus__9daAlink_cFv */ BOOL daAlink_c::setTalkStatus() { - if (i_checkEndResetFlg0(ERFLG0_UNK_400000) || field_0x27f4 == NULL) { + if (checkEndResetFlg0(ERFLG0_UNK_400000) || field_0x27f4 == NULL) { return 0; } @@ -15723,12 +15723,12 @@ f32 daAlink_c::getFrontRollRate() { // almost, small branch issues #ifdef NONMATCHING void daAlink_c::decideCommonDoStatus() { - if (!i_checkFmChainGrabAnime() && i_dComIfGp_getDoStatus() == 0) { + if (!checkFmChainGrabAnime() && dComIfGp_getDoStatus() == 0) { bool temp_r3 = checkStageName("R_SP127"); - if (checkRoomOnly() && !i_checkWolf() && !temp_r3) { + if (checkRoomOnly() && !checkWolf() && !temp_r3) { if ((checkNoUpperAnime() || checkIronBallWaitAnime()) && - (mEquipItem != NO_ITEM && i_checkModeFlg(4) && mEquipItem != 0x102)) + (mEquipItem != NO_ITEM && checkModeFlg(4) && mEquipItem != 0x102)) { if (checkCopyRodControllAnime()) { setDoStatus(0x2A); @@ -15738,7 +15738,7 @@ void daAlink_c::decideCommonDoStatus() { } else if (mFastShotTime != 0) { setDoStatus(0x12); } - } else if (i_checkWolf()) { + } else if (checkWolf()) { if (checkDownAttackState()) { setDoStatusEmphasys(0x30); } else if (checkCutHeadState()) { @@ -15753,26 +15753,26 @@ void daAlink_c::decideCommonDoStatus() { setDoStatus(0x93); } - i_onResetFlg0(RFLG0_UNK_20000); + onResetFlg0(RFLG0_UNK_20000); field_0x3738 = *static_cast(mTargetedActor)->getLockPos(); } } else { setDoStatus(0x8B); } - } else if (i_checkAttentionLock()) { + } else if (checkAttentionLock()) { setDoStatus(0x8B); } else if (field_0x30d2 == 0 && - (field_0x33a8 > getFrontRollRate() || i_checkAttentionLock())) + (field_0x33a8 > getFrontRollRate() || checkAttentionLock())) { setDoStatus(9); } } if (checkNotJumpSinkLimit() && - (i_dComIfGp_getDoStatus() == 0x8B || i_dComIfGp_getDoStatus() == 0x30 || - i_dComIfGp_getDoStatus() == 0x77 || i_dComIfGp_getDoStatus() == 0x19 || - i_dComIfGp_getDoStatus() == 9 || i_dComIfGp_getDoStatus() == 0x93)) + (dComIfGp_getDoStatus() == 0x8B || dComIfGp_getDoStatus() == 0x30 || + dComIfGp_getDoStatus() == 0x77 || dComIfGp_getDoStatus() == 0x19 || + dComIfGp_getDoStatus() == 9 || dComIfGp_getDoStatus() == 0x93)) { setDoStatus(0); } @@ -15780,7 +15780,7 @@ void daAlink_c::decideCommonDoStatus() { int direction = getDirectionFromShapeAngle(); f32 temp_f31 = getFrontRollRate(); - if (i_checkAttentionLock() || + if (checkAttentionLock() || (mTargetedActor != NULL && (mTargetedActor == mThrowBoomerangAcKeep.getActor() || mTargetedActor == mCopyRodAcKeep.getActor()))) { @@ -15792,7 +15792,7 @@ void daAlink_c::decideCommonDoStatus() { } else { setDoStatusEmphasys(0x19); } - } else if (!i_checkSmallUpperGuardAnime() && + } else if (!checkSmallUpperGuardAnime() && (mEquipItem == 0x103 || mEquipItem == 0x102)) { if (mEquipItem == 0x102) { @@ -15809,7 +15809,7 @@ void daAlink_c::decideCommonDoStatus() { } } else if (((checkNoUpperAnime()) || checkIronBallWaitAnime() || checkCopyRodControllAnime()) && - mEquipItem != NO_ITEM && i_checkModeFlg(4) && field_0x33a8 <= temp_f31) + mEquipItem != NO_ITEM && checkModeFlg(4) && field_0x33a8 <= temp_f31) { if (mEquipItem == 0x102) { if (checkAttentionState()) { @@ -15830,28 +15830,28 @@ void daAlink_c::decideCommonDoStatus() { setDoStatus(0x12); } - if ((((i_checkMagneBootsOn() || checkIronBallWaitAnime() || checkNotJumpSinkLimit()) || - (i_dComIfGp_getDoStatus() == 0x79 || i_dComIfGp_getDoStatus() == 0x86 || - i_dComIfGp_getDoStatus() == 0x30 || i_dComIfGp_getDoStatus() == 0x77 || - i_dComIfGp_getDoStatus() == 0x19)) || - (i_dComIfGp_getDoStatus() == 0x79 && + if ((((checkMagneBootsOn() || checkIronBallWaitAnime() || checkNotJumpSinkLimit()) || + (dComIfGp_getDoStatus() == 0x79 || dComIfGp_getDoStatus() == 0x86 || + dComIfGp_getDoStatus() == 0x30 || dComIfGp_getDoStatus() == 0x77 || + dComIfGp_getDoStatus() == 0x19)) || + (dComIfGp_getDoStatus() == 0x79 && (checkKandelaarSwingAnime() || field_0x2fa8 == 6 || checkCopyRodThrowAnime() || checkBoomerangThrowAnime()))) && - (!i_checkMagneBootsOn() || i_dComIfGp_getDoStatus() != 0x79 || + (!checkMagneBootsOn() || dComIfGp_getDoStatus() != 0x79 || !cBgW_CheckBGround(mMagneBootsTopVec.y))) { - if (mEquipItem == 0x42 && i_checkModeFlg(4)) { + if (mEquipItem == 0x42 && checkModeFlg(4)) { setDoStatus(4); } else { setDoStatus(0); } } - if (temp_r3 && i_dComIfGp_getDoStatus() == 0x19) { + if (temp_r3 && dComIfGp_getDoStatus() == 0x19) { setDoStatus(0); } - if (i_dComIfGp_getDoStatus() == 4 && checkCopyRodControllAnime()) { + if (dComIfGp_getDoStatus() == 4 && checkCopyRodControllAnime()) { setDoStatus(0x2A); } } @@ -15870,12 +15870,12 @@ asm void daAlink_c::decideCommonDoStatus() { /* 800B5284-800B58EC 0AFBC4 0668+00 1/1 0/0 0/0 .text decideDoStatus__9daAlink_cFv */ void daAlink_c::decideDoStatus() { - if (!i_checkFmChainGrabAnime()) { - if (i_checkNoResetFlg0(FLG0_UNK_1000000)) { + if (!checkFmChainGrabAnime()) { + if (checkNoResetFlg0(FLG0_UNK_1000000)) { setDoStatusEmphasys(0x62); } - if (mTargetedActor == NULL && mAttList == NULL && i_checkResetFlg0(RFLG0_UNK_8)) { + if (mTargetedActor == NULL && mAttList == NULL && checkResetFlg0(RFLG0_UNK_8)) { setWallGrabStatus(0x15, 2); if (field_0x2f91 == 7 || field_0x2f91 == 8 || field_0x2f91 == 6 || field_0x2f91 == 9) { @@ -15889,12 +15889,12 @@ void daAlink_c::decideDoStatus() { if (mAttList->mType == 5 || (mAttList->mType == 6 && - (!i_checkWolf() || static_cast(field_0x27f4)->checkSmallTbox()))) + (!checkWolf() || static_cast(field_0x27f4)->checkSmallTbox()))) { setDoStatus(6); } else if (mAttList->mType == 7 && actor_name == PROC_KYTAG05) { setDoStatus(0x89); - } else if (i_checkWolf()) { + } else if (checkWolf()) { if (mAttList->mType == 4 && !fopAcM_checkCarryNow(field_0x27f4) && fopAcM_CheckCarryType(field_0x27f4, fopAcM_CARRY_LIGHT)) { @@ -15924,7 +15924,7 @@ void daAlink_c::decideDoStatus() { mAttention->getActionBtnB()->mType == 7 && mAttention->getActionBtnB()->getActor() == mTargetedActor) { - i_onEndResetFlg1(ERFLG1_UNK_100000); + onEndResetFlg1(ERFLG1_UNK_100000); if (mWolfEyeUp != 0) { setWolfDigStatus(2); } @@ -15933,7 +15933,7 @@ void daAlink_c::decideDoStatus() { actor_name == PROC_Obj_DigSnow || actor_name == PROC_Obj_Lv4DigSand || actor_name == PROC_E_YM) { - i_onEndResetFlg1(ERFLG1_UNK_100000); + onEndResetFlg1(ERFLG1_UNK_100000); if (mWolfEyeUp != 0) { setWolfDigStatus(2); } @@ -15982,7 +15982,7 @@ void daAlink_c::decideDoStatus() { if (!fopAcM_checkCarryNow(field_0x27f4)) { if (checkGoatCatchActor(field_0x27f4)) { setDoStatus(0x91); - } else if (!i_checkMagneBootsOn()) { + } else if (!checkMagneBootsOn()) { if (checkInsectActorName(field_0x27f4)) { setDoStatusEmphasys(0x98); } else if (actor_name == PROC_Obj_SmallKey) { @@ -16145,7 +16145,7 @@ asm BOOL daAlink_c::checkAutoJumpAction() { /* 800B69CC-800B6A30 0B130C 0064+00 2/2 0/0 0/0 .text checkCutJumpInFly__9daAlink_cFv */ BOOL daAlink_c::checkCutJumpInFly() { - if ((mEquipItem == EQUIP_SWORD && i_checkResetFlg0(RFLG0_UNK_80)) || checkForceSwordSwing()) { + if ((mEquipItem == EQUIP_SWORD && checkResetFlg0(RFLG0_UNK_80)) || checkForceSwordSwing()) { return procCutJumpInit(1); } return false; @@ -16177,9 +16177,9 @@ asm int daAlink_c::checkItemActionInitStart() { /* 800B7090-800B7168 0B19D0 00D8+00 1/1 0/0 0/0 .text checkItemChangeAutoAction__9daAlink_cFv */ int daAlink_c::checkItemChangeAutoAction() { - if (i_checkResetFlg0(RFLG0_UNK_80)) { + if (checkResetFlg0(RFLG0_UNK_80)) { if (mEquipItem == EQUIP_SWORD) { - if (i_checkModeFlg(0x40000)) { + if (checkModeFlg(0x40000)) { return 0; } @@ -16187,7 +16187,7 @@ int daAlink_c::checkItemChangeAutoAction() { if (checkBoardRide()) { return checkBoardSwordTriggerAction(); - } else if (i_checkReinRide()) { + } else if (checkReinRide()) { return procHorseCutChargeReadyInit(); } @@ -16205,15 +16205,15 @@ int daAlink_c::checkItemChangeAutoAction() { /* 800B7168-800B7190 0B1AA8 0028+00 7/7 0/0 0/0 .text setFastShotTimer__9daAlink_cFv */ void daAlink_c::setFastShotTimer() { - if (!i_dComIfGp_checkPlayerStatus0(0, 0x2000)) { + if (!dComIfGp_checkPlayerStatus0(0, 0x2000)) { mFastShotTime = daAlinkHIO_item_c0::m.mItemFPTransitionTimer; } } /* 800B7190-800B71EC 0B1AD0 005C+00 9/9 0/0 0/0 .text cancelItemUseQuake__9daAlink_cFi */ void daAlink_c::cancelItemUseQuake(int param_0) { - if (i_checkNoResetFlg3(FLG3_UNK_4) && (param_0 != 0 || mProcID != PROC_HOOKSHOT_FLY)) { - i_offNoResetFlg3(FLG3_UNK_4); + if (checkNoResetFlg3(FLG3_UNK_4) && (param_0 != 0 || mProcID != PROC_HOOKSHOT_FLY)) { + offNoResetFlg3(FLG3_UNK_4); dComIfGp_getVibration().StopQuake(31); } } @@ -16222,10 +16222,10 @@ void daAlink_c::cancelItemUseQuake(int param_0) { // matches with literals #ifdef NONMATCHING int daAlink_c::cancelUpperItemReadyAnime(int param_0) { - if ((i_dComIfGp_getDoStatus() == 0x12 || param_0 != 0) && + if ((dComIfGp_getDoStatus() == 0x12 || param_0 != 0) && ((param_0 == 0 && doTrigger()) || (checkCanoeSlider() && - (subjectCancelTrigger() || i_checkEndResetFlg1(ERFLG1_UNK_20000000))))) + (subjectCancelTrigger() || checkEndResetFlg1(ERFLG1_UNK_20000000))))) { seStartSystem(0x6F); @@ -16264,7 +16264,7 @@ BOOL daAlink_c::checkItemActorPointer() { resetUpperAnime(UPPER_2, lit_6041); mEquipItem = NO_ITEM; - if (i_checkModeFlg(MODE_RIDING)) { + if (checkModeFlg(MODE_RIDING)) { if (checkCanoeRide()) { procCanoeWaitInit(0); } else { @@ -16333,7 +16333,7 @@ void daAlink_c::orderPeep() { mPeepExitID = ((kytag05_class*)field_0x27f4)->getSceneListID(); field_0x2ff2 = 20; fopAcM_orderOtherEvent(this, field_0x27f4, l_peepEventName, 0xFFFF, 1, 0); - if (i_checkWolf()) { + if (checkWolf()) { procWolfWaitInit(); } else { procWaitInit(); @@ -16350,16 +16350,16 @@ int daAlink_c::orderTalk(int i_checkZTalk) { return 0; } - if ((i_dComIfGp_getDoStatus() == 0x1C || i_dComIfGp_getDoStatus() == 0x1B || - i_dComIfGp_getDoStatus() == 0x80 || i_dComIfGp_getDoStatus() == 0x3B || - i_dComIfGp_getDoStatus() == 0x3C || i_dComIfGp_getDoStatus() == 0x8) && + if ((dComIfGp_getDoStatus() == 0x1C || dComIfGp_getDoStatus() == 0x1B || + dComIfGp_getDoStatus() == 0x80 || dComIfGp_getDoStatus() == 0x3B || + dComIfGp_getDoStatus() == 0x3C || dComIfGp_getDoStatus() == 0x8) && talkTrigger()) { fopAcM_orderTalkEvent(this, field_0x27f4, 0, 0); return 1; } - if (!i_checkWolf() && checkRequestTalkActor(mAttList2, field_0x27f8)) { + if (!checkWolf() && checkRequestTalkActor(mAttList2, field_0x27f8)) { for (int i = 0; i < 2; i++) { u8 item = dComIfGp_getSelectItem(i); @@ -16424,7 +16424,7 @@ int daAlink_c::checkNormalAction() { } if (wall_grab_status == 0x96 && searchFmChainPos()) { - if (i_checkWolf()) { + if (checkWolf()) { return procWolfChainUpInit(); } else { return procFmChainUpInit(); @@ -16437,38 +16437,38 @@ int daAlink_c::checkNormalAction() { } if (doTrigger()) { - if (i_dComIfGp_getDoStatus() == 0x89) { + if (dComIfGp_getDoStatus() == 0x89) { orderPeep(); return 1; } - if (i_dComIfGp_getDoStatus() == 7) { - if (i_checkWolf()) { + if (dComIfGp_getDoStatus() == 7) { + if (checkWolf()) { return procWolfLieStartInit(1); } else { return procCrawlStartInit(); } } - if (i_dComIfGp_getDoStatus() == 12) { + if (dComIfGp_getDoStatus() == 12) { return procWolfGrabUpInit(); } - if (i_dComIfGp_getDoStatus() == 0x7B) { + if (dComIfGp_getDoStatus() == 0x7B) { return procWolfChainReadyInit(); } - if (i_dComIfGp_getDoStatus() == 0x47) { + if (dComIfGp_getDoStatus() == 0x47) { return procWolfPushInit(); } - if (i_dComIfGp_getDoStatus() == 0x17) { + if (dComIfGp_getDoStatus() == 0x17) { if (fopAcM_GetName(field_0x27f4) == PROC_Obj_IceLeaf) { return procBoardRideInit(); } if (fopAcM_GetName(field_0x27f4) == PROC_CANOE) { - if (i_checkModeFlg(0x40000)) { + if (checkModeFlg(0x40000)) { return procCanoeRideInit(); } else { return procSmallJumpInit(1); @@ -16484,8 +16484,8 @@ int daAlink_c::checkNormalAction() { } } - if (i_dComIfGp_getDoStatus() == 0x20) { - if (i_checkWolf()) { + if (dComIfGp_getDoStatus() == 0x20) { + if (checkWolf()) { return procWolfHangReadyInit(); } else { if (field_0x2f91 == 7) { @@ -16496,7 +16496,7 @@ int daAlink_c::checkNormalAction() { } } - if (i_dComIfGp_getDoStatus() == 6) { + if (dComIfGp_getDoStatus() == 6) { if (mAttList->mType == 5) { if (!checkStageName("F_SP103") || !fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchBouDoor, NULL)) @@ -16511,15 +16511,15 @@ int daAlink_c::checkNormalAction() { return 1; } - if (i_dComIfGp_getDoStatus() == 0x2B) { + if (dComIfGp_getDoStatus() == 0x2B) { return procGrassWhistleGetInit(); } - if (i_dComIfGp_getDoStatus() == 0x38) { + if (dComIfGp_getDoStatus() == 0x38) { return procGoatStrokeInit(); } - if (i_dComIfGp_getDoStatus() == 0x63) { + if (dComIfGp_getDoStatus() == 0x63) { if (fopAcM_GetName(field_0x27f4) == PROC_Tag_Lv6Gate) { static_cast(field_0x27f4)->stabMasterSword(); } else { @@ -16530,22 +16530,22 @@ int daAlink_c::checkNormalAction() { return 1; } - if (i_dComIfGp_getDoStatus() == 0x91) { - i_onNoResetFlg0(FLG0_UNK_10000000); + if (dComIfGp_getDoStatus() == 0x91) { + onNoResetFlg0(FLG0_UNK_10000000); if (field_0x27f4->current.pos.abs2XZ(current.pos) < getGoatCatchDistance2()) { - if (i_checkWolf()) { + if (checkWolf()) { return procWolfGanonCatchInit(); } else { return procGoatCatchInit(field_0x27f4, 0.0f); } } - } else if (i_dComIfGp_getDoStatus() == 0x98) { + } else if (dComIfGp_getDoStatus() == 0x98) { return procInsectCatchInit(); - } else if (i_dComIfGp_getDoStatus() == 0x1F || i_dComIfGp_getDoStatus() == 0x39 || - i_dComIfGp_getDoStatus() == 0x34) + } else if (dComIfGp_getDoStatus() == 0x1F || dComIfGp_getDoStatus() == 0x39 || + dComIfGp_getDoStatus() == 0x34) { - if (i_checkWolf()) { + if (checkWolf()) { return procWolfGrabUpInit(); } else { if (fopAcM_CheckCarryType(field_0x27f4, fopAcM_CARRY_ITEM)) { @@ -16554,37 +16554,37 @@ int daAlink_c::checkNormalAction() { return procGrabReadyInit(); } } - } else if (i_dComIfGp_getDoStatus() == 0x99) { + } else if (dComIfGp_getDoStatus() == 0x99) { return procHangLeverDownInit(); - } else if (i_dComIfGp_getDoStatus() == 0x30) { - if (i_checkWolf()) { + } else if (dComIfGp_getDoStatus() == 0x30) { + if (checkWolf()) { return procWolfDownAttackInit(); } else { return checkDoCutAction(); } - } else if (i_dComIfGp_getDoStatus() == 0x77) { - if (i_checkWolf()) { + } else if (dComIfGp_getDoStatus() == 0x77) { + if (checkWolf()) { return procWolfJumpAttackInit(1); } else { return checkDoCutAction(); } - } else if (i_dComIfGp_getDoStatus() == 0x8B) { + } else if (dComIfGp_getDoStatus() == 0x8B) { return procWolfJumpAttackInit(1); - } else if (i_dComIfGp_getDoStatus() == 0x62) { + } else if (dComIfGp_getDoStatus() == 0x62) { changeCutFast(); return 1; - } else if (i_dComIfGp_getDoStatus() == 0x86) { + } else if (dComIfGp_getDoStatus() == 0x86) { return checkDoCutAction(); - } else if (i_dComIfGp_getDoStatus() == 5) { + } else if (dComIfGp_getDoStatus() == 5) { return procWolfHowlDemoInit(); - } else if (i_dComIfGp_getDoStatus() == 0x45) { + } else if (dComIfGp_getDoStatus() == 0x45) { return procWolfGetSmellInit(); - } else if (i_dComIfGp_getDoStatus() == 0x93) { + } else if (dComIfGp_getDoStatus() == 0x93) { return procWolfTagJumpInit(field_0x27f4); } - } else if (i_checkNoResetFlg0(FLG0_UNK_10000000) && i_dComIfGp_getDoStatus() == 0x91) { + } else if (checkNoResetFlg0(FLG0_UNK_10000000) && dComIfGp_getDoStatus() == 0x91) { if (field_0x27f4->current.pos.abs2XZ(current.pos) < getGoatCatchDistance2()) { - if (i_checkWolf()) { + if (checkWolf()) { return procWolfGanonCatchInit(); } else { return procGoatCatchInit(field_0x27f4, 0.0f); @@ -16734,7 +16734,7 @@ void daAlink_c::swordUnequip() { anm_speed = daAlinkHIO_cut_c0::m.mUnequipAnm.mSpeed; } - u16 anm_id = i_checkReinRide() ? (u16)0x261 : (u16)0x255; + u16 anm_id = checkReinRide() ? (u16)0x261 : (u16)0x255; setUpperAnime(anm_id, UPPER_2, anm_speed, daAlinkHIO_cut_c0::m.mUnequipAnm.mStartFrame, daAlinkHIO_cut_c0::m.mUnequipAnm.mEndFrame, @@ -16748,7 +16748,7 @@ void daAlink_c::itemEquip(u16 i_itemID) { if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != BOOMERANG) { field_0x2fde = i_itemID; dComIfGp_clearPlayerStatus0(0, 0x400000); - i_offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); + offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); itemUnequip(field_0x2fde, lit_6041); } } @@ -16811,7 +16811,7 @@ bool daAlink_c::checkFastUnequip() { /* 800B983C-800B994C 0B417C 0110+00 10/10 0/0 0/0 .text allUnequip__9daAlink_cFi */ void daAlink_c::allUnequip(int param_0) { - if (i_checkNoResetFlg2(FLG2_UNK_1) && param_0 != 0 && !checkCanoeRide() && + if (checkNoResetFlg2(FLG2_UNK_1) && param_0 != 0 && !checkCanoeRide() && mEquipItem != KANTERA) { for (u8 i = 0; i < 2; i++) { @@ -16820,7 +16820,7 @@ void daAlink_c::allUnequip(int param_0) { } } itemEquip(KANTERA); - i_onNoResetFlg1(FLG1_UNK_40); + onNoResetFlg1(FLG1_UNK_40); return; } else if (mEquipItem == EQUIP_SWORD) { swordUnequip(); @@ -16836,14 +16836,14 @@ void daAlink_c::allUnequip(int param_0) { /* 800B994C-800B9D2C 0B428C 03E0+00 8/8 0/0 0/0 .text checkItemChangeFromButton__9daAlink_cFv */ BOOL daAlink_c::checkItemChangeFromButton() { - if (i_checkModeFlg(4) && !checkEquipAnime() && !checkBoomerangThrowAnime() && + if (checkModeFlg(4) && !checkEquipAnime() && !checkBoomerangThrowAnime() && !checkCopyRodThrowAnime() && !checkKandelaarSwingAnime() && !checkKandelaarSwingAnime()) { if (dComIfGs_getSelectEquipSword() != NO_ITEM && !checkNotBattleStage() && - !checkCanoeRide() && (!i_checkModeFlg(0x40000) || i_checkEquipHeavyBoots()) && + !checkCanoeRide() && (!checkModeFlg(0x40000) || checkEquipHeavyBoots()) && mEquipItem != 0x103 && swordTrigger()) { - if (i_checkEndResetFlg1(ERFLG1_UNK_40000000)) { + if (checkEndResetFlg1(ERFLG1_UNK_40000000)) { return 0; } @@ -16861,18 +16861,18 @@ BOOL daAlink_c::checkItemChangeFromButton() { } } - if (doTrigger() && i_dComIfGp_getDoStatus() == 4) { - if (mEquipItem != KANTERA && i_checkNoResetFlg2(FLG2_UNK_1)) { + if (doTrigger() && dComIfGp_getDoStatus() == 4) { + if (mEquipItem != KANTERA && checkNoResetFlg2(FLG2_UNK_1)) { offKandelaarModel(); } else if (mSwordFlourishTimer != 0 && mEquipItem == EQUIP_SWORD && - !checkWoodSwordEquip() && !i_checkModeFlg(0x402)) + !checkWoodSwordEquip() && !checkModeFlg(0x402)) { return procSwordUnequipSpInit(); } else { allUnequip(1); } } else if (mEquipItem == NO_ITEM && mThrowBoomerangAcKeep.getActor() == NULL && - !checkCanoeRide() && checkNoUpperAnime() && i_checkNoResetFlg2(FLG2_UNK_1)) + !checkCanoeRide() && checkNoUpperAnime() && checkNoResetFlg2(FLG2_UNK_1)) { for (i = 0; i < 2; i++) { if (dComIfGp_getSelectItem(i) == KANTERA) { @@ -16881,14 +16881,14 @@ BOOL daAlink_c::checkItemChangeFromButton() { } itemEquip(KANTERA); - i_onNoResetFlg1(FLG1_UNK_40); + onNoResetFlg1(FLG1_UNK_40); } else if (mEquipItem != 0x103 && mEquipItem != NO_ITEM && mEquipItem != 0x10B && mEquipItem != 0x102 && (!checkCanoeRide() || !checkFisingRodLure())) { if (!checkEventRun() || - strcmp(i_dComIfGp_getEventManager().getRunEventName(), "ANGER")) + strcmp(dComIfGp_getEventManager().getRunEventName(), "ANGER")) { - if (strcmp(i_dComIfGp_getEventManager().getRunEventName(), "ANGER2") && + if (strcmp(dComIfGp_getEventManager().getRunEventName(), "ANGER2") && checkItemSetButton(mEquipItem) == 2) { allUnequip(1); @@ -16915,14 +16915,14 @@ BOOL daAlink_c::checkNextActionFromButton() { return 0; } - if (i_checkModeFlg(0x400)) { - if (i_dComIfGp_getDoStatus() == 0 && checkCanoeRide() && checkFisingRodLure()) { + if (checkModeFlg(0x400)) { + if (dComIfGp_getDoStatus() == 0 && checkCanoeRide() && checkFisingRodLure()) { setDoStatus(4); } - } else if (!i_checkModeFlg(0x40000)) { - if ((i_checkWolf() && !checkWolfGrabAnime()) || - (!i_checkWolf() && getCopyRodControllActor() == NULL && - (checkEquipAnime() || i_checkNoResetFlg0(FLG0_UNK_1000000) || checkUpperGuardAnime() || + } else if (!checkModeFlg(0x40000)) { + if ((checkWolf() && !checkWolfGrabAnime()) || + (!checkWolf() && getCopyRodControllActor() == NULL && + (checkEquipAnime() || checkNoResetFlg0(FLG0_UNK_1000000) || checkUpperGuardAnime() || checkIronBallWaitAnime() || checkNoUpperAnime()))) { decideDoStatus(); @@ -16943,7 +16943,7 @@ BOOL daAlink_c::checkNextActionFromButton() { return 1; } - if (!i_checkModeFlg(0x40400)) { + if (!checkModeFlg(0x40400)) { if (checkRAction()) { return 1; } @@ -16953,7 +16953,7 @@ BOOL daAlink_c::checkNextActionFromButton() { } } - if (!i_checkModeFlg(0x40000) && checkSubjectAction()) { + if (!checkModeFlg(0x40000) && checkSubjectAction()) { return 1; } @@ -16962,13 +16962,13 @@ BOOL daAlink_c::checkNextActionFromButton() { /* 800B9F50-800BA09C 0B4890 014C+00 14/14 0/0 0/0 .text checkGroundSpecialMode__9daAlink_cFv */ BOOL daAlink_c::checkGroundSpecialMode() { - if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && !i_checkMagneBootsOn() && - i_checkEndResetFlg0(ERFLG0_UNK_2)) + if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() && + checkEndResetFlg0(ERFLG0_UNK_2)) { return procCoMetamorphoseInit(); } - if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && checkBoardRestart()) { + if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && checkBoardRestart()) { return procBoardWaitInit(mRideAcKeep.getActor()); } @@ -16980,7 +16980,7 @@ BOOL daAlink_c::checkGroundSpecialMode() { return procSumouReadyInit(); } - if (i_checkGoronSideMove()) { + if (checkGoronSideMove()) { return procGoronMoveInit(); } @@ -16997,7 +16997,7 @@ BOOL daAlink_c::checkGroundSpecialMode() { return procGoronRideWaitInit(actor); } - if (i_checkEndResetFlg1(ERFLG1_UNK_1)) { + if (checkEndResetFlg1(ERFLG1_UNK_1)) { return procScreamWaitInit(); } @@ -17007,7 +17007,7 @@ BOOL daAlink_c::checkGroundSpecialMode() { /* 800BA09C-800BA0D0 0B49DC 0034+00 4/4 0/0 0/0 .text commonCheckNextAction__9daAlink_cFi */ int daAlink_c::commonCheckNextAction(int param_0) { - if (i_checkWolf()) { + if (checkWolf()) { return checkNextActionWolf(param_0); } else { return checkNextAction(param_0); @@ -17032,14 +17032,14 @@ int daAlink_c::checkNextAction(int param_0) { if (procID != PROC_MOVE_TURN && (param_0 == 0 || checkInputOnR()) && (procID != PROC_HOOKSHOT_MOVE || checkHookshotWait())) { - if (mTargetedActor != NULL || i_checkAttentionLock()) { + if (mTargetedActor != NULL || checkAttentionLock()) { setSpeedAndAngleAtn(); } else if (((!checkUpperReadyThrowAnime() || mFastShotTime != 0) || (checkBoomerangThrowAnime() && (mThrowBoomerangAcKeep.getActor() != NULL || mEquipItem == noentry71 || - i_checkNoResetFlg1(FLG1_UNK_2)))) || + checkNoResetFlg1(FLG1_UNK_2)))) || (checkCopyRodThrowAnime() && - (mCopyRodAcKeep.getActor() != NULL || i_checkNoResetFlg1(FLG1_UNK_10000)))) + (mCopyRodAcKeep.getActor() != NULL || checkNoResetFlg1(FLG1_UNK_10000)))) { setSpeedAndAngleNormal(); } @@ -17049,7 +17049,7 @@ int daAlink_c::checkNextAction(int param_0) { bool attention_state = checkAttentionState(); if (attention_state) { - if (i_checkFmChainGrabAnime()) { + if (checkFmChainGrabAnime()) { field_0x594 = 13.0f; } else if (mTargetedActor != NULL) { field_0x594 = daAlinkHIO_atnMove_c0::m.mMaxSpeed; @@ -17062,8 +17062,8 @@ int daAlink_c::checkNextAction(int param_0) { field_0x594 = daAlinkHIO_move_c0::m.mMaxSpeed; } - if (i_checkEndResetFlg0(ERFLG0_UNK_100000) && mLinkAcch.ChkGroundHit() && - !i_checkModeFlg(MODE_PLAYER_FLY)) + if (checkEndResetFlg0(ERFLG0_UNK_100000) && mLinkAcch.ChkGroundHit() && + !checkModeFlg(MODE_PLAYER_FLY)) { return procFloorDownReboundInit(); } @@ -17207,7 +17207,7 @@ void daAlink_c::getBodyAngleXBasePos(cXyz* o_pos) { mtx_id = 1; } - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(mtx_id), o_pos); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(mtx_id), o_pos); } /* 800BB084-800BB2B0 0B59C4 022C+00 3/3 0/0 0/0 .text getBodyAngleXAtnActor__9daAlink_cFi @@ -17253,12 +17253,12 @@ void daAlink_c::setMagicArmorBrk(int param_0) { /* 800BB408-800BB458 0B5D48 0050+00 6/6 0/0 0/0 .text checkMagicArmorHeavy__9daAlink_cCFv */ BOOL daAlink_c::checkMagicArmorHeavy() const { - return checkMagicArmorWearAbility() && i_dComIfGs_getRupee() == 0; + return checkMagicArmorWearAbility() && dComIfGs_getRupee() == 0; } /* 800BB458-800BB4B8 0B5D98 0060+00 1/0 0/0 0/0 .text checkBootsOrArmorHeavy__9daAlink_cCFv */ BOOL daAlink_c::checkBootsOrArmorHeavy() const { - return i_checkEquipHeavyBoots() || checkMagicArmorHeavy() || checkIronBallWaitAnime(); + return checkEquipHeavyBoots() || checkMagicArmorHeavy() || checkIronBallWaitAnime(); } /* 800BB4B8-800BB560 0B5DF8 00A8+00 29/29 0/0 0/0 .text checkHeavyStateOn__9daAlink_cFii @@ -17278,14 +17278,14 @@ BOOL daAlink_c::checkHeavyStateOn(int param_0, int param_1) { /* 800BB560-800BB644 0B5EA0 00E4+00 1/0 0/0 0/0 .text setOutPower__9daAlink_cFfsi */ void daAlink_c::setOutPower(f32 param_0, s16 param_1, int param_2) { - if (!i_checkFmChainGrabAnime() || !checkBossRoom() || fopAcM_GetRoomNo(this) != 50 || - !i_checkEquipHeavyBoots()) + if (!checkFmChainGrabAnime() || !checkBossRoom() || fopAcM_GetRoomNo(this) != 50 || + !checkEquipHeavyBoots()) { field_0x3400 += param_0 * cM_ssin(param_1); field_0x3404 += param_0 * cM_scos(param_1); if (param_2) { - i_onEndResetFlg0(ERFLG0_UNK_8); + onEndResetFlg0(ERFLG0_UNK_8); } } } @@ -17295,8 +17295,8 @@ void daAlink_c::initGravity() { f32 gravity; f32 max_fall_speed; - if (i_checkWolf()) { - if (i_checkModeFlg(MODE_SWIMMING)) { + if (checkWolf()) { + if (checkModeFlg(MODE_SWIMMING)) { if (checkHeavyStateOn(1, 1)) { gravity = -daAlinkHIO_wlSwim_c0::m.field_0x9C; max_fall_speed = daAlinkHIO_wlSwim_c0::m.field_0xA0; @@ -17308,7 +17308,7 @@ void daAlink_c::initGravity() { gravity = daAlinkHIO_wlAutoJump_c0::m.field_0x58; max_fall_speed = daAlinkHIO_wlAutoJump_c0::m.field_0x5c; } - } else if (i_checkModeFlg(MODE_SWIMMING) || i_checkNoResetFlg0(FLG0_UNDERWATER)) { + } else if (checkModeFlg(MODE_SWIMMING) || checkNoResetFlg0(FLG0_UNDERWATER)) { max_fall_speed = getSwimMaxFallSpeed(); if (checkHeavyStateOn(1, 1) && mProcID != PROC_OCTAIEAL_SPIT) { gravity = daAlinkHIO_swim_c0::m.mBootsGravity; @@ -17327,9 +17327,9 @@ void daAlink_c::initGravity() { */ void daAlink_c::setSpecialGravity(f32 i_gravity, f32 i_speed, int i_offFlag) { if (i_offFlag) { - i_offNoResetFlg3(FLG3_UNK_4000); + offNoResetFlg3(FLG3_UNK_4000); } else { - i_onNoResetFlg3(FLG3_UNK_4000); + onNoResetFlg3(FLG3_UNK_4000); } gravity = i_gravity; @@ -17394,17 +17394,17 @@ void daAlink_c::posMove() { f32 temp_f30 = cM_ssin(shape_angle.y); f32 temp_f29 = cM_scos(shape_angle.y); - if (!i_checkNoResetFlg3(FLG3_UNK_4000)) { + if (!checkNoResetFlg3(FLG3_UNK_4000)) { initGravity(); } transAnimeProc(&sp108, temp_f30, temp_f29); s16 var_r26; - if (i_checkModeFlg(MODE_SWIMMING)) { + if (checkModeFlg(MODE_SWIMMING)) { var_r26 = field_0x3080; - } else if (!mLinkAcch.ChkGroundHit() || i_checkMagneBootsOn() || - (i_checkModeFlg(MODE_PLAYER_FLY) && !checkBoardRide()) || field_0x3174 == 8) + } else if (!mLinkAcch.ChkGroundHit() || checkMagneBootsOn() || + (checkModeFlg(MODE_PLAYER_FLY) && !checkBoardRide()) || field_0x3174 == 8) { var_r26 = 0; } else { @@ -17412,7 +17412,7 @@ void daAlink_c::posMove() { } setFootSpeed(); - if (i_checkEndResetFlg0(ERFLG0_UNK_10000000)) { + if (checkEndResetFlg0(ERFLG0_UNK_10000000)) { speedF = 0.0f; mNormalSpeed = 0.0f; } @@ -17433,7 +17433,7 @@ void daAlink_c::posMove() { f32 var_f31 = speedF; speedF *= cM_scos(var_r26); - if (var_r26 < 0 && !checkBoardRide() && !i_checkModeFlg(MODE_SWIMMING)) { + if (var_r26 < 0 && !checkBoardRide() && !checkModeFlg(MODE_SWIMMING)) { speedF *= 0.85f; } @@ -17446,13 +17446,13 @@ void daAlink_c::posMove() { speed.x = speedF * cM_ssin(current.angle.y); speed.z = speedF * cM_scos(current.angle.y); - if (checkNoCollisionCorret() || (i_checkModeFlg(0x40) && i_checkModeFlg(0x4000))) { + if (checkNoCollisionCorret() || (checkModeFlg(0x40) && checkModeFlg(0x4000))) { field_0x342c = 0.0f; field_0x3430 = 0.0f; } BOOL eventRunning = checkEventRun(); - if (!i_checkEquipHeavyBoots() && mLinkAcch.ChkGroundHit() && !i_checkModeFlg(0x40) && + if (!checkEquipHeavyBoots() && mLinkAcch.ChkGroundHit() && !checkModeFlg(0x40) && !eventRunning) { if (checkLv2MiddleBossBgRide(getMoveBGActorName(mLinkAcch.m_gnd, 0))) { @@ -17477,17 +17477,17 @@ void daAlink_c::posMove() { } } - if (i_checkModeFlg(MODE_SWIMMING)) { + if (checkModeFlg(MODE_SWIMMING)) { cLib_chasePos(&field_0x3750, cXyz::Zero, daAlinkHIO_damSwim_c0::m.field_0x84); current.pos += field_0x3750; - if (i_checkNoResetFlg0(FLG0_UNK_100) && mProcID != PROC_SWIM_DIVE) { + if (checkNoResetFlg0(FLG0_UNK_100) && mProcID != PROC_SWIM_DIVE) { current.pos.y = mWaterY; } else if (mDemo.getDemoType() == 4 || mProcID == PROC_ELEC_DAMAGE || - i_dComIfGp_checkPlayerStatus0(0, 0x10)) + dComIfGp_checkPlayerStatus0(0, 0x10)) { speed.y = 0.0f; - } else if (i_checkWolf()) { + } else if (checkWolf()) { if (checkHeavyStateOn(1, 1)) { speed.y += daAlinkHIO_wlSwim_c0::m.field_0x9C; @@ -17501,7 +17501,7 @@ void daAlink_c::posMove() { speed.y = daAlinkHIO_wlSwim_c0::m.field_0x5C; } } - } else if (!i_checkEquipHeavyBoots() && getZoraSwim()) { + } else if (!checkEquipHeavyBoots() && getZoraSwim()) { speed.y = -var_f31 * cM_ssin(var_r26); } else if ((checkBootsOrArmorHeavy() && mProcID != PROC_DEAD) || mProcID == PROC_SWIM_DIVE) { @@ -17531,9 +17531,9 @@ void daAlink_c::posMove() { speed.y = daAlinkHIO_swim_c0::m.mMaxFloatUpSpeed; } } - } else if (!i_checkModeFlg(0x400)) { + } else if (!checkModeFlg(0x400)) { if (checkHeavyStateOn(1, 1) && mProcID != PROC_SPINNER_READY && - !i_checkNoResetFlg0(FLG0_UNDERWATER)) + !checkNoResetFlg0(FLG0_UNDERWATER)) { speed.y += gravity * 2.25f; @@ -17559,8 +17559,8 @@ void daAlink_c::posMove() { setIceSlipSpeed(); var_f31 = current.pos.y; - if (!i_checkModeFlg(0x400) || checkBoardRide()) { - if (i_checkMagneBootsOn()) { + if (!checkModeFlg(0x400) || checkBoardRide()) { + if (checkMagneBootsOn()) { mDoMtx_stack_c::copy(mMagneBootMtx); mDoMtx_stack_c::YrotM(current.angle.y); @@ -17575,17 +17575,17 @@ void daAlink_c::posMove() { current.pos.x += field_0x342c; current.pos.z += field_0x3430; - if (i_checkEndResetFlg1(ERFLG1_UNK_800) && checkStageName("F_SP113")) { + if (checkEndResetFlg1(ERFLG1_UNK_800) && checkStageName("F_SP113")) { current.pos.y -= 50.0f; } } } - if (checkBoardRide() && !i_checkModeFlg(2)) { + if (checkBoardRide() && !checkModeFlg(2)) { current.pos.y -= speedF * cM_ssin(var_r26); } - if (i_getSumouMode() && mProcID != PROC_SUMOU_WIN_LOSE) { + if (getSumouMode() && mProcID != PROC_SUMOU_WIN_LOSE) { current.pos.y = var_f31 - 1.0f; speed.y = gravity; } @@ -17597,13 +17597,13 @@ void daAlink_c::posMove() { setWindSpeed(); BOOL var_r27 = FALSE; - if (!checkNoCollisionCorret() && !i_checkModeFlg(0x40)) { - if (!i_checkNoResetFlg3(FLG3_UNK_20000000)) { + if (!checkNoCollisionCorret() && !checkModeFlg(0x40)) { + if (!checkNoResetFlg3(FLG3_UNK_20000000)) { current.pos += *field_0x814.GetCCMoveP(); } if (!eventRunning) { - if (!i_checkEndResetFlg0(ERFLG0_UNK_8) || !checkHeavyStateOn(1, 1)) { + if (!checkEndResetFlg0(ERFLG0_UNK_8) || !checkHeavyStateOn(1, 1)) { current.pos.x += field_0x3400; current.pos.z += field_0x3404; } @@ -17622,13 +17622,13 @@ void daAlink_c::posMove() { current.pos += field_0x3594; - if (i_checkModeFlg(2)) { + if (checkModeFlg(2)) { current.pos += field_0x35ac; } else { current.pos.x += field_0x35ac.x; current.pos.z += field_0x35ac.z; } - } else if (i_checkNoResetFlg0(FLG0_UNK_14000)) { + } else if (checkNoResetFlg0(FLG0_UNK_14000)) { current.pos += field_0x3594; } } else if (checkOctaIealSpecialCollect()) { @@ -17658,7 +17658,7 @@ void daAlink_c::posMove() { } } - if (i_checkModeFlg(MODE_SWIMMING) && i_checkNoResetFlg0(FLG0_UNK_100)) { + if (checkModeFlg(MODE_SWIMMING) && checkNoResetFlg0(FLG0_UNK_100)) { cXyz sp84 = current.pos - field_0x3798; f32 temp_f3 = sp84.absXZ(); @@ -17677,7 +17677,7 @@ void daAlink_c::posMove() { field_0x3400 = 0.0f; field_0x3404 = 0.0f; field_0x814.ClrCcMove(); - i_offNoResetFlg3(FLG3_UNK_20000000); + offNoResetFlg3(FLG3_UNK_20000000); field_0x3464 = 0.0f; field_0x3468 = 0.0f; @@ -17688,7 +17688,7 @@ void daAlink_c::posMove() { } f32 var_f0; - if (i_checkModeFlg(MODE_PLAYER_FLY)) { + if (checkModeFlg(MODE_PLAYER_FLY)) { var_f0 = 1.0f; } else { var_f0 = cM_scos(field_0x2ff0); @@ -17705,7 +17705,7 @@ void daAlink_c::posMove() { field_0x3464 = var_f0 * (sp78.z * temp_f30 + sp78.x * temp_f29); field_0x3464 = var_f0 * (sp78.z * temp_f29 - sp78.x * temp_f30); - if (i_checkMagneBootsOn()) { + if (checkMagneBootsOn()) { cXyz spD8; mDoMtx_stack_c::copy(mMagneBootMtx); mDoMtx_stack_c::YrotM(shape_angle.y); @@ -17721,11 +17721,11 @@ void daAlink_c::posMove() { } } - if (i_checkModeFlg(2) && current.pos.y > mFallHeight) { + if (checkModeFlg(2) && current.pos.y > mFallHeight) { mFallHeight = current.pos.y; } - if (i_checkMagneBootsOn()) { + if (checkMagneBootsOn()) { cXyz spCC; cXyz spC0 = current.pos + (mMagneBootsTopVec * l_autoUpHeight); cXyz spB4; @@ -17799,8 +17799,8 @@ asm void daAlink_c::autoGroundHit() { /* 800BDD70-800BDE20 0B86B0 00B0+00 2/2 0/0 0/0 .text startPeepChange__9daAlink_cFv */ bool daAlink_c::startPeepChange() { - if (!i_checkNoResetFlg0(FLG0_UNK_4000)) { - i_onNoResetFlg0(FLG0_UNK_4000); + if (!checkNoResetFlg0(FLG0_UNK_4000)) { + onNoResetFlg0(FLG0_UNK_4000); u32 mode; if (mProcID == PROC_PEEP_SUBJECTIVITY) { @@ -17836,15 +17836,15 @@ void daAlink_c::setLastSceneDamage(int i_dmgAmount, u32* o_mode) { /* 800BDE48-800BDF60 0B8788 0118+00 0/0 1/1 0/0 .text setLastSceneMode__9daAlink_cFPUl */ void daAlink_c::setLastSceneMode(u32* o_mode) { - if (i_checkEquipHeavyBoots()) { + if (checkEquipHeavyBoots()) { *o_mode |= 0x400000; } - if (i_checkWolf()) { + if (checkWolf()) { *o_mode |= 0x800000; } - if (i_checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != KANTERA) { + if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != KANTERA) { *o_mode |= 0x200000; } @@ -17874,11 +17874,11 @@ void daAlink_c::setLastSceneMode(u32* o_mode) { // matches with literals #ifdef NONMATCHING int daAlink_c::startRestartRoom(u32 i_mode, int param_1, int i_dmgAmount, int i_eventRun) { - if (!i_checkNoResetFlg0(FLG0_UNK_4000) && + if (!checkNoResetFlg0(FLG0_UNK_4000) && (i_eventRun != 0 || dComIfGp_event_compulsory(this, NULL, 0xFFFF))) { if (!checkRestartDead(i_dmgAmount, i_mode == 4)) { - i_onNoResetFlg0(FLG0_UNK_4000); + onNoResetFlg0(FLG0_UNK_4000); if (i_eventRun == 0) { mDemo.setOriginalDemoType(); @@ -17894,9 +17894,9 @@ int daAlink_c::startRestartRoom(u32 i_mode, int param_1, int i_dmgAmount, int i_ } // event flag 0x2008 = cleared snowpeak ruins - if (!i_dComIfGs_isEventBit(0x2008) && (checkBoardRide() || checkBoardRestart())) { + if (!dComIfGs_isEventBit(0x2008) && (checkBoardRide() || checkBoardRestart())) { i_mode = 11; - } else if (i_checkBoarSingleBattle() || + } else if (checkBoarSingleBattle() || (start_mode == 2 && !checkFinalBattle() && i_mode == 5)) { i_mode = 8; @@ -17930,7 +17930,7 @@ asm int daAlink_c::startRestartRoom(u32 param_0, int param_1, int param_2, int p /* 800BE26C-800BE2C0 0B8BAC 0054+00 2/2 0/0 0/0 .text checkCoachGuardGame__9daAlink_cFv */ BOOL daAlink_c::checkCoachGuardGame() { - return !i_checkBoarSingleBattle() && + return !checkBoarSingleBattle() && fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCoach, NULL); } @@ -17949,7 +17949,7 @@ void daAlink_c::checkRoofRestart() { if (mLinkAcch.ChkRoofHit() && (mLinkAcch.ChkGroundHit() || (spinner != NULL && spinner->checkGroundHit() && spinner->getJumpFlg() == 0)) && - !i_checkMagneBootsOn() && + !checkMagneBootsOn() && (mProcID != PROC_CRAWL_START && mProcID != PROC_CRAWL_END && !checkCoachGuardGame())) { s16 ac_name = getMoveBGActorName(mLinkAcch.m_roof, 1); @@ -18017,7 +18017,7 @@ asm s16 daAlink_c::getSceneExitMoveAngle() { int daAlink_c::checkSceneChange(int exitID) { s32 var_r3 = 0; - if (mProcID != PROC_FOG_DEAD && (field_0x3174 == 9 || i_checkNoResetFlg2(FLG2_UNK_4000))) { + if (mProcID != PROC_FOG_DEAD && (field_0x3174 == 9 || checkNoResetFlg2(FLG2_UNK_4000))) { var_r3 = 1; } @@ -18027,16 +18027,16 @@ int daAlink_c::checkSceneChange(int exitID) { if (var_r3 || ((exitID != 0x3F || mExitID != 0x3F) && - (i_checkModeFlg(0x40000) || i_checkModeFlg(0x400) || mLinkAcch.ChkGroundHit() || + (checkModeFlg(0x40000) || checkModeFlg(0x400) || mLinkAcch.ChkGroundHit() || mProcID == PROC_DOOR_OPEN || mProcID == PROC_WARP || mProcID == PROC_WOLF_DIG_THROUGH || (field_0x3174 == 5 && field_0x33c8 - current.pos.y > 500.0f))) || - (mExitID & 0x8000 && i_checkModeFlg(2))) + (mExitID & 0x8000 && checkModeFlg(2))) { if (field_0x3174 == 5 || (mExitID & 0x8000 && mExitDirection == 0xFF)) { mLinkAcch.i_ClrGroundHit(); } - if (i_checkNoResetFlg0(FLG0_UNK_4000)) { + if (checkNoResetFlg0(FLG0_UNK_4000)) { return 1; } else if (checkHorseRide()) { if (dComIfG_Bgsp().GetHorseNoEntry(mLinkAcch.m_gnd)) { @@ -18072,10 +18072,10 @@ int daAlink_c::checkSceneChange(int exitID) { exitSpeed = 15.0f; demoStick = 0.6f; } else { - exitSpeed = i_dComIfGp_getHorseActor()->getNormalMaxSpeedF(); + exitSpeed = dComIfGp_getHorseActor()->getNormalMaxSpeedF(); demoStick = 0.6f; } - } else if (i_checkWolf()) { + } else if (checkWolf()) { if (mNormalSpeed < 10.0f || var_r3) { exitSpeed = 10.0f; demoStick = 0.65f; @@ -18094,7 +18094,7 @@ int daAlink_c::checkSceneChange(int exitID) { s32 exitMode; if (ridingHorse) { exitMode = 1; - } else if (i_checkModeFlg(0x1000000)) { + } else if (checkModeFlg(0x1000000)) { exitSpeed = field_0x33a8; if (mUnderFrameCtrl[0].getRate() >= 0.0f) { exitMode = 2; @@ -18121,7 +18121,7 @@ int daAlink_c::checkSceneChange(int exitID) { sceneChanged = dStage_changeScene(mExitID, exitSpeed, exitMode, fopAcM_GetRoomNo(this), shape_angle.y, -1); if (sceneChanged) { - i_onNoResetFlg2(FLG2_SCN_CHG_START); + onNoResetFlg2(FLG2_SCN_CHG_START); if (mpScnChg != NULL && fopAcM_GetName(mpScnChg) == PROC_SCENE_EXIT) { mpScnChg->setSceneChangeOK(); } @@ -18139,7 +18139,7 @@ int daAlink_c::checkSceneChange(int exitID) { } if (sceneChanged) { - i_onNoResetFlg0(FLG0_UNK_4000); + onNoResetFlg0(FLG0_UNK_4000); if (!eventInfo.i_checkCommandDoor()) { mDemo.setOriginalDemoType(); @@ -18157,9 +18157,9 @@ int daAlink_c::checkSceneChange(int exitID) { mDemo.setMoveAngle(getSceneExitMoveAngle()); if (ridingHorse) { - daHorse_c* horse = i_dComIfGp_getHorseActor(); - horse->i_changeOriginalDemo(); - horse->i_changeDemoMode(6, 0); + daHorse_c* horse = dComIfGp_getHorseActor(); + horse->changeOriginalDemo(); + horse->changeDemoMode(6, 0); horse->changeDemoMoveAngle(mDemo.getMoveAngle()); horse->setDemoStickR(demoStick); } @@ -18394,8 +18394,8 @@ BOOL daAlink_c::setItemActor() { if (checkBombItem(mEquipItem)) { if (checkHorseRide()) { - if (!i_dComIfGp_getHorseActor()->checkNoBombProc() && - (mProcID != PROC_HORSE_TURN || !i_checkModeFlg(MODE_DISABLE_ITEMS))) + if (!dComIfGp_getHorseActor()->checkNoBombProc() && + (mProcID != PROC_HORSE_TURN || !checkModeFlg(MODE_DISABLE_ITEMS))) { mEquipItem = NO_ITEM; return 1; @@ -18453,12 +18453,12 @@ bool daPy_py_c::checkMagicArmorWearFlg() const { /* 800BFDB0-800BFDFC 0BA6F0 004C+00 28/28 0/0 0/0 .text checkZoraWearAbility__9daAlink_cCFv */ BOOL daAlink_c::checkZoraWearAbility() const { - return (!i_checkWolf() && checkZoraWearFlg()) && !i_checkNoResetFlg2(FLG2_UNK_80000); + return (!checkWolf() && checkZoraWearFlg()) && !checkNoResetFlg2(FLG2_UNK_80000); } /* 800BFDFC-800BFE48 0BA73C 004C+00 5/5 0/0 0/0 .text checkMagicArmorWearAbility__9daAlink_cCFv */ BOOL daAlink_c::checkMagicArmorWearAbility() const { - return (!i_checkWolf() && checkMagicArmorWearFlg()) && !i_checkNoResetFlg2(FLG2_UNK_80000); + return (!checkWolf() && checkMagicArmorWearFlg()) && !checkNoResetFlg2(FLG2_UNK_80000); } /* 800BFE48-800BFF04 0BA788 00BC+00 9/9 0/0 0/0 .text loadAramBmd__9daAlink_cFUsUl */ @@ -18590,32 +18590,32 @@ int daAlink_c::checkItemSetButton(int i_itemNo) { /* 800C0284-800C02C8 0BABC4 0044+00 1/1 0/0 0/0 .text checkField__9daAlink_cFv */ bool daAlink_c::checkField() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_FIELD; + return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_FIELD; } /* 800C02C8-800C0310 0BAC08 0048+00 6/6 0/0 0/0 .text checkBossRoom__9daAlink_cFv */ bool daAlink_c::checkBossRoom() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_BOSS_ROOM; + return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_BOSS_ROOM; } /* 800C0310-800C0358 0BAC50 0048+00 4/4 0/0 0/0 .text checkDungeon__9daAlink_cFv */ bool daAlink_c::checkDungeon() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_DUNGEON; + return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_DUNGEON; } /* 800C0358-800C03A0 0BAC98 0048+00 3/3 0/0 0/0 .text checkCastleTown__9daAlink_cFv */ bool daAlink_c::checkCastleTown() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_CASTLE_TOWN; + return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_CASTLE_TOWN; } /* 800C03A0-800C03E8 0BACE0 0048+00 6/6 0/0 1/1 .text checkCloudSea__9daAlink_cFv */ bool daAlink_c::checkCloudSea() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_CLOUD_SEA; + return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_CLOUD_SEA; } /* 800C03E8-800C044C 0BAD28 0064+00 5/5 0/0 0/0 .text checkRoomOnly__9daAlink_cFv */ bool daAlink_c::checkRoomOnly() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_ROOM || + return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_ROOM || checkLv7DungeonShop(); } @@ -18703,7 +18703,7 @@ int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) { if (i_procType == ITEM_PROC_GRASS_WHISTLE) { procGrassWhistleWaitInit(3, -1, 0, 0, NULL); } else if (i_procType == ITEM_PROC_BOTTLE_DRINK) { - if (i_checkReinRide()) { + if (checkReinRide()) { procHorseBottleDrinkInit(sel_item); } else if (checkCanoeRide()) { procCanoeBottleDrinkInit(sel_item); @@ -18711,7 +18711,7 @@ int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) { procBottleDrinkInit(sel_item); } } else if (i_procType == ITEM_PROC_KANDELAAR_POUR) { - if (i_checkReinRide()) { + if (checkReinRide()) { procHorseKandelaarPourInit(); } else if (checkCanoeRide()) { procCanoeKandelaarPourInit(); @@ -18746,7 +18746,7 @@ int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) { field_0x2fde = NO_ITEM; itemEquip(sel_item); - if (i_dComIfGp_checkPlayerStatus0(0, 0x2000) && + if (dComIfGp_checkPlayerStatus0(0, 0x2000) && ((checkBowAndSlingItem(field_0x2fde) || checkHookshotItem(field_0x2fde) || field_0x2fde == COPY_ROD) || field_0x2fde == BOOMERANG)) @@ -18787,11 +18787,11 @@ int daAlink_c::checkNewItemChange(u8 param_0) { ((sel_item == KANTERA || checkOilBottleItem(sel_item)) && checkWaterInKandelaarOffset(mWaterY)) || (checkCanoeRide() && checkStageName("F_SP127")) || checkCloudSea() || - ((i_checkModeFlg(0x40000) || i_checkNoResetFlg0(FLG0_UNDERWATER)) && + ((checkModeFlg(0x40000) || checkNoResetFlg0(FLG0_UNDERWATER)) && !checkAcceptUseItemInWater(sel_item)) || - (i_checkModeFlg(0x40000) && sel_item == WATER_BOMB) || !checkCastleTownUseItem(sel_item) || + (checkModeFlg(0x40000) && sel_item == WATER_BOMB) || !checkCastleTownUseItem(sel_item) || (checkBoardRide() && sel_item != 0x103) || - (i_checkModeFlg(0x400) && + (checkModeFlg(0x400) && (sel_item == EMPTY_BOTTLE || sel_item == POKE_BOMB || sel_item == IRONBALL || sel_item == COPY_ROD || checkFishingRodItem(sel_item))) || ((field_0x2fa8 == 6 || field_0x2fbd == 1 || field_0x2fbd == 2 || @@ -18801,10 +18801,10 @@ int daAlink_c::checkNewItemChange(u8 param_0) { (checkBossRoom() && checkDungeonWarpItem(sel_item)) || (sel_item == DUNGEON_EXIT && (checkLv7DungeonShop() || - (checkStageName("D_MN07") && i_fopAcM_isSwitch(this, 0x4D) && - !i_fopAcM_isSwitch(this, 0x18)) || + (checkStageName("D_MN07") && fopAcM_isSwitch(this, 0x4D) && + !fopAcM_isSwitch(this, 0x18)) || (checkStageName("D_MN10") && fopAcM_GetRoomNo(this) == 15))) || - (i_checkMagneBootsOn() && sel_item != 0x103 && !checkDrinkBottleItem(sel_item) && + (checkMagneBootsOn() && sel_item != 0x103 && !checkDrinkBottleItem(sel_item) && sel_item != HVY_BOOTS && !checkBowItem(sel_item))) { return ITEM_PROC_NONE; @@ -18813,7 +18813,7 @@ int daAlink_c::checkNewItemChange(u8 param_0) { (checkBottleItem(sel_item) && sel_item != EMPTY_BOTTLE) || sel_item == SPINNER || sel_item == POKE_BOMB || sel_item == HORSE_FLUTE || sel_item == HAWK_EYE) { - if (i_checkReinRide() || checkCanoeRide()) { + if (checkReinRide() || checkCanoeRide()) { if (checkDrinkBottleItem(sel_item)) { return ITEM_PROC_BOTTLE_DRINK; } @@ -18823,20 +18823,20 @@ int daAlink_c::checkNewItemChange(u8 param_0) { } } else if (sel_item == HVY_BOOTS) { if (!checkBoardRide()) { - if ((mLinkAcch.ChkGroundHit() && !i_checkModeFlg(0x70C52)) || - (i_checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) || + if ((mLinkAcch.ChkGroundHit() && !checkModeFlg(0x70C52)) || + (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) || mProcID == PROC_HANG_CLIMB) { return ITEM_PROC_BOOTS_EQUIP; } return ITEM_PROC_SET_HVYBOOTS; } - } else if (checkDrinkBottleItem(sel_item) && i_checkMagneBootsOn()) { + } else if (checkDrinkBottleItem(sel_item) && checkMagneBootsOn()) { if (cBgW_CheckBGround(mMagneBootsTopVec.y)) { return ITEM_PROC_BOTTLE_DRINK; } } else if (mLinkAcch.ChkGroundHit()) { - if (!i_checkModeFlg(0x70C52)) { + if (!checkModeFlg(0x70C52)) { if (sel_item == SPINNER) { cXyz sp38(current.pos.x, current.pos.y + l_autoUpHeight, current.pos.z); cXyz sp2C(sp38); @@ -18903,9 +18903,9 @@ int daAlink_c::checkNewItemChange(u8 param_0) { } else if (sel_item != NO_ITEM && mEquipItem != sel_item) { if ((checkBombItem(sel_item) && !dComIfGp_getSelectItemNum(param_0)) || ((sel_item == NORMAL_BOMB || sel_item == WATER_BOMB) && mActiveBombNum >= 3) || - (sel_item == IRONBALL && (!mLinkAcch.ChkGroundHit() || i_checkModeFlg(0x70C52))) || - (sel_item == KANTERA && (i_checkNoResetFlg0(FLG0_UNDERWATER) || - i_checkEndResetFlg1(ERFLG1_UNK_4) || i_checkModeFlg(0x40000)))) + (sel_item == IRONBALL && (!mLinkAcch.ChkGroundHit() || checkModeFlg(0x70C52))) || + (sel_item == KANTERA && (checkNoResetFlg0(FLG0_UNDERWATER) || + checkEndResetFlg1(ERFLG1_UNK_4) || checkModeFlg(0x40000)))) { return ITEM_PROC_NONE; } @@ -18994,15 +18994,15 @@ MtxP daAlink_c::getModelJointMtx(u16 param_0) { if (param_0 >= field_0x30c6) { return mpLinkModel->mBaseTransformMtx; } - return mpLinkModel->i_getAnmMtx(param_0); + return mpLinkModel->getAnmMtx(param_0); } /* 800C1DE0-800C1E0C 0BC720 002C+00 1/0 0/0 0/0 .text onFrollCrashFlg__9daAlink_cFUci */ void daAlink_c::onFrollCrashFlg(u8 param_0, int param_1) { if (param_1 != 0) { - i_onNoResetFlg0(FLG0_UNK_10); + onNoResetFlg0(FLG0_UNK_10); } else { - i_onNoResetFlg0(FLG0_UNK_8); + onNoResetFlg0(FLG0_UNK_8); } mRollCrashFlg = param_0; } @@ -19032,7 +19032,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { if (mProcID == PROC_TOOL_DEMO) { speed.y = 0.0f; resetDemoBck(); - if (i_checkModeFlg(MODE_RIDING)) { + if (checkModeFlg(MODE_RIDING)) { initForceRideHorse(); } @@ -19045,7 +19045,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { } } else if (mProcID == PROC_GRASS_WHISTLE_WAIT) { returnKeepItemData(); - } else if (i_checkModeFlg(MODE_UNK_20)) { + } else if (checkModeFlg(MODE_UNK_20)) { fopAc_ac_c* actor = field_0x280c.getActor(); if (enemy != NULL) { @@ -19065,13 +19065,13 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { field_0x280c.clearData(); if (mProcID == PROC_BOTTLE_SWING) { - i_offNoResetFlg2(FLG2_UNK_10000000); + offNoResetFlg2(FLG2_UNK_10000000); } } else if (mProcID == PROC_HOOKSHOT_FLY) { cancelHookshotCarry(); setOldRootQuaternion(shape_angle.x, 0, 0); cancelItemUseQuake(1); - } else if (i_dComIfGp_checkPlayerStatus1(0x02010000)) { + } else if (dComIfGp_checkPlayerStatus1(0x02010000)) { if (mProcID != PROC_HOOKSHOT_FLY) { cancelItemUseQuake(0); } @@ -19110,7 +19110,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { } bool temp_r31 = mProcID == PROC_FISHING_CAST; - i_offNoResetFlg0(FLG0_UNK_2); + offNoResetFlg0(FLG0_UNK_2); bool flg_20000_set = checkModeFlag(0x20000); bool flg_400_set = checkModeFlag(0x400); @@ -19163,13 +19163,13 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { if (temp_r31 && (mItemAcKeep.getActor() == NULL || mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt()) && - !i_checkEndResetFlg0(ERFLG0_UNK_1000)) + !checkEndResetFlg0(ERFLG0_UNK_1000)) { deleteEquipItem(0, 0); resetUpperAnime(UPPER_2, -1.0f); } - if (i_checkModeFlg(MODE_VINE_CLIMB)) { + if (checkModeFlg(MODE_VINE_CLIMB)) { mLinkAcch.SetRoofNone(); } else { mLinkAcch.ClrRoofNone(); @@ -19182,7 +19182,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { field_0x2f9e = 6; clearCutTurnEffectID(); - if (!i_checkModeFlg(MODE_SWIMMING) { + if (!checkModeFlg(MODE_SWIMMING) { field_0x3080 = 0; } @@ -19190,11 +19190,11 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { field_0x3088 = 0; field_0x308a = 0; - if (i_checkWolf()) { + if (checkWolf()) { shape_angle.z = 0; mBodyAngle.x = 0; mBodyAngle.y = 0; - } else if (!i_checkReinRide() && !checkBoardRide()) { + } else if (!checkReinRide() && !checkBoardRide()) { shape_angle.x = 0; shape_angle.z = 0; } @@ -19231,11 +19231,11 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { field_0x2f99 = 0x20; } - if (i_checkModeFlg(0x40840) || mProcID == PROC_BOSS_BODY_HANG) { + if (checkModeFlg(0x40840) || mProcID == PROC_BOSS_BODY_HANG) { field_0x2f99 = 0x50; } - if (i_checkModeFlg(MODE_NO_COLLISION) || mProcID == PROC_STEP_MOVE || mProcID == PROC_WOLF_TAG_JUMP) { + if (checkModeFlg(MODE_NO_COLLISION) || mProcID == PROC_STEP_MOVE || mProcID == PROC_WOLF_TAG_JUMP) { mLinkAcch.OffLineCheck(); mLinkAcch.OnLineCheckNone(); } else { @@ -19251,16 +19251,16 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { field_0x2ba4 = 0.0f; } - i_onNoResetFlg0(FLG0_PLAYER_NO_DRAW); + onNoResetFlg0(FLG0_PLAYER_NO_DRAW); if (mProcID != PROC_WOLF_FALL && mProcID != PROC_WOLF_LAND) { - i_offNoResetFlg2(FLG2_UNK_200); + offNoResetFlg2(FLG2_UNK_200); } - i_offNoResetFlg2(0x11102); - i_offResetFlg0(RFLG0_UNK_2); - i_offNoResetFlg1(0x48004001); - i_offNoResetFlg0(0x80018); + offNoResetFlg2(0x11102); + offResetFlg0(RFLG0_UNK_2); + offNoResetFlg1(0x48004001); + offNoResetFlg0(0x80018); field_0x28f8 = -1; mSight.offDrawFlg(); @@ -19275,11 +19275,11 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { field_0x3078 = 0; - if ((!checkEquipAnime() || !i_checkModeFlg(4) && - ((!i_checkModeFlg(MODE_SWIMMING) || !checkWolfEnemyThrowAnime()) && !checkModeFlg(MODE_UNK_1000))) || + if ((!checkEquipAnime() || !checkModeFlg(4) && + ((!checkModeFlg(MODE_SWIMMING) || !checkWolfEnemyThrowAnime()) && !checkModeFlg(MODE_UNK_1000))) || (checkSwordTwirlAnime() && mProcID != PROC_ATN_ACTOR_WAIT && mProcID != PROC_ATN_ACTOR_MOVE) || - (i_checkWolf() && checkFmChainGrabAnime() && i_checkModeFlg(MODE_NO_COLLISION)) || - i_checkNoResetFlg1(FLG1_UNK_40)) + (checkWolf() && checkFmChainGrabAnime() && checkModeFlg(MODE_NO_COLLISION)) || + checkNoResetFlg1(FLG1_UNK_40)) { if ((!checkDkCaught2Anime() || mProcID != PROC_DAMAGE) && !checkNoSetUpperAnime()) { resetUpperAnime(UPPER_2, 4.0f); @@ -19290,7 +19290,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { } } - if (!i_checkModeFlg(MODE_GRAB_PLACE) && !checkGrabAnime() && + if (!checkModeFlg(MODE_GRAB_PLACE) && !checkGrabAnime() && !checkWolfGrabAnime() && mGrabItemAcKeep.getActor() != NULL) { freeGrabItem(); } @@ -19299,8 +19299,8 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { cancelHookshotCarry(); } - if ((i_dComIfGp_checkPlayerStatus0(0, 8) && !i_checkModeFlg(MODE_VINE_CLIMB) && mProcID != PROC_HANG_CLIMB) || - ((i_dComIfGp_checkPlayerStatus1(0, 0x2000000) && mProcID != PROC_HOOKSHOT_WALL_SHOOT && mProcID != PROC_HOOKSHOT_WALL_WAIT)) { + if ((dComIfGp_checkPlayerStatus0(0, 8) && !checkModeFlg(MODE_VINE_CLIMB) && mProcID != PROC_HANG_CLIMB) || + ((dComIfGp_checkPlayerStatus1(0, 0x2000000) && mProcID != PROC_HOOKSHOT_WALL_SHOOT && mProcID != PROC_HOOKSHOT_WALL_WAIT)) { if (mProcID == PROC_CLIMB_TO_ROOF) { current.pos.x += 10.0f * cM_ssin(shape_angle.y); current.pos.z += 10.0f * cM_scos(shape_angle.y); @@ -19310,30 +19310,30 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { } } - if (i_dComIfGp_checkPlayerStatus0(0, 0x200000)) { + if (dComIfGp_checkPlayerStatus0(0, 0x200000)) { seStartSystem(Z2SE_AL_HAWK_EYE_PUTOFF); } if (checkUpperReadyThrowAnime() && mEquipItem != 0x102) { - i_dComIfGp_clearPlayerStatus0(0, 0xfeb5ab0f); + dComIfGp_clearPlayerStatus0(0, 0xfeb5ab0f); } else { - i_dComIfGp_clearPlayerStatus0(0, 0xffbfffcf); + dComIfGp_clearPlayerStatus0(0, 0xffbfffcf); } - i_dComIfGp_clearPlayerStatus1(0,0x7fb7b78); + dComIfGp_clearPlayerStatus1(0,0x7fb7b78); cancelHookshotShot(); if (mEquipItem == noentry77) { deleteEquipItem(0, 0); } - if ((mModeFlg >> 1) % 2 && i_checkModeFlg(MODE_JUMP)) { + if ((mModeFlg >> 1) % 2 && checkModeFlg(MODE_JUMP)) { mLastJumpPos = current.pos; mFallHeight = mLastJumpPos.y; field_0x33c8 = mLastJumpPos.y; } - if (!i_checkModeFlg(MODE_RIDING) && flg_400_set) { + if (!checkModeFlg(MODE_RIDING) && flg_400_set) { rideGetOff(); } @@ -19341,8 +19341,8 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { resetUnderAnime(UNDER_2, -1.0f); } - if (i_checkModeFlg(MODE_VINE_CLIMB | MODE_NO_COLLISION)) { - if (i_checkWolf()) { + if (checkModeFlg(MODE_VINE_CLIMB | MODE_NO_COLLISION)) { + if (checkWolf()) { field_0x814.SetWeight(0xFF); } else { field_0x814.SetWeight(0xFE); @@ -19357,9 +19357,9 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { setBowNormalAnime(); } - if (flg_20000_set && !i_checkModeFlg(MODE_SWIMMING)) { + if (flg_20000_set && !checkModeFlg(MODE_SWIMMING)) { if (mProcID != PROC_CAUGHT && mProcID != PROC_HOOKSHOT_FLY && - !i_checkNoResetFlg0(FLG0_UNDERWATER)) + !checkNoResetFlg0(FLG0_UNDERWATER)) { swimOutAfter(0); } @@ -19367,13 +19367,13 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { setBgCheckParam(); - if ((i_checkNoResetFlg2(FLG2_UNK_40) && mProcID != PROC_WOLF_ENEMY_HANG_BITE) || - (i_checkNoResetFlg2(FLG2_UNK_8) && mProcID != PROC_WOLF_ENEMY_THROW && !i_checkWolfEnemyThrowAnime())) { + if ((checkNoResetFlg2(FLG2_UNK_40) && mProcID != PROC_WOLF_ENEMY_HANG_BITE) || + (checkNoResetFlg2(FLG2_UNK_8) && mProcID != PROC_WOLF_ENEMY_THROW && !i_checkWolfEnemyThrowAnime())) { resetWolfEnemyBiteAll(); } fopAc_ac_c* actor = field_0x280c.getActor(); - if (actor != NULL && (mModeFlg >> 0x11) % 2 && !i_checkModeFlg(MODE_ROPE_WALK)) { + if (actor != NULL && (mModeFlg >> 0x11) % 2 && !checkModeFlg(MODE_ROPE_WALK)) { field_0x280c.clearData(); if (fopAcM_GetName(actor) == PROC_Obj_Crope) { diff --git a/src/d/a/d_a_alink_boom.inc b/src/d/a/d_a_alink_boom.inc index 42fc8873f34..53e576cf3ae 100644 --- a/src/d/a/d_a_alink_boom.inc +++ b/src/d/a/d_a_alink_boom.inc @@ -7,7 +7,7 @@ /* 800DFFE0-800E0010 0DA920 0030+00 0/0 0/0 1/1 .text checkBoomerangLockAccept__9daAlink_cFv */ BOOL daAlink_c::checkBoomerangLockAccept() { - return mSight.getDrawFlg() && i_dComIfGp_checkPlayerStatus0(0, 0x80000); + return mSight.getDrawFlg() && dComIfGp_checkPlayerStatus0(0, 0x80000); } /* 800E0010-800E00B0 0DA950 00A0+00 0/0 0/0 1/1 .text getBoomSpeed__9daAlink_cFv */ @@ -19,7 +19,7 @@ f32 daAlink_c::getBoomSpeed() { speed = daAlinkHIO_boom_c0::m.mFlySpeed; } - if (i_checkModeFlg(0x400)) { + if (checkModeFlg(0x400)) { fopAc_ac_c* ride_actor = mRideAcKeep.getActor(); if (ride_actor != NULL && ride_actor->speedF > FLOAT_LABEL(lit_6108)) { speed += ride_actor->speedF; @@ -36,7 +36,7 @@ f32 daAlink_c::getBoomCatchSpeed() const { /* 800E00C0-800E011C 0DAA00 005C+00 1/1 0/0 1/1 .text getBoomFlyMax__9daAlink_cCFv */ f32 daAlink_c::getBoomFlyMax() const { - if (i_checkModeFlg(0x400) && !checkCanoeRide()) { + if (checkModeFlg(0x400) && !checkCanoeRide()) { return daAlinkHIO_boom_c0::m.mHorsebackFlyDistMax; } else { return daAlinkHIO_boom_c0::m.mFlyDistMax; @@ -107,12 +107,12 @@ bool daAlink_c::checkBoomerangChargeEnd() { /* 800E02B8-800E03D0 0DABF8 0118+00 0/0 1/1 0/0 .text * checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c */ BOOL daAlink_c::checkBoomerangCarry(fopAc_ac_c* i_grabActor) { - if (i_checkNoResetFlg0(FLG0_UNK_20) && !checkEventRun() && !i_checkWolf() && - i_checkModeFlg(0x10000000) && + if (checkNoResetFlg0(FLG0_UNK_20) && !checkEventRun() && !checkWolf() && + checkModeFlg(0x10000000) && (checkHorseNoUpperAnime() || checkHorseTurnAnime() || checkBoomerangThrowAnime())) { deleteEquipItem(FALSE, FALSE); seStartOnlyReverb(JA_SE_LK_BOOM_CATCH); - i_offNoResetFlg0(FLG0_UNK_20); + offNoResetFlg0(FLG0_UNK_20); setGrabItemActor(i_grabActor); field_0x33e4 = lit_8785; @@ -146,7 +146,7 @@ BOOL daAlink_c::checkBoomerangAnime() const { /* 800E04AC-800E04E8 0DADEC 003C+00 13/13 0/0 0/0 .text checkBoomerangThrowAnime__9daAlink_cCFv */ BOOL daAlink_c::checkBoomerangThrowAnime() const { - return (mEquipItem == BOOMERANG || i_checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == noentry71) && + return (mEquipItem == BOOMERANG || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == noentry71) && checkUpperAnime(0x53); } @@ -155,14 +155,14 @@ void daAlink_c::setBoomerangReadyQuake() { f32 tmp_0 = FLOAT_LABEL(lit_6108); dComIfGp_getVibration().StartQuake(1, 1, cXyz(tmp_0, lit_6040, tmp_0)); - i_onNoResetFlg3(FLG3_UNK_4); + onNoResetFlg3(FLG3_UNK_4); mItemVar0.field_0x3018 = daAlinkHIO_boom_c0::m.mChargeTime; } /* 800E055C-800E05E8 0DAE9C 008C+00 2/2 0/0 0/0 .text setBoomerangReadyAnime__9daAlink_cFv */ void daAlink_c::setBoomerangReadyAnime() { f32 var_f31; - if (i_checkAttentionLock()) { + if (checkAttentionLock()) { var_f31 = daAlinkHIO_boom_c0::m.mIdleAnmSpeed; } else { var_f31 = FLOAT_LABEL(lit_6108); @@ -192,7 +192,7 @@ void daAlink_c::setBoomerangCatchAnime() { /* 800E06B8-800E08C4 0DAFF8 020C+00 1/1 0/0 0/0 .text throwBoomerang__9daAlink_cFv */ void daAlink_c::throwBoomerang() { daBoomerang_c* item = (daBoomerang_c*)mItemAcKeep.getActor(); - i_onNoResetFlg1(FLG1_UNK_2); + onNoResetFlg1(FLG1_UNK_2); //! @bug `item` pointer is being accessed without checking if NULL first BOOL boomerang_item = fopAcM_GetName(item) == PROC_BOOMERANG; @@ -231,7 +231,7 @@ void daAlink_c::throwBoomerang() { voiceStart(Z2SE_AL_V_ATTACK_S); - if (i_checkModeFlg(MODE_RIDING)) { + if (checkModeFlg(MODE_RIDING)) { if (checkCanoeRide()) { procCanoeWaitInit(0); } else { @@ -258,18 +258,18 @@ void daAlink_c::throwBoomerang() { int daAlink_c::returnBoomerang(int param_0) { dComIfGp_clearPlayerStatus0(0, 0x400000); - if (mEquipItem == NO_ITEM && !i_checkMagneBootsOn() && mItemAcKeep.getActor() == NULL && - !checkBoardRide() && !checkBoarRide() && !i_checkWolf() && + if (mEquipItem == NO_ITEM && !checkMagneBootsOn() && mItemAcKeep.getActor() == NULL && + !checkBoardRide() && !checkBoarRide() && !checkWolf() && (mProcID != PROC_HANG_READY || field_0x3198 != 3) && (!checkEventRun() || param_0 != 0) && (checkNoUpperAnime() || checkPlayerGuard() || checkHorseTurnAnime() || checkDashDamageAnime() || checkBoomerangAnime()) && - !i_checkModeFlg(0x1BD0810)) { + !checkModeFlg(0x1BD0810)) { mItemAcKeep = mThrowBoomerangAcKeep; mThrowBoomerangAcKeep.clearData(); mEquipItem = BOOMERANG; field_0x2f94 = 2; - i_onNoResetFlg0(FLG0_UNK_20); + onNoResetFlg0(FLG0_UNK_20); f32 tmp_0 = FLOAT_LABEL(lit_6108); dComIfGp_getVibration().StartShock(1, 1, cXyz(tmp_0, lit_6040, tmp_0)); @@ -313,7 +313,7 @@ void daAlink_c::checkUpperItemActionBoomerangFly() { int daAlink_c::checkNextActionBoomerang() { if ((checkBoomerangCatchAnime() && mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) || - i_checkNoResetFlg1(FLG1_UNK_2)) { + checkNoResetFlg1(FLG1_UNK_2)) { return 0; } @@ -325,13 +325,13 @@ int daAlink_c::checkNextActionBoomerang() { setBoomerangReadyAnime(); setFastShotTimer(); - if (!i_checkAttentionLock()) { + if (!checkAttentionLock()) { field_0x2fe4 = shape_angle.y; } } - if (!i_checkAttentionLock() && mFastShotTime == 0) { - if (i_checkModeFlg(0x400)) { + if (!checkAttentionLock() && mFastShotTime == 0) { + if (checkModeFlg(0x400)) { if (checkCanoeRide()) { return procCanoeBoomerangSubjectInit(); } else { @@ -340,7 +340,7 @@ int daAlink_c::checkNextActionBoomerang() { } else { return procBoomerangSubjectInit(); } - } else if (i_checkModeFlg(0x400)) { + } else if (checkModeFlg(0x400)) { if (checkCanoeRide()) { return procCanoeBoomerangMoveInit(); } else { @@ -353,10 +353,10 @@ int daAlink_c::checkNextActionBoomerang() { /* 800E0D8C-800E0E64 0DB6CC 00D8+00 1/1 0/0 0/0 .text checkBoomerangCatchAction__9daAlink_cFv */ int daAlink_c::checkBoomerangCatchAction() { - if (i_checkNoResetFlg0(FLG0_UNK_20)) { - if (!checkEventRun() && !i_checkWolf() && i_checkModeFlg(0x10000000)) { + if (checkNoResetFlg0(FLG0_UNK_20)) { + if (!checkEventRun() && !checkWolf() && checkModeFlg(0x10000000)) { if (checkNoUpperAnime() || checkHorseTurnAnime() || checkBoomerangThrowAnime()) { - if (i_checkModeFlg(0x1) && !i_checkModeFlg(0x400)) { + if (checkModeFlg(0x1) && !checkModeFlg(0x400)) { return procBoomerangCatchInit(); } @@ -364,7 +364,7 @@ int daAlink_c::checkBoomerangCatchAction() { } } - i_offNoResetFlg0(FLG0_UNK_20); + offNoResetFlg0(FLG0_UNK_20); } return FALSE; @@ -484,7 +484,7 @@ int daAlink_c::procBoomerangCatchInit() { setSingleAnimeParam(ANM_BOOMERANG_CATCH, &daAlinkHIO_boom_c0::m.mCatchAnm); setBoomerangCatchAnime(); - i_offNoResetFlg0(FLG0_UNK_20); + offNoResetFlg0(FLG0_UNK_20); return 1; } @@ -492,7 +492,7 @@ int daAlink_c::procBoomerangCatchInit() { /* 800E1248-800E12E0 0DBB88 0098+00 1/0 0/0 0/0 .text procBoomerangCatch__9daAlink_cFv */ int daAlink_c::procBoomerangCatch() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (frameCtrl->getFrame() > daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) { onModeFlg(4); diff --git a/src/d/a/d_a_alink_bottle.inc b/src/d/a/d_a_alink_bottle.inc index d5876773923..ff27e96b51f 100644 --- a/src/d/a/d_a_alink_bottle.inc +++ b/src/d/a/d_a_alink_bottle.inc @@ -11,10 +11,10 @@ */ int daAlink_c::bottleModelCallBack() { if (mItemMode != 0) { - mDoMtx_stack_c::copy(mpLinkModel->i_getAnmMtx(field_0x30c2)); + mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(field_0x30c2)); mDoMtx_stack_c::transM(lit_14616, lit_6041, lit_16570); mDoMtx_stack_c::XYZrotM(cM_deg2s(102.0f), cM_deg2s(-0.5f), cM_deg2s(-122.0f)); - mDoMtx_copy(mDoMtx_stack_c::get(), mHeldItemModel->i_getAnmMtx(1)); + mDoMtx_copy(mDoMtx_stack_c::get(), mHeldItemModel->getAnmMtx(1)); } return 1; @@ -186,26 +186,26 @@ int daAlink_c::commonBottleDrink(int param_0) { mEquipItem != CHUCHU_PURPLE) { if (mEquipItem == LV1_SOUP) { - i_dComIfGp_setItemLifeCount(8, 0); + dComIfGp_setItemLifeCount(8, 0); } else if (mEquipItem == LV2_SOUP) { - i_dComIfGp_setItemLifeCount(16, 0); + dComIfGp_setItemLifeCount(16, 0); } else if (mEquipItem == LV3_SOUP) { - i_dComIfGp_setItemLifeCount(32, 0); + dComIfGp_setItemLifeCount(32, 0); } else if (mEquipItem == BEE_CHILD) { field_0x2fd3 = 3; - i_dComIfGp_setItemLifeCount(dComIfGp_getSelectItemNum(mSelectItemId), 0); + dComIfGp_setItemLifeCount(dComIfGp_getSelectItemNum(mSelectItemId), 0); } else if (mEquipItem == RED_BOTTLE || mEquipItem == CHUCHU_RED || mEquipItem == RED_BOTTLE_2) { - i_dComIfGp_setItemLifeCount(32, 0); + dComIfGp_setItemLifeCount(32, 0); } else if (mEquipItem == MILK_BOTTLE || mEquipItem == HALF_MILK_BOTTLE) { - i_dComIfGp_setItemLifeCount(12, 0); + dComIfGp_setItemLifeCount(12, 0); } else if (mEquipItem == BLUE_BOTTLE || mEquipItem == CHUCHU_BLUE || mEquipItem == HOT_SPRING) { - i_dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0); + dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0); } else if (mEquipItem == CHUCHU_RARE || mEquipItem == FAIRY_DROP) { - i_dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0); + dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0); } } voiceStart(Z2SE_AL_V_DRINK); @@ -214,7 +214,7 @@ int daAlink_c::commonBottleDrink(int param_0) { mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x071c); } } else if (current_anm == getMainBckData(ANM_BOTTLE_DRINK)->m_underID) { - if (dComIfGp_getItemNowLife() == i_dComIfGs_getLife()) { + if (dComIfGp_getItemNowLife() == dComIfGs_getLife()) { mpHookTipModel = NULL; if (mEquipItem == MILK_BOTTLE) { @@ -236,12 +236,12 @@ int daAlink_c::commonBottleDrink(int param_0) { mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0720); } else if (simpleAnmPlay(field_0x0720)) { if (mEquipItem == UGLY_SOUP) { - if (i_dComIfGs_getLife() <= 2) { + if (dComIfGs_getLife() <= 2) { mItemVar0.mBottleItemHealAmount = dComIfGs_getMaxLifeGauge(); - } else if (i_dComIfGs_getLife() <= 4) { + } else if (dComIfGs_getLife() <= 4) { mItemVar0.mBottleItemHealAmount = - (dComIfGs_getMaxLifeGauge() / 2) - i_dComIfGs_getLife(); - } else if (i_dComIfGs_getLife() == dComIfGs_getMaxLifeGauge() || + (dComIfGs_getMaxLifeGauge() / 2) - dComIfGs_getLife(); + } else if (dComIfGs_getLife() == dComIfGs_getMaxLifeGauge() || cM_rnd() < 0.5f) { mItemVar0.mBottleItemHealAmount = -4; @@ -254,7 +254,7 @@ int daAlink_c::commonBottleDrink(int param_0) { if (rnd < 1.0f) { mItemVar0.mBottleItemHealAmount = dComIfGs_getMaxLifeGauge(); } else if (rnd < 2.0f) { - mItemVar0.mBottleItemHealAmount = -(i_dComIfGs_getLife() - 1); + mItemVar0.mBottleItemHealAmount = -(dComIfGs_getLife() - 1); if (mItemVar0.mBottleItemHealAmount == 0) { mItemVar0.mBottleItemHealAmount = -1; } @@ -308,7 +308,7 @@ int daAlink_c::commonBottleDrink(int param_0) { mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0718); } else if (mItemVar0.mBottleItemHealAmount >= 0 && frameCtrl_p->checkPass(21.0f)) { if (mItemVar0.mBottleItemHealAmount > 0) { - i_dComIfGp_setItemLifeCount(mItemVar0.mBottleItemHealAmount, 0); + dComIfGp_setItemLifeCount(mItemVar0.mBottleItemHealAmount, 0); } voiceStart(Z2SE_AL_V_DRINK_2); @@ -318,10 +318,10 @@ int daAlink_c::commonBottleDrink(int param_0) { } else if (frameCtrl_p->checkPass(17.0f)) { mDoAud_seStart(Z2SE_AL_DAMAGE_SMALL, NULL, 0, 0); - if (i_dComIfGs_getLife() <= -mItemVar0.mBottleItemHealAmount) { - i_dComIfGp_setItemLifeCount(-(i_dComIfGs_getLife() - 1), 0); + if (dComIfGs_getLife() <= -mItemVar0.mBottleItemHealAmount) { + dComIfGp_setItemLifeCount(-(dComIfGs_getLife() - 1), 0); } else { - i_dComIfGp_setItemLifeCount(mItemVar0.mBottleItemHealAmount, 0); + dComIfGp_setItemLifeCount(mItemVar0.mBottleItemHealAmount, 0); } } } @@ -360,10 +360,10 @@ asm int daAlink_c::commonBottleDrink(int param_0) { fopAc_ac_c* daAlink_c::makeFairy(cXyz* i_pos, u32 i_params) { cXyz fairy_pos; - if (i_checkModeFlg(0x40000)) { + if (checkModeFlg(0x40000)) { fairy_pos = *i_pos; - if (i_checkWolf()) { + if (checkWolf()) { fairy_pos.y -= lit_8247; } else { fairy_pos.y -= lit_6896; @@ -377,7 +377,7 @@ fopAc_ac_c* daAlink_c::makeFairy(cXyz* i_pos, u32 i_params) { &shape_angle, NULL, -1, NULL, NULL); field_0x285c.setData(fairy_actor); - i_onResetFlg0(RFLG0_UNK_400); + onResetFlg0(RFLG0_UNK_400); if (checkEventRun() && field_0x285c.getActor() != NULL) { fopAcM_OnStatus(field_0x285c.getActor(), 0x800); @@ -398,7 +398,7 @@ int daAlink_c::procBottleDrinkInit(u16 i_itemNo) { return 0; } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); } commonProcInit(PROC_BOTTLE_DRINK); @@ -440,7 +440,7 @@ int daAlink_c::procBottleOpenInit(u16 param_0) { return 0; } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); commonProcInit(PROC_BOTTLE_OPEN); current.angle.y = shape_angle.y; mNormalSpeed = FLOAT_LABEL(lit_6108); @@ -612,7 +612,7 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) { if (var_r31 != NULL) { field_0x280c.setData(var_r31); } else { - var_r31 = i_dComIfGp_att_getCatghTarget(); + var_r31 = dComIfGp_att_getCatghTarget(); } BOOL temp_r3; @@ -641,7 +641,7 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) { setSingleAnimeParam(ANM_BOTTLE_SCOOP, &daAlinkHIO_bottle_c0::m.mScoopAnm); if (mEquipItem == KANTERA) { - i_onNoResetFlg2(FLG2_UNK_10000000); + onNoResetFlg2(FLG2_UNK_10000000); JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x31c4); if (emitter_p != NULL) { @@ -705,8 +705,8 @@ int daAlink_c::procBottleSwing() { dComIfGp_setPlayerStatus1(0, 0x4000000); - if (i_dComIfGp_att_getCatghTarget() != NULL) { - fopAcM_OnStatus(i_dComIfGp_att_getCatghTarget(), 0x800); + if (dComIfGp_att_getCatghTarget() != NULL) { + fopAcM_OnStatus(dComIfGp_att_getCatghTarget(), 0x800); } else if (field_0x280c.getActor() != NULL) { fopAcM_OnStatus(field_0x280c.getActor(), 0x800); } @@ -742,14 +742,14 @@ int daAlink_c::procBottleSwing() { mHeldItemModel->getModelData()->getMaterialNodePointer(0)->getShape()->hide(); } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); } } else if (frameCtrl_p->getFrame() <= field_0x347c) { if (getReadyItem() == EMPTY_BOTTLE && - (i_dComIfGp_att_getCatghTarget() != NULL || + (dComIfGp_att_getCatghTarget() != NULL || (field_0x2fbc != 11 && field_0x2fbc != 6 && mWaterY > current.pos.y + 10.0f))) { - fopAcM_orderCatchEvent(this, i_dComIfGp_att_getCatghTarget(), 0, 0); + fopAcM_orderCatchEvent(this, dComIfGp_att_getCatghTarget(), 0, 0); } else if (mEquipItem == KANTERA) { if (field_0x280c.getActor() != NULL) { fopAcM_orderCatchEvent(this, field_0x280c.getActor(), 0, 0); @@ -838,7 +838,7 @@ int daAlink_c::procBottleGetInit(int param_0) { } // event flag 0x4A40: Ordon Day 1 completed - if (mEquipItem == BEE_CHILD && i_dComIfGs_isEventBit(0x4A40)) { + if (mEquipItem == BEE_CHILD && dComIfGs_isEventBit(0x4A40)) { dComIfGs_onEventBit(0x4C80); // event flag 0x4C80: Collected Bee Larva on Ordon Day 2 } diff --git a/src/d/a/d_a_alink_bow.inc b/src/d/a/d_a_alink_bow.inc index de6af991913..7788f7f6af2 100644 --- a/src/d/a/d_a_alink_bow.inc +++ b/src/d/a/d_a_alink_bow.inc @@ -13,7 +13,7 @@ void daAlink_c::getArrowFlyData(f32* o_distance, f32* o_speed, int i_forceCharge if (mEquipItem == PACHINKO) { *o_distance = daAlinkHIO_bow_c0::m.mSlingshotDistance; *o_speed = daAlinkHIO_bow_c0::m.mSlingshotSpeed; - } else if (i_dComIfGp_checkPlayerStatus0(0, 0x200000)) { + } else if (dComIfGp_checkPlayerStatus0(0, 0x200000)) { *o_distance = daAlinkHIO_bow_c0::m.mScopeArrowDistance; *o_speed = daAlinkHIO_bow_c0::m.mScopeArrowSpeed; } else if (field_0x301c == 0 || i_forceCharge) { @@ -79,9 +79,9 @@ cXyz* daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) { } s16 var_28; - if (checkHorseRide() && i_checkBoarSingleBattle() && i_dComIfGp_getHorseActor() != NULL) { - var_28 = i_dComIfGp_getHorseActor()->shape_angle.y; - } else if (i_checkMagneBootsOn()) { + if (checkHorseRide() && checkBoarSingleBattle() && dComIfGp_getHorseActor() != NULL) { + var_28 = dComIfGp_getHorseActor()->shape_angle.y; + } else if (checkMagneBootsOn()) { var_28 = field_0x3118; } else { var_28 = shape_angle.y; @@ -136,7 +136,7 @@ void daAlink_c::deleteArrow() { if (arrow_p != NULL && fopAcM_GetName(arrow_p) == PROC_ARROW) { if (arrow_p->checkBombArrow() && - (mDamageTimer == daAlinkHIO_damage_c0::m.mInvincibleTime || i_checkModeFlg(8))) + (mDamageTimer == daAlinkHIO_damage_c0::m.mInvincibleTime || checkModeFlg(8))) { arrow_p->setBombArrowExplode(); dComIfGp_addSelectItemNum(mSelectItemId, -1); @@ -165,7 +165,7 @@ void daAlink_c::changeArrowType() { if (checkCanoeSlider() || (mEquipItem == BOW && field_0x301e == 0) || (mEquipItem == BOMB_ARROW && field_0x301e == 0 && dComIfGp_getSelectItemNum(mSelectItemId) == 0) || - (mEquipItem == HAWK_ARROW && i_checkAttentionLock())) + (mEquipItem == HAWK_ARROW && checkAttentionLock())) { return; } @@ -174,7 +174,7 @@ void daAlink_c::changeArrowType() { if (arrowChangeTrigger()) { if (mEquipItem == HAWK_ARROW) { - if (i_dComIfGp_checkPlayerStatus0(0, 0x200000)) { + if (dComIfGp_checkPlayerStatus0(0, 0x200000)) { dComIfGp_clearPlayerStatus0(0, 0x200000); seStartSystem(Z2SE_AL_HAWK_EYE_PUTOFF); } else { @@ -209,12 +209,12 @@ asm void daAlink_c::changeArrowType() { /* 800DED88-800DEE1C 0D96C8 0094+00 1/1 0/0 0/0 .text cancelBowMoveRideNotAtn__9daAlink_cFv */ BOOL daAlink_c::cancelBowMoveRideNotAtn() { - return i_checkModeFlg(0x400) && i_checkAttentionLock() && mTargetedActor == NULL; + return checkModeFlg(0x400) && checkAttentionLock() && mTargetedActor == NULL; } /* 800DEE1C-800DEEDC 0D975C 00C0+00 3/3 0/0 0/0 .text cancelBowMove__9daAlink_cFv */ BOOL daAlink_c::cancelBowMove() { - if (mTargetedActor == NULL && !i_checkAttentionLock() && mFastShotTime == 0 && + if (mTargetedActor == NULL && !checkAttentionLock() && mFastShotTime == 0 && !checkBowReadyAnime() && (!checkBowShootAnime() || mUpperFrameCtrl[2].checkAnmEnd())) { resetUpperAnime(UPPER_2, lit_6041); @@ -240,7 +240,7 @@ void daAlink_c::setBowReadyAnime() { setUpperAnimeBase(0xD); - if (i_checkResetFlg0(RFLG0_UNK_80)) { + if (checkResetFlg0(RFLG0_UNK_80)) { mItemMode = 0; } else { mItemMode = 3; @@ -299,7 +299,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { frameCtrl_p->setRate(1.0f); } } else { - i_onResetFlg0(RFLG0_UNK_10); + onResetFlg0(RFLG0_UNK_10); cancelItemUseQuake(0); } } @@ -367,7 +367,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { dComIfGp_setItemArrowNumCount(-1); mItemAcKeep.clearData(); - i_onResetFlg0(RFLG0_UNK_20000000); + onResetFlg0(RFLG0_UNK_20000000); field_0x30a4 = daAlinkHIO_bow_c0::m.mBombArrowHoldTime; } else { seStartOnlyReverb(Z2SE_AL_ARROW_EMPTY); @@ -392,7 +392,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { if (mEquipItem != PACHINKO) { changeItemBck(0x42, 0.0f); dComIfGp_getVibration().StartQuake(1, 1, cXyz(0.0f, 1.0f, 0.0f)); - i_onNoResetFlg3(FLG3_UNK_4); + onNoResetFlg3(FLG3_UNK_4); } } } else if (checkBowWaitAnime()) { @@ -490,7 +490,7 @@ int daAlink_c::checkNextActionBow() { setBowReadyAnime(); setFastShotTimer(); - if (!i_checkAttentionLock()) { + if (!checkAttentionLock()) { field_0x2fe4 = shape_angle.y; } @@ -502,24 +502,24 @@ int daAlink_c::checkNextActionBow() { mFastShotTime = 0; } - if ((!i_checkAttentionLock() && !checkDashAnime()) || i_checkModeFlg(0x400)) { + if ((!checkAttentionLock() && !checkDashAnime()) || checkModeFlg(0x400)) { mFastShotTime = 0; - if (i_checkAttentionLock() && i_checkModeFlg(0x400)) { + if (checkAttentionLock() && checkModeFlg(0x400)) { mItemVar0.field_0x3018 = 1; } else { mItemVar0.field_0x3018 = 0; } - if (!i_checkResetFlg0(RFLG0_UNK_80)) { + if (!checkResetFlg0(RFLG0_UNK_80)) { mItemMode = 3; } } } BOOL rt; - if (!i_checkAttentionLock() && mFastShotTime == 0) { - if (i_checkModeFlg(0x400)) { + if (!checkAttentionLock() && mFastShotTime == 0) { + if (checkModeFlg(0x400)) { if (checkCanoeRide()) { rt = procCanoeBowSubjectInit(); } else { @@ -529,7 +529,7 @@ int daAlink_c::checkNextActionBow() { rt = procBowSubjectInit(); } } else { - if (i_checkModeFlg(0x400)) { + if (checkModeFlg(0x400)) { if (checkCanoeRide()) { rt = procCanoeBowMoveInit(); } else { @@ -587,7 +587,7 @@ asm void daAlink_c::setBowModel() { /* 800DFBC8-800DFC28 0DA508 0060+00 4/4 0/0 0/0 .text checkBowGrabLeftHand__9daAlink_cCFv */ bool daAlink_c::checkBowGrabLeftHand() const { - return i_checkReinRide() && !checkBowAnime(); + return checkReinRide() && !checkBowAnime(); } /* 800DFC28-800DFC70 0DA568 0048+00 6/6 0/0 0/0 .text setBowHangAnime__9daAlink_cFv */ @@ -608,7 +608,7 @@ void daAlink_c::setBowNormalAnime() { /* 800DFCD8-800DFD6C 0DA618 0094+00 3/3 0/0 0/0 .text setBowSight__9daAlink_cFv */ void daAlink_c::setBowSight() { - if (checkBowChargeWaitAnime() && !i_dComIfGp_checkPlayerStatus0(0, 0x200000)) { + if (checkBowChargeWaitAnime() && !dComIfGp_checkPlayerStatus0(0, 0x200000)) { cXyz sight_pos; f32 dist; f32 speed; @@ -670,7 +670,7 @@ int daAlink_c::procBowMove() { } mProcVar2.field_0x300c = 1; - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (!checkNextAction(0)) { f32 var_f31 = lit_6041; diff --git a/src/d/a/d_a_alink_canoe.inc b/src/d/a/d_a_alink_canoe.inc index 1ac9a578a76..3de26262a71 100644 --- a/src/d/a/d_a_alink_canoe.inc +++ b/src/d/a/d_a_alink_canoe.inc @@ -159,7 +159,7 @@ void daAlink_c::setArmReelAnime() { mUpperFrameCtrl[2].setRate(FLOAT_LABEL(lit_6108)); mNowAnmPackUpper[2].setRatio(lit_6040); field_0x2f97 = 8; - i_offNoResetFlg1(FLG1_UNK_8000); + offNoResetFlg1(FLG1_UNK_8000); } /* 800F4140-800F4490 0EEA80 0350+00 1/1 0/0 0/0 .text setFishingWaitAction__9daAlink_cFv diff --git a/src/d/a/d_a_alink_copyrod.inc b/src/d/a/d_a_alink_copyrod.inc index 02c7723c3bd..75edfb9ca62 100644 --- a/src/d/a/d_a_alink_copyrod.inc +++ b/src/d/a/d_a_alink_copyrod.inc @@ -73,7 +73,7 @@ BOOL daAlink_c::checkForestOldCentury() { /* 800E145C-800E1530 0DBD9C 00D4+00 1/0 0/0 0/0 .text checkCopyRodTopUse__9daAlink_cFv */ BOOL daAlink_c::checkCopyRodTopUse() { // Event flag 0x2580: Dominion Rod power restored - return (i_dComIfGs_isEventBit(0x2580) && !(mProcID == PROC_UNEQUIP && mProcVar3.field_0x300e.x != 0)) || + return (dComIfGs_isEventBit(0x2580) && !(mProcID == PROC_UNEQUIP && mProcVar3.field_0x300e.x != 0)) || i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x15 || checkForestOldCentury(); } @@ -120,7 +120,7 @@ void daAlink_c::setCopyRodModel() { mAtCps[0].OnAtSetBit(); mAtCps[0].SetAtHitCallback(NULL); mAtCps[0].SetAtMtrl(0); - mHeldItemModel->i_setBaseTRMtx(mpLinkModel->i_getAnmMtx(field_0x30c0)); + mHeldItemModel->setBaseTRMtx(mpLinkModel->getAnmMtx(field_0x30c0)); mHeldItemModel->calc(); } @@ -128,7 +128,7 @@ void daAlink_c::setCopyRodModel() { */ void daAlink_c::setCopyRodReadyAnime() { f32 speed; - if (i_checkAttentionLock()) { + if (checkAttentionLock()) { speed = daAlinkHIO_boom_c0::m.mIdleAnmSpeed; } else { speed = FLOAT_LABEL(lit_6108); @@ -150,12 +150,12 @@ void daAlink_c::setCopyRodReadyAnime() { /* 800E191C-800E1A30 0DC25C 0114+00 1/1 0/0 0/0 .text throwCopyRod__9daAlink_cFv */ void daAlink_c::throwCopyRod() { daCrod_c* copy_rod = static_cast(mItemAcKeep.getActor()); - i_onNoResetFlg1(FLG1_UNK_10000); + onNoResetFlg1(FLG1_UNK_10000); if (checkCopyRodTopUse()) { copy_rod->setThrow(); mCopyRodAcKeep = mItemAcKeep; - i_onNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); + onNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); mItemAcKeep.clearData(); } dComIfGp_clearPlayerStatus0(0, 0x80); @@ -176,12 +176,12 @@ void daAlink_c::throwCopyRod() { /* 800E1A30-800E1ADC 0DC370 00AC+00 0/0 0/0 1/1 .text returnCopyRod__9daAlink_cFv */ int daAlink_c::returnCopyRod() { - i_offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); + offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); int var_r31; if (mEquipItem == COPY_ROD) { mItemAcKeep = mCopyRodAcKeep; - i_onNoResetFlg0(FLG0_UNK_20); + onNoResetFlg0(FLG0_UNK_20); var_r31 = 1; f32 tmp_0 = FLOAT_LABEL(lit_6108); @@ -230,7 +230,7 @@ void daAlink_c::checkUpperItemActionCopyRodFly() { int daAlink_c::checkNextActionCopyRod() { if ((checkBoomerangCatchAnime() && mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCheckFrame) || - i_checkNoResetFlg1(FLG1_UNK_10000)) { + checkNoResetFlg1(FLG1_UNK_10000)) { return 0; } @@ -242,12 +242,12 @@ int daAlink_c::checkNextActionCopyRod() { setCopyRodReadyAnime(); setFastShotTimer(); - if (!i_checkAttentionLock()) { + if (!checkAttentionLock()) { field_0x2fe4 = shape_angle.y; } } - if (!i_checkAttentionLock() && mFastShotTime == 0) { + if (!checkAttentionLock() && mFastShotTime == 0) { return procCopyRodSubjectInit(); } @@ -395,7 +395,7 @@ int daAlink_c::procCopyRodSwing() { setCopyRodControllAnime(); checkNextAction(0); } else if (frameCtrl->getFrame() > field_0x3480 && checkNextAction(1)) { - if (i_checkModeFlg(0x1000)) { + if (checkModeFlg(0x1000)) { setCopyRodControllAnime(); } } else if (frameCtrl->getFrame() >= field_0x3478 && frameCtrl->getFrame() < field_0x347c) { diff --git a/src/d/a/d_a_alink_crawl.inc b/src/d/a/d_a_alink_crawl.inc index aaba4b5477f..79656006321 100644 --- a/src/d/a/d_a_alink_crawl.inc +++ b/src/d/a/d_a_alink_crawl.inc @@ -147,7 +147,7 @@ void daAlink_c::decideCrawlDoStatus() { dCamera_c* camera = dCam_getBody(); if (camera->ChangeModeOK(4) && mWaterY <= current.pos.y) { - i_onResetFlg0(RFLG0_UNK_4000000); + onResetFlg0(RFLG0_UNK_4000000); if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x1000) && !checkEventRun()) { setSubjectMode(); @@ -325,7 +325,7 @@ asm int daAlink_c::procCrawlMove() { // r30 / r31 swap #ifdef NONMATCHING int daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) { - BOOL var_r30 = i_dComIfGp_checkPlayerStatus0(0, 0x2000); + BOOL var_r30 = dComIfGp_checkPlayerStatus0(0, 0x2000); commonProcInit(PROC_CRAWL_AUTO_MOVE); field_0x37c8 = *param_1; field_0x33cc = lit_6040; diff --git a/src/d/a/d_a_alink_cut.inc b/src/d/a/d_a_alink_cut.inc index ffe0a198c5f..8d0ec5e45a0 100644 --- a/src/d/a/d_a_alink_cut.inc +++ b/src/d/a/d_a_alink_cut.inc @@ -45,18 +45,18 @@ void daAlink_c::checkLightSwordMtrl() { if (i_dStage_stagInfo_GetSaveTbl(stag_info) == 0x17 || fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchNightStalker, NULL)) { - i_onNoResetFlg3(FLG3_UNK_100000); + onNoResetFlg3(FLG3_UNK_100000); return; } } - i_offNoResetFlg3(FLG3_UNK_100000); + offNoResetFlg3(FLG3_UNK_100000); } /* 800D0E98-800D0ECC 0CB7D8 0034+00 5/5 0/0 0/0 .text checkSwordEquipAnime__9daAlink_cCFv */ BOOL daAlink_c::checkSwordEquipAnime() const { - return !i_checkNoResetFlg0(FLG0_UNK_1000000) && + return !checkNoResetFlg0(FLG0_UNK_1000000) && (checkUpperAnime(0x255) || checkUpperAnime(0x261)); } @@ -86,7 +86,7 @@ void daAlink_c::initCutTurnAt(f32 param_0, int param_1) { field_0xFB8.SetAtAtp(param_1); u8 mtrl; - if (!i_checkNoResetFlg3(FLG3_UNK_100000)) { + if (!checkNoResetFlg3(FLG3_UNK_100000)) { mtrl = 0; } else { mtrl = 4; @@ -112,7 +112,7 @@ void daAlink_c::changeCutFast() { setSwordModel(); mComboCutCount = 3; checkCutAction(); - i_onNoResetFlg0(FLG0_UNK_80000); + onNoResetFlg0(FLG0_UNK_80000); } /* 800D10E0-800D1268 0CBA20 0188+00 1/1 0/0 0/0 .text checkCutFastReady__9daAlink_cFv */ @@ -129,16 +129,16 @@ bool daAlink_c::checkCutFastReady() { fopAc_ac_c* target_p = mAttention->LockonTarget(0); - if (mEquipItem == NO_ITEM && (i_dComIfGs_isEventBit(0x2A80) || i_checkNoResetFlg3(FLG3_UNK_80))) + if (mEquipItem == NO_ITEM && (dComIfGs_isEventBit(0x2A80) || checkNoResetFlg3(FLG3_UNK_80))) { - if (i_checkModeFlg(1) && !i_checkRideOn() && i_checkSwordGet() && i_checkModeFlg(4) && - !i_checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p)) + if (checkModeFlg(1) && !checkRideOn() && i_checkSwordGet() && checkModeFlg(4) && + !checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p)) { 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)) + (checkNoResetFlg0(FLG0_UNK_1000000) && xz_dist < 202500.0f && y_dist < 350.0f)) { return true; } @@ -188,7 +188,7 @@ void daAlink_c::offSwordModel() { */ BOOL daAlink_c::checkCutTypeNoBlur() const { return mCutType == CUT_TYPE_NM_STAB || mCutType == CUT_TYPE_COMBO_STAB || - mCutType == CUT_TYPE_FINISH_STAB || i_checkNoResetFlg0(FLG0_UNDERWATER); + mCutType == CUT_TYPE_FINISH_STAB || checkNoResetFlg0(FLG0_UNDERWATER); } /* 800D13E4-800D1424 0CBD24 0040+00 7/7 0/0 0/0 .text checkCutTurnInput__9daAlink_cCFv */ @@ -205,7 +205,7 @@ int daAlink_c::getCutTurnDirection() const { /* 800D1430-800D1454 0CBD70 0024+00 17/17 0/0 0/0 .text resetCombo__9daAlink_cFi */ void daAlink_c::resetCombo(int param_0) { mComboCutCount = 0; - i_offNoResetFlg0(FLG0_UNK_8000); + offNoResetFlg0(FLG0_UNK_8000); if (param_0 != 0) { mRunCutComboCount = 0; } @@ -214,10 +214,10 @@ void daAlink_c::resetCombo(int param_0) { /* 800D1454-800D152C 0CBD94 00D8+00 1/1 0/0 0/0 .text checkComboCnt__9daAlink_cFv */ void daAlink_c::checkComboCnt() { if ((mEquipItem == EQUIP_SWORD && mComboCutCount == 2) && - (i_checkAttentionLock() && + (checkAttentionLock() && (mAtCps[0].ChkAtHit() || mAtCps[1].ChkAtHit() || mAtCps[2].ChkAtHit()))) { - i_onNoResetFlg0(FLG0_UNK_8000); + onNoResetFlg0(FLG0_UNK_8000); } if (field_0x307e > 0) { @@ -230,7 +230,7 @@ void daAlink_c::checkComboCnt() { /* 800D152C-800D1540 0CBE6C 0014+00 22/22 0/0 0/0 .text setCutType__9daAlink_cFUc */ void daAlink_c::setCutType(u8 type) { mCutType = type; - i_offResetFlg0(RFLG0_UNK_8000000); + offResetFlg0(RFLG0_UNK_8000000); } /* 800D1540-800D1688 0CBE80 0148+00 8/8 0/0 0/0 .text @@ -243,7 +243,7 @@ void daAlink_c::setCylAtParam(u32 i_AtType, dCcG_At_Spl i_spl, u8 i_hitMark, u8 u8 mtrl; if (i_AtType & 2) { - if (i_checkNoResetFlg3(FLG3_UNK_100000)) { + if (checkNoResetFlg3(FLG3_UNK_100000)) { mtrl = 4; } else { mtrl = 0; @@ -269,7 +269,7 @@ void daAlink_c::setCylAtParam(u32 i_AtType, dCcG_At_Spl i_spl, u8 i_hitMark, u8 mAtCyl.OffAtNoHitMark(); } - if (i_checkWolf()) { + if (checkWolf()) { dCcD_Cyl* cyl = field_0x850; for (int i = 0; i < 3; i++) { cyl->SetAtType(i_AtType); @@ -301,7 +301,7 @@ void daAlink_c::setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int } u8 mtrl; - if (i_checkNoResetFlg3(FLG3_UNK_100000)) { + if (checkNoResetFlg3(FLG3_UNK_100000)) { mtrl = 4; } else { mtrl = 0; @@ -344,7 +344,7 @@ BOOL daAlink_c::setSwordHitVibration(dCcD_GObjInf* i_gobj) { } int var_r4; - if (i_checkWolf()) { + if (checkWolf()) { var_r4 = 3; } else if (i_gobj->ChkAtShieldHit()) { if (field_0x2fd0 == 1) { @@ -398,12 +398,12 @@ asm BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM param_0) { /* 800D1E1C-800D20B4 0CC75C 0298+00 4/4 0/0 0/0 .text setCutDash__9daAlink_cFii */ void daAlink_c::setCutDash(int param_0, int param_1) { - if (!param_0 && i_checkNoResetFlg1(FLG1_UNK_4000000)) { + if (!param_0 && checkNoResetFlg1(FLG1_UNK_4000000)) { checkCutAction(); } else { field_0x2fce = 5; resetCombo(0); - i_offNoResetFlg2(FLG2_UNK_2); + offNoResetFlg2(FLG2_UNK_2); setSwordAtParam(dCcG_At_Spl_UNK_0, 7, 16, 1, daAlinkHIO_cut_c0::m.mRunCutLength, daAlinkHIO_cut_c0::m.mRunCutRadius); @@ -468,20 +468,20 @@ BOOL daAlink_c::checkForceSwordSwing() { /* 800D20FC-800D2188 0CCA3C 008C+00 7/7 0/0 0/0 .text setComboReserb__9daAlink_cFv */ void daAlink_c::setComboReserb() { - if (i_checkWolf()) { + if (checkWolf()) { field_0x307e = daAlinkHIO_wlAttack_c0::m.mComboDuration; } else { field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; } if (mComboCutCount != 4 && field_0x2fce == 0 && swordSwingTrigger()) { - i_onNoResetFlg2(FLG2_UNK_2); + onNoResetFlg2(FLG2_UNK_2); } } /* 800D2188-800D21D0 0CCAC8 0048+00 1/1 0/0 0/0 .text checkComboReserb__9daAlink_cFv */ BOOL daAlink_c::checkComboReserb() { - return i_checkNoResetFlg2(FLG2_UNK_2) && !checkEventRun(); + return checkNoResetFlg2(FLG2_UNK_2) && !checkEventRun(); } /* 800D21D0-800D2284 0CCB10 00B4+00 1/1 0/0 0/0 .text commonCutAction__9daAlink_cFv */ @@ -490,12 +490,12 @@ int daAlink_c::commonCutAction() { resetCombo(1); } - if (i_dComIfGp_getDoStatus() == 4) { + if (dComIfGp_getDoStatus() == 4) { setDoStatus(0); } mComboCutCount++; - if (i_checkReinRide()) { + if (checkReinRide()) { procHorseCutInit(); if (mComboCutCount > 1) { mComboCutCount = 1; @@ -508,7 +508,7 @@ int daAlink_c::commonCutAction() { /* 800D2284-800D22BC 0CCBC4 0038+00 13/13 0/0 0/0 .text setSwordVoiceSe__9daAlink_cFUl */ void daAlink_c::setSwordVoiceSe(u32 i_seID) { - if (!i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (!checkNoResetFlg0(FLG0_UNDERWATER)) { voiceStart(i_seID); } } @@ -550,27 +550,27 @@ int daAlink_c::checkCutAction() { int cutDir = getCutDirection(); if (mComboCutCount == 4) { - if (i_checkNoResetFlg0(FLG0_UNK_1000000)) { + if (checkNoResetFlg0(FLG0_UNK_1000000)) { if (checkInputOnR() && (cutDir == DIR_FORWARD || cutDir == DIR_BACKWARD)) { procCutFinishInit(3); } else { procCutFinishInit(4); } - } else if (i_checkNoResetFlg0(FLG0_UNK_8000)) { + } else if (checkNoResetFlg0(FLG0_UNK_8000)) { procCutFinishInit(hitFinishType[cutDir]); - } else if (i_checkAttentionLock()) { + } else if (checkAttentionLock()) { procCutFinishInit(atnFinishType[cutDir]); } else { procCutFinishInit(finishType[cutDir]); } } else if (mComboCutCount == 3) { - if (i_checkNoResetFlg0(FLG0_UNK_8000)) { + if (checkNoResetFlg0(FLG0_UNK_8000)) { if (cutDir == 0) { procCutNormalInit(hitType[cutDir]); } else { procCutFinishInit(hitType[cutDir]); } - } else if (i_checkAttentionLock()) { + } else if (checkAttentionLock()) { procCutNormalInit(atnNormalType3[cutDir]); } else { procCutNormalInit(normalType3[cutDir]); @@ -581,7 +581,7 @@ int daAlink_c::checkCutAction() { } else { procCutNormalInit(2); } - } else if (i_checkAttentionLock()) { + } else if (checkAttentionLock()) { if (mComboCutCount == 1) { procCutNormalInit(atnNormalType1[cutDir]); } else { @@ -602,7 +602,7 @@ void daAlink_c::checkCutTurnCharge() { if (mProcVar3.field_0x300e.z < 3) { mProcVar3.field_0x300e.z++; } else { - i_onResetFlg0(RFLG0_UNK_40); + onResetFlg0(RFLG0_UNK_40); } } else { mProcVar3.field_0x300e.z = 0; @@ -647,7 +647,7 @@ BOOL daAlink_c::checkCutCancelNextMode(int param_0) { /* 800D27E4-800D2890 0CD124 00AC+00 4/4 0/0 0/0 .text checkDoCutAction__9daAlink_cFv */ BOOL daAlink_c::checkDoCutAction() { // event flag 0x2A40: Learned Jump Strike - if (doButton() && (i_dComIfGs_isEventBit(0x2A40) || i_checkNoResetFlg3(FLG3_UNK_200))) { + if (doButton() && (dComIfGs_isEventBit(0x2A40) || checkNoResetFlg3(FLG3_UNK_200))) { return procCutLargeJumpChargeInit(); } else if (checkDownAttackState()) { return procCutDownInit(); @@ -661,7 +661,7 @@ BOOL daAlink_c::checkDoCutAction() { /* 800D2890-800D28F4 0CD1D0 0064+00 2/2 0/0 0/0 .text checkCutBackState__9daAlink_cFv */ BOOL daAlink_c::checkCutBackState() { // event flag 0x2902: Learned Backslice - return i_dComIfGs_isEventBit(0x2902) || i_checkNoResetFlg3(FLG3_UNK_20); + return dComIfGs_isEventBit(0x2902) || checkNoResetFlg3(FLG3_UNK_20); } /* 800D28F4-800D29D4 0CD234 00E0+00 6/6 0/0 0/0 .text checkCutHeadState__9daAlink_cFv */ @@ -670,7 +670,7 @@ BOOL daAlink_c::checkCutHeadState() { // event flag 0x2901: Learned Helm Splitter return ((!checkBootsOrArmorHeavy() && (temp_r27 != NULL) && - (i_dComIfGs_isEventBit(0x2901) || i_checkNoResetFlg3(FLG3_UNK_40))) && + (dComIfGs_isEventBit(0x2901) || checkNoResetFlg3(FLG3_UNK_40))) && fopAcM_GetGroup(temp_r27) == 2) && temp_r27->checkHeadLockFlg(); } @@ -682,9 +682,9 @@ BOOL daAlink_c::checkDownAttackState() { if (enemy != NULL && (fopAcM_GetGroup(enemy) == 2 && enemy->checkDownFlg() && - ((!i_checkWolf() && (i_dComIfGs_isEventBit(0x2904) || i_checkNoResetFlg3(FLG3_UNK_10)) && + ((!checkWolf() && (dComIfGs_isEventBit(0x2904) || checkNoResetFlg3(FLG3_UNK_10)) && enemy->getDownPos().abs2(current.pos) < lit_7174) || - (i_checkWolf() && + (checkWolf() && (fopAcM_GetName(mTargetedActor) == PROC_E_PO || fopAcM_GetName(mTargetedActor) == PROC_E_HP) && enemy->getDownPos().abs2(current.pos) < lit_7174)))) @@ -698,8 +698,8 @@ BOOL daAlink_c::checkDownAttackState() { /* 800D2ABC-800D2B88 0CD3FC 00CC+00 1/1 1/1 0/0 .text checkCutLargeTurnState__9daAlink_cCFv */ BOOL daAlink_c::checkCutLargeTurnState() const { // event flag 0x2A20: Learned Great Spin - return ((i_dComIfGs_isEventBit(0x2A20) || i_checkNoResetFlg3(FLG3_UNK_100)) && - i_dComIfGs_getLife() == dComIfGs_getMaxLifeGauge()) || + return ((dComIfGs_isEventBit(0x2A20) || checkNoResetFlg3(FLG3_UNK_100)) && + dComIfGs_getLife() == dComIfGs_getMaxLifeGauge()) || (mDemo.getDemoMode() == 0x24 && mDemo.getParam0() == 0x33); } @@ -743,7 +743,7 @@ void daAlink_c::checkCutAtnActorChange() { // matches with literals #ifdef NONMATCHING void daAlink_c::setCutJumpSpeed(int i_airAt) { - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; speed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; } else if (checkHeavyStateOn(1, 1)) { @@ -822,7 +822,7 @@ int daAlink_c::procCutNormalInit(int i_type) { field_0x3484 = cutData->mCutAnm.mCheckFrame; f32 morf; - if (!checkZoraWearAbility() && i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (!checkZoraWearAbility() && checkNoResetFlg0(FLG0_UNDERWATER)) { morf = cutParams->m_morf; } else { morf = cutData->mCutAnm.mInterpolation; @@ -832,7 +832,7 @@ int daAlink_c::procCutNormalInit(int i_type) { cutData->mCutAnm.mEndFrame, morf); current.angle.y = shape_angle.y; - if (!i_checkAttentionLock() && checkInputOnR()) { + if (!checkAttentionLock() && checkInputOnR()) { mProcVar2.field_0x300c = field_0x2fe2; } else { mProcVar2.field_0x300c = shape_angle.y; @@ -878,10 +878,10 @@ int daAlink_c::procCutNormal() { checkCutAtnActorChange(); cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mDeceleration); - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); field_0x2f99 = 4; - if (mProcVar3.field_0x300e.x != 0 && i_checkNoResetFlg2(FLG2_UNK_2)) { + if (mProcVar3.field_0x300e.x != 0 && checkNoResetFlg2(FLG2_UNK_2)) { int cutDir = getCutDirection(); if ((cutDir == DIR_RIGHT && mCutType == CUT_TYPE_NM_LEFT && frameCtrl->getFrame() > lit_7448) || @@ -924,12 +924,12 @@ int daAlink_c::procCutNormal() { current.angle.y = shape_angle.y; if (frameCtrl->getFrame() >= field_0x3478 && frameCtrl->getFrame() < field_0x347c) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(Z2SE_AL_SWORD_SWING_S); mNormalSpeed = field_0x3480; } - i_onResetFlg0(FLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); } if (mCutType == CUT_TYPE_NM_LEFT) { @@ -991,7 +991,7 @@ int daAlink_c::procCutFinishInit(int i_type) { } f32 morf; - if (!checkZoraWearAbility() && i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (!checkZoraWearAbility() && checkNoResetFlg0(FLG0_UNDERWATER)) { morf = cutParams->m_morf; } else { morf = cutData->mCutAnm.mInterpolation; @@ -1075,7 +1075,7 @@ int daAlink_c::procCutFinish() { setBodyAngleXReadyAnime(1); cLib_chaseF(&mNormalSpeed, 0.0f, daAlinkHIO_move_c0::m.mDeceleration); - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); setComboReserb(); checkCutTurnCharge(); @@ -1125,12 +1125,12 @@ int daAlink_c::procCutFinish() { current.angle.y = shape_angle.y; if (frameCtrl_p->getFrame() >= field_0x3478 && frameCtrl_p->getFrame() < field_0x347c) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(field_0x32d0); mNormalSpeed = field_0x3480; } - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); } } @@ -1162,7 +1162,7 @@ int daAlink_c::procCutFinishJumpUpInit() { speed.y = daAlinkHIO_cutFnJU_c0::m.mSpeedV; mNormalSpeed = daAlinkHIO_cutFnJU_c0::m.mSpeedH; - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; speed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; } else if (checkHeavyStateOn(1, 1)) { @@ -1224,11 +1224,11 @@ int daAlink_c::procCutFinishJumpUp() { if (frameCtrl->getFrame() >= daAlinkHIO_cutFnJU_c0::m.mAttackStartFrame && frameCtrl->getFrame() < daAlinkHIO_cutFnJU_c0::m.mAttackEndFrame) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(field_0x32cc); } - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); } return 1; @@ -1245,7 +1245,7 @@ int daAlink_c::procCutFinishJumpUpLandInit() { field_0x2f9d = 4; setFootEffectProcType(2); - i_onResetFlg1(RFLG1_UNK_30); + onResetFlg1(RFLG1_UNK_30); if (mComboCutCount == 3) { field_0x3484 = daAlinkHIO_cutFnJU_c0::m.mComboCheckFrame; @@ -1268,7 +1268,7 @@ int daAlink_c::procCutFinishJumpUpLand() { } daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); setComboReserb(); checkCutTurnCharge(); @@ -1362,7 +1362,7 @@ int daAlink_c::procCutReverse() { if (mProcVar2.field_0x300c == 0) { checkCutTurnCharge(); - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); } if (mProcVar2.field_0x300c != 0) { @@ -1426,11 +1426,11 @@ int daAlink_c::procCutJump() { if (mLinkAcch.ChkGroundHit()) { procCutJumpLandInit(field_0x3198); } else if (mUnderFrameCtrl[0].getFrame() >= daAlinkHIO_cutJump_c0::m.mStartAttackFrame) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(Z2SE_AL_SWORD_SWING_L); } - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); } return 1; @@ -1443,25 +1443,25 @@ int daAlink_c::procCutJumpLandInit(int param_0) { checkCutLandDamage(); setSingleAnimeParam(ANM_CUT_JUMP_LAND, &daAlinkHIO_cutJump_c0::m.mLandAnm); - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { field_0x2060->initOldFrameMorf(lit_7808 * daAlinkHIO_cutJump_c0::m.mLandAnm.mInterpolation, 0, 0x23); } - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(Z2SE_AL_SWORD_SWING_L); m_swordBlur.initBlur(FLOAT_LABEL(lit_6108), 0, &mSwordTopPos, &field_0x3498, &field_0x34a4); setSwordAtParam(dCcG_At_Spl_UNK_1, 3, 1, 3, daAlinkHIO_cut_c0::m.mSwordLength, daAlinkHIO_cut_c0::m.mSwordRadius); } - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); mNormalSpeed = FLOAT_LABEL(lit_6108); setCutType(CUT_TYPE_JUMP); field_0x2f9d = 4; setFootEffectProcType(2); - i_onResetFlg1(RFLG1_UNK_30); + onResetFlg1(RFLG1_UNK_30); field_0x3588 = l_halfAtnWaitBaseAnime; field_0x3198 = param_0; setStepLandVibration(); @@ -1481,7 +1481,7 @@ int daAlink_c::procCutJumpLand() { } field_0x2f99 = 4; - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (field_0x3198 != 2 && checkCutTurnInput()) { field_0x3198 = getCutTurnDirection(); @@ -1502,7 +1502,7 @@ int daAlink_c::procCutJumpLand() { } if (frameCtrl->getFrame() < daAlinkHIO_cutJump_c0::m.mEndAttackFrame) { - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); } } @@ -1558,7 +1558,7 @@ int daAlink_c::procCutTurnInit(int param_0, int param_1) { resetCombo(1); f32 morf; - if (!checkZoraWearAbility() && i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (!checkZoraWearAbility() && checkNoResetFlg0(FLG0_UNDERWATER)) { morf = lit_7625; } else { morf = anm_data->mInterpolation; @@ -1590,7 +1590,7 @@ int daAlink_c::procCutTurnInit(int param_0, int param_1) { setCutType(CUT_TYPE_TURN_LEFT); } - if (i_checkNoResetFlg3(FLG3_UNK_100000)) { + if (checkNoResetFlg3(FLG3_UNK_100000)) { field_0x3478 = cutData->mLightAttackRadius; field_0x348c = cutData->mLightAttackRadiusAccel; } else { @@ -1631,7 +1631,7 @@ int daAlink_c::procCutTurn() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; field_0x2f99 = 4; cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mDeceleration); - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (mComboCutCount != 0) { field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; @@ -1654,7 +1654,7 @@ int daAlink_c::procCutTurn() { } } else if (!(frameCtrl->getFrame() > field_0x3480) || !checkCutCancelNextMode(3)) { if (frameCtrl->getFrame() >= field_0x3484 && frameCtrl->getFrame() < field_0x3488) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(field_0x32cc); mNormalSpeed = daAlinkHIO_cutTurn_c0::m.mSpeed; @@ -1663,7 +1663,7 @@ int daAlink_c::procCutTurn() { } } - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); cLib_chaseF(&field_0x347c, field_0x3478, field_0x348c); field_0xFB8.SetR(field_0x347c); } @@ -1743,7 +1743,7 @@ int daAlink_c::procCutTurnMoveInit(int param_0) { } mProcVar2.field_0x300c = param_0; - i_onNoResetFlg1(FLG1_UNK_10000000); + onNoResetFlg1(FLG1_UNK_10000000); dComIfGp_setPlayerStatus0(0, 0x40000000); return 1; } @@ -1764,7 +1764,7 @@ int daAlink_c::procCutTurnMove() { } field_0x2fe4 = shape_angle.y; - i_onNoResetFlg1(FLG1_UNK_10000000); + onNoResetFlg1(FLG1_UNK_10000000); if (checkGroundSpecialMode()) { return 1; @@ -1790,7 +1790,7 @@ int daAlink_c::procCutTurnMove() { } } else if ((mProcVar2.field_0x300c == 0 && swordButton()) || (mProcVar2.field_0x300c != 0 && doButton())) { f32 var_f30 = 0.0f; - i_onResetFlg0(RFLG0_UNK_10); + onResetFlg0(RFLG0_UNK_10); if (checkInputOnR()) { int direction = getDirectionFromAngle(field_0x2fe2 - field_0x2fe4); @@ -1941,7 +1941,7 @@ int daAlink_c::procCutDownInit() { speed.y = daAlinkHIO_cutDown_c0::m.mRecoverSpeedH; - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; speed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; } else if (checkHeavyStateOn(1, 1)) { @@ -2012,7 +2012,7 @@ int daAlink_c::procCutDownLandInit(fopEn_enemy_c* i_enemy) { i_enemy->onCutDownHitFlg(); csXyz angle(0x4000, shape_angle.y, 0); - i_dComIfGp_setHitMark(3, NULL, &i_enemy->getDownPos(), &angle, NULL, 0); + dComIfGp_setHitMark(3, NULL, &i_enemy->getDownPos(), &angle, NULL, 0); } var_r30 = 0x20; @@ -2028,11 +2028,11 @@ int daAlink_c::procCutDownLandInit(fopEn_enemy_c* i_enemy) { mProcVar2.field_0x300c = 0; mNormalSpeed = 0.0f; - i_offResetFlg0(RFLG0_UNK_8000000); + offResetFlg0(RFLG0_UNK_8000000); field_0x2f9d = 4; setFootEffectProcType(2); - i_onResetFlg1(RFLG1_UNK_30); + onResetFlg1(RFLG1_UNK_30); mProcVar3.field_0x300e.y = 0; dComIfGp_setPlayerStatus1(0, 0x400000); @@ -2063,7 +2063,7 @@ int daAlink_c::procCutDownLand() { field_0x2f99 = 4; if (mProcVar2.field_0x300c != 0) { - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); } if (checkAnmEnd(frameCtrl_p)) { @@ -2201,11 +2201,11 @@ int daAlink_c::procCutHead() { if (frameCtrl->getFrame() >= daAlinkHIO_cutHead_c0::m.mAttackStartFrame && frameCtrl->getFrame() < daAlinkHIO_cutHead_c0::m.mAttackEndFrame) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(Z2SE_AL_SWORD_SWING_L); } - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); } if (mLinkAcch.ChkGroundHit()) { @@ -2228,7 +2228,7 @@ int daAlink_c::procCutHeadLandInit() { /* 800D618C-800D6238 0D0ACC 00AC+00 1/0 0/0 0/0 .text procCutHeadLand__9daAlink_cFv */ int daAlink_c::procCutHeadLand() { - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; if (frameCtrl->checkAnmEnd()) { @@ -2314,7 +2314,7 @@ int daAlink_c::procCutLargeJump() { field_0x2f99 = 4; } - if (i_checkModeFlg(2) && checkCutTurnInput()) { + if (checkModeFlg(2) && checkCutTurnInput()) { field_0x3198 = getCutTurnDirection(); } @@ -2329,7 +2329,7 @@ int daAlink_c::procCutLargeJump() { mProcVar3.field_0x300e.y = 1; } - if (!i_checkModeFlg(2) && frameCtrl->getFrame() >= lit_7808) { + if (!checkModeFlg(2) && frameCtrl->getFrame() >= lit_7808) { setJumpMode(); mNormalSpeed = daAlinkHIO_cutLargeJump_c0::m.mCutSpeedH; speed.y = daAlinkHIO_cutLargeJump_c0::m.mCutSpeedV; @@ -2339,10 +2339,10 @@ int daAlink_c::procCutLargeJump() { if (frameCtrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mJumpAttackStartFrame && frameCtrl->getFrame() < daAlinkHIO_cutLargeJump_c0::m.mJumpAttackEndFrame) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(Z2SE_AL_SWORD_SWING_S); } - i_onResetFlg0(2); + onResetFlg0(RFLG0_UNK_2); } } } else { @@ -2359,11 +2359,11 @@ int daAlink_c::procCutLargeJump() { if (mLinkAcch.ChkGroundHit()) { procCutLargeJumpLandInit(field_0x3198); } else if (frameCtrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mCutInitFrame) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { seStartSwordCut(Z2SE_AL_SWORD_SWING_S); } - i_onResetFlg0(2); + onResetFlg0(RFLG0_UNK_2); } } @@ -2380,8 +2380,8 @@ int daAlink_c::procCutLargeJumpLandInit(int param_0) { field_0x3588 = l_halfAtnWaitBaseAnime; field_0x2f9d = 4; setFootEffectProcType(4); - i_onResetFlg1(RFLG1_UNK_30); - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg1(RFLG1_UNK_30); + onResetFlg0(RFLG0_UNK_2); setCutType(CUT_TYPE_LARGE_JUMP); field_0x3478 = daAlinkHIO_cutLargeJump_c0::m.mLandAttackRadius; field_0x347c = lit_6896; @@ -2400,7 +2400,7 @@ int daAlink_c::procCutLargeJumpLandInit(int param_0) { int daAlink_c::procCutLargeJumpLand() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); field_0x2f99 = 4; if (field_0x3198 != 2 && checkCutTurnInput()) { @@ -2420,7 +2420,7 @@ int daAlink_c::procCutLargeJumpLand() { } else if (frameCtrl->getFrame() > daAlinkHIO_cutLargeJump_c0::m.mLandAnm.mCheckFrame) { checkNextAction(1); } else if (frameCtrl->getFrame() < daAlinkHIO_cutLargeJump_c0::m.mLandAttackEndFrame) { - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); if (frameCtrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mLandAttackInitFrame) { if (mProcVar2.field_0x300c == 0) { @@ -2469,10 +2469,10 @@ int daAlink_c::procSwordUnequipSp() { mProcVar3.field_0x300e.x = 1; } - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (mProcVar2.field_0x300c != 0) { - i_onEndResetFlg1(ERFLG1_GANON_FINISH); + onEndResetFlg1(ERFLG1_GANON_FINISH); } if (mProcVar3.field_0x300e.y == 0 && mDemo.getDemoMode() == 0x1E && mDemo.getParam1() == 1) { @@ -2522,7 +2522,7 @@ int daAlink_c::procSwordUnequipSp() { if (frameCtrl->getFrame() >= lit_7710) { field_0x2f93 = 0xFE; mProcVar2.field_0x300c = 1; - i_onEndResetFlg1(ERFLG1_GANON_FINISH); + onEndResetFlg1(ERFLG1_GANON_FINISH); } if (frameCtrl->checkPass(lit_8502) || frameCtrl->checkPass(lit_8781)) { diff --git a/src/d/a/d_a_alink_damage.inc b/src/d/a/d_a_alink_damage.inc index 1d02a017337..4f60cdf3bc1 100644 --- a/src/d/a/d_a_alink_damage.inc +++ b/src/d/a/d_a_alink_damage.inc @@ -25,8 +25,8 @@ bool daAlink_c::checkMiddleBossGoronRoom() { /* 800D6DF0-800D6E24 0D1730 0034+00 1/0 0/0 0/0 .text setDkCaught__9daAlink_cFP10fopAc_ac_c */ void daAlink_c::setDkCaught(fopAc_ac_c* param_0) { - if (!i_checkNoResetFlg1(FLG1_UNK_1)) { - i_onNoResetFlg1(FLG1_UNK_1); + if (!checkNoResetFlg1(FLG1_UNK_1)) { + onNoResetFlg1(FLG1_UNK_1); field_0x28f8 = fopAcM_GetID(param_0); } } @@ -55,7 +55,7 @@ void daAlink_c::freezeTimerDamage() { /* 800D6F00-800D6F2C 0D1840 002C+00 1/0 0/0 0/0 .text onPressedDamage__9daAlink_cFRC4cXyzs */ void daAlink_c::onPressedDamage(cXyz const& param_0, s16 param_1) { - i_onNoResetFlg2(FLG2_UNK_1000); + onNoResetFlg2(FLG2_UNK_1000); field_0x3104 = param_1; field_0x3744 = param_0; } @@ -111,10 +111,10 @@ void daAlink_c::checkCutLandDamage() { /* 800D70A0-800D7160 0D19E0 00C0+00 2/2 0/0 0/0 .text checkCaughtEscapeCutTurn__9daAlink_cFv */ BOOL daAlink_c::checkCaughtEscapeCutTurn() { - if (mLinkAcch.ChkGroundHit() && (i_checkSwordGet() || i_checkWolf()) && + if (mLinkAcch.ChkGroundHit() && (i_checkSwordGet() || checkWolf()) && checkCutTurnInputTrigger()) { - if (i_checkWolf()) { + if (checkWolf()) { return procWolfRollAttackInit(2, 0); } @@ -139,18 +139,18 @@ bool daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_ field_0x2ffe = param_0; if (param_4) { - i_onEndResetFlg0(ERFLG0_UNK_40); + onEndResetFlg0(ERFLG0_UNK_40); } else { - i_onEndResetFlg0(ERFLG0_UNK_80); + onEndResetFlg0(ERFLG0_UNK_80); } if (param_5 == 1) { - i_onEndResetFlg0(ERFLG0_UNK_40000000); + onEndResetFlg0(ERFLG0_UNK_40000000); } else if (param_5 == 2) { - i_onEndResetFlg1(ERFLG1_UNK_80); + onEndResetFlg1(ERFLG1_UNK_80); } - if (i_getSumouMode()) { + if (getSumouMode()) { cancelSumouMode(); } @@ -162,15 +162,15 @@ bool daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_ f32 daAlink_c::damageMagnification(int i_checkZoraMag, int param_1) { f32 base_mag; - if (param_1 == 0 && i_checkNoResetFlg3(FLG3_UNK_40000000) && - !i_checkEndResetFlg2(ERFLG2_UNK_40)) + if (param_1 == 0 && checkNoResetFlg3(FLG3_UNK_40000000) && + !checkEndResetFlg2(ERFLG2_UNK_40)) { base_mag = lit_7624; /* 1.5 */ } else { base_mag = lit_6040; /* 1.0 */ } - if (i_checkWolf() && !checkCargoCarry() && param_1 == 0) { + if (checkWolf() && !checkCargoCarry() && param_1 == 0) { return /* 2.0 */ lit_7307 * base_mag; } @@ -186,7 +186,7 @@ f32 daAlink_c::damageMagnification(int i_checkZoraMag, int param_1) { #ifdef NONMATCHING int daAlink_c::setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int param_3) { if (i_dmgAmount <= 0) { - i_dComIfGp_setItemLifeCount(-i_dmgAmount, 0); + dComIfGp_setItemLifeCount(-i_dmgAmount, 0); return 0; } @@ -196,17 +196,17 @@ int daAlink_c::setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgT magnified_dmg++; } - if (i_checkWolf()) { + if (checkWolf()) { offWolfEyeUp(); } if (checkMagicArmorNoDamage()) { - i_dComIfGp_setItemRupeeCount(-magnified_dmg * 10); + dComIfGp_setItemRupeeCount(-magnified_dmg * 10); } else { - i_dComIfGp_setItemLifeCount(-magnified_dmg, 0); + dComIfGp_setItemLifeCount(-magnified_dmg, 0); } - i_onResetFlg1(0x400); + onResetFlg1(0x400); mSwordUpTimer = 0; if (i_setDmgTimer) { @@ -237,9 +237,9 @@ void daAlink_c::setDamagePointNormal(int i_dmgAmount) { /* 800D74A4-800D74F4 0D1DE4 0050+00 3/3 0/0 0/0 .text setLandDamagePoint__9daAlink_cFi */ void daAlink_c::setLandDamagePoint(int i_dmgAmount) { - i_onEndResetFlg2(ERFLG2_UNK_40); + onEndResetFlg2(ERFLG2_UNK_40); setDamagePoint(i_dmgAmount, FALSE, TRUE, 0); - i_offEndResetFlg2(ERFLG2_UNK_40); + offEndResetFlg2(ERFLG2_UNK_40); } /* 800D74F4-800D76C4 0D1E34 01D0+00 11/11 0/0 0/0 .text getDamageVec__9daAlink_cFP12dCcD_GObjInf @@ -305,18 +305,18 @@ bool daAlink_c::checkElecReturnDamage(dCcD_GObjInf& param_0, fopAc_ac_c** param_ /* 800D7B18-800D7BE8 0D2458 00D0+00 1/1 0/0 0/0 .text damageTimerCount__9daAlink_cFv */ void daAlink_c::damageTimerCount() { - if (!i_checkModeFlg(8)) { + if (!checkModeFlg(8)) { if (mDamageColorTime != 0) { mDamageColorTime--; } mDamageTimer--; - if (mProcID != PROC_DK_CAUGHT && i_checkNoResetFlg1(FLG1_UNK_1)) { - i_offNoResetFlg1(1); + if (mProcID != PROC_DK_CAUGHT && checkNoResetFlg1(FLG1_UNK_1)) { + offNoResetFlg1(FLG1_UNK_1); } - if (!checkDkCaught2Anime() && i_checkNoResetFlg0(FLG0_UNK_20000)) { - i_offNoResetFlg0(FLG0_UNK_20000); + if (!checkDkCaught2Anime() && checkNoResetFlg0(FLG0_UNK_20000)) { + offNoResetFlg0(FLG0_UNK_20000); } } else if (mDamageColorTime != 0) { mDamageColorTime--; @@ -436,7 +436,7 @@ int daAlink_c::procCoLargeDamageWall() { int daAlink_c::procCoPolyDamageInit() { seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL); - if (!i_checkWolf()) { + if (!checkWolf()) { voiceStart(Z2SE_AL_V_DAMAGE_S); } @@ -446,7 +446,7 @@ int daAlink_c::procCoPolyDamageInit() { commonProcInit(PROC_POLY_DAMAGE); - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfParam(WANM_DMG_SMALL, &daAlinkHIO_wlDamage_c0::m.field_0x14); voiceStart(Z2SE_WL_V_DAMAGE); field_0x3478 = daAlinkHIO_wlDamage_c0::m.field_0x14.mCheckFrame; @@ -464,7 +464,7 @@ int daAlink_c::procCoPolyDamage() { if (mUnderFrameCtrl[0].checkAnmEnd()) { commonCheckNextAction(0); } else if (mUnderFrameCtrl[0].getFrame() > field_0x3478) { - if (!i_checkWolf()) { + if (!checkWolf()) { onModeFlg(4); } @@ -546,7 +546,7 @@ int daAlink_c::procStEscapeInit() { /* 800DB610-800DB6A4 0D5F50 0094+00 1/0 0/0 0/0 .text procStEscape__9daAlink_cFv */ int daAlink_c::procStEscape() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (frameCtrl->checkAnmEnd()) { checkNextAction(0); @@ -592,7 +592,7 @@ void daAlink_c::setScreamWaitAnime() { int daAlink_c::procScreamWaitInit() { commonProcInit(PROC_SCREAM_WAIT); - if (i_checkEndResetFlg1(ERFLG1_UNK_2)) { + if (checkEndResetFlg1(ERFLG1_UNK_2)) { setScreamWaitAnime(); } else { setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, @@ -607,11 +607,11 @@ int daAlink_c::procScreamWaitInit() { /* 800DBDA4-800DBE00 0D66E4 005C+00 1/0 0/0 0/0 .text procScreamWait__9daAlink_cFv */ int daAlink_c::procScreamWait() { - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); - if (!i_checkEndResetFlg1(ERFLG1_UNK_1)) { + if (!checkEndResetFlg1(ERFLG1_UNK_1)) { checkNextAction(0); - } else if (mProcVar2.field_0x300c == 0 && i_checkEndResetFlg1(ERFLG1_UNK_2)) { + } else if (mProcVar2.field_0x300c == 0 && checkEndResetFlg1(ERFLG1_UNK_2)) { setScreamWaitAnime(); } @@ -625,7 +625,7 @@ int daAlink_c::procCoSandWallHitInit() { return 1; } - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBase(WANM_WAIT_WIND); } else { setSingleAnimeBase(ANM_WAIT_WIND); @@ -642,7 +642,7 @@ int daAlink_c::procCoSandWallHit() { offModeFlg(2); } - if (!i_checkEndResetFlg1(ERFLG1_UNK_400)) { + if (!checkEndResetFlg1(ERFLG1_UNK_400)) { setDamagePointNormal(1); procCoPolyDamageInit(); } @@ -678,18 +678,18 @@ int daAlink_c::procCoSwimFreezeReturnInit() { return 0; } - mDemo.i_setSpecialDemoType(); - u32 chk_40000 = i_checkModeFlg(0x40000); + mDemo.setSpecialDemoType(); + u32 chk_40000 = checkModeFlg(0x40000); if (!commonProcInitNotSameProc(PROC_SWIM_FREEZE_RETURN)) { return 1; } - i_onNoResetFlg0(FLG0_UNK_100); + onNoResetFlg0(FLG0_UNK_100); J3DTransformInfo* transInfo = field_0x2060->getOldFrameTransInfo(0); f32 var_f31; - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_SWIM_WAIT, daAlinkHIO_wlDamNormal_c0::m.field_0x5C, lit_7625); mUnderFrameCtrl[0].setEnd(3); @@ -714,7 +714,7 @@ int daAlink_c::procCoSwimFreezeReturnInit() { field_0x3080 = 0; mDamageTimer = 0; mNormalSpeed = FLOAT_LABEL(lit_6108); - i_onNoResetFlg1(FLG1_UNK_40000000); + onNoResetFlg1(FLG1_UNK_40000000); field_0x3194 = 1; u32 id = fopAcM_GetID(this); @@ -729,7 +729,7 @@ int daAlink_c::procCoSwimFreezeReturnInit() { int daAlink_c::procCoSwimFreezeReturn() { if (mProcVar2.field_0x300c == 0) { if (checkRestartDead(4, 1)) { - i_onNoResetFlg1(FLG1_UNK_40000000); + onNoResetFlg1(FLG1_UNK_40000000); } else { u32 mode = 4; setLastSceneDamage(4, &mode); diff --git a/src/d/a/d_a_alink_demo.inc b/src/d/a/d_a_alink_demo.inc index 19429e90f9e..893a2e43be1 100644 --- a/src/d/a/d_a_alink_demo.inc +++ b/src/d/a/d_a_alink_demo.inc @@ -18,7 +18,7 @@ /* 80115C20-80115C50 110560 0030+00 72/72 0/0 0/0 .text checkEventRun__9daAlink_cCFv */ BOOL daAlink_c::checkEventRun() const { - return i_dComIfGp_event_runCheck() || checkPlayerDemoMode(); + return dComIfGp_event_runCheck() || checkPlayerDemoMode(); } /* 80115C50-80115D08 110590 00B8+00 2/2 0/0 0/0 .text createNpcTks__9daAlink_cFP4cXyziUl @@ -48,8 +48,8 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) { u32 scene_mode = getLastSceneMode(); if (param_2 != 0 && checkDungeon() && - i_dStage_stagInfo_GetSaveTbl(i_dComIfGp_getStage()->getStagInfo()) != 0x17 && - i_dStage_stagInfo_GetSaveTbl(i_dComIfGp_getStage()->getStagInfo()) != 0x18 && + i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17 && + i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x18 && (checkItemGet(TKS_LETTER, 1) || (checkItemGet(DUNGEON_BACK, 1) && !checkLv7DungeonShop())) && dComIfGs_isDungeonItemWarp()) @@ -83,9 +83,9 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) { // matches with literals / a fix for g_dComIfG_gameInfo.play.mEvent load #ifdef NONMATCHING int daAlink_c::checkDemoAction() { - if (i_dComIfGp_getEvent().i_isOrderOK()) { - if (!i_dComIfGp_event_runCheck()) { - i_offNoResetFlg0(FLG0_UNK_200000); + if (dComIfGp_getEvent().isOrderOK()) { + if (!dComIfGp_event_runCheck()) { + offNoResetFlg0(FLG0_UNK_200000); } return 0; } @@ -95,7 +95,7 @@ int daAlink_c::checkDemoAction() { (demoMode < daPy_demo_c::DEMO_LAST_e) || (demoMode == daPy_demo_c::DEMO_NEW_ANM0_e)); if (demoMode != 6 && demoMode != 8) { - i_offNoResetFlg0(FLG0_UNK_400); + offNoResetFlg0(FLG0_UNK_400); } if (demoMode != 0x33 && mSpecialMode == 1) { @@ -106,14 +106,14 @@ int daAlink_c::checkDemoAction() { return 0; } - if (!i_checkModeFlg(0x400) && demoMode != daPy_demo_c::DEMO_NEW_ANM0_e && demoMode != 0x46 && + if (!checkModeFlg(0x400) && demoMode != daPy_demo_c::DEMO_NEW_ANM0_e && demoMode != 0x46 && demoMode != 0x47 && demoMode != 0x39 && demoMode != 0x3A && demoMode != 9 && demoMode != 0x11 && demoMode != 0x18 && demoMode != 7 && demoMode != 0x13 && demoMode != 4 && demoMode != 0x38 && demoMode != 0x45 && demoMode != 0xA && demoMode != 0x2D && demoMode != 0x23 && demoMode != 0x43 && demoMode != 0x34 && - (demoMode != 0xB || !i_checkModeFlg(0x10040)) && - !i_dComIfGp_checkPlayerStatus0(0, 0x100000) && !checkFlyAtnWait() && - ((!mLinkAcch.ChkGroundHit() && !i_checkMagneBootsOn()) || i_checkModeFlg(0x70C52))) + (demoMode != 0xB || !checkModeFlg(0x10040)) && + !dComIfGp_checkPlayerStatus0(0, 0x100000) && !checkFlyAtnWait() && + ((!mLinkAcch.ChkGroundHit() && !checkMagneBootsOn()) || checkModeFlg(0x70C52))) { return 0; } @@ -128,26 +128,26 @@ int daAlink_c::checkDemoAction() { } if (demoMode == daPy_demo_c::DEMO_NEW_ANM0_e) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procCoToolDemoInit(); } if (m_demoInitTable[demoMode] != NULL) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return (this->*m_demoInitTable[demoMode])(); } if (demoMode == 6 || demoMode == 8) { - if (mDemo.getParam1() != 1 && !i_checkNoResetFlg0(FLG0_UNK_400)) { + if (mDemo.getParam1() != 1 && !checkNoResetFlg0(FLG0_UNK_400)) { seStartSystem(Z2SE_SY_TALK_START); - i_onNoResetFlg0(FLG0_UNK_400); + onNoResetFlg0(FLG0_UNK_400); } if (mProcID == PROC_SPINNER_WAIT) { return procFallInit(1, daAlinkHIO_autoJump_c0::m.mFallInterpolation); } - if (i_checkModeFlg(0x4000000) || i_checkModeFlg(0x40000) || checkHorseRide() || + if (checkModeFlg(0x4000000) || checkModeFlg(0x40000) || checkHorseRide() || checkBoarRide() || checkCanoeRide()) { if (demoMode == 6 && (checkHorseRide() || checkBoarRide())) { @@ -158,11 +158,11 @@ int daAlink_c::checkDemoAction() { if (checkHorseRide()) { if (fopAcM_getTalkEventPartner(this) == daPy_py_c::getMidnaActor()) { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (!horse_p->checkOriginalDemo()) { - horse_p->i_changeOriginalDemo(); - horse_p->i_changeDemoMode(14, 0); + horse_p->changeOriginalDemo(); + horse_p->changeDemoMode(14, 0); } } } @@ -171,7 +171,7 @@ int daAlink_c::checkDemoAction() { return 1; } - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); if (mGrabItemAcKeep.getActor() != NULL) { if (fopAcM_getTalkEventPartner(this) != NULL && checkGrabTalkActor(fopAcM_getTalkEventPartner(this))) @@ -185,7 +185,7 @@ int daAlink_c::checkDemoAction() { return procCoTalkInit(); } else if (demoMode == 4) { int var_r28; - if (i_checkWolf()) { + if (checkWolf()) { var_r28 = procWolfWaitInit(); } else { if (mDemo.getParam0() != 0) { @@ -245,21 +245,21 @@ int daAlink_c::checkDemoAction() { } return var_r28; } else if (demoMode == 9) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); if (mProcID == PROC_LARGE_DAMAGE_UP || mProcID == PROC_WOLF_LARGE_DAMAGE_UP || mProcID == PROC_LARGE_DAMAGE_WALL) { return 0; } - if (i_checkModeFlg(0x40000)) { + if (checkModeFlg(0x40000)) { dComIfGp_evmng_cutEnd(field_0x3184); return 0; } return procCoLargeDamageInit(-2, 1, 0, 0, NULL, 0); } else if (demoMode == 0x24) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); int prm0 = mDemo.getParam0(); if (mProcID == PROC_CUT_NORMAL || mProcID == PROC_CUT_FINISH || mProcID == PROC_CUT_TURN) { return 0; @@ -275,7 +275,7 @@ int daAlink_c::checkDemoAction() { return procCutTurnInit(1, 1); } } else if (demoMode == 0x52) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); if (mProcID == PROC_TURN_MOVE || mProcID == PROC_CUT_FINISH_JUMP_UP || mProcID == PROC_CUT_FINISH_JUMP_UP_LAND) { @@ -284,15 +284,15 @@ int daAlink_c::checkDemoAction() { return procTurnMoveInit(2); } else if (demoMode == 0x54) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); if (mProcID != PROC_CUT_FINISH) { - i_onNoResetFlg0(FLG0_UNK_1000000); + onNoResetFlg0(FLG0_UNK_1000000); changeCutFast(); } return 1; } else if (demoMode == 0x2B) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); int prm0 = mDemo.getParam0(); if (mProcID == PROC_WOLF_WAIT_ATTACK) { @@ -305,7 +305,7 @@ int daAlink_c::checkDemoAction() { return procWolfWaitAttackInit(prm0); } } else if (demoMode == 0x1B) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); if (mDemo.getDemoType() == 1) { return commonLargeDamageUpInit(-2, 1, 0, 0); @@ -315,51 +315,51 @@ int daAlink_c::checkDemoAction() { return commonLargeDamageUpInit(-3, 1, 0, 0); } } else if (demoMode == 0xF) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procWolfSitInit(1); } else if (demoMode == 0x15) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procWolfHowlInit(0); } else if (demoMode == 0x16) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procWolfHowlInit(1); } else if (demoMode == 0x2D) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procCoWarpInit(mDemo.getParam0(), mDemo.getParam1()); } else if (demoMode == 0x18) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procAutoJumpInit(1); } else if (demoMode == 0x5B) { if (mProcID == PROC_CUT_TURN_MOVE || mProcID == PROC_CUT_TURN_CHARGE) { return 1; } - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procCutTurnChargeInit(); } else if (demoMode == 0x5E) { if (mProcID == PROC_WOLF_SERVICE_WAIT) { return 0; } - if (i_checkModeFlg(0x40000)) { + if (checkModeFlg(0x40000)) { return 0; } - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procWolfServiceWaitInit(0); } else if (demoMode == 0x5C) { if (mProcID == PROC_CUT_LARGE_JUMP_CHARGE || mProcID == PROC_CUT_TURN_MOVE) { return 1; } - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procCutLargeJumpChargeInit(); } else if (demoMode == 0x49) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procSideRollInit(mDemo.getParam0() ? 3 : 2); } else if (demoMode == 0x10) { - i_onNoResetFlg0(FLG0_UNK_100000); - if (i_checkWolf()) { + onNoResetFlg0(FLG0_UNK_100000); + if (checkWolf()) { if (mProcID == PROC_WOLF_BACKJUMP_LAND || mProcID == PROC_WOLF_SIDESTEP_LAND || mProcID == PROC_WOLF_BACKJUMP || mProcID == PROC_WOLF_SIDESTEP) { @@ -386,17 +386,17 @@ int daAlink_c::checkDemoAction() { return procSideStepInit(mDemo.getParam0()); } else if (demoMode == 0x2C) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procWolfLieMoveInit(0); } else if (demoMode == 0x11) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return commonFallInit(1); } else if (demoMode == 0x2A) { - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); return procBottleDrinkInit(mDemo.getParam0()); } else if (demoMode == 0x1F) { - i_onNoResetFlg0(FLG0_UNK_100000); - if (!i_checkModeFlg(0x4070C52) && + onNoResetFlg0(FLG0_UNK_100000); + if (!checkModeFlg(0x4070C52) && (checkUpperReadyThrowAnime() || field_0x2f8c == 2 || field_0x2f8c == 1 || field_0x2f8c == 3 || field_0x2f8c == 8 || mProcID == PROC_GRAB_WAIT || mProcID == PROC_TALK || field_0x2f8c == 9)) @@ -407,32 +407,32 @@ int daAlink_c::checkDemoAction() { dComIfGp_evmng_cutEnd(field_0x3184); return 1; } else if (demoMode == 7) { - i_offNoResetFlg0(FLG0_UNK_100000); + offNoResetFlg0(FLG0_UNK_100000); if (checkUpperReadyThrowAnime() || checkGrabAnime()) { resetUpperAnime(UPPER_2, -1.0f); } - if (!i_checkModeFlg(0x400)) { + if (!checkModeFlg(0x400)) { initForceRideHorse(); } return checkNextActionHorse(); } else if (checkFlyAtnWait()) { return procAtnActorWaitInit(); - } else if ((i_checkNoResetFlg0(FLG0_UNK_100000) || checkUpperReadyThrowAnime() || - i_checkModeFlg(0x400) || mProcID == PROC_SWIM_SUBJECTIVITY || + } else if ((checkNoResetFlg0(FLG0_UNK_100000) || checkUpperReadyThrowAnime() || + checkModeFlg(0x400) || mProcID == PROC_SWIM_SUBJECTIVITY || mProcID == PROC_FISHING_CAST || mProcID == PROC_SUBJECTIVITY) && (demoMode == 1 || checkDemoMoveMode(demoMode) || demoMode == 0x17 || demoMode == 0x1F || demoMode == 0x12 || (checkSpinnerRide() && (demoMode == 0x1A || (demoMode == 0xE && mDemo.getParam0() == 0))))) { - i_offNoResetFlg0(FLG0_UNK_100000); + offNoResetFlg0(FLG0_UNK_100000); if (checkUpperReadyThrowAnime()) { resetUpperAnime(UPPER_2, -1.0f); } - if (i_checkReinRide()) { + if (checkReinRide()) { if (mDemo.getDemoMode() == 0x17 && !checkEquipAnime() && mEquipItem != 0x103 && (mDemo.getParam1() == 2 || mDemo.getParam1() == 3)) { @@ -447,7 +447,7 @@ int daAlink_c::checkDemoAction() { commonInitForceRideRein(); - if (rideAc_p == i_dComIfGp_getHorseActor()) { + if (rideAc_p == dComIfGp_getHorseActor()) { static_cast(rideAc_p)->onRideFlg(); mZ2Link.setRiding(true); } else { @@ -497,7 +497,7 @@ void daAlink_c::setDemoMoveData(u32* param_0, cXyz const* param_1) { f32 temp_f29; f32 temp_f28; f32 var_f27; - if (i_checkWolf()) { + if (checkWolf()) { var_f27 = daAlinkHIO_wlMoveNoP_c0::m.field_0x8 / daAlinkHIO_move_c0::m.mMaxSpeed; var_f27 *= var_f27; } else { @@ -512,7 +512,7 @@ void daAlink_c::setDemoMoveData(u32* param_0, cXyz const* param_1) { if (dist_to_pos < var_f27 * 25.0f) { *param_0 = 1; - if (!i_checkModeFlg(0x2)) { + if (!checkModeFlg(0x2)) { mNormalSpeed = 0.0f; } } else if (dist_to_pos < temp_f30 || (dist_to_pos < temp_f28 && checkZeroSpeedF())) { @@ -551,7 +551,7 @@ asm void daAlink_c::setNoDrawSwordShield(int param_0, u16 param_1) { // matches with literals #ifdef NONMATCHING void daAlink_c::setDemoData() { - if (i_dComIfGp_getEvent().i_isOrderOK()) { + if (dComIfGp_getEvent().isOrderOK()) { if (checkPlayerDemoMode() && mClothesChangeWaitTimer == 0) { endDemoMode(); } @@ -568,17 +568,17 @@ void daAlink_c::setDemoData() { int* prm1_p = NULL; dComIfGp_clearPlayerStatus0(0, 0x600000); - i_offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); + offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); field_0x30d0 = 0; if (mProcID == PROC_SUBJECTIVITY) { - if (i_checkWolf()) { + if (checkWolf()) { procWolfWaitInit(); } else { procWaitInit(); } } else if (mProcID == PROC_SWIM_SUBJECTIVITY) { - if (i_checkWolf()) { + if (checkWolf()) { procWolfSwimWaitInit(0); } else { procSwimWaitInit(0); @@ -598,7 +598,7 @@ void daAlink_c::setDemoData() { mDemo.setDemoMode(1); freeGrabItem(); - if (i_dComIfGp_evmng_startCheck("R22-opening")) { + if (dComIfGp_evmng_startCheck("R22-opening")) { if (mEquipItem == IRONBALL) { deleteEquipItem(FALSE, FALSE); } @@ -610,7 +610,7 @@ void daAlink_c::setDemoData() { resetUpperAnime(UPPER_2, -1.0f); } - if (i_checkWolf()) { + if (checkWolf()) { procWolfWaitInit(); } else { procWaitInit(); @@ -667,7 +667,7 @@ void daAlink_c::setDemoData() { demo_mode = ((cut_name[0] - '0') * 100) + ((cut_name[1] - '0') * 10) + (cut_name[2] - '0'); if (mDemo.getDemoType() != 4 && (demo_mode == 1 || demo_mode == 0x17) && - mLinkAcch.ChkGroundHit() && !i_checkModeFlg(0x70C52)) + mLinkAcch.ChkGroundHit() && !checkModeFlg(0x70C52)) { mNormalSpeed = 0.0f; speedF = 0.0f; @@ -780,7 +780,7 @@ void daAlink_c::setDemoData() { mDemo.setDemoMode(demo_mode); } - if (i_checkModeFlg(0x80000) || mDemo.getDemoMode() == 6 || mDemo.getDemoMode() == 8) { + if (checkModeFlg(0x80000) || mDemo.getDemoMode() == 6 || mDemo.getDemoMode() == 8) { dComIfGp_setPlayerStatus0(0, 0x10); mMidnaTalkDelayTimer = 30; } else { @@ -798,7 +798,7 @@ void daAlink_c::setDemoData() { s16 prm2 = mDemo.getParam2(); if (prm2 != 0) { - if (!i_checkWolf()) { + if (!checkWolf()) { if (prm2 == 1) { setFacePriTexture(FTANM_UNK_0); setFacePriBck(0x15A); @@ -812,11 +812,11 @@ void daAlink_c::setDemoData() { setFacePriBck(0x149); } - i_offNoResetFlg1(FLG1_UNK_2000); - i_onNoResetFlg1(FLG1_UNK_200); + offNoResetFlg1(FLG1_UNK_2000); + onNoResetFlg1(FLG1_UNK_200); } - } else if (i_checkNoResetFlg1(FLG1_UNK_200)) { - i_offNoResetFlg1(FLG1_UNK_200); + } else if (checkNoResetFlg1(FLG1_UNK_200)) { + offNoResetFlg1(FLG1_UNK_200); resetFacePriAnime(); } } @@ -844,7 +844,7 @@ void daAlink_c::resetDemoBck() { mFaceBtpHeap.resetIdx(); mFaceBtkHeap.resetIdx(); - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMoveNoP_c0::m.field_0x14, daAlinkHIO_wlMove_c0::m.field_0x94); setFaceBasicAnime(ANM_WAIT); @@ -860,7 +860,7 @@ void daAlink_c::endHighModel() { mpDemoFCTongueModel->getModelData()->removeTexMtxAnimator(field_0x068c); } - i_offNoResetFlg1(FLG1_UNK_10); + offNoResetFlg1(FLG1_UNK_10); field_0x0698 = NULL; field_0x068c = NULL; } @@ -868,7 +868,7 @@ void daAlink_c::endHighModel() { /* 80117C90-80117CF8 1125D0 0068+00 21/21 0/0 0/0 .text resetSpecialEvent__9daAlink_cFv */ void daAlink_c::resetSpecialEvent() { - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); endDemoMode(); } @@ -879,7 +879,7 @@ void daAlink_c::resetSpecialEvent() { void daAlink_c::endDemoMode() { BOOL temp_r30 = checkFlyAtnWait(); endHighModel(); - i_offNoResetFlg0(FLG0_UNK_10400); + offNoResetFlg0(FLG0_UNK_10400); field_0x06f4 = NULL; if (field_0x06f8 != NULL) { @@ -893,7 +893,7 @@ void daAlink_c::endDemoMode() { mpDemoHDTmpBck->remove(mpLinkHatModel->getModelData()); } - i_offNoResetFlg0(FLG0_UNK_100000); + offNoResetFlg0(FLG0_UNK_100000); dComIfGp_clearPlayerStatus0(0, 0x10); BOOL temp_r29 = mDemo.getDemoType() == 4; @@ -904,8 +904,8 @@ void daAlink_c::endDemoMode() { mDemo.setParam0(0); mDemo.setParam1(0); - if (i_checkNoResetFlg1(FLG1_UNK_200)) { - i_offNoResetFlg1(FLG1_UNK_200); + if (checkNoResetFlg1(FLG1_UNK_200)) { + offNoResetFlg1(FLG1_UNK_200); resetFacePriAnime(); } @@ -913,7 +913,7 @@ void daAlink_c::endDemoMode() { mDemo.setStick(1.0f); field_0x3184 = -1; - if (i_checkReinRide()) { + if (checkReinRide()) { field_0x2fab &= ~0x8; if (mProcID != PROC_HORSE_COMEBACK) { procHorseWaitInit(); @@ -921,7 +921,7 @@ void daAlink_c::endDemoMode() { } else if (!checkSpinnerRide() && mProcID != PROC_FISHING_CAST) { if (temp_r30) { if (checkSwimAction(1)) { - if (i_checkWolf()) { + if (checkWolf()) { procWolfSwimMoveInit(); } else { procSwimMoveInit(); @@ -930,9 +930,9 @@ void daAlink_c::endDemoMode() { checkWaitAction(); } } else if ((mLinkAcch.ChkGroundHit() && (!checkUpperReadyThrowAnime() || var_r0 == 0) && - !i_checkModeFlg(0x4070C52) && mProcID != PROC_LARGE_DAMAGE_UP && + !checkModeFlg(0x4070C52) && mProcID != PROC_LARGE_DAMAGE_UP && mProcID != PROC_WOLF_LARGE_DAMAGE_UP) || - i_checkMagneBootsOn()) + checkMagneBootsOn()) { if (temp_r29 && (mProcID == PROC_MOVE || mProcID == PROC_WOLF_MOVE)) { field_0x33a8 = mDoCPd_c::getStickValue(PAD_1); @@ -948,15 +948,15 @@ void daAlink_c::endDemoMode() { return; } - if (mProcID == PROC_TALK && i_dComIfGp_checkPlayerStatus0(0, 0x8000000)) { + if (mProcID == PROC_TALK && dComIfGp_checkPlayerStatus0(0, 0x8000000)) { procWolfLieMoveInit(0); } else { checkWaitAction(); } } } else if (mProcID == PROC_CAUGHT) { - if (i_checkModeFlg(0x40000)) { - if (i_checkWolf()) { + if (checkModeFlg(0x40000)) { + if (checkWolf()) { procWolfSwimWaitInit(0); } else { procSwimWaitInit(0); @@ -1114,7 +1114,7 @@ void daAlink_c::setShapeAngleToTalkActor() { /* 80118654-801186D4 112F94 0080+00 2/2 0/0 0/0 .text setTalkAnime__9daAlink_cFv */ void daAlink_c::setTalkAnime() { if (mDemo.getDemoMode() == 8 || mEquipItem == KANTERA || - (i_checkNoResetFlg2(FLG2_UNK_1) && field_0x2fde == 0x48)) + (checkNoResetFlg2(FLG2_UNK_1) && field_0x2fde == 0x48)) { setDoubleAnime(FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mWaitAnmSpeed, daAlinkHIO_move_c0::m.mWaitAnmSpeed, ANM_WAIT, ANM_WAIT, 2, lit_6109); @@ -1223,10 +1223,10 @@ u8 daAlink_c::setDemoLeftHandIndex(u16 param_0) { /* 8011894C-801189F8 11328C 00AC+00 1/1 0/0 0/0 .text setDemoRide__9daAlink_cFUs */ void daAlink_c::setDemoRide(u16 param_0) { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (param_0 == 1) { - if (horse_p != NULL && !i_checkModeFlg(0x400)) { + if (horse_p != NULL && !checkModeFlg(0x400)) { onModeFlg(0x400); horse_p->onRideFlg(); field_0x384c = (cXyz*)&l_horseBaseAnime; @@ -1283,10 +1283,10 @@ BOOL daAlink_c::checkFinalBattle() { BOOL daAlink_c::checkRestartDead(int i_dmgAmount, int i_checkZoraMag) { i_dmgAmount *= (int)damageMagnification(i_checkZoraMag, 1); - if (mProcID != PROC_DEAD && i_dmgAmount >= i_dComIfGs_getLife() && !checkMagicArmorNoDamage() && + if (mProcID != PROC_DEAD && i_dmgAmount >= dComIfGs_getLife() && !checkMagicArmorNoDamage() && !dComIfGs_checkBottle(FAIRY)) { - i_onNoResetFlg2(FLG2_UNK_40000); + onNoResetFlg2(FLG2_UNK_40000); procCoDeadInit(0); return 1; } @@ -1296,8 +1296,8 @@ BOOL daAlink_c::checkRestartDead(int i_dmgAmount, int i_checkZoraMag) { /* 80118BF4-80118C98 113534 00A4+00 2/2 0/0 0/0 .text setDeadRideSyncPos__9daAlink_cFv */ void daAlink_c::setDeadRideSyncPos() { - if (i_checkModeFlg(MODE_RIDING) && mRideAcKeep.getActor() != NULL) { - if (i_checkReinRide()) { + if (checkModeFlg(MODE_RIDING) && mRideAcKeep.getActor() != NULL) { + if (checkReinRide()) { setSyncRidePos(); } else if (checkSpinnerRide()) { s16 old_angle = shape_angle.y; @@ -1309,9 +1309,9 @@ void daAlink_c::setDeadRideSyncPos() { /* 80118C98-80118D7C 1135D8 00E4+00 5/5 0/0 0/0 .text checkDeadHP__9daAlink_cFv */ BOOL daAlink_c::checkDeadHP() { - return ((i_dComIfGs_getLife() == 0 && !i_checkResetFlg0(RFLG0_UNK_400)) && + return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(FAIRY)) || - i_checkNoResetFlg2(FLG2_UNK_40000) || + checkNoResetFlg2(FLG2_UNK_40000) || (dComIfGp_getOxygenShowFlag() && dComIfGp_getNowOxygen() == 0); } @@ -1430,14 +1430,14 @@ f32 daAlink_c::setStickAnmData(J3DAnmBase* i_anm, int param_1, int param_2, u16 } } else if (param_1 == 9) { if (param_2 == 2) { - if (i_checkNoResetFlg1(FLG1_UNK_10)) { + if (checkNoResetFlg1(FLG1_UNK_10)) { setHighModelBck(mpDemoFCTmpBck, param_3); return 0.0f; } setFaceDemoBck(param_3); } else if (param_2 == 3) { - if (i_checkNoResetFlg1(FLG1_UNK_10)) { + if (checkNoResetFlg1(FLG1_UNK_10)) { setHighModelFaceBtk(param_3); return 0.0f; } @@ -1532,7 +1532,7 @@ int daAlink_c::procCoToolDemoInit() { field_0x3478 = FLOAT_LABEL(lit_6108); field_0x37c8 = current.pos; - i_onEndResetFlg1(ERFLG1_GANON_FINISH); + onEndResetFlg1(ERFLG1_GANON_FINISH); return 1; } @@ -1543,7 +1543,7 @@ int daAlink_c::procCoToolDemo() { dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID); BOOL var_r29 = 0; - i_onEndResetFlg1(ERFLG1_GANON_FINISH); + onEndResetFlg1(ERFLG1_GANON_FINISH); field_0x3198 = 0; mProcVar3.field_0x300e.y = 0; field_0x2fab = 0; @@ -1583,7 +1583,7 @@ int daAlink_c::procCoToolDemo() { field_0x2f92 = setDemoLeftHandIndex(sp8); } else if (sp18 == 9) { if (sp8 == 1 && mpDemoFCBlendModel != NULL && mpDemoFCTongueModel != NULL) { - i_onNoResetFlg1(FLG1_UNK_10); + onNoResetFlg1(FLG1_UNK_10); var_r29 = 1; } else { endHighModel(); @@ -1613,7 +1613,7 @@ int daAlink_c::procCoToolDemo() { field_0x3484 = 1.0f; field_0x3480 = -0.5f; - if (i_checkWolf()) { + if (checkWolf()) { field_0x347c = 3.5f; } else { field_0x347c = 5.5f; @@ -1625,7 +1625,7 @@ int daAlink_c::procCoToolDemo() { tevStr.field_0x344 = 0.0f; field_0x347c = -0.5f; - if (i_checkWolf()) { + if (checkWolf()) { field_0x3480 = 3.5f; } else { field_0x3480 = 5.5f; @@ -1780,7 +1780,7 @@ int daAlink_c::procCoTalkInit() { } } - if (i_checkWolf()) { + if (checkWolf()) { field_0x3198 = 0; mNormalSpeed = 0.0f; @@ -1835,7 +1835,7 @@ asm int daAlink_c::procCoTalkInit() { // matches with literals #ifdef NONMATCHING int daAlink_c::procCoTalk() { - if (i_dComIfGp_checkPlayerStatus0(0, 0x8000000)) { + if (dComIfGp_checkPlayerStatus0(0, 0x8000000)) { field_0x2f99 = 13; } @@ -1903,7 +1903,7 @@ int daAlink_c::procCoOpenTreasureInit() { } f32 var_f31; - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBase(WANM_TRES_OPEN); if (mDemo.getParam0() != 1) { mUnderFrameCtrl[0].setEnd(21); @@ -1943,18 +1943,18 @@ int daAlink_c::procCoOpenTreasureInit() { current.pos.y = partner_p->current.pos.y; } - if (!i_checkWolf()) { + if (!checkWolf()) { deleteEquipItem(FALSE, FALSE); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::transM(60.0f, 45.0f, 30.0f); - mpKanteraModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpKanteraModel->setBaseTRMtx(mDoMtx_stack_c::get()); } mProcVar2.field_0x300c = 0; mLinkAcch.SetWallNone(); mLinkAcch.OffLineCheck(); - i_onEndResetFlg1(ERFLG1_UNK_8); + onEndResetFlg1(ERFLG1_UNK_8); return 1; } #else @@ -1970,7 +1970,7 @@ asm int daAlink_c::procCoOpenTreasureInit() { /* 8011A42C-8011A4C0 114D6C 0094+00 1/0 0/0 0/0 .text procCoOpenTreasure__9daAlink_cFv */ int daAlink_c::procCoOpenTreasure() { - i_onEndResetFlg1(ERFLG1_UNK_8); + onEndResetFlg1(ERFLG1_UNK_8); if (mProcVar2.field_0x300c == 0) { mProcVar2.field_0x300c = 1; @@ -1999,7 +1999,7 @@ int daAlink_c::procCoUnequipInit() { mProcVar2.field_0x300c = 0; mProcVar3.field_0x300e.x = 0; - if (i_checkWolf()) { + if (checkWolf()) { setBlendWolfMoveAnime(daAlinkHIO_wlMove_c0::m.field_0x94); } else { setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); @@ -2046,7 +2046,7 @@ int daAlink_c::procCoUnequip() { mProcVar2.field_0x300c = 0; } } else { - if (!i_checkWolf()) { + if (!checkWolf()) { setBlendMoveAnime(lit_6041); } @@ -2083,7 +2083,7 @@ BOOL daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const { return false; } - return dComIfGs_getRupeeMax() < rupeeCount[i_itemNo] + i_dComIfGs_getRupee(); + return dComIfGs_getRupeeMax() < rupeeCount[i_itemNo] + dComIfGs_getRupee(); } /* 8011A798-8011AC28 1150D8 0490+00 2/1 0/0 0/0 .text procCoGetItemInit__9daAlink_cFv */ @@ -2107,9 +2107,9 @@ int daAlink_c::procCoGetItemInit() { mLinkAcch.ClrWallNone(); - if (!i_checkWolf() && mEquipItem != NO_ITEM && var_r30 == 0) { - if (i_checkModeFlg(0x400) || (checkStageName("D_MN05B") && mEquipItem == BOOMERANG && - !i_dComIfGs_isItemFirstBit(BOOMERANG))) + if (!checkWolf() && mEquipItem != NO_ITEM && var_r30 == 0) { + if (checkModeFlg(0x400) || (checkStageName("D_MN05B") && mEquipItem == BOOMERANG && + !dComIfGs_isItemFirstBit(BOOMERANG))) { deleteEquipItem(0, 0); } else { @@ -2146,7 +2146,7 @@ int daAlink_c::procCoGetItemInit() { } } - if (i_checkWolf()) { + if (checkWolf()) { if (var_r30 != 0) { setSingleAnimeWolfBase(WANM_GET_A); } else { @@ -2158,14 +2158,14 @@ int daAlink_c::procCoGetItemInit() { field_0x347c = 10.0f; field_0x3480 = 19.0f; field_0x3484 = 0.1111111f; - } else if (i_checkModeFlg(0x400)) { + } else if (checkModeFlg(0x400)) { setSingleAnimeBase(ANM_HORSE_GET_ITEM); if (mProcVar2.field_0x300c != -1) { setGetItemFace(mProcVar2.field_0x300c); } - if (i_checkReinRide()) { + if (checkReinRide()) { setSyncRidePos(); if (checkBoarRide()) { setUnderAnime(0x26E, UNDER_2, 1.0f, 0.0f, -1, -1.0f); @@ -2222,7 +2222,7 @@ int daAlink_c::procCoGetItemInit() { dComIfGp_setPlayerStatus1(0, 0x4000000); if (mProcVar3.field_0x300e.y != 0) { - i_onEndResetFlg1(ERFLG1_UNK_8); + onEndResetFlg1(ERFLG1_UNK_8); } return 1; @@ -2243,11 +2243,11 @@ asm int daAlink_c::procCoGetItemInit() { #ifdef NONMATCHING int daAlink_c::procCoGetItem() { if (mProcVar3.field_0x300e.y != 0) { - i_onEndResetFlg1(ERFLG1_UNK_8); + onEndResetFlg1(ERFLG1_UNK_8); } if (field_0x3198 != 0) { - if (i_checkModeFlg(0x400) && i_checkReinRide()) { + if (checkModeFlg(0x400) && checkReinRide()) { setSyncRidePos(); } @@ -2257,8 +2257,8 @@ int daAlink_c::procCoGetItem() { daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl; - if (i_checkModeFlg(0x400)) { - if (i_checkReinRide()) { + if (checkModeFlg(0x400)) { + if (checkReinRide()) { setSyncRidePos(); } } else if (field_0x2f99 != 12) { @@ -2271,7 +2271,7 @@ int daAlink_c::procCoGetItem() { current.angle.y - (field_0x3484 * (mProcVar3.field_0x300e.x * (frameCtrl_p->getFrame() - field_0x347c))); - if (mProcVar3.field_0x300e.y != 0 && i_checkWolf()) { + if (mProcVar3.field_0x300e.y != 0 && checkWolf()) { current.pos.x -= cM_ssin(current.angle.y) * 3.888889f; current.pos.z -= cM_scos(current.angle.y) * 3.888889f; } @@ -2295,7 +2295,7 @@ int daAlink_c::procCoGetItem() { if (mProcVar2.field_0x300c == -1 && item_partner_p != NULL) { mProcVar2.field_0x300c = item_partner_p->getItemNo(); - if (!i_checkWolf() && (checkUnderMove0BckNoArc(ANM_GET_A_WAIT) || i_checkModeFlg(0x400))) { + if (!checkWolf() && (checkUnderMove0BckNoArc(ANM_GET_A_WAIT) || checkModeFlg(0x400))) { setGetItemFace(mProcVar2.field_0x300c); } } @@ -2329,7 +2329,7 @@ int daAlink_c::procCoGetItem() { if (checkAnmEnd(frameCtrl_p)) { mProcVar1.field_0x300a = 1; - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBase(WANM_GET); } else { setSingleAnimeBase(ANM_GET_A_WAIT); @@ -2341,7 +2341,7 @@ int daAlink_c::procCoGetItem() { dComIfGp_evmng_cutEnd(field_0x3184); } } else if (mProcVar1.field_0x300a != 0) { - if (mDemo.getParam1() == 1 && i_checkModeFlg(0x400)) { + if (mDemo.getParam1() == 1 && checkModeFlg(0x400)) { dComIfGp_evmng_cutEnd(field_0x3184); } @@ -2388,7 +2388,7 @@ int daAlink_c::procCoGetItem() { if (field_0x32cc != 0 && checkEndMessage(field_0x32cc)) { if (field_0x32cc < 0x164) { if (mProcVar2.field_0x300c >= 0xC0 && mProcVar2.field_0x300c <= 0xD7 && - i_dComIfGs_isItemFirstBit(mProcVar2.field_0x300c)) + dComIfGs_isItemFirstBit(mProcVar2.field_0x300c)) { field_0x32cc += 2000; mMsgClassID = -1; @@ -2411,7 +2411,7 @@ int daAlink_c::procCoGetItem() { field_0x3198 = 1; field_0x2f99 = 12; - if (i_checkWolf()) { + if (checkWolf()) { setBlendWolfMoveAnime(daAlinkHIO_wlMove_c0::m.field_0x94); } else { if (mEquipItem == KANTERA) { @@ -2419,7 +2419,7 @@ int daAlink_c::procCoGetItem() { } current.angle.y = shape_angle.y; - if (i_checkModeFlg(0x400)) { + if (checkModeFlg(0x400)) { setDoubleAnime(0.0f, 1.0f, 1.0f, ANM_HORSE_WAIT, ANM_HORSE_WAIT, 10, 3.0f); field_0x2f99 = 0x60; @@ -2454,7 +2454,7 @@ int daAlink_c::procCoTurnBackInit() { } mNormalSpeed = FLOAT_LABEL(lit_6108); - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBase(WANM_TURN_BACK); } else { setSingleAnimeBase(ANM_TURN_BACK); @@ -2472,7 +2472,7 @@ int daAlink_c::procCoTurnBack() { if (checkAnmEnd(frameCtrl_p)) { if (mProcVar2.field_0x300c == 0) { - if (i_checkWolf()) { + if (checkWolf()) { setBlendWolfMoveAnime(5.0f); } else { setDoubleAnime(0.0f, daAlinkHIO_noActAtnMove_c0::m.mWaitAnmSpeed, @@ -2486,7 +2486,7 @@ int daAlink_c::procCoTurnBack() { dComIfGp_evmng_cutEnd(field_0x3184); } else if (mProcVar2.field_0x300c != 0) { dComIfGp_evmng_cutEnd(field_0x3184); - } else if (!i_checkWolf() && frameCtrl_p->getFrame() >= 29.0f) { + } else if (!checkWolf() && frameCtrl_p->getFrame() >= 29.0f) { field_0x2f92 = 1; field_0x2f93 = 6; } @@ -2658,19 +2658,19 @@ int daAlink_c::procCoLookWaitInit() { return 0; } - i_onNoResetFlg0(FLG0_UNK_100000); + onNoResetFlg0(FLG0_UNK_100000); if (mGrabItemAcKeep.getActor() != NULL && (checkGrabAnime() || checkWolfGrabAnime())) { onModeFlg(0x100000); - if (!i_checkWolf()) { + if (!checkWolf()) { setWaterInAnmRate(&mUpperFrameCtrl[2], 1.0f); } } mNormalSpeed = 0.0f; - if (i_checkWolf()) { + if (checkWolf()) { setBlendWolfMoveAnime(daAlinkHIO_wlMove_c0::m.field_0x94); } else { setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); @@ -2720,7 +2720,7 @@ int daAlink_c::procCoDemoPushPullWaitInit() { return 0; } - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBase(WANM_WAIT_PP); } else { setSingleAnimeBaseSpeed(ANM_WAIT_PUSH_PULL, daAlinkHIO_pushpull_c0::m.field_0x10, @@ -2737,7 +2737,7 @@ int daAlink_c::procCoDemoPushMoveInit() { return 0; } - if (i_checkWolf()) { + if (checkWolf()) { if (mDemo.getParam0() != 0) { setSingleAnimeWolfBase(WANM_PUSH); } else { @@ -2790,7 +2790,7 @@ int daAlink_c::procMonkeyMoveInit() { mNormalSpeed = tmp_0; deleteEquipItem(FALSE, FALSE); - if (!i_checkWolf()) { + if (!checkWolf()) { setSingleAnimeBaseSpeed(ANM_ROPE_SWING, FLOAT_LABEL(lit_6108), lit_6109); setMonkeyMoveAnime(); } @@ -2802,7 +2802,7 @@ int daAlink_c::procMonkeyMoveInit() { int daAlink_c::procMonkeyMove() { dComIfGp_evmng_cutEnd(field_0x3184); - if (!i_checkWolf()) { + if (!checkWolf()) { setMonkeyMoveAnime(); } return 1; @@ -2841,11 +2841,11 @@ int daAlink_c::procCoDeadInit(int param_0) { } dComIfGp_event_compulsory(this, NULL, 0xFFFF); - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); mNormalSpeed = 0.0f; mDamageTimer = 0; - if (i_checkWolf()) { + if (checkWolf()) { mProcVar3.field_0x300e.y = 2; } else { mProcVar3.field_0x300e.y = 2; @@ -2853,9 +2853,9 @@ int daAlink_c::procCoDeadInit(int param_0) { setDeadRideSyncPos(); - if (i_checkNoResetFlg2(FLG2_UNK_40000)) { + if (checkNoResetFlg2(FLG2_UNK_40000)) { if (param_0) { - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMove_c0::m.field_0x70, 3.0f); } else { setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, 3.0f); @@ -2864,8 +2864,8 @@ int daAlink_c::procCoDeadInit(int param_0) { field_0x3478 = 0.38f; } else { - if (i_checkWolf()) { - if (i_checkModeFlg(0x40000)) { + if (checkWolf()) { + if (checkModeFlg(0x40000)) { setSingleAnimeWolfBase(WANM_SWIM_DIE); setFaceBasicTexture(FTANM_UNK_9D); dComIfGp_setPlayerStatus0(0, 0x100000); @@ -2878,8 +2878,8 @@ int daAlink_c::procCoDeadInit(int param_0) { } else { daAlink_ANM die_anm; - if (i_checkModeFlg(0x400)) { - if (i_checkReinRide()) { + if (checkModeFlg(0x400)) { + if (checkReinRide()) { die_anm = ANM_HORSE_DIE; if (checkHorseUnderItemAnime()) { @@ -2887,16 +2887,16 @@ int daAlink_c::procCoDeadInit(int param_0) { } if (checkHorseRide()) { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); - horse_p->i_changeOriginalDemo(); - horse_p->i_changeDemoMode(5, 0); + daHorse_c* horse_p = dComIfGp_getHorseActor(); + horse_p->changeOriginalDemo(); + horse_p->changeDemoMode(5, 0); } else { mRideAcKeep.getActor()->speedF = 0.0f; } } voiceStart(Z2SE_AL_V_DIE_SHORT); - } else if (i_checkModeFlg(0x40000)) { + } else if (checkModeFlg(0x40000)) { die_anm = ANM_SWIM_DIE; dComIfGp_setPlayerStatus0(0, 0x100000); voiceStart(Z2SE_AL_V_DIE_SHORT); @@ -2960,7 +2960,7 @@ int daAlink_c::procCoDead() { mDoAud_bgmStart(Z2BGM_GAME_OVER); } - if (!i_checkNoResetFlg2(FLG2_UNK_40000)) { + if (!checkNoResetFlg2(FLG2_UNK_40000)) { mProcVar3.field_0x300e++; if (mProcVar3.field_0x300e.x == 2) { dCam_getBody()->StartEventCamera(9, fopAcM_GetID(this), 0); @@ -2968,17 +2968,17 @@ int daAlink_c::procCoDead() { mProcVar3.field_0x300e.x = 10; } - if (!i_checkModeFlg(0x400)) { - if (i_checkModeFlg(0x40000)) { - if (i_checkNoResetFlg0(FLG0_UNK_80) && current.pos.y > mWaterY) { + if (!checkModeFlg(0x400)) { + if (checkModeFlg(0x40000)) { + if (checkNoResetFlg0(FLG0_UNK_80) && current.pos.y > mWaterY) { current.pos.y = mWaterY; - i_onNoResetFlg0(FLG0_UNK_100); + onNoResetFlg0(FLG0_UNK_100); } } else { field_0x33cc = (frameCtrl_p->getFrame() - 101.0f) / 19.0f; - if ((!i_checkWolf() && frameCtrl_p->checkPass(122.0f)) || - (i_checkWolf() && frameCtrl_p->checkPass(114.0f))) + if ((!checkWolf() && frameCtrl_p->checkPass(122.0f)) || + (checkWolf() && frameCtrl_p->checkPass(114.0f))) { field_0x2f9d = 4; } @@ -2988,8 +2988,8 @@ int daAlink_c::procCoDead() { setDeadRideSyncPos(); - if (checkAnmEnd(frameCtrl_p) || ((i_checkModeFlg(0x40000) && frameCtrl_p->getFrame() > 70.0f) || - i_checkNoResetFlg2(FLG2_UNK_40000))) + if (checkAnmEnd(frameCtrl_p) || ((checkModeFlg(0x40000) && frameCtrl_p->getFrame() > 70.0f) || + checkNoResetFlg2(FLG2_UNK_40000))) { cLib_chaseF(&field_0x3478, 0.0f, 0.01f); if (field_0x3478 < 0.38f) { @@ -3001,9 +3001,9 @@ int daAlink_c::procCoDead() { } if (mProcVar2.field_0x300c != 0 && dComIfGp_getGameoverStatus() == 2 && - !i_checkNoResetFlg0(FLG0_UNK_4000)) + !checkNoResetFlg0(FLG0_UNK_4000)) { - i_dComIfGp_setItemLifeCount(-(i_dComIfGs_getLife() - 12), 0); + dComIfGp_setItemLifeCount(-(dComIfGs_getLife() - 12), 0); u32 var_r31; int room_no = fopAcM_GetRoomNo(this); @@ -3022,7 +3022,7 @@ int daAlink_c::procCoDead() { } else if (checkBossRoom() && (((room_no == 50 && !dComIfGs_isStageBossEnemy()) || (room_no == 51 && !dComIfGs_isStageMiddleBoss())) || - (checkStageName("D_MN08C") && !i_dComIfGs_isEventBit(0x2880)))) + (checkStageName("D_MN08C") && !dComIfGs_isEventBit(0x2880)))) { var_r3_2 = 0; } else if (mProcVar3.field_0x300e.z != 0x3F) { @@ -3033,7 +3033,7 @@ int daAlink_c::procCoDead() { return 1; } - i_onNoResetFlg0(FLG0_UNK_4000); + onNoResetFlg0(FLG0_UNK_4000); dStage_changeScene(var_r3_2, 0.0f, var_r31, var_r30, shape_angle.y, -1); } } @@ -3060,7 +3060,7 @@ int daAlink_c::procCoLookAroundInit() { mProcVar3.field_0x300e.x = 0; - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBase(WANM_ENTRANCE); setFaceBasicTexture(FTANM_UNK_A0); field_0x3588 = l_wolfBaseAnime; @@ -3120,7 +3120,7 @@ int daAlink_c::procCoQuakeWaitInit() { return 0; } - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBase(WANM_WAIT_WIND); } else { setSingleAnimeBase(ANM_WAIT_WIND); @@ -3132,12 +3132,12 @@ int daAlink_c::procCoQuakeWaitInit() { /* 8011C904-8011C9D0 117244 00CC+00 1/0 0/0 0/0 .text procCoCaughtInit__9daAlink_cFv */ int daAlink_c::procCoCaughtInit() { - u32 chk_40000 = i_checkModeFlg(0x40000); + u32 chk_40000 = checkModeFlg(0x40000); if (!commonProcInitNotSameProc(PROC_CAUGHT)) { return 0; } - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseMorf(WANM_WAIT_START, daAlinkHIO_wlDamCaught_c0::m.field_0x8); } else { setSingleAnimeBaseMorf(ANM_WAIT_START, daAlinkHIO_damCaught_c0::m.field_0x1C); @@ -3289,7 +3289,7 @@ int daAlink_c::procCoFogDeadInit() { mDamageTimer = 0; if (mLinkAcch.ChkGroundHit()) { - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBase(WANM_DIE); setFaceBasicTexture(FTANM_UNK_9C); voiceStart(Z2SE_WL_V_DIE); @@ -3300,7 +3300,7 @@ int daAlink_c::procCoFogDeadInit() { } else { setJumpMode(); - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_FALL_LAND, FLOAT_LABEL(lit_6108), daAlinkHIO_wlDamFall_c0::m.field_0x3C); } else { @@ -3321,10 +3321,10 @@ int daAlink_c::procCoFogDeadInit() { // matches with literals #ifdef NONMATCHING int daAlink_c::procCoFogDead() { - if (mLinkAcch.ChkGroundHit() && i_checkModeFlg(0x2)) { + if (mLinkAcch.ChkGroundHit() && checkModeFlg(0x2)) { offModeFlg(0x2); - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBase(WANM_DIE); setFaceBasicTexture(FTANM_UNK_9C); voiceStart(Z2SE_WL_V_DIE); @@ -3378,7 +3378,7 @@ int daAlink_c::procCoNodInit() { return 1; } - if (i_checkWolf()) { + if (checkWolf()) { mProcVar2.field_0x300c = 1; } else { if (mDemo.getParam0() == 1) { @@ -3393,7 +3393,7 @@ int daAlink_c::procCoNodInit() { field_0x2f96 = 4; field_0x2f97 = 10; - i_onNoResetFlg1(0x10100000); + onNoResetFlg1(FLG1_UNK_10100000); mProcVar2.field_0x300c = 0; } @@ -3420,13 +3420,13 @@ int daAlink_c::procCoEyeAwayInit() { return 1; } - if (!i_checkWolf()) { + if (!checkWolf()) { setUpperAnimeBase(0xD3); setFacePriTexture(FTANM_UNK_77); setFacePriBck(0x129); field_0x2f96 = 4; field_0x2f97 = 10; - i_onNoResetFlg1(0x10100000); + onNoResetFlg1(FLG1_UNK_10100000); } return 1; @@ -3438,7 +3438,7 @@ int daAlink_c::procCoGlareInit() { return 1; } - if (i_checkWolf()) { + if (checkWolf()) { mProcVar2.field_0x300c = 1; } else { setUpperAnimeBase(0xD2); @@ -3450,7 +3450,7 @@ int daAlink_c::procCoGlareInit() { field_0x3478 = lit_6041; field_0x2f96 = 4; field_0x2f97 = 10; - i_onNoResetFlg1(0x10100000); + onNoResetFlg1(FLG1_UNK_10100000); } return 1; @@ -3460,7 +3460,7 @@ int daAlink_c::procCoGlareInit() { int daAlink_c::procCoGlare() { daPy_frameCtrl_c* frame_ctrl = &mUpperFrameCtrl[2]; - if (!i_checkWolf()) { + if (!checkWolf()) { if (field_0x3478 > frame_ctrl->getFrame()) { mProcVar2.field_0x300c = 1; } else { @@ -3472,7 +3472,7 @@ int daAlink_c::procCoGlare() { dComIfGp_evmng_cutEnd(field_0x3184); } - if (!i_checkWolf() && frame_ctrl->getFrame() >= lit_7449) { + if (!checkWolf() && frame_ctrl->getFrame() >= lit_7449) { field_0x2f96 = 0; field_0x2f97 = 5; } @@ -3516,13 +3516,13 @@ int daAlink_c::procCoGetReadySitInit() { return 1; } - if (mEquipItem != NO_ITEM && !i_checkWolf()) { + if (mEquipItem != NO_ITEM && !checkWolf()) { return procPreActionUnequipInit(PROC_GET_READY_SIT, NULL); } commonProcInit(PROC_GET_READY_SIT); - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMove_c0::m.field_0x70, lit_6109); mProcVar2.field_0x300c = 1; } else { @@ -3541,7 +3541,7 @@ int daAlink_c::procCoGetReadySit() { mProcVar2.field_0x300c = 1; } - if (!i_checkWolf() && field_0x2f99 != 12) { + if (!checkWolf() && field_0x2f99 != 12) { field_0x2f99 = 4; } @@ -3560,7 +3560,7 @@ int daAlink_c::procCoTwGateInit() { return 1; } - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBase(WANM_TWGATE_PULL); field_0x3588 = l_wolfBaseAnime; voiceStart(Z2SE_WL_V_TW_PULL); @@ -3846,7 +3846,7 @@ int daAlink_c::procTradeItemOut() { } if (mDemo.getParam0() == 2) { - i_onResetFlg1(RFLG1_UNK_100); + onResetFlg1(RFLG1_UNK_100); } } @@ -3890,7 +3890,7 @@ int daAlink_c::procNotUseItemInit(int param_0) { return 0; } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); commonProcInit(PROC_NOT_USE_ITEM); setSingleAnimeBase(ANM_TRADE_ITEM_PULL_OUT); @@ -4041,7 +4041,7 @@ int daAlink_c::procSwordPushInit() { /* 8011E960-8011E9F8 1192A0 0098+00 1/0 0/0 0/0 .text procSwordPush__9daAlink_cFv */ int daAlink_c::procSwordPush() { field_0x2f99 = 4; - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); setSwordPushAnime(); if (field_0x3198 == 0x193) { @@ -4069,13 +4069,13 @@ int daAlink_c::procGanonFinishInit() { speed.y = tmp_0; field_0x37c8 = current.pos; - i_onEndResetFlg1(ERFLG1_GANON_FINISH); + onEndResetFlg1(ERFLG1_GANON_FINISH); return 1; } /* 8011EA78-8011EAE8 1193B8 0070+00 1/0 0/0 0/0 .text procGanonFinish__9daAlink_cFv */ int daAlink_c::procGanonFinish() { - i_onEndResetFlg1(ERFLG1_GANON_FINISH); + onEndResetFlg1(ERFLG1_GANON_FINISH); current.pos = field_0x37c8; if (checkAnmEnd(mUnderFrameCtrl)) { @@ -4098,7 +4098,7 @@ int daAlink_c::procCutFastReadyInit() { setUpperAnime(0x255, UPPER_2, daAlinkHIO_cut_c0::m.mEquipAnm.mSpeed, lit_7448, daAlinkHIO_cut_c0::m.mEquipAnm.mEndFrame, daAlinkHIO_cut_c0::m.mEquipAnm.mInterpolation); - i_onNoResetFlg0(FLG0_UNK_1000000); + onNoResetFlg0(FLG0_UNK_1000000); return 1; } @@ -4200,7 +4200,7 @@ int daAlink_c::procDungeonWarpReadyInit() { return 0; } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); commonProcInit(PROC_DUNGEON_WARP_READY); setSingleAnimeBase(ANM_TRADE_ITEM_PULL_OUT); mNormalSpeed = FLOAT_LABEL(lit_6108); @@ -4268,10 +4268,10 @@ int daAlink_c::procDungeonWarp() { cLib_addCalc(&scale.y, 2.5f, 0.5f, 0.5f, 0.1f); if (scale.x < 0.01f) { - i_onNoResetFlg0(FLG0_UNK_8000000); + onNoResetFlg0(FLG0_UNK_8000000); if (checkItemGet(DUNGEON_EXIT, 1)) { int escape = - dStage_stagInfo_GetEscapeWarp(i_dComIfGp_getStage()->getStagInfo()); + dStage_stagInfo_GetEscapeWarp(dComIfGp_getStage()->getStagInfo()); dStage_changeScene(escape, 0.0f, 12, -1, shape_angle.y, -1); dMeter2Info_warpOutProc(); } else { @@ -4416,17 +4416,17 @@ static asm fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* param_0, void* param_1) bool daAlink_c::checkAcceptWarp() { cM3dGPla plane; - if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && - !i_checkNoResetFlg0(FLG0_UNDERWATER)) + if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && + !checkNoResetFlg0(FLG0_UNDERWATER)) { if (!getSlidePolygon(&plane) && !checkForestOldCentury()) { - if (i_checkMidnaRide() || getMidnaActor()->checkPortalObjRide()) { + if (checkMidnaRide() || getMidnaActor()->checkPortalObjRide()) { if ((checkField() || checkCastleTown()) && !checkStageName("R_SP161")) { - if ((i_checkWolf() && (i_checkModeFlg(MODE_UNK_1000) || - i_dComIfGp_checkPlayerStatus0(0, 0x10))) || - (!i_checkWolf() && + if ((checkWolf() && (checkModeFlg(MODE_UNK_1000) || + dComIfGp_checkPlayerStatus0(0, 0x10))) || + (!checkWolf() && (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) && - (i_checkModeFlg(4) || i_dComIfGp_checkPlayerStatus0(0, 0x10)))) + (checkModeFlg(4) || dComIfGp_checkPlayerStatus0(0, 0x10)))) { return true; } @@ -4469,7 +4469,7 @@ void daAlink_c::skipPortalObjWarp() { return; } - if (i_checkNoResetFlg3(FLG3_UNK_2000000) && + if (checkNoResetFlg3(FLG3_UNK_2000000) && (dComIfGp_TargetWarpPt_get() == 9 && dComIfGp_TransportWarp_check())) { dStage_changeScene(2, FLOAT_LABEL(lit_6108), 0, fopAcM_GetRoomNo(this), shape_angle.y, -1); @@ -4492,10 +4492,10 @@ void daAlink_c::checkWarpStart() { if (dMeter2Info_getWarpStatus() == WARP_STATUS_DECIDED_e || dComIfGp_event_compulsory(this, 0, 0xFFFF)) { - i_onNoResetFlg0(FLG0_UNK_4000); + onNoResetFlg0(FLG0_UNK_4000); if (dMeter2Info_getWarpStatus() == WARP_STATUS_DECIDED_e) { const char* portal; - if (!i_checkMidnaRide()) { + if (!checkMidnaRide()) { if (dComIfGp_TargetWarpPt_get() == 3) { eventInfo.setArchiveName("Obj_kbrg"); portal = kBridgePortal; @@ -4517,7 +4517,7 @@ void daAlink_c::checkWarpStart() { } fopAcM_orderOtherEvent(this, portal, 0xFFFF, 1, 1); } else { - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); if (dMeter2Info_getWarpStatus() == 1) { stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); u32 exitID = dStage_stagInfo_GetEscapeWarp(stag_info); @@ -4553,7 +4553,7 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) { mNormalSpeed = 0.0f; deleteEquipItem(FALSE, TRUE); - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMove_c0::m.field_0x70, 3.0f); } else { setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, 3.0f); @@ -4574,7 +4574,7 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) { field_0x3480 = -0.5f; mProcVar0.field_0x3008 = 0; - if (i_checkWolf()) { + if (checkWolf()) { field_0x347c = 3.5f; if (var_r27) { @@ -4587,8 +4587,8 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) { } if (param_1) { - if (!i_checkMidnaRide()) { - i_onPlayerNoDraw(); + if (!checkMidnaRide()) { + onPlayerNoDraw(); } } } else { @@ -4630,7 +4630,7 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) { field_0x347c = -0.5f; mProcVar0.field_0x3008 = 45; - if (i_checkWolf()) { + if (checkWolf()) { field_0x3480 = 3.5f; mProcVar3.field_0x300e.z = 0; field_0x3488 = -1.0f; @@ -4680,7 +4680,7 @@ int daAlink_c::procCoWarp() { mProcVar1.field_0x300a = 0; f32 var_f1; - if (i_checkWolf()) { + if (checkWolf()) { var_f1 = daAlinkHIO_wlAutoJump_c0::m.field_0x58; } else { var_f1 = daAlinkHIO_autoJump_c0::m.mGravity; @@ -4694,14 +4694,14 @@ int daAlink_c::procCoWarp() { mProcVar3.field_0x300e.z = 1; } - if (i_checkWolf() && mProcVar2.field_0x300c != 0) { + if (checkWolf() && mProcVar2.field_0x300c != 0) { for (int i = 0; i < 6; i++) { setEmitter(&field_0x3240[i], effName_39419[i], ¤t.pos, &shape_angle); } } } - if (mProcVar2.field_0x300c != 0 && !i_checkWolf()) { + if (mProcVar2.field_0x300c != 0 && !checkWolf()) { setEmitter(&field_0x3240[0], 0x9F3, ¤t.pos, &shape_angle); } @@ -4721,8 +4721,8 @@ int daAlink_c::procCoWarp() { dComIfGp_setNextStage(dComIfGp_getStartStageName(), mProcVar3.field_0x300e.y, fopAcM_GetRoomNo(this), -1, 0.0f, 5, 1, 0, shape_angle.y, 1, 0); - i_changeOriginalDemo(); - i_changeDemoMode(1, 0, 0, 0); + changeOriginalDemo(); + changeDemoMode(1, 0, 0, 0); } else { resetSpecialEvent(); } @@ -4739,7 +4739,7 @@ int daAlink_c::procCoWarp() { } else { dComIfGp_evmng_cutEnd(field_0x3184); } - } else if (mProcVar2.field_0x300c == 0 && !i_checkNoResetFlg0(FLG0_PLAYER_NO_DRAW)) { + } else if (mProcVar2.field_0x300c == 0 && !checkNoResetFlg0(FLG0_PLAYER_NO_DRAW)) { cXyz sp10(current.pos.x, current.pos.y + (field_0x347c - -0.5f) * 30.0f, current.pos.z); setEmitter(&field_0x3240[0], field_0x32cc, &sp10, &shape_angle); } @@ -4760,7 +4760,7 @@ asm int daAlink_c::procCoWarp() { /* 80120440-80120474 11AD80 0034+00 1/0 0/0 0/0 .text commonWaitTurnInit__9daAlink_cFv */ int daAlink_c::commonWaitTurnInit() { - if (i_checkWolf()) { + if (checkWolf()) { return procWolfWaitTurnInit(); } else { return procWaitTurnInit(); @@ -4778,7 +4778,7 @@ int daAlink_c::commonGrabPutInit() { } } - if (i_checkWolf()) { + if (checkWolf()) { return procWolfGrabPutInit(); } @@ -4787,7 +4787,7 @@ int daAlink_c::commonGrabPutInit() { /* 80120500-80120534 11AE40 0034+00 3/3 0/0 0/0 .text commonLargeDamageUpInit__9daAlink_cFiiss */ int daAlink_c::commonLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { - if (i_checkWolf()) { + if (checkWolf()) { return procWolfLargeDamageUpInit(param_0, param_1, param_2, param_3); } else { return procLargeDamageUpInit(param_0, param_1, param_2, param_3); @@ -4796,7 +4796,7 @@ int daAlink_c::commonLargeDamageUpInit(int param_0, int param_1, s16 param_2, s1 /* 80120534-80120580 11AE74 004C+00 4/4 0/0 0/0 .text commonFallInit__9daAlink_cFi */ int daAlink_c::commonFallInit(int param_0) { - if (i_checkWolf()) { + if (checkWolf()) { return procWolfFallInit(param_0, daAlinkHIO_wlAutoJump_c0::m.field_0x54); } else { return procFallInit(param_0, daAlinkHIO_autoJump_c0::m.mFallInterpolation); diff --git a/src/d/a/d_a_alink_effect.inc b/src/d/a/d_a_alink_effect.inc index a818a277922..c5a3c261076 100644 --- a/src/d/a/d_a_alink_effect.inc +++ b/src/d/a/d_a_alink_effect.inc @@ -157,7 +157,7 @@ asm void daAlink_c::setWolfFootOn(int param_0) { */ void daAlink_c::setFootMark(cXyz* i_pos, u16 i_mtxNo, int param_2) { cXyz sp8; - mDoMtx_multVecSR(mpLinkModel->i_getAnmMtx(i_mtxNo), &cXyz::BaseX, &sp8); + mDoMtx_multVecSR(mpLinkModel->getAnmMtx(i_mtxNo), &cXyz::BaseX, &sp8); dkWmark_c::setFootMark(i_pos, sp8.atan2sX_Z(), param_2); } @@ -360,7 +360,7 @@ asm void daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk& param_0) { void daAlink_c::setCutWaterDropEffect() { if (field_0x32c0[0] > 0) { cXyz sp18; - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(1), &sp18); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(1), &sp18); dComIfGp_particle_setColor(0x2A4, &sp18, &tevStr, NULL, NULL, FLOAT_LABEL(lit_6108), -1, &shape_angle, NULL, NULL, -1, NULL); } diff --git a/src/d/a/d_a_alink_grab.inc b/src/d/a/d_a_alink_grab.inc index d6d30740592..ccf3ae3846b 100644 --- a/src/d/a/d_a_alink_grab.inc +++ b/src/d/a/d_a_alink_grab.inc @@ -75,9 +75,9 @@ bool daAlink_c::exchangeGrabActor(fopAc_ac_c* p_actor) { /* 800E3A9C-800E3BCC 0DE3DC 0130+00 1/0 0/0 0/0 .text setForceGrab__9daAlink_cFP10fopAc_ac_cii */ bool daAlink_c::setForceGrab(fopAc_ac_c* p_actor, int param_1, int param_2) { - if (((param_1 != 0 || !checkEventRun()) && !i_checkWolf()) && + if (((param_1 != 0 || !checkEventRun()) && !checkWolf()) && (((mEquipItem == NO_ITEM || (param_2 != 0 && checkHookshotItem(mEquipItem)))) && - ((i_checkModeFlg(MODE_UNK_10000000) && + ((checkModeFlg(MODE_UNK_10000000) && (checkHorseNoUpperAnime() || checkHorseTurnAnime())) || param_2 != 0 && checkHookshotAnime()))) { @@ -629,7 +629,7 @@ asm void daAlink_c::setFmChainPosFromOut(fopAc_ac_c* param_0, cXyz* param_1, int /* 800E7BD0-800E7C30 0E2510 0060+00 1/0 0/0 0/0 .text checkChainBlockPushPull__9daAlink_cFv */ bool daAlink_c::checkChainBlockPushPull() { - if (i_checkFmChainGrabAnime()) { + if (checkFmChainGrabAnime()) { fopAc_ac_c* actor = field_0x2844.getActor(); if (actor != NULL) { s16 name = fopAcM_GetName(actor); @@ -697,7 +697,7 @@ asm void daAlink_c::setWallGrabStatus(u8 param_0, u8 param_1) { /* 800E7EE4-800E7EF4 0E2824 0010+00 2/2 0/0 0/0 .text getWallGrabStatus__9daAlink_cFv */ int daAlink_c::getWallGrabStatus() { - return i_dComIfGp_getRStatus(); + return dComIfGp_getRStatus(); } /* 800E7EF4-800E7F18 0E2834 0024+00 1/1 0/0 0/0 .text wallGrabTrigger__9daAlink_cFv */ @@ -860,7 +860,7 @@ static fopAc_ac_c* daAlink_searchGoat(fopAc_ac_c* i_actor, void*) { void daAlink_c::cancelGoronThrowEvent() { if (mProcID == PROC_GOAT_CATCH && mProcVar3.field_0x300e.z == 0) { mProcVar3.field_0x300e.z = 1; - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); } } diff --git a/src/d/a/d_a_alink_guard.inc b/src/d/a/d_a_alink_guard.inc index 4847479fe0c..87459974f66 100644 --- a/src/d/a/d_a_alink_guard.inc +++ b/src/d/a/d_a_alink_guard.inc @@ -46,7 +46,7 @@ BOOL daAlink_c::checkShieldAttackEmphasys() { /* 800DC678-800DC79C 0D6FB8 0124+00 5/5 0/0 0/0 .text checkGuardActionChange__9daAlink_cFv */ /* BOOL daAlink_c::checkGuardActionChange() { - return i_checkAttentionLock() && !checkIronBallWaitAnime() && !checkGrabAnime() && + return checkAttentionLock() && !checkIronBallWaitAnime() && !checkGrabAnime() && !checkCopyRodControllAnime() && mTargetedActor != NULL && !checkSpecialNpc(mTargetedActor) && (fopAcM_GetGroup(mTargetedActor) != 3 && fopAcM_GetGroup(mTargetedActor) != fopAc_NPC_e); } */ @@ -65,7 +65,7 @@ asm BOOL daAlink_c::checkGuardActionChange() { // matches with literals #ifdef NONMATCHING void daAlink_c::stickArrowIncrement(int param_0) { - if (!i_checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW)) { + if (!checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW)) { s16 arrow_num = 0; for (int i = 0; i < 16; i++) { @@ -89,7 +89,7 @@ void daAlink_c::stickArrowIncrement(int param_0) { 0.0f); } - i_onResetFlg0(RFLG0_UNK_1); + onResetFlg0(RFLG0_UNK_1); } } } @@ -218,14 +218,14 @@ 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 && + return checkNoResetFlg2(FLG2_UNK_8000000) && !checkEventRun() && + !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())) || + return (checkSmallUpperGuardAnime() || (i_checkShieldGet() && checkHorseLieAnime())) || checkUpperGuardAnime(); } @@ -236,27 +236,27 @@ 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() && + return checkModeFlg(0x80) && i_checkShieldGet() && !checkFmChainGrabAnime() && !checkNotBattleStage(); } /* 800DD008-800DD018 0D7948 0010+00 11/11 0/0 0/0 .text setUpperGuardAnime__9daAlink_cFf */ void daAlink_c::setUpperGuardAnime(f32) { - i_onNoResetFlg2(FLG2_UNK_8000000); + onNoResetFlg2(FLG2_UNK_8000000); } /* 800DD018-800DD114 0D7958 00FC+00 1/1 0/0 0/0 .text setShieldGuard__9daAlink_cFv */ void daAlink_c::setShieldGuard() { - if ((mProcID == PROC_GUARD_SLIP && mEquipItem != IRONBALL) || i_checkSmallUpperGuardAnime() || + if ((mProcID == PROC_GUARD_SLIP && mEquipItem != IRONBALL) || checkSmallUpperGuardAnime() || (checkGuardAccept() && !checkGrabAnime() && !checkUpperReadyThrowAnime() && !checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() && !checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) && - !i_checkRideOn() && checkGuardActionChange())) + !checkRideOn() && checkGuardActionChange())) { - i_onNoResetFlg2(FLG2_UNK_8000000); + onNoResetFlg2(FLG2_UNK_8000000); } else { - i_offNoResetFlg2(FLG2_UNK_8000000); + offNoResetFlg2(FLG2_UNK_8000000); } } diff --git a/src/d/a/d_a_alink_hang.inc b/src/d/a/d_a_alink_hang.inc index 07b4bd0f124..62ff6f757c3 100644 --- a/src/d/a/d_a_alink_hang.inc +++ b/src/d/a/d_a_alink_hang.inc @@ -67,7 +67,7 @@ asm bool daAlink_c::checkHangFootWall() { #ifdef NONMATCHING void daAlink_c::setHangGroundY() { cXyz pos; - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(0), &pos); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(0), &pos); pos.x -= cM_ssin(shape_angle.y) * 15.0f; pos.z -= cM_scos(shape_angle.y) * 15.0f; @@ -141,7 +141,7 @@ int daAlink_c::procHangStartInit() { BOOL hang_ready = mProcID == PROC_HANG_READY; commonProcInit(PROC_HANG_START); current.pos = sp38; - i_offNoResetFlg2(FLG2_UNK_2000); + offNoResetFlg2(FLG2_UNK_2000); if (checkHangFootWall()) { if (!hang_ready && cM_rnd() < 0.7f) { @@ -487,7 +487,7 @@ int daAlink_c::setOctaIealHangPos() { return 0; } - mDoMtx_stack_c::copy(ob_p->mParts[0].field_0x0->getModel()->i_getAnmMtx(0)); + mDoMtx_stack_c::copy(ob_p->mParts[0].field_0x0->getModel()->getAnmMtx(0)); mDoMtx_stack_c::transM(FLOAT_LABEL(lit_6108), lit_24400, lit_24401); mDoMtx_stack_c::multVecZero(¤t.pos); mDoMtx_MtxToRot(mDoMtx_stack_c::get(), &shape_angle); @@ -535,7 +535,7 @@ int daAlink_c::procBossBodyHangInit(fopAc_ac_c* param_0) { field_0x280c.setData(param_0); setBossBodyHangPos(); - i_onEndResetFlg1(ERFLG1_GANON_FINISH); + onEndResetFlg1(ERFLG1_GANON_FINISH); return 1; } @@ -559,9 +559,9 @@ int daAlink_c::getLadderUnitCount() const { // loop issue #ifdef NONMATCHING int daAlink_c::setLadderInit() { - i_onNoResetFlg3(FLG3_UNK_400000); + onNoResetFlg3(FLG3_UNK_400000); - if (i_checkModeFlg(0x40000)) { + if (checkModeFlg(0x40000)) { setLadderPos(getLadderUnitCount() - 2); while (mWaterY - current.pos.y > daAlinkHIO_swim_c0::m.mInitHeight) { @@ -858,9 +858,9 @@ BOOL daAlink_c::checkClimbCode(cBgS_PolyInfo& i_poly) { /* 800FE114-800FE174 0F8A54 0060+00 1/1 0/0 0/0 .text setClimbInit__9daAlink_cFv */ void daAlink_c::setClimbInit() { - i_onNoResetFlg3(FLG3_UNK_400000); + onNoResetFlg3(FLG3_UNK_400000); - if (i_checkModeFlg(0x40000)) { + if (checkModeFlg(0x40000)) { shape_angle.y = field_0x306e + 0x8000; current.pos.y -= lit_23595; setClimbStartNotGround(); @@ -950,7 +950,7 @@ int daAlink_c::checkBgCorrectClimbMove(cXyz* i_startPos, cXyz* i_endPos) { dComIfG_Bgsp().GetTriPla(mLinkLinChk, &tri_plane); if (cLib_distanceAngleS(tri_plane.mNormal.atan2sX_Z(), shape_angle.y) < 0x549F || - (i_checkModeFlg(0x10000) && !checkClimbCode(mLinkLinChk))) + (checkModeFlg(0x10000) && !checkClimbCode(mLinkLinChk))) { current.pos += mLinkLinChk.i_GetCross() - *i_endPos; return 1; diff --git a/src/d/a/d_a_alink_hook.inc b/src/d/a/d_a_alink_hook.inc index 473d847f5d0..90a06edddb0 100644 --- a/src/d/a/d_a_alink_hook.inc +++ b/src/d/a/d_a_alink_hook.inc @@ -219,7 +219,7 @@ asm void daAlink_c::setHookshotCatchNow() { /* 80108A90-80108B34 1033D0 00A4+00 1/0 0/0 0/0 .text setHookshotCarryOffset__9daAlink_cFUiPC4cXyz */ bool daAlink_c::setHookshotCarryOffset(unsigned int i_carryActorID, cXyz const* i_posOffset) { - if (i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { + if (dComIfGp_checkPlayerStatus1(0, 0x10000)) { fopAc_ac_c* carryActor_p = mCargoCarryAcKeep.getActor(); if (carryActor_p != NULL && fopAcM_checkHookCarryNow(carryActor_p) && @@ -365,7 +365,7 @@ void daAlink_c::cancelHookshotShot() { bool daAlink_c::cancelHookshotMove() { if (mFastShotTime == 0 && mItemMode == HS_MODE_NONE_e) { if (checkHookshotAnime() && - (mTargetedActor == NULL && !i_checkAttentionLock() || !itemButton())) + (mTargetedActor == NULL && !checkAttentionLock() || !itemButton())) { resetUpperAnime(UPPER_2, -1.0f); return 1; @@ -394,7 +394,7 @@ BOOL daAlink_c::checkHookshotReadyMaterialOffMode() const { /* 80109070-801090EC 1039B0 007C+00 5/5 0/0 0/0 .text setHookshotReadyMaterial__9daAlink_cFv */ void daAlink_c::setHookshotReadyMaterial() { - if (i_checkNoResetFlg2(FLG2_UNK_80000) || checkCasualWearFlg()) { + if (checkNoResetFlg2(FLG2_UNK_80000) || checkCasualWearFlg()) { mFallVoiceInit = 0; } else if (checkZoraWearFlg()) { field_0x32cc = 0x37B; @@ -443,7 +443,7 @@ void daAlink_c::initHookshotReady() { */ void daAlink_c::setHookshotReadyAnime() { f32 speed; - if (!i_checkAttentionLock() && mFastShotTime == 0) { + if (!checkAttentionLock() && mFastShotTime == 0) { speed = FLOAT_LABEL(lit_6108); } else { speed = daAlinkHIO_hookshot_c0::m.mWaitAnmSpeed; @@ -485,10 +485,10 @@ int daAlink_c::checkUpperItemActionHookshot() { } setSingleAnimeBaseMorf(anmID, FLOAT_LABEL(lit_6108)); - } else if (i_checkModeFlg(0x40400)) { + } else if (checkModeFlg(0x40400)) { setUpperAnimeParam(0x18C, UPPER_2, &daAlinkHIO_hookshot_c0::m.mShootAnm); - if (i_checkModeFlg(0x40000)) { + if (checkModeFlg(0x40000)) { mNormalSpeed = FLOAT_LABEL(lit_6108); } } else { @@ -505,16 +505,16 @@ int daAlink_c::checkUpperItemActionHookshot() { setSingleAnimeParam(ANM_HOOKSHOT_SHOOT, &daAlinkHIO_hookshot_c0::m.mShootAnm); } - if (!i_checkNoResetFlg3(FLG3_UNK_4)) { + if (!checkNoResetFlg3(FLG3_UNK_4)) { f32 tmp_0 = FLOAT_LABEL(lit_6108); dComIfGp_getVibration().StartQuake(1, 1, cXyz(tmp_0, lit_6040, tmp_0)); - i_onNoResetFlg3(FLG3_UNK_4); + onNoResetFlg3(FLG3_UNK_4); } return 1; } } else if (mItemMode == HS_MODE_NONE_e) { - if (i_checkModeFlg(0x400) && i_checkAttentionLock() && mTargetedActor == NULL) { + if (checkModeFlg(0x400) && checkAttentionLock() && mTargetedActor == NULL) { resetUpperAnime(UPPER_2, lit_6109); dComIfGp_clearPlayerStatus0(0, 0x4000); return 1; @@ -564,30 +564,30 @@ int daAlink_c::checkNextActionHookshot() { setHookshotReadyAnime(); setFastShotTimer(); - if (!i_checkAttentionLock()) { + if (!checkAttentionLock()) { field_0x2fe4 = shape_angle.y; } } - if (!i_checkAttentionLock() && mFastShotTime == 0) { - if (i_checkModeFlg(0x400)) { + if (!checkAttentionLock() && mFastShotTime == 0) { + if (checkModeFlg(0x400)) { if (checkCanoeRide()) { return procCanoeHookshotSubjectInit(); } else { return procHorseHookshotSubjectInit(); } - } else if (i_checkModeFlg(0x40000)) { + } else if (checkModeFlg(0x40000)) { return procSwimHookshotSubjectInit(); } else { return procHookshotSubjectInit(); } - } else if (i_checkModeFlg(0x400)) { + } else if (checkModeFlg(0x400)) { if (checkCanoeRide()) { return procCanoeHookshotMoveInit(); } else { return procHorseHookshotMoveInit(); } - } else if (i_checkModeFlg(0x40000)) { + } else if (checkModeFlg(0x40000)) { return procSwimHookshotMoveInit(); } else { return procHookshotMoveInit(); @@ -608,7 +608,7 @@ void daAlink_c::setHookshotReturnEnd() { field_0x2060->initOldFrameMorf(3.0f, field_0x30a8, field_0x30aa); } else if (checkHookshotShootAnime()) { setUpperAnimeBaseSpeed( - 0x18D, i_checkAttentionLock() ? daAlinkHIO_hookshot_c0::m.mWaitAnmSpeed : 0.0f, 3.0f); + 0x18D, checkAttentionLock() ? daAlinkHIO_hookshot_c0::m.mWaitAnmSpeed : 0.0f, 3.0f); } mFastShotTime = 0; @@ -674,7 +674,7 @@ static Vec l_hookSnowSandHitScale; // almost, just stack order #ifdef NONMATCHING void daAlink_c::setHookshotPos() { - mDoMtx_stack_c::copy(mpLinkModel->i_getAnmMtx(field_0x30c0)); + mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(field_0x30c0)); mDoMtx_stack_c::transM(-2.0f, 1.0f, 1.0f); mDoMtx_stack_c::XYZrotM(cM_deg2s(5.7f), cM_deg2s(162.0f), 0); @@ -684,9 +684,9 @@ void daAlink_c::setHookshotPos() { } else { var_r27 = field_0x0710; } - var_r27->i_setBaseTRMtx(mDoMtx_stack_c::get()); + var_r27->setBaseTRMtx(mDoMtx_stack_c::get()); - mDoMtx_stack_c::copy(mpLinkModel->i_getAnmMtx(field_0x30c2)); + mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(field_0x30c2)); mDoMtx_stack_c::transM(-2.0f, 0.0f, 1.0f); mDoMtx_stack_c::XYZrotM(cM_deg2s(-78.0f), cM_deg2s(182.0f), cM_deg2s(-99.0f)); @@ -696,7 +696,7 @@ void daAlink_c::setHookshotPos() { } else { var_r27_2 = mHeldItemModel; } - var_r27_2->i_setBaseTRMtx(mDoMtx_stack_c::get()); + var_r27_2->setBaseTRMtx(mDoMtx_stack_c::get()); cXyz sp134; @@ -770,7 +770,7 @@ void daAlink_c::setHookshotPos() { } } - if (i_checkModeFlg(0x400)) { + if (checkModeFlg(0x400)) { return_speed += current.pos.abs(field_0x3798); } @@ -905,7 +905,7 @@ void daAlink_c::setHookshotPos() { mHookshotTopPos += mIronBallCenterPos * shoot_speed; - if (i_checkModeFlg(0x400)) { + if (checkModeFlg(0x400)) { mHookshotTopPos += current.pos - field_0x3798; } @@ -943,7 +943,7 @@ void daAlink_c::setHookshotPos() { mItemMode = HS_MODE_FLY_e; hit_se = Z2SE_HIT_HOOKSHOT_STICK; - if (i_dComIfGp_checkPlayerStatus1(0, 0x2010000) != 0 && + if (dComIfGp_checkPlayerStatus1(0, 0x2010000) != 0 && mCargoCarryAcKeep.getActor() == NULL) { mPolyInfo3.SetPolyInfo(mPolyInfo2); @@ -989,7 +989,7 @@ void daAlink_c::setHookshotPos() { } else { sp30.set(cM_atan2s(poly.mNormal.y, poly.mNormal.absXZ()), cM_atan2s(-poly.mNormal.x, -poly.mNormal.z), 0); - i_dComIfGp_setHitMark(9, NULL, mRopeLinChk.GetCrossP(), &sp30, NULL, 0); + dComIfGp_setHitMark(9, NULL, mRopeLinChk.GetCrossP(), &sp30, NULL, 0); } } @@ -1022,15 +1022,15 @@ void daAlink_c::setHookshotPos() { } mHookTipBck.entry(mpHookTipModel->getModelData(), field_0x33e0); - mpHookTipModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpHookTipModel->setBaseTRMtx(mDoMtx_stack_c::get()); mpHookTipModel->calc(); f32 bck_frame; - if (i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { + if (dComIfGp_checkPlayerStatus1(0, 0x10000)) { mDoMtx_stack_c::transS(mIronBallBgChkPos); mDoMtx_stack_c::ZXYrotM(-0x4000, field_0x3022, 0); bck_frame = 14.0f; - } else if (i_dComIfGp_checkPlayerStatus1(0, 0x2000000)) { + } else if (dComIfGp_checkPlayerStatus1(0, 0x2000000)) { mDoMtx_stack_c::transS(mIronBallBgChkPos); mDoMtx_stack_c::ZXYrotM(0, field_0x3022, 0); bck_frame = 14.0f; @@ -1059,7 +1059,7 @@ void daAlink_c::setHookshotPos() { } mHookTipBck.entry(field_0x0714->getModelData(), bck_frame); - field_0x0714->i_setBaseTRMtx(mDoMtx_stack_c::get()); + field_0x0714->setBaseTRMtx(mDoMtx_stack_c::get()); field_0x0714->calc(); } #else @@ -1113,7 +1113,7 @@ void daAlink_c::setHookshotWallWaitAnime() { #ifdef NONMATCHING void daAlink_c::hookshotRoofTurn() { BOOL play_sound = false; - if (!i_dComIfGp_checkPlayerStatus0(0, 0x2000)) { + if (!dComIfGp_checkPlayerStatus0(0, 0x2000)) { f32 max_rise_y = (mIronBallBgChkPos.y + 15.0f) - 1.5f; f32 min_descend_y = mIronBallBgChkPos.y - daAlinkHIO_hookshot_c0::m.mMaxLength; @@ -1167,9 +1167,9 @@ void daAlink_c::hookshotRoofTurn() { } if (play_sound) { - if (!i_checkNoResetFlg3(FLG3_UNK_4)) { + if (!checkNoResetFlg3(FLG3_UNK_4)) { dComIfGp_getVibration().StartQuake(1, 1, cXyz(0.0f, 1.0f, 0.0f)); - i_onNoResetFlg3(FLG3_UNK_4); + onNoResetFlg3(FLG3_UNK_4); } } else { cancelItemUseQuake(0); @@ -1219,7 +1219,7 @@ int daAlink_c::checkNextHookPoint() { field_0x3026 = 0; return procHookshotFlyInit(); } - } else if (i_dComIfGp_checkPlayerStatus1(0, 0x10000) && checkHookshotRoofLv7Boss()) { + } else if (dComIfGp_checkPlayerStatus1(0, 0x10000) && checkHookshotRoofLv7Boss()) { if (!fopAcM_checkHookCarryNow(mCargoCarryAcKeep.getActor())) { field_0x3102 = shape_angle.y; return procCoLargeDamageInit(-6, 1, 0, 0, NULL, 0); @@ -1244,10 +1244,10 @@ int daAlink_c::checkLandHookshotHang() { if (mProcID != PROC_HOOKSHOT_ROOF_BOOTS && ((mProcID != PROC_HOOKSHOT_ROOF_SHOOT && mProcID != PROC_HOOKSHOT_WALL_SHOOT) || checkHookshotWait()) && - (!checkHookshotRoofLv7Boss() || !i_checkEquipHeavyBoots()) && + (!checkHookshotRoofLv7Boss() || !checkEquipHeavyBoots()) && checkSetItemTrigger(HVY_BOOTS)) { - if (i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { + if (dComIfGp_checkPlayerStatus1(0, 0x10000)) { return procHookshotRoofBootsInit(mCargoCarryAcKeep.getActor()); } setHeavyBoots(1); @@ -1403,8 +1403,8 @@ int daAlink_c::procHookshotMove() { int daAlink_c::procHookshotFlyInit() { commonProcInit(PROC_HOOKSHOT_FLY); - if (!i_checkNoResetFlg0(FLG0_UNK_100)) { - i_onNoResetFlg0(FLG0_UNDERWATER); + if (!checkNoResetFlg0(FLG0_UNK_100)) { + onNoResetFlg0(FLG0_UNDERWATER); } daAlink_ANM anm; @@ -1680,11 +1680,11 @@ int daAlink_c::procHookshotRoofWait() { mBodyAngle.y = 0; mBodyAngle.x = 0; offModeFlg(0x60000000); - } else if (i_dComIfGp_checkPlayerStatus0(0, 0x2000)) { + } else if (dComIfGp_checkPlayerStatus0(0, 0x2000)) { setBodyAngleToCamera(); } } else if (dCam_getBody()->ChangeModeOK(4)) { - i_onResetFlg0(RFLG0_UNK_4000000); + onResetFlg0(RFLG0_UNK_4000000); if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x1000)) { field_0x310c = shape_angle.y; @@ -1813,7 +1813,7 @@ int daAlink_c::procHookshotRoofShoot() { if (!checkUpperItemActionHookshot()) { mBodyAngle.x = mProcVar3.field_0x300e.x; - if (!i_checkAttentionLock() && mFastShotTime == 0) { + if (!checkAttentionLock() && mFastShotTime == 0) { if (checkHookshotWait()) { mUnderFrameCtrl[0].setRate(0.0f); mUnderFrameCtrl[0].setFrame(0.0f); @@ -1927,7 +1927,7 @@ int daAlink_c::procHookshotRoofBoots() { if (frameCtrl_p->checkPass(4.0f)) { setHeavyBoots(1); - } else if (i_checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS) && frameCtrl_p->checkPass(10.0f)) { + } else if (checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS) && frameCtrl_p->checkPass(10.0f)) { dComIfGp_getVibration().StartShock(3, 1, cXyz(0.0f, 1.0f, 0.0f)); } @@ -2017,7 +2017,7 @@ int daAlink_c::procHookshotWallWait() { dComIfGp_clearPlayerStatus0(0, 0x2000); mBodyAngle.x = 0; offModeFlg(0x60000000); - } else if (i_dComIfGp_checkPlayerStatus0(0, 0x2000)) { + } else if (dComIfGp_checkPlayerStatus0(0, 0x2000)) { s16 old_angle = shape_angle.y; shape_angle.y = field_0x310c; setBodyAngleToCamera(); @@ -2031,7 +2031,7 @@ int daAlink_c::procHookshotWallWait() { } } } else if (dCam_getBody()->ChangeModeOK(4)) { - i_onResetFlg0(RFLG0_UNK_4000000); + onResetFlg0(RFLG0_UNK_4000000); if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x1000)) { field_0x310c = shape_angle.y; @@ -2150,7 +2150,7 @@ int daAlink_c::procHookshotWallShoot() { mBodyAngle.x = mProcVar3.field_0x300e.x; shape_angle.y = mProcVar3.field_0x300e.y; - if (!i_checkAttentionLock() && mFastShotTime == 0) { + if (!checkAttentionLock() && mFastShotTime == 0) { if (checkHookshotWait()) { mUnderFrameCtrl[0].setRate(0.0f); mUnderFrameCtrl[0].setFrame(0.0f); diff --git a/src/d/a/d_a_alink_horse.inc b/src/d/a/d_a_alink_horse.inc index 1e9dfd06d8f..41128282067 100644 --- a/src/d/a/d_a_alink_horse.inc +++ b/src/d/a/d_a_alink_horse.inc @@ -32,19 +32,19 @@ static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* i_actor, void*) { /* 800EC76C-800EC7B0 0E70AC 0044+00 3/3 0/0 0/0 .text checkHorseZeldaBowMode__9daAlink_cFv */ BOOL daAlink_c::checkHorseZeldaBowMode() { - if (i_dComIfGp_getHorseActor() == NULL) { + if (dComIfGp_getHorseActor() == NULL) { return false; } - daHoZelda_c* zelda_p = i_dComIfGp_getHorseActor()->i_getZeldaActor(); + daHoZelda_c* zelda_p = dComIfGp_getHorseActor()->i_getZeldaActor(); return zelda_p != NULL && zelda_p->checkBowMode(); } /* 800EC7B0-800EC7DC 0E70F0 002C+00 4/4 0/0 0/0 .text setHorseZeldaDamage__9daAlink_cFv */ void daAlink_c::setHorseZeldaDamage() { - if (i_dComIfGp_getHorseActor() != NULL) { - daHoZelda_c* zelda_p = i_dComIfGp_getHorseActor()->i_getZeldaActor(); + if (dComIfGp_getHorseActor() != NULL) { + daHoZelda_c* zelda_p = dComIfGp_getHorseActor()->i_getZeldaActor(); if (zelda_p != NULL) { zelda_p->setDamageInit(); } @@ -177,16 +177,16 @@ int daAlink_c::initForceRideBoar() { void daAlink_c::initForceRideHorse() { commonInitForceRideRein(); mRideStatus = 1; - mRideAcKeep.setData(i_dComIfGp_getHorseActor()); + mRideAcKeep.setData(dComIfGp_getHorseActor()); field_0x384c = (cXyz*)&l_horseBaseAnime; - i_dComIfGp_getHorseActor()->onRideFlg(); + dComIfGp_getHorseActor()->onRideFlg(); mZ2Link.setRiding(true); } /* 800ECBD0-800ECD90 0E7510 01C0+00 5/5 0/0 0/0 .text rideGetOff__9daAlink_cFv */ void daAlink_c::rideGetOff() { if (checkHorseRide()) { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (horse_p != NULL) { horse_p->offRideFlg(); } @@ -221,7 +221,7 @@ void daAlink_c::rideGetOff() { } mRideStatus = 0; - i_offNoResetFlg1(FLG1_UNK_1800); + offNoResetFlg1(FLG1_UNK_1800); attention_info.field_0xa = 10; shape_angle.x = 0; shape_angle.z = 0; @@ -236,7 +236,7 @@ BOOL daAlink_c::checkHorseNotDamageReaction() const { /* 800ECDC4-800ECDEC 0E7704 0028+00 1/1 0/0 2/2 .text checkHorseWaitLashAnime__9daAlink_cCFv */ BOOL daAlink_c::checkHorseWaitLashAnime() const { - return checkHorseUnderDashStartAnime() && i_checkModeFlg(1); + return checkHorseUnderDashStartAnime() && checkModeFlg(1); } /* 800ECDEC-800ECE10 0E772C 0024+00 1/1 0/0 0/0 .text checkHorseReinLeftOnly__9daAlink_cCFv */ @@ -262,7 +262,7 @@ BOOL daAlink_c::checkHorseLieAnime() const { /* 800ECF5C-800ECF9C 0E789C 0040+00 0/0 0/0 3/3 .text checkHorseSubjectivity__9daAlink_cCFv */ BOOL daAlink_c::checkHorseSubjectivity() const { - return i_dComIfGp_checkPlayerStatus0(0, 0x2000) || mProcID == PROC_HORSE_BOW_SUBJECT || + return dComIfGp_checkPlayerStatus0(0, 0x2000) || mProcID == PROC_HORSE_BOW_SUBJECT || mProcID == PROC_HORSE_HOOKSHOT_SUBJECT || mProcID == PROC_HORSE_BOOMERANG_SUBJECT; } @@ -328,7 +328,7 @@ void daAlink_c::changeBoarRunRide() { // matches with literals #ifdef NONMATCHING int daAlink_c::setSyncHorsePos() { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (horse_p == NULL) { if (mProcID == PROC_DEAD || mProcID == PROC_GET_ITEM) { @@ -514,13 +514,13 @@ asm void daAlink_c::getBaseHorseAnime(daAlink_c::daAlink_ANM* param_0) { /* 800EDD6C-800EDE8C 0E86AC 0120+00 9/9 0/0 0/0 .text checkHorseSpecialProc__9daAlink_cFv */ int daAlink_c::checkHorseSpecialProc() { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (!checkHorseRide()) { return 0; } - if (i_checkEndResetFlg2(ERFLG2_UNK_2)) { + if (checkEndResetFlg2(ERFLG2_UNK_2)) { current.pos = horse_p->current.pos; return procWaitInit(); } @@ -553,8 +553,8 @@ BOOL daAlink_c::checkHorseServiceWaitAnime() { // matches with literals? #ifdef NONMATCHING int daAlink_c::setSyncHorse(int param_0) { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); - BOOL mode_1 = i_checkModeFlg(1); + daHorse_c* horse_p = dComIfGp_getHorseActor(); + BOOL mode_1 = checkModeFlg(1); setSyncHorsePos(); if (checkHorseSpecialProc()) { @@ -574,7 +574,7 @@ int daAlink_c::setSyncHorse(int param_0) { { field_0x3004 = daAlinkHIO_horse_c0::m.mNoWalkTime; setSingleAnimeParam(ANM_WSTARTH, &daAlinkHIO_horse_c0::m.mWalkAnm); - i_offNoResetFlg1(FLG1_UNK_1000); + offNoResetFlg1(FLG1_UNK_1000); } } @@ -605,7 +605,7 @@ int daAlink_c::setSyncHorse(int param_0) { setDoStatus(40); if (doTrigger()) { - i_onResetFlg0(RFLG0_UNK_200); + onResetFlg0(RFLG0_UNK_200); voiceStart(Z2SE_AL_V_RUSH_HORSE); field_0x30a6 = daAlinkHIO_horse_c0::m.mWhipWaitTime; setHorseSwordUpAnime(); @@ -627,12 +627,12 @@ int daAlink_c::setSyncHorse(int param_0) { setUnderAnimeParam(getMainBckData(ANM_HORSE_LASH)->m_underID, UNDER_2, &daAlinkHIO_horse_c0::m.mWhipAnm); - i_onNoResetFlg1(FLG1_UNK_1000); + onNoResetFlg1(FLG1_UNK_1000); horse_p->offPlayerBackRideLash(); voiceStart(Z2SE_AL_V_RUSH_HORSE); if (horse_p->speedF <= horse_p->getNormalMaxSpeedF()) { - i_onNoResetFlg1(FLG1_UNK_800); + onNoResetFlg1(FLG1_UNK_800); } field_0x30a6 = daAlinkHIO_horse_c0::m.mWhipWaitTime; @@ -647,11 +647,11 @@ int daAlink_c::setSyncHorse(int param_0) { horse_p->onMoveAccept(); } - if (i_checkNoResetFlg1(FLG1_UNK_1000) && + if (checkNoResetFlg1(FLG1_UNK_1000) && ((checkHorseUnderDashStartAnime() && mUnderFrameCtrl[2].getFrame() > 13.0f) || (checkHorseUnderLashAnime() && mUnderFrameCtrl[2].getFrame() > 13.0f))) { - i_offNoResetFlg1(FLG1_UNK_1000); + offNoResetFlg1(FLG1_UNK_1000); horse_p->onPlayerLash(); } @@ -680,7 +680,7 @@ int daAlink_c::setSyncHorse(int param_0) { BOOL var_r28 = checkAnmEnd(mUnderFrameCtrl) || (checkHorseServiceWaitAnime() && - (!checkNoUpperAnime() || horse_p->getAimNeckAngleY() != 0 || !i_checkModeFlg(1))); + (!checkNoUpperAnime() || horse_p->getAimNeckAngleY() != 0 || !checkModeFlg(1))); if (((var_r28 || sp8[0] == ANM_HORSE_TURN_LEFT || sp8[0] == ANM_HORSE_TURN_RIGHT || sp8[0] == ANM_HORSE_DASH_START || @@ -737,7 +737,7 @@ asm int daAlink_c::setSyncHorse(int param_0) { #ifdef NONMATCHING int daAlink_c::setSyncBoar(int param_0) { e_wb_class* e_wb_p = static_cast(mRideAcKeep.getActor()); - BOOL mode_1 = i_checkModeFlg(1); + BOOL mode_1 = checkModeFlg(1); if (!setSyncBoarPos()) { return 0; @@ -761,7 +761,7 @@ int daAlink_c::setSyncBoar(int param_0) { } if ((checkAnmEnd(mUnderFrameCtrl) && mProcID != PROC_HORSE_CUT_TURN) || - (checkHorseServiceWaitAnime() && (!checkNoUpperAnime() || !i_checkModeFlg(1)))) + (checkHorseServiceWaitAnime() && (!checkNoUpperAnime() || !checkModeFlg(1)))) { setBaseBoarAnime(); } else if (mUnderAnmHeap[0].getIdx() == 0x1B3) { @@ -809,8 +809,8 @@ asm int daAlink_c::setSyncBoar(int param_0) { /* 800EE918-800EEAE8 0E9258 01D0+00 12/12 0/0 0/0 .text setSyncRide__9daAlink_cFi */ int daAlink_c::setSyncRide(int param_0) { BOOL var_r31; - if (param_0 && mMidnaTalkDelayTimer == 0 && i_dComIfGp_getDoStatus() == 0 && - (!checkHorseRide() || i_dComIfGp_getHorseActor()->getAnmIdx(0) != 7)) + if (param_0 && mMidnaTalkDelayTimer == 0 && dComIfGp_getDoStatus() == 0 && + (!checkHorseRide() || dComIfGp_getHorseActor()->getAnmIdx(0) != 7)) { var_r31 = TRUE; } else { @@ -821,7 +821,7 @@ int daAlink_c::setSyncRide(int param_0) { !checkBowAndSlingItem(mEquipItem) && checkZeroSpeedF() && !checkUnderMove0BckNoArc(ANM_HORSE_TURN_LEFT) && !checkUnderMove0BckNoArc(ANM_HORSE_TURN_RIGHT) && !checkUnderMove0BckNoArc(ANM_WSTARTH) && - i_checkModeFlg(1)) + checkModeFlg(1)) { if (field_0x30ca != 0) { field_0x30ca--; @@ -869,7 +869,7 @@ asm void daAlink_c::setBaseBoarAnime() { #ifdef NONMATCHING void daAlink_c::setBaseRideAnime() { if (checkHorseRide()) { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); daAlink_ANM sp8[2]; getBaseHorseAnime(sp8); setDoubleAnime(horse_p->getBlendRate(), 1.0f, 1.0f, sp8[0], sp8[1], 10, @@ -892,7 +892,7 @@ asm void daAlink_c::setBaseRideAnime() { /* 800EEE30-800EEE5C 0E9770 002C+00 1/1 0/0 0/0 .text checkHorseSwordUpSpped__9daAlink_cFv */ bool daAlink_c::checkHorseSwordUpSpped() { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); return horse_p->speedF > horse_p->getLashMaxSpeedF() * lit_18847; } @@ -901,13 +901,13 @@ void daAlink_c::setHorseSwordUp(int param_0) { if (checkHorseRide() && checkNoUpperAnime() && mEquipItem == 0x103 && !checkHorseZeldaBowMode() && ((param_0 && checkHorseSwordUpSpped()) || - (!param_0 && checkEnemyGroup(mTargetedActor) && i_checkNoResetFlg1(FLG1_UNK_800)))) + (!param_0 && checkEnemyGroup(mTargetedActor) && checkNoResetFlg1(FLG1_UNK_800)))) { setHorseSwordUpAnime(); field_0x3002 = daAlinkHIO_horse_c0::m.mSwordUpTime; } - i_offNoResetFlg1(FLG1_UNK_800); + offNoResetFlg1(FLG1_UNK_800); } /* 800EEF30-800EF050 0E9870 0120+00 9/9 0/0 0/0 .text setRideSubjectAngle__9daAlink_cFs @@ -1092,8 +1092,8 @@ int daAlink_c::checkNextActionHorse() { return procHorseComebackInit(); } - if (mProcID == PROC_HORSE_JUMP && i_dComIfGp_getHorseActor() != NULL && - i_dComIfGp_getHorseActor()->checkJump()) + if (mProcID == PROC_HORSE_JUMP && dComIfGp_getHorseActor() != NULL && + dComIfGp_getHorseActor()->checkJump()) { return 1; } @@ -1109,8 +1109,8 @@ int daAlink_c::checkNextActionHorse() { // regalloc #ifdef NONMATCHING BOOL daAlink_c::checkHorseGetOff() { - return (checkHorseRide() && i_dComIfGp_getHorseActor() != NULL && - i_dComIfGp_getHorseActor()->checkGetOff()) || + return (checkHorseRide() && dComIfGp_getHorseActor() != NULL && + dComIfGp_getHorseActor()->checkGetOff()) || (checkBoarRide() && static_cast(mRideAcKeep.getActor()) != NULL && static_cast(mRideAcKeep.getActor())->checkGetOff()); } @@ -1138,9 +1138,9 @@ asm void daAlink_c::checkHorseGetOffAndSetDoStatus() { /* 800EF884-800EF95C 0EA1C4 00D8+00 2/2 0/0 0/0 .text setHorseGetOff__9daAlink_cFi */ int daAlink_c::setHorseGetOff(int param_0) { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); - if (i_dComIfGp_getDoStatus() == 0x32 && doTrigger()) { + if (dComIfGp_getDoStatus() == 0x32 && doTrigger()) { if ((checkHorseRide() && horse_p->checkEnemySearch()) || checkHorseLieAnime()) { resetUpperAnime(UPPER_2, lit_6041); procBackJumpInit(0); @@ -1257,7 +1257,7 @@ int daAlink_c::procHorseJumpInit() { /* 800F10F8-800F1188 0EBA38 0090+00 1/0 0/0 0/0 .text procHorseJump__9daAlink_cFv */ int daAlink_c::procHorseJump() { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (!setSyncRidePos()) { return 1; @@ -1289,7 +1289,7 @@ int daAlink_c::procHorseLandInit() { /* 800F1204-800F1294 0EBB44 0090+00 1/0 0/0 0/0 .text procHorseLand__9daAlink_cFv */ int daAlink_c::procHorseLand() { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); if (!setSyncRidePos()) { return 1; @@ -1319,7 +1319,7 @@ int daAlink_c::procHorseSubjectivityInit() { /* 800F12F8-800F13D8 0EBC38 00E0+00 1/0 0/0 0/0 .text procHorseSubjectivity__9daAlink_cFv */ int daAlink_c::procHorseSubjectivity() { - i_onResetFlg0(RFLG0_UNK_4000000); + onResetFlg0(RFLG0_UNK_4000000); s16 old_shape_angle = shape_angle.y; s16 old_angle = current.angle.y; int old_3190 = field_0x3190; @@ -1380,7 +1380,7 @@ int daAlink_c::procHorseCutChargeReadyInit() { mProcVar2.field_0x300c = daAlinkHIO_cut_c0::m.mNormalSwingDuration; field_0x3004 = 0; - i_onNoResetFlg1(FLG1_UNK_10000000); + onNoResetFlg1(FLG1_UNK_10000000); return 1; } @@ -1747,7 +1747,7 @@ asm int daAlink_c::procHorseBottleDrinkInit(u16 param_0) { /* 800F2AD8-800F2B4C 0ED418 0074+00 1/0 0/0 0/0 .text procHorseBottleDrink__9daAlink_cFv */ int daAlink_c::procHorseBottleDrink() { - i_dComIfGp_getHorseActor(); + dComIfGp_getHorseActor(); if (!setSyncRidePos()) { resetUpperAnime(UPPER_2, lit_6109); diff --git a/src/d/a/d_a_alink_hvyboots.inc b/src/d/a/d_a_alink_hvyboots.inc index ef93cb4e941..aff0eda7509 100644 --- a/src/d/a/d_a_alink_hvyboots.inc +++ b/src/d/a/d_a_alink_hvyboots.inc @@ -5,7 +5,7 @@ /* 800E23FC-800E243C 0DCD3C 0040+00 6/6 0/0 0/0 .text concatMagneBootMtx__9daAlink_cFv */ void daAlink_c::concatMagneBootMtx() { - if (i_checkMagneBootsOn()) { + if (checkMagneBootsOn()) { mDoMtx_stack_c::concat(mMagneBootMtx); } } @@ -13,14 +13,14 @@ void daAlink_c::concatMagneBootMtx() { /* 800E243C-800E247C 0DCD7C 0040+00 1/1 0/0 0/0 .text concatMagneBootInvMtx__9daAlink_cFv */ void daAlink_c::concatMagneBootInvMtx() { - if (i_checkMagneBootsOn()) { + if (checkMagneBootsOn()) { mDoMtx_stack_c::concat(mMagneBootInvMtx); } } /* 800E247C-800E24B0 0DCDBC 0034+00 8/8 0/0 0/0 .text multVecMagneBootInvMtx__9daAlink_cFP4cXyz */ void daAlink_c::multVecMagneBootInvMtx(cXyz* vec) { - if (i_checkMagneBootsOn()) { + if (checkMagneBootsOn()) { mDoMtx_multVecSR(mMagneBootInvMtx, vec, vec); } } @@ -40,7 +40,7 @@ bool daAlink_c::commonMagneLineCheck(cXyz* i_start, cXyz* i_end) { /* 800E251C-800E2580 0DCE5C 0064+00 2/2 0/0 0/0 .text checkBootsMoveAnime__9daAlink_cFi */ BOOL daAlink_c::checkBootsMoveAnime(int param_0) { - return (checkHeavyStateOn(param_0, 1) && !i_checkNoResetFlg0(FLG0_UNDERWATER)) || + return (checkHeavyStateOn(param_0, 1) && !checkNoResetFlg0(FLG0_UNDERWATER)) || checkDkCaught2Anime(); } @@ -48,8 +48,8 @@ BOOL daAlink_c::checkBootsMoveAnime(int param_0) { // matches with literals #ifdef NONMATCHING int daAlink_c::setHeavyBoots(int param_0) { - if (i_checkEquipHeavyBoots()) { - i_offNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); + if (checkEquipHeavyBoots()) { + offNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); mZ2Link.setLinkBootsType(0); if (field_0x06e0 != NULL) { @@ -60,15 +60,15 @@ int daAlink_c::setHeavyBoots(int param_0) { } } - if (i_checkModeFlg(0x40000) && !checkHookshotItem(mEquipItem)) { + if (checkModeFlg(0x40000) && !checkHookshotItem(mEquipItem)) { deleteEquipItem(TRUE, FALSE); } - if (i_checkNoResetFlg0(FLG0_UNDERWATER) && !i_dComIfGp_checkPlayerStatus1(0, 0x2000000)) { + if (checkNoResetFlg0(FLG0_UNDERWATER) && !dComIfGp_checkPlayerStatus1(0, 0x2000000)) { return procSwimWaitInit(0); } - if (i_checkMagneBootsOn()) { + if (checkMagneBootsOn()) { if (cancelMagneBootsOn()) { return procFallInit(1, 5.0f); } @@ -80,7 +80,7 @@ int daAlink_c::setHeavyBoots(int param_0) { } } } else if (param_0) { - i_onNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); + onNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); mZ2Link.setLinkBootsType(1); if (field_0x06e0 != NULL) { @@ -91,8 +91,8 @@ int daAlink_c::setHeavyBoots(int param_0) { } } - if (i_checkModeFlg(0x40000)) { - i_offNoResetFlg0(FLG0_UNK_100); + if (checkModeFlg(0x40000)) { + offNoResetFlg0(FLG0_UNK_100); mZ2Link.setInWater(true); } } @@ -168,7 +168,7 @@ void daAlink_c::setMagneBootsMtx(cBgS_PolyInfo* i_polyinfo, int param_1) { } else { // D_MN54 is the E3 Goron Mines Demo map if (checkStageName("D_MN54") && getMoveBGActorName(*i_polyinfo, 1) == PROC_Obj_MagneArm) { - i_fopAcM_onSwitch(this, 0x93); + fopAcM_onSwitch(this, 0x93); } field_0x3114 = var_r28; @@ -248,7 +248,7 @@ asm void daAlink_c::setMagneBootsMtx(cBgS_PolyInfo* param_0, int param_1) { // matches with literals #ifdef NONMATCHING int daAlink_c::cancelMagneBootsOn() { - i_offNoResetFlg0(FLG0_MAGNE_BOOTS_ON); + offNoResetFlg0(FLG0_MAGNE_BOOTS_ON); mZ2Link.setMagnetized(false); if (field_0x3114 == -0x8000) { @@ -299,7 +299,7 @@ asm int daAlink_c::cancelMagneBootsOn() { /* 800E2F88-800E3048 0DD8C8 00C0+00 1/1 0/0 0/0 .text checkMagneBootsFly__9daAlink_cFv */ int daAlink_c::checkMagneBootsFly() { - if (field_0x2fb8 != 0 && i_checkEquipHeavyBoots() && !checkDeadHP() && + if (field_0x2fb8 != 0 && checkEquipHeavyBoots() && !checkDeadHP() && mProcID != PROC_MAGNE_BOOTS_FLY && !checkEventRun()) { cXyz vec(field_0x369c); @@ -334,14 +334,14 @@ int daAlink_c::procBootsEquipInit() { #ifdef NONMATCHING int daAlink_c::procBootsEquip() { daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl; - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (checkAnmEnd(frameCtrl_p)) { checkNextAction(0); } else if (frameCtrl_p->checkPass(10.0f)) { setHeavyBoots(1); } else if (frameCtrl_p->checkPass(16.0f)) { - if (i_checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS)) { + if (checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS)) { dComIfGp_getVibration().StartShock(3, 1, cXyz(0.0f, 1.0f, 0.0f)); } @@ -387,8 +387,8 @@ int daAlink_c::procMagneBootsFlyInit() { return 0; } - if (i_checkMagneBootsOn()) { - i_offNoResetFlg0(FLG0_MAGNE_BOOTS_ON); + if (checkMagneBootsOn()) { + offNoResetFlg0(FLG0_MAGNE_BOOTS_ON); mZ2Link.setMagnetized(true); } @@ -435,7 +435,7 @@ int daAlink_c::procMagneBootsFly() { field_0x3478 = field_0x594; } - if (dComIfG_Bgsp().ChkPolySafe(mPolyInfo2) && i_checkEquipHeavyBoots()) { + if (dComIfG_Bgsp().ChkPolySafe(mPolyInfo2) && checkEquipHeavyBoots()) { if (dComIfG_Bgsp().ChkMoveBG(mPolyInfo2)) { cXyz old_37c8(field_0x37c8); dComIfG_Bgsp().MoveBgTransPos(mPolyInfo2, true, &field_0x37c8, NULL, NULL); @@ -451,12 +451,12 @@ int daAlink_c::procMagneBootsFly() { cLib_chasePos(¤t.pos, field_0x37c8, field_0x3478); if (field_0x37c8.abs(current.pos) < 50.0f) { current.pos = field_0x37c8; - i_onNoResetFlg0(FLG0_MAGNE_BOOTS_ON); + onNoResetFlg0(FLG0_MAGNE_BOOTS_ON); mZ2Link.setMagnetized(true); procLandDamageInit(0); } else { cXyz sp24; - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(0), &sp24); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(0), &sp24); sp24 = field_0x37c8 - sp24; cLib_addCalcAngleS(&shape_angle.x, sp24.atan2sY_XZ() + -0x4000, 5, 0x1000, 0x100); diff --git a/src/d/a/d_a_alink_iceleaf.inc b/src/d/a/d_a_alink_iceleaf.inc index fd1ef99bab3..7d7b4a654c7 100644 --- a/src/d/a/d_a_alink_iceleaf.inc +++ b/src/d/a/d_a_alink_iceleaf.inc @@ -65,7 +65,7 @@ int daAlink_c::checkNextActionBoard() { /* 80106618-80106650 100F58 0038+00 2/2 0/0 0/0 .text checkBoardSwordTriggerAction__9daAlink_cFv */ int daAlink_c::checkBoardSwordTriggerAction() { - if (i_checkModeFlg(2)) { + if (checkModeFlg(2)) { return procBoardCutInit(); } else { return procBoardWaitInit(NULL); @@ -79,7 +79,7 @@ int daAlink_c::commonProcBoardInit(daAlink_c::daAlink_PROC i_procID) { return 0; } - u32 check = i_checkModeFlg(2); + u32 check = checkModeFlg(2); commonProcInit(i_procID); if (check) { @@ -159,7 +159,7 @@ asm int daAlink_c::procBoardWait() { int daAlink_c::procBoardRowInit() { commonProcInit(PROC_BOARD_ROW); setSingleAnimeBaseSpeed(ANM_RIDE_KICK, getBoardRowAnmSpeed(), daAlinkHIO_board_c0::m.mPushInterpolation); - i_onResetFlg1(0x40); + onResetFlg1(RFLG1_UNK_40); mProcVar0.field_0x3008 = 4; mProcVar3.field_0x300e.y = 1; mProcVar3.field_0x300e.z = 0; @@ -237,7 +237,7 @@ int daAlink_c::procBoardJump() { } if (!checkNextActionBoard()) { - if (!i_checkModeFlg(2)) { + if (!checkModeFlg(2)) { setBoardLandAnime(); procBoardWaitInit(NULL); } else if (mProcVar3.field_0x300e.z != 0 && mProcVar3.field_0x300e.y == 0 && field_0x2060->getOldFrameRate() < lit_8782) { @@ -264,7 +264,7 @@ int daAlink_c::procBoardSubjectivityInit() { /* 80107418-801074AC 101D58 0094+00 1/0 0/0 0/0 .text procBoardSubjectivity__9daAlink_cFv */ int daAlink_c::procBoardSubjectivity() { - i_onResetFlg0(0x4000000); + onResetFlg0(RFLG0_UNK_4000000); s16 old_shape_angle = shape_angle.y; s16 old_angle = current.angle.y; diff --git a/src/d/a/d_a_alink_ironball.inc b/src/d/a/d_a_alink_ironball.inc index 35361470725..a25cc8e3b46 100644 --- a/src/d/a/d_a_alink_ironball.inc +++ b/src/d/a/d_a_alink_ironball.inc @@ -71,7 +71,7 @@ void daAlink_c::checkIronBallDelete() { if (mItemVar0.field_0x3018 == 1 || mItemVar0.field_0x3018 == 2 || mItemVar0.field_0x3018 == 3 || ((mItemVar0.field_0x3018 == 0 || mItemVar0.field_0x3018 == 8) && !checkIronBallWaitAnime() && !checkEquipAnime() && - (!i_checkModeFlg(4) || i_checkModeFlg(0x70C52) || !mLinkAcch.ChkGroundHit()))) { + (!checkModeFlg(4) || checkModeFlg(0x70C52) || !mLinkAcch.ChkGroundHit()))) { deleteEquipItem(1, 0); } } @@ -208,7 +208,7 @@ BOOL daAlink_c::checkUpperItemActionIronBall() { } if (frameCtrl->checkAnmEnd()) { - if (i_checkModeFlg(1)) { + if (checkModeFlg(1)) { setSingleAnimeBaseSpeed(ANM_IRONBALL_TURN, daAlinkHIO_ironBall_c0::m.mTurnAnmSpeed, daAlinkHIO_ironBall_c0::m.mTurnInterpolation); } @@ -245,12 +245,12 @@ int daAlink_c::checkNextActionIronBall() { setIronBallReadyAnime(); setFastShotTimer(); - if (!i_checkAttentionLock()) { + if (!checkAttentionLock()) { field_0x2fe4 = shape_angle.y; } } - if (!i_checkAttentionLock() && mFastShotTime == 0) { + if (!checkAttentionLock() && mFastShotTime == 0) { return procIronBallSubjectInit(); } else { return procIronBallMoveInit(); @@ -335,7 +335,7 @@ int daAlink_c::procIronBallMove() { offModeFlg(1); } - if (i_checkModeFlg(1)) { + if (checkModeFlg(1)) { setIronBallBaseAnime(); } else { setBlendAtnMoveAnime(var_f31); diff --git a/src/d/a/d_a_alink_kandelaar.inc b/src/d/a/d_a_alink_kandelaar.inc index b5e68b4970a..5aef9fd1982 100644 --- a/src/d/a/d_a_alink_kandelaar.inc +++ b/src/d/a/d_a_alink_kandelaar.inc @@ -37,19 +37,19 @@ static fopAc_ac_c* daAlink_searchTagKtOnFire(fopAc_ac_c* i_actor, void* i_data) */ void daAlink_c::setKandelaarMtx(Mtx i_mtx, int param_1, int param_2) { if (mpKanteraModel != NULL) { - if (i_checkNoResetFlg2(FLG2_UNK_1)) { + if (checkNoResetFlg2(FLG2_UNK_1)) { deleteEquipItem(0, 1); } - i_onEndResetFlg1(ERFLG1_UNK_4); + onEndResetFlg1(ERFLG1_UNK_4); - mpKanteraModel->i_setBaseTRMtx(i_mtx); + mpKanteraModel->setBaseTRMtx(i_mtx); if (param_1 == 0) { - i_onEndResetFlg1(ERFLG1_UNK_8); + onEndResetFlg1(ERFLG1_UNK_8); } if (param_2 != 0) { - i_onEndResetFlg1(ERFLG1_UNK_10); + onEndResetFlg1(ERFLG1_UNK_10); } } } @@ -58,7 +58,7 @@ void daAlink_c::setKandelaarMtx(Mtx i_mtx, int param_1, int param_2) { BOOL daAlink_c::checkWaterInKandelaarOffset(f32 param_0) { f32 tmp_65 = lit_17593; // tmp can be removed with literals f32 base_y_pos; - if (i_checkModeFlg(0x40)) { + if (checkModeFlg(0x40)) { base_y_pos = mRightFootPos.y; } else { base_y_pos = current.pos.y; @@ -70,7 +70,7 @@ BOOL daAlink_c::checkWaterInKandelaarOffset(f32 param_0) { /* 801107BC-80110840 10B0FC 0084+00 2/2 0/0 0/0 .text checkWaterInKandelaar__9daAlink_cFf */ void daAlink_c::checkWaterInKandelaar(f32 param_0) { - if (i_checkNoResetFlg2(FLG2_UNK_1) && checkWaterInKandelaarOffset(param_0)) { + if (checkNoResetFlg2(FLG2_UNK_1) && checkWaterInKandelaarOffset(param_0)) { if (mEquipItem == KANTERA) { deleteEquipItem(TRUE, TRUE); } else { @@ -83,13 +83,13 @@ void daAlink_c::checkWaterInKandelaar(f32 param_0) { /* 80110840-8011087C 10B180 003C+00 13/13 0/0 0/0 .text offKandelaarModel__9daAlink_cFv */ void daAlink_c::offKandelaarModel() { - i_offNoResetFlg2(0x10000001); + offNoResetFlg2(FLG2_UNK_10000001); mZ2Link.setKanteraState(0); } /* 8011087C-801108B4 10B1BC 0038+00 1/0 0/0 0/0 .text checkUseKandelaar__9daAlink_cFi */ bool daAlink_c::checkUseKandelaar(int param_0) { - return (param_0 == 0 && i_checkNoResetFlg2(FLG2_UNK_1)) || + return (param_0 == 0 && checkNoResetFlg2(FLG2_UNK_1)) || (param_0 != 0 && mEquipItem == KANTERA); } @@ -130,8 +130,8 @@ static int daAlink_kandelaarModelCallBack(J3DJoint* param_0, int param_1) { /* 80110C28-80110C6C 10B568 0044+00 1/0 0/0 0/0 .text getKandelaarFlamePos__9daAlink_cFv */ cXyz* daAlink_c::getKandelaarFlamePos() { - if ((!i_checkNoResetFlg2((daPy_FLG2)0x20001) && !i_checkEndResetFlg1(ERFLG1_UNK_4)) || - i_checkWolf() || !i_checkNoResetFlg1(FLG1_UNK_80)) + if ((!checkNoResetFlg2((daPy_FLG2)0x20001) && !checkEndResetFlg1(ERFLG1_UNK_4)) || + checkWolf() || !checkNoResetFlg1(FLG1_UNK_80)) { return NULL; } @@ -211,10 +211,10 @@ void J3DTevBlock::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) {} void daAlink_c::setKandelaarModel() { field_0x2f94 = 0; - if (!i_checkNoResetFlg2(FLG2_UNK_1)) { - i_onNoResetFlg2(FLG2_UNK_1); + if (!checkNoResetFlg2(FLG2_UNK_1)) { + onNoResetFlg2(FLG2_UNK_1); - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(field_0x30c0), &mKandelaarFlamePos); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(field_0x30c0), &mKandelaarFlamePos); mKandelaarFlamePos.y -= 30.0f; field_0x3630 = field_0x3624; @@ -256,7 +256,7 @@ void daAlink_c::resetOilBottleModel() { /* 80110FE0-801110B8 10B920 00D8+00 3/3 0/0 0/0 .text commonKandelaarPourInit__9daAlink_cFv */ void daAlink_c::commonKandelaarPourInit() { - if (i_checkNoResetFlg2(FLG2_UNK_1)) { + if (checkNoResetFlg2(FLG2_UNK_1)) { mProcVar3.field_0x300e.x = 1; } else { mProcVar3.field_0x300e.x = 0; @@ -290,7 +290,7 @@ int daAlink_c::commonKandelaarPour(int param_0) { current_anm = mUnderAnmHeap[0].getIdx(); } - i_onNoResetFlg2(FLG2_UNK_10000000); + onNoResetFlg2(FLG2_UNK_10000000); if (current_anm == getMainBckData(ANM_OIL_BOTTLE_POUR_START)->m_underID) { if (checkAnmEnd(frameCtrl_p)) { @@ -330,7 +330,7 @@ int daAlink_c::commonKandelaarPour(int param_0) { resetOilBottleModel(); resetSpecialEvent(); - i_offNoResetFlg2(FLG2_UNK_10000000); + offNoResetFlg2(FLG2_UNK_10000000); return 1; } @@ -377,7 +377,7 @@ void daAlink_c::initKandelaarSwing() { // matches with literals #ifdef NONMATCHING int daAlink_c::procKandelaarSwingInit() { - fopAc_ac_c* catch_target_p = i_dComIfGp_att_getCatghTarget(); + fopAc_ac_c* catch_target_p = dComIfGp_att_getCatghTarget(); if (catch_target_p != NULL) { s16 name = fopAcM_GetName(catch_target_p); BOOL is_sm2 = name == PROC_E_SM2; @@ -452,7 +452,7 @@ int daAlink_c::procKandelaarPourInit() { return 0; } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); commonProcInit(PROC_KANDELAAR_POUR); current.angle.y = shape_angle.y; mNormalSpeed = FLOAT_LABEL(lit_6108); diff --git a/src/d/a/d_a_alink_link.inc b/src/d/a/d_a_alink_link.inc index 30560586326..efe67fb1278 100644 --- a/src/d/a/d_a_alink_link.inc +++ b/src/d/a/d_a_alink_link.inc @@ -23,7 +23,7 @@ int daAlink_c::procPreActionUnequipInit(int i_procAfter, fopAc_ac_c* param_1) { if (fopAcM_GetName(param_1) == PROC_Tag_Lv8Gate) { if (mEquipItem == KANTERA) { mProcVar3.field_0x300e.y = 1; - } else if (i_checkNoResetFlg2(FLG2_UNK_1)) { + } else if (checkNoResetFlg2(FLG2_UNK_1)) { offKandelaarModel(); } } @@ -167,7 +167,7 @@ int daAlink_c::procTiredWait() { /* 800C33B8-800C3504 0BDCF8 014C+00 26/26 0/0 0/0 .text procWaitInit__9daAlink_cFv */ int daAlink_c::procWaitInit() { if (mProcID == PROC_TURN_BACK) { - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); } if (mProcID == PROC_WAIT) { @@ -198,7 +198,7 @@ int daAlink_c::procWaitInit() { initServiceWaitTime(); - if (i_checkEndResetFlg0(ERFLG0_UNK_8000000) && + if (checkEndResetFlg0(ERFLG0_UNK_8000000) && (checkUnderMove0BckNoArc(ANM_WAIT) || checkUnderMove0BckNoArc(ANM_WAIT_TIRED))) { setSingleAnimeBase(ANM_WAIT_B_TO_A); @@ -395,7 +395,7 @@ int daAlink_c::procWaitTurn() { if (checkGroundSpecialMode()) { return 1; - } else if (i_checkEndResetFlg0(ERFLG0_UNK_100000)) { + } else if (checkEndResetFlg0(ERFLG0_UNK_100000)) { return procFloorDownReboundInit(); } else { s16 angle = cLib_addCalcAngleS(&shape_angle.y, mProcVar3.field_0x300e.x, 30, 0x3CDF, 8000); @@ -490,7 +490,7 @@ int daAlink_c::procSideStepInit(int jump_type) { mProcVar1.field_0x300a = 1; } - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; speed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; } @@ -577,7 +577,7 @@ int daAlink_c::procSideStepLandInit() { field_0x2f9d = 4; setFootEffectProcType(2); - i_onResetFlg1(0x30); + onResetFlg1(RFLG1_UNK_30); mNormalSpeed = FLOAT_LABEL(lit_6108); mProcVar2.field_0x300c = 0; current.angle.y = shape_angle.y; @@ -588,7 +588,7 @@ int daAlink_c::procSideStepLandInit() { /* 800C4278-800C4378 0BEBB8 0100+00 1/0 0/0 0/0 .text procSideStepLand__9daAlink_cFv */ int daAlink_c::procSideStepLand() { daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl; - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (field_0x2fcc != 0) { field_0x2fcc = 10; @@ -638,7 +638,7 @@ int daAlink_c::procSlideInit(s16 param_0) { mNormalSpeed = FLOAT_LABEL(lit_6108); field_0x2f9d = 4; setUpperAnimeBaseMorf(0xCE, lit_6041); - i_onNoResetFlg1(FLG1_UNK_10000000); + onNoResetFlg1(FLG1_UNK_10000000); setFootEffectProcType(0); } else { field_0x3198 = 0; @@ -698,7 +698,7 @@ int daAlink_c::procSlide() { f32 accel = daAlinkHIO_slide_c0::m.mAcceleration; f32 var_f6 = field_0x594; - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { accel *= 0.3f; var_f6 *= 0.3f; } @@ -810,7 +810,7 @@ int daAlink_c::procFrontRollInit() { mNormalSpeed = daAlinkHIO_frontRoll_c0::m.mMinSpeed; } - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; } else if (checkHeavyStateOn(1, 1)) { mNormalSpeed *= mHeavySpeedMultiplier; @@ -821,10 +821,10 @@ int daAlink_c::procFrontRollInit() { mProcVar2.field_0x300c = 0; setFootEffectProcType(0); if (is_guard_anime) { - i_onNoResetFlg0(2); + onNoResetFlg0(2); } - if (i_checkEquipHeavyBoots()) { + if (checkEquipHeavyBoots()) { field_0xFB8.SetAtType(AT_TYPE_HEAVY_BOOTS); field_0xFB8.SetAtHitMark(1); field_0xFB8.SetAtSe(9); @@ -852,7 +852,7 @@ asm int daAlink_c::procFrontRollInit() { #ifdef NONMATCHING int daAlink_c::procFrontRoll() { daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl; - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); cM3dGPla poly; if (getSlidePolygon(&poly)) { @@ -866,7 +866,7 @@ int daAlink_c::procFrontRoll() { shape_angle.y = current.angle.y; } - if (i_checkNoResetFlg0(FLG0_UNK_2)) { + if (checkNoResetFlg0(FLG0_UNK_2)) { setUpperGuardAnime(-1.0f); } @@ -898,7 +898,7 @@ int daAlink_c::procFrontRoll() { } } else if (mDemo.getDemoMode() != 0x28 && speedF >= daAlinkHIO_frontRoll_c0::m.mCrashSpeedThreshold && - (i_checkNoResetFlg0(FLG0_UNK_18) || + (checkNoResetFlg0(FLG0_UNK_18) || (field_0x18B0[0].ChkWallHit() && !dComIfG_Bgsp().GetPolyAttackThrough(field_0x18B0[0])) && dComIfG_Bgsp().GetWallCode(field_0x18B0[0]) != 7 && @@ -908,11 +908,11 @@ int daAlink_c::procFrontRoll() { frameCtrl_p->getFrame() >= daAlinkHIO_frontRoll_c0::m.mCrashInitF && frameCtrl_p->getFrame() <= daAlinkHIO_frontRoll_c0::m.mCrashEndF)) { - if (!i_checkNoResetFlg0(FLG0_UNK_18)) { + if (!checkNoResetFlg0(FLG0_UNK_18)) { mRollCrashFlg = dKy_pol_sound_get(&field_0x18B0[0]); } - if (i_checkNoResetFlg0(FLG0_UNK_10) || + if (checkNoResetFlg0(FLG0_UNK_10) || (mLinkAcch.ChkWallHit() && field_0x18B0[0].ChkWallHit() && (getMoveBGActorName(field_0x18B0[0], 0) == PROC_Obj_Pillar || getMoveBGActorName(field_0x18B0[0], 0) == PROC_Obj_TaFence))) @@ -966,7 +966,7 @@ int daAlink_c::procFrontRollCrashInit() { mNormalSpeed = daAlinkHIO_frontRoll_c0::m.mCrashSpeedH; speed.y = daAlinkHIO_frontRoll_c0::m.mCrashSpeedV; - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; speed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; } @@ -974,7 +974,7 @@ int daAlink_c::procFrontRollCrashInit() { current.angle.y -= -0x8000; setFrontRollCrashShock(mRollCrashFlg); voiceStart(Z2SE_AL_V_ZENTEN_FAIL); - i_onResetFlg0(0x2000); + onResetFlg0(RFLG0_FRONT_ROLL_CRASH); return 1; } @@ -983,7 +983,7 @@ int daAlink_c::procFrontRollCrashInit() { int daAlink_c::procFrontRollCrash() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - if (!i_checkModeFlg(2)) { + if (!checkModeFlg(2)) { if (frameCtrl->checkAnmEnd()) { checkNextAction(0); } else if (frameCtrl->getFrame() > daAlinkHIO_frontRoll_c0::m.mCrashAnm.mCheckFrame) { @@ -994,9 +994,9 @@ int daAlink_c::procFrontRollCrash() { } else if (frameCtrl->getFrame() >= lit_8130) { field_0x2f93 = 10; } - } else if ((mLinkAcch.ChkGroundHit() || i_checkEndResetFlg2(ERFLG2_UNK_100) || - i_checkMagneBootsOn()) && - i_checkModeFlg(2)) + } else if ((mLinkAcch.ChkGroundHit() || checkEndResetFlg2(ERFLG2_UNK_100) || + checkMagneBootsOn()) && + checkModeFlg(2)) { mNormalSpeed = FLOAT_LABEL(lit_6108); setWaterInAnmRate(frameCtrl, daAlinkHIO_frontRoll_c0::m.mCrashAnm.mSpeed); @@ -1020,7 +1020,7 @@ int daAlink_c::procFrontRollSuccessInit() { if (!dk_caught) { setFrontRollCrashShock(mRollCrashFlg); - i_onResetFlg0(0x2000); + onResetFlg0(RFLG0_FRONT_ROLL_CRASH); } else { f32 tmp_3 = lit_6109; mUnderFrameCtrl[0].setFrame(tmp_3); @@ -1041,7 +1041,7 @@ int daAlink_c::procFrontRollSuccess() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; field_0x2f99 = 4; - i_onEndResetFlg0(0x8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (frameCtrl->checkAnmEnd()) { current.angle.y = shape_angle.y; @@ -1085,7 +1085,7 @@ int daAlink_c::procSideRollInit(int param_0) { daAlinkHIO_turnMove_c0::m.mTurnAnm.mInterpolation); mNormalSpeed = daAlinkHIO_turnMove_c0::m.mSideRollSpeed; - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; } else if (checkHeavyStateOn(1, 1)) { mNormalSpeed *= mHeavySpeedMultiplier; @@ -1096,7 +1096,7 @@ int daAlink_c::procSideRollInit(int param_0) { voiceStart(Z2SE_AL_V_SOTOMO_ROLL); if (guard_anime) { - i_onNoResetFlg0(FLG0_UNK_2); + onNoResetFlg0(FLG0_UNK_2); } mProcVar2.field_0x300c = 0; @@ -1107,7 +1107,7 @@ int daAlink_c::procSideRollInit(int param_0) { // matches with literals #ifdef NONMATCHING int daAlink_c::procSideRoll() { - i_onEndResetFlg0(ERFLG0_UNK_8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (mTargetedActor != NULL) { s16 actor_angle = fopAcM_searchActorAngleY(this, mTargetedActor); cLib_addCalcAngleS(&shape_angle.y, actor_angle, 5, 0x5E8, 0x13C); @@ -1128,7 +1128,7 @@ int daAlink_c::procSideRoll() { cLib_chaseF(&mNormalSpeed, 0.0f, 2.5f); } - if (i_checkNoResetFlg0(FLG0_UNK_2)) { + if (checkNoResetFlg0(FLG0_UNK_2)) { setUpperGuardAnime(-1.0f); } @@ -1136,8 +1136,8 @@ int daAlink_c::procSideRoll() { if (mDemo.getDemoMode() == 0x49) { dComIfGp_evmng_cutEnd(field_0x3184); } else { - if (!i_checkAttentionLock()) { - i_offNoResetFlg2(FLG0_PLAYER_NO_DRAW); + if (!checkAttentionLock()) { + offNoResetFlg2(FLG0_PLAYER_NO_DRAW); } checkNextAction(0); @@ -1230,14 +1230,14 @@ int daAlink_c::procBackJumpInit(int param_0) { shape_angle.y -= -0x8000; setOldRootQuaternion(0, -0x8000, 0); field_0x2060->getOldFrameTransInfo(0)->mTranslate.z += lit_20991; - i_onNoResetFlg3(FLG3_UNK_4000000); + onNoResetFlg3(FLG3_UNK_4000000); } current.angle.y = shape_angle.y - -0x8000; field_0x3198 = 2; if (guard_anime) { - i_onNoResetFlg0(FLG0_UNK_2); + onNoResetFlg0(FLG0_UNK_2); } return 1; @@ -1278,7 +1278,7 @@ int daAlink_c::procBackJumpLandInit(int i_cutDirection) { field_0x2f9d = 4; setFootEffectProcType(2); - i_onResetFlg1(0x30); + onResetFlg1(RFLG1_UNK_30); field_0x3198 = i_cutDirection; current.angle.y = shape_angle.y; @@ -1296,14 +1296,14 @@ int daAlink_c::procBackJumpLand() { field_0x2fcc = 10; } - i_onEndResetFlg0(0x8000000); + onEndResetFlg0(ERFLG0_UNK_8000000); if (frameCtrl->checkAnmEnd()) { if (mDemo.getDemoMode() == 0x10) { dComIfGp_getPEvtManager()->cutEnd(field_0x3184); } else { - if (!i_checkAttentionLock()) { - i_offNoResetFlg2(FLG2_UNK_8000000); + if (!checkAttentionLock()) { + offNoResetFlg2(FLG2_UNK_8000000); } checkNextAction(0); } @@ -1400,7 +1400,7 @@ public: // matches with literals #ifdef NONMATCHING int daAlink_c::procAutoJumpInit(int param_0) { - u32 chk_mode_400 = i_checkModeFlg(0x400); + u32 chk_mode_400 = checkModeFlg(0x400); BOOL not_front_roll = mProcID != PROC_FRONT_ROLL ? TRUE : FALSE; if (checkIronBallWaitAnime()) { @@ -1496,9 +1496,9 @@ int daAlink_c::procAutoJumpInit(int param_0) { field_0x3588 = l_waitBaseAnime; voiceStart(Z2SE_AL_V_JUMP_L); - i_offNoResetFlg0(FLG0_UNK_40000); + offNoResetFlg0(FLG0_UNK_40000); mProcVar2.field_0x300c = 0; - i_onResetFlg0(RFLG0_UNK_100); + onResetFlg0(RFLG0_UNK_100); mFallVoiceInit = false; return 1; } @@ -1539,7 +1539,7 @@ int daAlink_c::procAutoJump() { setLandPassiveData(); - if (!i_checkModeFlg(4) && checkSetItemTrigger(HVY_BOOTS)) { + if (!checkModeFlg(4) && checkSetItemTrigger(HVY_BOOTS)) { setHeavyBoots(1); } @@ -1769,7 +1769,7 @@ int daAlink_c::procFallInit(int param_0, f32 param_1) { mLinkAcch.OnLineCheckNone(); } - u32 var_r3 = i_checkModeFlg(0x10000) && !i_dComIfGp_checkPlayerStatus0(0, 8); + u32 var_r3 = checkModeFlg(0x10000) && !dComIfGp_checkPlayerStatus0(0, 8); u8 temp_r30 = mProcID != PROC_CANOE_GETOFF; BOOL temp_r29 = mProcID == PROC_ROOF_HANG_FRONT_MOVE; @@ -1781,8 +1781,8 @@ int daAlink_c::procFallInit(int param_0, f32 param_1) { return 0; } - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { - i_offNoResetFlg0(FLG0_UNDERWATER); + if (checkNoResetFlg0(FLG0_UNDERWATER)) { + offNoResetFlg0(FLG0_UNDERWATER); } mProcVar3.field_0x300e.z = 0; @@ -1801,7 +1801,7 @@ int daAlink_c::procFallInit(int param_0, f32 param_1) { dComIfGp_getVibration().StartShock(6, 31, cXyz(0.0f, 1.0f, 0.0f)); setDamagePoint(field_0x318c, FALSE, TRUE, 0); - i_onNoResetFlg1(FLG1_THROW_DAMAGE); + onNoResetFlg1(FLG1_THROW_DAMAGE); if (mDamageTimer != 0) { onModeFlg(8); } @@ -1835,7 +1835,7 @@ int daAlink_c::procFallInit(int param_0, f32 param_1) { mProcVar2.field_0x300c = 0; mProcVar3.field_0x300e.x = param_0 == 3; - i_offNoResetFlg0(FLG0_UNK_40000); + offNoResetFlg0(FLG0_UNK_40000); mFallVoiceInit = 0; return 1; } @@ -1868,7 +1868,7 @@ int daAlink_c::procFall() { return checkLandAction(mProcVar3.field_0x300e.x); } - if (i_dComIfGs_getLife() != 0) { + if (dComIfGs_getLife() != 0) { if (mProcVar0.field_0x3008 == 1) { if (mProcVar1.field_0x300a > 0) { mProcVar1.field_0x300a--; @@ -1900,7 +1900,7 @@ int daAlink_c::procFall() { } } - if (i_dComIfGs_getLife() != 0) { + if (dComIfGs_getLife() != 0) { checkItemChangeFromButton(); } @@ -1916,7 +1916,7 @@ int daAlink_c::procLandInit(f32 param_0) { if (checkGrabGlide()) { mUnderFrameCtrl[0].setRate(lit_5943); - } else if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + } else if (checkNoResetFlg0(FLG0_UNDERWATER)) { f32 rate = mUnderFrameCtrl[0].getRate() * lit_28286; mUnderFrameCtrl[0].setRate(rate); } @@ -1924,7 +1924,7 @@ int daAlink_c::procLandInit(f32 param_0) { field_0x2f9d = 4; setFootEffectProcType(4); - i_onResetFlg1(0x30); + onResetFlg1(RFLG1_UNK_30); current.angle.y = shape_angle.y; field_0x3478 = param_0; @@ -1943,7 +1943,7 @@ int daAlink_c::procLand() { int var_r4; if (checkBootsOrArmorHeavy()) { var_r4 = 3; - } else if (i_checkNoResetFlg0(FLG0_UNDERWATER) || + } else if (checkNoResetFlg0(FLG0_UNDERWATER) || field_0x3478 < daAlinkHIO_damFall_c0::m.mMinRollHeight) { var_r4 = 1; @@ -2019,7 +2019,7 @@ asm int daAlink_c::procSmallJumpInit(int param_0) { // one out of order block with sqrt #ifdef NONMATCHING int daAlink_c::procSmallJump() { - if (i_checkModeFlg(2)) { + if (checkModeFlg(2)) { if (checkCanoeJumpRide()) { return 1; } @@ -2035,7 +2035,7 @@ int daAlink_c::procSmallJump() { setJumpMode(); mNormalSpeed = daAlinkHIO_smallJump_c0::m.mSpeedH; - if (checkHeavyStateOn(1, 1) && !i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkHeavyStateOn(1, 1) && !checkNoResetFlg0(FLG0_UNDERWATER)) { speed.y = JMAFastSqrt(2.0f * ((daAlinkHIO_smallJump_c0::m.mTargetHeightOffset + (field_0x3478 - current.pos.y)) * -(gravity * 2.25f))); @@ -2148,7 +2148,7 @@ int daAlink_c::procCrouch() { } if (mDemo.getDemoMode() != 0x29 && - (mSinkShapeOffset <= -80.0f || (i_checkAttentionLock() && checkGuardAccept()))) + (mSinkShapeOffset <= -80.0f || (checkAttentionLock() && checkGuardAccept()))) { checkNextActionFromCrouch(0); } @@ -2188,11 +2188,11 @@ BOOL daMidna_c::checkMidnaRealBody() { int daAlink_c::procCoMetamorphoseInit() { int var_r29 = 0; - if (i_dComIfGp_getEvent().i_isOrderOK()) { + if (dComIfGp_getEvent().isOrderOK()) { if (!dComIfGp_event_compulsory(this, NULL, 0xFFFF)) { return 0; } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); mDamageTimer = 0; var_r29 = 1; } @@ -2208,25 +2208,25 @@ int daAlink_c::procCoMetamorphoseInit() { field_0x347c = 1.0f; mFallVoiceInit = 0; - if ((i_checkWolf() && mDemo.getDemoMode() == 0x39) || - (!i_checkWolf() && mDemo.getDemoMode() == 0x3A)) + if ((checkWolf() && mDemo.getDemoMode() == 0x39) || + (!checkWolf() && mDemo.getDemoMode() == 0x3A)) { mProcVar1.field_0x300a = 1; speed.y = 0.0f; mNormalSpeed = 0.0f; - if (i_checkWolf()) { + if (checkWolf()) { mProcVar2.field_0x300c = shape_angle.x; } } else { deleteEquipItem(FALSE, TRUE); - if (i_checkEndResetFlg0(ERFLG0_UNK_2) && checkStageName("D_MN08")) { + if (checkEndResetFlg0(ERFLG0_UNK_2) && checkStageName("D_MN08")) { mProcVar3.field_0x300e.y = 1; } mProcVar1.field_0x300a = 0; - if (i_checkWolf()) { + if (checkWolf()) { // Transform Wolf -> Human setSingleAnimeWolfBase(WANM_TRANSFORM_TO_HUMAN); field_0x3588 = l_wolfBaseAnime; @@ -2235,7 +2235,7 @@ int daAlink_c::procCoMetamorphoseInit() { mProcVar2.field_0x300c = shape_angle.x; daMidna_c* midna = getMidnaActor(); - if (i_checkMidnaRide() && daMidna_c::checkMidnaRealBody() && midna->checkDemoTypeNone()) + if (checkMidnaRide() && daMidna_c::checkMidnaRealBody() && midna->checkDemoTypeNone()) { midna->changeOriginalDemo(); midna->changeDemoMode(15); @@ -2372,8 +2372,8 @@ int daAlink_c::procCoMetamorphoseOnlyInit() { } deleteEquipItem(0, 1); - if ((i_checkWolf() && mDemo.getDemoMode() == 0x46) || - (!i_checkWolf() && mDemo.getDemoMode() == 0x47)) + if ((checkWolf() && mDemo.getDemoMode() == 0x46) || + (!checkWolf() && mDemo.getDemoMode() == 0x47)) { mProcVar2.field_0x300c = 1; mProcVar3.field_0x300e.x = 1; @@ -2399,7 +2399,7 @@ int daAlink_c::procCoMetamorphoseOnly() { if (mProcVar3.field_0x300e.x == 0) { mProcVar3.field_0x300e.x = 1; - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMoveNoP_c0::m.field_0x14, lit_6041); } else { @@ -3522,8 +3522,8 @@ asm void daAlink_c::setDrawHand() { /* 800CB480-800CB53C 0C5DC0 00BC+00 3/3 0/0 0/0 .text checkSwordDraw__9daAlink_cFv */ bool daAlink_c::checkSwordDraw() { return ((i_checkSwordGet() && mSwordChangeWaitTimer == 0) && - !i_checkNoResetFlg2(FLG2_UNK_2080000)) && - (!i_checkWolf() || !i_dComIfGs_isEventBit(0x0C08)); + !checkNoResetFlg2(FLG2_UNK_2080000)) && + (!checkWolf() || !dComIfGs_isEventBit(0x0C08)); } bool daPy_py_c::i_checkShieldGet() const { @@ -3533,8 +3533,8 @@ bool daPy_py_c::i_checkShieldGet() const { /* 800CB53C-800CB5F8 0C5E7C 00BC+00 3/3 0/0 0/0 .text checkShieldDraw__9daAlink_cFv */ bool daAlink_c::checkShieldDraw() { return ((i_checkShieldGet() && mShieldChangeWaitTimer == 0) && - !i_checkNoResetFlg2(FLG2_UNK_4080000)) && - (!i_checkWolf() || !i_dComIfGs_isEventBit(0x0C08)); + !checkNoResetFlg2(FLG2_UNK_4080000)) && + (!checkWolf() || !dComIfGs_isEventBit(0x0C08)); } /* 800CB5F8-800CB694 0C5F38 009C+00 2/2 0/0 0/0 .text checkItemDraw__9daAlink_cFv */ @@ -3628,7 +3628,7 @@ void daAlink_c::setWaterDropColor(J3DGXColorS10 const* i_color) { J3DGXColorS10* var_r31; if (&field_0x32a0[0] == i_color) { - if (i_checkNoResetFlg2(FLG2_UNK_80000) || checkZoraWearAbility() || + if (checkNoResetFlg2(FLG2_UNK_80000) || checkZoraWearAbility() || checkMagicArmorWearAbility()) { var_r31 = (J3DGXColorS10*)¬Color0; @@ -3640,7 +3640,7 @@ void daAlink_c::setWaterDropColor(J3DGXColorS10 const* i_color) { var_r31 = (J3DGXColorS10*)i_color; } - if (!i_checkNoResetFlg2(FLG2_UNK_80000)) { + if (!checkNoResetFlg2(FLG2_UNK_80000)) { if (checkZoraWearAbility()) { field_0x064C->getMaterialNodePointer(13)->setTevColor(1, i_color); field_0x064C->getMaterialNodePointer(0)->setTevColor(1, i_color); @@ -3686,7 +3686,7 @@ void daAlink_c::initTevCustomColor() { // matches with literals #ifdef NONMATCHING int daAlink_c::draw() { - if (i_checkWolf()) { + if (checkWolf()) { g_env_light.settingTevStruct(9, ¤t.pos, &tevStr); } else { g_env_light.settingTevStruct(10, ¤t.pos, &tevStr); @@ -3698,10 +3698,10 @@ int daAlink_c::draw() { mSight.setSight(); } - if (i_checkNoResetFlg1(FLG1_UNK_80)) { + if (checkNoResetFlg1(FLG1_UNK_80)) { JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x31c4); if (emitter_p != NULL) { - if (checkPlayerNoDraw() && !i_checkEndResetFlg1(ERFLG1_UNK_4)) { + if (checkPlayerNoDraw() && !checkEndResetFlg1(ERFLG1_UNK_4)) { emitter_p->stopDrawParticle(); } else { emitter_p->playDrawParticle(); @@ -3791,7 +3791,7 @@ int daAlink_c::draw() { var_r31 = 0; } - if (!i_checkWolf()) { + if (!checkWolf()) { if (var_r31) { if (checkMagicArmorWearAbility() && mClothesChangeWaitTimer == 0) { mpLinkModel->getModelData()->removeTevRegAnimator(mMagicArmorBodyBrk); @@ -3816,11 +3816,11 @@ int daAlink_c::draw() { mSwordUpColorIntensity = 0.0f; } - if (i_checkWolf()) { + if (checkWolf()) { dComIfGd_setListDark(); modelDraw(mpLinkModel, temp_r30); - if (i_dComIfGs_isEventBit(0x510)) { + if (dComIfGs_isEventBit(0x510)) { for (int i = 0; i < 4; i++) { modelDraw(mpWlChainModels[i], temp_r30); } @@ -3906,7 +3906,7 @@ int daAlink_c::draw() { modelDraw(mpLinkHatModel, var_r3); - if (i_checkNoResetFlg1(FLG1_UNK_10)) { + if (checkNoResetFlg1(FLG1_UNK_10)) { modelDraw(mpDemoFCBlendModel, var_r3); modelDraw(mpDemoFCTongueModel, var_r3); } else { @@ -3918,7 +3918,7 @@ int daAlink_c::draw() { tevStr.field_0x362 = 0; if (checkSwordDraw()) { - if (!i_checkNoResetFlg3(FLG3_UNK_80000000)) { + if (!checkNoResetFlg3(FLG3_UNK_80000000)) { modelDraw(mSwordModel, var_r3); } @@ -3961,7 +3961,7 @@ int daAlink_c::draw() { } if (mEquipItem == W_HOOKSHOT && !checkPlayerGuardAndAttack() && - !i_checkNoResetFlg0(FLG0_UNK_2)) + !checkNoResetFlg0(FLG0_UNK_2)) { if (field_0x0710 != NULL) { modelDraw(field_0x0710, temp_r30); @@ -3983,17 +3983,17 @@ int daAlink_c::draw() { } } - if (i_checkNoResetFlg2(FLG2_UNK_1)) { + if (checkNoResetFlg2(FLG2_UNK_1)) { modelDraw(mpKanteraModel, temp_r30); preKandelaarDraw(); modelDraw(mpKanteraGlowModel, temp_r30); - } else if (i_checkNoResetFlg2(FLG2_UNK_20000)) { + } else if (checkNoResetFlg2(FLG2_UNK_20000)) { basicModelDraw(mpKanteraModel); preKandelaarDraw(); basicModelDraw(mpKanteraGlowModel); } - if (i_checkEquipHeavyBoots()) { + if (checkEquipHeavyBoots()) { GXColorS10 color = tevStr.mFogColor; for (int i = 0; i < 2; i++) { JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x3228[i][0]); @@ -4014,7 +4014,7 @@ int daAlink_c::draw() { } if (!checkCanoeRide() && !dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x10000) && - !i_checkNoResetFlg2(FLG2_UNK_400)) + !checkNoResetFlg2(FLG2_UNK_400)) { shadowDraw(); } @@ -4090,8 +4090,8 @@ daAlink_c::~daAlink_c() { mpHookSound = NULL; } - if (i_checkNoResetFlg2(FLG2_UNK_80)) { - i_offNoResetFlg2(FLG2_UNK_80); + if (checkNoResetFlg2(FLG2_UNK_80)) { + offNoResetFlg2(FLG2_UNK_80); dComIfGp_2dShowOn(); } @@ -4165,10 +4165,10 @@ asm bool daAlink_c::acceptSubjectModeChange() { /* 800CE628-800CE728 0C8F68 0100+00 5/5 0/0 0/0 .text checkSubjectAction__9daAlink_cFv */ int daAlink_c::checkSubjectAction() { if (acceptSubjectModeChange()) { - i_onResetFlg0(RFLG0_UNK_4000000); + onResetFlg0(RFLG0_UNK_4000000); if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x1000)) { - if (i_checkModeFlg(0x400)) { + if (checkModeFlg(0x400)) { if (checkCanoeRide()) { return procCanoeSubjectivityInit(); } else if (checkBoardRide()) { @@ -4178,11 +4178,11 @@ int daAlink_c::checkSubjectAction() { } } - if (i_checkModeFlg(0x20000)) { + if (checkModeFlg(0x20000)) { return procWolfRopeSubjectivityInit(); } - if (i_checkModeFlg(0x40000)) { + if (checkModeFlg(0x40000)) { return procCoSwimSubjectivityInit(); } @@ -4234,8 +4234,8 @@ asm void daAlink_c::setSubjectMode() { /* 800CEB58-800CEBD8 0C9498 0080+00 2/2 0/0 0/0 .text subjectCancelTrigger__9daAlink_cFv */ BOOL daAlink_c::subjectCancelTrigger() { - if (i_checkWolf() || checkNotBattleStage() || !i_checkSwordGet() || - (i_checkModeFlg(0x40000) && !i_checkEquipHeavyBoots())) + if (checkWolf() || checkNotBattleStage() || !i_checkSwordGet() || + (checkModeFlg(0x40000) && !checkEquipHeavyBoots())) { return itemTriggerCheck(BTN_B); } @@ -4277,7 +4277,7 @@ int daAlink_c::procCoSubjectivityInit() { setSubjectMode(); field_0x2fe6 = shape_angle.y; - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_WAIT, FLOAT_LABEL(lit_6108), lit_6109); } else { setSingleAnimeBaseSpeed(ANM_WAIT, FLOAT_LABEL(lit_6108), lit_6109); @@ -4303,7 +4303,7 @@ int daAlink_c::procCoSwimSubjectivityInit() { setSubjectMode(); - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_SWIM_WAIT, daAlinkHIO_wlSwim_c0::m.field_0x88, daAlinkHIO_wlSwim_c0::m.field_0x68); } else { @@ -4333,13 +4333,13 @@ int daAlink_c::procCoPeepSubjectivityInit() { f32 tmp_0 = FLOAT_LABEL(lit_6108); mNormalSpeed = tmp_0; - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_WAIT, tmp_0, lit_6109); } else { setSingleAnimeBaseSpeed(ANM_WAIT, tmp_0, lit_6109); } - i_onPlayerNoDraw(); + onPlayerNoDraw(); setSpecialGravity(FLOAT_LABEL(lit_6108), maxFallSpeed, 0); speed.y = FLOAT_LABEL(lit_6108); dComIfGp_setPlayerStatus0(0, 0x2000); @@ -4384,7 +4384,7 @@ u32 daAlink_c::checkHorseRide() const { /* 800CF298-800CF2B4 0C9BD8 001C+00 1/0 0/0 0/0 .text getLeftItemMatrix__9daAlink_cFv */ MtxP daAlink_c::getLeftItemMatrix() { - return mpLinkModel->i_getAnmMtx(field_0x30c0); + return mpLinkModel->getAnmMtx(field_0x30c0); } /* 800CF2B4-800CF2C8 0C9BF4 0014+00 1/0 0/0 0/0 .text checkBoarRide__9daAlink_cCFv */ @@ -4399,12 +4399,12 @@ u32 daAlink_c::checkSpinnerRide() const { /* 800CF2DC-800CF2F8 0C9C1C 001C+00 1/0 0/0 0/0 .text getLeftHandMatrix__9daAlink_cFv */ MtxP daAlink_c::getLeftHandMatrix() { - return mpLinkModel->i_getAnmMtx(field_0x30b8); + return mpLinkModel->getAnmMtx(field_0x30b8); } /* 800CF2F8-800CF314 0C9C38 001C+00 1/0 0/0 0/0 .text getRightHandMatrix__9daAlink_cFv */ MtxP daAlink_c::getRightHandMatrix() { - return mpLinkModel->i_getAnmMtx(field_0x30ba); + return mpLinkModel->getAnmMtx(field_0x30ba); } /* 800CF314-800CF328 0C9C54 0014+00 1/0 0/0 0/0 .text @@ -4417,13 +4417,13 @@ void daAlink_c::onSceneChangeArea(u8 exitID, u8 exitDirection, fopAc_ac_c* scexA /* 800CF328-800CF344 0C9C68 001C+00 1/0 0/0 0/0 .text getRightItemMatrix__9daAlink_cFv */ MtxP daAlink_c::getRightItemMatrix() { - return mpLinkModel->i_getAnmMtx(field_0x30c2); + return mpLinkModel->getAnmMtx(field_0x30c2); } /* 800CF344-800CF380 0C9C84 003C+00 1/0 0/0 0/0 .text checkPlayerNoDraw__9daAlink_cFv */ u32 daAlink_c::checkPlayerNoDraw() { return dComIfGp_checkCameraAttentionStatus(field_0x317c, 2) || - i_checkNoResetFlg0(FLG0_PLAYER_NO_DRAW); + checkNoResetFlg0(FLG0_PLAYER_NO_DRAW); } /* 800CF380-800CFC3C 0C9CC0 08BC+00 1/1 0/0 0/0 .text __ct__9daAlink_cFv */ @@ -4514,50 +4514,44 @@ extern "C" asm void __dt__20daAlink_lockCursor_cFv() { #pragma pop /* 800CFEB0-800CFEC4 0CA7F0 0014+00 1/1 0/0 0/0 .text checkRideOn__9daAlink_cCFv */ -BOOL daAlink_c::checkRideOn() const { - return mRideStatus != 0; +extern "C" BOOL checkRideOn__9daAlink_cCFv(daAlink_c* this_) { + return this_->mRideStatus != 0; } /* 800CFEC4-800CFEF4 0CA804 0030+00 1/1 0/0 0/0 .text dComIfGp_att_getCatghTarget__Fv */ -#ifdef NONMATCHING -static s32 dComIfGp_att_getCatghTarget() { - return dComIfGp_getAttention().getCatghTarget().getCatghTarget(); -} -#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm dAttCatch_c* dComIfGp_att_getCatghTarget() { +extern "C" asm dAttCatch_c* dComIfGp_att_getCatghTarget__Fv() { nofralloc #include "asm/d/a/d_a_alink/dComIfGp_att_getCatghTarget__Fv.s" } #pragma pop -#endif /* 800CFEF4-800CFF2C 0CA834 0038+00 1/1 0/0 0/0 .text mDoAud_setLinkHp__Fll */ -static void mDoAud_setLinkHp(s32 param_0, s32 param_1) { +extern "C" void mDoAud_setLinkHp__Fll(s32 param_0, s32 param_1) { if (Z2GetLink() != NULL) { Z2GetLink()->setLinkHp(param_0, param_1); } } /* 800CFF2C-800CFF3C 0CA86C 0010+00 1/1 0/0 0/0 .text dComIfGs_getLife__Fv */ -static u16 dComIfGs_getLife() { +extern "C" u16 dComIfGs_getLife__Fv() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife(); } /* 800CFF3C-800CFF4C 0CA87C 0010+00 1/1 0/0 0/0 .text dComIfGp_getRStatus__Fv */ -static u8 dComIfGp_getRStatus() { +extern "C" u8 dComIfGp_getRStatus__Fv() { return g_dComIfG_gameInfo.play.getRStatus(); } /* 800CFF4C-800CFFA4 0CA88C 0058+00 1/1 0/0 0/0 .text checkAttentionLock__9daAlink_cFv */ -BOOL daAlink_c::checkAttentionLock() { - return mAttention->Lockon(); +extern "C" BOOL checkAttentionLock__9daAlink_cFv(daAlink_c* this_) { + return this_->mAttention->Lockon(); } /* 800CFFA4-800CFFC0 0CA8E4 001C+00 1/1 0/0 0/0 .text dComIfGp_setItemLifeCount__FfUc */ -void dComIfGp_setItemLifeCount(f32 amount, u8 type) { +extern "C" void dComIfGp_setItemLifeCount__FfUc(f32 amount, u8 type) { g_dComIfG_gameInfo.play.setItemLifeCount(amount, type); } @@ -4565,44 +4559,44 @@ void dComIfGp_setItemLifeCount(f32 amount, u8 type) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void cMtx_multVec(f32 const (*param_0)[4], Vec const* param_1, Vec* param_2) { +extern "C" asm void cMtx_multVec__FPA4_CfPC3VecP3Vec() { nofralloc #include "asm/d/a/d_a_alink/cMtx_multVec__FPA4_CfPC3VecP3Vec.s" } #pragma pop /* 800CFFE0-800CFFF4 0CA920 0014+00 1/1 0/0 0/0 .text getAnmMtx__8J3DModelFi */ -MtxP J3DModel::getAnmMtx(int i) { - return mMtxBuffer->getAnmMtx(i); +extern "C" MtxP getAnmMtx__8J3DModelFi(J3DModel* this_, int i) { + return this_->mMtxBuffer->getAnmMtx(i); } /* 800CFFF4-800D0020 0CA934 002C+00 1/1 0/0 0/0 .text setBaseTRMtx__8J3DModelFPA4_f */ -void J3DModel::setBaseTRMtx(MtxP matrix) { - MTXCopy(matrix, mBaseTransformMtx); +extern "C" void setBaseTRMtx__8J3DModelFPA4_f(J3DModel* this_, MtxP matrix) { + MTXCopy(matrix, this_->mBaseTransformMtx); } /* 800D0020-800D0048 0CA960 0028+00 1/1 0/0 0/0 .text checkFmChainGrabAnime__9daAlink_cCFv */ -BOOL daAlink_c::checkFmChainGrabAnime() const { - return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); +extern "C" BOOL checkFmChainGrabAnime__9daAlink_cCFv(daAlink_c* this_) { + return this_->checkUpperAnime(0x62) || this_->checkUpperAnime(0x2A0); } /* 800D0048-800D005C 0CA988 0014+00 1/1 0/0 0/0 .text checkSmallUpperGuardAnime__9daAlink_cCFv */ -BOOL daAlink_c::checkSmallUpperGuardAnime() const { - return checkUpperAnime(ANM_SMALL_GUARD); +extern "C" BOOL checkSmallUpperGuardAnime__9daAlink_cCFv(daAlink_c* this_) { + return this_->checkUpperAnime(daAlink_c::ANM_SMALL_GUARD); } /* 800D005C-800D008C 0CA99C 0030+00 1/1 0/0 0/0 .text dComIfGp_evmng_startCheck__FPCc */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm bool dComIfGp_evmng_startCheck(char const* param_0) { +extern "C" asm void dComIfGp_evmng_startCheck__FPCc() { nofralloc #include "asm/d/a/d_a_alink/dComIfGp_evmng_startCheck__FPCc.s" } #pragma pop /* 800D008C-800D00BC 0CA9CC 0030+00 1/1 0/0 0/0 .text mDoAud_setLinkGroupInfo__FUc */ -static void mDoAud_setLinkGroupInfo(u8 param_0) { +extern "C" void mDoAud_setLinkGroupInfo__FUc(u8 param_0) { if (Z2GetLink() != NULL) { Z2GetLink()->setLinkGroupInfo(param_0); } @@ -4612,550 +4606,544 @@ static void mDoAud_setLinkGroupInfo(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DAnmTransform* mDoExt_MtxCalcAnmBlendTbl::getAnm(int param_0) { +extern "C" asm void getAnm__25mDoExt_MtxCalcAnmBlendTblFi() { nofralloc #include "asm/d/a/d_a_alink/getAnm__25mDoExt_MtxCalcAnmBlendTblFi.s" } #pragma pop /* 800D00D0-800D00DC 0CAA10 000C+00 1/1 0/0 0/0 .text ChkRoofHit__9dBgS_AcchCFv */ -bool dBgS_Acch::ChkRoofHit() const { - return m_flags & ROOF_HIT; +extern "C" bool ChkRoofHit__9dBgS_AcchCFv(dBgS_Acch* this_) { + return this_->m_flags & dBgS_Acch::ROOF_HIT; } /* 800D00DC-800D00EC 0CAA1C 0010+00 1/1 0/0 0/0 .text ClrGroundHit__9dBgS_AcchFv */ -void dBgS_Acch::ClrGroundHit() { - m_flags &= ~GROUND_HIT; +extern "C" void ClrGroundHit__9dBgS_AcchFv(dBgS_Acch* this_) { + this_->m_flags &= ~dBgS_Acch::GROUND_HIT; } /* 800D00EC-800D0110 0CAA2C 0024+00 1/1 0/0 0/0 .text checkReinRide__9daAlink_cCFv */ -u32 daAlink_c::checkReinRide() const { - return mRideStatus == 1 || mRideStatus == 2; +extern "C" u32 checkReinRide__9daAlink_cCFv(daAlink_c* this_) { + return this_->mRideStatus == 1 || this_->mRideStatus == 2; } /* 800D0110-800D0138 0CAA50 0028+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAnime__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfEnemyThrowAnime() const { - return checkUpperAnime(0x2BD) || checkUpperAnime(0x2BE); +extern "C" BOOL checkWolfEnemyThrowAnime__9daAlink_cCFv(daAlink_c* this_) { + return this_->checkUpperAnime(0x2BD) || this_->checkUpperAnime(0x2BE); } /* 800D0138-800D014C 0CAA78 0014+00 1/1 0/0 0/0 .text checkSpecialDemoMode__9daAlink_cCFv */ -int daAlink_c::checkSpecialDemoMode() const { - return mDemo.getDemoType() == 5; +extern "C" BOOL checkSpecialDemoMode__9daAlink_cCFv(daAlink_c* this_) { + return this_->mDemo.getDemoType() == 5; } /* 800D014C-800D0164 0CAA8C 0018+00 1/1 0/0 0/0 .text setMidnaTalkStatus__9daAlink_cFUc */ -void daAlink_c::setMidnaTalkStatus(u8 status) { +extern "C" void setMidnaTalkStatus__9daAlink_cFUc(daAlink_c* this_, u8 status) { dComIfGp_setZStatus(status, 0); } /* 800D0164-800D0180 0CAAA4 001C+00 1/1 0/0 0/0 .text set3DStatus__9daAlink_cFUcUc */ -void daAlink_c::set3DStatus(u8 status, u8 direction) { +extern "C" void set3DStatus__9daAlink_cFUcUc(daAlink_c* this_, u8 status, u8 direction) { dComIfGp_set3DStatus(status, direction, 0); } /* 800D0180-800D018C 0CAAC0 000C+00 1/1 0/0 0/0 .text offSetFlg__16daAlink_matAnm_cFv */ -void daAlink_matAnm_c::offSetFlg() { - mSetFlag = 0; +extern "C" void offSetFlg__16daAlink_matAnm_cFv(daAlink_matAnm_c* this_) { + this_->mSetFlag = 0; } /* 800D018C-800D0198 0CAACC 000C+00 1/1 0/0 0/0 .text checkModeFlg__9daAlink_cCFUl */ -u32 daAlink_c::checkModeFlg(u32 pFlag) const { - return mModeFlg & pFlag; +extern "C" u32 checkModeFlg__9daAlink_cCFUl(daAlink_c* this_, u32 pFlag) { + return this_->mModeFlg & pFlag; } /* 800D0198-800D01A0 0CAAD8 0008+00 1/0 0/0 0/0 .text getShieldChangeWaitTimer__9daAlink_cCFv */ -u8 daAlink_c::getShieldChangeWaitTimer() const { - return mShieldChangeWaitTimer; +extern "C" u8 getShieldChangeWaitTimer__9daAlink_cCFv(daAlink_c* this_) { + return this_->mShieldChangeWaitTimer; } /* 800D01A0-800D01A8 0CAAE0 0008+00 1/0 0/0 0/0 .text getClothesChangeWaitTimer__9daAlink_cCFv */ -u8 daAlink_c::getClothesChangeWaitTimer() const { - return mClothesChangeWaitTimer; +extern "C" u8 getClothesChangeWaitTimer__9daAlink_cCFv(daAlink_c* this_) { + return this_->mClothesChangeWaitTimer; } -/* 800D01A8-800D01E0 0CAAE8 0038+00 1/0 0/0 0/0 .text checkHorseStart__9daAlink_cFv */ u32 daPy_py_c::getLastSceneMode() { return dComIfGs_getLastSceneMode() & 0xF; } -BOOL daAlink_c::checkHorseStart() { - return checkHorseStart(getLastSceneMode(), getStartMode()); +/* 800D01A8-800D01E0 0CAAE8 0038+00 1/0 0/0 0/0 .text checkHorseStart__9daAlink_cFv */ +extern "C" BOOL checkHorseStart__9daAlink_cFv(daAlink_c* this_) { + return this_->checkHorseStart(this_->getLastSceneMode(), this_->getStartMode()); } /* 800D01E0-800D0208 0CAB20 0028+00 1/0 0/0 0/0 .text checkCutTurnCharge__9daAlink_cCFv */ -BOOL daAlink_c::checkCutTurnCharge() const { - return mProcID == PROC_CUT_TURN_MOVE && mProcVar2.field_0x300c == 0; +extern "C" BOOL checkCutTurnCharge__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_CUT_TURN_MOVE && this_->mProcVar2.field_0x300c == 0; } /* 800D0208-800D0228 0CAB48 0020+00 1/0 0/0 0/0 .text checkAcceptDungeonWarpAlink__9daAlink_cFi */ -bool daAlink_c::checkAcceptDungeonWarpAlink(int param_0) { - return checkAcceptWarp(); +extern "C" bool checkAcceptDungeonWarpAlink__9daAlink_cFi(daAlink_c* this_) { + return this_->checkAcceptWarp(); } /* 800D0228-800D0274 0CAB68 004C+00 1/0 0/0 0/0 .text getSpinnerActor__9daAlink_cFv */ -daSpinner_c* daAlink_c::getSpinnerActor() { - fopAc_ac_c* spinnerActor; +extern "C" daSpinner_c* getSpinnerActor__9daAlink_cFv(daAlink_c* this_) { + daSpinner_c* spinnerActor; - if (!checkSpinnerRide()) { + if (!this_->checkSpinnerRide()) { spinnerActor = NULL; } else { - spinnerActor = mRideAcKeep.getActor(); + spinnerActor = (daSpinner_c*)this_->mRideAcKeep.getActor(); } return static_cast(spinnerActor); } /* 800D0274-800D027C 0CABB4 0008+00 1/0 0/0 0/0 .text getSumouCounter__9daAlink_cCFv */ -s16 daAlink_c::getSumouCounter() const { - return mProcVar2.field_0x300c; +extern "C" s16 getSumouCounter__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcVar2.field_0x300c; } /* 800D027C-800D0284 0CABBC 0008+00 1/0 0/0 0/0 .text checkSumouWithstand__9daAlink_cCFv */ -s16 daAlink_c::checkSumouWithstand() const { - return mProcVar3.field_0x300e.x; +extern "C" s16 checkSumouWithstand__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcVar3.field_0x300e.x; } /* 800D0284-800D0290 0CABC4 000C+00 1/0 0/0 0/0 .text setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs */ -void daAlink_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 pMsgNum) { - mMidnaMsgNum = pMsgNum; - static_cast(mMidnaMsg) = param_0; +extern "C" void setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs(daAlink_c* this_, fopAc_ac_c* param_0, u16 pMsgNum) { + this_->mMidnaMsgNum = pMsgNum; + static_cast(this_->mMidnaMsg) = param_0; } /* 800D0290-800D029C 0CABD0 000C+00 1/0 0/0 0/0 .text getModelMtx__9daAlink_cFv */ -MtxP daAlink_c::getModelMtx() { - return mpLinkModel->getBaseTRMtx(); +extern "C" MtxP getModelMtx__9daAlink_cFv(daAlink_c* this_) { + return this_->mpLinkModel->getBaseTRMtx(); } /* 800D029C-800D02A4 0CABDC 0008+00 1/0 0/0 0/0 .text getInvMtx__9daAlink_cFv */ -MtxP daAlink_c::getInvMtx() { - return mInvMtx; +extern "C" MtxP getInvMtx__9daAlink_cFv(daAlink_c* this_) { + return this_->mInvMtx; } /* 800D02A4-800D02B8 0CABE4 0014+00 1/0 0/0 0/0 .text getLinkBackBone1Matrix__9daAlink_cFv */ -MtxP daAlink_c::getLinkBackBone1Matrix() { - return mpLinkModel->i_getAnmMtx(1); +extern "C" MtxP getLinkBackBone1Matrix__9daAlink_cFv(daAlink_c* this_) { + return this_->mpLinkModel->getAnmMtx(1); } /* 800D02B8-800D02CC 0CABF8 0014+00 1/0 0/0 0/0 .text getWolfMouthMatrix__9daAlink_cFv */ -MtxP daAlink_c::getWolfMouthMatrix() { - return mpLinkModel->i_getAnmMtx(13); +extern "C" MtxP getWolfMouthMatrix__9daAlink_cFv(daAlink_c* this_) { + return this_->mpLinkModel->getAnmMtx(13); } /* 800D02CC-800D02E0 0CAC0C 0014+00 1/0 0/0 0/0 .text getWolfBackbone2Matrix__9daAlink_cFv */ -MtxP daAlink_c::getWolfBackbone2Matrix() { - return mpLinkModel->i_getAnmMtx(2); +extern "C" MtxP getWolfBackbone2Matrix__9daAlink_cFv(daAlink_c* this_) { + return this_->mpLinkModel->getAnmMtx(2); } /* 800D02E0-800D0334 0CAC20 0054+00 1/0 0/0 0/0 .text getBottleMtx__9daAlink_cFv */ -MtxP daAlink_c::getBottleMtx() { - if (mHeldItemModel != NULL && checkBottleItem(mEquipItem)) { - return mHeldItemModel->getBaseTRMtx(); +extern "C" MtxP getBottleMtx__9daAlink_cFv(daAlink_c* this_) { + if (this_->mHeldItemModel != NULL && this_->checkBottleItem(this_->mEquipItem)) { + return this_->mHeldItemModel->getBaseTRMtx(); } return NULL; } /* 800D0334-800D0350 0CAC74 001C+00 1/0 0/0 0/0 .text getHeadMtx__9daAlink_cFv */ -MtxP daAlink_c::getHeadMtx() { - return mpLinkModel->i_getAnmMtx(field_0x30b4); +extern "C" MtxP getHeadMtx__9daAlink_cFv(daAlink_c* this_) { + return this_->mpLinkModel->getAnmMtx(this_->field_0x30b4); } /* 800D0350-800D0358 0CAC90 0008+00 1/0 0/0 0/0 .text getGroundY__9daAlink_cFv */ -f32 daAlink_c::getGroundY() { - return mLinkAcch.GetGroundH(); +extern "C" f32 getGroundY__9daAlink_cFv(daAlink_c* this_) { + return this_->mLinkAcch.GetGroundH(); } /* 800D0358-800D0360 0CAC98 0008+00 1/0 0/0 0/0 .text getBaseAnimeFrameRate__9daAlink_cCFv */ -f32 daAlink_c::getBaseAnimeFrameRate() const { - return mUnderFrameCtrl[0].getRate(); +extern "C" f32 getBaseAnimeFrameRate__9daAlink_cCFv(daAlink_c* this_) { + return this_->mUnderFrameCtrl[0].getRate(); } /* 800D0360-800D0368 0CACA0 0008+00 1/0 0/0 0/0 .text getAtnActorID__9daAlink_cCFv */ -s32 daAlink_c::getAtnActorID() const { - return mAtnActorID; +extern "C" s32 getAtnActorID__9daAlink_cCFv(daAlink_c* this_) { + return this_->mAtnActorID; } /* 800D0368-800D0370 0CACA8 0008+00 1/0 0/0 0/0 .text getItemID__9daAlink_cCFv */ -s32 daAlink_c::getItemID() const { - return mItemAcKeep.getID(); +extern "C" s32 getItemID__9daAlink_cCFv(daAlink_c* this_) { + return this_->mItemAcKeep.getID(); } /* 800D0370-800D038C 0CACB0 001C+00 1/0 0/0 0/0 .text getGrabActorID__9daAlink_cCFv */ -s32 daAlink_c::getGrabActorID() const { - if (mEquipItem == noentry71) { - return mItemAcKeep.getID(); +extern "C" s32 getGrabActorID__9daAlink_cCFv(daAlink_c* this_) { + if (this_->mEquipItem == noentry71) { + return this_->mItemAcKeep.getID(); } else { - return mGrabItemAcKeep.getID(); + return this_->mGrabItemAcKeep.getID(); } } /* 800D038C-800D03B4 0CACCC 0028+00 1/0 0/0 0/0 .text setForcePutPos__9daAlink_cFRC4cXyz */ -void daAlink_c::setForcePutPos(cXyz const& pPutPos) { - mForcePutPos = pPutPos; - i_onEndResetFlg1(ERFLG1_UNK_2000); +extern "C" void setForcePutPos__9daAlink_cFRC4cXyz(daAlink_c* this_, cXyz const& pPutPos) { + this_->mForcePutPos = pPutPos; + this_->onEndResetFlg1(daAlink_c::ERFLG1_UNK_2000); } /* 800D03B4-800D03C8 0CACF4 0014+00 1/0 0/0 0/0 .text checkPlayerFly__9daAlink_cCFv */ -u32 daAlink_c::checkPlayerFly() const { - return i_checkModeFlg(MODE_SWIMMING | MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | - MODE_NO_COLLISION | MODE_CLIMB | MODE_JUMP); +extern "C" u32 checkPlayerFly__9daAlink_cCFv(daAlink_c* this_) { + return this_->checkModeFlg(daAlink_c::MODE_SWIMMING | daAlink_c::MODE_ROPE_WALK | daAlink_c::MODE_VINE_CLIMB | daAlink_c::MODE_UNK_800 | + daAlink_c::MODE_NO_COLLISION | daAlink_c::MODE_CLIMB | daAlink_c::MODE_JUMP); } /* 800D03C8-800D03DC 0CAD08 0014+00 1/0 0/0 0/0 .text checkFrontRoll__9daAlink_cCFv */ -BOOL daAlink_c::checkFrontRoll() const { - return mProcID == PROC_FRONT_ROLL; +extern "C" BOOL checkFrontRoll__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_FRONT_ROLL; } /* 800D03DC-800D03F0 0CAD1C 0014+00 1/0 0/0 0/0 .text checkWolfDash__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfDash() const { - return mProcID == PROC_WOLF_DASH; +extern "C" BOOL checkWolfDash__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_DASH; } /* 800D03F0-800D0414 0CAD30 0024+00 1/0 0/0 0/0 .text checkAutoJump__9daAlink_cCFv */ -BOOL daAlink_c::checkAutoJump() const { - return mProcID == PROC_AUTO_JUMP || mProcID == PROC_WOLF_AUTO_JUMP; +extern "C" BOOL checkAutoJump__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_AUTO_JUMP || this_->mProcID == daAlink_c::PROC_WOLF_AUTO_JUMP; } /* 800D0414-800D0444 0CAD54 0030+00 1/0 0/0 0/0 .text checkSideStep__9daAlink_cCFv */ -bool daAlink_c::checkSideStep() const { - return (mProcID == PROC_SIDESTEP || mProcID == PROC_WOLF_SIDESTEP) && mProcVar1.field_0x300a != 0; +extern "C" bool checkSideStep__9daAlink_cCFv(daAlink_c* this_) { + return (this_->mProcID == daAlink_c::PROC_SIDESTEP || this_->mProcID == daAlink_c::PROC_WOLF_SIDESTEP) && this_->mProcVar1.field_0x300a != 0; } /* 800D0444-800D0468 0CAD84 0024+00 1/0 0/0 0/0 .text checkWolfTriggerJump__9daAlink_cCFv */ -bool daAlink_c::checkWolfTriggerJump() const { - return mProcID == PROC_WOLF_SIDESTEP || mProcID == PROC_WOLF_JUMP_ATTACK; +extern "C" bool checkWolfTriggerJump__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_SIDESTEP || this_->mProcID == daAlink_c::PROC_WOLF_JUMP_ATTACK; } /* 800D0468-800D047C 0CADA8 0014+00 1/0 0/0 0/0 .text checkGuardBreakMode__9daAlink_cCFv */ -BOOL daAlink_c::checkGuardBreakMode() const { - return mProcID == PROC_GUARD_BREAK; +extern "C" BOOL checkGuardBreakMode__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_GUARD_BREAK; } /* 800D047C-800D04A4 0CADBC 0028+00 1/0 0/0 0/0 .text checkLv3Slide__9daAlink_cCFv */ -bool daAlink_c::checkLv3Slide() const { - return mProcID == PROC_SLIDE && mProcVar3.field_0x300e.x != 0; +extern "C" bool checkLv3Slide__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_SLIDE && this_->mProcVar3.field_0x300e.x != 0; } /* 800D04A4-800D04B8 0CADE4 0014+00 1/0 0/0 0/0 .text checkWolfHowlDemoMode__9daAlink_cCFv */ -bool daAlink_c::checkWolfHowlDemoMode() const { - return mProcID == PROC_WOLF_HOWL_DEMO; +extern "C" bool checkWolfHowlDemoMode__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_HOWL_DEMO; } /* 800D04B8-800D04CC 0CADF8 0014+00 1/0 0/0 0/0 .text checkElecDamage__9daAlink_cCFv */ -BOOL daAlink_c::checkElecDamage() const { - return mProcID == PROC_ELEC_DAMAGE; +extern "C" BOOL checkElecDamage__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_ELEC_DAMAGE; } /* 800D04CC-800D04F4 0CAE0C 0028+00 1/0 0/0 0/0 .text checkEmptyBottleSwing__9daAlink_cCFv */ -BOOL daAlink_c::checkEmptyBottleSwing() const { - return mEquipItem == EMPTY_BOTTLE && mProcID == PROC_BOTTLE_SWING; +extern "C" BOOL checkEmptyBottleSwing__9daAlink_cCFv(daAlink_c* this_) { + return this_->mEquipItem == EMPTY_BOTTLE && this_->mProcID == daAlink_c::PROC_BOTTLE_SWING; } /* 800D04F4-800D0508 0CAE34 0014+00 1/0 0/0 0/0 .text checkBottleSwingMode__9daAlink_cCFv */ -BOOL daAlink_c::checkBottleSwingMode() const { - return mProcID == PROC_BOTTLE_SWING; +extern "C" BOOL checkBottleSwingMode__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_BOTTLE_SWING; } /* 800D0508-800D051C 0CAE48 0014+00 1/0 0/0 0/0 .text checkHawkWait__9daAlink_cCFv */ -BOOL daAlink_c::checkHawkWait() const { - return mProcID == PROC_HAWK_SUBJECT; +extern "C" BOOL checkHawkWait__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_HAWK_SUBJECT; } /* 800D051C-800D0544 0CAE5C 0028+00 1/0 0/0 0/0 .text checkGoatThrow__9daAlink_cCFv */ -BOOL daAlink_c::checkGoatThrow() const { - return mProcID == PROC_GOAT_CATCH && mProcVar2.field_0x300c != 0; +extern "C" BOOL checkGoatThrow__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_GOAT_CATCH && this_->mProcVar2.field_0x300c != 0; } /* 800D0544-800D0570 0CAE84 002C+00 1/0 0/0 0/0 .text checkGoatThrowAfter__9daAlink_cCFv */ -BOOL daAlink_c::checkGoatThrowAfter() const { - return mProcID == PROC_GOAT_CATCH && field_0x3478 > FLOAT_LABEL(lit_6108); +extern "C" BOOL checkGoatThrowAfter__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_GOAT_CATCH && this_->field_0x3478 > FLOAT_LABEL(lit_6108); } /* 800D0570-800D0598 0CAEB0 0028+00 1/0 0/0 0/0 .text checkWolfTagLockJump__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfTagLockJump() const { - return mProcID == PROC_WOLF_TAG_JUMP && field_0x3198 == 0; +extern "C" BOOL checkWolfTagLockJump__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_TAG_JUMP && this_->field_0x3198 == 0; } /* 800D0598-800D05AC 0CAED8 0014+00 1/0 0/0 0/0 .text checkWolfTagLockJumpLand__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfTagLockJumpLand() const { - return mProcID == PROC_WOLF_TAG_JUMP_LAND; +extern "C" BOOL checkWolfTagLockJumpLand__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_TAG_JUMP_LAND; } /* 800D05AC-800D05C0 0CAEEC 0014+00 1/0 0/0 0/0 .text checkWolfRopeHang__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfRopeHang() const { - return mProcID == PROC_WOLF_ROPE_HANG; +extern "C" BOOL checkWolfRopeHang__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_ROPE_HANG; } /* 800D05C0-800D05D4 0CAF00 0014+00 1/0 0/0 0/0 .text checkRollJump__9daAlink_cCFv */ -BOOL daAlink_c::checkRollJump() const { - return mProcID == PROC_ROLL_JUMP; +extern "C" BOOL checkRollJump__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_ROLL_JUMP; } /* 800D05D4-800D05E8 0CAF14 0014+00 1/0 0/0 0/0 .text checkGoronRideWait__9daAlink_cCFv */ -BOOL daAlink_c::checkGoronRideWait() const { - return mProcID == PROC_GORON_RIDE_WAIT; +extern "C" BOOL checkGoronRideWait__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_GORON_RIDE_WAIT; } /* 800D05E8-800D05FC 0CAF28 0014+00 1/0 0/0 0/0 .text checkWolfChain__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfChain() const { - return mProcID == PROC_WOLF_CHAIN_WAIT; +extern "C" BOOL checkWolfChain__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_CHAIN_WAIT; } /* 800D05FC-800D0610 0CAF3C 0014+00 1/0 0/0 0/0 .text checkWolfWait__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfWait() const { - return mProcID == PROC_WOLF_WAIT; +extern "C" BOOL checkWolfWait__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_WAIT; } /* 800D0610-800D0624 0CAF50 0014+00 1/0 0/0 0/0 .text checkWolfJumpAttack__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfJumpAttack() const { - return mProcID == PROC_WOLF_JUMP_ATTACK; +extern "C" BOOL checkWolfJumpAttack__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_JUMP_ATTACK; } /* 800D0624-800D0638 0CAF64 0014+00 1/0 0/0 0/0 .text checkWolfRSit__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfRSit() const { - return mProcID == PROC_WOLF_SIT; +extern "C" BOOL checkWolfRSit__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_SIT; } /* 800D0638-800D0660 0CAF78 0028+00 1/0 0/0 0/0 .text checkBottleDrinkEnd__9daAlink_cCFv */ -BOOL daAlink_c::checkBottleDrinkEnd() const { - return mProcID == PROC_BOTTLE_DRINK && mProcVar3.field_0x300e.x != 0; +extern "C" BOOL checkBottleDrinkEnd__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_BOTTLE_DRINK && this_->mProcVar3.field_0x300e.x != 0; } /* 800D0660-800D0674 0CAFA0 0014+00 1/0 0/0 0/0 .text checkWolfDig__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfDig() const { - return mProcID == PROC_WOLF_DIG; +extern "C" BOOL checkWolfDig__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_DIG; } /* 800D0674-800D0688 0CAFB4 0014+00 1/0 0/0 0/0 .text checkCutCharge__9daAlink_cCFv */ -BOOL daAlink_c::checkCutCharge() const { - return mProcID == PROC_CUT_TURN_MOVE; +extern "C" BOOL checkCutCharge__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_CUT_TURN_MOVE; } /* 800D0688-800D06B0 0CAFC8 0028+00 1/0 0/0 0/0 .text checkCutLargeJumpCharge__9daAlink_cCFv */ -BOOL daAlink_c::checkCutLargeJumpCharge() const { - return mProcID == PROC_CUT_TURN_MOVE && mProcVar2.field_0x300c != 0; +extern "C" BOOL checkCutLargeJumpCharge__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_CUT_TURN_MOVE && this_->mProcVar2.field_0x300c != 0; } /* 800D06B0-800D06D8 0CAFF0 0028+00 1/0 0/0 0/0 .text checkComboCutTurn__9daAlink_cCFv */ -BOOL daAlink_c::checkComboCutTurn() const { - return mProcID == PROC_CUT_TURN && mComboCutCount != 0; +extern "C" BOOL checkComboCutTurn__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_CUT_TURN && this_->mComboCutCount != 0; } /* 800D06D8-800D0704 0CB018 002C+00 1/0 0/0 0/0 .text checkClimbMove__9daAlink_cCFv */ -BOOL daAlink_c::checkClimbMove() const { - return mProcID == PROC_CLIMB_MOVE_UPDOWN || mProcID == PROC_LADDER_MOVE || - mProcID == PROC_CLIMB_MOVE_SIDE; +extern "C" BOOL checkClimbMove__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_CLIMB_MOVE_UPDOWN || this_->mProcID == daAlink_c::PROC_LADDER_MOVE || + this_->mProcID == daAlink_c::PROC_CLIMB_MOVE_SIDE; } /* 800D0704-800D0718 0CB044 0014+00 1/0 0/0 0/0 .text checkGrassWhistle__9daAlink_cCFv */ -BOOL daAlink_c::checkGrassWhistle() const { - return mProcID == PROC_GRASS_WHISTLE_WAIT; +extern "C" BOOL checkGrassWhistle__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_GRASS_WHISTLE_WAIT; } /* 800D0718-800D072C 0CB058 0014+00 1/0 0/0 0/0 .text checkBoarRun__9daAlink_cCFv */ -BOOL daAlink_c::checkBoarRun() const { - return mProcID == PROC_BOAR_RUN; +extern "C" BOOL checkBoarRun__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_BOAR_RUN; } /* 800D072C-800D0794 0CB06C 0068+00 1/0 0/0 0/0 .text checkHorseRideNotReady__9daAlink_cCFv */ -BOOL daAlink_c::checkHorseRideNotReady() const { - return checkHorseRide() && mProcID != PROC_HORSE_RIDE && mProcID != PROC_HORSE_GETOFF; +extern "C" BOOL checkHorseRideNotReady__9daAlink_cCFv(daAlink_c* this_) { + return this_->checkHorseRide() && this_->mProcID != daAlink_c::PROC_HORSE_RIDE && this_->mProcID != daAlink_c::PROC_HORSE_GETOFF; } /* 800D0794-800D079C 0CB0D4 0008+00 1/0 0/0 0/0 .text getSearchBallScale__9daAlink_cCFv */ -f32 daAlink_c::getSearchBallScale() const { - return mSearchBallScale; +extern "C" f32 getSearchBallScale__9daAlink_cCFv(daAlink_c* this_) { + return this_->mSearchBallScale; } /* 800D079C-800D07A4 0CB0DC 0008+00 1/0 0/0 0/0 .text checkFastShotTime__9daAlink_cFv */ -s16 daAlink_c::checkFastShotTime() { - return mFastShotTime; +extern "C" s16 checkFastShotTime__9daAlink_cFv(daAlink_c* this_) { + return this_->mFastShotTime; } /* 800D07A4-800D07D4 0CB0E4 0030+00 1/0 0/0 0/0 .text checkCutJumpCancelTurn__9daAlink_cCFv */ -BOOL daAlink_c::checkCutJumpCancelTurn() const { - return (mProcID == PROC_CUT_JUMP || mProcID == PROC_CUT_JUMP_LAND) && field_0x3198 != 2; +extern "C" BOOL checkCutJumpCancelTurn__9daAlink_cCFv(daAlink_c* this_) { + return (this_->mProcID == daAlink_c::PROC_CUT_JUMP || this_->mProcID == daAlink_c::PROC_CUT_JUMP_LAND) && this_->field_0x3198 != 2; } /* 800D07D4-800D07FC 0CB114 0028+00 1/0 0/0 0/0 .text * checkSingleBoarBattleSecondBowReady__9daAlink_cCFv */ -BOOL daAlink_c::checkSingleBoarBattleSecondBowReady() const { - return mProcID == PROC_HORSE_BOW_SUBJECT && mProcVar2.field_0x300c != 0; +extern "C" BOOL checkSingleBoarBattleSecondBowReady__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_HORSE_BOW_SUBJECT && this_->mProcVar2.field_0x300c != 0; } /* 800D07FC-800D0818 0CB13C 001C+00 1/0 0/0 0/0 .text cancelDungeonWarpReadyNeck__9daAlink_cFv */ -void daAlink_c::cancelDungeonWarpReadyNeck() { - if (mProcID != PROC_DUNGEON_WARP_READY) { +extern "C" void cancelDungeonWarpReadyNeck__9daAlink_cFv(daAlink_c* this_) { + if (this_->mProcID != daAlink_c::PROC_DUNGEON_WARP_READY) { return; } - offModeFlg(MODE_UNK_100); + this_->offModeFlg(daAlink_c::MODE_UNK_100); } /* 800D0818-800D0830 0CB158 0018+00 1/0 0/0 0/0 .text * onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c */ -void daAlink_c::onSceneChangeAreaJump(u8 exitID, u8 exitDirection, fopAc_ac_c* scexAc) { - mExitID = exitID | 0x8000; - mExitDirection = exitDirection; - mpScnChg = (daScex_c*)scexAc; +extern "C" void onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c(daAlink_c* this_, u8 exitID, u8 exitDirection, fopAc_ac_c* scexAc) { + this_->mExitID = exitID | 0x8000; + this_->mExitDirection = exitDirection; + this_->mpScnChg = (daScex_c*)scexAc; } /* 800D0830-800D084C 0CB170 001C+00 1/0 0/0 0/0 .text onSceneChangeDead__9daAlink_cFUci */ -void daAlink_c::onSceneChangeDead(u8 param_0, int param_1) { - if (mProcID != PROC_DEAD) { +extern "C" void onSceneChangeDead__9daAlink_cFUci(daAlink_c* this_, u8 param_0, int param_1) { + if (this_->mProcID != daAlink_c::PROC_DEAD) { return; } - mProcVar3.field_0x300e.z = param_0; - field_0x3198 = param_1; + this_->mProcVar3.field_0x300e.z = param_0; + this_->field_0x3198 = param_1; } /* 800D084C-800D0860 0CB18C 0014+00 1/0 0/0 0/0 .text checkNoEquipItem__9daAlink_cCFv */ -bool daAlink_c::checkNoEquipItem() const { - return mEquipItem == NO_ITEM; +extern "C" bool checkNoEquipItem__9daAlink_cCFv(daAlink_c* this_) { + return this_->mEquipItem == NO_ITEM; } /* 800D0860-800D087C 0CB1A0 001C+00 1/0 0/0 0/0 .text getBoardCutTurnOffsetAngleY__9daAlink_cCFv */ -s16 daAlink_c::getBoardCutTurnOffsetAngleY() const { - if (mProcID == PROC_BOARD_CUT_TURN) { - return mProcVar3.field_0x300e.z; +extern "C" s16 getBoardCutTurnOffsetAngleY__9daAlink_cCFv(daAlink_c* this_) { + if (this_->mProcID == daAlink_c::PROC_BOARD_CUT_TURN) { + return this_->mProcVar3.field_0x300e.z; } return 0; } /* 800D087C-800D0884 0CB1BC 0008+00 1/0 0/0 0/0 .text getMagneBootsTopVec__9daAlink_cFv */ -cXyz* daAlink_c::getMagneBootsTopVec() { - return &mMagneBootsTopVec; +extern "C" cXyz* getMagneBootsTopVec__9daAlink_cFv(daAlink_c* this_) { + return &this_->mMagneBootsTopVec; } /* 800D0884-800D08B0 0CB1C4 002C+00 1/0 0/0 0/0 .text setCargoCarry__9daAlink_cFP10fopAc_ac_c */ -void daAlink_c::setCargoCarry(fopAc_ac_c* p_actor) { - mSpecialMode = SMODE_CARGO_CARRY; - mCargoCarryAcKeep.setData(p_actor); +extern "C" void setCargoCarry__9daAlink_cFP10fopAc_ac_c(daAlink_c* this_, fopAc_ac_c* p_actor) { + this_->mSpecialMode = daAlink_c::SMODE_CARGO_CARRY; + this_->mCargoCarryAcKeep.setData(p_actor); } /* 800D08B0-800D08DC 0CB1F0 002C+00 1/0 0/0 0/0 .text setGoronSideMove__9daAlink_cFP10fopAc_ac_c */ -void daAlink_c::setGoronSideMove(fopAc_ac_c* p_actor) { - mSpecialMode = SMODE_GORON_THROW; - mCargoCarryAcKeep.setData(p_actor); +extern "C" void setGoronSideMove__9daAlink_cFP10fopAc_ac_c(daAlink_c* this_, fopAc_ac_c* p_actor) { + this_->mSpecialMode = daAlink_c::SMODE_GORON_THROW; + this_->mCargoCarryAcKeep.setData(p_actor); } /* 800D08DC-800D091C 0CB21C 0040+00 1/0 0/0 0/0 .text setSumouReady__9daAlink_cFP10fopAc_ac_c */ -void daAlink_c::setSumouReady(fopAc_ac_c* p_actor) { - mSpecialMode = SMODE_SUMO_READY; - mCargoCarryAcKeep.setData(p_actor); - mDemo.setDemoMode(1); +extern "C" void setSumouReady__9daAlink_cFP10fopAc_ac_c(daAlink_c* this_, fopAc_ac_c* p_actor) { + this_->mSpecialMode = daAlink_c::SMODE_SUMO_READY; + this_->mCargoCarryAcKeep.setData(p_actor); + this_->mDemo.setDemoMode(1); } /* 800D091C-800D0930 0CB25C 0014+00 1/0 0/0 0/0 .text setSumouPushBackDirection__9daAlink_cFs */ -void daAlink_c::setSumouPushBackDirection(s16 param_0) { - if (mProcID != PROC_SUMOU_MOVE) { +extern "C" void setSumouPushBackDirection__9daAlink_cFs(daAlink_c* this_, s16 param_0) { + if (this_->mProcID != daAlink_c::PROC_SUMOU_MOVE) { return; } - mProcVar3.field_0x300e.y = param_0; + this_->mProcVar3.field_0x300e.y = param_0; } /* 800D0930-800D0948 0CB270 0018+00 1/0 0/0 0/0 .text setSumouLoseHeadUp__9daAlink_cFv */ -void daAlink_c::setSumouLoseHeadUp() { - if (mProcID != PROC_SUMOU_WIN_LOSE) { +extern "C" void setSumouLoseHeadUp__9daAlink_cFv(daAlink_c* this_) { + if (this_->mProcID != daAlink_c::PROC_SUMOU_WIN_LOSE) { return; } - mSpecialMode = SMODE_SUMO_LOSE; + this_->mSpecialMode = daAlink_c::SMODE_SUMO_LOSE; } /* 800D0948-800D095C 0CB288 0014+00 1/0 0/0 0/0 .text checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c */ -bool daAlink_c::checkPriActorOwn(fopAc_ac_c const* p_actor) const { - return field_0x27f4 == p_actor; +extern "C" bool checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c(daAlink_c* this_, const fopAc_ac_c* p_actor) { + return this_->field_0x27f4 == p_actor; } /* 800D095C-800D0970 0CB29C 0014+00 1/0 0/0 0/0 .text * checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c */ -bool daAlink_c::checkWolfEnemyBiteAllOwn(fopAc_ac_c const* p_actor) const { - return field_0x281c.getActorConst() == p_actor; +extern "C" bool checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c(daAlink_c* this_, const fopAc_ac_c* p_actor) { + return this_->field_0x281c.getActorConst() == p_actor; } /* 800D0970-800D0984 0CB2B0 0014+00 1/0 0/0 0/0 .text setWolfEnemyHangBiteAngle__9daAlink_cFs */ -void daAlink_c::setWolfEnemyHangBiteAngle(s16 angle) { - if (mProcID != PROC_WOLF_ENEMY_HANG_BITE) { +extern "C" void setWolfEnemyHangBiteAngle__9daAlink_cFs(daAlink_c* this_, s16 angle) { + if (this_->mProcID != daAlink_c::PROC_WOLF_ENEMY_HANG_BITE) { return; } - mProcVar3.field_0x300e.y = angle; + this_->mProcVar3.field_0x300e.y = angle; } /* 800D0984-800D0998 0CB2C4 0014+00 1/0 0/0 0/0 .text setSumouGraspCancelCount__9daAlink_cFi */ -void daAlink_c::setSumouGraspCancelCount(int param_0) { - if (mProcID != PROC_SUMOU_MOVE) { +extern "C" void setSumouGraspCancelCount__9daAlink_cFi(daAlink_c* this_, int param_0) { + if (this_->mProcID != daAlink_c::PROC_SUMOU_MOVE) { return; } - mProcVar2.field_0x300c = param_0; + this_->mProcVar2.field_0x300c = param_0; } /* 800D0998-800D09AC 0CB2D8 0014+00 1/0 0/0 0/0 .text checkItemSwordEquip__9daAlink_cCFv */ -bool daAlink_c::checkItemSwordEquip() const { - return mEquipItem == EQUIP_SWORD; +extern "C" bool checkItemSwordEquip__9daAlink_cCFv(daAlink_c* this_) { + return this_->mEquipItem == EQUIP_SWORD; } /* 800D09AC-800D09B4 0CB2EC 0008+00 1/0 0/0 0/0 .text getSinkShapeOffset__9daAlink_cCFv */ -f32 daAlink_c::getSinkShapeOffset() const { - return mSinkShapeOffset; +extern "C" f32 getSinkShapeOffset__9daAlink_cCFv(daAlink_c* this_) { + return this_->mSinkShapeOffset; } /* 800D09B4-800D09C8 0CB2F4 0014+00 1/0 0/0 0/0 .text checkSinkDead__9daAlink_cCFv */ -BOOL daAlink_c::checkSinkDead() const { - return field_0x2fbd == 0xFF; +extern "C" BOOL checkSinkDead__9daAlink_cCFv(daAlink_c* this_) { + return this_->field_0x2fbd == 0xFF; } /* 800D09C8-800D09DC 0CB308 0014+00 1/0 0/0 0/0 .text checkCutJumpMode__9daAlink_cCFv */ -BOOL daAlink_c::checkCutJumpMode() const { - return mProcID == PROC_CUT_JUMP; +extern "C" BOOL checkCutJumpMode__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_CUT_JUMP; } /* 800D09DC-800D09E4 0CB31C 0008+00 1/0 0/0 0/0 .text getGiantPuzzleAimAngle__9daAlink_cCFv */ -s16 daAlink_c::getGiantPuzzleAimAngle() const { - return mProcVar2.mPuzzleAimAngle; +extern "C" s16 getGiantPuzzleAimAngle__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcVar2.mPuzzleAimAngle; } /* 800D09E4-800D09EC 0CB324 0008+00 1/0 0/0 0/0 .text getSwordChangeWaitTimer__9daAlink_cCFv */ -u8 daAlink_c::getSwordChangeWaitTimer() const { - return mSwordChangeWaitTimer; +extern "C" u8 getSwordChangeWaitTimer__9daAlink_cCFv(daAlink_c* this_) { + return this_->mSwordChangeWaitTimer; } /* 800D09EC-800D0A14 0CB32C 0028+00 1/0 0/0 0/0 .text checkMetamorphose__9daAlink_cCFv */ -BOOL daAlink_c::checkMetamorphose() const { - return mProcID == PROC_METAMORPHOSE && mProcVar1.field_0x300a == 0; +extern "C" BOOL checkMetamorphose__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_METAMORPHOSE && this_->mProcVar1.field_0x300a == 0; } /* 800D0A14-800D0A28 0CB354 0014+00 1/0 0/0 0/0 .text checkWolfDownAttackPullOut__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfDownAttackPullOut() const { - return mProcID == PROC_WOLF_DOWN_AT_LAND; +extern "C" BOOL checkWolfDownAttackPullOut__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_WOLF_DOWN_AT_LAND; } /* 800D0A28-800D0A30 0CB368 0008+00 1/0 0/0 0/0 .text getMidnaAtnPos__9daAlink_cCFv */ -// vtable issue -#ifdef NONMATCHING -cXyz* daAlink_c::getMidnaAtnPos() const { - return &mMidnaAtnPos; -} -#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -5165,78 +5153,77 @@ extern "C" asm void getMidnaAtnPos__9daAlink_cCFv() { #include "asm/d/a/d_a_alink/getMidnaAtnPos__9daAlink_cCFv.s" } #pragma pop -#endif /* 800D0A30-800D0A44 0CB370 0014+00 1/0 0/0 0/0 .text checkCopyRodEquip__9daAlink_cCFv */ -bool daAlink_c::checkCopyRodEquip() const { - return mEquipItem == COPY_ROD; +extern "C" bool checkCopyRodEquip__9daAlink_cCFv(daAlink_c* this_) { + return this_->mEquipItem == COPY_ROD; } /* 800D0A44-800D0A6C 0CB384 0028+00 1/0 0/0 0/0 .text checkCanoeFishingGetLeft__9daAlink_cCFv */ -bool daAlink_c::checkCanoeFishingGetLeft() const { - return mProcID == PROC_CANOE_FISHING_GET && mProcVar3.field_0x300e.x == 0; +extern "C" bool checkCanoeFishingGetLeft__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_CANOE_FISHING_GET && this_->mProcVar3.field_0x300e.x == 0; } /* 800D0A6C-800D0A94 0CB3AC 0028+00 1/0 0/0 0/0 .text checkCanoeFishingGetRight__9daAlink_cCFv */ -bool daAlink_c::checkCanoeFishingGetRight() const { - return mProcID == PROC_CANOE_FISHING_GET && mProcVar3.field_0x300e.x == 1; +extern "C" bool checkCanoeFishingGetRight__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_CANOE_FISHING_GET && this_->mProcVar3.field_0x300e.x == 1; } /* 800D0A94-800D0A9C 0CB3D4 0008+00 1/0 0/0 0/0 .text checkBeeChildDrink__9daAlink_cCFv */ -u8 daAlink_c::checkBeeChildDrink() const { - return field_0x2fd3; +extern "C" u8 checkBeeChildDrink__9daAlink_cCFv(daAlink_c* this_) { + return this_->field_0x2fd3; } /* 800D0A9C-800D0AA4 0CB3DC 0008+00 1/0 0/0 0/0 .text getWolfHowlMgrP__9daAlink_cFv */ -Z2WolfHowlMgr* daAlink_c::getWolfHowlMgrP() { - return &mZ2WolfHowlMgr; +extern "C" Z2WolfHowlMgr* getWolfHowlMgrP__9daAlink_cFv(daAlink_c* this_) { + return &this_->mZ2WolfHowlMgr; } /* 800D0AA4-800D0AC8 0CB3E4 0024+00 1/0 0/0 0/0 .text checkWolfHowlSuccessAnime__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfHowlSuccessAnime() const { - return checkUnderMove0BckNoArcWolf(WANM_HOWL_SUCCESS); +extern "C" BOOL checkWolfHowlSuccessAnime__9daAlink_cCFv(daAlink_c* this_) { + return this_->checkUnderMove0BckNoArcWolf(daAlink_c::WANM_HOWL_SUCCESS); } /* 800D0AC8-800D0AF0 0CB408 0028+00 1/0 0/0 0/0 .text checkOctaIealHang__9daAlink_cCFv */ -bool daAlink_c::checkOctaIealHang() const { - return mProcID == PROC_BOSS_BODY_HANG && field_0x32cc == 0; +extern "C" bool checkOctaIealHang__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_BOSS_BODY_HANG && this_->field_0x32cc == 0; } /* 800D0AF0-800D0B08 0CB430 0018+00 1/0 0/0 0/0 .text cancelOctaIealHang__9daAlink_cFv */ -void daAlink_c::cancelOctaIealHang() { - if (mProcID != PROC_BOSS_BODY_HANG) { +extern "C" void cancelOctaIealHang__9daAlink_cFv(daAlink_c* this_) { + if (this_->mProcID != daAlink_c::PROC_BOSS_BODY_HANG) { return; } - mProcVar3.field_0x300e.x = 1; + this_->mProcVar3.field_0x300e.x = 1; } /* 800D0B08-800D0B20 0CB448 0018+00 1/0 0/0 0/0 .text cancelDragonHangBackJump__9daAlink_cFv */ -void daAlink_c::cancelDragonHangBackJump() { - if (mProcID != PROC_BOSS_BODY_HANG) { +extern "C" void cancelDragonHangBackJump__9daAlink_cFv(daAlink_c* this_) { + if (this_->mProcID != daAlink_c::PROC_BOSS_BODY_HANG) { return; } - mProcVar3.field_0x300e.x = -1; + this_->mProcVar3.field_0x300e.x = -1; } /* 800D0B20-800D0B38 0CB460 0018+00 1/0 0/0 0/0 .text setOctaIealWildHang__9daAlink_cFv */ -void daAlink_c::setOctaIealWildHang() { - if (mProcID != PROC_BOSS_BODY_HANG) { +extern "C" void setOctaIealWildHang__9daAlink_cFv(daAlink_c* this_) { + if (this_->mProcID != daAlink_c::PROC_BOSS_BODY_HANG) { return; } - mProcVar0.field_0x3008 = 1; + this_->mProcVar0.field_0x3008 = 1; } /* 800D0B38-800D0B60 0CB478 0028+00 1/0 0/0 0/0 .text checkDragonHangRide__9daAlink_cCFv */ -bool daAlink_c::checkDragonHangRide() const { - return mProcID == PROC_BOSS_BODY_HANG && field_0x32cc != 0; +extern "C" bool checkDragonHangRide__9daAlink_cCFv(daAlink_c* this_) { + return this_->mProcID == daAlink_c::PROC_BOSS_BODY_HANG && this_->field_0x32cc != 0; } /* 800D0B60-800D0B8C 0CB4A0 002C+00 1/0 0/0 0/0 .text playerStartCollisionSE__9daAlink_cFUlUl */ -void daAlink_c::playerStartCollisionSE(u32 param_0, u32 param_1) { - mZ2Link.startCollisionSE(param_0, param_1); +extern "C" void playerStartCollisionSE__9daAlink_cFUlUl(daAlink_c* this_, u32 param_0, u32 param_1) { + this_->mZ2Link.startCollisionSE(param_0, param_1); } /* 800D0B8C-800D0C6C 0CB4CC 00E0+00 1/0 0/0 0/0 .text __dt__16daAlink_matAnm_cFv */ @@ -5295,7 +5282,7 @@ SECTION_DATA extern void* __vt__Q29daAlink_c14hsChainShape_c[5 + 4 /* padding */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daAlink_c::hsChainShape_c::~hsChainShape_c() { +extern "C" asm void __dt__Q29daAlink_c14hsChainShape_cFv() { nofralloc #include "asm/d/a/d_a_alink/__dt__Q29daAlink_c14hsChainShape_cFv.s" } diff --git a/src/d/a/d_a_alink_spinner.inc b/src/d/a/d_a_alink_spinner.inc index eeb2293520d..8fc82e78ebb 100644 --- a/src/d/a/d_a_alink_spinner.inc +++ b/src/d/a/d_a_alink_spinner.inc @@ -231,7 +231,7 @@ int daAlink_c::procSpinnerWait() { daSpinner_c* spinner = (daSpinner_c*)mRideAcKeep.getActor(); if (spinner == NULL || spinner->getDeleteFlg() || checkWindSpeedOnXZ() || - i_checkEndResetFlg1(ERFLG1_UNK_1) || i_checkEndResetFlg0(ERFLG0_UNK_2)) { + checkEndResetFlg1(ERFLG1_UNK_1) || checkEndResetFlg0(ERFLG0_UNK_2)) { mNormalSpeed = 0.0f; setJumpMode(); return procFallInit(1, daAlinkHIO_autoJump_c0::m.mFallInterpolation); diff --git a/src/d/a/d_a_alink_sumou.inc b/src/d/a/d_a_alink_sumou.inc index 71edd4456bf..a90cff280a1 100644 --- a/src/d/a/d_a_alink_sumou.inc +++ b/src/d/a/d_a_alink_sumou.inc @@ -576,7 +576,7 @@ int daAlink_c::procSumouActionInit(BOOL i_doTrigger, BOOL i_punchTrigger, int un mSpecialMode = 0x13; anm = ANM_SUMOU_PUNCH; } - } else if (wrestler_p->getWrestlerType() != 0 && !i_checkEquipHeavyBoots()) { + } else if (wrestler_p->getWrestlerType() != 0 && !checkEquipHeavyBoots()) { if (i_doTrigger) { mSpecialMode = 0x12; anm = ANM_SUMOU_TACKLE_SHOCK_RETURN; diff --git a/src/d/a/d_a_alink_swim.inc b/src/d/a/d_a_alink_swim.inc index 79e3baab45b..0b5b8b2c05d 100644 --- a/src/d/a/d_a_alink_swim.inc +++ b/src/d/a/d_a_alink_swim.inc @@ -10,7 +10,7 @@ /* 80101890-801018E4 0FC1D0 0054+00 6/6 0/0 0/0 .text checkZoraWearMaskDraw__9daAlink_cFv */ BOOL daAlink_c::checkZoraWearMaskDraw() { - return checkZoraWearAbility() && !i_checkNoResetFlg0(FLG0_UNK_100); + return checkZoraWearAbility() && !checkNoResetFlg0(FLG0_UNK_100); } /* 801018E4-80101934 0FC224 0050+00 1/1 0/0 0/0 .text checkAcceptUseItemInWater__9daAlink_cCFUs */ @@ -24,7 +24,7 @@ void daAlink_c::swimDeleteItem() { deleteEquipItem(1, 1); } - if (i_checkNoResetFlg2(FLG2_UNK_1)) { + if (checkNoResetFlg2(FLG2_UNK_1)) { offKandelaarModel(); } } @@ -66,8 +66,8 @@ f32 daAlink_c::getSwimMaxFallSpeed() const { void daAlink_c::checkOxygenTimer() { BOOL hide_timer; - if (!i_checkNoResetFlg0(FLG0_UNK_100) || - (i_checkModeFlg(MODE_SWIMMING) && mWaterY > lit_7808 + current.pos.y)) + if (!checkNoResetFlg0(FLG0_UNK_100) || + (checkModeFlg(MODE_SWIMMING) && mWaterY > lit_7808 + current.pos.y)) { hide_timer = false; } else { @@ -110,14 +110,14 @@ void daAlink_c::offOxygenTimer() { /* 80101CB8-80101CF4 0FC5F8 003C+00 2/2 0/0 0/0 .text checkPossibleWaterInMode__9daAlink_cCFv */ BOOL daAlink_c::checkPossibleWaterInMode() const { - return i_checkModeFlg(MODE_VINE_CLIMB) || i_dComIfGp_checkPlayerStatus1(0, 0x2000000) || + return checkModeFlg(MODE_VINE_CLIMB) || dComIfGp_checkPlayerStatus1(0, 0x2000000) || mProcID == PROC_HOOKSHOT_FLY; } /* 80101CF4-80101D70 0FC634 007C+00 18/18 0/0 0/0 .text * setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf */ void daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c* i_frameCtrl, f32 i_rate) { - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkNoResetFlg0(FLG0_UNDERWATER)) { if (checkZoraWearAbility()) { i_rate *= daAlinkHIO_magneBoots_c0::m.mZoraWaterAnmSpeed; } else { @@ -131,7 +131,7 @@ void daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c* i_frameCtrl, f32 i_rate) { /* 80101D70-801023E4 0FC6B0 0674+00 2/2 0/0 0/0 .text swimBgCheck__9daAlink_cFf */ #ifdef NONMATCHING void daAlink_c::swimBgCheck(f32 param_0) { - i_offNoResetFlg1(FLG1_UNK_20000000); + offNoResetFlg1(FLG1_UNK_20000000); if (!getZoraSwim() && mProcID != PROC_METAMORPHOSE) { return; @@ -176,7 +176,7 @@ void daAlink_c::swimBgCheck(f32 param_0) { (getZoraSwim() && cLib_distanceAngleS(cM_atan2s(tri.mNormal.y, tri.mNormal.absXZ()), field_0x3080) < 0x1000)) { - i_onNoResetFlg1(FLG1_UNK_20000000); + onNoResetFlg1(FLG1_UNK_20000000); } start_pos.x -= fvar14; @@ -234,7 +234,7 @@ int daAlink_c::checkNextActionSwim() { field_0x3000 = 30; } - if ((checkZoraWearAbility() && !checkHeavyStateOn(1, 1)) || i_checkNoResetFlg0(FLG0_UNK_100)) { + if ((checkZoraWearAbility() && !checkHeavyStateOn(1, 1)) || checkNoResetFlg0(FLG0_UNK_100)) { setTalkStatus(); } @@ -242,7 +242,7 @@ int daAlink_c::checkNextActionSwim() { return 1; } - if (mAttList != NULL && mAttList->mType == 7 && i_checkNoResetFlg0(FLG0_UNK_100) && + if (mAttList != NULL && mAttList->mType == 7 && checkNoResetFlg0(FLG0_UNK_100) && fopAcM_GetName(field_0x27f4) == PROC_CANOE) { setDoStatus(0x17); @@ -284,12 +284,12 @@ asm int daAlink_c::checkSwimUpAction() { /* 801032C8-80103398 0FDC08 00D0+00 8/8 0/0 0/0 .text swimOutAfter__9daAlink_cFi */ void daAlink_c::swimOutAfter(int param_0) { - i_onNoResetFlg0(FLG0_UNK_100); - i_onEndResetFlg1(ERFLG1_UNK_100); + onNoResetFlg0(FLG0_UNK_100); + onEndResetFlg1(ERFLG1_UNK_100); mZ2Link.setInWater(false); - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { - i_offNoResetFlg0(FLG0_UNDERWATER); + if (checkNoResetFlg0(FLG0_UNDERWATER)) { + offNoResetFlg0(FLG0_UNDERWATER); } else { field_0x2b98 = FLOAT_LABEL(lit_6108); field_0x2f98 = 4; @@ -306,7 +306,7 @@ void daAlink_c::swimOutAfter(int param_0) { /* 80103398-801033CC 0FDCD8 0034+00 1/1 0/0 0/0 .text checkSwimFall__9daAlink_cFv */ bool daAlink_c::checkSwimFall() { - if (!i_checkNoResetFlg0(FLG0_UNK_80) || current.pos.y > mWaterY + l_autoUpHeight) { + if (!checkNoResetFlg0(FLG0_UNK_80) || current.pos.y > mWaterY + l_autoUpHeight) { return true; } @@ -336,18 +336,18 @@ asm void daAlink_c::setSwimMoveAnime() { /* 80103EE0-80103F08 0FE820 0028+00 5/5 0/0 0/0 .text checkSwimButtonAccept__9daAlink_cFv */ bool daAlink_c::checkSwimButtonAccept() { - return i_dComIfGp_getDoStatus() == 0x41 || i_dComIfGp_getDoStatus() == 0x4C; + return dComIfGp_getDoStatus() == 0x41 || dComIfGp_getDoStatus() == 0x4C; } /* 80103F08-80103F24 0FE848 001C+00 4/4 0/0 0/0 .text checkUpSwimButtonAccept__9daAlink_cFv */ bool daAlink_c::checkUpSwimButtonAccept() { - return i_dComIfGp_getDoStatus() == 0x97; + return dComIfGp_getDoStatus() == 0x97; } /* 80103F24-80103F94 0FE864 0070+00 2/2 0/0 0/0 .text checkSwimButtonMove__9daAlink_cFv */ BOOL daAlink_c::checkSwimButtonMove() { - return !i_checkNoResetFlg0(FLG0_UNK_100) && + return !checkNoResetFlg0(FLG0_UNK_100) && (checkSwimButtonAccept() || checkUpSwimButtonAccept()) && doButton(); } @@ -359,7 +359,7 @@ BOOL daAlink_c::checkZoraSwimMove() { /* 80103FE8-80104034 0FE928 004C+00 2/2 0/0 0/0 .text checkSwimNeckUpDown__9daAlink_cCFv */ BOOL daAlink_c::checkSwimNeckUpDown() const { - return !i_checkNoResetFlg0(FLG0_UNK_100) && checkUnderMove0BckNoArc(ANM_SWIM_WAIT); + return !checkNoResetFlg0(FLG0_UNK_100) && checkUnderMove0BckNoArc(ANM_SWIM_WAIT); } /* 80104034-801040F8 0FE974 00C4+00 3/3 0/0 0/0 .text setSwimUpDownOffset__9daAlink_cFv @@ -368,7 +368,7 @@ void daAlink_c::setSwimUpDownOffset() { mProcVar2.field_0x300c += (s16)((cM_rndF(lit_16570) + lit_27477) * lit_27476); f32 var_f1; - if (i_checkWolf()) { + if (checkWolf()) { if (checkHeavyStateOn(1, 1)) { var_f1 = daAlinkHIO_wlSwim_c0::m.field_0x98; } else { @@ -392,7 +392,7 @@ int daAlink_c::procSwimUpInit() { speed.y = FLOAT_LABEL(lit_6108); current.pos.y = mWaterY; field_0x3080 = 0; - i_onNoResetFlg0(FLG0_UNK_100); + onNoResetFlg0(FLG0_UNK_100); mZ2Link.setInWater(false); setSingleAnimeParam(ANM_SWIM_RESURFACE, &daAlinkHIO_swim_c0::m.mResurfaceAnm); dComIfGp_setPlayerStatus0(0, 0x100000); @@ -439,10 +439,10 @@ int daAlink_c::procSwimUp() { /* 801042F8-801044B4 0FEC38 01BC+00 15/15 0/0 0/0 .text procSwimWaitInit__9daAlink_cFi */ int daAlink_c::procSwimWaitInit(int param_0) { daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; - u32 mode_40000 = i_checkModeFlg(0x40000); + u32 mode_40000 = checkModeFlg(0x40000); - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { - i_offNoResetFlg0(FLG0_UNDERWATER); + if (checkNoResetFlg0(FLG0_UNDERWATER)) { + offNoResetFlg0(FLG0_UNDERWATER); current.pos.y += daAlinkHIO_swim_c0::m.mInitHeight; } @@ -477,7 +477,7 @@ int daAlink_c::procSwimWaitInit(int param_0) { dComIfGp_setPlayerStatus0(0, 0x100000); - if (i_checkNoResetFlg0(FLG0_UNK_100)) { + if (checkNoResetFlg0(FLG0_UNK_100)) { current.pos.y = mWaterY; speed.y = FLOAT_LABEL(lit_6108); } @@ -508,7 +508,7 @@ int daAlink_c::procSwimWait() { setSwimUpDownOffset(); - if (i_checkEquipHeavyBoots() && mEquipItem != NO_ITEM) { + if (checkEquipHeavyBoots() && mEquipItem != NO_ITEM) { setDoStatus(0x4); } @@ -542,14 +542,14 @@ int daAlink_c::procSwimWait() { /* 80104670-801047B8 0FEFB0 0148+00 9/9 0/0 0/0 .text procSwimMoveInit__9daAlink_cFv */ int daAlink_c::procSwimMoveInit() { - u32 mode_40000 = i_checkModeFlg(0x40000); + u32 mode_40000 = checkModeFlg(0x40000); bool proc_dive_jump = mProcID == PROC_DIVE_JUMP; bool proc_swim_dive = mProcID == PROC_SWIM_DIVE; commonProcInit(PROC_SWIM_MOVE); - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { - i_offNoResetFlg0(FLG0_UNDERWATER); + if (checkNoResetFlg0(FLG0_UNDERWATER)) { + offNoResetFlg0(FLG0_UNDERWATER); } if (!mode_40000) { @@ -573,7 +573,7 @@ int daAlink_c::procSwimMoveInit() { field_0x2f98 = 5; setSwimMoveAnime(); - if (i_checkNoResetFlg0(FLG0_UNK_100)) { + if (checkNoResetFlg0(FLG0_UNK_100)) { current.pos.y = mWaterY; speed.y = FLOAT_LABEL(lit_6108); } @@ -609,8 +609,8 @@ int daAlink_c::procSwimMove() { if (checkSwimButtonAccept() && doTrigger() && !getZoraSwim()) { procSwimDiveInit(); - } else if (i_dComIfGp_getDoStatus() == 9 && doTrigger()) { - i_onNoResetFlg1(FLG1_DASH_MODE); + } else if (dComIfGp_getDoStatus() == 9 && doTrigger()) { + onNoResetFlg1(FLG1_DASH_MODE); field_0x30d0 = daAlinkHIO_swim_c0::m.field_0x5c; setSingleAnimeParam(ANM_SWIM_DASH, &daAlinkHIO_swim_c0::m.mDashAnm); field_0x3198 = 0xC6; @@ -631,7 +631,7 @@ int daAlink_c::procSwimDiveInit() { setSpecialGravity(0.0f, maxFallSpeed, 0); speed.y = 0.0f; - if (i_checkNoResetFlg0(FLG0_UNK_100)) { + if (checkNoResetFlg0(FLG0_UNK_100)) { mProcVar2.field_0x300c = 1; setSingleAnimeParam(ANM_SWIM_DIVE, &daAlinkHIO_swim_c0::m.mDiveAnm); voiceStart(Z2SE_AL_V_DIVING); @@ -670,8 +670,8 @@ int daAlink_c::procSwimDive() { if (mProcVar2.field_0x300c == 0) { setDoStatus(0x4C); - } else if (i_checkNoResetFlg0(FLG0_UNK_100) && frame_ctrl->getFrame() > 20.0f) { - i_offNoResetFlg0(FLG0_UNK_100); + } else if (checkNoResetFlg0(FLG0_UNK_100) && frame_ctrl->getFrame() > 20.0f) { + offNoResetFlg0(FLG0_UNK_100); mZ2Link.setInWater(true); } @@ -740,7 +740,7 @@ int daAlink_c::procSwimHookshotSubjectInit() { field_0x3080 = 0; } - if (i_checkNoResetFlg0(FLG0_UNK_100)) { + if (checkNoResetFlg0(FLG0_UNK_100)) { current.pos.y = mWaterY; speed.y = FLOAT_LABEL(lit_6108); } @@ -815,7 +815,7 @@ int daAlink_c::procSwimHookshotMoveInit() { setSwimMoveAnime(); } - if (i_checkNoResetFlg0(FLG0_UNK_100)) { + if (checkNoResetFlg0(FLG0_UNK_100)) { current.pos.y = mWaterY; speed.y = FLOAT_LABEL(lit_6108); } @@ -898,7 +898,7 @@ int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) { dComIfGp_getVibration().StartShock(2, 31, cXyz(0.0f, 1.0f, 0.0f)); BOOL bvar4 = - i_checkNoResetFlg0(FLG0_UNK_100) || ((param_0 != NULL && param_0->GetTgHitAc() != NULL) && + checkNoResetFlg0(FLG0_UNK_100) || ((param_0 != NULL && param_0->GetTgHitAc() != NULL) && fopAcM_GetName(param_0->GetTgHitAc()) == PROC_E_SG); if (!getZoraSwim() && bvar4 && mProcID != PROC_SWIM_WAIT) { @@ -1027,11 +1027,11 @@ asm int daAlink_c::procSwimDamage() { // matches with literals #ifdef NONMATCHING int daAlink_c::procOctaIealSpitInit() { - u32 temp_r30 = i_checkModeFlg(MODE_SWIMMING); + u32 temp_r30 = checkModeFlg(MODE_SWIMMING); commonProcInit(PROC_OCTAIEAL_SPIT); - if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { - i_offNoResetFlg0(FLG0_UNDERWATER); + if (checkNoResetFlg0(FLG0_UNDERWATER)) { + offNoResetFlg0(FLG0_UNDERWATER); } setSingleAnimeBase(ANM_MORPHEEL_SPIT_OUT); @@ -1057,7 +1057,7 @@ int daAlink_c::procOctaIealSpitInit() { } field_0x3588 = l_waitBaseAnime; - i_offNoResetFlg0(FLG0_UNK_100); + offNoResetFlg0(FLG0_UNK_100); current.angle.y = field_0x2ffe; if (mNormalSpeed > 0.0f) { @@ -1082,7 +1082,7 @@ asm int daAlink_c::procOctaIealSpitInit() { /* 80105A00-80105A84 100340 0084+00 1/0 0/0 0/0 .text procOctaIealSpit__9daAlink_cFv */ int daAlink_c::procOctaIealSpit() { if (mDemo.getDemoMode() == 0x2E) { - i_cancelOriginalDemo(); + cancelOriginalDemo(); } cLib_addCalc(&mNormalSpeed, FLOAT_LABEL(lit_6108), lit_5943, field_0x3478, lit_9054); diff --git a/src/d/a/d_a_alink_swindow.inc b/src/d/a/d_a_alink_swindow.inc index 4270ac9ee80..caaf3508b63 100644 --- a/src/d/a/d_a_alink_swindow.inc +++ b/src/d/a/d_a_alink_swindow.inc @@ -62,7 +62,7 @@ void daAlink_c::setOriginalHeap(JKRExpHeap** p_heap, u32 param_1) { /* 80140038-80140064 13A978 002C+00 1/0 0/0 0/0 .text setClothesChange__9daAlink_cFi */ void daAlink_c::setClothesChange(int param_0) { - if (i_checkWolf()) { + if (checkWolf()) { return; } @@ -71,7 +71,7 @@ void daAlink_c::setClothesChange(int param_0) { return; } - i_onNoResetFlg2(FLG2_UNK_200000); + onNoResetFlg2(FLG2_UNK_200000); } /* 80140064-80140070 13A9A4 000C+00 0/0 1/1 0/0 .text setShieldChange__9daAlink_cFv */ @@ -92,19 +92,19 @@ int daAlink_c::loadModelDVD() { mpWlMidnaHandModel = NULL; mpWlMidnaHairModel = NULL; - if (!i_checkNoResetFlg2(FLG2_UNK_280000)) { + if (!checkNoResetFlg2(FLG2_UNK_280000)) { dComIfG_resDelete(&mPhaseReq, mArcName); cPhs_Reset(&mPhaseReq); field_0x0638->freeAll(); if (mProcID == PROC_METAMORPHOSE || mProcID == PROC_METAMORPHOSE_ONLY) { - setArcName(!i_checkWolf()); + setArcName(!checkWolf()); } else { - setArcName(i_checkWolf()); + setArcName(checkWolf()); } } } else if (mClothesChangeWaitTimer == 1) { - if (i_checkNoResetFlg2(FLG2_UNK_280000)) { + if (checkNoResetFlg2(FLG2_UNK_280000)) { mClothesChangeWaitTimer = 0; changeLink(1); } else { @@ -112,7 +112,7 @@ int daAlink_c::loadModelDVD() { mClothesChangeWaitTimer = 0; if (mProcID == PROC_METAMORPHOSE || mProcID == PROC_METAMORPHOSE_ONLY) { - if (i_checkWolf()) { + if (checkWolf()) { changeLink(0); } else { changeWolf(); @@ -197,11 +197,11 @@ void daAlink_c::initStatusWindow() { u16 var_r30; u16 var_r31; - i_onNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); + onNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); void* tmpBuffer = new (0x20) void*[0x500]; - if (i_checkWolf()) { + if (checkWolf()) { var_r28 = 0x2FF; var_r31 = 0x408; var_r30 = 0x3A7; @@ -264,12 +264,12 @@ void daAlink_c::statusWindowExecute(cXyz const* param_0, s16 param_1) { mDoMtx_stack_c::transS(*param_0); mDoMtx_stack_c::YrotM(param_1); - mpLinkModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpLinkModel->setBaseTRMtx(mDoMtx_stack_c::get()); m_sWindowBck->play(); m_sWindowBck->entry(field_0x064C); mpLinkModel->calc(); - if (i_checkWolf()) { + if (checkWolf()) { setWolfItemMatrix(); } else { setItemMatrix(1); @@ -283,19 +283,19 @@ void daAlink_c::statusWindowDraw() { g_env_light.settingTevStruct(12, ¤t.pos, &tevStr); initTevCustomColor(); - if (!i_checkWolf()) { + if (!checkWolf()) { setWaterDropColor((J3DGXColorS10*)&waterColor); setDrawHand(); } basicModelDraw(mpLinkModel); - if (!i_checkWolf()) { + if (!checkWolf()) { basicModelDraw(mpLinkHandModel); basicModelDraw(mpLinkHatModel); basicModelDraw(mpLinkFaceModel); - if (i_checkEquipHeavyBoots()) { + if (checkEquipHeavyBoots()) { for (int i = 0; i < 2; i++) { basicModelDraw(mpLinkBootModels[i]); } @@ -317,9 +317,9 @@ void daAlink_c::statusWindowDraw() { /* 80140AC8-80140B88 13B408 00C0+00 0/0 1/1 0/0 .text resetStatusWindow__9daAlink_cFv */ void daAlink_c::resetStatusWindow() { - i_offNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); + offNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); - if (i_checkWolf()) { + if (checkWolf()) { changeModelDataDirectWolf(1); } else { changeModelDataDirect(1); @@ -327,15 +327,15 @@ void daAlink_c::resetStatusWindow() { setMatrix(); mpLinkModel->calc(); - i_onNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); + onNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); setSelectEquipItem(0); - if (i_checkWolf()) { + if (checkWolf()) { setWolfItemMatrix(); } else { setItemMatrix(0); } - i_offNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); + offNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); m_sWindowBck = NULL; } \ No newline at end of file diff --git a/src/d/a/d_a_alink_weakfn.inc b/src/d/a/d_a_alink_weakfn.inc index 7bd5ec54337..a0cb560b6a8 100644 --- a/src/d/a/d_a_alink_weakfn.inc +++ b/src/d/a/d_a_alink_weakfn.inc @@ -49,7 +49,8 @@ extern "C" asm void __ct__16daPy_frameCtrl_cFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_anmHeap_c::__defctor() { +// asm void daPy_anmHeap_c::__defctor() { +extern "C" asm void __defctor__14daPy_anmHeap_cFv() { nofralloc #include "asm/d/a/d_a_alink/__defctor__14daPy_anmHeap_cFv.s" } @@ -59,7 +60,7 @@ asm void daPy_anmHeap_c::__defctor() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoExt_AnmRatioPack::~mDoExt_AnmRatioPack() { +extern "C" asm void __dt__19mDoExt_AnmRatioPackFv() { nofralloc #include "asm/d/a/d_a_alink/__dt__19mDoExt_AnmRatioPackFv.s" } @@ -69,7 +70,7 @@ asm mDoExt_AnmRatioPack::~mDoExt_AnmRatioPack() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoExt_AnmRatioPack::mDoExt_AnmRatioPack() { +extern "C" asm void __ct__19mDoExt_AnmRatioPackFv() { nofralloc #include "asm/d/a/d_a_alink/__ct__19mDoExt_AnmRatioPackFv.s" } @@ -153,34 +154,27 @@ extern "C" asm void __ct__16daPy_actorKeep_cFv() { /* 8014111C-8014112C 13BA5C 0010+00 1/1 0/0 0/0 .text * onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2 */ -void daPy_py_c::onNoResetFlg2(daPy_FLG2 pFlag) { - mNoResetFlg2 |= pFlag; +extern "C" void onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2(daPy_py_c* this_, daPy_py_c::daPy_FLG2 pFlag) { + this_->mNoResetFlg2 |= pFlag; } /* 8014112C-8014113C 13BA6C 0010+00 1/1 0/0 0/0 .text * offNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0 */ -// weird regalloc -#ifdef NONMATCHING -void daPy_py_c::offNoResetFlg0(daPy_FLG0 pFlag) { - mNoResetFlg0 &= ~pFlag; -} -#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::offNoResetFlg0(daPy_py_c::daPy_FLG0 param_0) { +extern "C" asm void offNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0() { nofralloc #include "asm/d/a/d_a_alink/offNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0.s" } #pragma pop -#endif /* 8014113C-80141190 13BA7C 0054+00 1/1 0/0 0/0 .text mDoAud_seStartLevel__FUlPC3VecUlSc */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void mDoAud_seStartLevel(u32 param_0, Vec const* param_1, u32 param_2, s8 param_3) { +extern "C" asm void mDoAud_seStartLevel__FUlPC3VecUlSc() { nofralloc #include "asm/d/a/d_a_alink/mDoAud_seStartLevel__FUlPC3VecUlSc.s" } @@ -188,36 +182,51 @@ static asm void mDoAud_seStartLevel(u32 param_0, Vec const* param_1, u32 param_2 /* 80141190-8014119C 13BAD0 000C+00 1/1 0/0 0/0 .text * checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2 */ -int daPy_py_c::checkEndResetFlg2(daPy_ERFLG2 pFlag) const { - return mEndResetFlg2 & pFlag; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2() { + nofralloc +#include "asm/d/a/d_a_alink/checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2.s" } +#pragma pop /* 8014119C-801411B0 13BADC 0014+00 1/1 0/0 0/0 .text dComIfGp_setBottleStatus__FUcUc */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dComIfGp_setBottleStatus(u8 param_0, u8 param_1) { +static asm void dComIfGp_setBottleStatus__FUcUc(u8 param_0, u8 param_1) { nofralloc #include "asm/d/a/d_a_alink/dComIfGp_setBottleStatus__FUcUc.s" } #pragma pop /* 801411B0-801411D4 13BAF0 0024+00 1/1 0/0 0/0 .text getSumouMode__9daPy_py_cCFv */ -bool daPy_py_c::getSumouMode() const { - return getSumouCameraMode(); +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getSumouMode__9daPy_py_cCFv() { + nofralloc +#include "asm/d/a/d_a_alink/getSumouMode__9daPy_py_cCFv.s" } +#pragma pop /* 801411D4-801411E0 13BB14 000C+00 1/1 0/0 0/0 .text * checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3 */ -int daPy_py_c::checkNoResetFlg3(daPy_FLG3 pFlag) const { - return mNoResetFlg3 & pFlag; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3() { + nofralloc +#include "asm/d/a/d_a_alink/checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3.s" } +#pragma pop /* 801411E0-801411F0 13BB20 0010+00 1/1 0/0 0/0 .text onCondition__11dEvt_info_cFUs */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_info_c::onCondition(u16 param_0) { +extern "C" asm void onCondition__11dEvt_info_cFUs() { nofralloc #include "asm/d/a/d_a_alink/onCondition__11dEvt_info_cFUs.s" } @@ -238,14 +247,14 @@ extern "C" asm void __ct__8cM3dGPlaFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_info_c::offCondition(u16 param_0) { +extern "C" asm void offCondition__11dEvt_info_cFUs() { nofralloc #include "asm/d/a/d_a_alink/offCondition__11dEvt_info_cFUs.s" } #pragma pop /* 80141210-80141230 13BB50 0020+00 1/1 0/0 0/0 .text checkShieldGet__9daPy_py_cFv */ -BOOL daPy_py_c::checkShieldGet() { +extern "C" BOOL checkShieldGet__9daPy_py_cFv() { return dComIfGs_getSelectEquipShield() != NO_ITEM; } @@ -254,14 +263,14 @@ BOOL daPy_py_c::checkShieldGet() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void fopAcM_onSwitch(fopAc_ac_c const* param_0, int param_1) { +extern "C" asm void fopAcM_onSwitch__FPC10fopAc_ac_ci(fopAc_ac_c const* param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/fopAcM_onSwitch__FPC10fopAc_ac_ci.s" } #pragma pop /* 80141264-80141294 13BBA4 0030+00 1/1 0/0 0/0 .text dComIfGs_isItemFirstBit__FUc */ -int dComIfGs_isItemFirstBit(u8 i_no) { +extern "C" int dComIfGs_isItemFirstBit__FUc(u8 i_no) { return g_dComIfG_gameInfo.info.getPlayer().getGetItem().isFirstBit(i_no); } @@ -270,7 +279,7 @@ int dComIfGs_isItemFirstBit(u8 i_no) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { +extern "C" asm void dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class() { nofralloc #include "asm/d/a/d_a_alink/dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class.s" } @@ -280,7 +289,7 @@ static asm s32 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm dStage_stageDt_c* dComIfGp_getStage() { +extern "C" asm void dComIfGp_getStage__Fv() { nofralloc #include "asm/d/a/d_a_alink/dComIfGp_getStage__Fv.s" } @@ -288,15 +297,14 @@ static asm dStage_stageDt_c* dComIfGp_getStage() { /* 801412B0-801412BC 13BBF0 000C+00 1/1 0/0 0/0 .text checkEquipHeavyBoots__9daPy_py_cCFv */ -u32 daPy_py_c::checkEquipHeavyBoots() const { - return i_checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); +extern "C" u32 checkEquipHeavyBoots__9daPy_py_cCFv(daPy_py_c* this_) { + return this_->checkNoResetFlg0(daPy_py_c::FLG0_EQUIP_HVY_BOOTS); } /* 801412BC-801412C4 13BBFC 0008+00 1/1 4/4 0/0 .text fopAcM_GetName__FPv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -// asm void fopAcM_GetName(void* param_0) { extern "C" asm void fopAcM_GetName__FPv() { nofralloc #include "asm/d/a/d_a_alink/fopAcM_GetName__FPv.s" @@ -305,22 +313,22 @@ extern "C" asm void fopAcM_GetName__FPv() { /* 801412C4-801412D4 13BC04 0010+00 1/1 0/0 0/0 .text * onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0 */ -void daPy_py_c::onNoResetFlg0(daPy_FLG0 pFlag) { - mNoResetFlg0 |= pFlag; +extern "C" void onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0(daPy_py_c* this_, daPy_py_c::daPy_FLG0 pFlag) { + this_->mNoResetFlg0 |= pFlag; } /* 801412D4-801412F8 13BC14 0024+00 1/1 0/0 0/0 .text isOrderOK__14dEvt_control_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm BOOL dEvt_control_c::isOrderOK() { +extern "C" asm void isOrderOK__14dEvt_control_cFv() { nofralloc #include "asm/d/a/d_a_alink/isOrderOK__14dEvt_control_cFv.s" } #pragma pop /* 801412F8-80141308 13BC38 0010+00 1/1 0/0 0/0 .text dComIfGp_getEvent__Fv */ -static dEvt_control_c& dComIfGp_getEvent() { +extern "C" dEvt_control_c& dComIfGp_getEvent__Fv() { return g_dComIfG_gameInfo.play.getEvent(); } @@ -329,7 +337,7 @@ static dEvt_control_c& dComIfGp_getEvent() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm u32 dComIfGp_checkPlayerStatus0(int param_0, u32 param_1) { +extern "C" asm u32 dComIfGp_checkPlayerStatus0__FiUl(int param_0, u32 param_1) { nofralloc #include "asm/d/a/d_a_alink/dComIfGp_checkPlayerStatus0__FiUl.s" } @@ -340,7 +348,7 @@ static asm u32 dComIfGp_checkPlayerStatus0(int param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm u32 dComIfGp_checkPlayerStatus1(int param_0, u32 param_1) { +extern "C" asm u32 dComIfGp_checkPlayerStatus1__FiUl(int param_0, u32 param_1) { nofralloc #include "asm/d/a/d_a_alink/dComIfGp_checkPlayerStatus1__FiUl.s" } @@ -348,12 +356,12 @@ static asm u32 dComIfGp_checkPlayerStatus1(int param_0, u32 param_1) { /* 80141340-8014134C 13BC80 000C+00 1/1 0/0 0/0 .text * checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1 */ -u32 daPy_py_c::checkEndResetFlg1(daPy_ERFLG1 pFlag) const { - return mEndResetFlg1 & pFlag; +extern "C" u32 checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1(daPy_py_c* this_, daPy_py_c::daPy_ERFLG1 pFlag) { + return this_->mEndResetFlg1 & pFlag; } /* 8014134C-8014135C 13BC8C 0010+00 1/1 0/0 0/0 .text dComIfGp_getEventManager__Fv */ -static dEvent_manager_c& dComIfGp_getEventManager() { +extern "C" dEvent_manager_c& dComIfGp_getEventManager__Fv() { return g_dComIfG_gameInfo.play.getEvtManager(); } @@ -362,7 +370,7 @@ static dEvent_manager_c& dComIfGp_getEventManager() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::offNoResetFlg1(daPy_py_c::daPy_FLG1 param_0) { +extern "C" asm void offNoResetFlg1__9daPy_py_cFQ29daPy_py_c9daPy_FLG1() { nofralloc #include "asm/d/a/d_a_alink/offNoResetFlg1__9daPy_py_cFQ29daPy_py_c9daPy_FLG1.s" } @@ -370,26 +378,19 @@ asm void daPy_py_c::offNoResetFlg1(daPy_py_c::daPy_FLG1 param_0) { /* 8014136C-8014137C 13BCAC 0010+00 1/1 0/0 0/0 .text * offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2 */ -// regalloc -#ifdef NONMATCHING -void daPy_py_c::offNoResetFlg2(daPy_py_c::daPy_FLG2 param_0) { - mNoResetFlg2 &= ~param_0; -} -#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::offNoResetFlg2(daPy_py_c::daPy_FLG2 param_0) { +extern "C" asm void offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2() { nofralloc #include "asm/d/a/d_a_alink/offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2.s" } #pragma pop -#endif /* 8014137C-80141388 13BCBC 000C+00 1/1 0/0 0/0 .text setSpecialDemoType__11daPy_demo_cFv */ -void daPy_demo_c::setSpecialDemoType() { - setDemoType(5); +extern "C" void setSpecialDemoType__11daPy_demo_cFv(daPy_demo_c* this_) { + this_->setDemoType(5); } /* 80141388-8014139C 13BCC8 0014+00 1/1 0/0 0/0 .text checkCommandCatch__11dEvt_info_cFv @@ -397,944 +398,996 @@ void daPy_demo_c::setSpecialDemoType() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool dEvt_info_c::checkCommandCatch() { +extern "C" asm void checkCommandCatch__11dEvt_info_cFv() { nofralloc #include "asm/d/a/d_a_alink/checkCommandCatch__11dEvt_info_cFv.s" } #pragma pop /* 8014139C-801413CC 13BCDC 0030+00 1/1 1/1 0/0 .text dComIfGs_isEventBit__FUs */ -BOOL dComIfGs_isEventBit(u16 id) { +extern "C" BOOL dComIfGs_isEventBit__FUs(u16 id) { return g_dComIfG_gameInfo.info.getEvent().isEventBit(id); } /* 801413CC-801413D8 13BD0C 000C+00 1/1 0/0 0/0 .text checkWolf__9daPy_py_cCFv */ -u32 daPy_py_c::checkWolf() const { - return i_checkNoResetFlg1(FLG1_IS_WOLF); +extern "C" u32 checkWolf__9daPy_py_cCFv(daPy_py_c* this_) { + return this_->checkNoResetFlg1(daPy_py_c::FLG1_IS_WOLF); } /* 801413D8-801413F8 13BD18 0020+00 1/1 0/0 0/0 .text checkSwordGet__9daPy_py_cFv */ -BOOL daPy_py_c::checkSwordGet() { +extern "C" BOOL checkSwordGet__9daPy_py_cFv() { return dComIfGs_getSelectEquipSword() != 0xFF; } /* 801413F8-80141404 13BD38 000C+00 1/1 0/0 0/0 .text * checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0 */ -u32 daPy_py_c::checkResetFlg0(daPy_RFLG0 pFlag) const { - return mResetFlg0 & pFlag; +extern "C" u32 checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0(daPy_py_c* this_, daPy_py_c::daPy_RFLG0 pFlag) { + return this_->mResetFlg0 & pFlag; } /* 80141404-80141410 13BD44 000C+00 1/1 0/0 0/0 .text ChkGroundHit__9dBgS_AcchCFv */ -bool dBgS_Acch::ChkGroundHit() const { - return m_flags & GROUND_HIT; +extern "C" bool ChkGroundHit__9dBgS_AcchCFv(dBgS_Acch* this_) { + return this_->m_flags & dBgS_Acch::GROUND_HIT; } /* 80141410-8014141C 13BD50 000C+00 1/1 0/0 0/0 .text * checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 */ -u32 daPy_py_c::checkNoResetFlg0(daPy_FLG0 pFlag) const { - return mNoResetFlg0 & pFlag; +extern "C" u32 checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0(daPy_py_c* this_, daPy_py_c::daPy_FLG0 pFlag) { + return this_->mNoResetFlg0 & pFlag; } /* 8014141C-80141438 13BD5C 001C+00 1/1 0/0 0/0 .text dComIfGp_getPlayerCameraID__Fi */ -#ifdef NONMATCHING -static s32 dComIfGp_getPlayerCameraID(int i) { - return g_dComIfG_gameInfo.play.getPlayerCameraID(i); -} -#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm s8 dComIfGp_getPlayerCameraID(int param_0) { +static asm int dComIfGp_getPlayerCameraID__Fi(int param_0) { nofralloc #include "asm/d/a/d_a_alink/dComIfGp_getPlayerCameraID__Fi.s" } #pragma pop -#endif /* 80141438-80141450 13BD78 0018+00 1/1 0/0 0/0 .text dComIfGp_event_chkEventFlag__FUs */ -static u16 dComIfGp_event_chkEventFlag(u16 flag) { +extern "C" u16 dComIfGp_event_chkEventFlag__FUs(u16 flag) { return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(flag); } /* 80141450-80141464 13BD90 0014+00 1/1 0/0 0/0 .text checkCommandDoor__11dEvt_info_cFv */ -BOOL dEvt_info_c::checkCommandDoor() { - return mCommand == 3; +extern "C" BOOL checkCommandDoor__11dEvt_info_cFv(dEvt_info_c* this_) { + return this_->mCommand == 3; } /* 80141464-801414A4 13BDA4 0040+00 1/1 0/0 0/0 .text * dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci */ -static s32 dComIfGp_evmng_getMyStaffId(char const* param_0, fopAc_ac_c* param_1, int param_2) { +extern "C" s32 dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci(char const* param_0, fopAc_ac_c* param_1, int param_2) { return dComIfGp_getPEvtManager()->getMyStaffId(param_0, param_1, param_2); } /* 801414A4-801414C0 13BDE4 001C+00 1/1 0/0 0/0 .text dComIfGp_event_runCheck__Fv */ -static BOOL dComIfGp_event_runCheck() { +extern "C" BOOL dComIfGp_event_runCheck__Fv() { return g_dComIfG_gameInfo.play.getEvent().runCheck(); } /* 801414C0-801414CC 13BE00 000C+00 1/1 0/0 0/0 .text * checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2 */ -u32 daPy_py_c::checkNoResetFlg2(daPy_FLG2 pFlag) const { - return mNoResetFlg2 & pFlag; +extern "C" u32 checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2(daPy_py_c* this_, daPy_py_c::daPy_FLG2 pFlag) { + return this_->mNoResetFlg2 & pFlag; } /* 801414CC-801414D8 13BE0C 000C+00 1/1 2/2 0/0 .text checkMagneBootsOn__9daPy_py_cCFv */ -u32 daPy_py_c::checkMagneBootsOn() const { - return i_checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); +extern "C" u32 checkMagneBootsOn__9daPy_py_cCFv(daPy_py_c* this_) { + return this_->checkNoResetFlg0(daPy_py_c::FLG0_MAGNE_BOOTS_ON); } /* 801414D8-801414E8 13BE18 0010+00 1/1 2/2 0/0 .text dComIfGp_getHorseActor__Fv */ -daHorse_c* dComIfGp_getHorseActor() { +extern "C" daHorse_c* dComIfGp_getHorseActor__Fv() { return (daHorse_c*)g_dComIfG_gameInfo.play.getPlayerPtr(1); } /* 801414E8-801414F4 13BE28 000C+00 1/1 0/0 0/0 .text checkBoarSingleBattle__9daPy_py_cCFv */ -u32 daPy_py_c::checkBoarSingleBattle() const { - return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); +extern "C" u32 checkBoarSingleBattle__9daPy_py_cCFv(daPy_py_c* this_) { + return this_->checkNoResetFlg2(daPy_py_c::FLG2_BOAR_SINGLE_BATTLE); } /* 801414F4-80141500 13BE34 000C+00 1/1 0/0 0/0 .text * checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0 */ -u32 daPy_py_c::checkEndResetFlg0(daPy_ERFLG0 pFlag) const { - return mEndResetFlg0 & pFlag; +extern "C" u32 checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0(daPy_py_c* this_, daPy_py_c::daPy_ERFLG0 pFlag) { + return this_->mEndResetFlg0 & pFlag; } /* 80141500-80141508 13BE40 0008+00 1/0 0/0 0/0 .text getMidnaAtnPos__9daPy_py_cCFv */ extern "C" bool getMidnaAtnPos__9daPy_py_cCFv() { - // bool daPy_py_c::getMidnaAtnPos() const { return false; } /* 80141508-8014150C 13BE48 0004+00 1/0 0/0 0/0 .text setMidnaMsgNum__9daPy_py_cFP10fopAc_ac_cUs */ -void daPy_py_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 param_1) { +extern "C" void setMidnaMsgNum__9daPy_py_cFP10fopAc_ac_cUs() { /* empty function */ } /* 8014150C-80141514 13BE4C 0008+00 1/0 0/0 0/0 .text getModelMtx__9daPy_py_cFv */ -MtxP daPy_py_c::getModelMtx() { - return cullMtx; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getModelMtx__9daPy_py_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getModelMtx__9daPy_py_cFv.s" } +#pragma pop /* 80141514-8014151C 13BE54 0008+00 1/0 0/0 0/0 .text getInvMtx__9daPy_py_cFv */ -MtxP daPy_py_c::getInvMtx() { - return cullMtx; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getInvMtx__9daPy_py_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getInvMtx__9daPy_py_cFv.s" } +#pragma pop /* 8014151C-80141524 13BE5C 0008+00 1/0 0/0 0/0 .text getShadowTalkAtnPos__9daPy_py_cFv */ -cXyz* daPy_py_c::getShadowTalkAtnPos() { - return ¤t.pos; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getShadowTalkAtnPos__9daPy_py_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getShadowTalkAtnPos__9daPy_py_cFv.s" } +#pragma pop /* 80141524-8014152C 13BE64 0008+00 1/0 0/0 0/0 .text getLeftItemMatrix__9daPy_py_cFv */ -MtxP daPy_py_c::getLeftItemMatrix() { - return cullMtx; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getLeftItemMatrix__9daPy_py_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getLeftItemMatrix__9daPy_py_cFv.s" } +#pragma pop /* 8014152C-80141534 13BE6C 0008+00 1/0 0/0 0/0 .text getRightItemMatrix__9daPy_py_cFv */ -MtxP daPy_py_c::getRightItemMatrix() { - return cullMtx; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getRightItemMatrix__9daPy_py_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getRightItemMatrix__9daPy_py_cFv.s" } +#pragma pop /* 80141534-8014153C 13BE74 0008+00 1/0 0/0 0/0 .text getLeftHandMatrix__9daPy_py_cFv */ -MtxP daPy_py_c::getLeftHandMatrix() { - return cullMtx; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getLeftHandMatrix__9daPy_py_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getLeftHandMatrix__9daPy_py_cFv.s" } +#pragma pop /* 8014153C-80141544 13BE7C 0008+00 1/0 0/0 0/0 .text getRightHandMatrix__9daPy_py_cFv */ -MtxP daPy_py_c::getRightHandMatrix() { - return cullMtx; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getRightHandMatrix__9daPy_py_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getRightHandMatrix__9daPy_py_cFv.s" } +#pragma pop /* 80141544-8014154C 13BE84 0008+00 1/0 0/0 0/0 .text getLinkBackBone1Matrix__9daPy_py_cFv */ -MtxP daPy_py_c::getLinkBackBone1Matrix() { - return cullMtx; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getLinkBackBone1Matrix__9daPy_py_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daPy_py_cFv.s" } +#pragma pop /* 8014154C-80141554 13BE8C 0008+00 1/0 0/0 0/0 .text getWolfMouthMatrix__9daPy_py_cFv */ -MtxP daPy_py_c::getWolfMouthMatrix() { - return cullMtx; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getWolfMouthMatrix__9daPy_py_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getWolfMouthMatrix__9daPy_py_cFv.s" } +#pragma pop /* 80141554-8014155C 13BE94 0008+00 1/0 0/0 0/0 .text getWolfBackbone2Matrix__9daPy_py_cFv */ -MtxP daPy_py_c::getWolfBackbone2Matrix() { - return cullMtx; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getWolfBackbone2Matrix__9daPy_py_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daPy_py_cFv.s" } +#pragma pop /* 8014155C-80141564 13BE9C 0008+00 1/0 0/0 0/0 .text getBottleMtx__9daPy_py_cFv */ -MtxP daPy_py_c::getBottleMtx() { +extern "C" bool getBottleMtx__9daPy_py_cFv() { return NULL; } /* 80141564-8014156C 13BEA4 0008+00 1/0 0/0 0/0 .text checkPlayerGuard__9daPy_py_cCFv */ -BOOL daPy_py_c::checkPlayerGuard() const { +extern "C" bool checkPlayerGuard__9daPy_py_cCFv() { return false; } /* 8014156C-80141574 13BEAC 0008+00 1/0 0/0 0/0 .text checkAutoJump__9daPy_py_cCFv */ -BOOL daPy_py_c::checkAutoJump() const { +extern "C" bool checkAutoJump__9daPy_py_cCFv() { return false; } /* 80141574-8014157C 13BEB4 0008+00 1/0 0/0 0/0 .text checkSideStep__9daPy_py_cCFv */ -bool daPy_py_c::checkSideStep() const { +extern "C" bool checkSideStep__9daPy_py_cCFv() { return false; } /* 8014157C-80141584 13BEBC 0008+00 1/0 0/0 0/0 .text checkWolfTriggerJump__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfTriggerJump() const { +extern "C" bool checkWolfTriggerJump__9daPy_py_cCFv() { return false; } /* 80141584-8014158C 13BEC4 0008+00 1/0 0/0 0/0 .text checkGuardBreakMode__9daPy_py_cCFv */ -BOOL daPy_py_c::checkGuardBreakMode() const { +extern "C" bool checkGuardBreakMode__9daPy_py_cCFv() { return false; } /* 8014158C-80141594 13BECC 0008+00 1/0 0/0 0/0 .text checkLv3Slide__9daPy_py_cCFv */ -bool daPy_py_c::checkLv3Slide() const { +extern "C" bool checkLv3Slide__9daPy_py_cCFv() { return false; } /* 80141594-8014159C 13BED4 0008+00 1/0 0/0 0/0 .text checkWolfHowlDemoMode__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfHowlDemoMode() const { +extern "C" bool checkWolfHowlDemoMode__9daPy_py_cCFv() { return false; } /* 8014159C-801415A4 13BEDC 0008+00 1/0 0/0 0/0 .text checkChainBlockPushPull__9daPy_py_cFv */ -bool daPy_py_c::checkChainBlockPushPull() { +extern "C" bool checkChainBlockPushPull__9daPy_py_cFv() { return false; } /* 801415A4-801415AC 13BEE4 0008+00 1/0 0/0 0/0 .text checkElecDamage__9daPy_py_cCFv */ -BOOL daPy_py_c::checkElecDamage() const { +extern "C" bool checkElecDamage__9daPy_py_cCFv() { return false; } /* 801415AC-801415B4 13BEEC 0008+00 1/0 0/0 0/0 .text checkEmptyBottleSwing__9daPy_py_cCFv */ -BOOL daPy_py_c::checkEmptyBottleSwing() const { +extern "C" bool checkEmptyBottleSwing__9daPy_py_cCFv() { return false; } /* 801415B4-801415BC 13BEF4 0008+00 1/0 0/0 0/0 .text checkBottleSwingMode__9daPy_py_cCFv */ -BOOL daPy_py_c::checkBottleSwingMode() const { +extern "C" bool checkBottleSwingMode__9daPy_py_cCFv() { return false; } /* 801415BC-801415C4 13BEFC 0008+00 1/0 0/0 0/0 .text checkHawkWait__9daPy_py_cCFv */ -BOOL daPy_py_c::checkHawkWait() const { +extern "C" bool checkHawkWait__9daPy_py_cCFv() { return false; } /* 801415C4-801415CC 13BF04 0008+00 1/0 0/0 0/0 .text checkGoatThrow__9daPy_py_cCFv */ -BOOL daPy_py_c::checkGoatThrow() const { +extern "C" bool checkGoatThrow__9daPy_py_cCFv() { return false; } /* 801415CC-801415D4 13BF0C 0008+00 1/0 0/0 0/0 .text checkGoatThrowAfter__9daPy_py_cCFv */ -BOOL daPy_py_c::checkGoatThrowAfter() const { +extern "C" bool checkGoatThrowAfter__9daPy_py_cCFv() { return false; } /* 801415D4-801415DC 13BF14 0008+00 1/0 0/0 0/0 .text checkWolfTagLockJump__9daPy_py_cCFv */ -BOOL daPy_py_c::checkWolfTagLockJump() const { +extern "C" bool checkWolfTagLockJump__9daPy_py_cCFv() { return false; } /* 801415DC-801415E4 13BF1C 0008+00 1/0 0/0 0/0 .text checkWolfTagLockJumpLand__9daPy_py_cCFv */ -BOOL daPy_py_c::checkWolfTagLockJumpLand() const { +extern "C" bool checkWolfTagLockJumpLand__9daPy_py_cCFv() { return false; } /* 801415E4-801415EC 13BF24 0008+00 1/0 0/0 0/0 .text checkWolfRope__9daPy_py_cFv */ -BOOL daPy_py_c::checkWolfRope() { +extern "C" bool checkWolfRope__9daPy_py_cFv() { return false; } /* 801415EC-801415F4 13BF2C 0008+00 1/0 0/0 0/0 .text checkWolfRopeHang__9daPy_py_cCFv */ -BOOL daPy_py_c::checkWolfRopeHang() const { +extern "C" bool checkWolfRopeHang__9daPy_py_cCFv() { return false; } /* 801415F4-801415FC 13BF34 0008+00 1/0 0/0 0/0 .text checkRollJump__9daPy_py_cCFv */ -BOOL daPy_py_c::checkRollJump() const { +extern "C" bool checkRollJump__9daPy_py_cCFv() { return false; } /* 801415FC-80141604 13BF3C 0008+00 1/0 0/0 0/0 .text checkGoronRideWait__9daPy_py_cCFv */ -BOOL daPy_py_c::checkGoronRideWait() const { +extern "C" bool checkGoronRideWait__9daPy_py_cCFv() { return false; } /* 80141604-8014160C 13BF44 0008+00 1/0 0/0 0/0 .text checkWolfChain__9daPy_py_cCFv */ -BOOL daPy_py_c::checkWolfChain() const { +extern "C" bool checkWolfChain__9daPy_py_cCFv() { return false; } /* 8014160C-80141614 13BF4C 0008+00 1/0 0/0 0/0 .text checkWolfWait__9daPy_py_cCFv */ -BOOL daPy_py_c::checkWolfWait() const { +extern "C" bool checkWolfWait__9daPy_py_cCFv() { return false; } /* 80141614-8014161C 13BF54 0008+00 1/0 0/0 0/0 .text checkWolfJumpAttack__9daPy_py_cCFv */ -BOOL daPy_py_c::checkWolfJumpAttack() const { +extern "C" bool checkWolfJumpAttack__9daPy_py_cCFv() { return false; } /* 8014161C-80141624 13BF5C 0008+00 1/0 0/0 0/0 .text checkWolfRSit__9daPy_py_cCFv */ -BOOL daPy_py_c::checkWolfRSit() const { +extern "C" bool checkWolfRSit__9daPy_py_cCFv() { return false; } /* 80141624-8014162C 13BF64 0008+00 2/0 0/0 0/0 .text checkBubbleFly__9daPy_py_cCFv */ -bool daPy_py_c::checkBubbleFly() const { +extern "C" bool checkBubbleFly__9daPy_py_cCFv() { return false; } /* 8014162C-80141634 13BF6C 0008+00 1/0 0/0 0/0 .text checkBottleDrinkEnd__9daPy_py_cCFv */ -BOOL daPy_py_c::checkBottleDrinkEnd() const { +extern "C" bool checkBottleDrinkEnd__9daPy_py_cCFv() { return false; } /* 80141634-8014163C 13BF74 0008+00 1/0 0/0 0/0 .text checkWolfDig__9daPy_py_cCFv */ -BOOL daPy_py_c::checkWolfDig() const { +extern "C" bool checkWolfDig__9daPy_py_cCFv() { return false; } /* 8014163C-80141644 13BF7C 0008+00 1/0 0/0 0/0 .text checkCutCharge__9daPy_py_cCFv */ -BOOL daPy_py_c::checkCutCharge() const { +extern "C" bool checkCutCharge__9daPy_py_cCFv() { return false; } /* 80141644-8014164C 13BF84 0008+00 1/0 0/0 0/0 .text checkCutTurnCharge__9daPy_py_cCFv */ -BOOL daPy_py_c::checkCutTurnCharge() const { +extern "C" bool checkCutTurnCharge__9daPy_py_cCFv() { return false; } /* 8014164C-80141654 13BF8C 0008+00 1/0 0/0 0/0 .text checkCutLargeJumpCharge__9daPy_py_cCFv */ -BOOL daPy_py_c::checkCutLargeJumpCharge() const { +extern "C" bool checkCutLargeJumpCharge__9daPy_py_cCFv() { return false; } /* 80141654-8014165C 13BF94 0008+00 2/0 0/0 0/0 .text getBokoFlamePos__9daPy_py_cFP4cXyz */ -bool daPy_py_c::getBokoFlamePos(cXyz* param_0) { +extern "C" bool getBokoFlamePos__9daPy_py_cFP4cXyz() { return false; } /* 8014165C-80141664 13BF9C 0008+00 1/0 0/0 0/0 .text checkComboCutTurn__9daPy_py_cCFv */ -BOOL daPy_py_c::checkComboCutTurn() const { +extern "C" bool checkComboCutTurn__9daPy_py_cCFv() { return false; } /* 80141664-8014166C 13BFA4 0008+00 1/0 0/0 0/0 .text checkClimbMove__9daPy_py_cCFv */ -BOOL daPy_py_c::checkClimbMove() const { +extern "C" bool checkClimbMove__9daPy_py_cCFv() { return false; } /* 8014166C-80141674 13BFAC 0008+00 1/0 0/0 0/0 .text checkGrassWhistle__9daPy_py_cCFv */ -BOOL daPy_py_c::checkGrassWhistle() const { +extern "C" bool checkGrassWhistle__9daPy_py_cCFv() { return false; } /* 80141674-8014167C 13BFB4 0008+00 1/0 0/0 0/0 .text checkBoarRun__9daPy_py_cCFv */ -BOOL daPy_py_c::checkBoarRun() const { +extern "C" bool checkBoarRun__9daPy_py_cCFv() { return false; } /* 8014167C-80141684 13BFBC 0008+00 2/0 0/0 0/0 .text checkFmChainPut__9daPy_py_cCFv */ -bool daPy_py_c::checkFmChainPut() const { +extern "C" bool checkFmChainPut__9daPy_py_cCFv() { return false; } /* 80141684-8014168C 13BFC4 0008+00 2/0 0/0 0/0 .text checkHorseElecDamage__9daPy_py_cCFv */ -bool daPy_py_c::checkHorseElecDamage() const { +extern "C" bool checkHorseElecDamage__9daPy_py_cCFv() { return false; } /* 8014168C-80141694 13BFCC 0008+00 1/0 0/0 0/0 .text getBaseAnimeFrameRate__9daPy_py_cCFv */ -float daPy_py_c::getBaseAnimeFrameRate() const { +extern "C" f32 getBaseAnimeFrameRate__9daPy_py_cCFv() { return lit_6040; } /* 80141694-8014169C 13BFD4 0008+00 1/0 0/0 0/0 .text getBaseAnimeFrame__9daPy_py_cCFv */ -f32 daPy_py_c::getBaseAnimeFrame() const { +extern "C" f32 getBaseAnimeFrame__9daPy_py_cCFv() { return FLOAT_LABEL(lit_6108); } /* 8014169C-801416A0 13BFDC 0004+00 1/0 0/0 0/0 .text setAnimeFrame__9daPy_py_cFf */ -void daPy_py_c::setAnimeFrame(f32 param_0) { +extern "C" void setAnimeFrame__9daPy_py_cFf() { /* empty function */ } /* 801416A0-801416A8 13BFE0 0008+00 1/0 0/0 0/0 .text checkWolfLock__9daPy_py_cCFP10fopAc_ac_c */ -BOOL daPy_py_c::checkWolfLock(fopAc_ac_c* param_0) const { +extern "C" bool checkWolfLock__9daPy_py_cCFP10fopAc_ac_c() { return false; } /* 801416A8-801416B0 13BFE8 0008+00 1/0 0/0 0/0 .text cancelWolfLock__9daPy_py_cFP10fopAc_ac_c */ -bool daPy_py_c::cancelWolfLock(fopAc_ac_c* param_0) { +extern "C" bool cancelWolfLock__9daPy_py_cFP10fopAc_ac_c() { return false; } /* 801416B0-801416B8 13BFF0 0008+00 1/0 0/0 0/0 .text getItemID__9daPy_py_cCFv */ -s32 daPy_py_c::getItemID() const { +extern "C" s32 getItemID__9daPy_py_cCFv() { return -1; } /* 801416B8-801416C0 13BFF8 0008+00 1/0 0/0 0/0 .text exchangeGrabActor__9daPy_py_cFP10fopAc_ac_c */ -bool daPy_py_c::exchangeGrabActor(fopAc_ac_c* param_0) { +extern "C" bool exchangeGrabActor__9daPy_py_cFP10fopAc_ac_c() { return false; } /* 801416C0-801416C8 13C000 0008+00 1/0 0/0 0/0 .text setForceGrab__9daPy_py_cFP10fopAc_ac_cii */ -bool daPy_py_c::setForceGrab(fopAc_ac_c* param_0, int param_1, int param_2) { +extern "C" bool setForceGrab__9daPy_py_cFP10fopAc_ac_cii() { return false; } /* 801416C8-801416CC 13C008 0004+00 1/0 0/0 0/0 .text setForcePutPos__9daPy_py_cFRC4cXyz */ -void daPy_py_c::setForcePutPos(cXyz const& param_0) { +extern "C" void setForcePutPos__9daPy_py_cFRC4cXyz() { /* empty function */ } /* 801416CC-801416D4 13C00C 0008+00 1/0 0/0 0/0 .text checkPlayerNoDraw__9daPy_py_cFv */ -u32 daPy_py_c::checkPlayerNoDraw() { +extern "C" bool checkPlayerNoDraw__9daPy_py_cFv() { return false; } /* 801416D4-801416DC 13C014 0008+00 2/0 0/0 0/0 .text checkRopeTag__9daPy_py_cFv */ -bool daPy_py_c::checkRopeTag() { +extern "C" bool checkRopeTag__9daPy_py_cFv() { return false; } /* 801416DC-801416E0 13C01C 0004+00 1/0 0/0 0/0 .text voiceStart__9daPy_py_cFUl */ -void daPy_py_c::voiceStart(u32 param_0) { +extern "C" void voiceStart__9daPy_py_cFUl() { /* empty function */ } /* 801416E0-801416E4 13C020 0004+00 1/0 0/0 0/0 .text seStartOnlyReverb__9daPy_py_cFUl */ -void daPy_py_c::seStartOnlyReverb(u32 param_0) { +extern "C" void seStartOnlyReverb__9daPy_py_cFUl() { /* empty function */ } /* 801416E4-801416E8 13C024 0004+00 1/0 0/0 0/0 .text seStartOnlyReverbLevel__9daPy_py_cFUl */ -void daPy_py_c::seStartOnlyReverbLevel(u32 param_0) { +extern "C" void seStartOnlyReverbLevel__9daPy_py_cFUl() { /* empty function */ } /* 801416E8-801416EC 13C028 0004+00 1/0 0/0 0/0 .text setOutPower__9daPy_py_cFfsi */ -void daPy_py_c::setOutPower(f32 param_0, s16 param_1, int param_2) { +extern "C" void setOutPower__9daPy_py_cFfsi() { /* empty function */ } /* 801416EC-801416F0 13C02C 0004+00 1/0 0/0 0/0 .text * setGrabCollisionOffset__9daPy_py_cFffP13cBgS_PolyInfo */ -void daPy_py_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyInfo* param_2) { +extern "C" void setGrabCollisionOffset__9daPy_py_cFffP13cBgS_PolyInfo() { /* empty function */ } /* 801416F0-801416F4 13C030 0004+00 2/0 0/0 0/0 .text onMagneGrab__9daPy_py_cFff */ -void daPy_py_c::onMagneGrab(f32 param_0, f32 param_1) { +extern "C" void onMagneGrab__9daPy_py_cFff() { /* empty function */ } /* 801416F4-801416FC 13C034 0008+00 1/0 0/0 0/0 .text getModelJointMtx__9daPy_py_cFUs */ -MtxP daPy_py_c::getModelJointMtx(u16 param_0) { +extern "C" bool getModelJointMtx__9daPy_py_cFUs() { return NULL; } /* 801416FC-80141704 13C03C 0008+00 1/0 0/0 0/0 .text getHeadMtx__9daPy_py_cFv */ -MtxP daPy_py_c::getHeadMtx() { +extern "C" bool getHeadMtx__9daPy_py_cFv() { return NULL; } /* 80141704-8014170C 13C044 0008+00 1/0 0/0 0/0 .text setHookshotCarryOffset__9daPy_py_cFUiPC4cXyz */ -bool daPy_py_c::setHookshotCarryOffset(unsigned int param_0, cXyz const* param_1) { +extern "C" bool setHookshotCarryOffset__9daPy_py_cFUiPC4cXyz() { return false; } /* 8014170C-80141714 13C04C 0008+00 1/0 0/0 0/0 .text checkIronBallReturn__9daPy_py_cCFv */ -bool daPy_py_c::checkIronBallReturn() const { +extern "C" bool checkIronBallReturn__9daPy_py_cCFv() { return false; } /* 80141714-8014171C 13C054 0008+00 1/0 0/0 0/0 .text checkIronBallGroundStop__9daPy_py_cCFv */ -bool daPy_py_c::checkIronBallGroundStop() const { +extern "C" bool checkIronBallGroundStop__9daPy_py_cCFv() { return false; } /* 8014171C-80141724 13C05C 0008+00 1/0 0/0 0/0 .text * checkSingleBoarBattleSecondBowReady__9daPy_py_cCFv */ -BOOL daPy_py_c::checkSingleBoarBattleSecondBowReady() const { +extern "C" bool checkSingleBoarBattleSecondBowReady__9daPy_py_cCFv() { return false; } /* 80141724-8014172C 13C064 0008+00 2/0 0/0 0/0 .text checkPointSubWindowMode__9daPy_py_cCFv */ -bool daPy_py_c::checkPointSubWindowMode() const { +extern "C" bool checkPointSubWindowMode__9daPy_py_cCFv() { return false; } /* 8014172C-80141730 13C06C 0004+00 1/0 0/0 0/0 .text setClothesChange__9daPy_py_cFi */ -void daPy_py_c::setClothesChange(int param_0) { +extern "C" void setClothesChange__9daPy_py_cFi() { /* empty function */ } /* 80141730-80141734 13C070 0004+00 1/0 0/0 0/0 .text setPlayerPosAndAngle__9daPy_py_cFPA4_f */ -void daPy_py_c::setPlayerPosAndAngle(f32 (*param_0)[4]) { +extern "C" void setPlayerPosAndAngle__9daPy_py_cFPA4_f() { /* empty function */ } /* 80141734-80141738 13C074 0004+00 1/0 0/0 0/0 .text * setPlayerPosAndAngle__9daPy_py_cFPC4cXyzPC5csXyz */ -void daPy_py_c::setPlayerPosAndAngle(cXyz const* param_0, csXyz const* param_1) { +extern "C" void setPlayerPosAndAngle__9daPy_py_cFPC4cXyzPC5csXyz() { /* empty function */ } /* 80141738-8014173C 13C078 0004+00 1/0 0/0 0/0 .text setPlayerPosAndAngle__9daPy_py_cFPC4cXyzsi */ -void daPy_py_c::setPlayerPosAndAngle(cXyz const* param_0, s16 param_1, int param_2) { +extern "C" void setPlayerPosAndAngle__9daPy_py_cFPC4cXyzsi() { /* empty function */ } /* 8014173C-80141744 13C07C 0008+00 1/0 0/0 0/0 .text setThrowDamage__9daPy_py_cFsffiii */ -bool daPy_py_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_3, int param_4, - int param_5) { +extern "C" bool setThrowDamage__9daPy_py_cFsffiii() { return false; } /* 80141744-8014174C 13C084 0008+00 1/0 0/0 0/0 .text checkSetNpcTks__9daPy_py_cFP4cXyzii */ -bool daPy_py_c::checkSetNpcTks(cXyz* param_0, int param_1, int param_2) { +extern "C" bool checkSetNpcTks__9daPy_py_cFP4cXyzii() { return false; } /* 8014174C-80141754 13C08C 0008+00 1/0 0/0 0/0 .text setRollJump__9daPy_py_cFffs */ -int daPy_py_c::setRollJump(f32 param_0, f32 param_1, s16 param_2) { +extern "C" bool setRollJump__9daPy_py_cFffs() { return 0; } /* 80141754-80141758 13C094 0004+00 1/0 0/0 0/0 .text playerStartCollisionSE__9daPy_py_cFUlUl */ -void daPy_py_c::playerStartCollisionSE(u32 param_0, u32 param_1) { +extern "C" void playerStartCollisionSE__9daPy_py_cFUlUl() { /* empty function */ } /* 80141758-8014175C 13C098 0004+00 2/0 0/0 0/0 .text changeTextureAnime__9daPy_py_cFUsUsi */ -void daPy_py_c::changeTextureAnime(u16 param_0, u16 param_1, int param_2) { +extern "C" void changeTextureAnime__9daPy_py_cFUsUsi() { /* empty function */ } /* 8014175C-80141760 13C09C 0004+00 2/0 0/0 0/0 .text cancelChangeTextureAnime__9daPy_py_cFv */ -void daPy_py_c::cancelChangeTextureAnime() { +extern "C" void cancelChangeTextureAnime__9daPy_py_cFv() { /* empty function */ } /* 80141760-80141764 13C0A0 0004+00 1/0 0/0 0/0 .text cancelDungeonWarpReadyNeck__9daPy_py_cFv */ -void daPy_py_c::cancelDungeonWarpReadyNeck() { +extern "C" void cancelDungeonWarpReadyNeck__9daPy_py_cFv() { /* empty function */ } /* 80141764-80141768 13C0A4 0004+00 1/0 0/0 0/0 .text * onSceneChangeArea__9daPy_py_cFUcUcP10fopAc_ac_c */ -void daPy_py_c::onSceneChangeArea(u8 param_0, u8 param_1, fopAc_ac_c* param_2) { +extern "C" void onSceneChangeArea__9daPy_py_cFUcUcP10fopAc_ac_c() { /* empty function */ } /* 80141768-8014176C 13C0A8 0004+00 1/0 0/0 0/0 .text * onSceneChangeAreaJump__9daPy_py_cFUcUcP10fopAc_ac_c */ -void daPy_py_c::onSceneChangeAreaJump(u8 param_0, u8 param_1, fopAc_ac_c* param_2) { +extern "C" void onSceneChangeAreaJump__9daPy_py_cFUcUcP10fopAc_ac_c() { /* empty function */ } /* 8014176C-80141770 13C0AC 0004+00 1/0 0/0 0/0 .text onSceneChangeDead__9daPy_py_cFUci */ -void daPy_py_c::onSceneChangeDead(u8 param_0, int param_1) { +extern "C" void onSceneChangeDead__9daPy_py_cFUci() { /* empty function */ } /* 80141770-80141778 13C0B0 0008+00 1/0 0/0 0/0 .text getSpinnerActor__9daPy_py_cFv */ -daSpinner_c* daPy_py_c::getSpinnerActor() { +extern "C" bool getSpinnerActor__9daPy_py_cFv() { return NULL; } /* 80141778-80141780 13C0B8 0008+00 1/0 0/0 0/0 .text checkHorseRideNotReady__9daPy_py_cCFv */ -BOOL daPy_py_c::checkHorseRideNotReady() const { +extern "C" bool checkHorseRideNotReady__9daPy_py_cCFv() { return false; } /* 80141780-80141788 13C0C0 0008+00 1/0 0/0 0/0 .text checkArrowChargeEnd__9daPy_py_cCFv */ -bool daPy_py_c::checkArrowChargeEnd() const { +extern "C" bool checkArrowChargeEnd__9daPy_py_cCFv() { return false; } /* 80141788-80141790 13C0C8 0008+00 1/0 0/0 0/0 .text getSearchBallScale__9daPy_py_cCFv */ -f32 daPy_py_c::getSearchBallScale() const { +extern "C" f32 getSearchBallScale__9daPy_py_cCFv() { return FLOAT_LABEL(lit_6108); } /* 80141790-80141798 13C0D0 0008+00 1/0 0/0 0/0 .text checkFastShotTime__9daPy_py_cFv */ -s16 daPy_py_c::checkFastShotTime() { +extern "C" bool checkFastShotTime__9daPy_py_cFv() { return 0; } /* 80141798-801417A0 13C0D8 0008+00 1/0 0/0 0/0 .text checkNoEquipItem__9daPy_py_cCFv */ -bool daPy_py_c::checkNoEquipItem() const { +extern "C" bool checkNoEquipItem__9daPy_py_cCFv() { return true; } /* 801417A0-801417A8 13C0E0 0008+00 2/0 0/0 0/0 .text checkFireMaterial__9daPy_py_cCFv */ -bool daPy_py_c::checkFireMaterial() const { +extern "C" bool checkFireMaterial__9daPy_py_cCFv() { return false; } /* 801417A8-801417B0 13C0E8 0008+00 1/0 0/0 0/0 .text checkKandelaarSwing__9daPy_py_cCFi */ -bool daPy_py_c::checkKandelaarSwing(int param_0) const { +extern "C" bool checkKandelaarSwing__9daPy_py_cCFi() { return false; } /* 801417B0-801417B8 13C0F0 0008+00 1/0 0/0 0/0 .text getBoardCutTurnOffsetAngleY__9daPy_py_cCFv */ -s16 daPy_py_c::getBoardCutTurnOffsetAngleY() const { +extern "C" bool getBoardCutTurnOffsetAngleY__9daPy_py_cCFv() { return 0; } /* 801417B8-801417C0 13C0F8 0008+00 2/0 0/0 0/0 .text getMagneHitPos__9daPy_py_cFv */ -cXyz* daPy_py_c::getMagneHitPos() { - return &mSwordTopPos; +extern "C" cXyz* getMagneHitPos__9daPy_py_cFv(daPy_py_c* this_) { + return &this_->mSwordTopPos; } /* 801417C0-801417C8 13C100 0008+00 1/0 0/0 0/0 .text getMagneBootsTopVec__9daPy_py_cFv */ -cXyz* daPy_py_c::getMagneBootsTopVec() { - return ¤t.pos; +extern "C" cXyz* getMagneBootsTopVec__9daPy_py_cFv(daPy_py_c* this_) { + return &this_->current.pos; } /* 801417C8-801417D0 13C108 0008+00 1/0 0/0 0/0 .text checkUseKandelaar__9daPy_py_cFi */ -bool daPy_py_c::checkUseKandelaar(int param_0) { +extern "C" bool checkUseKandelaar__9daPy_py_cFi() { return false; } /* 801417D0-801417D4 13C110 0004+00 1/0 0/0 0/0 .text setDkCaught__9daPy_py_cFP10fopAc_ac_c */ -void daPy_py_c::setDkCaught(fopAc_ac_c* param_0) { +extern "C" void setDkCaught__9daPy_py_cFP10fopAc_ac_c() { /* empty function */ } /* 801417D4-801417D8 13C114 0004+00 1/0 0/0 0/0 .text onPressedDamage__9daPy_py_cFRC4cXyzs */ -void daPy_py_c::onPressedDamage(cXyz const& param_0, s16 param_1) { +extern "C" void onPressedDamage__9daPy_py_cFRC4cXyzs() { /* empty function */ } /* 801417D8-801417E0 13C118 0008+00 1/0 0/0 0/0 .text checkPriActorOwn__9daPy_py_cCFPC10fopAc_ac_c */ -bool daPy_py_c::checkPriActorOwn(fopAc_ac_c const* param_0) const { +extern "C" bool checkPriActorOwn__9daPy_py_cCFPC10fopAc_ac_c() { return false; } /* 801417E0-801417E8 13C120 0008+00 1/0 0/0 0/0 .text * onWolfEnemyBiteAll__9daPy_py_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2 */ -bool daPy_py_c::onWolfEnemyBiteAll(fopAc_ac_c* param_0, daPy_py_c::daPy_FLG2 param_1) { +extern "C" bool onWolfEnemyBiteAll__9daPy_py_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2() { return false; } /* 801417E8-801417F0 13C128 0008+00 1/0 0/0 0/0 .text * checkWolfEnemyBiteAllOwn__9daPy_py_cCFPC10fopAc_ac_c */ -bool daPy_py_c::checkWolfEnemyBiteAllOwn(fopAc_ac_c const* param_0) const { +extern "C" bool checkWolfEnemyBiteAllOwn__9daPy_py_cCFPC10fopAc_ac_c() { return false; } /* 801417F0-801417F4 13C130 0004+00 1/0 0/0 0/0 .text setWolfEnemyHangBiteAngle__9daPy_py_cFs */ -void daPy_py_c::setWolfEnemyHangBiteAngle(s16 param_0) { +extern "C" void setWolfEnemyHangBiteAngle__9daPy_py_cFs() { /* empty function */ } /* 801417F4-801417F8 13C134 0004+00 1/0 0/0 0/0 .text setKandelaarMtx__9daPy_py_cFPA4_fii */ -void daPy_py_c::setKandelaarMtx(f32 (*param_0)[4], int param_1, int param_2) { +extern "C" void setKandelaarMtx__9daPy_py_cFPA4_fii() { /* empty function */ } /* 801417F8-80141800 13C138 0008+00 1/0 0/0 0/0 .text getStickAngleFromPlayerShape__9daPy_py_cCFPs */ -bool daPy_py_c::getStickAngleFromPlayerShape(s16* param_0) const { +extern "C" bool getStickAngleFromPlayerShape__9daPy_py_cCFPs() { return false; } /* 80141800-80141808 13C140 0008+00 1/0 0/0 0/0 .text checkSpinnerPathMove__9daPy_py_cFv */ -bool daPy_py_c::checkSpinnerPathMove() { +extern "C" bool checkSpinnerPathMove__9daPy_py_cFv() { return false; } /* 80141808-80141810 13C148 0008+00 1/0 0/0 0/0 .text checkSpinnerTriggerAttack__9daPy_py_cFv */ -bool daPy_py_c::checkSpinnerTriggerAttack() { +extern "C" bool checkSpinnerTriggerAttack__9daPy_py_cFv() { return false; } /* 80141810-80141814 13C150 0004+00 1/0 0/0 0/0 .text onSpinnerPathForceRemove__9daPy_py_cFv */ -void daPy_py_c::onSpinnerPathForceRemove() { +extern "C" void onSpinnerPathForceRemove__9daPy_py_cFv() { /* empty function */ } /* 80141814-8014181C 13C154 0008+00 1/0 0/0 0/0 .text getIronBallBgHit__9daPy_py_cCFv */ -s16 daPy_py_c::getIronBallBgHit() const { +extern "C" bool getIronBallBgHit__9daPy_py_cCFv() { return 0; } /* 8014181C-80141824 13C15C 0008+00 1/0 0/0 0/0 .text getIronBallCenterPos__9daPy_py_cFv */ -cXyz* daPy_py_c::getIronBallCenterPos() { +extern "C" bool getIronBallCenterPos__9daPy_py_cFv() { return NULL; } /* 80141824-8014182C 13C164 0008+00 1/0 0/0 0/0 .text checkCanoeFishingGetLeft__9daPy_py_cCFv */ -bool daPy_py_c::checkCanoeFishingGetLeft() const { +extern "C" bool checkCanoeFishingGetLeft__9daPy_py_cCFv() { return false; } /* 8014182C-80141834 13C16C 0008+00 1/0 0/0 0/0 .text checkCanoeFishingGetRight__9daPy_py_cCFv */ -bool daPy_py_c::checkCanoeFishingGetRight() const { +extern "C" bool checkCanoeFishingGetRight__9daPy_py_cCFv() { return false; } /* 80141834-8014183C 13C174 0008+00 1/0 0/0 0/0 .text checkBeeChildDrink__9daPy_py_cCFv */ -u8 daPy_py_c::checkBeeChildDrink() const { +extern "C" bool checkBeeChildDrink__9daPy_py_cCFv() { return false; } /* 8014183C-80141840 13C17C 0004+00 1/0 0/0 0/0 .text skipPortalObjWarp__9daPy_py_cFv */ -void daPy_py_c::skipPortalObjWarp() { +extern "C" void skipPortalObjWarp__9daPy_py_cFv() { /* empty function */ } /* 80141840-80141848 13C180 0008+00 1/0 0/0 0/0 .text checkTreasureRupeeReturn__9daPy_py_cCFi */ -BOOL daPy_py_c::checkTreasureRupeeReturn(int param_0) const { +extern "C" bool checkTreasureRupeeReturn__9daPy_py_cCFi() { return false; } /* 80141848-8014184C 13C188 0004+00 1/0 0/0 0/0 .text setSumouReady__9daPy_py_cFP10fopAc_ac_c */ -void daPy_py_c::setSumouReady(fopAc_ac_c* param_0) { +extern "C" void setSumouReady__9daPy_py_cFP10fopAc_ac_c() { /* empty function */ } /* 8014184C-80141854 13C18C 0008+00 1/0 0/0 0/0 .text checkAcceptDungeonWarpAlink__9daPy_py_cFi */ -bool daPy_py_c::checkAcceptDungeonWarpAlink(int param_0) { +extern "C" bool checkAcceptDungeonWarpAlink__9daPy_py_cFi() { return false; } /* 80141854-8014185C 13C194 0008+00 1/0 0/0 0/0 .text getSumouCounter__9daPy_py_cCFv */ -s16 daPy_py_c::getSumouCounter() const { +extern "C" bool getSumouCounter__9daPy_py_cCFv() { return 0; } /* 8014185C-80141864 13C19C 0008+00 1/0 0/0 0/0 .text checkSumouWithstand__9daPy_py_cCFv */ -s16 daPy_py_c::checkSumouWithstand() const { +extern "C" bool checkSumouWithstand__9daPy_py_cCFv() { return 0; } /* 80141864-80141868 13C1A4 0004+00 1/0 0/0 0/0 .text cancelGoronThrowEvent__9daPy_py_cFv */ -void daPy_py_c::cancelGoronThrowEvent() { +extern "C" void cancelGoronThrowEvent__9daPy_py_cFv() { /* empty function */ } /* 80141868-8014186C 13C1A8 0004+00 1/0 0/0 0/0 .text setSumouGraspCancelCount__9daPy_py_cFi */ -void daPy_py_c::setSumouGraspCancelCount(int param_0) { +extern "C" void setSumouGraspCancelCount__9daPy_py_cFi() { /* empty function */ } /* 8014186C-80141870 13C1AC 0004+00 1/0 0/0 0/0 .text setSumouPushBackDirection__9daPy_py_cFs */ -void daPy_py_c::setSumouPushBackDirection(s16 param_0) { +extern "C" void setSumouPushBackDirection__9daPy_py_cFs() { /* empty function */ } /* 80141870-80141874 13C1B0 0004+00 1/0 0/0 0/0 .text setSumouLoseHeadUp__9daPy_py_cFv */ -void daPy_py_c::setSumouLoseHeadUp() { +extern "C" void setSumouLoseHeadUp__9daPy_py_cFv() { /* empty function */ } /* 80141874-8014187C 13C1B4 0008+00 1/0 0/0 0/0 .text getGiantPuzzleAimAngle__9daPy_py_cCFv */ -s16 daPy_py_c::getGiantPuzzleAimAngle() const { - return shape_angle.y; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getGiantPuzzleAimAngle__9daPy_py_cCFv() { + nofralloc +#include "asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daPy_py_cCFv.s" } +#pragma pop /* 8014187C-80141880 13C1BC 0004+00 1/0 0/0 0/0 .text setGoronSideMove__9daPy_py_cFP10fopAc_ac_c */ -void daPy_py_c::setGoronSideMove(fopAc_ac_c* param_0) { +extern "C" void setGoronSideMove__9daPy_py_cFP10fopAc_ac_c() { /* empty function */ } /* 80141880-80141884 13C1C0 0004+00 1/0 0/0 0/0 .text setCargoCarry__9daPy_py_cFP10fopAc_ac_c */ -void daPy_py_c::setCargoCarry(fopAc_ac_c* param_0) { +extern "C" void setCargoCarry__9daPy_py_cFP10fopAc_ac_c() { /* empty function */ } /* 80141884-8014188C 13C1C4 0008+00 2/0 0/0 0/0 .text getDpdFarFlg__9daPy_py_cCFv */ -bool daPy_py_c::getDpdFarFlg() const { +extern "C" bool getDpdFarFlg__9daPy_py_cCFv() { return false; } /* 8014188C-80141894 13C1CC 0008+00 1/0 0/0 0/0 .text getHookshotTopPos__9daPy_py_cFv */ -cXyz* daPy_py_c::getHookshotTopPos() { +extern "C" bool getHookshotTopPos__9daPy_py_cFv() { return NULL; } /* 80141894-8014189C 13C1D4 0008+00 1/0 0/0 0/0 .text checkHookshotReturnMode__9daPy_py_cCFv */ -bool daPy_py_c::checkHookshotReturnMode() const { +extern "C" bool checkHookshotReturnMode__9daPy_py_cCFv() { return false; } /* 8014189C-801418A4 13C1DC 0008+00 1/0 0/0 0/0 .text checkHookshotShootReturnMode__9daPy_py_cCFv */ -bool daPy_py_c::checkHookshotShootReturnMode() const { +extern "C" bool checkHookshotShootReturnMode__9daPy_py_cCFv() { return false; } /* 801418A4-801418AC 13C1E4 0008+00 1/0 0/0 0/0 .text checkOctaIealHang__9daPy_py_cCFv */ -bool daPy_py_c::checkOctaIealHang() const { +extern "C" bool checkOctaIealHang__9daPy_py_cCFv() { return false; } /* 801418AC-801418B0 13C1EC 0004+00 1/0 0/0 0/0 .text cancelOctaIealHang__9daPy_py_cFv */ -void daPy_py_c::cancelOctaIealHang() { +extern "C" void cancelOctaIealHang__9daPy_py_cFv() { /* empty function */ } /* 801418B0-801418B4 13C1F0 0004+00 1/0 0/0 0/0 .text cancelDragonHangBackJump__9daPy_py_cFv */ -void daPy_py_c::cancelDragonHangBackJump() { +extern "C" void cancelDragonHangBackJump__9daPy_py_cFv() { /* empty function */ } /* 801418B4-801418B8 13C1F4 0004+00 1/0 0/0 0/0 .text setOctaIealWildHang__9daPy_py_cFv */ -void daPy_py_c::setOctaIealWildHang() { +extern "C" void setOctaIealWildHang__9daPy_py_cFv() { /* empty function */ } /* 801418B8-801418C0 13C1F8 0008+00 1/0 0/0 0/0 .text checkDragonHangRide__9daPy_py_cCFv */ -bool daPy_py_c::checkDragonHangRide() const { +extern "C" bool checkDragonHangRide__9daPy_py_cCFv() { return false; } /* 801418C0-801418C4 13C200 0004+00 1/0 0/0 0/0 .text changeDragonActor__9daPy_py_cFP10fopAc_ac_c */ -void daPy_py_c::changeDragonActor(fopAc_ac_c* param_0) { +extern "C" void changeDragonActor__9daPy_py_cFP10fopAc_ac_c() { /* empty function */ } /* 801418C4-801418CC 13C204 0008+00 1/0 0/0 0/0 .text getClothesChangeWaitTimer__9daPy_py_cCFv */ -u8 daPy_py_c::getClothesChangeWaitTimer() const { +extern "C" bool getClothesChangeWaitTimer__9daPy_py_cCFv() { return 0; } /* 801418CC-801418D4 13C20C 0008+00 1/0 0/0 0/0 .text getShieldChangeWaitTimer__9daPy_py_cCFv */ -u8 daPy_py_c::getShieldChangeWaitTimer() const { +extern "C" bool getShieldChangeWaitTimer__9daPy_py_cCFv() { return 0; } /* 801418D4-801418DC 13C214 0008+00 1/0 0/0 0/0 .text getSwordChangeWaitTimer__9daPy_py_cCFv */ -u8 daPy_py_c::getSwordChangeWaitTimer() const { +extern "C" bool getSwordChangeWaitTimer__9daPy_py_cCFv() { return 0; } /* 801418DC-801418E4 13C21C 0008+00 1/0 0/0 0/0 .text checkMetamorphose__9daPy_py_cCFv */ -BOOL daPy_py_c::checkMetamorphose() const { +extern "C" bool checkMetamorphose__9daPy_py_cCFv() { return false; } /* 801418E4-801418EC 13C224 0008+00 1/0 0/0 0/0 .text checkWolfDownAttackPullOut__9daPy_py_cCFv */ -BOOL daPy_py_c::checkWolfDownAttackPullOut() const { +extern "C" bool checkWolfDownAttackPullOut__9daPy_py_cCFv() { return false; } /* 801418EC-801418F4 13C22C 0008+00 1/0 0/0 0/0 .text checkBootsOrArmorHeavy__9daPy_py_cCFv */ -BOOL daPy_py_c::checkBootsOrArmorHeavy() const { +extern "C" bool checkBootsOrArmorHeavy__9daPy_py_cCFv() { return false; } /* 801418F4-801418FC 13C234 0008+00 1/0 0/0 0/0 .text getBottleOpenAppearItem__9daPy_py_cCFv */ -s32 daPy_py_c::getBottleOpenAppearItem() const { +extern "C" s32 getBottleOpenAppearItem__9daPy_py_cCFv() { return -1; } /* 801418FC-80141904 13C23C 0008+00 1/0 0/0 0/0 .text checkItemSwordEquip__9daPy_py_cCFv */ -bool daPy_py_c::checkItemSwordEquip() const { +extern "C" bool checkItemSwordEquip__9daPy_py_cCFv() { return false; } /* 80141904-8014190C 13C244 0008+00 1/0 0/0 0/0 .text getSinkShapeOffset__9daPy_py_cCFv */ -f32 daPy_py_c::getSinkShapeOffset() const { +extern "C" f32 getSinkShapeOffset__9daPy_py_cCFv() { return FLOAT_LABEL(lit_6108); } /* 8014190C-80141914 13C24C 0008+00 1/0 0/0 0/0 .text checkSinkDead__9daPy_py_cCFv */ -BOOL daPy_py_c::checkSinkDead() const { +extern "C" bool checkSinkDead__9daPy_py_cCFv() { return false; } /* 80141914-8014191C 13C254 0008+00 1/0 0/0 0/0 .text checkHorseStart__9daPy_py_cFv */ -BOOL daPy_py_c::checkHorseStart() { +extern "C" bool checkHorseStart__9daPy_py_cFv() { return false; } /* 8014191C-80141924 13C25C 0008+00 1/0 0/0 0/0 .text getWolfHowlMgrP__9daPy_py_cFv */ -Z2WolfHowlMgr* daPy_py_c::getWolfHowlMgrP() { +extern "C" bool getWolfHowlMgrP__9daPy_py_cFv() { return NULL; } /* 80141924-8014192C 13C264 0008+00 1/0 0/0 0/0 .text checkWolfHowlSuccessAnime__9daPy_py_cCFv */ -BOOL daPy_py_c::checkWolfHowlSuccessAnime() const { +extern "C" bool checkWolfHowlSuccessAnime__9daPy_py_cCFv() { return false; } /* 8014192C-80141934 13C26C 0008+00 1/0 0/0 0/0 .text checkCopyRodTopUse__9daPy_py_cFv */ -BOOL daPy_py_c::checkCopyRodTopUse() { +extern "C" bool checkCopyRodTopUse__9daPy_py_cFv() { return false; } /* 80141934-8014193C 13C274 0008+00 1/0 0/0 0/0 .text checkCopyRodEquip__9daPy_py_cCFv */ -bool daPy_py_c::checkCopyRodEquip() const { +extern "C" bool checkCopyRodEquip__9daPy_py_cCFv() { return false; } /* 8014193C-80141944 13C27C 0008+00 1/0 0/0 0/0 .text checkCutJumpMode__9daPy_py_cCFv */ -BOOL daPy_py_c::checkCutJumpMode() const { +extern "C" bool checkCutJumpMode__9daPy_py_cCFv() { return false; } /* 80141944-8014194C 13C284 0008+00 1/1 0/0 0/0 .text getZeldaActor__9daHorse_cFv */ -fopAc_ac_c* daHorse_c::getZeldaActor() { - return mZeldaActorKeep.getActor(); +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getZeldaActor__9daHorse_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/getZeldaActor__9daHorse_cFv.s" } +#pragma pop /* 8014194C-8014195C 13C28C 0010+00 1/1 0/0 0/0 .text dComIfGp_getDoStatus__Fv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm u8 dComIfGp_getDoStatus() { +static asm u8 dComIfGp_getDoStatus__Fv() { nofralloc #include "asm/d/a/d_a_alink/dComIfGp_getDoStatus__Fv.s" } @@ -1351,21 +1404,26 @@ extern "C" asm void __ct__4cXyzFfff(f32 param_0, f32 param_1, f32 param_2) { #pragma pop /* 8014196C-80141988 13C2AC 001C+00 1/1 0/0 0/0 .text dMeter2Info_offUseButton__Fi */ -static void dMeter2Info_offUseButton(int pButton) { - g_meter2_info.offUseButton(pButton); +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void dMeter2Info_offUseButton__Fi() { + nofralloc +#include "asm/d/a/d_a_alink/dMeter2Info_offUseButton__Fi.s" } +#pragma pop /* 80141988-80141990 -00001 0008+00 0/0 0/0 0/0 .text setLinkState__14Z2CreatureLinkFUc */ -void Z2CreatureLink::setLinkState(u8 pState) { - mLinkState = pState; +extern "C" void setLinkState__14Z2CreatureLinkFUc(Z2CreatureLink* this_, u8 param_0) { + *(u8*)(((u8*)this_) + 192) /* this->field_0xc0 */ = (u8)(param_0); } /* 80141990-801419A0 13C2D0 0010+00 1/1 0/0 0/0 .text dComIfGs_getRupee__Fv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm u16 dComIfGs_getRupee() { +asm u16 dComIfGs_getRupee__Fv() { nofralloc #include "asm/d/a/d_a_alink/dComIfGs_getRupee__Fv.s" } @@ -1375,54 +1433,79 @@ asm u16 dComIfGs_getRupee() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGp_setItemRupeeCount(s32 param_0) { +asm void dComIfGp_setItemRupeeCount__Fl(s32 param_0) { nofralloc #include "asm/d/a/d_a_alink/dComIfGp_setItemRupeeCount__Fl.s" } #pragma pop /* 801419B8-801419F4 13C2F8 003C+00 1/1 0/0 0/0 .text dMeter2Info_setFloatingMessage__FUssb */ -static void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bool pWakuVisible) { - g_meter2_info.setFloatingMessage(pMessageID, pMessageTimer, pWakuVisible); +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void dMeter2Info_setFloatingMessage__FUssb() { + nofralloc +#include "asm/d/a/d_a_alink/dMeter2Info_setFloatingMessage__FUssb.s" } +#pragma pop /* 801419F4-80141A04 13C334 0010+00 1/1 0/0 0/0 .text onForcePanic__9daMidna_cFv */ -void daMidna_c::onForcePanic() { - onEndResetStateFlg0(ERFLG0_FORCE_PANIC); +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void onForcePanic__9daMidna_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/onForcePanic__9daMidna_cFv.s" } +#pragma pop /* 80141A04-80141A10 13C344 000C+00 1/1 0/0 0/0 .text checkForceNormalColor__9daMidna_cCFv */ -u32 daMidna_c::checkForceNormalColor() const { - return checkStateFlg1(FLG1_FORCE_NORMAL_COL); +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void checkForceNormalColor__9daMidna_cCFv() { + nofralloc +#include "asm/d/a/d_a_alink/checkForceNormalColor__9daMidna_cCFv.s" } +#pragma pop /* 80141A10-80141A1C 13C350 000C+00 1/1 0/0 0/0 .text checkForceTiredColor__9daMidna_cCFv */ -u32 daMidna_c::checkForceTiredColor() const { - return checkStateFlg1(FLG1_FORCE_TIRED_COL); +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void checkForceTiredColor__9daMidna_cCFv() { + nofralloc +#include "asm/d/a/d_a_alink/checkForceTiredColor__9daMidna_cCFv.s" } +#pragma pop /* 80141A1C-80141A84 13C35C 0068+00 1/1 0/0 0/0 .text checkMidnaTired__9daMidna_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool daMidna_c::checkMidnaTired() { +extern "C" asm void checkMidnaTired__9daMidna_cFv() { nofralloc #include "asm/d/a/d_a_alink/checkMidnaTired__9daMidna_cFv.s" } #pragma pop /* 80141A84-80141A94 13C3C4 0010+00 1/1 0/0 0/0 .text onNoServiceWait__9daMidna_cFv */ -void daMidna_c::onNoServiceWait() { - onEndResetStateFlg0(ERFLG0_NO_SERVICE_WAIT); +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void onNoServiceWait__9daMidna_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/onNoServiceWait__9daMidna_cFv.s" } +#pragma pop /* 80141A94-80141ACC 13C3D4 0038+00 1/1 0/0 0/0 .text setControllActorData__8daCrod_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daCrod_c::setControllActorData() { +extern "C" asm void setControllActorData__8daCrod_cFv() { nofralloc #include "asm/d/a/d_a_alink/setControllActorData__8daCrod_cFv.s" } @@ -1443,12 +1526,14 @@ extern "C" asm void func_80141ACC(void* _this, fopAc_ac_c const* param_0, #pragma pop /* 80141AE8-80141B04 13C428 001C+00 1/1 4/4 0/0 .text cLib_calcTimer__FPUc */ -extern "C" int func_80141AE8(u8* pTimer) { - if (*pTimer != 0) { - *pTimer -= 1; - } - return *pTimer; +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm u8 func_80141AE8(u8*) { + nofralloc +#include "asm/d/a/d_a_alink/func_80141AE8.s" } +#pragma pop /* ############################################################################################## */ /* 80453344-80453348 001944 0004+00 1/1 0/0 0/0 .sdata2 @77808 */ diff --git a/src/d/a/d_a_alink_whistle.inc b/src/d/a/d_a_alink_whistle.inc index c30f29c1ae6..9a03aa31fad 100644 --- a/src/d/a/d_a_alink_whistle.inc +++ b/src/d/a/d_a_alink_whistle.inc @@ -134,7 +134,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s return checkNextAction(0); } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); commonProcInit(PROC_GRASS_WHISTLE_WAIT); if (param_0 == 3) { @@ -221,7 +221,7 @@ int daAlink_c::procGrassWhistleWait() { mProcVar0.field_0x3008--; if (mProcVar0.field_0x3008 == 0) { - daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + daHorse_c* horse_p = dComIfGp_getHorseActor(); daNPC_TK_c* tk_p = (daNPC_TK_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchWhistle, NULL); if (tk_p != NULL) { @@ -269,8 +269,8 @@ int daAlink_c::procGrassWhistleWait() { voiceStart(Z2SE_PLAY_REED_TOBIKUSA); mProcVar0.field_0x3008 = 100; - if (i_dComIfGs_isEventBit(dSv_event_flag_c::F_0700) && - i_dComIfGs_isEventBit(dSv_event_flag_c::F_0037)) + if (dComIfGs_isEventBit(dSv_event_flag_c::F_0700) && + dComIfGs_isEventBit(dSv_event_flag_c::F_0037)) { dComIfGs_onEventBit(dSv_event_flag_c::F_0581); } @@ -316,7 +316,7 @@ int daAlink_c::procCoHorseCallWaitInit(int param_0) { mProcVar3.field_0x300e.y = 0x10; } - if (i_checkWolf()) { + if (checkWolf()) { setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMove_c0::m.field_0x70, lit_6109); } else { setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, lit_6109); diff --git a/src/d/a/d_a_alink_wolf.inc b/src/d/a/d_a_alink_wolf.inc index 0ba8ffe3c5b..9c433d4c38a 100644 --- a/src/d/a/d_a_alink_wolf.inc +++ b/src/d/a/d_a_alink_wolf.inc @@ -36,7 +36,7 @@ void daAlink_c::changeCommon() { field_0x2f8c = 0; resetUpperAnime(UPPER_2, -1.0f); - i_offNoResetFlg1(FLG1_UNK_20000000); + offNoResetFlg1(FLG1_UNK_20000000); offKandelaarModel(); int i; @@ -67,8 +67,8 @@ void daAlink_c::changeCommon() { field_0x3080 = 0; field_0x3082 = 0; - i_offNoResetFlg1(0x600080); - i_offNoResetFlg2(FLG2_UNK_8000000); + offNoResetFlg1(0x600080); + offNoResetFlg2(FLG2_UNK_8000000); field_0x2180[0]->init(); field_0x2180[1]->init(); @@ -171,10 +171,10 @@ void daAlink_c::changeWolf() { field_0x06e8 = field_0x064C->getMaterialNodePointer(1)->getShape(); changeCommon(); - i_onNoResetFlg1(FLG1_IS_WOLF); + onNoResetFlg1(FLG1_IS_WOLF); deleteEquipItem(FALSE, FALSE); field_0x2e44.init(this, l_wolfJntColData, mpLinkModel, 18); - i_offNoResetFlg1(FLG1_UNK_800000); + offNoResetFlg1(FLG1_UNK_800000); field_0x598 = 115.0f; mLinkAcch.SetRoofCrrHeight(field_0x598); @@ -190,7 +190,7 @@ void daAlink_c::changeWolf() { field_0x2e44.offPassNum(16); field_0x2e44.offPassNum(15); - i_offNoResetFlg0(FLG0_UNDERWATER); + offNoResetFlg0(FLG0_UNDERWATER); setHeavyBoots(0); for (int i = 0; i < 3; i++) { @@ -250,7 +250,7 @@ void daAlink_c::changeWolf() { mMagicArmorBodyBrk = NULL; mMagicArmorHeadBrk = NULL; - field_0x2fc7 = dStage_stagInfo_GetWolfDashType(i_dComIfGp_getStage()->getStagInfo()); + field_0x2fc7 = dStage_stagInfo_GetWolfDashType(dComIfGp_getStage()->getStagInfo()); } #else #pragma push @@ -268,13 +268,13 @@ asm void daAlink_c::changeWolf() { #ifdef NONMATCHING void daAlink_c::changeLink(int param_0) { JKRHeap* current_heap = mAnmHeap3.setAnimeHeap(); - i_offNoResetFlg2(0x180000); + offNoResetFlg2(0x180000); mMagicArmorBodyBrk = NULL; mMagicArmorHeadBrk = NULL; - if (i_checkNoResetFlg2(FLG2_UNK_200000)) { - i_offNoResetFlg2(FLG2_UNK_200000); - i_onNoResetFlg2(FLG2_UNK_80000); + if (checkNoResetFlg2(FLG2_UNK_200000)) { + offNoResetFlg2(FLG2_UNK_200000); + onNoResetFlg2(FLG2_UNK_80000); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("alSumou", 0x31); mpLinkModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -285,7 +285,7 @@ void daAlink_c::changeLink(int param_0) { J3DModelData* handModelData = (J3DModelData*)dComIfG_getObjectRes("alSumou", 0x32); mpLinkHandModel = initModel(handModelData, 0); } else if (checkCasualWearFlg()) { - i_onNoResetFlg2(FLG2_UNK_100000); + onNoResetFlg2(FLG2_UNK_100000); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_bArcName, "bl.bmd"); mpLinkModel = initModel(modelData, 0); @@ -320,7 +320,7 @@ void daAlink_c::changeLink(int param_0) { (J3DModelData*)dComIfG_getObjectRes(l_mArcName, "al_hands.bmd"); mpLinkHandModel = initModel(handModelData, 0); - if (i_dComIfGs_getRupee() != 0) { + if (dComIfGs_getRupee() != 0) { setMagicArmorBrk(1); } else { setMagicArmorBrk(0); @@ -341,7 +341,7 @@ void daAlink_c::changeLink(int param_0) { mpLinkHandModel = initModel(handModelData, 0); } - if (i_checkNoResetFlg2(FLG2_UNK_200000) || !checkZoraWearFlg()) { + if (checkNoResetFlg2(FLG2_UNK_200000) || !checkZoraWearFlg()) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(mArcName, "al_face.bmd"); mpLinkFaceModel = initModel(modelData, 0x20200); } else { @@ -379,7 +379,7 @@ void daAlink_c::changeLink(int param_0) { field_0x06e4 = NULL; u8 var_r27; - if (i_checkNoResetFlg2(FLG2_UNK_80000)) { + if (checkNoResetFlg2(FLG2_UNK_80000)) { field_0x06d8 = field_0x064C->getMaterialNodePointer(4)->getShape(); field_0x06dc = field_0x064C->getMaterialNodePointer(5)->getShape(); field_0x06e0 = NULL; @@ -413,7 +413,7 @@ void daAlink_c::changeLink(int param_0) { field_0x06ec = field_0x064C->getMaterialNodePointer(1)->getShape(); field_0x06f0 = field_0x064C->getMaterialNodePointer(2)->getShape(); - if (i_dComIfGs_getRupee() != 0) { + if (dComIfGs_getRupee() != 0) { var_r27 = 4; } else { var_r27 = 5; @@ -430,7 +430,7 @@ void daAlink_c::changeLink(int param_0) { } if (field_0x06e0 != NULL) { - if (i_checkEquipHeavyBoots()) { + if (checkEquipHeavyBoots()) { field_0x06e0->hide(); } else { field_0x06e0->show(); @@ -469,7 +469,7 @@ void daAlink_c::changeLink(int param_0) { field_0x2060->offOldFrameFlg(); } else { changeCommon(); - i_offNoResetFlg1(FLG1_IS_WOLF); + offNoResetFlg1(FLG1_IS_WOLF); field_0x2e44.init(this, l_jntColData, mpLinkModel, 18); field_0x3088 = 0; field_0x302c[7] = -0x3800; @@ -606,7 +606,7 @@ BOOL daAlink_c::checkWolfShapeReverse() const { /* 80127DC4-80127E08 122704 0044+00 1/1 0/0 0/0 .text checkWolfSideStep__9daAlink_cCFv */ BOOL daAlink_c::checkWolfSideStep() const { return field_0x2f98 != 0 && - ((mProcID == PROC_WOLF_ATN_AC_MOVE && !i_checkModeFlg(1)) || + ((mProcID == PROC_WOLF_ATN_AC_MOVE && !checkModeFlg(1)) || mProcID == PROC_WOLF_SIDESTEP_LAND || mProcID == PROC_WOLF_BACKJUMP_LAND); } @@ -666,9 +666,9 @@ void daAlink_c::setSpeedAndAngleWolf() { if (cLib_distanceAngleS(field_0x2fe2, current.angle.y) > 0x7000 && abs(field_0x3180) < 0x5000 && - ((!i_checkModeFlg(1) && !(speedF < 0.001f)) || field_0x33a8 > 0.85f)) + ((!checkModeFlg(1) && !(speedF < 0.001f)) || field_0x33a8 > 0.85f)) { - if ((i_checkModeFlg(1) || speedF < 0.001f) && !temp_r31 && + if ((checkModeFlg(1) || speedF < 0.001f) && !temp_r31 && (mProcID == PROC_WOLF_WAIT || mProcID == PROC_WOLF_MOVE)) { cLib_addCalcAngleS(¤t.angle.y, field_0x2fe2, var_r30, var_r29, var_r28); @@ -709,7 +709,7 @@ void daAlink_c::setSpeedAndAngleWolf() { if (wolfSideBgCheck(temp_r4)) { current.angle.y = temp_r4; - i_onEndResetFlg1(ERFLG1_UNK_200000); + onEndResetFlg1(ERFLG1_UNK_200000); if (cLib_distanceAngleS(field_0x2fe2, current.angle.y) > 0x7000) { var_r26 = 1; @@ -726,7 +726,7 @@ void daAlink_c::setSpeedAndAngleWolf() { var_f26 *= mHeavySpeedMultiplier; } - if ((!i_checkNoResetFlg1(FLG1_UNK_20000000) || + if ((!checkNoResetFlg1(FLG1_UNK_20000000) || cLib_distanceAngleS(current.angle.y + 0x8000, field_0x3092) >= 0xC00) && field_0x33a8 > var_f26) { @@ -933,7 +933,7 @@ int daAlink_c::checkWolfLandAction(int param_0) { /* 80129958-801299A8 124298 0050+00 1/1 0/0 1/1 .text checkMidnaUseAbility__9daAlink_cCFv */ BOOL daAlink_c::checkMidnaUseAbility() const { - return i_dComIfGp_checkPlayerStatus1(0, 0x800000) || dKy_withwarp_capture_check(); + return dComIfGp_checkPlayerStatus1(0, 0x800000) || dKy_withwarp_capture_check(); } /* 801299A8-80129A80 1242E8 00D8+00 1/1 0/0 0/0 .text checkWolfUseAbility__9daAlink_cFv @@ -943,11 +943,11 @@ void daAlink_c::checkWolfUseAbility() { return; } - if (checkMidnaLockJumpPoint() != NULL && !i_checkMidnaRide()) { + if (checkMidnaLockJumpPoint() != NULL && !checkMidnaRide()) { offWolfEyeUp(); } else { // event flag 0x4308: senses ability unlocked - if (i_dComIfGs_isEventBit(0x4308) && field_0x2fd2 == 0 && !checkEventRun() && + if (dComIfGs_isEventBit(0x4308) && field_0x2fd2 == 0 && !checkEventRun() && mWolfEyeUp < daAlinkHIO_wolf_c0::m.mSensesLingerTime && wolfSenseTrigger()) { if (mWolfEyeUp == 0) { @@ -962,8 +962,8 @@ void daAlink_c::checkWolfUseAbility() { /* 80129A80-80129B44 1243C0 00C4+00 13/13 0/0 0/0 .text checkWolfGroundSpecialMode__9daAlink_cFv */ int daAlink_c::checkWolfGroundSpecialMode() { - if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && - i_checkEndResetFlg0(ERFLG0_UNK_1)) + if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && + checkEndResetFlg0(ERFLG0_UNK_1)) { return procCoMetamorphoseInit(); } else if (mSpecialMode == SMODE_WOLF_PUZZLE || mSpecialMode == 0x28) { @@ -972,7 +972,7 @@ int daAlink_c::checkWolfGroundSpecialMode() { return procWolfCargoCarryInit(); } else if (checkSlideAction()) { return 1; - } else if (i_checkEndResetFlg1(ERFLG1_UNK_1)) { + } else if (checkEndResetFlg1(ERFLG1_UNK_1)) { return procWolfScreamWaitInit(); } return 0; @@ -987,7 +987,7 @@ int daAlink_c::checkNextActionWolf(int param_0) { return 1; } - if (i_checkEndResetFlg1(ERFLG1_UNK_40) && + if (checkEndResetFlg1(ERFLG1_UNK_40) && (mProcID == PROC_WOLF_WAIT || mProcID == PROC_WOLF_SERVICE_WAIT || mProcID == PROC_WOLF_TIRED_WAIT || (!checkInputOnR() && mProcID == PROC_WOLF_MOVE) || mProcID == PROC_WOLF_LIE_START || mProcID == PROC_WOLF_LIE_MOVE || @@ -1015,13 +1015,13 @@ int daAlink_c::checkNextActionWolf(int param_0) { } else { field_0x594 = daAlinkHIO_wlSlide_c0::m.field_0x70; } - } else if (i_checkFmChainGrabAnime()) { + } else if (checkFmChainGrabAnime()) { field_0x594 = 13.0f; } else if (mTargetedActor != NULL) { field_0x594 = daAlinkHIO_wlAtnMove_c0::m.field_0x18; } else if (checkAttentionState()) { field_0x594 = daAlinkHIO_wlMove_c0::m.field_0xB4; - } else if (i_checkNoResetFlg1(FLG1_DASH_MODE)) { + } else if (checkNoResetFlg1(FLG1_DASH_MODE)) { if (checkWolfSlowDash()) { field_0x594 = daAlinkHIO_wlMove_c0::m.field_0xE0; } else if (field_0x2fc7 == 2) { @@ -1074,7 +1074,7 @@ int daAlink_c::checkNextActionWolf(int param_0) { (mProcID == PROC_WOLF_WAIT || mProcID == PROC_WOLF_MOVE) && cLib_distanceAngleS(field_0x2fe2, current.angle.y) > 0x7000) { - if (i_checkEndResetFlg1(ERFLG1_UNK_200000)) { + if (checkEndResetFlg1(ERFLG1_UNK_200000)) { var_r30 = procWolfSlipTurnInit(0); } else { var_r30 = 0; @@ -1176,15 +1176,15 @@ BOOL daAlink_c::checkWolfAttackReverse(int param_0) { return procWolfAttackReverseInit(); } - if ((i_checkNoResetFlg0(FLG0_UNK_18) && mProcID == PROC_WOLF_DASH) || - (param_0 && !i_checkNoResetFlg3(FLG3_UNK_400) && i_checkNoResetFlg1(FLG1_UNK_20000000) && + if ((checkNoResetFlg0(FLG0_UNK_18) && mProcID == PROC_WOLF_DASH) || + (param_0 && !checkNoResetFlg3(FLG3_UNK_400) && checkNoResetFlg1(FLG1_UNK_20000000) && cLib_distanceAngleS(field_0x3092, current.angle.y) > 0x6000)) { if (mProcID == PROC_WOLF_DASH) { return procWolfDashReverseInit(0); } else { - if (i_checkNoResetFlg3(FLG3_UNK_800000)) { - i_dComIfGp_setHitMark(2, NULL, &field_0x378c, &field_0x3166, NULL, 0); + if (checkNoResetFlg3(FLG3_UNK_800000)) { + dComIfGp_setHitMark(2, NULL, &field_0x378c, &field_0x3166, NULL, 0); } return procWolfAttackReverseInit(); @@ -1199,7 +1199,7 @@ int daAlink_c::checkWolfBarrierHitReverse() { if (field_0x3100 != 0 && mProcID != PROC_FRONT_ROLL_SUCCESS && mProcID != PROC_DAMAGE && mProcID != PROC_WOLF_ATTACK_REVERSE && mProcID != PROC_WOLF_DASH_REVERSE) { - if (i_checkWolf()) { + if (checkWolf()) { return procWolfDashReverseInit(1); } else if (mLinkAcch.ChkGroundHit()) { if (cLib_distanceAngleS(shape_angle.y, field_0x3102) >= 0x4000) { @@ -1431,7 +1431,7 @@ int daAlink_c::procWolfTiredWait() { /* 8012D050-8012D104 127990 00B4+00 3/2 0/0 0/0 .text procWolfMidnaRideShockInit__9daAlink_cFv */ int daAlink_c::procWolfMidnaRideShockInit() { - if (!i_checkWolf()) { + if (!checkWolf()) { dComIfGp_evmng_cutEnd(field_0x3184); return procWaitInit(); } @@ -1561,7 +1561,7 @@ int daAlink_c::procWolfDashInit() { setFootEffectProcType(3); current.angle.y = shape_angle.y; - i_onNoResetFlg1(FLG1_DASH_MODE); + onNoResetFlg1(FLG1_DASH_MODE); mProcVar2.field_0x300c = 0; mProcVar3.field_0x300e.x = 0; @@ -1657,10 +1657,10 @@ int daAlink_c::procWolfDash() { return 1; } else if (frameCtrl_p->checkPass(2.5f) || frameCtrl_p->checkPass(14.0f)) { field_0x2f9d = 0x60; - i_onResetFlg1(RFLG1_UNK_30); + onResetFlg1(RFLG1_UNK_30); } else if (frameCtrl_p->checkPass(8.0f) || frameCtrl_p->checkPass(16.5f)) { field_0x2f9d = 0x18; - i_onResetFlg1(RFLG1_UNK_C); + onResetFlg1(RFLG1_UNK_C); } field_0x30a2 = field_0x2fec; @@ -1708,7 +1708,7 @@ int daAlink_c::procWolfDashReverseInit(int param_0) { dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 5); seStartOnlyReverb(Z2SE_WOLF_BODYATTACK); field_0x3588 = l_wolfBaseAnime; - i_onResetFlg0(RFLG0_FRONT_ROLL_CRASH); + onResetFlg0(RFLG0_FRONT_ROLL_CRASH); return 1; } #else @@ -1731,7 +1731,7 @@ int daAlink_c::procWolfDashReverse() { field_0x2f99 = 4; } - if (!i_checkModeFlg(0x2)) { + if (!checkModeFlg(0x2)) { if (checkAnmEnd(frameCtrl_p)) { checkNextActionWolf(0); } else if (frameCtrl_p->getFrame() > daAlinkHIO_wlMove_c0::m.field_0x3C.mCheckFrame) { @@ -1739,8 +1739,8 @@ int daAlink_c::procWolfDashReverse() { } } else if (mProcVar2.field_0x300c != 0) { mProcVar2.field_0x300c = 0; - } else if (((mLinkAcch.ChkGroundHit() || i_checkEndResetFlg2(ERFLG2_UNK_100)) && - i_checkModeFlg(0x2))) + } else if (((mLinkAcch.ChkGroundHit() || checkEndResetFlg2(ERFLG2_UNK_100)) && + checkModeFlg(0x2))) { if (checkWolfLandAction(0)) { return 1; @@ -1972,7 +1972,7 @@ int daAlink_c::procWolfSideStepLandInit(s16 param_0) { mProcVar3.field_0x300e.z = param_0; field_0x2f9d = 4; setFootEffectProcType(2); - i_onResetFlg1(0xC); + onResetFlg1(RFLG1_UNK_C); mNormalSpeed = FLOAT_LABEL(lit_6108); setStepLandVibration(); @@ -2170,7 +2170,7 @@ int daAlink_c::procWolfHowl() { } if (frameCtrl_p->getFrame() >= 38.0f && frameCtrl_p->getFrame() <= 56.0f) { - i_onResetFlg0(RFLG0_UNK_40000000); + onResetFlg0(RFLG0_UNK_40000000); voiceStartLevel(Z2SE_WL_V_HOWL); dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 1); } @@ -2205,7 +2205,7 @@ int daAlink_c::procWolfAutoJumpInit(int param_0) { var_f31 = daAlinkHIO_wlAutoJump_c0::m.field_0x48; var_f30 = daAlinkHIO_wlAutoJump_c0::m.field_0x4c; var_r30 = daAlinkHIO_wlAutoJump_c0::m.field_0x40; - i_onNoResetFlg2(FLG2_UNK_10000); + onNoResetFlg2(FLG2_UNK_10000); } else { var_f1 = daAlinkHIO_wlAutoJump_c0::m.field_0x60; field_0x594 = daAlinkHIO_wlAutoJump_c0::m.field_0x74; @@ -2232,8 +2232,8 @@ int daAlink_c::procWolfAutoJumpInit(int param_0) { field_0x33b0 = l_wolfBaseAnime.y; current.angle.y = shape_angle.y; - i_offNoResetFlg0(FLG0_UNK_40000); - i_onResetFlg0(RFLG0_UNK_100); + offNoResetFlg0(FLG0_UNK_40000); + onResetFlg0(RFLG0_UNK_100); voiceStart(Z2SE_WL_V_BREATH_JUMP); mProcVar2.field_0x300c = 1; return 1; @@ -2323,7 +2323,7 @@ int daAlink_c::procWolfFallInit(int param_0, f32 i_morf) { current.angle.y = field_0x2ffe; dComIfGp_getVibration().StartShock(6, 31, cXyz(0.0f, 1.0f, 0.0f)); setDamagePointNormal(field_0x318c); - i_onNoResetFlg1(FLG1_THROW_DAMAGE); + onNoResetFlg1(FLG1_THROW_DAMAGE); if (mDamageTimer != 0) { onModeFlg(8); @@ -2344,7 +2344,7 @@ int daAlink_c::procWolfFallInit(int param_0, f32 i_morf) { field_0x2f99 = 12; resetBasAnime(); - i_offNoResetFlg0(FLG0_UNK_40000); + offNoResetFlg0(FLG0_UNK_40000); if (param_0 != 4 && current.angle.y == shape_angle.y) { if (mNormalSpeed > 1.0f) { mProcVar0.field_0x3008 = 2; @@ -2713,10 +2713,10 @@ int daAlink_c::procWolfSlipTurn() { return procWolfSlipTurnLandInit(); } - if (!i_checkModeFlg(2) && frameCtrl_p->getFrame() > 4.5f) { + if (!checkModeFlg(2) && frameCtrl_p->getFrame() > 4.5f) { mNormalSpeed = field_0x347c; setJumpMode(); - } else if (i_checkModeFlg(2) && + } else if (checkModeFlg(2) && current.pos.y < mLastJumpPos.y - daAlinkHIO_wlMove_c0::m.field_0xC0) { setOldRootQuaternion(0, -0x8000, 0); @@ -3073,7 +3073,7 @@ static void* daAlink_searchWolfHowl(fopAc_ac_c* i_actor, void* i_data) { s16 actor_name = fopAcM_GetName(i_actor); daAlink_c* player_p = daAlink_getAlinkActorClass(); - if ((actor_name == PROC_KAGO && i_dComIfGs_isEventBit(0xA10)) || + if ((actor_name == PROC_KAGO && dComIfGs_isEventBit(0xA10)) || (actor_name == PROC_E_PM && player_p->current.pos.abs2XZ(i_actor->current.pos) < 9000000.0f) || actor_name == PROC_OBJ_SEKIZOA || @@ -3127,7 +3127,7 @@ int daAlink_c::procWolfHowlDemoInit() { return 0; } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); s16 name; if (field_0x27f4 != NULL) { @@ -3268,7 +3268,7 @@ int daAlink_c::procWolfHowlDemo() { daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl; daNpc_GWolf_c* gwolf_p = (daNpc_GWolf_c*)field_0x280c.getActor(); - BOOL skip_edge = i_dComIfGp_getEvent().i_checkSkipEdge(); + BOOL skip_edge = dComIfGp_getEvent().checkSkipEdge(); if (skip_edge) { mZ2WolfHowlMgr.skipCorrectDemo(); } @@ -3313,11 +3313,11 @@ int daAlink_c::procWolfHowlDemo() { if (checkUnderMove0BckNoArcWolf(WANM_HOWL_SUCCESS)) { if (gwolf_p == NULL) { - i_dComIfGp_getEvent().i_startCheckSkipEdge(this); + dComIfGp_getEvent().startCheckSkipEdge(this); } } else if (checkUnderMove0BckNoArcWolf(WANM_HOWL_END)) { if (gwolf_p == NULL) { - i_dComIfGp_getEvent().i_startCheckSkipEdge(this); + dComIfGp_getEvent().startCheckSkipEdge(this); } } else if ((var_r26 || mZ2WolfHowlMgr.getTimer() != 0) && mZ2WolfHowlMgr.getReleaseTimer() != 30) @@ -3331,7 +3331,7 @@ int daAlink_c::procWolfHowlDemo() { } if (frameCtrl_p->getFrame() >= 38.0f && frameCtrl_p->getFrame() <= 56.0f) { - i_onResetFlg0(RFLG0_UNK_40000000); + onResetFlg0(RFLG0_UNK_40000000); } } } else { @@ -3440,11 +3440,11 @@ int daAlink_c::procWolfHowlDemo() { if (gwolf_p != NULL) { fopAcM_OnStatus(gwolf_p, 0x800); gwolf_p->setHowlingFlag(); - i_dComIfGp_event_reset(); + dComIfGp_event_reset(); dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); } else { - i_dComIfGp_getEvent().i_startCheckSkipEdge(this); + dComIfGp_getEvent().startCheckSkipEdge(this); } } @@ -3477,7 +3477,7 @@ asm void daObj_Sekizoa_c::setWolfHowling() { /* 80131408-80131450 12BD48 0048+00 1/0 0/0 0/0 .text checkWolfRope__9daAlink_cFv */ BOOL daAlink_c::checkWolfRope() { - return i_checkModeFlg(0x20000) && field_0x280c.getActor() != NULL && + return checkModeFlg(0x20000) && field_0x280c.getActor() != NULL && fopAcM_GetName(field_0x280c.getActor()) == PROC_Obj_Crope; } @@ -4112,7 +4112,7 @@ int daAlink_c::procWolfTagJumpLand() { daTagWljump_c* wljump_p = (daTagWljump_c*)field_0x280c.getActor(); if (wljump_p != NULL && wljump_p->getLockPos() != NULL) { - i_onResetFlg0(RFLG0_UNK_20000); + onResetFlg0(RFLG0_UNK_20000); field_0x3738 = *wljump_p->getLockPos(); if (frameCtrl_p->getFrame() > daAlinkHIO_wlPoint_c0::m.field_0x3C.mCheckFrame) { @@ -4207,7 +4207,7 @@ int daAlink_c::procWolfGiantPuzzle() { return checkNextActionWolf(0); } - if (!i_checkNoResetFlg0(FLG0_UNK_4000) && mProcVar2.field_0x300c == shape_angle.y && + if (!checkNoResetFlg0(FLG0_UNK_4000) && mProcVar2.field_0x300c == shape_angle.y && mSpecialMode != 0x28 && checkZeroSpeedF()) { setDoStatusEmphasys(0x1C); @@ -4274,7 +4274,7 @@ asm int daAlink_c::procWolfGiantPuzzle() { /* 80135458-801354C8 12FD98 0070+00 2/2 0/0 0/0 .text setWolfHangGroundY__9daAlink_cFv */ void daAlink_c::setWolfHangGroundY() { cXyz pos; - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(0), &pos); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(0), &pos); mLinkGndChk.SetPos(&pos); field_0x33d8 = dComIfG_Bgsp().GroundCross(&mLinkGndChk); @@ -4288,7 +4288,7 @@ int daAlink_c::changeWolfHangEndProc() { setWolfHangGroundY(); f32 var_f1; - if (i_checkNoResetFlg0(FLG0_UNK_80) && mWaterY > field_0x33d8) { + if (checkNoResetFlg0(FLG0_UNK_80) && mWaterY > field_0x33d8) { var_f1 = daAlinkHIO_wlSwim_c0::m.field_0x48 + daAlinkHIO_wlSwim_c0::m.field_0x94; } else { var_f1 = daAlinkHIO_wlWallHang_c0::m.field_0x88; @@ -4303,7 +4303,7 @@ int daAlink_c::changeWolfHangEndProc() { current.pos.x -= cM_ssin(shape_angle.y) * 50.0f; current.pos.z -= cM_scos(shape_angle.y) * 50.0f; - i_onNoResetFlg2(FLG2_UNK_200); + onNoResetFlg2(FLG2_UNK_200); procWolfFallInit(2, daAlinkHIO_wlWallHang_c0::m.field_0x98); return 1; } @@ -4383,7 +4383,7 @@ int daAlink_c::procWolfHangWallCatch() { } f32 temp_f2 = field_0x3478; - field_0x3478 = mpLinkModel->i_getAnmMtx(0)[1][3]; + field_0x3478 = mpLinkModel->getAnmMtx(0)[1][3]; if (temp_f2 < field_0x33b8 && field_0x3478 >= field_0x33b8) { seStartMapInfo(Z2SE_WL_OUTOF_WATER); } @@ -4410,13 +4410,13 @@ int daAlink_c::procWolfHangWallCatch() { procWolfSwimEndWaitInit(0); } - i_onNoResetFlg1(FLG1_UNK_20); + onNoResetFlg1(FLG1_UNK_20); } } else if (mProcVar3.field_0x300e.x != 0 && frameCtrl_p->getFrame() > daAlinkHIO_wlWallHang_c0::m.field_0x14.mCheckFrame && checkNextActionWolf(1)) { - i_onNoResetFlg1(FLG1_UNK_20); + onNoResetFlg1(FLG1_UNK_20); } return 1; @@ -4437,7 +4437,7 @@ asm int daAlink_c::procWolfHangWallCatch() { // matches with literals #ifdef NONMATCHING int daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) { - if (mProcID == PROC_WOLF_HANG_WALL_CATCH || i_checkNoResetFlg1(FLG1_UNK_20)) { + if (mProcID == PROC_WOLF_HANG_WALL_CATCH || checkNoResetFlg1(FLG1_UNK_20)) { return 0; } @@ -4719,7 +4719,7 @@ asm void daAlink_c::setWolfScreamWaitAnime() { /* 80136F54-80136FF8 131894 00A4+00 1/1 0/0 0/0 .text procWolfScreamWaitInit__9daAlink_cFv */ int daAlink_c::procWolfScreamWaitInit() { commonProcInit(PROC_WOLF_SCREAM_WAIT); - if (i_checkEndResetFlg1(ERFLG1_UNK_2)) { + if (checkEndResetFlg1(ERFLG1_UNK_2)) { setWolfScreamWaitAnime(); } else { setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMoveNoP_c0::m.field_0x14, @@ -4738,7 +4738,7 @@ int daAlink_c::procWolfScreamWaitInit() { int daAlink_c::procWolfScreamWait() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - if (!i_checkEndResetFlg1(ERFLG1_UNK_1)) { + if (!checkEndResetFlg1(ERFLG1_UNK_1)) { if (mProcVar3.field_0x300e.x != 0) { field_0x2f99 = 5; @@ -4755,7 +4755,7 @@ int daAlink_c::procWolfScreamWait() { daAlinkHIO_wlDamLarge_c0::m.field_0x0.mInterpolation); field_0x2f99 = 13; } - } else if (mProcVar2.field_0x300c == 0 && i_checkEndResetFlg1(ERFLG1_UNK_2)) { + } else if (mProcVar2.field_0x300c == 0 && checkEndResetFlg1(ERFLG1_UNK_2)) { setWolfScreamWaitAnime(); } @@ -4804,8 +4804,8 @@ asm f32 daAlink_c::getWolfLieMoveSpeed() { /* 801371A0-801371FC 131AE0 005C+00 0/0 0/0 2/2 .text checkMidnaDisappearMode__9daAlink_cCFv */ BOOL daAlink_c::checkMidnaDisappearMode() const { return mProcID == PROC_WOLF_DIG_THROUGH || - (i_checkWolf() && i_dComIfGp_checkPlayerStatus0(0, 0x8000000) && - !i_dComIfGp_checkPlayerStatus0(0, 0x10) && + (checkWolf() && dComIfGp_checkPlayerStatus0(0, 0x8000000) && + !dComIfGp_checkPlayerStatus0(0, 0x10) && (mTargetedActor == NULL || !(mTargetedActor->attention_info.flags & 0x800000))); } @@ -4945,7 +4945,7 @@ int daAlink_c::procWolfLieStart() { int daAlink_c::procWolfLieMoveInit(int param_0) { BOOL var_r30 = mProcID == PROC_TALK; BOOL var_r29 = checkUnderMove0BckNoArcWolf(WANM_CROUCH_WALK) == FALSE; - BOOL var_r28 = i_dComIfGp_checkPlayerStatus0(0, 0x2000); + BOOL var_r28 = dComIfGp_checkPlayerStatus0(0, 0x2000); if (!commonProcInitNotSameProc(PROC_WOLF_LIE_MOVE)) { return 0; @@ -4986,7 +4986,7 @@ int daAlink_c::procWolfLieMoveInit(int param_0) { mProcVar3.field_0x300e.z = 30; - if (i_checkAttentionLock()) { + if (checkAttentionLock()) { field_0x2fe4 = shape_angle.y; } @@ -5018,7 +5018,7 @@ asm int daAlink_c::procWolfLieMove() { // regalloc #ifdef NONMATCHING int daAlink_c::procWolfLieAutoMoveInit(int param_0, cXyz* param_1) { - BOOL var_r30 = i_dComIfGp_checkPlayerStatus0(0, 0x2000); + BOOL var_r30 = dComIfGp_checkPlayerStatus0(0, 0x2000); commonProcInit(PROC_WOLF_LIE_AUTO_MOVE); field_0x37c8 = *param_1; @@ -5100,7 +5100,7 @@ void daAlink_c::setSpeedAndAngleSwimWolf() { setNormalSpeedF(var_f31, daAlinkHIO_wlSwim_c0::m.field_0x54); - if (i_dComIfGp_checkPlayerStatus0(0, 0x10)) { + if (dComIfGp_checkPlayerStatus0(0, 0x10)) { mNormalSpeed = 0.0f; } } @@ -5161,15 +5161,15 @@ int daAlink_c::decideDoStatusSwimWolf() { setDoStatus(0x39); if (doTrigger()) { fopAcM_setCarryNow(field_0x27f4, 0); - i_onResetFlg0(RFLG0_UNK_8000); + onResetFlg0(RFLG0_UNK_8000); } - } else if (i_checkNoResetFlg0(FLG0_UNK_100) && field_0x30d2 == 0 && !checkWolfSwimDashAnime() && + } else if (checkNoResetFlg0(FLG0_UNK_100) && field_0x30d2 == 0 && !checkWolfSwimDashAnime() && mProcID == PROC_WOLF_SWIM_MOVE) { setDoStatus(9); if (doTrigger()) { - i_onNoResetFlg1(FLG1_DASH_MODE); + onNoResetFlg1(FLG1_DASH_MODE); if (field_0x2fc7 == 1 || field_0x2fc7 == 3) { field_0x30d0 = daAlinkHIO_wlMove_c0::m.field_0x5A; @@ -5207,7 +5207,7 @@ int daAlink_c::procWolfSwimUpInit() { commonProcInit(PROC_WOLF_SWIM_UP); speed.y = FLOAT_LABEL(lit_6108); current.pos.y = mWaterY; - i_onNoResetFlg0(FLG0_UNK_100); + onNoResetFlg0(FLG0_UNK_100); mZ2Link.setInWater(false); setSingleAnimeWolfParam(WANM_SWIM_RESURFACE, &daAlinkHIO_wlSwim_c0::m.field_0x0); @@ -5268,7 +5268,7 @@ int daAlink_c::procWolfSwimWaitInit(int param_0) { setSingleAnimeWolfBaseSpeed(WANM_SWIM_WAIT, anm_speed, morf); dComIfGp_setPlayerStatus0(0, 0x100000); - if (i_checkNoResetFlg0(FLG0_UNK_100)) { + if (checkNoResetFlg0(FLG0_UNK_100)) { current.pos.y = mWaterY; speed.y = 0.0f; } @@ -5325,7 +5325,7 @@ int daAlink_c::procWolfSwimMoveInit() { setSingleAnimeWolfBaseSpeed(WANM_SWIM, getWolfSwimMoveAnmSpeed(), daAlinkHIO_wlSwim_c0::m.field_0x78); - if (i_checkNoResetFlg0(FLG0_UNK_100)) { + if (checkNoResetFlg0(FLG0_UNK_100)) { current.pos.y = mWaterY; speed.y = FLOAT_LABEL(lit_6108); } @@ -5381,7 +5381,7 @@ int daAlink_c::procWolfSwimEndWaitInit(int param_0) { setSingleAnimeWolfParam(WANM_WAIT_SHAKE, &daAlinkHIO_wlSwim_c0::m.field_0x14); setFaceBasicTexture(FTANM_UNK_8F); - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(3), &field_0x37c8); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(3), &field_0x37c8); if (param_0 == 0) { mProcVar3.field_0x300e.x = 0; @@ -5412,7 +5412,7 @@ int daAlink_c::procWolfSwimEndWaitInit(int param_0) { */ int daAlink_c::procWolfSwimEndWait() { daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl; - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(3), &field_0x37c8); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(3), &field_0x37c8); if (frameCtrl_p->checkPass(lit_7977)) { if (mProcVar2.field_0x300c == 0) { @@ -5462,7 +5462,7 @@ bool daAlink_c::onWolfEnemyBiteAll(fopAc_ac_c* param_0, daPy_py_c::daPy_FLG2 par return 0; } - i_onNoResetFlg2(param_1); + onNoResetFlg2(param_1); field_0x281c.setData(param_0); return 1; @@ -5472,7 +5472,7 @@ bool daAlink_c::onWolfEnemyBiteAll(fopAc_ac_c* param_0, daPy_py_c::daPy_FLG2 par */ void daAlink_c::resetWolfEnemyBiteAll() { field_0x281c.clearData(); - i_offNoResetFlg2(0x58); + offNoResetFlg2(FLG2_UNK_58); } /* 80138C44-80138CB8 133584 0074+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAction__9daAlink_cFv */ @@ -5523,7 +5523,7 @@ void daAlink_c::setWolfBallModel() { mEquipItem = 0x10A; field_0x33dc = FLOAT_LABEL(lit_6108); - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(6), &mHeldItemRootPos); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(6), &mHeldItemRootPos); mIronBallCenterPos = mHeldItemRootPos; mHookshotTopPos = mHeldItemRootPos; @@ -5546,8 +5546,8 @@ void daAlink_c::resetWolfBallGrab() { 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); + onEndResetFlg0(ERFLG0_UNK_20000000); + offNoResetFlg3(FLG3_UNK_200000); } } #else @@ -5657,9 +5657,9 @@ static int daAlink_searchWolfLockEnemy(fopAc_ac_c* i_actor, void* i_data) { /* 801392E4-801393A4 133C24 00C0+00 1/1 0/0 0/0 .text checkWolfComboCnt__9daAlink_cFv */ void daAlink_c::checkWolfComboCnt() { - if (!i_dComIfGp_checkPlayerStatus1(0, 0x1000000)) { - if (mComboCutCount == 2 && i_checkAttentionLock() && mAtCyl.ChkAtHit()) { - i_onNoResetFlg0(FLG0_UNK_8000); + if (!dComIfGp_checkPlayerStatus1(0, 0x1000000)) { + if (mComboCutCount == 2 && checkAttentionLock() && mAtCyl.ChkAtHit()) { + onNoResetFlg0(FLG0_UNK_8000); } if (field_0x307e > 0) { @@ -5683,7 +5683,7 @@ BOOL daAlink_c::checkWolfAttackAction() { if (checkWolfDashMode()) { mComboCutCount = 4; return procWolfJumpAttackInit(0); - } else if (i_checkNoResetFlg0(FLG0_UNK_8000)) { + } else if (checkNoResetFlg0(FLG0_UNK_8000)) { if (mComboCutCount == 4) { if (atk_direction == DIR_NONE) { return procWolfWaitAttackInit(2); @@ -5781,8 +5781,8 @@ void daAlink_c::setWolfBiteDamage(fopEn_enemy_c* i_enemy) { i_enemy->onWolfBiteDamage(); cXyz pos; - mDoMtx_multVecZero(mpLinkModel->i_getAnmMtx(13), &pos); - i_dComIfGp_setHitMark(1, i_enemy, &pos, &shape_angle, (cXyz*)&l_wolfBiteHitMarkScale, 0); + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(13), &pos); + dComIfGp_setHitMark(1, i_enemy, &pos, &shape_angle, (cXyz*)&l_wolfBiteHitMarkScale, 0); dComIfGp_getVibration().StartShock(3, 31, cXyz(0.0f, 1.0f, 0.0f)); } #else @@ -5799,7 +5799,7 @@ asm void daAlink_c::setWolfBiteDamage(fopEn_enemy_c* param_0) { /* 801397A4-801398A8 1340E4 0104+00 1/1 0/0 0/0 .text checkWolfLockAttackChargeState__9daAlink_cFv */ BOOL daAlink_c::checkWolfLockAttackChargeState() { - return i_checkMidnaRide() && checkMidnaChargeAttack() && !daMidna_c::i_checkMidnaTired() && + return checkMidnaRide() && checkMidnaChargeAttack() && !daMidna_c::i_checkMidnaTired() && daMidna_c::checkMidnaRealBody(); } @@ -5885,7 +5885,7 @@ int daAlink_c::procWolfRollAttackMove() { setWolfLockDomeModel(); } } else { - i_onResetFlg0(RFLG0_UNK_10); + onResetFlg0(RFLG0_UNK_10); if (mEquipItem == 0x109) { seStartOnlyReverbLevel(Z2SE_MIDNA_BIND_AREA_SUS); @@ -6030,7 +6030,7 @@ int daAlink_c::procWolfJumpAttack() { if (mLinkAcch.ChkGroundHit()) { dComIfGp_getVibration().StartShock(1, 15, cXyz(0.0f, 1.0f, 0.0f)); - if (i_checkNoResetFlg2(FLG2_UNK_8)) { + if (checkNoResetFlg2(FLG2_UNK_8)) { procWolfEnemyThrowInit(4); } else if (mProcVar3.field_0x300e.z != 0 || mProcVar1.field_0x300a == 2 || mProcVar1.field_0x300a == 3) @@ -6042,7 +6042,7 @@ int daAlink_c::procWolfJumpAttack() { return 1; } - if (i_checkNoResetFlg2(FLG2_UNK_40)) { + if (checkNoResetFlg2(FLG2_UNK_40)) { return procWolfEnemyHangBiteInit(); } @@ -6051,12 +6051,12 @@ int daAlink_c::procWolfJumpAttack() { mProcVar2.field_0x300c = 1; setSingleAnimeWolfBaseSpeed(WANM_ATTACK_A, daAlinkHIO_wlAtNjump_c0::m.field_0x24, daAlinkHIO_wlAtNjump_c0::m.field_0x28); - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); } else { - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); } } else { - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); if (current.pos.y < mLastJumpPos.y - daAlinkHIO_wlAttack_c0::m.mFallHeight) { procWolfFallInit(2, daAlinkHIO_wlAttack_c0::m.mFallInterpolation); @@ -6334,7 +6334,7 @@ int daAlink_c::procWolfWaitAttack() { return 1; } - if (i_checkNoResetFlg2(FLG2_UNK_8) && frameCtrl_p->getFrame() >= 14.0f) { + if (checkNoResetFlg2(FLG2_UNK_8) && frameCtrl_p->getFrame() >= 14.0f) { return procWolfEnemyThrowInit(mCutType == CUT_TYPE_WOLF_B_LEFT ? 2 : 3); } @@ -6380,7 +6380,7 @@ int daAlink_c::procWolfWaitAttack() { } if (frameCtrl_p->getFrame() >= field_0x347c && frameCtrl_p->getFrame() < field_0x3480) { - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); if (mProcVar1.field_0x300a != 0) { mProcVar1.field_0x300a--; @@ -6474,11 +6474,11 @@ int daAlink_c::procWolfRollAttack() { } else if (mProcVar3.field_0x300e.x == 0 && frameCtrl_p->getFrame() >= 4.0f && frameCtrl_p->getFrame() < 13.0f) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + if (!checkNoResetFlg0(FLG0_UNK_40)) { mNormalSpeed = daAlinkHIO_wlAtRoll_c0::m.field_0x18; } - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); cLib_chaseF(mAtCyl.GetRP(), field_0x3478, 20.0f); } @@ -6778,7 +6778,7 @@ int daAlink_c::procWolfLockAttack() { } else { mZ2Link.startLinkSoundLevel(Z2SE_WOLFATTACK_WIND_RUSH, mComboCutCount, mVoiceReverbIntensity); - i_onResetFlg0(RFLG0_UNK_2); + onResetFlg0(RFLG0_UNK_2); } return 1; @@ -6825,7 +6825,7 @@ int daAlink_c::procWolfLockAttackTurnInit(int param_0) { mNormalSpeed *= 0.5f; field_0x2f99 = 4; dComIfGp_setPlayerStatus1(0, 0x1000000); - i_offResetFlg0(RFLG0_UNK_8000000); + offResetFlg0(RFLG0_UNK_8000000); mComboCutCount++; mProcVar1.field_0x300a = param_0; return 1; @@ -6903,7 +6903,7 @@ int daAlink_c::procWolfAttackReverseInit() { dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 5); seStartOnlyReverb(Z2SE_WOLF_BODYATTACK); - i_onResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); + onResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); field_0x3588 = l_wolfBaseAnime; return 1; } @@ -6930,7 +6930,7 @@ int daAlink_c::procWolfAttackReverse() { daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl; field_0x2f99 = 4; - if (!i_checkModeFlg(2)) { + if (!checkModeFlg(2)) { if (frameCtrl_p->checkPass(30.0f)) { voiceStart(Z2SE_WL_V_NOSE); } @@ -6940,8 +6940,8 @@ int daAlink_c::procWolfAttackReverse() { } else if (frameCtrl_p->getFrame() > daAlinkHIO_wlAttack_c0::m.mLandAnm.mCheckFrame) { checkNextActionWolf(1); } - } else if ((mLinkAcch.ChkGroundHit() || i_checkEndResetFlg2(ERFLG2_UNK_100)) && - i_checkModeFlg(2)) + } else if ((mLinkAcch.ChkGroundHit() || checkEndResetFlg2(ERFLG2_UNK_100)) && + checkModeFlg(2)) { if (checkWolfLandAction(0)) { return 1; @@ -6977,10 +6977,10 @@ int daAlink_c::procWolfEnemyThrowInit(int param_0) { daAlink_WANM anm; if (param_0 == 2 || (param_0 == 4 && cM_rnd() < 0.5f)) { anm = WANM_FLING_LEFT; - i_onNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); + onNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); } else { anm = WANM_FLING_RIGHT; - i_offNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); + offNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); } f32 var_f31; @@ -7225,7 +7225,7 @@ int daAlink_c::procWolfGrabUp() { } if (frameCtrl_p->checkPass(field_0x3478)) { - i_onResetFlg0(RFLG0_UNK_8000); + onResetFlg0(RFLG0_UNK_8000); fopAcM_setStageLayer(item_p); voiceStart(Z2SE_WL_V_HOLD_MOUTH); } @@ -7511,7 +7511,7 @@ int daAlink_c::procWolfCargoCarry() { checkSubjectAction(); } else { - if (i_checkEndResetFlg1(ERFLG1_UNK_10000)) { + if (checkEndResetFlg1(ERFLG1_UNK_10000)) { return checkNextActionWolf(0); } @@ -7586,7 +7586,7 @@ int daAlink_c::procWolfGanonCatchInit() { return 0; } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); field_0x27f4->actor_status |= 0x800; commonProcInit(PROC_WOLF_GANON_CATCH); @@ -7798,7 +7798,7 @@ int daAlink_c::procWolfChainWait() { if (chain == NULL || mProcVar0.field_0x3008 <= -daAlinkHIO_wlChain_c0::m.field_0x3E) { mNormalSpeed = field_0x37c8.absXZ(); current.angle.y = field_0x37c8.atan2sX_Z(); - i_onNoResetFlg2(FLG2_UNK_200); + onNoResetFlg2(FLG2_UNK_200); return procWolfFallInit(2, daAlinkHIO_wlWallHang_c0::m.field_0x98); } @@ -7972,9 +7972,9 @@ void daAlink_c::setSmellSave() { if (mProcVar3.field_0x300e.z == SMELL_MEDICINE) { dComIfGs_onEventBit(0x2F04); // ON: Got Medicine Scent } else if (mProcVar3.field_0x300e.z == SMELL_CHILDREN) { - i_fopAcM_onSwitch(this, 102); + fopAcM_onSwitch(this, 102); } else if (mProcVar3.field_0x300e.z == SMELL_YELIA_POUCH) { - i_fopAcM_onSwitch(this, 103); + fopAcM_onSwitch(this, 103); } else if (mProcVar3.field_0x300e.z == SMELL_FISH) { dComIfGs_onEventBit(0x6120); // ON: Got Reekfish scent } else if (mProcVar3.field_0x300e.z == SMELL_POH) { @@ -7993,7 +7993,7 @@ int daAlink_c::procWolfGetSmellInit() { return 0; } - mDemo.i_setSpecialDemoType(); + mDemo.setSpecialDemoType(); commonProcInit(PROC_WOLF_GET_SMELL); setSingleAnimeWolfBaseSpeed(WANM_SMELL, daAlinkHIO_wlChain_c0::m.field_0x54, daAlinkHIO_wlChain_c0::m.field_0x58); @@ -8028,7 +8028,7 @@ int daAlink_c::procWolfGetSmellInit() { field_0x319c = 0x2240; } - if (field_0x319c < 0 || i_dComIfGs_isEventBit(field_0x319c)) { + if (field_0x319c < 0 || dComIfGs_isEventBit(field_0x319c)) { field_0x319c = -1; } @@ -8056,8 +8056,8 @@ int daAlink_c::procWolfGetSmell() { kytag03_class* kytag3_p = (kytag03_class*)field_0x280c.getActor(); if (field_0x319c >= 0) { - if (i_checkSpecialDemoMode()) { - i_dComIfGp_getEvent().reset(this); + if (checkSpecialDemoMode()) { + dComIfGp_getEvent().reset(this); dComIfGp_clearPlayerStatus1(0, 0x4000000); if (mProcVar3.field_0x300e.z == SMELL_YELIA_POUCH) { diff --git a/src/d/a/d_a_no_chg_room.cpp b/src/d/a/d_a_no_chg_room.cpp index beaf0e4c8a5..b4052088f06 100644 --- a/src/d/a/d_a_no_chg_room.cpp +++ b/src/d/a/d_a_no_chg_room.cpp @@ -55,7 +55,7 @@ int daNocrm_c::execute() { cXyz cur_player_pos(player_p->current.pos); if (player_p->checkHorseRide()) { - cur_player_pos.y = i_dComIfGp_getHorseActor()->current.pos.y; + cur_player_pos.y = dComIfGp_getHorseActor()->current.pos.y; } else if (player_p->checkSpinnerRide()) { daSpinner_c* spinner_actor = player_p->getSpinnerActor(); @@ -70,7 +70,7 @@ int daNocrm_c::execute() { if (sp14.y < 0.0f || sp14.y > scale.y || fabsf(sp14.x) > scale.x || fabsf(sp14.z) > scale.z) { if (subtype == 0 || !mRoomLoading || - dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != 0) + dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 0) { return 1; } diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index d1bad39509a..726b6f7a594 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -1774,7 +1774,7 @@ int daNpcT_c::execute() { setCollision(); if (!field_0xe2c) { - if ((field_0xe33 && i_dComIfGp_getEvent().i_isOrderOK()) || i_dComIfGp_event_runCheck() == 0) { + if ((field_0xe33 && dComIfGp_getEvent().isOrderOK()) || dComIfGp_event_runCheck() == 0) { evtOrder(); } } @@ -2111,7 +2111,7 @@ void daNpcT_c::setMtx() { mDoMtx_stack_c::ZXYrotM(field_0xd78); mDoMtx_stack_c::scaleM(scale); - model->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); model->setUserArea((u32)this); mMcaMorfAnm[0]->onMorfNone(); @@ -2668,7 +2668,7 @@ asm void daNpcT_c::getEvtAreaTagP(int param_0, int param_1) { fopAc_ac_c* daNpcT_c::getShopItemTagP() { mFindCount = 0; mSrchName = 0x127; - i_fpcM_Search((fopAcIt_JudgeFunc)srchActor, (void*)this); + fpcM_Search((fopAcIt_JudgeFunc)srchActor, (void*)this); for (s32 i = 0; i < mFindCount; i++) { if ((fopAcM_GetParam(mFindActorPtrs[i]) & 0xf0000000) == 0xf0000000) { @@ -2803,7 +2803,7 @@ asm void daNpcT_getPlayerInfoFromPlayerList(int param_0, int param_1, cXyz* para bool daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_ActorP) { bool ret = 0; - if (i_dComIfGp_getDoStatus() == 0x1c) { + if (dComIfGp_getDoStatus() == 0x1c) { if (daPy_getPlayerActorClass()->checkPriActorOwn(i_ActorP)) { for (int i = 0; i < dComIfGp_getAttention().GetActionCount(); i++) { if (dComIfGp_getAttention().ActionTarget(i) == i_ActorP && @@ -2856,7 +2856,7 @@ void daNpcT_offEvtBit(u32 i_idx) { /* 8014CAAC-8014CAEC 1473EC 0040+00 0/0 0/0 155/155 .text daNpcT_chkEvtBit__FUl */ BOOL daNpcT_chkEvtBit(u32 i_idx) { - return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_idx]); + return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_idx]); } /* 8014CAEC-8014CB2C 14742C 0040+00 0/0 0/0 26/26 .text daNpcT_onTmpBit__FUl */ @@ -3556,7 +3556,7 @@ void daBaseNpc_c::setBtpAnm(J3DAnmTexPattern* param_0, J3DModelData* param_1, f3 void daBaseNpc_c::attnSttsOn(int param_0, int param_1) { u32 tmp; - if (dComIfGp_getLinkPlayer()->i_checkWolf()) { + if (dComIfGp_getLinkPlayer()->checkWolf()) { if (param_1 != 0) { tmp = 10; } else { @@ -3579,7 +3579,7 @@ void daBaseNpc_c::setParam() { /* 8014EFF4-8014F09C 149934 00A8+00 0/0 0/0 1/1 .text orderEvent__11daBaseNpc_cFiPc */ void daBaseNpc_c::orderEvent(int param_0, char* i_evtName) { if (i_evtName) { - mEvtIdx = i_dComIfGp_getEventManager().getEventIdx(this, i_evtName, -1); + mEvtIdx = dComIfGp_getEventManager().getEventIdx(this, i_evtName, -1); fopAcM_orderOtherEventId(this, mEvtIdx, -1, -1, 0, 1); } else { if ((mUnk >= 0 && attention_info.flags == 10) && (eventInfo.mCondition |= 1, param_0 != 0)) @@ -3702,7 +3702,7 @@ void daBaseNpc_c::setMtx(int param_0) { mDoMtx_stack_c::ZXYrotM(field_0x91a); mDoMtx_stack_c::scaleM(scale); - model->i_setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); if (param_0) { model->setUserArea((u32)this); @@ -5772,7 +5772,7 @@ s16 daNpcF_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1) { /* 80155634-80155674 14FF74 0040+00 0/0 0/0 69/69 .text daNpcF_chkEvtBit__FUl */ BOOL daNpcF_chkEvtBit(u32 i_idx) { - return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_idx]); + return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_idx]); } /* 80155674-801556B4 14FFB4 0040+00 0/0 0/0 13/13 .text daNpcF_onEvtBit__FUl */ diff --git a/src/d/a/d_a_npc_cd2.cpp b/src/d/a/d_a_npc_cd2.cpp index fae85574da7..6d950843b73 100644 --- a/src/d/a/d_a_npc_cd2.cpp +++ b/src/d/a/d_a_npc_cd2.cpp @@ -1873,9 +1873,9 @@ int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) { s32 jntNum = a_jntNumTbl[idx][x]; if (i_model && jntNum >= 0) { g_env_light.setLightTevColorType_MAJI(i_model, &tevStr); - mDoMtx_copy(mpMorf->getModel()->i_getAnmMtx(jntNum), mDoMtx_stack_c::now); + mDoMtx_copy(mpMorf->getModel()->getAnmMtx(jntNum), mDoMtx_stack_c::now); mDoMtx_stack_c::scaleM(i_scale, i_scale, i_scale); - i_model->i_setBaseTRMtx(mDoMtx_stack_c::now); + i_model->setBaseTRMtx(mDoMtx_stack_c::now); mDoExt_modelUpdateDL(i_model); } return 1; @@ -1994,7 +1994,7 @@ static void* s_sub1(void* param_0, void* param_1) { void* daNpcCd2_c::getEscapeTag() { target = NULL; wolfAngle = fopAcM_searchPlayerAngleY(this); - i_fpcM_Search(s_sub1, this); + fpcM_Search(s_sub1, this); return target; } @@ -2190,7 +2190,7 @@ fopAc_ac_c* PathTrace_c::checkObstacle(fopAc_ac_c* param_0) { if (fopAcM_CheckCondition(field_0x00, 4)) { return NULL; } - i_fpcM_Search(s_sub, this); + fpcM_Search(s_sub, this); if (field_0x04) { setAvoidPoint(); } diff --git a/src/d/a/d_a_obj_item.cpp b/src/d/a/d_a_obj_item.cpp index fee624feaac..3d9c3eca3de 100644 --- a/src/d/a/d_a_obj_item.cpp +++ b/src/d/a/d_a_obj_item.cpp @@ -276,7 +276,7 @@ void daItem_c::setBaseMtx() { break; } - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } } @@ -595,7 +595,7 @@ void daItem_c::CreateInit() { default: case 6: field_0x93c = daItem_prm::getSwitchNo(this); - if (field_0x93c != 0xFF && !i_fopAcM_isSwitch(this, field_0x93c)) { + if (field_0x93c != 0xFF && !fopAcM_isSwitch(this, field_0x93c)) { hide(); setFlag(8); procInitSwOnWait(); @@ -1053,10 +1053,6 @@ void daItem_c::procWaitGetDemoEvent() { } } -inline void dComIfGp_event_reset() { - g_dComIfG_gameInfo.play.getEvent().reset(); -} - /* 8015C3BC-8015C41C 156CFC 0060+00 1/0 0/0 0/0 .text procMainGetDemoEvent__8daItem_cFv */ void daItem_c::procMainGetDemoEvent() { @@ -1111,7 +1107,7 @@ void daItem_c::procInitSwOnWait() { /* 8015C648-8015C708 156F88 00C0+00 1/0 0/0 0/0 .text procMainSwOnWait__8daItem_cFv */ void daItem_c::procMainSwOnWait() { - if (i_fopAcM_isSwitch(this, field_0x93c)) { + if (fopAcM_isSwitch(this, field_0x93c)) { mAcch.CrrPos(dComIfG_Bgsp()); if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > lit_4070[0] + home.pos.y) { @@ -1413,7 +1409,7 @@ BOOL daItem_c::checkCountTimer() { count = false; } - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { count = false; } diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index 4684cdb0afd..6e34eb5fb88 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -99,7 +99,7 @@ int daPy_boomerangMove_c::posMove(cXyz* param_0, s16* param_1, fopAc_ac_c* param return 0; } - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { field_0x0 = 1; } else if (m_eventKeepFlg != 0 && field_0x0 == 0) { return 0; @@ -462,7 +462,7 @@ BOOL daPy_py_c::checkWoodShieldEquip() { } BOOL daPy_py_c::checkNowWolf() { - return dComIfGp_getLinkPlayer()->i_checkWolf(); + return dComIfGp_getLinkPlayer()->checkWolf(); } /* 8015F3FC-8015F424 159D3C 0028+00 0/0 4/4 3/3 .text getAttentionOffsetY__9daPy_py_cFv @@ -485,7 +485,7 @@ int daPy_py_c::checkNowWolfEyeUp() { */ void daAlink_c::startRestartRoomFromOut(int param_0, u32 param_1, int param_2) { - startRestartRoom(param_1, param_2, param_0, i_dComIfGp_event_runCheck()); + startRestartRoom(param_1, param_2, param_0, dComIfGp_event_runCheck()); } void daPy_py_c::forceRestartRoom(int param_0, u32 param_1, int param_2) { @@ -518,7 +518,7 @@ void daPy_py_c::setPlayerSe(u32 i_sfxID) { bool daPy_py_c::linkGrabSubjectNoDraw(fopAc_ac_c* i_actor) { return (fopAcM_checkCarryNow(i_actor) && daPy_getPlayerActorClass()->getGrabActorID() == fopAcM_GetID(i_actor)) && - dComIfGp_checkCameraAttentionStatus(i_dComIfGp_getPlayerCameraID(0), 2); + dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 2); } /* 8015F60C-8015F660 159F4C 0054+00 0/0 0/0 2/2 .text @@ -544,9 +544,9 @@ bool daPy_py_c::checkRoomRestartStart() { /* 8015F698-8015F730 159FD8 0098+00 0/0 2/2 1/1 .text checkCarryStartLightBallA__9daPy_py_cFv */ u32 daPy_py_c::checkCarryStartLightBallA() { - if (checkRoomRestartStart() || !i_dComIfGp_getStage() || - !i_dComIfGp_getStage()->getStagInfo() || - i_dStage_stagInfo_GetSaveTbl(i_dComIfGp_getStage()->getStagInfo()) != 0x17) + if (checkRoomRestartStart() || !dComIfGp_getStage() || + !dComIfGp_getStage()->getStagInfo() || + i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17) { return FALSE; } @@ -556,9 +556,9 @@ u32 daPy_py_c::checkCarryStartLightBallA() { /* 8015F730-8015F7C8 15A070 0098+00 0/0 2/2 1/1 .text checkCarryStartLightBallB__9daPy_py_cFv */ u32 daPy_py_c::checkCarryStartLightBallB() { - if (checkRoomRestartStart() || !i_dComIfGp_getStage() || - !i_dComIfGp_getStage()->getStagInfo() || - i_dStage_stagInfo_GetSaveTbl(i_dComIfGp_getStage()->getStagInfo()) != 0x17) + if (checkRoomRestartStart() || !dComIfGp_getStage() || + !dComIfGp_getStage()->getStagInfo() || + i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != 0x17) { return FALSE; } diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp index 98995ed3ff3..bbbf5642063 100644 --- a/src/d/bg/d_bg_w.cpp +++ b/src/d/bg/d_bg_w.cpp @@ -1991,8 +1991,8 @@ bool dBgW::ChkPolyThrough(int poly_index, cBgS_PolyPassChk* ppass_chk) { } cXyz pos(pm_tri[poly_index].m_plane.mNormal); - if (chk->ChkHorse() && i_dComIfGp_getHorseActor() != NULL) { - if (!i_dComIfGp_getHorseActor()->checkSpecialWallHit(pos)) { + if (chk->ChkHorse() && dComIfGp_getHorseActor() != NULL) { + if (!dComIfGp_getHorseActor()->checkSpecialWallHit(pos)) { return true; } } diff --git a/src/d/bg/d_bg_w_kcol.cpp b/src/d/bg/d_bg_w_kcol.cpp index 75e48e54c2b..1069f9be736 100644 --- a/src/d/bg/d_bg_w_kcol.cpp +++ b/src/d/bg/d_bg_w_kcol.cpp @@ -331,8 +331,8 @@ bool dBgWKCol::chkPolyThrough(dBgPc* ppoly, cBgS_PolyPassChk* param_2, if (polypass->ChkNoHorse()) { return true; } - if (polypass->ChkHorse() && i_dComIfGp_getHorseActor() != NULL) { - if (!i_dComIfGp_getHorseActor()->checkSpecialWallHit(param_4)) { + if (polypass->ChkHorse() && dComIfGp_getHorseActor() != NULL) { + if (!dComIfGp_getHorseActor()->checkSpecialWallHit(param_4)) { return true; } } diff --git a/src/d/cc/d_cc_s.cpp b/src/d/cc/d_cc_s.cpp index 72a3650f4a1..038378bcc3d 100644 --- a/src/d/cc/d_cc_s.cpp +++ b/src/d/cc/d_cc_s.cpp @@ -521,7 +521,7 @@ void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_O u32 atType = i_atObjInf->GetAtType(); fopAc_ac_c* ac = i_tgObjInf->GetAc(); - i_dComIfGp_setHitMark(2, ac, i_hitPos, &sp10, NULL, atType); + dComIfGp_setHitMark(2, ac, i_hitPos, &sp10, NULL, atType); } else { u16 hitmark; if (i_tgObjInf->GetTgHitMark() == 3) { @@ -534,7 +534,7 @@ void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_O u32 atType = i_atObjInf->GetAtType(); fopAc_ac_c* ac = i_tgObjInf->GetAc(); - i_dComIfGp_setHitMark(hitmark, ac, i_hitPos, &sp10, NULL, atType); + dComIfGp_setHitMark(hitmark, ac, i_hitPos, &sp10, NULL, atType); } } } @@ -546,7 +546,7 @@ void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_O fopAc_ac_c* ac = i_tgObjInf->GetAc(); u16 hitmark = i_tgObjInf->GetTgHitMark(); - i_dComIfGp_setHitMark(hitmark, ac, i_hitPos, &sp8, NULL, atType); + dComIfGp_setHitMark(hitmark, ac, i_hitPos, &sp8, NULL, atType); } } } diff --git a/src/d/cc/d_cc_uty.cpp b/src/d/cc/d_cc_uty.cpp index 72c0b908d0f..1b909460a9e 100644 --- a/src/d/cc/d_cc_uty.cpp +++ b/src/d/cc/d_cc_uty.cpp @@ -16,7 +16,7 @@ bool daPy_py_c::checkWoodSwordEquip() { } BOOL daPy_py_c::checkNowWolf() { - return dComIfGp_getLinkPlayer()->i_checkWolf(); + return dComIfGp_getLinkPlayer()->checkWolf(); } /* 803AC418-803AC500 009538 00E8+00 1/1 0/0 0/0 .data plCutLRC */ diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 720eb7a4d46..c973b8743d5 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -468,18 +468,18 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room // Stage is Snowpeak Ruins or Snowpeak if (!strcmp(i_stageName, "D_MN11") || !strcmp(i_stageName, "F_SP114")) { // Cleared Snowpeak Ruins - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[266])) { o_layer = 3; } // Talked with Yeta after giving Cheese - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[163])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[163])) { o_layer = 2; } // Talked with Yeta after giving Pumpkin - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[162])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[162])) { o_layer = 1; } @@ -489,24 +489,24 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "F_SP108")) { // Cleared Snowpeak Ruins - if (i_dComIfGs_isEventBit(0x2008)) { + if (dComIfGs_isEventBit(0x2008)) { o_layer = 5; } // Completed Midna's Desperate Hour - else if (i_dComIfGs_isEventBit(0x1E08)) + else if (dComIfGs_isEventBit(0x1E08)) { o_layer = 3; } // Cleared Forest Temple - else if (i_dComIfGs_isEventBit(0x0602)) + else if (dComIfGs_isEventBit(0x0602)) { o_layer = 2; } // Haven't finished Ordon Day 2 - else if (!i_dComIfGs_isEventBit(0x4510)) + else if (!dComIfGs_isEventBit(0x4510)) { o_layer = 1; } @@ -516,12 +516,12 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "R_SP108")) { // Cleared Forest Temple - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[55])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[55])) { o_layer = 2; } // Haven't finished Ordon Day 2 - else if (!i_dComIfGs_isEventBit(0x4510)) + else if (!dComIfGs_isEventBit(0x4510)) { o_layer = 1; } @@ -531,39 +531,39 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "F_SP109") || !strcmp(i_stageName, "F_SP111")) { // Obtained Zora's Armor - if (i_dComIfGs_isEventBit(0x0804)) { + if (dComIfGs_isEventBit(0x0804)) { o_layer = 2; dComIfG_get_timelayer(&o_layer); } // Finished Telma Wagon Escort - else if (i_dComIfGs_isEventBit(0x0810)) + else if (dComIfGs_isEventBit(0x0810)) { o_layer = 4; } // Watched cutscene after leaving Goron Mines - else if (i_dComIfGs_isEventBit(0x1320)) + else if (dComIfGs_isEventBit(0x1320)) { o_layer = 2; dComIfG_get_timelayer(&o_layer); } // Cleared Goron Mines - else if (i_dComIfGs_isEventBit(0x0701)) + else if (dComIfGs_isEventBit(0x0701)) { o_layer = 12; } // Defeated King Bulblin 1 - else if (i_dComIfGs_isEventBit(0x0A08)) + else if (dComIfGs_isEventBit(0x0A08)) { o_layer = 2; dComIfG_get_timelayer(&o_layer); } // King Bulblin 1 trigger activated - else if (i_dComIfGs_isEventBit(0x0608)) + else if (dComIfGs_isEventBit(0x0608)) { o_layer = 1; } @@ -574,19 +574,19 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room { // Stage is Kakariko Interiors and room is Barnes shop and Cleared Lakebed Temple if (!strcmp(i_stageName, "R_SP109") && i_roomNo == 1 && - i_dComIfGs_isEventBit(0x0904)) + dComIfGs_isEventBit(0x0904)) { o_layer = 4; dComIfG_get_timelayer(&o_layer); } else { // Defeated King Bulblin 1 - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[85])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[85])) { o_layer = 2; dComIfG_get_timelayer(&o_layer); } // King Bulblin 1 trigger activated - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[53])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[53])) { o_layer = 1; } @@ -597,7 +597,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "F_SP110")) { // Cleared Goron Mines - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[64])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[64])) { o_layer = 2; } } @@ -606,24 +606,24 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "R_SP110")) { // Returned Wood Statue to Ilia - if (i_dComIfGs_isEventBit(0x2320)) { + if (dComIfGs_isEventBit(0x2320)) { o_layer = 3; } // Cleared Temple of Time - else if (i_dComIfGs_isEventBit(0x2004)) + else if (dComIfGs_isEventBit(0x2004)) { o_layer = 4; } // Obtained Master Sword - else if (i_dComIfGs_isEventBit(0x2020)) + else if (dComIfGs_isEventBit(0x2020)) { o_layer = 2; } // Cleared Goron Mines - else if (i_dComIfGs_isEventBit(0x0701)) + else if (dComIfGs_isEventBit(0x0701)) { o_layer = 1; } @@ -637,18 +637,18 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room // Stage is Lake Hylia and room is Lake if (!strcmp(i_stageName, "F_SP115") && i_roomNo == 0) { // Repaired Sky Cannon - if (i_dComIfGs_isEventBit(0x3B08)) { + if (dComIfGs_isEventBit(0x3B08)) { o_layer = 3; } // Warped Sky Cannon to Lake Hylia - else if (i_dComIfGs_isEventBit(0x3120)) + else if (dComIfGs_isEventBit(0x3120)) { o_layer = 1; } // Cleared Lakebed Temple - else if (i_dComIfGs_isEventBit(0x0904)) + else if (dComIfGs_isEventBit(0x0904)) { o_layer = 2; } @@ -656,13 +656,13 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room // Stage is Telma's Bar and room is Bar and Obtained Master Sword else if (!strcmp(i_stageName, "R_SP116") && i_roomNo == 5 && - i_dComIfGs_isEventBit(0x2020)) + dComIfGs_isEventBit(0x2020)) { o_layer = 4; } // Completed Midna's Desperate Hour and Stage is Castle Town - else if (i_dComIfGs_isEventBit(0x1E08) && !strcmp(i_stageName, "F_SP116")) + else if (dComIfGs_isEventBit(0x1E08) && !strcmp(i_stageName, "F_SP116")) { // Room is not East, South, or North Castle Town if (i_roomNo != 4 && i_roomNo != 3 && i_roomNo != 1) { @@ -672,11 +672,11 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room } } else { // Cleared Lakebed Temple - if (i_dComIfGs_isEventBit(0x0904)) { + if (dComIfGs_isEventBit(0x0904)) { // Stage is Lake Hylia and room is Fountain and haven't started Midna's // Desperate Hour if ((!strcmp(i_stageName, "F_SP115") && i_roomNo == 1) && - !i_dComIfGs_isEventBit(0x0C01)) + !dComIfGs_isEventBit(0x0C01)) { o_layer = 9; } else { @@ -686,7 +686,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room // Stage is Castle Town and room is South Castle Town and Finished Telma // Wagon Escort if ((!strcmp(i_stageName, "F_SP116") && i_roomNo == 3) && - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) { o_layer = 1; } @@ -698,7 +698,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "F_SP113")) { // Cleared Snowpeak Ruins - if (i_dComIfGs_isEventBit(0x2008)) { + if (dComIfGs_isEventBit(0x2008)) { o_layer = 2; } } @@ -707,7 +707,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "F_SP126")) { // Unlocked Iza's River Ride (1) - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[95])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[95])) { o_layer = 1; } } @@ -718,7 +718,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room o_layer = 8; // Used Sky Cannon to go to Desert - if (i_dComIfGs_isEventBit(0x4008)) { + if (dComIfGs_isEventBit(0x4008)) { o_layer = 0; } } @@ -727,12 +727,12 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "F_SP112")) { // Unlocked Iza's River Ride (1) - if (i_dComIfGs_isEventBit(0x0B01)) { + if (dComIfGs_isEventBit(0x0B01)) { o_layer = 1; } // Started Iza's River Ride (1) - else if (i_dComIfGs_isEventBit(0x0902)) + else if (dComIfGs_isEventBit(0x0902)) { o_layer = 2; } @@ -744,7 +744,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room // Room is Main Village if (i_roomNo == 0) { // Tamed Epona - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[56])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[56])) { o_layer = 4; dComIfG_get_timelayer(&o_layer); } @@ -757,19 +757,19 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room } // Escaped Hyrule Castle Sewers (1st Time) - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { o_layer = 1; } // Finished Ordon Day 2 - else if (i_dComIfGs_isEventBit(0x4510)) + else if (dComIfGs_isEventBit(0x4510)) { o_layer = 7; } // Finished Ordon Day 1 - else if (i_dComIfGs_isEventBit(0x4A40)) + else if (dComIfGs_isEventBit(0x4A40)) { o_layer = 0; } else { @@ -786,19 +786,19 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room } // Escaped Hyrule Castle Sewers (1st Time) - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { o_layer = 1; } // Finished Ordon Day 2 - else if (i_dComIfGs_isEventBit(0x4510)) + else if (dComIfGs_isEventBit(0x4510)) { o_layer = 0; } // Finished Ordon Day 1 - else if (i_dComIfGs_isEventBit(0x4A40)) + else if (dComIfGs_isEventBit(0x4A40)) { o_layer = 4; } else { @@ -822,7 +822,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (i_roomNo == 2) { // Watched cutscene after defeating King Bulblin 1 - if (i_dComIfGs_isEventBit(0x0780)) { + if (dComIfGs_isEventBit(0x0780)) { o_layer = 3; } @@ -833,7 +833,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room } // Escaped Hyrule Castle Sewers (1st Time) - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { o_layer = 1; } @@ -843,7 +843,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (i_roomNo == 5) { // Tamed Epona - if (i_dComIfGs_isEventBit(0x0601)) { + if (dComIfGs_isEventBit(0x0601)) { o_layer = 4; } @@ -866,19 +866,19 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room } // Escaped Hyrule Castle Sewers (1st Time) - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { o_layer = 4; } // Finished Ordon Day 2 - else if (i_dComIfGs_isEventBit(0x4510)) + else if (dComIfGs_isEventBit(0x4510)) { o_layer = 0; } // Finished Ordon Day 1 - else if (i_dComIfGs_isEventBit(0x4A20)) + else if (dComIfGs_isEventBit(0x4A20)) { o_layer = 3; } else { @@ -893,7 +893,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room } // Escaped Hyrule Castle Sewers (1st Time) - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { o_layer = 4; } @@ -909,25 +909,25 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room } // Escaped Hyrule Castle Sewers (1st Time) - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { o_layer = 1; } // Watched cutscene after herding goats on Ordon Day 3 - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[169])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[169])) { o_layer = 10; } // Finished Ordon Day 2 - else if (i_dComIfGs_isEventBit(0x4510)) + else if (dComIfGs_isEventBit(0x4510)) { o_layer = 9; } // Finished Ordon Day 1 - else if (i_dComIfGs_isEventBit(0x4A40)) + else if (dComIfGs_isEventBit(0x4A40)) { o_layer = 11; } else { @@ -939,18 +939,18 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "F_SP121")) { // Completed Midna's Desperate Hour - if (i_dComIfGs_isEventBit(0x1E08)) { + if (dComIfGs_isEventBit(0x1E08)) { o_layer = 6; } // Started Midna's Desperate Hour - else if (i_dComIfGs_isEventBit(0x0C01)) + else if (dComIfGs_isEventBit(0x0C01)) { o_layer = 4; } // Finished Telma Wagon Escort - else if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) + else if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) { o_layer = 0; } @@ -971,12 +971,12 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room // Room is Outside Castle Town - West if (i_roomNo == 8) { // Completed Midna's Desperate Hour - if (i_dComIfGs_isEventBit(0x1E08)) { + if (dComIfGs_isEventBit(0x1E08)) { o_layer = 6; } // Started Midna's Desperate Hour - else if (i_dComIfGs_isEventBit(0x0C01)) + else if (dComIfGs_isEventBit(0x0C01)) { o_layer = 4; } @@ -986,24 +986,24 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (i_roomNo == 16) { // Obtained Wood Statue - if (i_dComIfGs_isEventBit(0x2204)) { + if (dComIfGs_isEventBit(0x2204)) { o_layer = 6; } // Talked to Louise after getting Medicine Scent - else if (i_dComIfGs_isEventBit(0x2102)) + else if (dComIfGs_isEventBit(0x2102)) { o_layer = 1; } // Completed Midna's Desperate Hour - else if (i_dComIfGs_isEventBit(0x1E08)) + else if (dComIfGs_isEventBit(0x1E08)) { o_layer = 6; } // Started Midna's Desperate Hour - else if (i_dComIfGs_isEventBit(0x0C01)) + else if (dComIfGs_isEventBit(0x0C01)) { o_layer = 4; } @@ -1013,12 +1013,12 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (i_roomNo == 17) { // Completed Midna's Desperate Hour - if (i_dComIfGs_isEventBit(0x1E08)) { + if (dComIfGs_isEventBit(0x1E08)) { o_layer = 0; } // Started Midna's Desperate Hour - else if (i_dComIfGs_isEventBit(0x0C01)) + else if (dComIfGs_isEventBit(0x0C01)) { o_layer = 4; } @@ -1028,7 +1028,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room // Stage is Hidden Village else if (!strcmp(i_stageName, "F_SP128")) { - if (i_dComIfGs_isEventBit(0x2320)) { + if (dComIfGs_isEventBit(0x2320)) { o_layer = 1; } } @@ -1039,7 +1039,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room // Room is Jovani's house if (i_roomNo == 5) { // Completed Midna's Desperate Hour - if (i_dComIfGs_isEventBit(0x1E08)) { + if (dComIfGs_isEventBit(0x1E08)) { o_layer = 0; } else { o_layer = 1; @@ -1047,7 +1047,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room } // Fundraised Malo Mart Castle Town branch - else if (i_dComIfGs_isEventBit(0x2210)) + else if (dComIfGs_isEventBit(0x2210)) { o_layer = 1; } @@ -1057,7 +1057,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "F_SP117")) { // Cleared Snowpeak Ruins - if (i_dComIfGs_isEventBit(0x2008)) { + if (dComIfGs_isEventBit(0x2008)) { o_layer = 2; } } @@ -1066,18 +1066,18 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "F_SP118")) { // Fixed the Mirror of Twilight - if (i_dComIfGs_isEventBit(0x2B08)) { + if (dComIfGs_isEventBit(0x2B08)) { o_layer = 3; } // Cleared Arbiter's Grounds - else if (i_dComIfGs_isEventBit(0x2010)) + else if (dComIfGs_isEventBit(0x2010)) { o_layer = 2; } // Escaped the burning tent - else if (i_dComIfGs_isEventBit(0x0B40)) + else if (dComIfGs_isEventBit(0x0B40)) { o_layer = 1; } @@ -1087,7 +1087,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "D_SB10")) { // Finished Ordon Day 2 - if (i_dComIfGs_isEventBit(0x4510)) { + if (dComIfGs_isEventBit(0x4510)) { o_layer = 1; } } @@ -1133,7 +1133,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room if (o_layer == 14) { int roomNo = i_roomNo; // Warped meteor to Zora's Domain - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[65])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[65])) { // Stage is Zora's River, Zora's Domain, Lake Hylia, Castle Town, Telma's Bar, R_SP115, // Hyrule Field, Upper Zora's River, or Outside Castle Town if (!strcmp(i_stageName, "F_SP112") || !strcmp(i_stageName, "F_SP113") || @@ -1156,7 +1156,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room // Stage is Hyrule Castle Sewers and room is Prison Cell if (!strcmp(i_stageName, "R_SP107") && i_roomNo == 0) { // Haven't been to Hyrule Castle Sewers - if (!i_dComIfGs_isEventBit(0x4D08)) { + if (!dComIfGs_isEventBit(0x4D08)) { o_layer = 11; } } @@ -1164,7 +1164,7 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room else if (!strcmp(i_stageName, "D_MN08A") && i_roomNo == 10) { // Defeated Zant - if (i_dComIfGs_isEventBit(0x5410)) { + if (dComIfGs_isEventBit(0x5410)) { o_layer = 1; } else { o_layer = 0; @@ -1874,7 +1874,7 @@ void dComIfGp_mapHide() { } bool dComIfGp_checkMapShow() { - return !i_dComIfGs_isEventBit(dSv_event_flag_c::MAP_VISIBLE); + return !dComIfGs_isEventBit(dSv_event_flag_c::MAP_VISIBLE); } /* 8002E0E0-8002E188 028A20 00A8+00 0/0 9/9 0/0 .text dComIfGp_setHeapLockFlag__FUc */ @@ -1986,8 +1986,8 @@ u8 dComIfGs_checkGetInsectNum() { for (int i = 0; i < ARRAY_SIZE(l_itemno); i++) { u8 insectId = *insectList; insectList++; - if (i_dComIfGs_isItemFirstBit(insectId) && - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) + if (dComIfGs_isItemFirstBit(insectId) && + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) { insectCount++; } @@ -2539,7 +2539,7 @@ BOOL dComIfGs_Wolf_Change_Check() { BOOL is_wolf = false; // Transforming Unlocked - if (i_dComIfGs_isEventBit(0x0D04)) { + if (dComIfGs_isEventBit(0x0D04)) { is_wolf = dComIfGs_getTransformStatus(); } else if (dComIfGs_isTransformLV(0) && !dComIfGs_isDarkClearLV(0)) { is_wolf = true; @@ -2591,7 +2591,7 @@ bool dComIfGs_shake_kandelaar_check() { /* 8002FA54-8002FA84 02A394 0030+00 0/0 4/4 96/96 .text dComIfGs_wolfeye_effect_check__Fv */ BOOL dComIfGs_wolfeye_effect_check() { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); BOOL ret = false; if (env_light->field_0xf3d == 1 && env_light->field_0xf40 > 0.6) { diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp index 7806e885ae9..65fcef927c4 100644 --- a/src/d/com/d_com_static.cpp +++ b/src/d/com/d_com_static.cpp @@ -595,7 +595,7 @@ int daTagMagne_c::checkMagnetCode(cBgS_PolyInfo& poly) { /* 80031BF4-80031C48 02C534 0054+00 1/1 0/0 0/0 .text checkMagneA__12daTagMagne_cFv */ int daTagMagne_c::checkMagneA() { - if (mSwNo1 == 0xFF || i_fopAcM_isSwitch(this, mSwNo1)) { + if (mSwNo1 == 0xFF || fopAcM_isSwitch(this, mSwNo1)) { return 1; } @@ -604,7 +604,7 @@ int daTagMagne_c::checkMagneA() { /* 80031C48-80031C9C 02C588 0054+00 1/1 0/0 0/0 .text checkMagneB__12daTagMagne_cFv */ int daTagMagne_c::checkMagneB() { - if (mSwNo2 == 0xFF || i_fopAcM_isSwitch(this, mSwNo2)) { + if (mSwNo2 == 0xFF || fopAcM_isSwitch(this, mSwNo2)) { return 1; } @@ -613,7 +613,7 @@ int daTagMagne_c::checkMagneB() { /* 80031C9C-80031CF0 02C5DC 0054+00 1/1 0/0 0/0 .text checkMagneC__12daTagMagne_cFv */ int daTagMagne_c::checkMagneC() { - if (mSwNo3 == 0xFF || i_fopAcM_isSwitch(this, mSwNo3)) { + if (mSwNo3 == 0xFF || fopAcM_isSwitch(this, mSwNo3)) { return 1; } diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 9069b354d8c..c5b20338e4f 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -1277,8 +1277,8 @@ void dAttention_c::runDrawProc() { draw[0].field_0x164.z = mAttParam.mAttnCursorOffsetY; draw[0].field_0x175 = 1; - if (!i_dComIfGp_checkPlayerStatus0(0, 0x36a02311) || - i_dComIfGp_checkPlayerStatus1(0, 0x11)) { + if (!dComIfGp_checkPlayerStatus0(0, 0x36a02311) || + dComIfGp_checkPlayerStatus1(0, 0x11)) { lockSoundStart(Z2SE_SY_L_FOCUS_SET); } } else if (chkFlag(0x10)) { @@ -1288,8 +1288,8 @@ void dAttention_c::runDrawProc() { setFlag(0x40000000); } - if (!i_dComIfGp_checkPlayerStatus0(0, 0x36a02311) || - i_dComIfGp_checkPlayerStatus1(0, 0x11)) { + if (!dComIfGp_checkPlayerStatus0(0, 0x36a02311) || + dComIfGp_checkPlayerStatus1(0, 0x11)) { lockSoundStart(Z2SE_SY_L_FOCUS_RESET); } } else if (chkFlag(0x1)) { @@ -1341,7 +1341,7 @@ void dAttention_c::checkButton() { } } - if (i_dComIfGp_checkPlayerStatus0(0, 0x36a02311) || i_dComIfGp_checkPlayerStatus1(0, 0x11)) { + if (dComIfGp_checkPlayerStatus0(0, 0x36a02311) || dComIfGp_checkPlayerStatus1(0, 0x11)) { switch (field_0x32b) { case 0: case 1: @@ -1618,7 +1618,7 @@ int dAttention_c::Run() { setOwnerAttentionPos(); - if (i_dComIfGp_event_runCheck() || chkFlag(0x10000)) { + if (dComIfGp_event_runCheck() || chkFlag(0x10000)) { mAttnStatus = ST_NONE; field_0x32b = 4; field_0x32c = 0; @@ -1694,7 +1694,7 @@ void dAttention_c::Draw() { MTXInverse(dComIfGd_getViewRotMtx(), tmp); fopAc_ac_c* target = LockonTarget(0); - if (!i_dComIfGp_event_runCheck()) { + if (!dComIfGp_event_runCheck()) { if (target != NULL) { draw[0].draw(target->attention_info.position, tmp); @@ -1877,7 +1877,7 @@ void dAttDraw_c::draw(cXyz& param_0, Mtx param_1) { mDoMtx_stack_c::transS(param_0.x, param_0.y + field_0x164.z, param_0.z); mDoMtx_stack_c::concat(param_1); - mModel[field_0x170]->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mModel[field_0x170]->setBaseTRMtx(mDoMtx_stack_c::get()); view_class* view = dComIfGd_getView(); f32 temp_f31 = tan(0.01745329238474369f * (0.5f * view->mFovy)); @@ -1927,7 +1927,7 @@ asm void dAttDraw_c::draw(cXyz& param_0, Mtx param_1) { /* 8007353C-800735DC 06DE7C 00A0+00 8/8 13/13 21/21 .text LockonTarget__12dAttention_cFl */ fopAc_ac_c* dAttention_c::LockonTarget(s32 param_0) { - if (i_dComIfGp_checkPlayerStatus0(0, 0x36A02311) || i_dComIfGp_checkPlayerStatus1(0, 0x11)) { + if (dComIfGp_checkPlayerStatus0(0, 0x36A02311) || dComIfGp_checkPlayerStatus1(0, 0x11)) { return NULL; } @@ -1981,7 +1981,7 @@ asm f32 dAttention_c::LockonReleaseDistanse() { /* 800736CC-80073734 06E00C 0068+00 2/2 0/0 0/0 .text LockonTargetPId__12dAttention_cFl */ u32 dAttention_c::LockonTargetPId(s32 param_0) { - if (i_dComIfGp_checkPlayerStatus0(0, 0x36A02311) || i_dComIfGp_checkPlayerStatus1(0, 0x11)) { + if (dComIfGp_checkPlayerStatus0(0, 0x36A02311) || dComIfGp_checkPlayerStatus1(0, 0x11)) { return -1; } diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index aee56653466..26930fba20b 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -1671,7 +1671,7 @@ s32 dDemo_actor_c::JSGFindNodeID(char const* param_0) const { /* 8003A088-8003A0C8 0349C8 0040+00 1/0 0/0 0/0 .text * JSGGetNodeTransformation__13dDemo_actor_cCFUlPA4_f */ int dDemo_actor_c::JSGGetNodeTransformation(u32 param_0, Mtx param_1) const { - MTXCopy(mModel->i_getAnmMtx((u16)param_0), param_1); + MTXCopy(mModel->getAnmMtx((u16)param_0), param_1); return 1; } diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index cc3686d0b89..4d430fe228a 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -1888,7 +1888,7 @@ SECTION_SDATA2 static f32 lit_5156 = 13.0f / 20.0f; // matches with literals #ifdef NONMATCHING static void setkankyoShadow(dKy_tevstr_c* param_0, f32* param_1) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); if (param_0 != NULL) { *param_1 *= param_0->field_0x344; @@ -2037,7 +2037,7 @@ asm u8 dDlst_shadowReal_c::setShadowRealMtx(cXyz* param_0, cXyz* param_1, f32 pa * set__18dDlst_shadowReal_cFUlP8J3DModelP4cXyzffP12dKy_tevstr_cff */ u32 dDlst_shadowReal_c::set(u32 i_key, J3DModel* i_model, cXyz* param_2, f32 param_3, f32 param_4, dKy_tevstr_c* param_5, f32 i_cameraZ, f32 param_7) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); if (mModelNum == 0) { cXyz sp60; diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index 5c59947f31e..c75b9822d61 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -153,7 +153,7 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par int i = i_soundInf->num; stage_sound_data* data_p = i_soundInf->entries; - cXyz cam_eye = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0))->mCamera.Eye(); + cXyz cam_eye = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))->mCamera.Eye(); if (param_2 == 0) { path_roomNo = -1; @@ -278,9 +278,9 @@ int dEnvSe_c::execute() { execute_common(roomDt_p->getSoundInfCL(), &field_0xfc, 1); execute_common(roomDt_p->getSoundInf(), &field_0xfd, 1); - execute_common(i_dComIfGp_getStage()->getSoundInfCL(), &field_0xfe, 0); + execute_common(dComIfGp_getStage()->getSoundInfCL(), &field_0xfe, 0); - return execute_common(i_dComIfGp_getStage()->getSoundInf(), &field_0xff, 0); + return execute_common(dComIfGp_getStage()->getSoundInf(), &field_0xff, 0); } /* 801835A0-801835C0 17DEE0 0020+00 1/0 0/0 0/0 .text dEnvSe_Execute__FP8dEnvSe_c */ diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index f54dfd8f8bb..d78b75f9989 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -250,8 +250,8 @@ int dCamera_c::EndEventCamera(int param_0) { i_clrFlag(0x20000000); mEventData.field_0x0 = 1; - if (i_dComIfGp_getEvent().runCheck()) { - i_dComIfGp_getEventManager().setCameraPlay(2); + if (dComIfGp_getEvent().runCheck()) { + dComIfGp_getEventManager().setCameraPlay(2); } return 1; diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index 382520c8f08..bd958130b1e 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -45,7 +45,7 @@ dEyeHL_c* dEyeHL_mng_c::m_obj; void dEyeHL_mng_c::update() { dEyeHL_c* obj = m_obj; - if (g_envHIO.mOther.mLODBias == 0 || !i_dComIfGp_event_runCheck()) { + if (g_envHIO.mOther.mLODBias == 0 || !dComIfGp_event_runCheck()) { for (; obj != NULL; obj = obj->m_next) { obj->m_timg->LODBias = obj->m_lodBias; } diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index d8933b19676..f708983b8d8 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -770,13 +770,13 @@ void dGameover_c::saveClose_proc() { dComIfGp_offPauseFlag(); // Reset Monkey lantern steal sequence flags if player hasn't regained lantern - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]); dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]); } // Reset Lantern and oil status back into inventory if gameover during monkey steal sequence - if (i_dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) { + if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) { dComIfGs_setItem(SLOT_1, KANTERA); dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp()); } diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index 17e2d28d45b..41df33357d2 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -57,8 +57,8 @@ void dInsect_c::Insect_GetDemoMain() { break; case 2: if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) { - i_dComIfGp_event_reset(); - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[m_saveBitNo]) || + dComIfGp_event_reset(); + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[m_saveBitNo]) || field_0x585 != 0) { mDraw = true; diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index c386a4f418d..00820e4fd4d 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -549,35 +549,35 @@ int checkItemGet(u8 i_itemNo, int i_default) { } void item_func_HEART() { - i_dComIfGp_setItemLifeCount(4.0f, 0); + dComIfGp_setItemLifeCount(4.0f, 0); } void item_func_GREEN_RUPEE() { - i_dComIfGp_setItemRupeeCount(1); + dComIfGp_setItemRupeeCount(1); } void item_func_BLUE_RUPEE() { - i_dComIfGp_setItemRupeeCount(5); + dComIfGp_setItemRupeeCount(5); } void item_func_YELLOW_RUPEE() { - i_dComIfGp_setItemRupeeCount(10); + dComIfGp_setItemRupeeCount(10); } void item_func_RED_RUPEE() { - i_dComIfGp_setItemRupeeCount(20); + dComIfGp_setItemRupeeCount(20); } void item_func_PURPLE_RUPEE() { - i_dComIfGp_setItemRupeeCount(50); + dComIfGp_setItemRupeeCount(50); } void item_func_ORANGE_RUPEE() { - i_dComIfGp_setItemRupeeCount(100); + dComIfGp_setItemRupeeCount(100); } void item_func_SILVER_RUPEE() { - i_dComIfGp_setItemRupeeCount(200); + dComIfGp_setItemRupeeCount(200); } void item_func_S_MAGIC() { @@ -655,7 +655,7 @@ void item_func_BOMB_INSECT_20() { void item_func_BOMB_INSECT_30() {} void item_func_RECOVER_FAILY() { - i_dComIfGp_setItemLifeCount(32.0f, 0); + dComIfGp_setItemLifeCount(32.0f, 0); } void item_func_TRIPLE_HEART() {} @@ -672,7 +672,7 @@ void item_func_UTUWA_HEART() { dComIfGp_setItemMaxLifeCount(5); f32 max_life = dComIfGs_getMaxLifeGauge(); - i_dComIfGp_setItemLifeCount(max_life, 0); + dComIfGp_setItemLifeCount(max_life, 0); stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); int tmp = i_dStage_stagInfo_GetSaveTbl(stag_info); @@ -1168,7 +1168,7 @@ void item_func_LV7_DUNGEON_EXIT() { } void item_func_LINKS_SAVINGS() { - i_dComIfGp_setItemRupeeCount(50); + dComIfGp_setItemRupeeCount(50); } void item_func_SMALL_KEY2() { @@ -1224,31 +1224,31 @@ int item_getcheck_func_HEART() { } int item_getcheck_func_GREEN_RUPEE() { - return i_dComIfGs_isItemFirstBit(GREEN_RUPEE); + return dComIfGs_isItemFirstBit(GREEN_RUPEE); } int item_getcheck_func_BLUE_RUPEE() { - return i_dComIfGs_isItemFirstBit(BLUE_RUPEE); + return dComIfGs_isItemFirstBit(BLUE_RUPEE); } int item_getcheck_func_YELLOW_RUPEE() { - return i_dComIfGs_isItemFirstBit(YELLOW_RUPEE); + return dComIfGs_isItemFirstBit(YELLOW_RUPEE); } int item_getcheck_func_RED_RUPEE() { - return i_dComIfGs_isItemFirstBit(RED_RUPEE); + return dComIfGs_isItemFirstBit(RED_RUPEE); } int item_getcheck_func_PURPLE_RUPEE() { - return i_dComIfGs_isItemFirstBit(PURPLE_RUPEE); + return dComIfGs_isItemFirstBit(PURPLE_RUPEE); } int item_getcheck_func_ORANGE_RUPEE() { - return i_dComIfGs_isItemFirstBit(ORANGE_RUPEE); + return dComIfGs_isItemFirstBit(ORANGE_RUPEE); } int item_getcheck_func_SILVER_RUPEE() { - return i_dComIfGs_isItemFirstBit(SILVER_RUPEE); + return dComIfGs_isItemFirstBit(SILVER_RUPEE); } int item_getcheck_func_S_MAGIC() { @@ -1260,39 +1260,39 @@ int item_getcheck_func_L_MAGIC() { } int item_getcheck_func_BOMB_5() { - return i_dComIfGs_isItemFirstBit(BOMB_5); + return dComIfGs_isItemFirstBit(BOMB_5); } int item_getcheck_func_BOMB_10() { - return i_dComIfGs_isItemFirstBit(BOMB_10); + return dComIfGs_isItemFirstBit(BOMB_10); } int item_getcheck_func_BOMB_20() { - return i_dComIfGs_isItemFirstBit(BOMB_20); + return dComIfGs_isItemFirstBit(BOMB_20); } int item_getcheck_func_BOMB_30() { - return i_dComIfGs_isItemFirstBit(BOMB_30); + return dComIfGs_isItemFirstBit(BOMB_30); } int item_getcheck_func_ARROW_10() { - return i_dComIfGs_isItemFirstBit(ARROW_10); + return dComIfGs_isItemFirstBit(ARROW_10); } int item_getcheck_func_ARROW_20() { - return i_dComIfGs_isItemFirstBit(ARROW_20); + return dComIfGs_isItemFirstBit(ARROW_20); } int item_getcheck_func_ARROW_30() { - return i_dComIfGs_isItemFirstBit(ARROW_30); + return dComIfGs_isItemFirstBit(ARROW_30); } int item_getcheck_func_ARROW_1() { - return i_dComIfGs_isItemFirstBit(ARROW_1); + return dComIfGs_isItemFirstBit(ARROW_1); } int item_getcheck_func_PACHINKO_SHOT() { - return i_dComIfGs_isItemFirstBit(PACHINKO_SHOT); + return dComIfGs_isItemFirstBit(PACHINKO_SHOT); } int item_getcheck_func_WATER_BOMB_5() { @@ -1316,15 +1316,15 @@ int item_getcheck_func_BOMB_INSECT_5() { } int item_getcheck_func_BOMB_INSECT_10() { - return i_dComIfGs_isItemFirstBit(BOMB_INSECT_10); + return dComIfGs_isItemFirstBit(BOMB_INSECT_10); } int item_getcheck_func_BOMB_INSECT_20() { - return i_dComIfGs_isItemFirstBit(BOMB_INSECT_20); + return dComIfGs_isItemFirstBit(BOMB_INSECT_20); } int item_getcheck_func_BOMB_INSECT_30() { - return i_dComIfGs_isItemFirstBit(BOMB_INSECT_30); + return dComIfGs_isItemFirstBit(BOMB_INSECT_30); } int item_getcheck_func_RECOVER_FAILY() { @@ -1376,15 +1376,15 @@ int item_getcheck_func_MASTER_SWORD() { } int item_getcheck_func_WOOD_SHIELD() { - return i_dComIfGs_isItemFirstBit(WOOD_SHIELD); + return dComIfGs_isItemFirstBit(WOOD_SHIELD); } int item_getcheck_func_SHIELD() { - return i_dComIfGs_isItemFirstBit(SHIELD); + return dComIfGs_isItemFirstBit(SHIELD); } int item_getcheck_func_HYLIA_SHIELD() { - return i_dComIfGs_isItemFirstBit(HYLIA_SHIELD); + return dComIfGs_isItemFirstBit(HYLIA_SHIELD); } int item_getcheck_func_TKS_LETTER() { @@ -1392,7 +1392,7 @@ int item_getcheck_func_TKS_LETTER() { } int item_getcheck_func_WEAR_CASUAL() { - return i_dComIfGs_isItemFirstBit(WEAR_CASUAL); + return dComIfGs_isItemFirstBit(WEAR_CASUAL); } int item_getcheck_func_WEAR_KOKIRI() { @@ -1400,11 +1400,11 @@ int item_getcheck_func_WEAR_KOKIRI() { } int item_getcheck_func_ARMOR() { - return i_dComIfGs_isItemFirstBit(ARMOR); + return dComIfGs_isItemFirstBit(ARMOR); } int item_getcheck_func_WEAR_ZORA() { - return i_dComIfGs_isItemFirstBit(WEAR_ZORA); + return dComIfGs_isItemFirstBit(WEAR_ZORA); } int item_getcheck_func_MAGIC_LV1() { @@ -1432,11 +1432,11 @@ int item_getcheck_func_ZORAS_JEWEL() { } int item_getcheck_func_HAWK_EYE() { - return i_dComIfGs_isItemFirstBit(HAWK_EYE); + return dComIfGs_isItemFirstBit(HAWK_EYE); } int item_getcheck_func_WOOD_STICK() { - return i_dComIfGs_isItemFirstBit(WOOD_STICK); + return dComIfGs_isItemFirstBit(WOOD_STICK); } int item_getcheck_func_BOOMERANG() { @@ -1500,19 +1500,19 @@ int item_getcheck_func_COPY_ROD_2() { } int item_getcheck_func_BOMB_BAG_LV2() { - return i_dComIfGs_isItemFirstBit(BOMB_BAG_LV2); + return dComIfGs_isItemFirstBit(BOMB_BAG_LV2); } int item_getcheck_func_BOMB_BAG_LV1() { - return i_dComIfGs_isItemFirstBit(BOMB_BAG_LV1); + return dComIfGs_isItemFirstBit(BOMB_BAG_LV1); } int item_getcheck_func_BOMB_IN_BAG() { - return i_dComIfGs_isItemFirstBit(BOMB_IN_BAG); + return dComIfGs_isItemFirstBit(BOMB_IN_BAG); } int item_getcheck_func_LIGHT_ARROW() { - return i_dComIfGs_isItemFirstBit(LIGHT_ARROW); + return dComIfGs_isItemFirstBit(LIGHT_ARROW); } int item_getcheck_func_ARROW_LV1() { @@ -1624,15 +1624,15 @@ int item_getcheck_func_OIL() { } int item_getcheck_func_NORMAL_BOMB() { - return i_dComIfGs_isItemFirstBit(NORMAL_BOMB); + return dComIfGs_isItemFirstBit(NORMAL_BOMB); } int item_getcheck_func_WATER_BOMB() { - return i_dComIfGs_isItemFirstBit(WATER_BOMB); + return dComIfGs_isItemFirstBit(WATER_BOMB); } int item_getcheck_func_POKE_BOMB() { - return i_dComIfGs_isItemFirstBit(POKE_BOMB); + return dComIfGs_isItemFirstBit(POKE_BOMB); } int item_getcheck_func_FAIRY_DROP() { @@ -1644,7 +1644,7 @@ int item_getcheck_func_WORM() { } int item_getcheck_func_DROP_BOTTLE() { - return i_dComIfGs_isItemFirstBit(DROP_BOTTLE); + return dComIfGs_isItemFirstBit(DROP_BOTTLE); } int item_getcheck_func_BEE_CHILD() { @@ -1676,15 +1676,15 @@ int item_getcheck_func_CHUCHU_PURPLE() { } int item_getcheck_func_LV1_SOUP() { - return i_dComIfGs_isItemFirstBit(LV1_SOUP); + return dComIfGs_isItemFirstBit(LV1_SOUP); } int item_getcheck_func_LV2_SOUP() { - return i_dComIfGs_isItemFirstBit(LV2_SOUP); + return dComIfGs_isItemFirstBit(LV2_SOUP); } int item_getcheck_func_LV3_SOUP() { - return i_dComIfGs_isItemFirstBit(LV3_SOUP); + return dComIfGs_isItemFirstBit(LV3_SOUP); } int item_getcheck_func_LETTER() { @@ -1732,7 +1732,7 @@ int item_getcheck_func_CHUCHU_BLACK() { } int item_getcheck_func_LIGHT_DROP() { - return i_dComIfGs_isItemFirstBit(LIGHT_DROP); + return dComIfGs_isItemFirstBit(LIGHT_DROP); } int item_getcheck_func_DROP_CONTAINER() { @@ -1788,99 +1788,99 @@ int item_getcheck_func_SMELL_MEDICINE() { } int item_getcheck_func_M_BEETLE() { - return i_dComIfGs_isItemFirstBit(M_BEETLE); + return dComIfGs_isItemFirstBit(M_BEETLE); } int item_getcheck_func_F_BEETLE() { - return i_dComIfGs_isItemFirstBit(F_BEETLE); + return dComIfGs_isItemFirstBit(F_BEETLE); } int item_getcheck_func_M_BUTTERFLY() { - return i_dComIfGs_isItemFirstBit(M_BUTTERFLY); + return dComIfGs_isItemFirstBit(M_BUTTERFLY); } int item_getcheck_func_F_BUTTERFLY() { - return i_dComIfGs_isItemFirstBit(F_BUTTERFLY); + return dComIfGs_isItemFirstBit(F_BUTTERFLY); } int item_getcheck_func_M_STAG_BEETLE() { - return i_dComIfGs_isItemFirstBit(M_STAG_BEETLE); + return dComIfGs_isItemFirstBit(M_STAG_BEETLE); } int item_getcheck_func_F_STAG_BEETLE() { - return i_dComIfGs_isItemFirstBit(F_STAG_BEETLE); + return dComIfGs_isItemFirstBit(F_STAG_BEETLE); } int item_getcheck_func_M_GRASSHOPPER() { - return i_dComIfGs_isItemFirstBit(M_GRASSHOPPER); + return dComIfGs_isItemFirstBit(M_GRASSHOPPER); } int item_getcheck_func_F_GRASSHOPPER() { - return i_dComIfGs_isItemFirstBit(F_GRASSHOPPER); + return dComIfGs_isItemFirstBit(F_GRASSHOPPER); } int item_getcheck_func_M_NANAFUSHI() { - return i_dComIfGs_isItemFirstBit(M_NANAFUSHI); + return dComIfGs_isItemFirstBit(M_NANAFUSHI); } int item_getcheck_func_F_NANAFUSHI() { - return i_dComIfGs_isItemFirstBit(F_NANAFUSHI); + return dComIfGs_isItemFirstBit(F_NANAFUSHI); } int item_getcheck_func_M_DANGOMUSHI() { - return i_dComIfGs_isItemFirstBit(M_DANGOMUSHI); + return dComIfGs_isItemFirstBit(M_DANGOMUSHI); } int item_getcheck_func_F_DANGOMUSHI() { - return i_dComIfGs_isItemFirstBit(F_DANGOMUSHI); + return dComIfGs_isItemFirstBit(F_DANGOMUSHI); } int item_getcheck_func_M_MANTIS() { - return i_dComIfGs_isItemFirstBit(M_MANTIS); + return dComIfGs_isItemFirstBit(M_MANTIS); } int item_getcheck_func_F_MANTIS() { - return i_dComIfGs_isItemFirstBit(F_MANTIS); + return dComIfGs_isItemFirstBit(F_MANTIS); } int item_getcheck_func_M_LADYBUG() { - return i_dComIfGs_isItemFirstBit(M_LADYBUG); + return dComIfGs_isItemFirstBit(M_LADYBUG); } int item_getcheck_func_F_LADYBUG() { - return i_dComIfGs_isItemFirstBit(F_LADYBUG); + return dComIfGs_isItemFirstBit(F_LADYBUG); } int item_getcheck_func_M_SNAIL() { - return i_dComIfGs_isItemFirstBit(M_SNAIL); + return dComIfGs_isItemFirstBit(M_SNAIL); } int item_getcheck_func_F_SNAIL() { - return i_dComIfGs_isItemFirstBit(F_SNAIL); + return dComIfGs_isItemFirstBit(F_SNAIL); } int item_getcheck_func_M_DRAGONFLY() { - return i_dComIfGs_isItemFirstBit(M_DRAGONFLY); + return dComIfGs_isItemFirstBit(M_DRAGONFLY); } int item_getcheck_func_F_DRAGONFLY() { - return i_dComIfGs_isItemFirstBit(F_DRAGONFLY); + return dComIfGs_isItemFirstBit(F_DRAGONFLY); } int item_getcheck_func_M_ANT() { - return i_dComIfGs_isItemFirstBit(M_ANT); + return dComIfGs_isItemFirstBit(M_ANT); } int item_getcheck_func_F_ANT() { - return i_dComIfGs_isItemFirstBit(F_ANT); + return dComIfGs_isItemFirstBit(F_ANT); } int item_getcheck_func_M_MAYFLY() { - return i_dComIfGs_isItemFirstBit(M_MAYFLY); + return dComIfGs_isItemFirstBit(M_MAYFLY); } int item_getcheck_func_F_MAYFLY() { - return i_dComIfGs_isItemFirstBit(F_MAYFLY); + return dComIfGs_isItemFirstBit(F_MAYFLY); } int item_getcheck_func_POU_SPIRIT() { @@ -1932,11 +1932,11 @@ int item_getcheck_func_BOSSRIDER_KEY() { } int item_getcheck_func_TOMATO_PUREE() { - return i_dComIfGs_isItemFirstBit(TOMATO_PUREE); + return dComIfGs_isItemFirstBit(TOMATO_PUREE); } int item_getcheck_func_TASTE() { - return i_dComIfGs_isItemFirstBit(TASTE); + return dComIfGs_isItemFirstBit(TASTE); } int item_getcheck_func_LV5_BOSS_KEY() { @@ -1952,19 +1952,19 @@ int item_getcheck_func_KANTERA2() { } int item_getcheck_func_L2_KEY_PIECES1() { - return i_dComIfGs_isItemFirstBit(L2_KEY_PIECES1); + return dComIfGs_isItemFirstBit(L2_KEY_PIECES1); } int item_getcheck_func_L2_KEY_PIECES2() { - return i_dComIfGs_isItemFirstBit(L2_KEY_PIECES2); + return dComIfGs_isItemFirstBit(L2_KEY_PIECES2); } int item_getcheck_func_L2_KEY_PIECES3() { - return i_dComIfGs_isItemFirstBit(L2_KEY_PIECES3); + return dComIfGs_isItemFirstBit(L2_KEY_PIECES3); } int item_getcheck_func_KEY_OF_CARAVAN() { - return i_dComIfGs_isItemFirstBit(KEY_OF_CARAVAN); + return dComIfGs_isItemFirstBit(KEY_OF_CARAVAN); } int item_getcheck_func_LV2_BOSS_KEY() { @@ -2088,12 +2088,12 @@ u8 check_itemno(int i_itemNo) { } if (i_itemNo == ARROW_1) { - if (!i_dComIfGs_isItemFirstBit(BOW)) { + if (!dComIfGs_isItemFirstBit(BOW)) { return GREEN_RUPEE; } } else { if (isArrow(i_itemNo)) { - if (!i_dComIfGs_isItemFirstBit(BOW)) { + if (!dComIfGs_isItemFirstBit(BOW)) { return GREEN_RUPEE; } @@ -2109,7 +2109,7 @@ u8 check_itemno(int i_itemNo) { } } - if (!i_dComIfGs_isItemFirstBit(BOMB_BAG_LV1) && isBomb(i_itemNo)) { + if (!dComIfGs_isItemFirstBit(BOMB_BAG_LV1) && isBomb(i_itemNo)) { return GREEN_RUPEE; } else { if (i_itemNo == TRIPLE_HEART) { diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index a742d81cbc9..dc14333f4dd 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -229,9 +229,9 @@ asm int dJntCol_c::getHitmarkPosAndAngle(cXyz const* param_0, csXyz const* param void dJntCol_c::setArrowPosAndAngle(cXyz const* param_0, cXyz const* i_srcPos, int i_anmMtxIdx, cXyz* param_3, csXyz* i_arrowPosP) { cXyz dst_pos; - mDoMtx_multVecSR(mModel->i_getAnmMtx(i_anmMtxIdx), i_srcPos, &dst_pos); + mDoMtx_multVecSR(mModel->getAnmMtx(i_anmMtxIdx), i_srcPos, &dst_pos); i_arrowPosP->x = dst_pos.atan2sY_XZ(); i_arrowPosP->y = dst_pos.atan2sX_Z(); - mDoMtx_multVec(mModel->i_getAnmMtx(i_anmMtxIdx), param_0, param_3); + mDoMtx_multVec(mModel->getAnmMtx(i_anmMtxIdx), param_0, param_3); } diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index 30c3353d8d9..be3ab90203f 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -104,7 +104,7 @@ BOOL dkWmark_c::setMatrix() { mDoMtx_stack_c::transS(mPos.x, mPos.y + 1.0f, mPos.z); mDoMtx_stack_c::ZXYrotM(cM_atan2s(var_f31 * cM_scos(temp_r26), poly.mNormal.y), field_0x48a, cM_atan2s(var_f31 * -cM_ssin(temp_r26), poly.mNormal.y)); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); if (dComIfG_Bgsp().ChkMoveBG(*fopAcM_gc_c::getGroundCheck())) { field_0x48c = 1; diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index 03e00a2411a..2d59f822fa1 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -79,7 +79,7 @@ int dkWpillar_c::create() { mpModel->setBaseScale(mScale); mDoMtx_stack_c::transS(mPos.x, mPos.y, mPos.z); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); return cPhs_COMPLEATE_e; } diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 7590b2e77d7..3c5f4029807 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -55,7 +55,7 @@ int dThunder_c::draw() { MTXCopy(mDoMtx_stack_c::get(), m); mModelInfo.mpModel->setBaseScale(field_0x138); - mModelInfo.mpModel->i_setBaseTRMtx(m); + mModelInfo.mpModel->setBaseTRMtx(m); mModelInfo.mBrk.entry(mModelInfo.mpModel->getModelData()); dComIfGd_setList(); @@ -70,7 +70,7 @@ static int dThunder_Draw(dThunder_c* i_this) { } int dThunder_c::execute(dThunder_c* i_thunder) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); if (env_light->mThunderEff.mStateTimer < 10) { cLib_addCalc(&mBrkSpeed, 0.1f, 0.05f, 0.017f, 9.999999747378752e-06f); @@ -149,7 +149,7 @@ static int dThunder_Create(kankyo_class* i_this) { /* 801AE458-801AE938 1A8D98 04E0+00 1/1 0/0 0/0 .text create__10dThunder_cFv */ int dThunder_c::create() { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); camera_class* camera_p = dComIfGp_getCamera(0); cXyz spB8; cXyz spC4; diff --git a/src/d/d_npc_lib.cpp b/src/d/d_npc_lib.cpp index 955338722ac..3699ae51d07 100644 --- a/src/d/d_npc_lib.cpp +++ b/src/d/d_npc_lib.cpp @@ -71,7 +71,7 @@ void dNpcLib_lookat_c::init(J3DModel* i_mdl_p, int* param_1, csXyz* param_2, csX break; } - mDoMtx_stack_c::copy(i_mdl_p->i_getAnmMtx(a_jntNum)); + mDoMtx_stack_c::copy(i_mdl_p->getAnmMtx(a_jntNum)); mDoMtx_stack_c::multVecZero(&field_0x04[mCount]); field_0xbc[i] = a_jntNum; field_0x94[i] = param_2[i]; diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp index 86170139434..91b124607c9 100644 --- a/src/d/d_path.cpp +++ b/src/d/d_path.cpp @@ -20,7 +20,7 @@ dPath* dPath_GetRoomPath(int path_index, int room_no) { dStage_dPath_c* path; if (room_no == -1) { - path = i_dComIfGp_getStage()->getPath2Inf(); + path = dComIfGp_getStage()->getPath2Inf(); } else { dStage_roomStatus_c* roomSt = dComIfGp_roomControl_getStatusRoomDt(room_no); if (roomSt == NULL) { @@ -43,7 +43,7 @@ dPath* dPath_GetNextRoomPath(dPath const* p_path, int room_no) { dStage_dPath_c* path; if (room_no == -1) { - path = i_dComIfGp_getStage()->getPath2Inf(); + path = dComIfGp_getStage()->getPath2Inf(); } else { dStage_roomStatus_c* roomSt = dComIfGp_roomControl_getStatusRoomDt(room_no); if (roomSt == NULL) { diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 0d3f1e35c11..3e7f9500cc1 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -364,7 +364,7 @@ void dRes_info_c::setWarpSRT(J3DModelData* modelData, cXyz const& param_1, f32 t texMtxInfo.mSRT.mTranslationX = translationX; texMtxInfo.mSRT.mTranslationY = translationY; mDoMtx_stack_c::transS(-param_1.x, -param_1.y, -param_1.z); - s16 angleY = fopCamM_GetAngleY(dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0))); + s16 angleY = fopCamM_GetAngleY(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); mDoMtx_stack_c::YrotM(angleY); MtxP stackMtx = mDoMtx_stack_c::get(); cMtx_concat(l_texMtxInfo.mEffectMtx, stackMtx, texMtxInfo.mEffectMtx); diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 26213d647dd..cc8b9a58aa1 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -216,7 +216,7 @@ int dScope_c::_execute(u32) { if (mProcess != PROC_CLOSE) { dComIfGp_setCStickStatusForce(61, 10, 3); - if (i_dComIfGp_checkPlayerStatus0(0, 0x1000)) { + if (dComIfGp_checkPlayerStatus0(0, 0x1000)) { dComIfGp_setRStatusForce(0x11, 3); } } @@ -250,7 +250,7 @@ void dScope_c::draw() { f32 temp_f30 = mHeight * temp_f1; u8 alpha = mAlpha * 255.0f; - if (i_dComIfGp_checkPlayerStatus0(0, 0x1000)) { + if (dComIfGp_checkPlayerStatus0(0, 0x1000)) { J2DDrawLine(304.0f, mDoGph_gInf_c::getMinYF(), 304.0f, mDoGph_gInf_c::getMaxYF(), JUtility::TColor(255, 0, 0, alpha), 6); J2DDrawLine(mDoGph_gInf_c::getMinXF(), 224.0f, mDoGph_gInf_c::getMaxXF(), 224.0f, diff --git a/src/d/d_simple_model.cpp b/src/d/d_simple_model.cpp index 4e1f0d5ae43..a868f467a6b 100644 --- a/src/d/d_simple_model.cpp +++ b/src/d/d_simple_model.cpp @@ -134,7 +134,7 @@ BOOL diff_model_c::create(J3DModelData* i_modelData, int roomNo, u8 drawBG) { mDoExt_restoreCurrentHeap(); } else { mpModel->setBaseScale(cXyz(0.0f, 0.0f, 0.0f)); - mpModel->i_setBaseTRMtx(g_mDoMtx_identity); + mpModel->setBaseTRMtx(g_mDoMtx_identity); mCreateNum++; mDoExt_adjustSolidHeapToSystem(mpHeap); mRoomNo = roomNo; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index b238dc4d97f..aac0e2d7fc0 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1571,7 +1571,7 @@ void dStage_roomControl_c::zoneCountCheck(int i_roomNo) const { dComIfGs_clearRoomSwitch(status->mZoneNo); dComIfGs_clearRoomItem(status->mZoneNo); - if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != ST_FIELD && + if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != ST_FIELD && i_roomNo != mOldStayNo) { if (--status->mZoneCount == 0) { @@ -2652,8 +2652,8 @@ static void readMult(dStage_dt_c* stageDt, dStage_Multi_c* multi, bool useOldRes if (multi != NULL) { dStage_Mult_info* info = multi->mInfo; - if (dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo()) == 0 || - dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo()) == 6) + if (dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 0 || + dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 6) { dStage_roomControl_c::m_roomDzs.create(multi->field_0x0); } @@ -2808,7 +2808,7 @@ static void layerTableLoader(void* i_data, dStage_dt_c* stageDt, int roomNo) { dComIfG_play_c::getLayerNo(0)); dStage_dt_c_decode(i_data, stageDt, l_layerFuncTableA, ARRAY_SIZE(l_layerFuncTableA)); - dStage_Elst_c* elst = i_dComIfGp_getStage()->getElst(); + dStage_Elst_c* elst = dComIfGp_getStage()->getElst(); if (elst != NULL && newRoomNo >= 0 && elst->m_entryNum > newRoomNo) { dStage_Elst_data* d = elst->m_entries; int layer = dComIfG_play_c::getLayerNo(0); @@ -2924,7 +2924,7 @@ void dStage_infoCreate() { void* stageRsrc = dComIfG_getStageRes("stage.dzs"); dComIfGp_roomControl_init(); - dStage_dt_c_stageInitLoader(stageRsrc, i_dComIfGp_getStage()); + dStage_dt_c_stageInitLoader(stageRsrc, dComIfGp_getStage()); } /* 80406194-804061A0 032EB4 000A+02 2/2 14/14 7/7 .bss mDemoArcName__20dStage_roomControl_c */ @@ -2933,7 +2933,7 @@ char dStage_roomControl_c::mDemoArcName[10]; /* 80026D38-80026DF8 021678 00C0+00 0/0 1/1 0/0 .text dStage_Create__Fv */ void dStage_Create() { void* stageRsrc = dComIfG_getStageRes("stage.dzs"); - dStage_dt_c_stageLoader(stageRsrc, i_dComIfGp_getStage()); + dStage_dt_c_stageLoader(stageRsrc, dComIfGp_getStage()); daSus_c::execute(); if (dComIfGp_getStartStageRoomNo() >= 0) { @@ -2980,7 +2980,7 @@ void dStage_Delete() { dComIfG_deleteObjectResMain("Event"); dComIfG_deleteObjectResMain(dComIfGp_getCameraParamFileName(0)); dComIfGp_evmng_remove(); - i_dComIfGp_getStage()->init(); + dComIfGp_getStage()->init(); } /* 80026FDC-80026FE8 02191C 000C+00 1/0 0/0 0/0 .text setOldMulti__16dStage_stageDt_cFv diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 3e72d130eaa..e3aa040a550 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -160,7 +160,7 @@ int dTimer_c::_create() { /* 8025CF04-8025D33C 257844 0438+00 1/1 0/0 0/0 .text _execute__8dTimer_cFv */ int dTimer_c::_execute() { - if (m_timer_mode == 6 && i_dComIfGs_getLife() == 0) { + if (m_timer_mode == 6 && dComIfGs_getLife() == 0) { fopMsgM_Delete(this); } diff --git a/src/d/d_tresure.cpp b/src/d/d_tresure.cpp index 648f590c545..fe417ee6995 100644 --- a/src/d/d_tresure.cpp +++ b/src/d/d_tresure.cpp @@ -31,7 +31,7 @@ int dTres_c::createWork() { /* 8009BC18-8009BC60 096558 0048+00 0/0 1/1 0/0 .text create__7dTres_cFv */ void dTres_c::create() { - if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != ST_BOSS_ROOM) { + if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != ST_BOSS_ROOM) { reset(); } } @@ -65,7 +65,7 @@ void dTres_c::reset() { /* 8009BCB4-8009BE28 0965F4 0174+00 0/0 1/1 0/0 .text addData__7dTres_cFPQ27dTres_c10list_classSc */ void dTres_c::addData(dTres_c::list_class* p_list, s8 roomNo) { - if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != ST_BOSS_ROOM) { + if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != ST_BOSS_ROOM) { reset(); data_s* listData = p_list->field_0x4->getDataPointer(); diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 5ba560ef409..f6925b1e72a 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -214,7 +214,7 @@ dEvt_order_c::dEvt_order_c() {} */ s32 dEvt_control_c::orderOld(u16 eventType, u16 priority, u16 flag, u16 hind, void* param_4, void* param_5, void const* eventName) { - int eventIdx = i_dComIfGp_getEventManager().getEventIdx((char*)eventName, -1, -1); + int eventIdx = dComIfGp_getEventManager().getEventIdx((char*)eventName, -1, -1); return order(eventType, priority, flag, hind, param_4, param_5, eventIdx, -1); } @@ -347,7 +347,7 @@ SECTION_DEAD static char const* const stringBase_80379D80 = "？？？"; * afterFlagProc__14dEvt_control_cFP12dEvt_order_c */ void dEvt_control_c::afterFlagProc(dEvt_order_c* p_order) { if (p_order->mFlag & 2) { - i_dComIfGp_getEventManager().issueStaff("ALL"); + dComIfGp_getEventManager().issueStaff("ALL"); } } @@ -398,10 +398,10 @@ int dEvt_control_c::talkCheck(dEvt_order_c* p_order) { if (actor != NULL && actor->eventInfo.getEventName() != NULL) { mSpecifiedEvent = actor->eventInfo.getEventId(); } else { - mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, 0xFF, -1); + mSpecifiedEvent = dComIfGp_getEventManager().getEventIdx(event, 0xFF, -1); } } - i_dComIfGp_getEventManager().order(mSpecifiedEvent); + dComIfGp_getEventManager().order(mSpecifiedEvent); return 1; } else { return 0; @@ -450,8 +450,8 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) { if (commonCheck(p_order, 1, 1)) { mMode = EVT_MODE_TALK; mPreItemNo = dComIfGp_getSelectItem(itemIndex); - mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, 0xFF, -1); - i_dComIfGp_getEventManager().order(mSpecifiedEvent); + mSpecifiedEvent = dComIfGp_getEventManager().getEventIdx(event, 0xFF, -1); + dComIfGp_getEventManager().order(mSpecifiedEvent); return 1; } else { return 0; @@ -478,7 +478,7 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) { mMode = EVT_MODE_DEMO; if (mSpecifiedEvent != -1) { - i_dComIfGp_getEventManager().order(mSpecifiedEvent); + dComIfGp_getEventManager().order(mSpecifiedEvent); } return 1; } @@ -496,7 +496,7 @@ int dEvt_control_c::talkEnd() { } if (mSpecifiedEvent != -1) { - i_dComIfGp_getEventManager().endProc(mSpecifiedEvent, 1); + dComIfGp_getEventManager().endProc(mSpecifiedEvent, 1); mSpecifiedEvent = -1; } @@ -533,10 +533,10 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) { } if (actor1 != NULL) { - i_dComIfGp_getEventManager().setObjectArchive(actor1->eventInfo.getArchiveName()); + dComIfGp_getEventManager().setObjectArchive(actor1->eventInfo.getArchiveName()); } - if (!i_dComIfGp_getEventManager().order(eventId)) { + if (!dComIfGp_getEventManager().order(eventId)) { return 0; } @@ -567,7 +567,7 @@ int dEvt_control_c::demoEnd() { } if (mSpecifiedEvent != -1) { - i_dComIfGp_getEventManager().endProc(mSpecifiedEvent, 1); + dComIfGp_getEventManager().endProc(mSpecifiedEvent, 1); mSpecifiedEvent = -1; } return 1; @@ -595,7 +595,7 @@ int dEvt_control_c::doorCheck(dEvt_order_c* p_order) { fopAc_ac_c* actor2 = getPt2(); if (actor2 != NULL) { - i_dComIfGp_getEventManager().setObjectArchive(actor2->eventInfo.getArchiveName()); + dComIfGp_getEventManager().setObjectArchive(actor2->eventInfo.getArchiveName()); } if (mSpecifiedEvent == -1 && actor2 != NULL && actor2->eventInfo.getEventId() != -1) { @@ -603,8 +603,8 @@ int dEvt_control_c::doorCheck(dEvt_order_c* p_order) { } if (mSpecifiedEvent != -1 && - i_dComIfGp_getEventManager().getEventData(mSpecifiedEvent) != NULL) { - i_dComIfGp_getEventManager().order(mSpecifiedEvent); + dComIfGp_getEventManager().getEventData(mSpecifiedEvent) != NULL) { + dComIfGp_getEventManager().order(mSpecifiedEvent); } else { mSpecifiedEvent = -1; reset(); @@ -629,8 +629,8 @@ int dEvt_control_c::itemCheck(dEvt_order_c* p_order) { if (commonCheck(p_order, 8, 4)) { mMode = EVT_MODE_DEMO; - mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, -1, -1); - i_dComIfGp_getEventManager().order(mSpecifiedEvent); + mSpecifiedEvent = dComIfGp_getEventManager().getEventIdx(event, -1, -1); + dComIfGp_getEventManager().order(mSpecifiedEvent); return 1; } else { return 0; @@ -658,7 +658,7 @@ int dEvt_control_c::endProc() { field_0xed = 0; mEventID = 255; mPreItemNo = NO_ITEM; - i_dComIfGp_getEventManager().setStartDemo(-2); + dComIfGp_getEventManager().setStartDemo(-2); return 1; } @@ -698,18 +698,18 @@ int dEvt_control_c::entry() { switch (order->mEventType) { case EVT_TYPE_TALK: - if (i_dComIfGs_getLife() != 0 && talkCheck(order) != 0) { + if (dComIfGs_getLife() != 0 && talkCheck(order) != 0) { return 1; } break; case EVT_TYPE_OTHER: - if (i_dComIfGs_getLife() != 0 && demoCheck(order) != 0) { + if (dComIfGs_getLife() != 0 && demoCheck(order) != 0) { return 1; } break; case EVT_TYPE_DOOR: case EVT_TYPE_TREASURE: - if (i_dComIfGs_getLife() != 0 && doorCheck(order) != 0) { + if (dComIfGs_getLife() != 0 && doorCheck(order) != 0) { return 1; } break; @@ -718,23 +718,23 @@ int dEvt_control_c::entry() { setParam(order); return 1; case EVT_TYPE_POTENTIAL: - if (i_dComIfGs_getLife() != 0 && potentialCheck(order) != 0) { + if (dComIfGs_getLife() != 0 && potentialCheck(order) != 0) { return 1; } break; case EVT_TYPE_ITEM: - if (i_dComIfGs_getLife() != 0 && itemCheck(order) != 0) { + if (dComIfGs_getLife() != 0 && itemCheck(order) != 0) { return 1; } break; case EVT_TYPE_SHOWITEM_X: case EVT_TYPE_SHOWITEM_Y: - if (i_dComIfGs_getLife() != 0 && talkXyCheck(order) != 0) { + if (dComIfGs_getLife() != 0 && talkXyCheck(order) != 0) { return 1; } break; case EVT_TYPE_CATCH: - if (i_dComIfGs_getLife() != 0 && catchCheck(order) != 0) { + if (dComIfGs_getLife() != 0 && catchCheck(order) != 0) { return 1; } break; @@ -751,7 +751,7 @@ int dEvt_control_c::entry() { void dEvt_control_c::reset() { if (field_0xec != 0xFF) { fopAc_ac_c* pt1 = getPt1(); - s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx(NULL, field_0xec, -1); + s16 eventIdx = dComIfGp_getEventManager().getEventIdx(NULL, field_0xec, -1); fopAc_ac_c* pt2 = getPt2(); order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, pt1, pt2, eventIdx, field_0xec); @@ -764,7 +764,7 @@ void dEvt_control_c::reset() { /* 80042518-800425B4 03CE58 009C+00 3/3 3/3 46/46 .text reset__14dEvt_control_cFPv */ void dEvt_control_c::reset(void* param_0) { if (field_0xec != 0xFF) { - s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx((fopAc_ac_c*)param_0, field_0xec); + s16 eventIdx = dComIfGp_getEventManager().getEventIdx((fopAc_ac_c*)param_0, field_0xec); fopAc_ac_c* pt2 = getPt2(); order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, param_0, pt2, eventIdx, field_0xec); } @@ -787,13 +787,13 @@ void dEvt_control_c::clearSkipSystem() { /* 800425E8-8004261C 03CF28 0034+00 0/0 2/2 5/5 .text dEv_defaultSkipProc__FPvi */ int dEv_defaultSkipProc(void* param_0, int) { - i_dComIfGp_getEvent().reset(param_0); + dComIfGp_getEvent().reset(param_0); return 1; } /* 8004261C-80042778 03CF5C 015C+00 1/1 1/1 0/0 .text dEv_defaultSkipZev__FPvi */ int dEv_defaultSkipZev(void* param_0, int param_1) { - dEvt_control_c* evControl = &i_dComIfGp_getEvent(); + dEvt_control_c* evControl = &dComIfGp_getEvent(); s16 eventID = -1; dStage_MapEvent_dt_c* data = evControl->getStageEventDt(); @@ -812,11 +812,11 @@ int dEv_defaultSkipZev(void* param_0, int param_1) { char eventName[32]; strcpy(eventName, data->mName); strcat(eventName, "$0"); - eventID = i_dComIfGp_getEventManager().getEventIdx(eventName, 0xFF, -1); + eventID = dComIfGp_getEventManager().getEventIdx(eventName, 0xFF, -1); break; case 1: - char* skipName = i_dComIfGp_getEvent().getSkipEventName(); - eventID = i_dComIfGp_getEventManager().getEventIdx(skipName, 0xFF, -1); + char* skipName = dComIfGp_getEvent().getSkipEventName(); + eventID = dComIfGp_getEventManager().getEventIdx(skipName, 0xFF, -1); break; } @@ -836,7 +836,7 @@ int dEv_defaultSkipZev(void* param_0, int param_1) { /* 80042778-800428DC 03D0B8 0164+00 0/0 1/1 0/0 .text dEv_defaultSkipStb__FPvi */ int dEv_defaultSkipStb(void* param_0, int param_1) { - dEvt_control_c* evControl = &i_dComIfGp_getEvent(); + dEvt_control_c* evControl = &dComIfGp_getEvent(); s16 eventID = -1; dStage_MapEvent_dt_c* data = evControl->getStageEventDt(); @@ -855,11 +855,11 @@ int dEv_defaultSkipStb(void* param_0, int param_1) { char eventName[32]; strcpy(eventName, data->mName); strcat(eventName, "$0"); - eventID = i_dComIfGp_getEventManager().getEventIdx(eventName, 0xFF, -1); + eventID = dComIfGp_getEventManager().getEventIdx(eventName, 0xFF, -1); break; case 1: - char* skipName = i_dComIfGp_getEvent().getSkipEventName(); - eventID = i_dComIfGp_getEventManager().getEventIdx(skipName, 0xFF, -1); + char* skipName = dComIfGp_getEvent().getSkipEventName(); + eventID = dComIfGp_getEventManager().getEventIdx(skipName, 0xFF, -1); break; } @@ -881,7 +881,7 @@ int dEv_defaultSkipStb(void* param_0, int param_1) { /* 800428DC-8004290C 03D21C 0030+00 0/0 1/1 33/33 .text dEv_noFinishSkipProc__FPvi */ int dEv_noFinishSkipProc(void*, int) { - i_dComIfGp_getEvent().offSkipFade(); + dComIfGp_getEvent().offSkipFade(); return 0; } @@ -995,7 +995,7 @@ SECTION_SDATA2 static f32 lit_5013 = -1.0f / 20.0f; /* 80042BBC-80042FA8 03D4FC 03EC+00 0/0 1/1 0/0 .text Step__14dEvt_control_cFv */ int dEvt_control_c::Step() { - dEvent_manager_c* evtMng = &i_dComIfGp_getEventManager(); + dEvent_manager_c* evtMng = &dComIfGp_getEventManager(); field_0xe7 = 0; field_0xe8 = mNum; @@ -1153,8 +1153,8 @@ int dEvt_control_c::moveApproval(void* param_0) { return 1; } - if (i_dComIfGp_checkPlayerStatus0(0, 0x20000000) || - i_dComIfGp_checkPlayerStatus1(0, 0x4002000)) { + if (dComIfGp_checkPlayerStatus0(0, 0x20000000) || + dComIfGp_checkPlayerStatus1(0, 0x4002000)) { return 0; } @@ -1285,7 +1285,7 @@ void dEvt_info_c::setEventName(char* name) { if (name == NULL) { mEventId = -1; } else { - mEventId = i_dComIfGp_getEventManager().getEventIdx(name, -1, -1); + mEventId = dComIfGp_getEventManager().getEventIdx(name, -1, -1); } } @@ -1294,7 +1294,7 @@ char* dEvt_info_c::getEventName() { if (mEventId == -1) { return NULL; } else { - dEvDtEvent_c* data = i_dComIfGp_getEventManager().getEventData(mEventId); + dEvDtEvent_c* data = dComIfGp_getEventManager().getEventData(mEventId); if (data == NULL) { return NULL; } else { @@ -1331,7 +1331,7 @@ dStage_MapEvent_dt_c* dEvt_control_c::searchMapEventData(u8 mapToolID, s32 roomN } } - dStage_MapEventInfo_c* stageDt = i_dComIfGp_getStage()->getMapEventInfo(); + dStage_MapEventInfo_c* stageDt = dComIfGp_getStage()->getMapEventInfo(); if (stageDt != NULL) { for (int i = 0; i < stageDt->mCount; i++) { if (mapToolID == stageDt->mData[i].field_0x4) { diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index 93cf52285a5..d3c9b812d96 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -13,11 +13,11 @@ #include "m_Do/m_Do_graphic.h" inline BOOL dEvDtFlagCheck(int flag) { - return i_dComIfGp_getEventManager().flagCheck(flag); + return dComIfGp_getEventManager().flagCheck(flag); } inline void dEvDtFlagSet(int flag) { - i_dComIfGp_getEventManager().setFlag(flag); + dComIfGp_getEventManager().setFlag(flag); } struct TelopDataStruct { @@ -92,7 +92,7 @@ static u16 getStartTelopNo() { if (telopData == NULL || telopData->_8 == 0) { return 0xFFFF; } else if (telopData->_8 == 2 && telopData->_6 != 0xFFFF && - !i_dComIfGs_isEventBit(telopData->_6)) + !dComIfGs_isEventBit(telopData->_6)) { return 0xFFFF; } else if (telopData->_8 == 3 && telopData->_6 != 0xFFFF && @@ -277,7 +277,7 @@ int dEvDtEvent_c::finishCheck() { return 1; } - if (!i_dComIfGp_getEventManager().flagCheck(tmp)) { + if (!dComIfGp_getEventManager().flagCheck(tmp)) { return 0; } } @@ -292,7 +292,7 @@ int dEvDtEvent_c::forceFinish() { return 1; } - i_dComIfGp_getEventManager().setFlag(flag); + dComIfGp_getEventManager().setFlag(flag); } return 1; } @@ -365,7 +365,7 @@ void dEvDtStaff_c::init() { field_0x41 = false; field_0x3c = -1; if (mType == TYPE_CAMERA) { - i_dComIfGp_getEventManager().setCameraPlay(1); + dComIfGp_getEventManager().setCameraPlay(1); } } @@ -380,9 +380,9 @@ void dEvDtStaff_c::advanceCut(int cut) { /* 80044190-80044324 03EAD0 0194+00 1/1 0/0 0/0 .text specialProcLight__12dEvDtStaff_cFv */ void dEvDtStaff_c::specialProcLight() { - int staffId = i_dComIfGp_evmng_getMyStaffId("LIGHT", NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId("LIGHT", NULL, 0); if (staffId != -1) { - char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); + char* nowCutName = dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { f32* hourP; @@ -423,12 +423,12 @@ void dEvDtStaff_c::specialProcLight() { void dEvDtStaff_c::specialProcMessage() { MessageData* data = (MessageData*)&mData; StaffWork* work = &mWork; - int staffId = i_dComIfGp_evmng_getMyStaffId("MESSAGE", NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId("MESSAGE", NULL, 0); if (staffId == -1) { return; } - char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); + char* nowCutName = dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*(int*)nowCutName) { case 'WAIT': @@ -606,12 +606,12 @@ void dEvDtStaff_c::specialProcMessage() { void dEvDtStaff_c::specialProcSound() { SoundData* data = (SoundData*)&mData; - int staffId = i_dComIfGp_evmng_getMyStaffId("SOUND", NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId("SOUND", NULL, 0); if (staffId == -1) { return; } - char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); + char* nowCutName = dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*(int*)nowCutName) { case 'WAIT': @@ -663,12 +663,12 @@ void dEvDtStaff_c::specialProcCreate() { cXyz scale; dStage_objectNameInf* objNameInf; - int staffId = i_dComIfGp_evmng_getMyStaffId("CREATER", NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId("CREATER", NULL, 0); if (staffId == -1) { return; } - char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); + char* nowCutName = dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*(int*)nowCutName) { case 'WAIT': @@ -717,14 +717,14 @@ void dEvDtStaff_c::specialProcCreate() { void dEvDtStaff_c::specialProcDirector() { DirectorData* data = (DirectorData*)mData; daPy_py_c* player = dComIfGp_getLinkPlayer(); - dEvt_control_c& evtControl = i_dComIfGp_getEvent(); + dEvt_control_c& evtControl = dComIfGp_getEvent(); - int staffId = i_dComIfGp_evmng_getMyStaffId("DIRECTOR", NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId("DIRECTOR", NULL, 0); if (staffId == -1) { return; } - char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); + char* nowCutName = dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { int* eventFlagP = dComIfGp_evmng_getMyIntegerP(staffId, "EventFlag"); if (eventFlagP != NULL) { @@ -770,9 +770,9 @@ void dEvDtStaff_c::specialProcDirector() { break; case 'PLAY': if (strcmp(nowCutName, "PLAYER_NODRAW") == 0) { - player->i_onPlayerNoDraw(); + player->onPlayerNoDraw(); } else if (strcmp(nowCutName, "PLAYER_DRAW") == 0) { - player->i_offPlayerNoDraw(); + player->offPlayerNoDraw(); } break; case 'NEXT': @@ -885,11 +885,11 @@ void dEvDtStaff_c::specialProcDirector() { if (specTypeP != NULL) { switch (*specTypeP) { case 8: - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[506])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[506])) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[566]); } - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[507])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[507])) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[567]); } } @@ -957,12 +957,12 @@ void dEvDtStaff_c::specialProcPackage() { dMsgObject_demoMessageGroup(); } - int staffId = i_dComIfGp_evmng_getMyStaffId("PACKAGE", NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId("PACKAGE", NULL, 0); if (staffId == -1) { return; } - char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); + char* nowCutName = dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*(int*)nowCutName) { case 'WAIT': @@ -997,7 +997,7 @@ void dEvDtStaff_c::specialProcPackage() { specialProc_WaitProc(staffId); break; case 'PLAY': - dEvt_control_c& evtControl = i_dComIfGp_getEvent(); + dEvt_control_c& evtControl = dComIfGp_getEvent(); if (dDemo_c::getMode() == 2) { dStage_MapEvent_dt_c* event = evtControl.getStageEventDt(); if (event != NULL && event->field_0x7 != 0xFF && !evtControl.chkFlag2(1)) { @@ -1021,12 +1021,12 @@ void dEvDtStaff_c::specialProcPackage() { /* 80045AFC-80045C34 04043C 0138+00 1/1 0/0 0/0 .text specialProcTimekeeper__12dEvDtStaff_cFv */ void dEvDtStaff_c::specialProcTimekeeper() { TimerKeeperData* dataP = (TimerKeeperData*)&mData; - int staffId = i_dComIfGp_evmng_getMyStaffId("TIMEKEEPER", NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId("TIMEKEEPER", NULL, 0); if (staffId == -1) { return; } - char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); + char* nowCutName = dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*(int*)nowCutName) { case 'COUN': @@ -1055,12 +1055,12 @@ void dEvDtStaff_c::specialProcTimekeeper() { */ void dEvDtStaff_c::specialProcEffect() { EffectData* data = (EffectData*)mData; - int staffId = i_dComIfGp_evmng_getMyStaffId("EFFECT", NULL, 0); + int staffId = dComIfGp_evmng_getMyStaffId("EFFECT", NULL, 0); if (staffId == -1) { return; } - char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); + char* nowCutName = dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { data->unk = 0; switch (*(int*)nowCutName) { diff --git a/src/d/event/d_event_lib.cpp b/src/d/event/d_event_lib.cpp index fd992d47b11..1dec5bb3490 100644 --- a/src/d/event/d_event_lib.cpp +++ b/src/d/event/d_event_lib.cpp @@ -38,7 +38,7 @@ BOOL dEvLib_callback_c::setEvent(int mapToolId, int eventIdx, int param_2) { } else { mActor->eventInfo.setMapToolId(mapToolId); if (mapToolId != 0xFF && eventIdx == 0xFF) { - eventIdx = i_dComIfGp_getEventManager().getEventIdx(mActor, mapToolId); + eventIdx = dComIfGp_getEventManager().getEventIdx(mActor, mapToolId); } mActor->eventInfo.setEventId(eventIdx); _C = param_2; @@ -112,10 +112,10 @@ 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->eventInfo.getEventId())) { + if (!dComIfGp_getEventManager().endCheck(mActor->eventInfo.getEventId())) { return eventRun(); } else { - i_dComIfGp_getEvent().reset(); + dComIfGp_getEvent().reset(); setAction(NULL); return eventEnd(); } diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index e66072ac5b8..817fb273e44 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -12,7 +12,7 @@ #include "stdio.h" BOOL daPy_py_c::checkNowWolf() { - return dComIfGp_getLinkPlayer()->i_checkWolf(); + return dComIfGp_getLinkPlayer()->checkWolf(); } void dEvent_exception_c::init() { @@ -303,15 +303,15 @@ void dEvent_manager_c::endProc(s16 eventID, int close) { event->mEventState = 0; mCurrentEventType = 0; mCurrentEventCompositId = -1; - i_dComIfGp_getEvent().setPtD(NULL); - i_dComIfGp_getEvent().setPtI(NULL); + dComIfGp_getEvent().setPtD(NULL); + dComIfGp_getEvent().setPtI(NULL); } } } /* 80046E64-800473FC 0417A4 0598+00 0/0 1/1 0/0 .text Sequencer__16dEvent_manager_cFv */ void dEvent_manager_c::Sequencer() { - dEvt_control_c& evtControl = i_dComIfGp_getEvent(); + dEvt_control_c& evtControl = dComIfGp_getEvent(); dEvDtEvent_c* event = getEventData(mCurrentEventCompositId); dStage_MapEvent_dt_c* mapEvent = evtControl.getStageEventDt(); @@ -666,7 +666,7 @@ int dEvent_manager_c::startCheckOld(char const* name) { /* 80047A78-80047ADC 0423B8 0064+00 1/1 2/2 122/122 .text endCheck__16dEvent_manager_cFs */ int dEvent_manager_c::endCheck(s16 eventID) { - dEvDtEvent_c* event = getEventData(i_dComIfGp_getEvent().runningEventID(eventID)); + dEvDtEvent_c* event = getEventData(dComIfGp_getEvent().runningEventID(eventID)); if (event == NULL) { return 0; } else { @@ -689,7 +689,7 @@ int dEvent_manager_c::getMyStaffId(char const* staffName, fopAc_ac_c* pActor, in int staffNum; int i; int evtIdx = -1; - if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { + if (dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return -1; } else { if (pActor != NULL) { @@ -758,7 +758,7 @@ int dEvent_manager_c::getMyStaffId(char const* staffName, fopAc_ac_c* pActor, in /* 80047D4C-80047DAC 04268C 0060+00 0/0 9/9 417/417 .text getIsAddvance__16dEvent_manager_cFi */ int dEvent_manager_c::getIsAddvance(int staffIdx) { - if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { + if (dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return 0; } else if (staffIdx == -1) { return 0; @@ -793,7 +793,7 @@ static int dEvmng_strcmp(char const* strA, char* strB) { * getMyActIdx__16dEvent_manager_cFiPCPCciii */ int dEvent_manager_c::getMyActIdx(int staffIdx, char const* const* param_1, int param_2, int param_3, int param_4) { - if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { + if (dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return 0; } else if (staffIdx == -1) { return -1; @@ -837,7 +837,7 @@ int dEvent_manager_c::getMyActIdx(int staffIdx, char const* const* param_1, int /* 80047F5C-80047FC8 04289C 006C+00 1/1 9/9 62/62 .text getMyNowCutName__16dEvent_manager_cFi */ char* dEvent_manager_c::getMyNowCutName(int cutIndex) { - if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { + if (dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return NULL; } else if (cutIndex == -1) { return NULL; @@ -850,7 +850,7 @@ char* dEvent_manager_c::getMyNowCutName(int cutIndex) { /* 80047FC8-800480EC 042908 0124+00 2/2 0/0 0/0 .text getMyDataP__16dEvent_manager_cFiPCci */ dEvDtData_c* dEvent_manager_c::getMyDataP(int index, char const* name, int type) { - if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { + if (dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return NULL; } else if (index == -1) { return NULL; @@ -901,7 +901,7 @@ int dEvent_manager_c::getMySubstanceNum(int index, char const* name) { /* 8004817C-800481F4 042ABC 0078+00 1/1 78/78 182/182 .text cutEnd__16dEvent_manager_cFi */ void dEvent_manager_c::cutEnd(int cutIndex) { - if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { + if (dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return; } else if (cutIndex == -1) { return; @@ -1024,8 +1024,8 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 bsTypeId, int param_1) { goal.x += cM_ssin(angle) * 100; goal.z += cM_scos(angle) * 100; setGoal(&goal); - i_dComIfGp_getEvent().setPt2(shutterActor); - i_dComIfGp_getEvent().setPtD(shutterActor); + dComIfGp_getEvent().setPt2(shutterActor); + dComIfGp_getEvent().setPtD(shutterActor); } return shutterActor; } @@ -1052,7 +1052,7 @@ fopAc_ac_c* dEvent_manager_c::specialCast(char const* name, int param_1) { shutterActor = specialCast_Shutter(0x22B, param_1); } if (shutterActor != NULL) { - i_dComIfGp_getEvent().onEventFlag(0x10); + dComIfGp_getEvent().onEventFlag(0x10); } } @@ -1068,7 +1068,7 @@ fopAc_ac_c* dEvent_manager_c::specialCast(char const* name, int param_1) { /* 80048748-800487F0 043088 00A8+00 1/1 0/0 0/0 .text dEv_talkman_get_action__Fi */ static int dEv_talkman_get_action(int param_0) { - int staffId = i_dComIfGp_getEventManager().getMyStaffId("TALKMAN", NULL, -1); + int staffId = dComIfGp_getEventManager().getMyStaffId("TALKMAN", NULL, -1); if (staffId == -1) { return -1; } else { @@ -1078,10 +1078,10 @@ static int dEv_talkman_get_action(int param_0) { "TALK0", "TALK1", }; - int actIdx = i_dComIfGp_getEventManager().getMyActIdx(staffId, action_table, + int actIdx = dComIfGp_getEventManager().getMyActIdx(staffId, action_table, ARRAY_SIZE(action_table), 0, 0); if (actIdx == param_0) { - i_dComIfGp_getEventManager().cutEnd(staffId); + dComIfGp_getEventManager().cutEnd(staffId); } return actIdx; } @@ -1094,7 +1094,7 @@ int dEvent_manager_c::ChkPresentEnd() { /* 8004882C-8004886C 04316C 0040+00 0/0 2/2 2/2 .text checkStartDemo__16dEvent_manager_cFv */ int dEvent_manager_c::checkStartDemo() { - if (!i_dComIfGp_getEvent().runCheck()) { + if (!dComIfGp_getEvent().runCheck()) { return 0; } diff --git a/src/d/file/d_file_sel_info.cpp b/src/d/file/d_file_sel_info.cpp index 6b909953133..24ac05cd630 100644 --- a/src/d/file/d_file_sel_info.cpp +++ b/src/d/file/d_file_sel_info.cpp @@ -86,7 +86,7 @@ int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_d char* player_name = i_savedata->getPlayer().getPlayerInfo().getLinkName(); if (*player_name == 0) { if (field_0x22 == 1 && i_dataNo == dComIfGs_getDataNum()) { - i_savedata->getPlayer().getPlayerStatusA().setLife(i_dComIfGs_getLife()); + i_savedata->getPlayer().getPlayerStatusA().setLife(dComIfGs_getLife()); setHeartCnt(i_savedata); i_savedata->getPlayer().getPlayerStatusA().setLife(12); strcpy(mPlayerName, dComIfGs_getPlayerName()); diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp index 32efe947dcd..7f96811f20e 100644 --- a/src/d/file/d_file_select.cpp +++ b/src/d/file/d_file_select.cpp @@ -5060,7 +5060,7 @@ void dFile_select3D_c::set_mtx() { mDoMtx_stack_c::transS(field_0x03a4.x, field_0x03a4.y, field_0x03a4.z); mDoMtx_stack_c::XYZrotM(field_0x03b0.x, field_0x03b0.y, field_0x03b0.z); mpModel->setBaseScale(stack_8); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } #else #pragma push diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 751b201f3f9..3813033424c 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -873,7 +873,7 @@ SECTION_SDATA2 static f64 lit_4444 = 4503601774854144.0 /* cast s32 to float */; // matches with literals #ifdef NONMATCHING static void dKy_twi_wolflight_set(int i_lightIdx) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); camera_class* camera_p = dComIfGp_getCamera(0); cXyz vectle; @@ -1297,7 +1297,7 @@ SECTION_SDATA2 static f32 lit_4732 = 255.0f; // matches with literals #ifdef NONMATCHING static void dKy_FiveSenses_fullthrottle_dark_static1() { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); int temp_r30 = 0; cXyz sp18; @@ -1751,7 +1751,7 @@ SECTION_SDATA2 static f32 lit_5194 = 0.0010000000474974513f; // matches with literals #ifdef NONMATCHING static void dungeonlight_init() { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); for (int i = 0; i < 8; i++) { env_light->mDungeonLights[i].mPosition = cXyz(test_pos_tbl[i]); @@ -1961,7 +1961,7 @@ static void envcolor_init() { g_env_light.field_0x126c = 999999.0f; g_env_light.field_0x127c = 200.0f; - if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_BOSS_ROOM) { + if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_BOSS_ROOM) { g_env_light.mpSchedule = dKyd_schejule_boss_getp(); } else { g_env_light.mpSchedule = dKyd_schejule_getp(); @@ -2060,7 +2060,7 @@ static void envcolor_init() { g_env_light.field_0x1302 = -1; g_env_light.mWaterSurfaceShineRate = 1.0f; - int timeH = dStage_stagInfo_GetTimeH(i_dComIfGp_getStage()->getStagInfo()); + int timeH = dStage_stagInfo_GetTimeH(dComIfGp_getStage()->getStagInfo()); if (timeH >= 0) { dComIfGs_setTime(timeH * 15.0f); } @@ -2389,7 +2389,7 @@ void dScnKy_env_light_c::setDaytime() { if (field_0x12fb == 0) { if (!dKy_darkworld_check()) { - if (!i_dComIfGp_event_runCheck()) { + if (!dComIfGp_event_runCheck()) { fopAc_ac_c* ac = dMsgObject_c::getActor(); bool tmp = true; @@ -3974,7 +3974,7 @@ SECTION_SDATA2 static f32 lit_7027 = 6.0f / 5.0f; // almost, just some regalloc + literals #ifdef NONMATCHING void dScnKy_env_light_c::settingTevStruct(int i_tevstrType, cXyz* param_1, dKy_tevstr_c* i_tevstr) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); u8 var_r30 = i_tevstr->mInitTimer; GXColorS10 sp30; @@ -4580,7 +4580,7 @@ void dScnKy_env_light_c::exeKankyo() { g_env_light.mColPatMode = g_env_light.mColPatModeGather; - if (!i_dComIfGp_event_runCheck() && g_env_light.mColPatModeGather != 0) { + if (!dComIfGp_event_runCheck() && g_env_light.mColPatModeGather != 0) { if (g_env_light.mColPatModeGather >= 3) { g_env_light.mColPatModeGather = 0; } else { @@ -4679,7 +4679,7 @@ void dScnKy_env_light_c::exeKankyo() { if (strcmp(dComIfGp_getStartStageName(), "R_SP127") == 0) { if ((dCam_getBody()->mCurMode == 4 || dCam_getBody()->mCurMode == 7) && - i_dComIfGp_event_runCheck()) + dComIfGp_event_runCheck()) { cLib_addCalc(&g_env_light.mDemoAttentionPoint, 0.0f, 0.5f, 0.1f, 1E-05f); } else { @@ -5417,7 +5417,7 @@ SND_INFLUENCE* dKy_Sound_get() { // matches with literals #ifdef NONMATCHING void dKy_SordFlush_set(cXyz param_0, int param_1) { - dScnKy_env_light_c* light = i_dKy_getEnvlight(); + dScnKy_env_light_c* light = dKy_getEnvlight(); if (!dKy_darkworld_check() && (light->mThunderEff.mStateTimer >= 10 || light->mThunderEff.field_0x8 <= 0.0f)) @@ -5805,7 +5805,7 @@ SECTION_SDATA2 static f32 lit_9677 = 1.5f; #ifdef NONMATCHING int dKy_WolfEyeLight_set(cXyz* param_0, f32 param_1, f32 param_2, f32 param_3, GXColor* param_4, f32 param_5, u8 param_6, u8 param_7) { - dScnKy_env_light_c* light = i_dKy_getEnvlight(); + dScnKy_env_light_c* light = dKy_getEnvlight(); light->field_0x0c18[0].mPos = *param_0; @@ -5965,7 +5965,7 @@ asm u8 dKy_pol_efftype2_get(cBgS_PolyInfo const* param_0) { /* 801AB4C0-801AB59C 1A5E00 00DC+00 0/0 9/9 21/21 .text dKy_pol_sound_get__FPC13cBgS_PolyInfo */ u8 dKy_pol_sound_get(cBgS_PolyInfo const* p_poly) { - dScnKy_env_light_c* envLight = i_dKy_getEnvlight(); + dScnKy_env_light_c* envLight = dKy_getEnvlight(); if (p_poly == NULL || &dComIfG_Bgsp() == NULL) { return 0; @@ -6159,8 +6159,8 @@ static int dKy_Outdoor_check() { BOOL outdoors = false; u32 type = ST_FIELD; - if (i_dComIfGp_getStage() != NULL) { - type = dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()); + if (dComIfGp_getStage() != NULL) { + type = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); } if (type == ST_FIELD) { @@ -6174,7 +6174,7 @@ static int dKy_Outdoor_check() { static int dKy_Indoor_check() { BOOL indoors = false; - if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != ST_FIELD) { + if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != ST_FIELD) { indoors = true; } @@ -6282,7 +6282,7 @@ static int dKy_F_SP121Check(char const* stageName, int roomNo, u8* out_darkLv, i // Prevent twilight if stage depends on Faron Twilight cleared status (Faron Woods, Coro's // Lantern Shop, Faron Woods Cave) but haven't finished Ordon Day 2. - if (darkworldTbl[tblIndex].darkLv == FARON && !i_dComIfGs_isEventBit(0x4510)) { + if (darkworldTbl[tblIndex].darkLv == FARON && !dComIfGs_isEventBit(0x4510)) { result = -1; } @@ -6587,7 +6587,7 @@ SECTION_SDATA2 static f32 lit_10932[1 + 1 /* padding */] = { // stack / couple instructions at the end #ifdef NONMATCHING void dKy_bg_MAxx_proc(void* param_0) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); s8 cam_id = dComIfGp_getWindow(0)->getCameraID(); camera_class* camera_p = dComIfGp_getCamera(cam_id); fopAc_ac_c* player_p = dComIfGp_getPlayer(0); diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp index bd0f69a96f5..245324c3253 100644 --- a/src/d/kankyo/d_kankyo_rain.cpp +++ b/src/d/kankyo/d_kankyo_rain.cpp @@ -582,7 +582,7 @@ void dKyr_sun_move() { u8 var_r21 = 0; s32 var_r20 = 0; - u32 st_type = dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()); + u32 st_type = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); if (g_env_light.mBaseLightInfluence.mColor.r == 0 && st_type != ST_ROOM) { dKyr_get_vectle_calc(&camera_p2->mLookat.mEye, &g_env_light.mBaseLightInfluence.mPosition, @@ -608,8 +608,8 @@ void dKyr_sun_move() { var_f1 *= var_f1; temp_f31 = 1.0f - var_f1; - if (i_dComIfGp_getStage()->getStagInfo() != NULL) { - dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()); + if (dComIfGp_getStage()->getStagInfo() != NULL) { + dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); } if (sun_p->field_0x28) { @@ -715,7 +715,7 @@ void dKyr_sun_move() { } if (sp54.y > 0.0f && g_env_light.mpSunLenzPacket->mDrawLenzInSky == 0) { - if (dStage_stagInfo_GetArg0(i_dComIfGp_getStage()->getStagInfo()) != 0) { + if (dStage_stagInfo_GetArg0(dComIfGp_getStage()->getStagInfo()) != 0) { f32 var_f1_3; if (S_parcent_bak < var_f30) { var_f1_3 = var_f30 - S_parcent_bak; @@ -1130,7 +1130,7 @@ void dKyr_rain_move() { var_r21 = 0; var_r20 = 0; - dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()); + dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); cXyz spA4; cXyz sp98; @@ -3700,7 +3700,7 @@ void dKyr_shstar_move() {} // matches with literals #ifdef NONMATCHING void dKyr_odour_init() { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); dKankyo_odour_Packet* odour_p = env_light->mpOdourPacket; for (int i = 0; i < 2000; i++) { @@ -3759,7 +3759,7 @@ asm void dKyr_odour_draw(Mtx param_0, u8** param_1) { // matches with literals #ifdef NONMATCHING void dKyr_mud_init() { - dScnKy_env_light_c* light = i_dKy_getEnvlight(); + dScnKy_env_light_c* light = dKy_getEnvlight(); light->mpMudPacket->mpMoyaRes = (u8*)dComIfG_getObjectRes("Always", 0x53); for (int i = 0; i < 100; i++) { @@ -3895,7 +3895,7 @@ SECTION_SDATA2 static f32 lit_11953 = 10000000.0f; #ifdef NONMATCHING static f32 dKyr_near_bosslight_check(cXyz param_0) { f32 dist = 10000000.0f; - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); for (int i = 0; i < 6; i++) { if (env_light->field_0x0c18[i].field_0x26 == 1) { diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index 1832e266ea5..685d42e26d7 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -1336,7 +1336,7 @@ static void wether_move_vrkumo() { if (memcmp(dComIfGp_getStartStageName(), "D_MN07", 6) == 0 || strcmp(dComIfGp_getStartStageName(), "F_SP114") == 0 || (strcmp(dComIfGp_getStartStageName(), "D_MN09B") == 0 && - (g_env_light.field_0x12cc != 0 || i_dComIfGp_event_runCheck()))) + (g_env_light.field_0x12cc != 0 || dComIfGp_event_runCheck()))) { cLib_addCalc(&g_env_light.mVrkumoStrength, 1.0f, 0.1f, 0.003f, 0.0000001f); } else if (strcmp(dComIfGp_getStartStageName(), "F_SP104") == 0 && @@ -1902,7 +1902,7 @@ cXyz dKyw_get_wind_vecpow() { /* 8005AB64-8005AC30 0554A4 00CC+00 0/0 0/0 1/1 .text dKyw_plight_collision_set__FP4cXyzssfffff */ void dKyw_plight_collision_set(cXyz* param_0, s16 param_1, s16 param_2, f32 param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); for (int i = 0; i < 5; i++) { if (!env_light->mWindInfluenceEntity[i].mInUse) { @@ -1934,7 +1934,7 @@ SECTION_SDATA2 static f32 lit_5630 = 1.0f / 5.0f; // matches with literals #ifdef NONMATCHING static void squal_proc() { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); WIND_INFLUENCE* influence; for (int i = 0; i < 5; i++) { @@ -2132,7 +2132,7 @@ SECTION_SDATA2 static f32 lit_5855[1 + 1 /* padding */] = { // matches with literals #ifdef NONMATCHING void dKyw_get_AllWind_vec(cXyz* param_0, cXyz* i_direction, f32* i_power) { - dScnKy_env_light_c* env_light = i_dKy_getEnvlight(); + dScnKy_env_light_c* env_light = dKy_getEnvlight(); dKyw_pntwind_get_info(param_0, i_direction, i_power); cXyz sp54; diff --git a/src/d/map/d_map.cpp b/src/d/map/d_map.cpp index b4d44a065f3..196ea2df268 100644 --- a/src/d/map/d_map.cpp +++ b/src/d/map/d_map.cpp @@ -119,7 +119,7 @@ void renderingAmap_c::draw() { int renderingAmap_c::getDispType() const { int disp_type; - switch (dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo())) { + switch (dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo())) { case 7: disp_type = 1; break; @@ -525,7 +525,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para if (dComIfGp_getStartStageDarkArea() == 2) { int temp_r3 = i_data->mNo; if (temp_r3 == 0x33 || temp_r3 == 0x34 || temp_r3 == 0x35) { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[119])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[119])) { temp_r23_2 = true; } } else { @@ -937,7 +937,7 @@ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) { } else { f32 var_f31 = 0.0f; - stage_stag_info_class* pstag = i_dComIfGp_getStage()->getStagInfo(); + stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo(); JUT_ASSERT(pstag != 0); if (pstag != NULL) { diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index 843495d2d6e..21ff75dbfda 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -723,7 +723,7 @@ void dMpath_c::setPointer(s8 i_roomNo, void* i_data, int i_mapLayerNo) { /* 8003FB70-8003FBD0 03A4B0 0060+00 0/0 1/1 0/0 .text create__8dMpath_cFv */ void dMpath_c::create() { - stage_stag_info_class* p_stag = i_dComIfGp_getStage()->getStagInfo(); + stage_stag_info_class* p_stag = dComIfGp_getStage()->getStagInfo(); if (dStage_stagInfo_GetSTType(p_stag) != ST_BOSS_ROOM) { reset(); data_80450E88 = false; diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index d7854095d31..36ee4710f7a 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -1073,13 +1073,13 @@ bool dMenu_Collect2D_c::isFishIconVisible() { /* 801B061C-801B071C 1AAF5C 0100+00 2/2 0/0 0/0 .text isSkillIconVisible__17dMenu_Collect2D_cFv */ bool dMenu_Collect2D_c::isSkillIconVisible() { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[338]) || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[339]) || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[340]) || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[341]) || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[342]) || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[343]) || - i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[344])) + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[338]) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[339]) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[340]) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[341]) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[342]) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[343]) || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[344])) { return true; } @@ -1232,23 +1232,23 @@ void dMenu_Collect2D_c::screenSet() { field_0x22d[0][0] = 0; field_0x22d[1][0] = 0; field_0x22d[2][0] = 0; - field_0x22d[3][0] = i_dComIfGs_isItemFirstBit(0x28) || - (i_dComIfGs_isItemFirstBit(0x3F) && !i_dComIfGs_isEventBit(0x302)) ? + field_0x22d[3][0] = dComIfGs_isItemFirstBit(0x28) || + (dComIfGs_isItemFirstBit(0x3F) && !dComIfGs_isEventBit(0x302)) ? true : false; if (field_0x22d[3][0] != 0) { - if (i_dComIfGs_isItemFirstBit(0x28)) { + if (dComIfGs_isItemFirstBit(0x28)) { mpScreen->search('ken_00')->hide(); mpScreen->search('ken_01')->show(); - } else if (i_dComIfGs_isItemFirstBit(0x3F) && !i_dComIfGs_isEventBit(0x302)) { + } else if (dComIfGs_isItemFirstBit(0x3F) && !dComIfGs_isEventBit(0x302)) { mpScreen->search('ken_00')->show(); mpScreen->search('ken_01')->hide(); } } field_0x22d[4][0] = - i_dComIfGs_isItemFirstBit(0x29) || i_dComIfGs_isItemFirstBit(0x49) ? true : false; + dComIfGs_isItemFirstBit(0x29) || dComIfGs_isItemFirstBit(0x49) ? true : false; if (dComIfGs_getMaxLife() > 15) { field_0x22d[5][0] = 1; } else { @@ -1260,17 +1260,17 @@ void dMenu_Collect2D_c::screenSet() { field_0x22d[2][1] = 0; field_0x22d[3][1] = - i_dComIfGs_isItemFirstBit(0x2B) || i_dComIfGs_isItemFirstBit(0x2A) ? true : false; + dComIfGs_isItemFirstBit(0x2B) || dComIfGs_isItemFirstBit(0x2A) ? true : false; if (field_0x22d[3][1] != 0) { - if (i_dComIfGs_isItemFirstBit(0x2B)) { + if (dComIfGs_isItemFirstBit(0x2B)) { mpScreen->search('tate_00')->show(); mpScreen->search('tate_01')->hide(); - } else if (i_dComIfGs_isItemFirstBit(0x2A)) { + } else if (dComIfGs_isItemFirstBit(0x2A)) { mpScreen->search('tate_00')->hide(); mpScreen->search('tate_01')->show(); } } - field_0x22d[4][1] = i_dComIfGs_isItemFirstBit(0x2C); + field_0x22d[4][1] = dComIfGs_isItemFirstBit(0x2C); field_0x22d[5][1] = 0; field_0x22d[6][1] = 0; field_0x22d[0][2] = 0; @@ -1281,9 +1281,9 @@ void dMenu_Collect2D_c::screenSet() { field_0x22d[4][2] = 0; field_0x22d[5][2] = 0; } else { - field_0x22d[3][2] = i_dComIfGs_isItemFirstBit(0x2F); - field_0x22d[4][2] = i_dComIfGs_isItemFirstBit(0x31); - field_0x22d[5][2] = i_dComIfGs_isItemFirstBit(0x30); + field_0x22d[3][2] = dComIfGs_isItemFirstBit(0x2F); + field_0x22d[4][2] = dComIfGs_isItemFirstBit(0x31); + field_0x22d[5][2] = dComIfGs_isItemFirstBit(0x30); } field_0x22d[6][2] = 0; field_0x22d[0][3] = 1; @@ -1334,12 +1334,12 @@ void dMenu_Collect2D_c::screenSet() { field_0x184[0][0] = 0; field_0x184[1][0] = 0; field_0x184[2][0] = 0; - if (i_dComIfGs_isItemFirstBit(0x28)) { + if (dComIfGs_isItemFirstBit(0x28)) { field_0x184[3][0] = 0x18d; } else { field_0x184[3][0] = 0x1a4; } - if (i_dComIfGs_isItemFirstBit(0x49)) { + if (dComIfGs_isItemFirstBit(0x49)) { field_0x184[4][0] = 0x1ae; } else { field_0x184[4][0] = 0x18e; @@ -1365,7 +1365,7 @@ void dMenu_Collect2D_c::screenSet() { field_0x184[0][1] = 0; field_0x184[1][1] = 0; field_0x184[2][1] = 0; - if (i_dComIfGs_isItemFirstBit(0x2B)) { + if (dComIfGs_isItemFirstBit(0x2B)) { field_0x184[3][1] = 0x190; } else { field_0x184[3][1] = 0x18f; @@ -1458,7 +1458,7 @@ void dMenu_Collect2D_c::screenSet() { field_0x1d8[5][3] = 0; field_0x1d8[6][3] = 0; field_0x1d8[0][4] = dMsgObject_getSmellTypeMessageID() + 0x100; - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[456])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[456])) { field_0x1d8[1][4] = 0x12d8; } else { field_0x1d8[1][4] = field_0x184[1][4] + 0x100; @@ -1834,7 +1834,7 @@ asm void dMenu_Collect2D_c::cursorPosSet() { void dMenu_Collect2D_c::changeSword() { switch (mCursorX) { case 3: - if (i_dComIfGs_isItemFirstBit(SWORD)) { + if (dComIfGs_isItemFirstBit(SWORD)) { if (dComIfGs_getSelectEquipSword() != SWORD) { dMeter2Info_setSword(SWORD, false); setEquipItemFrameColorSword(0); @@ -1849,7 +1849,7 @@ void dMenu_Collect2D_c::changeSword() { } break; case 4: - if (i_dComIfGs_isItemFirstBit(LIGHT_SWORD)) { + if (dComIfGs_isItemFirstBit(LIGHT_SWORD)) { if (dComIfGs_getSelectEquipSword() != LIGHT_SWORD) { dMeter2Info_setSword(LIGHT_SWORD, false); setEquipItemFrameColorSword(1); @@ -1892,7 +1892,7 @@ asm void dMenu_Collect2D_c::changeSword() { void dMenu_Collect2D_c::changeShield() { switch (mCursorX) { case 3: - if (i_dComIfGs_isItemFirstBit(SHIELD)) { + if (dComIfGs_isItemFirstBit(SHIELD)) { if (dComIfGs_getSelectEquipShield() != SHIELD) { dMeter2Info_setShield(SHIELD, false); setEquipItemFrameColorShield(0); @@ -1901,7 +1901,7 @@ void dMenu_Collect2D_c::changeShield() { 0); dMeter2Info_set2DVibration(); } - } else if (i_dComIfGs_isItemFirstBit(WOOD_SHIELD)) { + } else if (dComIfGs_isItemFirstBit(WOOD_SHIELD)) { if (dComIfGs_getSelectEquipShield() != WOOD_SHIELD) { dMeter2Info_setShield(WOOD_SHIELD, false); setEquipItemFrameColorShield(0); @@ -2143,7 +2143,7 @@ void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) { break; case LIGHT_SWORD: - if (i_dComIfGs_isItemFirstBit(LIGHT_SWORD)) { + if (dComIfGs_isItemFirstBit(LIGHT_SWORD)) { i_frame = 1; } break; @@ -3420,7 +3420,7 @@ void dMenu_Collect3D_c::set_mtx() { mDoMtx_stack_c::YrotM(mMaskMirrorAngle.y); mDoMtx_stack_c::XrotM(mMaskMirrorAngle.x); mDoMtx_stack_c::ZrotM(mMaskMirrorAngle.z); - mpModel->i_setBaseTRMtx(mDoMtx_stack_c::get()); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } #else #pragma push @@ -3672,8 +3672,8 @@ u8 dMenu_Collect3D_c::getMirrorNum() { /* 801B7504-801B75E8 1B1E44 00E4+00 4/4 0/0 0/0 .text getMaskMdlVisible__17dMenu_Collect3D_cFv */ u8 dMenu_Collect3D_c::getMaskMdlVisible() { if ((getCrystalNum() == 0 && getMirrorNum() == 0) || - (i_dComIfGs_isEventBit(0xC01) && !dComIfGs_isCollectMirror(0)) || - (i_dComIfGs_isEventBit(0x2B08) && !dComIfGs_isCollectCrystal(3))) + (dComIfGs_isEventBit(0xC01) && !dComIfGs_isCollectMirror(0)) || + (dComIfGs_isEventBit(0x2B08) && !dComIfGs_isCollectCrystal(3))) { return 0; } diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp index d00ce2342ef..2aaa4c92ea2 100644 --- a/src/d/menu/d_menu_dmap.cpp +++ b/src/d/menu/d_menu_dmap.cpp @@ -1466,7 +1466,7 @@ void dMenu_DmapBg_c::baseScreenInit() { mBaseScreen->search('t_t00')->hide(); uVar9->setFont(mDoExt_getSubFont()); uVar9->setString(32, ""); - u32 stageTitleNo = dStage_stagInfo_GetStageTitleNo(i_dComIfGp_getStage()->getStagInfo()); + u32 stageTitleNo = dStage_stagInfo_GetStageTitleNo(dComIfGp_getStage()->getStagInfo()); if (stageTitleNo != 0) { mString->getString((u16)stageTitleNo, uVar9, NULL, NULL, NULL, 0); } else { @@ -2360,11 +2360,11 @@ void dMenu_Dmap_c::screenInit() { local_140 = 0xf6; field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? 0xf6 : 0; } else { - if (checkItemGet(0xf4, 1) && !i_dComIfGs_isEventBit(2)) { + if (checkItemGet(0xf4, 1) && !dComIfGs_isEventBit(2)) { local_140 = 0xf4; field_0x174[2] = 0xf4; } else { - if (checkItemGet(0xf5, 1) && !i_dComIfGs_isEventBit(1)) { + if (checkItemGet(0xf5, 1) && !dComIfGs_isEventBit(1)) { local_140 = 0xf5; field_0x174[2] = 0xf5; } diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index 6dedecbcc64..d186da39782 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -574,7 +574,7 @@ u8 dMenu_Insect_c::getGetInsectNum() { u8 insectId = *insectList; insectList++; - if (i_dComIfGs_isItemFirstBit(insectId) != 0) { + if (dComIfGs_isItemFirstBit(insectId) != 0) { insectNum++; } } @@ -596,7 +596,7 @@ u8 dMenu_Insect_c::getInsectItemID(int param_0, int param_1) { /* 801D9DE4-801D9E20 1D4724 003C+00 4/4 0/0 0/0 .text isGetInsect__14dMenu_Insect_cFii */ bool dMenu_Insect_c::isGetInsect(int param_0, int param_1) { - return i_dComIfGs_isItemFirstBit(getInsectItemID(param_0, param_1)) != 0; + return dComIfGs_isItemFirstBit(getInsectItemID(param_0, param_1)) != 0; } /* 801D9E20-801D9E7C 1D4760 005C+00 4/4 0/0 0/0 .text isGiveInsect__14dMenu_Insect_cFii @@ -607,7 +607,7 @@ bool dMenu_Insect_c::isGiveInsect(int param_0, int param_1) { 0x193, 0x194, 0x19F, 0x1A0, 0x1A1, 0x1A2, 0x199, 0x19A, 0x197, 0x198, 0x1A3, 0x1A4, }; - return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_evtID[param_0 + param_1 * 6]]) != + return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_evtID[param_0 + param_1 * 6]]) != 0; } @@ -615,7 +615,7 @@ bool dMenu_Insect_c::isGiveInsect(int param_0, int param_1) { */ bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) { if (i_insectID >= M_BEETLE && i_insectID <= F_MAYFLY) { - return i_dComIfGs_isItemFirstBit(i_insectID); + return dComIfGs_isItemFirstBit(i_insectID); } return false; } @@ -625,7 +625,7 @@ bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) { bool dMenu_Insect_c::isGiveInsect(u8 i_insectID) { if (i_insectID >= M_BEETLE && i_insectID <= F_MAYFLY) { int label = i_insectID + 0xd1; - return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[label]); + return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[label]); } return false; } diff --git a/src/d/menu/d_menu_item_explain.cpp b/src/d/menu/d_menu_item_explain.cpp index 1af8952497e..cd640090593 100644 --- a/src/d/menu/d_menu_item_explain.cpp +++ b/src/d/menu/d_menu_item_explain.cpp @@ -665,7 +665,7 @@ u8 dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool itemNo = 0xfd; } } - if (itemNo == 0x50 && i_dComIfGs_isItemFirstBit(0x4f) && dMeter2Info_getRentalBombBag() == 0xff) + if (itemNo == 0x50 && dComIfGs_isItemFirstBit(0x4f) && dMeter2Info_getRentalBombBag() == 0xff) { itemNo = 0x4f; } diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index 55c042e6aa4..e5d6c31f05d 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -1955,7 +1955,7 @@ SECTION_DEAD static char const* const stringBase_80397A06 = "save cmdState %d\n" // matches with literals #ifdef NONMATCHING void dMenu_save_c::memCardDataSaveWait() { - i_mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); + mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); if (mWaitTimer != 0) { mWaitTimer--; @@ -1983,7 +1983,7 @@ asm void dMenu_save_c::memCardDataSaveWait() { #ifdef NONMATCHING void dMenu_save_c::memCardDataSaveWait2() { if (mWaitTimer != 0) { - i_mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); + mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); mWaitTimer--; return; } @@ -2219,12 +2219,12 @@ void dMenu_save_c::retryQuestion2() { /* 801F30B8-801F31B0 1ED9F8 00F8+00 2/2 0/0 0/0 .text restartInit__12dMenu_save_cFv */ void dMenu_save_c::restartInit() { // if monkey lantern sequence not completed - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]); // Lantern stolen dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]); // Monkey dropped lantern } - if (i_dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) { + if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) { dComIfGs_setItem(SLOT_1, KANTERA); dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp()); } @@ -2732,7 +2732,7 @@ asm void dMenu_save_c::yesnoSelectStart() { // matches with literals #ifdef NONMATCHING void dMenu_save_c::saveMoveDisp() { - i_mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); + mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); bool headerTxtChanged = headerTxtChangeAnm(); bool yesnoAnmComplete = yesnoMenuMoveAnm(); @@ -2762,7 +2762,7 @@ asm void dMenu_save_c::saveMoveDisp() { // matches with literals #ifdef NONMATCHING void dMenu_save_c::saveMoveDisp2() { - i_mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); + mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); bool headerTxtChanged = headerTxtChangeAnm(); bool dataMoveAnm = selectDataMoveAnm(); diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index 70d411982a2..21925af0b8f 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -651,7 +651,7 @@ u8 dMenu_Skill_c::getSkillNum() { u8 skillNum = 0; for (int i = 0; i < 7; i++) { - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[evt_id[i]])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[evt_id[i]])) { skillNum++; } } diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index 567429a748a..379e37e6911 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -2426,7 +2426,7 @@ BOOL dMw_c::dMw_isPush_S_Button() { /* 801FCDD8-801FCE08 1F7718 0030+00 1/1 0/0 0/0 .text isPauseReady__5dMw_cFv */ bool dMw_c::isPauseReady() { - if (i_dComIfGp_getEvent().checkCompulsory() || i_dComIfGs_getLife() == 0) { + if (dComIfGp_getEvent().checkCompulsory() || dComIfGs_getLife() == 0) { return false; } return true; @@ -2470,7 +2470,7 @@ bool dMw_c::isEventCheck() { field_0x148 = 0; } - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { if (!dMsgObject_isTalkNowCheck() && (dMeter2Info_getMapStatus() == 4 || dMeter2Info_getMapStatus() == 5 || dMeter2Info_getMapStatus() == 7 || dMeter2Info_getMapStatus() == 8 || @@ -2572,7 +2572,7 @@ int dMw_c::_execute() { checkCStickTrigger(); } - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { field_0x148 = 5; } else if (field_0x148 > 0) { field_0x148--; diff --git a/src/d/menu/d_menu_window_HIO.cpp b/src/d/menu/d_menu_window_HIO.cpp index 92219afee50..2b47c771aff 100644 --- a/src/d/menu/d_menu_window_HIO.cpp +++ b/src/d/menu/d_menu_window_HIO.cpp @@ -79,17 +79,17 @@ void dMw_HIO_c::init() { field_0xea = 0; for (int i = 0; i < 4; i++) { - bool swordBit = i_dComIfGs_isItemFirstBit(m_sword_item[i]); + bool swordBit = dComIfGs_isItemFirstBit(m_sword_item[i]); mSwordsCopy[i] = swordBit; mSwords[i] = swordBit; } for (int i = 0; i < 3; i++) { - bool shieldBit = i_dComIfGs_isItemFirstBit(m_shield_item[i]); + bool shieldBit = dComIfGs_isItemFirstBit(m_shield_item[i]); mShieldsCopy[i] = shieldBit; mShields[i] = shieldBit; - bool clothesBit = i_dComIfGs_isItemFirstBit(m_cloth_item[i]); + bool clothesBit = dComIfGs_isItemFirstBit(m_cloth_item[i]); mClothesCopy[i] = clothesBit; mClothes[i] = clothesBit; } diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp index c07d5da2f93..f6f26ae2c80 100644 --- a/src/d/meter/d_meter2.cpp +++ b/src/d/meter/d_meter2.cpp @@ -295,7 +295,7 @@ int dMeter2_c::_create() { field_0x1ed = 0; mLifeCountType = 0; - mNowLifeGauge = i_dComIfGs_getLife(); + mNowLifeGauge = dComIfGs_getLife(); dComIfGp_setItemNowLife((u8)mNowLifeGauge); mMaxLife = dComIfGs_getMaxLife(); @@ -322,10 +322,10 @@ int dMeter2_c::_create() { mNeedLightDropNum = dComIfGp_getNeedLightDropNum(); - mRupeeNum = i_dComIfGs_getRupee(); + mRupeeNum = dComIfGs_getRupee(); mKeyNum = dComIfGs_getKeyNum(); - mDoStatus = i_dComIfGp_getDoStatus(); + mDoStatus = dComIfGp_getDoStatus(); mDoSetFlag = dComIfGp_isDoSetFlag(2); for (int i = 0; i < 2; i++) { @@ -355,7 +355,7 @@ int dMeter2_c::_create() { field_0x201 = 0; mCollectSmell = dComIfGs_getCollectSmell(); - mRStatus = i_dComIfGp_getRStatus(); + mRStatus = dComIfGp_getRStatus(); mRSetFlag = dComIfGp_isRSetFlag(2); mXSetFlag = dComIfGp_isXSetFlag(2); mYSetFlag = dComIfGp_isYSetFlag(2); @@ -463,11 +463,11 @@ int dMeter2_c::_create() { int dMeter2_c::_execute() { JKRHeap* heap = mDoExt_setCurrentHeap(mpHeap); - if (!dComIfGs_isCollectMirror(0) && i_dComIfGs_isEventBit(dSv_event_flag_c::F_0685)) { + if (!dComIfGs_isCollectMirror(0) && dComIfGs_isEventBit(dSv_event_flag_c::F_0685)) { dComIfGs_onCollectMirror(0); } - if (!dComIfGs_isCollectCrystal(3) && i_dComIfGs_isEventBit(dSv_event_flag_c::F_0686)) { + if (!dComIfGs_isCollectCrystal(3) && dComIfGs_isEventBit(dSv_event_flag_c::F_0686)) { dComIfGs_onCollectCrystal(3); } @@ -504,7 +504,7 @@ int dMeter2_c::_execute() { moveSubContents(); move2DContents(); - if (!dComIfGp_isPauseFlag() && !i_dComIfGp_event_runCheck()) { + if (!dComIfGp_isPauseFlag() && !dComIfGp_event_runCheck()) { dMeter2Info_decHotSpringTimer(); } @@ -515,7 +515,7 @@ int dMeter2_c::_execute() { dComIfGp_setRemoConStatus(0, 0, 0); dComIfGp_setNunZStatus(0, 0); dComIfGp_setNunCStatus(0, 0); - i_dComIfGp_setBottleStatus(0, 0); + dComIfGp_setBottleStatus(0, 0); dComIfGp_setCStickStatus(0, 0, 0); mDoExt_setCurrentHeap(heap); @@ -630,7 +630,7 @@ int dMeter2_c::emphasisButtonDelete() { void dMeter2_c::setLifeZero() { dComIfGs_setLife(1); setNowLifeGauge(1); - i_dComIfGp_setItemLifeCount(-1.0f, 0); + dComIfGp_setItemLifeCount(-1.0f, 0); } /* 8021F7B0-8021FD60 21A0F0 05B0+00 2/1 0/0 0/0 .text checkStatus__9dMeter2_cFv */ @@ -639,13 +639,13 @@ void dMeter2_c::checkStatus() { field_0x12c = field_0x128; // supposed to be daPy_py_c::checkNowWolf, but it messes with reg alloc? - field_0x128 = ((daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR))->i_checkWolf(); + field_0x128 = ((daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR))->checkWolf(); if (!dComIfGp_2dShowCheck() || dMsgObject_getMsgObjectClass()->isPlaceMessage()) { mStatus |= 0x4000; - } else if (i_dComIfGp_checkPlayerStatus1(0, 1) && dComIfGp_getAStatus() == 0x12) { + } else if (dComIfGp_checkPlayerStatus1(0, 1) && dComIfGp_getAStatus() == 0x12) { mStatus |= 0x200000; - } else if (i_dComIfGp_event_runCheck()) { + } else if (dComIfGp_event_runCheck()) { mStatus |= 0x40; if (dDemo_c::getMode() != 1 && dComIfGp_isHeapLockFlag() != 6 && @@ -686,27 +686,27 @@ void dMeter2_c::checkStatus() { if (dComIfGp_checkCameraAttentionStatus(0, 8)) { mStatus |= 0x80; - } else if (dComIfGp_checkCameraAttentionStatus(i_dComIfGp_getPlayerCameraID(0), 0x10) && + } else if (dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 0x10) && dCam_getBody()->CalcSubjectAngle(&sp8, &spA)) { mStatus |= 0x20000000; } else if (daPy_getPlayerActorClass()->checkCanoeRide()) { mStatus |= 0x400; - } else if (i_dComIfGp_checkPlayerStatus0(0, 0x8000000) || + } else if (dComIfGp_checkPlayerStatus0(0, 0x8000000) || daPy_getPlayerActorClass()->checkSpinnerRide()) { mStatus |= 0x200; - } else if (i_dComIfGp_checkPlayerStatus0(0, 0x800000)) { + } else if (dComIfGp_checkPlayerStatus0(0, 0x800000)) { mStatus |= 0x800; - } else if (i_dComIfGp_checkPlayerStatus0(0, 0x100000)) { + } else if (dComIfGp_checkPlayerStatus0(0, 0x100000)) { mStatus |= 0x2000; - } else if (i_dComIfGp_checkPlayerStatus0(0, 0x2000108)) { + } else if (dComIfGp_checkPlayerStatus0(0, 0x2000108)) { mStatus |= 0x8000; - } else if (i_dComIfGp_checkPlayerStatus0(0, 0x4000000)) { + } else if (dComIfGp_checkPlayerStatus0(0, 0x4000000)) { mStatus |= 0x10000; } else if (daPy_getPlayerActorClass()->checkHorseRideNotReady() && - i_dComIfGp_getHorseActor() != NULL && - !i_dComIfGp_getHorseActor()->checkRodeoMode()) + dComIfGp_getHorseActor() != NULL && + !dComIfGp_getHorseActor()->checkRodeoMode()) { mStatus |= 0x2000000; } @@ -753,7 +753,7 @@ void dMeter2_c::checkStatus() { break; } - switch (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo())) { + switch (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo())) { case ST_DUNGEON: mStatus |= 0x4; break; @@ -783,8 +783,8 @@ void dMeter2_c::moveLife() { life_count = (max_count / 5) * 4; dComIfGs_setMaxLife(max_count); - s16 current_life = life_count - i_dComIfGs_getLife(); - i_dComIfGp_setItemLifeCount(current_life, 0); + s16 current_life = life_count - dComIfGs_getLife(); + dComIfGp_setItemLifeCount(current_life, 0); dComIfGp_clearItemMaxLifeCount(); draw_life = true; } @@ -797,7 +797,7 @@ void dMeter2_c::moveLife() { life_count = (dComIfGs_getMaxLife() / 5) * 4; } - s16 new_life = i_dComIfGs_getLife() + dComIfGp_getItemLifeCount(); + s16 new_life = dComIfGs_getLife() + dComIfGp_getItemLifeCount(); if (new_life > life_count) { new_life = life_count; } else if (new_life < 0) { @@ -807,7 +807,7 @@ void dMeter2_c::moveLife() { dComIfGs_setLife((u8)new_life); dComIfGp_clearItemLifeCount(); - if (mNowLifeGauge == i_dComIfGs_getLife() && mLifeCountType != 0) { + if (mNowLifeGauge == dComIfGs_getLife() && mLifeCountType != 0) { mLifeCountType = 0; } draw_life = true; @@ -825,12 +825,12 @@ void dMeter2_c::moveLife() { } } - u16 current_life = i_dComIfGs_getLife(); + u16 current_life = dComIfGs_getLife(); if (mNowLifeGauge != current_life) { if (mNowLifeGauge < current_life) { mNowLifeGauge++; - if (i_dComIfGp_checkPlayerStatus1(0, 0x2000) || - i_dComIfGp_checkPlayerStatus0(0, 0x20000000) || dMeter2Info_getLifeGaugeSE()) + if (dComIfGp_checkPlayerStatus1(0, 0x2000) || + dComIfGp_checkPlayerStatus0(0, 0x20000000) || dMeter2Info_getLifeGaugeSE()) { if (mNowLifeGauge % 4 == 0) { mDoAud_seStart(Z2SE_HP_GAUGE_INC, 0, 0, 0); @@ -839,7 +839,7 @@ void dMeter2_c::moveLife() { mDoAud_seStart(Z2SE_HP_GAUGE_INC, 0, 0, 0); } - u16 life = i_dComIfGs_getLife(); + u16 life = dComIfGs_getLife(); if (mNowLifeGauge == life && mLifeCountType != 0) { mLifeCountType = 0; } @@ -1242,7 +1242,7 @@ void dMeter2_c::moveRupee() { // using dComIfGp_getItemRupeeCount() here swaps r3/r4 reg alloc? if (g_dComIfG_gameInfo.play.mItemRupeeCount != 0) { - var_r6 = i_dComIfGs_getRupee() + dComIfGp_getItemRupeeCount(); + var_r6 = dComIfGs_getRupee() + dComIfGp_getItemRupeeCount(); if (var_r6 > temp_r5) { var_r6 = temp_r5; } else if (var_r6 < 0) { @@ -1268,13 +1268,13 @@ void dMeter2_c::moveRupee() { } } - if (mRupeeNum != i_dComIfGs_getRupee()) { - if (mRupeeNum < i_dComIfGs_getRupee()) { + if (mRupeeNum != dComIfGs_getRupee()) { + if (mRupeeNum < dComIfGs_getRupee()) { mRupeeNum++; draw_rupee = true; if (isRupeeSoundBit(2) & 1) { - if (mRupeeNum != i_dComIfGs_getRupee()) { + if (mRupeeNum != dComIfGs_getRupee()) { if (!isRupeeSoundBit(0)) { onRupeeSoundBit(0); mDoAud_seStart(Z2SE_LUPY_INC_CNT_1, NULL, 0, 0); @@ -1287,12 +1287,12 @@ void dMeter2_c::moveRupee() { offRupeeSoundBit(0); } } - } else if (mRupeeNum > i_dComIfGs_getRupee()) { + } else if (mRupeeNum > dComIfGs_getRupee()) { mRupeeNum--; draw_rupee = true; if (isRupeeSoundBit(3) & 1) { - if (mRupeeNum != i_dComIfGs_getRupee()) { + if (mRupeeNum != dComIfGs_getRupee()) { if (!isRupeeSoundBit(1)) { onRupeeSoundBit(1); mDoAud_seStart(Z2SE_LUPY_DEC_CNT_1, NULL, 0, 0); @@ -1465,18 +1465,18 @@ void dMeter2_c::moveButtonA() { dComIfGp_setDoStatusForce(0, 0); } - if (daPy_getPlayerActorClass()->i_getSumouMode()) { - if (i_dComIfGp_getDoStatus() == 0) { + if (daPy_getPlayerActorClass()->getSumouMode()) { + if (dComIfGp_getDoStatus() == 0) { dComIfGp_setDoStatus(0x15, 0); emphasis_a = true; - } else if (i_dComIfGp_getDoStatus() == 0x15 && !mpMeterDraw->isEmphasisA()) { + } else if (dComIfGp_getDoStatus() == 0x15 && !mpMeterDraw->isEmphasisA()) { var_r29 = 1; draw_buttonA = true; } } - if (mDoStatus != i_dComIfGp_getDoStatus()) { - mDoStatus = i_dComIfGp_getDoStatus(); + if (mDoStatus != dComIfGp_getDoStatus()) { + mDoStatus = dComIfGp_getDoStatus(); if (mDoStatus == 0x2D || mDoStatus == 0x2E) { dComIfGp_setDoStatus(mDoStatus, 1); @@ -1632,7 +1632,7 @@ void dMeter2_c::moveButtonB() { dComIfGp_setAStatusForce(0, 0); } - if (daPy_getPlayerActorClass()->i_getSumouMode()) { + if (daPy_getPlayerActorClass()->getSumouMode()) { if (dComIfGp_getAStatus() == 0 || dComIfGp_getAStatus() == 0x26) { dComIfGp_setAStatus(0x44, 0); emphasis_b = true; @@ -1841,8 +1841,8 @@ void dMeter2_c::moveButtonR() { dComIfGp_setRStatusForce(0, 0); } - if (mRStatus != i_dComIfGp_getRStatus()) { - mRStatus = i_dComIfGp_getRStatus(); + if (mRStatus != dComIfGp_getRStatus()) { + mRStatus = dComIfGp_getRStatus(); if (mRStatus == 0x2D || mRStatus == 0x2E) { dComIfGp_setRStatus(mRStatus, 1); @@ -1946,7 +1946,7 @@ void dMeter2_c::moveButtonZ() { dComIfGp_setZStatus(0, 0); if (dComIfGp_getBottleStatusForce() != 0) { - i_dComIfGp_setBottleStatus(dComIfGp_getBottleStatusForce(), + dComIfGp_setBottleStatus(dComIfGp_getBottleStatusForce(), dComIfGp_getBottleSetFlagForce()); dComIfGp_setBottleStatusForce(0, 0); } @@ -2596,7 +2596,7 @@ void dMeter2_c::checkSubContents() { } } - if (daPy_getPlayerActorClass()->i_getSumouMode() != 0) { + if (daPy_getPlayerActorClass()->getSumouMode() != 0) { killSubContents(5); if (mSubContentType == 0) { @@ -2978,8 +2978,8 @@ void dMeter2_c::movePachinkoNum() { void dMeter2_c::alphaAnimeLife() { if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x10) && - !i_dComIfGp_checkPlayerStatus1(0, 0x2000)) || - ((daPy_getPlayerActorClass()->i_getSumouMode() != 0) || (mStatus & 0x100000) || + !dComIfGp_checkPlayerStatus1(0, 0x2000)) || + ((daPy_getPlayerActorClass()->getSumouMode() != 0) || (mStatus & 0x100000) || (mStatus & 0x80000000) || (mStatus & 8) || (mStatus & 0x10) || (mStatus & 0x01000000) || (mStatus & 0x20) || (mStatus & 0x04000000) || (mStatus & 0x08000000) || (mStatus & 0x10000000))) @@ -2998,7 +2998,7 @@ void dMeter2_c::alphaAnimeKantera() { if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != KANTERA || !daPy_getPlayerActorClass()->checkUseKandelaar(0) || (mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x400)) || dComIfGp_getOxygenShowFlag() || - ((daPy_getPlayerActorClass()->i_getSumouMode() != 0) || + ((daPy_getPlayerActorClass()->getSumouMode() != 0) || (daPy_getPlayerActorClass()->checkCanoeSlider() && (dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4)) || (mStatus & 0x100000) || (mStatus & 0x80000000) || (mStatus & 8) || (mStatus & 0x10) || @@ -3017,7 +3017,7 @@ void dMeter2_c::alphaAnimeKantera() { void dMeter2_c::alphaAnimeOxygen() { if (!dComIfGp_getOxygenShowFlag() || (mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x800)) || - ((daPy_getPlayerActorClass()->i_getSumouMode() != 0) || + ((daPy_getPlayerActorClass()->getSumouMode() != 0) || (daPy_getPlayerActorClass()->checkCanoeSlider() && (dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4)) || (mStatus & 0x100000) || (mStatus & 0x80000000) || (mStatus & 8) || (mStatus & 0x10) || @@ -3071,7 +3071,7 @@ SECTION_DEAD static char const* const pad_8039934F = ""; #ifdef NONMATCHING void dMeter2_c::alphaAnimeRupee() { if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x80)) || - daPy_getPlayerActorClass()->i_getSumouMode() || + daPy_getPlayerActorClass()->getSumouMode() || (daPy_getPlayerActorClass()->checkCanoeSlider() && dComIfG_getTimerMode() == 4) || ((strcmp(dComIfGp_getStartStageName(), "R_SP127") != 0 || dComIfGp_event_checkHind(0x80)) && (((mStatus & 0x40000000) && !(mStatus & 0x100)) || (mStatus & 0x1000) || @@ -3104,7 +3104,7 @@ asm void dMeter2_c::alphaAnimeRupee() { void dMeter2_c::alphaAnimeKey() { if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x40)) || !isKeyVisible() || (mStatus & 0x40000000) || (mStatus & 0x1000) || (mStatus & 0x100000) || - (mStatus & 0x80000000) || daPy_getPlayerActorClass()->i_getSumouMode() || + (mStatus & 0x80000000) || daPy_getPlayerActorClass()->getSumouMode() || (daPy_getPlayerActorClass()->checkCanoeSlider() && (dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4)) || (mStatus & 0x100) || (mStatus & 8) || (mStatus & 0x10) || @@ -3217,7 +3217,7 @@ void dMeter2_c::alphaAnimeButton() { */ void dMeter2_c::alphaAnimeButtonCross() { if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x100)) || - ((daPy_getPlayerActorClass()->i_getSumouMode() != 0) || (mStatus & 0x100) || + ((daPy_getPlayerActorClass()->getSumouMode() != 0) || (mStatus & 0x100) || (mStatus & 0x80) || (mStatus & 0x40000000) || (mStatus & 0x1000) || (mStatus & 0x100000) || (mStatus & 0x80000000) || (mStatus & 8) || (mStatus & 0x10) || (mStatus & 0x01000000) || (mStatus & 0x20) || (mStatus & 0x04000000) || (mStatus & 0x08000000) || @@ -3226,7 +3226,7 @@ void dMeter2_c::alphaAnimeButtonCross() { { mpMeterDraw->setAlphButtonACrossAnimeMin(); - if ((!i_dComIfGp_event_chkEventFlag(0x40) || dMeter2Info_isGameStatus(2) || + if ((!dComIfGp_event_chkEventFlag(0x40) || dMeter2Info_isGameStatus(2) || (mStatus & 0x100)) && field_0x190 > 0) { @@ -3257,7 +3257,7 @@ bool dMeter2_c::isShowLightDrop() { if ((mStatus & 0x4000) || !dComIfGs_isLightDropGetFlag(dComIfGp_getStartStageDarkArea()) || dMeter2Info_getLightDropGetFlag(dComIfGp_getStartStageDarkArea()) <= 1 || !dKy_darkworld_check() || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x200)) || - daPy_getPlayerActorClass()->i_getSumouMode() || + daPy_getPlayerActorClass()->getSumouMode() || (daPy_getPlayerActorClass()->checkCanoeSlider() && (dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4)) || (mStatus & 0x40000000) || (mStatus & 0x00001000) || (mStatus & 0x00100000) || @@ -3301,8 +3301,8 @@ void dMeter2_c::killSubContents(u8 param_0) { /* 80225960-802259F8 2202A0 0098+00 1/1 0/0 0/0 .text isKeyVisible__9dMeter2_cFv */ u8 dMeter2_c::isKeyVisible() { - if (dStage_stagInfo_ChkKeyDisp(i_dComIfGp_getStage()->getStagInfo())) { - if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_FIELD) { + if (dStage_stagInfo_ChkKeyDisp(dComIfGp_getStage()->getStagInfo())) { + if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_FIELD) { return dComIfGs_getKeyNum() != 0; } else { return true; diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp index 6a19915f292..e7f52bc4b12 100644 --- a/src/d/meter/d_meter2_draw.cpp +++ b/src/d/meter/d_meter2_draw.cpp @@ -716,9 +716,9 @@ void dMeter2Draw_c::draw() { /* 80211BEC-80211E64 20C52C 0278+00 1/1 0/0 0/0 .text initLife__13dMeter2Draw_cFv */ void dMeter2Draw_c::initLife() { - if (i_dComIfGs_getLife() > dComIfGs_getMaxLifeGauge()) { + if (dComIfGs_getLife() > dComIfGs_getMaxLifeGauge()) { // "●●●●●●Heart Count adjust======>%d, %d\n" - OS_REPORT("●●●●●●ハートの数調整======>%d, %d\n", i_dComIfGs_getLife(), + OS_REPORT("●●●●●●ハートの数調整======>%d, %d\n", dComIfGs_getLife(), dComIfGs_getMaxLifeGauge()); dComIfGs_setLife(dComIfGs_getMaxLifeGauge()); } @@ -785,7 +785,7 @@ void dMeter2Draw_c::initLife() { var_f2 = g_drawHIO.mLifeTopPosY; } - drawLife(dComIfGs_getMaxLife(), i_dComIfGs_getLife(), g_drawHIO.mLifeGaugePosX + var_f1, + drawLife(dComIfGs_getMaxLife(), dComIfGs_getLife(), g_drawHIO.mLifeGaugePosX + var_f1, g_drawHIO.mLifeGaugePosY + var_f2); setAlphaLifeChange(true); } @@ -955,7 +955,7 @@ void dMeter2Draw_c::initRupeeKey() { JUT_ASSERT(mpKeyParent != 0); mpKeyParent->setAlphaRate(0.0f); - drawRupee(i_dComIfGs_getRupee()); + drawRupee(dComIfGs_getRupee()); drawKey(dComIfGs_getKeyNum()); setAlphaRupeeChange(true); setAlphaKeyChange(true); @@ -1201,9 +1201,9 @@ void dMeter2Draw_c::initButton() { drawButtonXY(0, dComIfGp_getSelectItem(0), dComIfGp_getXStatus(), true, false); drawButtonXY(1, dComIfGp_getSelectItem(1), dComIfGp_getYStatus(), true, false); - drawButtonA(i_dComIfGp_getDoStatus(), 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, false, false); + drawButtonA(dComIfGp_getDoStatus(), 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, false, false); drawButtonB(dComIfGp_getAStatus(), true, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, false); - drawButtonR(dComIfGs_getCollectSmell(), i_dComIfGp_getRStatus(), true, false); + drawButtonR(dComIfGs_getCollectSmell(), dComIfGp_getRStatus(), true, false); drawButtonZ(dComIfGp_getZStatus()); drawButton3D(dComIfGp_get3DStatus()); drawButtonC(dComIfGp_getCStickStatus(), true); @@ -2271,8 +2271,8 @@ void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textP } } - if (*mp_string != 0 && ((i_dComIfGp_getDoStatus() != dComIfGp_getAStatus() && - i_dComIfGp_getDoStatus() != dComIfGp_getAStatusForce()) || + if (*mp_string != 0 && ((dComIfGp_getDoStatus() != dComIfGp_getAStatus() && + dComIfGp_getDoStatus() != dComIfGp_getAStatusForce()) || !isEmphasisA())) { mpTextA->show(); @@ -2283,7 +2283,7 @@ void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textP JUT_ASSERT(std::strlen(mp_string) < (64)); - if (daPy_getPlayerActorClass()->i_getSumouMode()) { + if (daPy_getPlayerActorClass()->getSumouMode()) { mpTextA->show(); mp_string = getActionString(0x15, 1, NULL); @@ -2325,9 +2325,9 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos } if (*mp_string != 0 && i_action != 0 && i_action != 0x2E && - ((i_dComIfGp_getDoStatus() == 0 || - (i_dComIfGp_getDoStatus() != dComIfGp_getAStatus() && - i_dComIfGp_getDoStatus() != dComIfGp_getAStatusForce())) || + ((dComIfGp_getDoStatus() == 0 || + (dComIfGp_getDoStatus() != dComIfGp_getAStatus() && + dComIfGp_getDoStatus() != dComIfGp_getAStatusForce())) || !isEmphasisB())) { mpTextB->show(); @@ -3159,8 +3159,8 @@ void dMeter2Draw_c::setButtonIconMidonaAlpha(u32 param_0) { bool var_r31 = 1; if (getCanoeFishing() || - (!i_dComIfGs_isEventBit(0x0540) && !dMeter2Info_isUseButton(0x800)) || - !i_dComIfGs_isEventBit(0x0C10) || i_dComIfGs_isEventBit(0x6140)) + (!dComIfGs_isEventBit(0x0540) && !dMeter2Info_isUseButton(0x800)) || + !dComIfGs_isEventBit(0x0C10) || dComIfGs_isEventBit(0x6140)) { var_f29 = 0.0f; } else if (dComIfGp_isPauseFlag()) { @@ -4034,7 +4034,7 @@ bool dMeter2Draw_c::getItemSubject() { /* 8021BCAC-8021BCC0 2165EC 0014+00 0/0 1/1 0/0 .text getPlayerSubject__13dMeter2Draw_cFv */ bool dMeter2Draw_c::getPlayerSubject() { - return i_dComIfGp_checkPlayerStatus0(0, 0x8000000); + return dComIfGp_checkPlayerStatus0(0, 0x8000000); } /* 8021BCC0-8021BDD0 216600 0110+00 2/2 2/2 0/0 .text isButtonBShow__13dMeter2Draw_cFb */ @@ -4046,7 +4046,7 @@ bool dMeter2Draw_c::isButtonBShow(bool param_0) { if (dMeter2Info_isShopTalkFlag() || dMsgObject_getMsgObjectClass()->isHowlMessage() || daPy_getPlayerActorClass()->checkHawkWait() || dMeter2Info_getItemExplainWindowStatus() || (daPy_getPlayerActorClass()->checkGrassWhistle() && param_0) || - (!dComIfGp_event_checkHind(4) && i_dComIfGp_event_runCheck())) + (!dComIfGp_event_checkHind(4) && dComIfGp_event_runCheck())) { return true; } diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp index 5261e0550a9..005e52cad49 100644 --- a/src/d/meter/d_meter2_info.cpp +++ b/src/d/meter/d_meter2_info.cpp @@ -296,7 +296,7 @@ asm void dMeter2Info_c::init() { /* 8021C0E0-8021C11C 216A20 003C+00 0/0 1/1 2/2 .text setFloatingMessage__13dMeter2Info_cFUssb */ int dMeter2Info_c::setFloatingMessage(u16 msgID, s16 msgTimer, bool wakuVisible) { - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { return 0; } @@ -309,7 +309,7 @@ int dMeter2Info_c::setFloatingMessage(u16 msgID, s16 msgTimer, bool wakuVisible) /* 8021C11C-8021C1DC 216A5C 00C0+00 0/0 0/0 1/1 .text setFloatingFlow__13dMeter2Info_cFUssb */ int dMeter2Info_c::setFloatingFlow(u16 flowID, s16 msgTimer, bool wakuVisible) { - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { return 0; } @@ -1479,7 +1479,7 @@ bool dMeter2Info_isMapOpenCheck() { /* 8021E688-8021E6E4 218FC8 005C+00 0/0 2/2 0/0 .text dMeter2Info_isItemOpenCheck__Fv */ bool dMeter2Info_isItemOpenCheck() { if (daPy_getPlayerActorClass()->checkCanoeSlider() || - daPy_getPlayerActorClass()->i_getSumouMode() || dMeter2Info_isSub2DStatus(1)) + daPy_getPlayerActorClass()->getSumouMode() || dMeter2Info_isSub2DStatus(1)) { return false; } @@ -1542,7 +1542,7 @@ u8 dMeter2Info_getNewLetterNum() { for (int i = 0; i < 0x40; i++) { if (!dComIfGs_isLetterGetFlag(i) && dMenu_Letter::getLetterName(i) != 0) { u16 letterEvent = dMenu_Letter::getLetterEventFlag(i); - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[letterEvent])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[letterEvent])) { letterNum++; } } @@ -1560,7 +1560,7 @@ int dMeter2Info_setNewLetterSender() { for (int i = 0; i < 0x40; i++) { if (!dComIfGs_isLetterGetFlag(i) && dMenu_Letter::getLetterName(i) != 0) { u16 letterEvent = dMenu_Letter::getLetterEventFlag(i); - if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[letterEvent])) { + if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[letterEvent])) { if (check == 0) { u16 letterName = dMenu_Letter::getLetterName(i); dMsgObject_c::setLetterNameID(letterName); diff --git a/src/d/meter/d_meter_button.cpp b/src/d/meter/d_meter_button.cpp index 6f574070a5d..c49e2705078 100644 --- a/src/d/meter/d_meter_button.cpp +++ b/src/d/meter/d_meter_button.cpp @@ -301,8 +301,8 @@ void dMeterButton_c::draw() { f32 temp_f0 = (g_drawHIO.mEmpButton.mRepeatHitScale - 1.0f) * var_f2 + 1.0f; mpButtonA->scale(mButtonAScale * temp_f0, mButtonAScale * temp_f0); } else if ((field_0x4be[i] == BUTTON_A_e && - (i_dComIfGp_getDoStatus() == 0x3B || i_dComIfGp_getDoStatus() == 0x3F || - i_dComIfGp_getDoStatus() == 0x40) && + (dComIfGp_getDoStatus() == 0x3B || dComIfGp_getDoStatus() == 0x3F || + dComIfGp_getDoStatus() == 0x40) && dMeter2Info_isBlinkButton(1)) || (field_0x4be[i] == BUTTON_B_e && dComIfGp_getAStatus() == 0x3A && dMeter2Info_isBlinkButton(2))) @@ -366,7 +366,7 @@ void dMeterButton_c::draw() { mDoAud_seStart(Z2SE_SY_HINT_BUTTON_BLINK, NULL, 0, 0); } - if (daPy_getPlayerActorClass()->i_getSumouMode()) { + if (daPy_getPlayerActorClass()->getSumouMode()) { dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( vtx.x, vtx.y, &field_0x2e8[i], 1.8f, g_drawHIO.mEmpButton.mPikariListenFrontOuter, diff --git a/src/d/meter/d_meter_hakusha.cpp b/src/d/meter/d_meter_hakusha.cpp index 3e915f49f6f..96b6ff01630 100644 --- a/src/d/meter/d_meter_hakusha.cpp +++ b/src/d/meter/d_meter_hakusha.cpp @@ -190,7 +190,7 @@ void dMeterHakusha_c::alphaAnimeHakusha(u32 i_flags) { (i_flags & 0x08000000) || (i_flags & 0x01000000) || !(i_flags & 0x02000000) || (strcmp(dComIfGp_getStartStageName(), "F_SP00") == 0 && dComIfG_play_c::getLayerNo(0) == 4) || - (i_dComIfGp_getDoStatus() != 9 && i_dComIfGp_getDoStatus() != 0)) + (dComIfGp_getDoStatus() != 9 && dComIfGp_getDoStatus() != 0)) { setAlphaHakushaAnimeMin(); setAlphaButtonAnimeMin(); @@ -198,7 +198,7 @@ void dMeterHakusha_c::alphaAnimeHakusha(u32 i_flags) { } setAlphaHakushaAnimeMax(); - if (i_dComIfGp_getDoStatus() == 9) { + if (dComIfGp_getDoStatus() == 9) { setAlphaButtonAnimeMax(); } else { setAlphaButtonAnimeMin(); diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp index f0ea435b924..b43495a780a 100644 --- a/src/d/meter/d_meter_map.cpp +++ b/src/d/meter/d_meter_map.cpp @@ -90,7 +90,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* 8020D49C-8020D528 207DDC 008C+00 1/1 0/0 0/0 .text isEnableDispMap__11dMeterMap_cFv */ bool dMeterMap_c::isEnableDispMap() { bool minimapEnable = false; - stage_stag_info_class* pstag = i_dComIfGp_getStage()->getStagInfo(); + stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo(); if (pstag != NULL && getMapDispSizeTypeNo() != 0) { minimapEnable = dStage_stagInfo_GetMiniMap(pstag) != 0; @@ -114,8 +114,8 @@ int dMeterMap_c::getMapDispSizeTypeNo() { uvar6 = dStage_FileList_dt_getMiniMap(fList); } - u32 stageMapSizeTypeNo = dStage_stagInfo_GetMiniMap(i_dComIfGp_getStage()->getStagInfo()); - s32 mapDispType = dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo()); + u32 stageMapSizeTypeNo = dStage_stagInfo_GetMiniMap(dComIfGp_getStage()->getStagInfo()); + s32 mapDispType = dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()); if (mapDispType == 1) { uvar6 = 1; @@ -171,13 +171,13 @@ f32 dMeterMap_c::getMapDispEdgeBottomY_Layout() { // missing gameinfo load #ifdef NONMATCHING bool dMeterMap_c::isEventRunCheck() { - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { return true; } else if (dMsgObject_isTalkNowCheck()) { return true; } - return i_dComIfGp_event_runCheck() != field_0x30 ? 1 : 0; + return dComIfGp_event_runCheck() != field_0x30 ? 1 : 0; } #else #pragma push @@ -251,7 +251,7 @@ void dMeterMap_c::setMapAlpha(u8 i_alpha) { /* 8020D900-8020D948 208240 0048+00 3/3 1/1 0/0 .text isMapOpenCheck__11dMeterMap_cFv */ bool dMeterMap_c::isMapOpenCheck() { - return dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo()) == 7 ? false : true; + return dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 7 ? false : true; } /* 8020D948-8020D990 208288 0048+00 0/0 1/1 0/0 .text __ct__11dMeterMap_cFP9J2DScreen */ @@ -345,7 +345,7 @@ void dMeterMap_c::_create(J2DScreen* unused) { field_0x2e = 0; field_0x28 = 0; field_0x30 = 0; - field_0x2b = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[118]); + field_0x2b = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[118]); } /* 8020DC50-8020DCE4 208590 0094+00 1/1 0/0 0/0 .text _delete__11dMeterMap_cFv */ @@ -369,11 +369,11 @@ void dMeterMap_c::_delete() { /* 8020DCE4-8020DF1C 208624 0238+00 0/0 1/1 0/0 .text _move__11dMeterMap_cFUl */ void dMeterMap_c::_move(u32 param_0) { - if (!field_0x2b && i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[118])) { + if (!field_0x2b && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[118])) { if (strcmp(dComIfGp_getStartStageName(), "F_SP115") == 0) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[119]); } else { - field_0x2b = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[118]); + field_0x2b = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[118]); dMeter2Info_setPauseStatus(2); } } @@ -404,7 +404,7 @@ void dMeterMap_c::_move(u32 param_0) { field_0x1c = getMapDispEdgeBottomY_Layout() - mSizeH; mMap->_move(map_pos.x, map_pos.z, stayNo, map_pos.y); - field_0x30 = i_dComIfGp_event_runCheck(); + field_0x30 = dComIfGp_event_runCheck(); } /* 8020DF1C-8020DF68 20885C 004C+00 0/0 1/1 0/0 .text _draw__11dMeterMap_cFv */ @@ -545,8 +545,8 @@ u8 dMeterMap_c::checkMoveStatus() { bool dMeterMap_c::isShow(u32 param_0) { if ((param_0 & 0x4000) || fopOvlpM_IsDoingReq() || ((param_0 & 0x40) && dComIfGp_event_checkHind(0x100) && - !i_dComIfGp_event_chkEventFlag(0x40)) || - daPy_getPlayerActorClass()->i_getSumouMode() || (param_0 & 0x200000) || (param_0 & 0x100) || + !dComIfGp_event_chkEventFlag(0x40)) || + daPy_getPlayerActorClass()->getSumouMode() || (param_0 & 0x200000) || (param_0 & 0x100) || (param_0 & 0x80) || (param_0 & 0x40000000) || (param_0 & 0x1000) || (param_0 & 0x100000) || (param_0 & 0x20000) || (param_0 & 8) || (param_0 & 0x10) || (param_0 & 0x1000000) || (param_0 & 0x800000) || (param_0 & 0x20) || (param_0 & 0x4000000) || @@ -570,11 +570,11 @@ asm bool dMeterMap_c::isShow(u32 param_0) { /* 8020E620-8020E70C 208F60 00EC+00 3/3 0/0 0/0 .text isFmapScreen__11dMeterMap_cFv */ bool dMeterMap_c::isFmapScreen() { - if (dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo()) == 0 || - dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo()) == 5 || - dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo()) == 3 || - dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo()) == 4 || - dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo()) == 6) + if (dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 0 || + dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 5 || + dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 3 || + dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 4 || + dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 6) { return true; } @@ -583,7 +583,7 @@ bool dMeterMap_c::isFmapScreen() { /* 8020E70C-8020E754 20904C 0048+00 3/3 0/0 0/0 .text isDmapScreen__11dMeterMap_cFv */ bool dMeterMap_c::isDmapScreen() { - return dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo()) == 1 ? 1 : 0; + return dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 1 ? 1 : 0; } /* 8020E754-8020E9CC 209094 0278+00 0/0 1/1 0/0 .text meter_map_move__11dMeterMap_cFUl */ @@ -599,7 +599,7 @@ void dMeterMap_c::meter_map_move(u32 param_0) { } dMeter2Info_resetPauseStatus(); } else { - if (dMw_LEFT_TRIGGER() && !i_dComIfGp_event_runCheck() && + if (dMw_LEFT_TRIGGER() && !dComIfGp_event_runCheck() && !dMsgObject_isTalkNowCheck() && (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1)) { @@ -612,7 +612,7 @@ void dMeterMap_c::meter_map_move(u32 param_0) { dMeter2Info_set2DVibration(); } } - } else if (dMw_RIGHT_TRIGGER() && !i_dComIfGp_event_runCheck() && + } else if (dMw_RIGHT_TRIGGER() && !dComIfGp_event_runCheck() && !dMsgObject_isTalkNowCheck() && (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1)) { diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index 5ef974714a1..88bc23a9ec0 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -1111,11 +1111,11 @@ void jmessage_tReference::inputNumber() { s16 new_input_val = input_val; u8 max_figure = 0; - if (i_dComIfGs_getRupee() >= 1000) { + if (dComIfGs_getRupee() >= 1000) { max_figure = 3; - } else if (i_dComIfGs_getRupee() >= 100) { + } else if (dComIfGs_getRupee() >= 100) { max_figure = 2; - } else if (i_dComIfGs_getRupee() >= 10) { + } else if (dComIfGs_getRupee() >= 10) { max_figure = 1; } @@ -1167,8 +1167,8 @@ void jmessage_tReference::inputNumber() { new_input_val = 0; } - if (new_input_val > i_dComIfGs_getRupee()) { - new_input_val = i_dComIfGs_getRupee(); + if (new_input_val > dComIfGs_getRupee()) { + new_input_val = dComIfGs_getRupee(); } if (new_input_val != input_val) { @@ -1864,7 +1864,7 @@ bool jmessage_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_siz dMsgUnit_setTag(0x10000, dComIfGp_getNeedLightDropNum(), buffer_0); break; case 6: - dMsgUnit_setTag(6, 20 - i_dComIfGs_getEventReg(0xFF1F), buffer_0); + dMsgUnit_setTag(6, 20 - dComIfGs_getEventReg(0xFF1F), buffer_0); break; case 8: dMsgUnit_setTag(9, (u32)dComIfGp_getMessageCountNumber(), buffer_0); diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index e1c2d3218c6..b54f56870ad 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -1131,11 +1131,11 @@ int dMsgFlow_c::getParam(u8* params) { /* 8024B138-8024B180 245A78 0048+00 1/0 0/0 0/0 .text * query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ int dMsgFlow_c::query001(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { - return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[flow_node->params[0] & 0xFFFF]) == false; + return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[flow_node->params[0] & 0xFFFF]) == false; } BOOL daPy_py_c::checkNowWolf() { - return dComIfGp_getLinkPlayer()->i_checkWolf(); + return dComIfGp_getLinkPlayer()->checkWolf(); } /* 8024B180-8024B208 245AC0 0088+00 1/0 0/0 0/0 .text @@ -1183,11 +1183,11 @@ int dMsgFlow_c::query004(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, if ( uVar1 == 0 ) { uVar2 = dComIfGs_getRupeeMax(); - uVar1 = i_dComIfGs_getRupee(); + uVar1 = dComIfGs_getRupee(); ret = uVar1 < uVar2; } else { - ret = i_dComIfGs_getRupee() < (u16)p0; + ret = dComIfGs_getRupee() < (u16)p0; } return ret; @@ -1459,7 +1459,7 @@ int dMsgFlow_c::query030(mesg_flow_node_branch*, fopAc_ac_c*, int) { * query031__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ int dMsgFlow_c::query031(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { u16 uVar3 = *(u16*)(flow_node->params); - return (0x14 - i_dComIfGs_getEventReg(0xff1f)) < uVar3; + return (0x14 - dComIfGs_getEventReg(0xff1f)) < uVar3; } /* 8024BB74-8024BB9C 2464B4 0028+00 1/0 0/0 0/0 .text @@ -1467,7 +1467,7 @@ int dMsgFlow_c::query031(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int dMsgFlow_c::query032(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { u8 rv = 1; u16 uVar1 = *(u16*)flow_node->params; - if (i_dComIfGs_getLife() >= (int)uVar1) { + if (dComIfGs_getLife() >= (int)uVar1) { rv = 0; } @@ -1737,7 +1737,7 @@ int dMsgFlow_c::query051(mesg_flow_node_branch*, fopAc_ac_c*, int) { int dMsgFlow_c::query052(mesg_flow_node_branch*, fopAc_ac_c*, int) { bool phi_r4 = false; if (daPy_getPlayerActorClass()->checkWaterInMove() || - i_dComIfGp_checkPlayerStatus0(0, 0x100000)) { + dComIfGp_checkPlayerStatus0(0, 0x100000)) { phi_r4 = true; } @@ -1748,7 +1748,7 @@ int dMsgFlow_c::query052(mesg_flow_node_branch*, fopAc_ac_c*, int) { * query053__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ int dMsgFlow_c::query053(mesg_flow_node_branch*, fopAc_ac_c*, int) { bool phi_r4 = false; - if (daPy_getPlayerActorClass()->i_checkEquipHeavyBoots()) { + if (daPy_getPlayerActorClass()->checkEquipHeavyBoots()) { phi_r4 = true; } @@ -1792,7 +1792,7 @@ int dMsgFlow_c::event001(mesg_flow_node_event* flow_node, fopAc_ac_c*) { int dMsgFlow_c::event002(mesg_flow_node_event* flow_node, fopAc_ac_c*) { int prm0 = getParam(flow_node->params); - i_dComIfGp_setItemRupeeCount(prm0); + dComIfGp_setItemRupeeCount(prm0); return 1; } @@ -1801,7 +1801,7 @@ int dMsgFlow_c::event002(mesg_flow_node_event* flow_node, fopAc_ac_c*) { int dMsgFlow_c::event003(mesg_flow_node_event* flow_node, fopAc_ac_c*) { int prm0 = getParam(flow_node->params); - i_dComIfGp_setItemRupeeCount(-prm0); + dComIfGp_setItemRupeeCount(-prm0); return 1; } @@ -1816,7 +1816,7 @@ SECTION_SDATA2 static f64 lit_6040 = 4503601774854144.0 /* cast s32 to float */; int dMsgFlow_c::event004(mesg_flow_node_event* flow_node, fopAc_ac_c*) { f32 prm0 = getParam(flow_node->params); - i_dComIfGp_setItemLifeCount(prm0, 0); + dComIfGp_setItemLifeCount(prm0, 0); return 1; } #else @@ -1838,7 +1838,7 @@ int dMsgFlow_c::event005(mesg_flow_node_event* flow_node, fopAc_ac_c*) { f32 prm0 = getParam(flow_node->params); f32 prm1 = -prm0; - i_dComIfGp_setItemLifeCount(prm1, 0); + dComIfGp_setItemLifeCount(prm1, 0); return 1; } #else @@ -2349,7 +2349,7 @@ int dMsgFlow_c::event028(mesg_flow_node_event* param_0, fopAc_ac_c* param_1) { u8 bagID = dMsgObject_c::getSelectBombBagID(); s16 bombPrice = dMsgObject_c::getSelectBombPrice(); - i_dComIfGp_setItemRupeeCount(bombPrice); + dComIfGp_setItemRupeeCount(bombPrice); dComIfGs_setBombNum(bagID, 0); if (dComIfGs_getItem((u8)(SLOT_15 + bagID), true) != BOMB_ARROW) { diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index 57d0c57be2c..18a973ba3f8 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -937,7 +937,7 @@ asm void dMsgObject_c::isSend() { void dMsgObject_c::readMessageGroupLocal(mDoDvdThd_mountXArchive_c** p_arcMount) { static char arcName[22]; - int msgGroup = dStage_stagInfo_GetMsgGroup(i_dComIfGp_getStage()->getStagInfo()); + int msgGroup = dStage_stagInfo_GetMsgGroup(dComIfGp_getStage()->getStagInfo()); sprintf(arcName, "/res/Msgus/bmgres%d.arc", msgGroup); *p_arcMount = mDoDvdThd_mountXArchive_c::create(arcName, 0, JKRArchive::MOUNT_MEM, NULL); diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index e4b1d6300c0..cf7b27660ad 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -919,7 +919,7 @@ static asm void drawSecond_light8(JPABaseEmitter* param_0) { /* 80049E40-80049FEC 044780 01AC+00 2/2 0/0 0/0 .text drawSecond_b_light8__FP14JPABaseEmitter */ static void drawSecond_b_light8(JPABaseEmitter* param_0) { - dScnKy_env_light_c* envLight = i_dKy_getEnvlight(); + dScnKy_env_light_c* envLight = dKy_getEnvlight(); dKy_setLight_nowroom(dComIfGp_roomControl_getStayNo()); GXSetColorUpdate(true); GXSetNumChans(1); @@ -1555,7 +1555,7 @@ void dPa_windPcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* param_ void dPa_control_c::level_c::emitter_c::onActive() { mStatus |= 1; - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { onEventMove(); } else { offEventMove(); @@ -1620,7 +1620,7 @@ dPa_control_c::level_c::level_c() { * execute__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c */ void dPa_control_c::level_c::execute(dPa_control_c::level_c::emitter_c* i_emitter) { if (!i_emitter->isActive()) { - if (i_emitter->isEventMove() || !i_dComIfGp_event_runCheck()) { + if (i_emitter->isEventMove() || !dComIfGp_event_runCheck()) { i_emitter->getEmitter()->playCalcEmitter(); cutTable(i_emitter); mFreeNo = ((i_emitter - mEmitter) / sizeof(emitter_c)); diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index ed64acfd0fa..f28377dc7e5 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -426,7 +426,7 @@ dScnLogo_c::~dScnLogo_c() { field_0x1d4->destroy(); field_0x1d0->destroy(); - i_JKRFree(buffer); + JKRFree(buffer); dComIfGp_particle_createCommon(mParticleCommand->getMemAddress()); dComIfGp_setFieldMapArchive2(mpField0Command->getArchive()); diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp index e9846c97fe3..6df4938eb79 100644 --- a/src/d/s/d_s_play.cpp +++ b/src/d/s/d_s_play.cpp @@ -197,7 +197,7 @@ static int dScnPly_Execute(dScnPly_c* i_this) { dKy_itudemo_se(); if (!dComIfGp_isPauseFlag()) { dDemo_c::update(); - i_dComIfGp_getEvent().Step(); + dComIfGp_getEvent().Step(); dComIfGp_getAttention().Run(); } return 1; @@ -249,7 +249,7 @@ static int dScnPly_Delete(dScnPly_c* i_this) { dComIfG_Ccsp()->Dt(); dStage_Delete(); - i_dComIfGp_event_remove(); + dComIfGp_event_remove(); dComIfGp_particle_removeScene(0); @@ -550,10 +550,10 @@ static int phase_2(dScnPly_c* i_this) { return cPhs_INIT_e; } - u8 particle_no = dStage_stagInfo_GetParticleNo(i_dComIfGp_getStage()->getStagInfo(), + u8 particle_no = dStage_stagInfo_GetParticleNo(dComIfGp_getStage()->getStagInfo(), dComIfG_play_c::getLayerNo(0)); if (particle_no == 255) { - particle_no = dStage_stagInfo_GetParticleNo(i_dComIfGp_getStage()->getStagInfo()); + particle_no = dStage_stagInfo_GetParticleNo(dComIfGp_getStage()->getStagInfo()); } dComIfGp_particle_readScene(particle_no, &i_this->sceneCommand); diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp index 1b8ff00b000..26690e907c3 100644 --- a/src/d/s/d_s_room.cpp +++ b/src/d/s/d_s_room.cpp @@ -239,7 +239,7 @@ static int dScnRoom_Execute(room_of_scene_class* i_this) { if (dComIfGp_roomControl_checkStatusFlag(roomNo, 4)) { fopScnM_DeleteReq(i_this); } else if (i_this->field_0x1d4 < 0 && i_this->field_0x1d5 != 0 && - !i_dComIfGp_event_runCheck() && + !dComIfGp_event_runCheck() && (int)fopScnM_GetParam(i_this) == dComIfGp_roomControl_getStayNo()) { if (isCreating(fpcM_LayerID(i_this))) { @@ -335,7 +335,7 @@ static int phase_1(room_of_scene_class* i_this) { return cPhs_INIT_e; } } else { - stage_stag_info_class* stagInfo = i_dComIfGp_getStage()->getStagInfo(); + stage_stag_info_class* stagInfo = dComIfGp_getStage()->getStagInfo(); if (dStage_staginfo_GetArchiveHeap(stagInfo) != NULL) { heap = mDoExt_getArchiveHeap(); diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index ae102676f16..a9dda1889b0 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -140,7 +140,7 @@ u16 dSv_player_status_a_c::getRupeeMax() const { /* 80032AF8-80032B50 02D438 0058+00 0/0 1/1 0/0 .text isMagicFlag__21dSv_player_status_a_cCFUc */ BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const { if (i_magic == 0) { - return i_dComIfGs_isEventBit(dSv_event_flag_c::M_097); // Magic Unlocked + return dComIfGs_isEventBit(dSv_event_flag_c::M_097); // Magic Unlocked } return (mMagicFlag & (u8)(1 << i_magic)) ? TRUE : FALSE; @@ -575,8 +575,8 @@ u16 dSv_event_flag_c::saveBitLabels[822] = { /* 80033754-800337EC 02E094 0098+00 0/0 1/1 0/0 .text checkInsectBottle__17dSv_player_item_cFv */ BOOL dSv_player_item_c::checkInsectBottle() { for (int i = 0; i < 24; i++) { - if (i_dComIfGs_isItemFirstBit(M_BEETLE + i) && - !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) { + if (dComIfGs_isItemFirstBit(M_BEETLE + i) && + !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) { return TRUE; } } @@ -733,17 +733,17 @@ void dSv_player_item_c::setRodTypeLevelUp() { void dSv_player_item_c::setBaitItem(u8 i_itemNo) { switch (i_itemNo) { case BEE_CHILD: { - i_dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_BEE_ROD : + dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_BEE_ROD : mItems[SLOT_20] = BEE_ROD; break; } case WORM: { - i_dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_WORM_ROD : + dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_WORM_ROD : mItems[SLOT_20] = WORM_ROD; break; } case NO_ITEM: { - i_dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_ROD : + dComIfGs_isItemFirstBit(ZORAS_JEWEL) ? mItems[SLOT_20] = JEWEL_ROD : mItems[SLOT_20] = FISHING_ROD_1; break; } @@ -867,7 +867,7 @@ void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) { /* 800340F8-800341AC 02EA38 00B4+00 3/3 14/14 2/2 .text getBombNum__21dSv_player_item_max_cCFUc */ u8 dSv_player_item_max_c::getBombNum(u8 i_bombType) const { u8 lv_multiplier = 1; - if (i_dComIfGs_isItemFirstBit(BOMB_BAG_LV2)) { + if (dComIfGs_isItemFirstBit(BOMB_BAG_LV2)) { lv_multiplier = 2; } @@ -1702,10 +1702,10 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { u16 current_lantern_oil = 0; // If haven't gotten then lantern back from the monkey - if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { + if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { // Store whether or not it's stolen and dropped - lantern_dropped = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[224]); - lantern_stolen = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[225]); + lantern_dropped = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[224]); + lantern_stolen = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[225]); // Then turn those events off dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]); @@ -1716,7 +1716,7 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { } // If have the lantern and Slot 1 in the item wheel is blank - if (i_dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, 1) == NO_ITEM) { + if (dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, 1) == NO_ITEM) { // Set Slot 1 to Lantern and fetch current oil dComIfGs_setItem(SLOT_1, KANTERA); current_lantern_oil = dComIfGs_getOil(); diff --git a/src/d/save/d_save_HIO.cpp b/src/d/save/d_save_HIO.cpp index cd727134cd7..cb808ebbc5c 100644 --- a/src/d/save/d_save_HIO.cpp +++ b/src/d/save/d_save_HIO.cpp @@ -224,7 +224,7 @@ void dSvBit_HIO_c::init() { mDarkness.init(); mTransform.init(); mOther.init(); - mTransformFlag = field_0x49d = i_dComIfGs_isEventBit(dSv_event_flag_c::M_077); + mTransformFlag = field_0x49d = dComIfGs_isEventBit(dSv_event_flag_c::M_077); } /* 804307EC-80430C90 05D50C 04A0+04 1/1 2/2 0/0 .bss g_save_bit_HIO */ diff --git a/src/d/shop/d_shop_camera.cpp b/src/d/shop/d_shop_camera.cpp index c761eda53b0..f8da5eb5615 100644 --- a/src/d/shop/d_shop_camera.cpp +++ b/src/d/shop/d_shop_camera.cpp @@ -49,7 +49,7 @@ int ShopCam_action_c::shop_cam_action_init() { Save(); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - player->i_onPlayerNoDraw(); + player->onPlayerNoDraw(); setCamAction(&ShopCam_action_c::shop_cam_action); if (field_0xd6 >= 0) { @@ -72,7 +72,7 @@ int ShopCam_action_c::shop_cam_action_init() { /* 80195E18-8019630C 190758 04F4+00 1/0 0/0 0/0 .text shop_cam_action__16ShopCam_action_cFv */ int ShopCam_action_c::shop_cam_action() { - camera_class* camera = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Stay(); camera->mCamera.SetTrimSize(1); @@ -156,9 +156,9 @@ void ShopCam_action_c::EventRecoverNotime() { /* 801963B4-801964C8 190CF4 0114+00 0/0 0/0 9/9 .text Reset__16ShopCam_action_cFv */ void ShopCam_action_c::Reset() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - player->i_offPlayerNoDraw(); + player->offPlayerNoDraw(); - camera_class* camera = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(field_0x98, field_0xa4, field_0xbc, 0); camera->mCamera.Stay(); camera->mCamera.Reset(field_0x98, field_0xa4, field_0xbc, 0); @@ -175,7 +175,7 @@ void ShopCam_action_c::move() { if (field_0xd8 > 0) { --field_0xd8; if (field_0xd8 == 0) { - ((daPy_py_c*)dComIfGp_getPlayer(0))->i_offPlayerNoDraw(); + ((daPy_py_c*)dComIfGp_getPlayer(0))->offPlayerNoDraw(); } } } diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 82c18099351..61a8765f578 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -294,7 +294,7 @@ void fopEn_enemy_c::drawBallModel(dKy_tevstr_c* i_tevstr) { if (base_scale->x > 0.01f) { mDoMtx_trans(mBallModel->getBaseTRMtx(), mDownPos.x, mDownPos.y, mDownPos.z); - i_dKy_getEnvlight()->setLightTevColorType_MAJI(mBallModel, i_tevstr); + dKy_getEnvlight()->setLightTevColorType_MAJI(mBallModel, i_tevstr); mBtk->setFrame(field_0x590); mBallModel->getModelData()->entryTexMtxAnimator(mBtk); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 6399db06ed6..6bf2b131b69 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -913,7 +913,7 @@ asm f32 fopAcM_searchActorDistanceXZ2(fopAc_ac_c const* param_0, #endif BOOL daPy_py_c::checkNowWolf() { - return dComIfGp_getLinkPlayer()->i_checkWolf(); + return dComIfGp_getLinkPlayer()->checkWolf(); } /* 8001AAE0-8001AC40 015420 0160+00 0/0 0/0 2/2 .text @@ -1065,7 +1065,7 @@ s32 fopAcM_cullingCheck(fopAc_ac_c const* i_actor) { } f32 cullsize_far = fopAcM_getCullSizeFar(i_actor); - if (i_dComIfGp_event_runCheck()) { + if (dComIfGp_event_runCheck()) { cullsize_far *= dComIfGp_event_getCullRate(); } @@ -1152,8 +1152,8 @@ void* event_second_actor(u16) { /* 8001B068-8001B0FC 0159A8 0094+00 0/0 3/3 0/0 .text * fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs */ s32 fopAcM_orderTalkEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, u16 flag) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actorA))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) { return 0; } @@ -1169,8 +1169,8 @@ s32 fopAcM_orderTalkEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, * fopAcM_orderTalkItemBtnEvent__FUsP10fopAc_ac_cP10fopAc_ac_cUsUs */ s32 fopAcM_orderTalkItemBtnEvent(u16 eventType, fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, u16 flag) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actorA))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) { return 0; } @@ -1185,8 +1185,8 @@ s32 fopAcM_orderTalkItemBtnEvent(u16 eventType, fopAc_ac_c* actorA, fopAc_ac_c* /* 8001B19C-8001B244 015ADC 00A8+00 0/0 3/3 16/16 .text fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs */ s32 fopAcM_orderSpeakEvent(fopAc_ac_c* actor, u16 priority, u16 flag) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actor))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) { return 0; } @@ -1202,8 +1202,8 @@ s32 fopAcM_orderSpeakEvent(fopAc_ac_c* actor, u16 priority, u16 flag) { /* 8001B244-8001B334 015B84 00F0+00 0/0 2/2 0/0 .text * fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs */ s32 fopAcM_orderDoorEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, u16 flag) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actorA))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) { return 0; } @@ -1216,7 +1216,7 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, u8 toolID = actorB->eventInfo.getMapToolId(); if (fopAcM_GetProfName(actorB) == 0x55 && toolID != 0xFF) { - eventID = i_dComIfGp_getEventManager().getEventIdx(actorA, NULL, toolID); + eventID = dComIfGp_getEventManager().getEventIdx(actorA, NULL, toolID); } return dComIfGp_event_order(EVT_TYPE_DOOR, priority, flag, -1, actorA, actorB, eventID, toolID); @@ -1225,8 +1225,8 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, /* 8001B334-8001B3CC 015C74 0098+00 0/0 1/1 0/0 .text * fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs */ s32 fopAcM_orderCatchEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, u16 flag) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actorA))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) { return 0; } @@ -1242,18 +1242,18 @@ s32 fopAcM_orderCatchEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, * fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs */ s32 fopAcM_orderOtherEvent(fopAc_ac_c* actor, char const* param_1, u16 param_2, u16 flag, u16 priority) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actor))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) { return 0; } - s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx(actor, param_1, -1); + s16 eventIdx = dComIfGp_getEventManager().getEventIdx(actor, param_1, -1); if (eventIdx < 0) { return 0; } - u16 eventPrio = i_dComIfGp_getEventManager().getEventPrio(actor, eventIdx); + u16 eventPrio = dComIfGp_getEventManager().getEventPrio(actor, eventIdx); if (eventPrio == 0) { eventPrio = 0xFF; } @@ -1270,18 +1270,18 @@ s32 fopAcM_orderOtherEvent(fopAc_ac_c* actor, char const* param_1, u16 param_2, * fopAcM_orderOtherEvent__FP10fopAc_ac_cP10fopAc_ac_cPCcUsUsUs */ s32 fopAcM_orderOtherEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, char const* param_2, u16 param_3, u16 flag, u16 priority) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actorA))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) { return 0; } - s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx(actorA, param_2, -1); + s16 eventIdx = dComIfGp_getEventManager().getEventIdx(actorA, param_2, -1); if (eventIdx < 0) { return 0; } - u16 eventPrio = i_dComIfGp_getEventManager().getEventPrio(actorA, eventIdx); + u16 eventPrio = dComIfGp_getEventManager().getEventPrio(actorA, eventIdx); if (eventPrio == 0) { eventPrio = 0xFF; } @@ -1297,7 +1297,7 @@ s32 fopAcM_orderOtherEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, char const* p /* 8001B5E4-8001B67C 015F24 0098+00 0/0 2/2 41/41 .text * fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs */ s32 fopAcM_orderChangeEventId(fopAc_ac_c* actor, s16 eventID, u16 flag, u16 param_3) { - u16 eventPrio = i_dComIfGp_getEventManager().getEventPrio(actor, eventID); + u16 eventPrio = dComIfGp_getEventManager().getEventPrio(actor, eventID); if (eventPrio == 0) { eventPrio = 0xFF; } @@ -1310,8 +1310,8 @@ s32 fopAcM_orderChangeEventId(fopAc_ac_c* actor, s16 eventID, u16 flag, u16 para * fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs */ s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 param_3, u16 priority, u16 flag) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actor))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) { return 0; } @@ -1325,7 +1325,7 @@ s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 p if (priority != 0) { newPriority = priority; } else if (actor != NULL) { - u16 eventPrio = i_dComIfGp_getEventManager().getEventPrio(actor, eventID); + u16 eventPrio = dComIfGp_getEventManager().getEventPrio(actor, eventID); if (eventPrio != 0) { newPriority = eventPrio; @@ -1346,8 +1346,8 @@ s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 p * fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs */ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* actor, u8 param_1, s16 eventID, u16 param_3, u16 flag, u16 param_5) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actor))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) { return 0; } @@ -1363,7 +1363,7 @@ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* actor, u8 param_1, s16 eventID, u16 par newPriority = dt->mPriority; if (eventID == 0xFF) { - eventID = i_dComIfGp_getEventManager().getEventIdx(actor, param_1); + eventID = dComIfGp_getEventManager().getEventIdx(actor, param_1); } } @@ -1389,8 +1389,8 @@ s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c* actor, u8 param_1, s16 eventID, /* 8001B908-8001B9D0 016248 00C8+00 0/0 0/0 106/106 .text * fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs */ s32 fopAcM_orderPotentialEvent(fopAc_ac_c* actor, u16 flag, u16 param_2, u16 priority) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actor))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) { return 0; } @@ -1406,8 +1406,8 @@ s32 fopAcM_orderPotentialEvent(fopAc_ac_c* actor, u16 flag, u16 param_2, u16 pri /* 8001B9D0-8001BA7C 016310 00AC+00 0/0 3/3 12/12 .text fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs */ s32 fopAcM_orderItemEvent(fopAc_ac_c* actor, u16 priority, u16 flag) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actor))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actor))) { return 0; } @@ -1423,8 +1423,8 @@ s32 fopAcM_orderItemEvent(fopAc_ac_c* actor, u16 priority, u16 flag) { /* 8001BA7C-8001BB14 0163BC 0098+00 0/0 1/1 0/0 .text * fopAcM_orderTreasureEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs */ s32 fopAcM_orderTreasureEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, u16 flag) { - if (!i_dComIfGp_getEvent().i_isOrderOK() && - (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actorA))) + if (!dComIfGp_getEvent().isOrderOK() && + (!(flag & 0x400) || !dComIfGp_getEvent().isChangeOK(actorA))) { return 0; } @@ -1509,7 +1509,7 @@ u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo) { } #endif - u8 hp_percent = (i_dComIfGs_getLife() * 100) / (((dComIfGs_getMaxLife() / 5) * 4) & 0xFC); + u8 hp_percent = (dComIfGs_getLife() * 100) / (((dComIfGs_getMaxLife() / 5) * 4) & 0xFC); switch (i_tableNo) { case 150: @@ -2025,7 +2025,7 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) { i_actor->shape_angle.z = 0; i_actor->shape_angle.x = 0; - if (i_dComIfGp_event_runCheck() && fopAcM_GetGroup(i_actor) != 2) { + if (dComIfGp_event_runCheck() && fopAcM_GetGroup(i_actor) != 2) { i_actor->actor_status |= 0x800; } } diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index 8711e59c89d..c49dc095a35 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -147,11 +147,6 @@ void mDoRst_resetCallBack(int port, void*) { } } -/* 800157F4-800157FC -00001 0008+00 0/0 0/0 0/0 .text getResetData__6mDoRstFv */ -mDoRstData* mDoRst::getResetData() { - return mResetData; -} - /* ############################################################################################## */ /* 80450C80-80450C88 -00001 0008+00 0/0 6/6 0/0 .sbss None */ /* 80450C80 0001+00 data_80450C80 None */ diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 6553f119e33..4f07159bbbf 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -2142,7 +2142,7 @@ void mDoExt_invisibleModel::entryJoint(cXyz* param_0) { if (param_0 == NULL) { cXyz tmp; for (u16 i = 0; i < modelData->getJointNum(); i++) { - MtxP anmMtx = mModel->i_getAnmMtx(i); + MtxP anmMtx = mModel->getAnmMtx(i); tmp.set(anmMtx[0][3], anmMtx[1][3], anmMtx[2][3]); dComIfGd_entryZSortListZxlu(packet, tmp); packet++; @@ -4004,7 +4004,7 @@ void mDoExt_removeMesgFont() { delete mDoExt_font0; mDoExt_font0 = NULL; if (mDoExt_resfont0 != NULL) { - i_JKRFree(mDoExt_resfont0); + JKRFree(mDoExt_resfont0); mDoExt_resfont0 = NULL; } } @@ -4091,7 +4091,7 @@ void mDoExt_removeSubFont() { delete mDoExt_font2; mDoExt_font2 = NULL; if (mDoExt_resfont2 != NULL) { - i_JKRFree(mDoExt_resfont2); + JKRFree(mDoExt_resfont2); mDoExt_resfont2 = NULL; } } diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 4379b3dd9a3..6a410241109 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -626,7 +626,7 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ f32 var_f30 = -255.0f; if (dCam_getBody()->Mode() != 4 && dCam_getBody()->Mode() != 7) { - camera_class* temp_r4 = dComIfGp_getCamera(i_dComIfGp_getPlayerCameraID(0)); + camera_class* temp_r4 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dAttention_c& local_12c = dComIfGp_getAttention(); f32 temp_f31 = 60.0f / (temp_r4 ? fopCamM_GetFovy(temp_r4) : 48.0f); diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 8bb8de3e1a4..c1bf7706cf2 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -515,7 +515,7 @@ void main() { mDoRstData* reset_data = (mDoRstData*)OSAllocFromArenaLo(0x18, 4); mDoRst::setResetData(reset_data); - if (!mDoRst::i_getResetData()) { + if (!mDoRst::getResetData()) { do { } while (true); }