z64 - p

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"

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"

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"

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"

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"

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

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"
 

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

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 {

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"

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

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) {
 }

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"
 

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"
 
 /**

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.

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"

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"
 

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);

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"

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) {

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"

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"

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"

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"

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"

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;

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;
 

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"
 

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"

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"

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"

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"

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;

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

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;

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)

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) {

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"
 

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"

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, }

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);

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"
 
 /*

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"

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"

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"
 

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"

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"

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"

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"
 
 /**

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"
 

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"

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;

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"
 

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 | \

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"
 

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;

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] = {
     {

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"

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)) {

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"
 

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"

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) {

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
 

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"
 

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"
 

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 {

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"

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;
 

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)
 

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)
 

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)
 

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"

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"
 

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"
 

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"
 

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"
 

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"

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"
 

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"
 

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"

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"

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)
 

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"

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"

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"
 

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"
 

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"
 

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"
 

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"
 

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"

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"

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"
 

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"

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"
 

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"

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"

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"

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"

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"
 

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"