mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-09 18:43:45 +00:00
Code Issues Projects Releases Wiki Activity

z64 - c

Browse source
This commit is contained in:
fig02 2025-04-28 09:48:17 -04:00
parent 98e3b3869b
commit 1e3d6005ce
70 changed files with 88 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/actor.h
View file

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

6
include/z64camera.h → include/camera.h
View file

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

4
include/z64collision_check.h → include/collision_check.h
View file

@ -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"

4
include/z64curve.h → include/curve.h
View file

@ -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"

4
include/z64cutscene.h → include/cutscene.h
View file

@ -1,5 +1,5 @@
#ifndef Z64CUTSCENE_H
#define Z64CUTSCENE_H
#ifndef CUTSCENE_H
#define CUTSCENE_H
#include "ultra64.h"
#include "z64math.h"

6
include/z64cutscene_commands.h → include/cutscene_commands.h
View file

@ -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.

4
include/z64cutscene_flags.h → include/cutscene_flags.h
View file

@ -1,5 +1,5 @@
#ifndef Z64CUTSCENE_FLAGS_H
#define Z64CUTSCENE_FLAGS_H
#ifndef CUTSCENE_FLAGS_H
#define CUTSCENE_FLAGS_H
#include "ultra64.h"

4
include/z64cutscene_spline.h → include/cutscene_spline.h
View file

@ -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"

2
include/db_camera.h
View file

@ -2,7 +2,7 @@
#define DB_CAMERA_H
#include "ultra64.h"
#include "z64cutscene.h"
#include "cutscene.h"
#include "z64math.h"
struct Camera;

2
include/quake.h
View file

