From 6156df5fee16f528d9949a87b27943c5f747a11d Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:11:29 +1100 Subject: [PATCH] Document Culling (#1759) * culling docs * cleanup * PR suggestions --- include/z64actor.h | 31 ++-- src/code/z_actor.c | 134 ++++++++++++++---- src/code/z_en_item00.c | 2 +- src/code/z_player_call.c | 7 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 2 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 4 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 4 +- .../actors/ovl_Arrow_Light/z_arrow_light.c | 4 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 10 +- .../ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c | 2 +- .../ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c | 22 +-- .../ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c | 2 +- .../ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c | 8 +- .../ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c | 8 +- .../z_bg_dblue_elevator.c | 10 +- .../ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c | 14 +- .../z_bg_dblue_waterfall.c | 8 +- .../ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c | 8 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 2 +- .../actors/ovl_Bg_F40_Block/z_bg_f40_block.c | 8 +- .../actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c | 6 +- .../ovl_Bg_F40_Switch/z_bg_f40_switch.c | 8 +- .../ovl_Bg_F40_Swlift/z_bg_f40_swlift.c | 6 +- .../actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c | 2 +- .../actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c | 2 +- .../actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c | 2 +- .../actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c | 2 +- .../ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c | 8 +- .../ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c | 8 +- .../z_bg_hakugin_bombwall.c | 8 +- .../z_bg_hakugin_elvpole.c | 2 +- .../ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c | 2 +- .../z_bg_hakugin_switch.c | 14 +- .../actors/ovl_Bg_Icefloe/z_bg_icefloe.c | 2 +- .../actors/ovl_Bg_Icicle/z_bg_icicle.c | 2 +- .../ovl_Bg_Ikana_Block/z_bg_ikana_block.c | 8 +- .../z_bg_ikana_bombwall.c | 8 +- .../ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c | 12 +- .../ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c | 12 +- .../actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c | 10 +- .../z_bg_ikana_rotaryroom.c | 2 +- .../ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c | 8 +- .../ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c | 2 +- .../actors/ovl_Bg_Ikninside/z_bg_ikninside.c | 2 +- .../ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c | 2 +- .../actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c | 4 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 2 +- .../ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c | 2 +- .../ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c | 6 +- .../ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c | 8 +- .../ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c | 8 +- .../ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c | 9 +- .../ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c | 10 +- .../actors/ovl_Bg_Ladder/z_bg_ladder.c | 6 +- .../actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c | 2 +- src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c | 4 +- .../ovl_Bg_Market_Step/z_bg_market_step.c | 8 +- .../ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c | 6 +- .../actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c | 8 +- .../ovl_Bg_Open_Shutter/z_bg_open_shutter.c | 8 +- .../actors/ovl_Bg_Open_Spot/z_bg_open_spot.c | 8 +- .../ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c | 2 +- .../actors/ovl_Bg_Spdweb/z_bg_spdweb.c | 2 +- .../actors/ovl_Bg_Tobira01/z_bg_tobira01.c | 2 +- .../actors/ovl_Bg_Umajump/z_bg_umajump.c | 6 +- src/overlays/actors/ovl_Boss_01/z_boss_01.c | 4 +- src/overlays/actors/ovl_Boss_02/z_boss_02.c | 4 +- src/overlays/actors/ovl_Boss_03/z_boss_03.c | 4 +- src/overlays/actors/ovl_Boss_04/z_boss_04.c | 4 +- src/overlays/actors/ovl_Boss_05/z_boss_05.c | 2 +- src/overlays/actors/ovl_Boss_06/z_boss_06.c | 4 +- src/overlays/actors/ovl_Boss_07/z_boss_07.c | 4 +- .../actors/ovl_Boss_Hakugin/z_boss_hakugin.c | 4 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 2 +- .../actors/ovl_Demo_Getitem/z_demo_getitem.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 2 +- .../actors/ovl_Demo_Moonend/z_demo_moonend.c | 2 +- src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c | 2 +- .../actors/ovl_Demo_Syoten/z_demo_syoten.c | 2 +- .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 2 +- src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c | 6 +- .../actors/ovl_Dm_Char00/z_dm_char00.c | 2 +- .../actors/ovl_Dm_Char01/z_dm_char01.c | 4 +- .../actors/ovl_Dm_Char02/z_dm_char02.c | 2 +- .../actors/ovl_Dm_Char03/z_dm_char03.c | 2 +- .../actors/ovl_Dm_Char04/z_dm_char04.c | 2 +- .../actors/ovl_Dm_Char05/z_dm_char05.c | 2 +- .../actors/ovl_Dm_Char06/z_dm_char06.c | 2 +- .../actors/ovl_Dm_Char07/z_dm_char07.c | 2 +- .../actors/ovl_Dm_Char08/z_dm_char08.c | 6 +- .../actors/ovl_Dm_Char09/z_dm_char09.c | 2 +- src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c | 2 +- .../actors/ovl_Dm_Opstage/z_dm_opstage.c | 4 +- .../actors/ovl_Dm_Ravine/z_dm_ravine.c | 2 +- src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c | 2 +- .../actors/ovl_Dm_Statue/z_dm_statue.c | 2 +- src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c | 2 +- src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c | 2 +- src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c | 2 +- src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c | 2 +- src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 4 +- .../actors/ovl_Door_Shutter/z_door_shutter.c | 8 +- .../actors/ovl_Door_Spiral/z_door_spiral.c | 8 +- .../actors/ovl_Door_Warp1/z_door_warp1.c | 6 +- .../actors/ovl_Eff_Change/z_eff_change.c | 2 +- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 2 +- .../z_eff_kamejima_wave.c | 2 +- .../actors/ovl_Eff_Lastday/z_eff_lastday.c | 2 +- src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c | 2 +- .../actors/ovl_Eff_Zoraband/z_eff_zoraband.c | 2 +- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 4 +- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 4 +- src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c | 4 +- src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c | 4 +- src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c | 4 +- src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c | 4 +- src/overlays/actors/ovl_En_Ah/z_en_ah.c | 4 +- .../ovl_En_Akindonuts/z_en_akindonuts.c | 4 +- src/overlays/actors/ovl_En_Al/z_en_al.c | 4 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 2 +- src/overlays/actors/ovl_En_An/z_en_an.c | 4 +- src/overlays/actors/ovl_En_And/z_en_and.c | 4 +- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 6 +- .../actors/ovl_En_Aob_01/z_en_aob_01.c | 2 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 2 +- .../ovl_En_Attack_Niw/z_en_attack_niw.c | 2 +- src/overlays/actors/ovl_En_Az/z_en_az.c | 12 +- src/overlays/actors/ovl_En_Baba/z_en_baba.c | 2 +- src/overlays/actors/ovl_En_Bal/z_en_bal.c | 4 +- src/overlays/actors/ovl_En_Bat/z_en_bat.c | 4 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 4 +- .../actors/ovl_En_Bba_01/z_en_bba_01.c | 2 +- .../actors/ovl_En_Bbfall/z_en_bbfall.c | 4 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 2 +- .../actors/ovl_En_Bigpamet/z_en_bigpamet.c | 6 +- src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c | 10 +- .../actors/ovl_En_Bigslime/z_en_bigslime.c | 6 +- .../actors/ovl_En_Bji_01/z_en_bji_01.c | 2 +- .../actors/ovl_En_Boj_01/z_en_boj_01.c | 2 +- .../actors/ovl_En_Boj_02/z_en_boj_02.c | 2 +- .../actors/ovl_En_Boj_03/z_en_boj_03.c | 2 +- .../actors/ovl_En_Boj_04/z_en_boj_04.c | 2 +- .../actors/ovl_En_Boj_05/z_en_boj_05.c | 2 +- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 6 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 2 +- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 2 +- .../actors/ovl_En_Bombal/z_en_bombal.c | 4 +- .../actors/ovl_En_Bombers/z_en_bombers.c | 2 +- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 10 +- .../actors/ovl_En_Bomjima/z_en_bomjima.c | 4 +- src/overlays/actors/ovl_En_Boom/z_en_boom.c | 2 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 8 +- src/overlays/actors/ovl_En_Bsb/z_en_bsb.c | 6 +- src/overlays/actors/ovl_En_Butte/z_en_butte.c | 10 +- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 4 +- .../actors/ovl_En_Cne_01/z_en_cne_01.c | 2 +- .../actors/ovl_En_Col_Man/z_en_col_man.c | 4 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 6 +- src/overlays/actors/ovl_En_Dai/z_en_dai.c | 6 +- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 2 +- src/overlays/actors/ovl_En_Death/z_en_death.c | 9 +- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 4 +- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 4 +- src/overlays/actors/ovl_En_Dg/z_en_dg.c | 5 +- .../actors/ovl_En_Dinofos/z_en_dinofos.c | 6 +- src/overlays/actors/ovl_En_Dnb/z_en_dnb.c | 2 +- src/overlays/actors/ovl_En_Dnk/z_en_dnk.c | 2 +- src/overlays/actors/ovl_En_Dno/z_en_dno.c | 8 +- src/overlays/actors/ovl_En_Dnp/z_en_dnp.c | 2 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 2 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 4 +- src/overlays/actors/ovl_En_Door/z_en_door.c | 4 +- .../actors/ovl_En_Door_Etc/z_en_door_etc.c | 6 +- .../actors/ovl_En_Dragon/z_en_dragon.c | 4 +- src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c | 4 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 2 +- src/overlays/actors/ovl_En_Egol/z_en_egol.c | 6 +- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 2 +- .../actors/ovl_En_Elfgrp/z_en_elfgrp.c | 2 +- .../actors/ovl_En_Elforg/z_en_elforg.c | 2 +- .../actors/ovl_En_Encount1/z_en_encount1.c | 2 +- .../actors/ovl_En_Encount2/z_en_encount2.c | 2 +- .../actors/ovl_En_Encount3/z_en_encount3.c | 2 +- .../actors/ovl_En_Encount4/z_en_encount4.c | 2 +- .../actors/ovl_En_Estone/z_en_estone.c | 2 +- src/overlays/actors/ovl_En_Fall/z_en_fall.c | 2 +- src/overlays/actors/ovl_En_Fall2/z_en_fall2.c | 2 +- src/overlays/actors/ovl_En_Famos/z_en_famos.c | 2 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 2 +- .../actors/ovl_En_Firefly/z_en_firefly.c | 2 +- .../actors/ovl_En_Firefly2/z_en_firefly2.c | 6 +- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 12 +- src/overlays/actors/ovl_En_Fish2/z_en_fish2.c | 2 +- .../actors/ovl_En_Fishing/z_en_fishing.c | 16 +-- .../actors/ovl_En_Floormas/z_en_floormas.c | 6 +- src/overlays/actors/ovl_En_Fsn/z_en_fsn.c | 2 +- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 6 +- .../actors/ovl_En_Fu_Kago/z_en_fu_kago.c | 2 +- .../actors/ovl_En_Fu_Mato/z_en_fu_mato.c | 2 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 6 +- .../actors/ovl_En_Gakufu/z_en_gakufu.c | 2 +- .../actors/ovl_En_Gamelupy/z_en_gamelupy.c | 2 +- src/overlays/actors/ovl_En_Gb2/z_en_gb2.c | 6 +- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 2 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 10 +- src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 4 +- src/overlays/actors/ovl_En_Geg/z_en_geg.c | 2 +- src/overlays/actors/ovl_En_Gg/z_en_gg.c | 2 +- src/overlays/actors/ovl_En_Giant/z_en_giant.c | 8 +- .../actors/ovl_En_Ginko_Man/z_en_ginko_man.c | 2 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 4 +- src/overlays/actors/ovl_En_Gk/z_en_gk.c | 4 +- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 2 +- src/overlays/actors/ovl_En_Go/z_en_go.c | 6 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 22 +-- .../ovl_En_Grasshopper/z_en_grasshopper.c | 4 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 9 +- .../actors/ovl_En_Guruguru/z_en_guruguru.c | 2 +- .../actors/ovl_En_Hakurock/z_en_hakurock.c | 2 +- .../actors/ovl_En_Hanabi/z_en_hanabi.c | 2 +- src/overlays/actors/ovl_En_Hata/z_en_hata.c | 6 +- src/overlays/actors/ovl_En_Hg/z_en_hg.c | 4 +- src/overlays/actors/ovl_En_Hgo/z_en_hgo.c | 4 +- .../ovl_En_Hidden_Nuts/z_en_hidden_nuts.c | 2 +- .../actors/ovl_En_Hint_Skb/z_en_hint_skb.c | 2 +- .../actors/ovl_En_Hit_Tag/z_en_hit_tag.c | 2 +- src/overlays/actors/ovl_En_Holl/z_en_holl.c | 8 +- .../actors/ovl_En_Honotrap/z_en_honotrap.c | 12 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 13 +- .../z_en_horse_game_check.c | 6 +- .../z_en_horse_link_child.c | 4 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 2 +- src/overlays/actors/ovl_En_Ig/z_en_ig.c | 2 +- src/overlays/actors/ovl_En_In/z_en_in.c | 6 +- .../actors/ovl_En_Insect/z_en_insect.c | 8 +- .../actors/ovl_En_Invadepoh/z_en_invadepoh.c | 74 +++++----- .../z_en_invadepoh_demo.c | 34 ++--- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 22 +-- src/overlays/actors/ovl_En_Ja/z_en_ja.c | 4 +- .../actors/ovl_En_Jc_Mato/z_en_jc_mato.c | 2 +- src/overlays/actors/ovl_En_Jg/z_en_jg.c | 2 +- .../actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c | 4 +- src/overlays/actors/ovl_En_Js/z_en_js.c | 2 +- src/overlays/actors/ovl_En_Jso/z_en_jso.c | 2 +- src/overlays/actors/ovl_En_Jso2/z_en_jso2.c | 6 +- .../actors/ovl_En_Kaizoku/z_en_kaizoku.c | 3 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 4 +- src/overlays/actors/ovl_En_Kame/z_en_kame.c | 8 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 2 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 8 +- .../actors/ovl_En_Kendo_Js/z_en_kendo_js.c | 6 +- .../actors/ovl_En_Knight/z_en_knight.c | 4 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 16 +-- src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c | 12 +- .../actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c | 4 +- .../actors/ovl_En_Look_Nuts/z_en_look_nuts.c | 2 +- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 2 +- src/overlays/actors/ovl_En_Ma4/z_en_ma4.c | 6 +- .../actors/ovl_En_Ma_Yto/z_en_ma_yto.c | 2 +- .../actors/ovl_En_Ma_Yts/z_en_ma_yts.c | 2 +- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 2 +- .../actors/ovl_En_Maruta/z_en_maruta.c | 2 +- .../actors/ovl_En_Minideath/z_en_minideath.c | 6 +- .../actors/ovl_En_Minifrog/z_en_minifrog.c | 2 +- .../actors/ovl_En_Minislime/z_en_minislime.c | 6 +- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 2 +- src/overlays/actors/ovl_En_Mkk/z_en_mkk.c | 6 +- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 2 +- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 2 +- src/overlays/actors/ovl_En_Mm3/z_en_mm3.c | 2 +- src/overlays/actors/ovl_En_Mnk/z_en_mnk.c | 2 +- .../actors/ovl_En_Mt_tag/z_en_mt_tag.c | 2 +- .../actors/ovl_En_Mushi2/z_en_mushi2.c | 16 +-- src/overlays/actors/ovl_En_Muto/z_en_muto.c | 2 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 4 +- .../actors/ovl_En_Nimotsu/z_en_nimotsu.c | 2 +- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 2 +- src/overlays/actors/ovl_En_Nnh/z_en_nnh.c | 2 +- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 2 +- src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 2 +- .../z_en_okarina_effect.c | 2 +- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 2 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 6 +- src/overlays/actors/ovl_En_Osn/z_en_osn.c | 2 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 4 +- src/overlays/actors/ovl_En_Ot/z_en_ot.c | 10 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 12 +- .../actors/ovl_En_Pamera/z_en_pamera.c | 2 +- .../actors/ovl_En_Pametfrog/z_en_pametfrog.c | 4 +- src/overlays/actors/ovl_En_Paper/z_en_paper.c | 2 +- src/overlays/actors/ovl_En_Part/z_en_part.c | 2 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 8 +- src/overlays/actors/ovl_En_Pm/z_en_pm.c | 4 +- .../ovl_En_Po_Composer/z_en_po_composer.c | 4 +- .../actors/ovl_En_Po_Fusen/z_en_po_fusen.c | 4 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 6 +- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 2 +- src/overlays/actors/ovl_En_Pr/z_en_pr.c | 2 +- src/overlays/actors/ovl_En_Pr2/z_en_pr2.c | 2 +- src/overlays/actors/ovl_En_Prz/z_en_prz.c | 2 +- .../actors/ovl_En_Racedog/z_en_racedog.c | 8 +- .../actors/ovl_En_Rail_Skb/z_en_rail_skb.c | 2 +- .../actors/ovl_En_Railgibud/z_en_railgibud.c | 6 +- src/overlays/actors/ovl_En_Rat/z_en_rat.c | 4 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 4 +- src/overlays/actors/ovl_En_Rg/z_en_rg.c | 2 +- .../ovl_En_River_Sound/z_en_river_sound.c | 2 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 2 +- src/overlays/actors/ovl_En_Rsn/z_en_rsn.c | 4 +- src/overlays/actors/ovl_En_Ru/z_en_ru.c | 2 +- .../actors/ovl_En_Ruppecrow/z_en_ruppecrow.c | 12 +- src/overlays/actors/ovl_En_Rz/z_en_rz.c | 4 +- .../actors/ovl_En_S_Goro/z_en_s_goro.c | 5 +- .../actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c | 2 +- .../actors/ovl_En_Scopecoin/z_en_scopecoin.c | 2 +- .../actors/ovl_En_Scopecrow/z_en_scopecrow.c | 2 +- .../actors/ovl_En_Scopenuts/z_en_scopenuts.c | 4 +- src/overlays/actors/ovl_En_Sda/z_en_sda.c | 2 +- .../actors/ovl_En_Sekihi/z_en_sekihi.c | 2 +- .../actors/ovl_En_Sellnuts/z_en_sellnuts.c | 4 +- src/overlays/actors/ovl_En_Slime/z_en_slime.c | 14 +- .../actors/ovl_En_Snowman/z_en_snowman.c | 8 +- .../actors/ovl_En_Snowwd/z_en_snowwd.c | 6 +- src/overlays/actors/ovl_En_Sob1/z_en_sob1.c | 4 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 4 +- src/overlays/actors/ovl_En_St/z_en_st.c | 6 +- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 4 +- src/overlays/actors/ovl_En_Sth2/z_en_sth2.c | 2 +- .../ovl_En_Stop_heishi/z_en_stop_heishi.c | 2 +- .../actors/ovl_En_Stream/z_en_stream.c | 2 +- .../actors/ovl_En_Suttari/z_en_suttari.c | 2 +- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 4 +- .../ovl_En_Syateki_Crow/z_en_syateki_crow.c | 4 +- .../z_en_syateki_dekunuts.c | 2 +- .../ovl_En_Syateki_Man/z_en_syateki_man.c | 4 +- .../ovl_En_Syateki_Okuta/z_en_syateki_okuta.c | 2 +- .../ovl_En_Syateki_Wf/z_en_syateki_wf.c | 2 +- src/overlays/actors/ovl_En_Tab/z_en_tab.c | 4 +- .../actors/ovl_En_Takaraya/z_en_takaraya.c | 4 +- .../ovl_En_Talk_Gibud/z_en_talk_gibud.c | 4 +- .../actors/ovl_En_Tanron1/z_en_tanron1.c | 4 +- .../actors/ovl_En_Tanron2/z_en_tanron2.c | 4 +- .../actors/ovl_En_Tanron3/z_en_tanron3.c | 4 +- .../actors/ovl_En_Tanron4/z_en_tanron4.c | 4 +- .../actors/ovl_En_Tanron5/z_en_tanron5.c | 2 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 2 +- src/overlays/actors/ovl_En_Test2/z_en_test2.c | 10 +- src/overlays/actors/ovl_En_Test3/z_en_test3.c | 2 +- src/overlays/actors/ovl_En_Test4/z_en_test4.c | 2 +- src/overlays/actors/ovl_En_Test5/z_en_test5.c | 2 +- src/overlays/actors/ovl_En_Test6/z_en_test6.c | 4 +- src/overlays/actors/ovl_En_Test7/z_en_test7.c | 4 +- .../actors/ovl_En_Thiefbird/z_en_thiefbird.c | 12 +- .../actors/ovl_En_Time_Tag/z_en_time_tag.c | 2 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 2 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 2 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 2 +- src/overlays/actors/ovl_En_Trt2/z_en_trt2.c | 4 +- src/overlays/actors/ovl_En_Tru/z_en_tru.c | 4 +- .../actors/ovl_En_Tru_Mt/z_en_tru_mt.c | 4 +- src/overlays/actors/ovl_En_Tsn/z_en_tsn.c | 4 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 9 +- src/overlays/actors/ovl_En_Twig/z_en_twig.c | 14 +- .../actors/ovl_En_Viewer/z_en_viewer.c | 2 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 2 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 8 +- .../actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c | 10 +- .../actors/ovl_En_Warp_tag/z_en_warp_tag.c | 5 +- .../ovl_En_Water_Effect/z_en_water_effect.c | 4 +- .../actors/ovl_En_Wdhand/z_en_wdhand.c | 2 +- .../ovl_En_Weather_Tag/z_en_weather_tag.c | 2 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 4 +- src/overlays/actors/ovl_En_Wiz/z_en_wiz.c | 7 +- .../actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c | 2 +- .../actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c | 4 +- .../actors/ovl_En_Wood02/z_en_wood02.c | 32 ++--- src/overlays/actors/ovl_En_Yb/z_en_yb.c | 4 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 2 +- src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 2 +- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 2 +- src/overlays/actors/ovl_En_Zob/z_en_zob.c | 2 +- src/overlays/actors/ovl_En_Zod/z_en_zod.c | 4 +- src/overlays/actors/ovl_En_Zog/z_en_zog.c | 2 +- .../actors/ovl_En_Zoraegg/z_en_zoraegg.c | 2 +- src/overlays/actors/ovl_En_Zos/z_en_zos.c | 2 +- src/overlays/actors/ovl_En_Zot/z_en_zot.c | 2 +- src/overlays/actors/ovl_En_Zow/z_en_zow.c | 2 +- .../actors/ovl_Item_B_Heart/z_item_b_heart.c | 6 +- .../ovl_Item_Etcetera/z_item_etcetera.c | 2 +- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 8 +- src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c | 2 +- src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c | 2 +- src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c | 13 +- .../actors/ovl_Obj_Armos/z_obj_armos.c | 8 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 22 +-- src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c | 2 +- .../ovl_Obj_Bigicicle/z_obj_bigicicle.c | 4 +- .../ovl_Obj_Blockstop/z_obj_blockstop.c | 2 +- src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c | 8 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 8 +- src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c | 8 +- src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c | 2 +- .../actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c | 8 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 14 +- .../ovl_Obj_Danpeilift/z_obj_danpeilift.c | 8 +- src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c | 2 +- .../actors/ovl_Obj_Dhouse/z_obj_dhouse.c | 16 +-- .../actors/ovl_Obj_Dinner/z_obj_dinner.c | 2 +- src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c | 2 +- .../actors/ovl_Obj_Dowsing/z_obj_dowsing.c | 2 +- .../actors/ovl_Obj_Driftice/z_obj_driftice.c | 10 +- .../actors/ovl_Obj_Ending/z_obj_ending.c | 2 +- .../actors/ovl_Obj_Entotu/z_obj_entotu.c | 2 +- .../actors/ovl_Obj_Etcetera/z_obj_etcetera.c | 2 +- .../ovl_Obj_Fireshield/z_obj_fireshield.c | 8 +- .../ovl_Obj_Flowerpot/z_obj_flowerpot.c | 10 +- .../actors/ovl_Obj_Funen/z_obj_funen.c | 2 +- .../actors/ovl_Obj_Ghaka/z_obj_ghaka.c | 2 +- .../actors/ovl_Obj_Grass/z_obj_grass.c | 2 +- .../ovl_Obj_Grass_Carry/z_obj_grass_carry.c | 2 +- .../actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c | 2 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 12 +- src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c | 6 +- .../actors/ovl_Obj_Hariko/z_obj_hariko.c | 2 +- .../actors/ovl_Obj_HsStump/z_obj_hsstump.c | 2 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 10 +- .../ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c | 8 +- .../actors/ovl_Obj_Hunsui/z_obj_hunsui.c | 16 +-- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 4 +- .../actors/ovl_Obj_Iceblock/z_obj_iceblock.c | 20 +-- .../actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c | 2 +- .../ovl_Obj_Jgame_Light/z_obj_jgame_light.c | 2 +- .../ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c | 4 +- .../actors/ovl_Obj_Kibako/z_obj_kibako.c | 10 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 10 +- .../actors/ovl_Obj_Kinoko/z_obj_kinoko.c | 2 +- .../actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c | 2 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 10 +- .../ovl_Obj_Lightblock/z_obj_lightblock.c | 6 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 8 +- .../ovl_Obj_Lupygamelift/z_obj_lupygamelift.c | 8 +- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 10 +- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 2 +- src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c | 18 +-- .../ovl_Obj_Moon_Stone/z_obj_moon_stone.c | 2 +- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 10 +- .../actors/ovl_Obj_Mure2/z_obj_mure2.c | 12 +- .../actors/ovl_Obj_Mure3/z_obj_mure3.c | 10 +- .../actors/ovl_Obj_Nozoki/z_obj_nozoki.c | 4 +- .../ovl_Obj_Ocarinalift/z_obj_ocarinalift.c | 10 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 8 +- .../actors/ovl_Obj_Purify/z_obj_purify.c | 4 +- .../actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c | 8 +- .../actors/ovl_Obj_Raillift/z_obj_raillift.c | 8 +- .../ovl_Obj_Roomtimer/z_obj_roomtimer.c | 2 +- .../actors/ovl_Obj_Rotlift/z_obj_rotlift.c | 6 +- .../actors/ovl_Obj_Shutter/z_obj_shutter.c | 2 +- .../ovl_Obj_Skateblock/z_obj_skateblock.c | 10 +- .../actors/ovl_Obj_Smork/z_obj_smork.c | 2 +- .../actors/ovl_Obj_Snowball/z_obj_snowball.c | 12 +- .../ovl_Obj_Snowball2/z_obj_snowball2.c | 17 ++- .../actors/ovl_Obj_Sound/z_obj_sound.c | 2 +- .../ovl_Obj_Spidertent/z_obj_spidertent.c | 8 +- .../ovl_Obj_Spinyroll/z_obj_spinyroll.c | 12 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 8 +- .../actors/ovl_Obj_Swprize/z_obj_swprize.c | 2 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 8 +- .../z_obj_takaraya_wall.c | 4 +- src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c | 10 +- src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c | 10 +- .../ovl_Obj_Tokei_Step/z_obj_tokei_step.c | 10 +- .../ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c | 10 +- .../ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c | 6 +- .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 8 +- .../actors/ovl_Obj_Toudai/z_obj_toudai.c | 2 +- src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c | 2 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 20 +-- src/overlays/actors/ovl_Obj_Um/z_obj_um.c | 8 +- .../actors/ovl_Obj_Usiyane/z_obj_usiyane.c | 8 +- .../ovl_Obj_Visiblock/z_obj_visiblock.c | 6 +- .../ovl_Obj_Vspinyroll/z_obj_vspinyroll.c | 10 +- src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c | 8 +- .../actors/ovl_Obj_Wturn/z_obj_wturn.c | 2 +- .../actors/ovl_Obj_Y2lift/z_obj_y2lift.c | 8 +- .../ovl_Obj_Y2shutter/z_obj_y2shutter.c | 8 +- src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c | 2 +- src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c | 6 +- .../ovl_Object_Kankyo/z_object_kankyo.c | 2 +- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 4 +- .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 2 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 2 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 2 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 2 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 2 +- .../actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c | 2 +- .../actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c | 2 +- .../actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c | 2 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 2 +- src/overlays/actors/ovl_TG_Sw/z_tg_sw.c | 2 +- .../actors/ovl_player_actor/z_player.c | 2 +- tools/disasm/functions.txt | 4 +- tools/sizes/code_functions.csv | 4 +- 502 files changed, 1467 insertions(+), 1227 deletions(-) diff --git a/include/z64actor.h b/include/z64actor.h index 0faa4ff0dd..24f28abdd7 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -131,9 +131,9 @@ typedef struct Actor { /* 0x0BC */ ActorShape shape; // Variables related to the physical shape of the actor /* 0x0EC */ Vec3f projectedPos; // Position of the actor in projected space /* 0x0F8 */ f32 projectedW; // w component of the projected actor position - /* 0x0FC */ f32 uncullZoneForward; // Amount to increase the uncull zone forward by (in projected space) - /* 0x100 */ f32 uncullZoneScale; // Amount to increase the uncull zone scale by (in projected space) - /* 0x104 */ f32 uncullZoneDownward; // Amount to increase uncull zone downward by (in projected space) + /* 0x0FC */ f32 cullingVolumeDistance; // Forward distance of the culling volume (in projected space). See `Actor_CullingCheck` and `Actor_CullingVolumeTest` for more information. + /* 0x100 */ f32 cullingVolumeScale; // Scale of the culling volume (in projected space). See `Actor_CullingCheck` and `Actor_CullingVolumeTest` for more information. + /* 0x104 */ f32 cullingVolumeDownward; // Downward height of the culling volume (in projected space). See `Actor_CullingCheck` and `Actor_CullingVolumeTest` for more information. /* 0x108 */ Vec3f prevPos; // World position from the previous update cycle /* 0x114 */ u8 isLockedOn; // Set to true if the actor is currently being targeted by the player /* 0x115 */ u8 targetPriority; // Lower values have higher priority. Resets to 0 when player stops targeting @@ -480,12 +480,25 @@ typedef enum DoorLockType { // What actually matters is the presence or lack of `ACTOR_FLAG_HOSTILE`. #define ACTOR_FLAG_FRIENDLY (1 << 3) -// -#define ACTOR_FLAG_10 (1 << 4) -// -#define ACTOR_FLAG_20 (1 << 5) -// -#define ACTOR_FLAG_40 (1 << 6) +// Culling of the actor's update process is disabled. +// In other words, the actor will keep updating even if the actor is outside its own culling volume. +// See `Actor_CullingCheck` for more information about culling. +// See `Actor_CullingVolumeTest` for more information on the test used to determine if an actor should be culled. +#define ACTOR_FLAG_UPDATE_CULLING_DISABLED (1 << 4) + +// Culling of the actor's draw process is disabled. +// In other words, the actor will keep drawing even if the actor is outside its own culling volume. +// See `Actor_CullingCheck` for more information about culling. +// See `Actor_CullingVolumeTest` for more information on the test used to determine if an actor should be culled. +// (The original name for this flag is `NO_CULL_DRAW`, known from the Majora's Mask Debug ROM) +#define ACTOR_FLAG_DRAW_CULLING_DISABLED (1 << 5) + +// Set if the actor is currently within the bounds of its culling volume. +// In most cases, this flag can be used to determine whether or not an actor is currently culled. +// However this flag still updates even if `ACTOR_FLAG_UPDATE_CULLING_DISABLED` or `ACTOR_FLAG_DRAW_CULLING_DISABLED` +// are set. Meaning, the flag can still have a value of "false" even if it is not actually culled. +// (The original name for this flag is `NO_CULL_FLAG`, known from the Majora's Mask Debug ROM) +#define ACTOR_FLAG_INSIDE_CULLING_VOLUME (1 << 6) // hidden or revealed by Lens of Truth (depending on room lensMode) #define ACTOR_FLAG_REACT_TO_LENS (1 << 7) diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 09ff56811d..d9ced77faa 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -66,7 +66,7 @@ Actor* Actor_SpawnEntry(ActorContext* actorCtx, ActorEntry* actorEntry, PlayStat Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play); void Attention_FindActor(PlayState* play, ActorContext* actorCtx, Actor** attentionActorP, Actor** cameraDriftActorP, Player* player); -s32 func_800BA2FC(PlayState* play, Actor* actor, Vec3f* projectedPos, f32 projectedW); +s32 Actor_CullingVolumeTest(PlayState* play, Actor* actor, Vec3f* projPos, f32 projW); void Actor_AddToCategory(ActorContext* actorCtx, Actor* actor, u8 actorCategory); Actor* Actor_RemoveFromCategory(PlayState* play, ActorContext* actorCtx, Actor* actorToRemove); @@ -1157,9 +1157,9 @@ void Actor_Init(Actor* actor, PlayState* play) { actor->terminalVelocity = -20.0f; actor->xyzDistToPlayerSq = FLT_MAX; - actor->uncullZoneForward = 1000.0f; - actor->uncullZoneScale = 350.0f; - actor->uncullZoneDownward = 700.0f; + actor->cullingVolumeDistance = 1000.0f; + actor->cullingVolumeScale = 350.0f; + actor->cullingVolumeDownward = 700.0f; actor->hintId = TATL_HINT_ID_NONE; @@ -2680,7 +2680,7 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) { if (play->unk_18844) { params.unk_18 = ACTOR_FLAG_200000; } else { - params.unk_18 = ACTOR_FLAG_200000 | ACTOR_FLAG_40 | ACTOR_FLAG_10; + params.unk_18 = ACTOR_FLAG_200000 | ACTOR_FLAG_INSIDE_CULLING_VOLUME | ACTOR_FLAG_UPDATE_CULLING_DISABLED; } Actor_SpawnSetupActors(play, actorCtx); @@ -3014,31 +3014,113 @@ void Actor_DrawLensActors(PlayState* play, s32 numLensActors, Actor** lensActors CLOSE_DISPS(gfxCtx); } -s32 func_800BA2D8(PlayState* play, Actor* actor) { - return func_800BA2FC(play, actor, &actor->projectedPos, actor->projectedW); +/** + * Checks if an actor should be culled or not, by seeing if it is contained within its own culling volume. + * For more details on the culling test, see `Actor_CullingVolumeTest`. + * + * Returns true if the actor is inside its culling volume. In other words, it should not cull. + * + * "Culling" in this context refers to the removal of something for the sake of improving performance. + * For actors, being culled means that their Update and Draw processes are halted. + * While halted, an Actor's update state is frozen and it will not draw, making it invisible. + * + * Actors that are within the bounds of their culling volume may update and draw, while actors that are + * out of bounds of its culling volume may be excluded from updating and drawing until they are within bounds. + * + * It is possible for actors to opt out of update culling or draw culling. + * This is set per-actor with `ACTOR_FLAG_UPDATE_CULLING_DISABLED` and `ACTOR_FLAG_DRAW_CULLING_DISABLED`. + * + * Note: Even if either `ACTOR_FLAG_UPDATE_CULLING_DISABLED` or `ACTOR_FLAG_DRAW_CULLING_DISABLED` are set, the actor + * will still undergo the culling test and set `ACTOR_FLAG_INSIDE_CULLING_VOLUME` accordingly. + * So, `ACTOR_FLAG_INSIDE_CULLING_VOLUME` cannot be used on it own to determine if an actor is actually culled. + * It simply says whether or not they are physically located within the bounds of the culling volume. + */ +s32 Actor_CullingCheck(PlayState* play, Actor* actor) { + return Actor_CullingVolumeTest(play, actor, &actor->projectedPos, actor->projectedW); } -s32 func_800BA2FC(PlayState* play, Actor* actor, Vec3f* projectedPos, f32 projectedW) { - if ((-actor->uncullZoneScale < projectedPos->z) && - (projectedPos->z < (actor->uncullZoneForward + actor->uncullZoneScale))) { - f32 phi_f12; - f32 phi_f2 = CLAMP_MIN(projectedW, 1.0f); - f32 phi_f14; - f32 phi_f16; +/** + * Tests if an actor is currently within the bounds of its own culling volume. + * + * The culling volume is a 3D shape composed of a frustum with a box attached to the end of it. The frustum sits at the + * camera's position and projects forward, encompassing the player's current view; the box extrudes behind the camera, + * allowing actors in the immediate vicinity behind and to the sides of the camera to be detected. + * + * This function returns true if the actor is within bounds, false if not. + * The comparison is done in projected space against the actor's projected position as the viewing frustum + * in world space transforms to a box in projected space, making the calculation easy. + * + * Every actor can set properties for their own culling volume, changing its dimensions to suit the needs of + * it and its environment. These properties are in units of projected space (i.e. compared to the actor's position + * after perspective projection is applied) are therefore not directly comparable to world units. + * These depend on the current view parameters (aspect, scale, znear, zfar). + * The default parameters considered are (4/3, 1.0, 10, 12800). + * + * cullingVolumeDistance: Configures how far forward the far plane of the frustum should extend. + * This along with cullingVolumeScale determines the maximum distance from + * the camera eye that the actor can be detected at. This quantity is related + * to world units by a factor of + * (znear - zfar) / ((znear + zfar) * scale). + * For default view parameters, increasing this property by 1 increases the + * distance by ~0.995 world units. + * + * cullingVolumeScale: Scales the entire culling volume in all directions except the downward + * direction. Both the frustum and the box will scale in size. This quantity is + * related to world units by different factors based on direction: + * - For the forward and backward directions, they are related in the same way + * as above. For default view parameters, increasing this property by 1 increases + * the forward and backward scales by ~0.995 world units. + * - For the sideways directions, the relation to world units is + * (aspect / scale) * sqrt(3)/3 + * For default view parameters, increasing this property by 1 increases the + * sideways scales by ~0.77 world units. + * - For the upward direction, the relation to world units is + * (1 / scale) * sqrt(3)/3 + * For default view parameters, increasing this property by 1 increases the + * scale by ~0.58 world units. + * + * cullingVolumeDownward: Sets the height of the culling volume in the downward direction. Increasing + * this value will make actors below the camera more easily detected. This + * quantity is related to world units by the same factor as the upward scale. + * For default view parameters, increasing this property by 1 increases the + * downward height by ~0.58 world units. + * + * This interactive 3D graph visualizes the shape of the culling volume and has sliders for the 3 properties mentioned + * above: https://www.desmos.com/3d/4ztkxqky2a. + */ +s32 Actor_CullingVolumeTest(PlayState* play, Actor* actor, Vec3f* projPos, f32 projW) { + if ((projPos->z > -actor->cullingVolumeScale) && + (projPos->z < (actor->cullingVolumeDistance + actor->cullingVolumeScale))) { + f32 invW; + f32 cullingVolumeScaleX; + f32 cullingVolumeScaleY; + f32 cullingVolumeDownward; + + // Clamping `projW` affects points behind the camera, so that the culling volume has + // a frustum shape in front of the camera and a box shape behind the camera. + invW = CLAMP_MIN(projW, 1.0f); if (play->view.fovy != 60.0f) { - phi_f12 = actor->uncullZoneScale * play->projectionMtxFDiagonal.x * 0.76980036f; // sqrt(16/27) + // If the fov isn't 60 degrees, make the cull parameters behave as if it were 60 degrees. + // To do this, multiply by the ratios of the x and y diagonal elements of the projection matrix. + // The x diagonal element is cot(0.5 * fov) / aspect and the y diagonal element is just cot(0.5 * fov). + // When the fov is 60 degrees, cot(0.5 * 60 degrees) = sqrt(3) so the x element is 3sqrt(3)/4 and the y + // element is sqrt(3). The current diagonal element divided by (or multiplied by their inverse) gives + // the ratio. - phi_f14 = play->projectionMtxFDiagonal.y * 0.57735026f; // 1 / sqrt(3) - phi_f16 = actor->uncullZoneScale * phi_f14; - phi_f14 *= actor->uncullZoneDownward; + cullingVolumeScaleX = actor->cullingVolumeScale * play->projectionMtxFDiagonal.x * + 0.76980036f; // sqrt(16/27) = aspect / cot(0.5 * f) = (4/3) / sqrt(3) + + cullingVolumeDownward = play->projectionMtxFDiagonal.y * 0.57735026f; // 1 / sqrt(3) = 1 / cot(0.5 * f) + cullingVolumeScaleY = actor->cullingVolumeScale * cullingVolumeDownward; + cullingVolumeDownward *= actor->cullingVolumeDownward; } else { - phi_f16 = phi_f12 = actor->uncullZoneScale; - phi_f14 = actor->uncullZoneDownward; + cullingVolumeScaleY = cullingVolumeScaleX = actor->cullingVolumeScale; + cullingVolumeDownward = actor->cullingVolumeDownward; } - if (((fabsf(projectedPos->x) - phi_f12) < phi_f2) && ((-phi_f2 < (projectedPos->y + phi_f14))) && - ((projectedPos->y - phi_f16) < phi_f2)) { + if (((fabsf(projPos->x) - cullingVolumeScaleX) < invW) && ((-invW < (projPos->y + cullingVolumeDownward))) && + ((projPos->y - cullingVolumeScaleY) < invW)) { return true; } } @@ -3060,7 +3142,7 @@ void Actor_DrawAll(PlayState* play, ActorContext* actorCtx) { if (play->unk_18844) { actorFlags = ACTOR_FLAG_200000; } else { - actorFlags = ACTOR_FLAG_200000 | ACTOR_FLAG_40 | ACTOR_FLAG_20; + actorFlags = ACTOR_FLAG_200000 | ACTOR_FLAG_INSIDE_CULLING_VOLUME | ACTOR_FLAG_DRAW_CULLING_DISABLED; } OPEN_DISPS(play->state.gfxCtx); @@ -3081,10 +3163,10 @@ void Actor_DrawAll(PlayState* play, ActorContext* actorCtx) { Actor_UpdateFlaggedAudio(actor); } - if (func_800BA2D8(play, actor)) { - actor->flags |= ACTOR_FLAG_40; + if (Actor_CullingCheck(play, actor)) { + actor->flags |= ACTOR_FLAG_INSIDE_CULLING_VOLUME; } else { - actor->flags &= ~ACTOR_FLAG_40; + actor->flags &= ~ACTOR_FLAG_INSIDE_CULLING_VOLUME; } actor->isDrawn = false; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index e7058ba3b5..64a17eadd4 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1429,7 +1429,7 @@ void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnP spawnedActor->actor.world.rot.y = Rand_ZeroOne() * 40000.0f; Actor_SetScale(&spawnedActor->actor, 0.0f); spawnedActor->actionFunc = func_800A6780; - spawnedActor->actor.flags |= ACTOR_FLAG_10; + spawnedActor->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if ((spawnedActor->actor.params != ITEM00_SMALL_KEY) && (spawnedActor->actor.params != ITEM00_HEART_PIECE) && (spawnedActor->actor.params != ITEM00_HEART_CONTAINER)) { diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index e301cf48e3..9eb191dc9b 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -1,9 +1,10 @@ #include "global.h" #include "kaleido_manager.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_200000 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES | ACTOR_FLAG_MINIMAP_ICON_ENABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_200000 | ACTOR_FLAG_UPDATE_DURING_OCARINA | \ + ACTOR_FLAG_CAN_PRESS_SWITCHES | ACTOR_FLAG_MINIMAP_ICON_ENABLED) ActorFunc sPlayerCallInitFunc; ActorFunc sPlayerCallDestroyFunc; 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 cfc272e92c..0a1e35392f 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_link_child/object_link_child.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ArmsHook_Init(Actor* thisx, PlayState* play); void ArmsHook_Destroy(Actor* thisx, PlayState* play); 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 9510b192ba..e6fcf3fd66 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -7,7 +7,7 @@ #include "z_arrow_fire.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowFire_Init(Actor* thisx, PlayState* play); void ArrowFire_Destroy(Actor* thisx, PlayState* play); @@ -52,7 +52,7 @@ static ColliderQuadInit sQuadInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; static s32 sBssPad; diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 8a85dfca0b..e806cb32a7 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -7,7 +7,7 @@ #include "z_arrow_ice.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowIce_Init(Actor* thisx, PlayState* play); void ArrowIce_Destroy(Actor* thisx, PlayState* play); @@ -34,7 +34,7 @@ ActorProfile Arrow_Ice_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; void ArrowIce_SetupAction(ArrowIce* this, ArrowIceActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 4302f9f63e..a918738550 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -7,7 +7,7 @@ #include "z_arrow_light.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ArrowLight_Init(Actor* thisx, PlayState* play); void ArrowLight_Destroy(Actor* thisx, PlayState* play); @@ -32,7 +32,7 @@ ActorProfile Arrow_Light_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; static s32 sBssPad; diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index 96bb0f2b38..0e54edf5c0 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -15,7 +15,7 @@ #include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" #include "assets/objects/object_spot11_obj/object_spot11_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgBreakwall_Init(Actor* thisx, PlayState* play); void BgBreakwall_Update(Actor* thisx, PlayState* play); @@ -93,9 +93,9 @@ BgBreakwallStruct D_808B8140[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; Color_RGBA8 D_808B82F0[] = { @@ -246,7 +246,7 @@ void func_808B76CC(BgBreakwall* this, PlayState* play) { if (((BGBREAKWALL_GET_F(&this->dyna.actor)) != BGBREAKWALL_F_7) && ((BGBREAKWALL_GET_F(&this->dyna.actor)) != BGBREAKWALL_F_9) && ((BGBREAKWALL_GET_F(&this->dyna.actor)) != BGBREAKWALL_F_11)) { - this->dyna.actor.flags &= ~ACTOR_FLAG_10; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } Actor_SetObjectDependency(play, &this->dyna.actor); diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c index 406372a701..72c979b90f 100644 --- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c @@ -7,7 +7,7 @@ #include "z_bg_crace_movebg.h" #include "overlays/actors/ovl_En_Dno/z_en_dno.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgCraceMovebg_Init(Actor* thisx, PlayState* play); void BgCraceMovebg_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c index e3e45e5eba..993571d96f 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c @@ -7,7 +7,7 @@ #include "z_bg_ctower_gear.h" #include "assets/objects/object_ctower_rot/object_ctower_rot.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgCtowerGear_Init(Actor* thisx, PlayState* play); void BgCtowerGear_Destroy(Actor* thisx, PlayState* play); @@ -43,28 +43,28 @@ static Vec3f sEnterSplashOffsets[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; static InitChainEntry sInitChainCenterCog[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2000, ICHAIN_STOP), }; static InitChainEntry sInitChainOrgan[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 420, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 570, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 420, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 570, ICHAIN_STOP), }; static Gfx* sDLists[] = { gClockTowerCeilingCogDL, gClockTowerCenterCogDL, gClockTowerWaterWheelDL }; void BgCtowerGear_Splash(BgCtowerGear* this, PlayState* play) { s32 i; - s32 flag40 = this->dyna.actor.flags & ACTOR_FLAG_40; + s32 flag40 = this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME; Vec3f splashSpawnPos; Vec3f splashOffset; s32 pad; diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c index a0b80b93ea..19ef93104d 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c @@ -7,7 +7,7 @@ #include "z_bg_ctower_rot.h" #include "assets/objects/object_ctower_rot/object_ctower_rot.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgCtowerRot_Init(Actor* thisx, PlayState* play); void BgCtowerRot_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c index d145421beb..67241ceeae 100644 --- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c @@ -8,7 +8,7 @@ #include "assets/objects/object_d_lift/object_d_lift.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define DANPEI_MOVEBG_FLAG_4 (1 << 2) #define DANPEI_MOVEBG_FLAG_8 (1 << 3) @@ -46,9 +46,9 @@ static Gfx* D_80AF7534[] = { gDampeGraveBrownElevatorDL }; static CollisionHeader* D_80AF7538[] = { &gDampeGraveBrownElevatorCol }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index d464e1deae..8b136e284f 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -100,7 +100,7 @@ s8 D_80B83A94[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -309,8 +309,8 @@ void BgDblueBalance_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); this->dyna.actor.flags = sTypeInfo[sp2C].unk_08; - this->dyna.actor.uncullZoneScale = sTypeInfo[sp2C].unk_0C; - this->dyna.actor.uncullZoneDownward = sTypeInfo[sp2C].unk_10; + this->dyna.actor.cullingVolumeScale = sTypeInfo[sp2C].unk_0C; + this->dyna.actor.cullingVolumeDownward = sTypeInfo[sp2C].unk_10; this->dyna.actor.update = sTypeInfo[sp2C].update; this->dyna.actor.draw = sTypeInfo[sp2C].draw; @@ -694,7 +694,7 @@ void func_80B83758(Actor* thisx, PlayState* play) { temp_f0, 0x20); } - if (this->dyna.actor.flags & ACTOR_FLAG_40) { + if (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { ptr2 = &sTypeInfo[BGDBLUEBALANCE_GET_300(&this->dyna.actor)]; Gfx_DrawDListOpa(play, ptr2->opaDList); diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c index b2efca3b81..7f836fb6a4 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c @@ -7,7 +7,7 @@ #include "z_bg_dblue_elevator.h" #include "assets/objects/object_dblue_object/object_dblue_object.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgDblueElevator_SpawnRipplesAndSplashes(BgDblueElevator* this, PlayState* play); void BgDblueElevator_CheckWaterBoxInfo(BgDblueElevator* this, PlayState* play2); @@ -51,9 +51,9 @@ static s8 sLargeRipplesLives[] = { 0, 2, 4 }; static s8 sSmallRipplesLives[] = { 0, 1, 2, 3, 4, 5 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 250, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 250, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 250, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -292,7 +292,7 @@ void BgDblueElevator_Move(BgDblueElevator* this, PlayState* play) { if (!ptr->isHorizontal) { this->dyna.actor.world.pos.y = this->posOffset + this->dyna.actor.home.pos.y; - if (CHECK_FLAG_ALL(this->dyna.actor.flags, ACTOR_FLAG_40) && (this->isWithinWaterBoxXZ)) { + if (CHECK_FLAG_ALL(this->dyna.actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (this->isWithinWaterBoxXZ)) { if (this->direction > 0) { nearWaterSurfaceCheck = ((this->dyna.actor.world.pos.y + -10.0f) - this->waterSurfacePosY) * ((this->dyna.actor.prevPos.y + -10.0f) - this->waterSurfacePosY); diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c index 74ad1e161d..e17e9b0250 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c @@ -8,7 +8,7 @@ #include "assets/objects/object_dblue_object/object_dblue_object.h" #include "overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgDblueMovebg_Init(Actor* thisx, PlayState* play); void BgDblueMovebg_Destroy(Actor* thisx, PlayState* play); @@ -97,9 +97,9 @@ s16 D_80A2B96C[] = { 0, 0x16C, -0x16C, 0 }; static s16 sCsIdList[] = { CS_ID_NONE, CS_ID_NONE }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -263,7 +263,7 @@ void BgDblueMovebg_Init(Actor* thisx, PlayState* play) { Math_Vec3f_Sum(&this->unk_190, &this->dyna.actor.world.pos, &this->unk_190); Math_Vec3f_Sum(&this->unk_19C, &this->dyna.actor.world.pos, &this->unk_19C); D_80A2BBF0 = this; - this->dyna.actor.flags |= ACTOR_FLAG_20; + this->dyna.actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = func_80A2AED0; break; @@ -274,7 +274,7 @@ void BgDblueMovebg_Init(Actor* thisx, PlayState* play) { case 11: this->unk_1CC = D_80A2B96C[func_80A29A80(play, this->switchFlag, this->unk_1BC)]; D_80A2BBF0 = this; - this->dyna.actor.flags |= ACTOR_FLAG_20; + this->dyna.actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->dyna.actor.update = Actor_Noop; this->dyna.actor.draw = func_80A2B274; break; @@ -769,7 +769,7 @@ void BgDblueMovebg_Draw(Actor* thisx, PlayState* play2) { OPEN_DISPS(play->state.gfxCtx); - if ((this->unk_160 == 9) || (this->unk_160 == 8) || (this->dyna.actor.flags & ACTOR_FLAG_40)) { + if ((this->unk_160 == 9) || (this->unk_160 == 8) || (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { if (this->texAnim != NULL) { AnimatedMat_Draw(play, Lib_SegmentedToVirtual(this->texAnim)); } 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 10dbab2b77..2d230269a0 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 @@ -7,7 +7,7 @@ #include "z_bg_dblue_waterfall.h" #include "assets/objects/object_dblue_object/object_dblue_object.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgDblueWaterfall_Init(Actor* thisx, PlayState* play); void BgDblueWaterfall_Destroy(Actor* thisx, PlayState* play); @@ -321,9 +321,9 @@ void func_80B84610(BgDblueWaterfall* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; 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 dc65117a20..56271403b7 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 @@ -104,9 +104,9 @@ void BgDkjailIvy_IvyCutEffects(BgDkjailIvy* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -144,7 +144,7 @@ void BgDkjailIvy_SetupWaitForCut(BgDkjailIvy* this) { void BgDkjailIvy_WaitForCut(BgDkjailIvy* this, PlayState* play) { if (this->collider.base.acFlags & AC_HIT) { this->collider.base.acFlags &= ~AC_HIT; - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; CutsceneManager_Queue(this->dyna.actor.csId); BgDkjailIvy_SetupCutscene(this); } else { diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index bee7cce60f..5d705e6a31 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -7,7 +7,7 @@ #include "z_bg_dy_yoseizo.h" #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void BgDyYoseizo_Init(Actor* thisx, PlayState* play); void BgDyYoseizo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c index 724cae2019..bd74340e15 100644 --- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c @@ -7,7 +7,7 @@ #include "z_bg_f40_block.h" #include "assets/objects/object_f40_obj/object_f40_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgF40Block_Init(Actor* thisx, PlayState* play); void BgF40Block_Destroy(Actor* thisx, PlayState* play); @@ -42,9 +42,9 @@ static Vec3f D_80BC4620[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c index 3f89ad1770..f6d6f55fe5 100644 --- a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c +++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c @@ -7,7 +7,7 @@ #include "z_bg_f40_flift.h" #include "assets/objects/object_f40_obj/object_f40_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgF40Flift_Init(Actor* thisx, PlayState* play); void BgF40Flift_Destroy(Actor* thisx, PlayState* play); @@ -30,8 +30,8 @@ ActorProfile Bg_F40_Flift_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 5000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 5000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c index 9ca9d357c8..a009bb137a 100644 --- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c @@ -8,7 +8,7 @@ #include "z64rumble.h" #include "assets/objects/object_f40_switch/object_f40_switch.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgF40Switch_Init(Actor* thisx, PlayState* play); void BgF40Switch_Destroy(Actor* thisx, PlayState* play); @@ -97,9 +97,9 @@ void BgF40Switch_CheckAll(BgF40Switch* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 123, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c index 4fa49f483e..7418ff3dbb 100644 --- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c @@ -7,7 +7,7 @@ #include "z_bg_f40_swlift.h" #include "assets/objects/object_f40_obj/object_f40_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgF40Swlift_Init(Actor* thisx, PlayState* play); void BgF40Swlift_Destroy(Actor* thisx, PlayState* play); @@ -30,8 +30,8 @@ ActorProfile Bg_F40_Swlift_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 550, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 5000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 550, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 5000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; 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 2cdc790537..3e4fc2079d 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 @@ -72,7 +72,7 @@ void BgFireWall_Init(Actor* thisx, PlayState* play) { this->unk_158 = 0.1f; this->unk_160 = 300.0f; this->texIndex = Rand_S16Offset(0, ARRAY_COUNT(sFlameTextures) - 1); - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->collider.dim.pos.y = this->actor.world.pos.y; this->actionFunc = func_809AC638; } diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c index 7557a38f97..6bd1a5c170 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c @@ -7,7 +7,7 @@ #include "z_bg_fu_kaiten.h" #include "assets/objects/object_fu_kaiten/object_fu_kaiten.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgFuKaiten_Init(Actor* thisx, PlayState* play); void BgFuKaiten_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c index 84a4480a67..216a1b0b7e 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c @@ -7,7 +7,7 @@ #include "z_bg_fu_mizu.h" #include "assets/objects/object_fu_kaiten/object_fu_kaiten.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgFuMizu_Init(Actor* thisx, PlayState* play); void BgFuMizu_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c index 85d23d5026..d66a8216d3 100644 --- a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c +++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c @@ -7,7 +7,7 @@ #include "z_bg_goron_oyu.h" #include "assets/objects/object_oyu/object_oyu.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgGoronOyu_Init(Actor* thisx, PlayState* play); void BgGoronOyu_Destroy(Actor* thisx, PlayState* play); 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 e3f274b1eb..342a7a2f7d 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 @@ -57,9 +57,9 @@ static ColliderCylinderInit sCylinderInit = { static s16 sRockScales[4] = { 24, 15, 10, 5 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -189,7 +189,7 @@ void func_80BD6274(BgHakaBombwall* this, PlayState* play) { } void BgHakaBombwall_SetupPlayCutscene(BgHakaBombwall* this) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; CutsceneManager_Queue(this->dyna.actor.csId); this->actionFunc = BgHakaBombwall_PlayCutscene; } diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c index 6515d70944..f14d868581 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c +++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c @@ -7,7 +7,7 @@ #include "z_bg_haka_curtain.h" #include "assets/objects/object_haka_obj/object_haka_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgHakaCurtain_Init(Actor* thisx, PlayState* play); void BgHakaCurtain_Destroy(Actor* thisx, PlayState* play); @@ -37,9 +37,9 @@ ActorProfile Bg_Haka_Curtain_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 600, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; 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 897e815261..f323da6ed0 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 @@ -115,7 +115,7 @@ s32 D_80ABD020[] = { -73, -40, -8, 24, 57 }; Vec3f D_80ABD034 = { 0.0f, 3.0f, 0.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -328,8 +328,8 @@ void BgHakuginBombwall_Init(Actor* thisx, PlayState* play) { Collider_UpdateCylinder(&this->dyna.actor, &this->collider); Actor_SetFocus(&this->dyna.actor, ptr->unk_08); - this->dyna.actor.uncullZoneScale = ptr->unk_0C; - this->dyna.actor.uncullZoneDownward = ptr->unk_10; + this->dyna.actor.cullingVolumeScale = ptr->unk_0C; + this->dyna.actor.cullingVolumeDownward = ptr->unk_10; this->actionFunc = func_80ABCCE4; } @@ -379,7 +379,7 @@ void func_80ABCCE4(BgHakuginBombwall* this, PlayState* play) { BgHakuginBombwallStruct* ptr = &D_80ABCFC0[BGHAKUGIN_BOMBWALL_100(&this->dyna.actor)]; if (ptr->unk_20(this, play)) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; CutsceneManager_Queue(this->dyna.actor.csId); this->actionFunc = func_80ABCD98; } else { diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 5a08be55c6..560dd88b10 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -7,7 +7,7 @@ #include "z_bg_hakugin_elvpole.h" #include "assets/objects/object_hakugin_obj/object_hakugin_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgHakuginElvpole_Init(Actor* thisx, PlayState* play); void BgHakuginElvpole_Destroy(Actor* thisx, PlayState* play); 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 121d622272..8507a45a73 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 @@ -9,7 +9,7 @@ #include "z64rumble.h" #include "assets/objects/object_hakugin_obj/object_hakugin_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgHakuginPost_Init(Actor* thisx, PlayState* play); void BgHakuginPost_Destroy(Actor* thisx, PlayState* play); 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 720dfd9da7..f6172e9399 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 @@ -9,7 +9,7 @@ #include "z64rumble.h" #include "assets/objects/object_goronswitch/object_goronswitch.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgHakuginSwitch_Init(Actor* thisx, PlayState* play); void BgHakuginSwitch_Destroy(Actor* thisx, PlayState* play); @@ -87,16 +87,16 @@ BgHakuginSwitchStruct D_80B1688C[] = { }; static InitChainEntry sInitChain1[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 130, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 150, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 130, ICHAIN_STOP), }; static InitChainEntry sInitChain2[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 260, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 360, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 260, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 360, ICHAIN_STOP), }; void func_80B15790(BgHakuginSwitch* this, u16 sfxId) { diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c index 5adc24a26d..df88ac7836 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c @@ -7,7 +7,7 @@ #include "z_bg_icefloe.h" #include "assets/objects/object_icefloe/object_icefloe.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgIcefloe_Init(Actor* thisx, PlayState* play); void BgIcefloe_Destroy(Actor* thisx, PlayState* play); 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 cb78696e6b..1e94ffc895 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -53,7 +53,7 @@ ActorProfile Bg_Icicle_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), ICHAIN_F32(gravity, -3, ICHAIN_CONTINUE), ICHAIN_F32(terminalVelocity, -30, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c index 1871d448b3..0b5bd947b8 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c @@ -7,7 +7,7 @@ #include "z_bg_ikana_block.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgIkanaBlock_Init(Actor* thisx, PlayState* play); void BgIkanaBlock_Destroy(Actor* thisx, PlayState* play); @@ -36,9 +36,9 @@ ActorProfile Bg_Ikana_Block_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 250, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 250, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 250, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; 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 cece4a6233..a6c5a64373 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 @@ -83,9 +83,9 @@ s16 D_80BD52C8[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; @@ -316,7 +316,7 @@ void func_80BD4F9C(BgIkanaBombwall* this, PlayState* play) { } void func_80BD4FF8(BgIkanaBombwall* this) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; CutsceneManager_Queue(this->dyna.actor.csId); this->actionFunc = func_80BD503C; } 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 a418e08bff..336f43d0ae 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 @@ -8,7 +8,7 @@ #include "z64quake.h" #include "assets/objects/object_ikana_obj/object_ikana_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgIkanaDharma_Init(Actor* thisx, PlayState* play2); void BgIkanaDharma_Destroy(Actor* thisx, PlayState* play); @@ -55,9 +55,9 @@ static ColliderCylinderInit sCylinderInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 320, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 320, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 320, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 320, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -1100, ICHAIN_STOP), }; @@ -158,8 +158,8 @@ void BgIkanaDharma_WaitForHit(BgIkanaDharma* this, PlayState* play) { this->dyna.actor.speed = 20.0f; Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_DARUMA_VANISH); BgIkanaDharma_SetupStartCutscene(this); - } else if (CHECK_FLAG_ALL(this->dyna.actor.flags, ACTOR_FLAG_40) && (sFirstHitBgIkanaDharma == NULL) && - (this->dyna.actor.xzDistToPlayer < 420.0f)) { + } else if (CHECK_FLAG_ALL(this->dyna.actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME) && + (sFirstHitBgIkanaDharma == NULL) && (this->dyna.actor.xzDistToPlayer < 420.0f)) { tempAngle1 = BINANG_SUB(this->dyna.actor.yawTowardsPlayer, player->actor.shape.rot.y); tempAngle1 = ABS_ALT(tempAngle1); 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 9924c21b30..ccfb485de9 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 @@ -12,7 +12,7 @@ #include "z_bg_ikana_mirror.h" #include "assets/objects/object_ikana_obj/object_ikana_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgIkanaMirror_Init(Actor* thisx, PlayState* play2); void BgIkanaMirror_Destroy(Actor* thisx, PlayState* play); @@ -193,9 +193,9 @@ static ColliderQuadInit sLightRaysCollidersInit[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 220, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 220, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -325,7 +325,7 @@ void BgIkanaMirror_Wait(BgIkanaMirror* this, PlayState* play) { } void BgIkanaMirror_SetupEmitLight(BgIkanaMirror* this) { - this->dyna.actor.flags |= ACTOR_FLAG_20; + this->dyna.actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = BgIkanaMirror_EmitLight; } @@ -362,7 +362,7 @@ void BgIkanaMirror_EmitLight(BgIkanaMirror* this, PlayState* play) { } } else { - this->dyna.actor.flags &= ~ACTOR_FLAG_20; + this->dyna.actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; BgIkanaMirror_SetupWait(this); } } 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 a7be92e94f..69275b664b 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 @@ -52,9 +52,9 @@ static ColliderCylinderInit sCylinderInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -85,7 +85,7 @@ void BgIkanaRay_Destroy(Actor* thisx, PlayState* play) { void BgIkanaRay_SetDeactivated(BgIkanaRay* this) { this->actor.draw = NULL; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = BgIkanaRay_UpdateCheckForActivation; } @@ -97,7 +97,7 @@ void BgIkanaRay_UpdateCheckForActivation(BgIkanaRay* this, PlayState* play) { void BgIkanaRay_SetActivated(BgIkanaRay* this) { this->actor.draw = BgIkanaRay_Draw; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = BgIkanaRay_UpdateActivated; } 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 0e51231803..6a0850b843 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 @@ -11,7 +11,7 @@ #include "overlays/actors/ovl_En_Water_Effect/z_en_water_effect.h" #include "assets/objects/object_ikana_obj/object_ikana_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgIkanaRotaryroom_Init(Actor* thisx, PlayState* play); void BgIkanaRotaryroom_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c index a6c4bc8db2..b3c95cccdd 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c @@ -8,7 +8,7 @@ #include "z64quake.h" #include "assets/objects/object_ikana_obj/object_ikana_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgIkanaShutter_Init(Actor* thisx, PlayState* play); void BgIkanaShutter_Destroy(Actor* thisx, PlayState* play); @@ -47,9 +47,9 @@ ActorProfile Bg_Ikana_Shutter_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c index 9627d56901..b0b6309686 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c @@ -9,7 +9,7 @@ #include "z64rumble.h" #include "assets/objects/object_ikninside_obj/object_ikninside_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgIkninSusceil_Init(Actor* thisx, PlayState* play); void BgIkninSusceil_Destroy(Actor* thisx, PlayState* play); 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 762f79aaf7..6fb0b8bd55 100644 --- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c @@ -7,7 +7,7 @@ #include "z_bg_ikninside.h" #include "assets/objects/object_ikninside_obj/object_ikninside_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgIkninside_Init(Actor* thisx, PlayState* play); void BgIkninside_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c index 25e5fcd019..974de0ffb3 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c @@ -7,7 +7,7 @@ #include "z_bg_iknv_doukutu.h" #include "assets/objects/object_iknv_obj/object_iknv_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgIknvDoukutu_Init(Actor* thisx, PlayState* play); void BgIknvDoukutu_Destroy(Actor* thisx, PlayState* play); 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 f09287a520..c920a36d62 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 @@ -7,7 +7,7 @@ #include "z_bg_iknv_obj.h" #include "assets/objects/object_iknv_obj/object_iknv_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgIknvObj_Init(Actor* thisx, PlayState* play); void BgIknvObj_Destroy(Actor* thisx, PlayState* play); @@ -63,7 +63,7 @@ void BgIknvObj_Init(Actor* thisx, PlayState* play) { this->dList = object_iknv_obj_DL_013058; this->actionFunc = BgIknvObj_UpdateWaterwheel; this->dyna.actor.flags |= ACTOR_FLAG_100000; - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; break; case IKNV_OBJ_RAISED_DOOR: diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 419066883b..d70c1e2fa4 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -7,7 +7,7 @@ #include "z_bg_ingate.h" #include "assets/objects/object_sichitai_obj/object_sichitai_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgIngate_Init(Actor* thisx, PlayState* play2); void BgIngate_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c index b236554353..4ec14ef23a 100644 --- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c @@ -7,7 +7,7 @@ #include "z_bg_inibs_movebg.h" #include "assets/objects/object_inibs_object/object_inibs_object.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgInibsMovebg_Init(Actor* thisx, PlayState* play); void BgInibsMovebg_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c index cec07ebedf..70029979ce 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c @@ -27,9 +27,9 @@ ActorProfile Bg_Keikoku_Spr_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 20, ICHAIN_STOP), }; 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 8c657d6ebf..a1d18853b7 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 @@ -6,7 +6,7 @@ #include "z_bg_kin2_bombwall.h" #include "assets/objects/object_kin2_obj/object_kin2_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UCODE_POINT_LIGHT_ENABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UCODE_POINT_LIGHT_ENABLED) void BgKin2Bombwall_Init(Actor* thisx, PlayState* play); void BgKin2Bombwall_Destroy(Actor* thisx, PlayState* play); @@ -129,9 +129,9 @@ void BgKin2Bombwall_SpawnEffects(BgKin2Bombwall* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; 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 ad256217d6..b1bb75ee6f 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 @@ -7,7 +7,7 @@ #include "z_bg_kin2_fence.h" #include "assets/objects/object_kin2_obj/object_kin2_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgKin2Fence_Init(Actor* thisx, PlayState* play); void BgKin2Fence_Destroy(Actor* thisx, PlayState* play); @@ -132,9 +132,9 @@ void BgKin2Fence_SpawnEyeSparkles(BgKin2Fence* this, PlayState* play, s32 mask) } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; 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 b1b3cbe561..58d2e974e5 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 @@ -78,9 +78,12 @@ static ColliderTrisInit sTrisInit = { static Vec3f sDustBasePos = { 0.0f, 23.0f, 0.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; bool BgKin2Picture_IsSkulltulaCollected(PlayState* play, s32 skulltulaParams) { diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c index 1889485f41..1c3a88a9d6 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c @@ -46,7 +46,7 @@ f32 D_80B70770[] = { 10.0f, 15.0f }; u8 D_80B70778[] = { 0x0F, 0x0A }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; CollisionHeader* D_80B70780[] = { &gOceanSpiderHouseChestOfDrawersCol, &gOceanSpiderHouseBookshelfCol }; @@ -195,12 +195,12 @@ void BgKin2Shelf_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->dyna.actor, sInitChain); if (sp24 == 0) { - this->dyna.actor.uncullZoneScale = 150.0f; - this->dyna.actor.uncullZoneDownward = 140.0f; + this->dyna.actor.cullingVolumeScale = 150.0f; + this->dyna.actor.cullingVolumeDownward = 140.0f; Actor_SetScale(&this->dyna.actor, 0.1f); } else { - this->dyna.actor.uncullZoneScale = 250.0f; - this->dyna.actor.uncullZoneDownward = 300.0f; + this->dyna.actor.cullingVolumeScale = 250.0f; + this->dyna.actor.cullingVolumeDownward = 300.0f; Actor_SetScale(&this->dyna.actor, 1.0f); this->dyna.actor.flags |= ACTOR_FLAG_UCODE_POINT_LIGHT_ENABLED; } diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c index 26397e406d..835fc4a3ce 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -7,7 +7,7 @@ #include "z_bg_ladder.h" #include "assets/objects/object_ladder/object_ladder.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgLadder_Init(Actor* thisx, PlayState* play); void BgLadder_Destroy(Actor* thisx, PlayState* play); @@ -68,7 +68,7 @@ void BgLadder_Init(Actor* thisx, PlayState* play) { if (Flags_GetSwitch(play, this->switchFlag)) { // If the flag is set, then the ladder draws immediately this->alpha = 255; - this->dyna.actor.flags &= ~ACTOR_FLAG_10; // always update = off + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; // always update = off this->action = BgLadder_DoNothing; } else { // Otherwise, the ladder doesn't draw; wait for the flag to be set @@ -112,7 +112,7 @@ void BgLadder_FadeIn(BgLadder* this, PlayState* play) { this->alpha = 255; CutsceneManager_Stop(this->dyna.actor.csId); DynaPoly_EnableCollision(play, &play->colCtx.dyna, this->dyna.bgId); - this->dyna.actor.flags &= ~ACTOR_FLAG_10; // always update = off + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; // always update = off this->action = BgLadder_DoNothing; } } diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c index 6f3ccf66d4..1d4f8bbada 100644 --- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c @@ -33,7 +33,7 @@ void BgLbfshot_Init(Actor* thisx, PlayState* play) { BgLbfshot* this = (BgLbfshot*)thisx; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); - this->dyna.actor.uncullZoneForward = 4000.0f; + this->dyna.actor.cullingVolumeDistance = 4000.0f; DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); DynaPolyActor_LoadMesh(play, &this->dyna, &object_lbfshot_Colheader_0014D8); } diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c index 3292b8c31e..7115fa8ca2 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -85,7 +85,7 @@ void func_80AD68DC(BgLotus* this, PlayState* play) { } if (gSaveContext.save.playerForm != PLAYER_FORM_DEKU) { this->unk166 = 40; - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_80AD6A88; return; } @@ -135,7 +135,7 @@ void func_80AD6B68(BgLotus* this, PlayState* play) { } else { this->dyna.actor.world.pos.y = this->unk160; } - this->dyna.actor.flags &= ~ACTOR_FLAG_10; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk168 = 0x60; this->actionFunc = func_80AD68DC; this->dyna.actor.world.pos.x = this->dyna.actor.home.pos.x; diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c index 77fbe0a33c..206ddc2023 100644 --- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c +++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c @@ -7,7 +7,7 @@ #include "z_bg_market_step.h" #include "assets/objects/object_market_obj/object_market_obj.h" -#define FLAGS (ACTOR_FLAG_20 | ACTOR_FLAG_UCODE_POINT_LIGHT_ENABLED) +#define FLAGS (ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UCODE_POINT_LIGHT_ENABLED) void BgMarketStep_Init(Actor* thisx, PlayState* play); void BgMarketStep_Draw(Actor* thisx, PlayState* play); @@ -25,9 +25,9 @@ ActorProfile Bg_Market_Step_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c index 870c999433..155de379ac 100644 --- a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c +++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c @@ -27,9 +27,9 @@ ActorProfile Bg_Mbar_Chair_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 60, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 80, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 60, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 80, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; 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 c98aa7a28b..697068012d 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 @@ -8,7 +8,7 @@ #include "assets/objects/object_numa_obj/object_numa_obj.h" #include "assets/objects/object_syokudai/object_syokudai.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void BgNumaHana_Init(Actor* thisx, PlayState* play); void BgNumaHana_Destroy(Actor* thisx, PlayState* play); @@ -68,9 +68,9 @@ static s16 sInitialAnglePerPetal[] = { 0x0000, 0x2AAA, 0x5555, 0x8000, 0xAAAA, 0 static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 600, ICHAIN_STOP), }; /** diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c index 88b5bf5e7d..d200cfeebd 100644 --- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c @@ -9,7 +9,7 @@ #include "z64quake.h" #include "z64rumble.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgOpenShutter_Init(Actor* thisx, PlayState* play); void BgOpenShutter_Destroy(Actor* thisx, PlayState* play); @@ -38,9 +38,9 @@ ActorProfile Bg_Open_Shutter_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 350, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 350, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 350, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 350, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c index 22d1fa7f2b..0ec6da4f66 100644 --- a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c +++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c @@ -7,7 +7,7 @@ #include "z_bg_open_spot.h" #include "assets/objects/object_open_obj/object_open_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgOpenSpot_Init(Actor* thisx, PlayState* play); void BgOpenSpot_Destroy(Actor* thisx, PlayState* play); @@ -27,9 +27,9 @@ ActorProfile Bg_Open_Spot_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 560, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 560, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c index eaad738921..f77189179d 100644 --- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c @@ -15,7 +15,7 @@ #include "overlays/actors/ovl_En_Ot/z_en_ot.h" #include "assets/objects/object_sinkai_kabe/object_sinkai_kabe.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void BgSinkaiKabe_Init(Actor* thisx, PlayState* play); void BgSinkaiKabe_Destroy(Actor* thisx, PlayState* play); 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 32ea38fd66..5049d64952 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -137,7 +137,7 @@ Color_RGBA8 D_809CF208 = { 255, 255, 150, 170 }; Color_RGBA8 D_809CF20C = { 255, 0, 0, 0 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1500, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c index 0fedc84041..430243dce5 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -7,7 +7,7 @@ #include "z_bg_tobira01.h" #include "assets/objects/object_spot11_obj/object_spot11_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void BgTobira01_Init(Actor* thisx, PlayState* play); void BgTobira01_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index acb769428a..a4bbfd8c55 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -29,8 +29,8 @@ ActorProfile Bg_Umajump_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -95,7 +95,7 @@ void BgUmajump_Init(Actor* thisx, PlayState* play) { !CHECK_QUEST_ITEM(QUEST_SONG_EPONA) && (thisx->csId != CS_ID_NONE)) { this->actionFunc = BgUmajump_CheckDistance; thisx->update = func_8091A5A0; - thisx->flags |= ACTOR_FLAG_10; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->horse = SubS_FindActor(play, this->horse, ACTORCAT_BG, ACTOR_EN_HORSE); } else { thisx->update = Actor_Noop; 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 bcf2a0f91c..2b5f44389e 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c @@ -35,7 +35,9 @@ #include "overlays/actors/ovl_En_Tanron1/z_en_tanron1.h" #include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define ODOLWA_EFFECT_COUNT 100 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 1baced1646..621aa2447c 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -14,7 +14,9 @@ #include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void Boss02_Init(Actor* thisx, PlayState* play); void Boss02_Destroy(Actor* thisx, PlayState* play); 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 b719f4b5ab..23251c14ef 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -57,7 +57,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_water_effect/object_water_effect.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define WORK_TIMER_UNK0_A 0 // used in func_809E34B8 #define WORK_TIMER_CURRENT_ACTION 0 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 22d8fea2c7..bb60f8eeec 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -9,7 +9,9 @@ #include "attributes.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void Boss04_Init(Actor* thisx, PlayState* play2); void Boss04_Destroy(Actor* thisx, PlayState* play); 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 f277a874ad..0cfd6fc171 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c @@ -428,7 +428,7 @@ void Boss05_Init(Actor* thisx, PlayState* play) { ActorShape_Init(&this->dyna.actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); this->dyna.actor.colChkInfo.damageTable = &sWalkingHeadDamageTable; - this->dyna.actor.flags |= ACTOR_FLAG_10 | ACTOR_FLAG_20; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; } else if (BIO_BABA_GET_TYPE(&this->dyna.actor) >= BIO_BABA_TYPE_FRAGMENT_BASE) { SkelAnime_InitFlex(play, &this->headSkelAnime, &gBioDekuBabaHeadSkel, &gBioDekuBabaHeadChompAnim, this->headJointTable, this->headMorphTable, BIO_DEKU_BABA_HEAD_LIMB_MAX); 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 429c584c33..d21169eb86 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -12,7 +12,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_knight/object_knight.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void Boss06_Init(Actor* thisx, PlayState* play); void Boss06_Destroy(Actor* thisx, PlayState* play); 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 817a042a8e..1b71d029a0 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -27,7 +27,9 @@ #include "overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define MAJORA_TENTACLE_COUNT 25 #define MAJORA_WHIP_LENGTH 44 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 a796c2b78c..e86fed63ae 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c @@ -20,7 +20,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define GOHT_LIMB_DRAW_FLAG(limbIndex) (1 << ((limbIndex)-1)) diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 3ed93612f6..06d2424d7b 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_efc_tw/object_efc_tw.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoEffect_Init(Actor* thisx, PlayState* play); void DemoEffect_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c index ed550c449d..71c60bddcb 100644 --- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c @@ -6,7 +6,7 @@ #include "z_demo_getitem.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoGetitem_Init(Actor* thisx, PlayState* play); void DemoGetitem_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index aebd1aec6d..3fd0b13d9a 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_bubble/object_bubble.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoKankyo_Init(Actor* thisx, PlayState* play); void DemoKankyo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c index dd2e76dbb0..8c657eab6b 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c @@ -6,7 +6,7 @@ #include "z_demo_moonend.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoMoonend_Init(Actor* thisx, PlayState* play); void DemoMoonend_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 4fedadab7d..1a67188555 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -6,7 +6,7 @@ #include "z_demo_shd.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoShd_Init(Actor* thisx, PlayState* play); void DemoShd_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c index ff4c47fc8a..b39c9c00c3 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c @@ -7,7 +7,7 @@ #include "z_demo_syoten.h" #include "assets/objects/object_syoten/object_syoten.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DemoSyoten_Init(Actor* thisx, PlayState* play); void DemoSyoten_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index e514f5fa90..52a5a534f7 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Box/z_en_box.h" #include "assets/objects/object_box/object_box.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void DemoTreLgt_Init(Actor* thisx, PlayState* play); void DemoTreLgt_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c index f707cc8774..2e45377bad 100644 --- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c @@ -6,7 +6,9 @@ #include "z_dm_bal.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void DmBal_Init(Actor* thisx, PlayState* play); void DmBal_Destroy(Actor* thisx, PlayState* play); @@ -69,7 +71,7 @@ void DmBal_Init(Actor* thisx, PlayState* play) { DmBal* this = (DmBal*)thisx; this->actor.attentionRangeType = ATTENTION_RANGE_1; - this->actor.uncullZoneForward = 3000.0f; + this->actor.cullingVolumeDistance = 3000.0f; Actor_SetScale(&this->actor, 0.02f); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gTingleSkel, &gTingleFloatIdleAnim, this->jointTable, this->morphTable, diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c index 967db3f26a..41a90368c3 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_delf/object_delf.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmChar00_Init(Actor* thisx, PlayState* play); void DmChar00_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c index 7daf377a6a..216be5e6ac 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -8,7 +8,7 @@ #include "assets/objects/object_mtoride/object_mtoride.h" #include "overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void DmChar01_Init(Actor* thisx, PlayState* play); void DmChar01_Destroy(Actor* thisx, PlayState* play); @@ -46,7 +46,7 @@ ActorProfile Dm_Char01_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_STOP), }; s16 D_80AAAAB4 = false; diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c index d9c97eec9e..8a0d4cc753 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -7,7 +7,7 @@ #include "z_dm_char02.h" #include "assets/objects/object_stk2/object_stk2.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmChar02_Init(Actor* thisx, PlayState* play); void DmChar02_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c index 746a6341cc..80325a2f2d 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -7,7 +7,7 @@ #include "z_dm_char03.h" #include "assets/objects/object_osn/object_osn.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmChar03_Init(Actor* thisx, PlayState* play); void DmChar03_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c index e9b75e7e1a..cb543397a9 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c @@ -7,7 +7,7 @@ #include "z_dm_char04.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmChar04_Init(Actor* thisx, PlayState* play); void DmChar04_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c index 4a733cc2ac..4890756d5d 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -7,7 +7,7 @@ #include "z_dm_char05.h" #include "assets/objects/object_dmask/object_dmask.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmChar05_Init(Actor* thisx, PlayState* play); void DmChar05_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c index 81b2e79c3e..cb41c1f5a0 100644 --- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c +++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c @@ -6,7 +6,7 @@ #include "z_dm_char06.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmChar06_Init(Actor* thisx, PlayState* play); void DmChar06_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c index 86db0af925..9c033aaa2e 100644 --- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c @@ -7,7 +7,7 @@ #include "z_dm_char07.h" #include "assets/objects/object_milkbar/object_milkbar.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmChar07_Init(Actor* thisx, PlayState* play); void DmChar07_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c index f33e396749..2addc44968 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -71,9 +71,9 @@ static AnimationInfo sAnimationInfo[TURTLE_ANIM_MAX] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 4000, ICHAIN_STOP), }; void DmChar08_UpdateEyes(DmChar08* this) { diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c index 0a47e35ee1..a6993aaffd 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -6,7 +6,7 @@ #include "z_dm_char09.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmChar09_Init(Actor* thisx, PlayState* play); void DmChar09_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c index a11fd9d6ed..655b6be7f8 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -7,7 +7,7 @@ #include "z_dm_hina.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmHina_Init(Actor* thisx, PlayState* play); void DmHina_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c index 46c15025a3..b5714b72f9 100644 --- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c @@ -7,7 +7,7 @@ #include "z_dm_opstage.h" #include "assets/objects/object_keikoku_demo/object_keikoku_demo.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmOpstage_Init(Actor* thisx, PlayState* play); void DmOpstage_Destroy(Actor* thisx, PlayState* play); @@ -29,7 +29,7 @@ ActorProfile Dm_Opstage_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_STOP), }; void DmOpstage_SetupAction(DmOpstage* this, DmOpstageActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c index 8c13e74fb4..2302363d70 100644 --- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c @@ -6,7 +6,7 @@ #include "z_dm_ravine.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmRavine_Init(Actor* thisx, PlayState* play); void DmRavine_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c index 2fb7165a16..f9bc3af53e 100644 --- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c @@ -7,7 +7,7 @@ #include "z_dm_sa.h" #include "assets/objects/object_stk/object_stk.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmSa_Init(Actor* thisx, PlayState* play); void DmSa_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c index a3424f61c3..3447d15275 100644 --- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c @@ -7,7 +7,7 @@ #include "z_dm_statue.h" #include "assets/objects/object_smtower/object_smtower.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) void DmStatue_Init(Actor* thisx, PlayState* play); void DmStatue_Destroy(Actor* thisx, PlayState* play); 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 509433aae2..77ea17e006 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -12,7 +12,7 @@ #include "assets/objects/object_stk2/object_stk2.h" #include "assets/objects/object_stk3/object_stk3.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void DmStk_Init(Actor* thisx, PlayState* play); void DmStk_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c index 7d08a5fd96..3c57c1d9bb 100644 --- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c @@ -6,7 +6,7 @@ #include "z_dm_tag.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void DmTag_Init(Actor* thisx, PlayState* play); void DmTag_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c index abf32e783a..657b95abea 100644 --- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c @@ -7,7 +7,7 @@ #include "z_dm_tsg.h" #include "assets/objects/object_open_obj/object_open_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void DmTsg_Init(Actor* thisx, PlayState* play); void DmTsg_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c index f60d4a007a..018dd10efa 100644 --- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c @@ -6,7 +6,7 @@ #include "z_dm_zl.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void DmZl_Init(Actor* thisx, PlayState* play); void DmZl_Destroy(Actor* thisx, PlayState* play); 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 2cd890f1d4..4306cf9ec0 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -70,7 +70,7 @@ void DoorAna_Init(Actor* thisx, PlayState* play) { if (grottoType == DOORANA_TYPE_HIDDEN_BOMB) { Collider_InitAndSetCylinder(play, &this->bombCollider, &this->actor, &sCylinderInit); } else { - this->actor.flags |= ACTOR_FLAG_10; // always update + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; // always update } Actor_SetScale(&this->actor, 0); @@ -100,7 +100,7 @@ void DoorAna_WaitClosed(DoorAna* this, PlayState* play) { //! @bug Implementation from OoT is not updated for MM, grotto does not open on Song of Storms if (this->actor.xyzDistToPlayerSq < SQ(200.0f) && CutsceneFlags_Get(play, 5)) { grottoIsOpen = true; - this->actor.flags &= ~ACTOR_FLAG_10; // always update OFF + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; // always update OFF } } else { diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 379277f73d..da50dc97dc 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -20,7 +20,7 @@ #include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" #include "assets/objects/object_last_obj/object_last_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void DoorShutter_Init(Actor* thisx, PlayState* play2); void DoorShutter_Destroy(Actor* thisx, PlayState* play); @@ -93,9 +93,9 @@ s8 D_808A2240[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; typedef struct { diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c index 9627e78ab4..22a3bc3a72 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -12,7 +12,7 @@ #include "assets/objects/object_ikninside_obj/object_ikninside_obj.h" #include "assets/objects/object_danpei_object/object_danpei_object.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void DoorSpiral_Init(Actor* thisx, PlayState* play); void DoorSpiral_Destroy(Actor* thisx, PlayState* play); @@ -83,9 +83,9 @@ SpiralSceneInfo sSpiralSceneInfoTable[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; void DoorSpiral_SetupAction(DoorSpiral* this, DoorSpiralActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 3e8b4efb08..f5e98e9f97 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -61,9 +61,9 @@ ActorProfile Door_Warp1_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 4000, ICHAIN_STOP), }; void DoorWarp1_SetupAction(DoorWarp1* this, DoorWarp1ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c index 977235af26..42421f0290 100644 --- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c @@ -6,7 +6,7 @@ #include "z_eff_change.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EffChange_Init(Actor* thisx, PlayState* play); void EffChange_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 0c70c00190..f90eff08ba 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "libc64/malloc.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EffDust_Init(Actor* thisx, PlayState* play); void EffDust_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c index c913252dea..37e01dd2e3 100644 --- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c @@ -7,7 +7,7 @@ #include "z_eff_kamejima_wave.h" #include "assets/objects/object_kamejima/object_kamejima.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EffKamejimaWave_Init(Actor* thisx, PlayState* play); void EffKamejimaWave_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c index b285033620..a82a309fd5 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -7,7 +7,7 @@ #include "z_eff_lastday.h" #include "assets/objects/object_lastday/object_lastday.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EffLastday_Init(Actor* thisx, PlayState* play2); void EffLastday_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c index 6df46b47b6..164ea51abd 100644 --- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c @@ -7,7 +7,7 @@ #include "z_eff_stk.h" #include "assets/objects/object_stk2/object_stk2.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EffStk_Init(Actor* thisx, PlayState* play); void EffStk_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c index 9d8541f762..9b80e80cd2 100644 --- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c @@ -7,7 +7,7 @@ #include "z_eff_zoraband.h" #include "assets/objects/object_zoraband/object_zoraband.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EffZoraband_Init(Actor* thisx, PlayState* play); void EffZoraband_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index e7245c4187..61f7efe598 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -7,7 +7,7 @@ #include "z_elf_msg.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ElfMsg_Init(Actor* thisx, PlayState* play); void ElfMsg_Destroy(Actor* thisx, PlayState* play); @@ -30,7 +30,7 @@ ActorProfile Elf_Msg_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index 6420317d1c..b59ca62d5d 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -6,7 +6,7 @@ #include "z_elf_msg2.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ElfMsg2_Init(Actor* thisx, PlayState* play); void ElfMsg2_Destroy(Actor* thisx, PlayState* play); @@ -30,7 +30,7 @@ ActorProfile Elf_Msg2_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c index ea259fd02e..8e47605aa1 100644 --- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c @@ -7,7 +7,7 @@ #include "z_elf_msg3.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ElfMsg3_Init(Actor* thisx, PlayState* play); void ElfMsg3_Destroy(Actor* thisx, PlayState* play); @@ -29,7 +29,7 @@ ActorProfile Elf_Msg3_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; void ElfMsg3_SetupAction(ElfMsg3* this, ElfMsg3ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c index 803fb5f492..01d70ead5c 100644 --- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ElfMsg4_Init(Actor* thisx, PlayState* play); void ElfMsg4_Destroy(Actor* thisx, PlayState* play); @@ -33,7 +33,7 @@ ActorProfile Elf_Msg4_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; s32 func_80AFD380(ElfMsg4* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c index f4e3561b17..8441bbb52a 100644 --- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c @@ -6,7 +6,7 @@ #include "z_elf_msg5.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ElfMsg5_Init(Actor* thisx, PlayState* play); void ElfMsg5_Destroy(Actor* thisx, PlayState* play); @@ -29,7 +29,7 @@ ActorProfile Elf_Msg5_Profile = { static InitChainEntry sInitChainsInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; s32 func_80AFD990(ElfMsg5* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c index 2787eb4bdc..ae7de6cc6f 100644 --- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c @@ -7,7 +7,7 @@ #include "z_elf_msg6.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ElfMsg6_Init(Actor* thisx, PlayState* play); void ElfMsg6_Destroy(Actor* thisx, PlayState* play); @@ -35,7 +35,7 @@ ActorProfile Elf_Msg6_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; s32 func_80BA15A0(void) { 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 f400b1cb25..420ee7a145 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.c +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -7,7 +7,9 @@ #include "z_en_ah.h" #include "assets/objects/object_ah/object_ah.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnAh_Init(Actor* thisx, PlayState* play); void EnAh_Destroy(Actor* thisx, PlayState* play); 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 e6eb108a37..619a66b7fd 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -7,7 +7,9 @@ #include "z_en_akindonuts.h" #include "assets/objects/object_dnt/object_dnt.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnAkindonuts_Init(Actor* thisx, PlayState* play); void EnAkindonuts_Destroy(Actor* thisx, PlayState* play); 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 2b6669a3dc..19488646fb 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -7,7 +7,9 @@ #include "z_en_al.h" #include "attributes.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnAl_Init(Actor* thisx, PlayState* play); void EnAl_Destroy(Actor* thisx, PlayState* play); 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 fea5eb3f6f..84ed4b4937 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -380,7 +380,7 @@ void func_808B0820(EnAm* this) { Animation_PlayLoopSetSpeed(&this->skelAnime, &gArmosHopAnim, 4.0f); this->explodeTimer = 64; this->actor.world.rot.y = this->actor.shape.rot.y; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.speed = 0.0f; this->speed = 6.0f; this->actionFunc = func_808B0894; 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 a5f99840f1..1acf91737f 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -14,7 +14,9 @@ #include "assets/objects/object_mask_kerfay/object_mask_kerfay.h" #include "assets/objects/object_msmo/object_msmo.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnAn_Init(Actor* thisx, PlayState* play); void EnAn_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_And/z_en_and.c b/src/overlays/actors/ovl_En_And/z_en_and.c index 9c28346a47..c7ff7fd152 100644 --- a/src/overlays/actors/ovl_En_And/z_en_and.c +++ b/src/overlays/actors/ovl_En_And/z_en_and.c @@ -6,7 +6,9 @@ #include "z_en_and.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define EYE_TEXTURES_COUNT 4 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 db7b2150ca..e661375b28 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -73,7 +73,7 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 850, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 850, ICHAIN_STOP), }; void EnAni_DefaultBlink(EnAni* this) { @@ -134,7 +134,7 @@ void EnAni_Init(Actor* thisx, PlayState* play) { this->actor.velocity.y = 0.0f; this->actor.terminalVelocity = 0.0f; this->actor.gravity = 0.0f; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->stateFlags |= ANI_STATE_CLIMBING; CLEAR_EVENTINF(EVENTINF_14); } else { // ANI_TYPE_STANDING @@ -210,7 +210,7 @@ void EnAni_FallToGround(EnAni* this, PlayState* play) { s16 quakeIndex; if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnAni_LandOnFoot; this->actor.velocity.x = 0.0f; this->actor.velocity.z = 0.0f; 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 df8af5b062..8ad88c8084 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 @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Racedog/z_en_racedog.h" #include "overlays/actors/ovl_En_Dg/z_en_dg.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnAob01_Init(Actor* thisx, PlayState* play); void EnAob01_Destroy(Actor* thisx, PlayState* play); 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 7641cceae8..7fd853d0a1 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -10,7 +10,7 @@ #include "overlays/effects/ovl_Effect_Ss_Sbn/z_eff_ss_sbn.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnArrow_Init(Actor* thisx, PlayState* play); void EnArrow_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index 51e1418bb9..ab0216f6e2 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -7,7 +7,7 @@ #include "z_en_attack_niw.h" #include "overlays/actors/ovl_En_Niw/z_en_niw.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnAttackNiw_Init(Actor* thisx, PlayState* play); void EnAttackNiw_Destroy(Actor* thisx, PlayState* play); 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 9052f57a48..1eb8dbf148 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Twig/z_en_twig.h" #include "overlays/actors/ovl_En_Fish/z_en_fish.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_MINIMAP_ICON_ENABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_MINIMAP_ICON_ENABLED) typedef struct { /* 0x0 */ s16 unk_0; @@ -188,9 +188,9 @@ s32 func_80A94B98(EnAz* this, PlayState* play) { } static InitChainEntry sInitChain[3] = { - ICHAIN_F32(uncullZoneScale, 80, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 80, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 80, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 80, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; void EnAz_Init(Actor* thisx, PlayState* play2) { @@ -1669,10 +1669,10 @@ void func_80A97F9C(EnAz* this, PlayState* play) { func_80A97A28(this, play); } if (this->unk_374 & 0x100) { - if (this->actor.flags & ACTOR_FLAG_40) { + if (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { func_80A98414(this, play); } - if ((DECR(this->unk_37A) == 0) && (this->actor.flags & ACTOR_FLAG_40)) { + if ((DECR(this->unk_37A) == 0) && (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { EffectSsBubble_Spawn(play, &this->actor.world.pos, 0.0f, 20.0f, 20.0f, 0.35f); this->unk_37A = (Rand_ZeroOne() * 70.0f) + 10.0f; } 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 224523ef57..e85e6d8b42 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -6,7 +6,7 @@ #include "z_en_baba.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define BOMB_SHOP_LADY_STATE_END_CONVERSATION (1 << 0) #define BOMB_SHOP_LADY_STATE_VISIBLE (1 << 1) 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 43923742bb..1b0feb3099 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.c +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c @@ -7,7 +7,7 @@ #include "z_en_bal.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBal_Init(Actor* thisx, PlayState* play); void EnBal_Destroy(Actor* thisx, PlayState* play); @@ -197,7 +197,7 @@ void EnBal_Init(Actor* thisx, PlayState* play) { this->locationMapId = TINGLE_GET_MAP_ID(&this->picto.actor); this->picto.actor.attentionRangeType = 1; - this->picto.actor.uncullZoneForward = 3000.0f; + this->picto.actor.cullingVolumeDistance = 3000.0f; Actor_SetScale(&this->picto.actor, 0.02f); SkelAnime_InitFlex(play, &this->skelAnime, &gTingleSkel, &gTingleFloatIdleAnim, this->jointTable, this->morphTable, TINGLE_LIMB_MAX); 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 188a5890f7..3aff107c4d 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -108,7 +108,7 @@ static CollisionCheckInfoInit sColChkInfoInit = { 1, 15, 30, 10 }; static InitChainEntry sInitChain[] = { ICHAIN_S8(hintId, TATL_HINT_ID_BAD_BAT, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 2000, ICHAIN_STOP), }; @@ -346,7 +346,7 @@ void EnBat_SetupDie(EnBat* this, PlayState* play) { } this->collider.base.acFlags &= ~AC_ON; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnBat_Die; } 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 31839f6758..0fd92ac0f6 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -367,7 +367,7 @@ void EnBb_SetupDead(EnBb* this, PlayState* play) { bodyPartVelocity->y = Rand_ZeroFloat(3.5f) + 10.0f; } - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->actionFunc = EnBb_Dead; } @@ -485,7 +485,7 @@ void EnBb_Revive(EnBb* this, PlayState* play) { this->actor.shape.rot.y += 0x1F00; if (Math_StepToF(&this->actor.scale.x, 0.01f, 0.0005f)) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; this->collider.base.acFlags |= AC_ON; this->collider.base.atFlags |= AT_ON; 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 028ea6dd3d..25a5d0483b 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 @@ -15,7 +15,7 @@ #include "z_en_bba_01.h" #include "assets/objects/object_bba/object_bba.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBba01_Init(Actor* thisx, PlayState* play); void EnBba01_Destroy(Actor* thisx, PlayState* play); 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 0e6429942a..8222d83586 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -8,7 +8,9 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) void EnBbfall_Init(Actor* thisx, PlayState* play); void EnBbfall_Destroy(Actor* thisx, PlayState* play); 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 55c2a583da..f45b87d036 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -84,7 +84,7 @@ static ColliderCylinderInit sBodyCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 4, 130, 120, MASS_HEAVY }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2500, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 2000, ICHAIN_CONTINUE), ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_2, ICHAIN_CONTINUE), ICHAIN_S8(hintId, TATL_HINT_ID_BIG_OCTO, ICHAIN_CONTINUE), 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 7139597d82..ae207cf20c 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -10,9 +10,9 @@ #include "overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20 | \ - ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnBigpamet_Init(Actor* thisx, PlayState* play); void EnBigpamet_Destroy(Actor* thisx, PlayState* play); 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 21c165b22d..4b6f22654d 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -9,9 +9,9 @@ #include "assets/objects/object_bigpo/object_bigpo.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR | \ - ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR | ACTOR_FLAG_IGNORE_QUAKE) void EnBigpo_Init(Actor* thisx, PlayState* play2); void EnBigpo_Destroy(Actor* thisx, PlayState* play2); @@ -226,8 +226,8 @@ void EnBigpo_Init(Actor* thisx, PlayState* play2) { Actor_Kill(&this->actor); } - if (thisx->params == BIG_POE_TYPE_REGULAR) { // the well poe, starts immediately - thisx->flags &= ~ACTOR_FLAG_10; // always update OFF + if (thisx->params == BIG_POE_TYPE_REGULAR) { // the well poe, starts immediately + thisx->flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; // always update OFF this->storePrevBgm = true; EnBigpo_InitWellBigpo(this); } else if (thisx->params == BIG_POE_TYPE_SUMMONED) { // dampe type 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 15b9b858b8..1a78c2668e 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -12,9 +12,9 @@ #include "assets/objects/object_bigslime/object_bigslime.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20 | \ - ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) void EnBigslime_Init(Actor* thisx, PlayState* play2); void EnBigslime_Destroy(Actor* thisx, PlayState* play); 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 4f5777c98c..0fa2ab27a3 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 @@ -6,7 +6,7 @@ #include "z_en_bji_01.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBji01_Init(Actor* thisx, PlayState* play); void EnBji01_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c index 7d03ac421d..3e31341c06 100644 --- a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c +++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c @@ -6,7 +6,7 @@ #include "z_en_boj_01.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBoj01_Init(Actor* thisx, PlayState* play); void EnBoj01_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c index 0ac5e4422d..12588e128d 100644 --- a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c +++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c @@ -6,7 +6,7 @@ #include "z_en_boj_02.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBoj02_Init(Actor* thisx, PlayState* play); void EnBoj02_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c index 7eb191aab1..c08164c21c 100644 --- a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c +++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c @@ -6,7 +6,7 @@ #include "z_en_boj_03.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBoj03_Init(Actor* thisx, PlayState* play); void EnBoj03_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c index 28c1a7d756..09c5a6c6ca 100644 --- a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c +++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c @@ -6,7 +6,7 @@ #include "z_en_boj_04.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBoj04_Init(Actor* thisx, PlayState* play); void EnBoj04_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c index 534261580d..759bc60264 100644 --- a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c +++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c @@ -6,7 +6,7 @@ #include "z_en_boj_05.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBoj05_Init(Actor* thisx, PlayState* play); void EnBoj05_Destroy(Actor* thisx, PlayState* play); 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 e5d55a6b52..3cd5debc21 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBom_Init(Actor* thisx, PlayState* play); void EnBom_Destroy(Actor* thisx, PlayState* play); @@ -341,7 +341,7 @@ void EnBom_Explode(EnBom* this, PlayState* play) { Color_RGBA8 sp80; if (this->collider2.elements[0].dim.modelSphere.radius == 0) { - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); } @@ -555,7 +555,7 @@ void EnBom_Update(Actor* thisx, PlayState* play) { Camera_AddQuake(&play->mainCamera, 2, 11, 8); thisx->params = BOMB_TYPE_EXPLOSION; this->timer = 10; - thisx->flags |= (ACTOR_FLAG_20 | ACTOR_FLAG_100000); + thisx->flags |= (ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_100000); this->actionFunc = EnBom_Explode; if (this->isPowderKeg) { gSaveContext.powderKegTimer = 0; diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index f6f82f1c9a..ee95b5dd8f 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -410,7 +410,7 @@ void func_809C51B4(EnBomBowlMan* this, PlayState* play) { void func_809C52B4(EnBomBowlMan* this) { this->actor.draw = NULL; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_LOCK_ON_DISABLED; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->actor.world.pos.x = 1340.0f; 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 2275bc958a..0030bc0a58 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 @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define BOMBCHU_SCALE 0.01f 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 afc6da8527..61f3813280 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -9,7 +9,7 @@ #include "assets/objects/object_fusen/object_fusen.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBombal_Init(Actor* thisx, PlayState* play); void EnBombal_Destroy(Actor* thisx, PlayState* play); @@ -93,7 +93,7 @@ void func_80C05B3C(EnBombal* this, PlayState* play) { this->collider.base.acFlags &= ~AC_HIT; if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_75_40) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_73_10) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_85_02)) { - player->stateFlags1 |= ACTOR_FLAG_20; + player->stateFlags1 |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_100000; } this->actionFunc = func_80C05C44; 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 755c642d4f..e56ec790b4 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -550,7 +550,7 @@ void EnBombers_Update(Actor* thisx, PlayState* play) { Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 50.0f, UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_4 | UPDBGCHECKINFO_FLAG_8 | UPDBGCHECKINFO_FLAG_10); - this->actor.uncullZoneForward = 500.0f; + this->actor.cullingVolumeDistance = 500.0f; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); } 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 ef030320ae..1e99c519cd 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/object_bombf/object_bombf.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBombf_Init(Actor* thisx, PlayState* play2); void EnBombf_Destroy(Actor* thisx, PlayState* play); @@ -125,8 +125,8 @@ void EnBombf_Init(Actor* thisx, PlayState* play2) { func_808AEAB8(this, ENBOMBF_GET(thisx)); } - thisx->uncullZoneScale += 31000.0f; - thisx->uncullZoneForward += 31000.0f; + thisx->cullingVolumeScale += 31000.0f; + thisx->cullingVolumeDistance += 31000.0f; } void EnBombf_Destroy(Actor* thisx, PlayState* play) { @@ -260,7 +260,7 @@ void func_808AEF68(EnBombf* this, PlayState* play) { void func_808AEFD4(EnBombf* this, PlayState* play) { if (this->colliderJntSph.elements[0].dim.modelSphere.radius == 0) { - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; Rumble_Request(this->actor.xzDistToPlayer, 255, 20, 150); } @@ -421,7 +421,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) { this->actor.params = ENBOMBF_1; this->timer = 10; - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; EnBombf_SetupAction(this, func_808AEFD4); } 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 97a7ec9da9..7f4475b3b1 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -8,7 +8,7 @@ #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnBomjima_Init(Actor* thisx, PlayState* play); void EnBomjima_Destroy(Actor* thisx, PlayState* play); @@ -1111,7 +1111,7 @@ void EnBomjima_Update(Actor* thisx, PlayState* play) { Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 50.0f, UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_4 | UPDBGCHECKINFO_FLAG_8 | UPDBGCHECKINFO_FLAG_10); - this->actor.uncullZoneForward = 500.0f; + this->actor.cullingVolumeDistance = 500.0f; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); } 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 7a5ea1f9ac..5fd8c3b369 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -7,7 +7,7 @@ #include "z_en_boom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnBoom_Init(Actor* thisx, PlayState* play); void EnBoom_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 5603e599bb..0d8784cb4d 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -225,7 +225,7 @@ void EnBox_Init(Actor* thisx, PlayState* play) { EnBox_SetupAction(this, EnBox_FallOnSwitchFlag); this->alpha = 0; this->movementFlags |= ENBOX_MOVE_IMMOBILE; - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else if (((this->type == ENBOX_TYPE_BIG_ROOM_CLEAR) || (this->type == ENBOX_TYPE_SMALL_ROOM_CLEAR)) && !Flags_GetClear(play, this->dyna.actor.room)) { EnBox_SetupAction(this, EnBox_AppearOnRoomClear); @@ -237,7 +237,7 @@ void EnBox_Init(Actor* thisx, PlayState* play) { } this->alpha = 0; this->movementFlags |= ENBOX_MOVE_IMMOBILE; - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else if ((this->type == ENBOX_TYPE_BIG_SONG_ZELDAS_LULLABY) || (this->type == ENBOX_TYPE_BIG_SONG_SUNS)) { } else if (((this->type == ENBOX_TYPE_BIG_SWITCH_FLAG) || (this->type == ENBOX_TYPE_SMALL_SWITCH_FLAG)) && @@ -251,7 +251,7 @@ void EnBox_Init(Actor* thisx, PlayState* play) { } this->alpha = 0; this->movementFlags |= ENBOX_MOVE_IMMOBILE; - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else { if ((this->type == ENBOX_TYPE_BIG_INVISIBLE) || (this->type == ENBOX_TYPE_SMALL_INVISIBLE)) { this->dyna.actor.flags |= ACTOR_FLAG_REACT_TO_LENS; @@ -262,7 +262,7 @@ void EnBox_Init(Actor* thisx, PlayState* play) { } if ((this->getItemId == GI_STRAY_FAIRY) && !Flags_GetTreasure(play, ENBOX_GET_CHEST_FLAG(&this->dyna.actor))) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } this->dyna.actor.shape.rot.y += 0x8000; 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 49ab64bc29..8b6becc545 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -16,9 +16,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnBsb_Init(Actor* thisx, PlayState* play); void EnBsb_Destroy(Actor* thisx, PlayState* play); 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 3253313f49..2a8487425c 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -93,9 +93,9 @@ Vec3f D_8091D3A4 = { 0.0f, 0.0f, -3.0f }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 20, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 60, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 20, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 60, ICHAIN_STOP), }; f32 D_8091D3C0[] = { 50.0f, 80.0f, 100.0f }; @@ -173,7 +173,7 @@ void EnButte_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if ((BUTTERFLY_GET_1(&this->actor) & 0xFF) == BUTTERFLY_1) { - this->actor.uncullZoneScale = 200.0f; + this->actor.cullingVolumeScale = 200.0f; } SkelAnime_Init(play, &this->skelAnime, &gameplay_field_keep_Skel_002FA0, &gameplay_field_keep_Anim_001D20, @@ -366,7 +366,7 @@ void func_8091CBB4(EnButte* this, PlayState* play) { void func_8091CF64(EnButte* this) { this->unk_24C = 9; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->skelAnime.playSpeed = 1.0f; func_8091C124(); this->actionFunc = func_8091CFB4; diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 8472dcfc54..bee6ead5a5 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -8,7 +8,9 @@ #include "attributes.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) typedef enum { /* 0x00 */ CLEAR_TAG_EFFECT_AVAILABLE, 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 cc7e774f4e..f10bcde2e3 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 @@ -7,7 +7,7 @@ #include "z_en_cne_01.h" #include "assets/objects/object_cne/object_cne.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnCne01_Init(Actor* thisx, PlayState* play); void EnCne01_Destroy(Actor* thisx, PlayState* play); 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 8d69b7a4d8..5c5657c5bb 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 @@ -144,8 +144,8 @@ void EnColMan_SetHeartPieceCollectedAndKill(EnColMan* this, PlayState* play) { void func_80AFDF60(EnColMan* this) { this->actor.draw = func_80AFE584; - this->actor.flags |= ACTOR_FLAG_10; - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->type = EN_COL_MAN_FALLING_ROCK; this->actionFunc = func_80AFDFB4; this->actor.shape.shadowScale = 5.0f; 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 c122bf759b..1a69cd77cf 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -117,7 +117,7 @@ static DamageTable sDamageTable = { static s32 sDeadCount = 0; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), ICHAIN_S8(hintId, TATL_HINT_ID_GUAY, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 2000, ICHAIN_STOP), @@ -331,7 +331,7 @@ void EnCrow_SetupDamaged(EnCrow* this, PlayState* play) { } this->collider.base.acFlags &= ~AC_ON; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnCrow_Damaged; } @@ -458,7 +458,7 @@ void EnCrow_Respawn(EnCrow* this, PlayState* play) { } if (Math_StepToF(&this->actor.scale.x, scaleTarget, scaleTarget * 0.1f)) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.colChkInfo.health = 1; EnCrow_SetupFlyIdle(this); } diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.c b/src/overlays/actors/ovl_En_Dai/z_en_dai.c index d3af264fe7..fd512bea5a 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -6,9 +6,9 @@ #include "z_en_dai.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnDai_Init(Actor* thisx, PlayState* play); void EnDai_Destroy(Actor* thisx, PlayState* play); 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 f2dc1cb076..c48ce5e118 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -315,7 +315,7 @@ void EnDaiku_Update(Actor* thisx, PlayState* play) { Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 50.0f, UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_4 | UPDBGCHECKINFO_FLAG_8 | UPDBGCHECKINFO_FLAG_10); - this->actor.uncullZoneForward = 650.0f; + this->actor.cullingVolumeDistance = 650.0f; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); } 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 a23da1c29c..88b45701cf 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -9,8 +9,9 @@ #include "overlays/actors/ovl_Arrow_Light/z_arrow_light.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_IGNORE_QUAKE) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE) void EnDeath_Init(Actor* thisx, PlayState* play2); void EnDeath_Destroy(Actor* thisx, PlayState* play); @@ -1432,7 +1433,7 @@ void EnDeath_DrawBats(EnDeath* this, PlayState* play) { for (i = 0; i < ARRAY_COUNT(this->miniDeaths); i++) { if (this->actionFunc == EnDeath_BeginWithoutCutscene || - CHECK_FLAG_ALL(this->miniDeaths[i]->actor.flags, ACTOR_FLAG_40)) { + CHECK_FLAG_ALL(this->miniDeaths[i]->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { miniDeath = this->miniDeaths[i]; Matrix_RotateZYX(miniDeath->actor.shape.rot.x, miniDeath->actor.shape.rot.y, 0, MTXMODE_NEW); @@ -1553,7 +1554,7 @@ void EnDeath_DrawFlames(EnDeath* this, PlayState* play2) { } for (i = 0; i < ARRAY_COUNT(this->miniDeaths); i++) { - if (CHECK_FLAG_ALL(this->miniDeaths[i]->actor.flags, ACTOR_FLAG_40)) { + if (CHECK_FLAG_ALL(this->miniDeaths[i]->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { for (effect = this->miniDeaths[i]->effects, j = 0; j < MINIDEATH_NUM_EFFECTS; j++, effect++) { cmf->mf[3][0] = effect->pos.x; cmf->mf[3][1] = effect->pos.y - 12.0f; 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 fafc4184df..217281c1c7 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -839,7 +839,7 @@ void EnDekubaba_SetupPrunedSomersaultDie(EnDekubaba* this) { this->actor.world.rot.y = this->actor.shape.rot.y + 0x8000; this->actor.speed = this->size * 3.0f; this->collider.base.acFlags &= ~AC_ON; - this->actor.flags |= ACTOR_FLAG_10 | ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = EnDekubaba_PrunedSomersaultDie; } @@ -1042,7 +1042,7 @@ void EnDekubaba_SetupDeadStickDrop(EnDekubaba* this, PlayState* play) { this->actor.velocity.y = 0.0f; this->actor.shape.shadowScale = 3.0f; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_MISC); - this->actor.flags &= ~ACTOR_FLAG_20; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->timer = 200; this->drawDmgEffAlpha = 0.0f; this->actionFunc = EnDekubaba_DeadStickDrop; 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 fa8ccc3e7a..b606c63bd3 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -371,7 +371,7 @@ void func_808BDE7C(EnDekunuts* this) { this->actor.colChkInfo.mass = 50; Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DAMAGE); this->actor.world.rot.x = 0; - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->collider.base.acFlags &= ~AC_ON; this->actionFunc = func_808BDEF8; } @@ -434,7 +434,7 @@ void func_808BDFB8(EnDekunuts* this, PlayState* play) { if ((this->unk_18D == 0) && (Actor_WorldDistXZToPoint(&this->actor, &this->actor.home.pos) < 20.0f) && (fabsf(this->actor.world.pos.y - this->actor.home.pos.y) < 2.0f)) { this->actor.colChkInfo.mass = MASS_IMMOVABLE; - this->actor.flags &= ~ACTOR_FLAG_20; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actor.speed = 0.0f; func_808BDC9C(this); } else if (this->unk_190 == 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 790c7e55a3..d1c4b16699 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -8,7 +8,8 @@ #include "attributes.h" #include "overlays/actors/ovl_En_Aob_01/z_en_aob_01.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void EnDg_Init(Actor* thisx, PlayState* play); void EnDg_Destroy(Actor* thisx, PlayState* play); @@ -204,7 +205,7 @@ static AnimationInfoS sAnimationInfo[DOG_ANIM_MAX] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; void EnDg_ChangeAnim(SkelAnime* skelAnime, AnimationInfoS* animInfo, s32 animIndex) { 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 962b55bfeb..767ac37eba 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -7,9 +7,9 @@ #include "z_en_dinofos.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20 | \ - ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnDinofos_Init(Actor* thisx, PlayState* play); void EnDinofos_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c index d5fa231475..f295fb69b8 100644 --- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c @@ -8,7 +8,7 @@ #include "assets/objects/object_hanareyama_obj/object_hanareyama_obj.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_REACT_TO_LENS) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_REACT_TO_LENS) void EnDnb_Init(Actor* thisx, PlayState* play); void EnDnb_Destroy(Actor* thisx, PlayState* play); 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 c4bfdfade7..e9eccd9dda 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -238,7 +238,7 @@ void func_80A51648(EnDnk* this, PlayState* play) { CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit); if (ENDNK_GET_3C(&this->actor) == 4) { this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= (ACTOR_FLAG_10 | ACTOR_FLAG_20); + this->actor.flags |= (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); this->actionFunc = EnDnk_HandleCutscene; Actor_SetScale(&this->actor, 0.1f); } else { 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 bf5410a113..6ed0f85dc2 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -13,7 +13,9 @@ #include "overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnDno_Init(Actor* thisx, PlayState* play); void EnDno_Destroy(Actor* thisx, PlayState* play); @@ -125,8 +127,8 @@ static ColliderCylinderInit sCylinderInit = { static Vec3f D_80A73B2C = { 0.0f, 0.0f, 1.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneDownward, 80, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDownward, 80, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; void func_80A711D0(EnDno* this, PlayState* play, Vec3f* vec) { 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 8d6f16eef3..4e79f061ab 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -9,7 +9,7 @@ #include "z_en_dnp.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnDnp_Init(Actor* thisx, PlayState* play); void EnDnp_Destroy(Actor* thisx, PlayState* play); 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 867382d5a1..78c1f94f2a 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -6,7 +6,7 @@ #include "z_en_dns.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnDns_Init(Actor* thisx, PlayState* play); void EnDns_Destroy(Actor* thisx, PlayState* play); 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 cc00a3aab3..398ba3fc0d 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -707,7 +707,7 @@ void func_80877D90(EnDodongo* this, PlayState* play) { void func_80877DE0(EnDodongo* this) { Animation_Change(&this->skelAnime, &object_dodongo_Anim_0028F0, -1.0f, 35.0f, 0.0f, ANIMMODE_ONCE, -4.0f); - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->timer = 25; this->actionFunc = func_80877E60; this->actor.speed = 0.0f; @@ -747,7 +747,7 @@ void func_80877E60(EnDodongo* this, PlayState* play) { Actor_Kill(this->actor.child); this->actor.child = NULL; } - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else if (this->skelAnime.playSpeed > -0.5f) { this->timer--; if (this->timer == 10) { diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 1b506d6ee3..53dadf81ac 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -22,7 +22,7 @@ #include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define DOOR_AJAR_SLAM_RANGE 120.0f #define DOOR_AJAR_OPEN_RANGE (2 * DOOR_AJAR_SLAM_RANGE) @@ -247,7 +247,7 @@ static_assert(ARRAY_COUNT(sObjectInfo) == DOOR_OBJINFO_MAX, static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), ICHAIN_U16(shape.rot.x, 0, ICHAIN_CONTINUE), ICHAIN_U16(shape.rot.z, 0, ICHAIN_STOP), }; 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 b582f05d1d..b8db13f776 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 @@ -7,7 +7,7 @@ #include "z_en_door_etc.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnDoorEtc_Init(Actor* thisx, PlayState* play2); void EnDoorEtc_Destroy(Actor* thisx, PlayState* play); @@ -78,7 +78,7 @@ EnDoorEtcInfo sObjectInfo[] = { static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), ICHAIN_U16(shape.rot.x, 0, ICHAIN_CONTINUE), ICHAIN_U16(shape.rot.z, 0, ICHAIN_STOP), }; @@ -138,7 +138,7 @@ s32 EnDoorEtc_IsDistanceGreater(Vec3f* a, Vec3f* b, f32 c) { void EnDoorEtc_WaitForObject(EnDoorEtc* this, PlayState* play) { if (Object_IsLoaded(&play->objectCtx, this->knobDoor.objectSlot)) { - this->knobDoor.dyna.actor.flags &= ~ACTOR_FLAG_10; + this->knobDoor.dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->knobDoor.dyna.actor.objectSlot = this->knobDoor.objectSlot; this->actionFunc = func_80AC2354; this->knobDoor.dyna.actor.draw = EnDoorEtc_Draw; 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 19bc208a91..e82518036c 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -7,7 +7,9 @@ #include "z_en_dragon.h" #include "overlays/actors/ovl_En_Ot/z_en_ot.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnDragon_Init(Actor* thisx, PlayState* play); void EnDragon_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c index 0b120c3ee7..bf3db26d34 100644 --- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c @@ -9,7 +9,9 @@ #include "z_en_ds2n.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnDs2n_Init(Actor* thisx, PlayState* play); void EnDs2n_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index 03602dce3b..5854ed6b06 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -7,7 +7,7 @@ #include "z_en_dy_extra.h" #include "assets/objects/object_dy_obj/object_dy_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnDyExtra_Init(Actor* thisx, PlayState* play); void EnDyExtra_Destroy(Actor* thisx, PlayState* play); 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 b817759bd5..c92ae3d0d3 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -15,9 +15,9 @@ #include "overlays/actors/ovl_En_Estone/z_en_estone.h" #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20 | \ - ACTOR_FLAG_MINIMAP_ICON_ENABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_MINIMAP_ICON_ENABLED) typedef enum { /* 0 */ EYEGORE_ACTION_WAIT, diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 21fe445ace..e7e2006db0 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -8,7 +8,7 @@ #include "attributes.h" #include "z64elf_message.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnElf_Init(Actor* thisx, PlayState* play2); void EnElf_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c index b8ec8f9c38..19f7b4a9bc 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -34,7 +34,7 @@ #include "overlays/actors/ovl_En_Elforg/z_en_elforg.h" #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) //! TODO: this file require macros for its uses of weekEventReg 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 068b01174b..ccdd9ffa9a 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -6,7 +6,7 @@ #include "z_en_elforg.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnElforg_Init(Actor* thisx, PlayState* play); void EnElforg_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index 596cc983d6..e9f48c12fa 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Wallmas/z_en_wallmas.h" #include "overlays/actors/ovl_En_Pr2/z_en_pr2.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_100000 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_100000 | ACTOR_FLAG_LOCK_ON_DISABLED) void EnEncount1_Init(Actor* thisx, PlayState* play); void EnEncount1_Update(Actor* thisx, PlayState* play); 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 97181f2e87..b5c9ebba12 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -9,7 +9,7 @@ #include "assets/objects/object_fusen/object_fusen.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnEncount2_Init(Actor* thisx, PlayState* play); void EnEncount2_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c index 9d89fddc80..25b4308786 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c @@ -7,7 +7,7 @@ #include "z_en_encount3.h" #include "assets/objects/object_big_fwall/object_big_fwall.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnEncount3_Init(Actor* thisx, PlayState* play); void EnEncount3_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c index 948d5d0367..a1f426b2c4 100644 --- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c @@ -6,7 +6,7 @@ #include "z_en_encount4.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnEncount4_Init(Actor* thisx, PlayState* play); void EnEncount4_Destroy(Actor* thisx, PlayState* play); 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 665695e7ee..37d543650d 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -8,7 +8,7 @@ #include "assets/objects/object_eg/object_eg.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnEstone_Init(Actor* thisx, PlayState* play); void EnEstone_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c index f19f9ffa03..b9d5b3242d 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -22,7 +22,7 @@ #include "assets/objects/object_lodmoon/object_lodmoon.h" #include "assets/objects/object_moonston/object_moonston.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) #define FLAG_FIRE_BALL_INTENSIFIES (1 << 0) #define FLAG_FIRE_RING_APPEARS (1 << 1) diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c index b198fc3638..0840ffb293 100644 --- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c @@ -6,7 +6,7 @@ #include "z_en_fall2.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnFall2_Init(Actor* thisx, PlayState* play); void EnFall2_Destroy(Actor* thisx, PlayState* play); 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 c39489f374..48313a7c89 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -671,7 +671,7 @@ void EnFamos_SetupDeathExplosion(EnFamos* this) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 4); this->stateTimer = 25; Math_Vec3f_Copy(&this->targetDest, &this->actor.world.pos); - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnFamos_DeathExplosion; } diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 6ff2c623dd..a381d918ed 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -6,7 +6,7 @@ #include "z_en_fire_rock.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnFireRock_Init(Actor* thisx, PlayState* play); void EnFireRock_Destroy(Actor* thisx, PlayState* play); 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 3bcdc398b6..8bf4c520e9 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -341,7 +341,7 @@ void EnFirefly_SetupFall(EnFirefly* this, PlayState* play) { this->actor.velocity.y = 0.0f; Animation_Change(&this->skelAnime, &gFireKeeseFlyAnim, 0.0f, 6.0f, 6.0f, ANIMMODE_ONCE, 0.0f); Actor_PlaySfx(&this->actor, NA_SE_EN_FFLY_DEAD); - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (this->isInvisible) { Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_XLU, 40); diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c index 51c85aa9b1..7b422c2368 100644 --- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c @@ -6,9 +6,9 @@ #include "z_en_firefly2.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_IGNORE_QUAKE | \ - ACTOR_FLAG_CAN_ATTACH_TO_ARROW) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) void EnFirefly2_Init(Actor* thisx, PlayState* play); void EnFirefly2_Destroy(Actor* thisx, PlayState* play); 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 b76c19e199..1f21c254b3 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -78,9 +78,9 @@ ActorProfile En_Fish_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 720, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 40, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 40, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 720, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 40, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 40, ICHAIN_STOP), }; f32 func_8091D630(Vec3f* arg0, Vec3f* arg1) { @@ -211,7 +211,7 @@ void EnFish_Init(Actor* thisx, PlayState* play) { this->unk_246 = Rand_Next() >> 0x10; if (sp36 == ENFISH_0) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 8.0f); func_8091E810(this); } else if (sp36 == ENFISH_1) { @@ -605,7 +605,7 @@ void func_8091ECF4(EnFish* this) { this->actor.gravity = 0.0f; this->actor.terminalVelocity = 0.0f; this->actor.shape.yOffset = 0.0f; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_240 = 200; func_8091D660(this); this->unkFunc = func_8091ED70; @@ -666,7 +666,7 @@ void func_8091EF30(EnFish* this) { if (this->actor.velocity.y < -1.0f) { this->actor.velocity.y = -1.0f; } - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.home.pos.x = this->actor.world.pos.x; this->actor.home.pos.y = this->actor.world.pos.y - 20.0f; this->actor.home.pos.z = this->actor.world.pos.z; 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 81e4190611..ea99f42dc1 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -10,7 +10,7 @@ #include "overlays/actors/ovl_En_Mushi2/z_en_mushi2.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnFish2_Init(Actor* thisx, PlayState* play); void EnFish2_Destroy(Actor* thisx, PlayState* play); 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 bdc8e562e5..315dcd9435 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -11,7 +11,7 @@ #include "assets/objects/object_fish/object_fish.h" #include "overlays/actors/ovl_En_Kanban/z_en_kanban.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define WATER_SURFACE_Y(play) play->colCtx.colHeader->waterBoxes->minPos.y @@ -2864,8 +2864,8 @@ void EnFishing_UpdateFish(Actor* thisx, PlayState* play2) { f32 temp; f32 temp2; - this->actor.uncullZoneForward = 700.0f; - this->actor.uncullZoneScale = 50.0f; + this->actor.cullingVolumeDistance = 700.0f; + this->actor.cullingVolumeScale = 50.0f; if (this->unk_148 == 0) { sp118 = (player->actor.speed * 0.15f) + 0.25f; @@ -2984,8 +2984,8 @@ void EnFishing_UpdateFish(Actor* thisx, PlayState* play2) { case 100: EnFishing_HandleAquariumDialog(this, play); - this->actor.uncullZoneForward = 500.0f; - this->actor.uncullZoneScale = 300.0f; + this->actor.cullingVolumeDistance = 500.0f; + this->actor.cullingVolumeScale = 300.0f; Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.world.pos.x, this->actor.world.pos.y + 20.0f, this->actor.world.pos.z - 50.0f, 255, 255, 255, 255); @@ -3508,8 +3508,8 @@ void EnFishing_UpdateFish(Actor* thisx, PlayState* play2) { break; case 5: - this->actor.uncullZoneForward = 1200.0f; - this->actor.uncullZoneScale = 200.0f; + this->actor.cullingVolumeDistance = 1200.0f; + this->actor.cullingVolumeScale = 200.0f; D_809171D4++; @@ -5084,7 +5084,7 @@ void EnFishing_UpdateOwner(Actor* thisx, PlayState* play2) { if ((D_8090CD04 != 0) || Message_GetState(&play->msgCtx) != TEXT_STATE_NONE) { this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; } else { - this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_20); + this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); } if ((this->actor.xzDistToPlayer < 120.0f) || Message_GetState(&play->msgCtx) != TEXT_STATE_NONE) { 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 de92b3df02..534e58cce4 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -545,7 +545,7 @@ void func_808D19D4(EnFloormas* this) { this->actor.colorFilterTimer = 0; this->drawDmgEffAlpha = 0.0f; Actor_SetScale(&this->actor, 0.004f); - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_REACT_TO_LENS)) { this->actor.draw = func_808D3754; } else { @@ -866,7 +866,7 @@ void func_808D2764(EnFloormas* this, PlayState* play) { if (SkelAnime_Update(&this->skelAnime)) { if (this->actor.scale.x >= 0.01f) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_808D0908(this); this->actor.params = ENFLOORMAS_GET_7FFF_0; this->actor.flags &= ~ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR; @@ -897,7 +897,7 @@ void func_808D2A20(EnFloormas* this) { Actor_Kill(&this->actor); } else { this->actor.draw = NULL; - this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_10); + this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED); this->actionFunc = func_808D2AA8; } } 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 e6c2c570da..4edcec2f12 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -8,7 +8,7 @@ #include "attributes.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define SI_NONE 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 61a61437b3..b3ee031251 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -11,9 +11,9 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA | \ - ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) void EnFu_Init(Actor* thisx, PlayState* play); void EnFu_Destroy(Actor* thisx, PlayState* play); 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 3a6c20fa91..e69150abf9 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 @@ -10,7 +10,7 @@ #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "assets/objects/object_fu_mato/object_fu_mato.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnFuKago_Init(Actor* thisx, PlayState* play); void EnFuKago_Destroy(Actor* thisx, PlayState* play); 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 1d5217c2e0..5631a6ab1f 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 @@ -9,7 +9,7 @@ #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "assets/objects/object_fu_mato/object_fu_mato.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnFuMato_Init(Actor* thisx, PlayState* play); void EnFuMato_Destroy(Actor* thisx, PlayState* play); 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 ea59f8382a..ea574255fd 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -10,7 +10,7 @@ #include "assets/objects/object_fz/object_fz.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnFz_Init(Actor* thisx, PlayState* play); void EnFz_Destroy(Actor* thisx, PlayState* play); @@ -157,7 +157,7 @@ static DamageTable sDamageTable = { static InitChainEntry sInitChain[] = { ICHAIN_S8(hintId, TATL_HINT_ID_FREEZARD, ICHAIN_CONTINUE), ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_2, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1400, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 30, ICHAIN_STOP), }; @@ -188,7 +188,7 @@ void EnFz_Init(Actor* thisx, PlayState* play) { this->unk_BD7 = 1; this->unk_BD8 = 0; this->actor.speed = 0.0f; - this->actor.uncullZoneScale = 400.0f; + this->actor.cullingVolumeScale = 400.0f; this->unk_BAC = this->actor.world.pos.y; this->unk_BB4 = this->actor.world.pos.y; this->unk_BA8 = this->actor.world.pos.x; diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c index 7f080ecd11..1968fd5042 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -7,7 +7,7 @@ #include "z_en_gakufu.h" #include "assets/interface/parameter_static/parameter_static.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnGakufu_Init(Actor* thisx, PlayState* play); void EnGakufu_Destroy(Actor* thisx, PlayState* play); 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 5596407a2e..e15abcf490 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -7,7 +7,7 @@ #include "z_en_gamelupy.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGamelupy_Init(Actor* thisx, PlayState* play); void EnGamelupy_Destroy(Actor* thisx, PlayState* play); 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 bedba05687..ccd31f2e87 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -7,7 +7,9 @@ #include "z_en_gb2.h" #include "attributes.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnGb2_Init(Actor* thisx, PlayState* play); void EnGb2_Destroy(Actor* thisx, PlayState* play); @@ -914,7 +916,7 @@ void EnGb2_Init(Actor* thisx, PlayState* play) { } this->unk_28A = 255; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_UPDATE_DURING_OCARINA; if (CHECK_EVENTINF(EVENTINF_46)) { 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 9b3ebd1e1c..b5823fa5de 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -110,7 +110,7 @@ void EnGe1_Init(Actor* thisx, PlayState* play) { this->hairstyle = GERUDO_WHITE_HAIR_BOB; this->actionFunc = EnGe1_PerformCutsceneActions; this->picto.actor.draw = NULL; - this->picto.actor.flags |= ACTOR_FLAG_20 | ACTOR_FLAG_10; + this->picto.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED; this->picto.actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; break; } 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 15112f8b95..978a56fdb6 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -84,7 +84,7 @@ void EnGe2_Init(Actor* thisx, PlayState* play) { Collider_InitAndSetCylinder(play, &this->collider, &this->picto.actor, &sCylinderInit); this->picto.actor.colChkInfo.mass = MASS_IMMOVABLE; Actor_SetScale(&this->picto.actor, 0.01f); - this->picto.actor.uncullZoneForward = 1200.0f; + this->picto.actor.cullingVolumeDistance = 1200.0f; if (this->picto.actor.world.rot.z == 0) { this->verticalDetectRange = 40.0f; @@ -109,9 +109,9 @@ void EnGe2_Init(Actor* thisx, PlayState* play) { EnGe2_SetupPath(this, play); - this->picto.actor.flags |= ACTOR_FLAG_10; + this->picto.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (play->actorCtx.flags & ACTORCTX_FLAG_TELESCOPE_ON) { - this->picto.actor.flags |= (ACTOR_FLAG_10 | ACTOR_FLAG_20); + this->picto.actor.flags |= (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); } switch (GERUDO_PURPLE_GET_TYPE(&this->picto.actor)) { @@ -120,7 +120,7 @@ void EnGe2_Init(Actor* thisx, PlayState* play) { Animation_GetLastFrame(&gGerudoPurpleLookingAboutAnim), ANIMMODE_LOOP, 0.0f); this->actionFunc = EnGe2_GuardStationary; this->picto.actor.speed = 0.0f; - this->picto.actor.uncullZoneForward = 4000.0f; + this->picto.actor.cullingVolumeDistance = 4000.0f; break; case GERUDO_PURPLE_TYPE_AVEIL_GUARD: @@ -711,7 +711,7 @@ void EnGe2_Update(Actor* thisx, PlayState* play) { this->actionFunc = EnGe2_PerformCutsceneActions; this->stateFlags &= ~GERUDO_PURPLE_STATE_KO; this->stateFlags &= ~GERUDO_PURPLE_STATE_PATH_REVERSE; - this->picto.actor.flags |= ACTOR_FLAG_20; + this->picto.actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->picto.actor.speed = 0.0f; } 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 41e0d04949..761c95da88 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -7,7 +7,9 @@ #include "z_en_ge3.h" #include "attributes.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_MINIMAP_ICON_ENABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_MINIMAP_ICON_ENABLED) void EnGe3_Init(Actor* thisx, PlayState* play); void EnGe3_Destroy(Actor* thisx, PlayState* play); 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 a81f26bc77..449329684b 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -11,7 +11,7 @@ #include "assets/objects/object_hakugin_demo/object_hakugin_demo.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGeg_Init(Actor* thisx, PlayState* play); void EnGeg_Destroy(Actor* thisx, PlayState* play); 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 fbaec1e9b2..ef695de7e3 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -694,7 +694,7 @@ void EnGg_Init(Actor* thisx, PlayState* play) { this->unk_309 = 0; this->unk_304 = 0; this->unk_30A = 0; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_80B35B24(&this->unk_344, play); func_80B35250(this); } diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.c b/src/overlays/actors/ovl_En_Giant/z_en_giant.c index 6c020214e2..87854001b5 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.c +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -6,7 +6,7 @@ #include "z_en_giant.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnGiant_Init(Actor* thisx, PlayState* play); void EnGiant_Destroy(Actor* thisx, PlayState* play); @@ -163,9 +163,9 @@ void EnGiant_Init(Actor* thisx, PlayState* play) { EnGiant* this = (EnGiant*)thisx; s32 type = GIANT_TYPE(thisx); - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 2000.0f; - this->actor.uncullZoneDownward = 2400.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 2000.0f; + this->actor.cullingVolumeDownward = 2400.0f; Actor_SetScale(&this->actor, 0.32f); SkelAnime_InitFlex(play, &this->skelAnime, &gGiantSkel, &gGiantLargeStrideAnim, this->jointTable, this->morphTable, GIANT_LIMB_MAX); diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c index b1d1da9e5c..267620abcf 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c @@ -61,7 +61,7 @@ void EnGinkoMan_Init(Actor* thisx, PlayState* play) { EnGinkoMan* this = (EnGinkoMan*)thisx; this->actor.attentionRangeType = ATTENTION_RANGE_1; - this->actor.uncullZoneForward = 400.0f; + this->actor.cullingVolumeDistance = 400.0f; Actor_SetScale(&this->actor, 0.01f); this->actor.colChkInfo.cylRadius = 100; this->curTextId = 0; diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 9a13790d91..7673633b39 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -6,7 +6,7 @@ #include "z_en_girla.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGirlA_Init(Actor* thisx, PlayState* play); void EnGirlA_Destroy(Actor* thisx, PlayState* play); @@ -563,7 +563,7 @@ void EnGirlA_InitialUpdate(EnGirlA* this, PlayState* play) { ShopItemEntry* shopItem = &sShopItemEntries[params]; if (Object_IsLoaded(&play->objectCtx, this->objectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->objectSlot; this->actor.textId = shopItem->descriptionTextId; this->choiceTextId = shopItem->choiceTextId; 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 8841d6f43c..17924a1fd7 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -1096,7 +1096,7 @@ void EnGk_Init(Actor* thisx, PlayState* play) { if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_CALMED_GORON_ELDERS_SON)) { this->actionFunc = func_80B51FD0; this->actor.draw = NULL; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; } else { Actor_Kill(&this->actor); @@ -1104,7 +1104,7 @@ void EnGk_Init(Actor* thisx, PlayState* play) { } else if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_CALMED_GORON_ELDERS_SON)) { this->animIndex = ENGK_ANIM_0; this->csId = this->actor.csId; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_UPDATE_DURING_OCARINA; Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, ENGK_ANIM_0); this->actionFunc = func_80B5202C; 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 31602903a5..7dcd1593a6 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -8,7 +8,7 @@ #include "attributes.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGm_Init(Actor* thisx, PlayState* play); void EnGm_Destroy(Actor* thisx, PlayState* play); 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 17306816e0..ea68331527 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -21,7 +21,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) #define ENGO_STANDING_Y_OFFSET 0.0f // Actor shape offset in use when a Goron is in any standing state. #define ENGO_ROLLEDUP_Y_OFFSET 14.0f // Actor shape offset in use when a Goron is "rolled up". @@ -2651,7 +2653,7 @@ void EnGo_Snowball(EnGo* this, PlayState* play) { if ((this->actionFlags & ENGO_FLAG_HIT_BY_OTHER) && (this->actor.colChkInfo.damageEffect == ENGO_DMGEFF_BREAK)) { // Stop the Gatekeeper when hit by an appropriate effect Actor_PlaySfx(&this->actor, NA_SE_EV_SNOWBALL_BROKEN); - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_UPDATE_DURING_OCARINA; EnGo_InitSnow(this->effectTable, this->actor.world.pos); this->actor.shape.rot.x = 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 6e8acce37b..a3cddbd2b2 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -9,7 +9,7 @@ #include "assets/objects/object_goroiwa/object_goroiwa.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_MINIMAP_ICON_ENABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_MINIMAP_ICON_ENABLED) void EnGoroiwa_Init(Actor* thisx, PlayState* play); void EnGoroiwa_Destroy(Actor* thisx, PlayState* play); @@ -105,9 +105,11 @@ static Vec3f D_80942E60 = { 0.0f, 1.0f, 0.0f }; static Vec3f D_80942E6C = { 0.0f, 0.0f, 1.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -900, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -26000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 160, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 350, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -900, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(terminalVelocity, -26000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 160, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 350, ICHAIN_STOP), }; static UNK_TYPE D_80942E8C[] = { @@ -473,7 +475,7 @@ s32 func_8093F6F8(EnGoroiwa* this, PlayState* play) { temp_f2 = temp_f14 - this->actor.world.pos.y; if (fabsf(temp_f2) < (fabsf(this->actor.velocity.y) + 0.01f)) { - if (this->actor.flags & ACTOR_FLAG_40) { + if (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { sp48.x = this->actor.world.pos.x; sp48.y = temp_f14 + 10.0f; sp48.z = this->actor.world.pos.z; @@ -505,7 +507,7 @@ s32 func_8093F6F8(EnGoroiwa* this, PlayState* play) { if ((this->actor.world.pos.y + this->unk_1DC) <= sp40) { this->unk_1E5 |= 0x20; if (sp40 < (this->unk_1DC + sp78)) { - if (this->actor.flags & ACTOR_FLAG_40) { + if (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { Vec3f sp34; sp34.x = this->actor.world.pos.x; @@ -665,7 +667,7 @@ void func_80940090(EnGoroiwa* this, PlayState* play) { f32 temp_f20; s32 i; - if (!(this->actor.flags & ACTOR_FLAG_40)) { + if (!(this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { return; } @@ -892,7 +894,7 @@ void func_80940E38(EnGoroiwa* this, PlayState* play) { s16 sp46; s16 temp_a0; - if (this->actor.flags & ACTOR_FLAG_40) { + if (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { if (this->actor.xzDistToPlayer < 1000.0f) { sp5C = (1000.0f - this->actor.xzDistToPlayer) * 0.0012f * (this->actor.speed * 0.1f); if (Rand_ZeroOne() < sp5C) { @@ -1451,7 +1453,7 @@ void EnGoroiwa_Update(Actor* thisx, PlayState* play) { func_8093E91C(this); sp5C = true; - if (this->actor.flags & ACTOR_FLAG_40) { + if (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { tmp = this->actor.floorPoly; if (tmp != NULL) { floorType = SurfaceType_GetFloorType(&play->colCtx, tmp, this->actor.floorBgId); @@ -1515,7 +1517,7 @@ void EnGoroiwa_Update(Actor* thisx, PlayState* play) { func_8093FAA4(this, play); - if (this->actor.flags & ACTOR_FLAG_40) { + if (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { s32 params = ENGOROIWA_GET_C000(&this->actor); func_8093E938(this); 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 42df10a667..c2840cc08e 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGrasshopper_Init(Actor* thisx, PlayState* play); void EnGrasshopper_Destroy(Actor* thisx, PlayState* play); @@ -834,7 +834,7 @@ void EnGrasshopper_Dead(EnGrasshopper* this, PlayState* play) { } if (curFrame >= this->animEndFrame) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnGrasshopper_SetupFall(this); } } 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 26fa71b07d..7398df4871 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -12,7 +12,9 @@ #include "assets/objects/object_gs/object_gs.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnGs_Init(Actor* thisx, PlayState* play); void EnGs_Destroy(Actor* thisx, PlayState* play); @@ -853,7 +855,7 @@ s32 func_809995A4(EnGs* this, PlayState* play) { if (this->unk_1D4++ >= 40) { this->unk_19A |= 0x10; - this->actor.uncullZoneForward = 12000.0f; + this->actor.cullingVolumeDistance = 12000.0f; this->actor.gravity = 0.3f; this->unk_1DC = 0.0f; @@ -1046,7 +1048,8 @@ void EnGs_Update(Actor* thisx, PlayState* play) { s16 screenPosX; s16 screenPosY; - if ((this->actor.flags & ACTOR_FLAG_40) || (this->unk_19A & 0x100) || (this->unk_19A & 0x200)) { + if ((this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) || (this->unk_19A & 0x100) || + (this->unk_19A & 0x200)) { func_80999BC8(&this->actor, play); Actor_GetScreenPos(play, &this->actor, &screenPosX, &screenPosY); if ((this->actor.xyzDistToPlayerSq > SQ(400.0f)) || (screenPosX < 0) || (screenPosX > SCREEN_WIDTH) || 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 21ee7918a2..006bc12a15 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -6,7 +6,7 @@ #include "z_en_guruguru.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGuruguru_Init(Actor* thisx, PlayState* play); void EnGuruguru_Destroy(Actor* thisx, PlayState* play); 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 774f9392dd..e93f9eda48 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -28,7 +28,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_boss_hakugin/object_boss_hakugin.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnHakurock_Init(Actor* thisx, PlayState* play); void EnHakurock_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c index 0b8ec7386c..2133b9a870 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -7,7 +7,7 @@ #include "z_en_hanabi.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnHanabi_Init(Actor* thisx, PlayState* play2); void EnHanabi_Destroy(Actor* thisx, PlayState* play2); diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index f76d91b73c..57bcbe8cc5 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -38,9 +38,9 @@ void EnHata_Init(Actor* thisx, PlayState* play) { this->skelAnime.curFrame = rand; DynaPolyActor_LoadMesh(play, &this->dyna, &gFlagpoleCol); Actor_SetScale(&this->dyna.actor, 0.013f); - this->dyna.actor.uncullZoneScale = 500.0f; - this->dyna.actor.uncullZoneDownward = 500.0f; - this->dyna.actor.uncullZoneForward = 2200.0f; + this->dyna.actor.cullingVolumeScale = 500.0f; + this->dyna.actor.cullingVolumeDownward = 500.0f; + this->dyna.actor.cullingVolumeDistance = 2200.0f; } void EnHata_Destroy(Actor* thisx, PlayState* play) { 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 bc78135aa5..8890305c89 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -6,8 +6,8 @@ #include "z_en_hg.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_100000 | \ +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_100000 | \ ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnHg_Init(Actor* thisx, PlayState* play); 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 cdc0aa0f3f..9352c9d7b0 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -6,7 +6,9 @@ #include "z_en_hgo.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnHgo_Init(Actor* thisx, PlayState* play); void EnHgo_Destroy(Actor* thisx, PlayState* play); 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 8c9b56737d..28c02d66f9 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 @@ -258,7 +258,7 @@ void func_80BDB59C(EnHiddenNuts* this, PlayState* play) { } void func_80BDB788(EnHiddenNuts* this) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_LOCK_ON_DISABLED; Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_UP); Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DEAD); 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 27e6d6ad30..64f8da1acd 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 @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Part/z_en_part.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnHintSkb_Init(Actor* thisx, PlayState* play); void EnHintSkb_Destroy(Actor* thisx, PlayState* play); 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 3c2be43276..d0ed117f0c 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 @@ -6,7 +6,7 @@ #include "z_en_hit_tag.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnHitTag_Init(Actor* thisx, PlayState* play); void EnHitTag_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 8e1cf9a3b0..fdb05fb642 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -39,7 +39,7 @@ #include "z_en_holl.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnHoll_Init(Actor* thisx, PlayState* play); void EnHoll_Destroy(Actor* thisx, PlayState* play); @@ -76,9 +76,9 @@ static EnHollActionFunc sActionFuncs[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; //! Visible Halls: Being inside this plane enables the execution of more code within the actionFunc. 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 af4de3998d..520ba3e379 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define HONOTRAP_AT_ACTIVE (1 << 0) #define HONOTRAP_AC_ACTIVE (1 << 1) @@ -146,9 +146,9 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 0, 9, 23, 1 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; void EnHonotrap_FlameCollisionCheck(EnHonotrap* this, PlayState* play) { @@ -276,8 +276,8 @@ void EnHonotrap_Init(Actor* thisx, PlayState* play) { EnHonotrap_InitFlameGroup(this, play); this->actor.update = EnHonotrap_UpdateFlameGroup; this->actor.draw = EnHonotrap_DrawFlameGroup; - this->actor.uncullZoneScale = 500.0f; - this->actor.uncullZoneDownward = 500.0f; + this->actor.cullingVolumeScale = 500.0f; + this->actor.cullingVolumeDownward = 500.0f; } else { // HONOTRAP_TYPE_FLAME_MOVE, HONOTRAP_TYPE_FLAME_DROP EnHonotrap_InitFlame(this, play); this->actor.update = EnHonotrap_UpdateFlame; 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 bfe670c809..31c0af338b 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -13,7 +13,7 @@ #include "overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h" #include "assets/objects/object_horse_link_child/object_horse_link_child.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnHorse_Init(Actor* thisx, PlayState* play2); void EnHorse_Destroy(Actor* thisx, PlayState* play); @@ -247,8 +247,8 @@ static s32 sAnimSoundFrames[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; static u8 sResetNoInput[] = { @@ -549,15 +549,16 @@ void func_8087C288(PlayState* play, Vec3f* arg1, Vec3f* arg2, f32* arg3) { bool func_8087C2B8(PlayState* play, EnHorse* this, Vec3f* arg2, f32 arg3) { f32 phi_f14; - if ((arg2->z > 0.0f) && (arg2->z < (this->actor.uncullZoneForward + this->actor.uncullZoneScale))) { + if ((arg2->z > 0.0f) && (arg2->z < (this->actor.cullingVolumeDistance + this->actor.cullingVolumeScale))) { if (arg3 < 1.0f) { phi_f14 = 1.0f; } else { phi_f14 = 1.0f / arg3; } - if (((fabsf(arg2->x) * phi_f14) < 1.0f) && (((arg2->y + this->actor.uncullZoneDownward) * phi_f14) > -1.0f) && - (((arg2->y - this->actor.uncullZoneScale) * phi_f14) < 1.0f)) { + if (((fabsf(arg2->x) * phi_f14) < 1.0f) && + (((arg2->y + this->actor.cullingVolumeDownward) * phi_f14) > -1.0f) && + (((arg2->y - this->actor.cullingVolumeScale) * phi_f14) < 1.0f)) { return true; } } diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index bfd47d646c..c77f475bd0 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -9,7 +9,7 @@ #include "assets/objects/object_horse_game_check/object_horse_game_check.h" #include "libu64/debug.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnHorseGameCheck_Init(Actor* thisx, PlayState* play); void EnHorseGameCheck_Destroy(Actor* thisx, PlayState* play); @@ -393,8 +393,8 @@ s32 func_808F9868(EnHorseGameCheck* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 2400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 2400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; s32 func_808F987C(EnHorseGameCheck* this, PlayState* play) { 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 c61edc8598..9b2c3645da 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 @@ -9,7 +9,7 @@ #include "z64horse.h" #include "assets/objects/object_horse_link_child/object_horse_link_child.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnHorseLinkChild_Init(Actor* thisx, PlayState* play); void EnHorseLinkChild_Destroy(Actor* thisx, PlayState* play); @@ -98,7 +98,7 @@ static f32 sAnimPlaySpeeds[OOT_CHILD_EPONA_ANIM_MAX] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_STOP), }; typedef enum { 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 6c4a75c57f..4624427e3a 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -6,7 +6,7 @@ #include "z_en_hs.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnHs_Init(Actor* thisx, PlayState* play); void EnHs_Destroy(Actor* thisx, PlayState* play); 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 d3b524b0c0..d80329ea10 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -8,7 +8,7 @@ #include "attributes.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnIg_Init(Actor* thisx, PlayState* play); void EnIg_Destroy(Actor* thisx, PlayState* play); 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 f9da2f7fd8..8c6a8432db 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -8,7 +8,7 @@ #include "z64horse.h" #include "overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnIn_Init(Actor* thisx, PlayState* play); void EnIn_Destroy(Actor* thisx, PlayState* play); @@ -1481,8 +1481,8 @@ void func_808F5C98(EnIn* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; void EnIn_Init(Actor* thisx, PlayState* play) { 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 213da30d6a..ddbcd54d09 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -72,9 +72,9 @@ u16 D_8091BDB8[] = { 0, 5 }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 20, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 30, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 20, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 30, ICHAIN_STOP), }; Vec3f D_8091BDCC = { 0.0f, 0.0f, 0.0f }; @@ -149,7 +149,7 @@ void EnInsect_Init(Actor* thisx, PlayState* play) { if (this->unk_30C & 4) { this->unk_314 = Rand_S16Offset(200, 40); - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } rand = Rand_ZeroOne(); 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 25a8f560a7..8f9ee02f9d 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -37,7 +37,7 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define ALIEN_COUNT 8 #define EFFECT_COUNT 10 @@ -1945,7 +1945,7 @@ void EnInvadepoh_InvasionHandler_Init(EnInvadepoh* this, PlayState* play) { s32 alienCount; s32 pathIndex; - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; pathIndex = EN_INVADEPOH_GET_PATH(&this->actor); for (alienCount = 1; alienCount < ALIEN_COUNT; alienCount++) { @@ -1987,9 +1987,9 @@ void EnInvadepoh_InvasionHandler_Init(EnInvadepoh* this, PlayState* play) { } static InitChainEntry sAlienInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 600, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; @@ -2000,7 +2000,7 @@ void EnInvadepoh_Alien_Init(EnInvadepoh* this, PlayState* play) { Collider_InitCylinder(play, &this->collider); ActorShape_Init(&this->actor.shape, 6800.0f, ActorShadow_DrawWhiteCircle, 150.0f); this->actor.shape.shadowAlpha = 140; - this->actor.flags = ACTOR_FLAG_10 | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_MINIMAP_ICON_ENABLED; + this->actor.flags = ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_MINIMAP_ICON_ENABLED; if (EN_INVADEPOH_GET_TYPE(&this->actor) == EN_INVADEPOH_TYPE_ALIEN_ABDUCTOR) { this->actor.update = EnInvadepoh_AlienAbductor_WaitForObject; @@ -2018,9 +2018,9 @@ void EnInvadepoh_Alien_Init(EnInvadepoh* this, PlayState* play) { } static InitChainEntry sCowInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; @@ -2037,9 +2037,9 @@ void EnInvadepoh_Cow_Init(EnInvadepoh* this, PlayState* play) { } static InitChainEntry sCowTailInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; @@ -2054,8 +2054,10 @@ void EnInvadepoh_CowTail_Init(EnInvadepoh* this, PlayState* play) { } static InitChainEntry sRomaniInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_CONTINUE), + ICHAIN_F32(lockOnArrowOffset, 1500, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; @@ -2084,7 +2086,7 @@ void EnInvadepoh_Romani_Init(EnInvadepoh* this, PlayState* play) { this->actor.update = EnInvadepoh_AbductedRomani_WaitForObject; } else if (type == EN_INVADEPOH_TYPE_ROMANI_SILENT) { this->actor.update = EnInvadepoh_SilentRomani_WaitForObject; - this->actor.flags = ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10; + this->actor.flags = ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else if (type == EN_INVADEPOH_TYPE_ROMANI_NIGHT_1) { this->actor.update = EnInvadepoh_Night1Romani_WaitForObject; } else if (type == EN_INVADEPOH_TYPE_ROMANI_BARN) { @@ -2124,9 +2126,9 @@ void EnInvadepoh_Romani_Init(EnInvadepoh* this, PlayState* play) { } static InitChainEntry sUfoInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3S(shape, 0, ICHAIN_CONTINUE), - ICHAIN_F32(terminalVelocity, -100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3S(shape, 0, ICHAIN_CONTINUE), + ICHAIN_F32(terminalVelocity, -100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; void EnInvadepoh_Ufo_Init(EnInvadepoh* this, PlayState* play) { @@ -2149,9 +2151,9 @@ void EnInvadepoh_Ufo_Init(EnInvadepoh* this, PlayState* play) { } static InitChainEntry sDogInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 50, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 50, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 50, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 50, ICHAIN_CONTINUE), ICHAIN_F32(gravity, -3, ICHAIN_CONTINUE), ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_4, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 7, ICHAIN_STOP), @@ -2174,9 +2176,9 @@ void EnInvadepoh_Dog_Init(EnInvadepoh* this, PlayState* play) { } static InitChainEntry sCremiaInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 150, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 150, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 1500, ICHAIN_CONTINUE), ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_3, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), @@ -3127,7 +3129,7 @@ void EnInvadepoh_SilentRomani_Walk(EnInvadepoh* this, PlayState* play) { EnInvadepoh_Romani_StepYawAlongPath(this, 6, this->shapeAngularVelocityY, 0x46); - if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40) && + if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 7.0f))) { Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } @@ -3312,7 +3314,7 @@ void EnInvadepoh_SilentRomani_WaitForObject(Actor* thisx, PlayState* play2) { void EnInvadepoh_SilentRomani_Update(Actor* thisx, PlayState* play2) { PlayState* play = play2; EnInvadepoh* this = (EnInvadepoh*)thisx; - s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40); + s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME); s32 talkAccepted = Actor_TalkOfferAccepted(&this->actor, &play->state); if (talkAccepted) { @@ -3657,7 +3659,7 @@ void EnInvadepoh_Night1Romani_Walk(EnInvadepoh* this, PlayState* play) { this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY); } - if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40) && + if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 7.0f))) { Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } @@ -3767,7 +3769,7 @@ void EnInvadepoh_Night1Romani_WaitForTime(Actor* thisx, PlayState* play2) { void EnInvadepoh_Night1Romani_Update(Actor* thisx, PlayState* play2) { PlayState* play = play2; EnInvadepoh* this = (EnInvadepoh*)thisx; - s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40); + s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME); s32 talkAccepted = Actor_TalkOfferAccepted(&this->actor, &play->state); if (talkAccepted) { @@ -3918,7 +3920,7 @@ void EnInvadepoh_BarnRomani_Walk(EnInvadepoh* this, PlayState* play) { this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY); } - if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40) && + if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 7.0f))) { Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } @@ -4031,7 +4033,7 @@ void EnInvadepoh_BarnRomani_WaitForTime(Actor* thisx, PlayState* play2) { void EnInvadepoh_BarnRomani_Update(Actor* thisx, PlayState* play2) { PlayState* play = play2; EnInvadepoh* this = (EnInvadepoh*)thisx; - s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40); + s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME); s32 talkAccepted = Actor_TalkOfferAccepted(&this->actor, &play->state); if (talkAccepted) { @@ -4206,7 +4208,7 @@ void EnInvadepoh_RewardRomani_Update(Actor* thisx, PlayState* play2) { PlayState* play = play2; EnInvadepoh* this = (EnInvadepoh*)thisx; EnInvadepohModelInfo* modelInfo = &this->modelInfo; - s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40); + s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME); this->actionFunc(this, play); @@ -4421,7 +4423,7 @@ void EnInvadepoh_Dog_WaitForInvasion(Actor* thisx, PlayState* play2) { void EnInvadepoh_Dog_Update(Actor* thisx, PlayState* play2) { PlayState* play = play2; EnInvadepoh* this = (EnInvadepoh*)thisx; - s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40); + s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME); sClosestAlienThreat = EnInvadepoh_Dog_GetClosestAlienThreat(); if (sClosestAlienThreat == NULL) { @@ -4567,7 +4569,7 @@ void EnInvadepoh_Night3Cremia_Walk(EnInvadepoh* this, PlayState* play) { } } - if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40) && + if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 12.0f))) { Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } @@ -4703,7 +4705,7 @@ void EnInvadepoh_Night3Cremia_WaitForTime(Actor* thisx, PlayState* play2) { void EnInvadepoh_Night3Cremia_Update(Actor* thisx, PlayState* play2) { PlayState* play = play2; EnInvadepoh* this = (EnInvadepoh*)thisx; - s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40); + s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME); s32 talkAccepted = Actor_TalkOfferAccepted(&this->actor, &play->state); if (talkAccepted) { @@ -4801,7 +4803,7 @@ void EnInvadepoh_Night3Romani_Walk(EnInvadepoh* this, PlayState* play) { modelInfo->headRotTarget.y = CLAMP((s16)(yaw * 0.7f), -0x1F40, 0x1F40); } - if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40) && + if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (Animation_OnFrame(&this->skelAnime, 0.0f) || Animation_OnFrame(&this->skelAnime, 7.0f))) { Actor_PlaySfx(&this->actor, NA_SE_EN_ROMANI_WALK); } @@ -4932,7 +4934,7 @@ void EnInvadepoh_Night3Romani_WaitForTime(Actor* thisx, PlayState* play2) { void EnInvadepoh_Night3Romani_Update(Actor* thisx, PlayState* play2) { PlayState* play = play2; EnInvadepoh* this = (EnInvadepoh*)thisx; - s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_40); + s32 inUncullRange = CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_INSIDE_CULLING_VOLUME); s32 talkAccepted = Actor_TalkOfferAccepted(&this->actor, &play->state); if (talkAccepted) { diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c index 9a3bb2280d..7d1e4e7a8c 100644 --- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c @@ -19,7 +19,7 @@ #include "sys_cfb.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnInvadepohDemo_Init(Actor* thisx, PlayState* play); void EnInvadepohDemo_Destroy(Actor* thisx, PlayState* play); @@ -113,37 +113,39 @@ static s32 sCueTypes[EN_INVADEPOH_DEMO_TYPE_MAX] = { }; static InitChainEntry sAlienInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 600, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 6000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 600, ICHAIN_CONTINUE), + ICHAIN_F32(lockOnArrowOffset, 6000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; static InitChainEntry sRomaniInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 1500, ICHAIN_CONTINUE), ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_6, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; static InitChainEntry sCowInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; static InitChainEntry sUfoInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3S(shape.rot, 0, ICHAIN_CONTINUE), - ICHAIN_F32(terminalVelocity, -100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3S(shape.rot, 0, ICHAIN_CONTINUE), + ICHAIN_F32(terminalVelocity, -100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 800, ICHAIN_STOP), }; static InitChainEntry sCowTailInitChain[] = { - ICHAIN_F32(uncullZoneForward, 20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; @@ -210,7 +212,7 @@ void EnInvadepohDemo_DoNothing(EnInvadepohDemo* this, PlayState* play) { void EnInvadepohDemo_Alien_Init(EnInvadepohDemo* this, PlayState* play) { Actor_ProcessInitChain(&this->actor, sAlienInitChain); - this->actor.flags = ACTOR_FLAG_10 | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_MINIMAP_ICON_ENABLED; + this->actor.flags = ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_MINIMAP_ICON_ENABLED; this->objectSlot = Object_GetSlot(&play->objectCtx, OBJECT_UCH); if (this->objectSlot <= OBJECT_SLOT_NONE) { Actor_Kill(&this->actor); 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 a2e43d39f1..1001b2d8cb 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -12,7 +12,7 @@ #include "assets/objects/object_ishi/object_ishi.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void EnIshi_Init(Actor* thisx, PlayState* play); void EnIshi_Destroy(Actor* thisx, PlayState* play2); @@ -126,16 +126,16 @@ static InitChainEntry sInitChain[][5] = { { ICHAIN_F32_DIV1000(gravity, -1200, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }, { ICHAIN_F32_DIV1000(gravity, -2500, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 250, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }, }; @@ -387,7 +387,7 @@ void EnIshi_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain[sp34]); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1000.0f; + this->actor.cullingVolumeDistance += 1000.0f; } if ((this->actor.shape.rot.y == 0) && !(this->unk_197 & 2)) { @@ -446,7 +446,7 @@ void func_8095E5AC(EnIshi* this) { void func_8095E5C0(EnIshi* this, PlayState* play) { if (Object_IsLoaded(&play->objectCtx, this->objectSlot)) { this->actor.objectSlot = this->objectSlot; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (!ENISHI_GET_8(&this->actor)) { this->actor.draw = func_8095F61C; } else { @@ -524,7 +524,7 @@ void func_8095E660(EnIshi* this, PlayState* play) { void func_8095E934(EnIshi* this) { this->actionFunc = func_8095E95C; this->actor.room = -1; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void func_8095E95C(EnIshi* this, PlayState* play) { @@ -659,7 +659,7 @@ void func_8095EBDC(EnIshi* this, PlayState* play) { } void func_8095F060(EnIshi* this) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; CutsceneManager_Queue(this->actor.csId); this->actionFunc = func_8095F0A4; } 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 11600cc3e7..eb0ec6518c 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.c +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -6,7 +6,7 @@ #include "z_en_ja.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnJa_Init(Actor* thisx, PlayState* play); void EnJa_Destroy(Actor* thisx, PlayState* play); @@ -428,7 +428,7 @@ void EnJa_Init(Actor* thisx, PlayState* play) { CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(0x16), &sColChkInfoInit); Actor_SetScale(&this->actor, 0.01f); this->actor.attentionRangeType = ATTENTION_RANGE_0; - this->actor.uncullZoneForward = 800.0f; + this->actor.cullingVolumeDistance = 800.0f; this->actor.gravity = 0.0f; SubS_SetOfferMode(&this->unk_340, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK); this->unk_340 |= 0x10; 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 cb5911cfad..807ab51967 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 @@ -7,7 +7,7 @@ #include "z_en_jc_mato.h" #include "assets/objects/object_tru/object_tru.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) void EnJcMato_Init(Actor* thisx, PlayState* play); void EnJcMato_Destroy(Actor* thisx, PlayState* play); 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 9ff867dd24..fcc845723f 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_S_Goro/z_en_s_goro.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define FLAG_SHRINE_GORON_ARMS_RAISED (1 << 0) #define FLAG_LOOKING_AT_PLAYER (1 << 2) 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 d61e948eef..e5895d742d 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 @@ -7,7 +7,9 @@ #include "z_en_jgame_tsn.h" #include "overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnJgameTsn_Init(Actor* thisx, PlayState* play); void EnJgameTsn_Destroy(Actor* thisx, PlayState* play); 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 adf516d216..1b00baac5b 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -6,7 +6,7 @@ #include "z_en_js.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnJs_Init(Actor* thisx, PlayState* play); void EnJs_Destroy(Actor* thisx, PlayState* play); 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 3460bf9037..3cbd1ca3ae 100644 --- a/src/overlays/actors/ovl_En_Jso/z_en_jso.c +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Encount3/z_en_encount3.h" #include "overlays/actors/ovl_En_Part/z_en_part.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnJso_Init(Actor* thisx, PlayState* play); void EnJso_Destroy(Actor* thisx, PlayState* 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 1951627689..0d3772311c 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -12,9 +12,9 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_En_Col_Man/z_en_col_man.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_100000 | \ - ACTOR_FLAG_MINIMAP_ICON_ENABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_100000 | ACTOR_FLAG_MINIMAP_ICON_ENABLED) void EnJso2_Init(Actor* thisx, PlayState* play); void EnJso2_Destroy(Actor* thisx, PlayState* play); 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 adb9513259..e511770439 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -9,7 +9,8 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_100000) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_100000) void EnKaizoku_Init(Actor* thisx, PlayState* play); void EnKaizoku_Destroy(Actor* thisx, PlayState* play); 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 9b11963977..1bc073417b 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -11,7 +11,9 @@ #include "assets/objects/object_ka/object_ka.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnKakasi_Init(Actor* thisx, PlayState* play); void EnKakasi_Destroy(Actor* thisx, PlayState* play); 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 2a1f614c90..cd043ffd9f 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -392,7 +392,7 @@ void EnKame_SetupPrepareToAttack(EnKame* this) { this->timer = 0; } - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnKame_PrepareToAttack; } @@ -484,7 +484,7 @@ void EnKame_Attack(EnKame* this, PlayState* play) { this->spikesScale -= 0.1f; this->collider.base.atFlags &= ~AT_ON; if (this->spikesScale < 0.5f) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnKame_SetupEmergeFromShell(this); } } else { @@ -540,7 +540,7 @@ void EnKame_SetupFlip(EnKame* this) { this->collider.base.acFlags &= ~AC_ON; this->collider.base.atFlags &= ~AT_ON; this->collider.base.atFlags &= ~(AT_BOUNCED | AT_HIT); - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.shape.rot.z = 0; Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_REVERSE); this->actionFunc = EnKame_Flip; @@ -687,7 +687,7 @@ void EnKame_SetupDead(EnKame* this, PlayState* play) { this->actor.bgCheckFlags &= ~BGCHECKFLAG_GROUND; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_PlaySfx(&this->actor, NA_SE_EN_PAMET_DEAD); this->timer = 0; this->actionFunc = EnKame_Dead; 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 932020f57f..e98a62675d 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -9,7 +9,7 @@ #include "assets/objects/object_kanban/object_kanban.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnKanban_Init(Actor* thisx, PlayState* play); void EnKanban_Destroy(Actor* thisx, PlayState* play); 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 d0cb11c0af..0a4d36905b 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -385,7 +385,7 @@ void EnKarebaba_SetupDying(EnKarebaba* this) { } Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_JR_DEAD); - this->actor.flags |= (ACTOR_FLAG_10 | ACTOR_FLAG_20); + this->actor.flags |= (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); this->actionFunc = EnKarebaba_Dying; } @@ -449,7 +449,7 @@ void EnKarebaba_Dying(EnKarebaba* this, PlayState* play) { void EnKarebaba_SetupShrinkDie(EnKarebaba* this) { Actor_PlaySfx(&this->actor, NA_SE_EN_DEKU_JR_DEAD); - this->actor.flags |= (ACTOR_FLAG_10 | ACTOR_FLAG_20); + this->actor.flags |= (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; if (this->drawDmgEffType == ACTOR_DRAW_DMGEFF_FROZEN_NO_SFX) { this->timer = 3; @@ -485,7 +485,7 @@ void EnKarebaba_SetupDeadItemDrop(EnKarebaba* this, PlayState* play) { this->actor.shape.shadowScale = 3.0f; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_MISC); this->timer = 200; - this->actor.flags &= ~ACTOR_FLAG_20; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->drawDmgEffAlpha = 0.0f; this->actionFunc = EnKarebaba_DeadItemDrop; } @@ -548,7 +548,7 @@ void EnKarebaba_Regrow(EnKarebaba* this, PlayState* play) { this->actor.world.pos.y = this->actor.home.pos.y + (14.0f * scale); if (this->timer == 20) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE); if (this->actor.params == ENKAREBABA_1) { Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY); 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 cbc2e13d74..53c3b823fe 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 @@ -7,9 +7,9 @@ #include "z_en_kendo_js.h" #include "overlays/actors/ovl_En_Maruta/z_en_maruta.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA | \ - ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) void EnKendoJs_Init(Actor* thisx, PlayState* play); void EnKendoJs_Destroy(Actor* thisx, PlayState* play); 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 3d530d55af..14715da6cb 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.c +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -13,7 +13,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_knight/object_knight.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnKnight_Init(Actor* thisx, PlayState* play); void EnKnight_Destroy(Actor* thisx, PlayState* play); 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 eb0aa91b74..003fbc751a 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -10,7 +10,7 @@ #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void EnKusa_Init(Actor* thisx, PlayState* play); void EnKusa_Destroy(Actor* thisx, PlayState* play); @@ -105,9 +105,9 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 400, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -3200, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -17000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_STOP), }; /** @@ -365,7 +365,7 @@ void EnKusa_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1000.0f; + this->actor.cullingVolumeDistance += 1000.0f; } EnKusa_InitCollider(&this->actor, play); CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit); @@ -440,13 +440,13 @@ void EnKusa_WaitObject(EnKusa* this, PlayState* play) { this->actor.draw = EnKusa_DrawGrass; } this->actor.objectSlot = this->objectSlot; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } void EnKusa_SetupInteract(EnKusa* this) { this->actionFunc = EnKusa_WaitForInteract; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void EnKusa_WaitForInteract(EnKusa* this, PlayState* play) { @@ -499,7 +499,7 @@ void EnKusa_WaitForInteract(EnKusa* this, PlayState* play) { void EnKusa_SetupLiftedUp(EnKusa* this) { this->actionFunc = EnKusa_LiftedUp; this->actor.room = -1; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } void EnKusa_LiftedUp(EnKusa* this, PlayState* play) { 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 a545077cc2..ce84c9055f 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void EnKusa2_Init(Actor* thisx, PlayState* play); void EnKusa2_Destroy(Actor* thisx, PlayState* play); @@ -282,7 +282,7 @@ void func_80A5BB40(EnKusa2* this, PlayState* play, s32 arg2) { f32 temp_f24; s16 temp_s0; - if (this->actor.flags & ACTOR_FLAG_40) { + if (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { for (i = 0; i <= arg2; i++) { temp_s0 = Rand_S16Offset(-16000, 32000) + this->actor.world.rot.y; temp_f20 = Math_SinS(temp_s0); @@ -849,9 +849,9 @@ void func_80A5D178(EnKusa2* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -17000, ICHAIN_CONTINUE), - ICHAIN_VEC3F_DIV1000(scale, 400, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -17000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 400, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; void EnKusa2_Init(Actor* thisx, PlayState* play) { @@ -862,7 +862,7 @@ void EnKusa2_Init(Actor* thisx, PlayState* play) { if (!ENKUSA2_GET_1(&this->actor)) { this->actor.update = func_80A5E604; this->actor.draw = NULL; - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_BG); this->unk_1BE = 0; if (D_80A5EAEC) { 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 37ff9569c8..a7ec900328 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 @@ -7,7 +7,9 @@ #include "z_en_lift_nuts.h" #include "overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnLiftNuts_Init(Actor* thisx, PlayState* play); void EnLiftNuts_Destroy(Actor* thisx, PlayState* play); 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 920b2eac95..f85ac17604 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 @@ -366,7 +366,7 @@ void EnLookNuts_Update(Actor* thisx, PlayState* play) { Audio_PlaySfx(NA_SE_SY_FOUND); Player_SetCsActionWithHaltedActors(play, &this->actor, PLAYER_CSACTION_26); D_80A6862C = true; - this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_10); + this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED); this->actor.gravity = 0.0f; EnLookNuts_DetectedPlayer(this, play); } else { 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 7b80e00c84..fde4801647 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 @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_Eff_Dust/z_eff_dust.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMThunder_Init(Actor* thisx, PlayState* play); void EnMThunder_Destroy(Actor* thisx, PlayState* play); 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 d52878cfb5..13dca57091 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -6,9 +6,9 @@ #include "z_en_ma4.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnMa4_Init(Actor* thisx, PlayState* play); void EnMa4_Destroy(Actor* thisx, PlayState* play); 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 c1e3e881d7..cf7ac093dd 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 @@ -316,7 +316,7 @@ void EnMaYto_ChooseAction(EnMaYto* this, PlayState* play) { break; case MA_YTO_TYPE_4: - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnMaYto_SetupWarmFuzzyFeelingCs(this); break; 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 7f771cdd6a..8cfe2b33ce 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 @@ -406,7 +406,7 @@ void EnMaYts_DialogueHandler(EnMaYts* this, PlayState* play) { } void EnMaYts_SetupEndCreditsHandler(EnMaYts* this) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnMaYts_SetFaceExpression(this, 0, 0); this->actionFunc = EnMaYts_EndCreditsHandler; } diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index c39914f7e1..af122852d2 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -10,7 +10,7 @@ #include "assets/objects/object_mag/object_mag.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnMag_Init(Actor* thisx, PlayState* play); void EnMag_Destroy(Actor* thisx, PlayState* play); 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 0938538d14..5bcb593c37 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.h" #include "assets/objects/object_maruta/object_maruta.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMaruta_Init(Actor* thisx, PlayState* play); void EnMaruta_Destroy(Actor* thisx, PlayState* play); 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 855ae1f066..2376556919 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Death/z_en_death.h" #include "assets/objects/object_death/object_death.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMinideath_Init(Actor* thisx, PlayState* play); void EnMinideath_Destroy(Actor* thisx, PlayState* play); @@ -145,8 +145,8 @@ static DamageTable sDamageTable = { static CollisionCheckInfoInit sColChkInfoInit = { 1, 15, 30, 10 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; static s32 sItemDropTimer; 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 22e9827c10..81c31e9b16 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -7,7 +7,7 @@ #include "z_en_minifrog.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMinifrog_Init(Actor* thisx, PlayState* play); void EnMinifrog_Destroy(Actor* thisx, PlayState* play); 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 b42942b068..774ec803dd 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -7,9 +7,9 @@ #include "z_en_minislime.h" #include "overlays/actors/ovl_En_Bigslime/z_en_bigslime.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20 | \ - ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) void EnMinislime_Init(Actor* thisx, PlayState* play); void EnMinislime_Destroy(Actor* thisx, PlayState* play); 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 0ba110007d..a5940b3924 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -6,7 +6,7 @@ #include "z_en_mk.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMk_Init(Actor* thisx, PlayState* play); void EnMk_Destroy(Actor* thisx, PlayState* play); 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 18608ad144..baf1ebd968 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -310,7 +310,7 @@ void func_80A4E67C(EnMkk* this) { this->unk_14B |= 1; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->collider.base.acFlags &= ~AC_ON; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_PlaySfx(&this->actor, NA_SE_EN_PO_DEAD); this->alpha = 254; func_800BE568(&this->actor, &this->collider); @@ -452,12 +452,12 @@ void func_80A4EE48(EnMkk* this, PlayState* play) { if (this->unk_14E > 0) { this->unk_14E--; if (this->unk_14E == 0) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } else if ((this->actor.xzDistToPlayer < this->unk_178) && (Player_GetMask(play) != PLAYER_MASK_STONE)) { this->actor.update = EnMkk_Update; this->actor.draw = EnMkk_Draw; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_80A4E0CC(this); } } 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 db50045f63..87b581e06a 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -7,7 +7,7 @@ #include "z_en_mm.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMm_Init(Actor* thisx, PlayState* play); void EnMm_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 9c601d2727..b1b62ebc8e 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -6,7 +6,7 @@ #include "z_en_mm2.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMm2_Init(Actor* thisx, PlayState* play); void EnMm2_Destroy(Actor* thisx, PlayState* play); 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 ce51caed3d..f2821516a1 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -6,7 +6,7 @@ #include "z_en_mm3.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMm3_Init(Actor* thisx, PlayState* play); void EnMm3_Destroy(Actor* thisx, PlayState* play); 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 c4a26e9258..73db20c280 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c @@ -6,7 +6,7 @@ #include "z_en_mnk.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMnk_Init(Actor* thisx, PlayState* play); void EnMnk_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c index 8c892c43f4..c195622a4b 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -6,7 +6,7 @@ #include "z_en_mt_tag.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMttag_Init(Actor* thisx, PlayState* play); void EnMttag_Destroy(Actor* thisx, PlayState* play); 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 053ec5634e..8e59bfb550 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -7,7 +7,7 @@ #include "overlays/actors/ovl_Obj_Bean/z_obj_bean.h" #include "z_en_mushi2.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnMushi2_Init(Actor* thisx, PlayState* play); void EnMushi2_Destroy(Actor* thisx, PlayState* play); @@ -95,9 +95,9 @@ static MtxF D_80A6B9C4 = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 20, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 20, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 20, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 20, ICHAIN_STOP), }; f32 D_80A6BA14[] = { @@ -992,7 +992,7 @@ void func_80A6AB08(EnMushi2* this, PlayState* play) { Math_ScaledStepToS(&this->actor.world.rot.z, 0, 0xBB8); this->actor.shape.rot.z = this->actor.world.rot.z; - if ((this->actor.flags & ACTOR_FLAG_40) && (Rand_ZeroOne() < 0.03f)) { + if ((this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (Rand_ZeroOne() < 0.03f)) { Vec3f sp3C; sp3C.x = this->actor.world.pos.x; @@ -1034,7 +1034,7 @@ void func_80A6AE7C(EnMushi2* this, PlayState* play) { func_80A69424(this, play); temp_f2 = this->actor.scale.x - (1.0f / 20000.0f); Actor_SetScale(&this->actor, CLAMP_MIN(temp_f2, 0.001f)); - if ((this->actor.flags & ACTOR_FLAG_40) && (this->actor.depthInWater > 5.0f) && + if ((this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (this->actor.depthInWater > 5.0f) && (this->actor.depthInWater < 30.0f) && ((s32)(Rand_Next() & 0x1FF) < this->unk_368)) { EffectSsBubble_Spawn(play, &this->actor.world.pos, -5.0f, 5.0f, 5.0f, ((Rand_ZeroOne() * 4.0f) + 2.0f) * this->actor.scale.x); @@ -1083,7 +1083,7 @@ void func_80A6B0D8(EnMushi2* this, PlayState* play) { this->actor.velocity.z = (this->actor.speed * this->unk_328.z) + (-0.01f * this->unk_31C.z) + (this->unk_310.z * temp_f2); - if ((this->actor.flags & ACTOR_FLAG_40) && (this->unk_368 > 20) && (Rand_ZeroOne() < 0.15f)) { + if ((this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (this->unk_368 > 20) && (Rand_ZeroOne() < 0.15f)) { Vec3f sp48; s32 sp44 = 0; @@ -1197,7 +1197,7 @@ void EnMushi2_Update(Actor* thisx, PlayState* play) { SkelAnime_Update(&this->skelAnime); - if (this->actor.flags & ACTOR_FLAG_40) { + if (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { if ((this->actionFunc != func_80A6AE7C) && (this->actionFunc != func_80A6B0D8) && ((this->actionFunc != func_80A6A36C) || (this->unk_36A < 0xDD)) && (((this->actionFunc != func_80A6A5C0) && (this->actionFunc != func_80A6A824) && 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 2994158d81..aecdfbf552 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -284,7 +284,7 @@ void EnMuto_Update(Actor* thisx, PlayState* play2) { UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_4 | UPDBGCHECKINFO_FLAG_8 | UPDBGCHECKINFO_FLAG_10); - this->actor.uncullZoneForward = 500.0f; + this->actor.cullingVolumeDistance = 500.0f; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 73169c1da7..8a26e3c2db 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -8,7 +8,9 @@ #include "attributes.h" #include "assets/objects/object_nb/object_nb.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnNb_Init(Actor* thisx, PlayState* play); void EnNb_Destroy(Actor* thisx, PlayState* play); 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 7cf1d14e84..58c5a44da0 100644 --- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c @@ -7,7 +7,7 @@ #include "z_en_nimotsu.h" #include "assets/objects/object_boj/object_boj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnNimotsu_Init(Actor* thisx, PlayState* play); void EnNimotsu_Destroy(Actor* thisx, PlayState* play); 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 ba5fbf055c..c616125d17 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -7,7 +7,7 @@ #include "z_en_niw.h" #include "overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void EnNiw_Init(Actor* thisx, PlayState* play); void EnNiw_Destroy(Actor* thisx, PlayState* play); 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 3d3d82ffc6..a76d7dbe9f 100644 --- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c @@ -7,7 +7,7 @@ #include "z_en_nnh.h" #include "assets/objects/object_nnh/object_nnh.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnNnh_Init(Actor* thisx, PlayState* play); void EnNnh_Destroy(Actor* thisx, PlayState* play); 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 72912b9d7b..37bab5c9f7 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -8,7 +8,7 @@ #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnNutsball_Init(Actor* thisx, PlayState* play); void EnNutsball_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index 10aa228748..0a4e7c74e5 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -11,7 +11,7 @@ #include "overlays/actors/ovl_En_Niw/z_en_niw.h" #include "assets/objects/object_nwc/object_nwc.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnNwc_Init(Actor* thisx, PlayState* play); void EnNwc_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index 082a25fc50..b96a15d0c8 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -6,7 +6,7 @@ #include "z_en_okarina_effect.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnOkarinaEffect_Init(Actor* thisx, PlayState* play); void EnOkarinaEffect_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index c6f8d4f9d7..6fa4822ef6 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -6,7 +6,7 @@ #include "z_en_okarina_tag.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) void EnOkarinaTag_Init(Actor* thisx, PlayState* play); void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play); 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 130b08013b..9c7ad459e1 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -184,7 +184,7 @@ void EnOkuta_Init(Actor* thisx, PlayState* play2) { } else { ActorShape_Init(&thisx->shape, 1100.0f, ActorShadow_DrawCircle, 18.0f); thisx->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - thisx->flags |= ACTOR_FLAG_10; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Collider_InitAndSetCylinder(play, &this->collider, thisx, &sProjectileCylinderInit); Actor_ChangeCategory(play, &play->actorCtx, thisx, ACTORCAT_PROP); this->timer = 22; @@ -655,7 +655,7 @@ void EnOkuta_SetupFrozen(EnOkuta* this, PlayState* play) { if (this->actor.child != NULL) { this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.child->csId = this->actor.csId; this->actionFunc = EnOkuta_FrozenInIceBlock; } else { @@ -682,7 +682,7 @@ void EnOkuta_FrozenInIceBlock(EnOkuta* this, PlayState* play) { this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; if (Math_StepToF(&this->actor.world.pos.y, this->actor.home.pos.y, 10.0f)) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnOkuta_SetupFloat(this); } } 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 d61ad6e46b..3ac33885c7 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -7,7 +7,7 @@ #include "z_en_osn.h" #include "assets/objects/object_osn/object_osn.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnOsn_Init(Actor* thisx, PlayState* play); void EnOsn_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index be02974418..e0d844348d 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -7,7 +7,7 @@ #include "z_en_ossan.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define LOOKED_AT_PLAYER (1 << 0) #define END_INTERACTION (1 << 1) @@ -1507,7 +1507,7 @@ void EnOssan_InitShop(EnOssan* this, PlayState* play) { ShopItem* shopItems; if (Object_IsLoaded(&play->objectCtx, this->objectSlot)) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->objectSlot; Actor_SetObjectDependency(play, &this->actor); shopItems = sShops[this->actor.params]; 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 21d29b60fb..963aacef04 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -8,7 +8,7 @@ #include "attributes.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnOt_Init(Actor* thisx, PlayState* play); void EnOt_Destroy(Actor* thisx, PlayState* play); @@ -106,9 +106,9 @@ static AnimationSpeedInfo sAnimationSpeedInfo[SEAHORSE_ANIM_MAX] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 80, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 80, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 80, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 80, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; void func_80B5B2E0(PlayState* play, Vec3f* pos, s16 pathIndex, Vec3f* vec, s32* index) { @@ -974,7 +974,7 @@ void EnOt_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); if (this->actor.bgCheckFlags & BGCHECKFLAG_WATER) { if (DECR(this->unk_354) == 0) { - if (this->actor.flags & ACTOR_FLAG_40) { + if (this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { s32 i; for (i = 0; i < 2; i++) { 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 f74b37b962..2887aa3aa5 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -6,7 +6,7 @@ #include "z_en_owl.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnOwl_Init(Actor* thisx, PlayState* play); void EnOwl_Destroy(Actor* thisx, PlayState* play); @@ -79,9 +79,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 25, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2400, ICHAIN_STOP), }; void func_8095A510(EnOwl* this, PlayState* play) { @@ -447,7 +447,7 @@ void func_8095B254(EnOwl* this, PlayState* play) { if (this->actionFlags & 1) { EnOwl_ChangeMode(this, func_8095B1E4, func_8095C328, &this->skelAnimeFlying, &gOwlFlyAnim, 0.0f); this->unk_3EA = 6; - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; } func_8095B158(this); @@ -760,7 +760,7 @@ void func_8095BF58(EnOwl* this, PlayState* play) { } void func_8095BF78(EnOwl* this, PlayState* play) { - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; if (this->actor.xzDistToPlayer > 6000.0f) { Actor_Kill(&this->actor); } 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 fa8317698c..d715db8a14 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnPamera_Init(Actor* thisx, PlayState* play); void EnPamera_Destroy(Actor* thisx, PlayState* play); 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 79f7f77272..0b829c3ea4 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -11,7 +11,9 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnPametfrog_Init(Actor* thisx, PlayState* play); void EnPametfrog_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.c b/src/overlays/actors/ovl_En_Paper/z_en_paper.c index 2dbb70c72b..7732beecb7 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.c +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -13,7 +13,7 @@ #include "assets/objects/object_bal/object_bal.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_100000 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_100000 | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnPaper_Init(Actor* thisx, PlayState* play); void EnPaper_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 5c733b1da3..6ccce631e4 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -7,7 +7,7 @@ #include "z_en_part.h" #include "overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnPart_Init(Actor* thisx, PlayState* play); void EnPart_Destroy(Actor* thisx, PlayState* play); 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 5c61c5a3d5..001dd514f3 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnPeehat_Init(Actor* thisx, PlayState* play); void EnPeehat_Destroy(Actor* thisx, PlayState* play); @@ -166,9 +166,9 @@ static CollisionCheckInfoInit2 sColChkInfoInit1 = { 15, 50, 120, -20, MASS_HEAVY static CollisionCheckInfoInit2 sColChkInfoInit2 = { 1, 20, 15, -5, 30 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1800, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 700, ICHAIN_STOP), }; 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 2a87a61c78..64854dbb40 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -8,7 +8,9 @@ #include "attributes.h" #include "overlays/actors/ovl_En_Door/z_en_door.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnPm_Init(Actor* thisx, PlayState* play); void EnPm_Destroy(Actor* thisx, PlayState* play); 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 cb69c43558..6475e5b49d 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 @@ -6,8 +6,8 @@ #include "z_en_po_composer.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_100000 | \ +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_100000 | \ ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnPoComposer_Init(Actor* thisx, PlayState* play); 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 627a0b45f4..dcce260ba8 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 @@ -8,7 +8,9 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_En_Ma4/z_en_ma4.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_100000 | ACTOR_FLAG_MINIMAP_ICON_ENABLED) +#define FLAGS \ + (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_100000 | \ + ACTOR_FLAG_MINIMAP_ICON_ENABLED) void EnPoFusen_Init(Actor* thisx, PlayState* play); void EnPoFusen_Destroy(Actor* thisx, PlayState* play); 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 dcdaaa04e5..536cae676e 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 @@ -8,9 +8,9 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_IGNORE_QUAKE | \ - ACTOR_FLAG_CAN_ATTACH_TO_ARROW) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) void EnPoSisters_Init(Actor* thisx, PlayState* play); void EnPoSisters_Destroy(Actor* thisx, PlayState* play); 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 4b835bade3..cafa277b95 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -570,7 +570,7 @@ void func_80B2DC50(EnPoh* this, PlayState* play) { this->actor.world.pos.y = this->unk_3D8.yw; this->actor.world.pos.z = this->unk_3D8.zw; Actor_SetScale(&this->actor, 0.01f); - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.gravity = -1.0f; this->actor.shape.yOffset = 1500.0f; this->actor.world.pos.y -= 15.0f; 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 177fd16ab2..42688c2745 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_En_Prz/z_en_prz.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnPr_Init(Actor* thisx, PlayState* play2); void EnPr_Destroy(Actor* thisx, PlayState* play); 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 4aca2b7598..654ca783f0 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -7,7 +7,7 @@ #include "z_en_pr2.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnPr2_Init(Actor* thisx, PlayState* play); void EnPr2_Destroy(Actor* thisx, PlayState* play); 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 47e931237e..eedc72bc16 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -7,7 +7,7 @@ #include "z_en_prz.h" #include "overlays/actors/ovl_En_Pr/z_en_pr.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnPrz_Init(Actor* thisx, PlayState* play); void EnPrz_Destroy(Actor* thisx, PlayState* play); 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 971b258b78..221bb82583 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -12,7 +12,7 @@ #include "overlays/actors/ovl_En_Aob_01/z_en_aob_01.h" #include "overlays/actors/ovl_En_Dg/z_en_dg.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_MINIMAP_ICON_ENABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_MINIMAP_ICON_ENABLED) void EnRacedog_Init(Actor* thisx, PlayState* play); void EnRacedog_Destroy(Actor* thisx, PlayState* play); @@ -242,7 +242,7 @@ static AnimationInfoS sAnimationInfo[RACEDOG_ANIM_MAX] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_STOP), }; void EnRacedog_ChangeAnim(SkelAnime* skelAnime, AnimationInfoS* animationInfo, s32 animIndex) { @@ -355,8 +355,8 @@ void EnRacedog_Init(Actor* thisx, PlayState* play) { this->pointForCurrentTargetSpeed = -1; EnRacedog_UpdateTextId(this); - this->actor.flags |= ACTOR_FLAG_10; - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; sSelectedDogInfo = sDogInfo[(s16)GET_EVENTINF_DOG_RACE_SELECTED_DOG_INDEX]; this->selectedDogIndex = sSelectedDogInfo.index; 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 4baa5a9782..1810086b0d 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 @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Part/z_en_part.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnRailSkb_Init(Actor* thisx, PlayState* play); void EnRailSkb_Destroy(Actor* thisx, PlayState* play); 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 78c989be29..cdcd2253bb 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -8,7 +8,9 @@ #include "z64rumble.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnRailgibud_Init(Actor* thisx, PlayState* play); void EnRailgibud_Destroy(Actor* thisx, PlayState* play); @@ -1110,7 +1112,7 @@ void EnRailgibud_InitCutsceneGibdo(EnRailgibud* this, PlayState* play) { EnRailgibud_InitCueType(this); this->cueId = 99; this->actor.flags |= ACTOR_FLAG_100000; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 28.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gGibdoSkel, &gGibdoRedeadIdleAnim, this->jointTable, this->morphTable, 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 5b9e40c881..12f91d1316 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -573,7 +573,7 @@ void EnRat_Revive(EnRat* this, PlayState* play) { } if (Animation_OnFrame(&this->skelAnime, 0.0f)) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->timer = 150; EnRat_SetupIdle(this); } @@ -613,7 +613,7 @@ void EnRat_Idle(EnRat* this, PlayState* play) { } void EnRat_SetupSpottedPlayer(EnRat* this) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Animation_MorphToLoop(&this->skelAnime, &gRealBombchuSpotAnim, -5.0f); this->animLoopCounter = 3; this->actor.speed = 0.0f; 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 964f8f23b0..12b11a8c13 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -28,7 +28,9 @@ #include "assets/objects/object_rd/object_rd.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnRd_Init(Actor* thisx, PlayState* play); void EnRd_Destroy(Actor* thisx, PlayState* play); 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 b3aacb2982..e0170c332f 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -7,7 +7,7 @@ #include "z_en_rg.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_MINIMAP_ICON_ENABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_MINIMAP_ICON_ENABLED) void EnRg_Init(Actor* thisx, PlayState* play); void EnRg_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index cf40fb235f..c7a8385d55 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -6,7 +6,7 @@ #include "z_en_river_sound.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnRiverSound_Init(Actor* thisx, PlayState* play); void EnRiverSound_Update(Actor* thisx, PlayState* play); 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 d1e81822e0..7e75c93253 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -120,7 +120,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_S8(hintId, TATL_HINT_ID_LIKE_LIKE, ICHAIN_CONTINUE), ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_2, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 30, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c index 8d7127a542..4167b6dbe3 100644 --- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c @@ -7,7 +7,9 @@ #include "z_en_rsn.h" #include "assets/objects/object_rsn/object_rsn.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnRsn_Init(Actor* thisx, PlayState* play); void EnRsn_Destroy(Actor* thisx, PlayState* play); 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 c93bef1f10..5ad8190f62 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.c +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -6,7 +6,7 @@ #include "z_en_ru.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnRu_Init(Actor* thisx, PlayState* play); void EnRu_Destroy(Actor* thisx, PlayState* play); 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 4e7e552b8c..31f505b27c 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -7,7 +7,7 @@ #include "z_en_ruppecrow.h" #include "assets/objects/object_crow/object_crow.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) typedef enum EnRuppecrowEffect { /* 0x00 */ ENRUPPECROW_EFFECT_NONE = 0, @@ -272,7 +272,7 @@ void EnRuppecrow_SpawnRupee(EnRuppecrow* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EV_RUPY_FALL); rupee = this->rupees[rupeeIndex]; rupee->unk152 = 60; - this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_10; + this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else { rupee = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, this->actor.world.pos.x + xOffset, @@ -283,7 +283,7 @@ void EnRuppecrow_SpawnRupee(EnRuppecrow* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EV_RUPY_FALL); rupee = this->rupees[rupeeIndex]; rupee->unk152 = 60; - this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_10; + this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } else if (this->rupeeIndex == 19) { rupee = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, this->actor.world.pos.x + xOffset, @@ -294,7 +294,7 @@ void EnRuppecrow_SpawnRupee(EnRuppecrow* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EV_RUPY_FALL); rupee = this->rupees[rupeeIndex]; rupee->unk152 = 60; - this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_10; + this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else { rupee = (EnItem00*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ITEM00, this->actor.world.pos.x + xOffset, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, ITEM00_RUPEE_GREEN); @@ -304,7 +304,7 @@ void EnRuppecrow_SpawnRupee(EnRuppecrow* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EV_RUPY_FALL); rupee = this->rupees[rupeeIndex]; rupee->unk152 = 60; - this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_10; + this->rupees[rupeeIndex]->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } this->rupeeIndex++; @@ -467,7 +467,7 @@ void EnRuppecrow_HandleDeath(EnRuppecrow* this) { } this->collider.base.acFlags &= ~AC_ON; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnRuppecrow_FallToDespawn; } 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 22a15e5fd7..64f71e3917 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.c +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -127,7 +127,7 @@ void EnRz_Init(Actor* thisx, PlayState* play) { break; case EN_RZ_TYPE_2: - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (CHECK_WEEKEVENTREG(WEEKEVENTREG_77_04)) { EnRz_ChangeAnim(play, this, EN_RZ_ANIM_LINK_DANCE, ANIMMODE_LOOP, 0.0f); } else { @@ -135,7 +135,7 @@ void EnRz_Init(Actor* thisx, PlayState* play) { } this->actionFunc = func_80BFC3F8; this->sister = EnRz_FindSister(this, play); - this->actor.uncullZoneForward = 300.0f; + this->actor.cullingVolumeDistance = 300.0f; break; default: // EN_RZ_TYPE_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 cdafc5d423..d74ef7df95 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 @@ -36,7 +36,8 @@ Week Event Flags: #include "overlays/actors/ovl_En_Jg/z_en_jg.h" // Goron Elder #include "assets/objects/object_taisou/object_taisou.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) + #define EN_S_GORO_ROLLEDUP_YOFFSET 14.0f #define EN_S_GORO_OFTYPE_WSHRINE (EN_S_GORO_GET_MAIN_TYPE(&this->actor) < 3) @@ -1025,7 +1026,7 @@ void EnSGoro_SetupAction(EnSGoro* this, PlayState* play) { this->scaleFactor = 0.01f; Actor_SetScale(&this->actor, 0.01f); this->actor.gravity = -1.0f; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_UPDATE_DURING_OCARINA; this->actor.attentionRangeType = ATTENTION_RANGE_1; 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 4bf42e04c6..33d1a7731d 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 @@ -7,7 +7,7 @@ #include "z_en_sc_ruppe.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnScRuppe_Init(Actor* thisx, PlayState* play); void EnScRuppe_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c index eb3600d338..1d87637b8b 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -7,7 +7,7 @@ #include "z_en_scopecoin.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnScopecoin_Init(Actor* thisx, PlayState* play); void EnScopecoin_Destroy(Actor* thisx, PlayState* play); 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 7da2714e1f..0734da26ae 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c @@ -6,7 +6,7 @@ #include "z_en_scopecrow.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnScopecrow_Init(Actor* thisx, PlayState* play); void EnScopecrow_Destroy(Actor* thisx, PlayState* play); 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 76f387058f..be1581543d 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -7,7 +7,9 @@ #include "z_en_scopenuts.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnScopenuts_Init(Actor* thisx, PlayState* play); void EnScopenuts_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index 3ed124b980..378bd4b640 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -6,7 +6,7 @@ #include "z_en_sda.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnSda_Init(Actor* thisx, PlayState* play); void EnSda_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c index 153d163408..94efea2b12 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -11,7 +11,7 @@ #include "assets/objects/object_sekihiz/object_sekihiz.h" #include "assets/objects/object_zog/object_zog.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnSekihi_Init(Actor* thisx, PlayState* play); void EnSekihi_Destroy(Actor* thisx, PlayState* play); 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 ad853b8f1f..95a9a1e879 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -6,7 +6,9 @@ #include "z_en_sellnuts.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnSellnuts_Init(Actor* thisx, PlayState* play); void EnSellnuts_Destroy(Actor* thisx, PlayState* play); 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 e302d21873..5fd92bddf7 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -7,7 +7,9 @@ #include "z_en_slime.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) #define ICE_BLOCK_TIMER_MAX 254 #define ICE_BLOCK_UNUSED (ICE_BLOCK_TIMER_MAX + 1) @@ -279,7 +281,7 @@ void EnSlime_SetupInitializeIdle(EnSlime* this) { */ void EnSlime_InitializeIdle(EnSlime* this, PlayState* play) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnSlime_SetupIdle(this); } } @@ -837,7 +839,7 @@ void EnSlime_SpawnIceBlock(EnSlime* this, PlayState* play) { } void EnSlime_SetupIceBlock(EnSlime* this) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = EnSlime_IceBlock; } @@ -914,7 +916,7 @@ void EnSlime_IceBlockThaw(EnSlime* this, PlayState* play) { if (this->iceBlockTimer == ICE_BLOCK_UNUSED) { this->collider.base.acFlags |= AC_ON; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; EnSlime_SetupIdle(this); } } @@ -925,7 +927,7 @@ void EnSlime_IceBlockThaw(EnSlime* this, PlayState* play) { */ void EnSlime_SetupWaitForRevive(EnSlime* this) { this->actor.draw = NULL; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->drawDmgEffAlpha = 0.0f; this->actor.gravity = 0.0f; this->actor.velocity.y = 0.0f; @@ -974,7 +976,7 @@ void EnSlime_Revive(EnSlime* this, PlayState* play) { this->timer++; if (this->timer == 28) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; this->collider.base.acFlags |= AC_ON; this->actor.shape.rot.y = this->actor.home.rot.y; 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 0012fbe039..49ca062fe1 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -274,7 +274,7 @@ void EnSnowman_Init(Actor* thisx, PlayState* play) { thisx->gravity = -1.5f; } - thisx->flags |= ACTOR_FLAG_10; + thisx->flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; thisx->update = EnSnowman_UpdateSnowball; thisx->draw = EnSnowman_DrawSnowball; this->work.timer = 5; @@ -605,7 +605,7 @@ void EnSnowman_SetupMelt(EnSnowman* this) { this->collider.base.acFlags &= ~AC_ON; this->work.timer = 50; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.scale.y = this->actor.scale.x; this->actor.speed = 0.0f; this->actionFunc = EnSnowman_Melt; @@ -788,7 +788,7 @@ void EnSnowman_SetupSplitDoNothing(EnSnowman* this) { this->combineState = EN_SNOWMAN_COMBINE_STATE_NO_ABSORPTION; } - this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_10); + this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED); if ((this->actor.parent != NULL) && (((EnSnowman*)this->actor.parent)->actionFunc == EnSnowman_SplitDoNothing)) { if ((this->actor.child != NULL) && (((EnSnowman*)this->actor.child)->actionFunc == EnSnowman_SplitDoNothing)) { EnSnowman_SetupKill((EnSnowman*)this->actor.parent); @@ -861,7 +861,7 @@ void EnSnowman_SetupCombine(EnSnowman* this, PlayState* play, Vec3f* combinePos) if (this->actor.colChkInfo.health == 0) { this->combineState = EN_SNOWMAN_COMBINE_STATE_NO_ABSORPTION; } else { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Math_Vec3f_Copy(&this->combinePos, combinePos); this->combineState = EN_SNOWMAN_COMBINE_STATE_ACTIVE; 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 69db02039a..9dd323134b 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -54,9 +54,9 @@ void EnSnowwd_Init(Actor* thisx, PlayState* play) { SNOWWD_DROPPED_COLLECTIBLE(thisx) = false; this->actor.home.rot.y = 0; this->timer = 0; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 2000.0f; - this->actor.uncullZoneDownward = 2400.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 2000.0f; + this->actor.cullingVolumeDownward = 2400.0f; Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit); Actor_SetScale(&this->actor, 1.0f); this->actionFunc = EnSnowwd_Idle; diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index 6635d9303d..d1c1276461 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -9,7 +9,7 @@ #include "assets/objects/object_masterzoora/object_masterzoora.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnSob1_Init(Actor* thisx, PlayState* play); void EnSob1_Destroy(Actor* thisx, PlayState* play); @@ -1397,7 +1397,7 @@ void EnSob1_InitShop(EnSob1* this, PlayState* play) { Vec3f* posOffset; if (EnSob1_AreObjectsLoaded(this, play)) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.objectSlot = this->mainObjectSlot; Actor_SetObjectDependency(play, &this->actor); posOffset = &sPosOffset[this->shopType]; 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 5532c7c745..db75a3df25 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -7,7 +7,9 @@ #include "z_en_ssh.h" #include "assets/objects/object_st/object_st.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnSsh_Init(Actor* thisx, PlayState* play); void EnSsh_Destroy(Actor* thisx, PlayState* play); 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 9114d5e7ce..ef352e956c 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -8,9 +8,9 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20 | \ - ACTOR_FLAG_CAN_ATTACH_TO_ARROW | ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CAN_ATTACH_TO_ARROW | ACTOR_FLAG_SFX_FOR_PLAYER_BODY_HIT) void EnSt_Init(Actor* thisx, PlayState* play); void EnSt_Destroy(Actor* thisx, PlayState* play); 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 c82fea11c1..5d22f177a2 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -138,7 +138,7 @@ void EnSth_Init(Actor* thisx, PlayState* play) { switch (STH_GET_TYPE(&this->actor)) { case STH_TYPE_UNUSED_1: if (play->actorCtx.flags & ACTORCTX_FLAG_TELESCOPE_ON) { - this->actor.flags |= (ACTOR_FLAG_10 | ACTOR_FLAG_20); + this->actor.flags |= (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); this->actionFunc = EnSth_DefaultIdle; } else { Actor_Kill(&this->actor); @@ -168,7 +168,7 @@ void EnSth_Init(Actor* thisx, PlayState* play) { this->actionFunc = EnSth_MoonLookingIdle; this->sthFlags |= STH_FLAG_DISABLE_HEAD_TRACK; this->actor.attentionRangeType = ATTENTION_RANGE_3; - this->actor.uncullZoneForward = 800.0f; + this->actor.cullingVolumeDistance = 800.0f; break; case STH_TYPE_OCEANSIDE_SPIDER_HOUSE_GREET: diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c index 12622b8247..715c6e1a7a 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c @@ -39,7 +39,7 @@ void EnSth2_Init(Actor* thisx, PlayState* play) { this->unused = 0; if (play->actorCtx.flags & ACTORCTX_FLAG_TELESCOPE_ON) { - this->actor.flags |= (ACTOR_FLAG_10 | ACTOR_FLAG_20); + this->actor.flags |= (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED); } else { Actor_Kill(&this->actor); return; 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 990713186c..b8bec3a598 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 @@ -546,7 +546,7 @@ void EnStopheishi_Update(Actor* thisx, PlayState* play) { UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_4 | UPDBGCHECKINFO_FLAG_8 | UPDBGCHECKINFO_FLAG_10); Actor_SetScale(&this->actor, 0.01f); - this->actor.uncullZoneForward = 500.0f; + this->actor.cullingVolumeDistance = 500.0f; Math_Vec3f_Copy(&this->actor.focus.pos, &this->headWorldPos); Math_Vec3s_Copy(&this->actor.focus.rot, &this->actor.world.rot); if (!this->disableCollider) { diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index cb2f88d412..598443a9fc 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -7,7 +7,7 @@ #include "z_en_stream.h" #include "assets/objects/object_stream/object_stream.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnStream_Init(Actor* thisx, PlayState* play); void EnStream_Destroy(Actor* thisx, PlayState* play); 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 233fe7983d..c8a5642bc5 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -10,7 +10,7 @@ #include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnSuttari_Init(Actor* thisx, PlayState* play); void EnSuttari_Destroy(Actor* thisx, PlayState* play); 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 fdb30dac77..85089a1e56 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -1174,7 +1174,7 @@ void EnSw_Init(Actor* thisx, PlayState* play) { case 1: this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_460 = ABS_ALT(thisx->world.rot.z); @@ -1191,7 +1191,7 @@ void EnSw_Init(Actor* thisx, PlayState* play) { case 2: case 3: this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_460 = ABS_ALT(thisx->world.rot.z); 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 e6222ff8c4..444e0fd8c6 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 @@ -7,7 +7,7 @@ #include "z_en_syateki_crow.h" #include "overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnSyatekiCrow_Init(Actor* thisx, PlayState* play2); void EnSyatekiCrow_Destroy(Actor* thisx, PlayState* play); @@ -63,7 +63,7 @@ static ColliderJntSphInit sJntSphInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 3000, ICHAIN_CONTINUE), ICHAIN_S8(hintId, TATL_HINT_ID_GUAY, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 2000, ICHAIN_STOP), 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 ecf6984f2b..bcee7aa707 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 @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnSyatekiDekunuts_Init(Actor* thisx, PlayState* play2); void EnSyatekiDekunuts_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 674a7456f2..8adfa3c52a 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -14,7 +14,9 @@ #include "overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.h" #include "overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_LOCK_ON_DISABLED) void EnSyatekiMan_Init(Actor* thisx, PlayState* play); void EnSyatekiMan_Destroy(Actor* thisx, PlayState* play); 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 6136612f58..3edc8ff11d 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 @@ -7,7 +7,7 @@ #include "z_en_syateki_okuta.h" #include "overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnSyatekiOkuta_Init(Actor* thisx, PlayState* play); void EnSyatekiOkuta_Destroy(Actor* thisx, PlayState* play); 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 301ed936f0..86c16b7efe 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 @@ -7,7 +7,7 @@ #include "z_en_syateki_wf.h" #include "overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnSyatekiWf_Init(Actor* thisx, PlayState* play); void EnSyatekiWf_Destroy(Actor* thisx, PlayState* play); 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 2bd5f3a8de..4f84fbb00b 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.c +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -7,7 +7,9 @@ #include "z_en_tab.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnTab_Init(Actor* thisx, PlayState* play); void EnTab_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c index a04dee0b2f..732e03e857 100644 --- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c @@ -7,7 +7,9 @@ #include "z_en_takaraya.h" #include "overlays/actors/ovl_En_Box/z_en_box.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnTakaraya_Init(Actor* thisx, PlayState* play); void EnTakaraya_Destroy(Actor* thisx, PlayState* play); 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 dc1c088aba..10c1efafa7 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 @@ -7,7 +7,9 @@ #include "z_en_talk_gibud.h" #include "z64rumble.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnTalkGibud_Init(Actor* thisx, PlayState* play); void EnTalkGibud_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c index 4de826c253..79941fe4bf 100644 --- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c @@ -6,7 +6,9 @@ #include "z_en_tanron1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnTanron1_Init(Actor* thisx, PlayState* play); void EnTanron1_Destroy(Actor* thisx, PlayState* play); 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 a928408eaf..79dbe3eb85 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -10,7 +10,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_boss04/object_boss04.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnTanron2_Init(Actor* thisx, PlayState* play); void EnTanron2_Destroy(Actor* thisx, PlayState* play); 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 40117e6b28..152a7d1197 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -8,7 +8,9 @@ #include "overlays/actors/ovl_Boss_03/z_boss_03.h" #include "assets/objects/object_boss03/object_boss03.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) #define WORK_TIMER_PICK_NEW_DEVIATION 0 #define WORK_TIMER_DIE 0 diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c index f616e4d858..df0596b73f 100644 --- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c @@ -6,7 +6,7 @@ #include "z_en_tanron4.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnTanron4_Init(Actor* thisx, PlayState* play2); void EnTanron4_Destroy(Actor* thisx, PlayState* play); @@ -50,7 +50,7 @@ void EnTanron4_Init(Actor* thisx, PlayState* play2) { thisx->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; thisx->speed = 3.0f + KREG(48); - thisx->uncullZoneForward = 10000.0f + KREG(70); + thisx->cullingVolumeDistance = 10000.0f + KREG(70); this->randRollTimer = Rand_ZeroFloat(10.0f); if (thisx->params == SEAGULL_FOLLOW_ACTOR) { 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 11bd969841..25f646687e 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -25,7 +25,7 @@ #include "assets/objects/object_boss02/object_boss02.h" #include "overlays/actors/ovl_Boss_02/z_boss_02.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnTanron5_Init(Actor* thisx, PlayState* play); void EnTanron5_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index e5a2aa88ff..a014300cfc 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -7,7 +7,7 @@ #include "z_en_test.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnTest_Init(Actor* thisx, PlayState* play2); void EnTest_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c index 931e638852..becd0dbcbb 100644 --- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c @@ -12,7 +12,7 @@ #include "assets/objects/object_meganeana_obj/object_meganeana_obj.h" #include "assets/objects/object_haka_obj/object_haka_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_REACT_TO_LENS) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_REACT_TO_LENS) void EnTest2_Init(Actor* thisx, PlayState* play); void EnTest2_Update(Actor* thisx, PlayState* play); @@ -55,9 +55,9 @@ static EnTest2ModelInfo sModelInfo[EN_TEST2_TYPE_MAX] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F(scale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 8000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 2500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 8000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 2500, ICHAIN_STOP), }; static s16 sObjectIds[EN_TEST2_TYPE_MAX] = { @@ -81,7 +81,7 @@ void EnTest2_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if ((ENTEST2_GET_TYPE(&this->actor) == EN_TEST2_TYPE_11) || (ENTEST2_GET_TYPE(&this->actor) == EN_TEST2_TYPE_12)) { - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; } } diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index e455e35dbf..a263daa9c7 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -14,7 +14,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_mask_ki_tan/object_mask_ki_tan.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) typedef struct { /* 0x0 */ s8 unk_0; diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c index b98b535d8b..d1344b7f6a 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -11,7 +11,7 @@ #include "overlays/gamestates/ovl_daytelop/z_daytelop.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_100000) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_100000) void EnTest4_Init(Actor* thisx, PlayState* play); void EnTest4_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.c b/src/overlays/actors/ovl_En_Test5/z_en_test5.c index 5d6190c3b4..cdc9c2e197 100644 --- a/src/overlays/actors/ovl_En_Test5/z_en_test5.c +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.c @@ -6,7 +6,7 @@ #include "z_en_test5.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnTest5_Init(Actor* thisx, PlayState* play2); void EnTest5_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c index 3a5eee817f..79a84b326b 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -12,7 +12,9 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_200000 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_200000 | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnTest6_Init(Actor* thisx, PlayState* play2); void EnTest6_Destroy(Actor* thisx, PlayState* play2); diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index d6fbc5ea71..b865022815 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -8,7 +8,9 @@ #include "z_en_test7.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_100000 | ACTOR_FLAG_200000 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_100000 | ACTOR_FLAG_200000 | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnTest7_Init(Actor* thisx, PlayState* play2); void EnTest7_Destroy(Actor* thisx, PlayState* play); 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 f26644df9c..9ad580cc82 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -136,8 +136,8 @@ static s16 D_80C13664[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), ICHAIN_S8(hintId, TATL_HINT_ID_TAKKURI, ICHAIN_CONTINUE), ICHAIN_F32(lockOnArrowOffset, 500, ICHAIN_STOP), }; @@ -611,7 +611,7 @@ void func_80C11C60(EnThiefbird* this) { Actor_PlaySfx(&this->actor, NA_SE_EN_THIEFBIRD_DEAD); Actor_SetColorFilter(&this->actor, COLORFILTER_COLORFLAG_RED, 255, COLORFILTER_BUFFLAG_OPA, 40); this->collider.base.acFlags &= ~AC_ON; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_192 = 0x1C00; this->actionFunc = func_80C11D14; } @@ -788,7 +788,7 @@ void func_80C12378(EnThiefbird* this, PlayState* play) { void func_80C1242C(EnThiefbird* this) { Animation_Change(&this->skelAnime, &gTakkuriFlyWithItemAnim, 2.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -4.0f); - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->collider.base.acFlags |= AC_ON; this->actionFunc = func_80C124B0; this->actor.speed = 12.0f; @@ -854,7 +854,7 @@ void func_80C12744(EnThiefbird* this) { Animation_Change(&this->skelAnime, &gTakkuriFlyAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP_INTERP, -4.0f); this->unk_190 = 0; this->collider.base.acFlags |= AC_ON; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_80C127F4; this->actor.speed = 4.0f; this->skelAnime.playSpeed = 3.0f; @@ -920,7 +920,7 @@ void func_80C127F4(EnThiefbird* this, PlayState* play) { Math_SmoothStepToS(&this->actor.shape.rot.x, -0x800, 4, 0x800, 0x80); if (this->unk_194 == 0) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_80C11538(this); } } diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c index 3f903d62e5..eedaa27f99 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -11,7 +11,7 @@ #include "z_en_time_tag.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnTimeTag_Init(Actor* thisx, PlayState* play); void EnTimeTag_Destroy(Actor* thisx, PlayState* play); 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 84f4ebeb5b..4366a6ccf3 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -637,7 +637,7 @@ void func_80895020(EnTite* this, PlayState* play) { this->actor.colorFilterTimer = 0; SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EN_TEKU_DEAD); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_2BA = 1; Item_DropCollectibleRandom(play, &this->actor, &this->actor.world.pos, this->unk_2BE); this->unk_2BC = 25; 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 94fa4a29eb..95d0fcfa97 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -256,7 +256,7 @@ void EnTk_Init(Actor* thisx, PlayState* play) { this->actor.world.rot.y = this->actor.yawTowardsPlayer; this->actor.gravity = -1.0f; this->actor.shape.rot.y = this->actor.world.rot.y; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationSpeedInfo, ENTK_ANIM_0, &this->animIndex); SubS_FillCutscenesList(&this->actor, this->csIdList, ARRAY_COUNT(this->csIdList)); 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 f833002786..a6ed5da087 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -7,7 +7,7 @@ #include "z_en_torch2.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnTorch2_Init(Actor* thisx, PlayState* play); void EnTorch2_Destroy(Actor* thisx, PlayState* play); 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 e8638a785c..80df925664 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -240,7 +240,7 @@ void func_80AD381C(EnTrt2* this, PlayState* play) { this->unk_3D9 = 0; this->unk_3B2 = 0; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } else { Actor_Kill(&this->actor); @@ -717,7 +717,7 @@ s32 func_80AD4CCC(EnTrt2* this, PlayState* play) { void func_80AD4DB4(EnTrt2* this, PlayState* play) { static Vec3f D_80AD5904 = { 0.0f, 50.0f, 0.0f }; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; Actor_SetObjectDependency(play, &this->actor); Actor_SetScale(&this->actor, 0.008f); this->path = SubS_GetPathByIndex(play, ENTRT2_GET_PATH_INDEX(&this->actor), ENTRT2_PATH_INDEX_NONE); 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 7f52232ed4..d2c5557fa0 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -8,7 +8,9 @@ #include "attributes.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnTru_Init(Actor* thisx, PlayState* play); void EnTru_Destroy(Actor* thisx, PlayState* play); 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 81b701dcfe..306d49c025 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 @@ -7,7 +7,9 @@ #include "z_en_tru_mt.h" #include "overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnTruMt_Init(Actor* thisx, PlayState* play); void EnTruMt_Destroy(Actor* thisx, PlayState* play); 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 311ed95270..7e76a2d200 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -8,7 +8,9 @@ #include "z64snap.h" #include "assets/objects/object_tsn/object_tsn.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnTsn_Init(Actor* thisx, PlayState* play); void EnTsn_Destroy(Actor* thisx, PlayState* play); 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 c8ae3b36fe..b52a025d0e 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 @@ -51,9 +51,9 @@ ActorProfile En_Tubo_Trap_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 197, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; void EnTuboTrap_Init(Actor* thisx, PlayState* play) { @@ -236,7 +236,8 @@ void EnTuboTrap_Idle(EnTuboTrap* this, PlayState* play) { if ((startingRotation == 0) || (this->actor.playerHeightRel <= (startingRotation * 10.0f))) { Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY); currentHeight = this->actor.world.pos.y; - this->actor.flags |= (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_10); // always update and can target + this->actor.flags |= + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED); // always update and can target transformationHeight = sTransformationHeight[player->transformation]; diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.c b/src/overlays/actors/ovl_En_Twig/z_en_twig.c index b2c8864c35..b41836ed4b 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.c +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -6,7 +6,7 @@ #include "z_en_twig.h" #include "assets/objects/object_twig/object_twig.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnTwig_Init(Actor* thisx, PlayState* play2); void EnTwig_Destroy(Actor* thisx, PlayState* play2); @@ -47,9 +47,9 @@ static CollisionHeader* sColHeaders[] = { static s16 sRingsHaveSpawned = false; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 40, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 40, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 40, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 40, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; @@ -88,14 +88,16 @@ void EnTwig_Init(Actor* thisx, PlayState* play2) { return; } Actor_SetScale(&this->dyna.actor, 4.2f); - this->dyna.actor.uncullZoneScale = this->dyna.actor.uncullZoneDownward = this->dyna.actor.scale.x * 60.0f; + this->dyna.actor.cullingVolumeScale = this->dyna.actor.cullingVolumeDownward = + this->dyna.actor.scale.x * 60.0f; DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); func_80AC0A7C(this, play); break; case 2: Actor_SetScale(&this->dyna.actor, 1.0f); - this->dyna.actor.uncullZoneScale = this->dyna.actor.uncullZoneDownward = this->dyna.actor.scale.x * 880.0f; + this->dyna.actor.cullingVolumeScale = this->dyna.actor.cullingVolumeDownward = + this->dyna.actor.scale.x * 880.0f; func_80AC0A54(this, play); break; diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index d8559a1711..243cfa23e9 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -6,7 +6,7 @@ #include "z_en_viewer.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_200000) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_200000) void EnViewer_Init(Actor* thisx, PlayState* play); void EnViewer_Destroy(Actor* thisx, PlayState* play); 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 1bc3429cf3..fd92e6943b 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -372,7 +372,7 @@ void func_808CCBE4(EnVm* this, PlayState* play) { this->actor.gravity = -0.5f; this->actor.speed = Rand_ZeroOne() + 1.0f; this->unk_210 = 0; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_808CCCF0; } 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 32d7eeb57f..e5cc827d90 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -10,7 +10,9 @@ #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnWallmas_Init(Actor* thisx, PlayState* play); void EnWallmas_Destroy(Actor* thisx, PlayState* play); @@ -220,7 +222,7 @@ void EnWallmas_TimerInit(EnWallmas* this, PlayState* play) { Player* player = GET_PLAYER(play); this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_20; + this->actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; this->timer = 130; this->actor.velocity.y = 0.0f; this->actor.world.pos.y = player->actor.world.pos.y; @@ -271,7 +273,7 @@ void EnWallmas_SetupDrop(EnWallmas* this, PlayState* play) { this->actor.world.rot.y = this->actor.shape.rot.y; this->actor.floorHeight = player->actor.floorHeight; this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags &= ~ACTOR_FLAG_20; + this->actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; this->actionFunc = EnWallmas_Drop; } 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 2db9937ea3..d04ad5adbe 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 @@ -7,7 +7,7 @@ #include "z_en_warp_uzu.h" #include "assets/objects/object_warp_uzu/object_warp_uzu.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnWarpUzu_Init(Actor* thisx, PlayState* play); void EnWarpUzu_Destroy(Actor* thisx, PlayState* play); @@ -52,9 +52,9 @@ static ColliderCylinderInit sCylinderInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -116,7 +116,7 @@ void EnWarpUzu_Update(Actor* thisx, PlayState* play) { EnWarpUzu* this = (EnWarpUzu*)thisx; s32 pad; - this->actor.uncullZoneForward = 1000.0f; + this->actor.cullingVolumeDistance = 1000.0f; this->actionFunc(this, play); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index 7a5e2965d4..c0fd9e9992 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -8,8 +8,9 @@ #include "z_en_warp_tag.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | \ + ACTOR_FLAG_LOCK_ON_DISABLED) void EnWarptag_Init(Actor* thisx, PlayState* play); void EnWarptag_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c index 34560e7930..d839b4f89a 100644 --- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c @@ -17,7 +17,9 @@ #include "assets/objects/object_water_effect/object_water_effect.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnWaterEffect_Init(Actor* thisx, PlayState* play); void EnWaterEffect_Destroy(Actor* thisx, PlayState* play); 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 d9084b09f6..7de98268a5 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c @@ -595,7 +595,7 @@ void EnWdhand_SetupDie(EnWdhand* this) { s32 i; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; // Finds the particular collider that was hit for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) { diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 25d789d67a..d81986d52e 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -6,7 +6,7 @@ #include "z_en_weather_tag.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnWeatherTag_Init(Actor* thisx, PlayState* play); void EnWeatherTag_Destroy(Actor* thisx, PlayState* play); 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 75b0f9a84e..2f8cd7770b 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -9,7 +9,9 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void EnWf_Init(Actor* thisx, PlayState* play); void EnWf_Destroy(Actor* thisx, PlayState* play); 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 a272fbb8e7..4bb9559120 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -9,9 +9,10 @@ #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.h" -#define FLAGS \ - (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_IGNORE_QUAKE | \ - ACTOR_FLAG_100000 | ACTOR_FLAG_LOCK_ON_DISABLED | ACTOR_FLAG_MINIMAP_ICON_ENABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_IGNORE_QUAKE | ACTOR_FLAG_100000 | ACTOR_FLAG_LOCK_ON_DISABLED | \ + ACTOR_FLAG_MINIMAP_ICON_ENABLED) void EnWiz_Init(Actor* thisx, PlayState* play); void EnWiz_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c index 00cec5f49c..1d534f4d99 100644 --- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c @@ -7,7 +7,7 @@ #include "z_en_wiz_brock.h" #include "assets/objects/object_wiz/object_wiz.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) void EnWizBrock_Init(Actor* thisx, PlayState* play); void EnWizBrock_Destroy(Actor* thisx, PlayState* play); 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 e1ec9a5ca4..9d900579d8 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 @@ -9,7 +9,9 @@ #include "overlays/actors/ovl_En_Wiz/z_en_wiz.h" #include "assets/objects/object_wiz/object_wiz.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_10 | ACTOR_FLAG_LOCK_ON_DISABLED) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_LOCK_ON_DISABLED) void EnWizFire_Init(Actor* thisx, PlayState* play); void EnWizFire_Destroy(Actor* thisx, PlayState* play); 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 7a5ff72ddb..07342bfde1 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -109,11 +109,11 @@ s32 EnWood02_SpawnZoneCheck(EnWood02* this, PlayState* play, Vec3f* arg2) { phi_f12 = fabsf(1.0f / this->actor.projectedW); } - if (((-this->actor.uncullZoneScale < this->actor.projectedPos.z) && - (this->actor.projectedPos.z < (this->actor.uncullZoneForward + this->actor.uncullZoneScale)) && - (((fabsf(this->actor.projectedPos.x) - this->actor.uncullZoneScale) * phi_f12) < 1.0f)) && - (((this->actor.projectedPos.y + this->actor.uncullZoneDownward) * phi_f12) > -1.0f) && - (((this->actor.projectedPos.y - this->actor.uncullZoneScale) * phi_f12) < 1.0f)) { + if (((-this->actor.cullingVolumeScale < this->actor.projectedPos.z) && + (this->actor.projectedPos.z < (this->actor.cullingVolumeDistance + this->actor.cullingVolumeScale)) && + (((fabsf(this->actor.projectedPos.x) - this->actor.cullingVolumeScale) * phi_f12) < 1.0f)) && + (((this->actor.projectedPos.y + this->actor.cullingVolumeDownward) * phi_f12) > -1.0f) && + (((this->actor.projectedPos.y - this->actor.cullingVolumeScale) * phi_f12) < 1.0f)) { return true; } return false; @@ -223,9 +223,9 @@ void EnWood02_Init(Actor* thisx, PlayState* play) { case WOOD_BUSH_BLACK_LARGE: case WOOD_TREE_SPECIAL: actorScale = 1.5f; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 2000.0f; - this->actor.uncullZoneDownward = 2400.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 2000.0f; + this->actor.cullingVolumeDownward = 2400.0f; break; case WOOD_TREE_CONICAL_SPAWNER: @@ -247,16 +247,16 @@ void EnWood02_Init(Actor* thisx, PlayState* play) { case WOOD_TREE_KAKARIKO_ADULT: case WOOD_BUSH_GREEN_SMALL: case WOOD_BUSH_BLACK_SMALL: - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 800.0f; - this->actor.uncullZoneDownward = 1800.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 800.0f; + this->actor.cullingVolumeDownward = 1800.0f; break; case WOOD_TREE_CONICAL_SMALL: actorScale = 0.6f; - this->actor.uncullZoneForward = 4000.0f; - this->actor.uncullZoneScale = 400.0f; - this->actor.uncullZoneDownward = 1000.0f; + this->actor.cullingVolumeDistance = 4000.0f; + this->actor.cullingVolumeScale = 400.0f; + this->actor.cullingVolumeDownward = 1000.0f; break; case WOOD_LEAF_GREEN: @@ -304,7 +304,7 @@ void EnWood02_Init(Actor* thisx, PlayState* play) { this->actor.world.pos.x += sWood02SpawnSin * sWood02SpawnDistance[5]; this->actor.world.pos.z += sWood02SpawnCos * sWood02SpawnDistance[5]; } else { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_151 = 2; } @@ -367,7 +367,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) { // Despawn extra trees in a group if out of range if ((this->spawnType == WOOD_SPAWN_SPAWNED) && (thisx->parent != NULL)) { - if (!(thisx->flags & ACTOR_FLAG_40) && (this->unk_151 != 2)) { + if (!(thisx->flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (this->unk_151 != 2)) { s32 index = this->unk_14A[0]; s32 phi_v0 = 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 7cea63d579..6ffe42abe7 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -7,7 +7,9 @@ #include "z_en_yb.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_UPDATE_DURING_OCARINA) void EnYb_Init(Actor* thisx, PlayState* play); void EnYb_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 4b47a04527..956abab57e 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -6,7 +6,7 @@ #include "z_en_zl1.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnZl1_Init(Actor* thisx, PlayState* play); void EnZl1_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index d243e546d3..ba1b3e6356 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -7,7 +7,7 @@ #include "z_en_zl4.h" #include "assets/objects/object_stk/object_stk.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void EnZl4_Init(Actor* thisx, PlayState* play); void EnZl4_Destroy(Actor* thisx, PlayState* play); 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 73809bd857..2f1fc97daf 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -6,7 +6,7 @@ #include "z_en_zo.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnZo_Init(Actor* thisx, PlayState* play); void EnZo_Destroy(Actor* thisx, PlayState* play); 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 15e926b3ac..34d5552e9b 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -152,7 +152,7 @@ void EnZob_Init(Actor* thisx, PlayState* play) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE)) { Actor_Kill(&this->actor); } - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; break; } } 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 d9f8d9eeaf..f6bece3de6 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -118,7 +118,7 @@ void EnZod_Init(Actor* thisx, PlayState* play) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_78_01)) { this->actionFunc = func_80BAFDB4; EnZod_ChangeAnim(this, ENZOD_ANIM_PLAYING_VIVACE, ANIMMODE_ONCE); - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; CutsceneManager_Queue(this->actor.csId); break; } @@ -140,7 +140,7 @@ void EnZod_Init(Actor* thisx, PlayState* play) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE)) { Actor_Kill(&this->actor); } - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; break; } } 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 181d1a70e0..5a66eb4757 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -222,7 +222,7 @@ void EnZog_Init(Actor* thisx, PlayState* play) { this->actor.terminalVelocity = -4.0f; this->actor.gravity = -1.0f; - this->actor.uncullZoneScale = 3000.0f; + this->actor.cullingVolumeScale = 3000.0f; this->actor.shape.yOffset = 1000.0f; this->unk_308 = 0; this->unk_30A = 0; diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c index a4c83a0be4..9f1e5659d9 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -7,7 +7,7 @@ #include "z_en_zoraegg.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnZoraegg_Init(Actor* thisx, PlayState* play); void EnZoraegg_Destroy(Actor* thisx, PlayState* play); 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 e98fbe73fb..56c62c610a 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -123,7 +123,7 @@ void EnZos_Init(Actor* thisx, PlayState* play) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_GREAT_BAY_TEMPLE)) { Actor_Kill(&this->actor); } - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; break; } } 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 32382cdcab..52408e97f1 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -8,7 +8,7 @@ #include "z64snap.h" #include "attributes.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnZot_Init(Actor* thisx, PlayState* play2); void EnZot_Destroy(Actor* thisx, PlayState* play); 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 a53f013c95..d78389ef6b 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -6,7 +6,7 @@ #include "z_en_zow.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnZow_Init(Actor* thisx, PlayState* play); void EnZow_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index f5d4e55fe1..9e8d3528a3 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -30,9 +30,9 @@ ActorProfile Item_B_Heart_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ItemBHeart_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 4bcf0efc77..4c13ea6a8e 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -6,7 +6,7 @@ #include "z_item_etcetera.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ItemEtcetera_Init(Actor* thisx, PlayState* play); void ItemEtcetera_Destroy(Actor* thisx, PlayState* play); 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 c81fdb823e..076adb0c47 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -8,7 +8,7 @@ #include "z_mir_ray.h" #include "assets/objects/object_mir_ray/object_mir_ray.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void MirRay_Init(Actor* thisx, PlayState* play); void MirRay_Destroy(Actor* thisx, PlayState* play); @@ -232,9 +232,9 @@ MirRayDataEntry sMirRayData[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; const char D_808E3DD0[] = "反射光 発生失敗"; 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 ff66a41436..152517a442 100644 --- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c @@ -6,7 +6,7 @@ #include "z_mir_ray2.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void MirRay2_Init(Actor* thisx, PlayState* play); void MirRay2_Destroy(Actor* thisx, PlayState* play); 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 1d45507279..f45a3c6db5 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -7,7 +7,7 @@ #include "z_mir_ray3.h" #include "assets/objects/object_mir_ray/object_mir_ray.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void MirRay3_Init(Actor* thisx, PlayState* play); void MirRay3_Destroy(Actor* thisx, PlayState* play); 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 6368eaeb04..3913ca2eac 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -7,7 +7,7 @@ #include "z_obj_aqua.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjAqua_Init(Actor* thisx, PlayState* play); void ObjAqua_Destroy(Actor* thisx, PlayState* play); @@ -55,10 +55,13 @@ static ColliderCylinderInit sCylinderInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_VEC3S(shape.rot, 0, ICHAIN_CONTINUE), ICHAIN_VEC3S(world.rot, 0, ICHAIN_CONTINUE), - ICHAIN_F32_DIV1000(gravity, -900, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_VEC3S(shape.rot, 0, ICHAIN_CONTINUE), + ICHAIN_VEC3S(world.rot, 0, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(gravity, -900, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(terminalVelocity, -4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; Vec3f D_80ACC308 = { 1.0f / 1000.0f, 7.0f / 10000.0f, 1.0f / 1000.0f }; diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c index b7632e6cec..3c02823a88 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -7,7 +7,7 @@ #include "z_obj_armos.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) void ObjArmos_Init(Actor* thisx, PlayState* play); void ObjArmos_Destroy(Actor* thisx, PlayState* play); @@ -37,8 +37,10 @@ s16 D_809A5BB0[] = { 1, -1, 0, 0 }; s16 D_809A5BB8[] = { 0, 0, 1, -1 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 120, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 250, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(gravity, -4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 120, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 250, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(gravity, -4000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; 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 25d0b719ab..7f03960e97 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -350,9 +350,9 @@ void func_809375F4(ObjBean* this, PlayState* play) { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_STOP), }; void ObjBean_Init(Actor* thisx, PlayState* play) { @@ -373,7 +373,7 @@ void ObjBean_Init(Actor* thisx, PlayState* play) { Collider_SetCylinder(play, &this->collider, &this->dyna.actor, &sCylinderInit2); Collider_UpdateCylinder(&this->dyna.actor, &this->collider); } - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_80937C10(this); if (!func_80936D58(this, play)) { Actor_Kill(&this->dyna.actor); @@ -728,7 +728,7 @@ void func_8093868C(ObjBean* this, PlayState* play) { } void func_80938704(ObjBean* this) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.draw = NULL; this->actionFunc = func_80938728; } @@ -759,7 +759,7 @@ void func_80938780(ObjBean* this, PlayState* play) { } void func_80938804(ObjBean* this) { - this->dyna.actor.flags &= ~ACTOR_FLAG_10; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.draw = func_80938E00; this->actionFunc = func_80938834; } @@ -774,7 +774,7 @@ void func_80938834(ObjBean* this, PlayState* play) { void func_80938874(ObjBean* this) { this->actionFunc = func_809388A8; this->dyna.actor.draw = func_80938E00; - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.speed = 0.0f; } @@ -791,7 +791,7 @@ void func_809388A8(ObjBean* this, PlayState* play) { } void func_8093892C(ObjBean* this) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.draw = func_80938E00; this->actionFunc = func_80938958; } @@ -804,7 +804,7 @@ void func_80938958(ObjBean* this, PlayState* play) { } void func_80938998(ObjBean* this) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.draw = NULL; this->actionFunc = func_809389BC; } @@ -820,7 +820,7 @@ void func_809389BC(ObjBean* this, PlayState* play) { void func_80938A14(ObjBean* this) { this->dyna.actor.draw = NULL; - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_1B2 = 100; func_80937130(this); this->actionFunc = func_80938A5C; @@ -835,7 +835,7 @@ void func_80938A5C(ObjBean* this, PlayState* play) { } void func_80938AA4(ObjBean* this) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.draw = func_80938E00; this->unk_1B2 = 30; this->actionFunc = func_80938AD8; 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 a0fd5e548f..2d00690e3f 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -7,7 +7,7 @@ #include "z_obj_bell.h" #include "assets/objects/object_f52_obj/object_f52_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjBell_Init(Actor* thisx, PlayState* play); void ObjBell_Destroy(Actor* thisx, PlayState* play); 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 3e78983608..02befc6cca 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -80,7 +80,7 @@ Vec3f D_80AE987C = { 0.0f, -1.0f, 0.0f }; static InitChainEntry sInitChain[] = { ICHAIN_F32(gravity, -2, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 5600, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 5600, ICHAIN_STOP), }; s32 D_80AE9890 = false; @@ -200,7 +200,7 @@ void func_80AE9090(ObjBigicicle* this, PlayState* play) { if (this->unk_149 == 2) { f32 temp_f0 = this->actor.scale.y * 2100.0f; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.shape.yOffset = 2100.0f; this->actor.world.pos.y -= temp_f0; this->collider1.dim.yShift += TRUNCF_BINANG(temp_f0); diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index 05ee629209..f1006b56f6 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -7,7 +7,7 @@ #include "z_obj_blockstop.h" #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjBlockstop_Init(Actor* thisx, PlayState* play); void ObjBlockstop_Update(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c index 9ea6f1161d..c187babc0a 100644 --- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c @@ -7,7 +7,7 @@ #include "z_obj_boat.h" #include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjBoat_Init(Actor* thisx, PlayState* play); void ObjBoat_Destroy(Actor* thisx, PlayState* play); @@ -30,9 +30,9 @@ ActorProfile Obj_Boat_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1000, ICHAIN_STOP), }; /** 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 177dbf45f1..690c6ec11e 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -90,9 +90,9 @@ static CollisionCheckInfoInit sColChkInfoInit = { 0, 12, 60, MASS_IMMOVABLE }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_STOP), }; static s16 D_8093A9D0[] = { @@ -351,7 +351,7 @@ void func_80939EF4(ObjBombiwa* this, PlayState* play) { Actor_Kill(&this->actor); } else { func_80939994(play, &this->actor.world.pos); - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_8093A080(this); } } else { 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 95231a6108..039e618f4a 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -3,7 +3,7 @@ #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/object_boyo/object_boyo.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjBoyo_Init(Actor* thisx, PlayState* play); void ObjBoyo_Destroy(Actor* thisx, PlayState* play2); @@ -60,9 +60,9 @@ static ColliderCylinderInit sCylinderInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; 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 c44d881655..44589f9a23 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -14,7 +14,7 @@ #include "assets/objects/object_obj_chan/object_obj_chan.h" #include "assets/objects/object_tsubo/object_tsubo.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) #define OBJCHAN_ROTATION_SPEED 364 // == (65536 * 2/360) i.e. 2 degrees per second diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c index 65ea4ab0ed..1fb835c1f0 100644 --- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c @@ -8,7 +8,7 @@ #include "z64quake.h" #include "assets/objects/object_d_lift/object_d_lift.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjChikuwa_Init(Actor* thisx, PlayState* play); void ObjChikuwa_Destroy(Actor* thisx, PlayState* play); @@ -28,9 +28,9 @@ ActorProfile Obj_Chikuwa_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1500, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; 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 da98fd1b1a..5025bf25bb 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -61,9 +61,9 @@ static ColliderJntSphInit sJntSphInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; bool func_8098CE40(ObjComb* this, PlayState* play) { @@ -341,7 +341,7 @@ void ObjComb_Init(Actor* thisx, PlayState* play) { if ((sp2C == 0) && Item_CanDropBigFairy(play, OBJCOMB_GET_3F(&this->actor), OBJCOMB_GET_7F00(&this->actor))) { this->unk_1B7 = 1; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } if ((sp2C != 2) || !func_8098CE40(this, play)) { @@ -396,7 +396,7 @@ void func_8098DC60(ObjComb* this, PlayState* play) { if ((this->unk_1B2 <= 0) && (dmgFlags & 0x13820)) { if (this->unk_1B5 == 0) { this->unk_1B5 = 1; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } this->unk_1B2 = 20; } @@ -425,7 +425,7 @@ void func_8098DC60(ObjComb* this, PlayState* play) { } void func_8098DE58(ObjComb* this) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_1B4 = 100; this->actor.terminalVelocity = -20.0f; this->actor.gravity = -1.5f; @@ -544,7 +544,7 @@ void ObjComb_Update(Actor* thisx, PlayState* play) { if (this->unk_1B7 != 0) { play->actorCtx.flags |= ACTORCTX_FLAG_3; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } } diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c index da183b4dfb..c98def7548 100644 --- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c @@ -6,7 +6,7 @@ #include "z_obj_danpeilift.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjDanpeilift_Init(Actor* thisx, PlayState* play); void ObjDanpeilift_Destroy(Actor* thisx, PlayState* play); @@ -32,9 +32,9 @@ ActorProfile Obj_Danpeilift_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c index 2d8aa17d87..fe5711ba87 100644 --- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c @@ -6,7 +6,7 @@ #include "z_obj_demo.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjDemo_Init(Actor* thisx, PlayState* play); void ObjDemo_Update(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c index 6f6032fef9..aeed56148e 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -8,7 +8,7 @@ #include "z64quake.h" #include "assets/objects/object_dhouse/object_dhouse.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_IGNORE_LEGACY_POINT_LIGHTS) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_LEGACY_POINT_LIGHTS) void ObjDhouse_Init(Actor* thisx, PlayState* play); void ObjDhouse_Destroy(Actor* thisx, PlayState* play); @@ -114,9 +114,9 @@ ObjDhouseStruct3 D_80B13E90[] = { Vec3f D_80B13FA8 = { 0.0f, 0.3f, 0.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 8000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 8000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -134,7 +134,7 @@ void ObjDhouse_Init(Actor* thisx, PlayState* play) { func_80B13908(this); } else { DynaPolyActor_LoadMesh(play, &this->dyna, &object_dhouse_Colheader_008040); - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_80B1392C(this); } } @@ -441,7 +441,7 @@ void func_80B13940(ObjDhouse* this, PlayState* play2) { func_80B12A88(&this->dyna.actor); DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); this->dyna.actor.draw = func_80B13C08; - this->dyna.actor.flags |= ACTOR_FLAG_20; + this->dyna.actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; func_80B139D8(this); } } @@ -475,8 +475,8 @@ void func_80B139F4(ObjDhouse* this, PlayState* play) { this->unk_1370--; if (this->unk_1370 <= 0) { this->dyna.actor.draw = func_80B13E40; - this->dyna.actor.flags &= ~ACTOR_FLAG_20; - this->dyna.actor.flags &= ~ACTOR_FLAG_10; + this->dyna.actor.flags &= ~ACTOR_FLAG_DRAW_CULLING_DISABLED; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_80B13908(this); } else { func_80B12B38(this, play); diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c index 3a752484df..3096ad217b 100644 --- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c @@ -7,7 +7,7 @@ #include "z_obj_dinner.h" #include "assets/objects/object_obj_dinner/object_obj_dinner.h" -#define FLAGS (ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjDinner_Init(Actor* thisx, PlayState* play); void ObjDinner_Destroy(Actor* thisx, PlayState* play); 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 1dbfb196f9..ef051de4f3 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -7,7 +7,7 @@ #include "z_obj_dora.h" #include "assets/objects/object_dora/object_dora.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjDora_Init(Actor* thisx, PlayState* play); void ObjDora_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c index ec9e5202b0..9ba06a58b7 100644 --- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c @@ -6,7 +6,7 @@ #include "z_obj_dowsing.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjDowsing_Init(Actor* thisx, PlayState* play); void ObjDowsing_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c index f820d3f539..71fc7249f4 100644 --- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c @@ -71,7 +71,7 @@ static ObjDrifticeDataStruct D_80A676D0[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_STOP), }; void func_80A66570(ObjDriftice* this, s32 arg1) { @@ -277,8 +277,8 @@ void ObjDriftice_Init(Actor* thisx, PlayState* play) { this->dyna.actor.world.rot.z = 0; Actor_SetScale(&this->dyna.actor, sp2C[0] * 0.035377357f); - this->dyna.actor.uncullZoneScale = sp2C[1]; - this->dyna.actor.uncullZoneDownward = sp2C[2]; + this->dyna.actor.cullingVolumeScale = sp2C[1]; + this->dyna.actor.cullingVolumeDownward = sp2C[2]; this->unk_240 = 1.0f / this->dyna.actor.scale.x; this->unk_23C = D_80A67644[OBJDRIFTICE_GET_E00(&this->dyna.actor)]; @@ -304,7 +304,7 @@ void ObjDriftice_Init(Actor* thisx, PlayState* play) { if (sp20 != 0) { func_80A671A8(this); } else { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; path = &play->setupPathList[OBJDRIFTICE_GET_PATH_INDEX(&this->dyna.actor)]; this->unk_164 = 0; @@ -444,7 +444,7 @@ void ObjDriftice_Update(Actor* thisx, PlayState* play) { this->actionFunc(this, play); - if (OBJDRIFTICE_GET_ROT(&this->dyna.actor) && (this->dyna.actor.flags & ACTOR_FLAG_40)) { + if (OBJDRIFTICE_GET_ROT(&this->dyna.actor) && (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { func_80A66E30(&this->unk_170, this); } } diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c index cfd0efc333..e1b862b256 100644 --- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c @@ -7,7 +7,7 @@ #include "z_obj_ending.h" #include "assets/objects/object_ending_obj/object_ending_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjEnding_Init(Actor* thisx, PlayState* play); void ObjEnding_Update(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c index 20a8203b16..05c922cbf9 100644 --- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -7,7 +7,7 @@ #include "z_obj_entotu.h" #include "assets/objects/object_f53_obj/object_f53_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjEntotu_Init(Actor* thisx, PlayState* play); void ObjEntotu_Destroy(Actor* thisx, PlayState* play); 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 418c08db2b..cbd04d14a1 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -6,7 +6,7 @@ #include "z_obj_etcetera.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjEtcetera_Init(Actor* thisx, PlayState* play); void ObjEtcetera_Destroy(Actor* thisx, PlayState* play); 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 463abff8bf..3dc3a1356d 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -7,7 +7,7 @@ #include "z_obj_fireshield.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjFireshield_Init(Actor* thisx, PlayState* play); void ObjFireshield_Destroy(Actor* thisx, PlayState* play); @@ -69,8 +69,8 @@ s32 D_80A4D884[] = { 0, 0, 0, 0 }; s32 D_80A4D894[] = { 0, 0, 0, 0 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -287,7 +287,7 @@ void ObjFireshield_Init(Actor* thisx, PlayState* play) { this->actor.scale.z = this->actor.scale.x; this->actor.scale.y = 0.05f; - this->actor.uncullZoneScale = sp2C->unk_04; + this->actor.cullingVolumeScale = sp2C->unk_04; this->unk_1A4 = Rand_ZeroOne() * 128.0f; if ((this->actor.home.rot.z * 10) < 0) { 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 6510d0708f..e04f3f9c18 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -89,9 +89,9 @@ u8 D_80A1D404 = true; Vec3f D_80A1D408 = { 0.0f, 20.0f, 0.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), - ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 1600, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDistance, 1600, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; void func_80A1B3D0(void) { @@ -445,7 +445,7 @@ void func_80A1C838(ObjFlowerpot* this, PlayState* play) { func_80A1CBF8(this); this->actor.room = -1; this->actor.colChkInfo.mass = 180; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (func_800A817C(ENOBJFLOWERPOT_GET_3F(&this->actor))) { func_80A1B914(this, play); } @@ -491,7 +491,7 @@ void func_80A1C838(ObjFlowerpot* this, PlayState* play) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { if (this->actor.colChkInfo.mass == MASS_IMMOVABLE) { if (DynaPoly_GetActor(&play->colCtx, this->actor.floorBgId) == NULL) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_1EA &= ~0x1; } } else if (Math3D_Vec3fDistSq(&this->actor.world.pos, &this->actor.prevPos) < 0.01f) { diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c index b668fd9a26..9d1997d356 100644 --- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c @@ -7,7 +7,7 @@ #include "z_obj_funen.h" #include "assets/objects/object_funen/object_funen.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjFunen_Init(Actor* thisx, PlayState* play); void ObjFunen_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c index 7712338ed1..1c85e11967 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -7,7 +7,7 @@ #include "z_obj_ghaka.h" #include "assets/objects/object_ghaka/object_ghaka.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjGhaka_Init(Actor* thisx, PlayState* play); void ObjGhaka_Destroy(Actor* thisx, PlayState* play); 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 7dce791989..069cafaa86 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -10,7 +10,7 @@ #include "overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjGrass_Init(Actor* thisx, PlayState* play); void ObjGrass_Destroy(Actor* thisx, PlayState* play); 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 d00e41e393..9032204095 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 @@ -9,7 +9,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_Obj_Grass/z_obj_grass.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_THROW_ONLY) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY) void ObjGrassCarry_Init(Actor* thisx, PlayState* play); void ObjGrassCarry_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c index da1d5a7c8f..7d56e6f74e 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -7,7 +7,7 @@ #include "z_obj_hakaisi.h" #include "assets/objects/object_hakaisi/object_hakaisi.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjHakaisi_Init(Actor* thisx, PlayState* play); void ObjHakaisi_Destroy(Actor* thisx, PlayState* play); 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 fcd2c31f06..ec23a3c11c 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -7,7 +7,7 @@ #include "z_obj_hamishi.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjHamishi_Init(Actor* thisx, PlayState* play); void ObjHamishi_Destroy(Actor* thisx, PlayState* play2); @@ -54,9 +54,9 @@ s16 D_809A1AD4[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 250, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 250, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_STOP), }; void func_809A0F20(Actor* thisx, PlayState* play) { @@ -164,7 +164,7 @@ void ObjHamishi_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1000.0f; + this->actor.cullingVolumeDistance += 1000.0f; } if (this->actor.shape.rot.y == 0) { @@ -248,7 +248,7 @@ void ObjHamishi_Update(Actor* thisx, PlayState* play) { if (this->unk_1A0 > 0) { this->unk_1A0--; - } else if ((this->actor.flags & ACTOR_FLAG_40) && (this->actor.xzDistToPlayer < 1000.0f)) { + } else if ((this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (this->actor.xzDistToPlayer < 1000.0f)) { CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); } diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index 5f606f120d..46ab494f48 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -28,9 +28,9 @@ ActorProfile Obj_Hana_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 900, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 40, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 40, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 900, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 40, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 40, ICHAIN_STOP), }; void ObjHana_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c index 62da98eeec..9f4212e063 100644 --- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c @@ -8,7 +8,7 @@ #include "z64quake.h" #include "assets/objects/object_hariko/object_hariko.h" -#define FLAGS (ACTOR_FLAG_20 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ObjHariko_Init(Actor* thisx, PlayState* play); void ObjHariko_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c index f8f60a59c2..3ed4211ba5 100644 --- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c @@ -8,7 +8,7 @@ #include "attributes.h" #include "assets/objects/object_hsstump/object_hsstump.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjHsStump_Init(Actor* thisx, PlayState* play); void ObjHsStump_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 0b4967677e..41c4f2b6a3 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -38,9 +38,9 @@ static f32 sFocusHeights[] = { 85.0f, 85.0f, 0.0f }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_STOP), }; static CollisionHeader* sColHeaders[] = { @@ -102,7 +102,7 @@ void func_8093E03C(ObjHsblock* this) { } void func_8093E05C(ObjHsblock* this) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 105.0f; ObjHsblock_SetupAction(this, func_8093E0A0); } @@ -123,7 +123,7 @@ void func_8093E10C(ObjHsblock* this, PlayState* play) { this->dyna.actor.velocity.y, 0.3f)) < 0.001f) { this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y; func_8093E03C(this); - this->dyna.actor.flags &= ~ACTOR_FLAG_10; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } 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 37d3133fc8..1d11bb835d 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -9,7 +9,7 @@ #include "z64rumble.h" #include "assets/objects/object_bombiwa/object_bombiwa.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjHugebombiwa_Init(Actor* thisx, PlayState* play); void ObjHugebombiwa_Destroy(Actor* thisx, PlayState* play2); @@ -326,9 +326,9 @@ s32 func_80A54A0C(ObjHugebombiwa* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 3700, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 900, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 900, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3700, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 900, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 900, ICHAIN_STOP), }; void ObjHugebombiwa_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c index f5ac7b6a51..a79334a469 100644 --- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c @@ -8,7 +8,7 @@ #include "attributes.h" #include "assets/objects/object_hunsui/object_hunsui.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjHunsui_Init(Actor* thisx, PlayState* play); void ObjHunsui_Destroy(Actor* thisx, PlayState* play); @@ -59,9 +59,9 @@ ActorProfile Obj_Hunsui_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_STOP), }; s32 func_80B9C450(PlayState* play, s32 switchFlagBase, s32 arg2) { @@ -225,9 +225,9 @@ void ObjHunsui_Init(Actor* thisx, PlayState* play) { case OBJHUNSUI_F000_4: case OBJHUNSUI_F000_5: case OBJHUNSUI_F000_6: - this->dyna.actor.uncullZoneScale = 900.0f; - this->dyna.actor.uncullZoneDownward = 90.0f; - this->dyna.actor.uncullZoneForward = 4000.0f; + this->dyna.actor.cullingVolumeScale = 900.0f; + this->dyna.actor.cullingVolumeDownward = 90.0f; + this->dyna.actor.cullingVolumeDistance = 4000.0f; break; } @@ -655,7 +655,7 @@ void func_80B9DA60(Actor* thisx, PlayState* play) { Audio_PlaySfx_AtPosWithFreq(&this->dyna.actor.projectedPos, NA_SE_EV_WATER_PILLAR - SFX_FLAG, 1.0f + temp); } - if ((this->dyna.actor.flags & ACTOR_FLAG_40) && !(this->unk_172 & 2)) { + if ((this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) && !(this->unk_172 & 2)) { if ((this->unk_160 == OBJHUNSUI_F000_6) || (this->unk_160 == OBJHUNSUI_F000_5)) { OPEN_DISPS(play->state.gfxCtx); 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 6636eca031..9da625a694 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 @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjIcePoly_Init(Actor* thisx, PlayState* play); void ObjIcePoly_Destroy(Actor* thisx, PlayState* play); @@ -81,7 +81,7 @@ void ObjIcePoly_Init(Actor* thisx, PlayState* play) { this->switchFlag = OBJICEPOLY_GET_SWITCH_FLAG(thisx); thisx->params = OBJICEPOLY_GET_SCALE(thisx); - thisx->uncullZoneForward = 5600.0f; + thisx->cullingVolumeDistance = 5600.0f; Actor_SetScale(thisx, thisx->params * 0.01f); 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 9976442c39..ccf0b491e0 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -7,7 +7,7 @@ #include "z_obj_iceblock.h" #include "assets/objects/object_ice_block/object_ice_block.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjIceblock_Init(Actor* thisx, PlayState* play); void ObjIceblock_Destroy(Actor* thisx, PlayState* play); @@ -668,7 +668,7 @@ void func_80A24B74(ObjIceblock* this, PlayState* play) { s32 pad; Vec3f sp20; - if (!(this->dyna.actor.flags & ACTOR_FLAG_40)) { + if (!(this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { return; } @@ -686,7 +686,7 @@ void func_80A24BDC(ObjIceblock* this, PlayState* play, f32 arg2, f32 arg3, s32 a s16 phi_s0; s32 phi_s1 = 0; - if (this->dyna.actor.flags & ACTOR_FLAG_40) { + if (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { sp88.y = this->unk_244; temp_f22 = 0x10000 / arg4; @@ -722,7 +722,7 @@ void func_80A24DD0(ObjIceblock* this, PlayState* play) { } this->unk_2A2++; - if (this->dyna.actor.flags & ACTOR_FLAG_40) { + if (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { if (this->unk_2A2 >= 0x2E) { phi_f22 = 1.0f; } else { @@ -763,7 +763,7 @@ void func_80A2508C(ObjIceblock* this, PlayState* play) { f32 temp_f0; s32 temp_v0; - if (this->dyna.actor.flags & ACTOR_FLAG_40) { + if (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { temp_v0 = (s32)(this->dyna.actor.scale.y * 130.0f) - 3; if (temp_v0 > 0) { this->unk_2AC += temp_v0; @@ -895,9 +895,9 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32_DIV1000(gravity, -1800, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -26000, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 150, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_STOP), }; void ObjIceblock_Init(Actor* thisx, PlayState* play) { @@ -1007,7 +1007,7 @@ void func_80A2586C(ObjIceblock* this, PlayState* play) { func_80A2319C(this, this->dyna.actor.scale.x); - if (this->dyna.actor.flags & ACTOR_FLAG_40) { + if (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { func_80A2339C(play, &this->dyna.actor.world.pos, (this->dyna.actor.scale.x + 0.05f) * 0.6666666f, 1.0f, 3); } } @@ -1027,7 +1027,7 @@ void func_80A25994(ObjIceblock* this, PlayState* play) { return; } - if (this->dyna.actor.flags & ACTOR_FLAG_40) { + if (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { func_80A2339C(play, &this->dyna.actor.world.pos, this->dyna.actor.scale.x, 1.2f, 15); if (ICEBLOCK_GET_ICEBERG(&this->dyna.actor)) { sp30.x = this->dyna.actor.world.pos.x; diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c index 0c8154a1a3..b016d72c00 100644 --- a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c @@ -7,7 +7,7 @@ #include "z_obj_jg_gakki.h" #include "assets/objects/object_jg/object_jg.h" -#define FLAGS (ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjJgGakki_Init(Actor* thisx, PlayState* play2); void ObjJgGakki_Destroy(Actor* thisx, PlayState* play); 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 cbfd08f233..02e64c4fe1 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 @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_syokudai/object_syokudai.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) typedef enum { /* 0 */ OBJJGAMELIGHT_NONE, diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c index 32922dc583..c373fb88f9 100644 --- a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c @@ -27,8 +27,8 @@ ActorProfile Obj_Kepn_Koya_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 900, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 900, ICHAIN_STOP), }; void ObjKepnKoya_Init(Actor* thisx, PlayState* play) { 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 3d7364a2fa..a5cbc61d72 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_kibako/object_kibako.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) void ObjKibako_Init(Actor* thisx, PlayState* play2); void ObjKibako_Destroy(Actor* thisx, PlayState* play2); @@ -75,8 +75,8 @@ static Gfx* sDisplayLists[] = { gameplay_dangeon_keep_DL_007890, gSmallCrateDL } static InitChainEntry sInitChain[] = { ICHAIN_F32_DIV1000(gravity, -1500, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -18000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 60, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 60, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 60, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 60, ICHAIN_STOP), }; void ObjKibako_SpawnCollectible(ObjKibako* this, PlayState* play) { @@ -139,9 +139,9 @@ void ObjKibako_Init(Actor* thisx, PlayState* play2) { Actor_ProcessInitChain(&this->actor, sInitChain); Actor_SetScale(&this->actor, 0.15f); if (objectIndex == 0) { - this->actor.uncullZoneForward = 4000.0f; + this->actor.cullingVolumeDistance = 4000.0f; } else { - this->actor.uncullZoneForward = 800.0f; + this->actor.cullingVolumeDistance = 800.0f; } Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); 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 ab1b9d6daa..5f0ead6fb3 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -51,9 +51,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_STOP), }; bool ObjKibako2_ContainsSkulltula(ObjKibako2* this, PlayState* play) { @@ -159,7 +159,7 @@ void ObjKibako2_Init(Actor* thisx, PlayState* play) { if (Item_CanDropBigFairy(play, KIBAKO2_COLLECTIBLE_ID(&this->dyna.actor), KIBAKO2_COLLECTIBLE_FLAG(&this->dyna.actor))) { this->unk_1AC = 1; - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } if ((contents != OBJKIBAKO2_CONTENTS_SKULLTULA) || !ObjKibako2_ContainsSkulltula(this, play)) { @@ -208,7 +208,7 @@ void ObjKibako2_Idle(ObjKibako2* this, PlayState* play) { if (ObjKibako2_ShouldBreak(this)) { ObjKibako2_Break(this, play); SoundSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 20, NA_SE_EV_WOODBOX_BREAK); - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); this->dyna.actor.draw = NULL; this->actionFunc = ObjKibako2_Kill; diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c index 9aa2cbddaf..6dd0142dae 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -7,7 +7,7 @@ #include "z_obj_kinoko.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjKinoko_Init(Actor* thisx, PlayState* play); void ObjKinoko_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c index 86bb4231a9..c859d3055b 100644 --- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c @@ -7,7 +7,7 @@ #include "z_obj_kzsaku.h" #include "assets/objects/object_kzsaku/object_kzsaku.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjKzsaku_Init(Actor* thisx, PlayState* play); void ObjKzsaku_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 7017fbdf80..6943b00ee9 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -8,7 +8,7 @@ #include "z64quake.h" #include "assets/objects/object_d_lift/object_d_lift.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjLift_Init(Actor* thisx, PlayState* play); void ObjLift_Destroy(Actor* thisx, PlayState* play); @@ -45,9 +45,11 @@ Vec2s D_8093DD60[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -600, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -15000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 350, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 350, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -600, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(terminalVelocity, -15000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 350, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 350, ICHAIN_STOP), }; static f32 D_8093DD98[] = { 0.1f, 0.05f }; 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 0d511f3386..03a414551b 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -67,9 +67,9 @@ static LightblockTypeVars sLightblockTypeVars[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_STOP), }; void ObjLightblock_SpawnEffect(ObjLightblock* this, PlayState* play) { 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 aa8f38bd84..5421b7d97b 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -7,7 +7,7 @@ #include "z_obj_lightswitch.h" #include "assets/objects/object_lightswitch/object_lightswitch.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjLightswitch_Init(Actor* thisx, PlayState* play); void ObjLightswitch_Destroy(Actor* thisx, PlayState* play); @@ -76,9 +76,9 @@ static Color_RGBA8 sLightswitchEffectEnvColor = { 255, 0, 0, 0 }; static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_STOP), }; void ObjLightswitch_InitCollider(ObjLightswitch* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c index af743fe47e..0a0b761d02 100644 --- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c @@ -7,7 +7,7 @@ #include "z_obj_lupygamelift.h" #include "assets/objects/object_raillift/object_raillift.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjLupygamelift_Init(Actor* thisx, PlayState* play); void ObjLupygamelift_Destroy(Actor* thisx, PlayState* play); @@ -32,9 +32,9 @@ ActorProfile Obj_Lupygamelift_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index 0068ecaffc..0c979d88e7 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -6,7 +6,7 @@ #include "z_obj_makekinsuta.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjMakekinsuta_Init(Actor* thisx, PlayState* play); void ObjMakekinsuta_Destroy(Actor* thisx, PlayState* play); @@ -28,9 +28,9 @@ ActorProfile Obj_Makekinsuta_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1, ICHAIN_STOP), }; bool func_8099FA40(ObjMakekinsuta* this, PlayState* play) { @@ -131,7 +131,7 @@ void func_8099FD7C(Actor* thisx, PlayState* play) { } func_8099FB64(thisx, play); thisx->update = Actor_Noop; - thisx->flags &= ~ACTOR_FLAG_10; + thisx->flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else { CutsceneManager_Queue(thisx->csId); } diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index d2627a222d..30cf8e2cd3 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -6,7 +6,7 @@ #include "z_obj_makeoshihiki.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjMakeoshihiki_Init(Actor* thisx, PlayState* play); void ObjMakeoshihiki_Update(Actor* thisx, PlayState* play); 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 5fb142071e..b0cc0920d8 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -93,9 +93,9 @@ static ObjMineMtxF3 sStandardBasis = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 150, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 10, ICHAIN_STOP), }; @@ -712,8 +712,8 @@ void ObjMine_Init(Actor* thisx, PlayState* play) { s32 linkCount = OBJMINE_GET_LINK_COUNT(&this->actor); this->actor.update = ObjMine_AirWater_Update; - this->actor.uncullZoneScale = 150.0f + (linkCount * (LINK_SIZE * 1.75f)); - this->actor.uncullZoneDownward = 150.0f + (linkCount * (LINK_SIZE * 1.75f)); + this->actor.cullingVolumeScale = 150.0f + (linkCount * (LINK_SIZE * 1.75f)); + this->actor.cullingVolumeDownward = 150.0f + (linkCount * (LINK_SIZE * 1.75f)); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 45.0f); this->actor.shape.shadowAlpha = 140; @@ -756,7 +756,7 @@ void ObjMine_Path_Stationary(ObjMine* this, PlayState* play) { } void ObjMine_Path_SetupMove(ObjMine* this) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = ObjMine_Path_Move; } @@ -799,7 +799,7 @@ void ObjMine_Path_Move(ObjMine* this, PlayState* play) { ObjMine_Path_MoveToWaypoint(this, this->waypointIndex); } thisx->floorHeight = BgCheck_EntityRaycastFloor5(&play->colCtx, &thisx->floorPoly, &bgId, thisx, &thisx->world.pos); - if (thisx->flags & ACTOR_FLAG_40) { + if (thisx->flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { Vec3f rotAxis; Vec3f yhatCrossV; MtxF rotMtxF; @@ -818,7 +818,7 @@ void ObjMine_Path_Move(ObjMine* this, PlayState* play) { } void ObjMine_SetupExplode(ObjMine* this) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.draw = ObjMine_DrawExplosion; this->actor.shape.shadowDraw = NULL; this->actor.scale.x = 0.02f; @@ -1076,7 +1076,7 @@ void ObjMine_Path_Update(Actor* thisx, PlayState* play) { this->collider.base.ocFlags1 &= ~OC1_HIT; this->collider.base.acFlags &= ~AC_HIT; this->collider.base.ocFlags2 &= ~OC2_HIT_PLAYER; - if ((this->actor.flags & ACTOR_FLAG_40) && (this->actionFunc != ObjMine_Explode)) { + if ((this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) && (this->actionFunc != ObjMine_Explode)) { CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); } diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c index 758678ea89..aa1efe8cf4 100644 --- a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c @@ -7,7 +7,7 @@ #include "z_obj_moon_stone.h" #include "assets/objects/object_gi_reserve00/object_gi_reserve00.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_100000) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_100000) void ObjMoonStone_Init(Actor* thisx, PlayState* play); void ObjMoonStone_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index 251b4f3c5b..b4d4d80d8d 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -66,9 +66,9 @@ static s16 sSpawnParams[OBJMURE_TYPE_MAX] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 1200, ICHAIN_STOP), }; typedef enum { @@ -273,7 +273,7 @@ void ObjMure_InitialAction(ObjMure* this, PlayState* play) { void ObjMure_CulledState(ObjMure* this, PlayState* play) { if (fabsf(this->actor.projectedPos.z) < sZClip[this->type]) { this->actionFunc = ObjMure_ActiveState; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure_SpawnActors(this, play); } } @@ -396,7 +396,7 @@ void ObjMure_ActiveState(ObjMure* this, PlayState* play) { ObjMure_CheckChildren(this, play); if ((sZClip[this->type] + 40.0f) <= fabsf(this->actor.projectedPos.z)) { this->actionFunc = ObjMure_CulledState; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure_KillActors(this, play); } else if (sTypeGroupBehaviorFunc[this->type] != NULL) { sTypeGroupBehaviorFunc[this->type](this, play); diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index 092cbd797a..ed88f9f55d 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -181,9 +181,9 @@ void ObjMure2_ClearChildrenList(ObjMure2* this) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 2100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 2100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; void ObjMure2_Init(Actor* thisx, PlayState* play) { @@ -191,7 +191,7 @@ void ObjMure2_Init(Actor* thisx, PlayState* play) { Actor_ProcessInitChain(&this->actor, sInitChain); if (play->csCtx.state != CS_STATE_IDLE) { - this->actor.uncullZoneForward += 1200.0f; + this->actor.cullingVolumeDistance += 1200.0f; } func_809613B0(this); } @@ -211,7 +211,7 @@ void ObjMure2_SetupWaitForPlayerInRange(ObjMure2* this) { void ObjMure2_WaitForPlayerInRange(ObjMure2* this, PlayState* play) { if (Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z) < sActivationRangesSq[OBJ_MURE2_GET_CHILD_TYPE(&this->actor)] * this->rangeMultiplier) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure2_SpawnChildren(this, play); ObjMure2_SetupWaitForPlayerOutOfRange(this); } @@ -226,7 +226,7 @@ void ObjMure2_WaitForPlayerOutOfRange(ObjMure2* this, PlayState* play) { if ((sDeactivationRangesSq[OBJ_MURE2_GET_CHILD_TYPE(&this->actor)] * this->rangeMultiplier) <= Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z)) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; ObjMure2_KillChildren(this, play); ObjMure2_SetupWaitForPlayerInRange(this); } diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index 1bbe7a1ce7..6a974685c2 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -34,9 +34,9 @@ ActorProfile Obj_Mure3_Profile = { static s16 sRupeeCounts[] = { 5, 5, 7, 0 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 1800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 1800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; void func_8098F040(ObjMure3* this, PlayState* play) { @@ -172,7 +172,7 @@ void func_8098F5E4(ObjMure3* this, PlayState* play) { static ObjMure3SpawnFunc sSpawnFuncs[] = { func_8098F040, func_8098F110, func_8098F220 }; if (Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z) < SQ(1150.0f)) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; sSpawnFuncs[OBJMURE3_PARAM_RUPEEINDEX(&this->actor)](this, play); func_8098F66C(this); } @@ -185,7 +185,7 @@ void func_8098F66C(ObjMure3* this) { void func_8098F680(ObjMure3* this, PlayState* play) { func_8098F438(this, play); if (Math3D_Dist1DSq(this->actor.projectedPos.x, this->actor.projectedPos.z) >= SQ(1450.0f)) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; func_8098F364(this, play); func_8098F5D0(this); } diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index 641da1e512..cc67d6c213 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -7,7 +7,7 @@ #include "z_obj_nozoki.h" #include "assets/objects/object_secom_obj/object_secom_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjNozoki_Init(Actor* thisx, PlayState* play); void ObjNozoki_Destroy(Actor* thisx, PlayState* play); @@ -113,7 +113,7 @@ void func_80BA2514(ObjNozoki* this, PlayState* play) { Lib_Vec3f_TranslateAndRotateY(&this->dyna.actor.world.pos, this->dyna.actor.shape.rot.y, &D_80BA34C0, &this->dyna.actor.home.pos); Actor_SetScale(&this->dyna.actor, 0.6f); - this->dyna.actor.flags |= ACTOR_FLAG_20; + this->dyna.actor.flags |= ACTOR_FLAG_DRAW_CULLING_DISABLED; ObjNozoki_SetupAction(this, func_80BA2BA4); } else if (this->unk_15C == 2) { Lib_Vec3f_TranslateAndRotateY(&this->dyna.actor.home.pos, this->dyna.actor.shape.rot.y, &D_80BA34CC, diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c index df87b7889d..a3ccd31725 100644 --- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c @@ -7,7 +7,7 @@ #include "z_obj_ocarinalift.h" #include "assets/objects/object_raillift/object_raillift.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjOcarinalift_Init(Actor* thisx, PlayState* play); void ObjOcarinalift_Destroy(Actor* thisx, PlayState* play); @@ -43,9 +43,9 @@ ActorProfile Obj_Ocarinalift_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_2, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -90,7 +90,7 @@ void ObjOcarinalift_Destroy(Actor* thisx, PlayState* play) { } void func_80AC9680(ObjOcarinalift* this) { - this->dyna.actor.flags &= ~ACTOR_FLAG_10; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_80AC96A4; } diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 7a0de3fdd8..dff2a77ede 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -8,7 +8,7 @@ #include "overlays/actors/ovl_Obj_Switch/z_obj_switch.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjOshihiki_Init(Actor* thisx, PlayState* play); void ObjOshihiki_Destroy(Actor* thisx, PlayState* play); @@ -44,9 +44,9 @@ static Color_RGB8 sColors[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 500, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 500, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_STOP), }; // The vertices and center of the bottom face diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c index addaf1519f..1d46fcd4a6 100644 --- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c @@ -8,7 +8,7 @@ #include "assets/objects/object_numa_obj/object_numa_obj.h" #include "assets/objects/object_dekucity_obj/object_dekucity_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjPurify_Init(Actor* thisx, PlayState* play); void ObjPurify_Destroy(Actor* thisx, PlayState* play); @@ -224,7 +224,7 @@ void func_80A850E8(ObjPurify* this, PlayState* play) { } void func_80A8515C(ObjPurify* this) { - this->dyna.actor.flags &= ~ACTOR_FLAG_10; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->dyna.actor.draw = func_80A851C8; this->gfxIndex = 1; this->actionFunc = ObjPurify_DoNothing; diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c index d9ac422f75..ab0abbdd28 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -8,7 +8,7 @@ #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_secom_obj/object_secom_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) void ObjPzlblock_Init(Actor* thisx, PlayState* play); void ObjPzlblock_Destroy(Actor* thisx, PlayState* play); @@ -51,9 +51,9 @@ ObjPzlblockStruct D_809A4060[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3S(world.rot, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_STOP), }; Color_RGB8 D_809A4088[] = { diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c index 1b6eeb5515..7d3eac5c04 100644 --- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c @@ -8,7 +8,7 @@ #include "assets/objects/object_raillift/object_raillift.h" #include "overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjRaillift_Init(Actor* thisx, PlayState* play); void ObjRaillift_Destroy(Actor* thisx, PlayState* play); @@ -39,9 +39,9 @@ ActorProfile Obj_Raillift_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 400, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index c5d6a027f2..61446b5bc4 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -6,7 +6,7 @@ #include "z_obj_roomtimer.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjRoomtimer_Init(Actor* thisx, PlayState* play); void ObjRoomtimer_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c index ddacba5be3..c5704d83fe 100644 --- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c @@ -50,9 +50,9 @@ struct ObjRotliftModelInfo sModelInfo[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ObjRotlift_MoveDekuFlowers(ObjRotlift* this) { diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c index 8f9f332c67..7524f92909 100644 --- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c @@ -7,7 +7,7 @@ #include "z_obj_shutter.h" #include "assets/objects/object_f53_obj/object_f53_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjShutter_Init(Actor* thisx, PlayState* play); void ObjShutter_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c index f641469073..19ef21f7ff 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -7,7 +7,7 @@ #include "z_obj_skateblock.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjSkateblock_Init(Actor* thisx, PlayState* play); void ObjSkateblock_Destroy(Actor* thisx, PlayState* play); @@ -70,9 +70,9 @@ Color_RGBA8 D_80A22AD8 = { 250, 250, 250, 255 }; Color_RGBA8 D_80A22ADC = { 180, 180, 180, 255 }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -1700, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), - ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -1700, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 150, ICHAIN_CONTINUE), ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_STOP), }; f32 D_80A22AF8[] = { 14.0f, -14.0f, 14.0f, -14.0f }; @@ -449,7 +449,7 @@ void func_80A21F74(ObjSkateblock* this, PlayState* play) { this->unk_17C++; - if (this->dyna.actor.flags & ACTOR_FLAG_40) { + if (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) { if (this->unk_17C >= 46) { phi_f22 = 1.0f; } else { diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c index a1e85162e5..379d0cb8cb 100644 --- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -7,7 +7,7 @@ #include "z_obj_smork.h" #include "assets/objects/object_f53_obj/object_f53_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjSmork_Init(Actor* thisx, PlayState* play); void ObjSmork_Destroy(Actor* thisx, PlayState* play); 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 fface06afb..9bc67cd215 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -96,7 +96,7 @@ static Gfx* D_80B04FC8[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_STOP), }; void func_80B02CD0(ObjSnowball* this, PlayState* play) { @@ -469,8 +469,8 @@ void ObjSnowball_Init(Actor* thisx, PlayState* play) { this->actor.shape.rot.x = 0; this->actor.shape.rot.z = 0; this->actor.world.pos.y += 20.0f * phi_f20; - this->actor.uncullZoneScale = 150.0f * phi_f20; - this->actor.uncullZoneDownward = 300.0f * phi_f20; + this->actor.cullingVolumeScale = 150.0f * phi_f20; + this->actor.cullingVolumeDownward = 300.0f * phi_f20; this->actor.shape.rot.y = Rand_Next() >> 0x10; this->unk_20C = phi_f20; @@ -533,7 +533,7 @@ void func_80B04350(ObjSnowball* this, PlayState* play) { if (flag && (this->unk_211 == 0) && (this->collider.elements[0].base.acHitElem->atDmgInfo.dmgFlags & (0x80000000 | 0x4000 | 0x800 | 0x400 | 0x100 | 0x8))) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (this->actor.home.rot.y == 1) { this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY); } @@ -755,11 +755,11 @@ void ObjSnowball_Update(Actor* thisx, PlayState* play) { if (this->actor.home.rot.y == 1) { if (this->unk_211 != 0) { if (Actor_TextboxIsClosing(&this->actor, play)) { - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_211 = 0; } } else if (Actor_TalkOfferAccepted(&this->actor, &play->state)) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_211 = 1; } else if (this->actor.isLockedOn) { sp24 = true; 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 2e5e3941bb..1608ec88c1 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -304,9 +304,12 @@ void func_80B39B5C(ObjSnowball2* this, PlayState* play) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 2000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 25, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 2000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 25, ICHAIN_STOP), }; void ObjSnowball2_Init(Actor* thisx, PlayState* play) { @@ -333,7 +336,7 @@ void ObjSnowball2_Destroy(Actor* thisx, PlayState* play) { } void func_80B39C78(ObjSnowball2* this) { - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_1AD = 0; this->actionFunc = func_80B39C9C; } @@ -349,7 +352,7 @@ void func_80B39C9C(ObjSnowball2* this, PlayState* play) { if (Actor_HasParent(&this->actor, play)) { this->actor.room = -1; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if (func_800A817C(ENOBJSNOWBALL2_GET_3F(&this->actor))) { func_80B38E88(this, play); } @@ -377,7 +380,7 @@ void func_80B39C9C(ObjSnowball2* this, PlayState* play) { if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && (DynaPoly_GetActor(&play->colCtx, this->actor.floorBgId) == NULL)) { this->unk_1AD = 1; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } @@ -526,7 +529,7 @@ void func_80B3A13C(ObjSnowball2* this, PlayState* play) { void func_80B3A498(ObjSnowball2* this) { this->actor.home.pos.x = this->actor.world.pos.x; this->unk_1AC = 46; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.home.pos.y = this->actor.world.pos.y + this->actor.depthInWater; this->actor.home.pos.z = this->actor.world.pos.z; this->actor.world.pos.y += this->actor.shape.yOffset * this->actor.scale.y; diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c index 604a967f50..4bc4520f37 100644 --- a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c @@ -6,7 +6,7 @@ #include "z_obj_sound.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjSound_Init(Actor* thisx, PlayState* play); void ObjSound_Destroy(Actor* thisx, PlayState* 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 4f61db7eb5..6ac6deac26 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -319,9 +319,9 @@ Vec3f D_80B31400 = { 1.0f, 0.0f, 0.0f }; Vec3f D_80B3140C = { 0.0f, 1.0f, 0.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; @@ -669,7 +669,7 @@ void func_80B30808(ObjSpidertent* this, PlayState* play) { } void func_80B30A2C(ObjSpidertent* this) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = func_80B30A4C; } 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 832eeeba46..da33a017c3 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -8,7 +8,7 @@ #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" #include "assets/objects/object_spinyroll/object_spinyroll.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjSpinyroll_Init(Actor* thisx, PlayState* play); void ObjSpinyroll_Destroy(Actor* thisx, PlayState* play); @@ -136,8 +136,8 @@ f32 D_80A1F1F4[] = { 30.0f, -30.0f }; f32 D_80A1F1FC[] = { 9.0f, -9.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_STOP), }; s16 D_80A1F20C[] = { 0xFA0, -0xFA0 }; @@ -313,7 +313,7 @@ s32 func_80A1E074(ObjSpinyroll* this, PlayState* play, Vec3f* arg2, s32 arg3) { if (BgCheck_EntityLineTest3(&play->colCtx, &spC8, &spBC, &spB0, &temp_s1->unk_04, true, false, false, true, &temp_s1->bgId, &this->dyna.actor, 0.0f)) { - if (arg3 && (this->dyna.actor.flags & ACTOR_FLAG_40)) { + if (arg3 && (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { func_80A1DA50(play, this, &spC8, &spB0); } @@ -400,7 +400,7 @@ s32 func_80A1E3D8(ObjSpinyroll* this, PlayState* play, f32* arg2, s32 arg3) { if (spC0(&play->colCtx, &spA0.y, &temp_s0->unk_04, &temp_s0->bgId, &spAC, this)) { temp_f20 = fabsf(spA0.y - spAC.y); if (temp_f20 <= 24.0f) { - if (arg3 && (this->dyna.actor.flags & ACTOR_FLAG_40)) { + if (arg3 && (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { spA0.x = spAC.x; spA0.z = spAC.z; func_80A1DA50(play, this, &spAC, &spA0); @@ -467,7 +467,7 @@ void ObjSpinyroll_Init(Actor* thisx, PlayState* play) { this->dyna.actor.scale.y = 0.1f; this->dyna.actor.scale.z = 0.1f; - this->dyna.actor.uncullZoneScale = 250.0f * sp44; + this->dyna.actor.cullingVolumeScale = 250.0f * sp44; DynaPolyActor_Init(&this->dyna, 0); DynaPolyActor_LoadMesh(play, &this->dyna, &object_spinyroll_Colheader_000E68); 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 7fa2fc7fec..b79ef56338 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) #define COS_OF_5_PI_DIV_8 -0.38268343f @@ -190,9 +190,9 @@ static ColliderJntSphInit sJntSphInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_STOP), }; static Color_RGB8 sSakonHideoutColor[2] = { { 250, 90, 60 }, { 255, 255, 255 } }; diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c index b00634cd3a..586698e520 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c @@ -6,7 +6,7 @@ #include "z_obj_swprize.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjSwprize_Init(Actor* thisx, PlayState* play); void ObjSwprize_Destroy(Actor* thisx, PlayState* play); 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 b7b170206e..37bb402528 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -9,7 +9,7 @@ #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" #include "assets/objects/object_syokudai/object_syokudai.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) void ObjSyokudai_Init(Actor* thisx, PlayState* play); void ObjSyokudai_Destroy(Actor* thisx, PlayState* play); @@ -70,9 +70,9 @@ static ColliderCylinderInit sFlameColliderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; static u8 sColMaterials[] = { COL_MATERIAL_METAL, COL_MATERIAL_WOOD, COL_MATERIAL_WOOD }; 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 491d54a367..85ed57d879 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 @@ -27,7 +27,7 @@ #include "z_obj_takaraya_wall.h" #include "assets/objects/object_takaraya_objects/object_takaraya_objects.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjTakarayaWall_Init(Actor* thisx, PlayState* play); void ObjTakarayaWall_Destroy(Actor* thisx, PlayState* play); @@ -299,7 +299,7 @@ void ObjTakarayaWall_Init(Actor* thisx, PlayState* play) { this->actor.shape.rot.z = 0; if (chest != NULL) { - chest->uncullZoneForward = 2000.0f; + chest->cullingVolumeDistance = 2000.0f; } sTakarayaWallHeights[0][column] = -10.0f; 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 83a28a247f..6077ba7f8c 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -56,9 +56,9 @@ static ColliderCylinderInit sCylinderInit = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 200, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 3300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 200, ICHAIN_STOP), }; bool func_80B9B6E0(ObjTaru* this, PlayState* play) { @@ -218,7 +218,7 @@ void ObjTaru_Init(Actor* thisx, PlayState* play) { if (params8000 == 0) { if (Item_CanDropBigFairy(play, OBJ_TARU_GET_3F(&this->dyna.actor), OBJ_TARU_GET_7F00(&this->dyna.actor))) { this->unk_1AC = 1; - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } if ((params8000 != 1) || (!func_80B9B6E0(this, play))) { @@ -276,7 +276,7 @@ void func_80B9C07C(ObjTaru* this, PlayState* play) { if (OBJ_TARU_GET_80(&this->dyna.actor)) { this->actionFunc = func_80B9C1A0; } else { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); this->dyna.actor.draw = NULL; this->actionFunc = func_80B9C174; 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 6fffdf1e22..0f5957ea41 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -7,7 +7,7 @@ #include "z_obj_toge.h" #include "assets/objects/object_trap/object_trap.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjToge_Init(Actor* thisx, PlayState* play); void ObjToge_Destroy(Actor* thisx, PlayState* play2); @@ -61,9 +61,9 @@ f32 D_809A4D0C[] = { 1.0f, 2.0f }; static InitChainEntry sInitChain[] = { ICHAIN_F32_DIV1000(terminalVelocity, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 150, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 150, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 150, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 150, ICHAIN_STOP), }; void func_809A41C0(ObjToge* this, PlayState* play) { @@ -296,7 +296,7 @@ void ObjToge_Update(Actor* thisx, PlayState* play) { } } - if ((this->actor.flags & ACTOR_FLAG_40) || (this->actor.xzDistToPlayer < 300.0f)) { + if ((this->actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME) || (this->actor.xzDistToPlayer < 300.0f)) { CollisionCheck_SetOC(play, &play->colChkCtx, &collider->base); } else { this->collider.base.ocFlags1 &= ~OC1_HIT; diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c index 2d0be5beca..b5ba11a992 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c @@ -9,7 +9,7 @@ #include "z64rumble.h" #include "assets/objects/object_tokei_step/object_tokei_step.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_IGNORE_LEGACY_POINT_LIGHTS) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_IGNORE_LEGACY_POINT_LIGHTS) void ObjTokeiStep_Init(Actor* thisx, PlayState* play); void ObjTokeiStep_Destroy(Actor* thisx, PlayState* play); @@ -45,9 +45,9 @@ static f32 sDustSpawnXOffsets[] = { -60.0f, -40.0f, -20.0f, 0.0f, 20.0f, 40.0f, static Vec3f sDustEffectAccel = { 0.0f, 0.3f, 0.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -251,7 +251,7 @@ void ObjTokeiStep_Open(ObjTokeiStep* this, PlayState* play) { } void ObjTokeiStep_SetupDoNothingOpen(ObjTokeiStep* this) { - this->dyna.actor.flags &= ~ACTOR_FLAG_10; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = ObjTokeiStep_DoNothingOpen; } diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c index 1df47876cd..40b35a7373 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c @@ -28,9 +28,9 @@ ActorProfile Obj_Tokei_Tobira_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -77,7 +77,7 @@ void ObjTokeiTobira_Init(Actor* thisx, PlayState* play) { if ((type == OBJTOKEITOBIRA_TYPE_0) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_59_04) && (play->sceneId == SCENE_CLOCKTOWER) && (gSaveContext.sceneLayer == 0) && (this->dyna.actor.csId > CS_ID_NONE)) { - this->dyna.actor.flags |= ACTOR_FLAG_10; + this->dyna.actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actionFunc = ObjTokeiTobira_StartCutscene; } } @@ -93,7 +93,7 @@ void ObjTokeiTobira_StartCutscene(ObjTokeiTobira* this) { CutsceneManager_StartWithPlayerCs(this->dyna.actor.csId, &this->dyna.actor); SET_WEEKEVENTREG(WEEKEVENTREG_59_04); this->actionFunc = NULL; - this->dyna.actor.flags &= ~ACTOR_FLAG_10; + this->dyna.actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } else { CutsceneManager_Queue(this->dyna.actor.csId); } diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c index 6920a6a9c6..481ffc4312 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c @@ -27,7 +27,7 @@ ActorProfile Obj_Tokei_Turret_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1200, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; @@ -41,7 +41,7 @@ void ObjTokeiTurret_Init(Actor* thisx, PlayState* play) { DynaPolyActor_Init(&this->dyna, 0); if ((tier == TURRET_TIER_BASE) || (tier == TURRET_TIER_TOP)) { - this->dyna.actor.uncullZoneDownward = this->dyna.actor.uncullZoneScale = 240.0f; + this->dyna.actor.cullingVolumeDownward = this->dyna.actor.cullingVolumeScale = 240.0f; if (tier == TURRET_TIER_BASE) { DynaPolyActor_LoadMesh(play, &this->dyna, &gClockTownTurretBaseCol); @@ -49,7 +49,7 @@ void ObjTokeiTurret_Init(Actor* thisx, PlayState* play) { DynaPolyActor_LoadMesh(play, &this->dyna, &gClockTownTurretPlatformCol); } } else { - this->dyna.actor.uncullZoneDownward = this->dyna.actor.uncullZoneScale = 1300.0f; + this->dyna.actor.cullingVolumeDownward = this->dyna.actor.cullingVolumeScale = 1300.0f; } } diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 2ae2738932..a8725ad80d 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -32,7 +32,7 @@ #include "z_obj_tokeidai.h" #include "assets/objects/object_obj_tokeidai/object_obj_tokeidai.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) #define GET_CURRENT_CLOCK_HOUR(this) ((s32)TIME_TO_HOURS_F((this)->clockTime)) #define GET_CURRENT_CLOCK_MINUTE(this) ((s32)((this)->clockTime * (360 * 2.0f / 0x10000)) % 30) @@ -74,9 +74,9 @@ ActorProfile Obj_Tokeidai_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 3300, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1100, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 3300, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 1100, ICHAIN_STOP), }; /** diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c index d96d5ae2b2..b14508877e 100644 --- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -7,7 +7,7 @@ #include "z_obj_toudai.h" #include "assets/objects/object_f53_obj/object_f53_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjToudai_Init(Actor* thisx, PlayState* play); void ObjToudai_Destroy(Actor* thisx, PlayState* play); 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 67ef0d50de..70d470e8bc 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -94,7 +94,7 @@ void ObjTree_Init(Actor* thisx, PlayState* play) { if (OBJTREE_ISLARGE(&this->dyna.actor)) { Actor_SetScale(&this->dyna.actor, 0.15f); - this->dyna.actor.uncullZoneForward = 4000.0f; + this->dyna.actor.cullingVolumeDistance = 4000.0f; } else { Actor_SetScale(&this->dyna.actor, 0.1f); DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); 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 7dea8f5006..c5c75ca23a 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -10,7 +10,7 @@ #include "assets/objects/object_tsubo/object_tsubo.h" #include "assets/objects/object_racetsubo/object_racetsubo.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_THROW_ONLY | ACTOR_FLAG_CAN_PRESS_SWITCHES) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_THROW_ONLY | ACTOR_FLAG_CAN_PRESS_SWITCHES) void ObjTsubo_Init(Actor* thisx, PlayState* play); void ObjTsubo_Destroy(Actor* thisx, PlayState* play2); @@ -94,9 +94,11 @@ static ColliderCylinderInit sCylinderInit = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), ICHAIN_F32(uncullZoneScale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 100, ICHAIN_STOP), + ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_CONTINUE), + ICHAIN_F32_DIV1000(terminalVelocity, -20000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 100, ICHAIN_STOP), }; bool func_809275C0(ObjTsubo* this, PlayState* play) { @@ -442,7 +444,7 @@ void func_80928928(ObjTsubo* this, PlayState* play) { void func_809289B4(ObjTsubo* this) { this->actor.draw = ObjTsubo_Draw; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->unk_195 = false; this->actionFunc = func_809289E4; } @@ -462,7 +464,7 @@ void func_809289E4(ObjTsubo* this, PlayState* play) { } if (Actor_HasParent(&this->actor, play)) { this->actor.room = -1; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; if ((type != OBJ_TSUBO_TYPE_3) && func_800A817C(OBJ_TSUBO_P003F(&this->actor))) { func_80927690(this, play); } @@ -499,7 +501,7 @@ void func_809289E4(ObjTsubo* this, PlayState* play) { if ((this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) && (DynaPoly_GetActor(&play->colCtx, this->actor.floorBgId) == NULL)) { this->unk_195 = true; - this->actor.flags &= ~ACTOR_FLAG_10; + this->actor.flags &= ~ACTOR_FLAG_UPDATE_CULLING_DISABLED; } } if ((this->actor.xzDistToPlayer < 800.0f) || (gSaveContext.save.entrance == ENTRANCE(GORON_RACETRACK, 1))) { @@ -620,7 +622,7 @@ void func_80928F18(ObjTsubo* this, PlayState* play) { void func_809291DC(ObjTsubo* this) { this->actor.draw = NULL; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; Math_Vec3f_Copy(&this->actor.world.pos, &this->actor.home.pos); this->actor.shape.rot.z = 0; @@ -677,7 +679,7 @@ void ObjTsubo_Update(Actor* thisx, PlayState* play) { if (!this->unk_197) { if (this->unk_198) { play->actorCtx.flags |= ACTORCTX_FLAG_3; - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; } if (this->unk_19A >= 0) { if (this->unk_19A == 0) { 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 a81ae0708c..75bf7083d1 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -10,7 +10,9 @@ #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS \ + (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ + ACTOR_FLAG_DRAW_CULLING_DISABLED) /** * weekEventReg flags checked by this actor: @@ -632,8 +634,8 @@ void ObjUm_RotatePlayerView(ObjUm* this, PlayState* play, s16 angle) { } static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 300, ICHAIN_STOP), }; void ObjUm_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c index 25294b6017..d0befd3d67 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -7,7 +7,7 @@ #include "z_obj_usiyane.h" #include "assets/objects/object_obj_usiyane/object_obj_usiyane.h" -#define FLAGS (ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjUsiyane_Init(Actor* thisx, PlayState* play); void ObjUsiyane_Destroy(Actor* thisx, PlayState* play); @@ -34,9 +34,9 @@ PosRot D_80C08660[] = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneScale, 1200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 3000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 900, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeScale, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 900, ICHAIN_STOP), }; s32 ObjUsiyane_GetAlienSpawnTime(s32 alienIndex) { diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c index 827fc8afdf..34284ea9bb 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -26,9 +26,9 @@ ActorProfile Obj_Visiblock_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 200, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 150, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 200, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 150, ICHAIN_CONTINUE), ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; 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 9183eadc29..d568938f30 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -8,7 +8,7 @@ #include "assets/objects/object_spinyroll/object_spinyroll.h" #include "overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjVspinyroll_Init(Actor* thisx, PlayState* play); void ObjVspinyroll_Destroy(Actor* thisx, PlayState* play); @@ -69,8 +69,8 @@ f32 D_80A3D4B4[] = { 1.0f, 1.0f, -1.0f, -1.0f }; f32 D_80A3D4C4[] = { 29.0f, -29.0f, 29.0f, -29.0f }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 500, ICHAIN_STOP), }; s16 D_80A3D4DC[] = { 0xFA0, -0xFA0 }; @@ -195,7 +195,7 @@ s32 func_80A3C8D8(ObjVspinyroll* this, PlayState* play, Vec3f* arg2, s32 arg3) { if (BgCheck_EntityLineTest3(&play->colCtx, &spD8, &spCC, &spC0, &unk_1A8->unk_000[i].collisionPoly, true, false, false, true, &unk_1A8->unk_000[i].bgId, &this->dyna.actor, 0.0f)) { - if ((arg3 != 0) && (this->dyna.actor.flags & ACTOR_FLAG_40)) { + if ((arg3 != 0) && (this->dyna.actor.flags & ACTOR_FLAG_INSIDE_CULLING_VOLUME)) { spA8.x = ptr->unk_00.x * 0.2f; spA8.y = ptr->unk_00.y; spA8.z = 20.0f; @@ -275,7 +275,7 @@ void ObjVspinyroll_Init(Actor* thisx, PlayState* play) { this->dyna.actor.shape.rot.z = 0; this->dyna.actor.scale.y = 0.1f * sp40; this->dyna.actor.scale.z = 0.1f; - this->dyna.actor.uncullZoneScale = 300.0f * sp40; + this->dyna.actor.cullingVolumeScale = 300.0f * sp40; this->dyna.actor.scale.x = 0.1f; DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c index a2a8e7851b..16b8377554 100644 --- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c @@ -7,7 +7,7 @@ #include "z_obj_wind.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjWind_Init(Actor* thisx, PlayState* play); void ObjWind_Destroy(Actor* thisx, PlayState* play); @@ -27,9 +27,9 @@ ActorProfile Obj_Wind_Profile = { }; static InitChainEntry sInitChain[] = { - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 4000, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 4000, ICHAIN_STOP), }; void ObjWind_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c index b027831d71..d19356848b 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c @@ -6,7 +6,7 @@ #include "z_obj_wturn.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_100000 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_100000 | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ObjWturn_Init(Actor* thisx, PlayState* play); void ObjWturn_Update(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c index bbf9da28da..617e6d9f94 100644 --- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c @@ -7,7 +7,7 @@ #include "z_obj_y2lift.h" #include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjY2lift_Init(Actor* thisx, PlayState* play); void ObjY2lift_Destroy(Actor* thisx, PlayState* play); @@ -28,9 +28,9 @@ ActorProfile Obj_Y2lift_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ObjY2lift_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c index e0cfcb9745..4cea1b2879 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -7,7 +7,7 @@ #include "z_obj_y2shutter.h" #include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) void ObjY2shutter_Init(Actor* thisx, PlayState* play); void ObjY2shutter_Destroy(Actor* thisx, PlayState* play); @@ -46,9 +46,9 @@ ShutterInfo sShutterInfo[] = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 800, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 800, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ObjY2shutter_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c index 2c8d03d478..5f4d0b3633 100644 --- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c @@ -7,7 +7,7 @@ #include "z_obj_yado.h" #include "assets/objects/object_yado_obj/object_yado_obj.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) void ObjYado_Init(Actor* thisx, PlayState* play); void ObjYado_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c index edd76ad2f9..7c47607d5b 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -30,9 +30,9 @@ ActorProfile Obj_Yasi_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 4000, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeScale, 400, ICHAIN_CONTINUE), + ICHAIN_F32(cullingVolumeDownward, 800, ICHAIN_STOP), }; void ObjYasi_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index 62543ed30d..98d935045c 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -7,7 +7,7 @@ #include "z_object_kankyo.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void ObjectKankyo_Init(Actor* thisx, PlayState* play); void ObjectKankyo_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 40b6659c9b..67cae12d2d 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -6,7 +6,7 @@ #include "z_oceff_spot.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffSpot_Init(Actor* thisx, PlayState* play2); void OceffSpot_Destroy(Actor* thisx, PlayState* play2); @@ -35,7 +35,7 @@ ActorProfile Oceff_Spot_Profile = { static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 0, ICHAIN_CONTINUE), - ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_STOP), + ICHAIN_F32(cullingVolumeDistance, 1500, ICHAIN_STOP), }; void OceffSpot_SetupAction(OceffSpot* this, OceffSpotActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index b8e63291b4..aff8d3995e 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -6,7 +6,7 @@ #include "z_oceff_storm.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffStorm_Init(Actor* thisx, PlayState* play); void OceffStorm_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index ef04c69f72..61dd6f49d5 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -6,7 +6,7 @@ #include "z_oceff_wipe.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe_Init(Actor* thisx, PlayState* play); void OceffWipe_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 2ba9eedeec..1a6594733b 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -6,7 +6,7 @@ #include "z_oceff_wipe2.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe2_Init(Actor* thisx, PlayState* play); void OceffWipe2_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 7b3b703f26..073ca60178 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -7,7 +7,7 @@ #include "prevent_bss_reordering.h" #include "z_oceff_wipe3.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe3_Init(Actor* thisx, PlayState* play); void OceffWipe3_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index d843b61344..b94631d19a 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -6,7 +6,7 @@ #include "z_oceff_wipe4.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe4_Init(Actor* thisx, PlayState* play); void OceffWipe4_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c index 30233844bc..0cf9461a57 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c @@ -6,7 +6,7 @@ #include "z_oceff_wipe5.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe5_Init(Actor* thisx, PlayState* play); void OceffWipe5_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c index 516b487627..8865fad48e 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c @@ -6,7 +6,7 @@ #include "z_oceff_wipe6.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe6_Init(Actor* thisx, PlayState* play); void OceffWipe6_Destroy(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c index 5c17395aa8..58afdc5da8 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c @@ -6,7 +6,7 @@ #include "z_oceff_wipe7.h" -#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_UPDATE_DURING_OCARINA) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffWipe7_Init(Actor* thisx, PlayState* play); void OceffWipe7_Destroy(Actor* thisx, PlayState* play); 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 97e0f3ef39..3d87fa1f32 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -56,7 +56,7 @@ void ShotSun_Init(Actor* thisx, PlayState* play) { if ((SHOTSUN_GET_TYPE(thisx) == SHOTSUN_FAIRY_SPAWNER_SUNS) || (SHOTSUN_GET_TYPE(thisx) == SHOTSUN_FAIRY_SPAWNER_STORMS)) { this->fairySpawnerState = SPAWNER_OUT_OF_RANGE; // never read after here - this->actor.flags |= ACTOR_FLAG_10; + this->actor.flags |= ACTOR_FLAG_UPDATE_CULLING_DISABLED; this->actor.flags |= ACTOR_FLAG_UPDATE_DURING_OCARINA; this->actionFunc = ShotSun_UpdateForOcarina; this->actor.flags |= ACTOR_FLAG_LOCK_ON_DISABLED; diff --git a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c index 9f1376a12f..1cf75ccb6b 100644 --- a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c @@ -9,7 +9,7 @@ #include "z64debug_display.h" #include "overlays/actors/ovl_En_Sw/z_en_sw.h" -#define FLAGS (ACTOR_FLAG_10) +#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) // Prototypes void TGSw_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 40ea39ba5c..5039217a76 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -20952,7 +20952,7 @@ void Player_CsAction_48(PlayState* play, Player* this, CsCmdActorCue* cue) { } if (!var_a0 && (playerCue == NULL)) { - this->actor.flags &= ~ACTOR_FLAG_40; + this->actor.flags &= ~ACTOR_FLAG_INSIDE_CULLING_VOLUME; return; } diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index e6967ab906..cc70b76fd4 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -823,8 +823,8 @@ 0x800B9E4C:("Actor_AddToLensActors",), 0x800B9E84:("Actor_DrawLensOverlay",), 0x800B9EF4:("Actor_DrawLensActors",), - 0x800BA2D8:("func_800BA2D8",), - 0x800BA2FC:("func_800BA2FC",), + 0x800BA2D8:("Actor_CullingCheck",), + 0x800BA2FC:("Actor_CullingVolumeTest",), 0x800BA42C:("Actor_DrawAll",), 0x800BA6FC:("Actor_KillAllWithMissingObject",), 0x800BA798:("func_800BA798",), diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index e42994022a..061c1dfbd7 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -337,8 +337,8 @@ asm/non_matchings/code/z_actor/Actor_ResetLensActors.s,Actor_ResetLensActors,0x8 asm/non_matchings/code/z_actor/Actor_AddToLensActors.s,Actor_AddToLensActors,0x800B9E4C,0xE asm/non_matchings/code/z_actor/Actor_DrawLensOverlay.s,Actor_DrawLensOverlay,0x800B9E84,0x1C asm/non_matchings/code/z_actor/Actor_DrawLensActors.s,Actor_DrawLensActors,0x800B9EF4,0xF9 -asm/non_matchings/code/z_actor/func_800BA2D8.s,func_800BA2D8,0x800BA2D8,0x9 -asm/non_matchings/code/z_actor/func_800BA2FC.s,func_800BA2FC,0x800BA2FC,0x4C +asm/non_matchings/code/z_actor/Actor_CullingCheck.s,Actor_CullingCheck,0x800BA2D8,0x9 +asm/non_matchings/code/z_actor/Actor_CullingVolumeTest.s,Actor_CullingVolumeTest,0x800BA2FC,0x4C asm/non_matchings/code/z_actor/Actor_DrawAll.s,Actor_DrawAll,0x800BA42C,0xB4 asm/non_matchings/code/z_actor/Actor_KillAllWithMissingObject.s,Actor_KillAllWithMissingObject,0x800BA6FC,0x27 asm/non_matchings/code/z_actor/func_800BA798.s,func_800BA798,0x800BA798,0x48