From 784c1724ff4b33b8d1cb9079a353f2911f09a208 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Fri, 18 Oct 2024 05:54:54 -0700 Subject: [PATCH] Sync Colliders Final (#1718) * ElementDamageInfoAT * ElementDamageInfoAC * colMaterial * elemMaterial --- docs/tutorial/advanced_control_flow.md | 4 +- include/z64collision_check.h | 152 ++++---- src/code/z_actor.c | 14 +- src/code/z_collision_check.c | 357 +++++++++--------- src/code/z_en_a_keep.c | 8 +- src/code/z_en_item00.c | 8 +- src/code/z_fireobj.c | 12 +- src/code/z_player_lib.c | 10 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 12 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 8 +- .../ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c | 14 +- .../ovl_Bg_Botihasira/z_bg_botihasira.c | 8 +- .../z_bg_dblue_waterfall.c | 28 +- .../ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c | 8 +- .../actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c | 8 +- .../ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c | 8 +- .../z_bg_hakugin_bombwall.c | 12 +- .../ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c | 8 +- .../z_bg_hakugin_switch.c | 8 +- .../actors/ovl_Bg_Icicle/z_bg_icicle.c | 8 +- .../z_bg_ikana_bombwall.c | 16 +- .../ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c | 8 +- .../ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c | 72 ++-- .../actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c | 8 +- .../z_bg_ikana_rotaryroom.c | 22 +- .../actors/ovl_Bg_Ikninside/z_bg_ikninside.c | 11 +- .../actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c | 8 +- .../ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c | 8 +- .../ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c | 28 +- .../ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c | 14 +- .../ovl_Bg_Last_Bwall/z_bg_last_bwall.c | 14 +- .../actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c | 8 +- .../actors/ovl_Bg_Spdweb/z_bg_spdweb.c | 50 +-- .../ovl_Bg_Spout_Fire/z_bg_spout_fire.c | 8 +- src/overlays/actors/ovl_Boss_01/z_boss_01.c | 148 ++++---- src/overlays/actors/ovl_Boss_02/z_boss_02.c | 160 ++++---- src/overlays/actors/ovl_Boss_03/z_boss_03.c | 74 ++-- src/overlays/actors/ovl_Boss_04/z_boss_04.c | 20 +- src/overlays/actors/ovl_Boss_05/z_boss_05.c | 40 +- src/overlays/actors/ovl_Boss_06/z_boss_06.c | 12 +- src/overlays/actors/ovl_Boss_07/z_boss_07.c | 76 ++-- .../actors/ovl_Boss_Hakugin/z_boss_hakugin.c | 204 +++++----- src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c | 16 +- src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 8 +- src/overlays/actors/ovl_En_Ah/z_en_ah.c | 8 +- .../ovl_En_Akindonuts/z_en_akindonuts.c | 8 +- src/overlays/actors/ovl_En_Al/z_en_al.c | 8 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 30 +- src/overlays/actors/ovl_En_An/z_en_an.c | 8 +- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 8 +- .../actors/ovl_En_Aob_01/z_en_aob_01.c | 8 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 22 +- src/overlays/actors/ovl_En_Az/z_en_az.c | 8 +- src/overlays/actors/ovl_En_Baba/z_en_baba.c | 8 +- src/overlays/actors/ovl_En_Baguo/z_en_baguo.c | 10 +- .../actors/ovl_En_Baisen/z_en_baisen.c | 8 +- src/overlays/actors/ovl_En_Bal/z_en_bal.c | 8 +- src/overlays/actors/ovl_En_Bat/z_en_bat.c | 12 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 14 +- .../actors/ovl_En_Bba_01/z_en_bba_01.c | 8 +- .../actors/ovl_En_Bbfall/z_en_bbfall.c | 41 +- src/overlays/actors/ovl_En_Bee/z_en_bee.c | 8 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 26 +- .../actors/ovl_En_Bigpamet/z_en_bigpamet.c | 14 +- src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c | 22 +- .../actors/ovl_En_Bigslime/z_en_bigslime.c | 40 +- .../actors/ovl_En_Bji_01/z_en_bji_01.c | 8 +- src/overlays/actors/ovl_En_Bjt/z_en_bjt.c | 8 +- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 26 +- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 8 +- .../actors/ovl_En_Bombal/z_en_bombal.c | 8 +- .../actors/ovl_En_Bombers/z_en_bombers.c | 8 +- .../actors/ovl_En_Bombers2/z_en_bombers2.c | 8 +- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 20 +- .../actors/ovl_En_Bomjima/z_en_bomjima.c | 8 +- .../actors/ovl_En_Bomjimb/z_en_bomjimb.c | 8 +- src/overlays/actors/ovl_En_Boom/z_en_boom.c | 8 +- src/overlays/actors/ovl_En_Bsb/z_en_bsb.c | 70 ++-- .../actors/ovl_En_Bubble/z_en_bubble.c | 28 +- src/overlays/actors/ovl_En_Butte/z_en_butte.c | 8 +- src/overlays/actors/ovl_En_Cha/z_en_cha.c | 8 +- .../actors/ovl_En_Cne_01/z_en_cne_01.c | 8 +- .../actors/ovl_En_Col_Man/z_en_col_man.c | 8 +- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 8 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 15 +- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 8 +- .../actors/ovl_En_Daiku2/z_en_daiku2.c | 8 +- src/overlays/actors/ovl_En_Death/z_en_death.c | 44 +-- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 71 ++-- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 23 +- .../ovl_En_Demo_heishi/z_en_demo_heishi.c | 8 +- src/overlays/actors/ovl_En_Dg/z_en_dg.c | 8 +- .../actors/ovl_En_Dinofos/z_en_dinofos.c | 82 ++-- src/overlays/actors/ovl_En_Dnk/z_en_dnk.c | 8 +- src/overlays/actors/ovl_En_Dno/z_en_dno.c | 8 +- src/overlays/actors/ovl_En_Dnp/z_en_dnp.c | 8 +- src/overlays/actors/ovl_En_Dnq/z_en_dnq.c | 8 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 8 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 110 +++--- .../actors/ovl_En_Door_Etc/z_en_door_etc.c | 8 +- .../actors/ovl_En_Dragon/z_en_dragon.c | 68 ++-- src/overlays/actors/ovl_En_Drs/z_en_drs.c | 8 +- src/overlays/actors/ovl_En_Dt/z_en_dt.c | 8 +- src/overlays/actors/ovl_En_Egol/z_en_egol.c | 74 ++-- .../actors/ovl_En_Elfbub/z_en_elfbub.c | 8 +- .../actors/ovl_En_Elforg/z_en_elforg.c | 8 +- .../actors/ovl_En_Encount2/z_en_encount2.c | 8 +- .../actors/ovl_En_Estone/z_en_estone.c | 8 +- src/overlays/actors/ovl_En_Famos/z_en_famos.c | 30 +- src/overlays/actors/ovl_En_Fg/z_en_fg.c | 8 +- .../actors/ovl_En_Firefly/z_en_firefly.c | 20 +- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 8 +- src/overlays/actors/ovl_En_Fish2/z_en_fish2.c | 14 +- .../actors/ovl_En_Fishing/z_en_fishing.c | 74 ++-- .../actors/ovl_En_Floormas/z_en_floormas.c | 40 +- src/overlays/actors/ovl_En_Fsn/z_en_fsn.c | 8 +- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 8 +- .../actors/ovl_En_Fu_Kago/z_en_fu_kago.c | 8 +- .../actors/ovl_En_Fu_Mato/z_en_fu_mato.c | 10 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 24 +- .../actors/ovl_En_Gamelupy/z_en_gamelupy.c | 8 +- src/overlays/actors/ovl_En_Gb2/z_en_gb2.c | 8 +- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 8 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 10 +- src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 8 +- src/overlays/actors/ovl_En_Geg/z_en_geg.c | 16 +- src/overlays/actors/ovl_En_Gg/z_en_gg.c | 8 +- src/overlays/actors/ovl_En_Gk/z_en_gk.c | 8 +- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 16 +- src/overlays/actors/ovl_En_Go/z_en_go.c | 24 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 29 +- .../ovl_En_Grasshopper/z_en_grasshopper.c | 42 +-- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 8 +- .../ovl_En_Guard_Nuts/z_en_guard_nuts.c | 8 +- .../actors/ovl_En_Guruguru/z_en_guruguru.c | 8 +- .../actors/ovl_En_Hakurock/z_en_hakurock.c | 8 +- .../actors/ovl_En_Heishi/z_en_heishi.c | 8 +- src/overlays/actors/ovl_En_Hg/z_en_hg.c | 8 +- src/overlays/actors/ovl_En_Hgo/z_en_hgo.c | 8 +- .../ovl_En_Hidden_Nuts/z_en_hidden_nuts.c | 8 +- .../actors/ovl_En_Hint_Skb/z_en_hint_skb.c | 14 +- .../actors/ovl_En_Hit_Tag/z_en_hit_tag.c | 8 +- .../actors/ovl_En_Honotrap/z_en_honotrap.c | 22 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 36 +- .../z_en_horse_link_child.c | 8 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 8 +- src/overlays/actors/ovl_En_Ig/z_en_ig.c | 16 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 38 +- src/overlays/actors/ovl_En_In/z_en_in.c | 16 +- .../actors/ovl_En_Insect/z_en_insect.c | 8 +- .../actors/ovl_En_Invadepoh/z_en_invadepoh.c | 24 +- .../z_en_invisible_ruppe.c | 8 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 22 +- src/overlays/actors/ovl_En_Ja/z_en_ja.c | 8 +- .../actors/ovl_En_Jc_Mato/z_en_jc_mato.c | 8 +- src/overlays/actors/ovl_En_Jg/z_en_jg.c | 8 +- .../actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c | 8 +- src/overlays/actors/ovl_En_Js/z_en_js.c | 8 +- src/overlays/actors/ovl_En_Jso/z_en_jso.c | 22 +- src/overlays/actors/ovl_En_Jso2/z_en_jso2.c | 16 +- .../actors/ovl_En_Kaizoku/z_en_kaizoku.c | 64 ++-- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 8 +- src/overlays/actors/ovl_En_Kame/z_en_kame.c | 28 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 18 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 24 +- .../actors/ovl_En_Kendo_Js/z_en_kendo_js.c | 8 +- src/overlays/actors/ovl_En_Kitan/z_en_kitan.c | 8 +- .../actors/ovl_En_Knight/z_en_knight.c | 76 ++-- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 8 +- src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c | 10 +- .../actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c | 8 +- .../actors/ovl_En_Look_Nuts/z_en_look_nuts.c | 8 +- .../actors/ovl_En_M_Fire1/z_en_m_fire1.c | 10 +- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 20 +- src/overlays/actors/ovl_En_Ma4/z_en_ma4.c | 8 +- .../actors/ovl_En_Ma_Yto/z_en_ma_yto.c | 8 +- .../actors/ovl_En_Ma_Yts/z_en_ma_yts.c | 8 +- .../actors/ovl_En_Maruta/z_en_maruta.c | 8 +- .../actors/ovl_En_Minideath/z_en_minideath.c | 30 +- .../actors/ovl_En_Minifrog/z_en_minifrog.c | 8 +- .../actors/ovl_En_Minislime/z_en_minislime.c | 8 +- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 8 +- src/overlays/actors/ovl_En_Mkk/z_en_mkk.c | 8 +- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 8 +- src/overlays/actors/ovl_En_Mm3/z_en_mm3.c | 8 +- src/overlays/actors/ovl_En_Mnk/z_en_mnk.c | 8 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 8 +- .../actors/ovl_En_Mushi2/z_en_mushi2.c | 8 +- src/overlays/actors/ovl_En_Muto/z_en_muto.c | 8 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 8 +- .../actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c | 8 +- .../actors/ovl_En_Nimotsu/z_en_nimotsu.c | 8 +- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 8 +- src/overlays/actors/ovl_En_Nnh/z_en_nnh.c | 8 +- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 12 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 32 +- .../actors/ovl_En_Onpuman/z_en_onpuman.c | 8 +- src/overlays/actors/ovl_En_Osn/z_en_osn.c | 8 +- src/overlays/actors/ovl_En_Ot/z_en_ot.c | 8 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 8 +- .../actors/ovl_En_Pamera/z_en_pamera.c | 8 +- .../actors/ovl_En_Pametfrog/z_en_pametfrog.c | 37 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 45 +-- src/overlays/actors/ovl_En_Pm/z_en_pm.c | 16 +- .../ovl_En_Po_Composer/z_en_po_composer.c | 16 +- .../actors/ovl_En_Po_Fusen/z_en_po_fusen.c | 8 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 34 +- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 28 +- src/overlays/actors/ovl_En_Pp/z_en_pp.c | 40 +- src/overlays/actors/ovl_En_Pr/z_en_pr.c | 8 +- src/overlays/actors/ovl_En_Pr2/z_en_pr2.c | 8 +- src/overlays/actors/ovl_En_Prz/z_en_prz.c | 8 +- src/overlays/actors/ovl_En_Pst/z_en_pst.c | 8 +- .../actors/ovl_En_Racedog/z_en_racedog.c | 8 +- src/overlays/actors/ovl_En_Raf/z_en_raf.c | 8 +- .../actors/ovl_En_Rail_Skb/z_en_rail_skb.c | 14 +- .../actors/ovl_En_Railgibud/z_en_railgibud.c | 8 +- src/overlays/actors/ovl_En_Rat/z_en_rat.c | 8 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 8 +- src/overlays/actors/ovl_En_Rg/z_en_rg.c | 16 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 30 +- src/overlays/actors/ovl_En_Ru/z_en_ru.c | 8 +- .../actors/ovl_En_Ruppecrow/z_en_ruppecrow.c | 8 +- src/overlays/actors/ovl_En_Rz/z_en_rz.c | 8 +- .../actors/ovl_En_S_Goro/z_en_s_goro.c | 8 +- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 14 +- .../actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c | 8 +- .../actors/ovl_En_Scopecrow/z_en_scopecrow.c | 8 +- .../actors/ovl_En_Scopenuts/z_en_scopenuts.c | 8 +- .../actors/ovl_En_Sellnuts/z_en_sellnuts.c | 8 +- src/overlays/actors/ovl_En_Si/z_en_si.c | 8 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 14 +- src/overlays/actors/ovl_En_Slime/z_en_slime.c | 20 +- .../actors/ovl_En_Snowman/z_en_snowman.c | 22 +- .../actors/ovl_En_Snowwd/z_en_snowwd.c | 8 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 48 +-- src/overlays/actors/ovl_En_St/z_en_st.c | 32 +- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 8 +- .../ovl_En_Stone_heishi/z_en_stone_heishi.c | 8 +- .../ovl_En_Stop_heishi/z_en_stop_heishi.c | 8 +- .../actors/ovl_En_Suttari/z_en_suttari.c | 8 +- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 12 +- .../ovl_En_Syateki_Crow/z_en_syateki_crow.c | 8 +- .../z_en_syateki_dekunuts.c | 8 +- .../ovl_En_Syateki_Okuta/z_en_syateki_okuta.c | 8 +- .../ovl_En_Syateki_Wf/z_en_syateki_wf.c | 24 +- src/overlays/actors/ovl_En_Tab/z_en_tab.c | 8 +- .../actors/ovl_En_Tag_Obj/z_en_tag_obj.c | 8 +- .../ovl_En_Talk_Gibud/z_en_talk_gibud.c | 8 +- .../actors/ovl_En_Tanron2/z_en_tanron2.c | 20 +- .../actors/ovl_En_Tanron3/z_en_tanron3.c | 16 +- .../actors/ovl_En_Tanron5/z_en_tanron5.c | 16 +- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 8 +- .../actors/ovl_En_Thiefbird/z_en_thiefbird.c | 26 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 24 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 8 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 8 +- src/overlays/actors/ovl_En_Toto/z_en_toto.c | 8 +- src/overlays/actors/ovl_En_Trt2/z_en_trt2.c | 8 +- src/overlays/actors/ovl_En_Tru/z_en_tru.c | 8 +- .../actors/ovl_En_Tru_Mt/z_en_tru_mt.c | 8 +- src/overlays/actors/ovl_En_Tsn/z_en_tsn.c | 8 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 8 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 24 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 20 +- .../actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c | 8 +- .../actors/ovl_En_Wdhand/z_en_wdhand.c | 46 +-- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 60 +-- src/overlays/actors/ovl_En_Wiz/z_en_wiz.c | 76 ++-- .../actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c | 30 +- .../actors/ovl_En_Wood02/z_en_wood02.c | 8 +- src/overlays/actors/ovl_En_Yb/z_en_yb.c | 8 +- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 8 +- src/overlays/actors/ovl_En_Zob/z_en_zob.c | 8 +- src/overlays/actors/ovl_En_Zod/z_en_zod.c | 8 +- src/overlays/actors/ovl_En_Zog/z_en_zog.c | 8 +- src/overlays/actors/ovl_En_Zos/z_en_zos.c | 8 +- src/overlays/actors/ovl_En_Zot/z_en_zot.c | 8 +- src/overlays/actors/ovl_En_Zov/z_en_zov.c | 8 +- src/overlays/actors/ovl_En_Zow/z_en_zow.c | 8 +- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 16 +- src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c | 8 +- src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c | 16 +- src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c | 8 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 16 +- src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c | 18 +- .../ovl_Obj_Bigicicle/z_obj_bigicicle.c | 18 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 30 +- src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c | 8 +- src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c | 12 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 12 +- src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c | 38 +- .../actors/ovl_Obj_Etcetera/z_obj_etcetera.c | 8 +- .../ovl_Obj_Fireshield/z_obj_fireshield.c | 16 +- .../ovl_Obj_Flowerpot/z_obj_flowerpot.c | 26 +- .../actors/ovl_Obj_Grass/z_obj_grass.c | 8 +- .../ovl_Obj_Grass_Carry/z_obj_grass_carry.c | 8 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 18 +- .../ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c | 14 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 20 +- .../actors/ovl_Obj_Iceblock/z_obj_iceblock.c | 12 +- .../ovl_Obj_Jgame_Light/z_obj_jgame_light.c | 8 +- .../ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c | 22 +- .../actors/ovl_Obj_Kibako/z_obj_kibako.c | 8 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 14 +- .../ovl_Obj_Lightblock/z_obj_lightblock.c | 10 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 10 +- .../actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c | 8 +- src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c | 14 +- .../actors/ovl_Obj_Snowball/z_obj_snowball.c | 20 +- .../ovl_Obj_Snowball2/z_obj_snowball2.c | 16 +- .../ovl_Obj_Spidertent/z_obj_spidertent.c | 86 ++--- .../ovl_Obj_Spinyroll/z_obj_spinyroll.c | 38 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 40 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 26 +- .../z_obj_takaraya_wall.c | 8 +- src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c | 14 +- src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c | 10 +- src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c | 8 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 10 +- src/overlays/actors/ovl_Obj_Um/z_obj_um.c | 8 +- .../ovl_Obj_Vspinyroll/z_obj_vspinyroll.c | 8 +- .../ovl_Obj_Warpstone/z_obj_warpstone.c | 8 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 8 +- .../actors/ovl_player_actor/z_player.c | 78 ++-- tools/disasm/functions.txt | 22 +- tools/disasm/variables.txt | 4 +- tools/overlayhelpers/colliderinit.py | 52 +-- tools/sizes/code_functions.csv | 22 +- 329 files changed, 3222 insertions(+), 3205 deletions(-) diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md index 0265152a6d..094fbdacd4 100644 --- a/docs/tutorial/advanced_control_flow.md +++ b/docs/tutorial/advanced_control_flow.md @@ -39,8 +39,8 @@ ActorInit En_Ms_InitVars = { }; static ColliderCylinderInitType1 D_80952BA0 = { - { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, + { ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, { 22, 37, 0, { 0, 0, 0 } }, }; diff --git a/include/z64collision_check.h b/include/z64collision_check.h index 06a8445df5..37aa9f77cf 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -17,12 +17,12 @@ typedef struct { /* 0x11 */ u8 acFlags; // Information flags for AC collisions. /* 0x12 */ u8 ocFlags1; // Information flags for OC collisions. /* 0x13 */ u8 ocFlags2; // Flags related to which colliders it can OC collide with. - /* 0x14 */ u8 colType; // Determines hitmarks and sound effects during AC collisions. See `ColliderType` enum + /* 0x14 */ u8 colMaterial; // Determines hitmarks and sound effects during AC collisions. See `ColliderMaterial` enum /* 0x15 */ u8 shape; // See `ColliderShape` enum } Collider; // size = 0x18 typedef struct { - /* 0x0 */ u8 colType; // Determines hitmarks and sound effects during AC collisions. See `ColliderType` enum + /* 0x0 */ u8 colMaterial; // Determines hitmarks and sound effects during AC collisions. See `ColliderMaterial` enum /* 0x1 */ u8 atFlags; // Information flags for AT collisions. /* 0x2 */ u8 acFlags; // Information flags for AC collisions. /* 0x3 */ u8 ocFlags1; // Information flags for OC collisions. @@ -31,7 +31,7 @@ typedef struct { } ColliderInit; // size = 0x6 typedef struct { - /* 0x0 */ u8 colType; // Determines hitmarks and sound effects during AC collisions. See `ColliderType` enum + /* 0x0 */ u8 colMaterial; // Determines hitmarks and sound effects during AC collisions. See `ColliderMaterial` enum /* 0x1 */ u8 atFlags; // Information flags for AT collisions. /* 0x2 */ u8 acFlags; // Information flags for AC collisions. /* 0x3 */ u8 ocFlags1; // Information flags for OC collisions. @@ -47,36 +47,36 @@ typedef struct { } ColliderInitToActor; // size = 0x8 typedef struct { - /* 0x0 */ u32 dmgFlags; // Toucher damage type flags. + /* 0x0 */ u32 dmgFlags; // Damage types dealt by this collider element as AT. /* 0x4 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) /* 0x5 */ u8 damage; // Damage or Stun Timer -} ColliderTouch; // size = 0x8 +} ColliderElementDamageInfoAT; // size = 0x8 typedef struct { - /* 0x0 */ u32 dmgFlags; // Toucher damage type flags. + /* 0x0 */ u32 dmgFlags; // Damage types dealt by this collider element as AT. /* 0x4 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) /* 0x5 */ u8 damage; // Damage or Stun Timer -} ColliderTouchInit; // size = 0x8 +} ColliderElementDamageInfoATInit; // size = 0x8 typedef struct { /* 0x0 */ u32 dmgFlags; // Bumper damage type flags. /* 0x4 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) /* 0x5 */ u8 defense; // Damage Resistance /* 0x6 */ Vec3s hitPos; // Point of contact -} ColliderBump; // size = 0xC +} ColliderElementDamageInfoAC; // size = 0xC typedef struct { /* 0x0 */ u32 dmgFlags; // Bumper exclusion mask /* 0x4 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) /* 0x5 */ u8 defense; // Damage Resistance -} ColliderBumpInit; // size = 0x8 +} ColliderElementDamageInfoACInit; // size = 0x8 typedef struct ColliderElement { - /* 0x00 */ ColliderTouch toucher; // Damage properties when acting as an AT collider - /* 0x08 */ ColliderBump bumper; // Damage properties when acting as an AC collider - /* 0x14 */ u8 elemType; // Affects sfx reaction when attacked by Link and hookability. Full purpose unknown. - /* 0x15 */ u8 toucherFlags; // Information flags for AT collisions - /* 0x16 */ u8 bumperFlags; // Information flags for AC collisions + /* 0x00 */ ColliderElementDamageInfoAT atDmgInfo; // Damage properties when acting as an AT collider + /* 0x08 */ ColliderElementDamageInfoAC acDmgInfo; // Damage properties when acting as an AC collider + /* 0x14 */ u8 elemMaterial; // Affects sfx when attacked by Player, and interaction with hookshot and arrows. See `ElementMaterial` enum + /* 0x15 */ u8 atElemFlags; // Information flags for AT collisions + /* 0x16 */ u8 acElemFlags; // Information flags for AC collisions /* 0x17 */ u8 ocElemFlags; // Information flags for OC collisions /* 0x18 */ Collider* atHit; // object touching this element's AT collider /* 0x1C */ Collider* acHit; // object touching this element's AC collider @@ -85,11 +85,11 @@ typedef struct ColliderElement { } ColliderElement; // size = 0x28 typedef struct { - /* 0x00 */ u8 elemType; // Affects sfx reaction when attacked by Link and hookability. Full purpose unknown. - /* 0x04 */ ColliderTouchInit toucher; // Damage properties when acting as an AT collider - /* 0x0C */ ColliderBumpInit bumper; // Damage properties when acting as an AC collider - /* 0x14 */ u8 toucherFlags; // Information flags for AT collisions - /* 0x15 */ u8 bumperFlags; // Information flags for AC collisions + /* 0x00 */ u8 elemMaterial; // Affects sfx when attacked by Player, and interaction with hookshot and arrows. See `ElementMaterial` enum + /* 0x04 */ ColliderElementDamageInfoATInit atDmgInfo; // Damage properties when acting as an AT collider + /* 0x0C */ ColliderElementDamageInfoACInit acDmgInfo; // Damage properties when acting as an AC collider + /* 0x14 */ u8 atElemFlags; // Information flags for AT collisions + /* 0x15 */ u8 acElemFlags; // Information flags for AC collisions /* 0x16 */ u8 ocElemFlags; // Information flags for OC collisions } ColliderElementInit; // size = 0x18 @@ -327,22 +327,22 @@ typedef enum { /* 2 */ MASSTYPE_NORMAL } ColChkMassType; -typedef enum { - /* 0 */ COLTYPE_HIT0, // Blue blood, white hitmark - /* 1 */ COLTYPE_HIT1, // No blood, dust hitmark - /* 2 */ COLTYPE_HIT2, // Green blood, dust hitmark - /* 3 */ COLTYPE_HIT3, // No blood, white hitmark - /* 4 */ COLTYPE_HIT4, // Water burst, no hitmark - /* 5 */ COLTYPE_HIT5, // No blood, red hitmark - /* 6 */ COLTYPE_HIT6, // Green blood, white hitmark - /* 7 */ COLTYPE_HIT7, // Red blood, white hitmark - /* 8 */ COLTYPE_HIT8, // Blue blood, red hitmark - /* 9 */ COLTYPE_METAL, - /* 10 */ COLTYPE_NONE, - /* 11 */ COLTYPE_WOOD, - /* 12 */ COLTYPE_HARD, - /* 13 */ COLTYPE_TREE -} ColliderType; +typedef enum ColliderMaterial { + /* 0 */ COL_MATERIAL_HIT0, // Blue blood, white hitmark + /* 1 */ COL_MATERIAL_HIT1, // No blood, dust hitmark + /* 2 */ COL_MATERIAL_HIT2, // Green blood, dust hitmark + /* 3 */ COL_MATERIAL_HIT3, // No blood, white hitmark + /* 4 */ COL_MATERIAL_HIT4, // Water burst, no hitmark + /* 5 */ COL_MATERIAL_HIT5, // No blood, red hitmark + /* 6 */ COL_MATERIAL_HIT6, // Green blood, white hitmark + /* 7 */ COL_MATERIAL_HIT7, // Red blood, white hitmark + /* 8 */ COL_MATERIAL_HIT8, // Blue blood, red hitmark + /* 9 */ COL_MATERIAL_METAL, + /* 10 */ COL_MATERIAL_NONE, + /* 11 */ COL_MATERIAL_WOOD, + /* 12 */ COL_MATERIAL_HARD, + /* 13 */ COL_MATERIAL_TREE +} ColliderMaterial; typedef enum { /* 0 */ COLSHAPE_JNTSPH, @@ -353,16 +353,16 @@ typedef enum { /* 5 */ COLSHAPE_MAX } ColliderShape; -typedef enum { - /* 0 */ ELEMTYPE_UNK0, - /* 1 */ ELEMTYPE_UNK1, - /* 2 */ ELEMTYPE_UNK2, - /* 3 */ ELEMTYPE_UNK3, - /* 4 */ ELEMTYPE_UNK4, - /* 5 */ ELEMTYPE_UNK5, - /* 6 */ ELEMTYPE_UNK6, - /* 7 */ ELEMTYPE_UNK7 -} ElementType; +typedef enum ElementMaterial { + /* 0 */ ELEM_MATERIAL_UNK0, + /* 1 */ ELEM_MATERIAL_UNK1, + /* 2 */ ELEM_MATERIAL_UNK2, + /* 3 */ ELEM_MATERIAL_UNK3, + /* 4 */ ELEM_MATERIAL_UNK4, + /* 5 */ ELEM_MATERIAL_UNK5, + /* 6 */ ELEM_MATERIAL_UNK6, + /* 7 */ ELEM_MATERIAL_UNK7 +} ElementMaterial; #define SAC_ON (1 << 0) // CollisionContext SAC Flag @@ -405,27 +405,27 @@ typedef enum { #define OC2_TYPE_2 OC1_TYPE_2 // Has OC type 2 #define OC2_FIRST_ONLY (1 << 6) // Skips AC checks on elements after the first collision. Only used by Ganon -#define TOUCH_NONE 0 // No flags set. Cannot have AT collisions -#define TOUCH_ON (1 << 0) // Can have AT collisions -#define TOUCH_HIT (1 << 1) // Had an AT collision -#define TOUCH_NEAREST (1 << 2) // If a Quad, only collides with the closest bumper -#define TOUCH_SFX_NORMAL (0 << 3) // Hit sound effect based on AC collider's type -#define TOUCH_SFX_HARD (1 << 3) // Always uses hard deflection sound -#define TOUCH_SFX_WOOD (2 << 3) // Always uses wood deflection sound -#define TOUCH_SFX_NONE (3 << 3) // No hit sound effect -#define TOUCH_AT_HITMARK (1 << 5) // Draw hitmarks for every AT collision -#define TOUCH_DREW_HITMARK (1 << 6) // Already drew hitmark for this frame -#define TOUCH_UNK7 (1 << 7) // Unknown purpose. Used by some enemy quads +#define ATELEM_NONE 0 // No flags set. Cannot have AT collisions +#define ATELEM_ON (1 << 0) // Can have AT collisions +#define ATELEM_HIT (1 << 1) // Had an AT collision +#define ATELEM_NEAREST (1 << 2) // If a Quad, only collides with the closest AC element +#define ATELEM_SFX_NORMAL (0 << 3) // Hit sound effect based on AC collider's type +#define ATELEM_SFX_HARD (1 << 3) // Always uses hard deflection sound +#define ATELEM_SFX_WOOD (2 << 3) // Always uses wood deflection sound +#define ATELEM_SFX_NONE (3 << 3) // No hit sound effect +#define ATELEM_AT_HITMARK (1 << 5) // Draw hitmarks for every AT collision +#define ATELEM_DREW_HITMARK (1 << 6) // Already drew hitmark for this frame +#define ATELEM_UNK7 (1 << 7) // Unknown purpose. Used by some enemy quads -#define BUMP_NONE 0 // No flags set. Cannot have AC collisions -#define BUMP_ON (1 << 0) // Can have AC collisions -#define BUMP_HIT (1 << 1) // Had an AC collision -#define BUMP_HOOKABLE (1 << 2) // Can be hooked if actor has hookability flags set. -#define BUMP_NO_AT_INFO (1 << 3) // Does not give its info to the AT collider that hit it. -#define BUMP_NO_DAMAGE (1 << 4) // Does not take damage. -#define BUMP_NO_SWORD_SFX (1 << 5) // Does not have a sound when hit by player-attached AT colliders. -#define BUMP_NO_HITMARK (1 << 6) // Skips hit effects. -#define BUMP_DRAW_HITMARK (1 << 7) // Draw hitmark for AC collision this frame. +#define ACELEM_NONE 0 // No flags set. Cannot have AC collisions +#define ACELEM_ON (1 << 0) // Can have AC collisions +#define ACELEM_HIT (1 << 1) // Had an AC collision +#define ACELEM_HOOKABLE (1 << 2) // Can be hooked if actor has hookability flags set. +#define ACELEM_NO_AT_INFO (1 << 3) // Does not give its info to the AT collider that hit it. +#define ACELEM_NO_DAMAGE (1 << 4) // Does not take damage. +#define ACELEM_NO_SWORD_SFX (1 << 5) // Does not have a sound when hit by player-attached AT colliders. +#define ACELEM_NO_HITMARK (1 << 6) // Skips hit effects. +#define ACELEM_DRAW_HITMARK (1 << 7) // Draw hitmark for AC collision this frame. #define OCELEM_NONE 0 // No flags set. Cannot have OC collisions #define OCELEM_ON (1 << 0) // Can have OC collisions @@ -509,9 +509,9 @@ typedef struct CollisionCheckInfo { DamageTable* DamageTable_Get(s32 index); void DamageTable_Clear(DamageTable* damageTable); -f32 CollisionCheck_GetDamageAndEffectOnBumper(Collider* atCol, ColliderElement* atElem, Collider* acCol, ColliderElement* acElem, u32* effect); -f32 CollisionCheck_ApplyBumperDefense(f32 damage, ColliderElement* acElem); -s32 CollisionCheck_GetToucherDamage(Collider* atCol, ColliderElement* atElem, Collider* acCol, ColliderElement* acElem); +f32 CollisionCheck_GetDamageAndEffectOnElementAC(Collider* atCol, ColliderElement* atElem, Collider* acCol, ColliderElement* acElem, u32* effect); +f32 CollisionCheck_ApplyElementATDefense(f32 damage, ColliderElement* acElem); +s32 CollisionCheck_GetElementATDamage(Collider* atCol, ColliderElement* atElem, Collider* acCol, ColliderElement* acElem); s32 Collider_InitBase(struct PlayState* play, Collider* col); s32 Collider_DestroyBase(struct PlayState* play, Collider* collider); s32 Collider_SetBaseToActor(struct PlayState* play, Collider* col, ColliderInitToActor* src); @@ -520,13 +520,13 @@ s32 Collider_SetBase(struct PlayState* play, Collider* col, struct Actor* actor, void Collider_ResetATBase(struct PlayState* play, Collider* col); void Collider_ResetACBase(struct PlayState* play, Collider* col); void Collider_ResetOCBase(struct PlayState* play, Collider* col); -s32 Collider_InitTouch(struct PlayState* play, ColliderTouch* touch); -s32 Collider_DestroyTouch(struct PlayState* play, ColliderTouch* touch); -s32 Collider_SetTouch(struct PlayState* play, ColliderTouch* touch, ColliderTouchInit* src); +s32 Collider_InitElementDamageInfoAT(struct PlayState* play, ColliderElementDamageInfoAT* atDmgInfo); +s32 Collider_DestroyElementDamageInfoAT(struct PlayState* play, ColliderElementDamageInfoAT* atDmgInfo); +s32 Collider_SetElementDamageInfoAT(struct PlayState* play, ColliderElementDamageInfoAT* dest, ColliderElementDamageInfoATInit* src); void Collider_ResetATElementUnk(struct PlayState* play, ColliderElement* elem); -s32 Collider_InitBump(struct PlayState* play, ColliderBump* bump); -s32 Collider_DestroyBump(struct PlayState* play, ColliderBump* bump); -s32 Collider_SetBump(struct PlayState* play, ColliderBump* bump, ColliderBumpInit* src); +s32 Collider_InitElementDamageInfoAC(struct PlayState* play, ColliderElementDamageInfoAC* acDmgInfo); +s32 Collider_DestroyElementDamageInfoAC(struct PlayState* play, ColliderElementDamageInfoAC* acDmgInfo); +s32 Collider_SetElementDamageInfoAC(struct PlayState* play, ColliderElementDamageInfoAC* dest, ColliderElementDamageInfoACInit* src); s32 Collider_InitElement(struct PlayState* play, ColliderElement* elem); s32 Collider_DestroyElement(struct PlayState* play, ColliderElement* elem); s32 Collider_SetElement(struct PlayState* play, ColliderElement* elem, ColliderElementInit* elemInit); @@ -620,8 +620,8 @@ s32 CollisionCheck_SetAC_SAC(struct PlayState* play, CollisionCheckContext* colC s32 CollisionCheck_SetOC(struct PlayState* play, CollisionCheckContext* colChkCtx, Collider* col); s32 CollisionCheck_SetOC_SAC(struct PlayState* play, CollisionCheckContext* colChkCtx, Collider* col, s32 index); s32 CollisionCheck_SetOCLine(struct PlayState* play, CollisionCheckContext* colChkCtx, OcLine* line); -s32 CollisionCheck_SkipTouch(ColliderElement* elem); -s32 CollisionCheck_SkipBump(ColliderElement* elem); +s32 CollisionCheck_IsElementNotAT(ColliderElement* elem); +s32 CollisionCheck_IsElementNotAC(ColliderElement* elem); s32 CollisionCheck_NoSharedFlags(ColliderElement* atElem, ColliderElement* acElem); void CollisionCheck_NoBlood(struct PlayState* play, Collider* collider, Vec3f* v); void CollisionCheck_BlueBlood(struct PlayState* play, Collider* collider, Vec3f* v); diff --git a/src/code/z_actor.c b/src/code/z_actor.c index aa3afcb982..6717639f34 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4725,11 +4725,11 @@ void Actor_SetDropFlag(Actor* actor, ColliderElement* elem) { if (acHitElem == NULL) { actor->dropFlag = DROPFLAG_NONE; - } else if (acHitElem->toucher.dmgFlags & DMG_FIRE_ARROW) { + } else if (acHitElem->atDmgInfo.dmgFlags & DMG_FIRE_ARROW) { actor->dropFlag = DROPFLAG_1; - } else if (acHitElem->toucher.dmgFlags & DMG_ICE_ARROW) { + } else if (acHitElem->atDmgInfo.dmgFlags & DMG_ICE_ARROW) { actor->dropFlag = DROPFLAG_2; - } else if (acHitElem->toucher.dmgFlags & DMG_LIGHT_ARROW) { + } else if (acHitElem->atDmgInfo.dmgFlags & DMG_LIGHT_ARROW) { actor->dropFlag = DROPFLAG_20; } else { actor->dropFlag = DROPFLAG_NONE; @@ -4751,7 +4751,7 @@ void Actor_SetDropFlagJntSph(Actor* actor, ColliderJntSph* jntSph) { if (acHitElem == NULL) { flag = DROPFLAG_NONE; } else { - s32 dmgFlags = acHitElem->toucher.dmgFlags; + s32 dmgFlags = acHitElem->atDmgInfo.dmgFlags; if (dmgFlags & DMG_FIRE_ARROW) { flag = DROPFLAG_1; @@ -4804,7 +4804,7 @@ void func_800BE3D0(Actor* actor, s16 angle, Vec3s* arg2) { void func_800BE504(Actor* actor, ColliderCylinder* cyl) { // Checks if was hit by either DMG_NORMAL_ARROW, DMG_FIRE_ARROW, DMG_ICE_ARROW, DMG_LIGHT_ARROW or DMG_DEKU_BUBBLE - if ((cyl->elem.acHitElem->toucher.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20))) { + if ((cyl->elem.acHitElem->atDmgInfo.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20))) { actor->world.rot.y = cyl->base.ac->shape.rot.y; } else { actor->world.rot.y = Actor_WorldYawTowardActor(cyl->base.ac, actor); @@ -4812,7 +4812,7 @@ void func_800BE504(Actor* actor, ColliderCylinder* cyl) { } void func_800BE568(Actor* actor, ColliderSphere* sph) { - if (sph->elem.acHitElem->toucher.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20)) { + if (sph->elem.acHitElem->atDmgInfo.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20)) { actor->world.rot.y = sph->base.ac->shape.rot.y; } else { actor->world.rot.y = Actor_WorldYawTowardActor(sph->base.ac, actor); @@ -4820,7 +4820,7 @@ void func_800BE568(Actor* actor, ColliderSphere* sph) { } void func_800BE5CC(Actor* actor, ColliderJntSph* jntSph, s32 elemIndex) { - if (jntSph->elements[elemIndex].base.acHitElem->toucher.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20)) { + if (jntSph->elements[elemIndex].base.acHitElem->atDmgInfo.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20)) { actor->world.rot.y = jntSph->base.ac->shape.rot.y; } else { actor->world.rot.y = Actor_WorldYawTowardActor(jntSph->base.ac, actor); diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 75e3a11a2c..5cf01a80e0 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -109,8 +109,8 @@ TriNorm D_801EE188; * Gets the damage and effect that should be applied for the collision between * `at` and `ac`, referring to the ac actor's damage chart if applicable. */ -f32 CollisionCheck_GetDamageAndEffectOnBumper(Collider* atCol, ColliderElement* atElem, Collider* acCol, - ColliderElement* acElem, u32* effect) { +f32 CollisionCheck_GetDamageAndEffectOnElementAC(Collider* atCol, ColliderElement* atElem, Collider* acCol, + ColliderElement* acElem, u32* effect) { static f32 sDamageMultipliers[] = { 0.0f, 1.0f, 2.0f, 0.5f, 0.25f, 3.0f, 4.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, }; @@ -119,10 +119,10 @@ f32 CollisionCheck_GetDamageAndEffectOnBumper(Collider* atCol, ColliderElement* f32 damage; *effect = 0; - damage = CollisionCheck_GetToucherDamage(atCol, atElem, acCol, acElem); + damage = CollisionCheck_GetElementATDamage(atCol, atElem, acCol, acElem); if (acCol->actor->colChkInfo.damageTable != NULL) { - dmgFlags = atElem->toucher.dmgFlags; + dmgFlags = atElem->atDmgInfo.dmgFlags; for (i = 0; i < ARRAY_COUNT(acCol->actor->colChkInfo.damageTable->attack); i++) { if (dmgFlags == 1) { @@ -140,8 +140,8 @@ f32 CollisionCheck_GetDamageAndEffectOnBumper(Collider* atCol, ColliderElement* /** * Calculates damage after factoring in the ac collider's defense */ -f32 CollisionCheck_ApplyBumperDefense(f32 damage, ColliderElement* acElem) { - f32 finalDamage = damage - acElem->bumper.defense; +f32 CollisionCheck_ApplyElementATDefense(f32 damage, ColliderElement* acElem) { + f32 finalDamage = damage - acElem->acDmgInfo.defense; return finalDamage; } @@ -150,18 +150,18 @@ f32 CollisionCheck_ApplyBumperDefense(f32 damage, ColliderElement* acElem) { * Gets the damage to be inflicted by `at` on `ac`, before applying other * factors such as the ac collider's defense. */ -s32 CollisionCheck_GetToucherDamage(Collider* atCol, ColliderElement* atElem, Collider* acCol, - ColliderElement* acElem) { +s32 CollisionCheck_GetElementATDamage(Collider* atCol, ColliderElement* atElem, Collider* acCol, + ColliderElement* acElem) { if ((atCol->actor != NULL) && (atCol->actor->id == ACTOR_EN_BOM) && (acCol->actor != NULL) && (acCol->actor->id == ACTOR_PLAYER)) { return 8; } - return atElem->toucher.damage; + return atElem->atDmgInfo.damage; } s32 Collider_InitBase(struct PlayState* play, Collider* col) { static Collider sDefaultCollider = { - NULL, NULL, NULL, NULL, AT_NONE, AC_NONE, OC1_NONE, OC2_NONE, COLTYPE_HIT3, COLSHAPE_MAX, + NULL, NULL, NULL, NULL, AT_NONE, AC_NONE, OC1_NONE, OC2_NONE, COL_MATERIAL_HIT3, COLSHAPE_MAX, }; *col = sDefaultCollider; @@ -173,7 +173,7 @@ s32 Collider_DestroyBase(struct PlayState* play, Collider* col) { } /** - * Uses default OC2_TYPE_1 and COLTYPE_HIT0 + * Uses default OC2_TYPE_1 and COL_MATERIAL_HIT0 */ s32 Collider_SetBaseToActor(struct PlayState* play, Collider* col, ColliderInitToActor* src) { col->actor = src->actor; @@ -190,7 +190,7 @@ s32 Collider_SetBaseToActor(struct PlayState* play, Collider* col, ColliderInitT */ s32 Collider_SetBaseType1(struct PlayState* play, Collider* col, Actor* actor, ColliderInitType1* src) { col->actor = actor; - col->colType = src->colType; + col->colMaterial = src->colMaterial; col->atFlags = src->atFlags; col->acFlags = src->acFlags; col->ocFlags1 = src->ocFlags1; @@ -201,7 +201,7 @@ s32 Collider_SetBaseType1(struct PlayState* play, Collider* col, Actor* actor, C s32 Collider_SetBase(struct PlayState* play, Collider* col, Actor* actor, ColliderInit* src) { col->actor = actor; - col->colType = src->colType; + col->colMaterial = src->colMaterial; col->atFlags = src->atFlags; col->acFlags = src->acFlags; col->ocFlags1 = src->ocFlags1; @@ -226,72 +226,79 @@ void Collider_ResetOCBase(struct PlayState* play, Collider* col) { col->ocFlags2 &= ~OC2_HIT_PLAYER; } -s32 Collider_InitTouch(struct PlayState* play, ColliderTouch* touch) { - static ColliderTouch sDefaultColliderTouch = { 0x00000000, 0, 0 }; +s32 Collider_InitElementDamageInfoAT(struct PlayState* play, ColliderElementDamageInfoAT* atDmgInfo) { + static ColliderElementDamageInfoAT sDefaultDamageInfoAT = { 0x00000000, 0, 0 }; - *touch = sDefaultColliderTouch; + *atDmgInfo = sDefaultDamageInfoAT; return 1; } -s32 Collider_DestroyTouch(struct PlayState* play, ColliderTouch* touch) { +s32 Collider_DestroyElementDamageInfoAT(struct PlayState* play, ColliderElementDamageInfoAT* atDmgInfo) { return 1; } -s32 Collider_SetTouch(struct PlayState* play, ColliderTouch* touch, ColliderTouchInit* src) { - touch->dmgFlags = src->dmgFlags; - touch->effect = src->effect; - touch->damage = src->damage; +s32 Collider_SetElementDamageInfoAT(struct PlayState* play, ColliderElementDamageInfoAT* dest, + ColliderElementDamageInfoATInit* src) { + dest->dmgFlags = src->dmgFlags; + dest->effect = src->effect; + dest->damage = src->damage; return 1; } void Collider_ResetATElementUnk(struct PlayState* play, ColliderElement* elem) { } -s32 Collider_InitBump(struct PlayState* play, ColliderBump* bump) { - static ColliderBump sDefaultColliderBump = { 0xF7CFFFFF, 0, 0, { 0, 0, 0 } }; +s32 Collider_InitElementDamageInfoAC(struct PlayState* play, ColliderElementDamageInfoAC* acDmgInfo) { + static ColliderElementDamageInfoAC sDefaultDamageInfoAC = { 0xF7CFFFFF, 0, 0, { 0, 0, 0 } }; - *bump = sDefaultColliderBump; + *acDmgInfo = sDefaultDamageInfoAC; return 1; } -s32 Collider_DestroyBump(struct PlayState* play, ColliderBump* bump) { +s32 Collider_DestroyElementDamageInfoAC(struct PlayState* play, ColliderElementDamageInfoAC* acDmgInfo) { return 1; } -s32 Collider_SetBump(struct PlayState* play, ColliderBump* bump, ColliderBumpInit* src) { - bump->dmgFlags = src->dmgFlags; - bump->effect = src->effect; - bump->defense = src->defense; +s32 Collider_SetElementDamageInfoAC(struct PlayState* play, ColliderElementDamageInfoAC* dest, + ColliderElementDamageInfoACInit* src) { + dest->dmgFlags = src->dmgFlags; + dest->effect = src->effect; + dest->defense = src->defense; return 1; } s32 Collider_InitElement(struct PlayState* play, ColliderElement* elem) { static ColliderElement sDefaultColliderElement = { - { 0, 0, 0 }, { 0xF7CFFFFF, 0, 0, { 0, 0, 0 } }, - ELEMTYPE_UNK0, TOUCH_NONE, - BUMP_NONE, OCELEM_NONE, - NULL, NULL, - NULL, NULL, + { 0, 0, 0 }, + { 0xF7CFFFFF, 0, 0, { 0, 0, 0 } }, + ELEM_MATERIAL_UNK0, + ATELEM_NONE, + ACELEM_NONE, + OCELEM_NONE, + NULL, + NULL, + NULL, + NULL, }; *elem = sDefaultColliderElement; - Collider_InitTouch(play, &elem->toucher); - Collider_InitBump(play, &elem->bumper); + Collider_InitElementDamageInfoAT(play, &elem->atDmgInfo); + Collider_InitElementDamageInfoAC(play, &elem->acDmgInfo); return 1; } s32 Collider_DestroyElement(struct PlayState* play, ColliderElement* elem) { - Collider_DestroyTouch(play, &elem->toucher); - Collider_DestroyBump(play, &elem->bumper); + Collider_DestroyElementDamageInfoAT(play, &elem->atDmgInfo); + Collider_DestroyElementDamageInfoAC(play, &elem->acDmgInfo); return 1; } s32 Collider_SetElement(struct PlayState* play, ColliderElement* elem, ColliderElementInit* elemInit) { - elem->elemType = elemInit->elemType; - Collider_SetTouch(play, &elem->toucher, &elemInit->toucher); - Collider_SetBump(play, &elem->bumper, &elemInit->bumper); - elem->toucherFlags = elemInit->toucherFlags; - elem->bumperFlags = elemInit->bumperFlags; + elem->elemMaterial = elemInit->elemMaterial; + Collider_SetElementDamageInfoAT(play, &elem->atDmgInfo, &elemInit->atDmgInfo); + Collider_SetElementDamageInfoAC(play, &elem->acDmgInfo, &elemInit->acDmgInfo); + elem->atElemFlags = elemInit->atElemFlags; + elem->acElemFlags = elemInit->acElemFlags; elem->ocElemFlags = elemInit->ocElemFlags; return 1; } @@ -299,15 +306,15 @@ s32 Collider_SetElement(struct PlayState* play, ColliderElement* elem, ColliderE void Collider_ResetATElement(struct PlayState* play, ColliderElement* elem) { elem->atHit = NULL; elem->atHitElem = NULL; - elem->toucherFlags &= ~TOUCH_HIT; - elem->toucherFlags &= ~TOUCH_DREW_HITMARK; + elem->atElemFlags &= ~ATELEM_HIT; + elem->atElemFlags &= ~ATELEM_DREW_HITMARK; Collider_ResetATElementUnk(play, elem); } void Collider_ResetACElement(struct PlayState* play, ColliderElement* elem) { - elem->bumper.hitPos.x = elem->bumper.hitPos.y = elem->bumper.hitPos.z = 0; - elem->bumperFlags &= ~BUMP_HIT; - elem->bumperFlags &= ~BUMP_DRAW_HITMARK; + elem->acDmgInfo.hitPos.x = elem->acDmgInfo.hitPos.y = elem->acDmgInfo.hitPos.z = 0; + elem->acElemFlags &= ~ACELEM_HIT; + elem->acElemFlags &= ~ACELEM_DRAW_HITMARK; elem->acHit = NULL; elem->acHitElem = NULL; } @@ -420,7 +427,7 @@ s32 Collider_DestroyJntSph(struct PlayState* play, ColliderJntSph* jntSph) { /** * Sets up the ColliderJntSph using the values in src, sets it to the actor specified in src, and dynamically allocates - * the element array. Uses default OC2_TYPE_1 and COLTYPE_HIT0. + * the element array. Uses default OC2_TYPE_1 and COL_MATERIAL_HIT0. */ s32 Collider_SetJntSphToActor(struct PlayState* play, ColliderJntSph* dest, ColliderJntSphInitToActor* src) { ColliderJntSphElement* destElem; @@ -583,7 +590,7 @@ s32 Collider_DestroyCylinder(struct PlayState* play, ColliderCylinder* cyl) { /** * Sets up the ColliderCylinder using the values in src and sets it to the actor specified in src. Uses default - * OC2_TYPE_1 and COLTYPE_0. + * OC2_TYPE_1 and COL_MATERIAL_0. */ s32 Collider_SetCylinderToActor(struct PlayState* play, ColliderCylinder* dest, ColliderCylinderInitToActor* src) { Collider_SetBaseToActor(play, &dest->base, &src->base); @@ -997,14 +1004,14 @@ s32 Collider_ResetQuadOC(struct PlayState* play, Collider* col) { } /** - * For quad colliders with TOUCH_NEAREST, resets the previous AC collider it hit if the current element is closer, + * For quad colliders with ATELEM_NEAREST, resets the previous AC collider it hit if the current element is closer, * otherwise returns false. Used on player AT colliders to prevent multiple collisions from registering. */ s32 Collider_QuadSetNearestAC(struct PlayState* play, ColliderQuad* quad, Vec3f* hitPos) { f32 acDist; Vec3f dcMid; - if (!(quad->elem.toucherFlags & TOUCH_NEAREST)) { + if (!(quad->elem.atElemFlags & ATELEM_NEAREST)) { return 1; } Math_Vec3s_ToVec3f(&dcMid, &quad->dim.dcMid); @@ -1419,28 +1426,28 @@ s32 CollisionCheck_SetOCLine(struct PlayState* play, CollisionCheckContext* colC /** * Skips AT elements that are off. */ -s32 CollisionCheck_SkipTouch(ColliderElement* elem) { - if (!(elem->toucherFlags & TOUCH_ON)) { - return 1; +s32 CollisionCheck_IsElementNotAT(ColliderElement* elem) { + if (!(elem->atElemFlags & ATELEM_ON)) { + return true; } - return 0; + return false; } /** * Skips AC elements that are off. */ -s32 CollisionCheck_SkipBump(ColliderElement* elem) { - if (!(elem->bumperFlags & BUMP_ON)) { - return 1; +s32 CollisionCheck_IsElementNotAC(ColliderElement* elem) { + if (!(elem->acElemFlags & ACELEM_ON)) { + return true; } - return 0; + return false; } /** * If the AT element has no dmgFlags in common with the AC element, no collision happens. */ s32 CollisionCheck_NoSharedFlags(ColliderElement* atElem, ColliderElement* acElem) { - if (!(atElem->toucher.dmgFlags & acElem->bumper.dmgFlags)) { + if (!(atElem->atDmgInfo.dmgFlags & acElem->acDmgInfo.dmgFlags)) { return true; } return false; @@ -1589,30 +1596,30 @@ void CollisionCheck_RedBloodUnused(struct PlayState* play, Collider* col, Vec3f* * Plays sound effects and displays hitmarks for solid-type AC colliders (METAL, WOOD, HARD, and TREE) */ void CollisionCheck_HitSolid(struct PlayState* play, ColliderElement* elem, Collider* col, Vec3f* hitPos) { - s32 flags = elem->toucherFlags & TOUCH_SFX_NONE; + s32 flags = elem->atElemFlags & ATELEM_SFX_NONE; - if ((flags == TOUCH_SFX_NORMAL) && (col->colType != COLTYPE_METAL)) { + if ((flags == ATELEM_SFX_NORMAL) && (col->colMaterial != COL_MATERIAL_METAL)) { EffectSsHitmark_SpawnFixedScale(play, 0, hitPos); if (col->actor == NULL) { Audio_PlaySfx(NA_SE_IT_SHIELD_BOUND); } else { Audio_PlaySfx_AtPos(&col->actor->projectedPos, NA_SE_IT_SHIELD_BOUND); } - } else if (flags == TOUCH_SFX_NORMAL) { + } else if (flags == ATELEM_SFX_NORMAL) { EffectSsHitmark_SpawnFixedScale(play, 3, hitPos); if (col->actor == NULL) { CollisionCheck_SpawnShieldParticlesMetal(play, hitPos); } else { CollisionCheck_SpawnShieldParticlesMetalSound(play, hitPos, &col->actor->projectedPos); } - } else if (flags == TOUCH_SFX_HARD) { + } else if (flags == ATELEM_SFX_HARD) { EffectSsHitmark_SpawnFixedScale(play, 0, hitPos); if (col->actor == NULL) { Audio_PlaySfx(NA_SE_IT_SHIELD_BOUND); } else { Audio_PlaySfx_AtPos(&col->actor->projectedPos, NA_SE_IT_SHIELD_BOUND); } - } else if (flags == TOUCH_SFX_WOOD) { + } else if (flags == ATELEM_SFX_WOOD) { EffectSsHitmark_SpawnFixedScale(play, 1, hitPos); if (col->actor == NULL) { Audio_PlaySfx(NA_SE_IT_REFLECTION_WOOD); @@ -1623,17 +1630,17 @@ void CollisionCheck_HitSolid(struct PlayState* play, ColliderElement* elem, Coll } /** - * Plays a hit sound effect for AT colliders attached to Player based on the AC element's elemType. + * Plays a hit sound effect for AT colliders attached to Player based on the AC element's elemMaterial. */ s32 CollisionCheck_SwordHitAudio(Collider* at, ColliderElement* acElem) { if ((at->actor != NULL) && (at->actor->category == ACTORCAT_PLAYER)) { - if (acElem->elemType == ELEMTYPE_UNK0) { + if (acElem->elemMaterial == ELEM_MATERIAL_UNK0) { Audio_PlaySfx_AtPos(&at->actor->projectedPos, NA_SE_IT_SWORD_STRIKE); - } else if (acElem->elemType == ELEMTYPE_UNK1) { + } else if (acElem->elemMaterial == ELEM_MATERIAL_UNK1) { Audio_PlaySfx_AtPos(&at->actor->projectedPos, NA_SE_IT_SWORD_STRIKE_HARD); - } else if (acElem->elemType == ELEMTYPE_UNK2) { + } else if (acElem->elemMaterial == ELEM_MATERIAL_UNK2) { Audio_PlaySfx_AtPos(&at->actor->projectedPos, 0); - } else if (acElem->elemType == ELEMTYPE_UNK3) { + } else if (acElem->elemMaterial == ELEM_MATERIAL_UNK3) { Audio_PlaySfx_AtPos(&at->actor->projectedPos, 0); } } @@ -1653,34 +1660,34 @@ HitInfo sHitInfo[] = { }; /** - * Handles hitmarks, blood, and sound effects for each AC collision, determined by the AC collider's colType + * Handles hitmarks, blood, and sound effects for each AC collision, determined by the AC collider's colMaterial */ void CollisionCheck_HitEffects(struct PlayState* play, Collider* at, ColliderElement* atElem, Collider* ac, ColliderElement* acElem, Vec3f* hitPos) { - if (acElem->bumperFlags & BUMP_NO_HITMARK) { + if (acElem->acElemFlags & ACELEM_NO_HITMARK) { return; } - if (!(atElem->toucherFlags & TOUCH_AT_HITMARK) && (atElem->toucherFlags & TOUCH_DREW_HITMARK)) { + if (!(atElem->atElemFlags & ATELEM_AT_HITMARK) && (atElem->atElemFlags & ATELEM_DREW_HITMARK)) { return; } if (ac->actor != NULL) { - sBloodFuncs[sHitInfo[ac->colType].blood](play, ac, hitPos); + sBloodFuncs[sHitInfo[ac->colMaterial].blood](play, ac, hitPos); } if (ac->actor != NULL) { - if (sHitInfo[ac->colType].effect == HIT_SOLID) { + if (sHitInfo[ac->colMaterial].effect == HIT_SOLID) { CollisionCheck_HitSolid(play, atElem, ac, hitPos); - } else if (sHitInfo[ac->colType].effect == HIT_WOOD) { + } else if (sHitInfo[ac->colMaterial].effect == HIT_WOOD) { if (at->actor == NULL) { CollisionCheck_SpawnShieldParticles(play, hitPos); Audio_PlaySfx(NA_SE_IT_REFLECTION_WOOD); } else { CollisionCheck_SpawnShieldParticlesWood(play, hitPos, &at->actor->projectedPos); } - } else if (sHitInfo[ac->colType].effect != HIT_NONE) { - EffectSsHitmark_SpawnFixedScale(play, sHitInfo[ac->colType].effect, hitPos); - if (!(acElem->bumperFlags & BUMP_NO_SWORD_SFX)) { + } else if (sHitInfo[ac->colMaterial].effect != HIT_NONE) { + EffectSsHitmark_SpawnFixedScale(play, sHitInfo[ac->colMaterial].effect, hitPos); + if (!(acElem->acElemFlags & ACELEM_NO_SWORD_SFX)) { CollisionCheck_SwordHitAudio(at, acElem); } } @@ -1710,32 +1717,32 @@ s32 CollisionCheck_SetATvsAC(struct PlayState* play, Collider* atCol, ColliderEl f32 damage; u32 effect; - if (CollisionCheck_GetToucherDamage(atCol, atElem, acCol, acElem) != 0) { - damage = CollisionCheck_GetDamageAndEffectOnBumper(atCol, atElem, acCol, acElem, &effect); + if (CollisionCheck_GetElementATDamage(atCol, atElem, acCol, acElem) != 0) { + damage = CollisionCheck_GetDamageAndEffectOnElementAC(atCol, atElem, acCol, acElem, &effect); if (damage < 1.0f) { if (effect == 0) { return 0; } - } else if ((CollisionCheck_ApplyBumperDefense(damage, acElem) < 1.0f) && (effect == 0)) { + } else if ((CollisionCheck_ApplyElementATDefense(damage, acElem) < 1.0f) && (effect == 0)) { return 0; } } if ((acCol->acFlags & AC_HARD) && (atCol->actor != NULL) && (acCol->actor != NULL)) { CollisionCheck_SetBounce(atCol, acCol); } - if (!(acElem->bumperFlags & BUMP_NO_AT_INFO)) { + if (!(acElem->acElemFlags & ACELEM_NO_AT_INFO)) { atCol->atFlags |= AT_HIT; atCol->at = acCol->actor; atElem->atHit = acCol; - atElem->toucherFlags |= TOUCH_HIT; + atElem->atElemFlags |= ATELEM_HIT; atElem->atHitElem = acElem; - if (!(atElem->bumperFlags & BUMP_HIT)) { - atElem->bumper.hitPos.x = hitPos->x; - atElem->bumper.hitPos.y = hitPos->y; - atElem->bumper.hitPos.z = hitPos->z; + if (!(atElem->acElemFlags & ACELEM_HIT)) { + atElem->acDmgInfo.hitPos.x = hitPos->x; + atElem->acDmgInfo.hitPos.y = hitPos->y; + atElem->acDmgInfo.hitPos.z = hitPos->z; } if (atCol->actor != NULL) { - atCol->actor->colChkInfo.atHitEffect = acElem->bumper.effect; + atCol->actor->colChkInfo.atHitEffect = acElem->acDmgInfo.effect; } } if (!(atElem->ocElemFlags & OCELEM_UNK2)) { @@ -1743,20 +1750,20 @@ s32 CollisionCheck_SetATvsAC(struct PlayState* play, Collider* atCol, ColliderEl acCol->ac = atCol->actor; acElem->acHit = atCol; acElem->acHitElem = atElem; - acElem->bumperFlags |= BUMP_HIT; + acElem->acElemFlags |= ACELEM_HIT; if (acCol->actor != NULL) { - acCol->actor->colChkInfo.acHitEffect = atElem->toucher.effect; + acCol->actor->colChkInfo.acHitEffect = atElem->atDmgInfo.effect; } - acElem->bumper.hitPos.x = hitPos->x; - acElem->bumper.hitPos.y = hitPos->y; - acElem->bumper.hitPos.z = hitPos->z; + acElem->acDmgInfo.hitPos.x = hitPos->x; + acElem->acDmgInfo.hitPos.y = hitPos->y; + acElem->acDmgInfo.hitPos.z = hitPos->z; } - if (!(atElem->toucherFlags & TOUCH_AT_HITMARK) && (acCol->colType != COLTYPE_METAL) && - (acCol->colType != COLTYPE_WOOD) && (acCol->colType != COLTYPE_HARD)) { - acElem->bumperFlags |= BUMP_DRAW_HITMARK; + if (!(atElem->atElemFlags & ATELEM_AT_HITMARK) && (acCol->colMaterial != COL_MATERIAL_METAL) && + (acCol->colMaterial != COL_MATERIAL_WOOD) && (acCol->colMaterial != COL_MATERIAL_HARD)) { + acElem->acElemFlags |= ACELEM_DRAW_HITMARK; } else { CollisionCheck_HitEffects(play, atCol, atElem, acCol, acElem, hitPos); - atElem->toucherFlags |= TOUCH_DREW_HITMARK; + atElem->atElemFlags |= ATELEM_DREW_HITMARK; } return 1; } @@ -1793,13 +1800,13 @@ void CollisionCheck_AC_JntSphVsJntSph(struct PlayState* play, CollisionCheckCont if ((atJntSph->count > 0) && (atJntSph->elements != NULL) && (acJntSph->count > 0) && (acJntSph->elements != NULL)) { for (atJntSphElem = atJntSph->elements; atJntSphElem < &atJntSph->elements[atJntSph->count]; atJntSphElem++) { - if (CollisionCheck_SkipTouch(&atJntSphElem->base)) { + if (CollisionCheck_IsElementNotAT(&atJntSphElem->base)) { continue; } for (acJntSphElem = acJntSph->elements; acJntSphElem < &acJntSph->elements[acJntSph->count]; acJntSphElem++) { - if (CollisionCheck_SkipBump(&acJntSphElem->base)) { + if (CollisionCheck_IsElementNotAC(&acJntSphElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atJntSphElem->base, &acJntSphElem->base)) { @@ -1848,11 +1855,11 @@ void CollisionCheck_AC_JntSphVsCyl(struct PlayState* play, CollisionCheckContext f32 centerDist; if ((atJntSph->count > 0) && (atJntSph->elements != NULL) && (acCyl->dim.radius > 0) && (acCyl->dim.height > 0)) { - if (CollisionCheck_SkipBump(&acCyl->elem)) { + if (CollisionCheck_IsElementNotAC(&acCyl->elem)) { return; } for (atJntSphElem = atJntSph->elements; atJntSphElem < &atJntSph->elements[atJntSph->count]; atJntSphElem++) { - if (CollisionCheck_SkipTouch(&atJntSphElem->base)) { + if (CollisionCheck_IsElementNotAT(&atJntSphElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atJntSphElem->base, &acCyl->elem)) { @@ -1900,11 +1907,11 @@ void CollisionCheck_AC_JntSphVsTris(struct PlayState* play, CollisionCheckContex if ((atJntSph->count > 0) && (atJntSph->elements != NULL) && (acTris->count > 0) && (acTris->elements != NULL)) { for (atJntSphElem = atJntSph->elements; atJntSphElem < &atJntSph->elements[atJntSph->count]; atJntSphElem++) { - if (CollisionCheck_SkipTouch(&atJntSphElem->base)) { + if (CollisionCheck_IsElementNotAT(&atJntSphElem->base)) { continue; } for (acTrisElem = acTris->elements; acTrisElem < &acTris->elements[acTris->count]; acTrisElem++) { - if (CollisionCheck_SkipBump(&acTrisElem->base)) { + if (CollisionCheck_IsElementNotAC(&acTrisElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atJntSphElem->base, &acTrisElem->base)) { @@ -1936,14 +1943,14 @@ void CollisionCheck_AC_JntSphVsQuad(struct PlayState* play, CollisionCheckContex ColliderJntSphElement* atJntSphElem; if ((atJntSph->count > 0) && (atJntSph->elements != NULL)) { - if (CollisionCheck_SkipBump(&acQuad->elem)) { + if (CollisionCheck_IsElementNotAC(&acQuad->elem)) { return; } Math3D_TriNorm(&D_801EF590, &acQuad->dim.quad[2], &acQuad->dim.quad[3], &acQuad->dim.quad[1]); Math3D_TriNorm(&D_801EF5C8, &acQuad->dim.quad[1], &acQuad->dim.quad[0], &acQuad->dim.quad[2]); for (atJntSphElem = atJntSph->elements; atJntSphElem < &atJntSph->elements[atJntSph->count]; atJntSphElem++) { - if (CollisionCheck_SkipTouch(&atJntSphElem->base)) { + if (CollisionCheck_IsElementNotAT(&atJntSphElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atJntSphElem->base, &acQuad->elem)) { @@ -1976,11 +1983,11 @@ void CollisionCheck_AC_JntSphVsSphere(struct PlayState* play, CollisionCheckCont f32 centerDist; if ((atJntSph->count > 0) && (atJntSph->elements != NULL)) { - if (CollisionCheck_SkipBump(&acSph->elem)) { + if (CollisionCheck_IsElementNotAC(&acSph->elem)) { return; } for (atJntSphElem = atJntSph->elements; atJntSphElem < &atJntSph->elements[atJntSph->count]; atJntSphElem++) { - if (CollisionCheck_SkipTouch(&atJntSphElem->base)) { + if (CollisionCheck_IsElementNotAT(&atJntSphElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atJntSphElem->base, &acSph->elem)) { @@ -2022,11 +2029,11 @@ void CollisionCheck_AC_CylVsJntSph(struct PlayState* play, CollisionCheckContext ColliderJntSphElement* acJntSphElem; if ((acJntSph->count > 0) && (acJntSph->elements != NULL) && (atCyl->dim.radius > 0) && (atCyl->dim.height > 0)) { - if (CollisionCheck_SkipTouch(&atCyl->elem)) { + if (CollisionCheck_IsElementNotAT(&atCyl->elem)) { return; } for (acJntSphElem = acJntSph->elements; acJntSphElem < &acJntSph->elements[acJntSph->count]; acJntSphElem++) { - if (CollisionCheck_SkipBump(&acJntSphElem->base)) { + if (CollisionCheck_IsElementNotAC(&acJntSphElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atCyl->elem, &acJntSphElem->base)) { @@ -2074,10 +2081,10 @@ void CollisionCheck_AC_CylVsCyl(struct PlayState* play, CollisionCheckContext* c f32 centerDist; if ((atCyl->dim.radius > 0) && (atCyl->dim.height > 0) && (acCyl->dim.radius > 0) && (acCyl->dim.height > 0)) { - if (CollisionCheck_SkipBump(&acCyl->elem)) { + if (CollisionCheck_IsElementNotAC(&acCyl->elem)) { return; } - if (CollisionCheck_SkipTouch(&atCyl->elem)) { + if (CollisionCheck_IsElementNotAT(&atCyl->elem)) { return; } if (CollisionCheck_NoSharedFlags(&atCyl->elem, &acCyl->elem)) { @@ -2128,12 +2135,12 @@ void CollisionCheck_AC_CylVsTris(struct PlayState* play, CollisionCheckContext* Vec3f hitPos; if ((atCyl->dim.radius > 0) && (atCyl->dim.height > 0) && (acTris->count > 0) && (acTris->elements != NULL)) { - if (CollisionCheck_SkipTouch(&atCyl->elem)) { + if (CollisionCheck_IsElementNotAT(&atCyl->elem)) { return; } for (acTrisElem = acTris->elements; acTrisElem < &acTris->elements[acTris->count]; acTrisElem++) { - if (CollisionCheck_SkipBump(&acTrisElem->base)) { + if (CollisionCheck_IsElementNotAC(&acTrisElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atCyl->elem, &acTrisElem->base)) { @@ -2163,10 +2170,10 @@ void CollisionCheck_AC_CylVsQuad(struct PlayState* play, CollisionCheckContext* ColliderQuad* acQuad = (ColliderQuad*)acCol; if ((atCyl->dim.height > 0) && (atCyl->dim.radius > 0)) { - if (CollisionCheck_SkipTouch(&atCyl->elem)) { + if (CollisionCheck_IsElementNotAT(&atCyl->elem)) { return; } - if (CollisionCheck_SkipBump(&acQuad->elem)) { + if (CollisionCheck_IsElementNotAC(&acQuad->elem)) { return; } if (CollisionCheck_NoSharedFlags(&atCyl->elem, &acQuad->elem)) { @@ -2206,10 +2213,10 @@ void CollisionCheck_AC_CylVsSphere(struct PlayState* play, CollisionCheckContext f32 centerDist; if ((atCyl->dim.radius > 0) && (atCyl->dim.height > 0)) { - if (CollisionCheck_SkipTouch(&atCyl->elem)) { + if (CollisionCheck_IsElementNotAT(&atCyl->elem)) { return; } - if (CollisionCheck_SkipBump(&acSph->elem)) { + if (CollisionCheck_IsElementNotAC(&acSph->elem)) { return; } if (CollisionCheck_NoSharedFlags(&atCyl->elem, &acSph->elem)) { @@ -2256,11 +2263,11 @@ void CollisionCheck_AC_TrisVsJntSph(struct PlayState* play, CollisionCheckContex if ((acJntSph->count > 0) && (acJntSph->elements != NULL) && (atTris->count > 0) && (atTris->elements != NULL)) { for (acJntSphElem = acJntSph->elements; acJntSphElem < &acJntSph->elements[acJntSph->count]; acJntSphElem++) { - if (CollisionCheck_SkipBump(&acJntSphElem->base)) { + if (CollisionCheck_IsElementNotAC(&acJntSphElem->base)) { continue; } for (atTrisElem = atTris->elements; atTrisElem < &atTris->elements[atTris->count]; atTrisElem++) { - if (CollisionCheck_SkipTouch(&atTrisElem->base)) { + if (CollisionCheck_IsElementNotAT(&atTrisElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atTrisElem->base, &acJntSphElem->base)) { @@ -2294,11 +2301,11 @@ void CollisionCheck_AC_TrisVsCyl(struct PlayState* play, CollisionCheckContext* ColliderTrisElement* atTrisElem; if ((acCyl->dim.radius > 0) && (acCyl->dim.height > 0) && (atTris->count > 0) && (atTris->elements != NULL)) { - if (CollisionCheck_SkipBump(&acCyl->elem)) { + if (CollisionCheck_IsElementNotAC(&acCyl->elem)) { return; } for (atTrisElem = atTris->elements; atTrisElem < &atTris->elements[atTris->count]; atTrisElem++) { - if (CollisionCheck_SkipTouch(&atTrisElem->base)) { + if (CollisionCheck_IsElementNotAT(&atTrisElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atTrisElem->base, &acCyl->elem)) { @@ -2330,11 +2337,11 @@ void CollisionCheck_AC_TrisVsTris(struct PlayState* play, CollisionCheckContext* if ((acTris->count > 0) && (acTris->elements != NULL) && (atTris->count > 0) && (atTris->elements != NULL)) { for (acTrisElem = acTris->elements; acTrisElem < &acTris->elements[acTris->count]; acTrisElem++) { - if (CollisionCheck_SkipBump(&acTrisElem->base)) { + if (CollisionCheck_IsElementNotAC(&acTrisElem->base)) { continue; } for (atTrisElem = atTris->elements; atTrisElem < &atTris->elements[atTris->count]; atTrisElem++) { - if (CollisionCheck_SkipTouch(&atTrisElem->base)) { + if (CollisionCheck_IsElementNotAT(&atTrisElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atTrisElem->base, &acTrisElem->base)) { @@ -2365,7 +2372,7 @@ void CollisionCheck_AC_TrisVsQuad(struct PlayState* play, CollisionCheckContext* ColliderTrisElement* atTrisElem; if ((atTris->count > 0) && (atTris->elements != NULL)) { - if (CollisionCheck_SkipBump(&acQuad->elem)) { + if (CollisionCheck_IsElementNotAC(&acQuad->elem)) { return; } @@ -2373,7 +2380,7 @@ void CollisionCheck_AC_TrisVsQuad(struct PlayState* play, CollisionCheckContext* Math3D_TriNorm(&D_801EDE78, &acQuad->dim.quad[1], &acQuad->dim.quad[0], &acQuad->dim.quad[2]); for (atTrisElem = atTris->elements; atTrisElem < &atTris->elements[atTris->count]; atTrisElem++) { - if (CollisionCheck_SkipTouch(&atTrisElem->base)) { + if (CollisionCheck_IsElementNotAT(&atTrisElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atTrisElem->base, &acQuad->elem)) { @@ -2405,11 +2412,11 @@ void CollisionCheck_AC_TrisVsSphere(struct PlayState* play, CollisionCheckContex Vec3f hitPos; if ((atTris->count > 0) && (atTris->elements != NULL)) { - if (CollisionCheck_SkipBump(&acSph->elem)) { + if (CollisionCheck_IsElementNotAC(&acSph->elem)) { return; } for (atTrisElem = atTris->elements; atTrisElem < &atTris->elements[atTris->count]; atTrisElem++) { - if (CollisionCheck_SkipTouch(&atTrisElem->base)) { + if (CollisionCheck_IsElementNotAT(&atTrisElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atTrisElem->base, &acSph->elem)) { @@ -2439,14 +2446,14 @@ void CollisionCheck_AC_QuadVsJntSph(struct PlayState* play, CollisionCheckContex ColliderJntSph* acJntSph = (ColliderJntSph*)acCol; if ((acJntSph->count > 0) && (acJntSph->elements != NULL)) { - if (CollisionCheck_SkipTouch(&atQuad->elem)) { + if (CollisionCheck_IsElementNotAT(&atQuad->elem)) { return; } Math3D_TriNorm(&D_801EDEC8, &atQuad->dim.quad[2], &atQuad->dim.quad[3], &atQuad->dim.quad[1]); Math3D_TriNorm(&D_801EDF00, &atQuad->dim.quad[2], &atQuad->dim.quad[1], &atQuad->dim.quad[0]); for (acJntSphElem = acJntSph->elements; acJntSphElem < &acJntSph->elements[acJntSph->count]; acJntSphElem++) { - if (CollisionCheck_SkipBump(&acJntSphElem->base)) { + if (CollisionCheck_IsElementNotAC(&acJntSphElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atQuad->elem, &acJntSphElem->base)) { @@ -2482,10 +2489,10 @@ void CollisionCheck_AC_QuadVsCyl(struct PlayState* play, CollisionCheckContext* ColliderCylinder* acCyl = (ColliderCylinder*)acCol; if ((acCyl->dim.height > 0) && (acCyl->dim.radius > 0)) { - if (CollisionCheck_SkipBump(&acCyl->elem)) { + if (CollisionCheck_IsElementNotAC(&acCyl->elem)) { return; } - if (CollisionCheck_SkipTouch(&atQuad->elem)) { + if (CollisionCheck_IsElementNotAT(&atQuad->elem)) { return; } if (CollisionCheck_NoSharedFlags(&atQuad->elem, &acCyl->elem)) { @@ -2531,7 +2538,7 @@ void CollisionCheck_AC_QuadVsTris(struct PlayState* play, CollisionCheckContext* ColliderTrisElement* acTrisElem; if ((acTris->count > 0) && (acTris->elements != NULL)) { - if (CollisionCheck_SkipTouch(&atQuad->elem)) { + if (CollisionCheck_IsElementNotAT(&atQuad->elem)) { return; } @@ -2539,7 +2546,7 @@ void CollisionCheck_AC_QuadVsTris(struct PlayState* play, CollisionCheckContext* Math3D_TriNorm(&D_801EE038, &atQuad->dim.quad[1], &atQuad->dim.quad[0], &atQuad->dim.quad[2]); for (acTrisElem = acTris->elements; acTrisElem < &acTris->elements[acTris->count]; acTrisElem++) { - if (CollisionCheck_SkipBump(&acTrisElem->base)) { + if (CollisionCheck_IsElementNotAC(&acTrisElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atQuad->elem, &acTrisElem->base)) { @@ -2573,10 +2580,10 @@ void CollisionCheck_AC_QuadVsQuad(struct PlayState* play, CollisionCheckContext* s32 i; s32 j; - if (CollisionCheck_SkipTouch(&atQuad->elem)) { + if (CollisionCheck_IsElementNotAT(&atQuad->elem)) { return; } - if (CollisionCheck_SkipBump(&acQuad->elem)) { + if (CollisionCheck_IsElementNotAC(&acQuad->elem)) { return; } if (CollisionCheck_NoSharedFlags(&atQuad->elem, &acQuad->elem)) { @@ -2614,10 +2621,10 @@ void CollisionCheck_AC_QuadVsSphere(struct PlayState* play, CollisionCheckContex Vec3f hitPos; ColliderSphere* acSph = (ColliderSphere*)acCol; - if (CollisionCheck_SkipTouch(&atQuad->elem)) { + if (CollisionCheck_IsElementNotAT(&atQuad->elem)) { return; } - if (CollisionCheck_SkipBump(&acSph->elem) || CollisionCheck_NoSharedFlags(&atQuad->elem, &acSph->elem)) { + if (CollisionCheck_IsElementNotAC(&acSph->elem) || CollisionCheck_NoSharedFlags(&atQuad->elem, &acSph->elem)) { return; } @@ -2650,12 +2657,12 @@ void CollisionCheck_AC_SphereVsJntSph(struct PlayState* play, CollisionCheckCont f32 centerDist; if ((acJntSph->count > 0) && (acJntSph->elements != NULL)) { - if (CollisionCheck_SkipTouch(&atSph->elem)) { + if (CollisionCheck_IsElementNotAT(&atSph->elem)) { return; } for (acJntSphElem = acJntSph->elements; acJntSphElem < &acJntSph->elements[acJntSph->count]; acJntSphElem++) { - if (CollisionCheck_SkipBump(&acJntSphElem->base)) { + if (CollisionCheck_IsElementNotAC(&acJntSphElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atSph->elem, &acJntSphElem->base)) { @@ -2696,10 +2703,10 @@ void CollisionCheck_AC_SphereVsCylinder(struct PlayState* play, CollisionCheckCo f32 overlapSize; f32 centerDist; - if (CollisionCheck_SkipTouch(&atSph->elem)) { + if (CollisionCheck_IsElementNotAT(&atSph->elem)) { return; } - if (CollisionCheck_SkipBump(&acCyl->elem)) { + if (CollisionCheck_IsElementNotAC(&acCyl->elem)) { return; } if (CollisionCheck_NoSharedFlags(&atSph->elem, &acCyl->elem)) { @@ -2743,12 +2750,12 @@ void CollisionCheck_AC_SphereVsTris(struct PlayState* play, CollisionCheckContex ColliderTrisElement* acTrisElem; Vec3f hitPos; - if (CollisionCheck_SkipTouch(&atSph->elem)) { + if (CollisionCheck_IsElementNotAT(&atSph->elem)) { return; } for (acTrisElem = acTris->elements; acTrisElem < &acTris->elements[acTris->count]; acTrisElem++) { - if (CollisionCheck_SkipBump(&acTrisElem->base)) { + if (CollisionCheck_IsElementNotAC(&acTrisElem->base)) { continue; } if (CollisionCheck_NoSharedFlags(&atSph->elem, &acTrisElem->base)) { @@ -2776,10 +2783,10 @@ void CollisionCheck_AC_SphereVsQuad(struct PlayState* play, CollisionCheckContex Vec3f hitPos; ColliderQuad* acQuad = (ColliderQuad*)acCol; - if (CollisionCheck_SkipTouch(&atSph->elem)) { + if (CollisionCheck_IsElementNotAT(&atSph->elem)) { return; } - if (CollisionCheck_SkipBump(&acQuad->elem) || CollisionCheck_NoSharedFlags(&atSph->elem, &acQuad->elem)) { + if (CollisionCheck_IsElementNotAC(&acQuad->elem) || CollisionCheck_NoSharedFlags(&atSph->elem, &acQuad->elem)) { return; } @@ -2808,10 +2815,10 @@ void CollisionCheck_AC_SphereVsSphere(struct PlayState* play, CollisionCheckCont f32 overlapSize; f32 centerDist; - if (CollisionCheck_SkipTouch(&atSph->elem)) { + if (CollisionCheck_IsElementNotAT(&atSph->elem)) { return; } - if (CollisionCheck_SkipBump(&acSph->elem)) { + if (CollisionCheck_IsElementNotAC(&acSph->elem)) { return; } if (CollisionCheck_NoSharedFlags(&atSph->elem, &acSph->elem)) { @@ -2846,14 +2853,14 @@ void CollisionCheck_SetJntSphHitFX(struct PlayState* play, CollisionCheckContext ColliderJntSphElement* jntSphElem; for (jntSphElem = jntSph->elements; jntSphElem < &jntSph->elements[jntSph->count]; jntSphElem++) { - if ((jntSphElem->base.bumperFlags & BUMP_DRAW_HITMARK) && (jntSphElem->base.acHitElem != NULL) && - !(jntSphElem->base.acHitElem->toucherFlags & TOUCH_DREW_HITMARK)) { + if ((jntSphElem->base.acElemFlags & ACELEM_DRAW_HITMARK) && (jntSphElem->base.acHitElem != NULL) && + !(jntSphElem->base.acHitElem->atElemFlags & ATELEM_DREW_HITMARK)) { Vec3f hitPos; - Math_Vec3s_ToVec3f(&hitPos, &jntSphElem->base.bumper.hitPos); + Math_Vec3s_ToVec3f(&hitPos, &jntSphElem->base.acDmgInfo.hitPos); CollisionCheck_HitEffects(play, jntSphElem->base.acHit, jntSphElem->base.acHitElem, &jntSph->base, &jntSphElem->base, &hitPos); - jntSphElem->base.acHitElem->toucherFlags |= TOUCH_DREW_HITMARK; + jntSphElem->base.acHitElem->atElemFlags |= ATELEM_DREW_HITMARK; return; } } @@ -2865,13 +2872,13 @@ void CollisionCheck_SetJntSphHitFX(struct PlayState* play, CollisionCheckContext void CollisionCheck_SetCylHitFX(struct PlayState* play, CollisionCheckContext* colChkCtx, Collider* col) { ColliderCylinder* cyl = (ColliderCylinder*)col; - if ((cyl->elem.bumperFlags & BUMP_DRAW_HITMARK) && (cyl->elem.acHitElem != NULL) && - !(cyl->elem.acHitElem->toucherFlags & TOUCH_DREW_HITMARK)) { + if ((cyl->elem.acElemFlags & ACELEM_DRAW_HITMARK) && (cyl->elem.acHitElem != NULL) && + !(cyl->elem.acHitElem->atElemFlags & ATELEM_DREW_HITMARK)) { Vec3f hitPos; - Math_Vec3s_ToVec3f(&hitPos, &cyl->elem.bumper.hitPos); + Math_Vec3s_ToVec3f(&hitPos, &cyl->elem.acDmgInfo.hitPos); CollisionCheck_HitEffects(play, cyl->elem.acHit, cyl->elem.acHitElem, &cyl->base, &cyl->elem, &hitPos); - cyl->elem.acHitElem->toucherFlags |= TOUCH_DREW_HITMARK; + cyl->elem.acHitElem->atElemFlags |= ATELEM_DREW_HITMARK; } } @@ -2883,14 +2890,14 @@ void CollisionCheck_SetTrisHitFX(struct PlayState* play, CollisionCheckContext* ColliderTrisElement* trisElem; for (trisElem = tris->elements; trisElem < &tris->elements[tris->count]; trisElem++) { - if ((trisElem->base.bumperFlags & BUMP_DRAW_HITMARK) && (trisElem->base.acHitElem != NULL) && - !(trisElem->base.acHitElem->toucherFlags & TOUCH_DREW_HITMARK)) { + if ((trisElem->base.acElemFlags & ACELEM_DRAW_HITMARK) && (trisElem->base.acHitElem != NULL) && + !(trisElem->base.acHitElem->atElemFlags & ATELEM_DREW_HITMARK)) { Vec3f hitPos; - Math_Vec3s_ToVec3f(&hitPos, &trisElem->base.bumper.hitPos); + Math_Vec3s_ToVec3f(&hitPos, &trisElem->base.acDmgInfo.hitPos); CollisionCheck_HitEffects(play, trisElem->base.acHit, trisElem->base.acHitElem, &tris->base, &trisElem->base, &hitPos); - trisElem->base.acHitElem->toucherFlags |= TOUCH_DREW_HITMARK; + trisElem->base.acHitElem->atElemFlags |= ATELEM_DREW_HITMARK; return; } } @@ -2902,13 +2909,13 @@ void CollisionCheck_SetTrisHitFX(struct PlayState* play, CollisionCheckContext* void CollisionCheck_SetQuadHitFX(struct PlayState* play, CollisionCheckContext* colChkCtx, Collider* col) { ColliderQuad* quad = (ColliderQuad*)col; - if ((quad->elem.bumperFlags & BUMP_DRAW_HITMARK) && (quad->elem.acHitElem != NULL) && - !(quad->elem.acHitElem->toucherFlags & TOUCH_DREW_HITMARK)) { + if ((quad->elem.acElemFlags & ACELEM_DRAW_HITMARK) && (quad->elem.acHitElem != NULL) && + !(quad->elem.acHitElem->atElemFlags & ATELEM_DREW_HITMARK)) { Vec3f hitPos; - Math_Vec3s_ToVec3f(&hitPos, &quad->elem.bumper.hitPos); + Math_Vec3s_ToVec3f(&hitPos, &quad->elem.acDmgInfo.hitPos); CollisionCheck_HitEffects(play, quad->elem.acHit, quad->elem.acHitElem, &quad->base, &quad->elem, &hitPos); - quad->elem.acHitElem->toucherFlags |= TOUCH_DREW_HITMARK; + quad->elem.acHitElem->atElemFlags |= ATELEM_DREW_HITMARK; } } @@ -2918,13 +2925,13 @@ void CollisionCheck_SetQuadHitFX(struct PlayState* play, CollisionCheckContext* void CollisionCheck_SetSphereHitFX(struct PlayState* play, CollisionCheckContext* colChkCtx, Collider* col) { ColliderSphere* sph = (ColliderSphere*)col; - if ((sph->elem.bumperFlags & BUMP_DRAW_HITMARK) && (sph->elem.acHitElem != NULL) && - !(sph->elem.acHitElem->toucherFlags & TOUCH_DREW_HITMARK)) { + if ((sph->elem.acElemFlags & ACELEM_DRAW_HITMARK) && (sph->elem.acHitElem != NULL) && + !(sph->elem.acHitElem->atElemFlags & ATELEM_DREW_HITMARK)) { Vec3f hitPos; - Math_Vec3s_ToVec3f(&hitPos, &sph->elem.bumper.hitPos); + Math_Vec3s_ToVec3f(&hitPos, &sph->elem.acDmgInfo.hitPos); CollisionCheck_HitEffects(play, sph->elem.acHit, sph->elem.acHitElem, &sph->base, &sph->elem, &hitPos); - sph->elem.acHitElem->toucherFlags |= TOUCH_DREW_HITMARK; + sph->elem.acHitElem->atElemFlags |= ATELEM_DREW_HITMARK; } } @@ -3024,7 +3031,7 @@ void CollisionCheck_AC(struct PlayState* play, CollisionCheckContext* colChkCtx, * Iterates through all AT colliders, testing them for AC collisions with each AC collider, setting the info regarding * the collision for each AC and AT collider that collided. Then spawns hitmarks and plays sound effects for each * successful collision. To collide, an AT collider must share a type (AC_TYPE_PLAYER, AC_TYPE_ENEMY, or AC_TYPE_OTHER) - * with the AC collider and the toucher and bumper elements that overlapped must share a dmgFlag. + * with the AC collider and the atDmgInfo and acDmgInfo elements that overlapped must share a dmgFlag. */ void CollisionCheck_AT(struct PlayState* play, CollisionCheckContext* colChkCtx) { Collider** acColP; @@ -3536,7 +3543,7 @@ void CollisionCheck_ApplyDamage(struct PlayState* play, CollisionCheckContext* c if ((col->actor == NULL) || !(col->acFlags & AC_HIT)) { return; } - if (!(elem->bumperFlags & BUMP_HIT) || (elem->bumperFlags & BUMP_NO_DAMAGE)) { + if (!(elem->acElemFlags & ACELEM_HIT) || (elem->acElemFlags & ACELEM_NO_DAMAGE)) { return; } @@ -3544,16 +3551,16 @@ void CollisionCheck_ApplyDamage(struct PlayState* play, CollisionCheckContext* c atElem = elem->acHitElem; if ((atCol != NULL) && (atElem != NULL) && (col != NULL) && (elem != NULL)) { - damage = CollisionCheck_GetDamageAndEffectOnBumper(atCol, atElem, col, elem, &effect); + damage = CollisionCheck_GetDamageAndEffectOnElementAC(atCol, atElem, col, elem, &effect); - if (CollisionCheck_GetToucherDamage(atCol, atElem, col, elem) != 0) { + if (CollisionCheck_GetElementATDamage(atCol, atElem, col, elem) != 0) { if (damage < 1.0f) { finalDamage = 0.0f; if (effect == 0) { return; } } else { - finalDamage = CollisionCheck_ApplyBumperDefense(damage, elem); + finalDamage = CollisionCheck_ApplyElementATDefense(damage, elem); if ((finalDamage < 1.0f) && (effect == 0)) { return; } @@ -3562,7 +3569,7 @@ void CollisionCheck_ApplyDamage(struct PlayState* play, CollisionCheckContext* c if (col->actor->colChkInfo.damageTable != NULL) { col->actor->colChkInfo.damageEffect = effect; } - if (!(col->acFlags & AC_HARD) || ((col->acFlags & AC_HARD) && (atElem->toucher.dmgFlags == 0x20000000))) { + if (!(col->acFlags & AC_HARD) || ((col->acFlags & AC_HARD) && (atElem->atDmgInfo.dmgFlags == 0x20000000))) { if (col->actor->colChkInfo.damage < finalDamage) { col->actor->colChkInfo.damage = finalDamage; } diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index d062e0e1f5..637485e9de 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -27,7 +27,7 @@ ActorProfile En_A_Obj_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -35,11 +35,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE, - BUMP_NONE, + ATELEM_NONE, + ACELEM_NONE, OCELEM_ON, }, { 25, 60, 0, { 0, 0, 0 } }, diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 2101ff71f1..b0bc32675d 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -39,7 +39,7 @@ ActorProfile En_Item00_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AT_TYPE_PLAYER, OC1_NONE, @@ -47,11 +47,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000010, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 10, 30, 0, { 0, 0, 0 } }, diff --git a/src/code/z_fireobj.c b/src/code/z_fireobj.c index 162439a532..c4a4630f92 100644 --- a/src/code/z_fireobj.c +++ b/src/code/z_fireobj.c @@ -4,7 +4,7 @@ ColliderCylinderInit sFireObjCollisionInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -12,11 +12,11 @@ ColliderCylinderInit sFireObjCollisionInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 18, 67, 0, { 0, 0, 0 } }, @@ -223,13 +223,13 @@ void FireObj_Update(PlayState* play, FireObj* fire, Actor* actor) { FireObj_UpdateStateTransitions(play, fire); if (fire->state == FIRE_STATE_NOT_LIT) { if ((fire->collision.base.acFlags & AC_HIT) && - (fire->collision.elem.acHitElem->toucher.dmgFlags & DMG_FIRE_ARROW)) { + (fire->collision.elem.acHitElem->atDmgInfo.dmgFlags & DMG_FIRE_ARROW)) { FireObj_SetState(fire, fire->dynamicSizeStep, FIRE_STATE_GROWING); } } else if ((fire->collision.base.acFlags & AC_HIT) && (arrow->actor.update != NULL) && (arrow->actor.id == ACTOR_EN_ARROW)) { arrow->actor.params = 0; - arrow->collider.elem.toucher.dmgFlags = DMG_FIRE_ARROW; + arrow->collider.elem.atDmgInfo.dmgFlags = DMG_FIRE_ARROW; } fire->collision.dim.pos.x = fire->position.x; fire->collision.dim.pos.y = fire->position.y; diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index a81acfc1d6..15ba7869ab 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -2415,17 +2415,17 @@ s32 func_80126440(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInf return true; } -u8 sPlayerShieldCollisionTypes[PLAYER_SHIELD_MAX] = { - COLTYPE_METAL, // PLAYER_SHIELD_NONE - COLTYPE_METAL, // PLAYER_SHIELD_HEROS_SHIELD - COLTYPE_METAL, // PLAYER_SHIELD_MIRROR_SHIELD +u8 sPlayerShieldColMaterials[PLAYER_SHIELD_MAX] = { + COL_MATERIAL_METAL, // PLAYER_SHIELD_NONE + COL_MATERIAL_METAL, // PLAYER_SHIELD_HEROS_SHIELD + COL_MATERIAL_METAL, // PLAYER_SHIELD_MIRROR_SHIELD }; void Player_UpdateShieldCollider(PlayState* play, Player* player, ColliderQuad* collider, Vec3f quadSrc[4]) { if (player->stateFlags1 & PLAYER_STATE1_400000) { Vec3f quadDest[4]; - player->shieldQuad.base.colType = sPlayerShieldCollisionTypes[player->currentShield]; + player->shieldQuad.base.colMaterial = sPlayerShieldColMaterials[player->currentShield]; Matrix_MultVec3f(&quadSrc[0], &quadDest[0]); Matrix_MultVec3f(&quadSrc[1], &quadDest[1]); Matrix_MultVec3f(&quadSrc[2], &quadDest[2]); diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 15b04d33da..adafce002a 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -34,7 +34,7 @@ ActorProfile Arms_Hook_Profile = { static ColliderQuadInit D_808C1BC0 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -42,11 +42,11 @@ static ColliderQuadInit D_808C1BC0 = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000080, 0x00, 0x02 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_NEAREST | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -139,11 +139,11 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) { ArmsHook_CheckForCancel(this); if ((this->timer != 0) && (this->collider.base.atFlags & AT_HIT) && - (this->collider.elem.atHitElem->elemType != ELEMTYPE_UNK4)) { + (this->collider.elem.atHitElem->elemMaterial != ELEM_MATERIAL_UNK4)) { Actor* touchedActor = this->collider.base.at; if ((touchedActor->update != NULL) && (touchedActor->flags & (ACTOR_FLAG_200 | ACTOR_FLAG_400))) { - if (this->collider.elem.atHitElem->bumperFlags & BUMP_HOOKABLE) { + if (this->collider.elem.atHitElem->acElemFlags & ACELEM_HOOKABLE) { ArmsHook_AttachHookToActor(this, touchedActor); if (CHECK_FLAG_ALL(touchedActor->flags, ACTOR_FLAG_400)) { func_808C1154(this); diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 43abe7c3ac..7cd3ea2307 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -35,7 +35,7 @@ ActorProfile Arrow_Fire_Profile = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -43,11 +43,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x08000000, 0x00, 0x02 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c index fa97ab9579..b5f5f15ade 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c @@ -38,22 +38,22 @@ ActorProfile Bg_Astr_Bombwall_Profile = { static ColliderTrisElementInit sTrisElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -70.0f, 0.0f, 3.0f }, { 70.0f, 0.0f, 3.0f }, { -70.0f, 200.0f, 3.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 70.0f, 0.0f, 3.0f }, { 70.0f, 200.0f, 3.0f }, { -70.0f, 200.0f, 3.0f } } }, @@ -62,7 +62,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c index bc6af7a70d..07af23f89a 100644 --- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c @@ -32,7 +32,7 @@ ActorProfile Bg_Botihasira_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -40,11 +40,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 27, 80, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index 0b51ceb2f3..2b0cf31b01 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -39,7 +39,7 @@ ActorProfile Bg_Dblue_Waterfall_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -47,11 +47,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00CBFBB0, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 50, 740, -740, { 0, 0, 0 } }, @@ -150,13 +150,13 @@ void func_80B83EA4(BgDblueWaterfall* this, PlayState* play) { Vec3f sp98; s32 phi_s3; - if (this->collider.elem.bumperFlags & BUMP_HIT) { + if (this->collider.elem.acElemFlags & ACELEM_HIT) { f32 temp_f0_2; f32 temp_f20; - spB0.x = this->collider.elem.bumper.hitPos.x; - spB0.y = this->collider.elem.bumper.hitPos.y; - spB0.z = this->collider.elem.bumper.hitPos.z; + spB0.x = this->collider.elem.acDmgInfo.hitPos.x; + spB0.y = this->collider.elem.acDmgInfo.hitPos.y; + spB0.z = this->collider.elem.acDmgInfo.hitPos.z; sp98.x = spB0.x - this->actor.world.pos.x; sp98.y = 0.0f; @@ -206,10 +206,10 @@ void func_80B841A0(BgDblueWaterfall* this, PlayState* play) { s32 temp_s3; s32 phi_s2; - if (this->collider.elem.bumperFlags & BUMP_HIT) { - temp_f22 = this->collider.elem.bumper.hitPos.x; - temp_f24 = this->collider.elem.bumper.hitPos.y; - temp_f26 = this->collider.elem.bumper.hitPos.z; + if (this->collider.elem.acElemFlags & ACELEM_HIT) { + temp_f22 = this->collider.elem.acDmgInfo.hitPos.x; + temp_f24 = this->collider.elem.acDmgInfo.hitPos.y; + temp_f26 = this->collider.elem.acDmgInfo.hitPos.z; for (i = 0, phi_s2 = 0; i < 10; i++, phi_s2 += 0x1999) { temp_s3 = (s32)(Rand_ZeroOne() * 6553.0f) + phi_s2; @@ -419,13 +419,13 @@ void func_80B84928(BgDblueWaterfall* this, PlayState* play) { if (sp2C) { if (sp30 != 0) { func_80B83EA4(this, play); - if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x800) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x800) { this->csId = this->actor.csId; func_80B84AD4(this, play); } } else { func_80B841A0(this, play); - if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x1000) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x1000) { this->csId = CutsceneManager_GetAdditionalCsId(this->actor.csId); func_80B84AD4(this, play); } diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c index 452ef2e59a..b43080cc4c 100644 --- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c @@ -38,7 +38,7 @@ ActorProfile Bg_Dkjail_Ivy_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x01000200, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 20, 80, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c index bec145812a..b9b1438761 100644 --- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c @@ -35,7 +35,7 @@ ActorProfile Bg_Fire_Wall_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -43,11 +43,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x01, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_ON, }, { 34, 85, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c index ff108e4f94..07355809c6 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c @@ -38,7 +38,7 @@ ActorProfile Bg_Haka_Bombwall_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 80, 80, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c index 30cb0ce40e..3289177e96 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c @@ -40,7 +40,7 @@ ActorProfile Bg_Hakugin_Bombwall_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -48,11 +48,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 80, 80, 0, { 0, 0, 0 } }, @@ -326,7 +326,7 @@ void BgHakuginBombwall_Init(Actor* thisx, PlayState* play) { Collider_SetCylinder(play, &this->collider, &this->dyna.actor, &sCylinderInit); this->collider.dim.radius = ptr->unk_14; this->collider.dim.height = ptr->unk_16; - this->collider.elem.bumper.dmgFlags = ptr->unk_18; + this->collider.elem.acDmgInfo.dmgFlags = ptr->unk_18; Collider_UpdateCylinder(&this->dyna.actor, &this->collider); Actor_SetFocus(&this->dyna.actor, ptr->unk_08); @@ -359,7 +359,7 @@ s32 func_80ABCB5C(BgHakuginBombwall* this, PlayState* play) { s32 func_80ABCC00(BgHakuginBombwall* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { - if (this->collider.elem.acHitElem->toucher.dmgFlags & 8) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 8) { if (this->collider.base.ac != NULL) { Actor* thisx = &this->dyna.actor; diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c index 43b331e304..d528ecde5f 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c @@ -62,7 +62,7 @@ static BgHakuginPostUnkStruct3 D_80A9D880[] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -70,11 +70,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000100, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 276, 0, 20, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c index 23f8509813..da32f14da1 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c @@ -53,7 +53,7 @@ ActorProfile Bg_Hakugin_Switch_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -61,11 +61,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000400, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 60, 10, 180, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c index 5d6fff3052..06a0289599 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -24,7 +24,7 @@ void BgIcicle_Regrow(BgIcicle* this, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -32,11 +32,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 13, 120, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c index 9780222224..584bae535e 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c @@ -39,7 +39,7 @@ ActorProfile Bg_Ikana_Bombwall_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -47,11 +47,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 80, 80, 0, { 0, 0, 0 } }, @@ -59,7 +59,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -67,11 +67,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 50, 20, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c index 5dc7988d27..15b41a4484 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c @@ -38,7 +38,7 @@ ActorProfile Bg_Ikana_Dharma_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000100, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 98, 10, 25, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c index 2c4a85f498..df34f03b0e 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c @@ -41,99 +41,99 @@ ActorProfile Bg_Ikana_Mirror_Profile = { static ColliderTrisElementInit sMirrorColliderElementsInit[] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 21.6f, 13.7f }, { -25.3f, 6.0f, 8.4f }, { 25.3f, 6.0f, 8.4f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 45.0f, 13.7f }, { -25.3f, 6.0f, 8.4f }, { 0.0f, 21.6f, 13.7f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 45.0f, 13.7f }, { 0.0f, 21.6f, 13.7f }, { 25.3f, 6.0f, 8.4f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 45.0f, 13.7f }, { -25.3f, 45.0f, 8.4f }, { -25.3f, 6.0f, 8.4f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 45.0f, 13.7f }, { 25.3f, 6.0f, 8.4f }, { 25.3f, 45.0f, 8.4f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 45.0f, 13.7f }, { -17.9f, 64.1f, 8.4f }, { -25.3f, 45.0f, 8.4f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 45.0f, 13.7f }, { 25.3f, 45.0f, 8.4f }, { 17.9f, 64.1f, 8.4f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 45.0f, 13.7f }, { 0.0f, 72.0f, 8.4f }, { -17.9f, 64.1f, 8.4f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 45.0f, 13.7f }, { 17.9f, 64.1f, 8.4f }, { 0.0f, 72.0f, 8.4f } } }, @@ -142,7 +142,7 @@ static ColliderTrisElementInit sMirrorColliderElementsInit[] = { static ColliderTrisInit sMirrorColliderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER, OC1_NONE, @@ -156,7 +156,7 @@ static ColliderTrisInit sMirrorColliderInit = { static ColliderQuadInit sLightRaysCollidersInit[] = { { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_OTHER, AC_NONE, OC1_NONE, @@ -164,18 +164,18 @@ static ColliderQuadInit sLightRaysCollidersInit[] = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00200000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 72.0f, 20.0f }, { 0.0f, 72.0f, 240.0f }, { 0.0f, 6.0f, 20.0f }, { 0.0f, 6.0f, 240.0f } } }, }, { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_OTHER, AC_NONE, OC1_NONE, @@ -183,11 +183,11 @@ static ColliderQuadInit sLightRaysCollidersInit[] = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00200000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_NONE, }, { { { 25.3f, 20.0f, 20.0f }, { 25.3f, 20.0f, 240.0f }, { -25.3f, 20.0f, 20.0f }, { -25.3f, 20.0f, 240.0f } } }, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c index b1bbf000e9..d523a6c313 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c @@ -35,7 +35,7 @@ ActorProfile Bg_Ikana_Ray_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_OTHER, AC_NONE, OC1_NONE, @@ -43,11 +43,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00200000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_ON, }, { 90, 420, -420, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index 3481b19c5f..5271c3db37 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -49,22 +49,22 @@ ActorProfile Bg_Ikana_Rotaryroom_Profile = { static ColliderJntSphElementInit sJntSphElementsInit1[2] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00002000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 0, { { -3450, 450, 0 }, 60 }, 100 }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00002000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 0, { { 3450, 450, 0 }, 60 }, 100 }, @@ -73,7 +73,7 @@ static ColliderJntSphElementInit sJntSphElementsInit1[2] = { static ColliderJntSphInit sJntSphInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -87,11 +87,11 @@ static ColliderJntSphInit sJntSphInit1 = { static ColliderJntSphElementInit sJntSphElementsInit2[1] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00002000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 0, { { -3750, 1200, 0 }, 60 }, 100 }, @@ -100,7 +100,7 @@ static ColliderJntSphElementInit sJntSphElementsInit2[1] = { static ColliderJntSphInit sJntSphInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c index fb5e01cb38..2a6ad3c6d7 100644 --- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c @@ -34,7 +34,7 @@ static Gfx* D_80C076A0[] = { object_ikninside_obj_DL_00A748, object_ikninside_ob static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -42,11 +42,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x80000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 32, 32, 0, { 0, 0, 0 } }, @@ -104,7 +104,8 @@ void func_80C072D0(BgIkninside* this, PlayState* play) { s32 i; if (this->collider.base.acFlags & AC_HIT) { - if ((this->collider.elem.acHitElem != NULL) && (this->collider.elem.acHitElem->toucher.dmgFlags & 0x80000000)) { + if ((this->collider.elem.acHitElem != NULL) && + (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x80000000)) { for (i = 0; i < 20; i++) { altitude = Rand_S16Offset(0x1800, 0x2800); azimuth = Rand_Next() >> 0x10; diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c index 6f04cb58f9..1dc31b40fd 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c @@ -35,7 +35,7 @@ ActorProfile Bg_Iknv_Obj_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -43,11 +43,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 40, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c index 876b599f03..1f58615b3d 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c @@ -36,7 +36,7 @@ ActorProfile Bg_Kin2_Bombwall_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -44,11 +44,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 60, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c index 7e69cfe2de..de0f8042eb 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c @@ -42,44 +42,44 @@ ActorProfile Bg_Kin2_Fence_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[4] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 0, { { -2040, 1400, 350 }, 28 }, 100 }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 0, { { -1140, 1400, 350 }, 28 }, 100 }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 0, { { 1140, 1400, 350 }, 28 }, 100 }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 0, { { 2040, 1400, 350 }, 28 }, 100 }, @@ -88,7 +88,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[4] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -103,7 +103,7 @@ s32 BgKin2Fence_CheckHitMask(BgKin2Fence* this) { s32 i; for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) { - if (this->collider.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->collider.elements[i].base.acElemFlags & ACELEM_HIT) { return i; } } diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c index b652749bbc..7100d64e98 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c @@ -42,22 +42,22 @@ ActorProfile Bg_Kin2_Picture_Profile = { static ColliderTrisElementInit sTrisElementsInit[] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x000138B0, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -20.0f, 53.3f, 9.0f }, { -20.0f, 3.0f, 9.0f }, { 20.0f, 3.0f, 9.0f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x000138B0, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -20.0f, 53.3f, 9.0f }, { 20.0f, 3.0f, 9.0f }, { 20.0f, 53.3f, 9.0f } } }, @@ -66,7 +66,7 @@ static ColliderTrisElementInit sTrisElementsInit[] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c index f7fcccef4b..91f2693dae 100644 --- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c @@ -52,22 +52,22 @@ ActorProfile Bg_Last_Bwall_Profile = { static ColliderTrisElementInit sTrisElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -70.0f, 0.0f, 3.0f }, { 70.0f, 0.0f, 3.0f }, { -70.0f, 200.0f, 3.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 70.0f, 0.0f, 3.0f }, { 70.0f, 200.0f, 3.0f }, { -70.0f, 200.0f, 3.0f } } }, @@ -76,7 +76,7 @@ static ColliderTrisElementInit sTrisElementsInit[] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c index 28831db003..63af02c072 100644 --- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c @@ -44,7 +44,7 @@ ActorProfile Bg_Numa_Hana_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -52,11 +52,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x01CBFBB6, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 18, 16, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c index a99cb47aec..f5f3edc0c0 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -39,22 +39,22 @@ ActorProfile Bg_Spdweb_Profile = { static ColliderTrisElementInit sTrisElementsInit1[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000C00, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 75.0f, -8.0f, 75.0f }, { 75.0f, -8.0f, -75.0f }, { -75.0f, -8.0f, -75.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000C00, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 75.0f, -8.0f, 75.0f }, { -75.0f, -8.0f, -75.0f }, { -75.0f, -8.0f, 75.0f } } }, @@ -63,7 +63,7 @@ static ColliderTrisElementInit sTrisElementsInit1[2] = { static ColliderTrisInit sTrisInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -77,44 +77,44 @@ static ColliderTrisInit sTrisInit1 = { static ColliderTrisElementInit sTrisElementsInit2[4] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 70.0f, 160.0f, 15.0f }, { -70.0f, 160.0f, 15.0f }, { -70.0f, 20.0f, 15.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 70.0f, 160.0f, 15.0f }, { -70.0f, 20.0f, 15.0f }, { 70.0f, 20.0f, 15.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -70.0f, 160.0f, -15.0f }, { 70.0f, 160.0f, -15.0f }, { 70.0f, 20.0f, -15.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -70.0f, 160.0f, -15.0f }, { 70.0f, 20.0f, -15.0f }, { -70.0f, 20.0f, -15.0f } } }, @@ -123,7 +123,7 @@ static ColliderTrisElementInit sTrisElementsInit2[4] = { static ColliderTrisInit sTrisInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -290,9 +290,9 @@ void func_809CE4C8(BgSpdweb* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { for (i = 0; i < 2; i++) { trisElem = &this->collider.elements[i]; - if (trisElem->base.bumperFlags & BUMP_HIT) { - if (this->collider.elements[i].base.acHitElem->toucher.dmgFlags & 0x800) { - Math_Vec3s_ToVec3f(&this->dyna.actor.home.pos, &trisElem->base.bumper.hitPos); + if (trisElem->base.acElemFlags & ACELEM_HIT) { + if (this->collider.elements[i].base.acHitElem->atDmgInfo.dmgFlags & 0x800) { + Math_Vec3s_ToVec3f(&this->dyna.actor.home.pos, &trisElem->base.acDmgInfo.hitPos); func_809CEE74(this); return; } @@ -433,8 +433,8 @@ void func_809CEBC0(BgSpdweb* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) { trisElem = &this->collider.elements[i]; - if (trisElem->base.bumperFlags & BUMP_HIT) { - Math_Vec3s_ToVec3f(&this->dyna.actor.home.pos, &trisElem->base.bumper.hitPos); + if (trisElem->base.acElemFlags & ACELEM_HIT) { + Math_Vec3s_ToVec3f(&this->dyna.actor.home.pos, &trisElem->base.acDmgInfo.hitPos); break; } } diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c index 2aff0161ce..f5b42b21c9 100644 --- a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c @@ -36,7 +36,7 @@ ActorProfile Bg_Spout_Fire_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -44,11 +44,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x01, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_ON, }, { 30, 83, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c index 0ed74b7614..0177e1ad70 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c @@ -345,33 +345,33 @@ static DamageTable sBugDamageTable = { static ColliderJntSphElementInit sSwordColliderJntSphElementsInit[3] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 35 }, 100 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 35 }, 100 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 70 }, 100 }, @@ -380,7 +380,7 @@ static ColliderJntSphElementInit sSwordColliderJntSphElementsInit[3] = { static ColliderJntSphInit sSwordColliderJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -395,11 +395,11 @@ static ColliderJntSphInit sSwordColliderJntSphInit = { static ColliderJntSphElementInit sShieldColliderJntSphElementsInit[1] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 36 }, 100 }, @@ -408,7 +408,7 @@ static ColliderJntSphElementInit sShieldColliderJntSphElementsInit[1] = { static ColliderJntSphInit sShieldColliderJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -423,121 +423,121 @@ static ColliderJntSphInit sShieldColliderJntSphInit = { static ColliderJntSphElementInit sBodyColliderJntSphElementsInit[11] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 25 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_ROOT, { { 0, 0, 0 }, 15 }, 100 }, @@ -546,7 +546,7 @@ static ColliderJntSphElementInit sBodyColliderJntSphElementsInit[11] = { static ColliderJntSphInit sBodyColliderJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -561,22 +561,22 @@ static ColliderJntSphInit sBodyColliderJntSphInit = { static ColliderJntSphElementInit sKickAndShieldBashColliderJntSphElementsInit[2] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 36 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { ODOLWA_LIMB_NONE, { { 0, 0, 0 }, 36 }, 100 }, @@ -585,7 +585,7 @@ static ColliderJntSphElementInit sKickAndShieldBashColliderJntSphElementsInit[2] static ColliderJntSphInit sKickAndShieldBashColliderJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -598,7 +598,7 @@ static ColliderJntSphInit sKickAndShieldBashColliderJntSphInit = { static ColliderCylinderInit sBugACColliderCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -606,11 +606,11 @@ static ColliderCylinderInit sBugACColliderCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7FFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 15, 15, 10, { 0, 0, 0 } }, @@ -618,7 +618,7 @@ static ColliderCylinderInit sBugACColliderCylinderInit = { static ColliderCylinderInit sBugATColliderCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -626,11 +626,11 @@ static ColliderCylinderInit sBugATColliderCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7FFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 8, 15, 10, { 0, 0, 0 } }, @@ -1951,12 +1951,12 @@ void Boss01_UpdateDamage(Boss01* this, PlayState* play) { u8 damage; s32 i; - if (this->shieldCollider.elements[ODOLWA_SHIELD_COLLIDER_SHIELD].base.bumperFlags & BUMP_HIT) { + if (this->shieldCollider.elements[ODOLWA_SHIELD_COLLIDER_SHIELD].base.acElemFlags & ACELEM_HIT) { this->bodyInvincibilityTimer = 5; if (this->damagedTimer == 0) { ColliderElement* acHitElem = this->shieldCollider.elements[ODOLWA_SHIELD_COLLIDER_SHIELD].base.acHitElem; - if (acHitElem->toucher.dmgFlags == DMG_SWORD_BEAM) { + if (acHitElem->atDmgInfo.dmgFlags == DMG_SWORD_BEAM) { Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->actor.focus.pos.x, this->actor.focus.pos.y, this->actor.focus.pos.z, 0, 0, 3, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_BOUND); @@ -1965,24 +1965,24 @@ void Boss01_UpdateDamage(Boss01* this, PlayState* play) { } } else if (this->damagedTimer == 0) { for (i = 0; i < ODOLWA_SWORD_COLLIDER_MAX; i++) { - if (this->swordCollider.elements[i].base.toucherFlags & TOUCH_HIT) { - this->swordCollider.elements[i].base.toucherFlags &= ~TOUCH_HIT; + if (this->swordCollider.elements[i].base.atElemFlags & ATELEM_HIT) { + this->swordCollider.elements[i].base.atElemFlags &= ~ATELEM_HIT; player->pushedYaw = this->actor.yawTowardsPlayer; player->pushedSpeed = 15.0f; } } for (i = 0; i < ODOLWA_KICK_AND_SHIELD_BASH_COLLIDER_MAX; i++) { - if (this->kickAndShieldBashCollider.elements[i].base.toucherFlags & TOUCH_HIT) { - this->kickAndShieldBashCollider.elements[i].base.toucherFlags &= ~TOUCH_HIT; + if (this->kickAndShieldBashCollider.elements[i].base.atElemFlags & ATELEM_HIT) { + this->kickAndShieldBashCollider.elements[i].base.atElemFlags &= ~ATELEM_HIT; player->pushedYaw = this->actor.yawTowardsPlayer; player->pushedSpeed = 20.0f; } } for (i = 0; i < ODOLWA_COLLIDER_BODYPART_MAX; i++) { - if (this->bodyCollider.elements[i].base.bumperFlags & BUMP_HIT) { - this->bodyCollider.elements[i].base.bumperFlags &= ~BUMP_HIT; + if (this->bodyCollider.elements[i].base.acElemFlags & ACELEM_HIT) { + this->bodyCollider.elements[i].base.acElemFlags &= ~ACELEM_HIT; switch (this->actor.colChkInfo.damageEffect) { case ODOLWA_DMGEFF_FREEZE: @@ -2408,7 +2408,7 @@ void Boss01_Update(Actor* thisx, PlayState* play2) { } else { this->bodyInvincibilityTimer--; for (i = 0; i < ODOLWA_COLLIDER_BODYPART_MAX; i++) { - this->bodyCollider.elements[i].base.bumperFlags &= ~BUMP_HIT; + this->bodyCollider.elements[i].base.acElemFlags &= ~ACELEM_HIT; } } @@ -2428,7 +2428,7 @@ void Boss01_Update(Actor* thisx, PlayState* play2) { } else { this->disableCollisionTimer--; for (i = 0; i < ODOLWA_COLLIDER_BODYPART_MAX; i++) { - this->bodyCollider.elements[i].base.bumperFlags &= ~BUMP_HIT; + this->bodyCollider.elements[i].base.acElemFlags &= ~ACELEM_HIT; } } @@ -3255,7 +3255,7 @@ void Boss01_Bug_UpdateDamage(Boss01* this, PlayState* play) { if (this->damagedTimer == 0) { Matrix_RotateYS(this->actor.yawTowardsPlayer, MTXMODE_NEW); - if (acHitElem->toucher.dmgFlags & 0x300000) { + if (acHitElem->atDmgInfo.dmgFlags & 0x300000) { this->damagedTimer = 10; Matrix_MultVecZ(-10.0f, &additionalVelocity); this->additionalVelocityX = additionalVelocity.x; diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c index b5a2268749..76b0376cc7 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -172,242 +172,242 @@ s16 D_809DF5E4[] = { static ColliderJntSphElementInit sJntSphElementsInit1[] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 2, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 3, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 4, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 5, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 6, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 7, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 8, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 9, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 10, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 11, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 12, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 13, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 14, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 15, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 16, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 17, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 19, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 21, { { 0, 0, 0 }, 85 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 130 }, 100 }, @@ -416,7 +416,7 @@ static ColliderJntSphElementInit sJntSphElementsInit1[] = { static ColliderJntSphInit sJntSphInit1 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -430,22 +430,22 @@ static ColliderJntSphInit sJntSphInit1 = { static ColliderJntSphElementInit sJntSphElementsInit2[] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 130 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 22, { { 0, 0, 0 }, 110 }, 100 }, @@ -454,7 +454,7 @@ static ColliderJntSphElementInit sJntSphElementsInit2[] = { static ColliderJntSphInit sJntSphInit2 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -467,7 +467,7 @@ static ColliderJntSphInit sJntSphInit2 = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -475,11 +475,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 150, 200, 0, { 0, 0, 0 } }, @@ -1107,8 +1107,8 @@ void func_809DBFB4(Boss02* this, PlayState* play) { } for (i = temp; i < ARRAY_COUNT(this->colliderSphere2Elements); i++) { - if (this->colliderSphere2.elements[i].base.bumperFlags & BUMP_HIT) { - this->colliderSphere2.elements[i].base.bumperFlags &= ~BUMP_HIT; + if (this->colliderSphere2.elements[i].base.acElemFlags & ACELEM_HIT) { + this->colliderSphere2.elements[i].base.acElemFlags &= ~ACELEM_HIT; this->unk_0154 = 15; this->unk_0156 = 15; diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index 92b3c30036..d46641a3ba 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -292,22 +292,22 @@ ActorProfile Boss_03_Profile = { static ColliderJntSphElementInit sHeadJntSphElementsInit[] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { GYORG_LIMB_NONE, { { 0, 0, 0 }, 70 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { GYORG_LIMB_ROOT, { { 0, 0, 0 }, 50 }, 100 }, @@ -316,7 +316,7 @@ static ColliderJntSphElementInit sHeadJntSphElementsInit[] = { static ColliderJntSphInit sHeadJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -331,55 +331,55 @@ static ColliderJntSphInit sHeadJntSphInit = { static ColliderJntSphElementInit sBodyJntSphElementsInit[] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { GYORG_LIMB_HEAD, { { 0, 0, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { GYORG_LIMB_LOWER_TRUNK, { { 0, 0, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { GYORG_LIMB_TAIL, { { 0, 0, 0 }, 70 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { GYORG_LIMB_RIGHT_FIN_ROOT, { { 0, 0, 0 }, 70 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { GYORG_LIMB_UPPER_RIGHT_FIN, { { 0, 0, 0 }, 30 }, 100 }, @@ -388,7 +388,7 @@ static ColliderJntSphElementInit sBodyJntSphElementsInit[] = { static ColliderJntSphInit sBodyJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -1843,16 +1843,16 @@ void Boss03_UpdateCollision(Boss03* this, PlayState* play) { if (this->waterHeight < player->actor.world.pos.y) { for (i = 0; i < ARRAY_COUNT(sHeadJntSphElementsInit); i++) { - if (this->headCollider.elements[i].base.toucherFlags & TOUCH_HIT) { - this->headCollider.elements[i].base.toucherFlags &= ~TOUCH_HIT; + if (this->headCollider.elements[i].base.atElemFlags & ATELEM_HIT) { + this->headCollider.elements[i].base.atElemFlags &= ~ATELEM_HIT; player->pushedYaw = this->actor.shape.rot.y; player->pushedSpeed = 20.0f; } } for (i = 0; i < ARRAY_COUNT(sBodyJntSphElementsInit); i++) { - if (this->bodyCollider.elements[i].base.toucherFlags & TOUCH_HIT) { - this->bodyCollider.elements[i].base.toucherFlags &= ~TOUCH_HIT; + if (this->bodyCollider.elements[i].base.atElemFlags & ATELEM_HIT) { + this->bodyCollider.elements[i].base.atElemFlags &= ~ATELEM_HIT; player->pushedYaw = this->actor.shape.rot.y; player->pushedSpeed = 20.0f; } @@ -1862,16 +1862,16 @@ void Boss03_UpdateCollision(Boss03* this, PlayState* play) { if (this->unk_25C == 0) { if ((this->actionFunc == stunnedActionFunc) && sp4B) { for (i = 0; i < ARRAY_COUNT(sBodyJntSphElementsInit); i++) { - if (this->bodyCollider.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->bodyCollider.elements[i].base.acElemFlags & ACELEM_HIT) { acHitElem = this->bodyCollider.elements[i].base.acHitElem; - this->bodyCollider.elements[i].base.bumperFlags &= ~BUMP_HIT; + this->bodyCollider.elements[i].base.acElemFlags &= ~ACELEM_HIT; this->unk_25C = 15; this->unk_25E = 15; // (DMG_SWORD_BEAM | DMG_SPIN_ATTACK | DMG_ZORA_PUNCH | DMG_ZORA_BARRIER | DMG_DEKU_LAUNCH | // DMG_DEKU_SPIN | DMG_GORON_SPIKES | DMG_SWORD | DMG_GORON_PUNCH | DMG_DEKU_STICK) - phi_v0 = (acHitElem->toucher.dmgFlags & 0x038AC302) - ? this->bodyCollider.elements[i].base.acHitElem->toucher.damage + phi_v0 = (acHitElem->atDmgInfo.dmgFlags & 0x038AC302) + ? this->bodyCollider.elements[i].base.acHitElem->atDmgInfo.damage : 0; phi_v1 = phi_v0; @@ -1895,9 +1895,9 @@ void Boss03_UpdateCollision(Boss03* this, PlayState* play) { } for (i = 0; i < ARRAY_COUNT(sHeadJntSphElementsInit); i++) { - if (this->headCollider.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->headCollider.elements[i].base.acElemFlags & ACELEM_HIT) { acHitElem = this->headCollider.elements[i].base.acHitElem; - this->headCollider.elements[i].base.bumperFlags &= ~BUMP_HIT; + this->headCollider.elements[i].base.acElemFlags &= ~ACELEM_HIT; this->unk_25C = 15; if (this->actionFunc != stunnedActionFunc) { @@ -1919,8 +1919,8 @@ void Boss03_UpdateCollision(Boss03* this, PlayState* play) { // (DMG_SWORD_BEAM | DMG_SPIN_ATTACK | DMG_ZORA_PUNCH | DMG_ZORA_BARRIER | DMG_DEKU_LAUNCH | // DMG_DEKU_SPIN | DMG_GORON_SPIKES | DMG_SWORD | DMG_GORON_PUNCH | DMG_DEKU_STICK) - phi_v0 = (acHitElem->toucher.dmgFlags & 0x038AC302) - ? (this->headCollider.elements[i].base.acHitElem->toucher.damage) + phi_v0 = (acHitElem->atDmgInfo.dmgFlags & 0x038AC302) + ? (this->headCollider.elements[i].base.acHitElem->atDmgInfo.damage) : 0; phi_v1 = phi_v0; @@ -2025,9 +2025,9 @@ void Boss03_Update(Actor* thisx, PlayState* play2) { if (this->actionFunc != Boss03_DeathCutscene) { if ((this->actionFunc == Boss03_Stunned) || (this->actionFunc == Boss03_Damaged)) { - this->bodyCollider.base.colType = COLTYPE_HIT3; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HIT3; } else { - this->bodyCollider.base.colType = COLTYPE_METAL; + this->bodyCollider.base.colMaterial = COL_MATERIAL_METAL; } Boss03_UpdateCollision(this, play); diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.c b/src/overlays/actors/ovl_Boss_04/z_boss_04.c index 71390b5811..5b4efd1610 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -78,11 +78,11 @@ ActorProfile Boss_04_Profile = { static ColliderJntSphElementInit sJntSphElementsInit1[1] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 50 }, 100 }, @@ -91,7 +91,7 @@ static ColliderJntSphElementInit sJntSphElementsInit1[1] = { static ColliderJntSphInit sJntSphInit1 = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -105,11 +105,11 @@ static ColliderJntSphInit sJntSphInit1 = { static ColliderJntSphElementInit sJntSphElementsInit2[1] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 70 }, 100 }, @@ -118,7 +118,7 @@ static ColliderJntSphElementInit sJntSphElementsInit2[1] = { static ColliderJntSphInit sJntSphInit2 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -567,8 +567,8 @@ void func_809ED2A0(Boss04* this, PlayState* play) { void func_809ED45C(Boss04* this, PlayState* play) { u8 damage; - if ((this->unk_1FE == 0) && (this->collider1.elements[0].base.bumperFlags & BUMP_HIT)) { - this->collider1.elements[0].base.bumperFlags &= ~BUMP_HIT; + if ((this->unk_1FE == 0) && (this->collider1.elements[0].base.acElemFlags & ACELEM_HIT)) { + this->collider1.elements[0].base.acElemFlags &= ~ACELEM_HIT; Actor_PlaySfx(&this->actor, NA_SE_EN_ME_DAMAGE); damage = this->actor.colChkInfo.damage; this->actor.colChkInfo.health -= damage; diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c index 8022022d63..49cb9f4f84 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c @@ -108,22 +108,22 @@ typedef enum BioDekuBabaLilyPadWithHeadMovementState { static ColliderJntSphElementInit sLilyPadJntSphElementsInit[] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { BIO_DEKU_BABA_LILY_PAD_LIMB_NONE, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { BIO_DEKU_BABA_LILY_PAD_LIMB_NONE, { { 0, 0, 0 }, 15 }, 100 }, @@ -132,7 +132,7 @@ static ColliderJntSphElementInit sLilyPadJntSphElementsInit[] = { static ColliderJntSphInit sLilyPadJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -147,11 +147,11 @@ static ColliderJntSphInit sLilyPadJntSphInit = { static ColliderJntSphElementInit sHeadJntSphElementsInit[] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { BIO_DEKU_BABA_HEAD_LIMB_NONE, { { 0, 0, 0 }, 20 }, 100 }, @@ -160,7 +160,7 @@ static ColliderJntSphElementInit sHeadJntSphElementsInit[] = { static ColliderJntSphInit sHeadJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -175,11 +175,11 @@ static ColliderJntSphInit sHeadJntSphInit = { static ColliderJntSphElementInit sWalkingHeadJntSphElementsInit[] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7FFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { BIO_DEKU_BABA_HEAD_LIMB_NONE, { { 0, 0, 0 }, 15 }, 100 }, @@ -188,7 +188,7 @@ static ColliderJntSphElementInit sWalkingHeadJntSphElementsInit[] = { static ColliderJntSphInit sWalkingHeadJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -468,7 +468,7 @@ s32 Boss05_LilyPadWithHead_UpdateDamage(Boss05* this, PlayState* play) { s32 i = 0; while (true) { - if (this->lilyPadCollider.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->lilyPadCollider.elements[i].base.acElemFlags & ACELEM_HIT) { switch (this->dyna.actor.colChkInfo.damageEffect) { case BIO_BABA_DMGEFF_FIRE: return BIO_BABA_HEAD_HIT_REACTION_DEATCH + BIO_BABA_DRAW_DMGEFF_STATE_FIRE_INIT; @@ -486,7 +486,7 @@ s32 Boss05_LilyPadWithHead_UpdateDamage(Boss05* this, PlayState* play) { i++; if (i == BIO_BABA_LILY_PAD_COLLIDER_MAX) { - if (this->headCollider.elements[BIO_BABA_HEAD_COLLIDER_HEAD].base.bumperFlags & BUMP_HIT) { + if (this->headCollider.elements[BIO_BABA_HEAD_COLLIDER_HEAD].base.acElemFlags & ACELEM_HIT) { u8 damage = this->dyna.actor.colChkInfo.damage; this->dyna.actor.colChkInfo.health -= damage; @@ -950,10 +950,10 @@ void Boss05_WalkingHead_UpdateDamage(Boss05* this, PlayState* play) { ColliderElement* acHitElem; if ((this->damagedTimer == 0) && - (this->headCollider.elements[BIO_BABA_HEAD_COLLIDER_HEAD].base.bumperFlags & BUMP_HIT)) { - this->headCollider.elements[BIO_BABA_HEAD_COLLIDER_HEAD].base.bumperFlags &= ~BUMP_HIT; + (this->headCollider.elements[BIO_BABA_HEAD_COLLIDER_HEAD].base.acElemFlags & ACELEM_HIT)) { + this->headCollider.elements[BIO_BABA_HEAD_COLLIDER_HEAD].base.acElemFlags &= ~ACELEM_HIT; acHitElem = this->headCollider.elements[BIO_BABA_HEAD_COLLIDER_HEAD].base.acHitElem; - if (acHitElem->toucher.dmgFlags & 0x300000) { // (DMG_NORMAL_SHIELD | DMG_LIGHT_RAY) + if (acHitElem->atDmgInfo.dmgFlags & 0x300000) { // (DMG_NORMAL_SHIELD | DMG_LIGHT_RAY) this->knockbackMagnitude = -12.0f; this->knockbackAngle = this->dyna.actor.yawTowardsPlayer; this->damagedTimer = 6; diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c index 44c175ecbd..0e7d058f3d 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -92,7 +92,7 @@ ActorProfile Boss_06_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -100,11 +100,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7FFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 90, 140, 10, { 0, 0, 0 } }, @@ -184,10 +184,10 @@ void Boss06_UpdateDamage(Boss06* this) { Boss06_SetupCurtainBurningCutscene(this); Audio_PlaySfx(NA_SE_SY_TRE_BOX_APPEAR); - this->arrowHitPos.x = -(this->actor.world.pos.x - this->collider.elem.bumper.hitPos.x); + this->arrowHitPos.x = -(this->actor.world.pos.x - this->collider.elem.acDmgInfo.hitPos.x); this->arrowHitPosScaled.x = this->arrowHitPos.x * 0.35f; - this->arrowHitPos.y = -((this->actor.world.pos.y + 80.0f) - this->collider.elem.bumper.hitPos.y); + this->arrowHitPos.y = -((this->actor.world.pos.y + 80.0f) - this->collider.elem.acDmgInfo.hitPos.y); this->arrowHitPosScaled.y = this->arrowHitPos.y * -0.35f; } } diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/src/overlays/actors/ovl_Boss_07/z_boss_07.c index 3a2ad356f2..c4765d218a 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -249,164 +249,164 @@ ActorProfile Boss_07_Profile = { // static ColliderJntSphElementInit sJntSphElementsInit[11] = { static ColliderJntSphElementInit D_80A07A40[11] = { { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 20 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 30 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 25 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 150 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 150 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 150 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 150 }, }, }; // static ColliderJntSphInit sJntSphInit = { static ColliderJntSphInit D_80A07BCC = { - { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_JNTSPH, }, + { COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_JNTSPH, }, ARRAY_COUNT(sJntSphElementsInit), D_80A07A40, // sJntSphElementsInit, }; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80A07BDC = { - { COLTYPE_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK2, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, + { ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 80, 200, 0, { 0, 0, 0 } }, }; // static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphElementInit D_80A07C08[1] = { { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_HARD, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_HARD, ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 36 }, 200 }, }, }; // static ColliderJntSphInit sJntSphInit = { static ColliderJntSphInit D_80A07C2C = { - { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_JNTSPH, }, + { COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_JNTSPH, }, ARRAY_COUNT(sJntSphElementsInit), D_80A07C08, // sJntSphElementsInit, }; // static ColliderQuadInit sQuadInit = { static ColliderQuadInit D_80A07C3C = { - { COLTYPE_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_QUAD, }, - { ELEMTYPE_UNK2, { 0xF7CFFFFF, 0x04, 0x00 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_QUAD, }, + { ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x00 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; // static ColliderQuadInit sQuadInit = { static ColliderQuadInit D_80A07C8C = { - { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_QUAD, }, - { ELEMTYPE_UNK2, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_QUAD, }, + { ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; // static ColliderJntSphElementInit sJntSphElementsInit[11] = { static ColliderJntSphElementInit D_80A07CDC[11] = { { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 25 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 40 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 0 }, 0 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 150 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 150 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 150 }, }, { - { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CEFFFE, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 150 }, }, }; // static ColliderJntSphInit sJntSphInit = { static ColliderJntSphInit D_80A07E68 = { - { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_JNTSPH, }, + { COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, OC2_TYPE_1, COLSHAPE_JNTSPH, }, ARRAY_COUNT(sJntSphElementsInit), D_80A07CDC, // sJntSphElementsInit, }; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80A07E78 = { - { COLTYPE_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x04, 0x10 }, { 0x00300000, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, }, + { COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, + { ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x10 }, { 0x00300000, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON, OCELEM_ON, }, { 15, 30, -15, { 0, 0, 0 } }, }; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80A07EA4 = { - { COLTYPE_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON | BUMP_HOOKABLE, OCELEM_ON, }, + { COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, + { ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 50, 100, -50, { 0, 0, 0 } }, }; // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80A07ED0 = { - { COLTYPE_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7FFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON | BUMP_HOOKABLE, OCELEM_ON, }, + { COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, + { ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7FFFFFF, 0x00, 0x00 }, ATELEM_ON | ATELEM_SFX_NORMAL, ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 40, 20, 15, { 0, 0, 0 } }, }; diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c index 3728ecbfae..e1d5282c50 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c @@ -116,209 +116,209 @@ ActorProfile Boss_Hakugin_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[GOHT_COLLIDER_BODYPART_MAX] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_HEAD, { { 1300, 200, 0 }, 30 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_THORAX, { { 1400, 300, 0 }, 35 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_PELVIS, { { 1600, -400, 0 }, 26 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_FRONT_RIGHT_UPPER_LEG, { { 1700, 200, 400 }, 18 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_FRONT_RIGHT_LOWER_LEG, { { 1000, 0, 0 }, 10 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_FRONT_RIGHT_HOOF, { { 500, 0, 0 }, 9 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_FRONT_LEFT_UPPER_LEG, { { 1700, 200, -400 }, 18 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_FRONT_LEFT_LOWER_LEG, { { 1000, 0, 0 }, 10 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_FRONT_LEFT_HOOF, { { 500, 0, 0 }, 9 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_BACK_RIGHT_THIGH, { { 800, 0, 400 }, 15 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_BACK_RIGHT_SHIN, { { 500, 200, 0 }, 9 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_BACK_RIGHT_PASTERN, { { 300, 0, 0 }, 8 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_BACK_RIGHT_HOOF, { { 500, 100, 0 }, 9 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_BACK_LEFT_THIGH, { { 800, 0, -400 }, 15 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_BACK_LEFT_SHIN, { { 500, 200, 0 }, 9 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_BACK_LEFT_PASTERN, { { 300, 0, 0 }, 8 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_BACK_LEFT_HOOF, { { 500, 100, 0 }, 9 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_HEAD, { { 2400, -400, -2900 }, 12 }, 270 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_HITMARK, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_HITMARK, OCELEM_ON, }, { GOHT_LIMB_HEAD, { { 2400, -400, 2900 }, 12 }, 270 }, @@ -327,7 +327,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[GOHT_COLLIDER_BODYPART_MAX] static ColliderJntSphInit sJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -341,11 +341,11 @@ static ColliderJntSphInit sJntSphInit = { static ColliderTrisElementInit sTrisElementsInit[1] = { { { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x20000000, 0x03, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_NONE, }, { { { 22.0f, 0.0f, 100.0f }, { 0.0f, 0.0f, -100.0f }, { -22.0f, 0.0f, 100.0f } } }, @@ -354,7 +354,7 @@ static ColliderTrisElementInit sTrisElementsInit[1] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -367,7 +367,7 @@ static ColliderTrisInit sTrisInit = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -375,11 +375,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x20000000, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_NONE, OCELEM_NONE, }, { 1, { { 0, 0, 0 }, 23 }, 100 }, @@ -387,7 +387,7 @@ static ColliderSphereInit sSphereInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -395,11 +395,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x02, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 170, 40, 0, { 0, 0, 0 } }, @@ -1498,9 +1498,9 @@ void BossHakugin_UpdateDrawDmgEffect(BossHakugin* this, PlayState* play, s32 col this->drawDmgEffAlpha = 3.0f; this->drawDmgEffScale = 2.5f; Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, - this->bodyCollider.elements[colliderIndex].base.bumper.hitPos.x, - this->bodyCollider.elements[colliderIndex].base.bumper.hitPos.y, - this->bodyCollider.elements[colliderIndex].base.bumper.hitPos.z, 0, 0, 0, + this->bodyCollider.elements[colliderIndex].base.acDmgInfo.hitPos.x, + this->bodyCollider.elements[colliderIndex].base.acDmgInfo.hitPos.y, + this->bodyCollider.elements[colliderIndex].base.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } else if (this->actor.colChkInfo.damageEffect == GOHT_DMGEFF_FREEZE) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; @@ -1512,9 +1512,9 @@ void BossHakugin_UpdateDrawDmgEffect(BossHakugin* this, PlayState* play, s32 col this->drawDmgEffScale = 2.5f; this->drawDmgEffAlpha = 3.0f; Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, - this->bodyCollider.elements[colliderIndex].base.bumper.hitPos.x, - this->bodyCollider.elements[colliderIndex].base.bumper.hitPos.y, - this->bodyCollider.elements[colliderIndex].base.bumper.hitPos.z, 0, 0, 3, + this->bodyCollider.elements[colliderIndex].base.acDmgInfo.hitPos.x, + this->bodyCollider.elements[colliderIndex].base.acDmgInfo.hitPos.y, + this->bodyCollider.elements[colliderIndex].base.acDmgInfo.hitPos.z, 0, 0, 3, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } } @@ -1617,7 +1617,7 @@ void BossHakugin_FrozenBeforeFight(BossHakugin* this, PlayState* play) { } if ((this->iceCollider.base.acFlags & AC_HIT) && - (this->iceCollider.elem.acHitElem->toucher.dmgFlags == DMG_FIRE_ARROW)) { + (this->iceCollider.elem.acHitElem->atDmgInfo.dmgFlags == DMG_FIRE_ARROW)) { this->iceCollider.base.atFlags &= ~AT_HIT; this->iceCollider.base.acFlags &= ~AC_HIT; this->iceCollider.base.ocFlags1 &= ~OC1_HIT; @@ -2621,7 +2621,7 @@ void BossHakugin_CheckForBodyColliderHit(BossHakugin* this, PlayState* play) { if ((this->bodyCollider.base.atFlags & AT_HIT) && ((this->actionFunc == BossHakugin_Charge) || !(player->stateFlags3 & PLAYER_STATE3_80000))) { if ((this->actionFunc == BossHakugin_Charge) && - (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_HEAD].base.toucherFlags & TOUCH_HIT) && + (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_HEAD].base.atElemFlags & ATELEM_HIT) && !(this->bodyCollider.base.atFlags & AT_BOUNCED) && play->grabPlayer(play, player)) { BossHakugin_SetupThrow(this, play); } else if (player->stateFlags3 & PLAYER_STATE3_1000) { @@ -2656,7 +2656,7 @@ s32 BossHakugin_UpdateDamage(BossHakugin* this, PlayState* play) { s32 i; for (i = 0; i < GOHT_COLLIDER_BODYPART_MAX; i++) { - if (this->bodyCollider.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->bodyCollider.elements[i].base.acElemFlags & ACELEM_HIT) { break; } } @@ -2668,7 +2668,7 @@ s32 BossHakugin_UpdateDamage(BossHakugin* this, PlayState* play) { // DMG_DEKU_NUT | DMG_DEKU_STICK | DMG_ZORA_BOOMERANG | DMG_NORMAL_ARROW | DMG_HOOKSHOT | DMG_ICE_ARROW // | DMG_LIGHT_ARROW | DMG_DEKU_SPIN | DMG_DEKU_BUBBLE | DMG_DEKU_LAUNCH | DMG_ZORA_BARRIER if ((this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) && - (this->bodyCollider.elements[i].base.acHitElem->toucher.dmgFlags & 0x000DB0B3)) { + (this->bodyCollider.elements[i].base.acHitElem->atDmgInfo.dmgFlags & 0x000DB0B3)) { return false; } @@ -2714,7 +2714,7 @@ s32 BossHakugin_UpdateDamage(BossHakugin* this, PlayState* play) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 15); this->damagedSpeedUpCounter += 35; BossHakugin_UpdateDrawDmgEffect(this, play, i); - this->actor.colChkInfo.damage = this->bodyCollider.elements[i].base.acHitElem->toucher.damage; + this->actor.colChkInfo.damage = this->bodyCollider.elements[i].base.acHitElem->atDmgInfo.damage; if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); @@ -2724,19 +2724,19 @@ s32 BossHakugin_UpdateDamage(BossHakugin* this, PlayState* play) { if ((this->actor.colChkInfo.damageEffect == GOHT_DMGEFF_EXPLOSIVE) || ((this->actor.colChkInfo.damageEffect == GOHT_DMGEFF_GORON_SPIKES) && (this->actionFunc != BossHakugin_Charge) && - ((this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_HEAD].base.bumperFlags & BUMP_HIT) || - (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_THORAX].base.bumperFlags & BUMP_HIT) || - (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_PELVIS].base.bumperFlags & BUMP_HIT) || - (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_FRONT_RIGHT_UPPER_LEG].base.bumperFlags & - BUMP_HIT) || - (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_FRONT_LEFT_UPPER_LEG].base.bumperFlags & - BUMP_HIT) || - (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_BACK_RIGHT_THIGH].base.bumperFlags & - BUMP_HIT) || - (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_BACK_LEFT_THIGH].base.bumperFlags & - BUMP_HIT) || - (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_RIGHT_HORN].base.bumperFlags & BUMP_HIT) || - (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_LEFT_HORN].base.bumperFlags & BUMP_HIT)))) { + ((this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_HEAD].base.acElemFlags & ACELEM_HIT) || + (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_THORAX].base.acElemFlags & ACELEM_HIT) || + (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_PELVIS].base.acElemFlags & ACELEM_HIT) || + (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_FRONT_RIGHT_UPPER_LEG].base.acElemFlags & + ACELEM_HIT) || + (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_FRONT_LEFT_UPPER_LEG].base.acElemFlags & + ACELEM_HIT) || + (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_BACK_RIGHT_THIGH].base.acElemFlags & + ACELEM_HIT) || + (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_BACK_LEFT_THIGH].base.acElemFlags & + ACELEM_HIT) || + (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_RIGHT_HORN].base.acElemFlags & ACELEM_HIT) || + (this->bodyCollider.elements[GOHT_COLLIDER_BODYPART_LEFT_HORN].base.acElemFlags & ACELEM_HIT)))) { BossHakugin_SetupDowned(this); } else if ((this->electricBallState == GOHT_ELECTRIC_BALL_STATE_NONE) && (this->electricBallCount == 0) && (this->actionFunc == BossHakugin_Run) && @@ -2759,9 +2759,9 @@ s32 BossHakugin_UpdateDamage(BossHakugin* this, PlayState* play) { Vec3f hitPos; ColliderElement* elem = &this->bodyCollider.elements[j].base; - if ((elem->bumperFlags & BUMP_HIT) && (elem->acHitElem != NULL) && - !(elem->acHitElem->toucherFlags & TOUCH_SFX_NONE)) { - Math_Vec3s_ToVec3f(&hitPos, &elem->bumper.hitPos); + if ((elem->acElemFlags & ACELEM_HIT) && (elem->acHitElem != NULL) && + !(elem->acHitElem->atElemFlags & ATELEM_SFX_NONE)) { + Math_Vec3s_ToVec3f(&hitPos, &elem->acDmgInfo.hitPos); EffectSsHitmark_SpawnFixedScale(play, EFFECT_HITMARK_METAL, &hitPos); CollisionCheck_SpawnShieldParticlesMetalSound(play, &hitPos, &this->actor.projectedPos); break; @@ -3788,18 +3788,18 @@ void BossHakugin_UpdateCrushingRocksCollision(BossHakugin* this) { jntSphElem->dim.worldSphere.center.y = crushingRock->pos.y; jntSphElem->dim.worldSphere.center.z = crushingRock->pos.z; jntSphElem->dim.worldSphere.radius = crushingRock->scale * 3000.0f; - jntSphElem->base.bumper.dmgFlags = 0xF3CFBBFF; - jntSphElem->base.bumperFlags &= ~BUMP_NO_HITMARK; - jntSphElem->base.elemType = ELEMTYPE_UNK0; + jntSphElem->base.acDmgInfo.dmgFlags = 0xF3CFBBFF; + jntSphElem->base.acElemFlags &= ~ACELEM_NO_HITMARK; + jntSphElem->base.elemMaterial = ELEM_MATERIAL_UNK0; } // This for-loop will update the collider for GOHT_COLLIDER_BODYPART_LEFT_HORN. for (; i < ARRAY_COUNT(this->bodyColliderElements); i++) { - this->bodyCollider.elements[i].base.bumperFlags &= ~BUMP_ON; + this->bodyCollider.elements[i].base.acElemFlags &= ~ACELEM_ON; this->bodyCollider.elements[i].base.ocElemFlags &= ~OCELEM_ON; } - this->bodyCollider.base.colType = COLTYPE_HARD; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HARD; } /** diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c index 1c7eb0d8d8..093efdd49c 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -165,7 +165,7 @@ ActorProfile Dm_Stk_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -173,11 +173,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 14, 38, 0, { 0, 0, 0 } }, @@ -1102,10 +1102,10 @@ void DmStk_Init(Actor* thisx, PlayState* play) { } if (gSaveContext.save.saveInfo.inventory.items[SLOT_OCARINA] == ITEM_NONE) { - sCylinderInit.base.colType = COLTYPE_WOOD; + sCylinderInit.base.colMaterial = COL_MATERIAL_WOOD; this->actionFunc = DmStk_ClockTower_StartIntroCutsceneVersion1; } else { - sCylinderInit.base.colType = COLTYPE_WOOD; + sCylinderInit.base.colMaterial = COL_MATERIAL_WOOD; this->actionFunc = DmStk_ClockTower_StartIntroCutsceneVersion2; } @@ -1120,7 +1120,7 @@ void DmStk_Init(Actor* thisx, PlayState* play) { } this->actor.world.pos.y = 120.0f; - sCylinderInit.base.colType = COLTYPE_WOOD; + sCylinderInit.base.colMaterial = COL_MATERIAL_WOOD; this->actionFunc = DmStk_ClockTower_Idle; } else { this->animIndex = SK_ANIM_FLOATING_ARMS_CROSSED; @@ -1130,7 +1130,7 @@ void DmStk_Init(Actor* thisx, PlayState* play) { this->dekuPipesCutsceneState = SK_DEKU_PIPES_CS_STATE_READY; this->animIndex = SK_ANIM_FLOATING_ARMS_CROSSED; this->actor.world.pos.y = 120.0f; - sCylinderInit.base.colType = COLTYPE_WOOD; + sCylinderInit.base.colMaterial = COL_MATERIAL_WOOD; this->actionFunc = DmStk_ClockTower_Idle; } diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 474ecdb13d..27d1c2ea29 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -34,7 +34,7 @@ ActorProfile Door_Ana_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -42,11 +42,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 50, 10, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.c b/src/overlays/actors/ovl_En_Ah/z_en_ah.c index c3396ce94b..b9efb9f9c7 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.c +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -65,7 +65,7 @@ ActorProfile En_Ah_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -73,11 +73,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 10, 68, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c index 7e2db28fcb..29d35dd8fb 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -45,18 +45,18 @@ ActorProfile En_Akindonuts_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 27, 32, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.c b/src/overlays/actors/ovl_En_Al/z_en_al.c index d0a1978bd3..17e67587cd 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -389,7 +389,7 @@ ActorProfile En_Al_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -397,11 +397,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 14, 62, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 030cad2d0e..7b452634b4 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -50,7 +50,7 @@ ActorProfile En_Am_Profile = { static ColliderCylinderInit sEnemyCylinderInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -58,11 +58,11 @@ static ColliderCylinderInit sEnemyCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0x81C2C788, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 23, 98, 0, { 0, 0, 0 } }, @@ -70,7 +70,7 @@ static ColliderCylinderInit sEnemyCylinderInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -78,11 +78,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x760D3877, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 23, 98, 0, { 0, 0, 0 } }, @@ -180,8 +180,8 @@ void func_808AFF9C(EnAm* this) { f32 endFrame = Animation_GetLastFrame(&gArmosPushedBackAnim); Animation_Change(&this->skelAnime, &gArmosPushedBackAnim, 0.0f, endFrame, endFrame, ANIMMODE_LOOP, 0.0f); - this->enemyCollider.elem.bumper.dmgFlags = 0x80000088; - this->interactCollider.elem.bumper.dmgFlags = 0x77CFFF77; + this->enemyCollider.elem.acDmgInfo.dmgFlags = 0x80000088; + this->interactCollider.elem.acDmgInfo.dmgFlags = 0x77CFFF77; if (this->actor.colChkInfo.health != 0) { this->enemyCollider.base.atFlags &= ~AT_ON; } @@ -221,8 +221,8 @@ void EnAm_ApplyEnemyTexture(EnAm* this, PlayState* play) { if (this->textureBlend + 20 >= 255) { this->textureBlend = 255; this->actor.flags |= ACTOR_FLAG_TARGETABLE; - this->enemyCollider.elem.bumper.dmgFlags = 0x81C2C788; - this->interactCollider.elem.bumper.dmgFlags = 0x760D3877; + this->enemyCollider.elem.acDmgInfo.dmgFlags = 0x81C2C788; + this->interactCollider.elem.acDmgInfo.dmgFlags = 0x760D3877; this->enemyCollider.base.atFlags |= AT_ON; this->actor.shape.yOffset = 0.0f; func_808B0358(this); @@ -458,9 +458,9 @@ s32 EnAm_UpdateDamage(EnAm* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 0x4) { this->drawDmgEffScale = 0.7f; this->drawDmgEffAlpha = 4.0f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->enemyCollider.elem.bumper.hitPos.x, - this->enemyCollider.elem.bumper.hitPos.y, this->enemyCollider.elem.bumper.hitPos.z, 0, 0, 0, - CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->enemyCollider.elem.acDmgInfo.hitPos.x, + this->enemyCollider.elem.acDmgInfo.hitPos.y, this->enemyCollider.elem.acDmgInfo.hitPos.z, 0, 0, + 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } EnAm_TakeDamage(this, play); return true; diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index d17d6151d7..b9fd4a77b9 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -850,7 +850,7 @@ ActorProfile En_An_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -858,11 +858,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 14, 62, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index f471b3dc63..7174b04d76 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -55,7 +55,7 @@ ActorProfile En_Ani_Profile = { // two different colliders, but only one init for both static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -63,11 +63,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c index aacf07e33f..7add0d3bf3 100644 --- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c @@ -72,7 +72,7 @@ static AnimationInfo sAnimationInfo[EN_AOB01_ANIM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -80,11 +80,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index ffa46af0a0..46b05c5409 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -37,7 +37,7 @@ ActorProfile En_Arrow_Profile = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -45,11 +45,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000020, 0x00, 0x02 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_NEAREST | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -151,16 +151,16 @@ void EnArrow_Init(Actor* thisx, PlayState* play) { Collider_SetQuad(play, &this->collider, &this->actor, &sQuadInit); if (ARROW_IS_ARROW(this->actor.params)) { - this->collider.elem.toucherFlags &= ~(TOUCH_SFX_WOOD | TOUCH_SFX_HARD); - this->collider.elem.toucherFlags |= 0; + this->collider.elem.atElemFlags &= ~(ATELEM_SFX_WOOD | ATELEM_SFX_HARD); + this->collider.elem.atElemFlags |= 0; } if (this->actor.params < ARROW_TYPE_NORMAL_LIT) { this->collider.base.atFlags = (AT_TYPE_ENEMY | AT_ON); } else { - this->collider.elem.toucher.dmgFlags = Actor_GetArrowDmgFlags(this->actor.params); + this->collider.elem.atDmgInfo.dmgFlags = Actor_GetArrowDmgFlags(this->actor.params); if (this->actor.params == ARROW_TYPE_DEKU_NUT) { - this->collider.elem.toucher.damage = 1; + this->collider.elem.atDmgInfo.damage = 1; } if (this->actor.params == ARROW_TYPE_DEKU_BUBBLE) { @@ -351,7 +351,7 @@ void func_8088AA98(EnArrow* this, PlayState* play) { } this->actor.params = ARROW_TYPE_NORMAL; - this->collider.elem.toucher.dmgFlags = 0x20; + this->collider.elem.atDmgInfo.dmgFlags = 0x20; if (this->actor.child != NULL) { Actor_Kill(this->actor.child); @@ -380,7 +380,7 @@ void func_8088ACE0(EnArrow* this, PlayState* play) { ((this->actor.params == ARROW_TYPE_DEKU_BUBBLE) && ((this->unk_262 != 0) || (phi_a2 = (this->collider.base.atFlags & AT_HIT) != 0)))) { if (this->actor.params == ARROW_TYPE_DEKU_BUBBLE) { - if (phi_a2 && (this->collider.elem.atHitElem->elemType != ELEMTYPE_UNK4) && + if (phi_a2 && (this->collider.elem.atHitElem->elemMaterial != ELEM_MATERIAL_UNK4) && (this->collider.base.atFlags & AT_BOUNCED)) { if ((this->collider.base.at != NULL) && (this->collider.base.at->id != ACTOR_OBJ_SYOKUDAI)) { Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.prevPos); @@ -434,7 +434,7 @@ void func_8088ACE0(EnArrow* this, PlayState* play) { } else { EffectSsHitmark_SpawnCustomScale(play, EFFECT_HITMARK_WHITE, 150, &this->actor.world.pos); - if (sp50 && (this->collider.elem.atHitElem->elemType != ELEMTYPE_UNK4)) { + if (sp50 && (this->collider.elem.atHitElem->elemMaterial != ELEM_MATERIAL_UNK4)) { sp7C = this->collider.base.at; if ((sp7C->update != NULL) && !(this->collider.base.atFlags & AT_BOUNCED) && diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c index 1b90f33dee..1f4d9169c0 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -108,7 +108,7 @@ ActorProfile En_Az_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -116,11 +116,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 46, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c index 3e9642383f..74053e31cc 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -75,7 +75,7 @@ static AnimationInfo sAnimationInfo[BOMB_SHOP_LADY_ANIM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -83,11 +83,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index ec2f3225bf..b95c626359 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -57,11 +57,11 @@ ActorProfile En_Baguo_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 0 }, 1 }, @@ -70,7 +70,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -357,7 +357,7 @@ void EnBaguo_CheckForDetonation(EnBaguo* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; Actor_SetScale(&this->actor, 0.0f); this->collider.elements[0].dim.scale = 3.0f; - this->collider.elements[0].base.toucher.damage = 8; + this->collider.elements[0].base.atDmgInfo.damage = 8; Item_DropCollectibleRandom(play, NULL, &this->actor.world.pos, 0xB0); this->actionFunc = EnBaguo_PostDetonation; } diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c index b262e6ebdb..01aa61e86d 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -37,7 +37,7 @@ ActorProfile En_Baisen_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -45,11 +45,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 20, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.c b/src/overlays/actors/ovl_En_Bal/z_en_bal.c index 9523cdc0d9..e5f065bba3 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.c +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c @@ -142,11 +142,11 @@ static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 0, 0, 0, MASS_IMMOVABLE }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { TINGLE_LIMB_BALLOON, { { 2400, 0, 0 }, 50 }, 100 }, @@ -155,7 +155,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c index edb9d8dc7e..f7cb530312 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -43,7 +43,7 @@ ActorProfile En_Bat_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -51,11 +51,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, @@ -331,8 +331,8 @@ void EnBat_SetupDie(EnBat* this, PlayState* play) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.45f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_SMALL_LIGHT_RAYS)); } else if (this->actor.colChkInfo.damageEffect == BAD_BAT_DMGEFF_FIRE) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 0c2ceb0a7b..b544f46eaa 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -50,7 +50,7 @@ ActorProfile En_Bb_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -58,11 +58,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 20 }, 100 }, @@ -505,7 +505,7 @@ void EnBb_UpdateDamage(EnBb* this, PlayState* play) { this->collider.base.atFlags &= ~(AT_HIT | AT_BOUNCED); this->collider.base.atFlags &= ~AT_ON; if ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->collider.elem.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + !(this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { Actor_SetDropFlag(&this->actor, &this->collider.elem); this->flameScaleY = 0.0f; this->flameScaleX = 0.0f; @@ -533,8 +533,8 @@ void EnBb_UpdateDamage(EnBb* this, PlayState* play) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.4f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_SMALL_LIGHT_RAYS)); } } diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c index dad46c6927..7a279fc5c9 100644 --- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c @@ -42,7 +42,7 @@ ActorProfile En_Bba_01_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -50,11 +50,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index e1f779cf7d..79a7dfcdd9 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -51,33 +51,33 @@ ActorProfile En_Bbfall_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[3] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x01, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x01, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_NONE, OCELEM_NONE, }, { 0, { { 0, 0, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x01, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_NONE, OCELEM_NONE, }, { 0, { { 0, 0, 0 }, 20 }, 100 }, @@ -86,7 +86,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[3] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -234,15 +234,15 @@ void EnBbfall_CheckForWall(EnBbfall* this) { } void EnBbfall_EnableColliders(EnBbfall* this) { - this->collider.elements[0].base.toucher.effect = ELEMTYPE_UNK1; // Fire - this->collider.elements[1].base.toucherFlags |= TOUCH_ON; - this->collider.elements[2].base.toucherFlags |= TOUCH_ON; + this->collider.elements[0].base.atDmgInfo.effect = ELEM_MATERIAL_UNK1; // Fire + this->collider.elements[1].base.atElemFlags |= ATELEM_ON; + this->collider.elements[2].base.atElemFlags |= ATELEM_ON; } void EnBbfall_DisableColliders(EnBbfall* this) { - this->collider.elements[0].base.toucher.effect = ELEMTYPE_UNK0; // Nothing - this->collider.elements[1].base.toucherFlags &= ~TOUCH_ON; - this->collider.elements[2].base.toucherFlags &= ~TOUCH_ON; + this->collider.elements[0].base.atDmgInfo.effect = ELEM_MATERIAL_UNK0; // Nothing + this->collider.elements[1].base.atElemFlags &= ~ATELEM_ON; + this->collider.elements[2].base.atElemFlags &= ~ATELEM_ON; } void EnBbfall_SetupWaitForPlayer(EnBbfall* this) { @@ -524,7 +524,7 @@ void EnBbfall_UpdateDamage(EnBbfall* this, PlayState* play) { this->collider.base.atFlags &= ~(AT_HIT | AT_BOUNCED); this->collider.base.atFlags &= ~AT_ON; if ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + !(this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { Actor_SetDropFlagJntSph(&this->actor, &this->collider); this->flameOpacity = 0; this->flameScaleY = 0.0f; @@ -554,9 +554,10 @@ void EnBbfall_UpdateDamage(EnBbfall* this, PlayState* play) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.4f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elements[0].base.bumper.hitPos.x, - this->collider.elements[0].base.bumper.hitPos.y, - this->collider.elements[0].base.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, + this->collider.elements[0].base.acDmgInfo.hitPos.x, + this->collider.elements[0].base.acDmgInfo.hitPos.y, + this->collider.elements[0].base.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_SMALL_LIGHT_RAYS)); } } diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.c b/src/overlays/actors/ovl_En_Bee/z_en_bee.c index e0a16fa7ac..386f35814f 100644 --- a/src/overlays/actors/ovl_En_Bee/z_en_bee.c +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.c @@ -71,7 +71,7 @@ static DamageTable sDamageTable = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON, @@ -79,11 +79,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x08, 0x02 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 6, 13, -4, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 6d5b40eb97..e49f9d6c3d 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -45,7 +45,7 @@ ActorProfile En_Bigokuta_Profile = { static ColliderCylinderInit sShellCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -53,11 +53,11 @@ static ColliderCylinderInit sShellCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFC74F, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 75, 125, 0, { 0, 0, 0 } }, @@ -65,7 +65,7 @@ static ColliderCylinderInit sShellCylinderInit = { static ColliderCylinderInit sBodyCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -73,11 +73,11 @@ static ColliderCylinderInit sBodyCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x000038B0, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 70, 125, 0, { 0, 0, 0 } }, @@ -490,18 +490,18 @@ void EnBigokuta_CheckOneHitKill(EnBigokuta* this, PlayState* play) { Enemy_StartFinishingBlow(play, &this->picto.actor); if (this->bodyCollider.base.acFlags & AC_HIT) { - if (this->bodyCollider.elem.acHitElem->toucher.dmgFlags & 0x1000) { // Ice Arrow + if (this->bodyCollider.elem.acHitElem->atDmgInfo.dmgFlags & 0x1000) { // Ice Arrow this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; this->drawDmgEffScale = 1.2f; this->drawDmgEffFrozenSteamScale = 1800.0f * 0.001f; this->drawDmgEffAlpha = 1.0f; - } else if (this->bodyCollider.elem.acHitElem->toucher.dmgFlags & 0x2000) { // Light Arrow + } else if (this->bodyCollider.elem.acHitElem->atDmgInfo.dmgFlags & 0x2000) { // Light Arrow this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; this->drawDmgEffScale = 1.2f; this->drawDmgEffAlpha = 4.0f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->bodyCollider.elem.bumper.hitPos.x, - this->bodyCollider.elem.bumper.hitPos.y, this->bodyCollider.elem.bumper.hitPos.z, 0, 0, 0, - CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->bodyCollider.elem.acDmgInfo.hitPos.x, + this->bodyCollider.elem.acDmgInfo.hitPos.y, this->bodyCollider.elem.acDmgInfo.hitPos.z, 0, + 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } } diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c index 8c46a76165..a4678960cf 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -60,7 +60,7 @@ ActorProfile En_Bigpamet_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -68,11 +68,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CF7FFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 53, 50, 0, { 0, 0, 0 } }, @@ -484,7 +484,7 @@ void func_80A2866C(EnBigpamet* this, PlayState* play) { } void func_80A286C0(EnBigpamet* this) { - this->collider.elem.bumper.dmgFlags = 0xF7CF7FFF; + this->collider.elem.acDmgInfo.dmgFlags = 0xF7CF7FFF; this->collider.base.atFlags |= AT_ON; this->actor.shape.rot.z = 0x680; this->unk_29E = 15; @@ -563,7 +563,7 @@ void func_80A28970(EnBigpamet* this) { Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_CUTTER_OFF); this->actor.shape.rot.z = 0; this->collider.base.atFlags &= ~AT_ON; - this->collider.elem.bumper.dmgFlags = 0xF7CFFFFF; + this->collider.elem.acDmgInfo.dmgFlags = 0xF7CFFFFF; this->actor.speed = 0.0f; this->actionFunc = func_80A289C8; } @@ -616,7 +616,7 @@ void func_80A28B98(EnBigpamet* this, PlayState* play) { Animation_PlayLoop(&this->snapperSkelAnime, &gSnapperDeathAnim); this->collider.base.atFlags &= ~AT_ON; - this->collider.elem.bumper.dmgFlags = 0xF7CFFFFF; + this->collider.elem.acDmgInfo.dmgFlags = 0xF7CFFFFF; this->collider.base.atFlags &= ~(AT_HIT | AT_BOUNCED); this->collider.base.acFlags &= ~AC_ON; diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index a0c2a6ed6f..9a7cf37b27 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -97,7 +97,7 @@ ActorProfile En_Bigpo_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE | AT_TYPE_ENEMY, AC_NONE | AC_TYPE_PLAYER, OC1_NONE | OC1_TYPE_ALL, @@ -105,11 +105,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 35, 100, 10, { 0, 0, 0 } }, @@ -581,9 +581,9 @@ void EnBigpo_IdleFlying(EnBigpo* this, PlayState* play) { } void EnBigpo_SetupSpinUp(EnBigpo* this) { - this->collider.base.colType = COLTYPE_METAL; + this->collider.base.colMaterial = COL_MATERIAL_METAL; this->collider.base.acFlags |= AC_HARD; - this->collider.elem.bumper.dmgFlags &= ~0x8000; + this->collider.elem.acDmgInfo.dmgFlags &= ~0x8000; this->collider.base.atFlags |= AT_ON; this->angularVelocity = 0x800; this->actionFunc = EnBigpo_SpinningUp; @@ -614,7 +614,7 @@ void EnBigpo_SpinAttack(EnBigpo* this, PlayState* play) { Math_SmoothStepToF(&this->actor.world.pos.y, player->actor.world.pos.y, 0.3f, 7.5f, 1.0f); EnBigpo_UpdateSpin(this); yawDiff = this->actor.yawTowardsPlayer - this->actor.world.rot.y; - // because acFlags AC_HARD and COLTYPE_METAL, if we hit it means we contacted as attack + // because acFlags AC_HARD and COL_MATERIAL_METAL, if we hit it means we contacted as attack if ((this->collider.base.atFlags & AT_HIT) || ((ABS_ALT(yawDiff) > 0x4000) && (this->actor.xzDistToPlayer > 50.0f))) { // hit the player OR the poe has missed and flew past player @@ -638,9 +638,9 @@ void EnBigpo_SpinningDown(EnBigpo* this, PlayState* play) { Math_StepToF(&this->actor.speed, 0.0f, 0.2f); if (Math_ScaledStepToS(&this->angularVelocity, 0, 0x200)) { // spin down complete, re-allow hittable - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; - this->collider.elem.bumper.dmgFlags |= 0x8000; + this->collider.elem.acDmgInfo.dmgFlags |= 0x8000; EnBigpo_SetupIdleFlying(this); } EnBigpo_UpdateSpin(this); @@ -1143,8 +1143,8 @@ s32 EnBigpo_ApplyDamage(EnBigpo* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 4) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 1.0f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } EnBigpo_HitStun(this); diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index 78acfbaaca..ee17eab273 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -226,7 +226,7 @@ ActorProfile En_Bigslime_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_NO_PUSH | OC1_TYPE_ALL, @@ -234,11 +234,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 30, 60, 0, { 0, 0, 0 } }, @@ -333,8 +333,8 @@ void EnBigslime_Init(Actor* thisx, PlayState* play2) { this->bigslimeCollider[0].base.atFlags &= ~AT_ON; Collider_InitAndSetCylinder(play, &this->gekkoCollider, &this->actor, &sCylinderInit); - this->gekkoCollider.base.colType = COLTYPE_HIT6; - this->gekkoCollider.elem.elemType = ELEMTYPE_UNK1; + this->gekkoCollider.base.colMaterial = COL_MATERIAL_HIT6; + this->gekkoCollider.elem.elemMaterial = ELEM_MATERIAL_UNK1; this->gekkoCollider.base.atFlags &= ~AT_ON; this->gekkoCollider.base.ocFlags1 &= ~OC1_NO_PUSH; this->actor.params = CLAMP(this->actor.params, 1, 4); @@ -908,8 +908,8 @@ void EnBigslime_GekkoSfxInsideBigslime(EnBigslime* this, u16 sfxId) { void EnBigslime_GekkoFreeze(EnBigslime* this) { this->gekkoDrawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; - this->gekkoCollider.base.colType = COLTYPE_HIT3; - this->gekkoCollider.elem.elemType = ELEMTYPE_UNK0; + this->gekkoCollider.base.colMaterial = COL_MATERIAL_HIT3; + this->gekkoCollider.elem.elemMaterial = ELEM_MATERIAL_UNK0; this->stunTimer = 2; this->gekkoDrawDmgEffScale = 0.75f; this->gekkoDrawDmgEffFrozenSteamScale = 1.125f; @@ -920,8 +920,8 @@ void EnBigslime_GekkoFreeze(EnBigslime* this) { void EnBigslime_GekkoThaw(EnBigslime* this, PlayState* play) { if (this->gekkoDrawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->gekkoDrawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->gekkoCollider.base.colType = COLTYPE_HIT6; - this->gekkoCollider.elem.elemType = ELEMTYPE_UNK1; + this->gekkoCollider.base.colMaterial = COL_MATERIAL_HIT6; + this->gekkoCollider.elem.elemMaterial = ELEM_MATERIAL_UNK1; this->gekkoDrawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->gekkoBodyPartsPos, GEKKO_BODYPART_MAX, 2, 0.3f, 0.2f); this->actor.flags |= ACTOR_FLAG_200; @@ -2620,7 +2620,7 @@ void EnBigslime_ApplyDamageEffectGekko(EnBigslime* this, PlayState* play) { if (this->gekkoCollider.base.acFlags & AC_HIT) { this->gekkoCollider.base.acFlags &= ~AC_HIT; if ((this->gekkoDrawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->gekkoCollider.elem.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + !(this->gekkoCollider.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { EnBigslime_EndThrowMinislime(this); if (this->actor.colChkInfo.damageEffect != BIGSLIME_DMGEFF_HOOKSHOT) { if (Actor_ApplyDamage(&this->actor) == 0) { @@ -2637,10 +2637,11 @@ void EnBigslime_ApplyDamageEffectGekko(EnBigslime* this, PlayState* play) { this->gekkoDrawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; } else { this->gekkoDrawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn( - &play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->gekkoCollider.elem.bumper.hitPos.x, - this->gekkoCollider.elem.bumper.hitPos.y, this->gekkoCollider.elem.bumper.hitPos.z, 0, - 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, + this->gekkoCollider.elem.acDmgInfo.hitPos.x, + this->gekkoCollider.elem.acDmgInfo.hitPos.y, + this->gekkoCollider.elem.acDmgInfo.hitPos.z, 0, 0, 0, + CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } } else if (this->actor.colChkInfo.damageEffect == BIGSLIME_DMGEFF_ICE) { EnBigslime_GekkoFreeze(this); @@ -2672,10 +2673,11 @@ void EnBigslime_ApplyDamageEffectGekko(EnBigslime* this, PlayState* play) { this->gekkoDrawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; } else { this->gekkoDrawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn( - &play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->gekkoCollider.elem.bumper.hitPos.x, - this->gekkoCollider.elem.bumper.hitPos.y, this->gekkoCollider.elem.bumper.hitPos.z, 0, - 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, + this->gekkoCollider.elem.acDmgInfo.hitPos.x, + this->gekkoCollider.elem.acDmgInfo.hitPos.y, + this->gekkoCollider.elem.acDmgInfo.hitPos.z, 0, 0, 0, + CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } } EnBigslime_SetupDamageGekko(this, true); diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c index 37a3fc5a3e..5344834d3c 100644 --- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c @@ -38,7 +38,7 @@ ActorProfile En_Bji_01_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c index 9b8a311d69..f59371315e 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c @@ -99,7 +99,7 @@ ActorProfile En_Bjt_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -107,11 +107,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 10, 68, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 460937385a..84ffbd0521 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -50,7 +50,7 @@ static f32 enBomScales[] = { 0.01f, 0.03f }; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER, OC1_ON | OC1_TYPE_ALL, @@ -58,11 +58,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x00013828, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 6, 11, 14, { 0, 0, 0 } }, @@ -71,11 +71,11 @@ static ColliderCylinderInit sCylinderInit = { static ColliderJntSphElementInit sJntSphElementsInit1[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000008, 0x00, 0x02 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_NONE, }, { 0, { { 0, 0, 0 }, 0 }, 100 }, @@ -84,7 +84,7 @@ static ColliderJntSphElementInit sJntSphElementsInit1[1] = { static ColliderJntSphInit sJntSphInit1 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_ALL, AC_NONE, OC1_NONE, @@ -98,11 +98,11 @@ static ColliderJntSphInit sJntSphInit1 = { static ColliderJntSphElementInit sJntSphElementsInit2[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x80000008, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_NONE, }, { 0, { { 0, 0, 0 }, 0 }, 100 }, @@ -111,7 +111,7 @@ static ColliderJntSphElementInit sJntSphElementsInit2[1] = { static ColliderJntSphInit sJntSphInit2 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_ALL, AC_NONE, OC1_NONE, @@ -162,7 +162,7 @@ void EnBom_Init(Actor* thisx, PlayState* play) { func_80872648(play, &this->actor.world.pos); } - this->collider2Elements[0].base.toucher.damage += ENBOM_GET_FF00(thisx); + this->collider2Elements[0].base.atDmgInfo.damage += ENBOM_GET_FF00(thisx); this->actor.shape.rot.z &= 0xFF; if (ENBOM_GET_80(&this->actor)) { this->actor.shape.rot.z |= 0xFF00; diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 397ac74a5d..809c72c639 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -39,7 +39,7 @@ ActorProfile En_Bom_Chu_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_1 | OC1_TYPE_2, @@ -47,11 +47,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 13 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c index 59773d8e4c..2a1ffc6b71 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -40,7 +40,7 @@ ActorProfile En_Bombal_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -48,11 +48,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x004138B0, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 60, 90, -50, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c index bf5bb3196d..5e764fd35b 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -38,7 +38,7 @@ ActorProfile En_Bombers_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 10, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index 4614c34387..9a1ff976db 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -40,7 +40,7 @@ static u16 sTextIds[] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -48,11 +48,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 35, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 7724d048ca..47f4714ac8 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -39,7 +39,7 @@ ActorProfile En_Bombf_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER, OC1_ON | OC1_TYPE_ALL, @@ -47,11 +47,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x00013A28, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 9, 18, 10, { 0, 0, 0 } }, @@ -60,11 +60,11 @@ static ColliderCylinderInit sCylinderInit = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000008, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_NONE, }, { 0, { { 0, 0, 0 }, 0 }, 100 }, @@ -73,7 +73,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ALL, AC_NONE, OC1_NONE, @@ -167,8 +167,8 @@ void func_808AEAE0(EnBombf* this, PlayState* play) { player->stateFlags1 &= ~PLAYER_STATE1_CARRYING_ACTOR; } } else if ((this->colliderCylinder.base.acFlags & AC_HIT) && - ((this->colliderCylinder.elem.acHitElem->toucher.dmgFlags & 0x13828) || - ((this->colliderCylinder.elem.acHitElem->toucher.dmgFlags & 0x200) && + ((this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags & 0x13828) || + ((this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags & 0x200) && (player->transformation == PLAYER_FORM_GORON) && (player->actor.speed > 15.0f)))) { this->colliderCylinder.base.acFlags &= ~AC_HIT; if (this->colliderCylinder.base.ac->category != ACTORCAT_BOSS) { diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c index 8e20c1edb4..7fcaf2dc2e 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -67,7 +67,7 @@ ActorProfile En_Bomjima_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -75,11 +75,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 10, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c index 00308ba6f8..7f113f9694 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -53,7 +53,7 @@ ActorProfile En_Bomjimb_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -61,11 +61,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 4565d3cffa..3f56357422 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -33,7 +33,7 @@ ActorProfile En_Boom_Profile = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -41,11 +41,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000010, 0x00, 0x02 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_NEAREST | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index 81cf2cb3e6..30ecef9d5d 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -67,77 +67,77 @@ f32 D_80C0F8D0 = 0.0f; static ColliderJntSphElementInit sJntSphElementsInit[7] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 10, { { 1000, 400, 0 }, 40 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 9, { { 0, 700, 200 }, 35 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 6, { { 100, 600, 0 }, 35 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 3, { { 400, 200, 0 }, 40 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 13, { { 700, -100, 0 }, 35 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 16, { { 200, 300, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 19, { { 200, 300, 0 }, 30 }, 100 }, @@ -146,7 +146,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[7] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -528,10 +528,10 @@ void func_80C0BF2C(EnBsb* this) { this->collider.elements[0].dim.modelSphere.radius = 110; this->collider.elements[0].dim.modelSphere.center.x = 300; this->collider.elements[0].dim.modelSphere.center.y = 400; - this->collider.base.colType = COLTYPE_HARD; + this->collider.base.colMaterial = COL_MATERIAL_HARD; for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) { - this->collider.elements[i].base.elemType = ELEMTYPE_UNK2; + this->collider.elements[i].base.elemMaterial = ELEM_MATERIAL_UNK2; } this->actor.flags |= ACTOR_FLAG_LOCK_ON_DISABLED; @@ -570,10 +570,10 @@ void func_80C0C0F4(EnBsb* this, PlayState* play) { this->collider.elements[0].dim.modelSphere.radius = 40; this->collider.elements[0].dim.modelSphere.center.x = 1000; this->collider.elements[0].dim.modelSphere.center.y = 400; - this->collider.base.colType = COLTYPE_NONE; + this->collider.base.colMaterial = COL_MATERIAL_NONE; for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) { - this->collider.elements[i].base.elemType = ELEMTYPE_UNK0; + this->collider.elements[i].base.elemMaterial = ELEM_MATERIAL_UNK0; } this->unk_02AE = false; @@ -886,9 +886,9 @@ void func_80C0CDE4(EnBsb* this, PlayState* play) { f32 dy; f32 dz; - hitPos.x = this->collider.elements[1].base.bumper.hitPos.x; - hitPos.y = this->collider.elements[1].base.bumper.hitPos.y; - hitPos.z = this->collider.elements[1].base.bumper.hitPos.z; + hitPos.x = this->collider.elements[1].base.acDmgInfo.hitPos.x; + hitPos.y = this->collider.elements[1].base.acDmgInfo.hitPos.y; + hitPos.z = this->collider.elements[1].base.acDmgInfo.hitPos.z; dx = hitPos.x - player->actor.world.pos.x; dy = hitPos.y - player->actor.world.pos.y; @@ -1425,8 +1425,8 @@ void func_80C0E618(EnBsb* this, PlayState* play) { if ((this->unk_02B4 != 0) && (this->unk_02B4 != 1) && (this->unk_02B4 != 9) && (this->unk_02B4 != 12) && (this->unk_02B4 != 13) && (this->unk_02B4 != 5) && ((this->unk_02B4 != 8) || !this->unk_02DC)) { if (!(this->collider.base.atFlags & AT_BOUNCED)) { - if (this->collider.elements[1].base.toucherFlags & TOUCH_HIT) { - this->collider.elements[1].base.toucherFlags &= ~TOUCH_HIT; + if (this->collider.elements[1].base.atElemFlags & ATELEM_HIT) { + this->collider.elements[1].base.atElemFlags &= ~ATELEM_HIT; if ((this->unk_02B4 != 11) && (this->unk_02B4 != 7)) { func_80C0D334(this); } @@ -1524,10 +1524,10 @@ void func_80C0E618(EnBsb* this, PlayState* play) { func_80C0D3C0(this, play); } else { for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) { - if (this->collider.elements[i].base.bumperFlags & BUMP_HIT) { - sp48.x = this->collider.elements[i].base.bumper.hitPos.x; - sp48.y = this->collider.elements[i].base.bumper.hitPos.y; - sp48.z = this->collider.elements[i].base.bumper.hitPos.z; + if (this->collider.elements[i].base.acElemFlags & ACELEM_HIT) { + sp48.x = this->collider.elements[i].base.acDmgInfo.hitPos.x; + sp48.y = this->collider.elements[i].base.acDmgInfo.hitPos.y; + sp48.z = this->collider.elements[i].base.acDmgInfo.hitPos.z; CollisionCheck_BlueBlood(play, NULL, &sp48); } } diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 9f1bca514d..da49fad7a6 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -34,22 +34,22 @@ ActorProfile En_Bubble_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x04 }, { 0xF7CFD757, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 16 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00002820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_AT_INFO | BUMP_NO_DAMAGE | BUMP_NO_SWORD_SFX | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK, OCELEM_NONE, }, { 0, { { 0, 0, 0 }, 16 }, 100 }, @@ -58,7 +58,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -98,10 +98,10 @@ void EnBubble_SetDimensions(EnBubble* this, f32 dim) { s32 func_8089F59C(EnBubble* this) { ColliderElement* elem = &this->colliderSphere.elements[0].base; - elem->toucher.dmgFlags = DMG_EXPLOSIVES; - elem->toucher.effect = 0; - elem->toucher.damage = 4; - elem->toucherFlags = TOUCH_ON; + elem->atDmgInfo.dmgFlags = DMG_EXPLOSIVES; + elem->atDmgInfo.effect = 0; + elem->atDmgInfo.damage = 4; + elem->atElemFlags = ATELEM_ON; this->actor.velocity.y = 0.0f; return 6; } @@ -112,7 +112,7 @@ s32 func_8089F5D0(EnBubble* this) { } void EnBubble_DamagePlayer(EnBubble* this, PlayState* play) { - play->damagePlayer(play, -this->colliderSphere.elements[0].base.toucher.damage); + play->damagePlayer(play, -this->colliderSphere.elements[0].base.atDmgInfo.damage); func_800B8E1C(play, &this->actor, 6.0f, this->actor.yawTowardsPlayer, 6.0f); } @@ -205,7 +205,7 @@ void EnBubble_Fly(EnBubble* this, PlayState* play) { s32 bgId; u8 bounceCount; - if (this->colliderSphere.elements[1].base.bumperFlags & BUMP_HIT) { + if (this->colliderSphere.elements[1].base.acElemFlags & ACELEM_HIT) { bumpActor = this->colliderSphere.base.ac; this->normalizedBumpVelocity = bumpActor->velocity; EnBubble_Vec3fNormalize(&this->normalizedBumpVelocity); @@ -283,7 +283,7 @@ s32 func_8089FF30(EnBubble* this) { return false; } this->colliderSphere.base.acFlags &= ~AC_HIT; - if (this->colliderSphere.elements[1].base.bumperFlags & BUMP_HIT) { + if (this->colliderSphere.elements[1].base.acElemFlags & ACELEM_HIT) { this->unk1F4.x = this->colliderSphere.base.ac->velocity.x / 10.0f; this->unk1F4.y = this->colliderSphere.base.ac->velocity.y / 10.0f; this->unk1F4.z = this->colliderSphere.base.ac->velocity.z / 10.0f; diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index e5826444cd..f4cba15def 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -30,11 +30,11 @@ void func_8091D090(EnButte* this, PlayState* play); static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 5 }, 100 }, @@ -43,7 +43,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_1, diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.c b/src/overlays/actors/ovl_En_Cha/z_en_cha.c index f01103efc6..cd614b454f 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -32,7 +32,7 @@ ActorProfile En_Cha_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_WOOD, + COL_MATERIAL_WOOD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -40,11 +40,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 10, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c index 5cc132308b..d2c2a0175f 100644 --- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c @@ -34,7 +34,7 @@ ActorProfile En_Cne_01_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -42,11 +42,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c index 1650acc657..cfb69eee71 100644 --- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c @@ -30,7 +30,7 @@ void func_80AFE650(Actor* thisx, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON, @@ -38,11 +38,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 10, 11, 1, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index cefb3d7139..3cd93a28f6 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -43,7 +43,7 @@ ActorProfile En_Cow_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -51,11 +51,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 8f6190efc8..5c867847a4 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -43,11 +43,11 @@ ActorProfile En_Crow_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 20 }, 100 }, @@ -56,7 +56,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -316,9 +316,10 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; this->drawDmgEffAlpha = 4.0f; this->drawDmgEffFrozenSteamScale = 0.5f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elements[0].base.bumper.hitPos.x, - this->collider.elements[0].base.bumper.hitPos.y, this->collider.elements[0].base.bumper.hitPos.z, 0, - 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_SMALL_LIGHT_RAYS)); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elements[0].base.acDmgInfo.hitPos.x, + this->collider.elements[0].base.acDmgInfo.hitPos.y, + this->collider.elements[0].base.acDmgInfo.hitPos.z, 0, 0, 0, + CLEAR_TAG_PARAMS(CLEAR_TAG_SMALL_LIGHT_RAYS)); } else if (this->actor.colChkInfo.damageEffect == GUAY_DMGEFF_FIRE) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; this->drawDmgEffAlpha = 4.0f; diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index cc329b4933..95d4da9d70 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -38,7 +38,7 @@ static u16 sTextIds[] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 20, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c index a8c863d92f..df07426ab1 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -50,7 +50,7 @@ static u16 sTextIds[] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -58,11 +58,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 20, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c index 5676d369c4..769c17d8e6 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -71,7 +71,7 @@ ActorProfile En_Death_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_NONE | AC_TYPE_PLAYER, OC1_NONE, @@ -79,11 +79,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 1, { { 0, 0, 0 }, 22 }, 100 }, @@ -91,7 +91,7 @@ static ColliderSphereInit sSphereInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -99,11 +99,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 35, 90, 20, { 0, 0, 0 } }, @@ -112,22 +112,22 @@ static ColliderCylinderInit sCylinderInit = { static ColliderTrisElementInit sTrisElementsInit[2] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x20 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x20 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -136,7 +136,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -149,7 +149,7 @@ static ColliderTrisInit sTrisInit = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -157,11 +157,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x20 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL | TOUCH_UNK7, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -1220,9 +1220,9 @@ void EnDeath_UpdateDamage(EnDeath* this, PlayState* play) { this->dmgEffectAlpha = 3.0f; this->dmgEffectScale = 0.8f; this->dmgEffect = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->coreCollider.elem.bumper.hitPos.x, - this->coreCollider.elem.bumper.hitPos.y, this->coreCollider.elem.bumper.hitPos.z, 0, 0, 0, - 4); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->coreCollider.elem.acDmgInfo.hitPos.x, + this->coreCollider.elem.acDmgInfo.hitPos.y, this->coreCollider.elem.acDmgInfo.hitPos.z, 0, + 0, 0, 4); } if (play->envCtx.lightSettingOverride == 27) { play->envCtx.lightSettingOverride = 26; diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index 193f3eac39..9af8d60928 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -58,77 +58,77 @@ ActorProfile En_Dekubaba_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[7] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 1, { { 0, 100, 1000 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 51, { { 0, 0, 1500 }, 8 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 52, { { 0, 0, 500 }, 8 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 53, { { 0, 0, 1500 }, 8 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 54, { { 0, 0, 500 }, 8 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 55, { { 0, 0, 1500 }, 8 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 56, { { 0, 0, 500 }, 8 }, 100 }, @@ -137,7 +137,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[7] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -248,7 +248,7 @@ void EnDekubaba_DisableHitboxes(EnDekubaba* this) { s32 i; for (i = 1; i < ARRAY_COUNT(this->colliderElements); i++) { - this->collider.elements[i].base.bumperFlags &= ~BUMP_ON; + this->collider.elements[i].base.acElemFlags &= ~ACELEM_ON; } } @@ -279,8 +279,8 @@ void EnDekubaba_SetFireLightEffects(EnDekubaba* this, PlayState* play, s32 index this->drawDmgEffScale = 0.75f; this->drawDmgEffAlpha = 4.0f; jntSphElem = &this->collider.elements[index]; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, jntSphElem->base.bumper.hitPos.x, - jntSphElem->base.bumper.hitPos.y, jntSphElem->base.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, jntSphElem->base.acDmgInfo.hitPos.x, + jntSphElem->base.acDmgInfo.hitPos.y, jntSphElem->base.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_SMALL_LIGHT_RAYS)); } } @@ -290,7 +290,7 @@ void EnDekubaba_SetFrozenEffects(EnDekubaba* this) { this->drawDmgEffFrozenSteamScale = 1.125f; this->drawDmgEffAlpha = 1.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->timer = 80; this->actor.flags &= ~ACTOR_FLAG_400; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -299,7 +299,7 @@ void EnDekubaba_SetFrozenEffects(EnDekubaba* this) { void EnDekubaba_SpawnIceEffects(EnDekubaba* this, PlayState* play) { if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->collider.base.colType = COLTYPE_HIT6; + this->collider.base.colMaterial = COL_MATERIAL_HIT6; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, DEKUBABA_BODYPART_MAX, 4, this->size * 0.3f, this->size * 0.2f); @@ -320,7 +320,7 @@ void EnDekubaba_SetupWait(EnDekubaba* this) { Actor_SetScale(&this->actor, this->size * 0.01f * 0.5f); - this->collider.base.colType = COLTYPE_HARD; + this->collider.base.colMaterial = COL_MATERIAL_HARD; this->collider.base.acFlags |= AC_HARD; this->timer = 45; @@ -362,7 +362,7 @@ void EnDekubaba_SetupGrow(EnDekubaba* this) { this->collider.elements[i].base.ocElemFlags |= OCELEM_ON; } - this->collider.base.colType = COLTYPE_HIT6; + this->collider.base.colMaterial = COL_MATERIAL_HIT6; this->collider.base.acFlags &= ~AC_HARD; Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_WAKEUP); this->actionFunc = EnDekubaba_Grow; @@ -936,7 +936,7 @@ void EnDekubaba_SetupStunnedVertical(EnDekubaba* this) { s32 i; for (i = 1; i < ARRAY_COUNT(this->colliderElements); i++) { - this->collider.elements[i].base.bumperFlags |= BUMP_ON; + this->collider.elements[i].base.acElemFlags |= ACELEM_ON; } if (this->timer == 1) { @@ -1074,18 +1074,18 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlagJntSph(&this->actor, &this->collider); - if ((this->collider.base.colType != COLTYPE_HARD) && + if ((this->collider.base.colMaterial != COL_MATERIAL_HARD) && (this->actor.colChkInfo.damageEffect != DEKUBABA_DMGEFF_HOOKSHOT)) { jntSphElem = &this->collider.elements[0]; for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++, jntSphElem++) { - if (jntSphElem->base.bumperFlags & BUMP_HIT) { + if (jntSphElem->base.acElemFlags & ACELEM_HIT) { break; } } if ((i != ARRAY_COUNT(this->colliderElements)) && ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(jntSphElem->base.acHitElem->toucher.dmgFlags & 0xDB0B3))) { + !(jntSphElem->base.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3))) { EnDekubaba_SpawnIceEffects(this, play); newHealth = this->actor.colChkInfo.health - this->actor.colChkInfo.damage; @@ -1140,8 +1140,9 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { return; } } else if ((play->actorCtx.unk2 != 0) && (this->actor.xyzDistToPlayerSq < SQ(200.0f)) && - (this->collider.base.colType != COLTYPE_HARD) && (this->actionFunc != EnDekubaba_StunnedVertical) && - (this->actionFunc != EnDekubaba_Hit) && (this->actor.colChkInfo.health != 0)) { + (this->collider.base.colMaterial != COL_MATERIAL_HARD) && + (this->actionFunc != EnDekubaba_StunnedVertical) && (this->actionFunc != EnDekubaba_Hit) && + (this->actor.colChkInfo.health != 0)) { this->actor.colChkInfo.health--; this->actor.dropFlag = 0; EnDekubaba_SetupHit(this, DEKUBABA_HIT_STUN_OTHER); diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 80aaa1e66c..47aefbe4a0 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -54,7 +54,7 @@ ActorProfile En_Dekunuts_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -62,11 +62,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 32, 0, { 0, 0, 0 } }, @@ -132,8 +132,9 @@ void EnDekunuts_Init(Actor* thisx, PlayState* play) { if (this->actor.params == ENDEKUNUTS_GET_FF00_1) { this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; - this->collider.base.colType = COLTYPE_NONE; - this->collider.elem.bumperFlags |= (BUMP_NO_HITMARK | BUMP_NO_SWORD_SFX | BUMP_NO_DAMAGE | BUMP_NO_AT_INFO); + this->collider.base.colMaterial = COL_MATERIAL_NONE; + this->collider.elem.acElemFlags |= + (ACELEM_NO_HITMARK | ACELEM_NO_SWORD_SFX | ACELEM_NO_DAMAGE | ACELEM_NO_AT_INFO); } else if (this->actor.params == ENDEKUNUTS_GET_FF00_2) { this->actor.targetMode = TARGET_MODE_0; } @@ -152,7 +153,7 @@ void func_808BD348(EnDekunuts* this) { this->drawDmgEffScale = 0.55f; this->drawDmgEffFrozenSteamScale = 825.0f * 0.001f; this->drawDmgEffAlpha = 1.0f; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->unk_190 = 80; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80); } @@ -160,7 +161,7 @@ void func_808BD348(EnDekunuts* this) { void func_808BD3B4(EnDekunuts* this, PlayState* play) { if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->collider.base.colType = COLTYPE_HIT6; + this->collider.base.colMaterial = COL_MATERIAL_HIT6; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, ENDEKUNUTS_BODYPART_MAX, 2, 0.2f, 0.2f); } @@ -571,7 +572,7 @@ void func_808BE73C(EnDekunuts* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem); if ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->collider.elem.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + !(this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { func_808BD3B4(this, play); if ((this->actor.colChkInfo.mass == 50) || (this->actor.params != ENDEKUNUTS_GET_FF00_0)) { if ((this->actor.params != ENDEKUNUTS_GET_FF00_1) && !Actor_ApplyDamage(&this->actor)) { @@ -609,8 +610,8 @@ void func_808BE73C(EnDekunuts* this, PlayState* play) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.55f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_SMALL_LIGHT_RAYS)); } else if (this->actor.colChkInfo.damageEffect == 5) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_LARGE; diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c index 36247da4ab..9213ee8867 100644 --- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c @@ -34,7 +34,7 @@ ActorProfile En_Demo_heishi_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -42,11 +42,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 40, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.c b/src/overlays/actors/ovl_En_Dg/z_en_dg.c index ba8987e30c..3b741eb649 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -110,7 +110,7 @@ static RacetrackDogInfo sSelectedRacetrackDogInfo = { DOG_COLOR_DEFAULT, -1, 0x3 static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -118,11 +118,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x04, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 13, 19, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c index 68de3d17f8..6ce3b76cb4 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -72,99 +72,99 @@ ActorProfile En_Dinofos_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[9] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { DINOLFOS_LIMB_LOWER_BODY, { { 200, 300, 0 }, 19 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { DINOLFOS_LIMB_UPPER_BODY, { { 200, 200, 0 }, 17 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { DINOLFOS_LIMB_HEAD, { { 600, 200, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { DINOLFOS_LIMB_NECK, { { 700, 100, 0 }, 10 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { DINOLFOS_LIMB_LEFT_UPPER_LEG, { { 1300, 100, 0 }, 12 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { DINOLFOS_LIMB_RIGHT_UPPER_LEG, { { 1300, 100, 0 }, 12 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x09, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { DINOLFOS_LIMB_MAX, { { 0, -10, 35 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x09, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { DINOLFOS_LIMB_MAX, { { 0, -10, 70 }, 28 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x09, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { DINOLFOS_LIMB_MAX, { { 0, -5, 110 }, 30 }, 100 }, @@ -173,7 +173,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[9] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -186,7 +186,7 @@ static ColliderJntSphInit sJntSphInit = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -194,11 +194,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL | TOUCH_UNK7, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -401,7 +401,7 @@ void EnDinofos_EndCutscene(EnDinofos* this, PlayState* play) { void EnDinofos_Freeze(EnDinofos* this) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; this->drawDmgEffScale = 0.55f; - this->bodyAndFireCollider.base.colType = COLTYPE_HIT3; + this->bodyAndFireCollider.base.colMaterial = COL_MATERIAL_HIT3; this->drawDmgEffFrozenSteamScale = 825.0f * 0.001f; this->drawDmgEffAlpha = 1.0f; this->stunTimer = 80; @@ -412,7 +412,7 @@ void EnDinofos_Freeze(EnDinofos* this) { void EnDinofos_ThawIfFrozen(EnDinofos* this, PlayState* play) { if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->bodyAndFireCollider.base.colType = COLTYPE_HIT0; + this->bodyAndFireCollider.base.colMaterial = COL_MATERIAL_HIT0; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, DINOFOS_BODYPART_MAX, 2, 0.3f, 0.2f); this->actor.flags |= ACTOR_FLAG_400; @@ -427,7 +427,7 @@ void EnDinofos_EnableBumperCollision(EnDinofos* this) { if (this->isDodgingGoronPound) { for (i = 0; i < DINOFOS_COLLIDER_FIRE_START_INDEX; i++) { - this->bodyAndFireCollider.elements[i].base.bumper.dmgFlags |= 0x400; + this->bodyAndFireCollider.elements[i].base.acDmgInfo.dmgFlags |= 0x400; } this->isDodgingGoronPound = false; } @@ -482,7 +482,7 @@ s32 EnDinofos_Dodge(EnDinofos* this, PlayState* play) { (!this->isDodgingGoronPound)) { this->isDodgingGoronPound = true; for (i = 0; i < DINOFOS_COLLIDER_FIRE_START_INDEX; i++) { - this->bodyAndFireCollider.elements[i].base.bumper.dmgFlags &= ~0x400; + this->bodyAndFireCollider.elements[i].base.acDmgInfo.dmgFlags &= ~0x400; } } @@ -1296,7 +1296,7 @@ s32 EnDinofos_UpdateDamage(EnDinofos* this, PlayState* play) { Actor_SetDropFlagJntSph(&this->actor, &this->bodyAndFireCollider); for (i = 0; i < ARRAY_COUNT(this->bodyAndFireColliderElements); i++) { - if (this->bodyAndFireCollider.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->bodyAndFireCollider.elements[i].base.acElemFlags & ACELEM_HIT) { break; } } @@ -1306,7 +1306,7 @@ s32 EnDinofos_UpdateDamage(EnDinofos* this, PlayState* play) { } if ((this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) && - (this->bodyAndFireCollider.elements[i].base.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + (this->bodyAndFireCollider.elements[i].base.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { return false; } @@ -1374,9 +1374,9 @@ s32 EnDinofos_UpdateDamage(EnDinofos* this, PlayState* play) { this->drawDmgEffScale = 0.55f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, - this->bodyAndFireCollider.elements[i].base.bumper.hitPos.x, - this->bodyAndFireCollider.elements[i].base.bumper.hitPos.y, - this->bodyAndFireCollider.elements[i].base.bumper.hitPos.z, 0, 0, 0, + this->bodyAndFireCollider.elements[i].base.acDmgInfo.hitPos.x, + this->bodyAndFireCollider.elements[i].base.acDmgInfo.hitPos.y, + this->bodyAndFireCollider.elements[i].base.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } EnDinofos_SetupDamaged(this, i); diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c index 5952324ade..2fd4085eee 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -35,7 +35,7 @@ ActorProfile En_Dnk_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -43,11 +43,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 46, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c index 57d5527c42..5768760f19 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -105,7 +105,7 @@ ActorProfile En_Dno_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -113,11 +113,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 17, 58, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c index 1f2814c893..53db8e4a0a 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -46,7 +46,7 @@ ActorProfile En_Dnp_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -54,11 +54,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 14, 38, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c index 63ed2123a2..0e49c58b4b 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -75,7 +75,7 @@ ActorProfile En_Dnq_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -83,11 +83,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 34, 80, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 81cf64b101..fc9e07bd0e 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -93,7 +93,7 @@ ActorProfile En_Dns_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -101,11 +101,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 46, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index f29b1e33f5..6c285f7b51 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -51,110 +51,110 @@ ActorProfile En_Dodongo_Profile = { static ColliderJntSphElementInit sJntSphElementsInit1[10] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x800CB019, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 7, { { 500, 0, 0 }, 27 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x800CB019, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 21, { { -200, 0, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x800CB019, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 28, { { -200, 0, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x800CB019, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 22, { { 400, -400, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x800CB019, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 29, { { 400, -400, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 16, { { 1000, 0, 0 }, 28 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 14, { { -300, 300, 0 }, 17 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 14, { { 800, 100, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 13, { { 600, 0, 0 }, 12 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 13, { { 1500, 0, 0 }, 12 }, 100 }, @@ -163,7 +163,7 @@ static ColliderJntSphElementInit sJntSphElementsInit1[10] = { static ColliderJntSphInit sJntSphInit1 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -176,7 +176,7 @@ static ColliderJntSphInit sJntSphInit1 = { static ColliderJntSphInit sJntSphInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -190,33 +190,33 @@ static ColliderJntSphInit sJntSphInit2 = { static ColliderJntSphElementInit sJntSphElementsInit2[3] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x01, 0x10 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 2, { { 0, -10, 10 }, 25 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x01, 0x10 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 2, { { 0, -5, 50 }, 37 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x01, 0x10 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 2, { { 0, 0, 90 }, 50 }, 100 }, @@ -225,7 +225,7 @@ static ColliderJntSphElementInit sJntSphElementsInit2[3] = { static ColliderJntSphInit sJntSphInit3 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -315,8 +315,8 @@ void EnDodongo_Init(Actor* thisx, PlayState* play) { Collider_InitAndSetJntSph(play, &this->collider3, &this->actor, &sJntSphInit3, this->collider3Elements); for (i = 0; i < ARRAY_COUNT(this->collider2Elements); i++) { - this->collider2.elements[i].base.elemType = ELEMTYPE_UNK2; - this->collider2.elements[i].base.bumper.dmgFlags = 0x77C34FE6; + this->collider2.elements[i].base.elemMaterial = ELEM_MATERIAL_UNK2; + this->collider2.elements[i].base.acDmgInfo.dmgFlags = 0x77C34FE6; } Effect_Add(play, &this->unk_338, EFFECT_BLURE2, 0, 0, &D_80879308); @@ -330,7 +330,7 @@ void EnDodongo_Init(Actor* thisx, PlayState* play) { for (i = 0; i < ARRAY_COUNT(this->collider1Elements); i++) { this->collider1.elements[i].dim.modelSphere.radius *= 2; - this->collider1.elements[i].base.toucher.damage *= 2; + this->collider1.elements[i].base.atDmgInfo.damage *= 2; } for (i = 0; i < ARRAY_COUNT(this->collider2Elements); i++) { @@ -418,16 +418,16 @@ void func_80876BD0(EnDodongo* this, PlayState* play, s32 arg2) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; this->drawDmgEffScale = 0.75f; this->drawDmgEffAlpha = 4.0f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider1.elements[arg2].base.bumper.hitPos.x, - this->collider1.elements[arg2].base.bumper.hitPos.y, - this->collider1.elements[arg2].base.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider1.elements[arg2].base.acDmgInfo.hitPos.x, + this->collider1.elements[arg2].base.acDmgInfo.hitPos.y, + this->collider1.elements[arg2].base.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } } void func_80876CAC(EnDodongo* this) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; - this->collider1.base.colType = COLTYPE_HIT3; + this->collider1.base.colMaterial = COL_MATERIAL_HIT3; this->drawDmgEffScale = 0.75f; this->drawDmgEffFrozenSteamScale = 1.125f; this->drawDmgEffAlpha = 1.0f; @@ -441,7 +441,7 @@ void func_80876D28(EnDodongo* this, PlayState* play) { this->timer = 0; this->actor.colorFilterTimer = 0; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->collider1.base.colType = COLTYPE_HIT0; + this->collider1.base.colMaterial = COL_MATERIAL_HIT0; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, DODONGO_BODYPART_MAX, 2, this->unk_334 * 0.3f, this->unk_334 * 0.2f); @@ -963,16 +963,16 @@ void EnDodongo_UpdateDamage(EnDodongo* this, PlayState* play) { this->collider1.base.acFlags &= ~AC_HIT; for (i = 0; i < ARRAY_COUNT(this->collider2Elements); i++) { - if (this->collider2.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->collider2.elements[i].base.acElemFlags & ACELEM_HIT) { break; } } if ((i != ARRAY_COUNT(this->collider2Elements)) && ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->collider2.elements[i].base.acHitElem->toucher.dmgFlags & 0xDB0B3))) { + !(this->collider2.elements[i].base.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3))) { func_80876D28(this, play); - Math_Vec3s_ToVec3f(&sp3C, &this->collider2.elements[i].base.bumper.hitPos); + Math_Vec3s_ToVec3f(&sp3C, &this->collider2.elements[i].base.acDmgInfo.hitPos); if (this->actor.colChkInfo.damageEffect == 0xF) { CollisionCheck_BlueBlood(play, NULL, &sp3C); EffectSsHitmark_SpawnFixedScale(play, EFFECT_HITMARK_WHITE, &sp3C); @@ -987,14 +987,14 @@ void EnDodongo_UpdateDamage(EnDodongo* this, PlayState* play) { Actor_SetDropFlagJntSph(&this->actor, &this->collider1); for (i = 0; i < ARRAY_COUNT(this->collider1Elements); i++) { - if (this->collider1.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->collider1.elements[i].base.acElemFlags & ACELEM_HIT) { break; } } if ((i != ARRAY_COUNT(this->collider1Elements)) && ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->collider1.elements[i].base.acHitElem->toucher.dmgFlags & 0xDB0B3))) { + !(this->collider1.elements[i].base.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3))) { func_80876D28(this, play); if (this->actor.colChkInfo.damageEffect != 0xF) { if (!Actor_ApplyDamage(&this->actor)) { diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c index bff8cc30c6..4558a793e2 100644 --- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c @@ -34,7 +34,7 @@ ActorProfile En_Door_Etc_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -42,11 +42,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 100, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c index 12617b5e70..6e6d5b864b 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -99,88 +99,88 @@ static DamageTable sDamageTable = { static ColliderJntSphElementInit sJntSphElementsInit[8] = { { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { DEEP_PYTHON_LIMB_HEAD, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { DEEP_PYTHON_LIMB_COLLAR, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { DEEP_PYTHON_LIMB_COLLAR, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { DEEP_PYTHON_LIMB_BODY_SEGMENT_1, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { DEEP_PYTHON_LIMB_BODY_SEGMENT_1, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { DEEP_PYTHON_LIMB_BODY_SEGMENT_2, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { DEEP_PYTHON_LIMB_BODY_SEGMENT_2, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { DEEP_PYTHON_LIMB_BODY_SEGMENT_2, { { 0, 0, 0 }, 0 }, 1 }, @@ -189,7 +189,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[8] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -619,9 +619,9 @@ void EnDragon_Attack(EnDragon* this, PlayState* play) { } if (((this->state != DEEP_PYTHON_ATTACK_STATE_START) && (curFrame >= this->animEndFrame)) || - !(player->stateFlags2 & PLAYER_STATE2_80) || (this->collider.elements[0].base.bumperFlags & BUMP_HIT) || - (this->collider.elements[1].base.bumperFlags & BUMP_HIT) || - (this->collider.elements[2].base.bumperFlags & BUMP_HIT)) { + !(player->stateFlags2 & PLAYER_STATE2_80) || (this->collider.elements[0].base.acElemFlags & ACELEM_HIT) || + (this->collider.elements[1].base.acElemFlags & ACELEM_HIT) || + (this->collider.elements[2].base.acElemFlags & ACELEM_HIT)) { player->actor.parent = NULL; this->grabWaitTimer = 30; CutsceneManager_Stop(this->grabCsId); @@ -736,12 +736,12 @@ void EnDragon_UpdateDamage(EnDragon* this, PlayState* play) { PlayerImpactType playerImpactType; if (this->action == DEEP_PYTHON_ACTION_EXTEND) { - if ((this->collider.elements[2].base.bumperFlags & BUMP_HIT) || - (this->collider.elements[3].base.bumperFlags & BUMP_HIT) || - (this->collider.elements[4].base.bumperFlags & BUMP_HIT) || - (this->collider.elements[5].base.bumperFlags & BUMP_HIT) || - (this->collider.elements[6].base.bumperFlags & BUMP_HIT) || - (this->collider.elements[7].base.bumperFlags & BUMP_HIT)) { + if ((this->collider.elements[2].base.acElemFlags & ACELEM_HIT) || + (this->collider.elements[3].base.acElemFlags & ACELEM_HIT) || + (this->collider.elements[4].base.acElemFlags & ACELEM_HIT) || + (this->collider.elements[5].base.acElemFlags & ACELEM_HIT) || + (this->collider.elements[6].base.acElemFlags & ACELEM_HIT) || + (this->collider.elements[7].base.acElemFlags & ACELEM_HIT)) { Actor_ApplyDamage(&this->actor); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 25); if (this->actor.colChkInfo.health > 0) { diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.c b/src/overlays/actors/ovl_En_Drs/z_en_drs.c index 8513535ce6..605a6899df 100644 --- a/src/overlays/actors/ovl_En_Drs/z_en_drs.c +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.c @@ -31,7 +31,7 @@ ActorProfile En_Drs_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -39,11 +39,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 16, 62, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c index 9a65fda852..786c0bc523 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.c +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c @@ -170,7 +170,7 @@ static s16 sUnused[] = { 777, 777 }; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -178,11 +178,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 25, 70, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c index 49ac169c19..def2c7937c 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -93,11 +93,11 @@ void EnEgol_DrawEffects(EnEgol* this, PlayState* play); static ColliderJntSphElementInit sEyeJntSphElementsInit[1] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { EYEGORE_LIMB_EYE_COLLIDER, { { 0, 0, 0 }, 0 }, 1 }, @@ -107,66 +107,66 @@ static ColliderJntSphElementInit sEyeJntSphElementsInit[1] = { static ColliderJntSphElementInit sBodySphElementsInit[6] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { EYEGORE_LIMB_LEFT_HAND, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { EYEGORE_LIMB_RIGHT_HAND, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { EYEGORE_LIMB_HEAD, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { EYEGORE_LIMB_LEFT_SHOULDER, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { EYEGORE_LIMB_RIGHT_SHOULDER, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { EYEGORE_LIMB_FAULDS, { { 0, 0, 0 }, 0 }, 1 }, @@ -175,7 +175,7 @@ static ColliderJntSphElementInit sBodySphElementsInit[6] = { static ColliderJntSphInit sBodyJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -188,7 +188,7 @@ static ColliderJntSphInit sBodyJntSphInit = { static ColliderJntSphInit sEyeJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -201,7 +201,7 @@ static ColliderJntSphInit sEyeJntSphInit = { static ColliderQuadInit sLaserQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -209,11 +209,11 @@ static ColliderQuadInit sLaserQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x07, 0x10 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL | TOUCH_UNK7, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -960,8 +960,8 @@ void EnEgol_Punch(EnEgol* this, PlayState* play) { this->bodyCollider.elements[1].dim.modelSphere.radius = 20; EnEgol_SetupWalk(this); } else if (!this->hitPlayer) { - if ((this->bodyCollider.elements[0].base.toucherFlags & TOUCH_HIT) || - (this->bodyCollider.elements[1].base.toucherFlags & TOUCH_HIT)) { + if ((this->bodyCollider.elements[0].base.atElemFlags & ATELEM_HIT) || + (this->bodyCollider.elements[1].base.atElemFlags & ATELEM_HIT)) { this->hitPlayer = true; func_800B8D50(play, &this->actor, 10.0f, this->actor.home.rot.y, 10.0f, 0); } @@ -974,7 +974,7 @@ void EnEgol_Punch(EnEgol* this, PlayState* play) { void EnEgol_SetupSlamWait(EnEgol* this) { EnEgol_ChangeAnim(this, EYEGORE_ANIM_SLAM_WAIT); this->actionTimer = 0; - this->eyeCollider.elements[0].base.elemType = ELEMTYPE_UNK1; + this->eyeCollider.elements[0].base.elemMaterial = ELEM_MATERIAL_UNK1; this->action = EYEGORE_ACTION_SLAM_WAIT; this->actionFunc = EnEgol_SlamWait; } @@ -985,7 +985,7 @@ void EnEgol_SlamWait(EnEgol* this, PlayState* play) { if (curFrame >= this->animEndFrame) { this->actionTimer++; if (this->actionTimer > 20) { - this->eyeCollider.elements[0].base.elemType = ELEMTYPE_UNK2; + this->eyeCollider.elements[0].base.elemMaterial = ELEM_MATERIAL_UNK2; EnEgol_SetupSlamEnd(this); } } @@ -994,7 +994,7 @@ void EnEgol_SlamWait(EnEgol* this, PlayState* play) { void EnEgol_SetupStunned(EnEgol* this) { EnEgol_ChangeAnim(this, EYEGORE_ANIM_STUNNED); this->actionTimer = 0; - this->eyeCollider.elements[0].base.elemType = ELEMTYPE_UNK1; + this->eyeCollider.elements[0].base.elemMaterial = ELEM_MATERIAL_UNK1; this->bodyCollider.elements[0].dim.modelSphere.radius = 0; this->bodyCollider.elements[1].dim.modelSphere.radius = 0; this->action = EYEGORE_ACTION_STUNNED; @@ -1007,7 +1007,7 @@ void EnEgol_Stunned(EnEgol* this, PlayState* play) { if (curFrame >= this->animEndFrame) { this->actionTimer++; if (this->actionTimer > 80) { - this->eyeCollider.elements[0].base.elemType = ELEMTYPE_UNK2; + this->eyeCollider.elements[0].base.elemMaterial = ELEM_MATERIAL_UNK2; EnEgol_SetupStunEnd(this); } } @@ -1148,7 +1148,7 @@ void EnEgol_CollisionCheck(EnEgol* this, PlayState* play) { Math_Vec3f_Copy(&this->laserCollider.dim.quad[2], &this->laserBase); EnEgol_SetupWalk(this); } - if (this->eyeCollider.elements[0].base.bumperFlags & BUMP_HIT) { + if (this->eyeCollider.elements[0].base.acElemFlags & ACELEM_HIT) { reaction = EYEGORE_HIT_IMMUNE; switch (this->actor.colChkInfo.damageEffect) { case EYEGORE_DMGEFF_LIGHT_ARROW: @@ -1201,9 +1201,9 @@ void EnEgol_CollisionCheck(EnEgol* this, PlayState* play) { } else if (reaction == EYEGORE_HIT_IMMUNE) { Vec3f hitPos; - hitPos.x = this->eyeCollider.elements[0].base.bumper.hitPos.x; - hitPos.y = this->eyeCollider.elements[0].base.bumper.hitPos.y; - hitPos.z = this->eyeCollider.elements[0].base.bumper.hitPos.z; + hitPos.x = this->eyeCollider.elements[0].base.acDmgInfo.hitPos.x; + hitPos.y = this->eyeCollider.elements[0].base.acDmgInfo.hitPos.y; + hitPos.z = this->eyeCollider.elements[0].base.acDmgInfo.hitPos.z; Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_BOUND); EffectSsHitmark_SpawnFixedScale(play, EFFECT_HITMARK_METAL, &hitPos); CollisionCheck_SpawnShieldParticlesMetal(play, &hitPos); diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c index 07ac03895c..03070afa5d 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -34,7 +34,7 @@ ActorProfile En_Elfbub_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -42,11 +42,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 16, 32, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c index 7d073b3237..25992b7ba5 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -36,7 +36,7 @@ ActorProfile En_Elforg_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -44,11 +44,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 16, 32, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index e6d66a0f2a..6e16ae7b79 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -41,11 +41,11 @@ ActorProfile En_Encount2_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 0 }, 1 }, @@ -54,7 +54,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/src/overlays/actors/ovl_En_Estone/z_en_estone.c index 7ab15084aa..ded7cdf8f0 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -37,7 +37,7 @@ ActorProfile En_Estone_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -45,11 +45,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 30, 30, -10, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index f39aad37af..9bdcdaa83d 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -61,7 +61,7 @@ ActorProfile En_Famos_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -69,11 +69,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x20000000, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 80, 0, { 0, 0, 0 } }, @@ -81,7 +81,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -89,11 +89,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 70, 10, 0, { 0, 0, 0 } }, @@ -104,22 +104,22 @@ static ColliderCylinderInit sCylinderInit2 = { static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00002000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { FAMOS_LIMB_EMBLEM, { { 2500, 0, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00002000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { FAMOS_LIMB_EMBLEM, { { -1500, 0, 0 }, 20 }, 100 }, @@ -128,7 +128,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c index 5fc5a85f9a..077dde9517 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -46,7 +46,7 @@ ActorProfile En_Fg_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -54,11 +54,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x000010AA, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 8, 10, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 38850c972b..bf4dea06c2 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -58,7 +58,7 @@ ActorProfile En_Firefly_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -66,11 +66,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x01, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 1000, 0 }, 15 }, 100 }, @@ -154,13 +154,13 @@ void EnFirefly_Init(Actor* thisx, PlayState* play) { this->actionFunc = EnFirefly_FlyIdle; } else if (this->actor.params == KEESE_ICE_FLY) { this->auraType = KEESE_AURA_ICE; - this->collider.elem.toucher.effect = 2; // Freeze + this->collider.elem.atDmgInfo.effect = 2; // Freeze this->actor.hintId = TATL_HINT_ID_ICE_KEESE; this->maxAltitude = this->actor.home.pos.y + 100.0f; this->actionFunc = EnFirefly_FlyIdle; } else { this->auraType = KEESE_AURA_NONE; - this->collider.elem.toucher.effect = 0; // Nothing + this->collider.elem.atDmgInfo.effect = 0; // Nothing this->actor.hintId = TATL_HINT_ID_KEESE; this->maxAltitude = this->actor.home.pos.y + 100.0f; this->actionFunc = EnFirefly_Perch; @@ -186,7 +186,7 @@ void EnFirefly_SpawnIceEffects(EnFirefly* this, PlayState* play) { void EnFirefly_Extinguish(EnFirefly* this) { this->currentType = KEESE_NORMAL; - this->collider.elem.toucher.effect = 0; // Nothing + this->collider.elem.atDmgInfo.effect = 0; // Nothing this->auraType = KEESE_AURA_NONE; this->actor.hintId = TATL_HINT_ID_KEESE; } @@ -194,7 +194,7 @@ void EnFirefly_Extinguish(EnFirefly* this) { void EnFirefly_Ignite(EnFirefly* this) { if (this->actor.params == KEESE_FIRE_FLY) { this->currentType = KEESE_FIRE; - this->collider.elem.toucher.effect = 1; // Fire + this->collider.elem.atDmgInfo.effect = 1; // Fire this->auraType = KEESE_AURA_FIRE; this->actor.hintId = TATL_HINT_ID_FIRE_KEESE; } @@ -359,8 +359,8 @@ void EnFirefly_SetupFall(EnFirefly* this, PlayState* play) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.55f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_SMALL_LIGHT_RAYS)); } else if (this->actor.colChkInfo.damageEffect == KEESE_DMGEFF_FIRE) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 8e2216edba..5aa1e6b71b 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -37,11 +37,11 @@ void func_8091F994(Actor* thisx, PlayState* play); static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 5 }, 100 }, @@ -50,7 +50,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c index d5259d5406..f7e2c2fe1b 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -63,22 +63,22 @@ ActorProfile En_Fish2_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 17, { { 0, 0, 0 }, 0 }, 1 }, @@ -87,7 +87,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c index b4a047d643..98bec16e4f 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -247,132 +247,132 @@ u8 D_8090CD54 = 0; static ColliderJntSphElementInit sJntSphElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, @@ -381,7 +381,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE | AT_TYPE_ENEMY, AC_NONE | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 4c7175f6f9..7dfe7b2bfb 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -74,7 +74,7 @@ ActorProfile En_Floormas_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -82,11 +82,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7EFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 25, 40, 0, { 0, 0, 0 } }, @@ -195,16 +195,16 @@ void EnFloormas_Destroy(Actor* thisx, PlayState* play) { } void func_808D08D0(EnFloormas* this) { - this->collider.base.colType = COLTYPE_HARD; + this->collider.base.colMaterial = COL_MATERIAL_HARD; this->collider.base.acFlags |= AC_HARD; - this->collider.elem.bumper.dmgFlags &= ~0x8000; + this->collider.elem.acDmgInfo.dmgFlags &= ~0x8000; this->unk_190 = 40; } void func_808D0908(EnFloormas* this) { - this->collider.base.colType = COLTYPE_HIT0; + this->collider.base.colMaterial = COL_MATERIAL_HIT0; this->collider.base.acFlags &= ~AC_HARD; - this->collider.elem.bumper.dmgFlags |= 0x8000; + this->collider.elem.acDmgInfo.dmgFlags |= 0x8000; this->unk_190 = 0; } @@ -226,7 +226,7 @@ void func_808D09CC(EnFloormas* this) { this->drawDmgEffScale = 0.55f; this->drawDmgEffFrozenSteamScale = 825.0f * 0.001f; this->drawDmgEffAlpha = 1.0f; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->unk_18E = 80; this->actor.flags &= ~(ACTOR_FLAG_200 | ACTOR_FLAG_400); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -235,7 +235,7 @@ void func_808D09CC(EnFloormas* this) { void func_808D0A48(EnFloormas* this, PlayState* play) { if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->collider.base.colType = COLTYPE_HIT0; + this->collider.base.colMaterial = COL_MATERIAL_HIT0; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, ENFLOORMAS_BODYPART_MAX, 2, this->actor.scale.x * (30000.0f * 0.001f), this->actor.scale.x * 20.0f); @@ -1005,7 +1005,7 @@ void func_808D2E34(EnFloormas* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elem); if ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->collider.elem.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + !(this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { if (this->actor.colChkInfo.damageEffect == 0xE) { func_808D0908(this); this->actor.colorFilterTimer = 0; @@ -1017,7 +1017,7 @@ void func_808D2E34(EnFloormas* this, PlayState* play) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; } - if (this->collider.base.colType != COLTYPE_HARD) { + if (this->collider.base.colMaterial != COL_MATERIAL_HARD) { if (!Actor_ApplyDamage(&this->actor)) { if (this->actor.scale.x > 0.009f) { Actor_PlaySfx(&this->actor, NA_SE_EN_DAIOCTA_REVERSE); @@ -1064,9 +1064,9 @@ void func_808D2E34(EnFloormas* this, PlayState* play) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.55f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, - 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, + this->collider.elem.acDmgInfo.hitPos.x, this->collider.elem.acDmgInfo.hitPos.y, + this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, (this->actor.scale.x > 0.009f) ? CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS) : CLEAR_TAG_PARAMS(CLEAR_TAG_SMALL_LIGHT_RAYS)); } @@ -1123,7 +1123,7 @@ void EnFloormas_Update(Actor* thisx, PlayState* play) { } Actor_SetFocus(&this->actor, this->actor.scale.x * 2500.0f); - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { if (this->unk_190 != 0) { this->unk_190--; } @@ -1217,14 +1217,14 @@ void EnFloormas_Draw(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx); Gfx_SetupDL25_Opa(play->state.gfxCtx); - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { func_800AE2A0(play, &D_808D3958, this->unk_190 % 40, 40); } POLY_OPA_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnFloormas_OverrideLimbDraw, EnFloormas_PostLimbDraw, &this->actor, POLY_OPA_DISP); - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { func_800AE5A0(play); } @@ -1242,14 +1242,14 @@ void func_808D3754(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx); Gfx_SetupDL25_Xlu(play->state.gfxCtx); - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { func_800AE5E4(play, &D_808D3958, this->unk_190 % 40, 40); } POLY_XLU_DISP = SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnFloormas_OverrideLimbDraw, EnFloormas_PostLimbDraw, &this->actor, POLY_XLU_DISP); - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { func_800AE8EC(play); } diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index 1ed9e1badc..bd499c42ba 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -99,7 +99,7 @@ static AnimationInfoS sAnimationInfo[FSN_ANIM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -107,11 +107,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index c57cdac208..8abd4e5db5 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -103,7 +103,7 @@ static AnimationInfo sAnimationInfo[HONEY_DARLING_ANIM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -111,11 +111,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 50, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c index d84cef4bd2..a6ab1dbd5d 100644 --- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c @@ -42,7 +42,7 @@ ActorProfile En_Fu_Kago_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_NO_PUSH | OC1_TYPE_ALL, @@ -50,11 +50,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 200 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c index 57a9f32457..c1ad96afcd 100644 --- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c @@ -41,7 +41,7 @@ ActorProfile En_Fu_Mato_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -49,11 +49,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 200 }, 100 }, @@ -98,7 +98,7 @@ void EnFuMato_Init(Actor* thisx, PlayState* play) { fu = (EnFu*)this->dyna.actor.parent; if (fu->unk_542 == 2) { - this->collider.elem.elemType = ELEMTYPE_UNK0; + this->collider.elem.elemMaterial = ELEM_MATERIAL_UNK0; this->collider.dim.worldSphere.radius = 30; } else { this->collider.dim.worldSphere.radius = 17; diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 5758a9ed6d..cbfbc2b1a6 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -65,18 +65,18 @@ static s16 D_809346F0[] = { 0, 0x2000, 0x4000, 0 }; static ColliderCylinderInitType1 sCylinderInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFEFDD, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 30, 80, 0, { 0, 0, 0 } }, @@ -84,18 +84,18 @@ static ColliderCylinderInitType1 sCylinderInit1 = { static ColliderCylinderInitType1 sCylinderInit2 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00001022, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 35, 80, 0, { 0, 0, 0 } }, @@ -103,18 +103,18 @@ static ColliderCylinderInitType1 sCylinderInit2 = { static ColliderCylinderInitType1 sCylinderInit3 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x02, 0x04 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 20, 30, -15, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c index dce6504748..b029cc9d22 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -37,7 +37,7 @@ ActorProfile En_Gamelupy_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_NO_PUSH | OC1_TYPE_PLAYER, @@ -45,11 +45,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 10, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c index 0ea7786140..0962ae348b 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -69,18 +69,18 @@ static f32 D_80B11A00[][4] = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 40, 75, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index 206aec95ff..93af388c37 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -29,7 +29,7 @@ ActorProfile En_Ge1_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -37,11 +37,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x01000202, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 5754028a01..87dbd8936c 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -56,7 +56,7 @@ typedef enum { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -64,11 +64,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x038BFBB3, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 60, 0, { 0, 0, 0 } }, @@ -503,7 +503,7 @@ void EnGe2_PatrolDuties(EnGe2* this, PlayState* play) { } } else if (this->collider.base.acFlags & AC_HIT) { if ((this->collider.elem.acHitElem != NULL) && - (this->collider.elem.acHitElem->toucher.dmgFlags & DMG_DEKU_NUT)) { + (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & DMG_DEKU_NUT)) { Actor_SetColorFilter(&this->picto.actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 400); this->picto.actor.speed = 0.0f; this->actionFunc = EnGe2_Stunned; diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 5e735bca12..93a14bdc69 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -49,7 +49,7 @@ ActorProfile En_Ge3_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -57,11 +57,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x01000222, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 50, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c index 70286bf838..dd33018721 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -50,7 +50,7 @@ ActorProfile En_Geg_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -58,11 +58,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 0 }, 100 }, @@ -70,7 +70,7 @@ static ColliderSphereInit sSphereInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -78,11 +78,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, 0, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.c b/src/overlays/actors/ovl_En_Gg/z_en_gg.c index 2cd5b24236..13df995d8c 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -39,7 +39,7 @@ ActorProfile En_Gg_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -47,11 +47,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 24, 72, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c index 1251f5e8db..50179f7c2e 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -46,7 +46,7 @@ ActorProfile En_Gk_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -54,11 +54,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 24, 32, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 08f4b430c3..241c09f244 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -268,7 +268,7 @@ ActorProfile En_Gm_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -276,11 +276,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 14, 62, 0, { 0, 0, 0 } }, @@ -288,7 +288,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -296,11 +296,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 20 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index d105b55068..b0461fcd8c 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -588,7 +588,7 @@ ActorProfile En_Go_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -596,11 +596,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 0 }, 100 }, @@ -609,7 +609,7 @@ static ColliderSphereInit sSphereInit = { // Collider for the frozen solid Gorons. static ColliderCylinderInit sCylinderInitFrozen = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER, OC1_ON | OC1_TYPE_ALL, @@ -617,11 +617,11 @@ static ColliderCylinderInit sCylinderInitFrozen = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x02, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, 0, 0, { 0, 0, 0 } }, @@ -630,7 +630,7 @@ static ColliderCylinderInit sCylinderInitFrozen = { // Collider for normal Gorons. static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -638,11 +638,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, 0, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 94a8a89a26..4ce75198c0 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -48,11 +48,11 @@ ActorProfile En_Goroiwa_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x04 }, { 0x01C37BB6, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 58 }, 100 }, @@ -61,7 +61,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -155,13 +155,13 @@ void func_8093E9B0(EnGoroiwa* this, PlayState* play) { this->collider.elements[0].dim.worldSphere.radius = this->unk_1DC - 1.0f; if ((params == ENGOROIWA_C000_1) || (params == ENGOROIWA_C000_2)) { - this->collider.elements[0].base.bumper.dmgFlags |= (0x4000 | 0x400 | 0x100); + this->collider.elements[0].base.acDmgInfo.dmgFlags |= (0x4000 | 0x400 | 0x100); if (params == ENGOROIWA_C000_1) { - this->collider.base.colType = COLTYPE_WOOD; + this->collider.base.colMaterial = COL_MATERIAL_WOOD; } else { - this->collider.elements[0].base.bumper.dmgFlags &= ~(0x400000 | 0x200 | 0x2); - this->collider.elements[0].base.bumper.dmgFlags |= (0x80000000 | 0x800 | 0x8); - this->collider.base.colType = COLTYPE_NONE; + this->collider.elements[0].base.acDmgInfo.dmgFlags &= ~(0x400000 | 0x200 | 0x2); + this->collider.elements[0].base.acDmgInfo.dmgFlags |= (0x80000000 | 0x800 | 0x8); + this->collider.base.colMaterial = COL_MATERIAL_NONE; } } } @@ -923,7 +923,7 @@ void func_80941060(EnGoroiwa* this, PlayState* play) { Vec3f spAC; Vec3f spA0; Vec3f sp94; - Vec3s* vec = &this->collider.elements[0].base.bumper.hitPos; + Vec3s* vec = &this->collider.elements[0].base.acDmgInfo.hitPos; s32 i; for (i = 0; i < 4; i++) { @@ -1028,7 +1028,7 @@ s32 func_8094156C(EnGoroiwa* this, PlayState* play) { Vec3f sp80; if ((this->collider.base.acFlags & AC_HIT) && ((params == ENGOROIWA_C000_1) || (params == ENGOROIWA_C000_2))) { - if (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x4000) { + if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x4000) { s16 sp7E = BINANG_SUB(actor->yawTowardsPlayer, this->actor.world.rot.y); f32 temp; f32 temp2; @@ -1082,11 +1082,12 @@ s32 func_8094156C(EnGoroiwa* this, PlayState* play) { func_80941274(this, play); phi_s0_2 = true; } else if (((params == ENGOROIWA_C000_1) && - (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & (0x400 | 0x100))) || - ((params == ENGOROIWA_C000_2) && (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & + (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & (0x400 | 0x100))) || + ((params == ENGOROIWA_C000_2) && (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & (0x80000000 | 0x800 | 0x400 | 0x100 | 0x8)))) { this->unk_1CC = 50; - if ((params == ENGOROIWA_C000_2) && (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x800)) { + if ((params == ENGOROIWA_C000_2) && + (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x800)) { this->unk_1E6 = true; } func_80940090(this, play); diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c index 23613ddd8c..563770daec 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -225,22 +225,22 @@ ActorProfile En_Grasshopper_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { DRAGONFLY_LIMB_THORAX, { { 0, 0, 0 }, 0 }, 0 }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x07, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { DRAGONFLY_LIMB_TAIL_TIP, { { 0, 0, 0 }, 0 }, 0 }, @@ -249,7 +249,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT2, + COL_MATERIAL_HIT2, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_1, @@ -526,10 +526,10 @@ void EnGrasshopper_RoamInCircles(EnGrasshopper* this, PlayState* play) { BgCheck_SphVsFirstPoly(&play->colCtx, &collisionCheckPos, 10.0f)) { EnGrasshopper_SetupBank(this); } else if (player->stateFlags1 & PLAYER_STATE1_8000000) { - this->collider.elements[0].base.toucherFlags |= (TOUCH_ON | TOUCH_SFX_WOOD); + this->collider.elements[0].base.atElemFlags |= (ATELEM_ON | ATELEM_SFX_WOOD); EnGrasshopper_RaiseTail(this); } else if (this->collider.base.atFlags & AT_BOUNCED) { - this->collider.elements[0].base.toucherFlags &= ~(TOUCH_ON | TOUCH_SFX_WOOD); + this->collider.elements[0].base.atElemFlags &= ~(ATELEM_ON | ATELEM_SFX_WOOD); EnGrasshopper_SetupBounced(this); } else { this->targetRot.z = (this->actor.world.rot.y - this->targetRot.y) * 0.2f; @@ -612,7 +612,7 @@ void EnGrasshopper_Bounced(EnGrasshopper* this, PlayState* play) { this->targetRot.z *= 0.8f; Math_SmoothStepToS(&this->actor.world.rot.y, this->targetRot.y, 5, this->angularVelocity, 5); if (this->timer == 0) { - this->collider.elements[0].base.toucherFlags |= (TOUCH_ON | TOUCH_SFX_WOOD); + this->collider.elements[0].base.atElemFlags |= (ATELEM_ON | ATELEM_SFX_WOOD); this->timer = 0; this->action = DRAGONFLY_ACTION_ROAM_IN_CIRCLES; this->waitTimer = this->timer; @@ -681,8 +681,8 @@ void EnGrasshopper_SetupAttack(EnGrasshopper* this) { Math_SmoothStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 0xA, 0xFA0, 0xA); this->actor.speed = 3.0f; this->baseFlyHeight = this->actor.world.pos.y; - this->collider.elements[0].base.toucherFlags &= ~(TOUCH_ON | TOUCH_SFX_WOOD); - this->collider.elements[1].base.toucherFlags |= (TOUCH_ON | TOUCH_SFX_WOOD); + this->collider.elements[0].base.atElemFlags &= ~(ATELEM_ON | ATELEM_SFX_WOOD); + this->collider.elements[1].base.atElemFlags |= (ATELEM_ON | ATELEM_SFX_WOOD); Actor_PlaySfx(&this->actor, NA_SE_EN_BATTA_ATTACK); this->action = DRAGONFLY_ACTION_ATTACK; this->actionFunc = EnGrasshopper_Attack; @@ -721,9 +721,9 @@ void EnGrasshopper_Attack(EnGrasshopper* this, PlayState* play) { this->bobPhase += 0xAF0; this->targetApproachPos.y = (Math_SinS(this->bobPhase) * 10.0f) + (player->actor.world.pos.y + 60.0f); - hitPos.x = this->collider.elements[1].base.bumper.hitPos.x; - hitPos.y = this->collider.elements[1].base.bumper.hitPos.y; - hitPos.z = this->collider.elements[1].base.bumper.hitPos.z; + hitPos.x = this->collider.elements[1].base.acDmgInfo.hitPos.x; + hitPos.y = this->collider.elements[1].base.acDmgInfo.hitPos.y; + hitPos.z = this->collider.elements[1].base.acDmgInfo.hitPos.z; diff.x = hitPos.x - player->actor.world.pos.x; diff.y = hitPos.y - player->actor.world.pos.y; diff.z = hitPos.z - player->actor.world.pos.z; @@ -733,7 +733,7 @@ void EnGrasshopper_Attack(EnGrasshopper* this, PlayState* play) { ((player->stateFlags1 & PLAYER_STATE1_400000) && (playerToHitPosDist <= 60.0f) && ((s16)((player->actor.shape.rot.y - this->actor.shape.rot.y) + 0x8000) < 0x2000) && ((s16)((player->actor.shape.rot.y - this->actor.shape.rot.y) + 0x8000) > -0x2000))) { - this->collider.elements[1].base.toucherFlags &= ~(TOUCH_ON | TOUCH_SFX_WOOD); + this->collider.elements[1].base.atElemFlags &= ~(ATELEM_ON | ATELEM_SFX_WOOD); } Math_ApproachF(&this->actor.world.pos.y, this->targetApproachPos.y, 0.1f, this->approachSpeed); @@ -752,7 +752,7 @@ void EnGrasshopper_SetupWaitAfterAttack(EnGrasshopper* this) { this->action = DRAGONFLY_ACTION_WAIT_AFTER_ATTACK; this->waitTimer = 20; this->actor.speed = 0.0f; - this->collider.elements[1].base.toucherFlags &= ~(TOUCH_ON | TOUCH_SFX_WOOD); + this->collider.elements[1].base.atElemFlags &= ~(ATELEM_ON | ATELEM_SFX_WOOD); this->actionFunc = EnGrasshopper_WaitAfterAttack; } @@ -764,7 +764,7 @@ void EnGrasshopper_WaitAfterAttack(EnGrasshopper* this, PlayState* play) { this->targetPosY = (Math_SinS(this->bobPhase) * 10.0f) + this->baseFlyHeight; Math_ApproachF(&this->actor.world.pos.y, this->targetPosY, 0.1f, 10.0f); if (this->waitTimer == 0) { - this->collider.elements[0].base.toucherFlags |= (TOUCH_ON | TOUCH_SFX_WOOD); + this->collider.elements[0].base.atElemFlags |= (ATELEM_ON | ATELEM_SFX_WOOD); EnGrasshopper_RaiseTail(this); } } @@ -776,7 +776,7 @@ void EnGrasshopper_SetupDamaged(EnGrasshopper* this, PlayState* play) { this->actor.speed = 0.0f; this->actor.flags |= ACTOR_FLAG_TARGETABLE; this->approachSpeed = 0.0f; - this->collider.elements[1].base.toucherFlags &= ~(TOUCH_ON | TOUCH_SFX_WOOD); + this->collider.elements[1].base.atElemFlags &= ~(ATELEM_ON | ATELEM_SFX_WOOD); Matrix_RotateYS(this->actor.yawTowardsPlayer, MTXMODE_NEW); Matrix_MultVecZ(-20.0f, &damagedVelocity); Math_Vec3f_Copy(&this->damagedVelocity, &damagedVelocity); @@ -924,8 +924,8 @@ void EnGrasshopper_UpdateDamage(EnGrasshopper* this, PlayState* play) { s32 pad; s16 attackDealsDamage = false; - if ((this->collider.elements[0].base.bumperFlags & BUMP_HIT) || - (this->collider.elements[1].base.bumperFlags & BUMP_HIT)) { + if ((this->collider.elements[0].base.acElemFlags & ACELEM_HIT) || + (this->collider.elements[1].base.acElemFlags & ACELEM_HIT)) { this->collider.base.acFlags &= ~AC_HIT; if ((this->action != DRAGONFLY_ACTION_DAMAGED) && (this->action != DRAGONFLY_ACTION_DEAD) && (this->action != DRAGONFLY_ACTION_FALL)) { diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index c0e56b9b3e..3967fc42a2 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -54,7 +54,7 @@ ActorProfile En_Gs_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -62,11 +62,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 21, 48, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c index bc03f552db..fa0ade90d6 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c @@ -39,7 +39,7 @@ ActorProfile En_Guard_Nuts_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -47,11 +47,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON | OCELEM_UNK3, }, { 50, 50, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c index 4bde49c240..d8baec584e 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -43,7 +43,7 @@ static u16 textIDs[] = { 0x292A, 0x292B, 0x292C, 0x292D, 0x292E, 0x292F, 0x2930, static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -51,11 +51,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 15, 20, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c index 8e0d38127f..4bd01ff3f1 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -72,7 +72,7 @@ ActorProfile En_Hakurock_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_NO_PUSH | OC1_TYPE_ALL, @@ -80,11 +80,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x00 }, { 0xF3CFBBFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 60, 60, -30, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c index e8e445b466..9f13365d9d 100644 --- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c @@ -34,7 +34,7 @@ ActorProfile En_Heishi_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -42,11 +42,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 20, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.c b/src/overlays/actors/ovl_En_Hg/z_en_hg.c index 729e4b3ccc..a537e5be7c 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -48,7 +48,7 @@ ActorProfile En_Hg_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -56,11 +56,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 46, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c index c1cc7b0b67..360996e134 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -70,7 +70,7 @@ static AnimationInfo sAnimationInfo[HGO_ANIM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -78,11 +78,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 18, 46, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c index 3a46bd223e..03385b9d16 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c @@ -45,7 +45,7 @@ ActorProfile En_Hidden_Nuts_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -53,11 +53,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 30, 20, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index 8aba47d7f4..e665de2b53 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -54,22 +54,22 @@ ActorProfile En_Hint_Skb_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 15, { { 0, 0, 0 }, 10 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 20 }, 100 }, @@ -78,7 +78,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c index d981392399..d7e3137446 100644 --- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c @@ -30,7 +30,7 @@ ActorProfile En_Hit_Tag_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -38,11 +38,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 16, 32, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 718b5e3e78..b603a517b5 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -88,22 +88,22 @@ ActorProfile En_Honotrap_Profile = { static ColliderTrisElementInit sTrisElementsInit[] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 23.0f, 8.5f }, { -23.0f, 0.0f, 8.5f }, { 0.0f, -23.0f, 8.5f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 23.0f, 8.5f }, { 0.0f, -23.0f, 8.5f }, { 23.0f, 0.0f, 8.5f } } }, @@ -112,7 +112,7 @@ static ColliderTrisElementInit sTrisElementsInit[] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -125,7 +125,7 @@ static ColliderTrisInit sTrisInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -133,11 +133,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x01, 0x04 }, { 0x00100000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 10, 25, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 585fadc011..f03ca37c7b 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -176,7 +176,7 @@ ActorProfile En_Horse_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE | AT_TYPE_PLAYER, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -184,11 +184,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000004, 0x00, 0x02 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_ON, }, { 20, 70, 0, { 0, 0, 0 } }, @@ -196,7 +196,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -204,11 +204,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 20, 70, 0, { 0, 0, 0 } }, @@ -217,11 +217,11 @@ static ColliderCylinderInit sCylinderInit2 = { static ColliderJntSphElementInit sJntSphElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00013820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_NO_AT_INFO | BUMP_NO_DAMAGE | BUMP_NO_SWORD_SFX | BUMP_NO_HITMARK, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK, OCELEM_ON, }, { 13, { { 0, 0, 0 }, 20 }, 100 }, @@ -230,7 +230,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -934,14 +934,14 @@ void EnHorse_Init(Actor* thisx, PlayState* play2) { this->unk_538 = OBJ_UM_ANIM_TROT; if (this->unk_1EC & 0x100) { - this->colliderCylinder1.base.colType = COLTYPE_HIT3; + this->colliderCylinder1.base.colMaterial = COL_MATERIAL_HIT3; this->colliderCylinder1.base.acFlags |= (AC_TYPE_PLAYER | AC_ON); - this->colliderCylinder1.elem.bumperFlags |= BUMP_ON; - this->colliderCylinder1.elem.bumper.dmgFlags = 0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20; - this->colliderCylinder2.base.colType = COLTYPE_HIT3; + this->colliderCylinder1.elem.acElemFlags |= ACELEM_ON; + this->colliderCylinder1.elem.acDmgInfo.dmgFlags = 0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20; + this->colliderCylinder2.base.colMaterial = COL_MATERIAL_HIT3; this->colliderCylinder2.base.acFlags |= (AC_TYPE_PLAYER | AC_ON); - this->colliderCylinder2.elem.bumperFlags |= BUMP_ON; - this->colliderCylinder2.elem.bumper.dmgFlags = 0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20; + this->colliderCylinder2.elem.acElemFlags |= ACELEM_ON; + this->colliderCylinder2.elem.acDmgInfo.dmgFlags = 0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20; } } diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 92d59fe889..85fd7c273a 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -62,11 +62,11 @@ static AnimationHeader* sAnimations[OOT_CHILD_EPONA_ANIM_MAX] = { static ColliderJntSphElementInit sJntSphElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 13, { { 0, 0, 0 }, 10 }, 100 }, @@ -75,7 +75,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 26ddded8df..0b665f72d6 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -37,7 +37,7 @@ ActorProfile En_Hs_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -45,11 +45,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 40, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c index e97cfcc2ba..f8bbe619d0 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -127,7 +127,7 @@ ActorProfile En_Ig_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -135,11 +135,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 28, 62, 0, { 0, 0, 0 } }, @@ -147,7 +147,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -155,11 +155,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 20 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 90478e7f5e..d1af910d9d 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -89,7 +89,7 @@ ActorProfile En_Ik_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -97,11 +97,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 25, 80, 0, { 0, 0, 0 } }, @@ -110,22 +110,22 @@ static ColliderCylinderInit sCylinderInit = { static ColliderTrisElementInit sTrisElementsInit[2] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -10.0f, 14.0f, 2.0f }, { -10.0f, -6.0f, 2.0f }, { 9.0f, 14.0f, 2.0f } } }, }, { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -10.0f, -6.0f, 2.0f }, { 9.0f, -6.0f, 2.0f }, { 9.0f, 14.0f, 2.0f } } }, @@ -134,7 +134,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -147,7 +147,7 @@ static ColliderTrisInit sTrisInit = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -155,11 +155,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x04, 0x40 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL | TOUCH_UNK7, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -327,8 +327,8 @@ void EnIk_HitArmor(EnIk* this, PlayState* play) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.65f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->colliderCylinder.elem.bumper.hitPos.x, - this->colliderCylinder.elem.bumper.hitPos.y, this->colliderCylinder.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->colliderCylinder.elem.acDmgInfo.hitPos.x, + this->colliderCylinder.elem.acDmgInfo.hitPos.y, this->colliderCylinder.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } @@ -786,7 +786,7 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) { this->colliderCylinder.base.acFlags &= ~AC_HIT; if ((this->actor.colChkInfo.damageEffect != DMG_EFF_IMMUNE) && ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->colliderCylinder.elem.acHitElem->toucher.dmgFlags & 0xDB0B3))) { + !(this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3))) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 12); this->invincibilityFrames = 12; EnIk_Thaw(this, play); @@ -802,7 +802,7 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) { } if (isArmorBroken == true) { this->drawArmorFlags = 1; - this->colliderCylinder.base.colType = 3; + this->colliderCylinder.base.colMaterial = COL_MATERIAL_HIT3; this->actor.colChkInfo.damageTable = &sDamageTableNoArmor; Actor_PlaySfx(&this->actor, NA_SE_EN_IRONNACK_ARMOR_OFF_DEMO); EnIk_SetupCutscene(this); diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 2946faf053..1b82157f6e 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -36,7 +36,7 @@ ActorProfile En_In_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -44,11 +44,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, @@ -57,11 +57,11 @@ static ColliderCylinderInit sCylinderInit = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 12, { { 1600, 0, 0 }, 5 }, 200 }, @@ -70,7 +70,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 068393f457..f0f5219f6f 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -46,11 +46,11 @@ ActorProfile En_Insect_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 5 }, 100 }, @@ -59,7 +59,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_1, diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c index 5805db48f7..78afc87d22 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -248,7 +248,7 @@ ActorProfile En_Invadepoh_Profile = { static ColliderCylinderInit sAlienCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -256,11 +256,11 @@ static ColliderCylinderInit sAlienCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0xF7CFFFFF, 0x00, 0x04 }, { 0x00003820, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 40, 95, 10, { 0, 0, 0 } }, @@ -268,7 +268,7 @@ static ColliderCylinderInit sAlienCylinderInit = { static ColliderCylinderInit sRomaniAndCremiaCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -276,11 +276,11 @@ static ColliderCylinderInit sRomaniAndCremiaCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 18, 46, 0, { 0, 0, 0 } }, @@ -288,7 +288,7 @@ static ColliderCylinderInit sRomaniAndCremiaCylinderInit = { static ColliderCylinderInit sDogCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -296,11 +296,11 @@ static ColliderCylinderInit sDogCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 13, 19, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c index ac925ea698..91f77fa351 100644 --- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c @@ -32,7 +32,7 @@ ActorProfile En_Invisible_Ruppe_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_NO_PUSH | OC1_TYPE_PLAYER, @@ -41,11 +41,11 @@ static ColliderCylinderInit sCylinderInit = { }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 32ad580bbb..b26a520c1a 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -76,7 +76,7 @@ static s16 sObjectIds[] = { GAMEPLAY_FIELD_KEEP, OBJECT_ISHI }; static ColliderCylinderInit sCylinderInit[] = { { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -84,18 +84,18 @@ static ColliderCylinderInit sCylinderInit[] = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00400000, 0x00, 0x02 }, { 0x01C37FBE, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 10, 18, -2, { 0, 0, 0 } }, }, { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -103,11 +103,11 @@ static ColliderCylinderInit sCylinderInit[] = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00400000, 0x00, 0x02 }, { 0x01C37BB6, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 55, 70, 0, { 0, 0, 0 } }, @@ -482,7 +482,7 @@ void func_8095E660(EnIshi* this, PlayState* play) { return; } - if (sp34 && (sp38 == 0) && (this->collider.elem.acHitElem->toucher.dmgFlags & 0x508)) { + if (sp34 && (sp38 == 0) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x508)) { if (sp30 != 0) { func_8095DFF0(this, play); func_8095F060(this); @@ -504,9 +504,9 @@ void func_8095E660(EnIshi* this, PlayState* play) { if (this->unk_195 > 0) { this->unk_195--; if (this->unk_195 == 0) { - this->collider.base.colType = sCylinderInit[sp38].base.colType; + this->collider.base.colMaterial = sCylinderInit[sp38].base.colMaterial; } else { - this->collider.base.colType = COLTYPE_NONE; + this->collider.base.colMaterial = COL_MATERIAL_NONE; } } diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.c b/src/overlays/actors/ovl_En_Ja/z_en_ja.c index 4cb6d60c65..dc7f1f60ea 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.c +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -122,7 +122,7 @@ Vec3f D_80BC36D0 = { 0.0f, 58.0f, 20.0f }; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -130,11 +130,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 12, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c index 52ca92f535..1bfd1fff8a 100644 --- a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c +++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c @@ -34,7 +34,7 @@ ActorProfile En_Jc_Mato_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -42,11 +42,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 15 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.c b/src/overlays/actors/ovl_En_Jg/z_en_jg.c index ecb3713939..840c92dbdd 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -56,7 +56,7 @@ ActorProfile En_Jg_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -64,11 +64,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 60, 80, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index a7815196aa..48476e90f2 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -64,7 +64,7 @@ static AnimationInfo sAnimationInfo[ENJGAMETSN_ANIM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -72,11 +72,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 63b43e7b6d..d389e145bc 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -41,7 +41,7 @@ ActorProfile En_Js_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -49,11 +49,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.c b/src/overlays/actors/ovl_En_Jso/z_en_jso.c index 48b904b3d6..b2e8c28f91 100644 --- a/src/overlays/actors/ovl_En_Jso/z_en_jso.c +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.c @@ -166,7 +166,7 @@ ActorProfile En_Jso_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -174,11 +174,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x08, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 22, 55, 0, { 0, 0, 0 } }, @@ -186,7 +186,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -194,11 +194,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL | TOUCH_UNK7, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -804,7 +804,7 @@ void EnJso_SpinBeforeAttack(EnJso* this, PlayState* play) { void EnJso_SetupDashAttack(EnJso* this) { this->action = EN_JSO_ACTION_DASH_ATTACK; this->attackMovementTimer = 40; - this->bodyCollider.base.colType = COLTYPE_HIT2; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HIT2; this->bodyCollider.base.acFlags &= ~AC_HARD; this->actor.speed = 15.0f; this->actor.velocity.y = 13.0f; @@ -938,7 +938,7 @@ void EnJso_SetupWaitAfterSlash(EnJso* this) { void EnJso_WaitAfterSlash(EnJso* this, PlayState* play) { if (this->timer == 0) { this->attackTimer = Rand_S16Offset(30, 30); - this->bodyCollider.base.colType = COLTYPE_NONE; + this->bodyCollider.base.colMaterial = COL_MATERIAL_NONE; this->bodyCollider.base.acFlags |= AC_HARD; this->slashHitSomething = false; sIsAttacking = false; @@ -1428,7 +1428,7 @@ void EnJso_UpdateDamage(EnJso* this, PlayState* play) { if (attackDealsDamage) { Actor_ApplyDamage(&this->actor); - this->bodyCollider.base.colType = COLTYPE_NONE; + this->bodyCollider.base.colMaterial = COL_MATERIAL_NONE; this->bodyCollider.base.acFlags |= AC_HARD; if (this->actor.colChkInfo.health > 0) { EnJso_SetupDamaged(this, play); diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c index 5f9ed4401f..7691c29de8 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -228,7 +228,7 @@ ActorProfile En_Jso2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -236,11 +236,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x08, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 22, 70, 0, { 0, 0, 0 } }, @@ -248,7 +248,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -256,11 +256,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x09, 0x10 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL | TOUCH_UNK7, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c index 31ec43dc00..072624ad82 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -165,7 +165,7 @@ ActorProfile En_Kaizoku_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -173,11 +173,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 20, 50, 0, { 0, 0, 0 } }, @@ -185,7 +185,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -193,11 +193,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL | TOUCH_UNK7, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -1101,9 +1101,9 @@ void func_80B87C7C(EnKaizoku* this) { this->picto.actor.velocity.y = 15.0f; Actor_PlaySfx(&this->picto.actor, NA_SE_EN_TEKU_JUMP); this->picto.actor.world.rot.y = this->picto.actor.shape.rot.y; - this->bodyCollider.elem.elemType = ELEMTYPE_UNK4; - this->bodyCollider.base.colType = COLTYPE_NONE; - this->swordCollider.elem.elemType = ELEMTYPE_UNK4; + this->bodyCollider.elem.elemMaterial = ELEM_MATERIAL_UNK4; + this->bodyCollider.base.colMaterial = COL_MATERIAL_NONE; + this->swordCollider.elem.elemMaterial = ELEM_MATERIAL_UNK4; this->action = KAIZOKU_ACTION_6; this->actionFunc = func_80B87D3C; } @@ -1130,9 +1130,9 @@ void func_80B87D3C(EnKaizoku* this, PlayState* play) { this->unk_2D8 = 0; if ((curFrame >= this->animEndFrame) && (this->picto.actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_GROUND_TOUCH))) { - this->bodyCollider.elem.elemType = ELEMTYPE_UNK1; - this->bodyCollider.base.colType = COLTYPE_HIT3; - this->swordCollider.elem.elemType = ELEMTYPE_UNK2; + this->bodyCollider.elem.elemMaterial = ELEM_MATERIAL_UNK1; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HIT3; + this->swordCollider.elem.elemMaterial = ELEM_MATERIAL_UNK2; this->picto.actor.shape.rot.x = 0; this->picto.actor.world.rot.y = this->picto.actor.shape.rot.y = this->picto.actor.yawTowardsPlayer; this->picto.actor.speed = 0.0f; @@ -1146,9 +1146,9 @@ void func_80B87E28(EnKaizoku* this) { EnKaizoku_ChangeAnim(this, EN_KAIZOKU_ANIM_8); this->picto.actor.speed = -8.0f; Actor_PlaySfx(&this->picto.actor, NA_SE_EN_TEKU_JUMP); - this->bodyCollider.elem.elemType = ELEMTYPE_UNK4; - this->bodyCollider.base.colType = COLTYPE_NONE; - this->swordCollider.elem.elemType = ELEMTYPE_UNK4; + this->bodyCollider.elem.elemMaterial = ELEM_MATERIAL_UNK4; + this->bodyCollider.base.colMaterial = COL_MATERIAL_NONE; + this->swordCollider.elem.elemMaterial = ELEM_MATERIAL_UNK4; this->action = KAIZOKU_ACTION_7; this->actionFunc = func_80B87E9C; this->picto.actor.shape.rot.y = this->picto.actor.world.rot.y = this->picto.actor.yawTowardsPlayer; @@ -1658,7 +1658,7 @@ void func_80B894C0(EnKaizoku* this, PlayState* play) { } if ((this->picto.actor.xzDistToPlayer <= 65.0f) && ((play->gameplayFrames % 8) != 0)) { - this->swordCollider.elem.elemType = ELEMTYPE_UNK2; + this->swordCollider.elem.elemMaterial = ELEM_MATERIAL_UNK2; func_80B87F70(this); } else { func_80B87E28(this); @@ -1768,9 +1768,9 @@ void func_80B89A08(EnKaizoku* this, PlayState* play) { s32 i; if (gSaveContext.save.saveInfo.playerData.health <= 0x10) { - this->swordCollider.elem.toucher.damage = 0; + this->swordCollider.elem.atDmgInfo.damage = 0; } else { - this->swordCollider.elem.toucher.damage = 4; + this->swordCollider.elem.atDmgInfo.damage = 4; } if (!(this->swordCollider.base.atFlags & AT_BOUNCED) && (this->swordCollider.base.atFlags & AT_HIT)) { @@ -1841,9 +1841,9 @@ void func_80B89A08(EnKaizoku* this, PlayState* play) { this->unk_2B8 == 0) { Actor_SetColorFilter(&this->picto.actor, COLORFILTER_COLORFLAG_BLUE, 120, COLORFILTER_BUFFLAG_OPA, 40); - this->bodyCollider.elem.elemType = ELEMTYPE_UNK1; - this->bodyCollider.base.colType = COLTYPE_HIT3; - this->swordCollider.elem.elemType = ELEMTYPE_UNK2; + this->bodyCollider.elem.elemMaterial = ELEM_MATERIAL_UNK1; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HIT3; + this->swordCollider.elem.elemMaterial = ELEM_MATERIAL_UNK2; func_80B891B8(this); } break; @@ -1881,9 +1881,9 @@ void func_80B89A08(EnKaizoku* this, PlayState* play) { (this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX)) || (this->unk_2B8 == 0)) { Actor_ApplyDamage(&this->picto.actor); - this->bodyCollider.elem.elemType = ELEMTYPE_UNK1; - this->bodyCollider.base.colType = COLTYPE_HIT3; - this->swordCollider.elem.elemType = ELEMTYPE_UNK4; + this->bodyCollider.elem.elemMaterial = ELEM_MATERIAL_UNK1; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HIT3; + this->swordCollider.elem.elemMaterial = ELEM_MATERIAL_UNK4; this->unk_2B8 = 80; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_SFX; this->drawDmgEffScale = 0.0f; @@ -1922,9 +1922,9 @@ void func_80B89A08(EnKaizoku* this, PlayState* play) { return; } - this->bodyCollider.elem.elemType = ELEMTYPE_UNK1; - this->bodyCollider.base.colType = COLTYPE_HIT3; - this->swordCollider.elem.elemType = ELEMTYPE_UNK4; + this->bodyCollider.elem.elemMaterial = ELEM_MATERIAL_UNK1; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HIT3; + this->swordCollider.elem.elemMaterial = ELEM_MATERIAL_UNK4; Math_Vec3f_Copy(&sp58, &this->picto.actor.focus.pos); for (i = 0; i < 3; i++) { sp58.y += Rand_ZeroFloat(20.0f); @@ -1939,9 +1939,9 @@ void func_80B89A08(EnKaizoku* this, PlayState* play) { Vec3f pos; Player* player = GET_PLAYER(play); - pos.x = this->bodyCollider.elem.bumper.hitPos.x; - pos.y = this->bodyCollider.elem.bumper.hitPos.y; - pos.z = this->bodyCollider.elem.bumper.hitPos.z; + pos.x = this->bodyCollider.elem.acDmgInfo.hitPos.x; + pos.y = this->bodyCollider.elem.acDmgInfo.hitPos.y; + pos.z = this->bodyCollider.elem.acDmgInfo.hitPos.z; if (player->transformation != PLAYER_FORM_HUMAN) { player->pushedYaw = this->picto.actor.yawTowardsPlayer; diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index dd4cf95ef6..19fe42380e 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -52,7 +52,7 @@ void EnKakasi_SetupDialogue(EnKakasi* this); static ColliderCylinderInit D_80971D80 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -60,11 +60,11 @@ static ColliderCylinderInit D_80971D80 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 20, 70, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c index 5897d38414..fba7e7d560 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -71,7 +71,7 @@ ActorProfile En_Kame_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -79,11 +79,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CF7FFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 35, 40, 0, { 0, 0, 0 } }, @@ -195,7 +195,7 @@ void EnKame_Freeze(EnKame* this) { this->drawDmgEffScale = 0.6f; this->drawDmgEffFrozenSteamScale = 900.0f * 0.001f; this->drawDmgEffAlpha = 1.0f; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->stunTimer = 80; this->actor.flags &= ~ACTOR_FLAG_400; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -204,7 +204,7 @@ void EnKame_Freeze(EnKame* this) { void EnKame_Thaw(EnKame* this, PlayState* play) { if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->collider.base.colType = COLTYPE_HIT6; + this->collider.base.colMaterial = COL_MATERIAL_HIT6; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, SNAPPER_BODYPART_MAX, 2, 0.3f, 0.2f); this->actor.flags |= ACTOR_FLAG_400; @@ -243,7 +243,7 @@ void EnKame_SetupWalk(EnKame* this) { this->timer = Animation_GetLastFrame(&gSnapperWalkAnim) * ((s32)Rand_ZeroFloat(5.0f) + 3); this->targetRotY = this->actor.shape.rot.y; this->collider.base.acFlags |= (AC_HARD | AC_ON); - this->collider.base.colType = COLTYPE_HARD; + this->collider.base.colMaterial = COL_MATERIAL_HARD; this->actionFunc = EnKame_Walk; } @@ -530,11 +530,11 @@ void EnKame_SetupFlip(EnKame* this) { if (this->actionFunc == EnKame_Struggle) { Animation_MorphToPlayOnce(&this->snapperSkelAnime, &gSnapperBouncedUprightAnim, -3.0f); this->flipType = EN_KAME_FLIP_TYPE_RIGHTSIDE_UP; - this->collider.elem.bumper.dmgFlags &= ~0x8000; + this->collider.elem.acDmgInfo.dmgFlags &= ~0x8000; } else { Animation_MorphToPlayOnce(&this->snapperSkelAnime, &gSnapperFlipOverAnim, -3.0f); this->flipType = EN_KAME_FLIP_TYPE_UPSIDE_DOWN; - this->collider.elem.bumper.dmgFlags |= 0x8000; + this->collider.elem.acDmgInfo.dmgFlags |= 0x8000; } this->actor.draw = EnKame_Draw; @@ -567,7 +567,7 @@ void EnKame_SetupStruggle(EnKame* this) { Animation_MorphToPlayOnce(&this->snapperSkelAnime, &gSnapperWiggleLegsAnim, -3.0f); this->collider.base.acFlags |= AC_ON; this->collider.base.acFlags &= ~AC_HARD; - this->collider.base.colType = COLTYPE_HIT6; + this->collider.base.colMaterial = COL_MATERIAL_HIT6; this->actor.speed = 0.0f; this->actionFunc = EnKame_Struggle; } @@ -611,7 +611,7 @@ void EnKame_FlipUpright(EnKame* this, PlayState* play) { // See EnKame_PostLimbDraw and EnKame_Draw for more information. this->actor.shape.shadowDraw = NULL; this->collider.base.acFlags &= ~AC_ON; - this->collider.elem.bumper.dmgFlags &= ~0x8000; + this->collider.elem.acDmgInfo.dmgFlags &= ~0x8000; } } @@ -764,7 +764,7 @@ void EnKame_UpdateDamage(EnKame* this, PlayState* play) { Actor_SetDropFlag(&this->actor, &this->collider.elem); if ((this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) && - (this->collider.elem.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { return; } @@ -817,8 +817,8 @@ void EnKame_UpdateDamage(EnKame* this, PlayState* play) { this->drawDmgEffScale = 0.6f; this->drawDmgEffAlpha = 4.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index dc5578f40a..4aff45e044 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -31,7 +31,7 @@ ActorProfile En_Kanban_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -39,11 +39,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF3CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 50, 5, { 0, 0, 0 } }, @@ -250,9 +250,9 @@ void EnKanban_Update(Actor* thisx, PlayState* play) { s16 yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; u8 i; - if (acHitElem->toucher.dmgFlags & 0x200) { + if (acHitElem->atDmgInfo.dmgFlags & 0x200) { this->cutType = sCutTypes[player->meleeWeaponAnimation]; - } else if (acHitElem->toucher.dmgFlags & 0x10) { + } else if (acHitElem->atDmgInfo.dmgFlags & 0x10) { this->invincibilityTimer = 0; this->cutType = this->unk_19A + 3; this->unk_19A = 1 - this->unk_19A; @@ -264,7 +264,7 @@ void EnKanban_Update(Actor* thisx, PlayState* play) { this->cutType = 0; } - if ((ABS_ALT(yawDiff) > 0x4000) && !(acHitElem->toucher.dmgFlags & 0x10)) { + if ((ABS_ALT(yawDiff) > 0x4000) && !(acHitElem->atDmgInfo.dmgFlags & 0x10)) { if (this->cutType == 4) { this->cutType = 3; } else if (this->cutType == 1) { @@ -361,8 +361,8 @@ void EnKanban_Update(Actor* thisx, PlayState* play) { piece->actor.world.rot.y = BINANG_ROT180((s32)Rand_CenteredFloat(0x4000) + this->actor.yawTowardsPlayer); - if ((acHitElem->toucher.dmgFlags & 0x10) || (acHitElem->toucher.dmgFlags & 8) || - (acHitElem->toucher.dmgFlags & 0x80000000)) { + if ((acHitElem->atDmgInfo.dmgFlags & 0x10) || (acHitElem->atDmgInfo.dmgFlags & 8) || + (acHitElem->atDmgInfo.dmgFlags & 0x80000000)) { piece->actor.velocity.y = Rand_ZeroFloat(3.0f) + 6.0f; piece->actor.speed = Rand_ZeroFloat(4.0f) + 6.0f; } else { diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 3f99627679..b2b0da801b 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -53,7 +53,7 @@ ActorProfile En_Karebaba_Profile = { static ColliderCylinderInit sHurtCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -61,11 +61,11 @@ static ColliderCylinderInit sHurtCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 7, 25, 0, { 0, 0, 0 } }, @@ -73,7 +73,7 @@ static ColliderCylinderInit sHurtCylinderInit = { static ColliderCylinderInit sAttackCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -81,11 +81,11 @@ static ColliderCylinderInit sAttackCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_WOOD, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_WOOD, + ACELEM_NONE, OCELEM_ON, }, { 4, 25, 0, { 0, 0, 0 } }, @@ -202,8 +202,8 @@ void EnKarebaba_SetDamageEffects(EnKarebaba* this, PlayState* play) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; this->drawDmgEffAlpha = 3.0f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->hurtCollider.elem.bumper.hitPos.x, - this->hurtCollider.elem.bumper.hitPos.y, this->hurtCollider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->hurtCollider.elem.acDmgInfo.hitPos.x, + this->hurtCollider.elem.acDmgInfo.hitPos.y, this->hurtCollider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_SMALL_LIGHT_RAYS)); } else if (this->actor.colChkInfo.damageEffect == KAREBABA_DMGEFF_ICE) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; @@ -220,7 +220,7 @@ void EnKarebaba_SetDamageEffects(EnKarebaba* this, PlayState* play) { void EnKarebaba_ResetColliders(EnKarebaba* this) { this->hurtCollider.dim.radius = 7; this->hurtCollider.dim.height = 25; - this->hurtCollider.base.colType = COLTYPE_HARD; + this->hurtCollider.base.colMaterial = COL_MATERIAL_HARD; this->hurtCollider.base.acFlags |= AC_HARD; this->attackCollider.dim.height = 25; } @@ -287,7 +287,7 @@ void EnKarebaba_SetupUpright(EnKarebaba* this) { if (this->actionFunc != EnKarebaba_Spin) { Actor_SetScale(&this->actor, 0.01f); - this->hurtCollider.base.colType = COLTYPE_HIT6; + this->hurtCollider.base.colMaterial = COL_MATERIAL_HIT6; this->hurtCollider.base.acFlags &= ~AC_HARD; this->hurtCollider.dim.radius = 15; diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c index f979453812..a978367621 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c @@ -51,7 +51,7 @@ ActorProfile En_Kendo_Js_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -59,11 +59,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 18, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c index 9ddf96dfeb..647222cc51 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c @@ -32,7 +32,7 @@ ActorProfile En_Kitan_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -40,11 +40,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.c b/src/overlays/actors/ovl_En_Knight/z_en_knight.c index 8179ea5597..e315cf259f 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.c +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -209,11 +209,11 @@ static DamageTable sDamageTableFallenOver = { static ColliderJntSphElementInit sKnightSwordColliderJntSphElementsInit[1] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 27 }, 100 }, @@ -223,11 +223,11 @@ static ColliderJntSphElementInit sKnightSwordColliderJntSphElementsInit[1] = { static ColliderJntSphElementInit sIgosSwordColliderJntSphElementsInit[1] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 32 }, 100 }, @@ -236,7 +236,7 @@ static ColliderJntSphElementInit sIgosSwordColliderJntSphElementsInit[1] = { static ColliderJntSphInit sKnightSwordColliderJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -249,7 +249,7 @@ static ColliderJntSphInit sKnightSwordColliderJntSphInit = { static ColliderJntSphInit sIgosSwordColliderJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -263,11 +263,11 @@ static ColliderJntSphInit sIgosSwordColliderJntSphInit = { static ColliderJntSphElementInit sShieldColliderJntSphElementsInit[1] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 27 }, 100 }, @@ -276,7 +276,7 @@ static ColliderJntSphElementInit sShieldColliderJntSphElementsInit[1] = { static ColliderJntSphInit sShieldColliderJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -290,22 +290,22 @@ static ColliderJntSphInit sShieldColliderJntSphInit = { static ColliderJntSphElementInit sBodyColliderJntSphElementsInit[2] = { { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7EFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7EFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 17 }, 100 }, @@ -314,7 +314,7 @@ static ColliderJntSphElementInit sBodyColliderJntSphElementsInit[2] = { static ColliderJntSphInit sBodyColliderJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_1, @@ -327,7 +327,7 @@ static ColliderJntSphInit sBodyColliderJntSphInit = { static ColliderCylinderInit sHeadAttackColliderCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -335,11 +335,11 @@ static ColliderCylinderInit sHeadAttackColliderCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 15, 20, -10, { 0, 0, 0 } }, @@ -347,7 +347,7 @@ static ColliderCylinderInit sHeadAttackColliderCylinderInit = { static ColliderCylinderInit sHeadColliderCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ALL, AC_ON | AC_TYPE_PLAYER | AC_TYPE_ENEMY | AC_TYPE_OTHER, OC1_ON | OC1_TYPE_ALL, @@ -355,11 +355,11 @@ static ColliderCylinderInit sHeadColliderCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7FFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 40, 0, { 0, 0, 0 } }, @@ -1349,7 +1349,7 @@ void EnKnight_Retreat(EnKnight* this, PlayState* play) { goto common_case; common_case: - this->bodyCollider.base.colType = COLTYPE_NONE; + this->bodyCollider.base.colMaterial = COL_MATERIAL_NONE; Math_ApproachZeroF(&this->actor.speed, 1.0f, 1.0f); if (this->animLastFrame > 10.0f) { @@ -1586,8 +1586,8 @@ void EnKnight_FallOver(EnKnight* this, PlayState* play) { } else { this->actor.colChkInfo.health = 6 - BREG(40); } - this->bodyCollider.elements[0].base.bumperFlags &= ~BUMP_HIT; - this->bodyCollider.elements[1].base.bumperFlags &= ~BUMP_HIT; + this->bodyCollider.elements[0].base.acElemFlags &= ~ACELEM_HIT; + this->bodyCollider.elements[1].base.acElemFlags &= ~ACELEM_HIT; this->actor.colChkInfo.damageTable = &sDamageTableStanding; this->invincibilityTimer = 25; } @@ -3059,8 +3059,8 @@ void EnKnight_UpdateDamage(EnKnight* this, PlayState* play) { Vec3f translation; Player* player = GET_PLAYER(play); - if (this->shieldCollider.elements[0].base.bumperFlags & BUMP_HIT) { - this->shieldCollider.elements[0].base.bumperFlags &= ~BUMP_HIT; + if (this->shieldCollider.elements[0].base.acElemFlags & ACELEM_HIT) { + this->shieldCollider.elements[0].base.acElemFlags &= ~ACELEM_HIT; this->shieldingInvulnerabilityTimer = 5; if ((player->meleeWeaponState != PLAYER_MWA_FORWARD_SLASH_1H) && @@ -3081,8 +3081,8 @@ void EnKnight_UpdateDamage(EnKnight* this, PlayState* play) { continue; } - if (this->bodyCollider.elements[i].base.bumperFlags & BUMP_HIT) { - this->bodyCollider.elements[i].base.bumperFlags &= ~BUMP_HIT; + if (this->bodyCollider.elements[i].base.acElemFlags & ACELEM_HIT) { + this->bodyCollider.elements[i].base.acElemFlags &= ~ACELEM_HIT; switch (this->actor.colChkInfo.damageEffect) { case KNIGHT_DMGEFF_ICE: @@ -3162,13 +3162,13 @@ void EnKnight_UpdateDamageFallenOver(EnKnight* this, PlayState* play) { ColliderJntSphElement* jntSphElem = &this->bodyCollider.elements[i]; ColliderElement* acHitElem; - if (jntSphElem->base.bumperFlags & BUMP_HIT) { - jntSphElem->base.bumperFlags &= ~BUMP_HIT; + if (jntSphElem->base.acElemFlags & ACELEM_HIT) { + jntSphElem->base.acElemFlags &= ~ACELEM_HIT; acHitElem = jntSphElem->base.acHitElem; this->invincibilityTimer = 10; - if (acHitElem->toucher.dmgFlags & DMG_LIGHT_RAY) { + if (acHitElem->atDmgInfo.dmgFlags & DMG_LIGHT_RAY) { this->damageFlashTimer = 15; this->invincibilityTimer = 1000; EnKnight_SetupDie(this, play); @@ -3656,7 +3656,7 @@ void EnKnight_Update(Actor* thisx, PlayState* play) { this->swordColliderActive = false; this->shieldColliderActive = false; this->canRetreat = false; - this->bodyCollider.base.colType = COLTYPE_HIT3; + this->bodyCollider.base.colMaterial = COL_MATERIAL_HIT3; if (((KREG(63) == 0) && (this != sIgosInstance)) || ((KREG(63) != 2) && (this == sIgosInstance))) { for (i = 0; i < ARRAY_COUNT(this->timers); i++) { diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index aa78dc0fc3..56cfd5d686 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -74,7 +74,7 @@ static s16 sObjectIds[] = { GAMEPLAY_FIELD_KEEP, OBJECT_KUSA, OBJECT_KUSA, OBJEC static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_2, @@ -82,11 +82,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00400000, 0x00, 0x02 }, { 0x0580C71C, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 6, 44, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index 806c6b1b96..6d88efc586 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -67,7 +67,7 @@ ActorProfile En_Kusa2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_2, @@ -75,11 +75,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x0580C71C, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 6, 44, 0, { 0, 0, 0 } }, @@ -378,7 +378,7 @@ s32 func_80A5BFD8(EnKusa2* this, PlayState* play) { s32 pad; func_80A5CF44(this); - func_80A5BD14(this, play, (this->collider.elem.acHitElem->toucher.dmgFlags & 0x1000000) ? 1 : 0); + func_80A5BD14(this, play, (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x1000000) ? 1 : 0); SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 20, NA_SE_EV_PLANT_BROKEN); func_80A5BD94(this); Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c index dbe186e5d2..b117da0382 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c @@ -113,7 +113,7 @@ static s32 sPad = 0; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -121,11 +121,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 25, 75, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c index f1a70f4d6b..3cbb5158f8 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -38,7 +38,7 @@ ActorProfile En_Look_Nuts_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 20, 50, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index d596587f1a..c0eba8ef5b 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -28,7 +28,7 @@ ActorProfile En_M_Fire1_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -36,11 +36,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000001, 0x00, 0x01 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_NONE, }, { 100, 100, 0, { 0, 0, 0 } }, @@ -53,7 +53,7 @@ void EnMFire1_Init(Actor* thisx, PlayState* play) { Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); if (this->actor.params != 0) { - this->collider.elem.toucher.dmgFlags = 0x40000; + this->collider.elem.atDmgInfo.dmgFlags = 0x40000; } } diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 79eb496cf7..9aefd9a556 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -43,7 +43,7 @@ ActorProfile En_M_Thunder_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -51,11 +51,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x01000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 200, 200, 0, { 0, 0, 0 } }, @@ -146,7 +146,7 @@ void EnMThunder_Init(Actor* thisx, PlayState* play) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK)) { player->unk_B08 = 1.0f; - this->collider.elem.toucher.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX]; + this->collider.elem.atDmgInfo.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX]; this->subtype = ENMTHUNDER_SUBTYPE_SPIN_GREAT; if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) { this->scaleTarget = 6; @@ -157,7 +157,7 @@ void EnMThunder_Init(Actor* thisx, PlayState* play) { } } else { player->unk_B08 = 0.5f; - this->collider.elem.toucher.damage = sDamages[this->type]; + this->collider.elem.atDmgInfo.damage = sDamages[this->type]; this->subtype = ENMTHUNDER_SUBTYPE_SPIN_REGULAR; if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) { this->scaleTarget = 4; @@ -173,8 +173,8 @@ void EnMThunder_Init(Actor* thisx, PlayState* play) { this->actionFunc = EnMThunder_SwordBeam_Attack; this->timer = 1; this->scaleTarget = 12; - this->collider.elem.toucher.dmgFlags = DMG_SWORD_BEAM; - this->collider.elem.toucher.damage = 3; + this->collider.elem.atDmgInfo.dmgFlags = DMG_SWORD_BEAM; + this->collider.elem.atDmgInfo.damage = 3; } else { this->actionFunc = EnMThunder_Spin_Attack; this->timer = 8; @@ -275,7 +275,7 @@ void EnMThunder_Charge(EnMThunder* this, PlayState* play) { } if (player->unk_B08 < 0.85f) { - this->collider.elem.toucher.damage = sDamages[this->type]; + this->collider.elem.atDmgInfo.damage = sDamages[this->type]; this->subtype = ENMTHUNDER_SUBTYPE_SPIN_REGULAR; if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) { this->scaleTarget = 4; @@ -285,7 +285,7 @@ void EnMThunder_Charge(EnMThunder* this, PlayState* play) { this->scaleTarget = 2; } } else { - this->collider.elem.toucher.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX]; + this->collider.elem.atDmgInfo.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX]; this->subtype = ENMTHUNDER_SUBTYPE_SPIN_GREAT; if (this->type == ENMTHUNDER_TYPE_GREAT_FAIRYS_SWORD) { this->scaleTarget = 6; diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c index b012ccb8c7..2202ef6101 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -68,7 +68,7 @@ ActorProfile En_Ma4_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -76,11 +76,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 18, 46, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c index 101449c0b9..f70912addb 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c @@ -83,7 +83,7 @@ ActorProfile En_Ma_Yto_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -91,11 +91,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 18, 46, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c index b9ceb93e38..d61db87e39 100644 --- a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c +++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c @@ -55,7 +55,7 @@ void EnMaYts_UpdateEyes(EnMaYts* this) { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -63,11 +63,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 18, 46, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c index 0d35e2ff2b..8d8a132489 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -150,7 +150,7 @@ Vec3f D_80B38A9C[] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -158,11 +158,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 12, 65, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c index 472dd19d4c..c3d3fadf71 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -54,33 +54,33 @@ ActorProfile En_Minideath_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[3] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, @@ -89,7 +89,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[3] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE | OC1_TYPE_ALL, @@ -301,8 +301,8 @@ void EnMinideath_UpdateEffects(EnMinideath* this, PlayState* play) { } else if (this->actionFunc == EnMinideath_CrowdParent) { Math_Vec3f_Diff(&this->actor.parent->focus.pos, &this->actor.world.pos, &effect->vel); effect->state = 0; - this->collider.elements[i].base.bumperFlags |= BUMP_ON; - this->collider.elements[i].base.toucherFlags |= TOUCH_ON; + this->collider.elements[i].base.acElemFlags |= ACELEM_ON; + this->collider.elements[i].base.atElemFlags |= ATELEM_ON; phi_s7 = 1; phi_s3++; } @@ -754,9 +754,9 @@ void EnMinideath_UpdateDamage(EnMinideath* this, PlayState* play) { s32 phi_a0; for (i = 0; i < MINIDEATH_NUM_EFFECTS; i++) { - if (this->collider.elements[i].base.bumperFlags & BUMP_HIT) { - this->collider.elements[i].base.bumperFlags &= ~(BUMP_ON | BUMP_HIT); - this->collider.elements[i].base.toucherFlags &= ~(TOUCH_ON | TOUCH_HIT); + if (this->collider.elements[i].base.acElemFlags & ACELEM_HIT) { + this->collider.elements[i].base.acElemFlags &= ~(ACELEM_ON | ACELEM_HIT); + this->collider.elements[i].base.atElemFlags &= ~(ATELEM_ON | ATELEM_HIT); this->effects[i].vel.y = -1.0f; this->effects[i].state = 1; this->effects[i].angle.y = this->actor.shape.rot.y; diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index 321b57c97f..c4424cc099 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -39,7 +39,7 @@ ActorProfile En_Minifrog_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -47,11 +47,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 12, 14, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c index 77a9892435..c6c5beae0a 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -55,7 +55,7 @@ ActorProfile En_Minislime_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE | AT_TYPE_ENEMY, AC_NONE | AC_TYPE_PLAYER, OC1_NONE | OC1_TYPE_ALL, @@ -63,11 +63,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 54, 60, -30, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 26412d51f2..b79937ff90 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -37,7 +37,7 @@ ActorProfile En_Mk_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -45,11 +45,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index 86ccebd023..a2e01ea908 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -49,7 +49,7 @@ ActorProfile En_Mkk_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE | AT_TYPE_ENEMY, AC_NONE | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -57,11 +57,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 15 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 62f629b616..27f05f8e7e 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -35,7 +35,7 @@ ActorProfile En_Mm_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -43,11 +43,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00100000, 0x00, 0x00 }, { 0x01000202, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 6, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index 4f778d1874..5c847cf256 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -42,7 +42,7 @@ ActorProfile En_Mm3_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -50,11 +50,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 63, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c index 338674a1b4..132d6a3e16 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c @@ -56,7 +56,7 @@ ActorProfile En_Mnk_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -64,11 +64,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x01000200, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 15, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 3a4ffbad3c..9e42a72cb0 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -34,18 +34,18 @@ ActorProfile En_Ms_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 22, 37, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c index 027f37e036..1009be739b 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -46,11 +46,11 @@ ActorProfile En_Mushi2_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 5 }, 100 }, @@ -59,7 +59,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_1, diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.c b/src/overlays/actors/ovl_En_Muto/z_en_muto.c index 809d1735db..091a4ab18f 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -36,7 +36,7 @@ static u16 sTextIds[] = { 0x2ABD, 0x2ABB, 0x0624, 0x0623, 0x2AC6 }; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -44,11 +44,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 20, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 925403b1a9..4e13f79a7b 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -225,7 +225,7 @@ ActorProfile En_Nb_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -233,11 +233,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 10, 68, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index a28b1af5dc..5794cfa974 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -97,7 +97,7 @@ static DamageTable sDamageTable = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -105,11 +105,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x08, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 18, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c index 56f1aa51dc..bd41de49ef 100644 --- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c @@ -30,7 +30,7 @@ ActorProfile En_Nimotsu_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -38,11 +38,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 10, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 28d2e9b6d0..0829354216 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -64,7 +64,7 @@ static f32 sUnusedValue = 4000.0f; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_NO_PUSH | OC1_TYPE_ALL, @@ -72,11 +72,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 15, 25, 4, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c index aa65eb4d36..049c90e379 100644 --- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c @@ -35,7 +35,7 @@ ActorProfile En_Nnh_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_TREE, + COL_MATERIAL_TREE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -43,11 +43,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 50, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index 411e1d4ddf..6d6a8cff59 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -33,7 +33,7 @@ ActorProfile En_Nutsball_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -41,11 +41,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_WOOD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_WOOD, + ACELEM_ON, OCELEM_ON, }, { 13, 13, 0, { 0, 0, 0 } }, @@ -82,8 +82,8 @@ void EnNutsball_Destroy(Actor* thisx, PlayState* play) { void EnNutsball_InitColliderParams(EnNutsball* this) { this->collider.base.atFlags &= ~(AT_HIT | AT_TYPE_ENEMY | AT_BOUNCED); this->collider.base.atFlags |= AT_TYPE_PLAYER; - this->collider.elem.toucher.dmgFlags = 0x400000; - this->collider.elem.toucher.damage = 2; + this->collider.elem.atDmgInfo.dmgFlags = 0x400000; + this->collider.elem.atDmgInfo.damage = 2; } void EnNutsball_Update(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index e05dd20368..1ae7d845d1 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -57,7 +57,7 @@ ActorProfile En_Okuta_Profile = { static ColliderCylinderInit sProjectileCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -65,11 +65,11 @@ static ColliderCylinderInit sProjectileCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 13, 20, 0, { 0, 0, 0 } }, @@ -77,7 +77,7 @@ static ColliderCylinderInit sProjectileCylinderInit = { static ColliderCylinderInit sOctorokCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -85,11 +85,11 @@ static ColliderCylinderInit sOctorokCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 20, 40, -30, { 0, 0, 0 } }, @@ -177,7 +177,7 @@ void EnOkuta_Init(Actor* thisx, PlayState* play2) { } if (EN_OKUTA_GET_TYPE(thisx) == EN_OKUTA_TYPE_BLUE_OCTOROK) { - this->collider.base.colType = COLTYPE_HARD; + this->collider.base.colMaterial = COL_MATERIAL_HARD; this->collider.base.acFlags |= AC_HARD; } @@ -214,7 +214,7 @@ void EnOkuta_Freeze(EnOkuta* this) { this->drawDmgEffFrozenSteamScale = 9.0f * 0.1f; this->drawDmgEffAlpha = 1.0f; this->timer = 80; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80); } @@ -227,7 +227,7 @@ void EnOkuta_Thaw(EnOkuta* this, PlayState* play) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, EN_OKUTA_BODYPART_MAX, 2, 0.3f, 0.2f); - this->collider.base.colType = COLTYPE_HIT0; + this->collider.base.colMaterial = COL_MATERIAL_HIT0; } } @@ -766,8 +766,8 @@ void EnOkuta_Projectile_Fly(EnOkuta* this, PlayState* play) { if (this->collider.base.atFlags & AT_BOUNCED) { this->collider.base.atFlags &= ~(AT_HIT | AT_BOUNCED | AT_TYPE_ENEMY); this->collider.base.atFlags |= AT_TYPE_PLAYER; - this->collider.elem.toucher.dmgFlags = DMG_THROWN_OBJECT; - this->collider.elem.toucher.damage = 2; + this->collider.elem.atDmgInfo.dmgFlags = DMG_THROWN_OBJECT; + this->collider.elem.atDmgInfo.damage = 2; Matrix_MtxFToYXZRot(&player->shieldMf, &shieldRot, false); this->actor.world.rot.y = shieldRot.y + 0x8000; this->timer = 22; @@ -855,7 +855,7 @@ void EnOkuta_UpdateDamage(EnOkuta* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; if (this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX || - !(this->collider.elem.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + !(this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { Actor_SetDropFlag(&this->actor, &this->collider.elem); EnOkuta_Thaw(this, play); @@ -868,8 +868,8 @@ void EnOkuta_UpdateDamage(EnOkuta* this, PlayState* play) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.6f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c index 4bd353d827..b4aeee2e33 100644 --- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c @@ -30,7 +30,7 @@ ActorProfile En_Onpuman_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -38,11 +38,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c index 90fa129343..6aaf1a3795 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -121,7 +121,7 @@ static AnimationInfo sAnimationInfo[OSN_ANIM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -129,11 +129,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c index 871e226ac4..369ebd0305 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -75,7 +75,7 @@ ActorProfile En_Ot_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -83,11 +83,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 5, 33, -20, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 4ccf0221e4..8270c10576 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -61,7 +61,7 @@ ActorProfile En_Owl_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -69,11 +69,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c index 6d4478a463..39ec65a2c4 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -83,7 +83,7 @@ ActorProfile En_Pamera_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -91,11 +91,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 12, 46, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c index 6aee6beb7d..12e665a59f 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -127,22 +127,22 @@ static DamageTable sDamageTable = { static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 32 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_WOOD, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_WOOD, + ACELEM_NONE, OCELEM_NONE, }, { 1, { { 0, 0, 0 }, 25 }, 100 }, @@ -151,7 +151,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -231,8 +231,8 @@ u8 EnPametfrog_Vec3fNormalize(Vec3f* vec) { void EnPametfrog_Freeze(EnPametfrog* this) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; - this->collider.base.colType = COLTYPE_HIT3; - this->collider.elements[0].base.elemType = ELEMTYPE_UNK0; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; + this->collider.elements[0].base.elemMaterial = ELEM_MATERIAL_UNK0; this->drawDmgEffScale = 0.75f; this->drawDmgEffFrozenSteamScale = 1.125f; this->drawDmgEffAlpha = 1.0f; @@ -242,8 +242,8 @@ void EnPametfrog_Thaw(EnPametfrog* this, PlayState* play) { this->freezeTimer = 0; if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->collider.base.colType = COLTYPE_HIT6; - this->collider.elements[0].base.elemType = ELEMTYPE_UNK1; + this->collider.base.colMaterial = COL_MATERIAL_HIT6; + this->collider.elements[0].base.elemMaterial = ELEM_MATERIAL_UNK1; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, GEKKO_BODYPART_MAX, 2, 0.3f, 0.2f); } @@ -393,9 +393,10 @@ void EnPametfrog_ApplyMagicArrowEffects(EnPametfrog* this, PlayState* play) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; this->drawDmgEffScale = 0.75f; this->drawDmgEffAlpha = 3.0f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elements[0].base.bumper.hitPos.x, - this->collider.elements[0].base.bumper.hitPos.y, this->collider.elements[0].base.bumper.hitPos.z, 0, - 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elements[0].base.acDmgInfo.hitPos.x, + this->collider.elements[0].base.acDmgInfo.hitPos.y, + this->collider.elements[0].base.acDmgInfo.hitPos.z, 0, 0, 0, + CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } else if (this->actor.colChkInfo.damageEffect == GEKKO_DMGEFF_ICE) { EnPametfrog_Freeze(this); } @@ -1273,7 +1274,7 @@ void EnPametfrog_ApplyDamageEffect(EnPametfrog* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; if ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + !(this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { if (this->actor.params == GEKKO_PRE_SNAPPER) { if (Actor_ApplyDamage(&this->actor) == 0) { Audio_RestorePrevBgm(); @@ -1301,9 +1302,9 @@ void EnPametfrog_ApplyDamageEffect(EnPametfrog* this, PlayState* play) { this->drawDmgEffScale = 0.75f; this->drawDmgEffAlpha = 4.0f; Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, - this->collider.elements[0].base.bumper.hitPos.x, - this->collider.elements[0].base.bumper.hitPos.y, - this->collider.elements[0].base.bumper.hitPos.z, 0, 0, 0, + this->collider.elements[0].base.acDmgInfo.hitPos.x, + this->collider.elements[0].base.acDmgInfo.hitPos.y, + this->collider.elements[0].base.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } EnPametfrog_SetupDamage(this); diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 9c574dfd09..e47d6ee196 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -52,7 +52,7 @@ ActorProfile En_Peehat_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_WOOD, + COL_MATERIAL_WOOD, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -60,11 +60,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 50, 120, -20, { 0, 0, 0 } }, @@ -72,7 +72,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderSphereInit sSphereInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -80,11 +80,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 40 }, 100 }, @@ -93,22 +93,22 @@ static ColliderSphereInit sSphereInit = { static ColliderTrisElementInit sTrisElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -117,7 +117,7 @@ static ColliderTrisElementInit sTrisElementsInit[2] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -232,7 +232,7 @@ void func_80897170(EnPeehat* this) { this->drawDmgEffScale = 1.1f; this->drawDmgEffFrozenSteamScale = 1650.0f * 0.001f; this->drawDmgEffAlpha = 1.0f; - this->colliderSphere.base.colType = COLTYPE_HIT3; + this->colliderSphere.base.colMaterial = COL_MATERIAL_HIT3; this->unk_2B0 = 80; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80); } @@ -240,7 +240,7 @@ void func_80897170(EnPeehat* this) { void func_808971DC(EnPeehat* this, PlayState* play) { if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->colliderSphere.base.colType = COLTYPE_HIT6; + this->colliderSphere.base.colMaterial = COL_MATERIAL_HIT6; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, PEEHAT_BODYPART_MAX, 2, 0.5f, 0.35f); } @@ -690,7 +690,7 @@ void func_8089874C(EnPeehat* this, PlayState* play) { if (this->colliderSphere.base.acFlags & AC_HIT) { this->colliderSphere.base.acFlags &= ~AC_HIT; if ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->colliderSphere.elem.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + !(this->colliderSphere.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { if (!Actor_ApplyDamage(&this->actor)) { Enemy_StartFinishingBlow(play, &this->actor); } @@ -728,9 +728,10 @@ void func_8089874C(EnPeehat* this, PlayState* play) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 1.1f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->colliderSphere.elem.bumper.hitPos.x, - this->colliderSphere.elem.bumper.hitPos.y, this->colliderSphere.elem.bumper.hitPos.z, 0, - 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->colliderSphere.elem.acDmgInfo.hitPos.x, + this->colliderSphere.elem.acDmgInfo.hitPos.y, + this->colliderSphere.elem.acDmgInfo.hitPos.z, 0, 0, 0, + CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } func_800BE568(&this->actor, &this->colliderSphere); func_808984E0(this); @@ -739,7 +740,7 @@ void func_8089874C(EnPeehat* this, PlayState* play) { } else if ((this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) && (this->colliderCylinder.base.acFlags & AC_HIT) && ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->colliderCylinder.elem.acHitElem->toucher.dmgFlags & 0xDB0B3))) { + !(this->colliderCylinder.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3))) { func_808971DC(this, play); this->actor.colorFilterTimer = 0; func_80897648(this); diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c index 7c26f3af1f..f7bf20a566 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -307,7 +307,7 @@ ActorProfile En_Pm_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -315,11 +315,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 14, 62, 0, { 0, 0, 0 } }, @@ -327,7 +327,7 @@ static ColliderCylinderInit sCylinderInit = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -335,11 +335,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 26 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c index 40a1d36878..cc11095b53 100644 --- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c @@ -46,7 +46,7 @@ ActorProfile En_Po_Composer_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -54,11 +54,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 40, 20, { 0, 0, 0 } }, @@ -67,11 +67,11 @@ static ColliderCylinderInit sCylinderInit = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { POE_COMPOSER_LIMB_LANTERN, { { 0, -1500, 0 }, 10 }, 100 }, @@ -80,7 +80,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c index 4edaae3fdf..f8517f065a 100644 --- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c @@ -38,7 +38,7 @@ ActorProfile En_Po_Fusen_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -46,11 +46,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 200 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index e5255a70f3..9aa79a96c2 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -76,7 +76,7 @@ ActorProfile En_Po_Sisters_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -84,11 +84,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CBFFFE, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 18, 60, 15, { 0, 0, 0 } }, @@ -192,14 +192,14 @@ void EnPoSisters_Init(Actor* thisx, PlayState* play) { } else if (this->type == POE_SISTERS_TYPE_MEG) { if (this->megCloneId == POE_SISTERS_MEG_REAL) { this->actor.colChkInfo.health = 8; - this->collider.elem.toucher.damage = 16; + this->collider.elem.atDmgInfo.damage = 16; this->collider.base.ocFlags1 = (OC1_TYPE_PLAYER | OC1_ON); EnPoSisters_SpawnMegClones(this, play); EnPoSisters_SetupSpawnPo(this); } else { this->actor.flags &= ~(ACTOR_FLAG_200 | ACTOR_FLAG_4000); - this->collider.elem.elemType = ELEMTYPE_UNK4; - this->collider.elem.bumper.dmgFlags |= (0x40000 | 0x1); + this->collider.elem.elemMaterial = ELEM_MATERIAL_UNK4; + this->collider.elem.acDmgInfo.dmgFlags |= (0x40000 | 0x1); this->collider.base.ocFlags1 = OC1_NONE; EnPoSisters_MegCloneVanish(this, NULL); } @@ -417,7 +417,7 @@ void EnPoSisters_Investigating(EnPoSisters* this, PlayState* play) { */ void EnPoSisters_SetupSpinUp(EnPoSisters* this) { if (this->color.a != 0) { - this->collider.base.colType = COLTYPE_METAL; + this->collider.base.colMaterial = COL_MATERIAL_METAL; this->collider.base.acFlags |= AC_HARD; } @@ -442,7 +442,7 @@ void EnPoSisters_SpinUp(EnPoSisters* this, PlayState* play) { void EnPoSisters_SetupSpinAttack(EnPoSisters* this) { this->actor.speed = 5.0f; if (this->type == POE_SISTERS_TYPE_MEG) { - this->collider.base.colType = COLTYPE_METAL; + this->collider.base.colMaterial = COL_MATERIAL_METAL; this->collider.base.acFlags |= AC_HARD; Animation_MorphToLoop(&this->skelAnime, &gPoeSistersAttackAnim, -5.0f); } @@ -466,7 +466,7 @@ void EnPoSisters_SpinAttack(EnPoSisters* this, PlayState* play) { if (ABS_ALT(rotY) < 0x1000) { if (this->type != POE_SISTERS_TYPE_MEG) { - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; EnPoSisters_SetupAimlessIdleFlying(this); } else { @@ -488,7 +488,7 @@ void EnPoSisters_SetupAttackConnect(EnPoSisters* this) { Animation_MorphToLoop(&this->skelAnime, &gPoeSistersFloatAnim, -3.0f); this->actor.world.rot.y = BINANG_ROT180(this->actor.yawTowardsPlayer); if (this->type != POE_SISTERS_TYPE_MEG) { - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; } @@ -599,7 +599,7 @@ void EnPoSisters_SetupSpinToInvis(EnPoSisters* this) { void EnPoSisters_SpinToInvis(EnPoSisters* this, PlayState* play) { if (SkelAnime_Update(&this->skelAnime)) { this->color.a = 0; - this->collider.elem.bumper.dmgFlags = (0x40000 | 0x1); + this->collider.elem.acDmgInfo.dmgFlags = (0x40000 | 0x1); EnPoSisters_SetupAimlessIdleFlying(this); } else { s32 alpha = ((this->skelAnime.endFrame - this->skelAnime.curFrame) * 255.0f) / this->skelAnime.endFrame; @@ -632,7 +632,7 @@ void EnPoSisters_SpinBackToVisible(EnPoSisters* this, PlayState* play) { this->color.a = 255; // fully visible if (this->type != POE_SISTERS_TYPE_MEG) { this->poSisterFlags |= POE_SISTERS_FLAG_CHECK_AC; - this->collider.elem.bumper.dmgFlags = ~(0x8000000 | 0x200000 | 0x100000 | 0x40000 | 0x1); + this->collider.elem.acDmgInfo.dmgFlags = ~(0x8000000 | 0x200000 | 0x100000 | 0x40000 | 0x1); DECR(this->spinInvisibleTimer); @@ -764,7 +764,7 @@ void EnPoSisters_MegCloneVanish(EnPoSisters* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; this->invisibleTimer = 100; // 5 seconds this->poSisterFlags = POE_SISTERS_FLAG_UPDATE_FIRES; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->collider.base.acFlags &= ~AC_HARD; if (play != NULL) { @@ -918,7 +918,7 @@ void EnPoSisters_CheckCollision(EnPoSisters* this, PlayState* play) { pos.z = this->actor.world.pos.z; Item_DropCollectible(play, &pos, ITEM00_ARROWS_10); } - } else if (this->collider.base.colType != 9) { + } else if (this->collider.base.colMaterial != COL_MATERIAL_METAL) { if (this->actor.colChkInfo.damageEffect == POE_SISTERS_DMGEFF_DEKUNUT) { this->actor.world.rot.y = this->actor.shape.rot.y; this->poSisterFlags |= POE_SISTERS_FLAG_UPDATE_SHAPE_ROT; @@ -942,8 +942,8 @@ void EnPoSisters_CheckCollision(EnPoSisters* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == POE_SISTERS_DMGEFF_LIGHTARROWS) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.5f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } EnPoSisters_SetupDamageFlinch(this); diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index a7fe19b124..dfc1b08bad 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -61,7 +61,7 @@ ActorProfile En_Poh_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_NONE | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -69,11 +69,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CBFFFE, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 20, 40, 20, { 0, 0, 0 } }, @@ -82,11 +82,11 @@ static ColliderCylinderInit sCylinderInit = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 18, { { 0, 1400, 0 }, 10 }, 100 }, @@ -95,7 +95,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -505,7 +505,7 @@ void func_80B2D7D4(EnPoh* this, PlayState* play) { this->unk_197 = this->unk_18C * (255.0f / 32.0f); if (this->unk_18C == 0) { this->unk_190 = Rand_S16Offset(100, 50); - this->colliderCylinder.elem.bumper.dmgFlags = 0x40001; + this->colliderCylinder.elem.acDmgInfo.dmgFlags = 0x40001; func_80B2CB60(this); } } @@ -532,7 +532,7 @@ void func_80B2D980(EnPoh* this, PlayState* play) { if (this->unk_18C == 32) { this->unk_190 = Rand_S16Offset(700, 300); this->unk_18C = 0; - this->colliderCylinder.elem.bumper.dmgFlags = ~0x8340001; + this->colliderCylinder.elem.acDmgInfo.dmgFlags = ~0x8340001; func_80B2CB60(this); } } @@ -708,10 +708,10 @@ void func_80B2E438(EnPoh* this, PlayState* play) { if (this->actor.colChkInfo.damageEffect == 4) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.45f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->colliderCylinder.elem.bumper.hitPos.x, - this->colliderCylinder.elem.bumper.hitPos.y, - this->colliderCylinder.elem.bumper.hitPos.z, 0, 0, 0, - CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + Actor_Spawn( + &play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->colliderCylinder.elem.acDmgInfo.hitPos.x, + this->colliderCylinder.elem.acDmgInfo.hitPos.y, this->colliderCylinder.elem.acDmgInfo.hitPos.z, + 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } func_80B2CFF8(this); } diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c index 4e04bab98d..01c3002908 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -131,11 +131,11 @@ ActorProfile En_Pp_Profile = { static ColliderJntSphElementInit sMaskColliderJntSphElementsInit[1] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 0 }, 1 }, @@ -144,7 +144,7 @@ static ColliderJntSphElementInit sMaskColliderJntSphElementsInit[1] = { static ColliderJntSphInit sMaskColliderJntSphInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -158,11 +158,11 @@ static ColliderJntSphInit sMaskColliderJntSphInit = { static ColliderJntSphElementInit sBodyColliderJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 0 }, 1 }, @@ -171,7 +171,7 @@ static ColliderJntSphElementInit sBodyColliderJntSphElementsInit[1] = { static ColliderJntSphInit sBodyColliderJntSphInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -184,7 +184,7 @@ static ColliderJntSphInit sBodyColliderJntSphInit = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -192,11 +192,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x08 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL | TOUCH_UNK7, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL | ATELEM_UNK7, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -248,10 +248,10 @@ void EnPp_Init(Actor* thisx, PlayState* play) { this->bodyCollider.elements[0].dim.scale = 1.0f; if (EN_PP_GET_TYPE(&this->actor) > EN_PP_TYPE_MASKED) { this->actor.hintId = TATL_HINT_ID_HIPLOOP; - this->maskColliderElements[0].base.toucherFlags &= ~TOUCH_ON; - this->maskColliderElements[0].base.bumperFlags &= ~BUMP_ON; + this->maskColliderElements[0].base.atElemFlags &= ~ATELEM_ON; + this->maskColliderElements[0].base.acElemFlags &= ~ACELEM_ON; this->maskColliderElements[0].base.ocElemFlags &= ~OCELEM_ON; - this->maskCollider.base.colType = COLTYPE_HIT2; + this->maskCollider.base.colMaterial = COL_MATERIAL_HIT2; this->maskCollider.elements[0].dim.modelSphere.radius = 42; this->maskCollider.elements[0].dim.scale = 1.0f; this->maskCollider.elements[0].dim.modelSphere.center.x = 400; @@ -270,8 +270,8 @@ void EnPp_Init(Actor* thisx, PlayState* play) { this->bodyCollider.elements[0].dim.scale = 1.0f; this->bodyCollider.elements[0].dim.modelSphere.center.x = 400; this->bodyCollider.elements[0].dim.modelSphere.center.y = -400; - this->bodyColliderElements[0].base.bumperFlags |= BUMP_HOOKABLE; - this->maskCollider.elements[0].base.toucher.damage = 0x10; + this->bodyColliderElements[0].base.acElemFlags |= ACELEM_HOOKABLE; + this->maskCollider.elements[0].base.atDmgInfo.damage = 0x10; } Collider_InitQuad(play, &this->hornCollider); @@ -1257,7 +1257,7 @@ void EnPp_UpdateDamage(EnPp* this, PlayState* play) { } if ((EN_PP_GET_TYPE(&this->actor) == EN_PP_TYPE_MASKED) && (this->action < EN_PP_ACTION_MASK_DETACH)) { - if (this->maskCollider.elements[0].base.bumperFlags & BUMP_HIT) { + if (this->maskCollider.elements[0].base.acElemFlags & ACELEM_HIT) { if (yawDiff < (BREG(2) + 0x4A9C)) { if (this->actor.colChkInfo.damageEffect == EN_PP_DMGEFF_HOOKSHOT) { EnPp_Mask_SetupDetach(this, play); @@ -1269,12 +1269,12 @@ void EnPp_UpdateDamage(EnPp* this, PlayState* play) { } else { attackBouncedOffMask = true; } - } else if (this->maskCollider.elements[0].base.bumperFlags & BUMP_HIT) { + } else if (this->maskCollider.elements[0].base.acElemFlags & ACELEM_HIT) { attackBouncedOffMask = true; } } - if (this->bodyCollider.elements[0].base.bumperFlags & BUMP_HIT) { + if (this->bodyCollider.elements[0].base.acElemFlags & ACELEM_HIT) { if (EN_PP_GET_TYPE(&this->actor) != EN_PP_TYPE_MASKED) { if ((this->action < EN_PP_ACTION_DAMAGED) && (this->action != EN_PP_ACTION_JUMP)) { if (this->actor.colChkInfo.damageEffect == EN_PP_DMGEFF_HOOKSHOT) { diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.c b/src/overlays/actors/ovl_En_Pr/z_en_pr.c index b497b44a34..b6c6c29985 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -88,7 +88,7 @@ ActorProfile En_Pr_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -96,11 +96,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x20000000, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 18, 20, 5, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index 89a9f28d5a..6e4cd9093f 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -62,7 +62,7 @@ static DamageTable sDamageTable = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_1, @@ -70,11 +70,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x08, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 17, 32, -10, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c index 813868cbc4..833d0c6660 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -69,7 +69,7 @@ f32 D_80A771E0[PLAYER_FORM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -77,11 +77,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x20000000, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 10, 10, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.c b/src/overlays/actors/ovl_En_Pst/z_en_pst.c index 96546b99af..b958524df3 100644 --- a/src/overlays/actors/ovl_En_Pst/z_en_pst.c +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.c @@ -368,7 +368,7 @@ ActorProfile En_Pst_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -376,11 +376,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 28, 72, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c index d53daac1ab..b60533b757 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -149,7 +149,7 @@ static Vec2f sFinishLineCoordinates[] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -157,11 +157,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 13, 19, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c index 3c8d579f6b..57c87e24b5 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -73,7 +73,7 @@ ActorProfile En_Raf_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -81,11 +81,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 50, 10, -10, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index 92d16c9f65..fa75367994 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -99,22 +99,22 @@ static AnimationInfo sAnimationInfo[ENRAILSKB_ANIM_MAX] = { static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 15, { { 0, 0, 0 }, 10 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 20 }, 100 }, @@ -123,7 +123,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c index dce8b5c870..26f09d7c53 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -122,7 +122,7 @@ static AnimationInfo sAnimationInfo[EN_RAILGIBUD_ANIM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -130,11 +130,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7EFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 20, 70, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index ebb9475311..2211911ab6 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -49,7 +49,7 @@ ActorProfile En_Rat_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -57,11 +57,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 23 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 4d50257c67..01b4b6533e 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -112,7 +112,7 @@ ActorProfile En_Rd_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -120,11 +120,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7EFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 20, 70, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c index 8d3fd67d93..f5af45f425 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -34,7 +34,7 @@ ActorProfile En_Rg_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_PLAYER | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -42,11 +42,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 20 }, 100 }, @@ -54,7 +54,7 @@ static ColliderSphereInit sSphereInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -62,11 +62,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 20, 62, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 2f65261857..bfaba18adf 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -43,7 +43,7 @@ ActorProfile En_Rr_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -51,11 +51,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x20000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 45, 60, 0, { 0, 0, 0 } }, @@ -63,7 +63,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -71,11 +71,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x20000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_NONE, }, { 30, 45, -30, { 0, 0, 0 } }, @@ -179,8 +179,8 @@ void func_808FA01C(EnRr* this, PlayState* play, ColliderCylinder* collider) { this->drawDmgEffScale = 0.85f; this->drawDmgEffAlpha = 4.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, collider->elem.bumper.hitPos.x, - collider->elem.bumper.hitPos.y, collider->elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, collider->elem.acDmgInfo.hitPos.x, + collider->elem.acDmgInfo.hitPos.y, collider->elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } else if (this->actor.colChkInfo.damageEffect == 5) { this->drawDmgEffScale = 0.85f; @@ -191,8 +191,8 @@ void func_808FA01C(EnRr* this, PlayState* play, ColliderCylinder* collider) { void func_808FA11C(EnRr* this) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; - this->collider1.base.colType = COLTYPE_HIT3; - this->collider1.elem.elemType = ELEMTYPE_UNK0; + this->collider1.base.colMaterial = COL_MATERIAL_HIT3; + this->collider1.elem.elemMaterial = ELEM_MATERIAL_UNK0; this->unk_1EE = 80; this->drawDmgEffScale = 0.85f; this->drawDmgEffFrozenSteamScale = 1275.0f * 0.001f; @@ -205,8 +205,8 @@ void func_808FA19C(EnRr* this, PlayState* play) { this->unk_1EE = 0; if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->collider1.base.colType = COLTYPE_HIT0; - this->collider1.elem.elemType = ELEMTYPE_UNK1; + this->collider1.base.colMaterial = COL_MATERIAL_HIT0; + this->collider1.elem.elemMaterial = ELEM_MATERIAL_UNK1; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, LIKE_LIKE_BODYPART_MAX, 2, this->actor.scale.y * 23.333334f, this->actor.scale.y * 20.000002f); @@ -459,7 +459,7 @@ s32 func_808FAA94(EnRr* this, PlayState* play) { this->collider2.base.acFlags &= ~AC_HIT; if ((this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) && - (sp2C->elem.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + (sp2C->elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { return false; } diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.c b/src/overlays/actors/ovl_En_Ru/z_en_ru.c index abf1f2a2e7..ea3bca6e81 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.c +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -29,7 +29,7 @@ ActorProfile En_Ru_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -37,11 +37,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c index 0356473ab9..75b21433ec 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -42,11 +42,11 @@ ActorProfile En_Ruppecrow_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 20 }, 100 }, @@ -55,7 +55,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.c b/src/overlays/actors/ovl_En_Rz/z_en_rz.c index 4b5c9c96a3..8ce74ba25d 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.c +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -67,7 +67,7 @@ static TexturePtr sEyeTextures[] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -75,11 +75,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c index f127d5ae13..c4b37d2c4f 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c @@ -86,7 +86,7 @@ ActorProfile En_S_Goro_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -94,11 +94,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON, - BUMP_ON, + ATELEM_ON, + ACELEM_ON, OCELEM_ON, }, { 0, 0, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 3005be8108..47136ff529 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -39,18 +39,18 @@ ActorProfile En_Sb_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, @@ -346,9 +346,9 @@ void EnSb_UpdateDamage(EnSb* this, PlayState* play) { SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 0x28, NA_SE_EN_BEE_FLY); return; } - hitPoint.x = this->collider.elem.bumper.hitPos.x; - hitPoint.y = this->collider.elem.bumper.hitPos.y; - hitPoint.z = this->collider.elem.bumper.hitPos.z; + hitPoint.x = this->collider.elem.acDmgInfo.hitPos.x; + hitPoint.y = this->collider.elem.acDmgInfo.hitPos.y; + hitPoint.z = this->collider.elem.acDmgInfo.hitPos.z; CollisionCheck_SpawnShieldParticlesMetal2(play, &hitPoint); return; } diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c index 6da1c91d81..ffb50d36ba 100644 --- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c @@ -46,7 +46,7 @@ RuppeInfo sRupeeInfo[] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_NO_PUSH | OC1_TYPE_PLAYER, @@ -54,11 +54,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 10, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c index 0a257edc81..6b1f5e2b76 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c @@ -33,11 +33,11 @@ ActorProfile En_Scopecrow_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 60, 0 }, 50 }, 100 }, @@ -46,7 +46,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c index 91c6ade675..1d9f01ff42 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -46,18 +46,18 @@ ActorProfile En_Scopenuts_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 27, 32, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c index 86e99bc6c0..84364305d3 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -62,18 +62,18 @@ ActorProfile En_Sellnuts_Profile = { static ColliderCylinderInitType1 sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 27, 32, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index f14edd5feb..28ea483a44 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -31,7 +31,7 @@ ActorProfile En_Si_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_NO_PUSH | OC1_TYPE_ALL, @@ -39,11 +39,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 10 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index fc2c568430..64abc7230f 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -92,22 +92,22 @@ static Vec3f D_80997468[] = { static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 15, { { 0, 0, 0 }, 10 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 20 }, 100 }, @@ -116,7 +116,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c index 674c38bd92..8ead2f266e 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -80,7 +80,7 @@ ActorProfile En_Slime_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -88,11 +88,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 22, 35, 0, { 0, 0, 0 } }, @@ -227,7 +227,7 @@ void EnSlime_Destroy(Actor* thisx, PlayState* play) { void EnSlime_Freeze(EnSlime* this) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; this->drawDmgEffScale = 0.4f; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->drawDmgEffFrozenSteamScale = 0.6f; this->drawDmgEffAlpha = 1.0f; this->timer = 80; @@ -242,7 +242,7 @@ void EnSlime_Freeze(EnSlime* this) { void EnSlime_Thaw(EnSlime* this, PlayState* play) { if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = 0; // So it's not triggered again until Freeze has been called again. - this->collider.base.colType = COLTYPE_NONE; + this->collider.base.colMaterial = COL_MATERIAL_NONE; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, EN_SLIME_BODYPART_MAX, 2, 0.2f, 0.2f); this->actor.flags |= ACTOR_FLAG_200; @@ -1027,7 +1027,7 @@ void EnSlime_UpdateDamage(EnSlime* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; if ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->collider.elem.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + !(this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { EnSlime_Thaw(this, play); if ((this->actor.params == EN_SLIME_TYPE_BLUE) && @@ -1066,9 +1066,9 @@ void EnSlime_UpdateDamage(EnSlime* this, PlayState* play) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.4f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, - CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, + 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } else if (this->actor.colChkInfo.damageEffect == EN_SLIME_DMGEFF_ELECTRIC) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_LARGE; this->drawDmgEffAlpha = 4.0f; diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index 8c5726ac59..7f00e4117c 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -76,7 +76,7 @@ ActorProfile En_Snowman_Profile = { static ColliderCylinderInit sEenoCylinderInit = { { - COLTYPE_HIT4, + COL_MATERIAL_HIT4, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -84,11 +84,11 @@ static ColliderCylinderInit sEenoCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0.0f, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 60, 80, 0, { 0, 0, 0 } }, @@ -96,7 +96,7 @@ static ColliderCylinderInit sEenoCylinderInit = { static ColliderCylinderInit sSnowballCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE | OC1_TYPE_ALL, @@ -104,11 +104,11 @@ static ColliderCylinderInit sSnowballCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 60, 80, 0, { 0, 0, 0 } }, @@ -269,7 +269,7 @@ void EnSnowman_Init(Actor* thisx, PlayState* play) { this->collider.dim.radius = 50; this->collider.dim.height = 122; this->collider.dim.yShift = -8; - this->collider.elem.toucher.damage = 16; + this->collider.elem.atDmgInfo.damage = 16; thisx->world.pos.y -= 32.0f; Actor_SetScale(thisx, 0.006f); ActorShape_Init(&thisx->shape, 16000.0f / 3.0f, ActorShadow_DrawCircle, 170.0f); @@ -1011,8 +1011,8 @@ void EnSnowman_UpdateDamage(EnSnowman* this, PlayState* play) { this->drawDmgEffScale = 0.55f; this->drawDmgEffAlpha = 4.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } } diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c index 12d0c53039..6493ea1bc7 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -32,7 +32,7 @@ ActorProfile En_Snowwd_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_TREE, + COL_MATERIAL_TREE, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -40,11 +40,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0x0100020A, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index aaad741c4c..cd8b95a548 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -39,7 +39,7 @@ ActorProfile En_Ssh_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -47,11 +47,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 32, 50, -24, { 0, 0, 0 } }, @@ -61,7 +61,7 @@ static CollisionCheckInfoInit2 sColChkInfoInit = { 1, 0, 0, 0, MASS_IMMOVABLE }; static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -69,11 +69,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 20, 60, -30, { 0, 0, 0 } }, @@ -82,11 +82,11 @@ static ColliderCylinderInit sCylinderInit2 = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 1, { { 0, -240, 0 }, 28 }, 100 }, @@ -95,7 +95,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -194,12 +194,12 @@ void EnSsh_InitColliders(EnSsh* this, PlayState* play) { Collider_InitAndSetCylinder(play, &this->collider1[i], &this->actor, cylinders[i]); } - this->collider1[0].elem.bumper.dmgFlags = 0x38A9; - this->collider1[1].elem.bumper.dmgFlags = ~0x83038A9; - this->collider1[2].base.colType = COLTYPE_METAL; - this->collider1[2].elem.bumperFlags = (BUMP_NO_AT_INFO | BUMP_HOOKABLE | BUMP_ON); - this->collider1[2].elem.elemType = ELEMTYPE_UNK2; - this->collider1[2].elem.bumper.dmgFlags = ~0x83038A9; + this->collider1[0].elem.acDmgInfo.dmgFlags = 0x38A9; + this->collider1[1].elem.acDmgInfo.dmgFlags = ~0x83038A9; + this->collider1[2].base.colMaterial = COL_MATERIAL_METAL; + this->collider1[2].elem.acElemFlags = (ACELEM_NO_AT_INFO | ACELEM_HOOKABLE | ACELEM_ON); + this->collider1[2].elem.elemMaterial = ELEM_MATERIAL_UNK2; + this->collider1[2].elem.acDmgInfo.dmgFlags = ~0x83038A9; CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(2), &sColChkInfoInit); Collider_InitJntSph(play, &this->collider2); @@ -473,13 +473,13 @@ void EnSsh_CheckBodyStickHit(EnSsh* this, PlayState* play) { ColliderElement* elem = &this->collider1[0].elem; if (player->unk_B28 != 0) { - elem->bumper.dmgFlags |= 2; - this->collider1[1].elem.bumper.dmgFlags &= ~2; - this->collider1[2].elem.bumper.dmgFlags &= ~2; + elem->acDmgInfo.dmgFlags |= 2; + this->collider1[1].elem.acDmgInfo.dmgFlags &= ~2; + this->collider1[2].elem.acDmgInfo.dmgFlags &= ~2; } else { - elem->bumper.dmgFlags &= ~2; - this->collider1[1].elem.bumper.dmgFlags |= 2; - this->collider1[2].elem.bumper.dmgFlags |= 2; + elem->acDmgInfo.dmgFlags &= ~2; + this->collider1[1].elem.acDmgInfo.dmgFlags |= 2; + this->collider1[2].elem.acDmgInfo.dmgFlags |= 2; } } diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index f809d28057..2582b60b70 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -38,7 +38,7 @@ ActorProfile En_St_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_HIT2, + COL_MATERIAL_HIT2, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x800C3829, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 18, 48, -20, { 0, 0, 0 } }, @@ -58,7 +58,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_HIT2, + COL_MATERIAL_HIT2, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -66,11 +66,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x77C3C7D6, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 18, 48, -20, { 0, 0, 0 } }, @@ -78,7 +78,7 @@ static ColliderCylinderInit sCylinderInit2 = { static ColliderCylinderInit sCylinderInit3 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -86,11 +86,11 @@ static ColliderCylinderInit sCylinderInit3 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x77C3C7D6, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 18, 48, -20, { 0, 0, 0 } }, @@ -98,7 +98,7 @@ static ColliderCylinderInit sCylinderInit3 = { static ColliderCylinderInit sCylinderInit4 = { { - COLTYPE_HIT2, + COL_MATERIAL_HIT2, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -106,11 +106,11 @@ static ColliderCylinderInit sCylinderInit4 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x800C3829, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 18, 48, -20, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 64bbade78c..21556c9b0a 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -43,7 +43,7 @@ ActorProfile En_Sth_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -51,11 +51,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c index bd4caf886c..25ad464e56 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -41,7 +41,7 @@ ActorProfile En_Stone_heishi_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -49,11 +49,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 15, 70, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index 8febb09344..266502a599 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -36,7 +36,7 @@ ActorProfile En_Stop_heishi_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -44,11 +44,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 50, 260, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c index 3642401b6f..b881fe5f0d 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -78,7 +78,7 @@ static AnimationInfo sAnimationInfo[SUTTARI_ANIM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -86,11 +86,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 02c12b3401..17047839c0 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -42,7 +42,7 @@ ActorProfile En_Sw_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -50,11 +50,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 16 }, 100 }, @@ -1155,11 +1155,11 @@ void EnSw_Init(Actor* thisx, PlayState* play) { if (!ENSW_GET_3(&this->actor)) { this->actor.hintId = TATL_HINT_ID_SKULLWALLTULA; CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); - this->collider.elem.toucher.damage = 8; + this->collider.elem.atDmgInfo.damage = 8; } else { this->actor.hintId = TATL_HINT_ID_GOLD_SKULLTULA; CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable2, &sColChkInfoInit2); - this->collider.elem.toucher.damage = 16; + this->collider.elem.atDmgInfo.damage = 16; } this->path = diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c index 30a6440df3..92c2027dbb 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c @@ -40,11 +40,11 @@ ActorProfile En_Syateki_Crow_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 60, 0 }, 50 }, 100 }, @@ -53,7 +53,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index 625b0cff8c..f2da124909 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -53,7 +53,7 @@ ActorProfile En_Syateki_Dekunuts_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -61,11 +61,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 48, 80, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c index 7061251180..75dfc48e73 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c @@ -42,7 +42,7 @@ ActorProfile En_Syateki_Okuta_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -50,11 +50,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 40, -30, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c index 9ae09872e8..e1044c15b7 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c @@ -33,11 +33,11 @@ void EnSyatekiWf_Dead(EnSyatekiWf* this, PlayState* play); static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { WOLFOS_NORMAL_LIMB_HEAD, { { 800, 0, 0 }, 25 }, 100 }, @@ -46,7 +46,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderCylinderInit sBodyCylinderInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -54,11 +54,11 @@ static ColliderCylinderInit sBodyCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 40, 60, 0, { 0, 0, 0 } }, @@ -66,7 +66,7 @@ static ColliderCylinderInit sBodyCylinderInit = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -79,7 +79,7 @@ static ColliderJntSphInit sJntSphInit = { static ColliderCylinderInit sTailCylinderInit = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -87,11 +87,11 @@ static ColliderCylinderInit sTailCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 15, 20, -15, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.c b/src/overlays/actors/ovl_En_Tab/z_en_tab.c index 166119400b..0f33e8f245 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.c +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -226,7 +226,7 @@ ActorProfile En_Tab_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT1, + COL_MATERIAL_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -234,11 +234,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 14, 62, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c index cf94844073..fada05bd95 100644 --- a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c +++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c @@ -17,7 +17,7 @@ void EnTagObj_Update(Actor* thisx, PlayState* play); static ColliderCylinderInit sUnusedColliderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -25,11 +25,11 @@ static ColliderCylinderInit sUnusedColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 20, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c index c6fd124df8..6a7699a7fa 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -134,7 +134,7 @@ static AnimationInfo sAnimationInfo[EN_TALK_GIBUD_ANIM_MAX] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -142,11 +142,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7EFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 20, 70, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c index 0ee72c9e23..42d18b3964 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -80,7 +80,7 @@ static DamageTable sDamageTable = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -88,11 +88,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xFFFFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 30, 50, -25, { 0, 0, 0 } }, @@ -100,7 +100,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -108,11 +108,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7FFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 22, 42, -21, { 0, 0, 0 } }, @@ -425,7 +425,7 @@ void func_80BB7578(EnTanron2* this, PlayState* play) { if (this->collider1.base.acFlags & AC_HIT) { this->collider1.base.acFlags &= ~AC_HIT; acHitElem = this->collider1.elem.acHitElem; - if (acHitElem->toucher.dmgFlags & 0x80) { + if (acHitElem->atDmgInfo.dmgFlags & 0x80) { func_80BB6B80(this); this->unk_158 = 1; Actor_PlaySfx(&this->actor, NA_SE_EN_IKURA_DAMAGE); @@ -438,7 +438,7 @@ void func_80BB7578(EnTanron2* this, PlayState* play) { this->unk_154 = 15; if (this->actionFunc != func_80BB69FC) { Matrix_RotateYS(this->actor.yawTowardsPlayer, MTXMODE_NEW); - if ((acHitElem->toucher.dmgFlags & 0x300000) != 0) { + if ((acHitElem->atDmgInfo.dmgFlags & 0x300000) != 0) { this->unk_154 = 10; Matrix_MultVecZ(-10.0f, &this->actor.velocity); } else { diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c index 5f12f9fd97..88203780f1 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -45,7 +45,7 @@ ActorProfile En_Tanron3_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -53,11 +53,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x02 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 7, 10, -5, { 0, 0, 0 } }, @@ -67,7 +67,7 @@ static ColliderCylinderInit sCylinderInit = { // ColliderCylinderInit for both of them, leaving this one totally unused. static ColliderCylinderInit sUnusedCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -75,11 +75,11 @@ static ColliderCylinderInit sUnusedCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK3, + ELEM_MATERIAL_UNK3, { 0xF7CFFFFF, 0x00, 0x02 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 20, -10, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c index f0d1b051a5..eb68448d9f 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -58,7 +58,7 @@ ActorProfile En_Tanron5_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ALL, AC_ON | AC_TYPE_PLAYER | AC_TYPE_ENEMY | AC_TYPE_OTHER, OC1_ON | OC1_TYPE_ALL, @@ -66,11 +66,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 70, 450, 0, { 0, 0, 0 } }, @@ -370,7 +370,7 @@ void EnTanron5_Update(Actor* thisx, PlayState* play2) { fragmentAndItemCount = (s32)Rand_ZeroFloat(2.99f) + 10; } - if ((KREG(19) != 0) || ((acHitElem->toucher.dmgFlags & 0x05000202) && (sGiantModeScaleFactor < 0.5f)) || + if ((KREG(19) != 0) || ((acHitElem->atDmgInfo.dmgFlags & 0x05000202) && (sGiantModeScaleFactor < 0.5f)) || (ac->id == ACTOR_BOSS_02)) { if (this->dList == gTwinmoldRuinPillarDL) { // To create the appearance of the pillar shrinking after being hit, push it further into the floor, @@ -462,9 +462,9 @@ void EnTanron5_Update(Actor* thisx, PlayState* play2) { Vec3f hitPos; ColliderElement* acHitElem = this->collider.elem.acHitElem; - hitPos.x = acHitElem->bumper.hitPos.x; - hitPos.y = acHitElem->bumper.hitPos.y; - hitPos.z = acHitElem->bumper.hitPos.z; + hitPos.x = acHitElem->acDmgInfo.hitPos.x; + hitPos.y = acHitElem->acDmgInfo.hitPos.y; + hitPos.z = acHitElem->acDmgInfo.hitPos.z; Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_REFLECT_SW); CollisionCheck_SpawnShieldParticlesMetal(play, &hitPos); diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index a5232e52ca..f3ca664c9a 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -35,7 +35,7 @@ ActorProfile En_Tg_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -43,11 +43,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c index be8ddcaa71..6a91a09113 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -49,33 +49,33 @@ ActorProfile En_Thiefbird_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[3] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 1, { { 0, 0, 0 }, 24 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 9, { { 900, -600, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON, OCELEM_ON, }, { 12, { { 1200, 0, 0 }, 9 }, 100 }, @@ -84,7 +84,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[3] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -939,7 +939,7 @@ void func_80C12B1C(EnThiefbird* this, PlayState* play) { this->unk_194 = 0; for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) { - if (this->collider.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->collider.elements[i].base.acElemFlags & ACELEM_HIT) { break; } } @@ -952,8 +952,8 @@ void func_80C12B1C(EnThiefbird* this, PlayState* play) { this->drawDmgEffAlpha = 4.0f; if (i != ARRAY_COUNT(this->colliderElements)) { jntSphElem = &this->collider.elements[i]; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, jntSphElem->base.bumper.hitPos.x, - jntSphElem->base.bumper.hitPos.y, jntSphElem->base.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, jntSphElem->base.acDmgInfo.hitPos.x, + jntSphElem->base.acDmgInfo.hitPos.y, jntSphElem->base.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } } else if (this->actor.colChkInfo.damageEffect == 2) { diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 4c49e85904..c79eb1068b 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -60,7 +60,7 @@ ActorProfile En_Tite_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_HIT6, + COL_MATERIAL_HIT6, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -68,11 +68,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x08 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_HARD, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_ON | ATELEM_SFX_HARD, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 0, { { 0, 1500, 0 }, 20 }, 100 }, @@ -189,7 +189,7 @@ void EnTite_Destroy(Actor* thisx, PlayState* play) { } void func_80893A18(EnTite* this) { - this->collider.base.colType = COLTYPE_HIT6; + this->collider.base.colMaterial = COL_MATERIAL_HIT6; this->collider.base.acFlags &= ~AC_HARD; } @@ -266,7 +266,7 @@ void func_80893BCC(EnTite* this, PlayState* play) { void func_80893DD4(EnTite* this) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; - this->collider.base.colType = COLTYPE_HIT3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->unk_2BC = 80; this->drawDmgEffScale = 0.5f; this->drawDmgEffFrozenSteamScale = 0.75f; @@ -278,7 +278,7 @@ void func_80893DD4(EnTite* this) { void func_80893E54(EnTite* this, PlayState* play) { if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->collider.base.colType = COLTYPE_HIT6; + this->collider.base.colMaterial = COL_MATERIAL_HIT6; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, ENTITE_BODYPART_MAX, 2, 0.2f, 0.2f); this->actor.flags |= ACTOR_FLAG_200; @@ -749,7 +749,7 @@ void func_80895640(EnTite* this, PlayState* play) { void func_808956B8(EnTite* this) { this->unk_2BC = 400; this->actor.world.rot.y = this->actor.yawTowardsPlayer; - this->collider.base.colType = COLTYPE_HARD; + this->collider.base.colMaterial = COL_MATERIAL_HARD; this->collider.base.acFlags |= AC_HARD; this->actor.gravity = -1.0f; this->actionFunc = func_80895738; @@ -938,7 +938,7 @@ void func_80895FF8(EnTite* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; this->collider.base.atFlags &= ~AT_HIT; - if (this->collider.base.colType == COLTYPE_HARD) { + if (this->collider.base.colMaterial == COL_MATERIAL_HARD) { func_808956FC(this); func_800BE568(&this->actor, &this->collider); return; @@ -947,7 +947,7 @@ void func_80895FF8(EnTite* this, PlayState* play) { Actor_SetDropFlag(&this->actor, &this->collider.elem); if ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(this->collider.elem.acHitElem->toucher.dmgFlags & 0xDB0B3)) { + !(this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3)) { func_80893E54(this, play); if (this->actor.shape.yOffset < 0.0f) { func_80895DE8(this); @@ -996,8 +996,8 @@ void func_80895FF8(EnTite* this, PlayState* play) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.5f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 4efa389bf6..69d670ce79 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -77,7 +77,7 @@ ActorProfile En_Tk_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -85,11 +85,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 30, 52, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index e7a3fa42a4..310b2bc4e1 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -33,7 +33,7 @@ ActorProfile En_Torch2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_1 | OC1_TYPE_2, @@ -41,11 +41,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00100000, 0, 0 }, { 0xF7CFFFFF, 0, 0 }, - TOUCH_NONE, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 20, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/src/overlays/actors/ovl_En_Toto/z_en_toto.c index be99a79db7..2337ccfcac 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -63,7 +63,7 @@ ActorProfile En_Toto_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -71,11 +71,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00100000, 0x00, 0x00 }, { 0x01000202, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 20, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c index 480af43a0e..bc7f71068f 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -67,7 +67,7 @@ ActorProfile En_Trt2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -75,11 +75,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 32, 56, 30, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.c b/src/overlays/actors/ovl_En_Tru/z_en_tru.c index 38845a459e..aed9ea708b 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -153,7 +153,7 @@ static TexturePtr sDustTextures[] = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -161,11 +161,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 32 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c index e928527fd3..484b1a5c8f 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c @@ -54,7 +54,7 @@ ActorProfile En_Tru_Mt_Profile = { static ColliderSphereInit sSphereInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -62,11 +62,11 @@ static ColliderSphereInit sSphereInit = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 22 }, 100 }, diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c index 0fca434398..3e42e8547d 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -43,7 +43,7 @@ ActorProfile En_Tsn_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -51,11 +51,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index dda0f402b7..b8802de3f7 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -21,7 +21,7 @@ void EnTuboTrap_FlyAtPlayer(EnTuboTrap* this, PlayState* play); static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -29,11 +29,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 11, 28, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index a03c630e2a..1fd43b8c03 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -44,22 +44,22 @@ ActorProfile En_Vm_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 2, { { 0, 0, 0 }, 20 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 10, { { 0, 2300, 0 }, 33 }, 100 }, @@ -68,7 +68,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -82,11 +82,11 @@ static ColliderJntSphInit sJntSphInit = { static ColliderTrisElementInit sTrisElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -95,7 +95,7 @@ static ColliderTrisElementInit sTrisElementsInit[] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_NONE, @@ -408,7 +408,7 @@ void func_808CCDE4(EnVm* this, PlayState* play) { this->colliderJntSph.base.acFlags &= ~AC_HIT; for (i = 0; i < ARRAY_COUNT(this->colliderJntSphElements); i++) { - if (this->colliderJntSph.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->colliderJntSph.elements[i].base.acElemFlags & ACELEM_HIT) { break; } } diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 5def397941..3a5f1247d5 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -59,7 +59,7 @@ ActorProfile En_Wallmas_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -67,11 +67,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, @@ -202,7 +202,7 @@ void EnWallmas_Freeze(EnWallmas* this) { this->drawDmgEffScale = 0.55f; this->drawDmgEffFrozenSteamScale = 825.0f * 0.001f; this->drawDmgEffAlpha = 1.0f; - this->collider.base.colType = 3; + this->collider.base.colMaterial = COL_MATERIAL_HIT3; this->timer = 80; this->actor.flags &= ~ACTOR_FLAG_400; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -211,7 +211,7 @@ void EnWallmas_Freeze(EnWallmas* this) { void EnWallmas_ThawIfFrozen(EnWallmas* this, PlayState* play) { if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->collider.base.colType = 0; + this->collider.base.colMaterial = COL_MATERIAL_HIT0; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, WALLMASTER_BODYPART_MAX, 2, 0.3f, 0.2f); this->actor.flags |= ACTOR_FLAG_400; @@ -561,7 +561,7 @@ void EnWallmas_UpdateDamage(EnWallmas* this, PlayState* play) { Actor_SetDropFlag(&this->actor, &this->collider.elem); if ((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - (!(this->collider.elem.acHitElem->toucher.dmgFlags & 0xDB0B3))) { + (!(this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0xDB0B3))) { if (Actor_ApplyDamage(&this->actor) == 0) { Enemy_StartFinishingBlow(play, &this->actor); Actor_PlaySfx(&this->actor, NA_SE_EN_DAIOCTA_REVERSE); @@ -603,9 +603,9 @@ void EnWallmas_UpdateDamage(EnWallmas* this, PlayState* play) { this->drawDmgEffAlpha = 4.0f; this->drawDmgEffScale = 0.55f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.bumper.hitPos.x, - this->collider.elem.bumper.hitPos.y, this->collider.elem.bumper.hitPos.z, 0, 0, 0, - CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, this->collider.elem.acDmgInfo.hitPos.x, + this->collider.elem.acDmgInfo.hitPos.y, this->collider.elem.acDmgInfo.hitPos.z, 0, + 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } EnWallmas_SetupDamage(this, true); diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c index 468778f1e6..ba21a8314c 100644 --- a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c +++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c @@ -35,7 +35,7 @@ ActorProfile En_Warp_Uzu_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -43,11 +43,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 25, 43, -20, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c index 185aaede67..7282a4b8aa 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c @@ -47,77 +47,77 @@ ActorProfile En_Wdhand_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[EN_WDHAND_NUM_COLLIDER_ELEMENTS] = { { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 50, { { 0, 575, 0 }, 10 }, 100 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 50, { { 0, 1725, 0 }, 10 }, 100 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 50, { { 0, 575, 0 }, 10 }, 100 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 50, { { 0, 1725, 0 }, 10 }, 100 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 50, { { 0, 575, 0 }, 10 }, 100 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 50, { { 0, 1725, 0 }, 10 }, 100 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 50, { { 0, 1000, 0 }, 15 }, 100 }, @@ -126,7 +126,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[EN_WDHAND_NUM_COLLIDER_ELEM static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -601,7 +601,7 @@ void EnWdhand_SetupDie(EnWdhand* this) { // Finds the particular collider that was hit for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) { - if (this->collider.elements[i].base.bumperFlags & BUMP_HIT) { + if (this->collider.elements[i].base.acElemFlags & ACELEM_HIT) { break; } } diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index 3d1f72b9e3..9edd7e5b9b 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -71,44 +71,44 @@ ActorProfile En_Wf_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[4] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 15, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x10 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 21, { { 0, 0, 0 }, 15 }, 100 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 17, { { 800, 0, 0 }, 25 }, 100 }, }, { { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 12, { { 0, 0, 0 }, 30 }, 100 }, @@ -117,7 +117,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[4] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -130,7 +130,7 @@ static ColliderJntSphInit sJntSphInit = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -138,11 +138,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 20, 50, 0, { 0, 0, 0 } }, @@ -150,7 +150,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -158,11 +158,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 15, 20, -15, { 0, 0, 0 } }, @@ -321,8 +321,8 @@ void EnWf_Init(Actor* thisx, PlayState* play) { this->morphTable, WOLFOS_NORMAL_LIMB_MAX); this->actor.hintId = TATL_HINT_ID_WOLFOS; CollisionCheck_SetInfo(&this->actor.colChkInfo, &sDamageTable2, &sColChkInfoInit); - this->collider1.elements[0].base.toucher.damage = 8; - this->collider1.elements[1].base.toucher.damage = 8; + this->collider1.elements[0].base.atDmgInfo.damage = 8; + this->collider1.elements[1].base.atDmgInfo.damage = 8; this->actor.colChkInfo.health = 6; } else { SkelAnime_InitFlex(play, &this->skelAnime, &gWolfosWhiteSkel, &gWolfosWaitAnim, this->jointTable, @@ -363,8 +363,8 @@ void func_809907D4(EnWf* this) { this->drawDmgEffFrozenSteamScale = 1.125f; this->drawDmgEffAlpha = 1.0f; this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX; - this->collider2.base.colType = COLTYPE_HIT3; - this->collider3.base.colType = COLTYPE_HIT3; + this->collider2.base.colMaterial = COL_MATERIAL_HIT3; + this->collider3.base.colMaterial = COL_MATERIAL_HIT3; this->unk_2A0 = 80; this->actor.flags &= ~ACTOR_FLAG_400; Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 80); @@ -373,8 +373,8 @@ void func_809907D4(EnWf* this) { void func_80990854(EnWf* this, PlayState* play) { if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_FIRE; - this->collider2.base.colType = COLTYPE_HIT5; - this->collider3.base.colType = COLTYPE_HIT5; + this->collider2.base.colMaterial = COL_MATERIAL_HIT5; + this->collider3.base.colMaterial = COL_MATERIAL_HIT5; this->drawDmgEffAlpha = 0.0f; Actor_SpawnIceEffects(play, &this->actor, this->bodyPartsPos, WOLFOS_BODYPART_MAX, 2, 0.3f, 0.2f); this->actor.flags |= ACTOR_FLAG_400; @@ -1421,7 +1421,7 @@ void func_8099386C(EnWf* this, PlayState* play) { this->collider1.base.atFlags &= ~AT_ON; if (((this->drawDmgEffType != ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) || - !(collider->elem.acHitElem->toucher.dmgFlags & + !(collider->elem.acHitElem->atDmgInfo.dmgFlags & (0x80000 | 0x40000 | 0x10000 | 0x8000 | 0x2000 | 0x1000 | 0x80 | 0x20 | 0x10 | 0x2 | 0x1))) && (this->actor.colChkInfo.damageEffect != 0xF)) { if (!Actor_ApplyDamage(&this->actor)) { @@ -1459,8 +1459,8 @@ void func_8099386C(EnWf* this, PlayState* play) { this->drawDmgEffType = ACTOR_DRAW_DMGEFF_LIGHT_ORBS; this->drawDmgEffScale = 0.75f; this->drawDmgEffAlpha = 4.0f; - Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, collider->elem.bumper.hitPos.x, - collider->elem.bumper.hitPos.y, collider->elem.bumper.hitPos.z, 0, 0, 0, + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_CLEAR_TAG, collider->elem.acDmgInfo.hitPos.x, + collider->elem.acDmgInfo.hitPos.y, collider->elem.acDmgInfo.hitPos.z, 0, 0, 0, CLEAR_TAG_PARAMS(CLEAR_TAG_LARGE_LIGHT_RAYS)); } diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c index 18b1f5cad9..0c3c108f47 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -96,110 +96,110 @@ ActorProfile En_Wiz_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[10] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x01000202, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { WIZROBE_LIMB_PELVIS, { { 0, 0, 0 }, 0 }, 1 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { WIZROBE_LIMB_PELVIS, { { 0, 0, 0 }, 0 }, 0 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { WIZROBE_LIMB_PELVIS, { { 0, 0, 0 }, 0 }, 0 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { WIZROBE_LIMB_PELVIS, { { 0, 0, 0 }, 0 }, 0 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { WIZROBE_LIMB_PELVIS, { { 0, 0, 0 }, 0 }, 0 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { WIZROBE_LIMB_PELVIS, { { 0, 0, 0 }, 0 }, 0 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { WIZROBE_LIMB_PELVIS, { { 0, 0, 0 }, 0 }, 0 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { WIZROBE_LIMB_PELVIS, { { 0, 0, 0 }, 0 }, 0 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { WIZROBE_LIMB_PELVIS, { { 0, 0, 0 }, 0 }, 0 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { WIZROBE_LIMB_PELVIS, { { 0, 0, 0 }, 0 }, 0 }, @@ -208,7 +208,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[10] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_HIT2, + COL_MATERIAL_HIT2, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -221,7 +221,7 @@ static ColliderJntSphInit sJntSphInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -229,11 +229,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0xF7CFFFFF, 0x08, 0x04 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 35, 130, 0, { 0, 0, 0 } }, @@ -762,7 +762,7 @@ void EnWiz_Appear(EnWiz* this, PlayState* play) { } else { this->action = EN_WIZ_ACTION_RUN_IN_CIRCLES; this->actor.flags &= ~ACTOR_FLAG_LOCK_ON_DISABLED; - this->ghostColliders.elements[0].base.bumper.dmgFlags = 0x1013A22; + this->ghostColliders.elements[0].base.acDmgInfo.dmgFlags = 0x1013A22; Math_Vec3f_Copy(&this->staffTargetFlameScale, &staffTargetFlameScale); this->targetPlatformLightAlpha = 0; @@ -1049,7 +1049,7 @@ void EnWiz_Disappear(EnWiz* this, PlayState* play) { if (this->introCutsceneState != EN_WIZ_INTRO_CS_DISAPPEAR) { this->alpha = 0; if (this->fightState == EN_WIZ_FIGHT_STATE_FIRST_PHASE) { - this->ghostColliders.elements[0].base.bumper.dmgFlags = 0x1000202; + this->ghostColliders.elements[0].base.acDmgInfo.dmgFlags = 0x1000202; } this->actor.flags |= ACTOR_FLAG_TARGETABLE; @@ -1281,7 +1281,7 @@ void EnWiz_UpdateDamage(EnWiz* this, PlayState* play) { // in the final game, since EnWiz_Init effectively disables them), then the below code will // "destroy" the ghost by turning into a cloud of smoke. if ((R_TRANS_FADE_FLASH_ALPHA_STEP != 0) || - (this->ghostColliders.elements[i + 1].base.bumperFlags & BUMP_HIT)) { + (this->ghostColliders.elements[i + 1].base.acElemFlags & ACELEM_HIT)) { //! @bug: If a single ghost is destroyed, then changing the fight state here will cause //! strange behavior; the ghosts will stand still and pretend to attack the player like //! the real Wizrobe. Since Deku Nuts destroy all ghosts at once, and since the ghost diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c index 6b52581ec3..1c70825534 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -51,7 +51,7 @@ ActorProfile En_Wiz_Fire_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -59,11 +59,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x09, 0x10 }, { 0x01001202, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 0, 0, 0, { 0, 0, 0 } }, @@ -80,21 +80,21 @@ void EnWizFire_Init(Actor* thisx, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; if (!Player_HasMirrorShieldEquipped(play)) { - this->collider.elem.toucher.dmgFlags = 0x20000000; + this->collider.elem.atDmgInfo.dmgFlags = 0x20000000; } switch (this->type) { case EN_WIZ_FIRE_TYPE_ICE_MAGIC_PROJECTILE: this->isIceType = true; - this->collider.elem.toucher.damage = 8; - this->collider.elem.toucher.effect = 2; - this->collider.elem.bumper.dmgFlags = (0x1000000 | 0x800 | 0x200 | 0x2); + this->collider.elem.atDmgInfo.damage = 8; + this->collider.elem.atDmgInfo.effect = 2; + this->collider.elem.acDmgInfo.dmgFlags = (0x1000000 | 0x800 | 0x200 | 0x2); this->type = EN_WIZ_FIRE_TYPE_MAGIC_PROJECTILE; // fallthrough case EN_WIZ_FIRE_TYPE_MAGIC_PROJECTILE: if (this->type == EN_WIZ_FIRE_TYPE_ICE_MAGIC_PROJECTILE) { this->type = EN_WIZ_FIRE_TYPE_MAGIC_PROJECTILE; - this->collider.elem.toucher.damage = 8; + this->collider.elem.atDmgInfo.damage = 8; } // fallthrough case EN_WIZ_FIRE_TYPE_ARCING_MAGIC_PROJECTILE: @@ -106,7 +106,7 @@ void EnWizFire_Init(Actor* thisx, PlayState* play) { this->actor.draw = EnWizFire_DrawSmallFlame; this->smallFlameScroll = Rand_S16Offset(0, 10000); this->action = EN_WIZ_FIRE_ACTION_SMALL_FLAME; - this->collider.elem.toucher.damage = 2; + this->collider.elem.atDmgInfo.damage = 2; this->actionFunc = EnWiz_SetupSmallFlame; break; @@ -283,7 +283,7 @@ void EnWiz_MoveMagicProjectile(EnWizFire* this, PlayState* play) { if ((this->type != EN_WIZ_FIRE_TYPE_REFLECTED_MAGIC_PROJECTILE) && (this->timer != 0)) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (this->collider.elem.acHitElem->toucher.dmgFlags == 0x1000) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags == 0x1000) { this->timer = 0; this->hitByIceArrow = true; SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 50, NA_SE_EV_ICE_MELT); @@ -294,8 +294,8 @@ void EnWiz_MoveMagicProjectile(EnWizFire* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_REFLECT_MG); this->collider.base.atFlags &= ~(AT_TYPE_ENEMY | AT_BOUNCED | AT_HIT); this->collider.base.atFlags |= AT_TYPE_PLAYER; - this->collider.elem.toucher.dmgFlags = 0x20; - this->collider.elem.toucher.damage = 2; + this->collider.elem.atDmgInfo.dmgFlags = 0x20; + this->collider.elem.atDmgInfo.damage = 2; this->timer = 100; this->type = EN_WIZ_FIRE_TYPE_REFLECTED_MAGIC_PROJECTILE; this->actor.velocity.x *= -1.0f; @@ -342,7 +342,7 @@ void EnWiz_SmallFlame(EnWizFire* this, PlayState* play) { this->timer -= 10; } - if (this->collider.elem.acHitElem->toucher.dmgFlags == 0x1000) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags == 0x1000) { this->timer = 0; this->hitByIceArrow = true; SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 50, NA_SE_EV_ICE_MELT); @@ -409,7 +409,7 @@ void EnWiz_Pool(EnWizFire* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - if (!sPoolHitByIceArrow && (this->collider.elem.acHitElem->toucher.dmgFlags == 0x1000)) { + if (!sPoolHitByIceArrow && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags == 0x1000)) { sPoolHitByIceArrow = true; this->hitByIceArrow = true; this->poolTimer = 0; diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 4f1597f3e8..3d6ba9930b 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -53,7 +53,7 @@ ActorProfile En_Wood02_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_TREE, + COL_MATERIAL_TREE, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -61,11 +61,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0x0100020A, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c index 320a58f967..3793177dcf 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -46,7 +46,7 @@ ActorProfile En_Yb_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -54,11 +54,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 9e74d6a78d..18cb8f2340 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -33,7 +33,7 @@ ActorProfile En_Zo_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT0, + COL_MATERIAL_HIT0, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -41,11 +41,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 18, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c index 74059d9b5a..60f362524b 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -51,7 +51,7 @@ ActorProfile En_Zob_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -59,11 +59,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c index 251a04e450..d7bdf2ff3f 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -59,7 +59,7 @@ ActorProfile En_Zod_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -67,11 +67,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 60, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c index 3a6482bdac..2eeafb3a3b 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -47,7 +47,7 @@ ActorProfile En_Zog_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_PLAYER, @@ -55,11 +55,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.c b/src/overlays/actors/ovl_En_Zos/z_en_zos.c index ba62722c18..1efc8059b5 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -64,7 +64,7 @@ ActorProfile En_Zos_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -72,11 +72,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 60, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c index 52262efef8..516d8d85ce 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -46,7 +46,7 @@ ActorProfile En_Zot_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -54,11 +54,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c index 038aa61dc0..8aaaa3cfb0 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -41,7 +41,7 @@ ActorProfile En_Zov_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -49,11 +49,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 20, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c index 0a1c223fec..cf7fb201c5 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -36,7 +36,7 @@ ActorProfile En_Zow_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -44,11 +44,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 40, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 88da0d04a2..a14a190044 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -57,7 +57,7 @@ u8 D_808E3BF0 = false; static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -65,11 +65,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00200000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -78,11 +78,11 @@ static ColliderQuadInit sQuadInit = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00200000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 0, { { 0, 0, 0 }, 50 }, 100 }, @@ -91,7 +91,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c index 8b729669ee..bf622ab4af 100644 --- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c @@ -30,11 +30,11 @@ ActorProfile Mir_Ray2_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00200000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { 0, { { 0, 0, 0 }, 50 }, 100 }, @@ -43,7 +43,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_OTHER, AC_NONE, OC1_NONE, diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c index 9a787adf6e..67e25a4a9f 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -30,7 +30,7 @@ ActorProfile Mir_Ray3_Profile = { static ColliderQuadInit sQuadInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -38,11 +38,11 @@ static ColliderQuadInit sQuadInit = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00200000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -50,7 +50,7 @@ static ColliderQuadInit sQuadInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER, OC1_NONE, @@ -58,11 +58,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00200000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 10, 10, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c index 32074f2258..a307e247d8 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -38,7 +38,7 @@ ActorProfile Obj_Aqua_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_OTHER, AC_NONE, OC1_NONE, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_NONE, }, { 6, 10, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 8192d1be9c..d9d51999e1 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -74,7 +74,7 @@ ActorProfile Obj_Bean_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -82,11 +82,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 64, 30, -31, { 0, 0, 0 } }, @@ -94,7 +94,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_OTHER, OC1_NONE, @@ -102,11 +102,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 10, 10, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c index 2aa4be09b4..fe32637121 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -34,7 +34,7 @@ ActorProfile Obj_Bell_Profile = { // Bell Post? static ColliderSphereInit sCylinderInit1 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -42,11 +42,11 @@ static ColliderSphereInit sCylinderInit1 = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x20000000, 0x00, 0x04 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 0, { { 0, 960, 0 }, 70 }, 100 }, @@ -55,7 +55,7 @@ static ColliderSphereInit sCylinderInit1 = { // Bell static ColliderSphereInit sCylinderInit2 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -63,11 +63,11 @@ static ColliderSphereInit sCylinderInit2 = { COLSHAPE_SPHERE, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 0, { { 0, 1100, 0 }, 74 }, 100 }, @@ -135,7 +135,7 @@ s32 func_80A35510(ObjBell* this, s32 arg1) { this->unk_21C = CLAMP(this->unk_21C, 0.0f, 18000.0f); if (phi_a3 == true) { - Math_Vec3s_ToVec3f(&bumperPos, &this->collider2.elem.bumper.hitPos); + Math_Vec3s_ToVec3f(&bumperPos, &this->collider2.elem.acDmgInfo.hitPos); Math_Vec3f_Copy(&worldPos, &this->dyna.actor.world.pos); this->dyna.actor.world.rot.y = Math_Vec3f_Yaw(&bumperPos, &worldPos); if (this->unk_20C <= 0x4000 && this->unk_20C >= -0x4000) { diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c index 1ab8304de7..eb2cdd7fe5 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -38,7 +38,7 @@ ActorProfile Obj_Bigicicle_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 23, 68, -40, { 0, 0, 0 } }, @@ -58,7 +58,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -66,11 +66,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 31, 90, -150, { 0, 0, 0 } }, @@ -180,7 +180,7 @@ void func_80AE8DE4(ObjBigicicle* this, PlayState* play) { void func_80AE8FD4(ObjBigicicle* this, PlayState* play) { if ((this->collider1.base.acFlags & AC_HIT) || - ((this->collider2.base.acFlags & AC_HIT) && (this->collider2.elem.acHitElem->toucher.dmgFlags & 0x3820))) { + ((this->collider2.base.acFlags & AC_HIT) && (this->collider2.elem.acHitElem->atDmgInfo.dmgFlags & 0x3820))) { if ((this->unk_148 == 0) || (this->unk_149 == 1)) { CutsceneManager_Queue(this->actor.csId); this->actionFunc = func_80AE9090; diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index aee47bb0e1..7be839cd42 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -38,7 +38,7 @@ ActorProfile Obj_Bombiwa_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x81C37FBE, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 55, 70, 0, { 0, 0, 0 } }, @@ -58,7 +58,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -66,11 +66,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x81C37BBE, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 75, 130, 0, { 0, 0, 0 } }, @@ -111,15 +111,15 @@ s32 func_809393B0(Actor* thisx) { if (this->collider.base.acFlags & AC_HIT) { Actor* ac = this->collider.base.ac; - if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x80000000) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x80000000) { if ((ac != NULL) && (Math3D_Vec3fDistSq(&this->actor.world.pos, &ac->world.pos) < SQ(150.0f))) { return true; } - } else if (this->collider.elem.acHitElem->toucher.dmgFlags & 8) { + } else if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 8) { if ((ac != NULL) && (Math3D_Vec3fDistSq(&this->actor.world.pos, &ac->world.pos) < SQ(95.0f))) { return true; } - } else if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x500) { + } else if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x500) { return true; } } @@ -133,11 +133,11 @@ s32 func_80939470(Actor* thisx) { Actor* temp_v0 = this->collider.base.ac; if (temp_v0 != NULL) { - if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x80000000) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x80000000) { if (Math3D_Vec3fDistSq(&this->actor.world.pos, &temp_v0->world.pos) < SQ(175.0f)) { return true; } - } else if ((this->collider.elem.acHitElem->toucher.dmgFlags & 8) && + } else if ((this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 8) && (Math3D_Vec3fDistSq(&this->actor.world.pos, &temp_v0->world.pos) < SQ(115.0f))) { return true; } @@ -363,9 +363,9 @@ void func_80939EF4(ObjBombiwa* this, PlayState* play) { if (this->unk_202 > 0) { this->unk_202--; if (this->unk_202 == 0) { - this->collider.base.colType = COLTYPE_HARD; + this->collider.base.colMaterial = COL_MATERIAL_HARD; } else { - this->collider.base.colType = COLTYPE_NONE; + this->collider.base.colMaterial = COL_MATERIAL_NONE; } } CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c index c50aabe0cb..1438d0e6ae 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -38,7 +38,7 @@ typedef struct ObjBoyoUnkStruct { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_TYPE_PLAYER | AC_HARD | AC_ON, OC1_TYPE_2 | OC1_TYPE_1 | OC1_TYPE_PLAYER | OC1_ON, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x01CBFFBE, 0x00, 0x00 }, - TOUCH_NONE, - BUMP_ON, + ATELEM_NONE, + ACELEM_ON, OCELEM_ON, }, { diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c index cb103edfd5..c51278f474 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -42,7 +42,7 @@ ActorProfile Obj_Chan_Profile = { static ColliderCylinderInit sObjChanCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -50,11 +50,11 @@ static ColliderCylinderInit sObjChanCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 48, 76, -60, { 0, 0, 0 } }, @@ -261,7 +261,7 @@ void ObjChan_ChandelierAction(ObjChan* this, PlayState* play) { Math_Vec3f_ToVec3s(&pot->collider.dim.pos, &pot->actor.world.pos); } } - if ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->toucher.dmgFlags & 0x800)) { + if ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x800)) { Flags_SetSwitch(play, OBJCHAN_GET_SWITCH_FLAG(thisx)); } if (Flags_GetSwitch(play, OBJCHAN_GET_SWITCH_FLAG(thisx))) { @@ -297,7 +297,7 @@ void ObjChan_PotAction(ObjChan* this, PlayState* play) { s32 phi_v1; potBreaks = false; - if ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->toucher.dmgFlags & 0x4004000)) { + if ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x4004000)) { potBreaks = true; } if (this->stateFlags & OBJCHAN_STATE_ON_FIRE) { diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index dfe5b022f6..223cbf1d07 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -37,11 +37,11 @@ ActorProfile Obj_Comb_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x05CBFFBE, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 15 }, 100 }, @@ -50,7 +50,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER, @@ -380,12 +380,12 @@ void func_8098DC60(ObjComb* this, PlayState* play) { } if (this->unk_1B3) { - if (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x0182C29C) { + if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x0182C29C) { func_8098CEAC(this, play); func_8098DA74(this, play); Actor_Kill(&this->actor); } else { - s32 dmgFlags = this->collider.elements[0].base.acHitElem->toucher.dmgFlags; + s32 dmgFlags = this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags; if (dmgFlags & 0x13820) { this->unk_1A8 = 0xDAC; diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c index 6f069a924c..a49195deda 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -50,66 +50,66 @@ ActorProfile Obj_Dora_Profile = { static ColliderTrisElementInit sTrisElementsInit[6] = { { { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0x00100000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, -35.0f, 0.0f }, { 260.0f, -185.0f, 0.0f }, { 0.0f, -335.0f, 0.0f } } }, }, { { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0x00100000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 260.0f, -185.0f, 0.0f }, { 260.0f, -485.0f, 0.0f }, { 0.0f, -335.0f, 0.0f } } }, }, { { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 260.0f, -485.0f, 0.0f }, { 0.0f, -635.0f, 0.0f }, { 0.0f, -335.0f, 0.0f } } }, }, { { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, -635.0f, 0.0f }, { -260.0f, -485.0f, 0.0f }, { 0.0f, -335.0f, 0.0f } } }, }, { { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -260.0f, -485.0f, 0.0f }, { -260.0f, -185.0f, 0.0f }, { 0.0f, -335.0f, 0.0f } } }, }, { { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -260.0f, -185.0f, 0.0f }, { 0.0f, -35.0f, 0.0f }, { 0.0f, -335.0f, 0.0f } } }, @@ -118,7 +118,7 @@ static ColliderTrisElementInit sTrisElementsInit[6] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c index e69587c442..7d9a39ea3d 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -34,7 +34,7 @@ ActorProfile Obj_Etcetera_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -42,11 +42,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x01000202, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 20, 14, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c index fd039ac295..3ef1c66d61 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -36,7 +36,7 @@ ActorProfile Obj_Fireshield_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_PLAYER, @@ -44,11 +44,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x01, 0x04 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_ON, }, { 28, 144, 0, { 0, 0, 0 } }, @@ -365,11 +365,11 @@ void ObjFireshield_Update(Actor* thisx, PlayState* play) { Actor_PlaySfx_Flagged(thisx, NA_SE_EV_BURNING - SFX_FLAG); if (player->transformation == PLAYER_FORM_GORON) { - this->collider.elem.toucher.damage = 0; - this->collider.elem.toucher.effect = 0; + this->collider.elem.atDmgInfo.damage = 0; + this->collider.elem.atDmgInfo.effect = 0; } else { - this->collider.elem.toucher.damage = 4; - this->collider.elem.toucher.effect = 1; + this->collider.elem.atDmgInfo.damage = 4; + this->collider.elem.atDmgInfo.effect = 1; } Collider_UpdateCylinder(thisx, &this->collider); diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c index 2730db9f3d..5aeff04bcc 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -45,22 +45,22 @@ ActorProfile Obj_Flowerpot_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00400000, 0x00, 0x02 }, { 0x05CBFFBE, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 100, 0 }, 12 }, 100 }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x0580C71C, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 1, { { 0, 300, 0 }, 12 }, 100 }, @@ -69,7 +69,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[2] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -465,8 +465,8 @@ void func_80A1C838(ObjFlowerpot* this, PlayState* play) { func_80A1BD80(this, play); func_80A1B994(this, play); Actor_Kill(&this->actor); - } else if ((this->collider.elements[0].base.bumperFlags & BUMP_HIT) && - (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x058BFFBC)) { + } else if ((this->collider.elements[0].base.acElemFlags & ACELEM_HIT) && + (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x058BFFBC)) { if (!(this->unk_1EA & 2)) { func_80A1B914(this, play); func_80A1C0FC(this, play); @@ -477,10 +477,10 @@ void func_80A1C838(ObjFlowerpot* this, PlayState* play) { func_80A1B994(this, play); Actor_Kill(&this->actor); } else { - if (this->collider.elements[1].base.bumperFlags & BUMP_HIT) { + if (this->collider.elements[1].base.acElemFlags & ACELEM_HIT) { if (!(this->unk_1EA & 2)) { this->unk_1EA |= 2; - this->collider.elements[1].base.bumperFlags &= ~BUMP_ON; + this->collider.elements[1].base.acElemFlags &= ~ACELEM_ON; func_80A1C0FC(this, play); func_80A1B914(this, play); func_80A1B9CC(this, play); @@ -589,10 +589,10 @@ void func_80A1CD10(ObjFlowerpot* this) { void func_80A1CEF4(ObjFlowerpot* this, PlayState* play) { Actor* thisx = &this->actor; - s32 sp28 = this->collider.elements[0].base.toucherFlags & TOUCH_HIT; + s32 sp28 = this->collider.elements[0].base.atElemFlags & ATELEM_HIT; if (sp28) { - this->collider.elements[0].base.toucherFlags &= ~TOUCH_ON; + this->collider.elements[0].base.atElemFlags &= ~ATELEM_ON; } if (this->unk_1E8 > 0) { diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c index b49cacfeb5..ea9182e502 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -40,7 +40,7 @@ ActorProfile Obj_Grass_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_2, @@ -48,11 +48,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x0580C71C, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 6, 44, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c index ef551d53b2..b162f11a51 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c @@ -43,7 +43,7 @@ ActorProfile Obj_Grass_Carry_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_2, @@ -51,11 +51,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00400000, 0x00, 0x02 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_NONE, OCELEM_ON, }, { 10, 44, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index ce4a8e9800..c5f34d2f7f 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -30,7 +30,7 @@ ActorProfile Obj_Hamishi_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -38,11 +38,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x81C37FB6, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 50, 70, 0, { 0, 0, 0 } }, @@ -212,14 +212,14 @@ void ObjHamishi_Update(Actor* thisx, PlayState* play) { } if (sp24) { - if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x80000500) { - if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x400) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x80000500) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x400) { this->unk_1A0 = 26; } else { this->unk_1A0 = 11; } - if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x80000000) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x80000000) { this->unk_19E = 2; } else { this->unk_19E++; @@ -242,9 +242,9 @@ void ObjHamishi_Update(Actor* thisx, PlayState* play) { if (this->unk_1A1 > 0) { this->unk_1A1--; if (this->unk_1A1 == 0) { - this->collider.base.colType = COLTYPE_HARD; + this->collider.base.colMaterial = COL_MATERIAL_HARD; } else { - this->collider.base.colType = COLTYPE_NONE; + this->collider.base.colMaterial = COL_MATERIAL_NONE; } } diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c index 71d324d054..52aec3cd9c 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -42,7 +42,7 @@ ActorProfile Obj_Hugebombiwa_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -50,11 +50,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x81C37BB6, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 180, 226, 0, { 0, 0, 0 } }, @@ -311,7 +311,7 @@ s32 func_80A54A0C(ObjHugebombiwa* this) { s32 params; Vec3f sp20; - if ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->toucher.dmgFlags & 0x80000000)) { + if ((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x80000000)) { ac = this->collider.base.ac; params = ENHUGEBOMBIWA_GET_100(&this->actor); @@ -390,9 +390,9 @@ void func_80A54C04(ObjHugebombiwa* this, PlayState* play) { if (this->unk_4B3 > 0) { this->unk_4B3--; if (this->unk_4B3 == 0) { - this->collider.base.colType = COLTYPE_HARD; + this->collider.base.colMaterial = COL_MATERIAL_HARD; } else { - this->collider.base.colType = COLTYPE_NONE; + this->collider.base.colMaterial = COL_MATERIAL_NONE; } } diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index e1e9185d5f..eb52f13537 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -36,7 +36,7 @@ ActorProfile Obj_Ice_Poly_Profile = { static ColliderCylinderInit sCylinderInit1 = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -44,11 +44,11 @@ static ColliderCylinderInit sCylinderInit1 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x02, 0x00 }, { 0xF7CFF7FF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 50, 105, 0, { 0, 0, 0 } }, @@ -56,7 +56,7 @@ static ColliderCylinderInit sCylinderInit1 = { static ColliderCylinderInit sCylinderInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER, OC1_NONE, @@ -64,11 +64,11 @@ static ColliderCylinderInit sCylinderInit2 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 65, 105, 0, { 0, 0, 0 } }, @@ -191,13 +191,13 @@ void func_80931A38(ObjIcePoly* this, PlayState* play) { if (((this->colliders2[0].base.acFlags & AC_HIT) && ((this->colliders2[0].base.ac == NULL) || ((this->colliders2[0].base.ac->id != ACTOR_OBJ_AQUA) && - (this->colliders2[0].elem.acHitElem->toucher.dmgFlags == 0x800)) || + (this->colliders2[0].elem.acHitElem->atDmgInfo.dmgFlags == 0x800)) || ((this->colliders2[0].base.ac->id == ACTOR_OBJ_AQUA) && (this->colliders2[0].base.ac->params == AQUA_TYPE_HOT)))) || ((this->colliders2[1].base.acFlags & AC_HIT) && ((this->colliders2[1].base.ac == NULL) || ((this->colliders2[1].base.ac->id != ACTOR_OBJ_AQUA) && - (this->colliders2[1].elem.acHitElem->toucher.dmgFlags == 0x800)) || + (this->colliders2[1].elem.acHitElem->atDmgInfo.dmgFlags == 0x800)) || ((this->colliders2[1].base.ac->id == ACTOR_OBJ_AQUA) && (this->colliders2[1].base.ac->params == AQUA_TYPE_HOT))))) { CutsceneManager_Queue(this->actor.csId); diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c index c1c0f42247..d90c7a3214 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -59,7 +59,7 @@ ActorProfile Obj_Iceblock_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_NO_PUSH | OC1_TYPE_PLAYER, @@ -67,11 +67,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 44, 62, -31, { 0, 0, 0 } }, @@ -1448,7 +1448,7 @@ void ObjIceblock_Update(Actor* thisx, PlayState* play) { } } - if (((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->toucher.dmgFlags & 0x800)) || + if (((this->collider.base.acFlags & AC_HIT) && (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x800)) || (this->meltTimer == 0)) { this->meltTimer = -1; this->unk_2B0 = 4; @@ -1488,7 +1488,7 @@ void ObjIceblock_Update(Actor* thisx, PlayState* play) { if (ICEBLOCK_GET_ICEBERG(&this->dyna.actor) && (this->unk_2B4 > 0.0f)) { this->collider.base.ocFlags1 &= ~OC1_NO_PUSH; this->collider.base.ocFlags1 |= (OC1_TYPE_2 | OC1_TYPE_1 | OC1_TYPE_PLAYER); - this->collider.elem.bumper.dmgFlags |= + this->collider.elem.acDmgInfo.dmgFlags |= (0x800000 | 0x400000 | 0x10000 | 0x2000 | 0x1000 | 0x800 | 0x200 | 0x100 | 0x80 | 0x20 | 0x10 | 0x2); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); } diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c index a96ce303b1..b38a1ab868 100644 --- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c @@ -41,7 +41,7 @@ ActorProfile Obj_Jgame_Light_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -49,11 +49,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00100000, 0x00, 0x00 }, { 0xF6CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 12, 45, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c index 3110e15854..44dc458e75 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -90,22 +90,22 @@ static Vec3f sPointBR = { 300.0f, 10.0f, 40.0f }; static ColliderTrisElementInit sTrisElementsInit[] = { { { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0x01000202, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -300.0f, 850.0f, 40.0f }, { -300.0f, 10.0f, 40.0f }, { 300.0f, 850.0f, 40.0f } } }, }, { { - ELEMTYPE_UNK5, + ELEM_MATERIAL_UNK5, { 0x00000000, 0x00, 0x00 }, { 0x01000202, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 300.0f, 850.0f, 40.0f }, { 300.0f, 10.0f, 40.0f }, { -300.0f, 10.0f, 40.0f } } }, @@ -114,7 +114,7 @@ static ColliderTrisElementInit sTrisElementsInit[] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_TREE, + COL_MATERIAL_TREE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -127,7 +127,7 @@ static ColliderTrisInit sTrisInit = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_TREE, + COL_MATERIAL_TREE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -135,11 +135,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 33, 80, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index ba8f6d86eb..892dfe572c 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -50,7 +50,7 @@ ActorProfile Obj_Kibako_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -58,11 +58,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00400000, 0x00, 0x02 }, { 0x058BC79C, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 15, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 6ffb30c0db..eb6cf3edfe 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -33,7 +33,7 @@ ActorProfile Obj_Kibako2_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -41,11 +41,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x80000508, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 31, 48, 0, { 0, 0, 0 } }, @@ -185,17 +185,17 @@ s32 ObjKibako2_ShouldBreak(ObjKibako2* this) { Actor* ac = this->collider.base.ac; this->collider.base.acFlags = acFlags & ~AC_HIT; if (ac != NULL) { - if (this->collider.elem.acHitElem->toucher.dmgFlags & (1 << 31)) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (1 << 31)) { // Powder Keg if (Math3D_Vec3fDistSq(&this->dyna.actor.world.pos, &ac->world.pos) < SQ(160.0f)) { shouldBreak = true; } - } else if (this->collider.elem.acHitElem->toucher.dmgFlags & (1 << 3)) { + } else if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (1 << 3)) { // Explosives if (Math3D_Vec3fDistSq(&this->dyna.actor.world.pos, &ac->world.pos) < SQ(100.0f)) { shouldBreak = true; } - } else if (this->collider.elem.acHitElem->toucher.dmgFlags & (1 << 8 | 1 << 10)) { + } else if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (1 << 8 | 1 << 10)) { // Goron Punch/Pound shouldBreak = true; } diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c index 25317552bc..3ec10a9068 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -37,7 +37,7 @@ ActorProfile Obj_Lightblock_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER, OC1_NONE, @@ -45,11 +45,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00202000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 84, 120, 0, { 0, 0, 0 } }, @@ -123,7 +123,7 @@ void ObjLightblock_Wait(ObjLightblock* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; // light arrows - if (this->collider.elem.acHitElem->toucher.dmgFlags & (1 << 13)) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & (1 << 13)) { this->collisionCounter = 8; } // light ray diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index bdd3b6fa83..66601cd735 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -42,11 +42,11 @@ ActorProfile Obj_Lightswitch_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00202000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 19 }, 100 }, @@ -55,7 +55,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER, OC1_ON | OC1_TYPE_ALL, @@ -328,7 +328,7 @@ void ObjLightswitch_Update(Actor* thisx, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { // dmgFlags enum doesn't exist yet, 0x2000 is light arrows - if ((this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x2000) != 0) { + if ((this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x2000) != 0) { this->hitState = 10; } else if (LIGHTSWITCH_GET_TYPE(&this->actor) == LIGHTSWITCH_TYPE_FLIP) { if (this->hitState == 0) { diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c index e7154dd260..b1974c4e37 100644 --- a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c @@ -30,7 +30,7 @@ ActorProfile Obj_Milk_Bin_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -38,11 +38,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 12, 30, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c index da8fcc943d..f92fba293a 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -60,11 +60,11 @@ ActorProfile Obj_Mine_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x01CBFFBE, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 30 }, 100 }, @@ -73,7 +73,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_PLAYER | OC1_TYPE_1, @@ -182,12 +182,12 @@ void ObjMine_Air_CheckAC(ObjMine* this, s16* hitAngle, s16* torqueAngle) { yawToAttack = Math_Vec3f_Yaw(&attackActor->world.pos, ¢erPos); // dmgFlag check is (DMG_DEKU_BUBBLE | DMG_FIRE_ARROW | DMG_ICE_ARROW | DMG_FIRE_ARROW | DMG_NORMAL_ARROW) - if (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x13820) { + if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x13820) { *hitAngle = attackActor->shape.rot.y; *torqueAngle = attackActor->shape.rot.y - yawToAttack; } else { Vec3f hitPos; - Vec3s* hitPos3s = &this->collider.elements[0].base.bumper.hitPos; + Vec3s* hitPos3s = &this->collider.elements[0].base.acDmgInfo.hitPos; Math_Vec3s_ToVec3f(&hitPos, hitPos3s); *hitAngle = Actor_WorldYawTowardActor(attackActor, &this->actor); @@ -199,7 +199,7 @@ void ObjMine_Water_CheckAC(ObjMine* this, Vec3f* knockbackDir) { Actor* attackActor = this->collider.base.ac; // dmgFlag check is (DMG_DEKU_BUBBLE | DMG_LIGHT_ARROW | DMG_ICE_ARROW | DMG_FIRE_ARROW | DMG_NORMAL_ARROW) - if (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x13820) { + if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x13820) { Matrix_Push(); Matrix_RotateYS(attackActor->shape.rot.y, MTXMODE_NEW); Matrix_RotateXS(attackActor->shape.rot.x, MTXMODE_APPLY); diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c index 7dea349ac1..00be2b0f86 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -48,11 +48,11 @@ ActorProfile Obj_Snowball_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x81837FBE, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 73 }, 100 }, @@ -61,7 +61,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -139,7 +139,7 @@ void func_80B02EE4(ObjSnowball* this, PlayState* play) { Vec3f spAC; Vec3f spA0; Vec3f sp94; - Vec3s* hitPos = &this->collider.elements[0].base.bumper.hitPos; + Vec3s* hitPos = &this->collider.elements[0].base.acDmgInfo.hitPos; s32 i; for (i = 0; i < 4; i++) { @@ -533,17 +533,17 @@ void func_80B04350(ObjSnowball* this, PlayState* play) { } if (flag && (this->unk_211 == 0) && - (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & + (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & (0x80000000 | 0x4000 | 0x800 | 0x400 | 0x100 | 0x8))) { this->actor.flags |= ACTOR_FLAG_10; if (this->actor.home.rot.y == 1) { this->actor.flags &= ~(ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY); } - if (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x4000) { + if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x4000) { this->unk_20A = 1; } else { - if (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x800) { + if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x800) { this->unk_210 = 1; } this->unk_20A = 0; @@ -563,10 +563,10 @@ void func_80B04350(ObjSnowball* this, PlayState* play) { } if (flag && - !(this->collider.elements[0].base.acHitElem->toucher.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20))) { + !(this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & (0x10000 | 0x2000 | 0x1000 | 0x800 | 0x20))) { if (this->unk_209 <= 0) { func_80B02EE4(this, play); - if (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x1000000) { + if (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x1000000) { this->unk_209 = 25; } else { this->unk_209 = 10; diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c index 540ee8fc0f..76f7426647 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -41,11 +41,11 @@ ActorProfile Obj_Snowball2_Profile = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00400000, 0x00, 0x02 }, { 0x0583FFBE, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NONE, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NONE, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 0, 0 }, 15 }, 100 }, @@ -54,7 +54,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -273,8 +273,8 @@ void func_80B39908(ObjSnowball2* this, PlayState* play) { Vec3f sp94; s32 i; - if (this->collider.elements[0].base.bumperFlags & BUMP_HIT) { - Vec3s* hitPos = &this->collider.elements[0].base.bumper.hitPos; + if (this->collider.elements[0].base.acElemFlags & ACELEM_HIT) { + Vec3s* hitPos = &this->collider.elements[0].base.acDmgInfo.hitPos; for (i = 0; i < 4; i++) { sp94.x = ((Rand_ZeroOne() * 14.0f) - 7.0f) + hitPos->x; @@ -361,14 +361,14 @@ void func_80B39C9C(ObjSnowball2* this, PlayState* play) { } else if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && ((this->actor.shape.yOffset * this->actor.scale.y) < this->actor.depthInWater)) { func_80B3A498(this); - } else if (sp38 && (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 0x0583FFBC)) { + } else if (sp38 && (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 0x0583FFBC)) { func_80B38E88(this, play); func_80B39108(this, play); func_80B39B5C(this, play); Actor_Kill(&this->actor); return; } else { - if (sp38 && (this->collider.elements[0].base.acHitElem->toucher.dmgFlags & 2)) { + if (sp38 && (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & 2)) { func_80B39908(this, play); } diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c index 203d2d84c8..3c9ed44406 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -38,11 +38,11 @@ ActorProfile Obj_Spidertent_Profile = { static ColliderTrisElementInit sTrisElementsInit1[] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 68.80000305175781f, 0.0f, 18.799999237060547f }, @@ -51,11 +51,11 @@ static ColliderTrisElementInit sTrisElementsInit1[] = { }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 76.30000305175781f, 0.0f, -63.79999923706055f }, @@ -64,11 +64,11 @@ static ColliderTrisElementInit sTrisElementsInit1[] = { }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 23.799999237060547f, 0.0f, -116.30000305175781f }, @@ -77,11 +77,11 @@ static ColliderTrisElementInit sTrisElementsInit1[] = { }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -111.30000305175781f, 0.0f, -26.299999237060547f }, @@ -90,11 +90,11 @@ static ColliderTrisElementInit sTrisElementsInit1[] = { }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -81.30000305175781f, 0.0f, 78.80000305175781f }, @@ -103,11 +103,11 @@ static ColliderTrisElementInit sTrisElementsInit1[] = { }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 23.799999237060547f, 0.0f, 108.80000305175781f }, @@ -118,7 +118,7 @@ static ColliderTrisElementInit sTrisElementsInit1[] = { static ColliderTrisInit sTrisInit1 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -132,11 +132,11 @@ static ColliderTrisInit sTrisInit1 = { static ColliderTrisElementInit sTrisElementsInit2[] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 17.799999237060547f, 0.0f, 81.5999984741211f }, @@ -145,11 +145,11 @@ static ColliderTrisElementInit sTrisElementsInit2[] = { }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -60.900001525878906f, 0.0f, 59.099998474121094f }, @@ -158,11 +158,11 @@ static ColliderTrisElementInit sTrisElementsInit2[] = { }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -83.4000015258789f, 0.0f, -19.700000762939453f }, @@ -171,11 +171,11 @@ static ColliderTrisElementInit sTrisElementsInit2[] = { }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 17.799999237060547f, 0.0f, -87.19999694824219f }, @@ -184,11 +184,11 @@ static ColliderTrisElementInit sTrisElementsInit2[] = { }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 57.20000076293945f, 0.0f, -47.79999923706055f }, @@ -197,11 +197,11 @@ static ColliderTrisElementInit sTrisElementsInit2[] = { }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 51.599998474121094f, 0.0f, 14.100000381469727f }, @@ -212,7 +212,7 @@ static ColliderTrisElementInit sTrisElementsInit2[] = { static ColliderTrisInit sTrisInit2 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -635,10 +635,10 @@ void func_80B30808(ObjSpidertent* this, PlayState* play) { for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) { trisElem = &this->collider.elements[i]; - if (trisElem->base.bumperFlags & BUMP_HIT) { - sp54.x = trisElem->base.bumper.hitPos.x; - sp54.y = trisElem->base.bumper.hitPos.y; - sp54.z = trisElem->base.bumper.hitPos.z; + if (trisElem->base.acElemFlags & ACELEM_HIT) { + sp54.x = trisElem->base.acDmgInfo.hitPos.x; + sp54.y = trisElem->base.acDmgInfo.hitPos.y; + sp54.z = trisElem->base.acDmgInfo.hitPos.z; temp_f0 = Math3D_Vec3fDistSq(&sp54, &player->actor.world.pos); if (temp_f0 < phi_f20) { @@ -649,7 +649,7 @@ void func_80B30808(ObjSpidertent* this, PlayState* play) { } if (phi_s4 >= 0) { - hitPos = &this->collider.elements[phi_s4].base.bumper.hitPos; + hitPos = &this->collider.elements[phi_s4].base.acDmgInfo.hitPos; sp70.x = hitPos->x; sp70.y = hitPos->y; diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c index 16e89a07a2..e7503c983e 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -44,66 +44,66 @@ ActorProfile Obj_Spinyroll_Profile = { static ColliderTrisElementInit sTrisElementsInit[] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x04 }, { 0x01C37BB6, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -60.0f, 0.0f, 17.0f }, { 60.0f, 0.0f, 17.0f }, { 60.0f, 40.0f, 17.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x04 }, { 0x01C37BB6, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -60.0f, 0.0f, 17.0f }, { 60.0f, 40.0f, 17.0f }, { -60.0f, 40.0f, 17.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x04 }, { 0x01C37BB6, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 60.0f, 0.0f, -17.0f }, { -60.0f, 0.0f, -17.0f }, { -60.0f, 40.0f, -17.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x04 }, { 0x01C37BB6, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 60.0f, 0.0f, -17.0f }, { -60.0f, 40.0f, -17.0f }, { 60.0f, 40.0f, -17.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x04 }, { 0x01C37BB6, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 60.0f, 20.0f, -12.0f }, { -60.0f, 20.0f, -12.0f }, { -60.0f, 20.0f, 12.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0xF7CFFFFF, 0x04, 0x04 }, { 0x01C37BB6, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 60.0f, 20.0f, -12.0f }, { -60.0f, 20.0f, 12.0f }, { 60.0f, 20.0f, 12.0f } } }, @@ -112,7 +112,7 @@ static ColliderTrisElementInit sTrisElementsInit[] = { static ColliderTrisInit sTrisInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index 9d8ba2f3d0..9ce79e0d8f 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -91,22 +91,22 @@ static f32 sScale[] = { 0.123f, 0.123f, 0.1f, 0.118f, 0.118f, 0.248f }; static ColliderTrisElementInit sRustyFloorTrisElementsInit[2] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000400, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { -20.0f, 19.0f, -20.0f }, { -20.0f, 19.0f, 20.0f }, { 20.0f, 19.0f, 20.0f } } }, }, { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000400, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 20.0f, 19.0f, 20.0f }, { 20.0f, 19.0f, -20.0f }, { -20.0f, 19.0f, -20.0f } } }, @@ -115,7 +115,7 @@ static ColliderTrisElementInit sRustyFloorTrisElementsInit[2] = { static ColliderTrisInit sRustyFloorTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -129,22 +129,22 @@ static ColliderTrisInit sRustyFloorTrisInit = { static ColliderTrisElementInit sEyeSwitchTrisElementsInit[2] = { { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 23.0f, 8.5f }, { -23.0f, 0.0f, 8.5f }, { 0.0f, -23.0f, 8.5f } } }, }, { { - ELEMTYPE_UNK4, + ELEM_MATERIAL_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00003820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 23.0f, 8.5f }, { 0.0f, -23.0f, 8.5f }, { 23.0f, 0.0f, 8.5f } } }, @@ -153,7 +153,7 @@ static ColliderTrisElementInit sEyeSwitchTrisElementsInit[2] = { static ColliderTrisInit sEyeSwitchTrisInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -167,11 +167,11 @@ static ColliderTrisInit sEyeSwitchTrisInit = { static ColliderJntSphElementInit sJntSphElementsInit[1] = { { { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x01CBFFBE, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 0, { { 0, 300, 0 }, 20 }, 100 }, @@ -180,7 +180,7 @@ static ColliderJntSphElementInit sJntSphElementsInit[1] = { static ColliderJntSphInit sJntSphInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -954,9 +954,9 @@ void ObjSwitch_Update(Actor* thisx, PlayState* play) { } } if (this->disableCrystalSwitchTimer == 0) { - this->colliderJntSph.base.colType = sJntSphInit.base.colType; + this->colliderJntSph.base.colMaterial = sJntSphInit.base.colMaterial; } else { - this->colliderJntSph.base.colType = COLTYPE_NONE; + this->colliderJntSph.base.colMaterial = COL_MATERIAL_NONE; } this->collisionFlags = this->colliderJntSph.base.acFlags; CollisionCheck_SetAC(play, &play->colChkCtx, &this->colliderJntSph.base); diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index 5d8a19dfb3..19ccc1f3ce 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -32,7 +32,7 @@ ActorProfile Obj_Syokudai_Profile = { static ColliderCylinderInit sStandColliderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -40,11 +40,11 @@ static ColliderCylinderInit sStandColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00100000, 0x00, 0x00 }, { 0xF6CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 12, 45, 0, { 0, 0, 0 } }, @@ -52,7 +52,7 @@ static ColliderCylinderInit sStandColliderInit = { static ColliderCylinderInit sFlameColliderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -60,11 +60,11 @@ static ColliderCylinderInit sFlameColliderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x00 }, { 0x00000820, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 15, 45, 45, { 0, 0, 0 } }, @@ -77,7 +77,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), }; -static u8 sColTypes[] = { COLTYPE_METAL, COLTYPE_WOOD, COLTYPE_WOOD }; +static u8 sColMaterials[] = { COL_MATERIAL_METAL, COL_MATERIAL_WOOD, COL_MATERIAL_WOOD }; static Gfx* sDLists[] = { gObjectSyokudaiTypeSwitchCausesFlameDL, @@ -97,7 +97,7 @@ void ObjSyokudai_Init(Actor* thisx, PlayState* play) { func_800B4AEC(play, thisx, 50.0f); ActorShape_Init(&thisx->shape, 0.0f, func_800B4B50, 1.0f); Collider_InitAndSetCylinder(play, &this->standCollider, thisx, &sStandColliderInit); - this->standCollider.base.colType = sColTypes[OBJ_SYOKUDAI_GET_TYPE(thisx)]; + this->standCollider.base.colMaterial = sColMaterials[OBJ_SYOKUDAI_GET_TYPE(thisx)]; Collider_InitAndSetCylinder(play, &this->flameCollider, thisx, &sFlameColliderInit); thisx->colChkInfo.mass = MASS_IMMOVABLE; Lights_PointGlowSetInfo(&this->lightInfo, thisx->world.pos.x, thisx->world.pos.y + OBJ_SYOKUDAI_GLOW_HEIGHT, @@ -193,8 +193,8 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { } } if (this->flameCollider.base.acFlags & AC_HIT) { - flameColliderACDmgFlags = this->flameCollider.elem.acHitElem->toucher.dmgFlags; - if (this->flameCollider.elem.acHitElem->toucher.dmgFlags & 0x820) { + flameColliderACDmgFlags = this->flameCollider.elem.acHitElem->atDmgInfo.dmgFlags; + if (this->flameCollider.elem.acHitElem->atDmgInfo.dmgFlags & 0x820) { interaction = OBJ_SYOKUDAI_INTERACTION_ARROW_FA; } } else if (player->heldItemAction == PLAYER_IA_DEKU_STICK) { @@ -221,7 +221,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { if ((flameColliderACActor->update != NULL) && (flameColliderACActor->id == ACTOR_EN_ARROW)) { flameColliderACActor->params = 0; - ((EnArrow*)flameColliderACActor)->collider.elem.toucher.dmgFlags = 0x800; + ((EnArrow*)flameColliderACActor)->collider.elem.atDmgInfo.dmgFlags = 0x800; } } if ((this->snuffTimer > OBJ_SYOKUDAI_SNUFF_NEVER) && diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c index c24191e5bd..e79208551b 100644 --- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c @@ -52,7 +52,7 @@ ActorProfile Obj_Takaraya_Wall_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, @@ -60,11 +60,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_ON, }, { 40, 120, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index 759a051a68..a17fec1b0b 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -38,7 +38,7 @@ ActorProfile Obj_Taru_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -46,11 +46,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x80000508, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 30, 50, 0, { 0, 0, 0 } }, @@ -248,16 +248,16 @@ s32 func_80B9BF7C(ObjTaru* this) { this->collider.base.acFlags &= ~AC_HIT; if (ac != NULL) { - if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x80000000) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x80000000) { phi_a3 = false; if (Math3D_Vec3fDistSq(&this->dyna.actor.world.pos, &ac->world.pos) < SQ(160.0f)) { phi_a3 = true; } - } else if (this->collider.elem.acHitElem->toucher.dmgFlags & 8) { + } else if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 8) { if (Math3D_Vec3fDistSq(&this->dyna.actor.world.pos, &ac->world.pos) < SQ(100.0f)) { phi_a3 = true; } - } else if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x500) { + } else if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x500) { phi_a3 = true; } } diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c index e67a019c22..158f51d326 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -37,7 +37,7 @@ ActorProfile Obj_Toge_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -45,11 +45,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x01C37BB6, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 20, 0, { 0, 0, 0 } }, @@ -278,7 +278,7 @@ void ObjToge_Update(Actor* thisx, PlayState* play) { ColliderCylinder* collider = &this->collider; if (this->collider.base.acFlags & AC_HIT) { - if (this->collider.elem.acHitElem->toucher.dmgFlags & 0x1000) { + if (this->collider.elem.acHitElem->atDmgInfo.dmgFlags & 0x1000) { func_809A43A8(this, play); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_BLUE, 250, COLORFILTER_BUFFLAG_OPA, 250); } diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c index 2b681fa2b5..39c5666276 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -34,7 +34,7 @@ ActorProfile Obj_Tree_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_TREE, + COL_MATERIAL_TREE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -42,11 +42,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x0100020A, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 28, 120, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 6228684da3..c6da2fb0ef 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -77,7 +77,7 @@ ObjTsuboData sPotTypeData[4] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HARD, + COL_MATERIAL_HARD, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -85,11 +85,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00400000, 0x00, 0x02 }, { 0x05CBFFBE, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 12, 30, 0, { 0, 0, 0 } }, @@ -474,7 +474,7 @@ void func_809289E4(ObjTsubo* this, PlayState* play) { Player_PlaySfx((Player*)&this->actor, NA_SE_PL_PULL_UP_POT); func_80928D6C(this); } else if ((this->unk_19B != 0) || - (acHit && (this->cylinderCollider.elem.acHitElem->toucher.dmgFlags & 0x058BFFBC))) { + (acHit && (this->cylinderCollider.elem.acHitElem->atDmgInfo.dmgFlags & 0x058BFFBC))) { typeData = &sPotTypeData[type]; this->unk_19B = 0; if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.depthInWater > 15.0f)) { diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c index 45d0cd91d1..a5d5e3c529 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -89,7 +89,7 @@ static TexturePtr sMouthTextures[] = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_HIT3, + COL_MATERIAL_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, @@ -97,11 +97,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000020, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 40, 64, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c index f6b9af7865..49d793ec34 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -48,7 +48,7 @@ s16 D_80A3D478[] = { 1, 10, 20, 30, 40, 50, 60, 70 }; static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_NONE, @@ -56,11 +56,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x20000000, 0x00, 0x04 }, { 0x01C37BB6, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { 30, 120, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c index 307041c3f3..698509c65d 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -36,7 +36,7 @@ ActorProfile Obj_Warpstone_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -44,11 +44,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00100000, 0x00, 0x00 }, { 0x01000202, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON | BUMP_HOOKABLE, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON | ACELEM_HOOKABLE, OCELEM_ON, }, { 20, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 21ea26a348..5d58b71bfd 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -33,7 +33,7 @@ ActorProfile Shot_Sun_Profile = { static ColliderCylinderInit sCylinderInit = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, @@ -41,11 +41,11 @@ static ColliderCylinderInit sCylinderInit = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK0, + ELEM_MATERIAL_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000020, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 30, 60, 0, { 0, 0, 0 } }, diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 8df75c676b..bedd840133 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -1677,7 +1677,7 @@ struct_8085C2A4 D_8085C2A4[] = { // sCylinderInit ColliderCylinderInit D_8085C2EC = { { - COLTYPE_HIT5, + COL_MATERIAL_HIT5, AT_NONE, AC_ON | AC_TYPE_ENEMY, OC1_ON | OC1_TYPE_ALL, @@ -1685,11 +1685,11 @@ ColliderCylinderInit D_8085C2EC = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK1, + ELEM_MATERIAL_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 12, 60, 0, { 0, 0, 0 } }, @@ -1698,7 +1698,7 @@ ColliderCylinderInit D_8085C2EC = { // sShieldCylinderInit ColliderCylinderInit D_8085C318 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_HARD | AC_TYPE_ENEMY, OC1_NONE, @@ -1706,11 +1706,11 @@ ColliderCylinderInit D_8085C318 = { COLSHAPE_CYLINDER, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00100000, 0x00, 0x02 }, { 0xD7CFFFFF, 0x00, 0x00 }, - TOUCH_NONE | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_NONE | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_ON, }, { 25, 60, 0, { 0, 0, 0 } }, @@ -1719,7 +1719,7 @@ ColliderCylinderInit D_8085C318 = { // sMeleeWeaponQuadInit ColliderQuadInit D_8085C344 = { { - COLTYPE_NONE, + COL_MATERIAL_NONE, AT_ON | AT_TYPE_PLAYER, AC_NONE, OC1_NONE, @@ -1727,11 +1727,11 @@ ColliderQuadInit D_8085C344 = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00000000, 0x00, 0x01 }, { 0xF7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_NONE, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_NONE, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -1740,7 +1740,7 @@ ColliderQuadInit D_8085C344 = { // sShieldQuadInit ColliderQuadInit D_8085C394 = { { - COLTYPE_METAL, + COL_MATERIAL_METAL, AT_ON | AT_TYPE_PLAYER, AC_ON | AC_HARD | AC_TYPE_ENEMY, OC1_NONE, @@ -1748,11 +1748,11 @@ ColliderQuadInit D_8085C394 = { COLSHAPE_QUAD, }, { - ELEMTYPE_UNK2, + ELEM_MATERIAL_UNK2, { 0x00100000, 0x00, 0x00 }, { 0xD7CFFFFF, 0x00, 0x00 }, - TOUCH_ON | TOUCH_SFX_NORMAL, - BUMP_ON, + ATELEM_ON | ATELEM_SFX_NORMAL, + ACELEM_ON, OCELEM_NONE, }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, @@ -2755,14 +2755,14 @@ void Player_LerpEnvLighting(PlayState* play, PlayerEnvLighting* lighting, f32 le * Revert cylinder to normal properties */ void Player_ResetCylinder(Player* this) { - this->cylinder.base.colType = COLTYPE_HIT5; + this->cylinder.base.colMaterial = COL_MATERIAL_HIT5; this->cylinder.base.atFlags = AT_NONE; this->cylinder.base.acFlags = AC_ON | AC_TYPE_ENEMY; this->cylinder.base.ocFlags1 = OC1_ON | OC1_TYPE_ALL; - this->cylinder.elem.elemType = ELEMTYPE_UNK1; - this->cylinder.elem.toucher.dmgFlags = 0; - this->cylinder.elem.bumper.dmgFlags = 0xF7CFFFFF; - this->cylinder.elem.toucherFlags = TOUCH_NONE | TOUCH_SFX_NORMAL; + this->cylinder.elem.elemMaterial = ELEM_MATERIAL_UNK1; + this->cylinder.elem.atDmgInfo.dmgFlags = 0; + this->cylinder.elem.acDmgInfo.dmgFlags = 0xF7CFFFFF; + this->cylinder.elem.atElemFlags = ATELEM_NONE | ATELEM_SFX_NORMAL; this->cylinder.dim.radius = 12; } @@ -2789,17 +2789,17 @@ void Player_SetCylinderForAttack(Player* this, u32 dmgFlags, s32 damage, s32 rad this->cylinder.base.ocFlags1 = OC1_ON | OC1_TYPE_ALL; } - this->cylinder.elem.elemType = ELEMTYPE_UNK2; - this->cylinder.elem.toucherFlags = TOUCH_ON | TOUCH_NEAREST | TOUCH_SFX_NORMAL; + this->cylinder.elem.elemMaterial = ELEM_MATERIAL_UNK2; + this->cylinder.elem.atElemFlags = ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NORMAL; this->cylinder.dim.radius = radius; - this->cylinder.elem.toucher.dmgFlags = dmgFlags; - this->cylinder.elem.toucher.damage = damage; + this->cylinder.elem.atDmgInfo.dmgFlags = dmgFlags; + this->cylinder.elem.atDmgInfo.damage = damage; if (dmgFlags & DMG_GORON_POUND) { this->cylinder.base.acFlags = AC_NONE; } else { - this->cylinder.base.colType = COLTYPE_NONE; - this->cylinder.elem.bumper.dmgFlags = 0xF7CFFFFF; + this->cylinder.base.colMaterial = COL_MATERIAL_NONE; + this->cylinder.elem.acDmgInfo.dmgFlags = 0xF7CFFFFF; if (dmgFlags & DMG_ZORA_BARRIER) { this->cylinder.base.acFlags = AC_NONE; @@ -5403,13 +5403,13 @@ PlayerMeleeWeaponAnimation func_808335F4(Player* this) { } void func_80833728(Player* this, s32 index, u32 dmgFlags, s32 damage) { - this->meleeWeaponQuads[index].elem.toucher.dmgFlags = dmgFlags; - this->meleeWeaponQuads[index].elem.toucher.damage = damage; + this->meleeWeaponQuads[index].elem.atDmgInfo.dmgFlags = dmgFlags; + this->meleeWeaponQuads[index].elem.atDmgInfo.damage = damage; if (dmgFlags == DMG_DEKU_STICK) { - this->meleeWeaponQuads[index].elem.toucherFlags = (TOUCH_ON | TOUCH_NEAREST | TOUCH_SFX_WOOD); + this->meleeWeaponQuads[index].elem.atElemFlags = (ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_WOOD); } else { - this->meleeWeaponQuads[index].elem.toucherFlags = (TOUCH_ON | TOUCH_NEAREST); + this->meleeWeaponQuads[index].elem.atElemFlags = (ATELEM_ON | ATELEM_NEAREST); } } @@ -5865,7 +5865,7 @@ s32 func_80834600(Player* this, PlayState* play) { } else if ((this->shieldQuad.base.acFlags & AC_BOUNCED) || (this->shieldCylinder.base.acFlags & AC_BOUNCED) || ((this->invincibilityTimer < 0) && (this->cylinder.base.acFlags & AC_HIT) && (this->cylinder.elem.acHitElem != NULL) && - (this->cylinder.elem.acHitElem->toucher.dmgFlags != DMG_UNBLOCKABLE))) { + (this->cylinder.elem.acHitElem->atDmgInfo.dmgFlags != DMG_UNBLOCKABLE))) { PlayerAnimationHeader* var_a2; s32 sp64; @@ -12397,7 +12397,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { 0.5f); temp_fv0 += this->bodyPartsPos[PLAYER_BODYPART_HEAD].y + 10.0f; - if (this->cylinder.elem.toucher.dmgFlags == 0x80000) { + if (this->cylinder.elem.atDmgInfo.dmgFlags == 0x80000) { this->cylinder.dim.height = 80; var_fv1_2 = ((temp_fv0 + var_fv1_2) * 0.5f) - 40.0f; } else { @@ -12415,9 +12415,9 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { if (this->unk_B62 != 0) { this->shieldCylinder.base.acFlags = AC_NONE; - this->shieldCylinder.elem.toucher.dmgFlags = 0x80000; - this->shieldCylinder.elem.toucherFlags = TOUCH_ON; - this->shieldCylinder.elem.bumperFlags = BUMP_NONE; + this->shieldCylinder.elem.atDmgInfo.dmgFlags = 0x80000; + this->shieldCylinder.elem.atElemFlags = ATELEM_ON; + this->shieldCylinder.elem.acElemFlags = ACELEM_NONE; this->shieldCylinder.dim.height = 80; this->shieldCylinder.dim.radius = 50; this->shieldCylinder.dim.yShift = ((temp_fv0 + var_fv1_2) * 0.5f - 40.0f) - this->actor.world.pos.y; @@ -12427,9 +12427,9 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { } else if (this->stateFlags1 & PLAYER_STATE1_400000) { if ((this->transformation == PLAYER_FORM_GORON) || (this->transformation == PLAYER_FORM_DEKU)) { this->shieldCylinder.base.acFlags = AC_ON | AC_HARD | AC_TYPE_ENEMY; - this->shieldCylinder.elem.toucher.dmgFlags = 0x100000; - this->shieldCylinder.elem.toucherFlags = TOUCH_NONE; - this->shieldCylinder.elem.bumperFlags = BUMP_ON; + this->shieldCylinder.elem.atDmgInfo.dmgFlags = 0x100000; + this->shieldCylinder.elem.atElemFlags = ATELEM_NONE; + this->shieldCylinder.elem.acElemFlags = ACELEM_ON; if (this->transformation == PLAYER_FORM_GORON) { this->shieldCylinder.dim.height = 35; diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index bc1dd4df20..7a6ab8d619 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -1300,9 +1300,9 @@ 0x800E0348:("func_800E0348",), 0x800E03A0:("DamageTable_Get",), 0x800E03CC:("DamageTable_Clear",), - 0x800E0410:("CollisionCheck_GetDamageAndEffectOnBumper",), - 0x800E04BC:("CollisionCheck_ApplyBumperDefense",), - 0x800E04EC:("CollisionCheck_GetToucherDamage",), + 0x800E0410:("CollisionCheck_GetDamageAndEffectOnElementAC",), + 0x800E04BC:("CollisionCheck_ApplyElementATDefense",), + 0x800E04EC:("CollisionCheck_GetElementATDamage",), 0x800E0538:("Collider_InitBase",), 0x800E0580:("Collider_DestroyBase",), 0x800E0594:("Collider_SetBaseToActor",), @@ -1311,13 +1311,13 @@ 0x800E065C:("Collider_ResetATBase",), 0x800E0678:("Collider_ResetACBase",), 0x800E0694:("Collider_ResetOCBase",), - 0x800E06BC:("Collider_InitTouch",), - 0x800E06E4:("Collider_DestroyTouch",), - 0x800E06F8:("Collider_SetTouch",), + 0x800E06BC:("Collider_InitElementDamageInfoAT",), + 0x800E06E4:("Collider_DestroyElementDamageInfoAT",), + 0x800E06F8:("Collider_SetElementDamageInfoAT",), 0x800E0720:("Collider_ResetATElementUnk",), - 0x800E0730:("Collider_InitBump",), - 0x800E0760:("Collider_DestroyBump",), - 0x800E0774:("Collider_SetBump",), + 0x800E0730:("Collider_InitElementDamageInfoAC",), + 0x800E0760:("Collider_DestroyElementDamageInfoAC",), + 0x800E0774:("Collider_SetElementDamageInfoAC",), 0x800E079C:("Collider_InitElement",), 0x800E081C:("Collider_DestroyElement",), 0x800E085C:("Collider_SetElement",), @@ -1411,8 +1411,8 @@ 0x800E2928:("CollisionCheck_SetOC",), 0x800E2A04:("CollisionCheck_SetOC_SAC",), 0x800E2B10:("CollisionCheck_SetOCLine",), - 0x800E2B98:("CollisionCheck_SkipTouch",), - 0x800E2BBC:("CollisionCheck_SkipBump",), + 0x800E2B98:("CollisionCheck_IsElementNotAT",), + 0x800E2BBC:("CollisionCheck_IsElementNotAC",), 0x800E2BE0:("CollisionCheck_NoSharedFlags",), 0x800E2C08:("CollisionCheck_NoBlood",), 0x800E2C1C:("CollisionCheck_BlueBlood",), diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index 0b6998f0a2..3e962eee8a 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -1213,7 +1213,7 @@ 0x801C0958:("D_801C0958","UNK_TYPE4","",0x4), 0x801C095C:("D_801C095C","UNK_PTR","",0x4), 0x801C0964:("D_801C0964","UNK_TYPE1","",0x1), - 0x801C096C:("sPlayerShieldCollisionTypes","UNK_TYPE1","",0x1), + 0x801C096C:("sPlayerShieldColMaterials","UNK_TYPE1","",0x1), 0x801C0970:("D_801C0970","UNK_TYPE1","",0x1), 0x801C0994:("D_801C0994","UNK_TYPE4","",0x4), 0x801C09B8:("D_801C09B8","UNK_TYPE1","",0x1), @@ -6319,7 +6319,7 @@ 0x808BCCC0:("sStandColliderInit","UNK_TYPE1","",0x1), 0x808BCCEC:("sFlameColliderInit","UNK_TYPE1","",0x1), 0x808BCD18:("sInitChain","UNK_TYPE1","",0x1), - 0x808BCD28:("sColTypes","UNK_TYPE1","",0x1), + 0x808BCD28:("sColMaterials","UNK_TYPE1","",0x1), 0x808BCD2C:("sDLists","UNK_TYPE1","",0x1), 0x808BCD40:("D_808BCD40","f32","",0x4), 0x808BCD44:("D_808BCD44","f32","",0x4), diff --git a/tools/overlayhelpers/colliderinit.py b/tools/overlayhelpers/colliderinit.py index 528bf91b14..dce08d2b20 100755 --- a/tools/overlayhelpers/colliderinit.py +++ b/tools/overlayhelpers/colliderinit.py @@ -10,20 +10,20 @@ TType1 = 'Type1' T_ACTOR = '_Actor' TYPE_ENUM = [ - "COLTYPE_HIT0", - "COLTYPE_HIT1", - "COLTYPE_HIT2", - "COLTYPE_HIT3", - "COLTYPE_HIT4", - "COLTYPE_HIT5", - "COLTYPE_HIT6", - "COLTYPE_HIT7", - "COLTYPE_HIT8", - "COLTYPE_METAL", - "COLTYPE_NONE", - "COLTYPE_WOOD", - "COLTYPE_HARD", - "COLTYPE_TREE" ] + "COL_MATERIAL_HIT0", + "COL_MATERIAL_HIT1", + "COL_MATERIAL_HIT2", + "COL_MATERIAL_HIT3", + "COL_MATERIAL_HIT4", + "COL_MATERIAL_HIT5", + "COL_MATERIAL_HIT6", + "COL_MATERIAL_HIT7", + "COL_MATERIAL_HIT8", + "COL_MATERIAL_METAL", + "COL_MATERIAL_NONE", + "COL_MATERIAL_WOOD", + "COL_MATERIAL_HARD", + "COL_MATERIAL_TREE" ] SHAPE_ENUM = [ "COLSHAPE_JNTSPH", @@ -32,14 +32,14 @@ SHAPE_ENUM = [ "COLSHAPE_QUAD", "COLSHAPE_SPHERE" ] -ELEMTYPE_UNKENUM = [ - "ELEMTYPE_UNK0", - "ELEMTYPE_UNK1", - "ELEMTYPE_UNK2", - "ELEMTYPE_UNK3", - "ELEMTYPE_UNK4", - "ELEMTYPE_UNK5", - "ELEMTYPE_UNK6"] +ELEM_MATERIAL_UNKENUM = [ + "ELEM_MATERIAL_UNK0", + "ELEM_MATERIAL_UNK1", + "ELEM_MATERIAL_UNK2", + "ELEM_MATERIAL_UNK3", + "ELEM_MATERIAL_UNK4", + "ELEM_MATERIAL_UNK5", + "ELEM_MATERIAL_UNK6"] ATFLAGS_ENUM = [ "AT_ON", @@ -257,7 +257,7 @@ def GetItems(data, off, count, structf, fmt, size): cItem = struct.unpack_from(structf, data, off + 0x18 + ioff) if cBody[0] < 7: - cBody[0] = ELEMTYPE_UNKENUM[cBody[0]] + cBody[0] = ELEM_MATERIAL_UNKENUM[cBody[0]] else: cBody[0] = '0x{0:02X}'.format(cBody[0]) @@ -308,7 +308,7 @@ def GetCylinder(address, data, off, type): cCyl16 = struct.unpack_from(sf_Cylinder16, data, off + 0x20) if cBody[0] < 7: - cBody[0] = ELEMTYPE_UNKENUM[cBody[0]] + cBody[0] = ELEM_MATERIAL_UNKENUM[cBody[0]] else: cBody[0] = '0x{0:02X}'.format(cBody[0]) @@ -343,7 +343,7 @@ def GetQuad(address, data, off, type): cQuad = struct.unpack_from(sf_Quad, data, off + 0x20) if cBody[0] < 7: - cBody[0] = ELEMTYPE_UNKENUM[cBody[0]] + cBody[0] = ELEM_MATERIAL_UNKENUM[cBody[0]] else: cBody[0] = '0x{0:02X}'.format(cBody[0]) @@ -366,7 +366,7 @@ def GetSphere(address, data, off, type): cSphere = struct.unpack_from(sf_Sphere, data, off + 0x20) if cBody[0] < 7: - cBody[0] = ELEMTYPE_UNKENUM[cBody[0]] + cBody[0] = ELEM_MATERIAL_UNKENUM[cBody[0]] else: cBody[0] = '0x{0:02X}'.format(cBody[0]) diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index ee16dd9e20..73e609bc01 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -814,9 +814,9 @@ asm/non_matchings/code/z_camera/Camera_GetWaterYPos.s,Camera_GetWaterYPos,0x800E asm/non_matchings/code/z_camera/func_800E0348.s,func_800E0348,0x800E0348,0x16 asm/non_matchings/code/z_collision_btltbls/DamageTable_Get.s,DamageTable_Get,0x800E03A0,0xB asm/non_matchings/code/z_collision_btltbls/DamageTable_Clear.s,DamageTable_Clear,0x800E03CC,0xD -asm/non_matchings/code/z_collision_check/CollisionCheck_GetDamageAndEffectOnBumper.s,CollisionCheck_GetDamageAndEffectOnBumper,0x800E0410,0x2B -asm/non_matchings/code/z_collision_check/CollisionCheck_ApplyBumperDefense.s,CollisionCheck_ApplyBumperDefense,0x800E04BC,0xC -asm/non_matchings/code/z_collision_check/CollisionCheck_GetToucherDamage.s,CollisionCheck_GetToucherDamage,0x800E04EC,0x13 +asm/non_matchings/code/z_collision_check/CollisionCheck_GetDamageAndEffectOnElementAC.s,CollisionCheck_GetDamageAndEffectOnElementAC,0x800E0410,0x2B +asm/non_matchings/code/z_collision_check/CollisionCheck_ApplyElementATDefense.s,CollisionCheck_ApplyElementATDefense,0x800E04BC,0xC +asm/non_matchings/code/z_collision_check/CollisionCheck_GetElementATDamage.s,CollisionCheck_GetElementATDamage,0x800E04EC,0x13 asm/non_matchings/code/z_collision_check/Collider_InitBase.s,Collider_InitBase,0x800E0538,0x12 asm/non_matchings/code/z_collision_check/Collider_DestroyBase.s,Collider_DestroyBase,0x800E0580,0x5 asm/non_matchings/code/z_collision_check/Collider_SetBaseToActor.s,Collider_SetBaseToActor,0x800E0594,0x10 @@ -825,13 +825,13 @@ asm/non_matchings/code/z_collision_check/Collider_SetBase.s,Collider_SetBase,0x8 asm/non_matchings/code/z_collision_check/Collider_ResetATBase.s,Collider_ResetATBase,0x800E065C,0x7 asm/non_matchings/code/z_collision_check/Collider_ResetACBase.s,Collider_ResetACBase,0x800E0678,0x7 asm/non_matchings/code/z_collision_check/Collider_ResetOCBase.s,Collider_ResetOCBase,0x800E0694,0xA -asm/non_matchings/code/z_collision_check/Collider_InitTouch.s,Collider_InitTouch,0x800E06BC,0xA -asm/non_matchings/code/z_collision_check/Collider_DestroyTouch.s,Collider_DestroyTouch,0x800E06E4,0x5 -asm/non_matchings/code/z_collision_check/Collider_SetTouch.s,Collider_SetTouch,0x800E06F8,0xA +asm/non_matchings/code/z_collision_check/Collider_InitElementDamageInfoAT.s,Collider_InitElementDamageInfoAT,0x800E06BC,0xA +asm/non_matchings/code/z_collision_check/Collider_DestroyElementDamageInfoAT.s,Collider_DestroyElementDamageInfoAT,0x800E06E4,0x5 +asm/non_matchings/code/z_collision_check/Collider_SetElementDamageInfoAT.s,Collider_SetElementDamageInfoAT,0x800E06F8,0xA asm/non_matchings/code/z_collision_check/Collider_ResetATElementUnk.s,Collider_ResetATElementUnk,0x800E0720,0x4 -asm/non_matchings/code/z_collision_check/Collider_InitBump.s,Collider_InitBump,0x800E0730,0xC -asm/non_matchings/code/z_collision_check/Collider_DestroyBump.s,Collider_DestroyBump,0x800E0760,0x5 -asm/non_matchings/code/z_collision_check/Collider_SetBump.s,Collider_SetBump,0x800E0774,0xA +asm/non_matchings/code/z_collision_check/Collider_InitElementDamageInfoAC.s,Collider_InitElementDamageInfoAC,0x800E0730,0xC +asm/non_matchings/code/z_collision_check/Collider_DestroyElementDamageInfoAC.s,Collider_DestroyElementDamageInfoAC,0x800E0760,0x5 +asm/non_matchings/code/z_collision_check/Collider_SetElementDamageInfoAC.s,Collider_SetElementDamageInfoAC,0x800E0774,0xA asm/non_matchings/code/z_collision_check/Collider_InitElement.s,Collider_InitElement,0x800E079C,0x20 asm/non_matchings/code/z_collision_check/Collider_DestroyElement.s,Collider_DestroyElement,0x800E081C,0x10 asm/non_matchings/code/z_collision_check/Collider_SetElement.s,Collider_SetElement,0x800E085C,0x1E @@ -925,8 +925,8 @@ asm/non_matchings/code/z_collision_check/CollisionCheck_SetAC_SAC.s,CollisionChe asm/non_matchings/code/z_collision_check/CollisionCheck_SetOC.s,CollisionCheck_SetOC,0x800E2928,0x37 asm/non_matchings/code/z_collision_check/CollisionCheck_SetOC_SAC.s,CollisionCheck_SetOC_SAC,0x800E2A04,0x43 asm/non_matchings/code/z_collision_check/CollisionCheck_SetOCLine.s,CollisionCheck_SetOCLine,0x800E2B10,0x22 -asm/non_matchings/code/z_collision_check/CollisionCheck_SkipTouch.s,CollisionCheck_SkipTouch,0x800E2B98,0x9 -asm/non_matchings/code/z_collision_check/CollisionCheck_SkipBump.s,CollisionCheck_SkipBump,0x800E2BBC,0x9 +asm/non_matchings/code/z_collision_check/CollisionCheck_IsElementNotAT.s,CollisionCheck_IsElementNotAT,0x800E2B98,0x9 +asm/non_matchings/code/z_collision_check/CollisionCheck_IsElementNotAC.s,CollisionCheck_IsElementNotAC,0x800E2BBC,0x9 asm/non_matchings/code/z_collision_check/CollisionCheck_NoSharedFlags.s,CollisionCheck_NoSharedFlags,0x800E2BE0,0xA asm/non_matchings/code/z_collision_check/CollisionCheck_NoBlood.s,CollisionCheck_NoBlood,0x800E2C08,0x5 asm/non_matchings/code/z_collision_check/CollisionCheck_BlueBlood.s,CollisionCheck_BlueBlood,0x800E2C1C,0x5B