@ -1,7 +1,7 @@
#ifndef QUAKE_H
#define QUAKE_H
#include "z64camera.h"
#include "camera.h"
#include "z64math.h"
typedef struct ShakeInfo {

2
include/z64.h
View file

@ -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"

4
include/z64play.h
View file

@ -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"

2
src/code/code_n64dd_800AD4C0.c
View file

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

6
src/code/db_camera.c
View file

@ -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"

2
src/code/z_camera.c
View file

@ -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"

2
src/code/z_collision_btltbls.c
View file

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

2
src/code/z_collision_check.c
View file

@ -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"

4
src/code/z_cutscene_spline.c
View file

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

6
src/code/z_demo.c
View file

@ -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"

2
src/code/z_env_flags.c
View file

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

2
src/code/z_fcurve_data.c
View file

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

2
src/code/z_fcurve_data_skelanime.c
View file

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

2
src/code/z_kankyo.c
View file

@ -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"

2
src/code/z_play.c
View file

@ -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"

2
src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
View file

@ -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"

2
src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
View file

@ -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"

2
src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
View file

@ -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"

2
src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
View file

@ -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"

2
src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
View file

@ -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"

2
src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c
View file

@ -1,4 +1,4 @@
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
#include "z64player.h"
// clang-format off

2
src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c
View file

@ -1,4 +1,4 @@
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
#include "z64player.h"
// clang-format off

2
src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c
View file

@ -1,4 +1,4 @@
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
#include "z64player.h"
// clang-format off

2
src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c
View file

@ -1,5 +1,5 @@
#include "sequence.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
#include "z64player.h"
// clang-format off

2
src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c
View file

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

2
src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c
View file

@ -1,4 +1,4 @@
#include "z64collision_check.h"
#include "collision_check.h"
static ColliderJntSphElementInit sJntSphElementsInit[19] = {
{

2
src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c
View file

@ -1,4 +1,4 @@
#include "z64collision_check.h"
#include "collision_check.h"
static ColliderJntSphElementInit sJntSphElementsInit[9] = {
{

2
src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c
View file

@ -1,4 +1,4 @@
#include "z64collision_check.h"
#include "collision_check.h"
static ColliderJntSphElementInit sJntSphElementsInit[19] = {
{

2
src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c
View file

@ -1,4 +1,4 @@
#include "z64collision_check.h"
#include "collision_check.h"
static ColliderJntSphElementInit sJntSphElementsInitHand[11] = {
{

2
src/overlays/actors/ovl_Demo_Du/z_demo_du_cutscene_data.inc.c
View file

@ -1,5 +1,5 @@
#include "sequence.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
#include "z64player.h"
// clang-format off

4
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -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"

2
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
View file

@ -3,7 +3,7 @@
#include "ultra64.h"
#include "actor.h"
#include "z64curve.h"
#include "curve.h"
struct DemoEffect;

2
src/overlays/actors/ovl_Demo_Im/z_demo_im_cutscene_data.inc.c
View file

@ -1,5 +1,5 @@
#include "sequence.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
static CutsceneData gShadowMedallionCs[] = {

6
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
View file

@ -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"

2
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data1.c
View file

@ -1,4 +1,4 @@
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
CutsceneData gAdultWarpInCS[] = {

2
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data2.c
View file

@ -1,5 +1,5 @@
#include "z_demo_kankyo.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
CutsceneData gAdultWarpOutCS[] = {

2
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data3.c
View file

@ -1,5 +1,5 @@
#include "z_demo_kankyo.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
CutsceneData gAdultWarpInToTCS[] = {

2
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data4.c
View file

@ -1,5 +1,5 @@
#include "z_demo_kankyo.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
CutsceneData gAdultWarpOutToTCS[] = {

2
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data5.c
View file

@ -1,5 +1,5 @@
#include "z_demo_kankyo.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
CutsceneData gChildWarpInCS[] = {

2
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data6.c
View file

@ -1,5 +1,5 @@
#include "z_demo_kankyo.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
CutsceneData gChildWarpOutCS[] = {

2
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data7.c
View file

@ -1,5 +1,5 @@
#include "z_demo_kankyo.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
CutsceneData gChildWarpInToTCS[] = {

2
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo_cutscene_data8.c
View file

@ -1,5 +1,5 @@
#include "z_demo_kankyo.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
CutsceneData gChildWarpOutToTCS[] = {

2
src/overlays/actors/ovl_Demo_Sa/z_demo_sa_cutscene_data.inc.c
View file

@ -1,5 +1,5 @@
#include "z_demo_sa.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
static CutsceneData gForestMedallionCs[] = {

2
src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
View file

@ -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"

2
src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h
View file

@ -3,7 +3,7 @@
#include "ultra64.h"
#include "actor.h"
#include "z64curve.h"
#include "curve.h"
struct DemoTreLgt;

2
src/overlays/actors/ovl_Door_Ana/z_door_ana.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Box/z_en_box.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Jj/z_en_jj_cutscene_data.inc.c
View file

@ -1,5 +1,5 @@
#include "z_en_jj.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
static CutsceneData gJabuInhalingCs[] = {

2
src/overlays/actors/ovl_En_Mag/z_en_mag.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Nb/z_en_nb_cutscene_data.inc.c
View file

@ -1,5 +1,5 @@
#include "z_en_nb.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
static CutsceneData gSpiritMedallionCs[] = {

2
src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
View file

@ -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"

2
src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c
View file

@ -1,5 +1,5 @@
#include "sequence.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
#include "z64player.h"
// clang-format off

2
src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c
View file

@ -1,5 +1,5 @@
#include "z_en_ru1.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
static CutsceneData gRutoFirstMeetingCs[] = {

2
src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.inc.c
View file

@ -1,5 +1,5 @@
#include "z_en_ru2.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
// clang-format off
static CutsceneData gWaterMedallionCs[] = {

2
src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c
View file

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

2
src/overlays/actors/ovl_En_Zl1/z_en_zl1_cutscene_data.c
View file

@ -1,5 +1,5 @@
#include "sequence.h"
#include "z64cutscene_commands.h"
#include "cutscene_commands.h"
#include "z64player.h"
// clang-format off

2
src/overlays/actors/ovl_En_Zl4/z_en_zl4_cutscene_data.inc.c
View file

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

2
src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
View file

@ -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"

2
src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h
View file

@ -3,7 +3,7 @@
#include "ultra64.h"
#include "actor.h"
#include "z64curve.h"
#include "curve.h"
struct MagicWind;

2
src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
View file

@ -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"

2
tools/ZAPD/ZAPD/ZFile.cpp
View file

@ -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;
}