From 1e3d6005ce0ae60feaa4c484a5c76a977b2eb483 Mon Sep 17 00:00:00 2001 From: fig02 Date: Mon, 28 Apr 2025 09:48:17 -0400 Subject: [PATCH] z64 - c --- include/actor.h | 2 +- include/{z64camera.h => camera.h} | 6 +++--- include/{z64collision_check.h => collision_check.h} | 4 ++-- include/{z64curve.h => curve.h} | 4 ++-- include/{z64cutscene.h => cutscene.h} | 4 ++-- include/{z64cutscene_commands.h => cutscene_commands.h} | 6 +++--- include/{z64cutscene_flags.h => cutscene_flags.h} | 4 ++-- include/{z64cutscene_spline.h => cutscene_spline.h} | 4 ++-- include/db_camera.h | 2 +- include/quake.h | 2 +- include/z64.h | 2 +- include/z64play.h | 4 ++-- src/code/code_n64dd_800AD4C0.c | 2 +- src/code/db_camera.c | 6 +++--- src/code/z_camera.c | 2 +- src/code/z_collision_btltbls.c | 2 +- src/code/z_collision_check.c | 2 +- src/code/z_cutscene_spline.c | 4 ++-- src/code/z_demo.c | 6 +++--- src/code/z_env_flags.c | 2 +- src/code/z_fcurve_data.c | 2 +- src/code/z_fcurve_data_skelanime.c | 2 +- src/code/z_kankyo.c | 2 +- src/code/z_play.c | 2 +- src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 2 +- .../actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 2 +- .../actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c | 2 +- src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 2 +- src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 2 +- .../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 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c | 2 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c | 2 +- src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c | 2 +- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c | 2 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c | 2 +- src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c | 2 +- .../actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c | 4 ++-- src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h | 2 +- .../actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 6 +++--- .../actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c | 2 +- .../actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 2 +- src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h | 2 +- src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 2 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 2 +- src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 2 +- src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c | 2 +- .../actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c | 2 +- .../ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c | 2 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c | 2 +- src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c | 2 +- src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c | 2 +- src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h | 2 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 2 +- tools/ZAPD/ZAPD/ZFile.cpp | 2 +- 70 files changed, 88 insertions(+), 88 deletions(-) rename include/{z64camera.h => camera.h} (99%) rename include/{z64collision_check.h => collision_check.h} (99%) rename include/{z64curve.h => curve.h} (98%) rename include/{z64cutscene.h => cutscene.h} (99%) rename include/{z64cutscene_commands.h => cutscene_commands.h} (99%) rename include/{z64cutscene_flags.h => cutscene_flags.h} (83%) rename include/{z64cutscene_spline.h => cutscene_spline.h} (84%) diff --git a/include/actor.h b/include/actor.h index 6e5e96a261..cdca9814d9 100644 --- a/include/actor.h +++ b/include/actor.h @@ -6,7 +6,7 @@ #include "actor_profile.h" #include "animation.h" #include "z64math.h" -#include "z64collision_check.h" +#include "collision_check.h" #define ACTOR_NUMBER_MAX 200 diff --git a/include/z64camera.h b/include/camera.h similarity index 99% rename from include/z64camera.h rename to include/camera.h index 2fcbffdf5a..3a581406e6 100644 --- a/include/z64camera.h +++ b/include/camera.h @@ -1,8 +1,8 @@ -#ifndef Z64CAMERA_H -#define Z64CAMERA_H +#ifndef CAMERA_H +#define CAMERA_H #include "ultra64.h" -#include "z64cutscene.h" +#include "cutscene.h" #include "z64math.h" struct CollisionContext; diff --git a/include/z64collision_check.h b/include/collision_check.h similarity index 99% rename from include/z64collision_check.h rename to include/collision_check.h index 2c27563766..54dc8c9479 100644 --- a/include/z64collision_check.h +++ b/include/collision_check.h @@ -1,5 +1,5 @@ -#ifndef Z64COLLISION_CHECK_H -#define Z64COLLISION_CHECK_H +#ifndef COLLISION_CHECK_H +#define COLLISION_CHECK_H #include "ultra64.h" #include "z64math.h" diff --git a/include/z64curve.h b/include/curve.h similarity index 98% rename from include/z64curve.h rename to include/curve.h index 8fb83242ba..2ae1ff5c32 100644 --- a/include/z64curve.h +++ b/include/curve.h @@ -1,5 +1,5 @@ -#ifndef Z64_CURVE_H -#define Z64_CURVE_H +#ifndef CURVE_H +#define CURVE_H #include "ultra64/ultratypes.h" #include "z64math.h" diff --git a/include/z64cutscene.h b/include/cutscene.h similarity index 99% rename from include/z64cutscene.h rename to include/cutscene.h index f8aed368d4..ee8eadd9ac 100644 --- a/include/z64cutscene.h +++ b/include/cutscene.h @@ -1,5 +1,5 @@ -#ifndef Z64CUTSCENE_H -#define Z64CUTSCENE_H +#ifndef CUTSCENE_H +#define CUTSCENE_H #include "ultra64.h" #include "z64math.h" diff --git a/include/z64cutscene_commands.h b/include/cutscene_commands.h similarity index 99% rename from include/z64cutscene_commands.h rename to include/cutscene_commands.h index f0c8146cd1..14ec25c496 100644 --- a/include/z64cutscene_commands.h +++ b/include/cutscene_commands.h @@ -1,8 +1,8 @@ -#ifndef Z64CUTSCENE_COMMANDS_H -#define Z64CUTSCENE_COMMANDS_H +#ifndef CUTSCENE_COMMANDS_H +#define CUTSCENE_COMMANDS_H #include "command_macros_base.h" -#include "z64cutscene.h" +#include "cutscene.h" /** * Cutscene scripts are arrays of `CutsceneData` words, including bit-packed integers and floats. diff --git a/include/z64cutscene_flags.h b/include/cutscene_flags.h similarity index 83% rename from include/z64cutscene_flags.h rename to include/cutscene_flags.h index 5a3c7c2a7a..a6e34762af 100644 --- a/include/z64cutscene_flags.h +++ b/include/cutscene_flags.h @@ -1,5 +1,5 @@ -#ifndef Z64CUTSCENE_FLAGS_H -#define Z64CUTSCENE_FLAGS_H +#ifndef CUTSCENE_FLAGS_H +#define CUTSCENE_FLAGS_H #include "ultra64.h" diff --git a/include/z64cutscene_spline.h b/include/cutscene_spline.h similarity index 84% rename from include/z64cutscene_spline.h rename to include/cutscene_spline.h index 3a73949453..e08890a628 100644 --- a/include/z64cutscene_spline.h +++ b/include/cutscene_spline.h @@ -1,5 +1,5 @@ -#ifndef Z64CUTSCENE_SPLINE_H -#define Z64CUTSCENE_SPLINE_H +#ifndef CUTSCENE_SPLINE_H +#define CUTSCENE_SPLINE_H #include "ultra64.h" #include "z64math.h" diff --git a/include/db_camera.h b/include/db_camera.h index 81d8515d0b..bed8beec41 100644 --- a/include/db_camera.h +++ b/include/db_camera.h @@ -2,7 +2,7 @@ #define DB_CAMERA_H #include "ultra64.h" -#include "z64cutscene.h" +#include "cutscene.h" #include "z64math.h" struct Camera; diff --git a/include/quake.h b/include/quake.h index 0d97a5bf45..36f1d53075 100644 --- a/include/quake.h +++ b/include/quake.h @@ -1,7 +1,7 @@ #ifndef QUAKE_H #define QUAKE_H -#include "z64camera.h" +#include "camera.h" #include "z64math.h" typedef struct ShakeInfo { diff --git a/include/z64.h b/include/z64.h index b95e8e880a..03f38ad5c1 100644 --- a/include/z64.h +++ b/include/z64.h @@ -12,7 +12,7 @@ #include "z64play.h" #include "animation.h" #include "animation_legacy.h" -#include "z64curve.h" +#include "curve.h" #include "z64skin.h" #include "z64player.h" #include "z64ocarina.h" diff --git a/include/z64play.h b/include/z64play.h index a98d6e7773..75f0f4d96a 100644 --- a/include/z64play.h +++ b/include/z64play.h @@ -7,8 +7,8 @@ #include "transition_tile.h" #include "actor.h" #include "bgcheck.h" -#include "z64camera.h" -#include "z64cutscene.h" +#include "camera.h" +#include "cutscene.h" #include "z64environment.h" #include "z64frame_advance.h" #include "z64game.h" diff --git a/src/code/code_n64dd_800AD4C0.c b/src/code/code_n64dd_800AD4C0.c index 5593354cc2..219786f6d1 100644 --- a/src/code/code_n64dd_800AD4C0.c +++ b/src/code/code_n64dd_800AD4C0.c @@ -3,7 +3,7 @@ #include "regs.h" #include "segmented_address.h" #include "actor.h" -#include "z64cutscene.h" +#include "cutscene.h" #include "z64save.h" n64ddStruct_800FEE70_pointers D_800FEE70 = { diff --git a/src/code/db_camera.c b/src/code/db_camera.c index a275cae523..c6a0f8366d 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -10,9 +10,9 @@ #include "regs.h" #include "sfx.h" #include "z_lib.h" -#include "z64camera.h" -#include "z64cutscene.h" -#include "z64cutscene_spline.h" +#include "camera.h" +#include "cutscene.h" +#include "cutscene_spline.h" #include "z64debug.h" #include "z64debug_display.h" #include "z64olib.h" diff --git a/src/code/z_camera.c b/src/code/z_camera.c index f90be87924..f4e306558a 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -18,7 +18,7 @@ #include "z_lib.h" #include "zelda_arena.h" #include "audio.h" -#include "z64cutscene_spline.h" +#include "cutscene_spline.h" #include "z64debug.h" #include "z64olib.h" #include "z64play.h" diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index 5c2a210bcc..5b305764e6 100644 --- a/src/code/z_collision_btltbls.c +++ b/src/code/z_collision_btltbls.c @@ -1,7 +1,7 @@ #include "array_count.h" #include "printf.h" #include "translation.h" -#include "z64collision_check.h" +#include "collision_check.h" static DamageTable sDamageTablePresets[] = { { { diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index dcf07766e6..8df3367602 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -7,7 +7,7 @@ #include "terminal.h" #include "translation.h" #include "versions.h" -#include "z64collision_check.h" +#include "collision_check.h" #include "z64effect.h" #include "z64frame_advance.h" #include "zelda_arena.h" diff --git a/src/code/z_cutscene_spline.c b/src/code/z_cutscene_spline.c index 137f9f544c..fa261a0702 100644 --- a/src/code/z_cutscene_spline.c +++ b/src/code/z_cutscene_spline.c @@ -1,7 +1,7 @@ #include "ultra64.h" #include "z64math.h" -#include "z64camera.h" -#include "z64cutscene_spline.h" +#include "camera.h" +#include "cutscene_spline.h" // The code in this file is very similar to a spline system used in Super Mario 64 for cutscene camera movement diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 4b6c1d6742..f0760ae04c 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -22,9 +22,9 @@ #include "translation.h" #include "z_lib.h" #include "audio.h" -#include "z64camera.h" -#include "z64cutscene.h" -#include "z64cutscene_flags.h" +#include "camera.h" +#include "cutscene.h" +#include "cutscene_flags.h" #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" diff --git a/src/code/z_env_flags.c b/src/code/z_env_flags.c index 164ff1dde4..57f45ac9d3 100644 --- a/src/code/z_env_flags.c +++ b/src/code/z_env_flags.c @@ -1,6 +1,6 @@ #include "array_count.h" #include "ultra64.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64play.h" void CutsceneFlags_UnsetAll(PlayState* play) { diff --git a/src/code/z_fcurve_data.c b/src/code/z_fcurve_data.c index a1950a568b..774f4137f7 100644 --- a/src/code/z_fcurve_data.c +++ b/src/code/z_fcurve_data.c @@ -2,7 +2,7 @@ * File: z_fcurve_data.c * Description: Interpolation functions for use with Curve SkelAnime */ -#include "z64curve.h" +#include "curve.h" #define FCURVE_INTERP_CUBIC 0 // Interpolate using a Hermite cubic spline #define FCURVE_INTERP_NONE 1 // Return the value at the left endpoint instead of interpolating diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index a1dff4e6ee..7ebb1d27bd 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -33,7 +33,7 @@ #include "translation.h" #include "zelda_arena.h" #include "actor.h" -#include "z64curve.h" +#include "curve.h" #include "z64play.h" void SkelCurve_Clear(SkelCurve* skelCurve) { diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index d37a5ca737..962d56ce65 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -25,7 +25,7 @@ #include "versions.h" #include "z_lib.h" #include "audio.h" -#include "z64cutscene.h" +#include "cutscene.h" #include "z64frame_advance.h" #include "z64environment.h" #include "z64play.h" diff --git a/src/code/z_play.c b/src/code/z_play.c index 7bb6f1bbbe..d40a06b3b9 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -37,7 +37,7 @@ #include "z_actor_dlftbls.h" #include "zelda_arena.h" #include "audio.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64debug_display.h" #include "z64effect.h" #include "z64frame_advance.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 92fc3c57a8..9316964f82 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 @@ -14,7 +14,7 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64curve.h" +#include "curve.h" #include "z64play.h" #include "z64player.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 1892df9d9e..81a8f4e2ee 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 @@ -11,7 +11,7 @@ #include "sfx.h" #include "z_lib.h" #include "audio.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64play.h" #include "z64player.h" #include "z64save.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 c305635b83..7e8328b163 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 @@ -13,7 +13,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64light.h" #include "z64play.h" #include "z64player.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 574c2533d0..b3c2498ed3 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 @@ -17,7 +17,7 @@ #include "sys_math3d.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64effect.h" #include "z64play.h" #include "z64player.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 a3a3856969..cb3e7c724e 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 @@ -13,7 +13,7 @@ #include "sequence.h" #include "sfx.h" #include "sys_matrix.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64play.h" #include "z64player.h" #include "z64save.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 123a797a73..05bb71731c 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,4 +1,4 @@ -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" #include "z64player.h" // clang-format off 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 3e27901701..548467a51a 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,4 +1,4 @@ -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" #include "z64player.h" // clang-format off 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 3e5ccb4ea6..adedbf95ae 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,4 +1,4 @@ -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" #include "z64player.h" // clang-format off 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 c254318d42..dbe87e7e93 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,5 +1,5 @@ #include "sequence.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" #include "z64player.h" // clang-format off diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c index 3d0061bb35..ce2d694b11 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c @@ -1,4 +1,4 @@ -#include "z64collision_check.h" +#include "collision_check.h" static u8 D_808C7000[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c index 1012117e52..edd02bd7d9 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c @@ -1,4 +1,4 @@ -#include "z64collision_check.h" +#include "collision_check.h" static ColliderJntSphElementInit sJntSphElementsInit[19] = { { diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c index 3a432692fe..2323528180 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c @@ -1,4 +1,4 @@ -#include "z64collision_check.h" +#include "collision_check.h" static ColliderJntSphElementInit sJntSphElementsInit[9] = { { diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c index 1148cf1a99..8063245fa3 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c @@ -1,4 +1,4 @@ -#include "z64collision_check.h" +#include "collision_check.h" static ColliderJntSphElementInit sJntSphElementsInit[19] = { { diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c index 0016ff93d5..cb0e5012c1 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c @@ -1,4 +1,4 @@ -#include "z64collision_check.h" +#include "collision_check.h" static ColliderJntSphElementInit sJntSphElementsInitHand[11] = { { 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 ad83a24185..0645aca28e 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,5 +1,5 @@ #include "sequence.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" #include "z64player.h" // clang-format off 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 fcbc7279af..02394e4dc9 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -16,9 +16,9 @@ #include "versions.h" #include "z_lib.h" #include "audio.h" -#include "z64curve.h" +#include "curve.h" #include "z64draw.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64effect.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h index 449ed390fe..05747ff8dd 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "actor.h" -#include "z64curve.h" +#include "curve.h" struct DemoEffect; diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c index 7a9a0dde84..210fcdc5b7 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "sequence.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gShadowMedallionCs[] = { 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 35ffa63a36..179420a17a 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -10,9 +10,9 @@ #include "sys_matrix.h" #include "versions.h" #include "z_lib.h" -#include "z64cutscene_commands.h" -#include "z64cutscene_flags.h" -#include "z64cutscene_spline.h" +#include "cutscene_commands.h" +#include "cutscene_flags.h" +#include "cutscene_spline.h" #include "z64olib.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c index 4e17a4a53c..1a082a9cbc 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c @@ -1,4 +1,4 @@ -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gAdultWarpInCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c index 2a6e3f3e5d..439f78e05d 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gAdultWarpOutCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c index e742384ec2..d7d091cc55 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gAdultWarpInToTCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c index 53f2b5133a..731e9e286e 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gAdultWarpOutToTCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c index e1092b34dd..d9b6df92cb 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gChildWarpInCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c index 9e8a7c6bc6..69b239655c 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gChildWarpOutCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c index 3a718366c3..f4c06dbbc0 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gChildWarpInToTCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c index 84e12ec7a8..740639ab29 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c @@ -1,5 +1,5 @@ #include "z_demo_kankyo.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off CutsceneData gChildWarpOutToTCS[] = { diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c index 67edd6cb9f..5440aabf98 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "z_demo_sa.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gForestMedallionCs[] = { 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 c1f7983ce8..451b2605a9 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 @@ -5,7 +5,7 @@ #include "gfx_setupdl.h" #include "printf.h" #include "sfx.h" -#include "z64curve.h" +#include "curve.h" #include "z64play.h" #include "z64save.h" diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h index ace2988f3c..5b4947575b 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "actor.h" -#include "z64curve.h" +#include "curve.h" struct DemoTreLgt; 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 4034dafc91..8f29a2bf71 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -11,7 +11,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64play.h" #include "z64player.h" #include "z64save.h" 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 eafadae289..38595070a3 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -13,7 +13,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "audio.h" -#include "z64curve.h" +#include "curve.h" #include "z64effect.h" #include "z64ocarina.h" #include "z64play.h" diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c index 0cf56d63e6..35a67d6972 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "z_en_jj.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gJabuInhalingCs[] = { 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 e4dcc6a2e8..02a241fac3 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -21,7 +21,7 @@ #include "translation.h" #include "versions.h" #include "audio.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64play.h" #include "z64save.h" #include "z64ss_sram.h" diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c index 3c3a68311c..15d6ff298f 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "z_en_nb.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gSpiritMedallionCs[] = { 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 81ca7e8f54..a8e76af95a 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 @@ -12,7 +12,7 @@ #include "terminal.h" #include "versions.h" #include "audio.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64debug_display.h" #include "z64frame_advance.h" #include "z64play.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 2ff69c780e..460471578c 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,5 +1,5 @@ #include "sequence.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" #include "z64player.h" // clang-format off diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c index bce6bf6cac..32717457ef 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "z_en_ru1.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gRutoFirstMeetingCs[] = { diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c index 4efe6fb390..92b2634543 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c @@ -1,5 +1,5 @@ #include "z_en_ru2.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" // clang-format off static CutsceneData gWaterMedallionCs[] = { diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c index f6fac8940a..4c763e5583 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c @@ -1,4 +1,4 @@ -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" static CutsceneCameraDirection D_80B4D5C0[] = { { { -440.0f, 117.0f, 0.0f }, { -490.0f, 120.0f, 0.0f }, 0, 45 }, 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 4a8622cbba..988749fa49 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,5 +1,5 @@ #include "sequence.h" -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" #include "z64player.h" // clang-format off diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c index 933f7e0aaa..3819247d5c 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c @@ -1,4 +1,4 @@ -#include "z64cutscene_commands.h" +#include "cutscene_commands.h" static CutsceneCameraDirection sCamDirections[] = { { { -490.0f, 120.0f, 0.0f }, { -440.0f, 117.0f, 0.0f }, 0, 45 }, 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 57761244ba..11d85afbda 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -12,7 +12,7 @@ #include "gfx_setupdl.h" #include "printf.h" #include "sfx.h" -#include "z64curve.h" +#include "curve.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h index a0bfe26f03..6a186dcb56 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "actor.h" -#include "z64curve.h" +#include "curve.h" struct MagicWind; 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 13443bffdb..e274c5d286 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -19,7 +19,7 @@ #include "translation.h" #include "z_en_item00.h" #include "z_lib.h" -#include "z64cutscene_flags.h" +#include "cutscene_flags.h" #include "z64effect.h" #include "z64play.h" #include "z64save.h" diff --git a/tools/ZAPD/ZAPD/ZFile.cpp b/tools/ZAPD/ZAPD/ZFile.cpp index 281e6132f7..e3ae0e9632 100644 --- a/tools/ZAPD/ZAPD/ZFile.cpp +++ b/tools/ZAPD/ZAPD/ZFile.cpp @@ -903,7 +903,7 @@ std::string ZFile::GetZRoomHeaderInclude() const std::string headers; headers += "#include \"segment_symbols.h\"\n"; headers += "#include \"command_macros_base.h\"\n"; - headers += "#include \"z64cutscene_commands.h\"\n"; + headers += "#include \"cutscene_commands.h\"\n"; /* headers += "#include \"variables.h\"\n"; */ return headers; }