From cbe814b25455f14a343a7457c4b1c92af40ede6a Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Fri, 4 Sep 2026 21:12:50 +0200 Subject: [PATCH] Apply includes style to `src/code/z_[r-z].*.c` (#2824) * Apply includes style to `src/code/z_[r-z].c` * fixup --- src/code/z_rcp.c | 7 ++++++- src/code/z_room.c | 24 +++++++++++++++++++---- src/code/z_rumble.c | 4 ++++ src/code/z_sample.c | 19 ++++++++++++++----- src/code/z_scene.c | 41 ++++++++++++++++++++++++++++------------ src/code/z_sfx_source.c | 5 ++++- src/code/z_skelanime.c | 21 +++++++++++++++----- src/code/z_skin.c | 12 +++++++++--- src/code/z_skin_matrix.c | 5 +++++ src/code/z_sram.c | 21 +++++++++++++------- src/code/z_ss_sram.c | 7 +++++-- src/code/z_view.c | 10 ++++++++-- src/code/z_vimode.c | 10 +++++++--- src/code/z_viscvg.c | 8 ++++++-- src/code/z_vismono.c | 13 ++++++++++--- src/code/z_viszbuffer.c | 8 ++++++-- src/code/z_vr_box.c | 13 +++++++++---- src/code/z_vr_box_draw.c | 5 ++++- 18 files changed, 176 insertions(+), 57 deletions(-) diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 76cc6c467c..389b534557 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -1,11 +1,16 @@ -#include "buffers.h" #include "gfx.h" #include "gfx_setupdl.h" + +#include "buffers.h" #include "gfxalloc.h" #include "letterbox.h" #include "main.h" #include "regs.h" #include "play_state.h" +#include "room.h" + +#include "ultra64.h" +#include Gfx sSetupDL[SETUPDL_MAX][6] = { { diff --git a/src/code/z_room.c b/src/code/z_room.c index ebcb9de743..729eec25fa 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -1,8 +1,15 @@ -#include "libu64/debug.h" -#include "ultra64/gs2dex.h" +#include "room.h" + +#include "versions.h" +#include "actor.h" +#include "alignment.h" #include "array_count.h" +#include "bgcheck.h" #include "buffers.h" +#include "camera.h" +#include "dma.h" #include "fault.h" +#include "game.h" #include "gfx.h" #include "gfx_setupdl.h" #include "jpeg.h" @@ -18,13 +25,22 @@ #include "sys_ucode.h" #include "terminal.h" #include "translation.h" -#include "versions.h" #include "audio.h" #include "play_state.h" #include "player.h" -#include "room.h" #include "save.h" +#include "scene.h" #include "skin_matrix.h" +#include "z_math.h" + +#include "libu64/debug.h" +#include "libu64/pad.h" +#include "ultra64.h" +#include "ultra64/gs2dex.h" +#include +#include +#include +#include Vec3f D_801270A0 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/code/z_rumble.c b/src/code/z_rumble.c index fcc39adee8..b60e31b8c5 100644 --- a/src/code/z_rumble.c +++ b/src/code/z_rumble.c @@ -15,6 +15,10 @@ #include "padmgr.h" #include "z_math.h" +#include "ultra64.h" +#include +#include + static s32 sUnused[4]; RumbleMgr sRumbleMgr; diff --git a/src/code/z_sample.c b/src/code/z_sample.c index dc7c4836b0..c5246e3482 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -1,11 +1,20 @@ +#include "sample_state.h" + +#include "controller.h" +#include "dma.h" +#include "game.h" #include "gfx.h" #include "gfx_setupdl.h" -#include "controller.h" -#include "regs.h" -#include "sample_state.h" -#include "segment_symbols.h" -#include "dma.h" #include "play_state.h" +#include "regs.h" +#include "segment_symbols.h" +#include "view.h" +#include "z_math.h" + +#include "ultra64.h" +#include +#include +#include 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 96fe9b9170..bfca970ac6 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -1,20 +1,37 @@ +#include "object.h" +#include "scene.h" + +#include "versions.h" +#include "actor.h" +#include "alignment.h" #include "array_count.h" #include "avoid_ub.h" -#include "printf.h" -#include "regs.h" -#include "romfile.h" -#include "seqcmd.h" -#include "segment_symbols.h" -#include "segmented_address.h" -#include "terminal.h" -#include "translation.h" -#include "versions.h" -#include "z_actor_dlftbls.h" -#include "z_lib.h" +#include "bgcheck.h" +#include "dma.h" +#include "environment.h" +#include "game.h" +#include "inventory.h" +#include "light.h" #include "play_state.h" #include "player.h" +#include "printf.h" +#include "regs.h" #include "save.h" -#include "scene.h" +#include "segment_symbols.h" +#include "segmented_address.h" +#include "seqcmd.h" +#include "sequence.h" +#include "terminal.h" +#include "translation.h" +#include "z_actor_dlftbls.h" +#include "z_lib.h" +#include "z_math.h" + +#include "ultra64.h" +#include +#include +#include +#include SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX]; RomFile sNaviQuestHintFiles[]; diff --git a/src/code/z_sfx_source.c b/src/code/z_sfx_source.c index 63022b9815..0b331ed794 100644 --- a/src/code/z_sfx_source.c +++ b/src/code/z_sfx_source.c @@ -1,9 +1,12 @@ #include "sfx_source.h" #include "array_count.h" -#include "sfx.h" #include "play_state.h" +#include "sfx.h" #include "skin_matrix.h" +#include "z_math.h" + +#include "ultra64/ultratypes.h" void SfxSource_InitAll(PlayState* play) { SfxSource* sources = &play->sfxSources[0]; diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 8fbc70ae46..019c9d61bd 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1,18 +1,29 @@ -#include "libu64/debug.h" +#include "animation.h" +#include "animation_legacy.h" + +#include "actor.h" +#include "alignment.h" #include "avoid_ub.h" +#include "dma.h" #include "gfx.h" +#include "play_state.h" #include "printf.h" #include "regs.h" -#include "segmented_address.h" #include "segment_symbols.h" +#include "segmented_address.h" #include "sys_matrix.h" #include "terminal.h" #include "translation.h" #include "z_lib.h" +#include "z_math.h" #include "zelda_arena.h" -#include "animation.h" -#include "animation_legacy.h" -#include "play_state.h" + +#include "libu64/debug.h" +#include "ultra64.h" +#include +#include +#include +#include #define ANIM_INTERP 1 diff --git a/src/code/z_skin.c b/src/code/z_skin.c index e5ddf71f46..634d270fd5 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -1,10 +1,16 @@ +#include "skin.h" + +#include "actor.h" #include "gfx.h" +#include "play_state.h" #include "segmented_address.h" +#include "skin_matrix.h" #include "sys_matrix.h" #include "z_math.h" -#include "play_state.h" -#include "skin.h" -#include "skin_matrix.h" + +#include "ultra64.h" +#include +#include MtxF gSkinLimbMatrices[60]; // holds matrices for each limb of the skeleton currently being drawn diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index 1dbb9a26b0..f00673420f 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -5,6 +5,11 @@ #include "terminal.h" #include "translation.h" #include "z_lib.h" +#include "z_math.h" + +#include "ultra64.h" +#include +#include // clang-format off MtxF sMtxFClear = { diff --git a/src/code/z_sram.c b/src/code/z_sram.c index e4e530718c..26f3db3ba8 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -1,21 +1,28 @@ #include "sram.h" -#include "array_count.h" -#include "file_select_state.h" -#include "controller.h" -#include "memory_utils.h" -#include "printf.h" -#include "terminal.h" -#include "translation.h" #include "versions.h" +#include "array_count.h" #include "audio.h" +#include "controller.h" +#include "file_select_state.h" #include "game.h" #include "interface.h" +#include "inventory.h" +#include "item.h" +#include "memory_utils.h" #include "message.h" #include "ocarina.h" +#include "printf.h" #include "save.h" #include "scene.h" #include "ss_sram.h" +#include "terminal.h" +#include "translation.h" + +#include "ultra64.h" +#include +#include +#include #define SLOT_SIZE (sizeof(SaveContext) + 0x28) #define CHECKSUM_SIZE (sizeof(Save) / 2) diff --git a/src/code/z_ss_sram.c b/src/code/z_ss_sram.c index de13b321d2..47ef9f3a76 100644 --- a/src/code/z_ss_sram.c +++ b/src/code/z_ss_sram.c @@ -1,7 +1,10 @@ -#include "ultra64.h" -#include "printf.h" #include "ss_sram.h" +#include "printf.h" + +#include "ultra64.h" +#include + typedef struct SsSramContext { /* 0x00 */ OSPiHandle piHandle; /* 0x74 */ OSIoMesg ioMesg; diff --git a/src/code/z_view.c b/src/code/z_view.c index 4c37194cfd..6915668b91 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -1,7 +1,5 @@ #include "view.h" -#include "libc64/malloc.h" -#include "libu64/debug.h" #include "avoid_ub.h" #include "gfx.h" #include "letterbox.h" @@ -11,6 +9,14 @@ #include "sys_matrix.h" #include "terminal.h" #include "translation.h" +#include "z_math.h" + +#include "libc64/malloc.h" +#include "libu64/debug.h" +#include "ultra64.h" +#include +#include +#include vu32 sLogOnNextViewInit = true; diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c index 6eceeaa7e7..8efbfcbecc 100644 --- a/src/code/z_vimode.c +++ b/src/code/z_vimode.c @@ -1,13 +1,17 @@ #include "vi_mode.h" -#include "libu64/debug.h" -#include "ultra64/viint.h" +#include "versions.h" #include "controller.h" #include "gfx.h" #include "main.h" #include "printf.h" #include "regs.h" -#include "versions.h" + +#include "libu64/debug.h" +#include "libu64/pad.h" +#include "ultra64.h" +#include "ultra64/viint.h" +#include void ViMode_LogPrint(OSViMode* osViMode) { LOG_ADDRESS("osvimodep", osViMode, "../z_vimode.c", 87); diff --git a/src/code/z_viscvg.c b/src/code/z_viscvg.c index 236c0c052f..b143020388 100644 --- a/src/code/z_viscvg.c +++ b/src/code/z_viscvg.c @@ -6,10 +6,14 @@ * usually highlight silhouettes. */ -#include "ultra64.h" -#include "gfx.h" #include "vis.h" +#include "color.h" +#include "gfx.h" + +#include "ultra64.h" +#include + Gfx sVisCvgModulateBlendColorDL[] = { gsDPSetOtherMode(G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c index bd7950781f..9b1f589283 100644 --- a/src/code/z_vismono.c +++ b/src/code/z_vismono.c @@ -11,12 +11,19 @@ * See the rest of the file for specifics. */ -#include "libc64/malloc.h" -#include "libu64/debug.h" +#include "vis.h" + #include "attributes.h" +#include "color.h" #include "gfx.h" #include "gfxalloc.h" -#include "vis.h" + +#include "libc64/malloc.h" +#include "libu64/debug.h" +#include "ultra64.h" +#include +#include +#include // Height of the fragments the color frame buffer (CFB) is split into. // It is the maximum amount of lines such that all rgba16 SCREEN_WIDTH-long lines fit into diff --git a/src/code/z_viszbuffer.c b/src/code/z_viszbuffer.c index fa37f14402..77bd5a934a 100644 --- a/src/code/z_viszbuffer.c +++ b/src/code/z_viszbuffer.c @@ -37,10 +37,14 @@ * - blue: like green but even higher frequency */ -#include "ultra64.h" -#include "gfx.h" #include "vis.h" +#include "color.h" +#include "gfx.h" + +#include "ultra64.h" +#include + // z-buffer extern u16 D_0E000000[]; diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index 3387db500f..6daaeed1f4 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -1,14 +1,19 @@ #include "skybox.h" #include "array_count.h" -#include "printf.h" -#include "segment_symbols.h" -#include "terminal.h" -#include "ultra64.h" +#include "dma.h" #include "environment.h" #include "game.h" #include "play_state.h" +#include "printf.h" #include "save.h" +#include "segment_symbols.h" +#include "terminal.h" + +#include "ultra64.h" +#include +#include +#include typedef struct SkyboxFaceParams { /* 0x000 */ s32 xStart; diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c index 46c38291f6..233b8b5e84 100644 --- a/src/code/z_vr_box_draw.c +++ b/src/code/z_vr_box_draw.c @@ -1,7 +1,10 @@ +#include "skybox.h" + #include "gfx.h" #include "gfx_setupdl.h" #include "sys_matrix.h" -#include "skybox.h" + +#include "ultra64.h" Mtx* sSkyboxDrawMatrix;