From eab34d32a151fb72690176a278a20d88791fbe22 Mon Sep 17 00:00:00 2001 From: fig02 Date: Mon, 28 Apr 2025 11:02:32 -0400 Subject: [PATCH] z64 - p --- include/n64dd.h | 2 +- include/{z64path.h => path.h} | 4 ++-- include/{z64pause.h => pause.h} | 4 ++-- include/{z64play.h => play_state.h} | 6 +++--- include/{z64player.h => player.h} | 4 ++-- include/z64.h | 4 ++-- include/z64scene.h | 2 +- src/code/db_camera.c | 4 ++-- src/code/flg_set.c | 2 +- src/code/game.c | 2 +- src/code/graph.c | 2 +- src/code/sys_math3d_draw.c | 2 +- src/code/z_actor.c | 2 +- src/code/z_bg_collect.c | 2 +- src/code/z_bg_item.c | 2 +- src/code/z_bgcheck.c | 4 ++-- src/code/z_camera.c | 6 +++--- src/code/z_cheap_proc.inc.c | 2 +- src/code/z_collision_check.c | 2 +- src/code/z_construct.c | 2 +- src/code/z_debug_display.c | 2 +- src/code/z_demo.c | 4 ++-- src/code/z_draw.c | 2 +- src/code/z_eff_shield_particle.c | 2 +- src/code/z_eff_spark.c | 2 +- src/code/z_eff_ss_dead.c | 2 +- src/code/z_effect.c | 2 +- src/code/z_effect_soft_sprite.c | 2 +- src/code/z_effect_soft_sprite_old_init.c | 4 ++-- src/code/z_elf_message.c | 4 ++-- src/code/z_en_a_keep.c | 2 +- src/code/z_en_item00.c | 4 ++-- src/code/z_env_flags.c | 2 +- src/code/z_face_reaction.c | 2 +- src/code/z_fcurve_data_skelanime.c | 2 +- src/code/z_game_dlftbls.c | 2 +- src/code/z_game_over.c | 2 +- src/code/z_horse.c | 4 ++-- src/code/z_inventory.c | 4 ++-- src/code/z_kaleido_manager.c | 2 +- src/code/z_kaleido_scope_call.c | 2 +- src/code/z_kaleido_setup.c | 2 +- src/code/z_kankyo.c | 4 ++-- src/code/z_lifemeter.c | 4 ++-- src/code/z_lights.c | 2 +- src/code/z_map_exp.c | 4 ++-- src/code/z_map_mark.c | 2 +- src/code/z_message.c | 4 ++-- src/code/z_olib.c | 2 +- src/code/z_onepointdemo.c | 6 +++--- src/code/z_parameter.c | 4 ++-- src/code/z_path.c | 4 ++-- src/code/z_play.c | 4 ++-- src/code/z_player_call.c | 4 ++-- src/code/z_player_lib.c | 4 ++-- src/code/z_quake.c | 4 ++-- src/code/z_rcp.c | 2 +- src/code/z_room.c | 4 ++-- src/code/z_sample.c | 2 +- src/code/z_scene.c | 4 ++-- src/code/z_scene_table.c | 4 ++-- src/code/z_sfx_source.c | 2 +- src/code/z_skelanime.c | 2 +- src/code/z_skin.c | 2 +- src/code/z_skin_awb.c | 2 +- src/code/z_vr_box.c | 2 +- src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c | 4 ++-- src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h | 2 +- src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c | 2 +- src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c | 2 +- src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c | 2 +- src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 4 ++-- src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c | 4 ++-- src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c | 2 +- src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c | 2 +- src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 2 +- src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 4 ++-- src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c | 2 +- src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 2 +- src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 2 +- src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 4 ++-- src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 4 ++-- src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 2 +- src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 4 ++-- .../actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c | 2 +- .../actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c | 4 ++-- src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c | 4 ++-- src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c | 2 +- .../actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c | 2 +- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 4 ++-- src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 4 ++-- src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c | 4 ++-- src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 2 +- .../actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c | 2 +- src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c | 4 ++-- src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c | 2 +- src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 4 ++-- src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 2 +- src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c | 2 +- src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c | 2 +- src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 4 ++-- .../actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 2 +- src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c | 4 ++-- .../actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c | 4 ++-- src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c | 2 +- src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 4 ++-- .../actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 2 +- src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c | 2 +- src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c | 2 +- .../ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c | 2 +- src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c | 4 ++-- .../actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c | 2 +- .../actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c | 4 ++-- src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c | 4 ++-- src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c | 2 +- src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c | 4 ++-- src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 2 +- src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c | 2 +- src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c | 2 +- src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c | 2 +- src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 2 +- .../actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c | 2 +- .../actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c | 4 ++-- .../actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 4 ++-- src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c | 4 ++-- .../actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c | 2 +- src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 2 +- .../actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c | 4 ++-- src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 2 +- .../actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c | 2 +- .../actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c | 2 +- src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c | 2 +- src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c | 2 +- src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c | 2 +- src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c | 4 ++-- src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 2 +- src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c | 2 +- src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 4 ++-- .../actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c | 4 ++-- src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c | 2 +- .../actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c | 2 +- src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 4 ++-- src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c | 2 +- .../actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c | 4 ++-- .../actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c | 4 ++-- src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c | 4 ++-- src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c | 2 +- src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c | 2 +- .../actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 4 ++-- src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c | 2 +- .../actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c | 4 ++-- src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c | 2 +- .../ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c | 2 +- .../actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c | 2 +- .../actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c | 2 +- .../actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c | 2 +- .../actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c | 4 ++-- src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c | 2 +- src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c | 2 +- .../actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c | 2 +- src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c | 2 +- .../ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c | 2 +- .../actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c | 4 ++-- src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 2 +- .../ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c | 2 +- src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 4 ++-- src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 2 +- src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 2 +- src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 4 ++-- src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 2 +- .../actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c | 4 ++-- .../actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c | 2 +- .../ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c | 2 +- src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 2 +- .../actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 2 +- src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c | 2 +- src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 4 ++-- .../actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c | 2 +- src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c | 4 ++-- src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c | 2 +- src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 4 ++-- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c | 2 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c | 2 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c | 2 +- src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 4 ++-- .../actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c | 2 +- src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c | 2 +- src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c | 2 +- src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c | 2 +- src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c | 2 +- src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c | 4 ++-- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 2 +- src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 4 ++-- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 4 ++-- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 4 ++-- src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c | 4 ++-- src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 4 ++-- src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c | 4 ++-- src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c | 4 ++-- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 4 ++-- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 4 ++-- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 4 ++-- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 2 +- src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 4 ++-- src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 4 ++-- .../actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 2 +- src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c | 2 +- src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c | 2 +- src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c | 2 +- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 4 ++-- src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 2 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 2 +- src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 2 +- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 4 ++-- src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 6 +++--- src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 2 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 4 ++-- src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c | 2 +- src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 2 +- src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 4 ++-- src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c | 4 ++-- src/overlays/actors/ovl_Door_Killer/z_door_killer.c | 4 ++-- src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c | 4 ++-- src/overlays/actors/ovl_Door_Toki/z_door_toki.c | 2 +- src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c | 4 ++-- src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c | 2 +- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 4 ++-- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 4 ++-- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 2 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 4 ++-- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 2 +- src/overlays/actors/ovl_En_Anubice/z_en_anubice.c | 4 ++-- src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c | 4 ++-- src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c | 2 +- src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c | 2 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 2 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.h | 2 +- src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c | 4 ++-- src/overlays/actors/ovl_En_Ba/z_en_ba.c | 4 ++-- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 4 ++-- src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c | 4 ++-- src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c | 4 ++-- src/overlays/actors/ovl_En_Bili/z_en_bili.c | 2 +- src/overlays/actors/ovl_En_Bird/z_en_bird.c | 2 +- src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c | 4 ++-- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 4 ++-- src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 4 ++-- src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c | 4 ++-- src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 4 ++-- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 4 ++-- src/overlays/actors/ovl_En_Boom/z_en_boom.c | 2 +- src/overlays/actors/ovl_En_Boom/z_en_boom.h | 2 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 4 ++-- src/overlays/actors/ovl_En_Brob/z_en_brob.c | 2 +- src/overlays/actors/ovl_En_Bubble/z_en_bubble.c | 2 +- src/overlays/actors/ovl_En_Butte/z_en_butte.c | 4 ++-- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 4 ++-- src/overlays/actors/ovl_En_Bx/z_en_bx.c | 4 ++-- src/overlays/actors/ovl_En_Changer/z_en_changer.c | 2 +- src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 4 ++-- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 4 ++-- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 4 ++-- src/overlays/actors/ovl_En_Cs/z_en_cs.c | 4 ++-- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 4 ++-- .../actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c | 4 ++-- src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c | 4 ++-- src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c | 2 +- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 4 ++-- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 4 ++-- src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c | 4 ++-- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 4 ++-- src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 4 ++-- src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 4 ++-- src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 4 ++-- src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c | 4 ++-- src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c | 4 ++-- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 2 +- src/overlays/actors/ovl_En_Door/z_en_door.c | 4 ++-- src/overlays/actors/ovl_En_Ds/z_en_ds.c | 4 ++-- src/overlays/actors/ovl_En_Du/z_en_du.c | 4 ++-- src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 2 +- src/overlays/actors/ovl_En_Eg/z_en_eg.c | 2 +- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 4 ++-- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 4 ++-- src/overlays/actors/ovl_En_Encount1/z_en_encount1.c | 4 ++-- src/overlays/actors/ovl_En_Encount2/z_en_encount2.c | 4 ++-- src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c | 4 ++-- src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 2 +- src/overlays/actors/ovl_En_Fd/z_en_fd.c | 4 ++-- src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 4 ++-- src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 4 ++-- src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 4 ++-- src/overlays/actors/ovl_En_Firefly/z_en_firefly.c | 4 ++-- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 4 ++-- src/overlays/actors/ovl_En_Floormas/z_en_floormas.c | 4 ++-- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 4 ++-- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 4 ++-- src/overlays/actors/ovl_En_Fw/z_en_fw.c | 4 ++-- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 2 +- src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c | 4 ++-- src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c | 2 +- src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c | 2 +- src/overlays/actors/ovl_En_Gb/z_en_gb.c | 4 ++-- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 4 ++-- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 4 ++-- src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 4 ++-- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 4 ++-- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 2 +- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 4 ++-- src/overlays/actors/ovl_En_Go/z_en_go.c | 4 ++-- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 4 ++-- src/overlays/actors/ovl_En_Goma/z_en_goma.c | 4 ++-- src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c | 4 ++-- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 4 ++-- src/overlays/actors/ovl_En_Guest/z_en_guest.c | 4 ++-- src/overlays/actors/ovl_En_Hata/z_en_hata.c | 2 +- src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c | 4 ++-- src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c | 4 ++-- src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c | 4 ++-- src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c | 4 ++-- src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c | 2 +- src/overlays/actors/ovl_En_Holl/z_en_holl.c | 4 ++-- src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c | 4 ++-- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 4 ++-- .../actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c | 4 ++-- src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c | 4 ++-- .../actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c | 4 ++-- src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c | 2 +- src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c | 4 ++-- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 4 ++-- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 2 +- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 4 ++-- src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 4 ++-- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 4 ++-- src/overlays/actors/ovl_En_In/z_en_in.c | 4 ++-- src/overlays/actors/ovl_En_Insect/z_en_insect.c | 4 ++-- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 2 +- src/overlays/actors/ovl_En_It/z_en_it.c | 2 +- src/overlays/actors/ovl_En_Jj/z_en_jj.c | 4 ++-- src/overlays/actors/ovl_En_Js/z_en_js.c | 2 +- src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c | 4 ++-- src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c | 4 ++-- src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c | 4 ++-- src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c | 4 ++-- src/overlays/actors/ovl_En_Kanban/z_en_kanban.c | 4 ++-- src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c | 4 ++-- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 4 ++-- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 2 +- src/overlays/actors/ovl_En_Kz/z_en_kz.c | 4 ++-- src/overlays/actors/ovl_En_Light/z_en_light.c | 2 +- src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c | 2 +- src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c | 2 +- src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c | 4 ++-- src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 4 ++-- src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 4 ++-- src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 4 ++-- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 2 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 4 ++-- src/overlays/actors/ovl_En_Md/z_en_md.c | 4 ++-- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 4 ++-- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 4 ++-- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 2 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 2 +- src/overlays/actors/ovl_En_Mu/z_en_mu.c | 2 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 4 ++-- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 4 ++-- src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 4 ++-- src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 4 ++-- src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c | 4 ++-- src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 2 +- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 2 +- src/overlays/actors/ovl_En_OE2/z_en_oe2.c | 2 +- .../actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c | 2 +- src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c | 4 ++-- .../ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c | 2 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 4 ++-- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 4 ++-- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 4 ++-- src/overlays/actors/ovl_En_Part/z_en_part.c | 4 ++-- src/overlays/actors/ovl_En_Peehat/z_en_peehat.c | 4 ++-- src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c | 2 +- src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c | 4 ++-- src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c | 4 ++-- src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c | 4 ++-- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 4 ++-- src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c | 2 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 4 ++-- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 4 ++-- src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c | 4 ++-- src/overlays/actors/ovl_En_Rl/z_en_rl.c | 4 ++-- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 4 ++-- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 4 ++-- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 4 ++-- src/overlays/actors/ovl_En_Sa/z_en_sa.c | 4 ++-- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 2 +- src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c | 2 +- src/overlays/actors/ovl_En_Sda/z_en_sda.c | 4 ++-- src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c | 2 +- src/overlays/actors/ovl_En_Si/z_en_si.c | 4 ++-- src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c | 4 ++-- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 4 ++-- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 4 ++-- src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c | 2 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 4 ++-- src/overlays/actors/ovl_En_St/z_en_st.c | 4 ++-- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 2 +- src/overlays/actors/ovl_En_Stream/z_en_stream.c | 4 ++-- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 4 ++-- src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c | 4 ++-- src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c | 4 ++-- src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c | 4 ++-- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 4 ++-- src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c | 2 +- src/overlays/actors/ovl_En_Tana/z_en_tana.c | 2 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 4 ++-- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 2 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 4 ++-- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 2 +- src/overlays/actors/ovl_En_Torch/z_en_torch.c | 2 +- src/overlays/actors/ovl_En_Torch2/z_en_torch2.c | 4 ++-- src/overlays/actors/ovl_En_Torch2/z_en_torch2.h | 2 +- src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 4 ++-- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 4 ++-- src/overlays/actors/ovl_En_Tr/z_en_tr.c | 2 +- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 2 +- src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 4 ++-- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 2 +- src/overlays/actors/ovl_En_Vase/z_en_vase.c | 2 +- src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 4 ++-- src/overlays/actors/ovl_En_Viewer/z_en_viewer.c | 2 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 4 ++-- src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 2 +- src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c | 4 ++-- src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c | 4 ++-- src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c | 4 ++-- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 4 ++-- src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c | 4 ++-- src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c | 2 +- src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 4 ++-- src/overlays/actors/ovl_En_Wood02/z_en_wood02.c | 4 ++-- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 +- .../actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 2 +- src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c | 2 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 4 ++-- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 4 ++-- src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c | 2 +- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 4 ++-- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 4 ++-- src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 4 ++-- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 4 ++-- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 4 ++-- src/overlays/actors/ovl_End_Title/z_end_title.c | 4 ++-- src/overlays/actors/ovl_Fishing/z_fishing.c | 4 ++-- src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c | 2 +- src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c | 2 +- src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c | 2 +- src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c | 2 +- src/overlays/actors/ovl_Item_Shield/z_item_shield.c | 4 ++-- src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c | 4 ++-- src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c | 4 ++-- src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c | 4 ++-- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 4 ++-- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 2 +- src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c | 2 +- src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 2 +- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 2 +- src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c | 2 +- src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c | 2 +- src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 2 +- src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c | 2 +- src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 2 +- src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 2 +- src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c | 4 ++-- src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 2 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 2 +- src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c | 2 +- src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 4 ++-- .../actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 2 +- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 2 +- src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c | 2 +- src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c | 2 +- src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 4 ++-- src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c | 2 +- src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c | 4 ++-- src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 2 +- src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c | 4 ++-- src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 4 ++-- src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c | 4 ++-- src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c | 4 ++-- src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c | 4 ++-- src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c | 4 ++-- src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 4 ++-- src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 4 ++-- src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 4 ++-- src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 2 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 4 ++-- src/overlays/actors/ovl_player_actor/z_player.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c | 2 +- src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c | 2 +- .../effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c | 2 +- .../effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c | 2 +- .../effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 2 +- .../effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c | 2 +- .../effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c | 2 +- .../effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c | 2 +- src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c | 2 +- .../effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c | 2 +- .../effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c | 4 ++-- .../effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c | 4 ++-- src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c | 2 +- .../effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c | 2 +- .../effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c | 2 +- .../effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c | 2 +- src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c | 2 +- .../effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c | 4 ++-- .../effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c | 2 +- .../effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c | 2 +- .../effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c | 2 +- src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c | 4 ++-- .../effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c | 2 +- .../effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c | 2 +- src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c | 4 ++-- .../effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c | 2 +- .../z_eff_ss_solder_srch_ball.c | 4 ++-- src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c | 4 ++-- src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c | 2 +- src/overlays/gamestates/ovl_file_choose/z_file_choose.c | 2 +- src/overlays/gamestates/ovl_opening/z_opening.c | 2 +- src/overlays/gamestates/ovl_select/z_select.c | 2 +- src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c | 2 +- src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c | 2 +- src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c | 4 ++-- src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c | 2 +- src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c | 2 +- src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c | 2 +- src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c | 4 ++-- src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h | 2 +- src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c | 2 +- tools/ZAPDConfigs/EnumData.xml | 2 +- 553 files changed, 840 insertions(+), 840 deletions(-) rename include/{z64path.h => path.h} (92%) rename include/{z64pause.h => pause.h} (99%) rename include/{z64play.h => play_state.h} (99%) rename include/{z64player.h => player.h} (99%) diff --git a/include/n64dd.h b/include/n64dd.h index acbe6ef38b..669d9ec901 100644 --- a/include/n64dd.h +++ b/include/n64dd.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "ultra64/leo.h" -#include "z64pause.h" +#include "pause.h" #include "z64scene.h" #include "map_mark.h" #include "versions.h" diff --git a/include/z64path.h b/include/path.h similarity index 92% rename from include/z64path.h rename to include/path.h index 5242317b8d..56918762d7 100644 --- a/include/z64path.h +++ b/include/path.h @@ -1,5 +1,5 @@ -#ifndef Z64PATH_H -#define Z64PATH_H +#ifndef PATH_H +#define PATH_H #include "ultra64.h" #include "z_math.h" diff --git a/include/z64pause.h b/include/pause.h similarity index 99% rename from include/z64pause.h rename to include/pause.h index fa6033aac4..8d82bb7785 100644 --- a/include/z64pause.h +++ b/include/pause.h @@ -1,5 +1,5 @@ -#ifndef Z64PAUSE_H -#define Z64PAUSE_H +#ifndef PAUSE_H +#define PAUSE_H #include "animation.h" #include "message.h" diff --git a/include/z64play.h b/include/play_state.h similarity index 99% rename from include/z64play.h rename to include/play_state.h index 1765693c43..40f72e2963 100644 --- a/include/z64play.h +++ b/include/play_state.h @@ -1,5 +1,5 @@ -#ifndef Z64PLAY_H -#define Z64PLAY_H +#ifndef PLAY_STATE_H +#define PLAY_STATE_H #include "ultra64.h" @@ -17,7 +17,7 @@ #include "light.h" #include "message.h" #include "object.h" -#include "z64pause.h" +#include "pause.h" #include "z64room.h" #include "z64scene.h" #include "z64sfx_source.h" diff --git a/include/z64player.h b/include/player.h similarity index 99% rename from include/z64player.h rename to include/player.h index a4b658c9be..ec2f0512ab 100644 --- a/include/z64player.h +++ b/include/player.h @@ -1,5 +1,5 @@ -#ifndef Z64PLAYER_H -#define Z64PLAYER_H +#ifndef PLAYER_H +#define PLAYER_H #include "actor.h" #include "alignment.h" diff --git a/include/z64.h b/include/z64.h index 79b52d4163..a89005bea2 100644 --- a/include/z64.h +++ b/include/z64.h @@ -9,12 +9,12 @@ #include "sequence.h" #include "sys_matrix.h" #include "ultra64.h" -#include "z64play.h" +#include "play_state.h" #include "animation.h" #include "animation_legacy.h" #include "curve.h" #include "z64skin.h" -#include "z64player.h" +#include "player.h" #include "ocarina.h" #endif diff --git a/include/z64scene.h b/include/z64scene.h index cc70251ec3..a5c1b4a1c3 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -7,7 +7,7 @@ #include "environment.h" #include "light.h" #include "z_math.h" -#include "z64path.h" +#include "path.h" #include "command_macros_base.h" diff --git a/src/code/db_camera.c b/src/code/db_camera.c index b23238b006..11f86038c7 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -15,8 +15,8 @@ #include "cutscene_spline.h" #include "debug.h" #include "debug_display.h" -#include "olib.h.h" -#include "z64play.h" +#include "olib.h" +#include "play_state.h" #include "z64save.h" #define DEBUG_CAM_CONTROLLER_PORT 2 diff --git a/src/code/flg_set.c b/src/code/flg_set.c index 88f32a3e4e..306007a248 100644 --- a/src/code/flg_set.c +++ b/src/code/flg_set.c @@ -5,7 +5,7 @@ #include "gfx.h" #include "gfxalloc.h" #include "controller.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" typedef struct FlagSetEntry { diff --git a/src/code/game.c b/src/code/game.c index 5a79ab58c2..42b39b8249 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -29,7 +29,7 @@ #include "debug.h" #include "dma.h" #include "game.h" -#include "z64play.h" +#include "play_state.h" #include "z64vis.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" diff --git a/src/code/graph.c b/src/code/graph.c index c8bd2c07d8..3fd790ca59 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -28,7 +28,7 @@ #include "z_game_dlftbls.h" #include "audio.h" #include "z64save.h" -#include "z64play.h" +#include "play_state.h" #define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_TAIL_MAGIC 0x5678 diff --git a/src/code/sys_math3d_draw.c b/src/code/sys_math3d_draw.c index 7781a79e2e..2b8776ec68 100644 --- a/src/code/sys_math3d_draw.c +++ b/src/code/sys_math3d_draw.c @@ -1,5 +1,5 @@ #include "sys_math3d.h" -#include "z64play.h" +#include "play_state.h" void Math3D_DrawSphere(PlayState* play, Sphere16* sph) { } diff --git a/src/code/z_actor.c b/src/code/z_actor.c index b41522242c..4ae7e349d7 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -24,7 +24,7 @@ #include "effect.h" #include "light.h" #include "horse.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "z64skin_matrix.h" diff --git a/src/code/z_bg_collect.c b/src/code/z_bg_collect.c index 36e14e7117..dc9e7720a5 100644 --- a/src/code/z_bg_collect.c +++ b/src/code/z_bg_collect.c @@ -4,7 +4,7 @@ #include "ultra64.h" #include "actor.h" #include "bgcheck.h" -#include "z64player.h" +#include "player.h" #include "z64skin_matrix.h" /** diff --git a/src/code/z_bg_item.c b/src/code/z_bg_item.c index f0c9756c11..33cb0fbe82 100644 --- a/src/code/z_bg_item.c +++ b/src/code/z_bg_item.c @@ -1,7 +1,7 @@ #include "z_lib.h" #include "actor.h" #include "bgcheck.h" -#include "z64play.h" +#include "play_state.h" /** * @param transformFlags How other actors standing on the dynapoly actor's collision move when the dynapoly actor moves. diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 48d2a70519..ca29069fbb 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -10,8 +10,8 @@ #include "translation.h" #include "z_lib.h" #include "bgcheck.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64skin_matrix.h" #pragma increment_block_number "ntsc-1.0:152 ntsc-1.1:152 ntsc-1.2:152" diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 5d567d2e30..aa732571ef 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -20,9 +20,9 @@ #include "audio.h" #include "cutscene_spline.h" #include "debug.h" -#include "olib.h.h" -#include "z64play.h" -#include "z64player.h" +#include "olib.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" diff --git a/src/code/z_cheap_proc.inc.c b/src/code/z_cheap_proc.inc.c index e922c0832c..2daaa97601 100644 --- a/src/code/z_cheap_proc.inc.c +++ b/src/code/z_cheap_proc.inc.c @@ -1,7 +1,7 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" void Gfx_DrawDListOpa(PlayState* play, Gfx* dlist) { OPEN_DISPS(play->state.gfxCtx, "../z_cheap_proc.c", 214); diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 843b97755a..fb574f27e0 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -11,7 +11,7 @@ #include "effect.h" #include "frame_advance.h" #include "zelda_arena.h" -#include "z64play.h" +#include "play_state.h" #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" #include "z_lib.h" diff --git a/src/code/z_construct.c b/src/code/z_construct.c index ff9baad4f1..eff9d879f7 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -7,7 +7,7 @@ #include "lifemeter.h" #include "interface.h" #include "ocarina.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" void Interface_Destroy(PlayState* play) { diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index 44a45265d2..1481e22fe7 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -1,7 +1,7 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "debug_display.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_demo.c b/src/code/z_demo.c index f267072890..6f60d3a63c 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -26,8 +26,8 @@ #include "cutscene.h" #include "cutscene_flags.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h" diff --git a/src/code/z_draw.c b/src/code/z_draw.c index e8089371ef..35c61ebbf8 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -2,7 +2,7 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "draw.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_gi_key/object_gi_key.h" #include "assets/objects/object_gi_jewel/object_gi_jewel.h" diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index c01b02e46c..09ee1ed522 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -7,7 +7,7 @@ #include "translation.h" #include "effect.h" #include "light.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index 67e1aa0529..719ad3afcf 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -6,7 +6,7 @@ #include "sys_matrix.h" #include "translation.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index c752738725..b29cb0a32f 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -1,6 +1,6 @@ #include "gfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" void func_80026230(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) { f32 cos; diff --git a/src/code/z_effect.c b/src/code/z_effect.c index fe9047dd65..a725cd3172 100644 --- a/src/code/z_effect.c +++ b/src/code/z_effect.c @@ -3,7 +3,7 @@ #include "translation.h" #include "effect.h" #include "frame_advance.h" -#include "z64play.h" +#include "play_state.h" EffectContext sEffectContext; diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 368b32c302..363367a85c 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -7,7 +7,7 @@ #include "zelda_arena.h" #include "frame_advance.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info" diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 593f955dda..64a5428340 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -8,8 +8,8 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64skin_matrix.h" #include "overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h" diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index bb93099363..f1edc873c9 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -1,7 +1,7 @@ #include "libu64/debug.h" #include "rand.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64quest_hint.h" #include "z64quest_hint_commands.h" #include "z64save.h" diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 9b2bf7c0b7..12d31b4f0a 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -4,7 +4,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_d_hsblock/object_d_hsblock.h" diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 2cd72f8f38..f9f9dc1a8e 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -15,8 +15,8 @@ #include "draw.h" #include "effect.h" #include "item.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_env_flags.c b/src/code/z_env_flags.c index 57f45ac9d3..858061d4f5 100644 --- a/src/code/z_env_flags.c +++ b/src/code/z_env_flags.c @@ -1,7 +1,7 @@ #include "array_count.h" #include "ultra64.h" #include "cutscene_flags.h" -#include "z64play.h" +#include "play_state.h" void CutsceneFlags_UnsetAll(PlayState* play) { u8 i; diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c index b94e6e0cbd..470c454b7d 100644 --- a/src/code/z_face_reaction.c +++ b/src/code/z_face_reaction.c @@ -1,6 +1,6 @@ #include "ultra64.h" #include "face_reaction.h" -#include "z64player.h" +#include "player.h" u16 sMaskReactionSetTextIds[MASK_REACTION_SET_MAX][PLAYER_MASK_MAX] = { // MASK_REACTION_SET_CARPENTER_BOSS diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index 7ebb1d27bd..da1325ee17 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -34,7 +34,7 @@ #include "zelda_arena.h" #include "actor.h" #include "curve.h" -#include "z64play.h" +#include "play_state.h" void SkelCurve_Clear(SkelCurve* skelCurve) { skelCurve->limbCount = 0; diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c index 57efe90dfc..84fca6ba63 100644 --- a/src/code/z_game_dlftbls.c +++ b/src/code/z_game_dlftbls.c @@ -5,7 +5,7 @@ #include "setup_state.h" #include "title_setup_state.h" #include "z_game_dlftbls.h" -#include "z64play.h" +#include "play_state.h" // Linker symbol declarations (used in the table below) #define DEFINE_GAMESTATE(typeName, enumName, name) DECLARE_OVERLAY_SEGMENT(name) diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c index 107123195e..6b1fea6f0b 100644 --- a/src/code/z_game_over.c +++ b/src/code/z_game_over.c @@ -5,7 +5,7 @@ #include "sequence.h" #include "versions.h" #include "game_over.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" void GameOver_Init(PlayState* play) { diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 764eb46143..7758e1c6c8 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -5,8 +5,8 @@ #include "regs.h" #include "translation.h" #include "horse.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c index c31d4d926f..b742e53dcc 100644 --- a/src/code/z_inventory.c +++ b/src/code/z_inventory.c @@ -1,8 +1,8 @@ #include "ultra64.h" #include "printf.h" #include "translation.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/textures/icon_item_static/icon_item_static.h" diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index d9bca732e5..63bc6e0fdc 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -6,7 +6,7 @@ #include "segment_symbols.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #define KALEIDO_OVERLAY(name, nameString) \ { NULL, ROM_FILE(ovl_##name), _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, 0, nameString, } diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 2707db8265..0750098211 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -8,7 +8,7 @@ #include "regs.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" void (*sKaleidoScopeUpdateFunc)(PlayState* play); void (*sKaleidoScopeDrawFunc)(PlayState* play); diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index c053aabb16..e0806dadb5 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -6,7 +6,7 @@ #include "printf.h" #include "regs.h" #include "audio.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" /* diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 5a0c16215f..8fa2e49d14 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -28,8 +28,8 @@ #include "cutscene.h" #include "frame_advance.h" #include "environment.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 0d2afca2ed..6c0cc78398 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -4,8 +4,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "lifemeter.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/code/z_lights.c b/src/code/z_lights.c index e3b2589521..4059faacaa 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -4,7 +4,7 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "light.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index c22a8bda65..e4372b4958 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -13,8 +13,8 @@ #include "terminal.h" #include "translation.h" #include "map_mark.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 1faf8f8748..00020af412 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -11,7 +11,7 @@ #include "terminal.h" #include "translation.h" #include "map_mark.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/code/z_message.c b/src/code/z_message.c index ecb817a2de..91581a306d 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -20,8 +20,8 @@ #include "versions.h" #include "audio.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/code/z_olib.c b/src/code/z_olib.c index 392bce860a..1ee420025b 100644 --- a/src/code/z_olib.c +++ b/src/code/z_olib.c @@ -1,6 +1,6 @@ #include "z_math.h" #include "libc64/math64.h" -#include "olib.h.h" +#include "olib.h" #include "z_lib.h" /** diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 59f57b605b..885f5b776a 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -9,9 +9,9 @@ #include "terminal.h" #include "versions.h" #include "z_lib.h" -#include "olib.h.h" -#include "z64play.h" -#include "z64player.h" +#include "olib.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "overlays/actors/ovl_En_Sw/z_en_sw.h" diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 2c324d4ec2..75dd1253f1 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -21,8 +21,8 @@ #include "lifemeter.h" #include "horse.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/code/z_path.c b/src/code/z_path.c index e2e91c3d0b..f025f04499 100644 --- a/src/code/z_path.c +++ b/src/code/z_path.c @@ -2,8 +2,8 @@ #include "libc64/math64.h" #include "segmented_address.h" #include "actor.h" -#include "z64path.h" -#include "z64play.h" +#include "path.h" +#include "play_state.h" Path* Path_GetByIndex(PlayState* play, s16 index, s16 max) { Path* path; diff --git a/src/code/z_play.c b/src/code/z_play.c index aedc3fd3d9..08d14057ac 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -42,8 +42,8 @@ #include "effect.h" #include "frame_advance.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "z64vis.h" diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index 5e7dcdc41b..5838188ab6 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -1,8 +1,8 @@ #include "kaleido_manager.h" #include "actor.h" #include "actor_profile.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 7b680a708f..e2329e8347 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -8,8 +8,8 @@ #include "z_lib.h" #include "draw.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "z64skin_matrix.h" diff --git a/src/code/z_quake.c b/src/code/z_quake.c index cdc831653f..18ebfbcc38 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -4,8 +4,8 @@ #include "quake.h" #include "terminal.h" #include "z_lib.h" -#include "olib.h.h" -#include "z64play.h" +#include "olib.h" +#include "play_state.h" typedef struct QuakeRequest { /* 0x00 */ s16 index; diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 6228b51cf1..135ffa8876 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -5,7 +5,7 @@ #include "letterbox.h" #include "main.h" #include "regs.h" -#include "z64play.h" +#include "play_state.h" Gfx sSetupDL[SETUPDL_MAX][6] = { { diff --git a/src/code/z_room.c b/src/code/z_room.c index 0b330476a6..f92c497e99 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -20,8 +20,8 @@ #include "translation.h" #include "versions.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64room.h" #include "z64save.h" #include "z64skin_matrix.h" diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 4d2c8cb1d6..dc7c4836b0 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -5,7 +5,7 @@ #include "sample_state.h" #include "segment_symbols.h" #include "dma.h" -#include "z64play.h" +#include "play_state.h" void Sample_HandleStateChange(SampleState* this) { if (CHECK_BTN_ALL(this->state.input[0].press.button, BTN_START)) { diff --git a/src/code/z_scene.c b/src/code/z_scene.c index feef5ffc62..d122afd5bd 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -11,8 +11,8 @@ #include "versions.h" #include "z_actor_dlftbls.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "z64scene.h" diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index bca584ba5d..6920821d79 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -12,8 +12,8 @@ #include "versions.h" #include "z_lib.h" #include "frame_advance.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/scenes/indoors/miharigoya/miharigoya_scene.h" diff --git a/src/code/z_sfx_source.c b/src/code/z_sfx_source.c index 785afcde35..2a22967f62 100644 --- a/src/code/z_sfx_source.c +++ b/src/code/z_sfx_source.c @@ -2,7 +2,7 @@ #include "array_count.h" #include "sfx.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" void SfxSource_InitAll(PlayState* play) { diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 5bfe46d3c6..10e0df1a44 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -12,7 +12,7 @@ #include "zelda_arena.h" #include "animation.h" #include "animation_legacy.h" -#include "z64play.h" +#include "play_state.h" #define ANIM_INTERP 1 diff --git a/src/code/z_skin.c b/src/code/z_skin.c index 7c3a5167ce..f5e1587196 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -2,7 +2,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_math.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin.h" #include "z64skin_matrix.h" diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c index c1a3ce793b..798088c8a0 100644 --- a/src/code/z_skin_awb.c +++ b/src/code/z_skin_awb.c @@ -2,7 +2,7 @@ #include "segmented_address.h" #include "zelda_arena.h" #include "actor.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin.h" #include "z64skin_matrix.h" diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index 5c452a9918..e73033d572 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -7,7 +7,7 @@ #include "ultra64.h" #include "environment.h" #include "game.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" typedef struct SkyboxFaceParams { 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 9ca642d4e9..62594850af 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -7,8 +7,8 @@ #include "sfx.h" #include "sys_math.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z_lib.h" #include "assets/objects/object_link_boy/object_link_boy.h" diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h index aa5d979f59..d06019f040 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "actor.h" -#include "z64player.h" +#include "player.h" struct ArmsHook; 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 a92c226117..6041cd926d 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 953e0a333c..17b85445f6 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 100b8c20c1..5ca1a01a12 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 29ac159acd..4879b6bb9d 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -16,8 +16,8 @@ #include "translation.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_bdan_objects/object_bdan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index 0dcb302eaa..a27bb69c1f 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_bdan_objects/object_bdan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index bee0e2484c..a7ae0f3cc6 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -11,7 +11,7 @@ #include "regs.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_bowl/object_bowl.h" diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 6db143bdf8..a40a29242a 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 5ae9ff06e2..7900504f7f 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -19,7 +19,7 @@ #include "translation.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_bowl/object_bowl.h" 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 f36d251f45..19dc8e6acf 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/scenes/dungeons/ddan/ddan_scene.h" diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index fb910b56fd..71f37f61a5 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -11,7 +11,7 @@ #include "rand.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ddan_objects/object_ddan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 9a8669e535..81012e657a 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -14,7 +14,7 @@ #include "rumble.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ddan_objects/object_ddan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index fdc7377f69..66b82e5009 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -19,7 +19,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_ddan_objects/object_ddan_objects.h" 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 8490a47ddf..922762b2ee 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 @@ -22,8 +22,8 @@ #include "versions.h" #include "z_lib.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_dy_obj/object_dy_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index f8fa42033c..a79129cc9d 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -18,8 +18,8 @@ #include "terminal.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index c263ed5e3a..867c426923 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -14,7 +14,7 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h" diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 6c0f01b322..c546d461a1 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -11,8 +11,8 @@ #include "ichain.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_gjyo_objects/object_gjyo_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index b05734104c..d3f3ccae8b 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -9,7 +9,7 @@ #include "gfx.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index c49697f627..441870154f 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -11,8 +11,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index be680c60ab..2e587cde55 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -13,8 +13,8 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c index 98824a94e0..3a6aa26abb 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c @@ -6,7 +6,7 @@ #include "z_bg_gnd_nisekabe.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 261694d6ca..acb2bd4f80 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index f20af0b9f8..31bfcaf41a 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_haka/object_haka.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index a209637949..cdda12ba15 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index 711f526f63..4e6d67df94 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index a09195d6fe..a0c3e37a58 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -7,7 +7,7 @@ #include "z_bg_haka_megane.h" #include "ichain.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 7b06abe5ab..061cdaf5d5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -10,7 +10,7 @@ #include "one_point_cutscene.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index 768743b8fb..f5d9ef9581 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -10,8 +10,8 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index 126dcc7ee1..09c9e19c3e 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 631d3adba5..fbee695475 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -12,8 +12,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64skin_matrix.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 275455ce84..d4b20752d5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -15,7 +15,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index 581af06120..8143404e10 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 8e252275a4..5be3889889 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hakach_objects/object_hakach_objects.h" #include "assets/objects/object_haka_objects/object_haka_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 73cb5e31f1..88b063ae2c 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -23,8 +23,8 @@ #include "translation.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_heavy_object/object_heavy_object.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 0f0f99da70..f6b1cbacc4 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 0b0d25c8cd..412b2a5426 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -12,8 +12,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index 9394d4017b..9ca446025c 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index 2616f14ace..b8d10809f8 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -9,7 +9,7 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 47849aa850..b0ececf471 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index d20bccdb71..3f2e87ed3f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -20,7 +20,7 @@ #include "translation.h" #include "versions.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index a4fd5fab33..64159da59a 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -10,7 +10,7 @@ #include "rumble.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 8148f8ca0d..3559b572fb 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index a57af1062d..ff71d16fc0 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -17,7 +17,7 @@ #include "translation.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index bf5bc52317..0a40995bc5 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64skin_matrix.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index 0b64a4ff6b..110e20627c 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index 452c88f5f4..bb7cf7edf5 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index f166f9f4d8..a44cfa3491 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index d21b1e8212..a540872b96 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -8,7 +8,7 @@ #include "ichain.h" #include "sfx.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index 48f5197a2b..7398d9e8e0 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 9c4199179f..cc8f46a982 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -16,7 +16,7 @@ #include "translation.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index 20176f2758..8933b3c7a1 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -10,7 +10,7 @@ #include "one_point_cutscene.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 7194c81181..8f619e0ed2 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ice_objects/object_ice_objects.h" 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 e46139117c..ecb8b830a2 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_ingate/object_ingate.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 58cd7278ad..6486b9b773 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index ee9487d2ef..1147ed7e6f 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index f2955f3050..66cc92b98c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -12,7 +12,7 @@ #include "printf.h" #include "sys_matrix.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index 946db1b05c..9f23cd6231 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -11,8 +11,8 @@ #include "ichain.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 16e4c58690..6d524848e4 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -12,7 +12,7 @@ #include "translation.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_ATTENTION_ENABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index 64312e9b99..5e231d5414 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -14,7 +14,7 @@ #include "terminal.h" #include "translation.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 0a087d91d9..7e9e034da2 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -11,8 +11,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 6d6b13efb8..fb25354ccd 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -10,8 +10,8 @@ #include "ichain.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_goroiwa/object_goroiwa.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 5f80eddfd3..dd514e850b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_iron/object_jya_iron.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index f3f696b848..32063fa455 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -15,7 +15,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_iron/object_jya_iron.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 354c17b94b..6c5bc7cc66 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index dd8b162bd7..83e58b79b8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index 4df97aab23..da22420786 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -18,7 +18,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index e9cfd701a2..810b3ff9e1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -13,8 +13,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_jya_obj/object_jya_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 79102a7c12..e7c15409e6 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index ee3f35a1db..1b17110214 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -8,7 +8,7 @@ #include "ichain.h" #include "sfx.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c index ff13454557..43a922bd33 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c @@ -6,7 +6,7 @@ #include "z_bg_menkuri_nisekabe.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 7dc55fbe02..f169e236ac 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -17,7 +17,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index ae1dd32bc6..98de021dab 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index ed8fae2784..c8c325298c 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -8,7 +8,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index 3072207ece..03d4ac5628 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -8,8 +8,8 @@ #include "ichain.h" #include "sfx.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 2b5be14285..8bad01b034 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -17,7 +17,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mizu_objects/object_mizu_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index bf00812fc6..cd9fc555c7 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -11,7 +11,7 @@ #include "ichain.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mjin/object_mjin.h" #include "assets/objects/object_mjin_wind/object_mjin_wind.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index c0b7314bcb..697b1f72c9 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "translation.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index 798e3f77d7..2536370b2c 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -9,8 +9,8 @@ #include "sys_matrix.h" #include "translation.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 6bd947c3a0..a2b1193c30 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index 21b561a770..f1ae962844 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index 9316964f82..e06abd1114 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -15,8 +15,8 @@ #include "versions.h" #include "z_lib.h" #include "curve.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_box/object_box.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index eaeb6afc3e..7c68aa1b69 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index c47a01879f..3f41bf1e79 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index dccddcf49a..4c11347b9e 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -17,8 +17,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mori_objects/object_mori_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 7b5883c1fa..4d0433be14 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_po_sisters/object_po_sisters.h" diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index 4d0616ae7b..cf9c454583 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "light.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_syokudai/object_syokudai.h" diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index 3392a15f60..49f017a0f9 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -11,7 +11,7 @@ #include "ichain.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_pu_box/object_pu_box.h" diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 81a8f4e2ee..503cf13e63 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -12,8 +12,8 @@ #include "z_lib.h" #include "audio.h" #include "cutscene_flags.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_relay_objects/object_relay_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index 4a3a760d92..05edc90748 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -7,7 +7,7 @@ #include "z_bg_spot00_break.h" #include "ichain.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot00_break/object_spot00_break.h" diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index 26105204e3..50c096b891 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -15,8 +15,8 @@ #include "z_lib.h" #include "cutscene_flags.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index c1bfbea818..3470efe9d9 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 5a3e82d7ae..5613958289 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -17,7 +17,7 @@ #include "translation.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index 5329d2e0f6..ada73a08c7 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot01_objects/object_spot01_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 6dbdd910d5..75d2bb98f8 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "ichain.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index af7dec9c5d..42bff72f1a 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -10,7 +10,7 @@ #include "printf.h" #include "segmented_address.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h" diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 04ae3fd68e..e16b9f7915 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_spot02_objects/object_spot02_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index da84dcfac6..e77823866c 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -13,7 +13,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "audio.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot03_object/object_spot03_object.h" diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index edb253568d..4ef4d45e49 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -10,7 +10,7 @@ #include "one_point_cutscene.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot05_objects/object_spot05_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index d395b70639..c48a7e4c0f 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -16,7 +16,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot06_objects/object_spot06_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index afb9d02972..7fbe1478ea 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -11,7 +11,7 @@ #include "ichain.h" #include "sys_matrix.h" #include "versions.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot07_object/object_spot07_object.h" diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index ed66648f24..ce59f55d04 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/object_spot08_obj/object_spot08_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 17d9385b00..956a2093c7 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_spot08_obj/object_spot08_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 57b76c4147..da5fee0dfe 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -13,7 +13,7 @@ #include "printf.h" #include "sys_matrix.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot09_obj/object_spot09_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 96cff036c3..42dcc0ee73 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -13,7 +13,7 @@ #include "translation.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot11_obj/object_spot11_obj.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index d30f21cb5d..d4a2be3391 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -19,8 +19,8 @@ #include "z_lib.h" #include "cutscene_flags.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_spot11_obj/object_spot11_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index c4fc3fcdc4..190f964943 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot12_obj/object_spot12_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index f9a5253cea..48752674a0 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot12_obj/object_spot12_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index eb89d5f06a..f38351ca23 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -13,8 +13,8 @@ #include "sys_math3d.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_spot15_obj/object_spot15_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index c053a6c2d1..7af51b698e 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot15_obj/object_spot15_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 19e64d98f5..11092b4c90 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -16,8 +16,8 @@ #include "translation.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_spot16_obj/object_spot16_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index 3ea3dd67ad..1481d4bcf0 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_efc_doughnut/object_efc_doughnut.h" diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 7b7151a107..7c5546156c 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot17_obj/object_spot17_obj.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index b03edd8aae..2d32d0199b 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -12,7 +12,7 @@ #include "printf.h" #include "sys_matrix.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot17_obj/object_spot17_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index 4eb0597404..4f79fc5f39 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -13,7 +13,7 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index 21bc50671c..9a30eb90df 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -8,7 +8,7 @@ #include "ichain.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index d44a14de50..bb9a815dbd 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -14,8 +14,8 @@ #include "sys_math3d.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index a92e53a4f2..23f47ba298 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -10,7 +10,7 @@ #include "one_point_cutscene.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_spot18_obj/object_spot18_obj.h" diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index 1ddffb6c98..f2dfdc363f 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -13,8 +13,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_sst/object_sst.h" diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index 47550f22bd..a602bfa87d 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "ichain.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_toki_objects/object_toki_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index cb3e7c724e..47ff9a4323 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "cutscene_flags.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_toki_objects/object_toki_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c index 05bb71731c..efc039ced4 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c @@ -1,5 +1,5 @@ #include "cutscene_commands.h" -#include "z64player.h" +#include "player.h" // clang-format off CutsceneData gPullMasterSwordCs[] = { diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c index 548467a51a..4de0284695 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c @@ -1,5 +1,5 @@ #include "cutscene_commands.h" -#include "z64player.h" +#include "player.h" // clang-format off CutsceneData gPlaceMasterSwordCs[] = { diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c index adedbf95ae..9d40cf7b01 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c @@ -1,5 +1,5 @@ #include "cutscene_commands.h" -#include "z64player.h" +#include "player.h" // clang-format off CutsceneData gRevealMasterSwordCs[] = { diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index d4c2cb0bec..56ce494730 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "versions.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_spot04_objects/object_spot04_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c index dbe87e7e93..fda53b3d9c 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c @@ -1,6 +1,6 @@ #include "sequence.h" #include "cutscene_commands.h" -#include "z64player.h" +#include "player.h" // clang-format off CutsceneData gDekuTreeMeetingCs[] = { 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 63a73aaf4e..aefab25c8f 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -8,7 +8,7 @@ #include "ichain.h" #include "regs.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_umajump/object_umajump.h" diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c index 01d94f0f55..a3ef2197eb 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c @@ -16,7 +16,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_fd/object_fd.h" diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index f759a98148..1d563eda76 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ydan_objects/object_ydan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index becd2a11cc..b8682184a6 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -10,7 +10,7 @@ #include "one_point_cutscene.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ydan_objects/object_ydan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index b693cbf419..e6a1a261a2 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -17,8 +17,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_ydan_objects/object_ydan_objects.h" diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index 7a12637b9d..f607fb4150 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_zg/object_zg.h" diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 084c58ec93..017d0a6083 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -17,8 +17,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 78fa31b33e..e2ab108cd1 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -26,8 +26,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index 856f9e34ea..efc154e97f 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -23,8 +23,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_fd2/object_fd2.h" diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index af980a4ddb..c20f75cd47 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -22,8 +22,8 @@ #include "versions.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h" diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 64b7b9d238..457fbf405e 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -20,8 +20,8 @@ #include "versions.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ganon/object_ganon.h" diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 04ab634c4e..09f84081de 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -28,8 +28,8 @@ #include "z_lib.h" #include "effect.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_gnd/object_gnd.h" diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index bafb38c3e8..b4d827278c 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -27,8 +27,8 @@ #include "z_lib.h" #include "effect.h" #include "environment.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_goma/object_goma.h" diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 831005bea3..fc01cd580a 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -29,8 +29,8 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "z64skin_matrix.h" diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 5c5c444797..4a1cec61f3 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -24,8 +24,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "z64skin_matrix.h" diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index e2d6eeb3a8..9951a8ea45 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -18,8 +18,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "z64skin_matrix.h" diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index dcd9ea7af5..c13e382233 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -23,7 +23,7 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index ec91484dd0..076c395093 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -20,8 +20,8 @@ #include "audio.h" #include "effect.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_demo_6k/object_demo_6k.h" diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index dea8d49eac..6b05ed171d 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -13,8 +13,8 @@ #include "translation.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_du/object_du.h" diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c index 0645aca28e..1f8e223ba1 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c @@ -1,6 +1,6 @@ #include "sequence.h" #include "cutscene_commands.h" -#include "z64player.h" +#include "player.h" // clang-format off static CutsceneData gFireMedallionCs[] = { diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 7528a2a6a2..73c7be0710 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -14,7 +14,7 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_zo/object_zo.h" 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 9d44284c64..24b9edc605 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -20,7 +20,7 @@ #include "draw.h" #include "cutscene_flags.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 129b99d926..e01352ea20 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin.h" #include "assets/objects/object_fhg/object_fhg.h" diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 27cb963a4b..423535b4ea 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_geff/object_geff.h" diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index e79695b228..925bf15e0e 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -22,8 +22,8 @@ #include "z_lib.h" #include "draw.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_gj/object_gj.h" diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 4ea8f4b685..5c40aeabff 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -15,7 +15,7 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 81049195af..0873048491 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -17,7 +17,7 @@ #include "audio.h" #include "effect.h" #include "frame_advance.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_gt/object_gt.h" diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index 9cdb3d3a13..8d71a6f4a9 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -9,7 +9,7 @@ #include "terminal.h" #include "translation.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ik/object_ik.h" diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 0eef345821..b77c76abf2 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -18,8 +18,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h" 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 18946bb4d4..3d527557a0 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -13,9 +13,9 @@ #include "cutscene_commands.h" #include "cutscene_flags.h" #include "cutscene_spline.h" -#include "olib.h.h" -#include "z64play.h" -#include "z64player.h" +#include "olib.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index d52ab4faa8..2c2968bbc2 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -17,7 +17,7 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 38a44165d5..8400dd6f3e 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -18,8 +18,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_sa/object_sa.h" 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 b85f03122b..1c6ea8559b 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -11,7 +11,7 @@ #include "sequence.h" #include "sys_matrix.h" #include "audio.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) 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 451b2605a9..122e432294 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 @@ -6,7 +6,7 @@ #include "printf.h" #include "sfx.h" #include "curve.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_box/object_box.h" 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 8f29a2bf71..402c7223a1 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -12,8 +12,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "cutscene_flags.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index 2f9f4e1183..e186e20934 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_door_gerudo/object_door_gerudo.h" diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index e0f8d254a1..dc016d34b6 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_hidan_objects/object_hidan_objects.h" 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 9672dba395..3b2ce6b8a1 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -21,8 +21,8 @@ #include "versions.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index ceef1f93f6..5869c51b9c 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -7,7 +7,7 @@ #include "z_door_toki.h" #include "ichain.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_toki_objects/object_toki_objects.h" 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 ab8511a8f5..096e65e5a4 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -11,8 +11,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_warp1/object_warp1.h" diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 8a1bf2b7f3..4ae3ad0f7d 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -8,7 +8,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_efc_erupc/object_efc_erupc.h" 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 e8f9f26841..10875e547b 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -14,8 +14,8 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 22c96a08d4..bd3e67b2ea 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -14,8 +14,8 @@ #include "regs.h" #include "sys_matrix.h" #include "terminal.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" 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 f6beb6cc82..ffcac5eeae 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -14,7 +14,7 @@ #include "regs.h" #include "sys_matrix.h" #include "terminal.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 a5fb179a0f..483afa7215 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -17,8 +17,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_am/object_am.h" 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 8cc0d80692..21b50129a3 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_ani/object_ani.h" diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index 92b6383fd4..fb4c9b9d11 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -20,8 +20,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_anubice/object_anubice.h" diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 8975d75ad4..39cc72c383 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_anubice/object_anubice.h" diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index e48e091bd7..18790ee6ee 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -12,7 +12,7 @@ #include "terminal.h" #include "z_lib.h" #include "debug_display.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c index d4de5191ef..56b949ce7e 100644 --- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c +++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c @@ -7,7 +7,7 @@ #include "z_en_arow_trap.h" #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 8cb0be6c90..2e16fdb144 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -18,7 +18,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h index 2235048a92..e5d80928cd 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "actor.h" -#include "z64player.h" +#include "player.h" struct EnArrow; 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 9ef25d23ac..a7fd550149 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 @@ -16,8 +16,8 @@ #include "versions.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_niw/object_niw.h" diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 92a32938e3..462e8a5f1d 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_bxa/object_bxa.h" 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 7a1d07a9af..50fc2934d2 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -18,8 +18,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_Bb/object_Bb.h" diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 24d7fd492b..76462af1de 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" 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 ff745e94a4..318bc58b20 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -14,8 +14,8 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_bigokuta/object_bigokuta.h" diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 9af56b8751..221d6953c2 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -18,7 +18,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_bl/object_bl.h" diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c index c93d682ee1..771ee7dd15 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c @@ -8,7 +8,7 @@ #include "ichain.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_bird/object_bird.h" diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index 1d8d606cf3..813f16ce12 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "ichain.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_blkobj/object_blkobj.h" 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 9fa11a71dd..bf1c9ee479 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 8722a4815f..6c91544a47 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 @@ -11,8 +11,8 @@ #include "sfx.h" #include "terminal.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_bg/object_bg.h" diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index a911548df0..944b49608b 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -6,8 +6,8 @@ #include "sfx.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 fdab797a48..6e9dc91695 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 @@ -12,8 +12,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 e4448fbf5f..117343703e 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_bombf/object_bombf.h" 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 6569395bce..d70422b1d0 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h index 16b25a5078..f62edc7654 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "actor.h" -#include "z64player.h" +#include "player.h" struct EnBoom; 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 34dad978c6..780bb34ba3 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -16,8 +16,8 @@ #include "curve.h" #include "effect.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_box/object_box.h" diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index 10560f7613..1dc0ea5e6e 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -12,7 +12,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_brob/object_brob.h" diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 4c22361cea..30de9c5bbb 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -9,7 +9,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_bubble/object_bubble.h" 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 c206adfbf5..3c3b71c61d 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -17,8 +17,8 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 7502380f3c..ee17bb1f09 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -20,8 +20,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_bw/object_bw.h" diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index 7b418a6895..942cfdd6fb 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_bxa/object_bxa.h" diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c index 0e39b324ad..f9d93de2dc 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -14,7 +14,7 @@ #include "regs.h" #include "terminal.h" #include "debug_display.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #define FLAGS 0 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 6bcbd62323..f3b7f3dc19 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 @@ -10,8 +10,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 1bb30524b7..081ab279e9 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) 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 471e64af3f..21c586871c 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -8,8 +8,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_crow/object_crow.h" diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 2c4b934458..6c061dac70 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -9,8 +9,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_cs/object_cs.h" 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 cfb4576780..b2653e9e75 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -11,8 +11,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_daiku/object_daiku.h" diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index f570a83447..504a98bdc5 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_daiku/object_daiku.h" 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 f91fa326c6..01f8a11622 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -10,8 +10,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 bf80a93100..17b9cba9e8 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -13,7 +13,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_dekunuts/object_dekunuts.h" diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 69d163ceae..709ece13ec 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -20,8 +20,8 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_dh/object_dh.h" diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 5754d8ae1e..d80a312377 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -16,8 +16,8 @@ #include "versions.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_dh/object_dh.h" diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 5cbaa8289f..47b4214efa 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -21,8 +21,8 @@ #include "audio.h" #include "effect.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_zo/object_zo.h" 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 fc36b3b651..50b6de2318 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -15,8 +15,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_shopnuts/object_shopnuts.h" diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index 348e032a2c..c7cabe839a 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -20,8 +20,8 @@ #include "z_lib.h" #include "audio.h" #include "debug_display.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 1074b3cea0..bffabad846 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -23,8 +23,8 @@ #include "terminal.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_dns/object_dns.h" diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 749fdb1128..5c601ce345 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -24,8 +24,8 @@ #include "versions.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_dnk/object_dnk.h" diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index 5d2ad62ed9..671054e644 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -15,8 +15,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_dodojr/object_dodojr.h" 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 53de2d7b2e..c90ced4f44 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -13,8 +13,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_dodongo/object_dodongo.h" diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 0255b01626..08035f55c5 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_dog/object_dog.h" 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 6624a4e0f3..1063cee09c 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 3c879ee1ac..b2be4c2ef8 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -11,8 +11,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ds/object_ds.h" diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index fa4d098ae6..cc13809c1d 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -10,8 +10,8 @@ #include "audio.h" #include "face_reaction.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_du/object_du.h" 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 d65d703e68..e931a48508 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 @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_dy_obj/object_dy_obj.h" diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index b4da54551d..54bcfc865a 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -14,7 +14,7 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index b734018cbe..895f5ad2ca 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -8,8 +8,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_ei/object_ei.h" 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 b9ddc046f0..5450f60d85 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -22,8 +22,8 @@ #include "audio.h" #include "effect.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64quest_hint.h" #include "z64save.h" 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 75c04cbae6..4bc9e0c2b7 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -9,8 +9,8 @@ #include "translation.h" #include "z_lib.h" #include "debug_display.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED) 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 847f5d34a1..7104e65c0b 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -11,8 +11,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 54bcbcea35..312cfaae33 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -17,8 +17,8 @@ #include "terminal.h" #include "z_lib.h" #include "draw.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 828a0b2d04..ff03668e1d 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -13,7 +13,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index b2216347de..8050aef560 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -17,8 +17,8 @@ #include "versions.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_fw/object_fw.h" diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index b124094a2c..a26b54a64a 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -6,8 +6,8 @@ #include "rand.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 7caaaf6747..cba342b50f 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -22,8 +22,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_fhg/object_fhg.h" 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 d4191a212e..01c438612d 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 @@ -13,8 +13,8 @@ #include "z_lib.h" #include "debug_display.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_efc_star_field/object_efc_star_field.h" 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 36a6592034..795a88bdbd 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -18,8 +18,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_firefly/object_firefly.h" 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 20af3034f8..2331899db4 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -15,8 +15,8 @@ #include "terminal.h" #include "z_lib.h" #include "item.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 db1e377047..db7c0ea933 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -14,8 +14,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_wallmaster/object_wallmaster.h" diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index f74068dd9b..97061529d9 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -19,8 +19,8 @@ #include "effect.h" #include "light.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" 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 a61af9e3cf..e3b59d7bea 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -14,8 +14,8 @@ #include "z_lib.h" #include "face_reaction.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_fu/object_fu.h" diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index ba002aefbe..9d8b9e5aa3 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_fw/object_fw.h" 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 3549f7d1ab..716ed7187f 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 "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_fz/object_fz.h" diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index e3ecb1635b..38e03a8772 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -24,8 +24,8 @@ #include "audio.h" #include "debug_display.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index d40a9a446d..bb97512b5f 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -13,7 +13,7 @@ #include "sys_math.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index a002ce5e1b..6237f84e06 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "printf.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h" diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 81ae70f18d..16e4cb55b4 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -17,8 +17,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ps/object_ps.h" 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 fa1d02a518..3622eb254e 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -17,8 +17,8 @@ #include "z_lib.h" #include "face_reaction.h" #include "horse.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ge1/object_ge1.h" 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 4a96e040c3..65fb5fb52e 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -16,8 +16,8 @@ #include "z_lib.h" #include "effect.h" #include "horse.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_gla/object_gla.h" 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 25bf8e9de3..ad77c01118 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -14,8 +14,8 @@ #include "versions.h" #include "z_lib.h" #include "item.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_geldb/object_geldb.h" diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 7571381b0c..5800b468e7 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -19,8 +19,8 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_geldb/object_geldb.h" 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 524ded870c..b7adb90e62 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -12,7 +12,7 @@ #include "terminal.h" #include "z_lib.h" #include "draw.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 4b6a979b58..9ab8e65bd6 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -15,8 +15,8 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "terminal.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" 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 4f7f47630f..13f8807b87 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -11,8 +11,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 86deafd0d0..a3cc43896d 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -16,8 +16,8 @@ #include "z_lib.h" #include "audio.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 9cba6f9fdf..d13c4a85f8 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -19,8 +19,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_gol/object_gol.h" 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 8264d7adc6..93570dbc66 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -19,8 +19,8 @@ #include "terminal.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_goroiwa/object_goroiwa.h" 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 e7d1368b11..0125dbb6c8 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -17,8 +17,8 @@ #include "z_lib.h" #include "effect.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_gs/object_gs.h" diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 474912abb6..87f063e732 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_os_anime/object_os_anime.h" 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 27cd1341ce..2b4133c39f 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -12,7 +12,7 @@ #include "rand.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hata/object_hata.h" diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 4528a69195..e62eae0d89 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -20,8 +20,8 @@ #include "z_lib.h" #include "debug_display.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_sd/object_sd.h" diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 241a8789d8..5fde07079c 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -18,8 +18,8 @@ #include "terminal.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_sd/object_sd.h" diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 354c3f3058..757205da4f 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -13,8 +13,8 @@ #include "terminal.h" #include "versions.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_sd/object_sd.h" diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index 6c57fb6b9d..4f745b2609 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -5,8 +5,8 @@ #include "printf.h" #include "terminal.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_sd/object_sd.h" diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 454f83c2d0..72a6fb9d63 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -10,7 +10,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hintnuts/object_hintnuts.h" 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 c3f8fa40ad..7c136a520c 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -5,8 +5,8 @@ #include "ichain.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 a4caaf784e..2fa5d13382 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -18,8 +18,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" 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 ee75e3d740..fe33762cfa 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -26,8 +26,8 @@ #include "audio.h" #include "effect.h" #include "horse.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "z64skin_matrix.h" 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 eefef20798..83fc60e120 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 @@ -16,8 +16,8 @@ #include "sequence.h" #include "sys_math3d.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index e1991688a1..edced17c79 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -13,8 +13,8 @@ #include "sfx.h" #include "sys_math3d.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64skin.h" #include "assets/objects/object_horse_ganon/object_horse_ganon.h" 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 47b3b0b243..58cd3d1885 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 @@ -18,8 +18,8 @@ #include "z_lib.h" #include "actor.h" #include "horse.h" -#include "z64player.h" -#include "z64play.h" +#include "player.h" +#include "play_state.h" #include "z64save.h" #include "z64skin.h" diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 300711ff37..4a20e26644 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -17,7 +17,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "z64skin.h" #include "z64skin_matrix.h" diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index fb59c5b84a..2906e541cd 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_math3d.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_horse_zelda/object_horse_zelda.h" 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 935fdedd97..996743e95d 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -13,8 +13,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_hs/object_hs.h" diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 6906ea60ac..04a681d4c0 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -13,7 +13,7 @@ #include "terminal.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_hs/object_hs.h" diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 40d5731a36..cabd0e28ae 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -17,8 +17,8 @@ #include "z_lib.h" #include "audio.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_aob/object_aob.h" diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 55b00d8cf9..11af1012a8 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -16,8 +16,8 @@ #include "z_lib.h" #include "item.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 317fe6f563..66c0656d5f 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -23,8 +23,8 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "z64skin_matrix.h" 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 72227af9ea..886cc3a106 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -16,8 +16,8 @@ #include "z_lib.h" #include "audio.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_in/object_in.h" 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 8b961ff84d..74a701a9a9 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -17,8 +17,8 @@ #include "terminal.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 21ff7930b7..16ce926194 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -24,7 +24,7 @@ #include "z_lib.h" #include "effect.h" #include "item.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_En_It/z_en_it.c b/src/overlays/actors/ovl_En_It/z_en_it.c index 975fe8411f..2faea7fb6e 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.c +++ b/src/overlays/actors/ovl_En_It/z_en_it.c @@ -6,7 +6,7 @@ #include "z_en_it.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index 3f6b3c587c..2370aa4a64 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_jj/object_jj.h" 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 f5aee34c6a..a526f00398 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -11,7 +11,7 @@ #include "regs.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_js/object_js.h" diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 13ebc48f3e..1d02c22013 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -14,8 +14,8 @@ #include "sys_math.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) 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 c9708e2c34..c882fc3685 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -17,8 +17,8 @@ #include "terminal.h" #include "z_lib.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ka/object_ka.h" diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 5ae6731210..014cbd2ef7 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -15,8 +15,8 @@ #include "z_lib.h" #include "debug_display.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ka/object_ka.h" diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index a4035391d4..a07f05b431 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -17,8 +17,8 @@ #include "terminal.h" #include "z_lib.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ka/object_ka.h" 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 d0e384314e..46121adc9f 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -21,8 +21,8 @@ #include "z_lib.h" #include "effect.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 49fd1b1394..28c01b20d7 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_dekubaba/object_dekubaba.h" diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 2d342e9768..85df4ff102 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -16,8 +16,8 @@ #include "versions.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_fa/object_fa.h" 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 3f17f979e8..2b1daf0468 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -18,7 +18,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 60ab01971a..2ec01e0549 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -16,8 +16,8 @@ #include "versions.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_kz/object_kz.h" diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index b3756a6075..de3d8f747e 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "light.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index b4bd3af91b..097564b021 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -9,7 +9,7 @@ #include "regs.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_lightbox/object_lightbox.h" diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index 2097bb9d26..eef5e1c0b9 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -7,7 +7,7 @@ #include "z_en_m_fire1.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 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 a511b00922..e42d3ce99a 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 @@ -8,8 +8,8 @@ #include "z_lib.h" #include "audio.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index 3a250b2f0b..15aa5d0ffe 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -15,8 +15,8 @@ #include "audio.h" #include "face_reaction.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ma1/object_ma1.h" diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index 112c3fba1c..8f226abbcb 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -10,8 +10,8 @@ #include "audio.h" #include "face_reaction.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ma2/object_ma2.h" diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index aca1e76064..7dc159f3cf 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -15,8 +15,8 @@ #include "z_lib.h" #include "versions.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ma2/object_ma2.h" 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 02a241fac3..83afd0745d 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -22,7 +22,7 @@ #include "versions.h" #include "audio.h" #include "cutscene_flags.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "z64ss_sram.h" diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 59409ba189..745bef3aee 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -19,8 +19,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mb/object_mb.h" diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 690b7de3ff..b58933a8e8 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -16,8 +16,8 @@ #include "z_lib.h" #include "face_reaction.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_md/object_md.h" 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 fcf0c43b98..8c989fb329 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -12,8 +12,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_mk/object_mk.h" 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 686ef6192d..967ef2a42a 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_mm/object_mm.h" 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 d2f444a193..b743e38c30 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_mm/object_mm.h" diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 0d4c436054..8ef8632c2d 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -11,7 +11,7 @@ #include "ichain.h" #include "printf.h" #include "face_reaction.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_ms/object_ms.h" diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 3f460e0c60..9df3c04321 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -11,7 +11,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_mu/object_mu.h" 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 c77c657b8f..7c6454c62f 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -22,8 +22,8 @@ #include "translation.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_nb/object_nb.h" 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 d9dfa727f4..bba0c7713e 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -24,8 +24,8 @@ #include "versions.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_niw/object_niw.h" diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 6a2468f93f..7496d1bd38 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_gr/object_gr.h" diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 793ed13db6..3bc3c4c93d 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -13,8 +13,8 @@ #include "versions.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ane/object_ane.h" 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 2281a6d56a..2b98c852f6 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_dekunuts/object_dekunuts.h" 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 a5f322def6..4d5ec7f3ca 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 "gfx_setupdl.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_nwc/object_nwc.h" diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index e96b8b767e..a768eac1b7 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -12,7 +12,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_ny/object_ny.h" diff --git a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c index f568d1812b..1d6b8dec43 100644 --- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c +++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c @@ -6,7 +6,7 @@ #include "z_en_oe2.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) 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 2fba2f61b3..3e887b2daf 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 @@ -15,7 +15,7 @@ #include "cutscene_flags.h" #include "debug_display.h" #include "frame_advance.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 7b6577c174..5782fc16d3 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 @@ -17,8 +17,8 @@ #include "audio.h" #include "debug_display.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c index 460471578c..fde49023cd 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c @@ -1,6 +1,6 @@ #include "sequence.h" #include "cutscene_commands.h" -#include "z64player.h" +#include "player.h" // clang-format off CutsceneData gWindmillSpinningFasterCs[] = { 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 c92b17ad30..2a307b8203 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -9,8 +9,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_okuta/object_okuta.h" 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 9d70c9019a..d243f984c9 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -14,8 +14,8 @@ #include "sfx.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 a3cf50e2bd..299dd1c34f 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -23,8 +23,8 @@ #include "translation.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_owl/object_owl.h" 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 1bd4d9b160..27956fd3d4 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_tite/object_tite.h" #include "assets/objects/object_ik/object_ik.h" 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 6036586708..28dcf5b45b 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -13,8 +13,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_peehat/object_peehat.h" diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index 280e47caa5..ed2c3b07d4 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -15,7 +15,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "light.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_po_field/object_po_field.h" diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index f68d9622d9..ba4d8ab3c7 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -16,8 +16,8 @@ #include "z_lib.h" #include "effect.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index ca4182b953..1ae19e2de7 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -19,8 +19,8 @@ #include "z_lib.h" #include "effect.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_tk/object_tk.h" 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 c11652a9f0..b81fedc361 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 @@ -20,8 +20,8 @@ #include "audio.h" #include "effect.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_sisters/object_po_sisters.h" 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 54d49db8c8..853e6d1da1 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -16,8 +16,8 @@ #include "z_lib.h" #include "effect.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_poh/object_poh.h" diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index e984f316f7..5f72ceeb4d 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -8,7 +8,7 @@ #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_pu_box/object_pu_box.h" 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 81ad4f5e3c..cec48bb268 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -17,8 +17,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_rd/object_rd.h" diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index a2467d47c9..1558a69529 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -21,8 +21,8 @@ #include "z_lib.h" #include "debug_display.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_reeba/object_reeba.h" 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 2510613901..bcc0f1ef5d 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 @@ -11,8 +11,8 @@ #include "sfx.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index ff57761161..c304bc4fd8 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -14,8 +14,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_rl/object_rl.h" 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 b822d98780..9daa352787 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -20,8 +20,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_rr/object_rr.h" diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index a5158b57b1..3066194980 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -24,8 +24,8 @@ #include "z_lib.h" #include "effect.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ru1/object_ru1.h" diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 4f1af1e4ff..78349ca3c7 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -20,8 +20,8 @@ #include "translation.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ru2/object_ru2.h" diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index bc880cb4fc..837f1d10c6 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -8,8 +8,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_sa/object_sa.h" diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index da5678e328..73e05ff3a8 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -15,7 +15,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_sb/object_sb.h" diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c index 425b30b8f4..3ba16d656c 100644 --- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c +++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c @@ -8,7 +8,7 @@ #include "gfx.h" #include "gfx_setupdl.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 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 7cec1579b8..1276b7f5ee 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -11,8 +11,8 @@ #include "printf.h" #include "regs.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index 4e082fcd47..3d92efa6aa 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -13,7 +13,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_shopnuts/object_shopnuts.h" diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index f2f613b347..7c88b62214 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -10,8 +10,8 @@ #include "z_lib.h" #include "audio.h" #include "draw.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index e50c00aa93..b56bca6f67 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -16,8 +16,8 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_siofuki/object_siofuki.h" diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 9585b46846..887d672357 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -17,8 +17,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_skb/object_skb.h" diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 5e11f0d788..6dbd004b8b 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -17,8 +17,8 @@ #include "face_reaction.h" #include "ocarina.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_skj/object_skj.h" diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index 91e9273054..11c33d8469 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "ichain.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_skj/object_skj.h" 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 3b0f678117..9ccd47f6f3 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -8,8 +8,8 @@ #include "z_lib.h" #include "effect.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ssh/object_ssh.h" 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 2a018160ef..7a3536cd3e 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -15,8 +15,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_st/object_st.h" 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 9eb1679a56..f512b256bd 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_ahg/object_ahg.h" 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 118328e793..c8c301cb2d 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -13,8 +13,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_stream/object_stream.h" 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 a608a42fe1..ffe2806442 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -11,8 +11,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_st/object_st.h" diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 05e85675c7..6c15f1be23 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -10,8 +10,8 @@ #include "terminal.h" #include "z_lib.h" #include "debug_display.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 f2744b5d57..b836d6e3cf 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 @@ -10,8 +10,8 @@ #include "seqcmd.h" #include "sequence.h" #include "terminal.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ossan/object_ossan.h" diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 2c24a02291..304541f514 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -17,8 +17,8 @@ #include "terminal.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_niw/object_niw.h" diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index c94c1cc38d..e03483bcfd 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -23,8 +23,8 @@ #include "z_lib.h" #include "audio.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_ta/object_ta.h" diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 8d51dae459..263ed0a3a8 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -13,7 +13,7 @@ #include "segmented_address.h" #include "terminal.h" #include "versions.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_ts/object_ts.h" diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index ddb9e8d8d9..d8981c2d9a 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -11,7 +11,7 @@ #include "printf.h" #include "segmented_address.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_shop_dungen/object_shop_dungen.h" 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 0ef7970a3a..24a9c839db 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -17,8 +17,8 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_sk2/object_sk2.h" diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index fbe90db220..e0e7ef04b2 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -9,7 +9,7 @@ #include "gfx.h" #include "sys_matrix.h" #include "face_reaction.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_mu/object_mu.h" 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 757867655a..2afe18565d 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -20,8 +20,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_tite/object_tite.h" 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 e75013ea41..d1158551b7 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -18,7 +18,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c index 6e406c6bab..aeadcbf74b 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -7,7 +7,7 @@ #include "z_en_torch.h" #include "overlays/actors/ovl_En_Box/z_en_box.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 0387e09e3e..638bc1eea2 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -19,8 +19,8 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_torch2/object_torch2.h" diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h index 7ee2a67fd2..a45afbba4a 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h @@ -4,6 +4,6 @@ #include "ultra64.h" #include "actor.h" -// Uses the Player struct (from z64player.h) +// Uses the Player struct (from player.h) #endif diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 83c678caf6..ea8ff0a128 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -12,8 +12,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_toryo/object_toryo.h" diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 985cd60c04..7904591814 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -19,8 +19,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_tp/object_tp.h" diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index fbf7429db6..526760541b 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_tr/object_tr.h" diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 8b36bac23a..22b44abdfc 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -9,7 +9,7 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_trap/object_trap.h" 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 083272255f..779e0cf06f 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 @@ -15,8 +15,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index 0b18eda08f..ddc58e4956 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -16,7 +16,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_vali/object_vali.h" diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c index 30f8b32b18..4e8cec5ff4 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c @@ -6,7 +6,7 @@ #include "z_en_vase.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_vase/object_vase.h" diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 8791409d01..826d7f0ebe 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -15,8 +15,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_fd/object_fd.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 18031153f4..105853990e 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -21,7 +21,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "z64skin.h" 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 6fa677d39e..128a0af5f4 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -18,8 +18,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_vm/object_vm.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index 4782187eb4..204bd3530e 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -18,7 +18,7 @@ #include "z_lib.h" #include "debug_display.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 58de267e48..d63467c234 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -15,8 +15,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 ab75aa8e28..459894607b 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 @@ -12,8 +12,8 @@ #include "versions.h" #include "z_lib.h" #include "debug_display.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 96709c8385..52aa640198 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -14,8 +14,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_ei/object_ei.h" 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 483062c6f4..666f41f810 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -23,8 +23,8 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_wf/object_wf.h" diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index ffc2442923..7cfe974b8a 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -14,8 +14,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "debug_display.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index a64b7ba930..9aa52b312e 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -10,7 +10,7 @@ #include "regs.h" #include "terminal.h" #include "debug_display.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_LOCK_ON_DISABLED) diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index 78aa7ade36..f7558a8d99 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -11,8 +11,8 @@ #include "terminal.h" #include "debug_display.h" #include "item.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_LOCK_ON_DISABLED) 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 bf32807226..a089cca882 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64skin_matrix.h" #include "assets/objects/object_wood02/object_wood02.h" diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index f90f09f1c5..f90088f944 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -23,7 +23,7 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "z64skin_matrix.h" diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index 418a5c864d..101dce7825 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -15,7 +15,7 @@ #include "audio.h" #include "debug_display.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 39b6c688b0..772eceb114 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_yukabyun/object_yukabyun.h" diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 20d15852fb..95ce179258 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -20,8 +20,8 @@ #include "z_lib.h" #include "audio.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_zf/object_zf.h" 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 6ced3bbd6f..7811ac755e 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_zl1/object_zl1.h" diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c index 988749fa49..77709ec0fb 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c @@ -1,6 +1,6 @@ #include "sequence.h" #include "cutscene_commands.h" -#include "z64player.h" +#include "player.h" // clang-format off CutsceneData gTriforceCreationStartCs[] = { diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 4aa017db6e..0425ced130 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -19,8 +19,8 @@ #include "translation.h" #include "z_lib.h" #include "frame_advance.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_zl2/object_zl2.h" diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 33bd76f699..6828c9b9d8 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -26,8 +26,8 @@ #include "z_lib.h" #include "audio.h" #include "frame_advance.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" 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 197864b5c2..f8b7c704db 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -18,8 +18,8 @@ #include "z_lib.h" #include "audio.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_zl4/object_zl4.h" 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 949e9de8f4..742c59bbb7 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "face_reaction.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_zo/object_zo.h" diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 02e24ff540..f7788d3b35 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -20,8 +20,8 @@ #include "sequence.h" #include "sfx.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "z64skin.h" diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 3e2d26e509..d730c5049f 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -10,8 +10,8 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "versions.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 622f6258f0..5ed2e4fcc5 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -29,8 +29,8 @@ #include "versions.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "z64skin_matrix.h" #if PLATFORM_N64 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 a7d2170da4..3c636bc128 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 @@ -12,7 +12,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "item.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_gi_hearts/object_gi_hearts.h" 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 3a327bb31b..b78276a282 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -12,7 +12,7 @@ #include "rand.h" #include "draw.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index 445e983d56..4459188135 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -6,7 +6,7 @@ #include "z_item_inbox.h" #include "draw.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 3aea385cf8..21e31bbd0d 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "draw.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/scenes/overworld/spot00/spot00_scene.h" diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index e84486eed7..9dda7af3f0 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -17,8 +17,8 @@ #include "z_lib.h" #include "effect.h" #include "item.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index d2912c7ea5..1ca698ca49 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index f93ded2f02..f76046743b 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -12,8 +12,8 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 11d85afbda..69d589ea11 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -13,8 +13,8 @@ #include "printf.h" #include "sfx.h" #include "curve.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 1c357f5ed7..3682e28e7f 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -16,8 +16,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "light.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_mir_ray/object_mir_ray.h" 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 33f5135690..a66ec2a958 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -21,7 +21,7 @@ #include "z_lib.h" #include "cutscene_flags.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 8f24b7e647..5f76c6e02a 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -9,7 +9,7 @@ #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 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 208e0e9d01..1ebc95cff8 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -14,7 +14,7 @@ #include "sfx.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_bombiwa/object_bombiwa.h" 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 de4dcbe5f2..9430414f3e 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -15,7 +15,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index 2c77570a41..97c6a00dca 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/object_dekujr/object_dekujr.h" diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index 2163114cd2..f849298e10 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_d_elevator/object_d_elevator.h" 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 6800a6179b..97c898f466 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -16,7 +16,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" 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 f1f8000063..19091d4a7b 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -7,7 +7,7 @@ #include "z_obj_hana.h" #include "ichain.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" 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 c057c6b875..187bb4d184 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_d_hsblock/object_d_hsblock.h" 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 31b654a19c..3dac2d7fe4 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 @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 0edca3ec4b..62bc353c99 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -14,8 +14,8 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" 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 905b4f1505..a56c8f81e3 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -14,7 +14,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_kibako2/object_kibako2.h" 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 7e50f25ab6..a8da522c09 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -16,7 +16,7 @@ #include "translation.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_d_lift/object_d_lift.h" 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 0c48b6c3e5..30a14815b5 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -19,7 +19,7 @@ #include "terminal.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_lightswitch/object_lightswitch.h" 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 cd25733300..a8bc8a3f4b 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -8,8 +8,8 @@ #include "printf.h" #include "terminal.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 d7a80212c1..d68d390f10 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED 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 b86e27a258..a5c55ebed2 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -10,7 +10,7 @@ #include "libc64/qrand.h" #include "ichain.h" #include "printf.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 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 365a0e37c3..7dafb57326 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -10,7 +10,7 @@ #include "printf.h" #include "sys_math3d.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 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 51035c0678..ff37f4b8e1 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -10,7 +10,7 @@ #include "sys_math3d.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS 0 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 8c62e888f3..aef68ecfc1 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -18,8 +18,8 @@ #include "sys_matrix.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" 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 6eca379686..53395edc1a 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -8,7 +8,7 @@ #include "sfx.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 b21c99e2ea..3e1dab64e0 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -19,8 +19,8 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" 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 a189fe4345..9409ee0a52 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -15,7 +15,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_syokudai/object_syokudai.h" diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index 14081a9126..f348cc4cf7 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_timeblock/object_timeblock.h" 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 cede882789..039e49b462 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -15,8 +15,8 @@ #include "z_lib.h" #include "effect.h" #include "item.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_tsubo/object_tsubo.h" diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index e8065f1240..beb4e842e5 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -17,8 +17,8 @@ #include "terminal.h" #include "z_lib.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/object_timeblock/object_timeblock.h" 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 f4c7f8628f..afffbe3299 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -17,8 +17,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h" 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 90672b2c9d..b37d37ebf8 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -16,8 +16,8 @@ #include "z_lib.h" #include "light.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 5e236c86f4..042d3da212 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -9,8 +9,8 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 36177c0729..d0b5a922bb 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -12,8 +12,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 db8171b362..4373b0e9c0 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -12,8 +12,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 7aec9136f2..320d23556d 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -12,8 +12,8 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 0828ba289f..8b860cc0c1 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -12,7 +12,7 @@ #include "sys_matrix.h" #include "terminal.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 5bfee75f1f..483d53bb1e 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -18,8 +18,8 @@ #include "z_lib.h" #include "environment.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/scenes/overworld/spot06/spot06_scene.h" diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 40fe7fd827..c52ca03c77 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -47,7 +47,7 @@ #include "effect.h" #include "lifemeter.h" #include "ocarina.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "z64skin_matrix.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index a16b3c732d..aa9ae498eb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -12,7 +12,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index d2612f9c8b..52a6649c29 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index 74cf72c9bb..53f2bc82b1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -12,7 +12,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index ff1b613398..49f3ace0c1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index e3c78e6b22..12cde949aa 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "segmented_address.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/object_dodongo/object_dodongo.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index b834af4ae0..889105cb2e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -11,7 +11,7 @@ #include "segmented_address.h" #include "sfx.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index d4311156f9..ef425bee7e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -11,7 +11,7 @@ #include "gfx_setupdl.h" #include "printf.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index 62f9b1648d..5f6da1295f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -10,7 +10,7 @@ #include "gfx_setupdl.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c index efd8e1210a..ee30f8959a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.c @@ -8,7 +8,7 @@ #include "printf.h" #include "sfx.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #define rSfxId regs[10] #define rRepeatMode regs[11] // sound is replayed every update. unused in the original game diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c index 69a7858eb6..1e7e3ca2ed 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c @@ -13,7 +13,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index 6820568dca..e1acc6caff 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index e82555c62b..d632dfaa52 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -12,7 +12,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 3a6dc0a4aa..bf20003e4b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -15,7 +15,7 @@ #include "versions.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index 475d74ba24..f2eaceaee8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -11,7 +11,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_yabusame_point/object_yabusame_point.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index cd4ca3277b..c9bfbe981a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -11,7 +11,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index 0678a62e05..e60aed1cda 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -15,8 +15,8 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64skin.h" #include "assets/objects/object_fhg/object_fhg.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index fe810885aa..8a5e416a6a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -11,8 +11,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c index acd876aac8..9fc9d920dd 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c @@ -8,7 +8,7 @@ #include "segmented_address.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c index f3d96d744f..b37136a18c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c @@ -9,7 +9,7 @@ #include "libc64/qrand.h" #include "segmented_address.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index 40d19802a3..19f535ef71 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -11,7 +11,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_kingdodongo/object_kingdodongo.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 9ff312e88c..8a1c441b15 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -11,7 +11,7 @@ #include "segmented_address.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index 64fcf75662..39fd4e89c8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -12,7 +12,7 @@ #include "segmented_address.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c index f6a55402c8..5995c1b563 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c @@ -8,7 +8,7 @@ #include "segmented_address.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c index d461cbb25e..550c4a08d3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c @@ -12,8 +12,8 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c index b034eb88b2..789fc4300b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c @@ -11,7 +11,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index dcf2197d0a..4bad83b5f0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -12,7 +12,7 @@ #include "sys_math.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index c12ee6ed11..2207aeca18 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/object_fz/object_fz.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index 98f81a0fc1..ce06859168 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -11,7 +11,7 @@ #include "rand.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index 2d692449a0..d9be2d6d84 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -15,8 +15,8 @@ #include "sys_matrix.h" #include "versions.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define rReg0 regs[0] #define rGravity regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index b13af237b5..e39440e93f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index b84a82c73a..82d0679ad3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index eed03336b8..aecdd6c936 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -14,8 +14,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c index dc05d823bf..24e484c1ee 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c @@ -11,7 +11,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index a1c13566e9..beac5fd414 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -8,8 +8,8 @@ #include "bgcheck.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #define rUnused regs[1] diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index 294e4b43d8..ef19523daf 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -11,8 +11,8 @@ #include "sys_matrix.h" #include "z_lib.h" #include "effect.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/objects/object_link_boy/object_link_boy.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c index 3b8b28655a..ca0fdc571e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c @@ -13,7 +13,7 @@ #include "segmented_address.h" #include "sys_matrix.h" #include "effect.h" -#include "z64play.h" +#include "play_state.h" #include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index bf2eea367f..23eb903611 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -26,7 +26,7 @@ #include "z_lib.h" #include "audio.h" #include "environment.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "z64skybox.h" #include "z64sram.h" diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c index c644033351..58ecd99b7b 100644 --- a/src/overlays/gamestates/ovl_opening/z_opening.c +++ b/src/overlays/gamestates/ovl_opening/z_opening.c @@ -9,7 +9,7 @@ #include "sys_matrix.h" #include "title_setup_state.h" #include "game.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "z64sram.h" #include "z64view.h" diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 84b1cb69ae..8c8741fe9c 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -25,7 +25,7 @@ #include "terminal.h" #include "translation.h" #include "ultra64.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "z64sram.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index 1e2e5be021..71b1f7edf6 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -7,7 +7,7 @@ #include "regs.h" #include "sfx.h" #include "ocarina.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index a8433e9f2e..a26bce9326 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -6,7 +6,7 @@ #include "gfx_setupdl.h" #include "gfxalloc.h" #include "printf.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index b9a55b7eef..90c17d332e 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -6,8 +6,8 @@ #include "printf.h" #include "regs.h" #include "sfx.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/textures/icon_item_static/icon_item_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 97458d024f..7d14bd9949 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -7,7 +7,7 @@ #include "printf.h" #include "regs.h" #include "sfx.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c index c090b77fb9..2d24c6a806 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c @@ -9,7 +9,7 @@ #include "sfx.h" #include "sys_ucode.h" #include "versions.h" -#include "z64play.h" +#include "play_state.h" #include "z64save.h" #include "assets/textures/icon_item_24_static/icon_item_24_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c index 6264c4147c..265a122116 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_prompt.c @@ -3,7 +3,7 @@ #include "libu64/pad.h" #include "regs.h" #include "sfx.h" -#include "z64play.h" +#include "play_state.h" static s16 sKaleidoPromptCursorAlphaVals[] = { 100, 255 }; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index 9fc9c8f127..258a9955c1 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -23,8 +23,8 @@ #include "versions.h" #include "audio.h" #include "ocarina.h" -#include "z64play.h" -#include "z64player.h" +#include "play_state.h" +#include "player.h" #include "z64save.h" #include "assets/textures/icon_item_static/icon_item_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index efead4c6ea..1dfc68b2c3 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -4,7 +4,7 @@ #include "ultra64.h" #include "gfx.h" #include "inventory.h" -#include "z64pause.h" +#include "pause.h" struct PlayState; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c index ec2c566ece..05371b7149 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c @@ -5,7 +5,7 @@ #include "sys_matrix.h" #include "z_kaleido_scope.h" #include "z_lib.h" -#include "z64play.h" +#include "play_state.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/tools/ZAPDConfigs/EnumData.xml b/tools/ZAPDConfigs/EnumData.xml index 9955475b9d..545d002e7d 100644 --- a/tools/ZAPDConfigs/EnumData.xml +++ b/tools/ZAPDConfigs/EnumData.xml @@ -348,7 +348,7 @@ - +