From 5cf03a4cdadefe31d81cd324299ff5e0dc436748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= <159546+serprex@users.noreply.github.com> Date: Tue, 7 Jul 2026 01:51:44 +0000 Subject: [PATCH] pull decomp changes: actor functions, z_en_horse.c (#6877) --- soh/include/functions.h | 102 +++++----- .../Graphics/DisableLinkSpinWithGoronPot.cpp | 2 +- .../TimeSavers/timesaver_hook_handlers.cpp | 2 +- soh/soh/Enhancements/debugger/colViewer.cpp | 2 +- .../GameInteractor_RawAction.cpp | 3 +- .../Enhancements/randomizer/hook_handlers.cpp | 2 +- soh/soh/z_scene_otr.cpp | 2 +- soh/src/code/code_800A9F30.c | 2 +- soh/src/code/code_800EC960.c | 58 +++--- soh/src/code/z_actor.c | 188 +++++++++--------- soh/src/code/z_bgcheck.c | 2 +- soh/src/code/z_camera.c | 6 +- soh/src/code/z_debug.c | 2 +- soh/src/code/z_demo.c | 6 +- soh/src/code/z_en_a_keep.c | 2 +- soh/src/code/z_game_over.c | 8 +- soh/src/code/z_horse.c | 10 +- soh/src/code/z_kankyo.c | 6 +- soh/src/code/z_lights.c | 4 +- soh/src/code/z_onepointdemo.c | 30 +-- soh/src/code/z_parameter.c | 4 +- soh/src/code/z_play.c | 6 +- soh/src/code/z_player_lib.c | 2 +- soh/src/code/z_scene.c | 2 +- soh/src/code/z_sram.c | 2 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 2 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 2 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 2 +- .../actors/ovl_Arrow_Light/z_arrow_light.c | 2 +- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 24 +-- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c | 6 +- .../actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c | 2 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 2 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 2 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 2 +- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 2 +- .../ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c | 2 +- .../ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c | 2 +- .../ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c | 2 +- .../overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 2 +- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 4 +- .../ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c | 8 +- .../ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c | 2 +- .../actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c | 2 +- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 10 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 2 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.c | 4 +- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 6 +- .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 6 +- .../z_bg_hidan_firewall.c | 4 +- .../ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c | 4 +- .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 8 +- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 4 +- .../ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c | 2 +- .../ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c | 4 +- .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c | 4 +- .../z_bg_hidan_rsekizou.c | 2 +- .../ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c | 6 +- .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c | 4 +- .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c | 4 +- .../ovl_Bg_Ice_Objects/z_bg_ice_objects.c | 2 +- .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 2 +- .../z_bg_jya_amishutter.c | 4 +- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 2 +- .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c | 2 +- .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c | 2 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 2 +- .../z_bg_jya_zurerukabe.c | 6 +- .../z_bg_menkuri_kaiten.c | 2 +- .../ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c | 8 +- .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c | 4 +- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 8 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 2 +- .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 2 +- .../z_bg_mori_rakkatenjo.c | 2 +- .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 4 +- .../ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c | 2 +- .../ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 6 +- .../z_bg_spot00_hanebasi.c | 4 +- .../z_bg_spot02_objects.c | 2 +- .../z_bg_spot06_objects.c | 6 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 2 +- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 2 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 2 +- .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 2 +- .../z_bg_spot18_shutter.c | 4 +- .../actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c | 12 +- .../ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c | 6 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 6 +- .../overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 10 +- .../overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 4 +- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 16 +- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 9 +- .../actors/ovl_Boss_Goma/z_boss_goma.c | 8 +- .../overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 7 +- .../overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 39 ++-- .../overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 6 +- .../overlays/actors/ovl_Boss_Va/z_boss_va.c | 14 +- .../overlays/actors/ovl_Demo_6K/z_demo_6k.c | 12 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 10 +- .../overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 2 +- .../overlays/actors/ovl_Demo_Im/z_demo_im.c | 2 +- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 10 +- .../overlays/actors/ovl_Door_Ana/z_door_ana.c | 2 +- .../actors/ovl_Door_Killer/z_door_killer.c | 2 +- .../actors/ovl_Door_Shutter/z_door_shutter.c | 2 +- soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c | 4 +- .../ovl_En_Attack_Niw/z_en_attack_niw.c | 2 +- soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c | 2 +- soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c | 4 +- .../actors/ovl_En_Bdfire/z_en_bdfire.c | 2 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 8 +- .../overlays/actors/ovl_En_Bili/z_en_bili.c | 2 +- soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c | 4 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 8 +- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 4 +- .../overlays/actors/ovl_En_Bombf/z_en_bombf.c | 4 +- .../overlays/actors/ovl_En_Boom/z_en_boom.c | 2 +- soh/src/overlays/actors/ovl_En_Box/z_en_box.c | 10 +- .../overlays/actors/ovl_En_Brob/z_en_brob.c | 6 +- .../actors/ovl_En_Bubble/z_en_bubble.c | 2 +- soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c | 2 +- soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c | 2 +- soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c | 4 +- soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c | 2 +- .../overlays/actors/ovl_En_Daiku/z_en_daiku.c | 2 +- .../z_en_daiku_kakariko.c | 2 +- soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c | 2 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 4 +- soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c | 2 +- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 2 +- .../overlays/actors/ovl_En_Door/z_en_door.c | 2 +- soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c | 8 +- .../overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 6 +- .../actors/ovl_En_Encount1/z_en_encount1.c | 2 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 2 +- soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c | 11 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 8 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 4 +- .../actors/ovl_En_Floormas/z_en_floormas.c | 4 +- soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c | 6 +- soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c | 4 +- soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c | 4 +- soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 10 +- soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 8 +- soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 8 +- .../overlays/actors/ovl_En_GeldB/z_en_geldb.c | 2 +- soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c | 4 +- soh/src/overlays/actors/ovl_En_Go/z_en_go.c | 10 +- soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c | 16 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 6 +- soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c | 6 +- .../overlays/actors/ovl_En_Guest/z_en_guest.c | 4 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 8 +- .../actors/ovl_En_Heishi4/z_en_heishi4.c | 6 +- .../actors/ovl_En_Hintnuts/z_en_hintnuts.c | 2 +- .../actors/ovl_En_Honotrap/z_en_honotrap.c | 2 +- .../overlays/actors/ovl_En_Horse/z_en_horse.c | 68 +++---- soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c | 8 +- soh/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 4 +- soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c | 8 +- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 4 +- soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c | 4 +- .../overlays/actors/ovl_En_Ishi/z_en_ishi.c | 2 +- soh/src/overlays/actors/ovl_En_Js/z_en_js.c | 6 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 2 +- .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 2 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 2 +- soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c | 16 +- soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c | 12 +- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 2 +- soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 6 +- soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 6 +- soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 6 +- soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c | 23 ++- soh/src/overlays/actors/ovl_En_Md/z_en_md.c | 10 +- soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c | 6 +- soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c | 6 +- soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 4 +- soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c | 2 +- soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c | 2 +- soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c | 4 +- soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c | 2 +- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 2 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 8 +- soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c | 2 +- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 4 +- .../overlays/actors/ovl_En_Ossan/z_en_ossan.c | 6 +- soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c | 4 +- .../overlays/actors/ovl_En_Part/z_en_part.c | 5 +- .../actors/ovl_En_Partner/z_en_partner.c | 4 +- .../actors/ovl_En_Po_Desert/z_en_po_desert.c | 4 +- .../actors/ovl_En_Po_Field/z_en_po_field.c | 8 +- .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 14 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 6 +- soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c | 14 +- soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c | 8 +- .../overlays/actors/ovl_En_Reeba/z_en_reeba.c | 6 +- soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c | 4 +- soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 8 +- .../actors/ovl_En_Siofuki/z_en_siofuki.c | 2 +- soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c | 24 +-- soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 4 +- soh/src/overlays/actors/ovl_En_St/z_en_st.c | 2 +- soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c | 10 +- .../actors/ovl_En_Stream/z_en_stream.c | 2 +- .../ovl_En_Syateki_Man/z_en_syateki_man.c | 4 +- soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c | 22 +- .../ovl_En_Takara_Man/z_en_takara_man.c | 4 +- .../overlays/actors/ovl_En_Test/z_en_test.c | 2 +- .../overlays/actors/ovl_En_Toryo/z_en_toryo.c | 4 +- soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c | 8 +- .../overlays/actors/ovl_En_Trap/z_en_trap.c | 2 +- .../overlays/actors/ovl_En_Vali/z_en_vali.c | 2 +- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 2 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 2 +- .../ovl_En_Wonder_Talk/z_en_wonder_talk.c | 2 +- .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 2 +- soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.c | 4 +- soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 14 +- soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 8 +- soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 4 +- soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c | 4 +- .../overlays/actors/ovl_Fishing/z_fishing.c | 4 +- .../actors/ovl_Magic_Dark/z_magic_dark.c | 6 +- .../overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 2 +- .../overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 10 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 4 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 2 +- .../actors/ovl_player_actor/z_player.c | 32 +-- .../ovl_file_choose/z_file_choose.c | 8 +- .../ovl_file_choose/z_file_copy_erase.c | 4 +- .../ovl_file_choose/z_file_nameset_NES.c | 4 +- .../ovl_file_choose/z_file_nameset_PAL.c | 4 +- 235 files changed, 829 insertions(+), 818 deletions(-) diff --git a/soh/include/functions.h b/soh/include/functions.h index 00af797489..d371bdd19f 100644 --- a/soh/include/functions.h +++ b/soh/include/functions.h @@ -371,8 +371,8 @@ void ActorShadow_DrawHorse(Actor* actor, Lights* lights, PlayState* play); void ActorShadow_DrawFeet(Actor* actor, Lights* lights, PlayState* play); void Actor_SetFeetPos(Actor* actor, s32 limbIndex, s32 leftFootIndex, Vec3f* leftFootPos, s32 rightFootIndex, Vec3f* rightFootPos); -void func_8002BE04(PlayState* play, Vec3f* arg1, Vec3f* arg2, f32* arg3); -void func_8002C124(TargetContext* targetCtx, PlayState* play); +void Actor_ProjectPos(PlayState* play, Vec3f* arg1, Vec3f* arg2, f32* arg3); +void Attention_Draw(TargetContext* targetCtx, PlayState* play); s32 Flags_GetSwitch(PlayState* play, s32 flag); void Flags_SetSwitch(PlayState* play, s32 flag); void Flags_UnsetSwitch(PlayState* play, s32 flag); @@ -393,7 +393,7 @@ void TitleCard_InitBossName(PlayState* play, TitleCardContext* titleCtx, void* t u8 height, s16 hasTranslation); void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void* texture, s32 x, s32 y, s32 width, s32 height, s32 delay); -s32 func_8002D53C(PlayState* play, TitleCardContext* titleCtx); +s32 TitleCard_Clear(PlayState* play, TitleCardContext* titleCtx); void Actor_Kill(Actor* actor); void Actor_SetFocus(Actor* actor, f32 offset); void Actor_SetScale(Actor* actor, f32 scale); @@ -421,12 +421,12 @@ s32 func_8002DD6C(Player* player); s32 func_8002DD78(Player* player); s32 func_8002DDE4(PlayState* play); s32 func_8002DDF4(PlayState* play); -void func_8002DE04(PlayState* play, Actor* actorA, Actor* actorB); -void func_8002DE74(PlayState* play, Player* player); +void Actor_SwapHookshotAttachment(PlayState* play, Actor* actorA, Actor* actorB); +void Actor_RequestHorseCameraSetting(PlayState* play, Player* player); void Actor_MountHorse(PlayState* play, Player* player, Actor* horse); s32 func_8002DEEC(Player* player); -void func_8002DF18(PlayState* play, Player* player); -s32 func_8002DF38(PlayState* play, Actor* actor, u8 csMode); +void Actor_InitPlayerHorse(PlayState* play, Player* player); +s32 Player_SetCsAction(PlayState* play, Actor* actor, u8 csMode); s32 Player_SetCsActionWithHaltedActors(PlayState* play, Actor* actor, u8 arg2); void func_8002DF90(DynaPolyActor* dynaActor); void func_8002DFA4(DynaPolyActor* dynaActor, f32 arg1, s16 arg2); @@ -445,14 +445,14 @@ void func_8002ED80(Actor* actor, PlayState* play, s32 flag); PosRot* Actor_GetFocus(PosRot* arg0, Actor* actor); PosRot* Actor_GetWorld(PosRot* arg0, Actor* actor); PosRot* Actor_GetWorldPosShapeRot(PosRot* arg0, Actor* actor); -s32 func_8002F0C8(Actor* actor, Player* player, s32 arg2); +s32 Attention_ShouldReleaseLockOn(Actor* actor, Player* player, s32 arg2); u32 Actor_ProcessTalkRequest(Actor* actor, PlayState* play); -s32 func_8002F1C4(Actor* actor, PlayState* play, f32 arg2, f32 arg3, u32 arg4); -s32 func_8002F298(Actor* actor, PlayState* play, f32 arg2, u32 arg3); -s32 func_8002F2CC(Actor* actor, PlayState* play, f32 arg2); -s32 func_8002F2F4(Actor* actor, PlayState* play); +s32 Actor_OfferTalkExchange(Actor* actor, PlayState* play, f32 arg2, f32 arg3, u32 arg4); +s32 Actor_OfferTalkExchangeEquiCylinder(Actor* actor, PlayState* play, f32 arg2, u32 arg3); +s32 Actor_OfferTalk(Actor* actor, PlayState* play, f32 arg2); +s32 Actor_OfferTalkNearColChkInfoCylinder(Actor* actor, PlayState* play); u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play); -s8 func_8002F368(PlayState* play); +s8 Actor_GetPlayerExchangeItemId(PlayState* play); void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y); u32 Actor_HasParent(Actor* actor, PlayState* play); // TODO: Rename the follwing 3 functions using whatever scheme we use when we rename Actor_OfferGetItem and Actor_OfferGetItemNearby. @@ -464,30 +464,30 @@ void Actor_OfferGetItemNearby(Actor* actor, PlayState* play, s32 getItemId); void Actor_OfferCarry(Actor* actor, PlayState* play); u32 Actor_HasNoParent(Actor* actor, PlayState* play); void func_8002F5C4(Actor* actorA, Actor* actorB, PlayState* play); -void func_8002F5F0(Actor* actor, PlayState* play); +void Actor_SetClosestSecretDistance(Actor* actor, PlayState* play); s32 Actor_IsMounted(PlayState* play, Actor* horse); u32 Actor_SetRideActor(PlayState* play, Actor* horse, s32 arg2); s32 Actor_NotMounted(PlayState* play, Actor* horse); -void func_8002F698(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6); -void func_8002F6D4(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); -void func_8002F71C(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4); -void func_8002F758(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); -void func_8002F7A0(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4); +void Actor_SetPlayerKnockback(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6); +void Actor_SetPlayerKnockbackLarge(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); +void Actor_SetPlayerKnockbackLargeNoDamage(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4); +void Actor_SetPlayerKnockbackSmall(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); +void Actor_SetPlayerKnockbackSmallNoDamage(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4); void Player_PlaySfx(Actor* actor, u16 sfxId); void Audio_PlayActorSound2(Actor* actor, u16 sfxId); -void func_8002F850(PlayState* play, Actor* actor); -void func_8002F8F0(Actor* actor, u16 sfxId); -void func_8002F91C(Actor* actor, u16 sfxId); -void func_8002F948(Actor* actor, u16 sfxId); -void func_8002F974(Actor* actor, u16 sfxId); -void func_8002F994(Actor* actor, s32 arg1); +void Actor_PlaySfx_SurfaceBomb(PlayState* play, Actor* actor); +void Actor_PlaySfx_Flagged2(Actor* actor, u16 sfxId); +void Actor_PlaySfx_FlaggedCentered1(Actor* actor, u16 sfxId); +void Actor_PlaySfx_FlaggedCentered2(Actor* actor, u16 sfxId); +void Actor_PlaySfx_Flagged(Actor* actor, u16 sfxId); +void Actor_PlaySfx_FlaggedTimer(Actor* actor, s32 arg1); s32 func_8002F9EC(PlayState* play, Actor* actor, CollisionPoly* poly, s32 bgId, Vec3f* pos); void Actor_DisableLens(PlayState* play); -void func_800304DC(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEntry); +void Actor_InitContext(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEntry); void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx); -s32 func_800314D4(PlayState* play, Actor* actorB, Vec3f* arg2, f32 arg3); -void func_800315AC(PlayState* play, ActorContext* actorCtx); -void func_80031A28(PlayState* play, ActorContext* actorCtx); +s32 Actor_CullingVolumeTest(PlayState* play, Actor* actorB, Vec3f* arg2, f32 arg3); +void Actor_DrawAll(PlayState* play, ActorContext* actorCtx); +void Actor_KillAllWithMissingObject(PlayState* play, ActorContext* actorCtx); void func_80031B14(PlayState* play, ActorContext* actorCtx); void func_80031C3C(ActorContext* actorCtx, PlayState* play); Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 posX, f32 posY, f32 posZ, @@ -497,10 +497,10 @@ Actor* Actor_SpawnAsChild(ActorContext* actorCtx, Actor* parent, PlayState* play void Actor_SpawnTransitionActors(PlayState* play, ActorContext* actorCtx); Actor* Actor_SpawnEntry(ActorContext* actorCtx, ActorEntry* actorEntry, PlayState* play); Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play); -Actor* func_80032AF0(PlayState* play, ActorContext* actorCtx, Actor** actorPtr, Player* player); +Actor* Attention_FindActor(PlayState* play, ActorContext* actorCtx, Actor** actorPtr, Player* player); Actor* Actor_Find(ActorContext* actorCtx, s32 actorId, s32 actorCategory); void Enemy_StartFinishingBlow(PlayState* play, Actor* actor); -s16 func_80032CB4(s16* arg0, s16 arg1, s16 arg2, s16 arg3); +s16 FaceChange_UpdateBlinking(s16* arg0, s16 arg1, s16 arg2, s16 arg3); void BodyBreak_Alloc(BodyBreak* bodyBreak, s32 count, PlayState* play); void BodyBreak_SetInfo(BodyBreak* bodyBreak, s32 limbIndex, s32 minLimbIndex, s32 maxLimbIndex, u32 count, Gfx** dList, s16 objectId); @@ -519,9 +519,9 @@ s32 Actor_IsTargeted(PlayState* play, Actor* actor); s32 Actor_OtherIsTargeted(PlayState* play, Actor* actor); f32 func_80033AEC(Vec3f* arg0, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, PlayState* play); -void func_80033DB8(PlayState* play, s16 arg1, s16 arg2); -void func_80033E1C(PlayState* play, s16 arg1, s16 arg2, s16 arg3); -void func_80033E88(Actor* actor, PlayState* play, s16 arg2, s16 arg3); +void Actor_RequestQuake(PlayState* play, s16 arg1, s16 arg2); +void Actor_RequestQuakeWithSpeed(PlayState* play, s16 arg1, s16 arg2, s16 arg3); +void Actor_RequestQuakeAndRumble(Actor* actor, PlayState* play, s16 arg2, s16 arg3); f32 Rand_ZeroFloat(f32 f); f32 Rand_CenteredFloat(f32 f); void Actor_DrawDoorLock(PlayState* play, s32 arg1, s32 arg2); @@ -539,7 +539,7 @@ void func_80034CC4(PlayState* play, SkelAnime* skelAnime, OverrideLimbDraw overr PostLimbDraw postLimbDraw, Actor* actor, s16 alpha); s16 Actor_UpdateAlphaByDistance(Actor* actor, PlayState* play, s16 arg2, f32 arg3); void Animation_ChangeByInfo(SkelAnime* skelAnime, AnimationInfo* animationInfo, s32 index); -void func_80034F54(PlayState* play, s16* arg1, s16* arg2, s32 arg3); +void Actor_UpdateFidgetTables(PlayState* play, s16* arg1, s16* arg2, s32 arg3); void Actor_Noop(Actor* actor, PlayState* play); void Gfx_DrawDListOpa(PlayState* play, Gfx* dlist); void Gfx_DrawDListXlu(PlayState* play, Gfx* dlist); @@ -572,7 +572,7 @@ void Flags_SetRandomizerInf(RandomizerInf flag); void Flags_UnsetRandomizerInf(RandomizerInf flag); u16 func_80037C30(PlayState* play, s16 arg1); s32 func_80037D98(PlayState* play, Actor* actor, s16 arg2, s32* arg3); -s32 func_80038290(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f arg4); +s32 Actor_TrackPlayer(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f arg4); // ? func_80038600(?); u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList*); @@ -678,7 +678,7 @@ u16 SurfaceType_GetNumCameras(CollisionContext* colCtx, CollisionPoly* poly, s32 Vec3s* func_80041C10(CollisionContext* colCtx, s32 camId, s32 bgId); Vec3s* SurfaceType_GetCamPosData(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId); u32 SurfaceType_GetSceneExitIndex(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId); -u32 func_80041D4C(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId); +u32 SurfaceType_GetFloorType(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId); u32 func_80041D70(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId); u32 func_80041D94(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId); s32 func_80041DB8(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId); @@ -1379,7 +1379,7 @@ void Sram_InitSram(GameState* gameState); void SsSram_ReadWrite(uintptr_t addr, void* dramAddr, size_t size, s32 direction); void func_800A9F30(PadMgr*, s32); void func_800A9F6C(f32, u8, u8, u8); -void func_800AA000(f32, u8, u8, u8); +void Rumble_Request(f32, u8, u8, u8); void func_800AA0B4(); void func_800AA0F0(void); u32 func_800AA148(); @@ -2092,14 +2092,14 @@ void Audio_ClearSariaBgm(void); void Audio_ClearSariaBgmAtPos(Vec3f* pos); void Audio_PlaySariaBgm(Vec3f* pos, u16 seqId, u16 distMax); void Audio_ClearSariaBgm2(void); -void func_800F5510(u16 seqId); -void func_800F5550(u16 seqId); -void func_800F574C(f32 arg0, u8 arg2); -void func_800F5718(void); -void func_800F5918(void); -void func_800F595C(u16); -void func_800F59E8(u16); -s32 func_800F5A58(u8); +void Audio_PlayMorningSceneSequence(u16 seqId); +void Audio_PlaySceneSequence(u16 seqId); +void Audio_SetMainBgmTempoFreqAfterFanfare(f32 arg0, u8 arg2); +void Audio_PlayWindmillBgm(void); +void Audio_SetFastTempoForTimedMinigame(void); +void Audio_PlaySequenceInCutscene(u16); +void Audio_StopSequenceInCutscene(u16); +s32 Audio_IsSequencePlaying(u8); void func_800F5ACC(u16 seqId); void PreviewSequence(u16 seqId); void func_800F5B58(void); @@ -2107,21 +2107,21 @@ void func_800F5BF0(u8 natureAmbienceId); void Audio_PlayFanfare(u16); void Audio_PlayFanfare_Rando(GetItemEntry getItem); void func_800F5C2C(void); -void func_800F5E18(u8 playerIdx, u16 seqId, u8 fadeTimer, s8 arg3, s8 arg4); +void Audio_PlaySequenceWithSeqPlayerIO(u8 playerIdx, u16 seqId, u8 fadeTimer, s8 arg3, s8 arg4); void Audio_SetSequenceMode(u8 seqMode); void Audio_SetBgmEnemyVolume(f32 dist); -void func_800F6268(f32 dist, u16); +void Audio_UpdateMalonSinging(f32 dist, u16); void func_800F64E0(u8 arg0); -void func_800F6584(u8 arg0); +void Audio_ToggleMalonSinging(u8 arg0); void Audio_SetEnvReverb(s8 reverb); void Audio_SetCodeReverb(s8 reverb); -void func_800F6700(s8 outputMode); +void Audio_SetSoundOutputMode(s8 outputMode); void Audio_SetBaseFilter(u8); void Audio_SetExtraFilter(u8); void Audio_SetCutsceneFlag(s8 flag); void Audio_PlaySoundIfNotInCutscene(u16 sfxId); void func_800F6964(u16); -void func_800F6AB0(u16); +void Audio_StopBgmAndFanfare(u16); // ? Audio_DisableAllSeq(?); // ? func_800F6BB8(?); void Audio_PreNMI(); diff --git a/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp b/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp index c6fcbf9139..654aef3880 100644 --- a/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp +++ b/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp @@ -15,7 +15,7 @@ static void MakeLinkFocusOnPot() { BgSpot18Basket* bgSpot18 = (BgSpot18Basket*)Actor_Find(&gPlayState->actorCtx, ACTOR_BG_SPOT18_BASKET, ACTORCAT_PROP); if (bgSpot18 != NULL) { - func_8002DF38(gPlayState, &bgSpot18->dyna.actor, 1); + Player_SetCsAction(gPlayState, &bgSpot18->dyna.actor, 1); } } diff --git a/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp index 3a76bd723b..96c3c9455d 100644 --- a/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp +++ b/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp @@ -834,7 +834,7 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.Story"), IS_RANDO)) { *should = false; if (!Flags_GetEventChkInf(EVENTCHKINF_RAINBOW_BRIDGE_BUILT)) { - func_800F595C(NA_BGM_BRIDGE_TO_GANONS); + Audio_PlaySequenceInCutscene(NA_BGM_BRIDGE_TO_GANONS); // This would have been set 2 frames later, but we're skipping now so the sound doesn't play twice Flags_SetEventChkInf(EVENTCHKINF_RAINBOW_BRIDGE_BUILT); } diff --git a/soh/soh/Enhancements/debugger/colViewer.cpp b/soh/soh/Enhancements/debugger/colViewer.cpp index ce6c88b7d4..e7a7ef2a74 100644 --- a/soh/soh/Enhancements/debugger/colViewer.cpp +++ b/soh/soh/Enhancements/debugger/colViewer.cpp @@ -398,7 +398,7 @@ void DrawDynapoly(std::vector& dl, CollisionHeader* col, int32_t bgId) { } else if (SurfaceType_GetSceneExitIndex(&gPlayState->colCtx, poly, bgId) || func_80041E80(&gPlayState->colCtx, poly, bgId) == 0x05) { color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorEntrance.Value"), { 0, 255, 0, 255 }); - } else if (func_80041D4C(&gPlayState->colCtx, poly, bgId) != 0 || + } else if (SurfaceType_GetFloorType(&gPlayState->colCtx, poly, bgId) != 0 || SurfaceType_IsWallDamage(&gPlayState->colCtx, poly, bgId)) { color = CVarGetColor(CVAR_DEVELOPER_TOOLS("ColViewer.ColorSpecialSurface.Value"), { 192, 255, 192, 255 }); } else if (SurfaceType_GetSlope(&gPlayState->colCtx, poly, bgId) == 0x01) { diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp index 5d6eee5bca..7f8b2bf17a 100644 --- a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp +++ b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp @@ -123,7 +123,8 @@ void GameInteractor::RawAction::ElectrocutePlayer() { void GameInteractor::RawAction::KnockbackPlayer(float strength) { Player* player = GET_PLAYER(gPlayState); - func_8002F71C(gPlayState, &player->actor, strength * 5, player->actor.world.rot.y + 0x8000, strength * 5); + Actor_SetPlayerKnockbackLargeNoDamage(gPlayState, &player->actor, strength * 5, player->actor.world.rot.y + 0x8000, + strength * 5); } void GameInteractor::RawAction::SetSceneFlag(int16_t sceneNum, int16_t flagType, int16_t flag) { diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index 2618055830..85deb7d66c 100644 --- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp +++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp @@ -1607,7 +1607,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l bool hasShieldHoldingR = (CHECK_BTN_ANY(input.cur.button, BTN_R) && CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) > EQUIP_VALUE_SHIELD_NONE); - if (func_8002F368(gPlayState) == EXCH_ITEM_PRESCRIPTION || + if (Actor_GetPlayerExchangeItemId(gPlayState) == EXCH_ITEM_PRESCRIPTION || (hasShieldHoldingR && INV_CONTENT(ITEM_TRADE_ADULT) < ITEM_FROG)) { Flags_SetRandomizerInf(RAND_INF_ADULT_TRADES_ZD_TRADE_PRESCRIPTION); Flags_UnsetRandomizerInf(RAND_INF_ADULT_TRADES_HAS_PRESCRIPTION); diff --git a/soh/soh/z_scene_otr.cpp b/soh/soh/z_scene_otr.cpp index 8662903db4..77d46e9c84 100644 --- a/soh/soh/z_scene_otr.cpp +++ b/soh/soh/z_scene_otr.cpp @@ -159,7 +159,7 @@ bool Scene_CommandObjectList(PlayState* play, SOH::ISceneCommand* cmd) { for (j = i; j < play->objectCtx.num; j++) { play->objectCtx.status[j].id = OBJECT_INVALID; } - func_80031A28(play, &play->actorCtx); + Actor_KillAllWithMissingObject(play, &play->actorCtx); break; } } diff --git a/soh/src/code/code_800A9F30.c b/soh/src/code/code_800A9F30.c index 2eba3774c9..512ad49408 100644 --- a/soh/src/code/code_800A9F30.c +++ b/soh/src/code/code_800A9F30.c @@ -31,7 +31,7 @@ void func_800A9F6C(f32 a, u8 b, u8 c, u8 d) { } } -void func_800AA000(f32 a, u8 b, u8 c, u8 d) { +void Rumble_Request(f32 a, u8 b, u8 c, u8 d) { s32 temp1; s32 temp2; s32 i; diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c index 39d45785c4..ac6cb0d367 100644 --- a/soh/src/code/code_800EC960.c +++ b/soh/src/code/code_800EC960.c @@ -1261,7 +1261,7 @@ s32 sAudioUpdateTaskEnd; void PadMgr_RequestPadData(PadMgr* padmgr, Input* inputs, s32 mode); void Audio_StepFreqLerp(FreqLerp* lerp); -void func_800F56A8(void); +void Audio_UpdateSceneSequenceResumePoint(void); void Audio_PlayNatureAmbienceSequence(u8 natureAmbienceId); s32 Audio_SetGanonDistVol(u8 targetVol); void Audio_PlayFanfare_Rando(GetItemEntry getItem); @@ -3081,7 +3081,7 @@ void AudioDebug_ProcessInput_SndCont(void) { &gSfxDefaultReverb); break; case 4: - func_800F6700(sAudioSndContWork[sAudioSndContSel]); + Audio_SetSoundOutputMode(sAudioSndContWork[sAudioSndContSel]); break; case 5: Audio_SeqCmdE01(SEQ_PLAYER_BGM_MAIN, sAudioSndContWork[sAudioSndContSel]); @@ -3123,7 +3123,7 @@ void AudioDebug_ProcessInput_SndCont(void) { if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { if (sAudioSndContSel == 0) { - func_800F595C(sAudioSndContWork[sAudioSndContSel]); + Audio_PlaySequenceInCutscene(sAudioSndContWork[sAudioSndContSel]); } } @@ -3607,7 +3607,7 @@ void AudioDebug_ProcessInput(void) { } void func_800F4A70(void); -void func_800F5CF8(void); +void Audio_UpdateFanfare(void); void func_800F3054(void) { if (func_800FAD34() == 0) { @@ -3617,8 +3617,8 @@ void func_800F3054(void) { Audio_StepFreqLerp(&sRiverFreqScaleLerp); Audio_StepFreqLerp(&sWaterfallFreqScaleLerp); func_800F4A70(); - func_800F56A8(); - func_800F5CF8(); + Audio_UpdateSceneSequenceResumePoint(); + Audio_UpdateFanfare(); if (gAudioSpecId == 7) { Audio_ClearSariaBgm(); } @@ -4475,7 +4475,7 @@ void Audio_PlaySariaBgm(Vec3f* pos, u16 seqId, u16 distMax) { dist = sqrtf(SQ(pos->z) + SQ(pos->x)); if (sSariaBgmPtr == NULL) { sSariaBgmPtr = pos; - func_800F5E18(SEQ_PLAYER_BGM_SUB, seqId, 0, 7, 2); + Audio_PlaySequenceWithSeqPlayerIO(SEQ_PLAYER_BGM_SUB, seqId, 0, 7, 2); } else { prevDist = sqrtf(SQ(sSariaBgmPtr->z) + SQ(sSariaBgmPtr->x)); if (dist < prevDist) { @@ -4511,12 +4511,12 @@ void Audio_ClearSariaBgm2(void) { sSariaBgmPtr = NULL; } -void func_800F5510(u16 seqId) { - func_800F5550(seqId); - func_800F5E18(SEQ_PLAYER_BGM_MAIN, seqId, 0, 0, 1); +void Audio_PlayMorningSceneSequence(u16 seqId) { + Audio_PlaySceneSequence(seqId); + Audio_PlaySequenceWithSeqPlayerIO(SEQ_PLAYER_BGM_MAIN, seqId, 0, 0, 1); } -void func_800F5550(u16 seqId) { +void Audio_PlaySceneSequence(u16 seqId) { u8 sp27 = 0; u16 nv; @@ -4532,12 +4532,12 @@ void func_800F5550(u16 seqId) { sp27 = 0x1E; } - func_800F5E18(SEQ_PLAYER_BGM_MAIN, seqId, sp27, 7, D_8013062C); + Audio_PlaySequenceWithSeqPlayerIO(SEQ_PLAYER_BGM_MAIN, seqId, sp27, 7, D_8013062C); D_8013062C = 0; } else { nv = (Audio_GetSeqFlags((seqId & 0xFF) & 0xFF) & 0x40) ? 1 : 0xFF; - func_800F5E18(SEQ_PLAYER_BGM_MAIN, seqId, 0, 7, nv); + Audio_PlaySequenceWithSeqPlayerIO(SEQ_PLAYER_BGM_MAIN, seqId, 0, 7, nv); if (!(Audio_GetSeqFlags(seqId) & 0x20)) { D_8013062C = 0xC0; } @@ -4546,7 +4546,7 @@ void func_800F5550(u16 seqId) { } } -void func_800F56A8(void) { +void Audio_UpdateSceneSequenceResumePoint(void) { u16 temp_v0; u8 bvar; @@ -4561,13 +4561,13 @@ void func_800F56A8(void) { } } -void func_800F5718(void) { +void Audio_PlayWindmillBgm(void) { if (func_800FA0B4(SEQ_PLAYER_BGM_MAIN) != NA_BGM_WINDMILL) { Audio_StartSeq(SEQ_PLAYER_BGM_MAIN, 0, NA_BGM_WINDMILL); } } -void func_800F574C(f32 arg0, u8 arg2) { +void Audio_SetMainBgmTempoFreqAfterFanfare(f32 arg0, u8 arg2) { if (arg0 == 1.0f) { Audio_SeqCmdB40(SEQ_PLAYER_BGM_MAIN, arg2, 0); } else { @@ -4576,13 +4576,13 @@ void func_800F574C(f32 arg0, u8 arg2) { Audio_SeqCmdC(SEQ_PLAYER_FANFARE, 0xA0, arg2, arg0 * 100.0f); } -void func_800F5918(void) { +void Audio_SetFastTempoForTimedMinigame(void) { if (func_800FA0B4(SEQ_PLAYER_BGM_MAIN) == NA_BGM_TIMED_MINI_GAME && func_800FA11C(0, 0xF0000000)) { Audio_SeqCmdB(SEQ_PLAYER_BGM_MAIN, 5, 0, 0xD2); } } -void func_800F595C(u16 arg0) { +void Audio_PlaySequenceInCutscene(u16 arg0) { u8 arg0b = arg0 & 0xFF; if (Audio_GetSeqFlags(arg0b) & 2) { @@ -4591,12 +4591,12 @@ void func_800F595C(u16 arg0) { Audio_StartSeq(SEQ_PLAYER_FANFARE, 0, arg0); } else { - func_800F5E18(SEQ_PLAYER_BGM_MAIN, arg0, 0, 7, -1); + Audio_PlaySequenceWithSeqPlayerIO(SEQ_PLAYER_BGM_MAIN, arg0, 0, 7, -1); Audio_SeqCmd1(SEQ_PLAYER_FANFARE, 0); } } -void func_800F59E8(u16 arg0) { +void Audio_StopSequenceInCutscene(u16 arg0) { u8 arg0b = arg0 & 0xFF; if (Audio_GetSeqFlags(arg0b) & 2) { @@ -4608,7 +4608,7 @@ void func_800F59E8(u16 arg0) { } } -s32 func_800F5A58(u8 arg0) { +s32 Audio_IsSequencePlaying(u8 arg0) { u8 phi_a1 = 0; if (Audio_GetSeqFlags(arg0 & 0xFF) & 2) { @@ -4727,7 +4727,7 @@ void Audio_PlayFanfare(u16 seqId) { D_8016B9F6 = seqId; } -void func_800F5CF8(void) { +void Audio_UpdateFanfare(void) { u16 sp26; u16 pad; u16 sp22; @@ -4759,7 +4759,7 @@ void func_800F5CF8(void) { } } -void func_800F5E18(u8 playerIdx, u16 seqId, u8 fadeTimer, s8 arg3, s8 arg4) { +void Audio_PlaySequenceWithSeqPlayerIO(u8 playerIdx, u16 seqId, u8 fadeTimer, s8 arg3, s8 arg4) { Audio_SeqCmd7(playerIdx, arg3, arg4); Audio_StartSeq(playerIdx, fadeTimer, seqId); } @@ -4863,7 +4863,7 @@ void Audio_SetBgmEnemyVolume(f32 dist) { sAudioEnemyDist = dist; } -void func_800F6268(f32 dist, u16 arg1) { +void Audio_UpdateMalonSinging(f32 dist, u16 arg1) { s8 pad; s8 phi_v1; s16 temp_a0; @@ -4893,7 +4893,7 @@ void func_800F6268(f32 dist, u16 arg1) { } else if ((temp_a0 == NA_BGM_NATURE_AMBIENCE) && ((arg1 & 0xFF) == NA_BGM_LONLON)) { temp_a0 = (s8)(func_800FA0B4(SEQ_PLAYER_BGM_SUB) & 0xFF); if ((temp_a0 != (arg1 & 0xFF)) && (D_8016B9D8 < 10)) { - func_800F5E18(SEQ_PLAYER_BGM_SUB, NA_BGM_LONLON, 0, 0, 0); + Audio_PlaySequenceWithSeqPlayerIO(SEQ_PLAYER_BGM_SUB, NA_BGM_LONLON, 0, 0, 0); Audio_SeqCmdA(SEQ_PLAYER_BGM_SUB, 0xFFFC); D_8016B9D8 = 10; } @@ -4929,7 +4929,7 @@ void func_800F64E0(u8 arg0) { } } -void func_800F6584(u8 arg0) { +void Audio_ToggleMalonSinging(u8 arg0) { u8 playerIdx; u16 sp34; @@ -4952,7 +4952,7 @@ void func_800F6584(u8 arg0) { } } else { if (playerIdx == SEQ_PLAYER_BGM_SUB) { - func_800F5E18(SEQ_PLAYER_BGM_SUB, NA_BGM_LONLON, 0, 0, 0); + Audio_PlaySequenceWithSeqPlayerIO(SEQ_PLAYER_BGM_SUB, NA_BGM_LONLON, 0, 0, 0); } Audio_SeqCmd6(playerIdx, 1, 0, 0x7F); Audio_SeqCmd6(playerIdx, 1, 1, 0x7F); @@ -4972,7 +4972,7 @@ void Audio_SetCodeReverb(s8 reverb) { } } -void func_800F6700(s8 arg0) { +void Audio_SetSoundOutputMode(s8 arg0) { s8 sp1F = 0; switch (arg0) { @@ -5076,7 +5076,7 @@ void func_800F6964(u16 arg0) { Audio_SeqCmd1(SEQ_PLAYER_BGM_SUB, (arg0 * 3) / 2); } -void func_800F6AB0(u16 arg0) { +void Audio_StopBgmAndFanfare(u16 arg0) { Audio_SeqCmd1(SEQ_PLAYER_BGM_MAIN, arg0); Audio_SeqCmd1(SEQ_PLAYER_FANFARE, arg0); Audio_SeqCmd1(SEQ_PLAYER_BGM_SUB, arg0); diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index 7369727e02..c37d4b61df 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -292,7 +292,7 @@ void Actor_SetFeetPos(Actor* actor, s32 limbIndex, s32 leftFootIndex, Vec3f* lef } } -void func_8002BE04(PlayState* play, Vec3f* arg1, Vec3f* arg2, f32* arg3) { +void Actor_ProjectPos(PlayState* play, Vec3f* arg1, Vec3f* arg2, f32* arg3) { SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, arg1, arg2, arg3); *arg3 = (*arg3 < 1.0f) ? 1.0f : (1.0f / *arg3); } @@ -326,14 +326,14 @@ Gfx D_80115FF0[] = { gsSPEndDisplayList(), }; -void func_8002BE64(TargetContext* targetCtx, s32 index, f32 arg2, f32 arg3, f32 arg4) { +void Attention_SetReticlePos(TargetContext* targetCtx, s32 index, f32 arg2, f32 arg3, f32 arg4) { targetCtx->arr_50[index].pos.x = arg2; targetCtx->arr_50[index].pos.y = arg3; targetCtx->arr_50[index].pos.z = arg4; targetCtx->arr_50[index].unk_0C = targetCtx->unk_44; } -void func_8002BE98(TargetContext* targetCtx, s32 actorCategory, PlayState* play) { +void Attention_InitReticle(TargetContext* targetCtx, s32 actorCategory, PlayState* play) { TargetContextEntry* entry; NaviColor* naviColor; s32 i; @@ -346,7 +346,7 @@ void func_8002BE98(TargetContext* targetCtx, s32 actorCategory, PlayState* play) entry = &targetCtx->arr_50[0]; for (i = 0; i < ARRAY_COUNT(targetCtx->arr_50); i++) { - func_8002BE64(targetCtx, i, 0.0f, 0.0f, 0.0f); + Attention_SetReticlePos(targetCtx, i, 0.0f, 0.0f, 0.0f); entry->color.r = naviColor->inner.r; entry->color.g = naviColor->inner.g; entry->color.b = naviColor->inner.b; @@ -354,7 +354,7 @@ void func_8002BE98(TargetContext* targetCtx, s32 actorCategory, PlayState* play) } } -void func_8002BF60(TargetContext* targetCtx, Actor* actor, s32 actorCategory, PlayState* play) { +void Attention_SetNaviState(TargetContext* targetCtx, Actor* actor, s32 actorCategory, PlayState* play) { if (CVarGetInteger(CVAR_COSMETIC("Navi.IdlePrimary.Changed"), 0)) { sNaviColorList[ACTORCAT_PLAYER].inner = CVarGetColor(CVAR_COSMETIC("Navi.IdlePrimary.Value"), defaultIdlePrimaryColor); @@ -427,7 +427,7 @@ void func_8002BF60(TargetContext* targetCtx, Actor* actor, s32 actorCategory, Pl targetCtx->naviOuter.a = naviColor->outer.a; } -void func_8002C0C0(TargetContext* targetCtx, Actor* actor, PlayState* play) { +void Attention_Init(TargetContext* targetCtx, Actor* actor, PlayState* play) { targetCtx->arrowPointedActor = NULL; targetCtx->targetedActor = NULL; targetCtx->unk_40 = 0.0f; @@ -435,11 +435,11 @@ void func_8002C0C0(TargetContext* targetCtx, Actor* actor, PlayState* play) { targetCtx->bgmEnemy = NULL; targetCtx->unk_4B = 0; targetCtx->unk_4C = 0; - func_8002BF60(targetCtx, actor, actor->category, play); - func_8002BE98(targetCtx, actor->category, play); + Attention_SetNaviState(targetCtx, actor, actor->category, play); + Attention_InitReticle(targetCtx, actor->category, play); } -void func_8002C124(TargetContext* targetCtx, PlayState* play) { +void Attention_Draw(TargetContext* targetCtx, PlayState* play) { Actor* actor = targetCtx->targetedActor; OPEN_DISPS(play->state.gfxCtx); @@ -481,7 +481,7 @@ void func_8002C124(TargetContext* targetCtx, PlayState* play) { spCE = targetCtx->unk_48; } - func_8002BE04(play, &targetCtx->targetCenterPos, &spBC, &spB4); + Actor_ProjectPos(play, &targetCtx->targetCenterPos, &spBC, &spB4); spBC.x = (160 * (spBC.x * spB4)) * var1; spBC.x = CLAMP(spBC.x, -320.0f, 320.0f); @@ -496,7 +496,7 @@ void func_8002C124(TargetContext* targetCtx, PlayState* play) { targetCtx->unk_4C = 2; } - func_8002BE64(targetCtx, targetCtx->unk_4C, spBC.x, spBC.y, spBC.z); + Attention_SetReticlePos(targetCtx, targetCtx->unk_4C, spBC.x, spBC.y, spBC.z); if ((!(player->stateFlags1 & PLAYER_STATE1_TALKING)) || (actor != player->focusActor)) { OVERLAY_DISP = Gfx_SetupDL(OVERLAY_DISP, 0x39); @@ -558,7 +558,7 @@ void func_8002C124(TargetContext* targetCtx, PlayState* play) { CLOSE_DISPS(play->state.gfxCtx); } -void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, PlayState* play) { +void Attention_Update(TargetContext* targetCtx, Player* player, Actor* actorArg, PlayState* play) { s32 pad; Actor* unkActor; s32 actorCategory; @@ -577,7 +577,7 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Pl if ((player->focusActor != NULL) && (player->controlStickDirections[player->controlStickDataIndex] == 2)) { targetCtx->unk_94 = NULL; } else { - func_80032AF0(play, &play->actorCtx, &unkActor, player); + Attention_FindActor(play, &play->actorCtx, &unkActor, player); targetCtx->unk_94 = unkActor; } @@ -613,11 +613,11 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Pl targetCtx->naviRefPos.y += temp3 * temp1; targetCtx->naviRefPos.z += temp4 * temp1; } else { - func_8002BF60(targetCtx, unkActor, actorCategory, play); + Attention_SetNaviState(targetCtx, unkActor, actorCategory, play); } if ((actorArg != NULL) && (targetCtx->unk_4B == 0)) { - func_8002BE04(play, &actorArg->focus.pos, &sp50, &sp4C); + Actor_ProjectPos(play, &actorArg->focus.pos, &sp50, &sp4C); if (((sp50.z <= 0.0f) || (1.0f <= fabsf(sp50.x * sp4C))) || (1.0f <= fabsf(sp50.y * sp4C))) { actorArg = NULL; } @@ -625,7 +625,7 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Pl if (actorArg != NULL) { if (actorArg != targetCtx->targetedActor) { - func_8002BE98(targetCtx, actorArg->category, play); + Attention_InitReticle(targetCtx, actorArg->category, play); targetCtx->targetedActor = actorArg; if (actorArg->id == ACTOR_EN_BOOM) { @@ -834,7 +834,7 @@ void Flags_SetCollectible(PlayState* play, s32 flag) { } } -void func_8002CDE4(PlayState* play, TitleCardContext* titleCtx) { +void TitleCard_Init(PlayState* play, TitleCardContext* titleCtx) { titleCtx->durationTimer = titleCtx->delayTimer = titleCtx->intensityR = titleCtx->alpha = 0; titleCtx->durationTimer = titleCtx->delayTimer = titleCtx->intensityG = titleCtx->alpha = 0; titleCtx->durationTimer = titleCtx->delayTimer = titleCtx->intensityB = titleCtx->alpha = 0; @@ -1188,7 +1188,7 @@ void TitleCard_Draw(PlayState* play, TitleCardContext* titleCtx) { } } -s32 func_8002D53C(PlayState* play, TitleCardContext* titleCtx) { +s32 TitleCard_Clear(PlayState* play, TitleCardContext* titleCtx) { if ((play->actorCtx.titleCtx.delayTimer != 0) || (play->actorCtx.titleCtx.alpha != 0)) { titleCtx->durationTimer = 0; titleCtx->delayTimer = 0; @@ -1444,7 +1444,7 @@ s32 func_8002DDF4(PlayState* play) { return player->stateFlags2 & PLAYER_STATE2_STATIONARY_LADDER; } -void func_8002DE04(PlayState* play, Actor* actorA, Actor* actorB) { +void Actor_SwapHookshotAttachment(PlayState* play, Actor* actorA, Actor* actorB) { ArmsHook* hookshot = (ArmsHook*)Actor_Find(&play->actorCtx, ACTOR_ARMS_HOOK, ACTORCAT_ITEMACTION); hookshot->grabbed = actorB; @@ -1455,7 +1455,7 @@ void func_8002DE04(PlayState* play, Actor* actorA, Actor* actorB) { actorA->flags &= ~ACTOR_FLAG_HOOKSHOT_ATTACHED; } -void func_8002DE74(PlayState* play, Player* player) { +void Actor_RequestHorseCameraSetting(PlayState* play, Player* player) { if ((play->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_4) && func_800C0CB8(play)) { Camera_ChangeSetting(Play_GetCamera(play, MAIN_CAM), CAM_SET_HORSE); } @@ -1471,11 +1471,11 @@ s32 func_8002DEEC(Player* player) { return (player->stateFlags1 & (PLAYER_STATE1_DEAD | PLAYER_STATE1_IN_CUTSCENE)) || (player->csAction != 0); } -void func_8002DF18(PlayState* play, Player* player) { +void Actor_InitPlayerHorse(PlayState* play, Player* player) { Horse_InitPlayerHorse(play, player); } -s32 func_8002DF38(PlayState* play, Actor* actor, u8 csAction) { +s32 Player_SetCsAction(PlayState* play, Actor* actor, u8 csAction) { Player* player = GET_PLAYER(play); player->csAction = csAction; @@ -1488,7 +1488,7 @@ s32 func_8002DF38(PlayState* play, Actor* actor, u8 csAction) { s32 Player_SetCsActionWithHaltedActors(PlayState* play, Actor* actor, u8 csAction) { Player* player = GET_PLAYER(play); - func_8002DF38(play, actor, csAction); + Player_SetCsAction(play, actor, csAction); player->cv.haltActorsDuringCsAction = true; return true; @@ -1881,7 +1881,7 @@ PosRot* Actor_GetWorldPosShapeRot(PosRot* arg0, Actor* actor) { return arg0; } -f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2) { +f32 Attention_WeightedDistToPlayerSq(Actor* actor, Player* player, s16 arg2) { s16 yawTemp = (s16)(actor->yawTowardsPlayer - 0x8000) - arg2; s16 yawTempAbs = ABS(yawTemp); @@ -1917,11 +1917,11 @@ TargetRangeParams D_80115FF8[] = { TARGET_RANGE(240, 576), TARGET_RANGE(280, 280000), }; -u32 func_8002F090(Actor* actor, f32 arg1) { +u32 Attention_ActorIsInRange(Actor* actor, f32 arg1) { return arg1 < D_80115FF8[actor->targetMode].rangeSq; } -s32 func_8002F0C8(Actor* actor, Player* player, s32 flag) { +s32 Attention_ShouldReleaseLockOn(Actor* actor, Player* player, s32 flag) { if ((actor->update == NULL) || !(actor->flags & ACTOR_FLAG_ATTENTION_ENABLED)) { return true; } @@ -1937,7 +1937,7 @@ s32 func_8002F0C8(Actor* actor, Player* player, s32 flag) { dist = actor->xyzDistToPlayerSq; } - return !func_8002F090(actor, D_80115FF8[actor->targetMode].leashScale * dist); + return !Attention_ActorIsInRange(actor, D_80115FF8[actor->targetMode].leashScale * dist); } return false; @@ -1952,7 +1952,7 @@ u32 Actor_ProcessTalkRequest(Actor* actor, PlayState* play) { return false; } -s32 func_8002F1C4(Actor* actor, PlayState* play, f32 arg2, f32 arg3, u32 exchangeItemId) { +s32 Actor_OfferTalkExchange(Actor* actor, PlayState* play, f32 arg2, f32 arg3, u32 exchangeItemId) { Player* player = GET_PLAYER(play); // This is convoluted but it seems like it must be a single if statement to match @@ -1970,18 +1970,18 @@ s32 func_8002F1C4(Actor* actor, PlayState* play, f32 arg2, f32 arg3, u32 exchang return true; } -s32 func_8002F298(Actor* actor, PlayState* play, f32 arg2, u32 exchangeItemId) { - return func_8002F1C4(actor, play, arg2, arg2, exchangeItemId); +s32 Actor_OfferTalkExchangeEquiCylinder(Actor* actor, PlayState* play, f32 arg2, u32 exchangeItemId) { + return Actor_OfferTalkExchange(actor, play, arg2, arg2, exchangeItemId); } -s32 func_8002F2CC(Actor* actor, PlayState* play, f32 arg2) { - return func_8002F298(actor, play, arg2, EXCH_ITEM_NONE); +s32 Actor_OfferTalk(Actor* actor, PlayState* play, f32 arg2) { + return Actor_OfferTalkExchangeEquiCylinder(actor, play, arg2, EXCH_ITEM_NONE); } -s32 func_8002F2F4(Actor* actor, PlayState* play) { +s32 Actor_OfferTalkNearColChkInfoCylinder(Actor* actor, PlayState* play) { f32 var1 = 50.0f + actor->colChkInfo.cylRadius; - return func_8002F2CC(actor, play, var1); + return Actor_OfferTalk(actor, play, var1); } u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play) { @@ -1992,7 +1992,7 @@ u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play) { } } -s8 func_8002F368(PlayState* play) { +s8 Actor_GetPlayerExchangeItemId(PlayState* play) { Player* player = GET_PLAYER(play); return player->exchangeItemId; @@ -2002,7 +2002,7 @@ void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y) { Vec3f projectedPos; f32 w; - func_8002BE04(play, &actor->focus.pos, &projectedPos, &w); + Actor_ProjectPos(play, &actor->focus.pos, &projectedPos, &w); *x = projectedPos.x * w * (SCREEN_WIDTH / 2) + (SCREEN_WIDTH / 2); *y = projectedPos.y * w * -(SCREEN_HEIGHT / 2) + (SCREEN_HEIGHT / 2); } @@ -2173,7 +2173,7 @@ void func_8002F5C4(Actor* actorA, Actor* actorB, PlayState* play) { actorA->parent = NULL; } -void func_8002F5F0(Actor* actor, PlayState* play) { +void Actor_SetClosestSecretDistance(Actor* actor, PlayState* play) { Player* player = GET_PLAYER(play); if (actor->xyzDistToPlayerSq < player->closestSecretDistSq) { @@ -2212,7 +2212,7 @@ s32 Actor_NotMounted(PlayState* play, Actor* horse) { } } -void func_8002F698(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) { +void Actor_SetPlayerKnockback(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) { Player* player = GET_PLAYER(play); player->knockbackDamage = arg6; @@ -2222,20 +2222,20 @@ void func_8002F698(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, player->knockbackYVelocity = arg4; } -void func_8002F6D4(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5) { - func_8002F698(play, actor, arg2, arg3, arg4, 2, arg5); +void Actor_SetPlayerKnockbackLarge(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5) { + Actor_SetPlayerKnockback(play, actor, arg2, arg3, arg4, 2, arg5); } -void func_8002F71C(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4) { - func_8002F6D4(play, actor, arg2, arg3, arg4, 0); +void Actor_SetPlayerKnockbackLargeNoDamage(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4) { + Actor_SetPlayerKnockbackLarge(play, actor, arg2, arg3, arg4, 0); } -void func_8002F758(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5) { - func_8002F698(play, actor, arg2, arg3, arg4, 1, arg5); +void Actor_SetPlayerKnockbackSmall(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5) { + Actor_SetPlayerKnockback(play, actor, arg2, arg3, arg4, 1, arg5); } -void func_8002F7A0(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4) { - func_8002F758(play, actor, arg2, arg3, arg4, 0); +void Actor_SetPlayerKnockbackSmallNoDamage(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4) { + Actor_SetPlayerKnockbackSmall(play, actor, arg2, arg3, arg4, 0); } void Player_PlaySfx(Actor* actor, u16 sfxId) { @@ -2262,7 +2262,7 @@ void Audio_PlayActorSound2(Actor* actor, u16 sfxId) { Sfx_PlaySfxAtPos(&actor->projectedPos, sfxId); } -void func_8002F850(PlayState* play, Actor* actor) { +void Actor_PlaySfx_SurfaceBomb(PlayState* play, Actor* actor) { s32 sfxId; if (actor->bgCheckFlags & 0x20) { @@ -2279,31 +2279,31 @@ void func_8002F850(PlayState* play, Actor* actor) { Sfx_PlaySfxAtPos(&actor->projectedPos, sfxId + SFX_FLAG); } -void func_8002F8F0(Actor* actor, u16 sfxId) { +void Actor_PlaySfx_Flagged2(Actor* actor, u16 sfxId) { actor->sfx = sfxId; actor->flags |= ACTOR_FLAG_SFX_ACTOR_POS_2; actor->flags &= ~(ACTOR_AUDIO_FLAG_SFX_CENTERED_1 | ACTOR_AUDIO_FLAG_SFX_CENTERED_2 | ACTOR_FLAG_SFX_TIMER); } -void func_8002F91C(Actor* actor, u16 sfxId) { +void Actor_PlaySfx_FlaggedCentered1(Actor* actor, u16 sfxId) { actor->sfx = sfxId; actor->flags |= ACTOR_AUDIO_FLAG_SFX_CENTERED_1; actor->flags &= ~(ACTOR_FLAG_SFX_ACTOR_POS_2 | ACTOR_AUDIO_FLAG_SFX_CENTERED_2 | ACTOR_FLAG_SFX_TIMER); } -void func_8002F948(Actor* actor, u16 sfxId) { +void Actor_PlaySfx_FlaggedCentered2(Actor* actor, u16 sfxId) { actor->sfx = sfxId; actor->flags |= ACTOR_AUDIO_FLAG_SFX_CENTERED_2; actor->flags &= ~(ACTOR_FLAG_SFX_ACTOR_POS_2 | ACTOR_AUDIO_FLAG_SFX_CENTERED_1 | ACTOR_FLAG_SFX_TIMER); } -void func_8002F974(Actor* actor, u16 sfxId) { +void Actor_PlaySfx_Flagged(Actor* actor, u16 sfxId) { actor->flags &= ~(ACTOR_FLAG_SFX_ACTOR_POS_2 | ACTOR_AUDIO_FLAG_SFX_CENTERED_1 | ACTOR_AUDIO_FLAG_SFX_CENTERED_2 | ACTOR_FLAG_SFX_TIMER); actor->sfx = sfxId; } -void func_8002F994(Actor* actor, s32 arg1) { +void Actor_PlaySfx_FlaggedTimer(Actor* actor, s32 arg1) { actor->flags |= ACTOR_FLAG_SFX_TIMER; actor->flags &= ~(ACTOR_FLAG_SFX_ACTOR_POS_2 | ACTOR_AUDIO_FLAG_SFX_CENTERED_1 | ACTOR_AUDIO_FLAG_SFX_CENTERED_2); if (arg1 < 40) { @@ -2317,7 +2317,7 @@ void func_8002F994(Actor* actor, s32 arg1) { // Tests if something hit Jabu Jabu surface, displaying hit splash and playing sfx if true s32 func_8002F9EC(PlayState* play, Actor* actor, CollisionPoly* poly, s32 bgId, Vec3f* pos) { - if (func_80041D4C(&play->colCtx, poly, bgId) == 8) { + if (SurfaceType_GetFloorType(&play->colCtx, poly, bgId) == 8) { play->roomCtx.unk_74[0] = 1; CollisionCheck_BlueBlood(play, NULL, pos); Audio_PlayActorSound2(actor, NA_SE_IT_WALL_HIT_BUYO); @@ -2531,8 +2531,7 @@ void Actor_DisableLens(PlayState* play) { } } -// Actor_InitContext -void func_800304DC(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEntry) { +void Actor_InitContext(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEntry) { SavedSceneFlags* savedSceneFlags; s32 i; @@ -2548,12 +2547,12 @@ void func_800304DC(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEnt actorCtx->flags.clear = savedSceneFlags->clear; actorCtx->flags.collect = savedSceneFlags->collect; - func_8002CDE4(play, &actorCtx->titleCtx); + TitleCard_Init(play, &actorCtx->titleCtx); actorCtx->absoluteSpace = NULL; Actor_SpawnEntry(actorCtx, actorEntry, play); - func_8002C0C0(&actorCtx->targetCtx, actorCtx->actorLists[ACTORCAT_PLAYER].head, play); + Attention_Init(&actorCtx->targetCtx, actorCtx->actorLists[ACTORCAT_PLAYER].head, play); func_8002FA60(play); } @@ -2721,7 +2720,7 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) { } } - func_8002C7BC(&actorCtx->targetCtx, player, actor, play); + Attention_Update(&actorCtx->targetCtx, player, actor, play); TitleCard_Update(play, &actorCtx->titleCtx); DynaPoly_UpdateBgActorTransforms(play, &play->colCtx.dyna); } @@ -2817,7 +2816,7 @@ void Actor_Draw(PlayState* play, Actor* actor) { Fault_RemoveClient(&faultClient); } -void func_80030ED8(Actor* actor) { +void Actor_UpdateFlaggedAudio(Actor* actor) { if (actor->flags & ACTOR_FLAG_SFX_ACTOR_POS_2) { Audio_PlaySoundGeneral(actor->sfx, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -2945,11 +2944,11 @@ void Actor_DrawLensActors(PlayState* play, s32 numInvisibleActors, Actor** invis CLOSE_DISPS(gfxCtx); } -s32 func_800314B0(PlayState* play, Actor* actor) { - return func_800314D4(play, actor, &actor->projectedPos, actor->projectedW); +s32 Actor_CullingCheck(PlayState* play, Actor* actor) { + return Actor_CullingVolumeTest(play, actor, &actor->projectedPos, actor->projectedW); } -s32 func_800314D4(PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3) { +s32 Actor_CullingVolumeTest(PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3) { f32 var; if ((arg2->z > -actor->uncullZoneScale) && (arg2->z < (actor->uncullZoneForward + actor->uncullZoneScale))) { @@ -2972,7 +2971,7 @@ s32 Ship_CalcShouldDrawAndUpdate(PlayState* play, Actor* actor, Vec3f* projected f32 clampedProjectedW; // Check if the actor passes its original/vanilla culling requirements - if (func_800314D4(play, actor, projectedPos, projectedW)) { + if (Actor_CullingVolumeTest(play, actor, projectedPos, projectedW)) { *shouldUpdate = true; *shouldDraw = true; return true; @@ -3039,7 +3038,7 @@ s32 Ship_CalcShouldDrawAndUpdate(PlayState* play, Actor* actor, Vec3f* projected } // #endregion -void func_800315AC(PlayState* play, ActorContext* actorCtx) { +void Actor_DrawAll(PlayState* play, ActorContext* actorCtx) { s32 invisibleActorCounter; Actor* invisibleActors[INVISIBLE_ACTOR_MAX]; ActorListEntry* actorListEntry; @@ -3070,7 +3069,7 @@ void func_800315AC(PlayState* play, ActorContext* actorCtx) { if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(69) == 0)) { if (actor->sfx != 0) { - func_80030ED8(actor); + Actor_UpdateFlaggedAudio(actor); } } @@ -3089,7 +3088,7 @@ void func_800315AC(PlayState* play, ActorContext* actorCtx) { actor->flags &= ~ACTOR_FLAG_INSIDE_CULLING_VOLUME; } } else { - if (func_800314B0(play, actor)) { + if (Actor_CullingCheck(play, actor)) { actor->flags |= ACTOR_FLAG_INSIDE_CULLING_VOLUME; } else { actor->flags &= ~ACTOR_FLAG_INSIDE_CULLING_VOLUME; @@ -3157,7 +3156,7 @@ void func_800315AC(PlayState* play, ActorContext* actorCtx) { CLOSE_DISPS(play->state.gfxCtx); } -void func_80031A28(PlayState* play, ActorContext* actorCtx) { +void Actor_KillAllWithMissingObject(PlayState* play, ActorContext* actorCtx) { Actor* actor; s32 i; @@ -3534,7 +3533,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) { return newHead; } -s32 func_80032880(PlayState* play, Actor* actor) { +s32 Attention_ActorOnScreen(PlayState* play, Actor* actor) { s16 sp1E; s16 sp1C; @@ -3550,7 +3549,7 @@ f32 sbgmEnemyDistSq; s32 D_8015BBF8; s16 D_8015BBFC; -void func_800328D4(PlayState* play, ActorContext* actorCtx, Player* player, u32 actorCategory) { +void Attention_FindActorInCategory(PlayState* play, ActorContext* actorCtx, Player* player, u32 actorCategory) { f32 var; Actor* actor; Actor* sp84; @@ -3578,8 +3577,9 @@ void func_800328D4(PlayState* play, ActorContext* actorCtx, Player* player, u32 } if (actor != sp84) { - var = func_8002EFC0(actor, player, D_8015BBFC); - if ((var < D_8015BBF0) && func_8002F090(actor, var) && func_80032880(play, actor) && + var = Attention_WeightedDistToPlayerSq(actor, player, D_8015BBFC); + if ((var < D_8015BBF0) && Attention_ActorIsInRange(actor, var) && + Attention_ActorOnScreen(play, actor) && (!BgCheck_CameraLineTest1(&play->colCtx, &player->actor.focus.pos, &actor->focus.pos, &sp70, &sp80, 1, 1, 1, 1, &sp7C) || SurfaceType_IsIgnoredByProjectiles(&play->colCtx, sp80, sp7C))) { @@ -3605,7 +3605,7 @@ u8 D_801160A0[] = { ACTORCAT_CHEST, ACTORCAT_SWITCH, ACTORCAT_PROP, ACTORCAT_MISC, ACTORCAT_DOOR, ACTORCAT_SWITCH, }; -Actor* func_80032AF0(PlayState* play, ActorContext* actorCtx, Actor** actorPtr, Player* player) { +Actor* Attention_FindActor(PlayState* play, ActorContext* actorCtx, Actor** actorPtr, Player* player) { s32 i; u8* entry; @@ -3620,13 +3620,13 @@ Actor* func_80032AF0(PlayState* play, ActorContext* actorCtx, Actor** actorPtr, D_8015BBFC = player->actor.shape.rot.y; for (i = 0; i < 3; i++) { - func_800328D4(play, actorCtx, player, *entry); + Attention_FindActorInCategory(play, actorCtx, player, *entry); entry++; } if (D_8015BBE8 == NULL) { for (; i < ARRAY_COUNT(D_801160A0); i++) { - func_800328D4(play, actorCtx, player, *entry); + Attention_FindActorInCategory(play, actorCtx, player, *entry); entry++; } } @@ -3666,7 +3666,7 @@ void Enemy_StartFinishingBlow(PlayState* play, Actor* actor) { SoundSource_PlaySfxAtFixedWorldPos(play, &actor->world.pos, 20, NA_SE_EN_LAST_DAMAGE); } -s16 func_80032CB4(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { +s16 FaceChange_UpdateBlinking(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { if (DECR(arg0[1]) == 0) { arg0[1] = Rand_S16Offset(arg1, arg2); } @@ -3682,7 +3682,7 @@ s16 func_80032CB4(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { return arg0[0]; } -s16 func_80032D60(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { +s16 FaceChange_UpdateRandomSet(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { if (DECR(arg0[1]) == 0) { arg0[1] = Rand_S16Offset(arg1, arg2); arg0[0]++; @@ -4139,7 +4139,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, PlayState* play) { CLOSE_DISPS(play->state.gfxCtx); } -void func_80033DB8(PlayState* play, s16 arg1, s16 arg2) { +void Actor_RequestQuake(PlayState* play, s16 arg1, s16 arg2) { s16 var = Quake_Add(&play->mainCamera, 3); Quake_SetSpeed(var, 20000); @@ -4147,7 +4147,7 @@ void func_80033DB8(PlayState* play, s16 arg1, s16 arg2) { Quake_SetCountdown(var, arg2); } -void func_80033E1C(PlayState* play, s16 arg1, s16 arg2, s16 arg3) { +void Actor_RequestQuakeWithSpeed(PlayState* play, s16 arg1, s16 arg2, s16 arg3) { s16 var = Quake_Add(&play->mainCamera, 3); Quake_SetSpeed(var, arg3); @@ -4155,14 +4155,14 @@ void func_80033E1C(PlayState* play, s16 arg1, s16 arg2, s16 arg3) { Quake_SetCountdown(var, arg2); } -void func_80033E88(Actor* actor, PlayState* play, s16 arg2, s16 arg3) { +void Actor_RequestQuakeAndRumble(Actor* actor, PlayState* play, s16 arg2, s16 arg3) { if (arg2 >= 5) { - func_800AA000(actor->xyzDistToPlayerSq, 0xFF, 0x14, 0x96); + Rumble_Request(actor->xyzDistToPlayerSq, 0xFF, 0x14, 0x96); } else { - func_800AA000(actor->xyzDistToPlayerSq, 0xB4, 0x14, 0x64); + Rumble_Request(actor->xyzDistToPlayerSq, 0xB4, 0x14, 0x64); } - func_80033DB8(play, arg2, arg3); + Actor_RequestQuake(play, arg2, arg3); } f32 Rand_ZeroFloat(f32 f) { @@ -4316,7 +4316,7 @@ s32 Npc_UpdateTalking(PlayState* play, Actor* actor, s16* talkState, f32 interac return false; } - if (!func_8002F2CC(actor, play, interactRange)) { + if (!Actor_OfferTalk(actor, play, interactRange)) { return false; } @@ -4646,7 +4646,7 @@ void Animation_ChangeByInfo(SkelAnime* skelAnime, AnimationInfo* animationInfo, frameCount, animationInfo->mode, animationInfo->morphFrames); } -void func_80034F54(PlayState* play, s16* arg1, s16* arg2, s32 arg3) { +void Actor_UpdateFidgetTables(PlayState* play, s16* arg1, s16* arg2, s32 arg3) { u32 frames = play->gameplayFrames; s32 i; @@ -6383,11 +6383,11 @@ s32 func_80037D98(PlayState* play, Actor* actor, s16 arg2, s32* arg3) { } if (actor->xyzDistToPlayerSq <= SQ(80.0f)) { - if (func_8002F2CC(actor, play, 80.0f)) { + if (Actor_OfferTalk(actor, play, 80.0f)) { actor->textId = func_80037C30(play, arg2); } } else { - if (func_8002F2F4(actor, play)) { + if (Actor_OfferTalkNearColChkInfoCylinder(actor, play)) { actor->textId = func_80037C30(play, arg2); } } @@ -6395,7 +6395,7 @@ s32 func_80037D98(PlayState* play, Actor* actor, s16 arg2, s32* arg3) { return false; } -s32 func_80037F30(Vec3s* arg0, Vec3s* arg1) { +s32 Actor_TrackNone(Vec3s* arg0, Vec3s* arg1) { Math_SmoothStepToS(&arg0->y, 0, 6, 6200, 100); Math_SmoothStepToS(&arg0->x, 0, 6, 6200, 100); Math_SmoothStepToS(&arg1->y, 0, 6, 6200, 100); @@ -6403,7 +6403,7 @@ s32 func_80037F30(Vec3s* arg0, Vec3s* arg1) { return true; } -s32 func_80037FC8(Actor* actor, Vec3f* arg1, Vec3s* arg2, Vec3s* arg3) { +s32 Actor_TrackPoint(Actor* actor, Vec3f* arg1, Vec3s* arg2, Vec3s* arg3) { s16 sp36; s16 sp34; s16 var; @@ -6427,7 +6427,7 @@ s32 func_80037FC8(Actor* actor, Vec3f* arg1, Vec3s* arg2, Vec3s* arg3) { return true; } -s32 func_80038154(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, f32 arg4) { +s32 Actor_TrackPlayerSetFocusHeight(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, f32 arg4) { Player* player = GET_PLAYER(play); s32 pad; Vec3f sp2C; @@ -6442,7 +6442,7 @@ s32 func_80038154(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, f32 a var = actor->yawTowardsPlayer - actor->shape.rot.y; abs_var = ABS(var); if (abs_var >= 0x4300) { - func_80037F30(arg2, arg3); + Actor_TrackNone(arg2, arg3); return false; } } @@ -6454,12 +6454,12 @@ s32 func_80038154(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, f32 a sp2C = player->actor.focus.pos; } - func_80037FC8(actor, &sp2C, arg2, arg3); + Actor_TrackPoint(actor, &sp2C, arg2, arg3); return true; } -s32 func_80038290(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f arg4) { +s32 Actor_TrackPlayer(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f arg4) { Player* player = GET_PLAYER(play); s32 pad; Vec3f sp24; @@ -6473,7 +6473,7 @@ s32 func_80038290(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f var = actor->yawTowardsPlayer - actor->shape.rot.y; abs_var = ABS(var); if (abs_var >= 0x4300) { - func_80037F30(arg2, arg3); + Actor_TrackNone(arg2, arg3); return false; } } @@ -6485,7 +6485,7 @@ s32 func_80038290(PlayState* play, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f sp24 = player->actor.focus.pos; } - func_80037FC8(actor, &sp24, arg2, arg3); + Actor_TrackPoint(actor, &sp24, arg2, arg3); return true; } diff --git a/soh/src/code/z_bgcheck.c b/soh/src/code/z_bgcheck.c index 3cce952f5b..4c65371b04 100644 --- a/soh/src/code/z_bgcheck.c +++ b/soh/src/code/z_bgcheck.c @@ -3990,7 +3990,7 @@ u32 SurfaceType_GetSceneExitIndex(CollisionContext* colCtx, CollisionPoly* poly, /** * SurfaceType Get ? Property (& 0x0003 E000) */ -u32 func_80041D4C(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId) { +u32 SurfaceType_GetFloorType(CollisionContext* colCtx, CollisionPoly* poly, s32 bgId) { return SurfaceType_GetData(colCtx, poly, bgId, 0) >> 13 & 0x1F; } diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index 75297c546f..24d7f434ed 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -430,7 +430,7 @@ f32 Camera_GetFloorYLayer(Camera* camera, Vec3f* norm, Vec3f* pos, s32* bgId) { norm->z = 0.0f; floorY = BGCHECK_Y_MIN; break; - } else if (func_80041D4C(colCtx, floorPoly, *bgId) == 1) { + } else if (SurfaceType_GetFloorType(colCtx, floorPoly, *bgId) == 1) { // floor is not solid, check below that floor. pos->y = floorY - 10.0f; continue; @@ -5272,11 +5272,11 @@ s32 Camera_Unique9(Camera* camera) { Camera_UpdateInterface(0xF000 | ((anim->curKeyFrame->unk_01 & 0xF) << 8)); } else if (camera->player->stateFlags1 & PLAYER_STATE1_IN_WATER && player->currentBoots != PLAYER_BOOTS_IRON) { - func_8002DF38(camera->play, camera->target, 8); + Player_SetCsAction(camera->play, camera->target, 8); osSyncPrintf("camera: demo: player demo set WAIT\n"); } else { osSyncPrintf("camera: demo: player demo set %d\n", anim->curKeyFrame->unk_01); - func_8002DF38(camera->play, camera->target, anim->curKeyFrame->unk_01); + Player_SetCsAction(camera->play, camera->target, anim->curKeyFrame->unk_01); } } } else { diff --git a/soh/src/code/z_debug.c b/soh/src/code/z_debug.c index aebd08f864..aa762a08bd 100644 --- a/soh/src/code/z_debug.c +++ b/soh/src/code/z_debug.c @@ -202,7 +202,7 @@ void func_8006390C(Input* input) { } if (iREG(0)) { iREG(0) = 0; - func_800AA000(0, iREG(1), iREG(2), iREG(3)); + Rumble_Request(0, iREG(1), iREG(2), iREG(3)); } } } diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c index ecf26beadd..dc01a5d798 100644 --- a/soh/src/code/z_demo.c +++ b/soh/src/code/z_demo.c @@ -444,14 +444,14 @@ void Cutscene_Command_SetLighting(PlayState* play, CutsceneContext* csCtx, CsCmd // Command 0x56: Play Background Music void Cutscene_Command_PlayBGM(PlayState* play, CutsceneContext* csCtx, CsCmdMusicChange* cmd) { if (csCtx->frames == cmd->startFrame) { - func_800F595C(cmd->sequence - 1); + Audio_PlaySequenceInCutscene(cmd->sequence - 1); } } // Command 0x57: Stop Background Music void Cutscene_Command_StopBGM(PlayState* play, CutsceneContext* csCtx, CsCmdMusicChange* cmd) { if (csCtx->frames == cmd->startFrame) { - func_800F59E8(cmd->sequence - 1); + Audio_StopSequenceInCutscene(cmd->sequence - 1); } } @@ -473,7 +473,7 @@ void Cutscene_Command_FadeBGM(PlayState* play, CutsceneContext* csCtx, CsCmdMusi // Command 9: ? void Cutscene_Command_09(PlayState* play, CutsceneContext* csCtx, CsCmdUnknown9* cmd) { if (csCtx->frames == cmd->startFrame) { - func_800AA000(0.0f, cmd->unk_06, cmd->unk_07, cmd->unk_08); + Rumble_Request(0.0f, cmd->unk_06, cmd->unk_07, cmd->unk_08); } } diff --git a/soh/src/code/z_en_a_keep.c b/soh/src/code/z_en_a_keep.c index 611d2dfb84..cd0f16a349 100644 --- a/soh/src/code/z_en_a_keep.c +++ b/soh/src/code/z_en_a_keep.c @@ -219,7 +219,7 @@ void EnAObj_WaitTalk(EnAObj* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->dyna.actor, play)) { EnAObj_SetupAction(this, EnAObj_WaitFinishedTalking); } else { - func_8002F2F4(&this->dyna.actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->dyna.actor, play); } } } diff --git a/soh/src/code/z_game_over.c b/soh/src/code/z_game_over.c index e57e5a3a24..96004dbde6 100644 --- a/soh/src/code/z_game_over.c +++ b/soh/src/code/z_game_over.c @@ -86,8 +86,8 @@ void GameOver_Update(PlayState* play) { v91 = VREG(91); v92 = VREG(92); - func_800AA000(0.0f, ((v90 > 0x64) ? 0xFF : (v90 * 0xFF) / 0x64), (CLAMP_MAX(v91 * 3, 0xFF)), - ((v92 > 0x64) ? 0xFF : (v92 * 0xFF) / 0x64)); + Rumble_Request(0.0f, ((v90 > 0x64) ? 0xFF : (v90 * 0xFF) / 0x64), (CLAMP_MAX(v91 * 3, 0xFF)), + ((v92 > 0x64) ? 0xFF : (v92 * 0xFF) / 0x64)); gameOverCtx->state = GAMEOVER_DEATH_WAIT_GROUND; break; @@ -120,8 +120,8 @@ void GameOver_Update(PlayState* play) { v91 = VREG(91); v92 = VREG(92); - func_800AA000(0.0f, ((v90 > 0x64) ? 0xFF : (v90 * 0xFF) / 0x64), (CLAMP_MAX(v91 * 3, 0xFF)), - ((v92 > 0x64) ? 0xFF : (v92 * 0xFF) / 0x64)); + Rumble_Request(0.0f, ((v90 > 0x64) ? 0xFF : (v90 * 0xFF) / 0x64), (CLAMP_MAX(v91 * 3, 0xFF)), + ((v92 > 0x64) ? 0xFF : (v92 * 0xFF) / 0x64)); break; case GAMEOVER_REVIVE_WAIT_GROUND: diff --git a/soh/src/code/z_horse.c b/soh/src/code/z_horse.c index 2accaa9ac5..a8f9f39696 100644 --- a/soh/src/code/z_horse.c +++ b/soh/src/code/z_horse.c @@ -59,7 +59,7 @@ void Horse_SetupInGameplay(PlayState* play, Player* player) { assert(player->rideActor != NULL); Actor_MountHorse(play, player, player->rideActor); - func_8002DE74(play, player); + Actor_RequestHorseCameraSetting(play, player); gSaveContext.horseData.scene = play->sceneNum; if (play->sceneNum == SCENE_GERUDOS_FORTRESS) { @@ -166,7 +166,7 @@ void Horse_SetupInCutscene(PlayState* play, Player* player) { assert(player->rideActor != NULL); Actor_MountHorse(play, player, player->rideActor); - func_8002DE74(play, player); + Actor_RequestHorseCameraSetting(play, player); gSaveContext.horseData.scene = play->sceneNum; } else if ((play->sceneNum == SCENE_LON_LON_RANCH) && ((gSaveContext.eventInf[0] & 0xF) == 6) && (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) == 0) && (DREG(1) == 0)) { @@ -175,7 +175,7 @@ void Horse_SetupInCutscene(PlayState* play, Player* player) { assert(player->rideActor != NULL); Actor_MountHorse(play, player, player->rideActor); - func_8002DE74(play, player); + Actor_RequestHorseCameraSetting(play, player); gSaveContext.horseData.scene = play->sceneNum; if (play->sceneNum == SCENE_GERUDOS_FORTRESS) { @@ -209,7 +209,7 @@ void Horse_SetupInCutscene(PlayState* play, Player* player) { assert(player->rideActor != NULL); Actor_MountHorse(play, player, player->rideActor); - func_8002DE74(play, player); + Actor_RequestHorseCameraSetting(play, player); } else if ((D_8011F9B8[i].type == 5) || (D_8011F9B8[i].type == 6) || (D_8011F9B8[i].type == 8)) { Vec3f sp54; s32 temp = 0; @@ -230,7 +230,7 @@ void Horse_SetupInCutscene(PlayState* play, Player* player) { player->actor.shape.rot.y = D_8011F9B8[i].angle; Actor_MountHorse(play, player, player->rideActor); - func_8002DE74(play, player); + Actor_RequestHorseCameraSetting(play, player); sp54.x = player->actor.world.pos.x - 200.0f; sp54.y = player->actor.world.pos.y + 100.0f; diff --git a/soh/src/code/z_kankyo.c b/soh/src/code/z_kankyo.c index 91aac96238..f978c83551 100644 --- a/soh/src/code/z_kankyo.c +++ b/soh/src/code/z_kankyo.c @@ -2011,11 +2011,11 @@ void Environment_PlaySceneSequence(PlayState* play) { osSyncPrintf("\n\n\nBGM設定game_play->sound_info.BGM=[%d] old_bgm=[%d]\n\n", play->sequenceCtx.seqId, ((void)0, gSaveContext.seqId)); if (((void)0, gSaveContext.seqId) != play->sequenceCtx.seqId) { - func_800F5550(play->sequenceCtx.seqId); + Audio_PlaySceneSequence(play->sequenceCtx.seqId); } } else if (((void)0, gSaveContext.dayTime) > 0x4AAA && ((void)0, gSaveContext.dayTime) < 0xB71D) { if (((void)0, gSaveContext.seqId) != play->sequenceCtx.seqId) { - func_800F5550(play->sequenceCtx.seqId); + Audio_PlaySceneSequence(play->sequenceCtx.seqId); } play->envCtx.unk_E0 = 1; @@ -2050,7 +2050,7 @@ void func_80075B44(PlayState* play) { CHANNEL_IO_PORT_1, 0); if (play->envCtx.unk_EE[0] == 0 && play->envCtx.unk_F2[0] == 0) { osSyncPrintf("\n\n\nNa_StartMorinigBgm\n\n"); - func_800F5510(play->sequenceCtx.seqId); + Audio_PlayMorningSceneSequence(play->sequenceCtx.seqId); } play->envCtx.unk_E0++; break; diff --git a/soh/src/code/z_lights.c b/soh/src/code/z_lights.c index 96fa863058..8a0fa68fd0 100644 --- a/soh/src/code/z_lights.c +++ b/soh/src/code/z_lights.c @@ -345,7 +345,7 @@ void Lights_GlowCheckPrepare(PlayState* play) { pos.x = params->x; pos.y = params->y; pos.z = params->z; - func_8002BE04(play, &pos, &multDest, &wDest); + Actor_ProjectPos(play, &pos, &multDest, &wDest); wX = multDest.x * wDest; wY = multDest.y * wDest; @@ -385,7 +385,7 @@ void Lights_GlowCheck(PlayState* play) { pos.x = params->x; pos.y = params->y; pos.z = params->z; - func_8002BE04(play, &pos, &multDest, &wDest); + Actor_ProjectPos(play, &pos, &multDest, &wDest); params->drawGlow = false; wX = multDest.x * wDest; wY = multDest.y * wDest; diff --git a/soh/src/code/z_onepointdemo.c b/soh/src/code/z_onepointdemo.c index c3c2c2e765..8c0f4fd801 100644 --- a/soh/src/code/z_onepointdemo.c +++ b/soh/src/code/z_onepointdemo.c @@ -516,7 +516,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor Play_CameraSetAtEye(play, camIdx, &spC0, &spB4); csCam->roll = 0x50; csCam->fov = 55.0f; - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); break; case 3170: Actor_GetWorld(&spA0, actor); @@ -532,7 +532,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor Play_CopyCamera(play, MAIN_CAM, camIdx); csCam->roll = -1; csCam->fov = 55.0f; - func_8002DF38(play, actor, 1); + Player_SetCsAction(play, actor, 1); break; case 3160: Actor_GetWorld(&spA0, actor); @@ -545,7 +545,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor Play_CameraSetAtEye(play, camIdx, &spC0, &spB4); csCam->roll = 0; csCam->fov = 55.0f; - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); break; case 3180: Actor_GetWorldPosShapeRot(&spA0, actor); @@ -559,12 +559,12 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor Play_CameraSetAtEye(play, camIdx, &spC0, &spB4); csCam->roll = 0; csCam->fov = 60.0f; - func_8002DF38(play, actor, 1); + Player_SetCsAction(play, actor, 1); break; case 3190: Play_CameraChangeSetting(play, camIdx, CAM_SET_FOREST_DEFEAT_POE); Camera_ChangeMode(mainCam, CAM_MODE_NORMAL); - func_8002DF38(play, actor, 0xC); + Player_SetCsAction(play, actor, 0xC); break; case 3230: spC0.x = 120.0f; @@ -577,7 +577,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor Play_CameraSetAtEye(play, camIdx, &spC0, &spB4); csCam->roll = 0x1E; csCam->fov = 75.0f; - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); Actor_GetWorldPosShapeRot(&spA0, actor); Actor_GetFocus(&sp8C, &player->actor); spC0.x = sp8C.pos.x; @@ -606,7 +606,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor Play_CameraSetAtEye(play, camIdx, &spC0, &spB4); csCam->roll = 0; csCam->fov = 45.0f; - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); break; case 3220: Actor_GetFocus(&spA0, actor); @@ -650,7 +650,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor break; case 3400: Play_CameraChangeSetting(play, camIdx, CAM_SET_CS_3); - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); OnePointCutscene_SetCsCamPoints(csCam, D_8012069C | 0x2000, D_80120698, D_801204D4, D_801205B4); OnePointCutscene_Vec3sToVec3f(&mainCam->eye, &D_801205B4[D_80120694 - 2].pos); OnePointCutscene_Vec3sToVec3f(&mainCam->at, &D_801204D4[D_80120694 - 2].pos); @@ -716,7 +716,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor csInfo->keyFrames = D_8012205C; csInfo->keyFrameCnt = 3; - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); func_800C0808(play, camIdx, player, CAM_SET_CS_C); break; case 3350: @@ -742,7 +742,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor csInfo->keyFrames = D_8012219C; csInfo->keyFrameCnt = 7; - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); func_800C0808(play, camIdx, player, CAM_SET_CS_C); break; case 3410: @@ -761,7 +761,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor csInfo->keyFrames = D_8012237C; csInfo->keyFrameCnt = 2; - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); func_800C0808(play, camIdx, player, CAM_SET_CS_C); i = Quake_Add(csCam, 1); @@ -807,7 +807,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor csInfo->keyFrames = D_8012269C; csInfo->keyFrameCnt = 3; - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); func_800C0808(play, camIdx, player, CAM_SET_CS_C); break; case 4120: @@ -853,7 +853,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor csInfo->keyFrames = D_80122A5C; csInfo->keyFrameCnt = 8; - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); Camera_ChangeMode(mainCam, CAM_MODE_NORMAL); func_800C0808(play, camIdx, player, CAM_SET_CS_C); break; @@ -861,7 +861,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor csInfo->keyFrames = D_80122B9C; csInfo->keyFrameCnt = 3; - func_8002DF38(play, &player->actor, 8); + Player_SetCsAction(play, &player->actor, 8); Camera_ChangeMode(mainCam, CAM_MODE_NORMAL); func_800C0808(play, camIdx, player, CAM_SET_CS_C); break; @@ -884,7 +884,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 camIdx, s16 csId, Actor* actor func_800C0808(play, camIdx, player, CAM_SET_CS_C); if (GameInteractor_Should(VB_LINK_SPIN_WITH_GORON_POT, true)) { - func_8002DF38(play, &player->actor, 1); + Player_SetCsAction(play, &player->actor, 1); } i = Quake_Add(csCam, 3); diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 9a63d8de5d..cae9cbec1f 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -3633,7 +3633,7 @@ void Interface_DrawEnemyHealthBar(TargetContext* targetCtx, PlayState* play) { if (anchorType == ENEMYHEALTH_ANCHOR_ACTOR) { // Get actor projected position - func_8002BE04(play, &targetCtx->targetCenterPos, &projTargetCenter, &projTargetCappedInvW); + Actor_ProjectPos(play, &targetCtx->targetCenterPos, &projTargetCenter, &projTargetCappedInvW); projTargetCenter.x = (SCREEN_WIDTH / 2) * (projTargetCenter.x * projTargetCappedInvW); projTargetCenter.x = projTargetCenter.x * (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0) ? -1 : 1); @@ -5395,7 +5395,7 @@ void Interface_Draw(PlayState* play) { gSPMatrix(OVERLAY_DISP++, interfaceCtx->view.projectionFlippedPtr, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } - func_8002C124(&play->actorCtx.targetCtx, play); // Draw Z-Target + Attention_Draw(&play->actorCtx.targetCtx, play); // Draw Z-Target if (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)) { gSPMatrix(OVERLAY_DISP++, interfaceCtx->view.projectionPtr, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index e4d707918c..3a9bdb9dd0 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -579,7 +579,7 @@ void Play_Init(GameState* thisx) { gItemAgeReqs[ITEM_ROCS_FEATHER] = AGE_REQ_NONE; gSlotAgeReqs[SLOT_NAYRUS_LOVE] = AGE_REQ_NONE; - func_800304DC(play, &play->actorCtx, play->linkActorEntry); + Actor_InitContext(play, &play->actorCtx, play->linkActorEntry); while (!func_800973FC(play, &play->roomCtx)) { ; // Empty Loop @@ -620,7 +620,7 @@ void Play_Init(GameState* thisx) { Environment_PlaySceneSequence(play); gSaveContext.seqId = play->sequenceCtx.seqId; gSaveContext.natureAmbienceId = play->sequenceCtx.natureAmbienceId; - func_8002DF18(play, GET_PLAYER(play)); + Actor_InitPlayerHorse(play, GET_PLAYER(play)); AnimationContext_Update(play, &play->animationCtx); gSaveContext.respawnFlag = 0; @@ -1546,7 +1546,7 @@ void Play_Draw(PlayState* play) { } if ((HREG(80) != 10) || (HREG(85) != 0)) { - func_800315AC(play, &play->actorCtx); + Actor_DrawAll(play, &play->actorCtx); } if ((HREG(80) != 10) || (HREG(86) != 0)) { diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index b02a591c28..b6d84d9546 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -1237,7 +1237,7 @@ void func_8008F87C(PlayState* play, Player* this, SkelAnime* skelAnime, Vec3f* p skelAnime->jointTable[shinLimbIndex].z = skelAnime->jointTable[shinLimbIndex].z + temp1; skelAnime->jointTable[footLimbIndex].z = skelAnime->jointTable[footLimbIndex].z + temp2 - temp1; - temp3 = func_80041D4C(&play->colCtx, sp88, sp84); + temp3 = SurfaceType_GetFloorType(&play->colCtx, sp88, sp84); if ((temp3 >= 2) && (temp3 < 4) && !SurfaceType_IsWallDamage(&play->colCtx, sp88, sp84)) { footprintPos.y = sp80; diff --git a/soh/src/code/z_scene.c b/soh/src/code/z_scene.c index c138bd4cf5..f488abe5ae 100644 --- a/soh/src/code/z_scene.c +++ b/soh/src/code/z_scene.c @@ -286,7 +286,7 @@ void Scene_CommandObjectList(PlayState* play, SceneCmd* cmd) { status2++; } play->objectCtx.num = i; - func_80031A28(play, &play->actorCtx); + Actor_KillAllWithMissingObject(play, &play->actorCtx); continue; } diff --git a/soh/src/code/z_sram.c b/soh/src/code/z_sram.c index 7abc221a4a..6c00149c67 100644 --- a/soh/src/code/z_sram.c +++ b/soh/src/code/z_sram.c @@ -276,5 +276,5 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx) { void Sram_InitSram(GameState* gameState) { Save_Init(); - func_800F6700(gSaveContext.audioSetting); + Audio_SetSoundOutputMode(gSaveContext.audioSetting); } diff --git a/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 5bf52d5780..9da41ef790 100644 --- a/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -169,7 +169,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) { return; } - func_8002F8F0(&player->actor, NA_SE_IT_HOOKSHOT_CHAIN - SFX_FLAG); + Actor_PlaySfx_Flagged2(&player->actor, NA_SE_IT_HOOKSHOT_CHAIN - SFX_FLAG); ArmsHook_CheckForCancel(this); if ((this->timer != 0) && (this->collider.base.atFlags & AT_HIT) && diff --git a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 9f3efde512..5073669500 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -75,7 +75,7 @@ void ArrowFire_Charge(ArrowFire* this, PlayState* play) { this->actor.world.pos = arrow->actor.world.pos; this->actor.shape.rot = arrow->actor.shape.rot; - func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_FIRE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_ARROW_CHARGE_FIRE - SFX_FLAG); // if arrow has no parent, player has fired the arrow if (arrow->actor.parent == NULL) { diff --git a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 53f8107a16..42fe9d3d9d 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -76,7 +76,7 @@ void ArrowIce_Charge(ArrowIce* this, PlayState* play) { this->actor.world.pos = arrow->actor.world.pos; this->actor.shape.rot = arrow->actor.shape.rot; - func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_ICE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_ARROW_CHARGE_ICE - SFX_FLAG); // if arrow has no parent, player has fired the arrow if (arrow->actor.parent == NULL) { diff --git a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index ee2cfc9534..406aebc1dc 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -75,7 +75,7 @@ void ArrowLight_Charge(ArrowLight* this, PlayState* play) { this->actor.world.pos = arrow->actor.world.pos; this->actor.shape.rot = arrow->actor.shape.rot; - func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_LIGHT - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_ARROW_CHARGE_LIGHT - SFX_FLAG); // if arrow has no parent, player has fired the arrow if (arrow->actor.parent == NULL) { diff --git a/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index d6f8250059..8ce584e093 100644 --- a/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/soh/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -183,7 +183,7 @@ void BgBdanObjects_OctoPlatform_WaitForRutoToStartCutscene(BgBdanObjects* this, player->actor.world.pos.x = -1130.0f; player->actor.world.pos.y = -1025.0f; player->actor.world.pos.z = -3300.0f; - func_800AA000(0.0f, 0xFF, 0x14, 0x96); + Rumble_Request(0.0f, 0xFF, 0x14, 0x96); } } else if (this->timer != 0) { if (this->timer != 0) { @@ -208,16 +208,16 @@ void BgBdanObjects_OctoPlatform_RaiseToUpperPosition(BgBdanObjects* this, PlaySt this->actionFunc = BgBdanObjects_OctoPlatform_WaitForRutoToAdvanceCutscene; this->timer = 30; BgBdanObjects_SetContactRu1(this, 2); - func_800AA000(0.0f, 0xFF, 0x14, 0x96); + Rumble_Request(0.0f, 0xFF, 0x14, 0x96); } else { if (this->timer != 0) { this->timer--; } if (this->timer == 0) { - func_800AA000(0.0f, 0x78, 0x14, 0xA); + Rumble_Request(0.0f, 0x78, 0x14, 0xA); this->timer = 11; } - func_8002F974(&this->dyna.actor, NA_SE_EV_BUYOSTAND_RISING - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_BUYOSTAND_RISING - SFX_FLAG); } } @@ -262,14 +262,14 @@ void BgBdanObjects_OctoPlatform_DescendWithBigOcto(BgBdanObjects* this, PlayStat player->actor.world.pos.z = -3500.0f; player->actor.shape.rot.y = 0x7530; player->actor.world.rot.y = player->actor.shape.rot.y; - func_800AA000(0.0f, 0xFF, 0x1E, 0x96); + Rumble_Request(0.0f, 0xFF, 0x1E, 0x96); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_BUYOSTAND_FALL - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_BUYOSTAND_FALL - SFX_FLAG); if (this->timer != 0) { this->timer--; } if (this->timer == 0) { - func_800AA000(0.0f, 0x78, 0x14, 0xA); + Rumble_Request(0.0f, 0x78, 0x14, 0xA); this->timer = 11; } if (this->dyna.actor.child != NULL) { @@ -340,7 +340,7 @@ void BgBdanObjects_RaiseToUpperPosition(BgBdanObjects* this, PlayState* play) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BUYOSTAND_STOP_A); this->actionFunc = BgBdanObjects_DoNothing; } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_BUYOSTAND_RISING - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_BUYOSTAND_RISING - SFX_FLAG); } } @@ -390,12 +390,12 @@ void BgBdanObjects_ChangeWaterBoxLevel(BgBdanObjects* this, PlayState* play) { Flags_UnsetSwitch(play, this->switchFlag); this->actionFunc = BgBdanObjects_WaitForSwitch; } - func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } else { if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 75.0f, 0.5f)) { this->actionFunc = BgBdanObjects_WaitForTimerExpired; } - func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } play->colCtx.colHeader->waterBoxes[7].ySurface = this->dyna.actor.world.pos.y; } @@ -404,7 +404,7 @@ void BgBdanObjects_WaitForTimerExpired(BgBdanObjects* this, PlayState* play) { if (this->timer != 0) { this->timer--; } - func_8002F994(&this->dyna.actor, this->timer); + Actor_PlaySfx_FlaggedTimer(&this->dyna.actor, this->timer); if (this->timer == 0) { this->actionFunc = BgBdanObjects_ChangeWaterBoxLevel; } @@ -432,7 +432,7 @@ void BgBdanObjects_FallToLowerPos(BgBdanObjects* this, PlayState* play) { this->actionFunc = BgBdanObjects_DoNothing; Play_CopyCamera(play, MAIN_CAM, SUBCAM_ACTIVE); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_BUYOSTAND_FALL - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_BUYOSTAND_FALL - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index d2a5c3b701..04fe1d7e32 100644 --- a/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/soh/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -278,7 +278,7 @@ void func_8086D694(BgBdanSwitch* this, PlayState* play) { if (this->unk_1C8 <= 0.1f) { func_8086D730(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_FOOT_SWITCH); - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 0x78, 0x14, 0xA); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 0x78, 0x14, 0xA); } } } @@ -341,7 +341,7 @@ void func_8086D8CC(BgBdanSwitch* this, PlayState* play) { if (this->unk_1C8 <= 0.6f) { func_8086D9F8(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_FOOT_SWITCH); - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 0x78, 0x14, 0xA); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 0x78, 0x14, 0xA); } } @@ -356,7 +356,7 @@ void func_8086D95C(BgBdanSwitch* this, PlayState* play) { if (this->unk_1C8 <= 0.1f) { func_8086DB24(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_FOOT_SWITCH); - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 0x78, 0x14, 0xA); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 0x78, 0x14, 0xA); } } } diff --git a/soh/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/soh/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index f27caa9331..38c3ab7aa6 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/soh/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -147,7 +147,7 @@ void BgDdanJd_MoveEffects(BgDdanJd* this, PlayState* play) { func_80033480(play, &dustPos, 5.0f, 1, 20, 60, 1); } if (this->ySpeed == SHORTCUT_Y_SPEED) { - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 307df9df4e..bb9117ea06 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -130,7 +130,7 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, PlayState* play) { f32 effectStrength; Math_SmoothStepToF(&this->dyna.actor.speedXZ, 4.0f, 0.5f, 0.025f, 0.0f); - func_800AA000(500.0f, 0x78, 0x14, 0xA); + Rumble_Request(500.0f, 0x78, 0x14, 0xA); if (Math_SmoothStepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y - 200.0f - 20.0f, 0.075f, this->dyna.actor.speedXZ, 0.0075f) == 0.0f) { diff --git a/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index ecd684ac63..33cb38fa1e 100644 --- a/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -246,7 +246,7 @@ void BgDodoago_OpenJaw(BgDodoago* this, PlayState* play) { BgDodoago_SpawnSparkles(&pos, play); Math_StepToS(&this->state, 100, 3); - func_800AA000(500.0f, 0x78, 0x14, 0xA); + Rumble_Request(500.0f, 0x78, 0x14, 0xA); if (Math_SmoothStepToS(&this->dyna.actor.shape.rot.x, 0x1333, 110 - this->state, 0x3E8, 0x32) == 0) { BgDodoago_SetupAction(this, BgDodoago_DoNothing); diff --git a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index d521ad680e..1e90b0803d 100644 --- a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -870,7 +870,7 @@ void BgDyYoseizo_Update(Actor* thisx, PlayState* play2) { this->heightOffset = this->scale * 7500.0f; Actor_SetFocus(&this->actor, this->heightOffset); this->actor.focus.pos.y = this->heightOffset; - func_80038290(play, &this->actor, &this->headRot, &this->torsoRot, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->torsoRot, this->actor.focus.pos); BgDyYoseizo_ParticleUpdate(this, play); Actor_SetScale(&this->actor, this->scale); } diff --git a/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 8c8dc2fe94..c82d159f49 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -214,7 +214,7 @@ void BgGanonOtyuka_Fall(BgGanonOtyuka* this, PlayState* play) { (s16)Rand_ZeroFloat(100.0f) + 250, 5, (s16)Rand_ZeroFloat(5.0f) + 15); } - func_80033DB8(play, 10, 15); + Actor_RequestQuake(play, 10, 15); SoundSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_BOX_BREAK); } Actor_Kill(&this->dyna.actor); diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index 00f61c7fc3..52d861faf8 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -151,7 +151,7 @@ void BgGndDarkmeiro_UpdateBlockTimer(BgGndDarkmeiro* this, PlayState* play) { timeLeft = CLAMP_MIN(this->timer1, this->timer2); if (timeLeft > 0) { - func_8002F994(&this->dyna.actor, timeLeft); + Actor_PlaySfx_FlaggedTimer(&this->dyna.actor, timeLeft); } if ((this->timer1 >= 64) || (this->timer2 >= 64)) { Flags_SetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F); diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index c571b3548a..81cb07d23f 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -71,7 +71,7 @@ void BgGndFiremeiro_Sink(BgGndFiremeiro* this, PlayState* play) { this->dyna.actor.world.pos.y = sunkHeight; } - func_8002F948(&this->dyna.actor, NA_SE_EV_ROLL_STAND_2 - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_ROLL_STAND_2 - SFX_FLAG); } if (this->timer > 0) { diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index 7e90818edd..f0889cab3d 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -341,7 +341,7 @@ void BgGndIceblock_Slide(BgGndIceblock* this, PlayState* play) { pos.x = thisx->world.pos.x - (60.0f * Math_SinS(this->dyna.unk_158)) + (Math_CosS(this->dyna.unk_158) * spread); pos.z = thisx->world.pos.z - (60.0f * Math_CosS(this->dyna.unk_158)) - (Math_SinS(this->dyna.unk_158) * spread); func_8002829C(play, &pos, &velocity, &sZeroVec, &sWhite, &sGray, 250, Rand_S16Offset(40, 15)); - func_8002F974(thisx, NA_SE_PL_SLIP_ICE_LEVEL - SFX_FLAG); + Actor_PlaySfx_Flagged(thisx, NA_SE_PL_SLIP_ICE_LEVEL - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index 8f86e0cb99..5e2137a2d9 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -139,7 +139,7 @@ void BgHaka_Pull(BgHaka* this, PlayState* play) { this->actionFunc = BgHaka_IdleOpened; } - func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); } void BgHaka_IdleOpened(BgHaka* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 748beac149..a96ba67442 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -217,7 +217,7 @@ void BgHakaGate_StatueTurn(BgHakaGate* this, PlayState* play) { this->actionFunc = BgHakaGate_StatueIdle; this->dyna.unk_150 = 0.0f; } - func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); } void BgHakaGate_FloorClosed(BgHakaGate* this, PlayState* play) { @@ -279,7 +279,7 @@ void BgHakaGate_GateOpen(BgHakaGate* this, PlayState* play) { this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = BgHakaGate_DoNothing; } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/soh/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 348c604f8c..0091423b92 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -153,7 +153,7 @@ void BgHakaMeganeBG_ElevatorPlatform_Drop(BgHakaMeganeBG* this, PlayState* play) if (!Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y - 640.0f, this->dyna.actor.velocity.y)) { - func_8002F974(&this->dyna.actor, NA_SE_EV_CHINETRAP_DOWN - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_CHINETRAP_DOWN - SFX_FLAG); } if (this->timer == 0) { @@ -165,7 +165,7 @@ void BgHakaMeganeBG_ElevatorPlatform_Drop(BgHakaMeganeBG* this, PlayState* play) void BgHakaMeganeBG_ElevatorPlatform_Raise(BgHakaMeganeBG* this, PlayState* play) { Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, 16.0f / 3.0f); - func_8002F974(&this->dyna.actor, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG); if (this->timer != 0) { this->timer--; @@ -179,7 +179,7 @@ void BgHakaMeganeBG_ElevatorPlatform_Raise(BgHakaMeganeBG* this, PlayState* play void BgHakaMeganeBG_RotatingPlatform_Spin(BgHakaMeganeBG* this, PlayState* play) { this->dyna.actor.shape.rot.y += 0x180; - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); } void BgHakaMeganeBG_Gate_WaitForSwitchFlag(BgHakaMeganeBG* this, PlayState* play) { @@ -196,7 +196,7 @@ void BgHakaMeganeBG_Gate_Open(BgHakaMeganeBG* this, PlayState* play) { Actor_SetFocus(&this->dyna.actor, 50.0f); this->actionFunc = BgHakaMeganeBG_DoNothing; } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_OPEN); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALDOOR_OPEN); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/soh/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index dc77df64d0..f9ba20d759 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -283,7 +283,7 @@ void BgHakaSgami_Spin(BgHakaSgami* this, PlayState* play) { CollisionCheck_SetAT(play, &play->colChkCtx, &this->colliderScythe.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->colliderScytheCenter.base); - func_8002F974(&this->actor, NA_SE_EV_ROLLCUTTER_MOTOR - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_ROLLCUTTER_MOTOR - SFX_FLAG); } void BgHakaSgami_Update(Actor* thisx, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index e595b8e627..b11cc0a9ea 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -167,7 +167,7 @@ void BgHakaShip_CrashShake(BgHakaShip* this, PlayState* play) { this->dyna.actor.gravity = -1.0f; this->actionFunc = BgHakaShip_CrashFall; } - func_8002F974(&this->dyna.actor, NA_SE_EV_BLOCKSINK - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_BLOCKSINK - SFX_FLAG); } void BgHakaShip_CrashFall(BgHakaShip* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 5cbf881b05..4364f713d7 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -234,7 +234,7 @@ void BgHakaTrap_SpikedWall_CloseIn(BgHakaTrap* this, PlayState* play) { if ((D_80880F30 == 0) && (!Player_InCsMode(play))) { if (!Math_StepToF(&this->dyna.actor.world.pos.x, this->dyna.actor.home.pos.x, 0.5f)) { - func_8002F974(&this->dyna.actor, NA_SE_EV_TRAP_OBJ_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_TRAP_OBJ_SLIDE - SFX_FLAG); } else if (this->dyna.actor.params == HAKA_TRAP_SPIKED_WALL) { D_80881018 |= 1; } else if (this->dyna.actor.params == HAKA_TRAP_SPIKED_WALL_2) { @@ -264,7 +264,7 @@ void BgHakaTrap_SpikedWall_Burn(BgHakaTrap* this, PlayState* play) { this->timer--; } - func_8002F974(&this->dyna.actor, NA_SE_EV_BURN_OUT - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_BURN_OUT - SFX_FLAG); for (i = 0; i < 2; i++) { f32 rand = Rand_ZeroOne(); @@ -387,7 +387,7 @@ void BgHakaTrap_SpikedCrusher_Fall(BgHakaTrap* this, PlayState* play) { } if (this->dyna.actor.velocity.y >= 0.01f) { - func_8002F974(&this->dyna.actor, NA_SE_EV_CHINETRAP_DOWN - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_CHINETRAP_DOWN - SFX_FLAG); } if (this->timer == 0) { @@ -458,7 +458,7 @@ void BgHakaTrap_FireBarrier_Idle(BgHakaTrap* this, PlayState* play) { this->dyna.actor.shape.rot.z += this->dyna.actor.world.rot.z; if (this->dyna.actor.world.rot.z >= 0x1801) { - func_8002F974(&this->dyna.actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); } BgHakaTrap_FanBlade_UpdateFanRotation(this, play, this->dyna.actor.world.rot.z); @@ -469,7 +469,7 @@ void BgHakaTrap_FireBarrier_UpdateLayout(BgHakaTrap* this, PlayState* play) { this->timer--; } - func_8002F974(&this->dyna.actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); if (this->timer == 0) { this->timer = 1; diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 43beaa506e..697b283dd3 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -116,7 +116,7 @@ void BgHakaTubo_Idle(BgHakaTubo* this, PlayState* play) { // Colliding with flame circle if (this->flamesCollider.base.atFlags & AT_HIT) { this->flamesCollider.base.atFlags &= ~AT_HIT; - func_8002F71C(play, &this->dyna.actor, 5.0f, this->dyna.actor.yawTowardsPlayer, 5.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->dyna.actor, 5.0f, this->dyna.actor.yawTowardsPlayer, 5.0f); } // Colliding with hitbox inside the pot if (this->potCollider.base.acFlags & AC_HIT) { diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index f84b323314..fd07391526 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -86,9 +86,9 @@ void BgHakaWater_ChangeWaterLevel(BgHakaWater* this, PlayState* play) { } if (this->actor.home.pos.y < this->actor.world.pos.y) { - func_8002F948(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } else { - func_8002F948(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } if (Math_StepToF(&this->actor.world.pos.y, this->actor.home.pos.y, 0.5f) != 0) { diff --git a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 8156fdae9f..df1c585978 100644 --- a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -192,7 +192,7 @@ void BgHeavyBlock_MovePiece(BgHeavyBlock* this, PlayState* play) { thisx->velocity.z = Rand_CenteredFloat(8.0f); BgHeavyBlock_SetPieceRandRot(this, 1.0f); Audio_PlayActorSound2(thisx, NA_SE_EV_ROCK_BROKEN); - func_800AA000(thisx->xzDistToPlayer, 0x96, 0xA, 8); + Rumble_Request(thisx->xzDistToPlayer, 0x96, 0xA, 8); } } @@ -351,7 +351,7 @@ void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, PlayState* play) { f32 xOffset; if (this->timer == 11) { - func_800AA000(0.0f, 0xFF, 0x14, 0x14); + Rumble_Request(0.0f, 0xFF, 0x14, 0x14); Player_PlaySfx(&player->actor, NA_SE_PL_PULL_UP_BIGROCK); LOG_STRING("NA_SE_PL_PULL_UP_BIGROCK"); } @@ -395,7 +395,7 @@ void BgHeavyBlock_Fly(BgHeavyBlock* this, PlayState* play) { this->dyna.actor.floorHeight = raycastResult; if (this->dyna.actor.home.pos.y <= raycastResult) { - func_800AA000(0.0f, 0xFF, 0x3C, 4); + Rumble_Request(0.0f, 0xFF, 0x3C, 4); switch (this->dyna.actor.params & 0xFF) { case HEAVYBLOCK_BREAKABLE: diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 0c6b7a204c..20992aef72 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -200,7 +200,7 @@ void BgHidanCurtain_WaitForTimer(BgHidanCurtain* this, PlayState* play) { this->actionFunc = BgHidanCurtain_TurnOn; } if ((this->type == 1) || (this->type == 3)) { - func_8002F994(&this->actor, this->timer); + Actor_PlaySfx_FlaggedTimer(&this->actor, this->timer); } } @@ -216,7 +216,7 @@ void BgHidanCurtain_Update(Actor* thisx, PlayState* play2) { } else { if (this->collider.base.atFlags & AT_HIT) { this->collider.base.atFlags &= ~AT_HIT; - func_8002F71C(play, &this->actor, 5.0f, this->actor.yawTowardsPlayer, 1.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 5.0f, this->actor.yawTowardsPlayer, 1.0f); } if ((this->type == 4) || (this->type == 5)) { this->actor.world.pos.y = (2.0f * this->actor.home.pos.y) - hcParams->riseDist - this->actor.world.pos.y; @@ -234,7 +234,7 @@ void BgHidanCurtain_Update(Actor* thisx, PlayState* play2) { CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); if (gSaveContext.sceneSetupIndex <= 3) { - func_8002F974(&this->actor, NA_SE_EV_FIRE_PILLAR_S - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FIRE_PILLAR_S - SFX_FLAG); } } else if ((this->type == 1) && Flags_GetTreasure(play, this->treasureFlag)) { Actor_Kill(&this->actor); diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index 185bb3d2ac..7d9135d52b 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -134,7 +134,7 @@ void BgHidanFirewall_Collide(BgHidanFirewall* this, PlayState* play) { phi_a3 = this->actor.shape.rot.y + 0x8000; } - func_8002F71C(play, &this->actor, 5.0f, phi_a3, 1.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 5.0f, phi_a3, 1.0f); } void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, PlayState* play) { @@ -190,7 +190,7 @@ void BgHidanFirewall_Update(Actor* thisx, PlayState* play) { BgHidanFirewall_ColliderFollowPlayer(this, play); CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); - func_8002F974(&this->actor, NA_SE_EV_FIRE_PLATE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FIRE_PLATE - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index 160f60ebe0..2d3aeac5f6 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -103,7 +103,7 @@ void BgHidanFslift_Descend(BgHidanFslift* this, PlayState* play) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); BgHidanFslift_SetupIdle(this); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); } BgHidanFslift_SetHookshotTargetPos(this); } @@ -114,7 +114,7 @@ void BgHidanFslift_Ascend(BgHidanFslift* this, PlayState* play) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); BgHidanFslift_SetupIdle(this); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); } } else { BgHidanFslift_SetupIdle(this); diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 9300f035c2..91454fbdfc 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -173,7 +173,7 @@ void BgHidanFwbig_WaitForTimer(BgHidanFwbig* this, PlayState* play) { if (this->timer == 0) { this->actionFunc = BgHidanFwbig_Rise; } - func_8002F994(&this->actor, this->timer); + Actor_PlaySfx_FlaggedTimer(&this->actor, this->timer); } void BgHidanFwbig_WaitForPlayer(BgHidanFwbig* this, PlayState* play) { @@ -225,7 +225,7 @@ void BgHidanFwbig_Update(Actor* thisx, PlayState* play) { if (this->collider.base.atFlags & AT_HIT) { this->collider.base.atFlags &= ~AT_HIT; - func_8002F71C(play, &this->actor, 5.0f, this->actor.world.rot.y, 1.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 5.0f, this->actor.world.rot.y, 1.0f); if (this->direction != 0) { this->actionFunc = BgHidanFwbig_Lower; } @@ -239,9 +239,9 @@ void BgHidanFwbig_Update(Actor* thisx, PlayState* play) { if ((this->actor.home.pos.y - 200.0f) < this->actor.world.pos.y) { if (gSaveContext.sceneSetupIndex < 4) { - func_8002F974(&this->actor, NA_SE_EV_BURNING - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_BURNING - SFX_FLAG); } else if ((s16)this->actor.world.pos.x == -513) { - func_8002F974(&this->actor, NA_SE_EV_FLAME_OF_FIRE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FLAME_OF_FIRE - SFX_FLAG); } BgHidanFwbig_MoveCollider(this, play); CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index a3e18a0799..20a2338847 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -312,7 +312,7 @@ void func_80888860(BgHidanHamstep* this, PlayState* play) { Quake_SetQuakeValues(quakeIndex, 0, 0, 500, 0); Quake_SetCountdown(quakeIndex, 20); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 255, 20, 150); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 255, 20, 150); func_80888638(this, play); osSyncPrintf("A(%d)\n", this->dyna.actor.params); } @@ -370,7 +370,7 @@ void func_80888A58(BgHidanHamstep* this, PlayState* play) { Quake_SetCountdown(quakeIndex, 7); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); - func_800AA000(10000.0f, 255, 20, 150); + Rumble_Request(10000.0f, 255, 20, 150); func_808884C8(this, play); if ((this->dyna.actor.params & 0xFF) == 5) { diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index e0a1d87c44..af121e4041 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -162,7 +162,7 @@ void func_808894B0(BgHidanHrock* this, PlayState* play) { (Math_CosS(this->dyna.actor.world.rot.y + (this->unk_168 << 0xE)) * 5.0f) + this->dyna.actor.home.pos.z; if (!(this->unk_168 % 4)) { - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 180, 10, 100); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 180, 10, 100); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_SHAKE); } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index a1dbc1158c..e992b1a8b6 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -126,7 +126,7 @@ void func_80889C18(BgHidanKousi* this, PlayState* play) { BgHidanKousi_SetupAction(this, func_80889C90); } Actor_MoveXZGravity(&this->dyna.actor); - func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); } void func_80889C90(BgHidanKousi* this, PlayState* play) { @@ -137,7 +137,7 @@ void func_80889C90(BgHidanKousi* this, PlayState* play) { BgHidanKousi_SetupAction(this, func_80889D28); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_METALDOOR_STOP); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index 00793b6813..21b1866a33 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -161,7 +161,7 @@ void func_8088B268(BgHidanRock* this, PlayState* play) { this->timer = 5 - ((CVarGetInteger(CVAR_ENHANCEMENT("FasterBlockPush"), 0) * 3) / 5); } - func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); } else { player->stateFlags2 &= ~PLAYER_STATE2_MOVING_DYNAPOLY; this->dyna.unk_150 = 0.0f; @@ -237,7 +237,7 @@ void func_8088B69C(BgHidanRock* this, PlayState* play) { } if (!(this->timer % 4)) { - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 0xB4, 0x0A, 0x64); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 0xB4, 0x0A, 0x64); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_SHAKE); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index 9c7fd0857d..0bf703c3e8 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -179,7 +179,7 @@ void BgHidanRsekizou_Update(Actor* thisx, PlayState* play) { } CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); - func_8002F974(&this->dyna.actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); } Gfx* BgHidanRsekizou_DrawFireball(PlayState* play, BgHidanRsekizou* this, s16 frame, MtxF* mf, s32 a, diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index 2f62debff9..e92a2c410f 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -259,7 +259,7 @@ void func_8088D750(BgHidanSekizou* this, PlayState* play) { phi_a3 = -0x4000; } } - func_8002F71C(play, &this->dyna.actor, 5.0f, phi_a3, 1.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->dyna.actor, 5.0f, phi_a3, 1.0f); } void BgHidanSekizou_Update(Actor* thisx, PlayState* play2) { @@ -284,13 +284,13 @@ void BgHidanSekizou_Update(Actor* thisx, PlayState* play2) { if (this->unk_168[0] > 0) { CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); - func_8002F974(&this->dyna.actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); } } else { if ((this->unk_168[0] > 0) || (this->unk_168[1] > 0) || (this->unk_168[2] > 0) || (this->unk_168[3] > 0)) { CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); - func_8002F974(&this->dyna.actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); } } } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index eea4a8a593..9effb70b72 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -145,7 +145,7 @@ void func_8088E5D0(BgHidanSima* this, PlayState* play) { this->dyna.actor.world.pos.z = this->dyna.actor.home.pos.z; } if (!(this->timer % 4)) { - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 180, 10, 100); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 180, 10, 100); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_SHAKE); } } @@ -190,7 +190,7 @@ void func_8088E7A8(BgHidanSima* this, PlayState* play) { this->timer = 20; this->actionFunc = func_8088E760; } - func_8002F974(&this->dyna.actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); } void func_8088E90C(BgHidanSima* this) { diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index 67176037b3..2ddad1ed89 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -75,7 +75,7 @@ void func_8088F514(BgHidanSyoku* this, PlayState* play) { if (this->timer == 0) { func_8088F47C(this); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); } } @@ -87,7 +87,7 @@ void func_8088F5A0(BgHidanSyoku* this, PlayState* play) { if (this->timer == 0) { func_8088F47C(this); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/soh/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index a35af82275..16d92e9b88 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/soh/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -193,7 +193,7 @@ void BgIceObjects_Slide(BgIceObjects* this, PlayState* play) { pos.x = thisx->world.pos.x - (60.0f * Math_SinS(this->dyna.unk_158)) + (Math_CosS(this->dyna.unk_158) * spread); pos.z = thisx->world.pos.z - (60.0f * Math_CosS(this->dyna.unk_158)) - (Math_SinS(this->dyna.unk_158) * spread); func_8002829C(play, &pos, &velocity, &sZeroVec, &sWhite, &sGray, 250, Rand_S16Offset(40, 15)); - func_8002F974(thisx, NA_SE_PL_SLIP_ICE_LEVEL - SFX_FLAG); + Actor_PlaySfx_Flagged(thisx, NA_SE_PL_SLIP_ICE_LEVEL - SFX_FLAG); } BgIceObjects_CheckPits(this, play); } diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/soh/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 8a7e364a88..694c471114 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -163,7 +163,7 @@ void BgJya1flift_Move(BgJya1flift* this, PlayState* play) { BgJya1flift_ResetMoveDelay(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/soh/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index 915c8b7295..0a4ed1e9c3 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -90,7 +90,7 @@ void func_80893438(BgJyaAmishutter* this) { func_808934B0(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_METALDOOR_STOP); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); } } @@ -113,7 +113,7 @@ void func_8089350C(BgJyaAmishutter* this) { BgJyaAmishutter_SetupWaitForPlayer(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_METALDOOR_STOP); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index dc4153ffae..e504b58e9b 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -511,7 +511,7 @@ void func_80896ABC(BgJyaCobra* this, PlayState* play) { } this->dyna.unk_150 = 0.0f; - func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); } void BgJyaCobra_Update(Actor* thisx, PlayState* play2) { diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/soh/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index d19c37f025..17de1c7a47 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -153,7 +153,7 @@ void BgJyaGoroiwa_Move(BgJyaGoroiwa* this, PlayState* play) { thisx->world.rot.y += 0x8000; } - func_8002F6D4(play, thisx, 2.0f, thisx->yawTowardsPlayer, 0.0f, 0); + Actor_SetPlayerKnockbackLarge(play, thisx, 2.0f, thisx->yawTowardsPlayer, 0.0f, 0); Player_PlaySfx(&GET_PLAYER(play)->actor, NA_SE_PL_BODY_HIT); this->yOffsetSpeed = 10.0f; diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 7c24b922e0..c28b4d567c 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -129,7 +129,7 @@ void BgJyaLift_Move(BgJyaLift* this, PlayState* play) { BgJyaLift_SetFinalPosY(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_ELEVATOR_STOP); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index cd30ddeb34..49ef451b36 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -186,7 +186,7 @@ void BgJyaMegami_DetectLight(BgJyaMegami* this, PlayState* play) { if (play->gameplayFrames % 4 == 0) { BgJyaMegami_SetupSpawnEffect(this, play, (this->crumbleIndex * 0.04f) + 0.05f); } - func_8002F974(&this->dyna.actor, NA_SE_EV_FACE_CRUMBLE_SLOW - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_FACE_CRUMBLE_SLOW - SFX_FLAG); } else if (this->lightTimer > 0) { this->lightTimer--; } diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/soh/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index 8743585dd8..7f673c7c66 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -94,13 +94,13 @@ void func_8089B4C8(BgJyaZurerukabe* this, PlayState* play) { case 3: case 5: if (fabsf(D_8089B9C0[D_8089BA30[i]]) > 1.0f) { - func_8002F6D4(play, &this->dyna.actor, 1.5f, this->dyna.actor.shape.rot.y, 0.0f, 0); + Actor_SetPlayerKnockbackLarge(play, &this->dyna.actor, 1.5f, this->dyna.actor.shape.rot.y, 0.0f, 0); } break; case 1: case 4: if (fabsf(D_8089B9C0[D_8089BA30[i]] - D_8089B9C0[D_8089BA30[i + 1]]) > 1.0f) { - func_8002F6D4(play, &this->dyna.actor, 1.5f, this->dyna.actor.shape.rot.y, 0.0f, 0); + Actor_SetPlayerKnockbackLarge(play, &this->dyna.actor, 1.5f, this->dyna.actor.shape.rot.y, 0.0f, 0); } break; } @@ -167,7 +167,7 @@ void func_8089B870(BgJyaZurerukabe* this, PlayState* play) { } D_8089B9C0[this->unk_168] = D_8089BA08[this->unk_168] * this->unk_16E; - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); } void BgJyaZurerukabe_Update(Actor* thisx, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/soh/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index 3052494a58..dce6ccda29 100644 --- a/soh/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/soh/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -52,7 +52,7 @@ void BgMenkuriKaiten_Update(Actor* thisx, PlayState* play) { BgMenkuriKaiten* this = (BgMenkuriKaiten*)thisx; if (!Flags_GetSwitch(play, this->dyna.actor.params) && DynaPolyActor_IsPlayerAbove(&this->dyna)) { - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); this->dyna.actor.shape.rot.y += 0x80; } } diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index 58a79d2b1d..70a7cc0a8c 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -273,9 +273,9 @@ void BgMizuMovebg_UpdateMain(BgMizuMovebg* this, PlayState* play) { } if (this->sfxFlags & 2) { if (this->dyna.actor.room == 0) { - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); } else { - func_8002F948(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); } } } @@ -294,7 +294,7 @@ void BgMizuMovebg_UpdateMain(BgMizuMovebg* this, PlayState* play) { this->sfxFlags |= 2; } if (this->sfxFlags & 2) { - func_8002F948(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); } } break; @@ -350,7 +350,7 @@ void BgMizuMovebg_UpdateHookshotPlatform(BgMizuMovebg* this, PlayState* play) { this->sfxFlags |= 1; } if (this->sfxFlags & 1) { - func_8002F948(&this->dyna.actor, NA_SE_EV_ROLL_STAND_2 - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_ROLL_STAND_2 - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index 19985b2ce9..d437679332 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -129,7 +129,7 @@ void BgMizuShutter_Move(BgMizuShutter* this, PlayState* play) { if ((this->dyna.actor.world.pos.x == this->closedPos.x) && (this->dyna.actor.world.pos.y == this->closedPos.y) && (this->dyna.actor.world.pos.z == this->closedPos.z)) { - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 0x78, 0x14, 0xA); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 0x78, 0x14, 0xA); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND); this->actionFunc = BgMizuShutter_WaitForSwitch; } @@ -141,7 +141,7 @@ void BgMizuShutter_WaitForTimer(BgMizuShutter* this, PlayState* play) { if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, true, this, &this->timer)) { this->timer--; } - func_8002F994(&this->dyna.actor, this->timer); + Actor_PlaySfx_FlaggedTimer(&this->dyna.actor, this->timer); if (this->timer == 0) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_METALDOOR_CLOSE); Flags_UnsetSwitch(play, (u16)this->dyna.actor.params & 0x3F); diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 32aa02562f..6707ad7739 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -281,11 +281,11 @@ void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, PlayState* play) { } if (this->targetY < this->actor.world.pos.y) { - func_800AA000(0.0f, 0x78, 0x14, 0xA); - func_8002F948(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Rumble_Request(0.0f, 0x78, 0x14, 0xA); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } else if (this->targetY > this->actor.world.pos.y) { - func_800AA000(0.0f, 0x78, 0x14, 0xA); - func_8002F948(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Rumble_Request(0.0f, 0x78, 0x14, 0xA); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index e71b251397..aa13499609 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -169,7 +169,7 @@ void BgMoriBigst_Fall(BgMoriBigst* this, PlayState* play) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND); if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) { OnePointCutscene_Init(play, 1020, 8, &this->dyna.actor, MAIN_CAM); - func_8002DF38(play, NULL, 0x3C); + Player_SetCsAction(play, NULL, 0x3C); } } } diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index 5409dff8df..257c2f5707 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -226,7 +226,7 @@ void func_808A3E54(BgMoriHineri* this, PlayState* play) { } if ((sBgMoriHineriNextCamIdx >= SUBCAM_FIRST) && ((GET_ACTIVE_CAM(play)->eye.z - this->dyna.actor.world.pos.z) < 1100.0f)) { - func_8002F948(&this->dyna.actor, NA_SE_EV_FLOOR_ROLLING - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_FLOOR_ROLLING - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 524be20a02..e6ed9e456e 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -157,7 +157,7 @@ void BgMoriRakkatenjo_Fall(BgMoriRakkatenjo* this, PlayState* play) { if (this->bounceCount == 0) { this->fallCount++; Sfx_PlaySfxCentered2(NA_SE_EV_STONE_BOUND); - func_800AA000(SQ(thisx->yDistToPlayer), 0xFF, 0x14, 0x96); + Rumble_Request(SQ(thisx->yDistToPlayer), 0xFF, 0x14, 0x96); } thisx->world.pos.y = 403.0f - (thisx->world.pos.y - 403.0f) * bounceVel[this->bounceCount] / fabsf(thisx->velocity.y); diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index cf07b4f44f..ade4c2a5a8 100644 --- a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -318,7 +318,7 @@ void BgPoEvent_BlockFall(BgPoEvent* this, PlayState* play) { BgPoEvent_CheckBlock(this); } else { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND); - func_80033E88(&this->dyna.actor, play, 5, 5); + Actor_RequestQuakeAndRumble(&this->dyna.actor, play, 5, 5); Interface_SetTimer(this->timer); if (firstFall == 0) { firstFall = 1; @@ -415,7 +415,7 @@ void BgPoEvent_BlockPush(BgPoEvent* this, PlayState* play) { BgPoEvent_CheckBlock(this); BgPoEvent_CheckBlock((BgPoEvent*)this->dyna.actor.parent); } - func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); } void BgPoEvent_BlockReset(BgPoEvent* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index 5e6bc62aab..8907821d65 100644 --- a/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -136,7 +136,7 @@ void BgPoSyokudai_Update(Actor* thisx, PlayState* play) { CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); if (Flags_GetSwitch(play, this->actor.params)) { - func_8002F974(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); } this->flameTextureScroll++; } diff --git a/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 17113859f8..166fff64d1 100644 --- a/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -63,7 +63,7 @@ void BgRelayObjects_Init(Actor* thisx, PlayState* play) { } else { thisx->world.rot.y = 0x80; } - func_800F5718(); + Audio_PlayWindmillBgm(); thisx->room = -1; thisx->flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; if (D_808A9508 & 2) { @@ -137,7 +137,7 @@ void func_808A91AC(BgRelayObjects* this, PlayState* play) { if (GameInteractor_Should(VB_SWITCH_TIMER_TICK, this->timer != 0, this, &this->timer)) { this->timer--; } - func_8002F994(&this->dyna.actor, this->timer); + Actor_PlaySfx_FlaggedTimer(&this->dyna.actor, this->timer); } if ((this->timer == 0) || (this->unk_169 == play->roomCtx.curRoom.num)) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_SLIDE_DOOR_CLOSE); @@ -148,7 +148,7 @@ void func_808A91AC(BgRelayObjects* this, PlayState* play) { void func_808A9234(BgRelayObjects* this, PlayState* play) { this->dyna.actor.velocity.y += this->dyna.actor.gravity; if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y, this->dyna.actor.velocity.y)) { - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 180, 20, 100); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 180, 20, 100); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONE_BOUND); if (this->unk_169 != play->roomCtx.curRoom.num) { Sfx_PlaySfxCentered2(NA_SE_EN_PO_LAUGH); diff --git a/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index a2a6181eab..5edd04caf4 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -187,13 +187,13 @@ void BgSpot00Hanebasi_DrawbridgeRiseAndFall(BgSpot00Hanebasi* this, PlayState* p if (this->actionFunc == BgSpot00Hanebasi_DrawbridgeWait) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BRIDGE_CLOSE_STOP); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG); } } else { if (this->actionFunc == BgSpot00Hanebasi_DrawbridgeWait) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN_STOP); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN - SFX_FLAG); } } } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index d649f7d95b..5da98c7b20 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -186,7 +186,7 @@ void func_808ACB58(BgSpot02Objects* this, PlayState* play) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); this->actionFunc = func_808AC8FC; } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_WALL_MOVE_SP - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_WALL_MOVE_SP - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index eef23e1eae..26be72b9ae 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -267,7 +267,7 @@ void BgSpot06Objects_GateOpen(BgSpot06Objects* this, PlayState* play) { this->timer = 0; Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_METALDOOR_STOP); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG); } } @@ -525,7 +525,7 @@ void BgSpot06Objects_WaterPlaneCutsceneRise(BgSpot06Objects* this, PlayState* pl play->colCtx.colHeader->waterBoxes[LHWB_MAIN_2].ySurface = this->dyna.actor.world.pos.y; } - func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } /** @@ -556,5 +556,5 @@ void BgSpot06Objects_WaterPlaneCutsceneLower(BgSpot06Objects* this, PlayState* p play->colCtx.colHeader->waterBoxes[LHWB_MAIN_2].ySurface = yPos; } - func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/soh/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index be4eee82a2..11b5a04999 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -117,7 +117,7 @@ void func_808B318C(BgSpot12Gate* this, PlayState* play) { Quake_SetCountdown(var, 0xC); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN_STOP); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index 5d73c277f7..1818c583d7 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -107,7 +107,7 @@ void func_808B3604(BgSpot12Saku* this, PlayState* play) { func_808B3714(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BRIDGE_OPEN_STOP); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_METALGATE_OPEN - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index 85cafdbbdc..257b340cdc 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -235,7 +235,7 @@ void BgSpot18Basket_Spinning(BgSpot18Basket* this, PlayState* play) { } } } - func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); } void BgSpot18Basket_SetupExplosionCs(BgSpot18Basket* this) { diff --git a/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 9094e26e44..5e3a77a455 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -260,7 +260,7 @@ void func_808B8F08(BgSpot18Obj* this, PlayState* play) { Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/soh/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index 2ee80beee4..ca5949b348 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -110,7 +110,7 @@ void func_808B9698(BgSpot18Shutter* this, PlayState* play) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); this->actionFunc = func_808B95AC; } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG); } } @@ -126,7 +126,7 @@ void func_808B971C(BgSpot18Shutter* this, PlayState* play) { Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); this->actionFunc = func_808B95AC; } else { - func_8002F974(&this->dyna.actor, NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_STONE_STATUE_OPEN - SFX_FLAG); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index 890b7c1495..9a5c3b3d3c 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -115,12 +115,12 @@ void BgYdanHasi_MoveWater(BgYdanHasi* this, PlayState* play) { Flags_UnsetSwitch(play, this->type); this->actionFunc = BgYdanHasi_InitWater; } - func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } else { if (Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y - 47.0f, 0.5f)) { this->actionFunc = BgYdanHasi_DecWaterTimer; } - func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } waterBox = &play->colCtx.colHeader->waterBoxes[1]; waterBox->ySurface = this->dyna.actor.world.pos.y; @@ -131,7 +131,7 @@ void BgYdanHasi_DecWaterTimer(BgYdanHasi* this, PlayState* play) { this->timer--; } - func_8002F994(&this->dyna.actor, this->timer); + Actor_PlaySfx_FlaggedTimer(&this->dyna.actor, this->timer); if (this->timer == 0) { this->actionFunc = BgYdanHasi_MoveWater; } @@ -157,13 +157,13 @@ void BgYdanHasi_UpdateThreeBlocks(BgYdanHasi* this, PlayState* play) { this->dyna.actor.draw = NULL; this->actionFunc = BgYdanHasi_SetupThreeBlocks; } else { - func_8002F948(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); } } else if (!Math_StepToF(&this->dyna.actor.world.pos.y, this->dyna.actor.home.pos.y + 120.0f, 3.0f)) { - func_8002F948(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE - SFX_FLAG); } else { - func_8002F994(&this->dyna.actor, this->timer); + Actor_PlaySfx_FlaggedTimer(&this->dyna.actor, this->timer); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/soh/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index 23d7fac96c..e4b2ca0a8a 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/soh/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -138,11 +138,11 @@ void BgYdanMaruta_Destroy(Actor* thisx, PlayState* play) { void func_808BEFF4(BgYdanMaruta* this, PlayState* play) { if (this->collider.base.atFlags & AT_HIT) { - func_8002F71C(play, &this->dyna.actor, 7.0f, this->dyna.actor.shape.rot.y, 6.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->dyna.actor, 7.0f, this->dyna.actor.shape.rot.y, 6.0f); } this->dyna.actor.shape.rot.x += 0x360; CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); - func_8002F974(&this->dyna.actor, NA_SE_EV_TOGE_STICK_ROLLING - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_TOGE_STICK_ROLLING - SFX_FLAG); } void func_808BF078(BgYdanMaruta* this, PlayState* play) { @@ -177,7 +177,7 @@ void func_808BF108(BgYdanMaruta* this, PlayState* play) { this->dyna.actor.world.pos.x = (Math_CosS(this->dyna.actor.shape.rot.y) * temp) + this->dyna.actor.home.pos.x; this->dyna.actor.world.pos.z = (Math_SinS(this->dyna.actor.shape.rot.y) * temp) + this->dyna.actor.home.pos.z; - func_8002F974(&this->dyna.actor, NA_SE_EV_TRAP_OBJ_SLIDE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_TRAP_OBJ_SLIDE - SFX_FLAG); } void func_808BF1EC(BgYdanMaruta* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 399cd936cd..ec8e9493f6 100644 --- a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -733,7 +733,7 @@ void BossDodongo_Explode(BossDodongo* this, PlayState* play) { this->actionFunc = BossDodongo_LayDown; Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION); Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_DAMAGE); - func_80033E88(&this->actor, play, 4, 10); + Actor_RequestQuakeAndRumble(&this->actor, play, 4, 10); this->health -= 2; // make sure not to die from the bomb explosion @@ -858,7 +858,7 @@ void BossDodongo_Walk(BossDodongo* this, PlayState* play) { } if (this->cutsceneCamera == 0) { - func_80033E88(&this->actor, play, 4, 10); + Actor_RequestQuakeAndRumble(&this->actor, play, 4, 10); } else { this->unk_1B6 = 10; func_800A9F6C(0.0f, 180, 20, 100); @@ -973,7 +973,7 @@ void BossDodongo_Roll(BossDodongo* this, PlayState* play) { sp50.y = this->actor.world.pos.y + 60.0f; sp50.z = this->actor.world.pos.z; func_80033480(play, &sp50, 250.0f, 40, 800, 10, 0); - func_80033E88(&this->actor, play, 6, 15); + Actor_RequestQuakeAndRumble(&this->actor, play, 6, 15); } else { this->actor.velocity.y = 15.0f; Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_K_COLI2); diff --git a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 4b050ab920..ea2d6fc447 100644 --- a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -642,7 +642,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { this->holePosition.x = this->targetPosition.x; this->holePosition.z = this->targetPosition.z; - func_80033E1C(play, 1, 0x50, 0x5000); + Actor_RequestQuakeWithSpeed(play, 1, 0x50, 0x5000); if (this->introState != BFD_CS_NONE) { this->timers[0] = 50; } else { @@ -687,7 +687,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Audio_PlaySoundGeneral(NA_SE_EV_EXPLOSION, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_80033E1C(play, 3, 0xA, 0x7530); + Actor_RequestQuakeWithSpeed(play, 3, 0xA, 0x7530); this->work[BFD_ROCK_TIMER] = 300; } } else { @@ -994,14 +994,14 @@ void BossFd_Fly(BossFd* this, PlayState* play) { if (this->work[BFD_ACTION_STATE] < BOSSFD_SKULL_FALL) { if ((this->actor.prevPos.y < 90.0f) && (90.0f <= this->actor.world.pos.y)) { this->timers[4] = 80; - func_80033E1C(play, 1, 80, 0x5000); + Actor_RequestQuakeWithSpeed(play, 1, 80, 0x5000); this->work[BFD_ROAR_TIMER] = 40; this->work[BFD_MANE_EMBERS_TIMER] = 30; this->work[BFD_SPLASH_TIMER] = 10; } if ((this->actor.prevPos.y > 90.0f) && (90.0f >= this->actor.world.pos.y)) { this->timers[4] = 80; - func_80033E1C(play, 1, 80, 0x5000); + Actor_RequestQuakeWithSpeed(play, 1, 80, 0x5000); this->work[BFD_MANE_EMBERS_TIMER] = 30; this->work[BFD_SPLASH_TIMER] = 10; } @@ -1486,7 +1486,7 @@ void BossFd_UpdateEffects(BossFd* this, PlayState* play) { diff.z = player->actor.world.pos.z - effect->pos.z; if ((this->timers[3] == 0) && (sqrtf(SQ(diff.x) + SQ(diff.y) + SQ(diff.z)) < 20.0f)) { this->timers[3] = 50; - func_8002F6D4(play, NULL, 5.0f, effect->kbAngle, 0.0f, 0x30); + Actor_SetPlayerKnockbackLarge(play, NULL, 5.0f, effect->kbAngle, 0.0f, 0x30); if (player->bodyIsBurning == false) { for (i2 = 0; i2 < ARRAY_COUNT(player->bodyFlameTimers); i2++) { player->bodyFlameTimers[i2] = Rand_S16Offset(0, 200); diff --git a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index 1a00b983b7..83f7106413 100644 --- a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -253,7 +253,7 @@ void BossFd2_Emerge(BossFd2* this, PlayState* play) { bossFd->faceExposed = 0; bossFd->holePosition.x = this->actor.world.pos.x; bossFd->holePosition.z = this->actor.world.pos.z; - func_80033E1C(play, 1, 0x32, 0x5000); + Actor_RequestQuakeWithSpeed(play, 1, 0x32, 0x5000); this->work[FD2_ACTION_STATE] = 1; this->work[FD2_HOLE_COUNTER]++; this->actor.world.pos.y = -200.0f; @@ -304,7 +304,7 @@ void BossFd2_Emerge(BossFd2* this, PlayState* play) { case 2: Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 3, 0x7D0); if ((this->timers[0] == 1) && (this->actor.xzDistToPlayer < 120.0f)) { - func_8002F6D4(play, &this->actor, 3.0f, this->actor.yawTowardsPlayer, 2.0f, 0x20); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 3.0f, this->actor.yawTowardsPlayer, 2.0f, 0x20); Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT); } if (Animation_OnFrame(&this->skelAnime, this->fwork[FD2_END_FRAME])) { diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 743eea2c7d..d6c1d4cb83 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -1965,7 +1965,7 @@ void BossGanon_PoundFloor(BossGanon* this, PlayState* play) { this->actor.world.pos.y = 60.0f; this->unk_1C2 = 2; this->timers[0] = 10; - func_80033E88(&this->actor, play, 0xA, 0x14); // rumble + Actor_RequestQuakeAndRumble(&this->actor, play, 0xA, 0x14); // rumble this->unk_19C = 35; this->unk_19E = 0; Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_HIT_GND_IMP); @@ -4018,7 +4018,7 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) { Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); } else { spBA = 1; this->actor.world.rot.y = Math_Atan2S(zDistFromGanondorf, xDistFromGanondorf); @@ -4029,7 +4029,7 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) { Audio_PlaySoundGeneral(NA_SE_IT_SWORD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(this->actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64); + Rumble_Request(this->actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64); if (hitWithBottle == false) { // if ganondorf is 250 units away from link, at least 3 volleys are required @@ -4057,7 +4057,7 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) { } else { if (sqrtf(SQ(xDistFromLink) + SQ(yDistFromLink) + SQ(zDistFromLink)) <= 25.0f) { spBA = 5; - func_8002F6D4(play, &this->actor, 3.0f, this->actor.world.rot.y, 0.0f, 0x30); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 3.0f, this->actor.world.rot.y, 0.0f, 0x30); SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EN_GANON_HIT_THUNDER); ganondorf->timers[2] = 20; @@ -4498,7 +4498,7 @@ void func_808E2544(Actor* thisx, PlayState* play) { this->collider.base.acFlags &= ~2; if (!(acHitInfo->toucher.dmgFlags & 0x100000) || Player_HasMirrorShieldEquipped(play)) { - func_800AA000(this->actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64); + Rumble_Request(this->actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64); this->unk_1C2 = 0xC; this->actor.speedXZ = -30.0f; @@ -4533,7 +4533,7 @@ void func_808E2544(Actor* thisx, PlayState* play) { this->actor.speedXZ = 0.0f; if (dorf->timers[2] == 0) { - func_8002F6D4(play, &this->actor, 3.0f, this->actor.world.rot.y, 0.0f, 0x50); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 3.0f, this->actor.world.rot.y, 0.0f, 0x50); SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EN_GANON_HIT_THUNDER); dorf->timers[2] = 20; @@ -4851,8 +4851,8 @@ void BossGanon_UpdateEffects(PlayState* play) { if (((eff->scale * 150.0f) < distToPlayer) && (distToPlayer < (eff->scale * 300.0f))) { eff->timer = 150; - func_8002F6D4(play, &sBossGanonGanondorf->actor, 7.0f, - sBossGanonGanondorf->actor.yawTowardsPlayer, 0.0f, 0x20); + Actor_SetPlayerKnockbackLarge(play, &sBossGanonGanondorf->actor, 7.0f, + sBossGanonGanondorf->actor.yawTowardsPlayer, 0.0f, 0x20); } } } diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index e0ac9826f6..d22349f1b4 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -206,7 +206,7 @@ void func_808FD4D4(BossGanon2* this, PlayState* play, s16 arg2, s16 arg3) { } Audio_PlayActorSound2(&this->actor, NA_SE_EN_MGANON_WALK); - func_80033E88(&this->actor, play, 2, 0xA); + Actor_RequestQuakeAndRumble(&this->actor, play, 2, 0xA); } void func_808FD5C4(BossGanon2* this, PlayState* play) { @@ -1909,7 +1909,8 @@ void func_80902348(BossGanon2* this, PlayState* play) { phi_v0_2 = 0; } - func_8002F6D4(play, &this->actor, 15.0f, this->actor.yawTowardsPlayer + phi_v0_2, 2.0f, 0); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 15.0f, this->actor.yawTowardsPlayer + phi_v0_2, 2.0f, + 0); sBossGanon2Zelda->unk_3C8 = 8; this->unk_316 = 10; break; @@ -1928,7 +1929,7 @@ void func_80902348(BossGanon2* this, PlayState* play) { } player->bodyIsBurning = true; - func_8002F6D4(play, &this->actor, 10.0f, Math_Atan2S(temp_f12, temp_f2), 0.0f, 0x10); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 10.0f, Math_Atan2S(temp_f12, temp_f2), 0.0f, 0x10); sBossGanon2Zelda->unk_3C8 = 8; } } @@ -2058,7 +2059,7 @@ void BossGanon2_Update(Actor* thisx, PlayState* play) { Actor_UpdateBgCheckInfo(play, &this->actor, 60.0f, 60.0f, 100.0f, 5); if (this->actor.bgCheckFlags & 1) { if (this->actor.velocity.y < -5.0f) { - func_80033E88(&this->actor, play, 5, 20); + Actor_RequestQuakeAndRumble(&this->actor, play, 5, 20); Sfx_PlaySfxCentered(NA_SE_IT_BOMB_EXPLOSION); } this->actor.velocity.y = 0.0f; diff --git a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index 3920cca5e4..76612bfe4a 100644 --- a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -1320,7 +1320,7 @@ void BossGoma_FloorAttack(BossGoma* this, PlayState* play) { if (Animation_OnFrame(&this->skelanime, 10.0f)) { BossGoma_PlayEffectsAndSfx(this, play, 3, 5); - func_80033E88(&this->actor, play, 5, 15); + Actor_RequestQuakeAndRumble(&this->actor, play, 5, 15); } if (Animation_OnFrame(&this->skelanime, Animation_GetLastFrame(&gGohmaAttackAnim))) { @@ -1445,7 +1445,7 @@ void BossGoma_FallJump(BossGoma* this, PlayState* play) { BossGoma_SetupFloorLand(this); this->actor.velocity.y = 0.0f; BossGoma_PlayEffectsAndSfx(this, play, 0, 8); - func_80033E88(&this->actor, play, 5, 0xF); + Actor_RequestQuakeAndRumble(&this->actor, play, 5, 0xF); } } @@ -1462,7 +1462,7 @@ void BossGoma_FallStruckDown(BossGoma* this, PlayState* play) { BossGoma_SetupFloorLandStruckDown(this); this->actor.velocity.y = 0.0f; BossGoma_PlayEffectsAndSfx(this, play, 0, 8); - func_80033E88(&this->actor, play, 0xA, 0xF); + Actor_RequestQuakeAndRumble(&this->actor, play, 0xA, 0xF); Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_DAM1); } } @@ -1865,7 +1865,7 @@ void BossGoma_UpdateHit(BossGoma* this, PlayState* play) { } this->timer = 4; - func_80033E88(&this->actor, play, 4, 0xC); + Actor_RequestQuakeAndRumble(&this->actor, play, 4, 0xC); } } } diff --git a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index a13eb15477..e3a730f251 100644 --- a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -530,7 +530,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { if ((this->sfxTimer % 32) == 0) { Audio_PlaySoundIncreasinglyTransposed(&this->tentTipPos, NA_SE_EN_MOFER_WAVE, gMorphaTransposeTable); - func_800AA000(0, 100, 5, 2); + Rumble_Request(0, 100, 5, 2); Player_PlaySfx(&player->actor, NA_SE_VO_LI_FREEZE + player->ageProperties->unk_92); } } else { @@ -545,7 +545,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { if ((this->sfxTimer % 16) == 0) { Audio_PlaySoundIncreasinglyTransposed(&this->tentTipPos, NA_SE_EN_MOFER_WAVE, gMorphaTransposeTable); - func_800AA000(0, 160, 5, 4); + Rumble_Request(0, 160, 5, 4); Player_PlaySfx(&player->actor, NA_SE_VO_LI_FREEZE + player->ageProperties->unk_92); } } @@ -864,7 +864,8 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { player->actor.parent = NULL; player->csAction = 0; if (this->timers[0] == 0) { - func_8002F6D4(play, &this->actor, 20.0f, this->actor.shape.rot.y + 0x8000, 10.0f, 0); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 20.0f, this->actor.shape.rot.y + 0x8000, + 10.0f, 0); } } this->timers[0] = 75; diff --git a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index aa68a5866b..14b3b0850f 100644 --- a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -457,7 +457,7 @@ void BossSst_HeadIntro(BossSst* this, PlayState* play) { if (!this->ready) { sFloor->dyna.actor.params = BONGOFLOOR_HIT; this->ready = true; - func_800AA000(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); Audio_PlayActorSound2(&sFloor->dyna.actor, NA_SE_EN_SHADEST_TAIKO_HIGH); } else if (Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BONGO_BONGO_BATTLE)) { sHands[RIGHT]->actor.draw = BossSst_DrawHand; @@ -782,7 +782,7 @@ void BossSst_HeadCharge(BossSst* this, PlayState* play) { this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); sHands[LEFT]->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); sHands[RIGHT]->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); - func_8002F71C(play, &this->actor, 10.0f, this->actor.shape.rot.y, 5.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 10.0f, this->actor.shape.rot.y, 5.0f); Player_PlaySfx(&GET_PLAYER(play)->actor, NA_SE_PL_BODY_HIT); } } @@ -1311,7 +1311,7 @@ void BossSst_HandDownbeat(BossSst* this, PlayState* play) { } else { BossSst_HandSetupDownbeatEnd(this); } - func_800AA000(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); Audio_PlayActorSound2(&this->actor, NA_SE_EN_SHADEST_TAIKO_HIGH); } } @@ -1447,7 +1447,7 @@ void BossSst_HandRetreat(BossSst* this, PlayState* play) { inPosition = Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.home.rot.y, 0x200); inPosition &= Math_ScaledStepToS(&this->actor.shape.rot.z, this->actor.home.rot.z, 0x200); inPosition &= Math_ScaledStepToS(&this->handYRotMod, 0, 0x800); - func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); if ((Math_SmoothStepToF(&this->actor.world.pos.y, ROOM_CENTER_Y + 250.0f, 0.5f, 70.0f, 5.0f) < 1.0f) && inPosition && (diff < 10.0f)) { this->timer = 8; @@ -1482,7 +1482,7 @@ void BossSst_HandReadySlam(BossSst* this, PlayState* play) { Math_ScaledStepToS(&this->actor.shape.rot.x, -0x1000, 0x100); Math_ApproachF(&this->actor.world.pos.x, player->actor.world.pos.x, 0.5f, 40.0f); Math_ApproachF(&this->actor.world.pos.z, player->actor.world.pos.z, 0.5f, 40.0f); - func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); } } @@ -1537,7 +1537,7 @@ void BossSst_HandSlam(BossSst* this, PlayState* play) { player->actor.world.pos.z = (Math_CosS(this->actor.yawTowardsPlayer) * 100.0f) + this->actor.world.pos.z; this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); - func_8002F71C(play, &this->actor, 5.0f, this->actor.yawTowardsPlayer, 0.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 5.0f, this->actor.yawTowardsPlayer, 0.0f); } Math_ScaledStepToS(&this->actor.shape.rot.x, 0, 0x200); @@ -1567,7 +1567,7 @@ void BossSst_HandReadySweep(BossSst* this, PlayState* play) { if (inPosition) { BossSst_HandSetupSweep(this); } else { - func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); } } @@ -1596,7 +1596,8 @@ void BossSst_HandSweep(BossSst* this, PlayState* play) { } else if (this->colliderJntSph.base.atFlags & AT_HIT) { this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); this->ready = true; - func_8002F71C(play, &this->actor, 5.0f, this->actor.shape.rot.y - (this->vParity * 0x3800), 0.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 5.0f, + this->actor.shape.rot.y - (this->vParity * 0x3800), 0.0f); Player_PlaySfx(&player->actor, NA_SE_PL_BODY_HIT); newTargetYaw = this->actor.shape.rot.y - (this->vParity * 0x1400); if (((s16)(newTargetYaw - this->targetYaw) * this->vParity) > 0) { @@ -1655,11 +1656,11 @@ void BossSst_HandPunch(BossSst* this, PlayState* play) { BossSst_HandSetupRetreat(this); } else if (this->colliderJntSph.base.atFlags & AT_HIT) { Player_PlaySfx(&GET_PLAYER(play)->actor, NA_SE_PL_BODY_HIT); - func_8002F71C(play, &this->actor, 10.0f, this->actor.shape.rot.y, 5.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 10.0f, this->actor.shape.rot.y, 5.0f); BossSst_HandSetupRetreat(this); } - func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); } void BossSst_HandSetupReadyClap(BossSst* this) { @@ -1759,7 +1760,7 @@ void BossSst_HandClap(BossSst* this, PlayState* play) { } this->ready = true; } else { - func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); } this->actor.world.pos.x = (Math_SinS(this->actor.shape.rot.y) * this->radius) + sHead->actor.world.pos.x; @@ -1850,7 +1851,7 @@ void BossSst_HandGrab(BossSst* this, PlayState* play) { } else { this->actor.speedXZ *= 1.26f; this->actor.speedXZ = CLAMP_MAX(this->actor.speedXZ, 70.0f); - func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); } if (this->colliderJntSph.base.atFlags & AT_HIT) { @@ -1973,11 +1974,11 @@ void BossSst_HandSwing(BossSst* this, PlayState* play) { BossSst_HandReleasePlayer(this, play, false); player->actor.world.pos.x += 70.0f * Math_SinS(this->actor.shape.rot.y); player->actor.world.pos.z += 70.0f * Math_CosS(this->actor.shape.rot.y); - func_8002F71C(play, &this->actor, 15.0f, this->actor.shape.rot.y, 2.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 15.0f, this->actor.shape.rot.y, 2.0f); Player_PlaySfx(&player->actor, NA_SE_PL_BODY_HIT); } - func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); } void BossSst_HandSetupReel(BossSst* this) { @@ -2038,7 +2039,7 @@ void BossSst_HandReadyShake(BossSst* this, PlayState* play) { if ((diff < 30.0f) && inPosition) { BossSst_HandSetupShake(this); } else { - func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); } } @@ -2095,7 +2096,7 @@ void BossSst_HandReadyCharge(BossSst* this, PlayState* play) { this->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); OTHER_HAND(this)->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); sHead->colliderJntSph.base.atFlags &= ~(AT_ON | AT_HIT); - func_8002F71C(play, &this->actor, 10.0f, this->actor.shape.rot.y, 5.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 10.0f, this->actor.shape.rot.y, 5.0f); Player_PlaySfx(&GET_PLAYER(play)->actor, NA_SE_PL_BODY_HIT); } } @@ -2292,7 +2293,7 @@ void BossSst_HandRecover(BossSst* this, PlayState* play) { this->ready = true; } } - func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); } void BossSst_HandSetupFrozen(BossSst* this) { @@ -2418,7 +2419,7 @@ void BossSst_HandBreakIce(BossSst* this, PlayState* play) { BossSst_HandSetupRetreat(this); } - func_8002F974(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_SHADEST_HAND_FLY - SFX_FLAG); } void BossSst_HandGrabPlayer(BossSst* this, PlayState* play) { @@ -2444,7 +2445,7 @@ void BossSst_HandReleasePlayer(BossSst* this, PlayState* play, s32 dropPlayer) { this->colliderJntSph.base.ocFlags1 |= OC1_ON; OTHER_HAND(this)->colliderJntSph.base.ocFlags1 |= OC1_ON; if (dropPlayer) { - func_8002F71C(play, &this->actor, 0.0f, this->actor.shape.rot.y, 0.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 0.0f, this->actor.shape.rot.y, 0.0f); } } } diff --git a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 3f83322c44..ec9c1c3265 100644 --- a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -778,7 +778,7 @@ s32 BossTw_BeamHitPlayerCheck(BossTw* this, PlayState* play) { if (sTwinrovaPtr->timers[2] == 0) { sTwinrovaPtr->timers[2] = 150; this->beamDist = sqrtf(SQ(offset.x) + SQ(offset.y) + SQ(offset.z)); - func_8002F6D4(play, &this->actor, 3.0f, this->actor.shape.rot.y, 0.0f, 0x20); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 3.0f, this->actor.shape.rot.y, 0.0f, 0x20); if (this->actor.params == 0) { if (sFreezeState == 0) { @@ -1091,7 +1091,7 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) { this->groundBlastPos.y = 0.0f; this->groundBlastPos.z = 0.0f; play->envCtx.unk_D8 = 1.0f; - func_800AA000(0.0f, 0x64, 5, 4); + Rumble_Request(0.0f, 0x64, 5, 4); } else if (beamReflection == 0) { BossTw_BeamHitPlayerCheck(this, play); @@ -4307,7 +4307,7 @@ s32 BossTw_BlastShieldCheck(BossTw* this, PlayState* play) { if (info->toucher.dmgFlags & DMG_SHIELD) { this->work[INVINC_TIMER] = 7; play->envCtx.unk_D8 = 1.0f; - func_800AA000(0.0f, 100, 5, 4); + Rumble_Request(0.0f, 100, 5, 4); if (Player_HasMirrorShieldEquipped(play)) { if (this->blastType == 1) { diff --git a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index f30f966040..a0a7b2fc89 100644 --- a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -1094,7 +1094,7 @@ void BossVa_BodyPhase1(BossVa* this, PlayState* play) { if (this->colliderBody.base.atFlags & AT_HIT) { this->colliderBody.base.atFlags &= ~AT_HIT; if (this->colliderBody.base.at == &player->actor) { - func_8002F71C(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); } } @@ -1185,7 +1185,7 @@ void BossVa_BodyPhase2(BossVa* this, PlayState* play) { sPhase2Timer = (sPhase2Timer + 0x18) & 0xFFF0; if (this->colliderBody.base.at == &player->actor) { - func_8002F71C(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT); } } @@ -1260,7 +1260,7 @@ void BossVa_BodyPhase3(BossVa* this, PlayState* play) { if (this->colliderBody.base.atFlags & AT_HIT) { this->colliderBody.base.atFlags &= ~AT_HIT; if (this->colliderBody.base.at == &player->actor) { - func_8002F71C(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); this->actor.world.rot.y += (s16)Rand_CenteredFloat(0x2EE0) + 0x8000; Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT); } @@ -1381,7 +1381,7 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) { if (this->colliderBody.base.atFlags & AT_HIT) { this->colliderBody.base.atFlags &= ~AT_HIT; if (this->colliderBody.base.at == &player->actor) { - func_8002F71C(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); this->actor.world.rot.y += (s16)Rand_CenteredFloat(0x2EE0) + 0x8000; Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT); } @@ -2569,7 +2569,8 @@ void BossVa_BariPhase3Attack(BossVa* this, PlayState* play) { this->vaBariUnused.y += this->vaBariUnused.z; if ((this->colliderLightning.base.atFlags & AT_HIT) || (this->colliderSph.base.atFlags & AT_HIT)) { if ((this->colliderLightning.base.at == &player->actor) || (this->colliderSph.base.at == &player->actor)) { - func_8002F71C(play, &this->actor, 8.0f, GET_BODY(this)->actor.yawTowardsPlayer, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 8.0f, GET_BODY(this)->actor.yawTowardsPlayer, + 8.0f); Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT); this->colliderSph.base.at = NULL; this->colliderLightning.base.at = NULL; @@ -2664,7 +2665,8 @@ void BossVa_BariPhase2Attack(BossVa* this, PlayState* play) { if ((this->colliderLightning.base.atFlags & AT_HIT) || (this->colliderSph.base.atFlags & AT_HIT)) { if ((this->colliderLightning.base.at == &player->actor) || (this->colliderSph.base.at == &player->actor)) { - func_8002F71C(play, &this->actor, 8.0f, GET_BODY(this)->actor.yawTowardsPlayer, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 8.0f, GET_BODY(this)->actor.yawTowardsPlayer, + 8.0f); Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT); this->colliderSph.base.at = NULL; this->colliderLightning.base.at = NULL; diff --git a/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 5a8719cb87..8b638c027b 100644 --- a/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -212,11 +212,11 @@ void Demo6K_WaitForObject(Demo6K* this, PlayState* play) { void func_80966E04(Demo6K* this, PlayState* play) { if (play->csCtx.frames > 214) { - func_8002F948(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); } if (play->csCtx.frames > 264) { - func_8002F948(&this->actor, NA_SE_EV_GOD_LIGHTBALL_2 - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_GOD_LIGHTBALL_2 - SFX_FLAG); } if ((play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.npcActions[6] != NULL) && @@ -227,8 +227,8 @@ void func_80966E04(Demo6K* this, PlayState* play) { void func_80966E98(Demo6K* this, PlayState* play) { if (play->csCtx.frames < 353) { - func_8002F948(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); - func_8002F948(&this->actor, NA_SE_EV_GOD_LIGHTBALL_2 - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_GOD_LIGHTBALL_2 - SFX_FLAG); } if (play->csCtx.frames == 342) { @@ -305,7 +305,7 @@ void func_8096712C(Demo6K* this, PlayState* play) { this->timer2++; if ((play->sceneNum == SCENE_INSIDE_GANONS_CASTLE) && (play->csCtx.frames < D_8096932C[this->actor.params - 3])) { - func_8002F974(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_LIGHT_GATHER - SFX_FLAG); } } @@ -470,7 +470,7 @@ void func_80967AD0(Demo6K* this, PlayState* play) { if ((play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.npcActions[1] != NULL)) { if (play->csCtx.npcActions[1]->action == 2) { this->unk_170++; - func_8002F948(&this->actor, NA_SE_EV_RAINBOW_SHOWER - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_RAINBOW_SHOWER - SFX_FLAG); } func_809691BC(this, play, 1); diff --git a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index a20f0c6522..548dcb14c2 100644 --- a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -786,7 +786,7 @@ void DemoEffect_UpdateTimeWarpReturnFromChamberOfSages(DemoEffect* this, PlaySta DemoEffect_TimewarpShrink(shrinkProgress * 5.0f); } - func_8002F948(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); } /** @@ -810,7 +810,7 @@ void DemoEffect_UpdateTimeWarpTimeblock(DemoEffect* this, PlayState* play) { this->actor.scale.x = scale; this->actor.scale.z = scale; DemoEffect_TimewarpShrink(shrinkProgress); - func_8002F948(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); return; } @@ -823,7 +823,7 @@ void DemoEffect_UpdateTimeWarpTimeblock(DemoEffect* this, PlayState* play) { * This is an Update Func that is only ran for one frame. */ void DemoEffect_InitTimeWarpTimeblock(DemoEffect* this, PlayState* play) { - func_8002F948(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(&this->actor, NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); if (SkelCurve_Update(play, &this->skelCurve)) { SkelCurve_SetAnim(&this->skelCurve, &gTimeWarpAnim, 1.0f, 60.0f, 59.0f, 0.0f); @@ -1529,10 +1529,10 @@ void DemoEffect_JewelSparkle(DemoEffect* this, PlayState* play, s32 spawnerCount void DemoEffect_PlayJewelSfx(DemoEffect* this, PlayState* play) { if (!DemoEffect_CheckCsAction(this, play, 1)) { if (this->actor.params == sSfxJewelId[0]) { - func_8002F974(&this->actor, NA_SE_EV_SPIRIT_STONE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_SPIRIT_STONE - SFX_FLAG); } else if (sSfxJewelId[0] == 0) { sSfxJewelId[0] = this->actor.params; - func_8002F974(&this->actor, NA_SE_EV_SPIRIT_STONE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_SPIRIT_STONE - SFX_FLAG); } } } diff --git a/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 63e20df36c..06dd169067 100644 --- a/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -32,7 +32,7 @@ void DemoGt_PlayExplosion2Sfx(PlayState* play, Vec3f* pos) { } void DemoGt_Rumble(PlayState* play) { - func_800AA000(0.0f, 0x32, 0xA, 5); + Rumble_Request(0.0f, 0x32, 0xA, 5); } void DemoGt_SpawnDust(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, f32 scale, s16 scaleStep, s16 life) { diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index bbcebd592a..fed62c6b6b 100644 --- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -862,7 +862,7 @@ s32 func_80986AD0(DemoIm* this, PlayState* play) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY; if (!Actor_ProcessTalkRequest(&this->actor, play)) { this->actor.textId = 0x708E; - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } else { return true; } diff --git a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 6dd049bccc..add2548be4 100644 --- a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -185,7 +185,7 @@ void DemoKekkai_TowerBarrier(DemoKekkai* this, PlayState* play) { } } if (!(this->sfxFlag & 1)) { - func_8002F974(&this->actor, NA_SE_EV_TOWER_BARRIER - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_TOWER_BARRIER - SFX_FLAG); } } @@ -195,7 +195,7 @@ void DemoKekkai_Update(Actor* thisx, PlayState* play2) { if (this->energyAlpha > 0.99f) { if ((this->collider1.base.atFlags & AT_HIT) || (this->collider2.base.atFlags & AT_HIT)) { - func_8002F71C(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f); } CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider1.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider1.base); @@ -233,7 +233,7 @@ void DemoKekkai_TrialBarrierDispel(Actor* thisx, PlayState* play) { this->orbScale = 0.0f; } if (this->orbScale != 0.0f) { - func_8002F974(&this->actor, NA_SE_EV_TOWER_ENERGY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_TOWER_ENERGY - SFX_FLAG); } this->timer++; } @@ -253,7 +253,7 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, PlayState* play) { DemoKekkai* this = (DemoKekkai*)thisx; if (this->collider1.base.atFlags & AT_HIT) { - func_8002F71C(play, &this->actor, 5.0f, this->actor.yawTowardsPlayer, 5.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 5.0f, this->actor.yawTowardsPlayer, 5.0f); } CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider1.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider1.base); @@ -269,7 +269,7 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, PlayState* play) { } } CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider2.base); - func_8002F974(&this->actor, NA_SE_EV_TOWER_ENERGY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_TOWER_ENERGY - SFX_FLAG); } void DemoKekkai_DrawTrialBarrier(Actor* thisx, PlayState* play2) { diff --git a/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 7dde93e1cd..1f4eb78b50 100644 --- a/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -123,7 +123,7 @@ void DoorAna_WaitClosed(DoorAna* this, PlayState* play) { Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - func_8002F5F0(&this->actor, play); + Actor_SetClosestSecretDistance(&this->actor, play); } // update routine for grottos that are open diff --git a/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 6f1e4fa712..b3aae7e355 100644 --- a/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -378,7 +378,7 @@ void DoorKiller_FallOver(DoorKiller* this, PlayState* play) { if ((fabsf(playerPosRelToDoor.y) < 20.0f) && (fabsf(playerPosRelToDoor.x) < 20.0f) && (playerPosRelToDoor.z < 100.0f) && (playerPosRelToDoor.z > 0.0f)) { this->hasHitPlayerOrGround |= 1; - func_8002F6D4(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f, 16); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f, 16); Audio_PlayActorSound2(&this->actor, NA_SE_EN_KDOOR_HIT); Player_PlaySfx(&player->actor, NA_SE_PL_BODY_HIT); } diff --git a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 3f37ef1ad8..46ba36c9b2 100644 --- a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -596,7 +596,7 @@ void DoorShutter_Close(DoorShutter* this, PlayState* play) { Quake_SetSpeed(quakeId, -32536); Quake_SetQuakeValues(quakeId, 2, 0, 0, 0); Quake_SetCountdown(quakeId, 10); - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64); DoorShutter_SetupClosed(this, play); } } diff --git a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 740a394b6d..a9c48f8663 100644 --- a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -104,7 +104,7 @@ void EnAni_Destroy(Actor* thisx, PlayState* play) { s32 EnAni_SetText(EnAni* this, PlayState* play, u16 textId) { this->actor.textId = textId; this->unk_2A8 |= 1; - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); return 0; } @@ -280,7 +280,7 @@ void EnAni_Update(Actor* thisx, PlayState* play) { } if (this->unk_2A8 & 1) { - func_80038290(play, &this->actor, &this->unk_29C, &this->unk_2A2, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_29C, &this->unk_2A2, this->actor.focus.pos); this->unk_2A2.z = 0; this->unk_2A2.y = this->unk_2A2.z; this->unk_2A2.x = this->unk_2A2.z; diff --git a/soh/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/soh/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index 70bd36a6b6..c652f4d91d 100644 --- a/soh/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/soh/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -366,7 +366,7 @@ void EnAttackNiw_Update(Actor* thisx, PlayState* play) { cucco = (EnNiw*)this->actor.parent; if ((this->actor.parent->update != NULL) && (this->actor.parent != NULL) && (cucco != NULL) && (cucco->timer9 == 0) && (player->invincibilityTimer == 0)) { - func_8002F6D4(play, &this->actor, 2.0f, this->actor.world.rot.y, 0.0f, 0x10); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 2.0f, this->actor.world.rot.y, 0.0f, 0x10); cucco->timer9 = 0x46; } } diff --git a/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 1eae09bbc2..86890a397a 100644 --- a/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -307,7 +307,7 @@ void EnBa_SwingAtPlayer(EnBa* this, PlayState* play) { if (this->collider.base.atFlags & 2) { this->collider.base.atFlags &= ~2; if (this->collider.base.at == &player->actor) { - func_8002F71C(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); } } CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); diff --git a/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 5ae4305187..b20331005c 100644 --- a/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -701,7 +701,7 @@ void EnBb_Down(EnBb* this, PlayState* play) { } if (this->actor.bgCheckFlags & 3) { if (this->actor.params == ENBB_RED) { - s32 floorType = func_80041D4C(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); + s32 floorType = SurfaceType_GetFloorType(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); if ((floorType == 2) || (floorType == 3) || (floorType == 9)) { this->moveMode = BBMOVE_HIDDEN; @@ -820,7 +820,7 @@ void EnBb_Red(EnBb* this, PlayState* play) { this->actor.bgCheckFlags &= ~8; } if (this->actor.bgCheckFlags & 1) { - floorType = func_80041D4C(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); + floorType = SurfaceType_GetFloorType(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); if ((floorType == 2) || (floorType == 3) || (floorType == 9)) { this->moveMode = BBMOVE_HIDDEN; this->timer = 10; diff --git a/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index d06a234baa..d9c295c762 100644 --- a/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -181,7 +181,7 @@ void func_809BC598(EnBdfire* this, PlayState* play) { player->bodyFlameTimers[i] = Rand_S16Offset(0, 200); } player->bodyIsBurning = true; - func_8002F6D4(play, &this->actor, 20.0f, this->actor.world.rot.y, 0.0f, 8); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 20.0f, this->actor.world.rot.y, 0.0f, 8); osSyncPrintf("POWER\n"); } } diff --git a/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 368bf865b2..cb28fd8a9b 100644 --- a/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -251,7 +251,7 @@ void func_809BCF68(EnBigokuta* this, PlayState* play) { } EffectSsGSplash_Spawn(play, &effectPos, NULL, NULL, 1, 800); if (this->actionFunc != func_809BE4A4) { - func_8002F974(&this->actor, NA_SE_EN_DAIOCTA_SPLASH - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_DAIOCTA_SPLASH - SFX_FLAG); } } @@ -269,7 +269,7 @@ void func_809BD1C8(EnBigokuta* this, PlayState* play) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_LAND_WATER); Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_LAND_BIG); - func_80033E88(&this->actor, play, 0xA, 8); + Actor_RequestQuakeAndRumble(&this->actor, play, 0xA, 8); } void func_809BD2E4(EnBigokuta* this) { @@ -442,7 +442,7 @@ void func_809BD8DC(EnBigokuta* this, PlayState* play) { EffectSsGSplash_Spawn(play, &effectPos, NULL, NULL, 1, 2000); Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_LAND_WATER); Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOLON_LAND_BIG); - func_800AA000(0.0f, 0xFF, 0x14, 0x96); + Rumble_Request(0.0f, 0xFF, 0x14, 0x96); } } else if (this->unk_196 < -1) { this->actor.world.pos.y = this->actor.home.pos.y - (sinf((this->unk_196 + 1) * (M_PI / 10)) * 20.0f); @@ -739,7 +739,7 @@ void func_809BE798(EnBigokuta* this, PlayState* play) { } else { effectRot = -0x6000; } - func_8002F71C(play, &this->actor, 10.0f, this->actor.world.rot.y + effectRot, 5.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 10.0f, this->actor.world.rot.y + effectRot, 5.0f); if (this->actionFunc == func_809BDC08) { func_809BD4A4(this); this->unk_196 = 40; diff --git a/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c index d8ba387738..ecee3fc155 100644 --- a/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -381,7 +381,7 @@ void EnBili_DischargeLightning(EnBili* this, PlayState* play) { } SkelAnime_Update(&this->skelAnime); - func_8002F974(&this->actor, NA_SE_EN_BIRI_SPARK - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_BIRI_SPARK - SFX_FLAG); if (this->timer != 0) { this->timer--; diff --git a/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 900a869025..35bababe25 100644 --- a/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -171,7 +171,7 @@ void EnBom_Move(EnBom* this, PlayState* play) { } else { Math_StepToF(&this->actor.speedXZ, 0.0f, 1.0f); if ((this->actor.bgCheckFlags & 2) && (this->actor.velocity.y < -3.0f)) { - func_8002F850(play, &this->actor); + Actor_PlaySfx_SurfaceBomb(play, &this->actor); this->actor.velocity.y *= -0.3f; this->actor.bgCheckFlags &= ~2; } else if (this->timer >= 4) { @@ -195,7 +195,7 @@ void EnBom_Explode(EnBom* this, PlayState* play) { if (this->explosionCollider.elements[0].dim.modelSphere.radius == 0) { this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; - func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); } if (CVarGetInteger(CVAR_ENHANCEMENT("StaticExplosionRadius"), 0)) { diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 5597f8a1fc..3077b42722 100644 --- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -122,7 +122,7 @@ void EnBomBowMan_WaitAsleep(EnBomBowlMan* this, PlayState* play) { yawDiff = ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)); if (!(this->actor.xzDistToPlayer > 120.0f) && (yawDiff < 0x4300)) { - func_8002F2CC(&this->actor, play, 120.0f); + Actor_OfferTalk(&this->actor, play, 120.0f); } } } @@ -208,7 +208,7 @@ void EnBomBowMan_WaitNotBeatenDC(EnBomBowlMan* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { this->actionFunc = EnBomBowMan_TalkNotBeatenDC; } else { - func_8002F2CC(&this->actor, play, 120.0f); + Actor_OfferTalk(&this->actor, play, 120.0f); } } @@ -303,7 +303,7 @@ void EnBomBowMan_RunGame(EnBomBowlMan* this, PlayState* play) { yawDiff = ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)); if (!(this->actor.xzDistToPlayer > 120.0f) && (yawDiff < 0x4300)) { - func_8002F2CC(&this->actor, play, 120.0f); + Actor_OfferTalk(&this->actor, play, 120.0f); } } } @@ -539,7 +539,7 @@ void EnBomBowlMan_Update(Actor* thisx, PlayState* play) { } } - func_80038290(play, &this->actor, &this->unk_218, &this->unk_224, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_218, &this->unk_224, this->actor.focus.pos); break; } diff --git a/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index bc1d9a58d7..ebfd3da939 100644 --- a/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -240,7 +240,7 @@ void EnBomChu_WaitForRelease(EnBomChu* this, PlayState* play) { //! and will cause a crash inside this function. EnBomChu_UpdateFloorPoly(this, this->actor.floorPoly, play); this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; // make chu targetable - func_8002F850(play, &this->actor); + Actor_PlaySfx_SurfaceBomb(play, &this->actor); this->actionFunc = EnBomChu_Move; } } @@ -347,7 +347,7 @@ void EnBomChu_Move(EnBomChu* this, PlayState* play) { Math_ScaledStepToS(&this->actor.shape.rot.y, this->actor.world.rot.y, 0x800); Math_ScaledStepToS(&this->actor.shape.rot.z, this->actor.world.rot.z, 0x800); - func_8002F8F0(&this->actor, NA_SE_IT_BOMBCHU_MOVE - SFX_FLAG); + Actor_PlaySfx_Flagged2(&this->actor, NA_SE_IT_BOMBCHU_MOVE - SFX_FLAG); } void EnBomChu_WaitForKill(EnBomChu* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 741fc5c340..f43761cf14 100644 --- a/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -239,7 +239,7 @@ void EnBombf_Move(EnBombf* this, PlayState* play) { } else { Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 1.5f, 0.0f); if ((this->actor.bgCheckFlags & 2) && (this->actor.velocity.y < -6.0f)) { - func_8002F850(play, &this->actor); + Actor_PlaySfx_SurfaceBomb(play, &this->actor); this->actor.velocity.y *= -0.5f; } else if (this->timer >= 4) { Actor_OfferCarry(&this->actor, play); @@ -262,7 +262,7 @@ void EnBombf_Explode(EnBombf* this, PlayState* play) { if (this->explosionCollider.elements[0].dim.modelSphere.radius == 0) { this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; - func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); } this->explosionCollider.elements[0].dim.modelSphere.radius += 8; diff --git a/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 2b41e176ae..bc69863f28 100644 --- a/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -152,7 +152,7 @@ void EnBoom_Fly(EnBoom* this, PlayState* play) { // Set xyz speed, move forward, and play the boomerang sound Actor_SetProjectileSpeed(&this->actor, 12.0f); Actor_MoveXZGravity(&this->actor); - func_8002F974(&this->actor, NA_SE_IT_BOOMERANG_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_IT_BOOMERANG_FLY - SFX_FLAG); // If the boomerang collides with EnItem00 or a Skulltula token, set grabbed pointer to pick it up collided = this->collider.base.atFlags & AT_HIT; diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c index c178dab757..5e21973e8b 100644 --- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -290,7 +290,7 @@ void EnBox_FallOnSwitchFlag(EnBox* this, PlayState* play) { s32 treasureFlag = this->dyna.actor.params & 0x1F; if (treasureFlag >= ENBOX_TREASURE_FLAG_UNK_MIN && treasureFlag < ENBOX_TREASURE_FLAG_UNK_MAX) { - func_8002F5F0(&this->dyna.actor, play); + Actor_SetClosestSecretDistance(&this->dyna.actor, play); } if (this->unk_1A8 >= 0) { @@ -310,7 +310,7 @@ void func_809C9700(EnBox* this, PlayState* play) { Player* player = GET_PLAYER(play); if (treasureFlag >= ENBOX_TREASURE_FLAG_UNK_MIN && treasureFlag < ENBOX_TREASURE_FLAG_UNK_MAX) { - func_8002F5F0(&this->dyna.actor, play); + Actor_SetClosestSecretDistance(&this->dyna.actor, play); } if (Math3D_Vec3fDistSq(&this->dyna.actor.world.pos, &player->actor.world.pos) > 22500.0f) { @@ -346,7 +346,7 @@ void EnBox_AppearOnSwitchFlag(EnBox* this, PlayState* play) { s32 treasureFlag = this->dyna.actor.params & 0x1F; if (treasureFlag >= ENBOX_TREASURE_FLAG_UNK_MIN && treasureFlag < ENBOX_TREASURE_FLAG_UNK_MAX) { - func_8002F5F0(&this->dyna.actor, play); + Actor_SetClosestSecretDistance(&this->dyna.actor, play); } if (Flags_GetSwitch(play, this->switchFlag)) { @@ -360,7 +360,7 @@ void EnBox_AppearOnRoomClear(EnBox* this, PlayState* play) { s32 treasureFlag = this->dyna.actor.params & 0x1F; if (treasureFlag >= ENBOX_TREASURE_FLAG_UNK_MIN && treasureFlag < ENBOX_TREASURE_FLAG_UNK_MAX) { - func_8002F5F0(&this->dyna.actor, play); + Actor_SetClosestSecretDistance(&this->dyna.actor, play); } if (Flags_GetTempClear(play, this->dyna.actor.room) && !Player_InCsMode(play)) { @@ -510,7 +510,7 @@ void EnBox_SpawnIceSmoke(EnBox* this, PlayState* play) { f32 f0; this->iceSmokeTimer++; - func_8002F974(&this->dyna.actor, NA_SE_EN_MIMICK_BREATH - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EN_MIMICK_BREATH - SFX_FLAG); if (Rand_ZeroOne() < 0.3f) { f0 = 2.0f * Rand_ZeroOne() - 1.0f; pos = this->dyna.actor.world.pos; diff --git a/soh/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/soh/src/overlays/actors/ovl_En_Brob/z_en_brob.c index a71489ade1..626d73f9cc 100644 --- a/soh/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/soh/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -155,7 +155,8 @@ void EnBrob_Idle(EnBrob* this, PlayState* play) { } if (this->timer == 0) { if (DynaPolyActor_IsPlayerOnTop(&this->dyna) != 0) { - func_8002F71C(play, &this->dyna.actor, 5.0f, this->dyna.actor.yawTowardsPlayer, 1.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->dyna.actor, 5.0f, this->dyna.actor.yawTowardsPlayer, + 1.0f); EnBrob_SetupMoveUp(this, play); } else if (this->dyna.actor.xzDistToPlayer < 300.0f) { EnBrob_SetupMoveUp(this, play); @@ -281,7 +282,8 @@ void EnBrob_Update(Actor* thisx, PlayState* play2) { if (this->actionFunc == EnBrob_MoveUp && !(this->colliders[0].base.atFlags & AT_BOUNCED) && !(this->colliders[1].base.atFlags & AT_BOUNCED)) { - func_8002F71C(play, &this->dyna.actor, 5.0f, this->dyna.actor.yawTowardsPlayer, 1.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->dyna.actor, 5.0f, this->dyna.actor.yawTowardsPlayer, + 1.0f); } else if (this->actionFunc != EnBrob_MoveUp) { EnBrob_SetupShock(this); } diff --git a/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 6717b9788f..c0d167ab58 100644 --- a/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -119,7 +119,7 @@ void EnBubble_DamagePlayer(EnBubble* this, PlayState* play) { s32 damage = -this->colliderSphere.elements[0].info.toucher.damage; play->damagePlayer(play, damage); - func_8002F7A0(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f); + Actor_SetPlayerKnockbackSmallNoDamage(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f); } s32 EnBubble_Explosion(EnBubble* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c index e268b222e4..cd9d0c2497 100644 --- a/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -457,7 +457,7 @@ void func_809CF984(EnBw* this, PlayState* play) { } SkelAnime_Update(&this->skelAnime); if (this->actor.bgCheckFlags & 3) { - floorPolyType = func_80041D4C(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); + floorPolyType = SurfaceType_GetFloorType(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); if ((floorPolyType == 2) || (floorPolyType == 3) || (floorPolyType == 9)) { Actor_Kill(&this->actor); return; diff --git a/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c index b7e515e3dd..153ffe4419 100644 --- a/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -155,7 +155,7 @@ void EnBx_Update(Actor* thisx, PlayState* play) { play->damagePlayer(play, -4); } } - func_8002F71C(play, &this->actor, 6.0f, tmp32, 6.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 6.0f, tmp32, 6.0f); player->invincibilityTimer = tmp33; } diff --git a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c index e4994d13f0..8c5e2ecb36 100644 --- a/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/soh/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -246,7 +246,7 @@ void EnCow_Talk(EnCow* this, PlayState* play) { this->actionFunc = EnCow_CheckForEmptyBottle; } else { this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; - func_8002F2CC(&this->actor, play, 170.0f); + Actor_OfferTalk(&this->actor, play, 170.0f); this->actor.textId = 0x2006; } EnCow_UpdateAnimation(this, play); @@ -265,7 +265,7 @@ void EnCow_Idle(EnCow* this, PlayState* play) { if (GameInteractor_Should(VB_GIVE_ITEM_FROM_COW, true, this)) { this->actionFunc = EnCow_Talk; this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; - func_8002F2CC(&this->actor, play, 170.0f); + Actor_OfferTalk(&this->actor, play, 170.0f); this->actor.textId = 0x2006; } else { return; diff --git a/soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 0c8c8e59eb..7ebd1ee4ea 100644 --- a/soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -257,7 +257,7 @@ void EnCs_HandleTalking(EnCs* this, PlayState* play) { Actor_GetScreenPos(play, &this->actor, &sp2A, &sp28); if ((sp2A >= 0) && (sp2A <= 320) && (sp28 >= 0) && (sp28 <= 240) && - (func_8002F2CC(&this->actor, play, 100.0f))) { + (Actor_OfferTalk(&this->actor, play, 100.0f))) { this->actor.textId = EnCs_GetTextID(this, play); } } diff --git a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 73133dcec8..c45163a6fe 100644 --- a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -270,7 +270,7 @@ void EnDaiku_UpdateText(EnDaiku* this, PlayState* play) { } else { Actor_GetScreenPos(play, &this->actor, &sp2E, &sp2C); if (sp2E >= 0 && sp2E <= 320 && sp2C >= 0 && sp2C <= 240 && this->talkState == ENDAIKU_STATE_CAN_TALK && - func_8002F2CC(&this->actor, play, 100.0f) == 1) { + Actor_OfferTalk(&this->actor, play, 100.0f) == 1) { if (play->sceneNum == SCENE_THIEVES_HIDEOUT) { if (this->stateFlags & ENDAIKU_STATEFLAG_GERUDODEFEATED) { freedCount = 0; diff --git a/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 9852620e0b..cd4d1ad662 100644 --- a/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -242,7 +242,7 @@ void EnDaikuKakariko_HandleTalking(EnDaikuKakariko* this, PlayState* play) { Actor_GetScreenPos(play, &this->actor, &sp26, &sp24); if ((sp26 >= 0) && (sp26 <= 320) && (sp24 >= 0) && (sp24 <= 240) && (this->talkState == 0) && - (func_8002F2CC(&this->actor, play, 100.0f) == 1)) { + (Actor_OfferTalk(&this->actor, play, 100.0f) == 1)) { this->actor.textId = Text_GetFaceReaction(play, maskReactionSets[this->actor.params & 3]); if (this->actor.textId == 0) { diff --git a/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c index f3d9d779e2..7e4d9273d2 100644 --- a/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -336,7 +336,7 @@ void EnDh_Attack(EnDh* this, PlayState* play) { this->actionState++; } else if (this->collider2.base.atFlags & AT_HIT) { this->collider2.base.atFlags &= ~AT_HIT; - func_8002F71C(play, &this->actor, 8.0f, this->actor.shape.rot.y, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 8.0f, this->actor.shape.rot.y, 8.0f); } break; case 3: diff --git a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index cd1a14f1fa..36ed96b298 100644 --- a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -230,7 +230,7 @@ void EnDivingGame_Talk(EnDivingGame* this, PlayState* play) { break; } } - func_8002F2CC(&this->actor, play, 80.0f); + Actor_OfferTalk(&this->actor, play, 80.0f); } } } @@ -520,7 +520,7 @@ void EnDivingGame_Update(Actor* thisx, PlayState* play2) { } if (gSaveContext.timerSeconds == 10) { - func_800F5918(); + Audio_SetFastTempoForTimedMinigame(); } if (this->eyeTimer == 0) { this->eyeTimer = 2; diff --git a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 89044687e0..fc3e05cdbf 100644 --- a/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/soh/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -322,7 +322,7 @@ void EnDns_Idle(EnDns* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; } if (GameInteractor_Should(VB_BUSINESS_SCRUB_SPEAK, this->actor.xzDistToPlayer < 130.0f)) { - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } } diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index e722494779..39f97f2b6f 100644 --- a/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -241,7 +241,7 @@ void EnDntJiji_Cower(EnDntJiji* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { this->actionFunc = EnDntJiji_SetupTalk; } else { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } } diff --git a/soh/src/overlays/actors/ovl_En_Door/z_en_door.c b/soh/src/overlays/actors/ovl_En_Door/z_en_door.c index 2683550946..4ed0b710e9 100644 --- a/soh/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/soh/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -244,7 +244,7 @@ void EnDoor_WaitForCheck(EnDoor* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { this->actionFunc = EnDoor_Check; } else { - func_8002F2CC(&this->actor, play, DOOR_CHECK_RANGE); + Actor_OfferTalk(&this->actor, play, DOOR_CHECK_RANGE); } } diff --git a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c index ce6db14d14..b5be9d2fb3 100644 --- a/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/soh/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -78,7 +78,7 @@ void EnDs_TalkAfterGiveOddPotion(EnDs* this, PlayState* play) { this->actionFunc = EnDs_Talk; } else { this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; - func_8002F2CC(&this->actor, play, 1000.0f); + Actor_OfferTalk(&this->actor, play, 1000.0f); } } @@ -225,7 +225,7 @@ void EnDs_Wait(EnDs* this, PlayState* play) { s16 yawDiff; if (Actor_ProcessTalkRequest(&this->actor, play)) { - if (func_8002F368(play) == EXCH_ITEM_ODD_MUSHROOM) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_ODD_MUSHROOM) { Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); player->actor.textId = 0x504A; @@ -247,7 +247,7 @@ void EnDs_Wait(EnDs* this, PlayState* play) { this->actor.textId = 0x5048; if ((ABS(yawDiff) < 0x2151) && (this->actor.xzDistToPlayer < 200.0f)) { - func_8002F298(&this->actor, play, 100.0f, EXCH_ITEM_ODD_MUSHROOM); + Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 100.0f, EXCH_ITEM_ODD_MUSHROOM); this->unk_1E8 |= 1; } } @@ -263,7 +263,7 @@ void EnDs_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); if (this->unk_1E8 & 1) { - func_80038290(play, &this->actor, &this->unk_1D8, &this->unk_1DE, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_1D8, &this->unk_1DE, this->actor.focus.pos); } else { Math_SmoothStepToS(&this->unk_1D8.x, 0, 6, 0x1838, 100); Math_SmoothStepToS(&this->unk_1D8.y, 0, 6, 0x1838, 100); diff --git a/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 77f6c74c28..7b227584c4 100644 --- a/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -450,7 +450,7 @@ void EnEiyer_Glide(EnEiyer* this, PlayState* play) { EnEiyer_SetupStartAttack(this); } - func_8002F974(&this->actor, NA_SE_EN_EIER_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_EIER_FLY - SFX_FLAG); } void EnEiyer_StartAttack(EnEiyer* this, PlayState* play) { @@ -474,7 +474,7 @@ void EnEiyer_StartAttack(EnEiyer* this, PlayState* play) { this->actor.world.rot.x = -this->actor.shape.rot.x; Math_StepToF(&this->actor.speedXZ, 5.0f, 0.3f); Math_ApproachS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 2, 0x71C); - func_8002F974(&this->actor, NA_SE_EN_EIER_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_EIER_FLY - SFX_FLAG); } void EnEiyer_DiveAttack(EnEiyer* this, PlayState* play) { @@ -489,7 +489,7 @@ void EnEiyer_DiveAttack(EnEiyer* this, PlayState* play) { this->collider.base.atFlags &= ~(AT_ON | AT_HIT); } - func_8002F974(&this->actor, NA_SE_EN_EIER_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_EIER_FLY - SFX_FLAG); } void EnEiyer_Land(EnEiyer* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index 577d70d990..c518aaef07 100644 --- a/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/soh/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -109,7 +109,7 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, PlayState* play) { if ((this->timer == 0) && (play->csCtx.state == CS_STATE_IDLE) && (this->curNumSpawn <= this->maxCurSpawns) && (this->curNumSpawn < 5)) { - floorType = func_80041D4C(&play->colCtx, player->actor.floorPoly, player->actor.floorBgId); + floorType = SurfaceType_GetFloorType(&play->colCtx, player->actor.floorPoly, player->actor.floorBgId); if ((floorType != 4) && (floorType != 7) && (floorType != 12)) { this->numLeeverSpawns = 0; } else if (!(this->reduceLeevers && (this->actor.xzDistToPlayer > 1300.0f))) { diff --git a/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index bbf8b5216d..0ad00ecd4f 100644 --- a/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -337,7 +337,7 @@ void EnExRuppy_WaitToBlowUp(EnExRuppy* this, PlayState* play) { explosionScaleStep = 6; } EffectSsBomb2_SpawnLayered(play, &this->actor.world.pos, &velocity, &accel, explosionScale, explosionScaleStep); - func_8002F71C(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f); Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION); Actor_Kill(&this->actor); } diff --git a/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c index c20ef6e181..ee25570523 100644 --- a/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -231,7 +231,7 @@ s32 EnFd_SpawnCore(EnFd* this, PlayState* play) { } if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_HOOKSHOT_ATTACHED)) { - func_8002DE04(play, &this->actor, this->actor.child); + Actor_SwapHookshotAttachment(play, &this->actor, this->actor.child); } this->coreActive = true; @@ -312,7 +312,8 @@ s32 EnFd_ColliderCheck(EnFd* this, PlayState* play) { } this->attackTimer = 30; Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT); - func_8002F71C(play, &this->actor, this->actor.speedXZ + 2.0f, this->actor.yawTowardsPlayer, 6.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, this->actor.speedXZ + 2.0f, + this->actor.yawTowardsPlayer, 6.0f); } return false; } @@ -537,9 +538,9 @@ void EnFd_SpinAndSpawnFire(EnFd* this, PlayState* play) { f32 rotSpeed; if ((this->spinTimer < 31) && (this->invincibilityTimer == 0)) { - func_8002F974(&this->actor, NA_SE_EN_FLAME_FIRE_ATTACK - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_FLAME_FIRE_ATTACK - SFX_FLAG); } else { - func_8002F974(&this->actor, NA_SE_EN_FLAME_ROLL - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_FLAME_ROLL - SFX_FLAG); } if (DECR(this->spinTimer) != 0) { @@ -628,7 +629,7 @@ void EnFd_Run(EnFd* this, PlayState* play) { EnFd_GetPosAdjAroundCircle(&adjPos, this, this->runRadius, this->runDir); Math_SmoothStepToS(&this->actor.shape.rot.y, Math_FAtan2F(adjPos.x, adjPos.z) * (0x8000 / M_PI), 4, 0xFA0, 1); this->actor.world.rot = this->actor.shape.rot; - func_8002F974(&this->actor, NA_SE_EN_FLAME_RUN - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_FLAME_RUN - SFX_FLAG); if (this->skelAnime.curFrame == 6.0f || this->skelAnime.curFrame == 13.0f || this->skelAnime.curFrame == 28.0f) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FLAME_KICK); } diff --git a/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 40024da88d..bca2c05e76 100644 --- a/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -213,7 +213,7 @@ void EnFhgFire_LightningStrike(EnFhgFire* this, PlayState* play) { (s16)(Rand_ZeroOne() * 100.0f) + 240, FHGFLASH_LIGHTBALL_GREEN); } } - func_80033E88(&this->actor, play, 4, 10); + Actor_RequestQuakeAndRumble(&this->actor, play, 4, 10); } break; @@ -496,7 +496,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) { Audio_PlaySoundGeneral(NA_SE_IT_SHIELD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); } else { if (bossGnd->flyMode == GND_FLY_NEUTRAL) { angleModX = Rand_CenteredFloat(0x2000); @@ -526,7 +526,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) { Audio_PlaySoundGeneral(NA_SE_IT_SWORD_REFLECT_MG, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(this->actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64); + Rumble_Request(this->actor.xyzDistToPlayerSq, 0xB4, 0x14, 0x64); } } else if (sqrtf(SQ(dxL) + SQ(dyL) + SQ(dzL)) <= 25.0f) { killMode = BALL_BURST; @@ -534,7 +534,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) { if ((bossGnd->flyMode >= GND_FLY_VOLLEY) && (this->work[FHGFIRE_RETURN_COUNT] >= 2)) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FANTOM_LAUGH); } - func_8002F698(play, &this->actor, 3.0f, this->actor.world.rot.y, 0.0f, 3, 0x10); + Actor_SetPlayerKnockback(play, &this->actor, 3.0f, this->actor.world.rot.y, 0.0f, 3, 0x10); } break; case FHGFIRE_LIGHT_BLUE: diff --git a/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index ac984c9bb8..de3992a99c 100644 --- a/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -197,7 +197,7 @@ void EnFireRock_Fall(EnFireRock* this, PlayState* play) { switch (this->type) { case FIRE_ROCK_SPAWNED_FALLING1: case FIRE_ROCK_SPAWNED_FALLING2: - func_80033E88(&this->actor, play, 5, 2); + Actor_RequestQuakeAndRumble(&this->actor, play, 5, 2); case FIRE_ROCK_BROKEN_PIECE1: Actor_SpawnFloorDustRing(play, &this->actor, &this->actor.world.pos, this->actor.shape.shadowScale, 1, 8.0f, 500, 10, false); @@ -363,7 +363,7 @@ void EnFireRock_Update(Actor* thisx, PlayState* play) { this->collider.base.atFlags &= ~2; if (this->collider.base.at == playerActor) { if (!(player->stateFlags1 & PLAYER_STATE1_DAMAGED)) { - func_8002F758(play, thisx, 2.0f, -player->actor.world.rot.y, 3.0f, 4); + Actor_SetPlayerKnockbackSmall(play, thisx, 2.0f, -player->actor.world.rot.y, 3.0f, 4); } return; } diff --git a/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index caea853340..32ccea05af 100644 --- a/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -588,7 +588,7 @@ void EnFloormas_Slide(EnFloormas* this, PlayState* play) { func_800286CC(play, &pos, &velocity, &accel, 450, 100); - func_8002F974(&this->actor, NA_SE_EN_FLOORMASTER_SLIDING); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_FLOORMASTER_SLIDING); } void EnFloormas_Charge(EnFloormas* this, PlayState* play) { @@ -935,7 +935,7 @@ void EnFloormas_Merge(EnFloormas* this, PlayState* play) { } } } - func_8002F974(&this->actor, NA_SE_EN_FLOORMASTER_RESTORE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_FLOORMASTER_RESTORE - SFX_FLAG); } void EnFloormas_SmWait(EnFloormas* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 7ccea3d70b..314b861343 100644 --- a/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -118,7 +118,7 @@ s32 func_80A1D94C(EnFu* this, PlayState* play, u16 textID, EnFuActionFunc action yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if ((ABS(yawDiff) < 0x2301) && (this->actor.xzDistToPlayer < 100.0f)) { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } else { this->behaviorFlags |= FU_RESET_LOOK_ANGLE; } @@ -237,7 +237,7 @@ void EnFu_WaitAdult(EnFu* this, PlayState* play) { } else if (ABS(yawDiff) < 0x2301) { if (this->actor.xzDistToPlayer < 100.0f) { this->actor.textId = 0x5034; - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); player->stateFlags2 |= PLAYER_STATE2_NEAR_OCARINA_ACTOR; } } @@ -263,7 +263,7 @@ void EnFu_Update(Actor* thisx, PlayState* play) { Math_SmoothStepToS(&this->unk_2A2.y, 0, 6, 6200, 100); this->behaviorFlags &= ~FU_RESET_LOOK_ANGLE; } else { - func_80038290(play, &this->actor, &this->lookAngleOffset, &this->unk_2A2, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->lookAngleOffset, &this->unk_2A2, this->actor.focus.pos); } } diff --git a/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c index fbfbf92b02..a555deea45 100644 --- a/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -511,7 +511,7 @@ void EnFz_BlowSmoke(EnFz* this, PlayState* play) { } else if (this->timer >= 11) { isTimerMod8 = false; primAlpha = 150; - func_8002F974(&this->actor, NA_SE_EN_FREEZAD_BREATH - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_FREEZAD_BREATH - SFX_FLAG); if ((this->timer - 10) < 16) { // t < 26 primAlpha = (this->timer * 10) - 100; @@ -623,7 +623,7 @@ void EnFz_BlowSmokeStationary(EnFz* this, PlayState* play) { } else { isTimerMod8 = false; primAlpha = 150; - func_8002F974(&this->actor, NA_SE_EN_FREEZAD_BREATH - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_FREEZAD_BREATH - SFX_FLAG); if ((this->counter & 0x3F) >= 48) { primAlpha = 630 - ((this->counter & 0x3F) * 10); diff --git a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c index ff4de22119..1f70935593 100644 --- a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -288,7 +288,7 @@ void func_80A2F83C(EnGb* this, PlayState* play) { } if (Actor_ProcessTalkRequest(&this->dyna.actor, play)) { if (GameInteractor_Should(VB_SELL_POES_TO_POE_COLLECTOR, true, this)) { - switch (func_8002F368(play)) { + switch (Actor_GetPlayerExchangeItemId(play)) { case EXCH_ITEM_NONE: func_80A2F180(this); this->actionFunc = func_80A2F94C; @@ -306,7 +306,7 @@ void func_80A2F83C(EnGb* this, PlayState* play) { return; } if (this->dyna.actor.xzDistToPlayer < 100.0f) { - func_8002F298(&this->dyna.actor, play, 100.0f, EXCH_ITEM_POE); + Actor_OfferTalkExchangeEquiCylinder(&this->dyna.actor, play, 100.0f, EXCH_ITEM_POE); } } diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index ab4ec68601..3f9f6cd340 100644 --- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -204,7 +204,7 @@ s32 EnGe1_SetTalkAction(EnGe1* this, PlayState* play, u16 textId, f32 arg3, EnGe this->actor.textId = textId; if (this->actor.xzDistToPlayer < arg3) { - func_8002F2CC(&this->actor, play, arg3); + Actor_OfferTalk(&this->actor, play, arg3); } return false; @@ -572,7 +572,7 @@ void EnGe1_TalkWinPrize_Archery(EnGe1* this, PlayState* play) { this->actionFunc = EnGe1_BeginGiveItem_Archery; this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; } else { - func_8002F2CC(&this->actor, play, 200.0f); + Actor_OfferTalk(&this->actor, play, 200.0f); } } @@ -642,7 +642,7 @@ void EnGe1_TalkNoPrize_Archery(EnGe1* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { this->actionFunc = EnGe1_TalkOfferPlay_Archery; } else { - func_8002F2CC(&this->actor, play, 300.0f); + Actor_OfferTalk(&this->actor, play, 300.0f); } } @@ -713,7 +713,7 @@ void EnGe1_TurnToFacePlayer(EnGe1* this, PlayState* play) { if (ABS(angleDiff) <= 0x4000) { Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 6, 4000, 100); this->actor.world.rot.y = this->actor.shape.rot.y; - func_80038290(play, &this->actor, &this->headRot, &this->unk_2A2, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->unk_2A2, this->actor.focus.pos); } else { if (angleDiff < 0) { Math_SmoothStepToS(&this->headRot.y, -0x2000, 6, 6200, 0x100); @@ -730,7 +730,7 @@ void EnGe1_LookAtPlayer(EnGe1* this, PlayState* play) { s16 angleDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if ((ABS(angleDiff) <= 0x4300) && (this->actor.xzDistToPlayer < 100.0f)) { - func_80038290(play, &this->actor, &this->headRot, &this->unk_2A2, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->unk_2A2, this->actor.focus.pos); } else { Math_SmoothStepToS(&this->headRot.x, 0, 6, 6200, 100); Math_SmoothStepToS(&this->headRot.y, 0, 6, 6200, 100); diff --git a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 61efee28bc..4eb8e97620 100644 --- a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -411,7 +411,7 @@ void EnGe2_TurnToFacePlayer(EnGe2* this, PlayState* play) { if (ABS(angleDiff) <= 0x4000) { Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 6, 4000, 100); this->actor.world.rot.y = this->actor.shape.rot.y; - func_80038290(play, &this->actor, &this->headRot, &this->unk_2EE, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->unk_2EE, this->actor.focus.pos); } else { if (angleDiff < 0) { Math_SmoothStepToS(&this->headRot.y, -0x2000, 6, 6200, 0x100); @@ -427,7 +427,7 @@ void EnGe2_TurnToFacePlayer(EnGe2* this, PlayState* play) { void EnGe2_LookAtPlayer(EnGe2* this, PlayState* play) { if ((ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) <= 0x4300) && (this->actor.xzDistToPlayer < 200.0f)) { - func_80038290(play, &this->actor, &this->headRot, &this->unk_2EE, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->unk_2EE, this->actor.focus.pos); } else { Math_SmoothStepToS(&this->headRot.x, 0, 6, 6200, 100); Math_SmoothStepToS(&this->headRot.y, 0, 6, 6200, 100); @@ -488,7 +488,7 @@ void EnGe2_ForceTalk(EnGe2* this, PlayState* play) { } else { this->actor.textId = 0x6004; this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; - func_8002F1C4(&this->actor, play, 300.0f, 300.0f, 0); + Actor_OfferTalkExchange(&this->actor, play, 300.0f, 300.0f, 0); } EnGe2_LookAtPlayer(this, play); } @@ -547,7 +547,7 @@ void EnGe2_UpdateFriendly(Actor* thisx, PlayState* play) { this->actor.textId = 0x6005; if (this->actor.xzDistToPlayer < 100.0f) { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } EnGe2_MoveAndBlink(this, play); diff --git a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 8e2264adee..7bfb27f41e 100644 --- a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -103,7 +103,7 @@ void EnGe3_TurnToFacePlayer(EnGe3* this, PlayState* play) { if (ABS(angleDiff) <= 0x4000) { Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 6, 4000, 100); this->actor.world.rot.y = this->actor.shape.rot.y; - func_80038290(play, &this->actor, &this->headRot, &this->unk_306, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->unk_306, this->actor.focus.pos); } else { if (angleDiff < 0) { Math_SmoothStepToS(&this->headRot.y, -0x2000, 6, 6200, 0x100); @@ -119,7 +119,7 @@ void EnGe3_TurnToFacePlayer(EnGe3* this, PlayState* play) { void EnGe3_LookAtPlayer(EnGe3* this, PlayState* play) { if ((ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) <= 0x2300) && (this->actor.xzDistToPlayer < 100.0f)) { - func_80038290(play, &this->actor, &this->headRot, &this->unk_306, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->unk_306, this->actor.focus.pos); } else { Math_SmoothStepToS(&this->headRot.x, 0, 6, 6200, 100); Math_SmoothStepToS(&this->headRot.y, 0, 6, 6200, 100); @@ -172,7 +172,7 @@ void EnGe3_ForceTalk(EnGe3* this, PlayState* play) { } this->actor.textId = 0x6004; this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; - func_8002F1C4(&this->actor, play, 300.0f, 300.0f, 0); + Actor_OfferTalkExchange(&this->actor, play, 300.0f, 300.0f, 0); } EnGe3_LookAtPlayer(this, play); } @@ -217,7 +217,7 @@ void EnGe3_UpdateWhenNotTalking(Actor* thisx, PlayState* play) { } else { this->actor.textId = 0x6005; if (this->actor.xzDistToPlayer < 100.0f) { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } diff --git a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index f1b68528bf..9339fb51ee 100644 --- a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -921,7 +921,7 @@ void EnGeldB_SpinAttack(EnGeldB* this, PlayState* play) { } else if (this->swordCollider.base.atFlags & AT_HIT) { this->swordCollider.base.atFlags &= ~AT_HIT; if (&player->actor == this->swordCollider.base.at) { - func_8002F71C(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f); this->spinAttackState = 2; Player_SetCsActionWithHaltedActors(play, &this->actor, 0x18); Message_StartTextbox(play, 0x6003, &this->actor); diff --git a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 1429941596..46f9864331 100644 --- a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -187,7 +187,7 @@ void func_80A3DB04(EnGm* this, PlayState* play) { this->actionFunc = func_80A3DBF4; } else if ((this->collider.base.ocFlags1 & OC1_HIT) || (SQ(dx) + SQ(dz)) < SQ(100.0f)) { this->collider.base.acFlags &= ~AC_HIT; - func_8002F2CC(&this->actor, play, 415.0f); + Actor_OfferTalk(&this->actor, play, 415.0f); } } @@ -227,7 +227,7 @@ void func_80A3DC44(EnGm* this, PlayState* play) { } if ((this->collider.base.ocFlags1 & OC1_HIT) || (SQ(dx) + SQ(dz)) < SQ(100.0f)) { this->collider.base.acFlags &= ~AC_HIT; - func_8002F2CC(&this->actor, play, 415.0f); + Actor_OfferTalk(&this->actor, play, 415.0f); } } diff --git a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c index 949af28895..36712b2d9c 100644 --- a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -345,7 +345,7 @@ s32 EnGo_UpdateTalking(PlayState* play, Actor* thisx, s16* talkState, f32 intera } else if (Actor_ProcessTalkRequest(thisx, play)) { *talkState = NPC_TALK_STATE_TALKING; return true; - } else if (!func_8002F2CC(thisx, play, interactRange)) { + } else if (!Actor_OfferTalk(thisx, play, interactRange)) { return false; } else { thisx->textId = getTextId(play, thisx); @@ -599,7 +599,7 @@ void func_80A3F908(EnGo* this, PlayState* play) { if (((this->actor.params & 0xF0) == 0x90) && (dialogStarted == true)) { if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_SWORD_BROKEN) { - if (func_8002F368(play) == EXCH_ITEM_SWORD_BROKEN) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_SWORD_BROKEN) { if (Flags_GetInfTable(INFTABLE_B4)) { this->actor.textId = 0x3055; } else { @@ -612,7 +612,7 @@ void func_80A3F908(EnGo* this, PlayState* play) { } if (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_EYEDROPS) { - if (func_8002F368(play) == EXCH_ITEM_EYEDROPS) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_EYEDROPS) { this->actor.textId = 0x3059; } else { this->actor.textId = 0x3058; @@ -716,7 +716,7 @@ void EnGo_StopRolling(EnGo* this, PlayState* play) { if (this->collider.base.ocFlags2 & OC2_HIT_PLAYER) { this->collider.base.ocFlags2 &= ~OC2_HIT_PLAYER; play->damagePlayer(play, -4); - func_8002F71C(play, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f); this->unk_20E = 0x10; } } @@ -1031,7 +1031,7 @@ void EnGo_Update(Actor* thisx, PlayState* play) { if (this->actionFunc == EnGo_BiggoronActionFunc || this->actionFunc == EnGo_FireGenericActionFunc || this->actionFunc == func_80A40B1C) { - func_80034F54(play, this->jointTable, this->morphTable, 18); + Actor_UpdateFidgetTables(play, this->jointTable, this->morphTable, 18); } EnGo_UpdateShadow(this); diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 58835cc2ab..2701cf2295 100644 --- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -613,7 +613,7 @@ s16 EnGo2_UpdateTalkStateGoronDmtBiggoron(PlayState* play, EnGo2* this) { case TEXT_STATE_DONE_FADING: switch (this->actor.textId) { case 0x305E: - if (func_8002F368(play) != EXCH_ITEM_CLAIM_CHECK) { + if (Actor_GetPlayerExchangeItemId(play) != EXCH_ITEM_CLAIM_CHECK) { break; } case 0x3059: @@ -834,7 +834,7 @@ s32 func_80A44790(EnGo2* this, PlayState* play) { } else if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) { this->interactInfo.talkState = EnGo2_UpdateTalkState(play, &this->actor); return false; - } else if (func_8002F2CC(&this->actor, play, this->interactRange)) { + } else if (Actor_OfferTalk(&this->actor, play, this->interactRange)) { this->actor.textId = EnGo2_GetTextId(play, &this->actor); } return false; @@ -912,7 +912,7 @@ s32 func_80A44AB0(EnGo2* this, PlayState* play) { arg2 = this->actionFunc == EnGo2_ContinueRolling ? 1.5f : this->actor.speedXZ * 1.5f; play->damagePlayer(play, -4); - func_8002F71C(play, &this->actor, arg2, this->actor.yawTowardsPlayer, 6.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, arg2, this->actor.yawTowardsPlayer, 6.0f); Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT); this->collider.base.ocFlags1 &= ~0x8; } @@ -1033,7 +1033,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) { if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) { if (GameInteractor_Should(VB_BIGGORON_CONSIDER_TRADE_COMPLETE, gSaveContext.bgsFlag)) { - if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_CLAIM_CHECK) { this->actor.textId = 0x3003; } else { this->actor.textId = 0x305E; @@ -1042,7 +1042,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) { } else if (!GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_COLLECTED, gSaveContext.bgsFlag) && (INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_CLAIM_CHECK)) { - if (func_8002F368(play) == EXCH_ITEM_CLAIM_CHECK) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_CLAIM_CHECK) { if (GameInteractor_Should(VB_BIGGORON_CONSIDER_SWORD_FORGED, Environment_GetBgsDayCount() >= 3)) { textId = 0x305E; } else { @@ -1061,7 +1061,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) { } else if ((INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_PRESCRIPTION) && (INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_CLAIM_CHECK)) { - if (func_8002F368(play) == EXCH_ITEM_EYEDROPS) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_EYEDROPS) { this->actor.textId = 0x3059; } else { this->actor.textId = 0x3058; @@ -1072,7 +1072,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, PlayState* play, Player* player) { player->actor.textId = this->actor.textId; } else if (INV_CONTENT(ITEM_TRADE_ADULT) <= ITEM_SWORD_BROKEN) { - if (func_8002F368(play) == EXCH_ITEM_SWORD_BROKEN) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_SWORD_BROKEN) { if (Flags_GetInfTable(INFTABLE_B4)) { textId = 0x3055; } else { @@ -2018,7 +2018,7 @@ void EnGo2_Update(Actor* thisx, PlayState* play) { } this->actionFunc(this, play); if (this->unk_211 == true) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 18); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 18); } func_80A45288(this, play); EnGo2_EyeMouthTexState(this); diff --git a/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 0eee785dd9..64537135e9 100644 --- a/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -594,7 +594,7 @@ void EnGoroiwa_Roll(EnGoroiwa* this, PlayState* play) { EnGoroiwa_FaceNextWaypoint(this, play); } } - func_8002F6D4(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 0); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 0); osSyncPrintf(VT_FGCOL(CYAN)); osSyncPrintf("Player ぶっ飛ばし\n"); // "Player knocked down" osSyncPrintf(VT_RST); @@ -680,7 +680,7 @@ void EnGoroiwa_SetupMoveUp(EnGoroiwa* this) { void EnGoroiwa_MoveUp(EnGoroiwa* this, PlayState* play) { if (this->collider.base.atFlags & AT_HIT) { this->collider.base.atFlags &= ~AT_HIT; - func_8002F6D4(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 4); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 4); Player_PlaySfx(&GET_PLAYER(play)->actor, NA_SE_PL_BODY_HIT); if ((this->actor.home.rot.z & 1) == 1) { this->collisionDisabledTimer = 50; @@ -705,7 +705,7 @@ void EnGoroiwa_SetupMoveDown(EnGoroiwa* this) { void EnGoroiwa_MoveDown(EnGoroiwa* this, PlayState* play) { if (this->collider.base.atFlags & AT_HIT) { this->collider.base.atFlags &= ~AT_HIT; - func_8002F6D4(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 4); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 2.0f, this->actor.yawTowardsPlayer, 0.0f, 4); Player_PlaySfx(&GET_PLAYER(play)->actor, NA_SE_PL_BODY_HIT); if ((this->actor.home.rot.z & 1) == 1) { this->collisionDisabledTimer = 50; diff --git a/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 50c9e201bf..782ab288ac 100644 --- a/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -186,7 +186,7 @@ void func_80A4E648(EnGs* this, PlayState* play) { } else { Actor_GetScreenPos(play, &this->actor, &sp26, &sp24); if ((sp26 >= 0) && (sp26 <= SCREEN_WIDTH) && (sp24 >= 0) && (sp24 <= SCREEN_HEIGHT) && (this->unk_19C != 3)) { - if (func_8002F2CC(&this->actor, play, 40.0f) == 1) { + if (Actor_OfferTalk(&this->actor, play, 40.0f) == 1) { if (IS_RANDO) { // if we're rando'd, always use the non-mask text id this->actor.textId = 0x2053; @@ -354,7 +354,7 @@ void func_80A4ED34(EnGs* this, PlayState* play) { (s16)Rand_ZeroFloat(50.0f) + 200, 40, 15); } - func_8002F974(&this->actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); if (this->unk_200++ >= 40) { this->unk_19E |= 0x10; this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; @@ -377,7 +377,7 @@ void func_80A4ED34(EnGs* this, PlayState* play) { this->unk_19E |= 8; this->actionFunc = func_80A4F700; } else { - func_8002F974(&this->actor, NA_SE_EV_STONE_LAUNCH - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_STONE_LAUNCH - SFX_FLAG); } Actor_MoveXZGravity(&this->actor); diff --git a/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c index bc73c062e9..b107dc08d4 100644 --- a/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -134,7 +134,7 @@ void func_80A50518(EnGuest* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { this->actionFunc = func_80A5057C; } else if (this->actor.xzDistToPlayer < 100.0f) { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } @@ -163,7 +163,7 @@ void func_80A505CC(Actor* thisx, PlayState* play) { } Npc_TrackPoint(&this->actor, &this->interactInfo, 6, NPC_TRACKING_HEAD_AND_TORSO); - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[this->osAnimeBankIndex].segment); diff --git a/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 598c27291c..cd158bdc73 100644 --- a/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -417,7 +417,7 @@ void func_80A53AD4(EnHeishi2* this, PlayState* play) { } this->unk_300 = TEXT_STATE_DONE; if (Actor_ProcessTalkRequest(&this->actor, play)) { - exchangeItemId = func_8002F368(play); + exchangeItemId = Actor_GetPlayerExchangeItemId(play); if (GameInteractor_Should(VB_HEISHI2_ACCEPT_ITEM_AS_ZELDAS_LETTER, exchangeItemId == EXCH_ITEM_LETTER_ZELDA, exchangeItemId)) { Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); @@ -431,7 +431,7 @@ void func_80A53AD4(EnHeishi2* this, PlayState* play) { yawDiffTemp = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; yawDiff = ABS(yawDiffTemp); if (!(120.0f < this->actor.xzDistToPlayer) && (yawDiff < 0x4300)) { - func_8002F298(&this->actor, play, 100.0f, EXCH_ITEM_LETTER_ZELDA); + Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 100.0f, EXCH_ITEM_LETTER_ZELDA); } } } @@ -760,7 +760,7 @@ void func_80A5475C(EnHeishi2* this, PlayState* play) { ((yawDiff = ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)), !(this->actor.xzDistToPlayer > 120.0f)) && (yawDiff < 0x4300))) { - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } @@ -793,7 +793,7 @@ void EnHeishi2_Update(Actor* thisx, PlayState* play) { if ((this->type == 2) || (this->type == 5)) { this->actor.focus.pos.y = 70.0f; Actor_SetFocus(&this->actor, 70.0f); - func_80038290(play, &this->actor, &this->unk_260, &this->unk_26C, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_260, &this->unk_26C, this->actor.focus.pos); } this->unk_2FC++; diff --git a/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index 2180f71cd3..be5506ffb8 100644 --- a/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -255,7 +255,7 @@ void func_80A56874(EnHeishi4* this, PlayState* play) { this->actionFunc = func_80A56900; } } else { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } @@ -268,7 +268,7 @@ void func_80A56900(EnHeishi4* this, PlayState* play) { void func_80A56994(EnHeishi4* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); - func_80038290(play, &this->actor, &this->headRot, &this->torsoRot, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->torsoRot, this->actor.focus.pos); if ((this->unk_282 == Message_GetState(&play->msgCtx)) && Message_ShouldAdvance(play)) { Message_CloseTextbox(play); Flags_SetInfTable(INFTABLE_6C); @@ -349,7 +349,7 @@ void func_80A56B40(EnHeishi4* this, PlayState* play) { } } } - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } /*Function that allows child Link to exit from Market entrance to Hyrule Field diff --git a/soh/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/soh/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 938395ba4c..49ee741d0f 100644 --- a/soh/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/soh/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -335,7 +335,7 @@ void EnHintnuts_CheckProximity(EnHintnuts* this, PlayState* play) { } if (this->actor.xzDistToPlayer < 130.0f) { this->actor.textId = this->textIdCopy; - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } } diff --git a/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 1f66c4a229..a5fba5429c 100644 --- a/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -321,7 +321,7 @@ void EnHonotrap_SetupFlameDrop(EnHonotrap* this) { void EnHonotrap_FlameDrop(EnHonotrap* this, PlayState* play) { if ((this->collider.cyl.base.atFlags & AT_HIT) || (this->timer <= 0)) { if ((this->collider.cyl.base.atFlags & AT_HIT) && !(this->collider.cyl.base.atFlags & AT_BOUNCED)) { - func_8002F71C(play, &this->actor, 5.0f, this->actor.yawTowardsPlayer, 0.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 5.0f, this->actor.yawTowardsPlayer, 0.0f); } this->actor.velocity.x = this->actor.velocity.y = this->actor.velocity.z = 0.0f; EnHonotrap_SetupFlameVanish(this); diff --git a/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c index fe8bd8b83a..5f6511b0dc 100644 --- a/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -606,7 +606,7 @@ void EnHorse_UpdateIngoRaceInfo(EnHorse* this, PlayState* play, RaceInfo* raceIn this->ingoRaceFlags &= ~0x1; } -void EnHorse_PlayWalkingSound(EnHorse* this) { +void EnHorse_PlayWalkingSfx(EnHorse* this) { if (sAnimSoundFrames[this->soundTimer] < this->curFrame) { if (this->soundTimer == 0 && (sAnimSoundFrames[1] < this->curFrame)) { return; @@ -653,7 +653,7 @@ s32 func_80A5BBBC(PlayState* play, EnHorse* this, Vec3f* pos) { return false; } eyeDist = Math3D_Vec3f_DistXYZ(pos, &play->view.eye); - return func_800314D4(play, &this->actor, &sp24, sp20) || eyeDist < 100.0f; + return Actor_CullingVolumeTest(play, &this->actor, &sp24, sp20) || eyeDist < 100.0f; } void EnHorse_IdleAnimSounds(EnHorse* this, PlayState* play) { @@ -1170,7 +1170,7 @@ void EnHorse_MountedTurn(EnHorse* this, PlayState* play) { s16 stickAngle; this->actor.speedXZ = 0; - EnHorse_PlayWalkingSound(this); + EnHorse_PlayWalkingSfx(this); EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); if (stickMag > 10.0f) { if (!EnHorse_PlayerCanMove(this, play)) { @@ -1235,7 +1235,7 @@ void EnHorse_MountedWalk(EnHorse* this, PlayState* play) { f32 stickMag; s16 stickAngle; - EnHorse_PlayWalkingSound(this); + EnHorse_PlayWalkingSfx(this); EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); if (this->noInputTimerMax == 0.0f || (this->noInputTimer > 0.0f && this->noInputTimer < this->noInputTimerMax - 20.0f)) { @@ -1315,7 +1315,7 @@ void EnHorse_MountedTrot(EnHorse* this, PlayState* play) { this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.375f; if (SkelAnime_Update(&this->skin.skelAnime)) { EnHorse_PlayTrottingSound(this); - func_800AA000(0.0f, 60, 8, 255); + Rumble_Request(0.0f, 60, 8, 255); if (this->actor.speedXZ >= 6.0f) { EnHorse_StartGallopingInterruptable(this); } else if (this->actor.speedXZ < 3.0f) { @@ -1383,7 +1383,7 @@ void EnHorse_MountedGallop(EnHorse* this, PlayState* play) { this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.3f; if (SkelAnime_Update(&this->skin.skelAnime)) { EnHorse_PlayGallopingSound(this); - func_800AA000(0, 120, 8, 255); + Rumble_Request(0, 120, 8, 255); if (EnHorse_PlayerCanMove(this, play) == true) { if (stickMag >= 10.0f && Math_CosS(stickAngle) <= -0.5f) { EnHorse_StartBraking(this, play); @@ -1407,7 +1407,7 @@ void EnHorse_StartRearing(EnHorse* this) { Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - func_800AA000(0.0f, 180, 20, 100); + Rumble_Request(0.0f, 180, 20, 100); Animation_Change(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], 1.0f, 0.0f, Animation_GetLastFrame(sAnimationHeaders[this->type][this->animationIdx]), ANIMMODE_ONCE, -3.0f); } @@ -1422,7 +1422,7 @@ void EnHorse_MountedRearing(EnHorse* this, PlayState* play) { this->stateFlags |= ENHORSE_LAND2_SOUND; Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND2, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0, 180, 20, 100); + Rumble_Request(0, 180, 20, 100); } } @@ -1479,7 +1479,7 @@ void EnHorse_Stopping(EnHorse* this, PlayState* play) { Audio_PlaySoundGeneral(NA_SE_EV_HORSE_NEIGH, &this->unk_21C, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } - func_800AA000(0.0f, 180, 20, 100); + Rumble_Request(0.0f, 180, 20, 100); this->stateFlags &= ~ENHORSE_STOPPING_NEIGH_SOUND; } else { EnHorse_StartMountedIdleResetAnim(this); @@ -1524,7 +1524,7 @@ void EnHorse_Reverse(EnHorse* this, PlayState* play) { s16 turnAmount; Player* player = GET_PLAYER(play); - EnHorse_PlayWalkingSound(this); + EnHorse_PlayWalkingSfx(this); EnHorse_StickDirection(&this->curStick, &stickMag, &stickAngle); if (EnHorse_PlayerCanMove(this, play) == true) { if (this->noInputTimerMax == 0.0f || @@ -1610,7 +1610,7 @@ void EnHorse_StartLowJump(EnHorse* this, PlayState* play) { Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0.0f, 170, 10, 10); + Rumble_Request(0.0f, 170, 10, 10); } void EnHorse_Stub1(EnHorse* this) { @@ -1645,7 +1645,7 @@ void EnHorse_LowJump(EnHorse* this, PlayState* play) { (curFrame > 17.0f && this->actor.world.pos.y < this->actor.floorHeight - this->actor.velocity.y + 80.0f)) { Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0.0f, 255, 10, 80); + Rumble_Request(0.0f, 255, 10, 80); this->stateFlags &= ~ENHORSE_JUMPING; this->actor.gravity = -3.5f; this->actor.world.pos.y = this->actor.floorHeight; @@ -1685,7 +1685,7 @@ void EnHorse_StartHighJump(EnHorse* this, PlayState* play) { this->stateFlags |= ENHORSE_CALC_RIDER_POS; Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0.0f, 170, 10, 10); + Rumble_Request(0.0f, 170, 10, 10); } void EnHorse_Stub2(EnHorse* this) { @@ -1721,7 +1721,7 @@ void EnHorse_HighJump(EnHorse* this, PlayState* play) { (curFrame > 23.0f && this->actor.world.pos.y < this->actor.floorHeight - this->actor.velocity.y + 80.0f)) { Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0.0f, 255, 10, 80); + Rumble_Request(0.0f, 255, 10, 80); this->stateFlags &= ~ENHORSE_JUMPING; this->actor.gravity = -3.5f; this->actor.world.pos.y = this->actor.floorHeight; @@ -1959,7 +1959,7 @@ void EnHorse_FollowPlayer(EnHorse* this, PlayState* play) { this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.375f; } else if (this->animationIdx == ENHORSE_ANIM_WALK) { this->actor.speedXZ = 3; - EnHorse_PlayWalkingSound(this); + EnHorse_PlayWalkingSfx(this); this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.75f; } else { this->actor.speedXZ = 0; @@ -2081,7 +2081,7 @@ void EnHorse_UpdateIngoRace(EnHorse* this, PlayState* play) { if (this->animationIdx == ENHORSE_ANIM_IDLE || this->animationIdx == ENHORSE_ANIM_WHINNEY) { EnHorse_IdleAnimSounds(this, play); } else if (this->animationIdx == ENHORSE_ANIM_WALK) { - EnHorse_PlayWalkingSound(this); + EnHorse_PlayWalkingSfx(this); } EnHorse_UpdateIngoRaceInfo(this, play, &sIngoRace); @@ -2145,7 +2145,7 @@ void EnHorse_CsMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorCue* action if (SkelAnime_Update(&this->skin.skelAnime)) { EnHorse_PlayGallopingSound(this); - func_800AA000(0.0f, 120, 8, 255); + Rumble_Request(0.0f, 120, 8, 255); Animation_PlayOnceSetSpeed(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], this->actor.speedXZ * 0.3f); } @@ -2177,7 +2177,7 @@ void EnHorse_CsPlayHighJumpAnim(EnHorse* this, PlayState* play) { this->stateFlags |= ENHORSE_CALC_RIDER_POS; Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0.0f, 170, 10, 10); + Rumble_Request(0.0f, 170, 10, 10); } void EnHorse_CsJumpInit(EnHorse* this, PlayState* play, CsCmdActorCue* action) { @@ -2222,7 +2222,7 @@ void EnHorse_CsJump(EnHorse* this, PlayState* play, CsCmdActorCue* action) { this->cutsceneFlags |= 1; Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0.0f, 255, 10, 80); + Rumble_Request(0.0f, 255, 10, 80); this->stateFlags &= ~ENHORSE_JUMPING; this->actor.gravity = -3.5f; this->actor.velocity.y = 0; @@ -2306,7 +2306,7 @@ void EnHorse_CsWarpMoveToPoint(EnHorse* this, PlayState* play, CsCmdActorCue* ac if (SkelAnime_Update(&this->skin.skelAnime)) { EnHorse_PlayGallopingSound(this); - func_800AA000(0.0f, 120, 8, 255); + Rumble_Request(0.0f, 120, 8, 255); Animation_PlayOnceSetSpeed(&this->skin.skelAnime, sAnimationHeaders[this->type][this->animationIdx], this->actor.speedXZ * 0.3f); } @@ -2490,12 +2490,12 @@ void EnHorse_UpdateHbaAnim(EnHorse* this) { animSpeed = this->actor.speedXZ * 0.25f; Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0.0f, 60, 8, 255); + Rumble_Request(0.0f, 60, 8, 255); } else if (this->animationIdx == ENHORSE_ANIM_GALLOP) { animSpeed = this->actor.speedXZ * 0.2f; Audio_PlaySoundGeneral(NA_SE_EV_HORSE_RUN, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0.0f, 120, 8, 255); + Rumble_Request(0.0f, 120, 8, 255); } else { animSpeed = 1.0f; } @@ -2514,19 +2514,19 @@ void EnHorse_UpdateHbaAnim(EnHorse* this) { void EnHorse_UpdateHorsebackArchery(EnHorse* this, PlayState* play) { f32 playSpeed; - s32 sp20; + s32 isFanfarePlaying; if (this->animationIdx == ENHORSE_ANIM_WALK) { - EnHorse_PlayWalkingSound(this); + EnHorse_PlayWalkingSfx(this); } if (play->interfaceCtx.hbaAmmo == 0) { this->hbaTimer++; } - sp20 = func_800F5A58(NA_BGM_HORSE_GOAL); + isFanfarePlaying = Audio_IsSequencePlaying(NA_BGM_HORSE_GOAL); EnHorse_UpdateHbaRaceInfo(this, play, &sHbaInfo); if (this->hbaFlags & 1 || this->hbaTimer >= 46) { - if (sp20 != 1 && gSaveContext.minigameState != 3) { + if (isFanfarePlaying != 1 && gSaveContext.minigameState != 3) { gSaveContext.cutsceneIndex = 0; play->nextEntranceIndex = ENTR_GERUDOS_FORTRESS_16; play->transitionTrigger = TRANS_TRIGGER_START; @@ -2641,7 +2641,7 @@ void EnHorse_FleePlayer(EnHorse* this, PlayState* play) { } else if (this->actor.speedXZ > 0.1f) { // walk this->skin.skelAnime.playSpeed = this->actor.speedXZ * 0.75f; nextAnim = ENHORSE_ANIM_WALK; - EnHorse_PlayWalkingSound(this); + EnHorse_PlayWalkingSfx(this); } else { // idle nextAnim = Rand_ZeroOne() > 0.5f ? 1 : 0; EnHorse_IdleAnimSounds(this, play); @@ -2769,7 +2769,7 @@ void EnHorse_BridgeJumpInit(EnHorse* this, PlayState* play) { } Audio_PlaySoundGeneral(NA_SE_EV_HORSE_JUMP, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0.0f, 170, 10, 10); + Rumble_Request(0.0f, 170, 10, 10); this->postDrawFunc = NULL; } @@ -2819,7 +2819,7 @@ void EnHorse_CheckBridgeJumpLanding(EnHorse* this, PlayState* play) { EnHorse_JumpLanding(this, play); Audio_PlaySoundGeneral(NA_SE_EV_HORSE_LAND, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); - func_800AA000(0.0f, 255, 10, 80); + Rumble_Request(0.0f, 255, 10, 80); } } @@ -2857,7 +2857,7 @@ s32 EnHorse_CalcFloorHeight(EnHorse* this, PlayState* play, Vec3f* pos, Collisio if ((*floorPoly)->normal.y * COLPOLY_NORMAL_FRAC < 0.81915206f || // cos(35 degrees) SurfaceType_IsHorseBlocked(&play->colCtx, *floorPoly, bgId) || - func_80041D4C(&play->colCtx, *floorPoly, bgId) == 7) { + SurfaceType_GetFloorType(&play->colCtx, *floorPoly, bgId) == 7) { return 3; // Horse blocked surface } return 0; @@ -2986,7 +2986,7 @@ void EnHorse_CheckFloors(EnHorse* this, PlayState* play) { if (ny < 0.81915206f || // cos(35 degrees) SurfaceType_IsHorseBlocked(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId) || - func_80041D4C(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId) == 7) { + SurfaceType_GetFloorType(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId) == 7) { if ((this->actor.speedXZ >= 0.0f)) { EnHorse_ObstructMovement(this, play, 4, galloping); } else { @@ -3259,7 +3259,7 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { ny = obstacleFloor->normal.y * COLPOLY_NORMAL_FRAC; if (ny < 0.81915206f || // cos(35 degrees) (SurfaceType_IsHorseBlocked(&play->colCtx, obstacleFloor, bgId) != 0) || - (func_80041D4C(&play->colCtx, obstacleFloor, bgId) == 7)) { + (SurfaceType_GetFloorType(&play->colCtx, obstacleFloor, bgId) == 7)) { if (movingFast == true && this->action != ENHORSE_ACT_STOPPING) { this->stateFlags |= ENHORSE_FORCE_REVERSING; EnHorse_StartBraking(this, play); @@ -3296,7 +3296,7 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { ny = obstacleFloor->normal.y * COLPOLY_NORMAL_FRAC; if (ny < 0.81915206f || // cos(35 degrees) SurfaceType_IsHorseBlocked(&play->colCtx, obstacleFloor, bgId) || - func_80041D4C(&play->colCtx, obstacleFloor, bgId) == 7) { + SurfaceType_GetFloorType(&play->colCtx, obstacleFloor, bgId) == 7) { if (movingFast == true && this->action != ENHORSE_ACT_STOPPING) { this->stateFlags |= ENHORSE_FORCE_REVERSING; EnHorse_StartBraking(this, play); @@ -3329,7 +3329,7 @@ void EnHorse_CheckBoost(EnHorse* thisx, PlayState* play2) { if (!(this->stateFlags & ENHORSE_BOOST) && !(this->stateFlags & ENHORSE_FLAG_8) && !(this->stateFlags & ENHORSE_FLAG_9)) { if (this->numBoosts > 0) { - func_800AA000(0.0f, 180, 20, 100); + Rumble_Request(0.0f, 180, 20, 100); this->stateFlags |= ENHORSE_BOOST; this->stateFlags |= ENHORSE_FIRST_BOOST_REGEN; this->stateFlags |= ENHORSE_FLAG_8; diff --git a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c index d9529d6655..345f4c9658 100644 --- a/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/soh/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -115,7 +115,7 @@ s32 func_80A6E53C(EnHs* this, PlayState* play, u16 textId, EnHsActionFunc action yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if ((ABS(yawDiff) <= 0x2150) && (this->actor.xzDistToPlayer < 100.0f)) { this->unk_2A8 |= 1; - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } return 0; @@ -216,7 +216,7 @@ void func_80A6E9AC(EnHs* this, PlayState* play) { s16 yawDiff; if (Actor_ProcessTalkRequest(&this->actor, play)) { - if (func_8002F368(play) == 7) { + if (Actor_GetPlayerExchangeItemId(play) == 7) { player->actor.textId = 0x10B2; func_80A6E3A0(this, func_80A6E8CC); Animation_Change(&this->skelAnime, &object_hs_Anim_000304, 1.0f, 0.0f, @@ -231,7 +231,7 @@ void func_80A6E9AC(EnHs* this, PlayState* play) { yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; this->actor.textId = 0x10B1; if ((ABS(yawDiff) <= 0x2150) && (this->actor.xzDistToPlayer < 100.0f)) { - func_8002F298(&this->actor, play, 100.0f, 7); + Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 100.0f, 7); } } } @@ -251,7 +251,7 @@ void EnHs_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); if (this->unk_2A8 & 1) { - func_80038290(play, &this->actor, &this->unk_29C, &this->unk_2A2, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_29C, &this->unk_2A2, this->actor.focus.pos); this->unk_2A8 &= ~1; } else { Math_SmoothStepToS(&this->unk_29C.x, 12800, 6, 6200, 100); diff --git a/soh/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/soh/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 8b74563507..7366d1e073 100644 --- a/soh/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/soh/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -86,7 +86,7 @@ s32 func_80A6F0B4(EnHs2* this, PlayState* play, u16 textId, EnHs2ActionFunc acti if (ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) < 0x2151 && this->actor.xzDistToPlayer < 100.0f) { this->unk_2A8 |= 0x1; - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } return 0; } @@ -122,7 +122,7 @@ void EnHs2_Update(Actor* thisx, PlayState* play) { } this->actionFunc(this, play); if (this->unk_2A8 & 0x1) { - func_80038290(play, &this->actor, &this->unk_29C, &this->unk_2A2, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_29C, &this->unk_2A2, this->actor.focus.pos); this->unk_2A8 &= ~1; } else { Math_SmoothStepToS(&this->unk_29C.x, 12800, 6, 6200, 100); diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c index e02b4ee601..0e833b1488 100644 --- a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -746,7 +746,7 @@ void EnHy_OfferBuyBottledItem(EnHy* this, PlayState* play) { if ((this->actor.params & 0x7F) == ENHY_TYPE_BOJ_5) { if (!Inventory_HasSpecificBottle(ITEM_BLUE_FIRE) && !Inventory_HasSpecificBottle(ITEM_BUG) && !Inventory_HasSpecificBottle(ITEM_FISH)) { - switch (func_8002F368(play)) { + switch (Actor_GetPlayerExchangeItemId(play)) { case EXCH_ITEM_POE: case EXCH_ITEM_BIG_POE: case EXCH_ITEM_LETTER_RUTO: @@ -759,7 +759,7 @@ void EnHy_OfferBuyBottledItem(EnHy* this, PlayState* play) { break; } } else { - switch (func_8002F368(play)) { + switch (Actor_GetPlayerExchangeItemId(play)) { case EXCH_ITEM_BLUE_FIRE: this->actor.textId = 0x70F0; break; @@ -1025,7 +1025,7 @@ void EnHy_Walk(EnHy* this, PlayState* play) { } void EnHy_Fidget(EnHy* this, PlayState* play) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); } void EnHy_DoNothing(EnHy* this, PlayState* play) { @@ -1038,7 +1038,7 @@ void EnHy_SetupPace(EnHy* this, PlayState* play) { this->actionFunc = EnHy_Pace; } - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); } void EnHy_Pace(EnHy* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 8668190073..10de8ef61c 100644 --- a/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -222,7 +222,7 @@ void EnIceHono_CapturableFlame(EnIceHono* this, PlayState* play) { if (this->actor.xzDistToPlayer < 200.0f) { CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); } - func_8002F8F0(&this->actor, NA_SE_EV_FIRE_PILLAR_S - SFX_FLAG); + Actor_PlaySfx_Flagged2(&this->actor, NA_SE_EV_FIRE_PILLAR_S - SFX_FLAG); } void EnIceHono_SetupActionDroppedFlame(EnIceHono* this) { @@ -348,7 +348,7 @@ void EnIceHono_Update(Actor* thisx, PlayState* play) { this->timer--; } if (this->actor.params == 0) { - func_8002F8F0(&this->actor, NA_SE_IT_FLAME - SFX_FLAG); + Actor_PlaySfx_Flagged2(&this->actor, NA_SE_IT_FLAME - SFX_FLAG); } if ((this->actor.params == -1) || (this->actor.params == 0)) { this->unk_154 += 0x1111; diff --git a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 425a80a36f..7382af6976 100644 --- a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -444,7 +444,7 @@ void func_80A74EBC(EnIk* this, PlayState* play) { sp2C.y = this->actor.world.pos.y; Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_HIT_GND); Camera_AddQuake(&play->mainCamera, 2, 0x19, 5); - func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); CollisionCheck_SpawnShieldParticles(play, &sp2C); } @@ -790,7 +790,7 @@ void func_80A75FA0(Actor* thisx, PlayState* play) { this->unk_2FE = 0; } } - func_8002F71C(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 8.0f, this->actor.yawTowardsPlayer, 8.0f); player->invincibilityTimer = prevInvincibilityTimer; } } diff --git a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 1f4e9adfb1..b7d0da6bad 100644 --- a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -444,7 +444,7 @@ void EnIshi_Fly(EnIshi* this, PlayState* play) { Quake_SetSpeed(quakeIdx, -0x3CB0); Quake_SetQuakeValues(quakeIdx, 3, 0, 0, 0); Quake_SetCountdown(quakeIdx, 7); - func_800AA000(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xyzDistToPlayerSq, 0xFF, 0x14, 0x96); } Actor_Kill(&this->actor); return; diff --git a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c index 8abb0b5d10..153495d11e 100644 --- a/soh/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/soh/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -94,7 +94,7 @@ u8 func_80A88F64(EnJs* this, PlayState* play, u16 textId) { if (ABS(yawDiff) <= 0x1800 && this->actor.xzDistToPlayer < 100.0f) { this->unk_284 |= 1; - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } return 0; } @@ -117,7 +117,7 @@ void func_80A890C0(EnJs* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { En_Js_SetupAction(this, func_80A89078); } else { - func_8002F2CC(&this->actor, play, 1000.0f); + Actor_OfferTalk(&this->actor, play, 1000.0f); } } @@ -202,7 +202,7 @@ void EnJs_Update(Actor* thisx, PlayState* play) { } this->actionFunc(this, play); if (this->unk_284 & 1) { - func_80038290(play, &this->actor, &this->unk_278, &this->unk_27E, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_278, &this->unk_27E, this->actor.focus.pos); } else { Math_SmoothStepToS(&this->unk_278.x, 0, 6, 0x1838, 0x64); Math_SmoothStepToS(&this->unk_278.y, 0, 6, 0x1838, 0x64); diff --git a/soh/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/soh/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 9e71fff51d..7a1c74ce1c 100644 --- a/soh/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/soh/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -227,7 +227,7 @@ void func_80A8F75C(EnKakasi* this, PlayState* play) { player->stateFlags2 |= PLAYER_STATE2_NEAR_OCARINA_ACTOR; } } - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } } diff --git a/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index eaf902fb6b..c0b4a5e13c 100644 --- a/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/soh/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -261,7 +261,7 @@ void func_80A91348(EnKakasi3* this, PlayState* play) { player->stateFlags2 |= PLAYER_STATE2_NEAR_OCARINA_ACTOR; } } - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } } diff --git a/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 0d578f17ec..baeef5e783 100644 --- a/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -236,7 +236,7 @@ void EnKanban_Message(EnKanban* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { this->msgFlag = true; } else { - func_8002F2CC(&this->actor, play, 68.0f); + Actor_OfferTalk(&this->actor, play, 68.0f); } } } else { diff --git a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c index cfd312c714..7422dacc54 100644 --- a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -707,7 +707,7 @@ s32 func_80A97D68(EnKo* this, PlayState* play) { s32 func_80A97E18(EnKo* this, PlayState* play) { s16 trackingMode; - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); if (EnKo_IsWithinTalkAngle(this) == true) { trackingMode = NPC_TRACKING_HEAD_AND_TORSO; } else { @@ -726,7 +726,7 @@ s32 func_80A97EB0(EnKo* this, PlayState* play) { s16 trackingMode; s32 result; - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); result = EnKo_IsWithinTalkAngle(this); trackingMode = (result == true) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE; Npc_TrackPoint(&this->actor, &this->interactInfo, 2, trackingMode); @@ -734,7 +734,7 @@ s32 func_80A97EB0(EnKo* this, PlayState* play) { } s32 func_80A97F20(EnKo* this, PlayState* play) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); Npc_TrackPoint(&this->actor, &this->interactInfo, 2, NPC_TRACKING_FULL_BODY); return 1; } @@ -746,7 +746,7 @@ s32 func_80A97F70(EnKo* this, PlayState* play) { if ((this->skelAnime.animation == &gKokiriBlockingAnim) == false) { Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_BLOCKING_STATIC); } - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); trackingMode = NPC_TRACKING_HEAD_AND_TORSO; } else { if ((this->skelAnime.animation == &gKokiriCuttingGrassAnim) == false) { @@ -766,7 +766,7 @@ s32 func_80A98034(EnKo* this, PlayState* play) { if ((this->skelAnime.animation == &gKokiriBlockingAnim) == false) { Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_BLOCKING_STATIC); } - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); result = EnKo_IsWithinTalkAngle(this); trackingMode = (result == true) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE; } else { @@ -782,7 +782,7 @@ s32 func_80A98034(EnKo* this, PlayState* play) { // Same as func_80A97F20 s32 func_80A98124(EnKo* this, PlayState* play) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); Npc_TrackPoint(&this->actor, &this->interactInfo, 2, NPC_TRACKING_FULL_BODY); return 1; } @@ -796,7 +796,7 @@ s32 func_80A98174(EnKo* this, PlayState* play) { this->skelAnime.playSpeed = 1.0f; } if (this->skelAnime.playSpeed == 0.0f) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); } Npc_TrackPoint(&this->actor, &this->interactInfo, 2, (this->skelAnime.playSpeed == 0.0f) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE); @@ -978,7 +978,7 @@ void func_80A9877C(EnKo* this, PlayState* play) { ENKO_TYPE == ENKO_TYPE_CHILD_FADO && play->sceneNum == SCENE_LOST_WOODS) { this->actor.textId = INV_CONTENT(ITEM_TRADE_ADULT) > ITEM_ODD_POTION ? 0x10B9 : 0x10DF; - if (func_8002F368(play) == ENKO_TYPE_CHILD_9) { + if (Actor_GetPlayerExchangeItemId(play) == ENKO_TYPE_CHILD_9) { this->actor.textId = (Flags_GetInfTable(INFTABLE_BC)) ? 0x10B8 : 0x10B7; this->unk_210 = 0; } diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c index fa4db4d59c..3cc7e4c1b8 100644 --- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -259,7 +259,7 @@ s32 func_80A9C95C(PlayState* play, EnKz* this, s16* talkState, f32 unkf, NpcGetT xzDistToPlayer = this->actor.xzDistToPlayer; this->actor.xzDistToPlayer = Math_Vec3f_DistXZ(&this->actor.home.pos, &player->actor.world.pos); - if (func_8002F2CC(&this->actor, play, unkf) == 0) { + if (Actor_OfferTalk(&this->actor, play, unkf) == 0) { this->actor.xzDistToPlayer = xzDistToPlayer; return 0; } @@ -287,7 +287,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) { if (func_80A9C95C(play, this, &this->interactInfo.talkState, 340.0f, EnKz_GetText, func_80A9C6C0)) { if (GameInteractor_Should(VB_BE_ABLE_TO_EXCHANGE_RUTOS_LETTER, (this->actor.textId == 0x401A), this) && !Flags_GetEventChkInf(EVENTCHKINF_KING_ZORA_MOVED)) { - if (func_8002F368(play) == EXCH_ITEM_LETTER_RUTO) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_LETTER_RUTO) { this->actor.textId = 0x401B; this->sfxPlayed = false; } else { @@ -299,7 +299,7 @@ void func_80A9CB18(EnKz* this, PlayState* play) { if (LINK_IS_ADULT) { if ((INV_CONTENT(ITEM_TRADE_ADULT) == ITEM_PRESCRIPTION) && - (func_8002F368(play) == EXCH_ITEM_PRESCRIPTION)) { + (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_PRESCRIPTION)) { this->actor.textId = 0x4014; this->sfxPlayed = false; player->actor.textId = this->actor.textId; @@ -416,7 +416,7 @@ void EnKz_PreMweepWait(EnKz* this, PlayState* play) { this->interactInfo.talkState = NPC_TALK_STATE_IDLE; this->actionFunc = EnKz_SetupMweep; } else { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 12); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 12); } } @@ -489,7 +489,7 @@ void EnKz_Wait(EnKz* this, PlayState* play) { this->actionFunc = EnKz_SetupGetItem; EnKz_SetupGetItem(this, play); } else { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 12); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 12); } } @@ -505,7 +505,7 @@ void EnKz_SetupGetItem(EnKz* this, PlayState* play) { this->actionFunc = EnKz_StartTimer; } else { if (CVarGetInteger(CVAR_ENHANCEMENT("EarlyEyeballFrog"), 0)) { - getItemId = func_8002F368(play) == EXCH_ITEM_PRESCRIPTION ? GI_FROG : GI_TUNIC_ZORA; + getItemId = Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_PRESCRIPTION ? GI_FROG : GI_TUNIC_ZORA; } else { getItemId = this->isTrading ? GI_FROG : GI_TUNIC_ZORA; } diff --git a/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 2731873db6..93c0d9f8ab 100644 --- a/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -173,7 +173,7 @@ void EnMThunder_ChargingSpinAttack(EnMThunder* this, PlayState* play) { } if (player->unk_858 >= 0.1f) { - func_800AA000(0.0f, (s32)(player->unk_858 * 150.0f) & 0xFF, 2, (s32)(player->unk_858 * 150.0f) & 0xFF); + Rumble_Request(0.0f, (s32)(player->unk_858 * 150.0f) & 0xFF, 2, (s32)(player->unk_858 * 150.0f) & 0xFF); } if (player->stateFlags2 & PLAYER_STATE2_SPIN_ATTACKING) { diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index 925c90a7f9..fc07f00cb5 100644 --- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -261,12 +261,12 @@ void EnMa1_UpdateSinging(EnMa1* this) { if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) { if (this->singingDisabled != 0) { this->singingDisabled = 0; - func_800F6584(0); + Audio_ToggleMalonSinging(0); } } else { if (this->singingDisabled == 0) { this->singingDisabled = 1; - func_800F6584(1); + Audio_ToggleMalonSinging(1); } } } @@ -480,7 +480,7 @@ void EnMa1_Draw(Actor* thisx, PlayState* play) { camera = GET_ACTIVE_CAM(play); distFromCamera = Math_Vec3f_DistXZ(&this->actor.world.pos, &camera->eye); - func_800F6268(distFromCamera, NA_BGM_LONLON); + Audio_UpdateMalonSinging(distFromCamera, NA_BGM_LONLON); Gfx_SetupDL_25Opa(play->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthIndex])); diff --git a/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index efd8e61b66..023ed0319e 100644 --- a/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -200,12 +200,12 @@ void EnMa2_UpdateSinging(EnMa2* this, PlayState* play) { if (this->skelAnime.animation == &gMalonAdultSingAnim) { if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) { if (this->singingDisabled != 0) { - func_800F6584(0); + Audio_ToggleMalonSinging(0); this->singingDisabled = 0; } } else { if (this->singingDisabled == 0) { - func_800F6584(1); + Audio_ToggleMalonSinging(1); this->singingDisabled = 1; } } @@ -384,7 +384,7 @@ void EnMa2_Draw(Actor* thisx, PlayState* play) { camera = GET_ACTIVE_CAM(play); someFloat = Math_Vec3f_DistXZ(&this->actor.world.pos, &camera->eye); - func_800F6268(someFloat, NA_BGM_LONLON); + Audio_UpdateMalonSinging(someFloat, NA_BGM_LONLON); Gfx_SetupDL_25Opa(play->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthIndex])); diff --git a/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 9bc0418b4b..fcc6f5e446 100644 --- a/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -298,11 +298,11 @@ void EnMa3_Update(Actor* thisx, PlayState* play) { EnMa3_GetTextId, EnMa3_UpdateTalkState); if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) { if (this->isNotSinging != 0) { - func_800F6584(0); + Audio_ToggleMalonSinging(0); this->isNotSinging = 0; } } else if (this->isNotSinging == 0) { - func_800F6584(1); + Audio_ToggleMalonSinging(1); this->isNotSinging = 1; } } @@ -363,7 +363,7 @@ void EnMa3_Draw(Actor* thisx, PlayState* play) { camera = GET_ACTIVE_CAM(play); someFloat = Math_Vec3f_DistXZ(&this->actor.world.pos, &camera->eye); - func_800F6268(someFloat, NA_BGM_LONLON); + Audio_UpdateMalonSinging(someFloat, NA_BGM_LONLON); Gfx_SetupDL_25Opa(play->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthIndex])); diff --git a/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 78f75dabd5..cec1d97698 100644 --- a/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/soh/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -617,7 +617,7 @@ void EnMb_Stunned(EnMb* this, PlayState* play) { player->stateFlags2 &= ~PLAYER_STATE2_GRABBED_BY_ENEMY; player->actor.parent = NULL; player->av2.actionVar2 = 200; - func_8002F71C(play, &this->actor, 4.0f, this->actor.world.rot.y, 4.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 4.0f, this->actor.world.rot.y, 4.0f); this->attack = ENMB_ATTACK_NONE; } @@ -742,7 +742,7 @@ void EnMb_SpearPatrolEndCharge(EnMb* this, PlayState* play) { player->stateFlags2 &= ~PLAYER_STATE2_GRABBED_BY_ENEMY; player->actor.parent = NULL; player->av2.actionVar2 = 200; - func_8002F71C(play, &this->actor, 4.0f, this->actor.world.rot.y, 4.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 4.0f, this->actor.world.rot.y, 4.0f); } if (this->actor.bgCheckFlags & 1) { @@ -867,8 +867,9 @@ void EnMb_ClubAttack(EnMb* this, PlayState* play) { } } - func_8002F71C(play, &this->actor, (650.0f - this->actor.xzDistToPlayer) * 0.04f + 4.0f, - this->actor.world.rot.y, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, + (650.0f - this->actor.xzDistToPlayer) * 0.04f + 4.0f, + this->actor.world.rot.y, 8.0f); player->invincibilityTimer = prevPlayerInvincibilityTimer; } @@ -886,7 +887,7 @@ void EnMb_ClubAttack(EnMb* this, PlayState* play) { effSpawnPos = this->effSpawnPos; effSpawnPos.y = this->actor.floorHeight; Audio_PlayActorSound2(&this->actor, NA_SE_EN_MONBLIN_HAM_LAND); - func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); EffectSsBlast_SpawnWhiteShockwave(play, &effSpawnPos, &effWhiteShockwaveDynamics, &effWhiteShockwaveDynamics); func_80033480(play, &effSpawnPos, 2.0f, 3, 0x12C, 0xB4, 1); @@ -981,7 +982,7 @@ void EnMb_SpearPatrolPrepareAndCharge(EnMb* this, PlayState* play) { player->stateFlags2 &= ~PLAYER_STATE2_GRABBED_BY_ENEMY; player->actor.parent = NULL; player->av2.actionVar2 = 200; - func_8002F71C(play, &this->actor, 4.0f, this->actor.world.rot.y, 4.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 4.0f, this->actor.world.rot.y, 4.0f); } } this->attack = ENMB_ATTACK_NONE; @@ -1050,7 +1051,7 @@ void EnMb_SpearPatrolImmediateCharge(EnMb* this, PlayState* play) { player->stateFlags2 &= ~PLAYER_STATE2_GRABBED_BY_ENEMY; player->actor.parent = NULL; player->av2.actionVar2 = 200; - func_8002F71C(play, &this->actor, 4.0f, this->actor.world.rot.y, 4.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 4.0f, this->actor.world.rot.y, 4.0f); } this->attack = ENMB_ATTACK_NONE; this->actor.speedXZ = -10.0f; @@ -1076,7 +1077,7 @@ void EnMb_ClubDamaged(EnMb* this, PlayState* play) { if (this->timer3 != 0) { Animation_PlayOnce(&this->skelAnime, &gEnMbClubStandUpAnim); this->timer3 = 0; - func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); Camera_AddQuake(&play->mainCamera, 2, 25, 5); } else { EnMb_SetupClubWaitPlayerNear(this); @@ -1135,7 +1136,7 @@ void EnMb_ClubDead(EnMb* this, PlayState* play) { Actor_Kill(&this->actor); } } else if ((s32)this->skelAnime.curFrame == 15 || (s32)this->skelAnime.curFrame == 22) { - func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); Actor_SpawnFloorDustRing(play, &this->actor, &effPos, 50.0f, 10, 3.0f, 400, 60, false); Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIZA_DOWN); Camera_AddQuake(&play->mainCamera, 2, 25, 5); @@ -1346,7 +1347,7 @@ void EnMb_SpearDead(EnMb* this, PlayState* play) { player->stateFlags2 &= ~PLAYER_STATE2_GRABBED_BY_ENEMY; player->actor.parent = NULL; player->av2.actionVar2 = 200; - func_8002F71C(play, &this->actor, 4.0f, this->actor.world.rot.y, 4.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 4.0f, this->actor.world.rot.y, 4.0f); this->attack = ENMB_ATTACK_NONE; } @@ -1429,7 +1430,7 @@ void EnMb_CheckColliding(EnMb* this, PlayState* play) { player->stateFlags2 &= ~PLAYER_STATE2_GRABBED_BY_ENEMY; player->actor.parent = NULL; player->av2.actionVar2 = 200; - func_8002F71C(play, &this->actor, 6.0f, this->actor.world.rot.y, 6.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 6.0f, this->actor.world.rot.y, 6.0f); } this->damageEffect = this->actor.colChkInfo.damageEffect; this->attack = ENMB_ATTACK_NONE; diff --git a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c index 68b43078e5..bbc4a1bfec 100644 --- a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -682,7 +682,7 @@ void EnMd_Destroy(Actor* thisx, PlayState* play) { void EnMd_Idle(EnMd* this, PlayState* play) { if (this->skelAnime.animation == &gMidoHandsOnHipsIdleAnim) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 17); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 17); } else if ((this->interactInfo.talkState == NPC_TALK_STATE_IDLE) && (this->animSequence != 7)) { EnMd_SetAnimSequence(this, 7); } @@ -692,7 +692,7 @@ void EnMd_Idle(EnMd* this, PlayState* play) { void EnMd_Watch(EnMd* this, PlayState* play) { if (this->skelAnime.animation == &gMidoHandsOnHipsIdleAnim) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 17); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 17); } EnMd_UpdateAnimSequence(this); } @@ -748,7 +748,7 @@ void EnMd_BlockPath(EnMd* this, PlayState* play) { } if (this->skelAnime.animation == &gMidoHandsOnHipsIdleAnim) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 17); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 17); } if ((this->interactInfo.talkState == NPC_TALK_STATE_IDLE) && (play->sceneNum == SCENE_LOST_WOODS)) { @@ -776,7 +776,7 @@ void EnMd_ListenToOcarina(EnMd* this, PlayState* play) { Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); this->actor.textId = 0x1067; - func_8002F2CC(&this->actor, play, this->collider.dim.radius + 30.0f); + Actor_OfferTalk(&this->actor, play, this->collider.dim.radius + 30.0f); this->actionFunc = EnMd_BlockPath; play->msgCtx.ocarinaMode = OCARINA_MODE_04; @@ -786,7 +786,7 @@ void EnMd_ListenToOcarina(EnMd* this, PlayState* play) { } void EnMd_Walk(EnMd* this, PlayState* play) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 17); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 17); EnMd_UpdateAnimSequence(this); if (!(EnMd_FollowPath(this, play)) || (this->waypoint != 0)) { diff --git a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 8ab050e526..62da4274d6 100644 --- a/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/soh/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -227,7 +227,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) { s32 playerExchangeItem; if (Actor_ProcessTalkRequest(&this->actor, play)) { - playerExchangeItem = func_8002F368(play); + playerExchangeItem = Actor_GetPlayerExchangeItemId(play); if (this->actor.textId != 0x4018) { player->actor.textId = this->actor.textId; @@ -285,7 +285,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) { angle = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if ((ABS(angle) < 0x2151) && (this->actor.xzDistToPlayer < 100.0f)) { - func_8002F298(&this->actor, play, 100.0f, EXCH_ITEM_FROG); + Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 100.0f, EXCH_ITEM_FROG); this->flags |= 1; } } @@ -310,7 +310,7 @@ void EnMk_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); if (this->flags & 1) { - func_80038290(play, &this->actor, &this->headRotation, &vec, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRotation, &vec, this->actor.focus.pos); } else { Math_SmoothStepToS(&this->headRotation.x, 0, 6, 6200, 100); Math_SmoothStepToS(&this->headRotation.y, 0, 6, 6200, 100); diff --git a/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c index c3a27994f6..6aa79c2aa9 100644 --- a/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -306,7 +306,7 @@ void func_80AADCD0(EnMm* this, PlayState* play) { yawDiff = ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)); if ((sp26 >= 0) && (sp26 <= 0x140) && (sp24 >= 0) && (sp24 <= 0xF0) && (yawDiff <= 17152.0f) && - (this->unk_1E0 != 3) && func_8002F2CC(&this->actor, play, 100.0f)) { + (this->unk_1E0 != 3) && Actor_OfferTalk(&this->actor, play, 100.0f)) { this->actor.textId = EnMm_GetTextId(this, play); } } @@ -468,7 +468,7 @@ void func_80AAE294(EnMm* this, PlayState* play) { } if (this->collider.base.ocFlags2 & OC2_HIT_PLAYER) { - func_8002F71C(play, &this->actor, 3.0f, this->actor.yawTowardsPlayer, 4.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 3.0f, this->actor.yawTowardsPlayer, 4.0f); } } } @@ -492,7 +492,7 @@ void func_80AAE50C(EnMm* this, PlayState* play) { } void func_80AAE598(EnMm* this, PlayState* play) { - func_80038290(play, &this->actor, &this->unk_248, &this->unk_24E, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_248, &this->unk_24E, this->actor.focus.pos); SkelAnime_Update(&this->skelAnime); if ((func_80AADA70() != 0) && (this->unk_1E0 == 0)) { diff --git a/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 4129bbb239..9153cfb152 100644 --- a/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -175,7 +175,7 @@ s32 func_80AAF224(EnMm2* this, PlayState* play, EnMm2ActionFunc actionFunc) { } yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if ((ABS(yawDiff) <= 0x4300) && (this->actor.xzDistToPlayer < 100.0f)) { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } return 0; } @@ -295,7 +295,7 @@ void EnMm2_Update(Actor* thisx, PlayState* play) { s32 pad; if (this->unk_1F4 & 1) { - func_80038290(play, &this->actor, &this->unk_1E8, &this->unk_1EE, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_1E8, &this->unk_1EE, this->actor.focus.pos); } else { Math_SmoothStepToS(&this->unk_1E8.x, 0, 6, 6200, 100); Math_SmoothStepToS(&this->unk_1E8.y, 0, 6, 6200, 100); diff --git a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 3c8442ba97..2dab1b05f0 100644 --- a/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/soh/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -114,7 +114,7 @@ void EnMs_Wait(EnMs* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { // if talk is initiated this->actionFunc = EnMs_Talk; } else if ((this->actor.xzDistToPlayer < 90.0f) && (ABS(yawDiff) < 0x2000)) { // talk range - func_8002F2CC(&this->actor, play, 90.0f); + Actor_OfferTalk(&this->actor, play, 90.0f); } } diff --git a/soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 86351c7dd0..d407ba574d 100644 --- a/soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -149,7 +149,7 @@ void EnMu_Destroy(Actor* thisx, PlayState* play) { } void EnMu_Pose(EnMu* this, PlayState* play) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 16); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16); } void EnMu_Update(Actor* thisx, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c index afdfefeddc..5fd5cd2ed4 100644 --- a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -1211,7 +1211,7 @@ void func_80AB3838(EnNb* this, PlayState* play) { this->actor.textId = 0x6024; } - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } @@ -1302,7 +1302,7 @@ void func_80AB3B04(EnNb* this, PlayState* play) { this->actor.textId = 0x6026; } - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } diff --git a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c index c258182d5c..419d4c8c6a 100644 --- a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -1077,7 +1077,7 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { dist = 20.0f; if (this->unk_2A8 != 0 && thisx->xyzDistToPlayerSq < SQ(dist) && player->invincibilityTimer == 0) { - func_8002F6D4(play, &this->actor, 2.0f, thisx->world.rot.y, 0.0f, 0x10); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 2.0f, thisx->world.rot.y, 0.0f, 0x10); } func_80AB747C(this, play); diff --git a/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 54ec62d96b..bd7fdcd9d8 100644 --- a/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -184,7 +184,7 @@ void func_80AB94D0(EnNiwGirl* this, PlayState* play) { this->jumpTimer = Rand_ZeroFloat(100.0f) + 250.0f; this->actionFunc = EnNiwGirl_Jump; } else { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } } diff --git a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 09ac1e057e..a86c9327fd 100644 --- a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -298,7 +298,7 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) { } } } else { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } @@ -375,7 +375,7 @@ void func_80ABA878(EnNiwLady* this, PlayState* play) { this->unk_26E = 11; } if (Actor_ProcessTalkRequest(&this->actor, play)) { - playerExchangeItemId = func_8002F368(play); + playerExchangeItemId = Actor_GetPlayerExchangeItemId(play); if ((playerExchangeItemId == 6) && (Flags_GetEventChkInf(EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO))) { Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR); player->actor.textId = sTradeItemTextIds[5]; @@ -391,7 +391,7 @@ void func_80ABA878(EnNiwLady* this, PlayState* play) { this->actionFunc = !this->unk_273 ? func_80ABA778 : func_80ABA9B8; } } else { - func_8002F298(&this->actor, play, 50.0f, 6); + Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 50.0f, 6); } } @@ -503,7 +503,7 @@ void func_80ABAD7C(EnNiwLady* this, PlayState* play) { this->unk_26E = this->unk_27A + 9; this->actionFunc = func_80ABAD38; } else { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } diff --git a/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 1684e63bd5..248b644ac0 100644 --- a/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -229,7 +229,7 @@ void EnNy_Move(EnNy* this, PlayState* play) { s32 stoneTimer; if (!(this->unk_1F0 < this->actor.yDistToWater)) { - func_8002F974(&this->actor, NA_SE_EN_NYU_MOVE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_NYU_MOVE - SFX_FLAG); } func_80ABCD40(this); stoneTimer = this->stoneTimer; diff --git a/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 00d6577af4..801bcf69f4 100644 --- a/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/soh/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -252,7 +252,7 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) { play->csCtx.segment = D_80ABF9D0; gSaveContext.cutsceneTrigger = 1; } - func_800F574C(1.18921f, 0x5A); + Audio_SetMainBgmTempoFreqAfterFanfare(1.18921f, 0x5A); break; case 4: // Door of Time if (GameInteractor_Should(VB_PLAY_DOOR_OF_TIME_CS, true, this)) { @@ -304,7 +304,7 @@ void func_80ABF708(EnOkarinaTag* this, PlayState* play) { yawDiffNew = ABS(yawDiff); if (yawDiffNew < 0x4300) { this->unk_15A = 0; - func_8002F2CC(&this->actor, play, 70.0f); + Actor_OfferTalk(&this->actor, play, 70.0f); } } } diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 1d3a9a4fd2..5b978a7d7a 100644 --- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -768,7 +768,7 @@ void EnOssan_State_Idle(EnOssan* this, PlayState* play, Player* player) { Play_SetShopBrowsingViewpoint(play); EnOssan_SetStateStartShopping(play, this, false); } else if (this->actor.xzDistToPlayer < 100.0f) { - func_8002F2CC(&this->actor, play, 100); + Actor_OfferTalk(&this->actor, play, 100); } } @@ -1782,7 +1782,7 @@ void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, PlayState* play, Player Play_SetViewpoint(play, 2); Message_StartTextbox(play, this->actor.textId, &this->actor); EnOssan_SetStateStartShopping(play, this, true); - func_8002F298(&this->actor, play, 100.0f, -1); + Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 100.0f, -1); break; case 1: default: @@ -1801,7 +1801,7 @@ void EnOssan_State_ContinueShoppingPrompt(EnOssan* this, PlayState* play, Player Play_SetViewpoint(play, 2); Message_StartTextbox(play, this->actor.textId, &this->actor); EnOssan_SetStateStartShopping(play, this, true); - func_8002F298(&this->actor, play, 100.0f, -1); + Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 100.0f, -1); } } diff --git a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c index de842a9fff..2abb7f995f 100644 --- a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -286,7 +286,7 @@ s32 EnOwl_CheckInitTalk(EnOwl* this, PlayState* play, u16 textId, f32 targetDist distCheck = (flags & 2) ? 200.0f : 1000.0f; if (GameInteractor_Should(VB_OWL_INTERACTION, this->actor.xzDistToPlayer < targetDist, this)) { this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; - func_8002F1C4(&this->actor, play, targetDist, distCheck, 0); + Actor_OfferTalkExchange(&this->actor, play, targetDist, distCheck, 0); } return false; } @@ -298,7 +298,7 @@ s32 func_80ACA558(EnOwl* this, PlayState* play, u16 textId) { } else { this->actor.textId = textId; if (this->actor.xzDistToPlayer < 120.0f) { - func_8002F1C4(&this->actor, play, 350.0f, 1000.0f, 0); + Actor_OfferTalkExchange(&this->actor, play, 350.0f, 1000.0f, 0); } return false; } diff --git a/soh/src/overlays/actors/ovl_En_Part/z_en_part.c b/soh/src/overlays/actors/ovl_En_Part/z_en_part.c index 599aa39c15..8dd761c489 100644 --- a/soh/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/soh/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -193,8 +193,9 @@ void func_80ACE5C8(EnPart* this, PlayState* play) { play->damagePlayer(play, -8); } } - func_8002F71C(play, this->actor.parent, (650.0f - this->actor.parent->xzDistToPlayer) * 0.04f + 4.0f, - this->actor.parent->world.rot.y, 8.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, this->actor.parent, + (650.0f - this->actor.parent->xzDistToPlayer) * 0.04f + 4.0f, + this->actor.parent->world.rot.y, 8.0f); player->invincibilityTimer = prevInvincibilityTimer; this->timer = 1; } diff --git a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c index aeffb88b4a..574c88dd18 100644 --- a/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c +++ b/soh/src/overlays/actors/ovl_En_Partner/z_en_partner.c @@ -478,7 +478,7 @@ void UseFaroresWind(EnPartner* this, PlayState* play, u8 started) { } if (started == 1 || started == 2) { - func_8002F974(&this->actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); this->windEffect->actor.world.pos.x = this->actor.world.pos.x; this->windEffect->actor.world.pos.y = this->actor.world.pos.y; @@ -807,7 +807,7 @@ void EnPartner_Update(Actor* thisx, PlayState* play) { } if (this->usedSpell != 0) { - func_8002F974(thisx, NA_SE_PL_MAGIC_SOUL_NORMAL - SFX_FLAG); + Actor_PlaySfx_Flagged(thisx, NA_SE_PL_MAGIC_SOUL_NORMAL - SFX_FLAG); } if (!Player_InCsMode(play)) { diff --git a/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index 4f17c2358d..7f29419c5b 100644 --- a/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -134,7 +134,7 @@ void EnPoDesert_UpdateSpeedModifier(EnPoDesert* this) { } void EnPoDesert_WaitForPlayer(EnPoDesert* this, PlayState* play) { - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); if (this->actor.xzDistToPlayer < 200.0f && (this->currentPathPoint != 2 || play->actorCtx.lensActive)) { if (this->currentPathPoint == 2) { if (Play_InCsMode(play)) { @@ -165,7 +165,7 @@ void EnPoDesert_MoveToNextPoint(EnPoDesert* this, PlayState* play) { this->actor.world.rot.y = Actor_WorldYawTowardPoint(&this->actor, &this->actor.home.pos); Math_ApproachS(&this->actor.shape.rot.y, this->actor.world.rot.y + 0x8000, 5, 0x400); this->actor.speedXZ = sinf(this->speedModifier * (M_PI / 32.0f)) * 2.5f + 5.5f; - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); this->targetY = this->actor.home.pos.y - ((temp_f20 * this->yDiff) / this->initDistToNextPoint); if (temp_f20 < 40.0f) { if (this->currentPathPoint != 0) { diff --git a/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index a493fa9455..f02e556883 100644 --- a/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -505,7 +505,7 @@ void EnPoField_CirclePlayer(EnPoField* this, PlayState* play) { EnPoField_SpawnFlame(this); } EnPoField_CorrectYPos(this, play); - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); } void EnPoField_Flee(EnPoField* this, PlayState* play) { @@ -533,7 +533,7 @@ void EnPoField_Flee(EnPoField* this, PlayState* play) { } else { EnPoField_CorrectYPos(this, play); } - func_8002F974(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); } void EnPoField_Damage(EnPoField* this, PlayState* play) { @@ -670,7 +670,7 @@ void func_80AD58D4(EnPoField* this, PlayState* play) { } if (this->collider.base.ocFlags1 & OC1_HIT) { this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } else { this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -701,7 +701,7 @@ void EnPoField_SoulInteract(EnPoField* this, PlayState* play) { if (this->actor.textId != 0x5005) { EnPoField_SoulUpdateProperties(this, -13); } else { - func_8002F974(&this->actor, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); } if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) { if (Message_ShouldAdvance(play)) { diff --git a/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 95332dd7ed..4ede239434 100644 --- a/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -175,9 +175,9 @@ void EnPoRelay_Idle(EnPoRelay* this, PlayState* play) { } else if (this->actor.xzDistToPlayer < 250.0f) { this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; this->actor.textId = this->textId; - func_8002F2CC(&this->actor, play, 250.0f); + Actor_OfferTalk(&this->actor, play, 250.0f); } - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); } void EnPoRelay_Talk(EnPoRelay* this, PlayState* play) { @@ -187,7 +187,7 @@ void EnPoRelay_Talk(EnPoRelay* this, PlayState* play) { this->textId = this->actor.textId; EnPoRelay_SetupRace(this); } - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); } void EnPoRelay_Race(EnPoRelay* this, PlayState* play) { @@ -265,7 +265,7 @@ void EnPoRelay_Race(EnPoRelay* this, PlayState* play) { } } this->yawTowardsPathPoint = Actor_WorldYawTowardPoint(&this->actor, &vec); - func_8002F974(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); } void EnPoRelay_EndRace(EnPoRelay* this, PlayState* play) { @@ -277,9 +277,9 @@ void EnPoRelay_EndRace(EnPoRelay* this, PlayState* play) { gSaveContext.timerState = TIMER_STATE_OFF; } else if (Actor_IsFacingAndNearPlayer(&this->actor, 150.0f, 0x3000)) { this->actor.textId = this->textId; - func_8002F2CC(&this->actor, play, 250.0f); + Actor_OfferTalk(&this->actor, play, 250.0f); } - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); } void EnPoRelay_Talk2(EnPoRelay* this, PlayState* play) { @@ -299,7 +299,7 @@ void EnPoRelay_Talk2(EnPoRelay* this, PlayState* play) { this->actionTimer = 0; this->actionFunc = EnPoRelay_DisappearAndReward; } - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); } void EnPoRelay_DisappearAndReward(EnPoRelay* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index a58041ef02..54c31b15ca 100644 --- a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -599,9 +599,9 @@ void func_80ADA35C(EnPoSisters* this, PlayState* play) { this->actor.world.pos.y += (2.0f + 0.5f * Rand_ZeroOne()) * Math_SinS(this->unk_196 * 0x800); if (this->unk_22E.a == 255 && this->actionFunc != func_80ADA8C0 && this->actionFunc != func_80ADA7F0) { if (this->actionFunc == func_80ADAC70) { - func_8002F974(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); } else { - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); } } } @@ -1057,7 +1057,7 @@ void func_80ADBC88(EnPoSisters* this, PlayState* play) { func_80ADA10C(this); } } - func_8002F974(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); } void func_80ADBD38(EnPoSisters* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 2a447d0157..bf87fdfecb 100644 --- a/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -494,7 +494,7 @@ void func_80ADEAC4(EnPoh* this, PlayState* play) { EnPoh_SetupIdle(this); } if (this->lightColor.a == 255) { - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); } } @@ -516,7 +516,7 @@ void EnPoh_Idle(EnPoh* this, PlayState* play) { } } if (this->lightColor.a == 255) { - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); } } @@ -545,7 +545,7 @@ void func_80ADEC9C(EnPoh* this, PlayState* play) { EnPoh_SetupAttack(this); } if (this->lightColor.a == 255) { - func_8002F974(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_FLY - SFX_FLAG); } } @@ -715,7 +715,7 @@ void func_80ADF894(EnPoh* this, PlayState* play) { this->actor.world.rot.y = this->actor.shape.rot.y; EnPoh_SetupIdle(this); } - func_8002F974(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_AWAY - SFX_FLAG); } void EnPoh_Death(EnPoh* this, PlayState* play) { @@ -785,7 +785,7 @@ void func_80ADFE80(EnPoh* this, PlayState* play) { } if (this->colliderCyl.base.ocFlags1 & OC1_HIT) { this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } else { this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; CollisionCheck_SetOC(play, &play->colChkCtx, &this->colliderCyl.base); @@ -815,7 +815,7 @@ void EnPoh_TalkRegular(EnPoh* this, PlayState* play) { if (this->actor.textId != 0x5005) { func_80ADFA90(this, -13); } else { - func_8002F974(&this->actor, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); } if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) { if (Message_ShouldAdvance(play)) { @@ -841,7 +841,7 @@ void EnPoh_TalkRegular(EnPoh* this, PlayState* play) { } void EnPoh_TalkComposer(EnPoh* this, PlayState* play) { - func_8002F974(&this->actor, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_PO_BIG_CRY - SFX_FLAG); if (Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) { if (Message_ShouldAdvance(play)) { if (play->msgCtx.choiceIndex == 0) { diff --git a/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 5482f38f69..0d282086e1 100644 --- a/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -348,7 +348,7 @@ void EnRd_WalkToPlayer(EnRd* this, PlayState* play) { player->actor.freezeTimer = 40; Player_SetAutoLockOnActor(play, &this->actor); GET_PLAYER(play)->autoLockOnActor = &this->actor; - func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); } this->playerStunWaitTimer = 0x3C; Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_AIM); @@ -503,7 +503,7 @@ void EnRd_Grab(EnRd* this, PlayState* play) { Animation_PlayLoop(&this->skelAnime, &gGibdoRedeadGrabAttackAnim); this->grabState++; play->damagePlayer(play, -8); - func_800AA000(this->actor.xzDistToPlayer, 0xFF, 1, 0xC); + Rumble_Request(this->actor.xzDistToPlayer, 0xFF, 1, 0xC); this->grabDamageTimer = 20; case 0: Math_SmoothStepToS(&this->headYRotation, 0, 1, 0x5DC, 0); @@ -537,7 +537,7 @@ void EnRd_Grab(EnRd* this, PlayState* play) { if (this->grabDamageTimer == 0) { play->damagePlayer(play, -8); - func_800AA000(this->actor.xzDistToPlayer, 0xF0, 1, 0xC); + Rumble_Request(this->actor.xzDistToPlayer, 0xF0, 1, 0xC); this->grabDamageTimer = 20; Player_PlaySfx(&player->actor, NA_SE_VO_LI_DAMAGE_S + player->ageProperties->unk_92); } @@ -578,7 +578,7 @@ void EnRd_AttemptPlayerFreeze(EnRd* this, PlayState* play) { if (ABS(temp_v0) < 0x2008) { if (!(this->rdFlags & 0x80) && GameInteractor_Should(VB_REDEAD_GIBDO_FREEZE_LINK, true, this)) { player->actor.freezeTimer = 60; - func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); + Rumble_Request(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); Player_SetAutoLockOnActor(play, &this->actor); } Audio_PlayActorSound2(&this->actor, NA_SE_EN_REDEAD_AIM); diff --git a/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 94785b7a53..6fd24c6765 100644 --- a/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -136,7 +136,7 @@ void EnReeba_Init(Actor* thisx, PlayState* play) { this->actor.colChkInfo.damageTable = &sDamageTable; Actor_UpdateBgCheckInfo(play, &this->actor, 35.0f, 60.0f, 60.0f, 0x1D); - surfaceType = func_80041D4C(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); + surfaceType = SurfaceType_GetFloorType(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); if ((surfaceType != 4) && (surfaceType != 7)) { Actor_Kill(&this->actor); @@ -256,7 +256,7 @@ void EnReeba_Move(EnReeba* this, PlayState* play) { Math_ApproachF(&this->actor.shape.shadowScale, 12.0f, 3.0f, 1.0f); } - surfaceType = func_80041D4C(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); + surfaceType = SurfaceType_GetFloorType(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); if ((surfaceType != 4) && (surfaceType != 7)) { this->actor.speedXZ = 0.0f; @@ -287,7 +287,7 @@ void EnReeba_MoveBig(EnReeba* this, PlayState* play) { Math_ApproachF(&this->actor.shape.shadowScale, 12.0f, 3.0f, 1.0f); } - surfaceType = func_80041D4C(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); + surfaceType = SurfaceType_GetFloorType(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); if (((surfaceType != 4) && (surfaceType != 7)) || (this->actor.xzDistToPlayer > 400.0f) || (this->actor.bgCheckFlags & 8)) { diff --git a/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 8c8f3db5e5..8ced08ec9d 100644 --- a/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -327,7 +327,7 @@ void EnRr_SetupReleasePlayer(EnRr* this, PlayState* play) { break; } osSyncPrintf(VT_FGCOL(YELLOW) "%s[%d] : Rr_Catch_Cancel" VT_RST "\n", __FILE__, __LINE__); - func_8002F6D4(play, &this->actor, 4.0f, this->actor.shape.rot.y, 12.0f, 8); + Actor_SetPlayerKnockbackLarge(play, &this->actor, 4.0f, this->actor.shape.rot.y, 12.0f, 8); if (this->actor.colorFilterTimer == 0) { this->actionFunc = EnRr_Approach; Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIKE_THROW); @@ -624,7 +624,7 @@ void EnRr_Reach(EnRr* this, PlayState* play) { void EnRr_GrabPlayer(EnRr* this, PlayState* play) { Player* player = GET_PLAYER(play); - func_800AA000(this->actor.xyzDistToPlayerSq, 120, 2, 120); + Rumble_Request(this->actor.xyzDistToPlayerSq, 120, 2, 120); if ((this->frameCount % 8) == 0) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIKE_EAT); } diff --git a/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index a5dd7441e4..5f2d2b9932 100644 --- a/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1509,13 +1509,13 @@ s32 func_80AEE264(EnRu1* this, PlayState* play) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY; if ((Flags_GetInfTable(INFTABLE_143))) { this->actor.textId = 0x404E; - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } else if (Flags_GetInfTable(INFTABLE_RUTO_IN_JJ_TALK_FIRST_TIME)) { this->actor.textId = 0x404D; - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } else { this->actor.textId = 0x404C; - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } return false; } @@ -2149,7 +2149,7 @@ s32 func_80AEFDC0(EnRu1* this, PlayState* play) { if (this->actor.textId == 0) { this->actor.textId = 0x402C; } - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); return false; } return true; diff --git a/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index cb302e2496..4c19d52371 100644 --- a/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -206,7 +206,7 @@ void func_80AFC218(EnSiofuki* this, PlayState* play) { break; } } else { - func_8002F994(&this->dyna.actor, this->timer); + Actor_PlaySfx_FlaggedTimer(&this->dyna.actor, this->timer); } if (((((u16)this->dyna.actor.params >> 0xC) & 0xF) == EN_SIOFUKI_LOWERING) && diff --git a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c index a00e7ee7e1..27503e2d91 100644 --- a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -947,7 +947,7 @@ void EnSkj_WaitInRange(EnSkj* this, PlayState* play) { } else { this->textId = Text_GetFaceReaction(play, 0x15); } - func_8002F2CC(&this->actor, play, EnSkj_GetItemXzRange(this)); + Actor_OfferTalk(&this->actor, play, EnSkj_GetItemXzRange(this)); } } } @@ -966,7 +966,7 @@ void EnSkj_WaitForSong(EnSkj* this, PlayState* play) { play->msgCtx.ocarinaMode = OCARINA_MODE_04; Message_CloseTextbox(play); player->unk_6A8 = &this->actor; - func_8002F2CC(&this->actor, play, EnSkj_GetItemXzRange(this)); + Actor_OfferTalk(&this->actor, play, EnSkj_GetItemXzRange(this)); EnSkj_SetupWrongSong(this); } else { if ((play->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) && (this->unk_2D6 == 0)) { @@ -987,7 +987,7 @@ void EnSkj_WaitForSong(EnSkj* this, PlayState* play) { play->msgCtx.ocarinaMode = OCARINA_MODE_04; Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME); player->unk_6A8 = &this->actor; - func_8002F2CC(&this->actor, play, EnSkj_GetItemXzRange(this)); + Actor_OfferTalk(&this->actor, play, EnSkj_GetItemXzRange(this)); this->textId = 0x10BB; EnSkj_SetupAfterSong(this); } else { @@ -1004,13 +1004,13 @@ void EnSkj_WaitForSong(EnSkj* this, PlayState* play) { if (Flags_GetItemGetInf(ITEMGETINF_16)) { play->msgCtx.ocarinaMode = OCARINA_MODE_04; player->unk_6A8 = &this->actor; - func_8002F2CC(&this->actor, play, EnSkj_GetItemXzRange(this)); + Actor_OfferTalk(&this->actor, play, EnSkj_GetItemXzRange(this)); this->textId = 0x10BD; EnSkj_SetupAfterSong(this); } else { play->msgCtx.ocarinaMode = OCARINA_MODE_04; player->unk_6A8 = &this->actor; - func_8002F2CC(&this->actor, play, EnSkj_GetItemXzRange(this)); + Actor_OfferTalk(&this->actor, play, EnSkj_GetItemXzRange(this)); EnSkj_SetupWrongSong(this); } } @@ -1028,7 +1028,7 @@ void EnSkj_AfterSong(EnSkj* this, PlayState* play) { if (D_80B01EA0 != 0) { EnSkj_SetupTalk(this); } else { - func_8002F2CC(&this->actor, play, EnSkj_GetItemXzRange(this)); + Actor_OfferTalk(&this->actor, play, EnSkj_GetItemXzRange(this)); } } @@ -1203,7 +1203,7 @@ void EnSkj_WrongSong(EnSkj* this, PlayState* play) { if (D_80B01EA0 != 0) { EnSkj_SetupWaitForTextClear(this); } else { - func_8002F2CC(&this->actor, play, EnSkj_GetItemXzRange(this)); + Actor_OfferTalk(&this->actor, play, EnSkj_GetItemXzRange(this)); } } @@ -1442,7 +1442,7 @@ void EnSkj_WaitForPlayback(EnSkj* this, PlayState* play) { Message_CloseTextbox(play); play->msgCtx.ocarinaMode = OCARINA_MODE_04; player->unk_6A8 = &this->actor; - func_8002F2CC(&this->actor, play, 26.0f); + Actor_OfferTalk(&this->actor, play, 26.0f); this->textId = 0x102D; this->actionFunc = EnSkj_FailedMiniGame; } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_0F) { // completed the game @@ -1450,7 +1450,7 @@ void EnSkj_WaitForPlayback(EnSkj* this, PlayState* play) { Message_CloseTextbox(play); play->msgCtx.ocarinaMode = OCARINA_MODE_04; player->unk_6A8 = &this->actor; - func_8002F2CC(&this->actor, play, 26.0f); + Actor_OfferTalk(&this->actor, play, 26.0f); this->textId = 0x10BF; this->actionFunc = EnSkj_WonOcarinaMiniGame; } else { // playing the game @@ -1491,7 +1491,7 @@ void EnSkj_WaitForPlayback(EnSkj* this, PlayState* play) { Message_CloseTextbox(play); play->msgCtx.ocarinaMode = OCARINA_MODE_04; player->unk_6A8 = &this->actor; - func_8002F2CC(&this->actor, play, 26.0f); + Actor_OfferTalk(&this->actor, play, 26.0f); this->textId = 0x102D; this->actionFunc = EnSkj_FailedMiniGame; } @@ -1517,7 +1517,7 @@ void EnSkj_FailedMiniGame(EnSkj* this, PlayState* play) { if (D_80B01EA0) { this->actionFunc = EnSkj_WaitForNextRound; } else { - func_8002F2CC(&this->actor, play, 26.0f); + Actor_OfferTalk(&this->actor, play, 26.0f); } } @@ -1556,7 +1556,7 @@ void EnSkj_WonOcarinaMiniGame(EnSkj* this, PlayState* play) { this->actionFunc = EnSkj_WaitToGiveReward; } } else { - func_8002F2CC(&this->actor, play, 26.0f); + Actor_OfferTalk(&this->actor, play, 26.0f); } } diff --git a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 37c9df3d30..42bb79df43 100644 --- a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -476,7 +476,7 @@ s32 EnSsh_CheckHitPlayer(EnSsh* this, PlayState* play) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_STALTU_ROLL); Audio_PlayActorSound2(&this->actor, NA_SE_VO_ST_ATTACK); play->damagePlayer(play, -8); - func_8002F71C(play, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f); this->hitCount--; return true; } @@ -729,7 +729,7 @@ void EnSsh_Idle(EnSsh* this, PlayState* play) { this->actor.textId = 0x22; } } - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } } diff --git a/soh/src/overlays/actors/ovl_En_St/z_en_st.c b/soh/src/overlays/actors/ovl_En_St/z_en_st.c index 99f4617bb9..aac063cd19 100644 --- a/soh/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/soh/src/overlays/actors/ovl_En_St/z_en_st.c @@ -403,7 +403,7 @@ s32 EnSt_CheckHitLink(EnSt* this, PlayState* play) { this->gaveDamageSpinTimer = 30; play->damagePlayer(play, -8); Audio_PlayActorSound2(&player->actor, NA_SE_PL_BODY_HIT); - func_8002F71C(play, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f); + Actor_SetPlayerKnockbackLargeNoDamage(play, &this->actor, 4.0f, this->actor.yawTowardsPlayer, 6.0f); return true; } diff --git a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 7ec402360c..bdcab64443 100644 --- a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -204,7 +204,7 @@ void EnSth_FacePlayer(EnSth* this, PlayState* play) { if (ABS(diffRot) <= 0x4000) { Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 6, 0xFA0, 0x64); this->actor.world.rot.y = this->actor.shape.rot.y; - func_80038290(play, &this->actor, &this->headRot, &this->unk_2AC, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->unk_2AC, this->actor.focus.pos); } else { if (diffRot < 0) { Math_SmoothStepToS(&this->headRot.y, -0x2000, 6, 0x1838, 0x100); @@ -220,7 +220,7 @@ void EnSth_LookAtPlayer(EnSth* this, PlayState* play) { s16 diffRot = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if ((ABS(diffRot) <= 0x4300) && (this->actor.xzDistToPlayer < 100.0f)) { - func_80038290(play, &this->actor, &this->headRot, &this->unk_2AC, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->unk_2AC, this->actor.focus.pos); } else { Math_SmoothStepToS(&this->headRot.x, 0, 6, 0x1838, 0x64); Math_SmoothStepToS(&this->headRot.y, 0, 6, 0x1838, 0x64); @@ -246,7 +246,7 @@ void EnSth_ParentRewardObtainedWait(EnSth* this, PlayState* play) { } else { this->actor.textId = 0x23; if (this->actor.xzDistToPlayer < 100.0f) { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } EnSth_LookAtPlayer(this, play); @@ -309,7 +309,7 @@ void EnSth_RewardUnobtainedWait(EnSth* this, PlayState* play) { this->actor.textId = 0x21; } if (this->actor.xzDistToPlayer < 100.0f) { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } EnSth_LookAtPlayer(this, play); @@ -325,7 +325,7 @@ void EnSth_ChildRewardObtainedWait(EnSth* this, PlayState* play) { this->actor.textId = 0x1F; } if (this->actor.xzDistToPlayer < 100.0f) { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } EnSth_LookAtPlayer(this, play); diff --git a/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 28859a4c81..7fa20e4d97 100644 --- a/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -125,7 +125,7 @@ void EnStream_Update(Actor* thisx, PlayState* play) { EnStream* this = (EnStream*)thisx; this->actionFunc(this, play); - func_8002F948(thisx, NA_SE_EV_WHIRLPOOL - SFX_FLAG); + Actor_PlaySfx_FlaggedCentered2(thisx, NA_SE_EV_WHIRLPOOL - SFX_FLAG); } void EnStream_Draw(Actor* thisx, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 39667a3197..795e583029 100644 --- a/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/soh/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -205,7 +205,7 @@ void EnSyatekiMan_Idle(EnSyatekiMan* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { this->actionFunc = EnSyatekiMan_Talk; } else { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } @@ -498,7 +498,7 @@ void EnSyatekiMan_Update(Actor* thisx, PlayState* play) { this->blinkFunc(this); this->actor.focus.pos.y = 70.0f; Actor_SetFocus(&this->actor, 70.0f); - func_80038290(play, &this->actor, &this->headRot, &this->bodyRot, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->bodyRot, this->actor.focus.pos); } s32 EnSyatekiMan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { diff --git a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 032c1cf27c..dbd8779ca1 100644 --- a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -259,7 +259,7 @@ s32 EnTa_RequestTalk(EnTa* this, PlayState* play, u16 textId) { if ((ABS((s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y)) <= 0x4300) && (this->actor.xzDistToPlayer < 100.0f)) { this->stateFlags |= 1; - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } return false; } @@ -332,7 +332,7 @@ void EnTa_IdleAsleepInCastle(EnTa* this, PlayState* play) { Player* player = GET_PLAYER(play); if (Actor_ProcessTalkRequest(&this->actor, play)) { - s32 exchangeItemId = func_8002F368(play); + s32 exchangeItemId = Actor_GetPlayerExchangeItemId(play); switch (exchangeItemId) { case EXCH_ITEM_CHICKEN: @@ -349,7 +349,7 @@ void EnTa_IdleAsleepInCastle(EnTa* this, PlayState* play) { } } else { this->actor.textId = 0x702A; - func_8002F298(&this->actor, play, 100.0f, 3); + Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 100.0f, 3); } } @@ -358,14 +358,14 @@ void EnTa_IdleAsleepInLonLonHouse(EnTa* this, PlayState* play) { EnTa_SetupAction(this, EnTa_SleepTalkInLonLonHouse, EnTa_AnimSleeping); } this->actor.textId = 0x204B; - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } void EnTa_IdleAsleepInKakariko(EnTa* this, PlayState* play) { Player* player = GET_PLAYER(play); if (Actor_ProcessTalkRequest(&this->actor, play)) { - s32 exchangeItemId = func_8002F368(play); + s32 exchangeItemId = Actor_GetPlayerExchangeItemId(play); switch (exchangeItemId) { case EXCH_ITEM_POCKET_CUCCO: @@ -382,7 +382,7 @@ void EnTa_IdleAsleepInKakariko(EnTa* this, PlayState* play) { } } else { this->actor.textId = 0x5015; - func_8002F298(&this->actor, play, 100.0f, 6); + Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 100.0f, 6); } } @@ -626,7 +626,7 @@ void EnTa_IdleFoundSuperCucco(EnTa* this, PlayState* play) { this->actionFunc = EnTa_TalkFoundSuperCucco; this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; } else { - func_8002F2CC(&this->actor, play, 1000.0f); + Actor_OfferTalk(&this->actor, play, 1000.0f); } this->stateFlags |= 1; } @@ -732,7 +732,7 @@ void EnTa_RunCuccoGame(EnTa* this, PlayState* play) { } this->actionFunc = EnTa_IdleFoundSuperCucco; this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; - func_8002F2CC(&this->actor, play, 1000.0f); + Actor_OfferTalk(&this->actor, play, 1000.0f); return; } } else { @@ -742,7 +742,7 @@ void EnTa_RunCuccoGame(EnTa* this, PlayState* play) { } if (gSaveContext.timerSeconds == 10) { - func_800F5918(); + Audio_SetFastTempoForTimedMinigame(); } if (gSaveContext.timerSeconds == 0 && !Play_InCsMode(play)) { @@ -1064,7 +1064,7 @@ void EnTa_IdleAfterCuccoGameFinished(EnTa* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; } else { this->actor.flags |= ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED; - func_8002F2CC(&this->actor, play, 1000.0f); + Actor_OfferTalk(&this->actor, play, 1000.0f); } this->stateFlags |= 1; } @@ -1163,7 +1163,7 @@ void EnTa_Update(Actor* thisx, PlayState* play) { } if (this->stateFlags & 1) { - func_80038290(play, &this->actor, &this->headRot, &this->torsoRot, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->headRot, &this->torsoRot, this->actor.focus.pos); } else { Math_SmoothStepToS(&this->headRot.x, 0, 6, 6200, 100); Math_SmoothStepToS(&this->headRot.y, 0, 6, 6200, 100); diff --git a/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index e1a0c3f907..6b3fab93af 100644 --- a/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -136,7 +136,7 @@ void func_80B1778C(EnTakaraMan* this, PlayState* play) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; this->unk_218 = 1; } - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } } } @@ -201,7 +201,7 @@ void EnTakaraMan_Update(Actor* thisx, PlayState* play) { } Actor_SetFocus(&this->actor, this->height); - func_80038290(play, &this->actor, &this->unk_22C, &this->unk_232, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_22C, &this->unk_232, this->actor.focus.pos); if (this->eyeTimer == 0) { this->eyeTextureIdx++; if (this->eyeTextureIdx >= 2) { diff --git a/soh/src/overlays/actors/ovl_En_Test/z_en_test.c b/soh/src/overlays/actors/ovl_En_Test/z_en_test.c index 0bcf45a8b5..16641e2e4c 100644 --- a/soh/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/soh/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -1728,7 +1728,7 @@ void EnTest_Update(Actor* thisx, PlayState* play) { floorProperty = func_80041EA4(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); if ((floorProperty == 5) || (floorProperty == 0xC) || - func_80041D4C(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId) == 9) { + SurfaceType_GetFloorType(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId) == 9) { Actor_Kill(&this->actor); GameInteractor_ExecuteOnEnemyDefeat(&this->actor); return; diff --git a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index aab4323281..5054e4c80f 100644 --- a/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/soh/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -324,7 +324,7 @@ void EnToryo_HandleTalking(EnToryo* this, PlayState* play) { if (this->messageState == 0) { if (Actor_ProcessTalkRequest(&this->actor, play)) { - this->exchangeItemId = func_8002F368(play); + this->exchangeItemId = Actor_GetPlayerExchangeItemId(play); if (this->exchangeItemId != 0) { player->actor.textId = EnToryo_ReactToExchangeItem(this, play); this->actor.textId = player->actor.textId; @@ -336,7 +336,7 @@ void EnToryo_HandleTalking(EnToryo* this, PlayState* play) { Actor_GetScreenPos(play, &this->actor, &sp32, &sp30); if ((sp32 >= 0) && (sp32 < 0x141) && (sp30 >= 0) && (sp30 < 0xF1)) { this->actor.textId = EnToryo_GetTextId(this, play); - func_8002F298(&this->actor, play, 100.0f, 10); + Actor_OfferTalkExchangeEquiCylinder(&this->actor, play, 100.0f, 10); } } } diff --git a/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 6e528b0c24..d728c7f3a6 100644 --- a/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -141,7 +141,7 @@ void EnTr_CrySpellcast(EnTr* this, PlayState* play) { } else if (this->actor.child != NULL) { this->actor.child = NULL; } - func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); } void EnTr_DoNothing(EnTr* this, PlayState* play) { @@ -176,7 +176,7 @@ void EnTr_ChooseAction2(EnTr* this, PlayState* play) { EnTr_UpdateRotation(this, play, this->actionIndex); break; } - func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); } } } @@ -206,7 +206,7 @@ void EnTr_FlyKidnapCutscene(EnTr* this, PlayState* play) { } if (play->csCtx.frames < 670) { - func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); } } } @@ -295,7 +295,7 @@ void EnTr_Reappear(EnTr* this, PlayState* play) { if (this->timer > 0) { this->timer--; } - func_8002F974(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_TWINROBA_FLY_DEMO - SFX_FLAG); } void EnTr_WaitToReappear(EnTr* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/soh/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 7ef4c6a4c9..2109773741 100644 --- a/soh/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/soh/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -175,7 +175,7 @@ void EnTrap_Update(Actor* thisx, PlayState* play) { angleToKnockPlayer = thisx->yawTowardsPlayer; } play->damagePlayer(play, -4); - func_8002F7A0(play, thisx, 6.0f, angleToKnockPlayer, 6.0f); + Actor_SetPlayerKnockbackSmallNoDamage(play, thisx, 6.0f, angleToKnockPlayer, 6.0f); this->playerDmgTimer = 15; } if (thisx->params & SPIKETRAP_MODE_LINEAR) { diff --git a/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c index dc7a307de5..9e5bbba20d 100644 --- a/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -311,7 +311,7 @@ void EnVali_DischargeLightning(EnVali* this, PlayState* play) { } } - func_8002F974(&this->actor, NA_SE_EN_BIRI_SPARK - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_BIRI_SPARK - SFX_FLAG); } void EnVali_Lurk(EnVali* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 4ee837cdef..2351aeed37 100644 --- a/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -192,7 +192,7 @@ void EnVbBall_Update(Actor* thisx, PlayState* play2) { if ((this->actor.params == 100) || (this->actor.params == 101)) { Actor_Kill(&this->actor); if (this->actor.params == 100) { - func_80033E88(&this->actor, play, 5, 0xA); + Actor_RequestQuakeAndRumble(&this->actor, play, 5, 0xA); } if (this->actor.params == 100) { spawnNum = 2; diff --git a/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 77cedb3263..a2cea31866 100644 --- a/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -271,7 +271,7 @@ void EnWallmas_SetupTakePlayer(EnWallmas* this, PlayState* play) { this->actor.velocity.y = 0.0f; this->yTarget = this->actor.yDistToPlayer; - func_8002DF38(play, &this->actor, 0x25); + Player_SetCsAction(play, &this->actor, 0x25); OnePointCutscene_Init(play, 9500, 9999, &this->actor, MAIN_CAM); } diff --git a/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index d427b8aaae..78ff2f1653 100644 --- a/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/soh/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -170,7 +170,7 @@ void func_80B3943C(EnWonderTalk* this, PlayState* play) { osSyncPrintf("\n\n"); } this->unk_15A = 0; - func_8002F2CC(&this->actor, play, this->unk_15C); + Actor_OfferTalk(&this->actor, play, this->unk_15C); } } } diff --git a/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index 33daf26928..67736d5b39 100644 --- a/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/soh/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -163,7 +163,7 @@ void func_80B3A15C(EnWonderTalk2* this, PlayState* play) { } this->unk_158 = 0; - func_8002F1C4(&this->actor, play, this->triggerRange + 50.0f, 100.0f, EXCH_ITEM_NONE); + Actor_OfferTalkExchange(&this->actor, play, this->triggerRange + 50.0f, 100.0f, EXCH_ITEM_NONE); } } } diff --git a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c index ec6582ecd4..2bee1b4bc3 100644 --- a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -2224,7 +2224,7 @@ void EnXc_SetupDialogueAction(EnXc* this, PlayState* play) { } else { this->actor.textId = 0x700F; //"You need another skill" } - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } diff --git a/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 34bab2f2f9..552cbf4934 100644 --- a/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -96,7 +96,7 @@ void func_80B43AD4(EnYukabyun* this, PlayState* play) { this->actionfunc = func_80B43B6C; } Math_StepToF(&this->actor.world.pos.y, this->actor.home.pos.y + 30.0f, 1.0f); - func_8002F974(&this->actor, NA_SE_EN_YUKABYUN_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_YUKABYUN_FLY - SFX_FLAG); } void func_80B43B6C(EnYukabyun* this, PlayState* play) { @@ -105,7 +105,7 @@ void func_80B43B6C(EnYukabyun* this, PlayState* play) { Actor_Kill(&this->actor); return; } - func_8002F974(&this->actor, NA_SE_EN_YUKABYUN_FLY - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EN_YUKABYUN_FLY - SFX_FLAG); } void EnYukabyun_Break(EnYukabyun* this, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index b7178a89a3..44f7a1de8e 100644 --- a/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -144,7 +144,7 @@ void func_80B4AF18(EnZl1* this, PlayState* play) { Player* player = GET_PLAYER(play); s32 pad; - func_80038290(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos); if (this->unk_1E6 != 0) { if (Actor_TextboxIsClosing(&this->actor, play)) { @@ -153,7 +153,7 @@ void func_80B4AF18(EnZl1* this, PlayState* play) { } else if (Actor_ProcessTalkRequest(&this->actor, play)) { this->unk_1E6 = 1; } else if (this->actor.world.pos.y <= player->actor.world.pos.y) { - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } Collider_UpdateCylinder(&this->actor, &this->collider); @@ -194,7 +194,7 @@ void func_80B4B010(EnZl1* this, PlayState* play) { } else { rotDiff = ABS(this->actor.yawTowardsPlayer - this->actor.shape.rot.y); if ((rotDiff < 0x238E) && !(player->actor.world.pos.y < this->actor.world.pos.y)) { - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } } @@ -332,7 +332,7 @@ void func_80B4B240(EnZl1* this, PlayState* play) { frameCount = Animation_GetLastFrame(animHeaderSeg); Animation_Change(&this->skelAnime, animHeaderSeg, 1.0f, 0.0f, frameCount, sp54[sp3C], -10.0f); } - func_80038290(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos); } void func_80B4B7F4(CsCmdActorCue* npcAction, Vec3f* pos) { @@ -413,7 +413,7 @@ void func_80B4B8B4(EnZl1* this, PlayState* play) { } this->actor.velocity.z = (sp68.z - sp74.z) / actionLength; } - func_80038290(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos); Play_CameraSetAtEye(play, this->subCamId, &sp98, &sp8C); Play_CameraSetFov(play, this->subCamId, 70.0f); } @@ -547,7 +547,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, play)) { this->unk_1E2++; } else { - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } break; @@ -565,7 +565,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) { } break; } - func_80038290(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos); + Actor_TrackPlayer(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos); } void EnZl1_Update(Actor* thisx, PlayState* play) { diff --git a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index a672df2663..8526827779 100644 --- a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -1123,7 +1123,7 @@ void func_80B55D00(EnZl3* this, PlayState* play) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; this->actor.textId = 0x70D5; - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } else { this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; @@ -1182,7 +1182,7 @@ void func_80B55F6C(EnZl3* this, PlayState* play) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; this->actor.textId = 0x7059; - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } else { this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY); @@ -1244,7 +1244,7 @@ void func_80B56214(EnZl3* this, PlayState* play) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; this->actor.textId = 0x7059; - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } } else { @@ -1698,7 +1698,7 @@ void func_80B57350(EnZl3* this, PlayState* play) { if (ABS(temp_v0) <= 0x4300) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY; this->actor.textId = func_80B572F0(play); - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } diff --git a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index f4bc603cf1..580674b6e4 100644 --- a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -438,7 +438,7 @@ s32 EnZl4_CsWaitForPlayer(EnZl4* this, PlayState* play) { if ((playerx->world.pos.y != this->actor.world.pos.y) || (absYawDiff >= 0x3FFC)) { return false; } else { - func_8002F2CC(&this->actor, play, this->collider.dim.radius + 60.0f); + Actor_OfferTalk(&this->actor, play, this->collider.dim.radius + 60.0f); return false; } } @@ -921,7 +921,7 @@ s32 EnZl4_CsLookWindow(EnZl4* this, PlayState* play) { play->csCtx.state = CS_STATE_UNSKIPPABLE_INIT; } } else { - func_800AA000(0.0f, 0xA0, 0xA, 0x28); + Rumble_Request(0.0f, 0xA0, 0xA, 0x28); Player_SetCsActionWithHaltedActors(play, &this->actor, 1); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ZL4_ANIM_30); EnZl4_SetCsCameraAngle(play, 11); diff --git a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c index e2a2ad3109..6e30b0095b 100644 --- a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -622,7 +622,7 @@ void EnZo_Destroy(Actor* thisx, PlayState* play) { void EnZo_Standing(EnZo* this, PlayState* play) { s16 angle; - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 20); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 20); EnZo_SetAnimation(this); if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) { this->trackingMode = NPC_TRACKING_FULL_BODY; @@ -664,7 +664,7 @@ void EnZo_Surface(EnZo* this, PlayState* play) { } void EnZo_TreadWater(EnZo* this, PlayState* play) { - func_80034F54(play, this->fidgetTableY, this->fidgetTableZ, 20); + Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 20); if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { this->canSpeak = true; this->trackingMode = NPC_TRACKING_FULL_BODY; diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c index 41aee59654..b8f5dc7d9f 100644 --- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -2898,7 +2898,7 @@ void Fishing_HandleAquariumDialog(Fishing* this, PlayState* play) { sFishLengthToWeigh = sFishingRecordLength; this->isAquariumMessage = true; } else { - func_8002F2F4(&this->actor, play); + Actor_OfferTalkNearColChkInfoCylinder(&this->actor, play); } } else { this->aquariumWaitTimer--; @@ -4845,7 +4845,7 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) { this->stateAndTimer = 10; } } else { - func_8002F2CC(&this->actor, play, 100.0f); + Actor_OfferTalk(&this->actor, play, 100.0f); } break; diff --git a/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 526932d19a..733dbfe6d2 100644 --- a/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -126,9 +126,9 @@ void MagicDark_DiamondUpdate(Actor* thisx, PlayState* play) { gSaveContext.nayrusLoveTimer = nayrusLoveTimer + 1; if (nayrusLoveTimer < 1100) { - func_8002F974(thisx, NA_SE_PL_MAGIC_SOUL_NORMAL - SFX_FLAG); + Actor_PlaySfx_Flagged(thisx, NA_SE_PL_MAGIC_SOUL_NORMAL - SFX_FLAG); } else { - func_8002F974(thisx, NA_SE_PL_MAGIC_SOUL_FLASH - SFX_FLAG); + Actor_PlaySfx_Flagged(thisx, NA_SE_PL_MAGIC_SOUL_FLASH - SFX_FLAG); } } @@ -171,7 +171,7 @@ void MagicDark_OrbUpdate(Actor* thisx, PlayState* play) { s32 pad; Player* player = GET_PLAYER(play); - func_8002F974(&this->actor, NA_SE_PL_MAGIC_SOUL_BALL - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_PL_MAGIC_SOUL_BALL - SFX_FLAG); if (this->timer < 35) { MagicDark_DimLighting(play, this->timer * (1 / 45.0f)); Math_SmoothStepToF(&thisx->scale.x, this->scale * (1 / 12.000001f), 0.05f, 0.01f, 0.0001f); diff --git a/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 778c1c1889..334c1fdf6c 100644 --- a/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -258,7 +258,7 @@ void MirRay_Update(Actor* thisx, PlayState* play) { MirRay_MakeShieldLight(this, play); if (this->reflectIntensity > 0.0f) { - func_8002F8F0(&player->actor, NA_SE_IT_SHIELD_BEAM - SFX_FLAG); + Actor_PlaySfx_Flagged2(&player->actor, NA_SE_IT_SHIELD_BEAM - SFX_FLAG); } } } diff --git a/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 0510e93e2c..f977c5e67d 100644 --- a/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -539,12 +539,12 @@ void ObjBean_SetupWaitForBean(ObjBean* this) { void ObjBean_WaitForBean(ObjBean* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->dyna.actor, play)) { - if (func_8002F368(play) == EXCH_ITEM_BEAN) { + if (Actor_GetPlayerExchangeItemId(play) == EXCH_ITEM_BEAN) { func_80B8FE00(this); Flags_SetSwitch(play, this->dyna.actor.params & 0x3F); } } else { - func_8002F298(&this->dyna.actor, play, 40.0f, EXCH_ITEM_BEAN); + Actor_OfferTalkExchangeEquiCylinder(&this->dyna.actor, play, 40.0f, EXCH_ITEM_BEAN); } } @@ -584,7 +584,7 @@ void func_80B8FEAC(ObjBean* this, PlayState* play) { } else { this->timer = 1; } - func_8002F974(&this->dyna.actor, NA_SE_PL_PLANT_GROW_UP - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_PL_PLANT_GROW_UP - SFX_FLAG); } void func_80B8FF50(ObjBean* this) { @@ -680,7 +680,7 @@ void ObjBean_GrowWaterPhase2(ObjBean* this, PlayState* play) { if (this->stalkSizeMultiplier >= 0.1f) { // 100 Frames ObjBean_SetupGrowWaterPhase3(this); } - func_8002F974(&this->dyna.actor, NA_SE_PL_PLANT_TALLER - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_PL_PLANT_TALLER - SFX_FLAG); } void ObjBean_SetupGrowWaterPhase3(ObjBean* this) { @@ -791,7 +791,7 @@ void ObjBean_Fly(ObjBean* this, PlayState* play) { } else if (DynaPolyActor_IsPlayerOnTop(&this->dyna) != 0) { // Player is on top - func_8002F974(&this->dyna.actor, NA_SE_PL_PLANT_MOVE - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_PL_PLANT_MOVE - SFX_FLAG); if (play->sceneNum == SCENE_LOST_WOODS) { Camera_ChangeSetting(play->cameraPtrs[MAIN_CAM], CAM_SET_BEAN_LOST_WOODS); diff --git a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index cba8feb08a..12ca04c114 100644 --- a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -429,7 +429,7 @@ void ObjSwitch_FloorPress(ObjSwitch* this, PlayState* play) { if (this->dyna.actor.scale.y <= 33.0f / 2000.0f) { ObjSwitch_FloorDownInit(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_FOOT_SWITCH); - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 120, 20, 10); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 120, 20, 10); } } } @@ -487,7 +487,7 @@ void ObjSwitch_FloorRelease(ObjSwitch* this, PlayState* play) { ObjSwitch_FloorUpInit(this); Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_FOOT_SWITCH); if (subType == OBJSWITCH_SUBTYPE_FLOOR_1) { - func_800AA000(this->dyna.actor.xyzDistToPlayerSq, 120, 20, 10); + Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 120, 20, 10); } } } diff --git a/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index 10ae5895a6..c8fde0ef1f 100644 --- a/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -253,7 +253,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { lightRadius = (this->litTimer * 200.0f) / 20.0f; } brightness = (u8)(Rand_ZeroOne() * 127.0f) + 128; - func_8002F974(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); + Actor_PlaySfx_Flagged(&this->actor, NA_SE_EV_TORCH - SFX_FLAG); } Lights_PointSetColorAndRadius(&this->lightInfo, brightness, brightness, 0, lightRadius); this->flameTexScroll++; diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 4ae297f319..394760402b 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -1717,7 +1717,7 @@ void func_80832630(PlayState* play) { void Player_RequestRumble(Player* this, s32 sourceStrength, s32 duration, s32 decreaseRate, s32 distSq) { if (this->actor.category == ACTORCAT_PLAYER) { - func_800AA000(distSq, sourceStrength, duration, decreaseRate); + Rumble_Request(distSq, sourceStrength, duration, decreaseRate); } } @@ -3477,7 +3477,7 @@ void Player_UseItem(PlayState* play, Player* this, s32 item) { // Handle "cutscene items" if (!Player_CheckHostileLockOn(this) || ((itemAction >= PLAYER_IA_BOTTLE_POTION_RED) && (itemAction <= PLAYER_IA_BOTTLE_FAIRY))) { - func_8002D53C(play, &play->actorCtx.titleCtx); + TitleCard_Clear(play, &play->actorCtx.titleCtx); this->unk_6AD = 4; this->itemAction = itemAction; } @@ -3536,7 +3536,7 @@ void func_80836448(PlayState* play, Player* this, LinkAnimationHeader* anim) { this->av1.actionVar1 = 1; } else { play->gameOverCtx.state = GAMEOVER_DEATH_START; - func_800F6AB0(0); + Audio_StopBgmAndFanfare(0); Audio_PlayFanfare(NA_BGM_GAME_OVER); gSaveContext.seqId = (u8)NA_BGM_DISABLED; gSaveContext.natureAmbienceId = NATURE_ID_DISABLED; @@ -3867,7 +3867,7 @@ void Player_UpdateZTargeting(Player* this, PlayState* play) { if (this->focusActor != NULL) { if ((this->actor.category == ACTORCAT_PLAYER) && (this->focusActor != this->autoLockOnActor) && - func_8002F0C8(this->focusActor, this, ignoreLeash)) { + Attention_ShouldReleaseLockOn(this->focusActor, this, ignoreLeash)) { Player_ReleaseLockOn(this); this->stateFlags1 |= PLAYER_STATE1_LOCK_ON_FORCED_TO_RELEASE; } else if (this->focusActor != NULL) { @@ -5169,7 +5169,7 @@ s32 Player_HandleExitsAndVoids(PlayState* play, Player* this, CollisionPoly* pol if (!(this->stateFlags1 & (PLAYER_STATE1_ON_HORSE | PLAYER_STATE1_IN_CUTSCENE)) && !(this->stateFlags2 & PLAYER_STATE2_CRAWLING) && !func_808332B8(this) && - (temp = func_80041D4C(&play->colCtx, poly, bgId), (temp != 10)) && + (temp = SurfaceType_GetFloorType(&play->colCtx, poly, bgId), (temp != 10)) && ((sp34 < 100) || (this->actor.bgCheckFlags & 1))) { if (temp == 11) { @@ -7274,7 +7274,7 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) { } if (iREG(67) || - (((interactedActor = this->interactRangeActor) != NULL) && func_8002D53C(play, &play->actorCtx.titleCtx))) { + (((interactedActor = this->interactRangeActor) != NULL) && TitleCard_Clear(play, &play->actorCtx.titleCtx))) { if (iREG(67) || (this->getItemId > GI_NONE)) { if (iREG(67)) { this->getItemId = iREG(68); @@ -8058,7 +8058,7 @@ void func_8084029C(Player* this, f32 arg1) { } if ((this->currentBoots == PLAYER_BOOTS_HOVER) && !(this->actor.bgCheckFlags & 1) && (this->hoverBootsTimer != 0)) { - func_8002F8F0(&this->actor, NA_SE_PL_HOBBERBOOTS_LV - SFX_FLAG); + Actor_PlaySfx_Flagged2(&this->actor, NA_SE_PL_HOBBERBOOTS_LV - SFX_FLAG); } else if (func_8084021C(this->unk_868, arg1, 29.0f, 10.0f) || func_8084021C(this->unk_868, arg1, 29.0f, 24.0f)) { Player_PlaySteppingSfx(this, this->linearVelocity); if (this->linearVelocity > 4.0f) { @@ -9147,7 +9147,7 @@ s32 func_80842DF4(PlayState* play, Player* this) { if (BgCheck_EntityLineTest1(&play->colCtx, &sp68, &this->meleeWeaponInfo[0].tip, &sp5C, &sp78, true, false, false, true, &sp74) && !SurfaceType_IsIgnoredByEntities(&play->colCtx, sp78, sp74) && - (func_80041D4C(&play->colCtx, sp78, sp74) != 6) && + (SurfaceType_GetFloorType(&play->colCtx, sp78, sp74) != 6) && (func_8002F9EC(play, &this->actor, sp78, sp74, &sp5C) == 0)) { if (this->heldItemAction == PLAYER_IA_HAMMER) { @@ -9823,7 +9823,7 @@ void Player_Action_Roll(Player* this, PlayState* play) { func_8083DF68(this, speedTarget, this->actor.shape.rot.y); if (func_8084269C(play, this)) { - func_8002F8F0(&this->actor, NA_SE_PL_ROLL_DUST - SFX_FLAG); + Actor_PlaySfx_Flagged2(&this->actor, NA_SE_PL_ROLL_DUST - SFX_FLAG); } Player_ProcessAnimSfxList(this, sRollAnimSfxList); @@ -11370,7 +11370,7 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) { if (this->actor.bgCheckFlags & 1) { if (GameInteractor_Should(VB_SET_STATIC_FLOOR_TYPE, true, this)) { - sFloorType = func_80041D4C(&play->colCtx, floorPoly, this->actor.floorBgId); + sFloorType = SurfaceType_GetFloorType(&play->colCtx, floorPoly, this->actor.floorBgId); } if (!Player_UpdateHoverBoots(this)) { @@ -11573,7 +11573,7 @@ void Player_UpdateBodyShock(PlayState* play, Player* this) { shockPos.z = (Rand_CenteredFloat(5.0f) + randBodyPart->z) - this->actor.world.pos.z; EffectSsFhgFlash_SpawnShock(play, &this->actor, &shockPos, shockScale, FHGFLASH_SHOCK_PLAYER); - func_8002F8F0(&this->actor, NA_SE_PL_SPARK - SFX_FLAG); + Actor_PlaySfx_Flagged2(&this->actor, NA_SE_PL_SPARK - SFX_FLAG); } } @@ -11858,7 +11858,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { } Math_ScaledStepToS(&this->unk_6C2, 0, 400); - func_80032CB4(this->unk_3A8, 20, 80, 6); + FaceChange_UpdateBlinking(this->unk_3A8, 20, 80, 6); this->actor.shape.face = this->unk_3A8[0] + ((play->gameplayFrames & 32) ? 0 : 3); @@ -12285,7 +12285,7 @@ void Player_Update(Actor* thisx, PlayState* play) { Player* player = GET_PLAYER(play); player->pushedSpeed = 3.0f; // Play fan sound (too annoying) - // func_8002F974(&player->actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); + // Actor_PlaySfx_Flagged(&player->actor, NA_SE_EV_WIND_TRAP - SFX_FLAG); } GameInteractor_ExecuteOnPlayerUpdate(); @@ -13537,7 +13537,7 @@ void Player_Action_8084CC98(Player* this, PlayState* play) { } if (LinkAnimation_OnFrame(&this->skelAnime, arr[1])) { - func_8002DE74(play, this); + Actor_RequestHorseCameraSetting(play, this); Player_PlaySfx(this, NA_SE_PL_SIT_ON_HORSE); return; } @@ -13545,7 +13545,7 @@ void Player_Action_8084CC98(Player* this, PlayState* play) { return; } - func_8002DE74(play, this); + Actor_RequestHorseCameraSetting(play, this); this->skelAnime.prevTransl = D_8085499C; if ((rideActor->animationIdx != this->av2.actionVar2) && @@ -14848,7 +14848,7 @@ void Player_Action_8084FBF4(Player* this, PlayState* play) { } this->bodyShockTimer = 40; - func_8002F8F0(&this->actor, NA_SE_VO_LI_TAKEN_AWAY - SFX_FLAG + this->ageProperties->unk_92); + Actor_PlaySfx_Flagged2(&this->actor, NA_SE_VO_LI_TAKEN_AWAY - SFX_FLAG + this->ageProperties->unk_92); } /** diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 964ba69c23..63a69358fd 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -361,7 +361,7 @@ bool fileSelectSpoilerFileLoaded = false; void FileChoose_UpdateRandomizer() { if (CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) != 0 && generating == 0) { generating = 1; - func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_HORSE, 0, 7, 1); + Audio_PlaySequenceWithSeqPlayerIO(SEQ_PLAYER_BGM_MAIN, NA_BGM_HORSE, 0, 7, 1); return; } else if (CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) == 0 && generating) { if (Randomizer_IsSeedGenerated()) { @@ -370,7 +370,7 @@ void FileChoose_UpdateRandomizer() { } else { Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR); } - func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1); + Audio_PlaySequenceWithSeqPlayerIO(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1); generating = 0; return; } else if (generating) { @@ -2379,7 +2379,7 @@ void FileChoose_ConfirmFile(GameState* thisx) { if (CHECK_BTN_ALL(input->press.button, BTN_START) || (CHECK_BTN_ALL(input->press.button, BTN_A))) { if (this->confirmButtonIndex == FS_BTN_CONFIRM_YES) { - func_800AA000(300.0f, 180, 20, 100); + Rumble_Request(300.0f, 180, 20, 100); Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); this->selectMode = SM_FADE_OUT; @@ -3136,5 +3136,5 @@ void FileChoose_Init(GameState* thisx) { Font_LoadOrderedFontNTSC(&this->font); } Audio_QueueSeqCmd(0xF << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0xA); - func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1); + Audio_PlaySequenceWithSeqPlayerIO(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1); } diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c index fe8c33fa1e..ce791e9f98 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c @@ -396,7 +396,7 @@ void FileChoose_CopyConfirm(GameState* thisx) { this->nextTitleLabel = FS_TITLE_COPY_COMPLETE; this->actionTimer = 8; this->configMode = CM_COPY_ANIM_1; - func_800AA000(300.0f, 0xB4, 0x14, 0x64); + Rumble_Request(300.0f, 0xB4, 0x14, 0x64); Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); } else if ((ABS(this->stickRelY) >= 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) { @@ -872,7 +872,7 @@ void FileChoose_EraseConfirm(GameState* thisx) { this->actionTimer = 8; this->configMode = CM_ERASE_ANIM_1; this->nextTitleLabel = FS_TITLE_ERASE_COMPLETE; - func_800AA000(200.0f, 0xFF, 0x14, 0x96); + Rumble_Request(200.0f, 0xFF, 0x14, 0x96); sEraseDelayTimer = 15; } else if ((ABS(this->stickRelY) >= 30) || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DDOWN | BTN_DUP))) { Audio_PlaySoundGeneral(NA_SE_SY_FSEL_CURSOR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_NES.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_NES.c index 6d1e1d5756..949f3af9dd 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_NES.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_NES.c @@ -713,7 +713,7 @@ void FileChoose_DrawNameEntryNES(GameState* thisx) { CVarSetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 0); this->nameBoxAlpha[this->buttonIndex] = this->nameAlpha[this->buttonIndex] = 200; this->connectorAlpha[this->buttonIndex] = 255; - func_800AA000(300.0f, 180, 20, 100); + Rumble_Request(300.0f, 180, 20, 100); } else { Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, @@ -1017,7 +1017,7 @@ void FileChoose_UpdateOptionsMenuNES(GameState* thisx) { // osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); // osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); // osSyncPrintf(VT_RST); - func_800F6700(gSaveContext.audioSetting); + Audio_SetSoundOutputMode(gSaveContext.audioSetting); // osSyncPrintf("終了\n"); return; } diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c index d82ec38448..5228b7e99a 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c @@ -465,7 +465,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) { CVarSetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 0); this->nameBoxAlpha[this->buttonIndex] = this->nameAlpha[this->buttonIndex] = 200; this->connectorAlpha[this->buttonIndex] = 255; - func_800AA000(300.0f, 0xB4, 0x14, 0x64); + Rumble_Request(300.0f, 0xB4, 0x14, 0x64); } else { Audio_PlaySoundGeneral(NA_SE_SY_FSEL_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -714,7 +714,7 @@ void FileChoose_UpdateOptionsMenu(GameState* thisx) { osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); osSyncPrintf("Na_SetSoundOutputMode = %d\n", gSaveContext.audioSetting); osSyncPrintf(VT_RST); - func_800F6700(gSaveContext.audioSetting); + Audio_SetSoundOutputMode(gSaveContext.audioSetting); osSyncPrintf("終了\n"); return; }